diff --git a/.gitignore b/.gitignore
index cc28be0..2be1dc5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+cookies.txt
+
 docs/
 .idea/
 *.zip
diff --git a/README.md b/README.md
index 1931e24..9ea6d51 100644
--- a/README.md
+++ b/README.md
@@ -2,13 +2,11 @@
 SolarFM is a Gtk+ Python file manager.
 
 # Notes
-<b>Still Work in  progress! Use at own risk!</b>
-
-Additionally, if not building a .deb then just move the contents of user_config to their respective folders.
+If not building a .deb then just move the contents of user_config to their respective folders.
 Copy the share/solarfm folder to your user .config/ directory too.
 
 `pyrightconfig.json`
-<p>The pyrightconfig file needs to stay on same level as the .git folders in order to have settings detected when using pyright with lsp functionality.</p>
+<p>The pyrightconfig file needs to stay on same level as the .git folders in order to have settings detected when using pyright with lsp functionality. "pyrightconfig.json" can prompt IDEs such as Zed on settings to use and where imports are located- look at venvPath and venv. "venvPath" is parent path of "venv" where "venv" is just the name of the folder under the parent path that is the python created venv.
 
 <h6>Install Setup</h6>
 ```
@@ -17,7 +15,7 @@ sudo apt-get install xclip python3.8 python3-setproctitle python3-gi wget ffmpeg
 
 # Known Issues
 <ul>
-<li>The memory leak has now been mostly mitigated in that it doesn't balloon to 2GB'. Still working out where the smaller one(s) is/are.</li>
+<li>There is a memory leak that has been slowed down but can get to 2GB over a long enough time period OR active accessing image based dirs.</li>
 <li>Doing Ctrl+D when in Terminator (maybe other terminals too) somehow propagates the signal to SolarFM too.
 A selected file in the active quad-pane will move to trash since it is the default key-binding for that action.</li>
 </ul>
@@ -25,11 +23,10 @@ A selected file in the active quad-pane will move to trash since it is the defau
 # TODO
 <ul>
 <li>Add simpleish preview plugin for various file types.</li>
-<li>Add simpleish bulk-renamer.</li>
 </ul>
 
 # Images
 ![1 SolarFM single pane. ](images/pic1.png)
 ![2 SolarFM double pane. ](images/pic2.png)
 ![3 SolarFM triple pane. ](images/pic3.png)
-![4 SolarFM quad pane. ](images/pic4.png)
\ No newline at end of file
+![4 SolarFM quad pane. ](images/pic4.png)
diff --git a/plugins/README.md b/plugins/README.md
index 1f18e50..f475c08 100644
--- a/plugins/README.md
+++ b/plugins/README.md
@@ -14,6 +14,7 @@ class Manifest:
         'ui_target': "plugin_control_list",
         'pass_fm_events': "true"
     }
+    pre_launch: bool = False
 ```
 
 
diff --git a/plugins/file_properties/plugin.py b/plugins/file_properties/plugin.py
index 1036fcf..a402831 100644
--- a/plugins/file_properties/plugin.py
+++ b/plugins/file_properties/plugin.py
@@ -122,7 +122,6 @@ class Plugin(PluginBase):
             uri  = state.uris[0]
             path = state.tab.get_current_directory()
 
-
             properties = self._set_ui_data(uri, path)
             response   = self._properties_dialog.run()
             if response in [Gtk.ResponseType.CANCEL, Gtk.ResponseType.DELETE_EVENT]:
@@ -168,13 +167,13 @@ class Plugin(PluginBase):
 
     def _set_ui_data(self, uri, path):
         properties = Properties()
-        file_info  = Gio.File.new_for_path(uri).query_info(attributes="standard::*,owner::*,time::access,time::changed",
-                                                            flags=Gio.FileQueryInfoFlags.NONE,
-                                                            cancellable=None)
+        file_info  = Gio.File.new_for_path(uri).query_info(attributes = "standard::*,owner::*,time::access,time::changed",
+                                                            flags = Gio.FileQueryInfoFlags.NONE,
+                                                            cancellable = None)
 
         is_symlink               = file_info.get_attribute_as_string("standard::is-symlink")
         properties.file_uri      = uri
-        properties.file_target   = file_info.get_attribute_as_string("standard::symlink-target") if is_symlink else ""
+        properties.file_target   = file_info.get_attribute_as_string("standard::symlink-target") if is_symlink in [True, "TRUE"] else ""
         properties.file_name     = file_info.get_display_name()
         properties.file_location = path
         properties.mime_type     = file_info.get_content_type()
@@ -186,7 +185,7 @@ class Plugin(PluginBase):
 
         # NOTE: Read = 4,  Write = 2,  Exec = 1
         command = ["stat", "-c", "%a", uri]
-        with subprocess.Popen(command, stdout=subprocess.PIPE) as proc:
+        with subprocess.Popen(command, stdout = subprocess.PIPE) as proc:
             properties.chmod_stat = list(proc.stdout.read().decode("UTF-8").strip())
             owner  = self._chmod_map[f"{properties.chmod_stat[0]}"]
             group  = self._chmod_map[f"{properties.chmod_stat[1]}"]
diff --git a/plugins/searcher/widgets/grep_preview_widget.py b/plugins/searcher/widgets/grep_preview_widget.py
index 79a34d6..09e778a 100644
--- a/plugins/searcher/widgets/grep_preview_widget.py
+++ b/plugins/searcher/widgets/grep_preview_widget.py
@@ -48,7 +48,7 @@ class GrepPreviewWidget(Gtk.Box):
         return bytes(f"\n<span foreground='{color}'>{target}</span>", "utf-8").decode("utf-8")
 
     def make_utf8_line_highlight(self, buffer, itr, i, color, target, query):
-        parts = re.split(r"(" + query + ")(?i)", target.replace("\n", ""))
+        parts = re.split(r"(?i)(" + query + ")", target.replace("\n", ""))
         for part in parts:
             itr  = buffer.get_end_iter()
 
@@ -57,4 +57,4 @@ class GrepPreviewWidget(Gtk.Box):
             else:
                 new_s = f"<span foreground='#000000' background='{color}'>{part}</span>"
                 _part = bytes(new_s, "utf-8").decode("utf-8")
-                buffer.insert_markup(itr, _part, len(_part))
+                buffer.insert_markup(itr, _part, len(_part))
\ No newline at end of file
diff --git a/plugins/template/manifest.json b/plugins/template/manifest.json
index 4dcbf47..10483da 100644
--- a/plugins/template/manifest.json
+++ b/plugins/template/manifest.json
@@ -8,6 +8,7 @@
             "ui_target": "plugin_control_list",
             "pass_fm_events": "true",
             "bind_keys": ["Example Plugin||send_message:<Control>f"]
-        }
+        },
+        "pre_launch": "false"
     }
 }
diff --git a/plugins/thumbnailer/__init__.py b/plugins/thumbnailer/__init__.py
new file mode 100644
index 0000000..d36fa8c
--- /dev/null
+++ b/plugins/thumbnailer/__init__.py
@@ -0,0 +1,3 @@
+"""
+    Pligin Module
+"""
diff --git a/plugins/thumbnailer/__main__.py b/plugins/thumbnailer/__main__.py
new file mode 100644
index 0000000..a576329
--- /dev/null
+++ b/plugins/thumbnailer/__main__.py
@@ -0,0 +1,3 @@
+"""
+    Pligin Package
+"""
diff --git a/src/solarfm/shellfm/windows/tabs/icons/__init__.py b/plugins/thumbnailer/icons/__init__.py
similarity index 100%
rename from src/solarfm/shellfm/windows/tabs/icons/__init__.py
rename to plugins/thumbnailer/icons/__init__.py
diff --git a/plugins/thumbnailer/icons/controller.py b/plugins/thumbnailer/icons/controller.py
new file mode 100644
index 0000000..cec4601
--- /dev/null
+++ b/plugins/thumbnailer/icons/controller.py
@@ -0,0 +1,75 @@
+# Python imports
+import json
+import os
+from os import path
+
+# Lib imports
+import gi
+gi.require_version('Gtk', '3.0')
+from gi.repository import Gtk
+
+# Application imports
+from .icon import Icon
+
+
+
+class IconController(Icon):
+    def __init__(self):
+        CURRENT_PATH = os.path.dirname(os.path.realpath(__file__))
+
+        # NOTE: app_name should be defined using python 'builtins' and so too must be logger used in the various classes
+        app_name_exists   = False
+        try:
+            app_name
+            app_name_exists = True
+        except Exception as e:
+            ...
+
+        APP_CONTEXT            = f"{app_name.lower()}" if app_name_exists else "shellfm"
+        USR_APP_CONTEXT        = f"/usr/share/{APP_CONTEXT}"
+        USER_HOME              = path.expanduser('~')
+        CONFIG_PATH            = f"{USER_HOME}/.config/{APP_CONTEXT}"
+        self.DEFAULT_ICONS     = f"{CONFIG_PATH}/icons"
+        self.DEFAULT_ICON      = f"{self.DEFAULT_ICONS}/text.png"
+        self.FFMPG_THUMBNLR    = f"{CONFIG_PATH}/ffmpegthumbnailer"    # Thumbnail generator binary
+        self.BLENDER_THUMBNLR  = f"{CONFIG_PATH}/blender-thumbnailer"  # Blender thumbnail generator binary
+
+        self.ICON_DIRS         = ["/usr/share/icons", f"{USER_HOME}/.icons" "/usr/share/pixmaps"]
+        self.BASE_THUMBS_PTH   = f"{USER_HOME}/.thumbnails"
+        self.ABS_THUMBS_PTH    = f"{self.BASE_THUMBS_PTH}/normal"
+        self.STEAM_ICONS_PTH   = f"{self.BASE_THUMBS_PTH}/steam_icons"
+        self.STEAM_CDN_URL     = ""
+
+        if not path.isdir(self.BASE_THUMBS_PTH):
+            os.mkdir(self.BASE_THUMBS_PTH)
+
+        if not path.isdir(self.ABS_THUMBS_PTH):
+            os.mkdir(self.ABS_THUMBS_PTH)
+
+        if not path.isdir(self.STEAM_ICONS_PTH):
+            os.mkdir(self.STEAM_ICONS_PTH)
+
+        if not os.path.exists(self.DEFAULT_ICONS):
+            self.DEFAULT_ICONS = f"{USR_APP_CONTEXT}/icons"
+            self.DEFAULT_ICON  = f"{self.DEFAULT_ICONS}/text.png"
+
+        CONFIG_FILE  = f"{CURRENT_PATH}/../settings.json"
+        with open(CONFIG_FILE) as f:
+            settings      = json.load(f)
+            config        = settings["config"]
+
+            self.container_icon_wh = config["container_icon_wh"]
+            self.video_icon_wh     = config["video_icon_wh"]
+            self.sys_icon_wh       = config["sys_icon_wh"]
+            self.STEAM_CDN_URL     = config["steam_cdn_url"]
+
+            # Filters
+            filters = settings["filters"]
+            self.fmeshs  = tuple(filters["meshs"])
+            self.fcode   = tuple(filters["code"])
+            self.fvideos = tuple(filters["videos"])
+            self.foffice = tuple(filters["office"])
+            self.fimages = tuple(filters["images"])
+            self.ftext   = tuple(filters["text"])
+            self.fmusic  = tuple(filters["music"])
+            self.fpdf    = tuple(filters["pdf"])
diff --git a/src/solarfm/shellfm/windows/tabs/icons/icon.py b/plugins/thumbnailer/icons/icon.py
similarity index 94%
rename from src/solarfm/shellfm/windows/tabs/icons/icon.py
rename to plugins/thumbnailer/icons/icon.py
index 72285b0..79903ca 100644
--- a/src/solarfm/shellfm/windows/tabs/icons/icon.py
+++ b/plugins/thumbnailer/icons/icon.py
@@ -50,8 +50,8 @@ class Icon(DesktopIconMixin, VideoIconMixin, MeshsIconMixin):
 
             if not thumbnl:
                 # TODO: Detect if not in a thread and use directly for speed get_system_thumbnail
-                thumbnl = self.get_system_thumbnail(full_path, self.sys_icon_wh[0])
-                # thumbnl = self._get_system_thumbnail_gtk_thread(full_path, self.sys_icon_wh[0])
+                # thumbnl = self.get_system_thumbnail(full_path, self.sys_icon_wh[0])
+                thumbnl = self._get_system_thumbnail_gtk_thread(full_path, self.sys_icon_wh[0])
                 if not thumbnl:
                     raise IconException("No known icons found.")
 
@@ -138,11 +138,14 @@ class Icon(DesktopIconMixin, VideoIconMixin, MeshsIconMixin):
         def _call_gtk_thread(event, result):
             result.append( self.get_system_thumbnail(full_path, size) )
             event.set()
+            return False
 
         result  = []
         event   = threading.Event()
         GLib.idle_add(_call_gtk_thread, event, result)
         event.wait()
+
+        event   = None
         return result[0]
 
 
@@ -151,11 +154,12 @@ class Icon(DesktopIconMixin, VideoIconMixin, MeshsIconMixin):
             gio_file  = Gio.File.new_for_path(full_path)
             info      = gio_file.query_info('standard::icon' , 0, None)
             icon      = info.get_icon().get_names()[0]
-            data      = settings_manager.get_icon_theme().lookup_icon(icon , size , 0)
+            data      = settings_manager.get_icon_theme().lookup_icon(icon , size, 0)
 
             if data:
                 icon_path = data.get_filename()
-                return GdkPixbuf.Pixbuf.new_from_file(icon_path)
+
+                return GdkPixbuf.Pixbuf.new_from_file_at_size(icon_path, width = size, height = size)
 
             raise IconException("No system icon found...")
         except IconException:
diff --git a/src/solarfm/shellfm/windows/tabs/icons/mixins/__init__.py b/plugins/thumbnailer/icons/mixins/__init__.py
similarity index 100%
rename from src/solarfm/shellfm/windows/tabs/icons/mixins/__init__.py
rename to plugins/thumbnailer/icons/mixins/__init__.py
diff --git a/src/solarfm/shellfm/windows/tabs/icons/mixins/desktopiconmixin.py b/plugins/thumbnailer/icons/mixins/desktopiconmixin.py
similarity index 100%
rename from src/solarfm/shellfm/windows/tabs/icons/mixins/desktopiconmixin.py
rename to plugins/thumbnailer/icons/mixins/desktopiconmixin.py
diff --git a/src/solarfm/shellfm/windows/tabs/icons/mixins/meshsiconmixin.py b/plugins/thumbnailer/icons/mixins/meshsiconmixin.py
similarity index 89%
rename from src/solarfm/shellfm/windows/tabs/icons/mixins/meshsiconmixin.py
rename to plugins/thumbnailer/icons/mixins/meshsiconmixin.py
index 0d62636..8f7b057 100644
--- a/src/solarfm/shellfm/windows/tabs/icons/mixins/meshsiconmixin.py
+++ b/plugins/thumbnailer/icons/mixins/meshsiconmixin.py
@@ -14,4 +14,4 @@ class MeshsIconMixin:
             proc = subprocess.Popen([self.BLENDER_THUMBNLR, full_path, hash_img_path])
             proc.wait()
         except Exception as e:
-            self.logger.debug(repr(e))
+            logger.debug(repr(e))
diff --git a/src/solarfm/shellfm/windows/tabs/icons/mixins/videoiconmixin.py b/plugins/thumbnailer/icons/mixins/videoiconmixin.py
similarity index 95%
rename from src/solarfm/shellfm/windows/tabs/icons/mixins/videoiconmixin.py
rename to plugins/thumbnailer/icons/mixins/videoiconmixin.py
index 60fd16b..e1acdf5 100644
--- a/src/solarfm/shellfm/windows/tabs/icons/mixins/videoiconmixin.py
+++ b/plugins/thumbnailer/icons/mixins/videoiconmixin.py
@@ -14,7 +14,7 @@ class VideoIconMixin:
             proc = subprocess.Popen([self.FFMPG_THUMBNLR, "-t", scrub_percent, "-s", "300", "-c", "jpg", "-i", full_path, "-o", hash_img_path])
             proc.wait()
         except Exception as e:
-            self.logger.debug(repr(e))
+            logger.info(e)
             self.ffprobe_generate_video_thumbnail(full_path, hash_img_path)
 
 
@@ -51,5 +51,4 @@ class VideoIconMixin:
             proc.wait()
         except Exception as e:
             print("Video thumbnail generation issue in thread:")
-            print( repr(e) )
-            self.logger.debug(repr(e))
+            logger.info(repr(e))
diff --git a/src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/BaseDirectory.py b/plugins/thumbnailer/icons/mixins/xdg/BaseDirectory.py
similarity index 100%
rename from src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/BaseDirectory.py
rename to plugins/thumbnailer/icons/mixins/xdg/BaseDirectory.py
diff --git a/src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/Config.py b/plugins/thumbnailer/icons/mixins/xdg/Config.py
similarity index 100%
rename from src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/Config.py
rename to plugins/thumbnailer/icons/mixins/xdg/Config.py
diff --git a/src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/DesktopEntry.py b/plugins/thumbnailer/icons/mixins/xdg/DesktopEntry.py
similarity index 100%
rename from src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/DesktopEntry.py
rename to plugins/thumbnailer/icons/mixins/xdg/DesktopEntry.py
diff --git a/src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/Exceptions.py b/plugins/thumbnailer/icons/mixins/xdg/Exceptions.py
similarity index 100%
rename from src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/Exceptions.py
rename to plugins/thumbnailer/icons/mixins/xdg/Exceptions.py
diff --git a/src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/IconTheme.py b/plugins/thumbnailer/icons/mixins/xdg/IconTheme.py
similarity index 100%
rename from src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/IconTheme.py
rename to plugins/thumbnailer/icons/mixins/xdg/IconTheme.py
diff --git a/src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/IniFile.py b/plugins/thumbnailer/icons/mixins/xdg/IniFile.py
similarity index 100%
rename from src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/IniFile.py
rename to plugins/thumbnailer/icons/mixins/xdg/IniFile.py
diff --git a/src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/Locale.py b/plugins/thumbnailer/icons/mixins/xdg/Locale.py
similarity index 100%
rename from src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/Locale.py
rename to plugins/thumbnailer/icons/mixins/xdg/Locale.py
diff --git a/src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/Menu.py b/plugins/thumbnailer/icons/mixins/xdg/Menu.py
similarity index 100%
rename from src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/Menu.py
rename to plugins/thumbnailer/icons/mixins/xdg/Menu.py
diff --git a/src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/MenuEditor.py b/plugins/thumbnailer/icons/mixins/xdg/MenuEditor.py
similarity index 100%
rename from src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/MenuEditor.py
rename to plugins/thumbnailer/icons/mixins/xdg/MenuEditor.py
diff --git a/src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/Mime.py b/plugins/thumbnailer/icons/mixins/xdg/Mime.py
similarity index 100%
rename from src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/Mime.py
rename to plugins/thumbnailer/icons/mixins/xdg/Mime.py
diff --git a/src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/RecentFiles.py b/plugins/thumbnailer/icons/mixins/xdg/RecentFiles.py
similarity index 100%
rename from src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/RecentFiles.py
rename to plugins/thumbnailer/icons/mixins/xdg/RecentFiles.py
diff --git a/src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/__init__.py b/plugins/thumbnailer/icons/mixins/xdg/__init__.py
similarity index 100%
rename from src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/__init__.py
rename to plugins/thumbnailer/icons/mixins/xdg/__init__.py
diff --git a/src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/util.py b/plugins/thumbnailer/icons/mixins/xdg/util.py
similarity index 100%
rename from src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/util.py
rename to plugins/thumbnailer/icons/mixins/xdg/util.py
diff --git a/plugins/thumbnailer/manifest.json b/plugins/thumbnailer/manifest.json
new file mode 100644
index 0000000..576316c
--- /dev/null
+++ b/plugins/thumbnailer/manifest.json
@@ -0,0 +1,12 @@
+{
+    "manifest": {
+        "name": "Thumbnailer",
+        "author": "ITDominator",
+        "version": "0.0.1",
+        "support": "",
+        "requests": {
+            "pass_fm_events": "true"
+        },
+        "pre_launch": "true"
+    }
+}
diff --git a/plugins/thumbnailer/plugin.py b/plugins/thumbnailer/plugin.py
new file mode 100644
index 0000000..3478689
--- /dev/null
+++ b/plugins/thumbnailer/plugin.py
@@ -0,0 +1,75 @@
+# Python imports
+import os
+
+# Lib imports
+
+# Application imports
+from plugins.plugin_base import PluginBase
+from .icons.controller import IconController
+
+
+
+class Plugin(PluginBase):
+    def __init__(self):
+        super().__init__()
+
+        self.name        = "Thumbnailer"  # NOTE: Need to remove after establishing private bidirectional 1-1 message bus
+                                          #       where self.name should not be needed for message comms
+        # self.path        = os.path.dirname(os.path.realpath(__file__))
+
+
+    def run(self):
+        self.icon_controller = IconController()
+        self._event_system.subscribe("create-thumbnail", self.create_thumbnail)
+        self._event_system.subscribe("create-video-thumbnail", self.create_video_thumbnail)
+        self._event_system.subscribe("create-scaled-image", self.create_scaled_image)
+        self._event_system.subscribe("get-thumbnail-hash", self.get_thumbnail_hash)
+        self._event_system.subscribe("get-thumbnails-path", self.get_thumbnails_path)
+
+    def generate_reference_ui_element(self):
+        ...
+
+    def create_thumbnail(self, dir, file) -> str:
+        return self.icon_controller.create_icon(dir, file)
+
+    def create_video_thumbnail(self, file, scrub_percent, replace):
+        return self.icon_controller.create_video_thumbnail(file, scrub_percent, replace)
+
+    def create_scaled_image(self, hash_img_pth):
+        return self.icon_controller.create_scaled_image(hash_img_pth)
+
+    def get_thumbnail_hash(self, file):
+        return self.icon_controller.generate_hash_and_path(file)
+
+    def get_thumbnails_path(self) -> str:
+        return self.icon_controller.ABS_THUMBS_PTH
+
+    def get_video_icons(self, dir) -> list:
+        data = []
+
+    def get_video_icons(self) -> list:
+        data    = []
+        fvideos = self.icon_controller.fvideos
+        vids    = [ file for file in os.path.list_dir(dir) if file.lower().endswith(fvideos) ]
+
+        for file in vids:
+            img_hash, hash_img_path = self.create_video_thumbnail(full_path = f"{dir}/{file}", returnHashInstead = True)
+            data.append([img_hash, hash_img_path])
+
+        return data
+
+    def get_pixbuf_icon_str_combo(self, dir)  -> list:
+        data = []
+        for file in os.path.list_dir(dir):
+            icon = self.icon_controller.create_icon(dir, file).get_pixbuf()
+            data.append([icon, file])
+
+        return data
+
+    def get_gtk_icon_str_combo(self, dir) -> list:
+        data = []
+        for file in os.path.list_dir(dir):
+            icon = self.icon_controller.create_icon(dir, file)
+            data.append([icon, file[0]])
+
+        return data
diff --git a/plugins/thumbnailer/settings.json b/plugins/thumbnailer/settings.json
new file mode 100644
index 0000000..134ca82
--- /dev/null
+++ b/plugins/thumbnailer/settings.json
@@ -0,0 +1,101 @@
+{
+    "config":{
+        "thumbnailer_path":"ffmpegthumbnailer",
+        "blender_thumbnailer_path":"",
+        "container_icon_wh":[
+            128,
+            128
+        ],
+        "video_icon_wh":[
+            128,
+            64
+        ],
+        "sys_icon_wh":[
+            56,
+            56
+        ],
+        "steam_cdn_url":"https://steamcdn-a.akamaihd.net/steam/apps/",
+        "remux_folder_max_disk_usage":"8589934592"
+    },
+    "filters":{
+        "meshs":[
+            ".dae",
+            ".fbx",
+            ".gltf",
+            ".obj",
+            ".stl"
+        ],
+        "code":[
+            ".cpp",
+            ".css",
+            ".c",
+            ".go",
+            ".html",
+            ".htm",
+            ".java",
+            ".js",
+            ".json",
+            ".lua",
+            ".md",
+            ".py",
+            ".rs",
+            ".toml",
+            ".xml",
+            ".pom"
+        ],
+        "videos":[
+            ".mkv",
+            ".mp4",
+            ".webm",
+            ".avi",
+            ".mov",
+            ".m4v",
+            ".mpg",
+            ".mpeg",
+            ".wmv",
+            ".flv"
+        ],
+        "office":[
+            ".doc",
+            ".docx",
+            ".xls",
+            ".xlsx",
+            ".xlt",
+            ".xltx",
+            ".xlm",
+            ".ppt",
+            ".pptx",
+            ".pps",
+            ".ppsx",
+            ".odt",
+            ".rtf"
+        ],
+        "images":[
+            ".png",
+            ".jpg",
+            ".jpeg",
+            ".gif",
+            ".ico",
+            ".tga",
+            ".webp"
+        ],
+        "text":[
+            ".txt",
+            ".text",
+            ".sh",
+            ".cfg",
+            ".conf",
+            ".log"
+        ],
+        "music":[
+            ".psf",
+            ".mp3",
+            ".ogg",
+            ".flac",
+            ".m4a"
+        ],
+        "pdf":[
+            ".pdf"
+        ]
+    }
+}
diff --git a/plugins/translate/plugin.py b/plugins/translate/plugin.py
index aca4062..d55d0d5 100644
--- a/plugins/translate/plugin.py
+++ b/plugins/translate/plugin.py
@@ -184,11 +184,11 @@ class Plugin(PluginBase):
         response = requests.post(self.vqd_link, headers=self.vqd_headers, data=self.vqd_data, timeout=2)
         if response.status_code == 200:
             data             = response.content
-            vqd_start_index  = data.index(b"vqd='") + 5
-            vqd_end_index    = data.index(b"'", vqd_start_index)
+            vqd_start_index  = data.index(b"vqd=\"") + 5
+            vqd_end_index    = data.index(b"\"", vqd_start_index)
             self._vqd_attrib = data[vqd_start_index:vqd_end_index].decode("utf-8")
 
             print(f"Translation VQD: {self._vqd_attrib}")
         else:
             msg = f"Could not get VQS attribute... Response Code: {response.status_code}"
-            self._translate_to_buffer.set_text(msg)
+            self._translate_to_buffer.set_text(msg)
\ No newline at end of file
diff --git a/plugins/trasher/plugin.py b/plugins/trasher/plugin.py
index fd71ecf..dd0e81e 100644
--- a/plugins/trasher/plugin.py
+++ b/plugins/trasher/plugin.py
@@ -111,6 +111,8 @@ class Plugin(PluginBase):
         for uri in state.uris:
             self.trashman.trash(uri, verbocity)
 
+        self.trashman.regenerate()
+
     def restore_trash_files(self, widget = None, eve = None, verbocity = False):
         self._event_system.emit("get_current_state")
         state = self._fm_state
diff --git a/plugins/trasher/trash.py b/plugins/trasher/trash.py
index 4210f9c..d60d086 100755
--- a/plugins/trasher/trash.py
+++ b/plugins/trasher/trash.py
@@ -43,4 +43,4 @@ class Trash(object):
 
     def restore(self, filename, verbose):
         """Restore a file from trash."""
-        raise NotImplementedError(_('Backend didn’t \ implement this functionality'))
+        raise NotImplementedError(_('Backend didn’t implement this functionality'))
diff --git a/plugins/trasher/xdgtrash.py b/plugins/trasher/xdgtrash.py
index 02ff013..0ff2cf4 100755
--- a/plugins/trasher/xdgtrash.py
+++ b/plugins/trasher/xdgtrash.py
@@ -127,7 +127,7 @@ DeletionDate={}
         f.write(infofile)
         f.close()
 
-        self.regenerate()
+        # self.regenerate()
 
         if verbose:
             sys.stderr.write(_('trashed \'{}\'\n').format(filename))
diff --git a/plugins/vod_thumbnailer/plugin.py b/plugins/vod_thumbnailer/plugin.py
index 9fea674..30219fc 100644
--- a/plugins/vod_thumbnailer/plugin.py
+++ b/plugins/vod_thumbnailer/plugin.py
@@ -26,6 +26,8 @@ def threaded(fn):
     return wrapper
 
 
+class VODThumbnailerException(Exception):
+    ...
 
 
 class Plugin(PluginBase):
@@ -94,32 +96,39 @@ class Plugin(PluginBase):
         file          = self._file_name.get_text()
         dir           = self._file_location.get_text()
         file_hash     = self._file_hash.get_text()
-        hash_img_pth  = f"{self._fm_state.tab.ABS_THUMBS_PTH}/{file_hash}.jpg"
+        hash_img_pth  = f"{self.ABS_THUMBS_PTH}/{file_hash}.jpg"
 
         try:
-            self._fm_state.tab.create_video_thumbnail(f"{dir}/{file}", f"{scrub_percent}%", True)
+            self._event_system.emit_and_await("create-video-thumbnail", (f"{dir}/{file}", f"{scrub_percent}%", True,))
             preview_pixbuf = GdkPixbuf.Pixbuf.new_from_file(hash_img_pth)
             self._thumbnail_preview_img.set_from_pixbuf(preview_pixbuf)
 
-            img_pixbuf = self._fm_state.tab.create_scaled_image(hash_img_pth)
+            img_pixbuf = self._event_system.emit_and_await("create-scaled-image", (hash_img_pth,))
             tree_pth   = self._fm_state.icon_grid.get_selected_items()[0]
             itr        = self._fm_state.store.get_iter(tree_pth)
             pixbuff    = self._fm_state.store.get(itr, 0)[0]
             self._fm_state.store.set(itr, 0, img_pixbuf)
         except Exception as e:
-            print(repr(e))
             print("Couldn't regenerate thumbnail!")
+            print(repr(e))
 
 
     def _set_ui_data(self):
         uri            = self._fm_state.uris[0]
         path           = self._fm_state.tab.get_current_directory()
         parts          = uri.split("/")
-        file_hash      = self._fm_state.tab.fast_hash(uri)
-        hash_img_pth   = f"{self._fm_state.tab.ABS_THUMBS_PTH}/{file_hash}.jpg"
+        path_exists, \
+        img_hash,    \
+        hash_img_pth   = self._event_system.emit_and_await("get-thumbnail-hash", (uri,))
+
+        if not path_exists:
+            raise VODThumbnailerException(f"Could not generate file_hash from: {uri}")
+
+
+        self.ABS_THUMBS_PTH = self._event_system.emit_and_await("get-thumbnails-path")
         preview_pixbuf = GdkPixbuf.Pixbuf.new_from_file(hash_img_pth)
 
         self._thumbnail_preview_img.set_from_pixbuf(preview_pixbuf)
         self._file_name.set_text(parts[ len(parts) - 1 ])
         self._file_location.set_text(path)
-        self._file_hash.set_text(file_hash)
+        self._file_hash.set_text(img_hash)
diff --git a/plugins/youtube_download/download.sh b/plugins/youtube_download/download.sh
index de8e1ea..af03894 100755
--- a/plugins/youtube_download/download.sh
+++ b/plugins/youtube_download/download.sh
@@ -8,12 +8,29 @@
 
 
 function main() {
-    cd "$(dirname "")"
-    echo "Working Dir: " $(pwd)
+    _STARGET="${1}"
+    _SPATH="${HOME}/.config/solarfm/plugins/youtube_download"
     LINK=`xclip -selection clipboard -o`
 
-    python "${HOME}/.config/solarfm/plugins/youtube_download/yt_dlp/__main__.py" \
-            --write-sub --embed-sub --sub-langs en \
-            -o "${1}/%(title)s.%(ext)s" "${LINK}"
+    cd "${_SPATH}"
+    echo "Working Dir: " $(pwd)
+    
+    rm "${_SPATH}/../../cookies.txt"
+
+    # Note: Export cookies to file 
+    python "${_SPATH}/yt_dlp/__main__.py" \
+            --cookies-from-browser firefox --cookies "${_SPATH}/../../cookies.txt"
+
+    # Note: Use cookies from browser directly
+    # python "${_SPATH}/yt_dlp/__main__.py" \
+    #         --cookies-from-browser firefox --write-sub --embed-sub --sub-langs en \
+    #         -o "${_STARGET}/%(title)s.%(ext)s" "${LINK}"
+
+    # Note:  Download video
+    python "${_SPATH}/yt_dlp/__main__.py" \
+            -f "bestvideo[height<=1080][ext=mp4][vcodec^=avc]+bestaudio[ext=m4a]/best[ext=mp4]/best" \
+            --cookies "${_SPATH}/../../cookies.txt" --write-sub --embed-sub --sub-langs en \
+            -o "${_STARGET}/%(title)s.%(ext)s" "${LINK}"
+
 }
-main "$@";
+main "$@";
\ No newline at end of file
diff --git a/plugins/youtube_download/plugin.py b/plugins/youtube_download/plugin.py
index 58df3b3..b5decd4 100644
--- a/plugins/youtube_download/plugin.py
+++ b/plugins/youtube_download/plugin.py
@@ -47,4 +47,4 @@ class Plugin(PluginBase):
 
     @threaded
     def _download(self, dir):
-        subprocess.Popen([f'{self.path}/download.sh', dir])
+        subprocess.Popen([f'{self.path}/download.sh', dir], start_new_session=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, close_fds=True)
diff --git a/plugins/youtube_download/yt_dlp/YoutubeDL.py b/plugins/youtube_download/yt_dlp/YoutubeDL.py
index 666d89b..63e6e11 100644
--- a/plugins/youtube_download/yt_dlp/YoutubeDL.py
+++ b/plugins/youtube_download/yt_dlp/YoutubeDL.py
@@ -1,9 +1,10 @@
 import collections
 import contextlib
 import copy
-import datetime
+import datetime as dt
 import errno
 import fileinput
+import functools
 import http.cookiejar
 import io
 import itertools
@@ -24,14 +25,23 @@ import traceback
 import unicodedata
 
 from .cache import Cache
-from .compat import functools, urllib  # isort: split
-from .compat import compat_os_name, compat_shlex_quote, urllib_req_to_req
-from .cookies import LenientSimpleCookie, load_cookies
+from .compat import urllib  # isort: split
+from .compat import urllib_req_to_req
+from .cookies import CookieLoadError, LenientSimpleCookie, load_cookies
 from .downloader import FFmpegFD, get_suitable_downloader, shorten_protocol_name
 from .downloader.rtmp import rtmpdump_version
-from .extractor import gen_extractor_classes, get_info_extractor
+from .extractor import gen_extractor_classes, get_info_extractor, import_extractors
 from .extractor.common import UnsupportedURLIE
 from .extractor.openload import PhantomJSwrapper
+from .globals import (
+    IN_CLI,
+    LAZY_EXTRACTORS,
+    plugin_ies,
+    plugin_ies_overrides,
+    plugin_pps,
+    all_plugins_loaded,
+    plugin_dirs,
+)
 from .minicurses import format_text
 from .networking import HEADRequest, Request, RequestDirector
 from .networking.common import _REQUEST_HANDLERS, _RH_PREFERENCES
@@ -40,11 +50,10 @@ from .networking.exceptions import (
     NoSupportingHandlers,
     RequestError,
     SSLError,
-    _CompatHTTPError,
     network_exceptions,
 )
-from .plugins import directories as plugin_directories
-from .postprocessor import _PLUGIN_CLASSES as plugin_pps
+from .networking.impersonate import ImpersonateRequestHandler
+from .plugins import directories as plugin_directories, load_all_plugins
 from .postprocessor import (
     EmbedThumbnailPP,
     FFmpegFixupDuplicateMoovPP,
@@ -60,7 +69,13 @@ from .postprocessor import (
     get_postprocessor,
 )
 from .postprocessor.ffmpeg import resolve_mapping as resolve_recode_mapping
-from .update import REPOSITORY, current_git_head, detect_variant
+from .update import (
+    REPOSITORY,
+    _get_system_deprecation,
+    _make_label,
+    current_git_head,
+    detect_variant,
+)
 from .utils import (
     DEFAULT_OUTTMPL,
     IDENTITY,
@@ -94,16 +109,14 @@ from .utils import (
     SameFileError,
     UnavailableVideoError,
     UserNotLive,
+    YoutubeDLError,
     age_restricted,
-    args_to_str,
     bug_reports_message,
     date_from_str,
     deprecation_warning,
     determine_ext,
     determine_protocol,
     encode_compat_str,
-    encodeFilename,
-    error_to_compat_str,
     escapeHTML,
     expand_path,
     extract_basic_auth,
@@ -134,11 +147,13 @@ from .utils import (
     sanitize_filename,
     sanitize_path,
     sanitize_url,
+    shell_quote,
     str_or_none,
     strftime_or_none,
     subtitles_filename,
     supports_terminal_sequences,
     system_identifier,
+    filesize_from_tbr,
     timetuple_from_msec,
     to_high_limit_path,
     traverse_obj,
@@ -146,24 +161,37 @@ from .utils import (
     try_get,
     url_basename,
     variadic,
-    version_tuple,
     windows_enable_vt_mode,
     write_json_file,
     write_string,
 )
-from .utils._utils import _YDLLogger
+from .utils._utils import _UnsafeExtensionError, _YDLLogger, _ProgressState
 from .utils.networking import (
     HTTPHeaderDict,
     clean_headers,
     clean_proxies,
     std_headers,
 )
-from .version import CHANNEL, RELEASE_GIT_HEAD, VARIANT, __version__
+from .version import CHANNEL, ORIGIN, RELEASE_GIT_HEAD, VARIANT, __version__
 
-if compat_os_name == 'nt':
+if os.name == 'nt':
     import ctypes
 
 
+def _catch_unsafe_extension_error(func):
+    @functools.wraps(func)
+    def wrapper(self, *args, **kwargs):
+        try:
+            return func(self, *args, **kwargs)
+        except _UnsafeExtensionError as error:
+            self.report_error(
+                f'The extracted extension ({error.extension!r}) is unusual '
+                'and will be skipped for safety reasons. '
+                f'If you believe this is an error{bug_reports_message(",")}')
+
+    return wrapper
+
+
 class YoutubeDL:
     """YoutubeDL class.
 
@@ -229,7 +257,7 @@ class YoutubeDL:
     format_sort_force: Force the given format_sort. see "Sorting Formats"
                        for more details.
     prefer_free_formats: Whether to prefer video formats with free containers
-                       over non-free ones of same quality.
+                       over non-free ones of the same quality.
     allow_multiple_video_streams:   Allow multiple video streams to be merged
                        into a single file
     allow_multiple_audio_streams:   Allow multiple audio streams to be merged
@@ -239,14 +267,16 @@ class YoutubeDL:
                        'selected' (check selected formats),
                        or None (check only if requested by extractor)
     paths:             Dictionary of output paths. The allowed keys are 'home'
-                       'temp' and the keys of OUTTMPL_TYPES (in utils.py)
+                       'temp' and the keys of OUTTMPL_TYPES (in utils/_utils.py)
     outtmpl:           Dictionary of templates for output names. Allowed keys
-                       are 'default' and the keys of OUTTMPL_TYPES (in utils.py).
+                       are 'default' and the keys of OUTTMPL_TYPES (in utils/_utils.py).
                        For compatibility with youtube-dl, a single string can also be used
     outtmpl_na_placeholder: Placeholder for unavailable meta fields.
     restrictfilenames: Do not allow "&" and spaces in file names
     trim_file_name:    Limit length of filename (extension excluded)
-    windowsfilenames:  Force the filenames to be windows compatible
+    windowsfilenames:  True: Force filenames to be Windows compatible
+                       False: Sanitize filenames only minimally
+                       This option has no effect when running on Windows
     ignoreerrors:      Do not stop on download/postprocessing errors.
                        Can be 'only_download' to ignore only download errors.
                        Default is 'only_download' for CLI, but False for API
@@ -261,9 +291,12 @@ class YoutubeDL:
     lazy_playlist:     Process playlist entries as they are received.
     matchtitle:        Download only matching titles.
     rejecttitle:       Reject downloads for matching titles.
-    logger:            Log messages to a logging.Logger instance.
+    logger:            A class having a `debug`, `warning` and `error` function where
+                       each has a single string parameter, the message to be logged.
+                       For compatibility reasons, both debug and info messages are passed to `debug`.
+                       A debug message will have a prefix of `[debug] ` to discern it from info messages.
     logtostderr:       Print everything to stderr instead of stdout.
-    consoletitle:      Display progress in console window's titlebar.
+    consoletitle:      Display progress in the console window's titlebar.
     writedescription:  Write the video description to a .description file
     writeinfojson:     Write the video description to a .info.json file
     clean_infojson:    Remove internal metadata from the infojson
@@ -397,6 +430,8 @@ class YoutubeDL:
                        - "detect_or_warn": check whether we can do anything
                                            about it, warn otherwise (default)
     source_address:    Client-side IP address to bind to.
+    impersonate:       Client to impersonate for requests.
+                       An ImpersonateTarget (from yt_dlp.networking.impersonate)
     sleep_interval_requests: Number of seconds to sleep between requests
                        during extraction
     sleep_interval:    Number of seconds to sleep before each download when
@@ -422,13 +457,14 @@ class YoutubeDL:
                          asked whether to download the video.
                        - Raise utils.DownloadCancelled(msg) to abort remaining
                          downloads when a video is rejected.
-                       match_filter_func in utils.py is one example for this.
+                       match_filter_func in utils/_utils.py is one example for this.
     color:             A Dictionary with output stream names as keys
                        and their respective color policy as values.
                        Can also just be a single color policy,
                        in which case it applies to all outputs.
                        Valid stream names are 'stdout' and 'stderr'.
-                       Valid color policies are one of 'always', 'auto', 'no_color' or 'never'.
+                       Valid color policies are one of 'always', 'auto',
+                       'no_color', 'never', 'auto-tty' or 'no_color-tty'.
     geo_bypass:        Bypass geographic restriction via faking X-Forwarded-For
                        HTTP header
     geo_bypass_country:
@@ -444,8 +480,9 @@ class YoutubeDL:
                        Set the value to 'native' to use the native downloader
     compat_opts:       Compatibility options. See "Differences in default behavior".
                        The following options do not work when used through the API:
-                       filename, abort-on-error, multistreams, no-live-chat, format-sort
-                       no-clean-infojson, no-playlist-metafiles, no-keep-subs, no-attach-info-json.
+                       filename, abort-on-error, multistreams, no-live-chat,
+                       format-sort, no-clean-infojson, no-playlist-metafiles,
+                       no-keep-subs, no-attach-info-json, allow-unsafe-ext, prefer-vp9-sort.
                        Refer __init__.py for their implementation
     progress_template: Dictionary of templates for progress outputs.
                        Allowed keys are 'download', 'postprocess',
@@ -471,7 +508,7 @@ class YoutubeDL:
     nopart, updatetime, buffersize, ratelimit, throttledratelimit, min_filesize,
     max_filesize, test, noresizebuffer, retries, file_access_retries, fragment_retries,
     continuedl, xattr_set_filesize, hls_use_mpegts, http_chunk_size,
-    external_downloader_args, concurrent_fragment_downloads.
+    external_downloader_args, concurrent_fragment_downloads, progress_delta.
 
     The following options are used by the post processors:
     ffmpeg_location:   Location of the ffmpeg/avconv binary; either the path
@@ -487,7 +524,7 @@ class YoutubeDL:
     The following options are used by the extractors:
     extractor_retries: Number of times to retry for known errors (default: 3)
     dynamic_mpd:       Whether to process dynamic DASH manifests (default: True)
-    hls_split_discontinuity: Split HLS playlists to different formats at
+    hls_split_discontinuity: Split HLS playlists into different formats at
                        discontinuities such as ad breaks (default: False)
     extractor_args:    A dictionary of arguments to be passed to the extractors.
                        See "EXTRACTOR ARGUMENTS" for details.
@@ -527,7 +564,7 @@ class YoutubeDL:
     include_ads:       - Doesn't work
                        Download ads as well
     call_home:         - Not implemented
-                       Boolean, true iff we are allowed to contact the
+                       Boolean, true if we are allowed to contact the
                        yt-dlp servers for debugging.
     post_hooks:        - Register a custom postprocessor
                        A list of functions that get called as the final step
@@ -569,15 +606,23 @@ class YoutubeDL:
         # NB: Keep in sync with the docstring of extractor/common.py
         'url', 'manifest_url', 'manifest_stream_number', 'ext', 'format', 'format_id', 'format_note',
         'width', 'height', 'aspect_ratio', 'resolution', 'dynamic_range', 'tbr', 'abr', 'acodec', 'asr', 'audio_channels',
-        'vbr', 'fps', 'vcodec', 'container', 'filesize', 'filesize_approx', 'rows', 'columns',
-        'player_url', 'protocol', 'fragment_base_url', 'fragments', 'is_from_start',
+        'vbr', 'fps', 'vcodec', 'container', 'filesize', 'filesize_approx', 'rows', 'columns', 'hls_media_playlist_data',
+        'player_url', 'protocol', 'fragment_base_url', 'fragments', 'is_from_start', 'is_dash_periods', 'request_data',
         'preference', 'language', 'language_preference', 'quality', 'source_preference', 'cookies',
-        'http_headers', 'stretched_ratio', 'no_resume', 'has_drm', 'extra_param_to_segment_url', 'hls_aes', 'downloader_options',
-        'page_url', 'app', 'play_path', 'tc_url', 'flash_version', 'rtmp_live', 'rtmp_conn', 'rtmp_protocol', 'rtmp_real_time'
+        'http_headers', 'stretched_ratio', 'no_resume', 'has_drm', 'extra_param_to_segment_url', 'extra_param_to_key_url',
+        'hls_aes', 'downloader_options', 'page_url', 'app', 'play_path', 'tc_url', 'flash_version',
+        'rtmp_live', 'rtmp_conn', 'rtmp_protocol', 'rtmp_real_time',
+    }
+    _deprecated_multivalue_fields = {
+        'album_artist': 'album_artists',
+        'artist': 'artists',
+        'composer': 'composers',
+        'creator': 'creators',
+        'genre': 'genres',
     }
     _format_selection_exts = {
         'audio': set(MEDIA_EXTENSIONS.common_audio),
-        'video': set(MEDIA_EXTENSIONS.common_video + ('3gp', )),
+        'video': {*MEDIA_EXTENSIONS.common_video, '3gp'},
         'storyboards': set(MEDIA_EXTENSIONS.storyboards),
     }
 
@@ -605,13 +650,15 @@ class YoutubeDL:
         self.cache = Cache(self)
         self.__header_cookies = []
 
+        # compat for API: load plugins if they have not already
+        if not all_plugins_loaded.value:
+            load_all_plugins()
+
         stdout = sys.stderr if self.params.get('logtostderr') else sys.stdout
         self._out_files = Namespace(
             out=stdout,
             error=sys.stderr,
             screen=sys.stderr if self.params.get('quiet') else stdout,
-            console=None if compat_os_name == 'nt' else next(
-                filter(supports_terminal_sequences, (sys.stderr, sys.stdout)), None)
         )
 
         try:
@@ -619,19 +666,28 @@ class YoutubeDL:
         except Exception as e:
             self.write_debug(f'Failed to enable VT mode: {e}')
 
+        # hehe "immutable" namespace
+        self._out_files.console = next(filter(supports_terminal_sequences, (sys.stderr, sys.stdout)), None)
+
         if self.params.get('no_color'):
             if self.params.get('color') is not None:
                 self.params.setdefault('_warnings', []).append(
                     'Overwriting params from "color" with "no_color"')
             self.params['color'] = 'no_color'
 
-        term_allow_color = os.environ.get('TERM', '').lower() != 'dumb'
+        term_allow_color = os.getenv('TERM', '').lower() != 'dumb'
+        base_no_color = bool(os.getenv('NO_COLOR'))
 
         def process_color_policy(stream):
             stream_name = {sys.stdout: 'stdout', sys.stderr: 'stderr'}[stream]
-            policy = traverse_obj(self.params, ('color', (stream_name, None), {str}), get_all=False)
-            if policy in ('auto', None):
-                return term_allow_color and supports_terminal_sequences(stream)
+            policy = traverse_obj(self.params, ('color', (stream_name, None), {str}, any)) or 'auto'
+            if policy in ('auto', 'auto-tty', 'no_color-tty'):
+                no_color = base_no_color
+                if policy.endswith('tty'):
+                    no_color = policy.startswith('no_color')
+                if term_allow_color and supports_terminal_sequences(stream):
+                    return 'no_color' if no_color else True
+                return False
             assert policy in ('always', 'never', 'no_color'), policy
             return {'always': True, 'never': False}.get(policy, policy)
 
@@ -640,17 +696,9 @@ class YoutubeDL:
             for name, stream in self._out_files.items_ if name != 'console'
         })
 
-        # The code is left like this to be reused for future deprecations
-        MIN_SUPPORTED, MIN_RECOMMENDED = (3, 7), (3, 7)
-        current_version = sys.version_info[:2]
-        if current_version < MIN_RECOMMENDED:
-            msg = ('Support for Python version %d.%d has been deprecated. '
-                   'See  https://github.com/yt-dlp/yt-dlp/issues/3764  for more details.'
-                   '\n                    You will no longer receive updates on this version')
-            if current_version < MIN_SUPPORTED:
-                msg = 'Python version %d.%d is no longer supported'
-            self.deprecated_feature(
-                f'{msg}! Please update to Python %d.%d or above' % (*current_version, *MIN_RECOMMENDED))
+        system_deprecation = _get_system_deprecation()
+        if system_deprecation:
+            self.deprecated_feature(system_deprecation.replace('\n', '\n                    '))
 
         if self.params.get('allow_unplayable_formats'):
             self.report_warning(
@@ -667,9 +715,9 @@ class YoutubeDL:
                 width_args = [] if width is None else ['-w', str(width)]
                 sp_kwargs = {'stdin': subprocess.PIPE, 'stdout': slave, 'stderr': self._out_files.error}
                 try:
-                    self._output_process = Popen(['bidiv'] + width_args, **sp_kwargs)
+                    self._output_process = Popen(['bidiv', *width_args], **sp_kwargs)
                 except OSError:
-                    self._output_process = Popen(['fribidi', '-c', 'UTF-8'] + width_args, **sp_kwargs)
+                    self._output_process = Popen(['fribidi', '-c', 'UTF-8', *width_args], **sp_kwargs)
                 self._output_channel = os.fdopen(master, 'rb')
             except OSError as ose:
                 if ose.errno == errno.ENOENT:
@@ -683,7 +731,6 @@ class YoutubeDL:
         self.params['http_headers'] = HTTPHeaderDict(std_headers, self.params.get('http_headers'))
         self._load_cookies(self.params['http_headers'].get('Cookie'))  # compat
         self.params['http_headers'].pop('Cookie', None)
-        self._request_director = self.build_request_director(_REQUEST_HANDLERS.values(), _RH_PREFERENCES)
 
         if auto_init and auto_init != 'no_verbose_header':
             self.print_debug_header()
@@ -707,6 +754,13 @@ class YoutubeDL:
         for msg in self.params.get('_deprecation_warnings', []):
             self.deprecated_feature(msg)
 
+        if impersonate_target := self.params.get('impersonate'):
+            if not self._impersonate_target_available(impersonate_target):
+                raise YoutubeDLError(
+                    f'Impersonate target "{impersonate_target}" is not available. '
+                    f'Use --list-impersonate-targets to see available targets. '
+                    f'You may be missing dependencies required to support this target.')
+
         if 'list-formats' in self.params['compat_opts']:
             self.params['listformats_table'] = False
 
@@ -804,8 +858,7 @@ class YoutubeDL:
             )
             self.report_warning(
                 'Long argument string detected. '
-                'Use -- to separate parameters and URLs, like this:\n%s' %
-                args_to_str(correct_argv))
+                f'Use -- to separate parameters and URLs, like this:\n{shell_quote(correct_argv)}')
 
     def add_info_extractor(self, ie):
         """Add an InfoExtractor object to the end of the list."""
@@ -904,7 +957,7 @@ class YoutubeDL:
         if (self.params.get('quiet') if quiet is None else quiet) and not self.params.get('verbose'):
             return
         self._write_string(
-            '%s%s' % (self._bidi_workaround(message), ('' if skip_eol else '\n')),
+            '{}{}'.format(self._bidi_workaround(message), ('' if skip_eol else '\n')),
             self._out_files.screen, only_once=only_once)
 
     def to_stderr(self, message, only_once=False):
@@ -916,21 +969,22 @@ class YoutubeDL:
             self._write_string(f'{self._bidi_workaround(message)}\n', self._out_files.error, only_once=only_once)
 
     def _send_console_code(self, code):
-        if compat_os_name == 'nt' or not self._out_files.console:
-            return
+        if not supports_terminal_sequences(self._out_files.console):
+            return False
         self._write_string(code, self._out_files.console)
+        return True
 
-    def to_console_title(self, message):
-        if not self.params.get('consoletitle', False):
+    def to_console_title(self, message=None, progress_state=None, percent=None):
+        if not self.params.get('consoletitle'):
             return
-        message = remove_terminal_sequences(message)
-        if compat_os_name == 'nt':
-            if ctypes.windll.kernel32.GetConsoleWindow():
-                # c_wchar_p() might not be necessary if `message` is
-                # already of type unicode()
-                ctypes.windll.kernel32.SetConsoleTitleW(ctypes.c_wchar_p(message))
-        else:
-            self._send_console_code(f'\033]0;{message}\007')
+
+        if message:
+            success = self._send_console_code(f'\033]0;{remove_terminal_sequences(message)}\007')
+            if not success and os.name == 'nt' and ctypes.windll.kernel32.GetConsoleWindow():
+                ctypes.windll.kernel32.SetConsoleTitleW(message)
+
+        if isinstance(progress_state, _ProgressState):
+            self._send_console_code(progress_state.get_ansi_escape(percent))
 
     def save_console_title(self):
         if not self.params.get('consoletitle') or self.params.get('simulate'):
@@ -944,6 +998,7 @@ class YoutubeDL:
 
     def __enter__(self):
         self.save_console_title()
+        self.to_console_title(progress_state=_ProgressState.INDETERMINATE)
         return self
 
     def save_cookies(self):
@@ -952,11 +1007,14 @@ class YoutubeDL:
 
     def __exit__(self, *args):
         self.restore_console_title()
+        self.to_console_title(progress_state=_ProgressState.HIDDEN)
         self.close()
 
     def close(self):
         self.save_cookies()
-        self._request_director.close()
+        if '_request_director' in self.__dict__:
+            self._request_director.close()
+            del self._request_director
 
     def trouble(self, message=None, tb=None, is_error=True):
         """Determine action to take when a download problem appears.
@@ -1025,10 +1083,10 @@ class YoutubeDL:
         return self._format_text(self._out_files.error, self._allow_colors.error, *args, **kwargs)
 
     def report_warning(self, message, only_once=False):
-        '''
+        """
         Print the message to stderr, it will be prefixed with 'WARNING:'
         If stderr is a tty file the 'WARNING:' will be colored
-        '''
+        """
         if self.params.get('logger') is not None:
             self.params['logger'].warning(message)
         else:
@@ -1046,14 +1104,14 @@ class YoutubeDL:
         self.to_stderr(f'{self._format_err("Deprecated Feature:", self.Styles.ERROR)} {message}', True)
 
     def report_error(self, message, *args, **kwargs):
-        '''
+        """
         Do the same as trouble, but prefixes the message with 'ERROR:', colored
         in red if stderr is a tty file.
-        '''
+        """
         self.trouble(f'{self._format_err("ERROR:", self.Styles.ERROR)} {message}', *args, **kwargs)
 
     def write_debug(self, message, only_once=False):
-        '''Log debug message or Print message to stderr'''
+        """Log debug message or Print message to stderr"""
         if not self.params.get('verbose', False):
             return
         message = f'[debug] {message}'
@@ -1065,21 +1123,21 @@ class YoutubeDL:
     def report_file_already_downloaded(self, file_name):
         """Report file has already been fully downloaded."""
         try:
-            self.to_screen('[download] %s has already been downloaded' % file_name)
+            self.to_screen(f'[download] {file_name} has already been downloaded')
         except UnicodeEncodeError:
             self.to_screen('[download] The file has already been downloaded')
 
     def report_file_delete(self, file_name):
         """Report that existing file will be deleted."""
         try:
-            self.to_screen('Deleting existing file %s' % file_name)
+            self.to_screen(f'Deleting existing file {file_name}')
         except UnicodeEncodeError:
             self.to_screen('Deleting existing file')
 
     def raise_no_formats(self, info, forced=False, *, msg=None):
         has_drm = info.get('_has_drm')
         ignored, expected = self.params.get('ignore_no_formats_error'), bool(msg)
-        msg = msg or has_drm and 'This video is DRM protected' or 'No video formats found!'
+        msg = msg or (has_drm and 'This video is DRM protected') or 'No video formats found!'
         if forced or not ignored:
             raise ExtractorError(msg, video_id=info['id'], ie=info['extractor'],
                                  expected=has_drm or ignored or expected)
@@ -1127,7 +1185,7 @@ class YoutubeDL:
 
     @staticmethod
     def escape_outtmpl(outtmpl):
-        ''' Escape any remaining strings like %s, %abc% etc. '''
+        """ Escape any remaining strings like %s, %abc% etc. """
         return re.sub(
             STR_FORMAT_RE_TMPL.format('', '(?![%(\0])'),
             lambda mobj: ('' if mobj.group('has_key') else '%') + mobj.group(0),
@@ -1135,7 +1193,7 @@ class YoutubeDL:
 
     @classmethod
     def validate_outtmpl(cls, outtmpl):
-        ''' @return None or Exception object '''
+        """ @return None or Exception object """
         outtmpl = re.sub(
             STR_FORMAT_RE_TMPL.format('[^)]*', '[ljhqBUDS]'),
             lambda mobj: f'{mobj.group(0)[:-1]}s',
@@ -1155,8 +1213,7 @@ class YoutubeDL:
 
     def prepare_outtmpl(self, outtmpl, info_dict, sanitize=False):
         """ Make the outtmpl and info_dict suitable for substitution: ydl.escape_outtmpl(outtmpl) % info_dict
-        @param sanitize    Whether to sanitize the output as a filename.
-                           For backward compatibility, a function can also be passed
+        @param sanitize    Whether to sanitize the output as a filename
         """
 
         info_dict.setdefault('epoch', int(time.time()))  # keep epoch consistent once set
@@ -1184,16 +1241,17 @@ class YoutubeDL:
         MATH_FUNCTIONS = {
             '+': float.__add__,
             '-': float.__sub__,
+            '*': float.__mul__,
         }
         # Field is of the form key1.key2...
         # where keys (except first) can be string, int, slice or "{field, ...}"
-        FIELD_INNER_RE = r'(?:\w+|%(num)s|%(num)s?(?::%(num)s?){1,2})' % {'num': r'(?:-?\d+)'}
-        FIELD_RE = r'\w*(?:\.(?:%(inner)s|{%(field)s(?:,%(field)s)*}))*' % {
+        FIELD_INNER_RE = r'(?:\w+|%(num)s|%(num)s?(?::%(num)s?){1,2})' % {'num': r'(?:-?\d+)'}  # noqa: UP031
+        FIELD_RE = r'\w*(?:\.(?:%(inner)s|{%(field)s(?:,%(field)s)*}))*' % {  # noqa: UP031
             'inner': FIELD_INNER_RE,
-            'field': rf'\w*(?:\.{FIELD_INNER_RE})*'
+            'field': rf'\w*(?:\.{FIELD_INNER_RE})*',
         }
         MATH_FIELD_RE = rf'(?:{FIELD_RE}|-?{NUMBER_RE})'
-        MATH_OPERATORS_RE = r'(?:%s)' % '|'.join(map(re.escape, MATH_FUNCTIONS.keys()))
+        MATH_OPERATORS_RE = r'(?:{})'.format('|'.join(map(re.escape, MATH_FUNCTIONS.keys())))
         INTERNAL_FORMAT_RE = re.compile(rf'''(?xs)
             (?P<negate>-)?
             (?P<fields>{FIELD_RE})
@@ -1205,6 +1263,15 @@ class YoutubeDL:
                 (?:\|(?P<default>.*?))?
             )$''')
 
+        def _from_user_input(field):
+            if field == ':':
+                return ...
+            elif ':' in field:
+                return slice(*map(int_or_none, field.split(':')))
+            elif int_or_none(field) is not None:
+                return int(field)
+            return field
+
         def _traverse_infodict(fields):
             fields = [f for x in re.split(r'\.({.+?})\.?', fields)
                       for f in ([x] if x.startswith('{') else x.split('.'))]
@@ -1214,11 +1281,12 @@ class YoutubeDL:
 
             for i, f in enumerate(fields):
                 if not f.startswith('{'):
+                    fields[i] = _from_user_input(f)
                     continue
                 assert f.endswith('}'), f'No closing brace for {f} in {fields}'
-                fields[i] = {k: k.split('.') for k in f[1:-1].split(',')}
+                fields[i] = {k: list(map(_from_user_input, k.split('.'))) for k in f[1:-1].split(',')}
 
-            return traverse_obj(info_dict, fields, is_user_input=True, traverse_string=True)
+            return traverse_obj(info_dict, fields, traverse_string=True)
 
         def get_value(mdict):
             # Object traversal
@@ -1261,14 +1329,23 @@ class YoutubeDL:
 
         na = self.params.get('outtmpl_na_placeholder', 'NA')
 
-        def filename_sanitizer(key, value, restricted=self.params.get('restrictfilenames')):
+        def filename_sanitizer(key, value, restricted):
             return sanitize_filename(str(value), restricted=restricted, is_id=(
                 bool(re.search(r'(^|[_.])id(\.|$)', key))
                 if 'filename-sanitization' in self.params['compat_opts']
                 else NO_DEFAULT))
 
-        sanitizer = sanitize if callable(sanitize) else filename_sanitizer
-        sanitize = bool(sanitize)
+        if callable(sanitize):
+            self.deprecation_warning('Passing a callable "sanitize" to YoutubeDL.prepare_outtmpl is deprecated')
+        elif not sanitize:
+            pass
+        elif (sys.platform != 'win32' and not self.params.get('restrictfilenames')
+                and self.params.get('windowsfilenames') is False):
+            def sanitize(key, value):
+                return str(value).replace('/', '\u29F8').replace('\0', '')
+        else:
+            def sanitize(key, value):
+                return filename_sanitizer(key, value, restricted=self.params.get('restrictfilenames'))
 
         def _dumpjson_default(obj):
             if isinstance(obj, (set, LazyList)):
@@ -1306,7 +1383,7 @@ class YoutubeDL:
                     value, default = None, na
 
             fmt = outer_mobj.group('format')
-            if fmt == 's' and last_field in field_size_compat_map.keys() and isinstance(value, int):
+            if fmt == 's' and last_field in field_size_compat_map and isinstance(value, int):
                 fmt = f'0{field_size_compat_map[last_field]:d}d'
 
             flags = outer_mobj.group('conversion') or ''
@@ -1324,14 +1401,14 @@ class YoutubeDL:
                 value, fmt = escapeHTML(str(value)), str_fmt
             elif fmt[-1] == 'q':  # quoted
                 value = map(str, variadic(value) if '#' in flags else [value])
-                value, fmt = ' '.join(map(compat_shlex_quote, value)), str_fmt
+                value, fmt = shell_quote(value, shell=True), str_fmt
             elif fmt[-1] == 'B':  # bytes
                 value = f'%{str_fmt}'.encode() % str(value).encode()
                 value, fmt = value.decode('utf-8', 'ignore'), 's'
             elif fmt[-1] == 'U':  # unicode normalized
                 value, fmt = unicodedata.normalize(
                     # "+" = compatibility equivalence, "#" = NFD
-                    'NF%s%s' % ('K' if '+' in flags else '', 'D' if '#' in flags else 'C'),
+                    'NF{}{}'.format('K' if '+' in flags else '', 'D' if '#' in flags else 'C'),
                     value), str_fmt
             elif fmt[-1] == 'D':  # decimal suffix
                 num_fmt, fmt = fmt[:-1].replace('#', ''), 's'
@@ -1351,15 +1428,15 @@ class YoutubeDL:
 
             if sanitize:
                 # If value is an object, sanitize might convert it to a string
-                # So we convert it to repr first
+                # So we manually convert it before sanitizing
                 if fmt[-1] == 'r':
                     value, fmt = repr(value), str_fmt
                 elif fmt[-1] == 'a':
                     value, fmt = ascii(value), str_fmt
                 if fmt[-1] in 'csra':
-                    value = sanitizer(last_field, value)
+                    value = sanitize(last_field, value)
 
-            key = '%s\0%s' % (key.replace('%', '%\0'), outer_mobj.group('format'))
+            key = '{}\0{}'.format(key.replace('%', '%\0'), outer_mobj.group('format'))
             TMPL_DICT[key] = value
             return '{prefix}%({key}){fmt}'.format(key=key, fmt=fmt, prefix=outer_mobj.group('prefix'))
 
@@ -1369,6 +1446,7 @@ class YoutubeDL:
         outtmpl, info_dict = self.prepare_outtmpl(outtmpl, info_dict, *args, **kwargs)
         return self.escape_outtmpl(outtmpl) % info_dict
 
+    @_catch_unsafe_extension_error
     def _prepare_filename(self, info_dict, *, outtmpl=None, tmpl_type=None):
         assert None in (outtmpl, tmpl_type), 'outtmpl and tmpl_type are mutually exclusive'
         if outtmpl is None:
@@ -1448,9 +1526,9 @@ class YoutubeDL:
 
             date = info_dict.get('upload_date')
             if date is not None:
-                dateRange = self.params.get('daterange', DateRange())
-                if date not in dateRange:
-                    return f'{date_from_str(date).isoformat()} upload date is not in range {dateRange}'
+                date_range = self.params.get('daterange', DateRange())
+                if date not in date_range:
+                    return f'{date_from_str(date).isoformat()} upload date is not in range {date_range}'
             view_count = info_dict.get('view_count')
             if view_count is not None:
                 min_views = self.params.get('min_views')
@@ -1460,7 +1538,7 @@ class YoutubeDL:
                 if max_views is not None and view_count > max_views:
                     return 'Skipping %s, because it has exceeded the maximum view count (%d/%d)' % (video_title, view_count, max_views)
             if age_restricted(info_dict.get('age_limit'), self.params.get('age_limit')):
-                return 'Skipping "%s" because it is age restricted' % video_title
+                return f'Skipping "{video_title}" because it is age restricted'
 
             match_filter = self.params.get('match_filter')
             if match_filter is None:
@@ -1513,7 +1591,7 @@ class YoutubeDL:
 
     @staticmethod
     def add_extra_info(info_dict, extra_info):
-        '''Set the keys from extra_info in info dict if they are missing'''
+        """Set the keys from extra_info in info dict if they are missing"""
         for key, value in extra_info.items():
             info_dict.setdefault(key, value)
 
@@ -1559,7 +1637,7 @@ class YoutubeDL:
                 self.to_screen(f'[download] {self._format_screen(temp_id, self.Styles.ID)}: '
                                'has already been recorded in the archive')
                 if self.params.get('break_on_existing', False):
-                    raise ExistingVideoReached()
+                    raise ExistingVideoReached
                 break
             return self.__extract_info(url, self.get_info_extractor(key), download, extra_info, process)
         else:
@@ -1573,7 +1651,7 @@ class YoutubeDL:
             while True:
                 try:
                     return func(self, *args, **kwargs)
-                except (DownloadCancelled, LazyList.IndexError, PagedList.IndexError):
+                except (CookieLoadError, DownloadCancelled, LazyList.IndexError, PagedList.IndexError):
                     raise
                 except ReExtractInfo as e:
                     if e.expected:
@@ -1585,8 +1663,8 @@ class YoutubeDL:
                 except GeoRestrictedError as e:
                     msg = e.msg
                     if e.countries:
-                        msg += '\nThis video is available in %s.' % ', '.join(
-                            map(ISO3166Utils.short2full, e.countries))
+                        msg += '\nThis video is available in {}.'.format(', '.join(
+                            map(ISO3166Utils.short2full, e.countries)))
                     msg += '\nYou might want to use a VPN or a proxy server (with --proxy) to workaround.'
                     self.report_error(msg)
                 except ExtractorError as e:  # An error we somewhat expected
@@ -1795,8 +1873,8 @@ class YoutubeDL:
                 if isinstance(additional_urls, str):
                     additional_urls = [additional_urls]
                 self.to_screen(
-                    '[info] %s: %d additional URL(s) requested' % (ie_result['id'], len(additional_urls)))
-                self.write_debug('Additional URLs: "%s"' % '", "'.join(additional_urls))
+                    '[info] {}: {} additional URL(s) requested'.format(ie_result['id'], len(additional_urls)))
+                self.write_debug('Additional URLs: "{}"'.format('", "'.join(additional_urls)))
                 ie_result['additional_entries'] = [
                     self.extract_info(
                         url, download, extra_info=extra_info,
@@ -1848,8 +1926,8 @@ class YoutubeDL:
             webpage_url = ie_result.get('webpage_url')  # Playlists maynot have webpage_url
             if webpage_url and webpage_url in self._playlist_urls:
                 self.to_screen(
-                    '[download] Skipping already downloaded playlist: %s'
-                    % ie_result.get('title') or ie_result.get('id'))
+                    '[download] Skipping already downloaded playlist: {}'.format(
+                        ie_result.get('title')) or ie_result.get('id'))
                 return
 
             self._playlist_level += 1
@@ -1864,8 +1942,8 @@ class YoutubeDL:
                     self._playlist_urls.clear()
         elif result_type == 'compat_list':
             self.report_warning(
-                'Extractor %s returned a compat_list result. '
-                'It needs to be updated.' % ie_result.get('extractor'))
+                'Extractor {} returned a compat_list result. '
+                'It needs to be updated.'.format(ie_result.get('extractor')))
 
             def _fixup(r):
                 self.add_extra_info(r, {
@@ -1882,7 +1960,7 @@ class YoutubeDL:
             ]
             return ie_result
         else:
-            raise Exception('Invalid result type: %s' % result_type)
+            raise Exception(f'Invalid result type: {result_type}')
 
     def _ensure_dir_exists(self, path):
         return make_dir(path, self.report_error)
@@ -1896,6 +1974,9 @@ class YoutubeDL:
             'playlist_title': ie_result.get('title'),
             'playlist_uploader': ie_result.get('uploader'),
             'playlist_uploader_id': ie_result.get('uploader_id'),
+            'playlist_channel': ie_result.get('channel'),
+            'playlist_channel_id': ie_result.get('channel_id'),
+            'playlist_webpage_url': ie_result.get('webpage_url'),
             **kwargs,
         }
         if strict:
@@ -1998,8 +2079,9 @@ class YoutubeDL:
                 resolved_entries[i] = (playlist_index, NO_DEFAULT)
                 continue
 
-            self.to_screen('[download] Downloading item %s of %s' % (
-                self._format_screen(i + 1, self.Styles.ID), self._format_screen(n_entries, self.Styles.EMPHASIS)))
+            self.to_screen(
+                f'[download] Downloading item {self._format_screen(i + 1, self.Styles.ID)} '
+                f'of {self._format_screen(n_entries, self.Styles.EMPHASIS)}')
 
             entry_result = self.__process_iterable_entry(entry, download, collections.ChainMap({
                 'playlist_index': playlist_index,
@@ -2049,20 +2131,20 @@ class YoutubeDL:
         }
         operator_rex = re.compile(r'''(?x)\s*
             (?P<key>[\w.-]+)\s*
-            (?P<op>%s)(?P<none_inclusive>\s*\?)?\s*
+            (?P<op>{})(?P<none_inclusive>\s*\?)?\s*
             (?P<value>[0-9.]+(?:[kKmMgGtTpPeEzZyY]i?[Bb]?)?)\s*
-            ''' % '|'.join(map(re.escape, OPERATORS.keys())))
+            '''.format('|'.join(map(re.escape, OPERATORS.keys()))))
         m = operator_rex.fullmatch(filter_spec)
         if m:
             try:
-                comparison_value = int(m.group('value'))
+                comparison_value = float(m.group('value'))
             except ValueError:
                 comparison_value = parse_filesize(m.group('value'))
                 if comparison_value is None:
                     comparison_value = parse_filesize(m.group('value') + 'B')
                 if comparison_value is None:
                     raise ValueError(
-                        'Invalid value %r in format specification %r' % (
+                        'Invalid value {!r} in format specification {!r}'.format(
                             m.group('value'), filter_spec))
             op = OPERATORS[m.group('op')]
 
@@ -2072,15 +2154,15 @@ class YoutubeDL:
                 '^=': lambda attr, value: attr.startswith(value),
                 '$=': lambda attr, value: attr.endswith(value),
                 '*=': lambda attr, value: value in attr,
-                '~=': lambda attr, value: value.search(attr) is not None
+                '~=': lambda attr, value: value.search(attr) is not None,
             }
             str_operator_rex = re.compile(r'''(?x)\s*
                 (?P<key>[a-zA-Z0-9._-]+)\s*
-                (?P<negation>!\s*)?(?P<op>%s)\s*(?P<none_inclusive>\?\s*)?
+                (?P<negation>!\s*)?(?P<op>{})\s*(?P<none_inclusive>\?\s*)?
                 (?P<quote>["'])?
                 (?P<value>(?(quote)(?:(?!(?P=quote))[^\\]|\\.)+|[\w.-]+))
                 (?(quote)(?P=quote))\s*
-                ''' % '|'.join(map(re.escape, STR_OPERATORS.keys())))
+                '''.format('|'.join(map(re.escape, STR_OPERATORS.keys()))))
             m = str_operator_rex.fullmatch(filter_spec)
             if m:
                 if m.group('op') == '~=':
@@ -2094,7 +2176,7 @@ class YoutubeDL:
                     op = str_op
 
         if not m:
-            raise SyntaxError('Invalid filter specification %r' % filter_spec)
+            raise SyntaxError(f'Invalid filter specification {filter_spec!r}')
 
         def _filter(f):
             actual_value = f.get(m.group('key'))
@@ -2105,7 +2187,12 @@ class YoutubeDL:
 
     def _check_formats(self, formats):
         for f in formats:
-            self.to_screen('[info] Testing format %s' % f['format_id'])
+            working = f.get('__working')
+            if working is not None:
+                if working:
+                    yield f
+                continue
+            self.to_screen('[info] Testing format {}'.format(f['format_id']))
             path = self.get_output_path('temp')
             if not self._ensure_dir_exists(f'{path}/'):
                 continue
@@ -2113,41 +2200,51 @@ class YoutubeDL:
             temp_file.close()
             try:
                 success, _ = self.dl(temp_file.name, f, test=True)
-            except (DownloadError, OSError, ValueError) + network_exceptions:
+            except (DownloadError, OSError, ValueError, *network_exceptions):
                 success = False
             finally:
                 if os.path.exists(temp_file.name):
                     try:
                         os.remove(temp_file.name)
                     except OSError:
-                        self.report_warning('Unable to delete temporary file "%s"' % temp_file.name)
+                        self.report_warning(f'Unable to delete temporary file "{temp_file.name}"')
+            f['__working'] = success
             if success:
                 yield f
             else:
-                self.to_screen('[info] Unable to download format %s. Skipping...' % f['format_id'])
+                self.to_screen('[info] Unable to download format {}. Skipping...'.format(f['format_id']))
 
-    def _default_format_spec(self, info_dict, download=True):
+    def _select_formats(self, formats, selector):
+        return list(selector({
+            'formats': formats,
+            'has_merged_format': any('none' not in (f.get('acodec'), f.get('vcodec')) for f in formats),
+            'incomplete_formats': (all(f.get('vcodec') == 'none' for f in formats)  # No formats with video
+                                   or all(f.get('acodec') == 'none' for f in formats)),  # OR, No formats with audio
+        }))
+
+    def _default_format_spec(self, info_dict):
+        prefer_best = (
+            self.params['outtmpl']['default'] == '-'
+            or (info_dict.get('is_live') and not self.params.get('live_from_start')))
 
         def can_merge():
             merger = FFmpegMergerPP(self)
             return merger.available and merger.can_merge()
 
-        prefer_best = (
-            not self.params.get('simulate')
-            and download
-            and (
-                not can_merge()
-                or info_dict.get('is_live') and not self.params.get('live_from_start')
-                or self.params['outtmpl']['default'] == '-'))
-        compat = (
-            prefer_best
-            or self.params.get('allow_multiple_audio_streams', False)
-            or 'format-spec' in self.params['compat_opts'])
+        if not prefer_best and not can_merge():
+            prefer_best = True
+            formats = self._get_formats(info_dict)
+            evaluate_formats = lambda spec: self._select_formats(formats, self.build_format_selector(spec))
+            if evaluate_formats('b/bv+ba') != evaluate_formats('bv*+ba/b'):
+                self.report_warning('ffmpeg not found. The downloaded format may not be the best available. '
+                                    'Installing ffmpeg is strongly recommended: https://github.com/yt-dlp/yt-dlp#dependencies')
 
-        return (
-            'best/bestvideo+bestaudio' if prefer_best
-            else 'bestvideo*+bestaudio/best' if not compat
-            else 'bestvideo+bestaudio/best')
+        compat = (self.params.get('allow_multiple_audio_streams')
+                  or 'format-spec' in self.params['compat_opts'])
+
+        return ('best/bestvideo+bestaudio' if prefer_best
+                else 'bestvideo+bestaudio/best' if compat
+                else 'bestvideo*+bestaudio/best')
 
     def build_format_selector(self, format_spec):
         def syntax_error(note, start):
@@ -2167,8 +2264,8 @@ class YoutubeDL:
 
         def _parse_filter(tokens):
             filter_parts = []
-            for type, string_, start, _, _ in tokens:
-                if type == tokenize.OP and string_ == ']':
+            for type_, string_, _start, _, _ in tokens:
+                if type_ == tokenize.OP and string_ == ']':
                     return ''.join(filter_parts)
                 else:
                     filter_parts.append(string_)
@@ -2178,23 +2275,23 @@ class YoutubeDL:
             # E.g. 'mp4' '-' 'baseline' '-' '16x9' is converted to 'mp4-baseline-16x9'
             ALLOWED_OPS = ('/', '+', ',', '(', ')')
             last_string, last_start, last_end, last_line = None, None, None, None
-            for type, string_, start, end, line in tokens:
-                if type == tokenize.OP and string_ == '[':
+            for type_, string_, start, end, line in tokens:
+                if type_ == tokenize.OP and string_ == '[':
                     if last_string:
                         yield tokenize.NAME, last_string, last_start, last_end, last_line
                         last_string = None
-                    yield type, string_, start, end, line
+                    yield type_, string_, start, end, line
                     # everything inside brackets will be handled by _parse_filter
-                    for type, string_, start, end, line in tokens:
-                        yield type, string_, start, end, line
-                        if type == tokenize.OP and string_ == ']':
+                    for type_, string_, start, end, line in tokens:
+                        yield type_, string_, start, end, line
+                        if type_ == tokenize.OP and string_ == ']':
                             break
-                elif type == tokenize.OP and string_ in ALLOWED_OPS:
+                elif type_ == tokenize.OP and string_ in ALLOWED_OPS:
                     if last_string:
                         yield tokenize.NAME, last_string, last_start, last_end, last_line
                         last_string = None
-                    yield type, string_, start, end, line
-                elif type in [tokenize.NAME, tokenize.NUMBER, tokenize.OP]:
+                    yield type_, string_, start, end, line
+                elif type_ in [tokenize.NAME, tokenize.NUMBER, tokenize.OP]:
                     if not last_string:
                         last_string = string_
                         last_start = start
@@ -2207,13 +2304,13 @@ class YoutubeDL:
         def _parse_format_selection(tokens, inside_merge=False, inside_choice=False, inside_group=False):
             selectors = []
             current_selector = None
-            for type, string_, start, _, _ in tokens:
-                # ENCODING is only defined in python 3.x
-                if type == getattr(tokenize, 'ENCODING', None):
+            for type_, string_, start, _, _ in tokens:
+                # ENCODING is only defined in Python 3.x
+                if type_ == getattr(tokenize, 'ENCODING', None):
                     continue
-                elif type in [tokenize.NAME, tokenize.NUMBER]:
+                elif type_ in [tokenize.NAME, tokenize.NUMBER]:
                     current_selector = FormatSelector(SINGLE, string_, [])
-                elif type == tokenize.OP:
+                elif type_ == tokenize.OP:
                     if string_ == ')':
                         if not inside_group:
                             # ')' will be handled by the parentheses group
@@ -2256,7 +2353,7 @@ class YoutubeDL:
                         current_selector = FormatSelector(MERGE, (selector_1, selector_2), [])
                     else:
                         raise syntax_error(f'Operator not recognized: "{string_}"', start)
-                elif type == tokenize.ENDMARKER:
+                elif type_ == tokenize.ENDMARKER:
                     break
             if current_selector:
                 selectors.append(current_selector)
@@ -2297,7 +2394,7 @@ class YoutubeDL:
                 vexts=[f['ext'] for f in video_fmts],
                 aexts=[f['ext'] for f in audio_fmts],
                 preferences=(try_call(lambda: self.params['merge_output_format'].split('/'))
-                             or self.params.get('prefer_free_formats') and ('webm', 'mkv')))
+                             or (self.params.get('prefer_free_formats') and ('webm', 'mkv'))))
 
             filtered = lambda *keys: filter(None, (traverse_obj(fmt, *keys) for fmt in formats_info))
 
@@ -2331,7 +2428,7 @@ class YoutubeDL:
                     'acodec': the_only_audio.get('acodec'),
                     'abr': the_only_audio.get('abr'),
                     'asr': the_only_audio.get('asr'),
-                    'audio_channels': the_only_audio.get('audio_channels')
+                    'audio_channels': the_only_audio.get('audio_channels'),
                 })
 
             return new_dict
@@ -2346,7 +2443,7 @@ class YoutubeDL:
                 return
 
             for f in formats:
-                if f.get('has_drm'):
+                if f.get('has_drm') or f.get('__needs_testing'):
                     yield from self._check_formats([f])
                 else:
                     yield f
@@ -2412,9 +2509,9 @@ class YoutubeDL:
 
                         format_fallback = not format_type and not format_modified  # for b, w
                         _filter_f = (
-                            (lambda f: f.get('%scodec' % format_type) != 'none')
+                            (lambda f: f.get(f'{format_type}codec') != 'none')
                             if format_type and format_modified  # bv*, ba*, wv*, wa*
-                            else (lambda f: f.get('%scodec' % not_format_type) == 'none')
+                            else (lambda f: f.get(f'{not_format_type}codec') == 'none')
                             if format_type  # bv, ba, wv, wa
                             else (lambda f: f.get('vcodec') != 'none' and f.get('acodec') != 'none')
                             if not format_modified  # b, w
@@ -2440,7 +2537,7 @@ class YoutubeDL:
                                 # for extractors with incomplete formats (audio only (soundcloud)
                                 # or video only (imgur)) best/worst will fallback to
                                 # best/worst {video,audio}-only format
-                                matches = formats
+                                matches = list(filter(lambda f: f.get('vcodec') != 'none' or f.get('acodec') != 'none', formats))
                             elif seperate_fallback and not ctx['has_merged_format']:
                                 # for compatibility with youtube-dl when there is no pre-merged format
                                 matches = list(filter(seperate_fallback, formats))
@@ -2459,9 +2556,16 @@ class YoutubeDL:
                 return selector_function(ctx_copy)
             return final_selector
 
-        stream = io.BytesIO(format_spec.encode())
+        # HACK: Python 3.12 changed the underlying parser, rendering '7_a' invalid
+        #       Prefix numbers with random letters to avoid it being classified as a number
+        #       See: https://github.com/yt-dlp/yt-dlp/pulls/8797
+        # TODO: Implement parser not reliant on tokenize.tokenize
+        prefix = ''.join(random.choices(string.ascii_letters, k=32))
+        stream = io.BytesIO(re.sub(r'\d[_\d]*', rf'{prefix}\g<0>', format_spec).encode())
         try:
-            tokens = list(_remove_unused_ops(tokenize.tokenize(stream.readline)))
+            tokens = list(_remove_unused_ops(
+                token._replace(string=token.string.replace(prefix, ''))
+                for token in tokenize.tokenize(stream.readline)))
         except tokenize.TokenError:
             raise syntax_error('Missing closing/opening brackets or parenthesis', (0, len(format_spec)))
 
@@ -2475,7 +2579,7 @@ class YoutubeDL:
 
             def __next__(self):
                 if self.counter >= len(self.tokens):
-                    raise StopIteration()
+                    raise StopIteration
                 value = self.tokens[self.counter]
                 self.counter += 1
                 return value
@@ -2558,7 +2662,7 @@ class YoutubeDL:
         self._sort_thumbnails(thumbnails)
         for i, t in enumerate(thumbnails):
             if t.get('id') is None:
-                t['id'] = '%d' % i
+                t['id'] = str(i)
             if t.get('width') and t.get('height'):
                 t['resolution'] = '%dx%d' % (t['width'], t['height'])
             t['url'] = sanitize_url(t['url'])
@@ -2591,9 +2695,12 @@ class YoutubeDL:
                 # Working around out-of-range timestamp values (e.g. negative ones on Windows,
                 # see http://bugs.python.org/issue1646728)
                 with contextlib.suppress(ValueError, OverflowError, OSError):
-                    upload_date = datetime.datetime.utcfromtimestamp(info_dict[ts_key])
+                    upload_date = dt.datetime.fromtimestamp(info_dict[ts_key], dt.timezone.utc)
                     info_dict[date_key] = upload_date.strftime('%Y%m%d')
 
+        if not info_dict.get('release_year'):
+            info_dict['release_year'] = traverse_obj(info_dict, ('release_date', {lambda x: int(x[:4])}))
+
         live_keys = ('is_live', 'was_live')
         live_status = info_dict.get('live_status')
         if live_status is None:
@@ -2616,8 +2723,17 @@ class YoutubeDL:
         # Auto generate title fields corresponding to the *_number fields when missing
         # in order to always have clean titles. This is very common for TV series.
         for field in ('chapter', 'season', 'episode'):
-            if final and info_dict.get('%s_number' % field) is not None and not info_dict.get(field):
-                info_dict[field] = '%s %d' % (field.capitalize(), info_dict['%s_number' % field])
+            if final and info_dict.get(f'{field}_number') is not None and not info_dict.get(field):
+                info_dict[field] = '%s %d' % (field.capitalize(), info_dict[f'{field}_number'])
+
+        for old_key, new_key in self._deprecated_multivalue_fields.items():
+            if new_key in info_dict and old_key in info_dict:
+                if '_version' not in info_dict:  # HACK: Do not warn when using --load-info-json
+                    self.deprecation_warning(f'Do not return {old_key!r} when {new_key!r} is present')
+            elif old_value := info_dict.get(old_key):
+                info_dict[new_key] = old_value.split(', ')
+            elif new_value := info_dict.get(new_key):
+                info_dict[old_key] = ', '.join(v.replace(',', '\N{FULLWIDTH COMMA}') for v in new_value)
 
     def _raise_pending_errors(self, info):
         err = info.pop('__pending_error', None)
@@ -2640,8 +2756,8 @@ class YoutubeDL:
 
         def report_force_conversion(field, field_not, conversion):
             self.report_warning(
-                '"%s" field is not %s - forcing %s conversion, there is an error in extractor'
-                % (field, field_not, conversion))
+                f'"{field}" field is not {field_not} - forcing {conversion} conversion, '
+                'there is an error in extractor')
 
         def sanitize_string_field(info, string_field):
             field = info.get(string_field)
@@ -2733,7 +2849,7 @@ class YoutubeDL:
 
         get_from_start = not info_dict.get('is_live') or bool(self.params.get('live_from_start'))
         if not get_from_start:
-            info_dict['title'] += ' ' + datetime.datetime.now().strftime('%Y-%m-%d %H:%M')
+            info_dict['title'] += ' ' + dt.datetime.now().strftime('%Y-%m-%d %H:%M')
         if info_dict.get('is_live') and formats:
             formats = [f for f in formats if bool(f.get('is_from_start')) == get_from_start]
             if get_from_start and not formats:
@@ -2758,25 +2874,25 @@ class YoutubeDL:
         if not formats:
             self.raise_no_formats(info_dict)
 
-        for format in formats:
-            sanitize_string_field(format, 'format_id')
-            sanitize_numeric_fields(format)
-            format['url'] = sanitize_url(format['url'])
-            if format.get('ext') is None:
-                format['ext'] = determine_ext(format['url']).lower()
-            if format.get('protocol') is None:
-                format['protocol'] = determine_protocol(format)
-            if format.get('resolution') is None:
-                format['resolution'] = self.format_resolution(format, default=None)
-            if format.get('dynamic_range') is None and format.get('vcodec') != 'none':
-                format['dynamic_range'] = 'SDR'
-            if format.get('aspect_ratio') is None:
-                format['aspect_ratio'] = try_call(lambda: round(format['width'] / format['height'], 2))
-            if (not format.get('manifest_url')  # For fragmented formats, "tbr" is often max bitrate and not average
-                    and info_dict.get('duration') and format.get('tbr')
-                    and not format.get('filesize') and not format.get('filesize_approx')):
-                format['filesize_approx'] = int(info_dict['duration'] * format['tbr'] * (1024 / 8))
-            format['http_headers'] = self._calc_headers(collections.ChainMap(format, info_dict), load_cookies=True)
+        for fmt in formats:
+            sanitize_string_field(fmt, 'format_id')
+            sanitize_numeric_fields(fmt)
+            fmt['url'] = sanitize_url(fmt['url'])
+            FormatSorter._fill_sorting_fields(fmt)
+            if fmt['ext'] in ('aac', 'opus', 'mp3', 'flac', 'vorbis'):
+                if fmt.get('acodec') is None:
+                    fmt['acodec'] = fmt['ext']
+            if fmt.get('resolution') is None:
+                fmt['resolution'] = self.format_resolution(fmt, default=None)
+            if fmt.get('dynamic_range') is None and fmt.get('vcodec') != 'none':
+                fmt['dynamic_range'] = 'SDR'
+            if fmt.get('aspect_ratio') is None:
+                fmt['aspect_ratio'] = try_call(lambda: round(fmt['width'] / fmt['height'], 2))
+            # For fragmented formats, "tbr" is often max bitrate and not average
+            if (('manifest-filesize-approx' in self.params['compat_opts'] or not fmt.get('manifest_url'))
+                    and not fmt.get('filesize') and not fmt.get('filesize_approx')):
+                fmt['filesize_approx'] = filesize_from_tbr(fmt.get('tbr'), info_dict.get('duration'))
+            fmt['http_headers'] = self._calc_headers(collections.ChainMap(fmt, info_dict), load_cookies=True)
 
         # Safeguard against old/insecure infojson when using --load-info-json
         if info_dict.get('http_headers'):
@@ -2789,36 +2905,36 @@ class YoutubeDL:
 
         self.sort_formats({
             'formats': formats,
-            '_format_sort_fields': info_dict.get('_format_sort_fields')
+            '_format_sort_fields': info_dict.get('_format_sort_fields'),
         })
 
         # Sanitize and group by format_id
         formats_dict = {}
-        for i, format in enumerate(formats):
-            if not format.get('format_id'):
-                format['format_id'] = str(i)
+        for i, fmt in enumerate(formats):
+            if not fmt.get('format_id'):
+                fmt['format_id'] = str(i)
             else:
                 # Sanitize format_id from characters used in format selector expression
-                format['format_id'] = re.sub(r'[\s,/+\[\]()]', '_', format['format_id'])
-            formats_dict.setdefault(format['format_id'], []).append(format)
+                fmt['format_id'] = re.sub(r'[\s,/+\[\]()]', '_', fmt['format_id'])
+            formats_dict.setdefault(fmt['format_id'], []).append(fmt)
 
         # Make sure all formats have unique format_id
         common_exts = set(itertools.chain(*self._format_selection_exts.values()))
         for format_id, ambiguous_formats in formats_dict.items():
             ambigious_id = len(ambiguous_formats) > 1
-            for i, format in enumerate(ambiguous_formats):
+            for i, fmt in enumerate(ambiguous_formats):
                 if ambigious_id:
-                    format['format_id'] = '%s-%d' % (format_id, i)
+                    fmt['format_id'] = f'{format_id}-{i}'
                 # Ensure there is no conflict between id and ext in format selection
                 # See https://github.com/yt-dlp/yt-dlp/issues/1282
-                if format['format_id'] != format['ext'] and format['format_id'] in common_exts:
-                    format['format_id'] = 'f%s' % format['format_id']
+                if fmt['format_id'] != fmt['ext'] and fmt['format_id'] in common_exts:
+                    fmt['format_id'] = 'f{}'.format(fmt['format_id'])
 
-                if format.get('format') is None:
-                    format['format'] = '{id} - {res}{note}'.format(
-                        id=format['format_id'],
-                        res=self.format_resolution(format),
-                        note=format_field(format, 'format_note', ' (%s)'),
+                if fmt.get('format') is None:
+                    fmt['format'] = '{id} - {res}{note}'.format(
+                        id=fmt['format_id'],
+                        res=self.format_resolution(fmt),
+                        note=format_field(fmt, 'format_note', ' (%s)'),
                     )
 
         if self.params.get('check_formats') is True:
@@ -2871,16 +2987,11 @@ class YoutubeDL:
                     continue
 
             if format_selector is None:
-                req_format = self._default_format_spec(info_dict, download=download)
+                req_format = self._default_format_spec(info_dict)
                 self.write_debug(f'Default format spec: {req_format}')
                 format_selector = self.build_format_selector(req_format)
 
-            formats_to_download = list(format_selector({
-                'formats': formats,
-                'has_merged_format': any('none' not in (f.get('acodec'), f.get('vcodec')) for f in formats),
-                'incomplete_formats': (all(f.get('vcodec') == 'none' for f in formats)  # No formats with video
-                                       or all(f.get('acodec') == 'none' for f in formats)),  # OR, No formats with audio
-            }))
+            formats_to_download = self._select_formats(formats, format_selector)
             if interactive_format_selection and not formats_to_download:
                 self.report_error('Requested format is not available', tb=False, is_error=False)
                 continue
@@ -2945,7 +3056,7 @@ class YoutubeDL:
             info_dict['requested_downloads'] = downloaded_formats
             info_dict = self.run_all_pps('after_video', info_dict)
             if max_downloads_reached:
-                raise MaxDownloadsReached()
+                raise MaxDownloadsReached
 
         # We update the info dict with the selected best quality format (backwards compatibility)
         info_dict.update(best_format)
@@ -3006,8 +3117,8 @@ class YoutubeDL:
             else:
                 f = formats[-1]
                 self.report_warning(
-                    'No subtitle format found matching "%s" for language %s, '
-                    'using %s' % (formats_query, lang, f['ext']))
+                    'No subtitle format found matching "{}" for language {}, '
+                    'using {}. Use --list-subs for a list of available subtitles'.format(formats_query, lang, f['ext']))
             subs[lang] = f
         return subs
 
@@ -3086,11 +3197,12 @@ class YoutubeDL:
 
         if test:
             verbose = self.params.get('verbose')
+            quiet = self.params.get('quiet') or not verbose
             params = {
                 'test': True,
-                'quiet': self.params.get('quiet') or not verbose,
+                'quiet': quiet,
                 'verbose': verbose,
-                'noprogress': not verbose,
+                'noprogress': quiet,
                 'nopart': True,
                 'skip_unavailable_fragments': False,
                 'keep_fragments': False,
@@ -3125,6 +3237,7 @@ class YoutubeDL:
             os.remove(file)
         return None
 
+    @_catch_unsafe_extension_error
     def process_info(self, info_dict):
         """Process a single resolved IE result. (Modifies it in-place)"""
 
@@ -3162,7 +3275,7 @@ class YoutubeDL:
 
         def check_max_downloads():
             if self._num_downloads >= float(self.params.get('max_downloads') or 'inf'):
-                raise MaxDownloadsReached()
+                raise MaxDownloadsReached
 
         if self.params.get('simulate'):
             info_dict['__write_download_archive'] = self.params.get('force_write_download_archive')
@@ -3171,9 +3284,9 @@ class YoutubeDL:
 
         if full_filename is None:
             return
-        if not self._ensure_dir_exists(encodeFilename(full_filename)):
+        if not self._ensure_dir_exists(full_filename):
             return
-        if not self._ensure_dir_exists(encodeFilename(temp_filename)):
+        if not self._ensure_dir_exists(temp_filename):
             return
 
         if self._write_description('video', info_dict,
@@ -3205,16 +3318,16 @@ class YoutubeDL:
         if self.params.get('writeannotations', False):
             annofn = self.prepare_filename(info_dict, 'annotation')
         if annofn:
-            if not self._ensure_dir_exists(encodeFilename(annofn)):
+            if not self._ensure_dir_exists(annofn):
                 return
-            if not self.params.get('overwrites', True) and os.path.exists(encodeFilename(annofn)):
+            if not self.params.get('overwrites', True) and os.path.exists(annofn):
                 self.to_screen('[info] Video annotations are already present')
             elif not info_dict.get('annotations'):
                 self.report_warning('There are no annotations to write.')
             else:
                 try:
                     self.to_screen('[info] Writing video annotations to: ' + annofn)
-                    with open(encodeFilename(annofn), 'w', encoding='utf-8') as annofile:
+                    with open(annofn, 'w', encoding='utf-8') as annofile:
                         annofile.write(info_dict['annotations'])
                 except (KeyError, TypeError):
                     self.report_warning('There are no annotations to write.')
@@ -3230,14 +3343,14 @@ class YoutubeDL:
                     f'Cannot write internet shortcut file because the actual URL of "{info_dict["webpage_url"]}" is unknown')
                 return True
             linkfn = replace_extension(self.prepare_filename(info_dict, 'link'), link_type, info_dict.get('ext'))
-            if not self._ensure_dir_exists(encodeFilename(linkfn)):
+            if not self._ensure_dir_exists(linkfn):
                 return False
-            if self.params.get('overwrites', True) and os.path.exists(encodeFilename(linkfn)):
+            if self.params.get('overwrites', True) and os.path.exists(linkfn):
                 self.to_screen(f'[info] Internet shortcut (.{link_type}) is already present')
                 return True
             try:
                 self.to_screen(f'[info] Writing internet shortcut (.{link_type}) to: {linkfn}')
-                with open(encodeFilename(to_high_limit_path(linkfn)), 'w', encoding='utf-8',
+                with open(to_high_limit_path(linkfn), 'w', encoding='utf-8',
                           newline='\r\n' if link_type == 'url' else '\n') as linkfile:
                     template_vars = {'url': url}
                     if link_type == 'desktop':
@@ -3268,7 +3381,7 @@ class YoutubeDL:
 
         if self.params.get('skip_download'):
             info_dict['filepath'] = temp_filename
-            info_dict['__finaldir'] = os.path.dirname(os.path.abspath(encodeFilename(full_filename)))
+            info_dict['__finaldir'] = os.path.dirname(os.path.abspath(full_filename))
             info_dict['__files_to_move'] = files_to_move
             replace_info_dict(self.run_pp(MoveFilesAfterDownloadPP(self, False), info_dict))
             info_dict['__write_download_archive'] = self.params.get('force_write_download_archive')
@@ -3336,7 +3449,7 @@ class YoutubeDL:
                         for f in info_dict['requested_formats'] if fd != FFmpegFD else []:
                             f['filepath'] = fname = prepend_extension(
                                 correct_ext(temp_filename, info_dict['ext']),
-                                'f%s' % f['format_id'], info_dict['ext'])
+                                'f{}'.format(f['format_id']), info_dict['ext'])
                             downloaded.append(fname)
                         info_dict['url'] = '\n'.join(f['url'] for f in info_dict['requested_formats'])
                         success, real_download = self.dl(temp_filename, info_dict)
@@ -3369,7 +3482,7 @@ class YoutubeDL:
                             if temp_filename != '-':
                                 fname = prepend_extension(
                                     correct_ext(temp_filename, new_info['ext']),
-                                    'f%s' % f['format_id'], new_info['ext'])
+                                    'f{}'.format(f['format_id']), new_info['ext'])
                                 if not self._ensure_dir_exists(fname):
                                     return
                                 f['filepath'] = fname
@@ -3398,14 +3511,14 @@ class YoutubeDL:
                         self.report_file_already_downloaded(dl_filename)
 
                 dl_filename = dl_filename or temp_filename
-                info_dict['__finaldir'] = os.path.dirname(os.path.abspath(encodeFilename(full_filename)))
+                info_dict['__finaldir'] = os.path.dirname(os.path.abspath(full_filename))
 
             except network_exceptions as err:
-                self.report_error('unable to download video data: %s' % error_to_compat_str(err))
+                self.report_error(f'unable to download video data: {err}')
                 return
             except OSError as err:
                 raise UnavailableVideoError(err)
-            except (ContentTooShortError, ) as err:
+            except ContentTooShortError as err:
                 self.report_error(f'content too short (expected {err.expected} bytes and served {err.downloaded})')
                 return
 
@@ -3457,11 +3570,12 @@ class YoutubeDL:
                                      and info_dict.get('container') == 'm4a_dash',
                                      'writing DASH m4a. Only some players support this container',
                                      FFmpegFixupM4aPP)
-                        ffmpeg_fixup(downloader == 'hlsnative' and not self.params.get('hls_use_mpegts')
-                                     or info_dict.get('is_live') and self.params.get('hls_use_mpegts') is None,
+                        ffmpeg_fixup((downloader == 'hlsnative' and not self.params.get('hls_use_mpegts'))
+                                     or (info_dict.get('is_live') and self.params.get('hls_use_mpegts') is None),
                                      'Possible MPEG-TS in MP4 container or malformed AAC timestamps',
                                      FFmpegFixupM3u8PP)
-                        ffmpeg_fixup(info_dict.get('is_live') and downloader == 'dashsegments',
+                        ffmpeg_fixup(downloader == 'dashsegments'
+                                     and (info_dict.get('is_live') or info_dict.get('is_dash_periods')),
                                      'Possible duplicate MOOV atoms', FFmpegFixupDuplicateMoovPP)
 
                     ffmpeg_fixup(downloader == 'web_socket_fragment', 'Malformed timestamps detected', FFmpegFixupTimestampPP)
@@ -3471,13 +3585,13 @@ class YoutubeDL:
                 try:
                     replace_info_dict(self.post_process(dl_filename, info_dict, files_to_move))
                 except PostProcessingError as err:
-                    self.report_error('Postprocessing: %s' % str(err))
+                    self.report_error(f'Postprocessing: {err}')
                     return
                 try:
                     for ph in self._post_hooks:
                         ph(info_dict['filepath'])
                 except Exception as err:
-                    self.report_error('post hooks: %s' % str(err))
+                    self.report_error(f'post hooks: {err}')
                     return
                 info_dict['__write_download_archive'] = True
 
@@ -3491,6 +3605,8 @@ class YoutubeDL:
         def wrapper(*args, **kwargs):
             try:
                 res = func(*args, **kwargs)
+            except CookieLoadError:
+                raise
             except UnavailableVideoError as e:
                 self.report_error(e)
             except DownloadCancelled as e:
@@ -3538,11 +3654,13 @@ class YoutubeDL:
                     raise
                 self.report_warning(f'The info failed to download: {e}; trying with URL {webpage_url}')
                 self.download([webpage_url])
+            except ExtractorError as e:
+                self.report_error(e)
         return self._download_retcode
 
     @staticmethod
     def sanitize_info(info_dict, remove_private_keys=False):
-        ''' Sanitize the infodict for converting to json '''
+        """ Sanitize the infodict for converting to json """
         if info_dict is None:
             return info_dict
         info_dict.setdefault('epoch', int(time.time()))
@@ -3551,14 +3669,14 @@ class YoutubeDL:
             'version': __version__,
             'current_git_head': current_git_head(),
             'release_git_head': RELEASE_GIT_HEAD,
-            'repository': REPOSITORY,
+            'repository': ORIGIN,
         })
 
         if remove_private_keys:
             reject = lambda k, v: v is None or k.startswith('__') or k in {
                 'requested_downloads', 'requested_formats', 'requested_subtitles', 'requested_entries',
                 'entries', 'filepath', '_filename', 'filename', 'infojson_filename', 'original_url',
-                'playlist_autonumber', '_format_sort_fields',
+                'playlist_autonumber',
             }
         else:
             reject = lambda k, v: False
@@ -3577,7 +3695,7 @@ class YoutubeDL:
 
     @staticmethod
     def filter_requested_info(info_dict, actually_filter=True):
-        ''' Alias of sanitize_info for backward compatibility '''
+        """ Alias of sanitize_info for backward compatibility """
         return YoutubeDL.sanitize_info(info_dict, actually_filter)
 
     def _delete_downloaded_files(self, *files_to_delete, info={}, msg=None):
@@ -3599,7 +3717,7 @@ class YoutubeDL:
                     actual_post_extract(video_dict or {})
                 return
 
-            post_extractor = info_dict.pop('__post_extractor', None) or (lambda: {})
+            post_extractor = info_dict.pop('__post_extractor', None) or dict
             info_dict.update(post_extractor())
 
         actual_post_extract(info_dict or {})
@@ -3704,7 +3822,7 @@ class YoutubeDL:
         if format.get('width') and format.get('height'):
             return '%dx%d' % (format['width'], format['height'])
         elif format.get('height'):
-            return '%sp' % format['height']
+            return '{}p'.format(format['height'])
         elif format.get('width'):
             return '%dx?' % format['width']
         return default
@@ -3721,7 +3839,7 @@ class YoutubeDL:
         if fdict.get('language'):
             if res:
                 res += ' '
-            res += '[%s]' % fdict['language']
+            res += '[{}]'.format(fdict['language'])
         if fdict.get('format_note') is not None:
             if res:
                 res += ' '
@@ -3733,7 +3851,7 @@ class YoutubeDL:
         if fdict.get('container') is not None:
             if res:
                 res += ', '
-            res += '%s container' % fdict['container']
+            res += '{} container'.format(fdict['container'])
         if (fdict.get('vcodec') is not None
                 and fdict.get('vcodec') != 'none'):
             if res:
@@ -3748,7 +3866,7 @@ class YoutubeDL:
         if fdict.get('fps') is not None:
             if res:
                 res += ', '
-            res += '%sfps' % fdict['fps']
+            res += '{}fps'.format(fdict['fps'])
         if fdict.get('acodec') is not None:
             if res:
                 res += ', '
@@ -3791,7 +3909,7 @@ class YoutubeDL:
                     format_field(f, 'format_id'),
                     format_field(f, 'ext'),
                     self.format_resolution(f),
-                    self._format_note(f)
+                    self._format_note(f),
                 ] for f in formats if (f.get('preference') or 0) >= -1000]
             return render_table(['format code', 'extension', 'resolution', 'note'], table, extra_gap=1)
 
@@ -3822,8 +3940,8 @@ class YoutubeDL:
                 delim, (
                     format_field(f, 'filesize', ' \t%s', func=format_bytes)
                     or format_field(f, 'filesize_approx', '≈\t%s', func=format_bytes)
-                    or format_field(try_call(lambda: format_bytes(int(info_dict['duration'] * f['tbr'] * (1024 / 8)))),
-                                    None, self._format_out('~\t%s', self.Styles.SUPPRESS))),
+                    or format_field(filesize_from_tbr(f.get('tbr'), info_dict.get('duration')), None,
+                                    self._format_out('~\t%s', self.Styles.SUPPRESS), func=format_bytes)),
                 format_field(f, 'tbr', '\t%dk', func=round),
                 shorten_protocol_name(f.get('protocol', '')),
                 delim,
@@ -3891,17 +4009,8 @@ class YoutubeDL:
         if not self.params.get('verbose'):
             return
 
-        from . import _IN_CLI  # Must be delayed import
-
-        # These imports can be slow. So import them only as needed
-        from .extractor.extractors import _LAZY_LOADER
-        from .extractor.extractors import (
-            _PLUGIN_CLASSES as plugin_ies,
-            _PLUGIN_OVERRIDES as plugin_ie_overrides
-        )
-
         def get_encoding(stream):
-            ret = str(getattr(stream, 'encoding', 'missing (%s)' % type(stream).__name__))
+            ret = str(getattr(stream, 'encoding', f'missing ({type(stream).__name__})'))
             additional_info = []
             if os.environ.get('TERM', '').lower() == 'dumb':
                 additional_info.append('dumb')
@@ -3912,13 +4021,13 @@ class YoutubeDL:
                 ret = f'{ret} ({",".join(additional_info)})'
             return ret
 
-        encoding_str = 'Encodings: locale %s, fs %s, pref %s, %s' % (
+        encoding_str = 'Encodings: locale {}, fs {}, pref {}, {}'.format(
             locale.getpreferredencoding(),
             sys.getfilesystemencoding(),
             self.get_encoding(),
             ', '.join(
                 f'{key} {get_encoding(stream)}' for key, stream in self._out_files.items_
-                if stream is not None and key != 'console')
+                if stream is not None and key != 'console'),
         )
 
         logger = self.params.get('logger')
@@ -3934,23 +4043,24 @@ class YoutubeDL:
             source += '*'
         klass = type(self)
         write_debug(join_nonempty(
-            f'{"yt-dlp" if REPOSITORY == "yt-dlp/yt-dlp" else REPOSITORY} version',
-            f'{CHANNEL}@{__version__}',
+            f'{REPOSITORY.rpartition("/")[2]} version',
+            _make_label(ORIGIN, CHANNEL.partition('@')[2] or __version__, __version__),
             f'[{RELEASE_GIT_HEAD[:9]}]' if RELEASE_GIT_HEAD else '',
             '' if source == 'unknown' else f'({source})',
-            '' if _IN_CLI else 'API' if klass == YoutubeDL else f'API:{self.__module__}.{klass.__qualname__}',
+            '' if IN_CLI.value else 'API' if klass == YoutubeDL else f'API:{self.__module__}.{klass.__qualname__}',
             delim=' '))
 
-        if not _IN_CLI:
+        if not IN_CLI.value:
             write_debug(f'params: {self.params}')
 
-        if not _LAZY_LOADER:
-            if os.environ.get('YTDLP_NO_LAZY_EXTRACTORS'):
-                write_debug('Lazy loading extractors is forcibly disabled')
-            else:
-                write_debug('Lazy loading extractors is disabled')
+        import_extractors()
+        lazy_extractors = LAZY_EXTRACTORS.value
+        if lazy_extractors is None:
+            write_debug('Lazy loading extractors is disabled')
+        elif not lazy_extractors:
+            write_debug('Lazy loading extractors is forcibly disabled')
         if self.params['compat_opts']:
-            write_debug('Compatibility options: %s' % ', '.join(self.params['compat_opts']))
+            write_debug('Compatibility options: {}'.format(', '.join(self.params['compat_opts'])))
 
         if current_git_head():
             write_debug(f'Git HEAD: {current_git_head()}')
@@ -3959,14 +4069,14 @@ class YoutubeDL:
         exe_versions, ffmpeg_features = FFmpegPostProcessor.get_versions_and_features(self)
         ffmpeg_features = {key for key, val in ffmpeg_features.items() if val}
         if ffmpeg_features:
-            exe_versions['ffmpeg'] += ' (%s)' % ','.join(sorted(ffmpeg_features))
+            exe_versions['ffmpeg'] += ' ({})'.format(','.join(sorted(ffmpeg_features)))
 
         exe_versions['rtmpdump'] = rtmpdump_version()
         exe_versions['phantomjs'] = PhantomJSwrapper._version()
         exe_str = ', '.join(
             f'{exe} {v}' for exe, v in sorted(exe_versions.items()) if v
         ) or 'none'
-        write_debug('exe versions: %s' % exe_str)
+        write_debug(f'exe versions: {exe_str}')
 
         from .compat.compat_utils import get_package_info
         from .dependencies import available_dependencies
@@ -3976,33 +4086,28 @@ class YoutubeDL:
         })) or 'none'))
 
         write_debug(f'Proxy map: {self.proxies}')
-        # write_debug(f'Request Handlers: {", ".join(rh.RH_NAME for rh in self._request_director.handlers.values())}')
-        for plugin_type, plugins in {'Extractor': plugin_ies, 'Post-Processor': plugin_pps}.items():
-            display_list = ['%s%s' % (
-                klass.__name__, '' if klass.__name__ == name else f' as {name}')
-                for name, klass in plugins.items()]
+        write_debug(f'Request Handlers: {", ".join(rh.RH_NAME for rh in self._request_director.handlers.values())}')
+
+        for plugin_type, plugins in (('Extractor', plugin_ies), ('Post-Processor', plugin_pps)):
+            display_list = [
+                klass.__name__ if klass.__name__ == name else f'{klass.__name__} as {name}'
+                for name, klass in plugins.value.items()]
             if plugin_type == 'Extractor':
                 display_list.extend(f'{plugins[-1].IE_NAME.partition("+")[2]} ({parent.__name__})'
-                                    for parent, plugins in plugin_ie_overrides.items())
+                                    for parent, plugins in plugin_ies_overrides.value.items())
             if not display_list:
                 continue
             write_debug(f'{plugin_type} Plugins: {", ".join(sorted(display_list))}')
 
-        plugin_dirs = plugin_directories()
-        if plugin_dirs:
-            write_debug(f'Plugin directories: {plugin_dirs}')
+        plugin_dirs_msg = 'none'
+        if not plugin_dirs.value:
+            plugin_dirs_msg = 'none (disabled)'
+        else:
+            found_plugin_directories = plugin_directories()
+            if found_plugin_directories:
+                plugin_dirs_msg = ', '.join(found_plugin_directories)
 
-        # Not implemented
-        if False and self.params.get('call_home'):
-            ipaddr = self.urlopen('https://yt-dl.org/ip').read().decode()
-            write_debug('Public IP address: %s' % ipaddr)
-            latest_version = self.urlopen(
-                'https://yt-dl.org/latest/version').read().decode()
-            if version_tuple(latest_version) > version_tuple(__version__):
-                self.report_warning(
-                    'You are using an outdated version (newest version: %s)! '
-                    'See https://yt-dl.org/update if you need help updating.' %
-                    latest_version)
+        write_debug(f'Plugin directories: {plugin_dirs_msg}')
 
     @functools.cached_property
     def proxies(self):
@@ -4023,8 +4128,14 @@ class YoutubeDL:
     @functools.cached_property
     def cookiejar(self):
         """Global cookiejar instance"""
-        return load_cookies(
-            self.params.get('cookiefile'), self.params.get('cookiesfrombrowser'), self)
+        try:
+            return load_cookies(
+                self.params.get('cookiefile'), self.params.get('cookiesfrombrowser'), self)
+        except CookieLoadError as error:
+            cause = error.__context__
+            # compat: <=py3.9: `traceback.format_exception` has a different signature
+            self.report_error(str(cause), tb=''.join(traceback.format_exception(None, cause, cause.__traceback__)))
+            raise
 
     @property
     def _opener(self):
@@ -4035,6 +4146,22 @@ class YoutubeDL:
         handler = self._request_director.handlers['Urllib']
         return handler._get_instance(cookiejar=self.cookiejar, proxies=self.proxies)
 
+    def _get_available_impersonate_targets(self):
+        # TODO(future): make available as public API
+        return [
+            (target, rh.RH_NAME)
+            for rh in self._request_director.handlers.values()
+            if isinstance(rh, ImpersonateRequestHandler)
+            for target in reversed(rh.supported_targets)
+        ]
+
+    def _impersonate_target_available(self, target):
+        # TODO(future): make available as public API
+        return any(
+            rh.is_supported_target(target)
+            for rh in self._request_director.handlers.values()
+            if isinstance(rh, ImpersonateRequestHandler))
+
     def urlopen(self, req):
         """ Start an HTTP download """
         if isinstance(req, str):
@@ -4059,12 +4186,36 @@ class YoutubeDL:
             return self._request_director.send(req)
         except NoSupportingHandlers as e:
             for ue in e.unsupported_errors:
+                # FIXME: This depends on the order of errors.
                 if not (ue.handler and ue.msg):
                     continue
                 if ue.handler.RH_KEY == 'Urllib' and 'unsupported url scheme: "file"' in ue.msg.lower():
                     raise RequestError(
                         'file:// URLs are disabled by default in yt-dlp for security reasons. '
                         'Use --enable-file-urls to enable at your own risk.', cause=ue) from ue
+                if (
+                    'unsupported proxy type: "https"' in ue.msg.lower()
+                    and 'requests' not in self._request_director.handlers
+                    and 'curl_cffi' not in self._request_director.handlers
+                ):
+                    raise RequestError(
+                        'To use an HTTPS proxy for this request, one of the following dependencies needs to be installed: requests, curl_cffi')
+
+                elif (
+                    re.match(r'unsupported url scheme: "wss?"', ue.msg.lower())
+                    and 'websockets' not in self._request_director.handlers
+                ):
+                    raise RequestError(
+                        'This request requires WebSocket support. '
+                        'Ensure one of the following dependencies are installed: websockets',
+                        cause=ue) from ue
+
+                elif re.match(r'unsupported (?:extensions: impersonate|impersonate target)', ue.msg.lower()):
+                    raise RequestError(
+                        f'Impersonate target "{req.extensions["impersonate"]}" is not available.'
+                        f' See --list-impersonate-targets for available targets.'
+                        f' This request requires browser impersonation, however you may be missing dependencies'
+                        f' required to support this target.')
             raise
         except SSLError as e:
             if 'UNSAFE_LEGACY_RENEGOTIATION_DISABLED' in str(e):
@@ -4074,8 +4225,6 @@ class YoutubeDL:
                     'SSLV3_ALERT_HANDSHAKE_FAILURE: The server may not support the current cipher list. '
                     'Try using --legacy-server-connect', cause=e) from e
             raise
-        except HTTPError as e:  # TODO: Remove in a future release
-            raise _CompatHTTPError(e) from e
 
     def build_request_director(self, handlers, preferences=None):
         logger = _YDLLogger(self)
@@ -4099,6 +4248,7 @@ class YoutubeDL:
                     'timeout': 'socket_timeout',
                     'legacy_ssl_support': 'legacyserverconnect',
                     'enable_file_urls': 'enable_file_urls',
+                    'impersonate': 'impersonate',
                     'client_cert': {
                         'client_certificate': 'client_certificate',
                         'client_certificate_key': 'client_certificate_key',
@@ -4107,8 +4257,14 @@ class YoutubeDL:
                 }),
             ))
         director.preferences.update(preferences or [])
+        if 'prefer-legacy-http-handler' in self.params['compat_opts']:
+            director.preferences.add(lambda rh, _: 500 if rh.RH_KEY == 'Urllib' else 0)
         return director
 
+    @functools.cached_property
+    def _request_director(self):
+        return self.build_request_director(_REQUEST_HANDLERS.values(), _RH_PREFERENCES)
+
     def encode(self, s):
         if isinstance(s, bytes):
             return s  # Already encoded
@@ -4126,7 +4282,7 @@ class YoutubeDL:
         return encoding
 
     def _write_info_json(self, label, ie_result, infofn, overwrite=None):
-        ''' Write infojson and returns True = written, 'exists' = Already exists, False = skip, None = error '''
+        """ Write infojson and returns True = written, 'exists' = Already exists, False = skip, None = error """
         if overwrite is None:
             overwrite = self.params.get('overwrites', True)
         if not self.params.get('writeinfojson'):
@@ -4149,7 +4305,7 @@ class YoutubeDL:
             return None
 
     def _write_description(self, label, ie_result, descfn):
-        ''' Write description and returns True = written, False = skip, None = error '''
+        """ Write description and returns True = written, False = skip, None = error """
         if not self.params.get('writedescription'):
             return False
         elif not descfn:
@@ -4165,7 +4321,7 @@ class YoutubeDL:
         else:
             try:
                 self.to_screen(f'[info] Writing {label} description to: {descfn}')
-                with open(encodeFilename(descfn), 'w', encoding='utf-8') as descfile:
+                with open(descfn, 'w', encoding='utf-8') as descfile:
                     descfile.write(ie_result['description'])
             except OSError:
                 self.report_error(f'Cannot write {label} description file {descfn}')
@@ -4173,7 +4329,7 @@ class YoutubeDL:
         return True
 
     def _write_subtitles(self, info_dict, filename):
-        ''' Write subtitles to file and return list of (sub_filename, final_sub_filename); or None if error'''
+        """ Write subtitles to file and return list of (sub_filename, final_sub_filename); or None if error"""
         ret = []
         subtitles = info_dict.get('requested_subtitles')
         if not (self.params.get('writesubtitles') or self.params.get('writeautomaticsub')):
@@ -4219,7 +4375,7 @@ class YoutubeDL:
                 self.dl(sub_filename, sub_copy, subtitle=True)
                 sub_info['filepath'] = sub_filename
                 ret.append((sub_filename, sub_filename_final))
-            except (DownloadError, ExtractorError, IOError, OSError, ValueError) + network_exceptions as err:
+            except (DownloadError, ExtractorError, OSError, ValueError, *network_exceptions) as err:
                 msg = f'Unable to download video subtitles for {sub_lang!r}: {err}'
                 if self.params.get('ignoreerrors') is not True:  # False or 'only_download'
                     if not self.params.get('ignoreerrors'):
@@ -4229,7 +4385,7 @@ class YoutubeDL:
         return ret
 
     def _write_thumbnails(self, label, info_dict, filename, thumb_filename_base=None):
-        ''' Write thumbnails to file and return list of (thumb_filename, final_thumb_filename) '''
+        """ Write thumbnails to file and return list of (thumb_filename, final_thumb_filename); or None if error """
         write_all = self.params.get('write_all_thumbnails', False)
         thumbnails, ret = [], []
         if write_all or self.params.get('writethumbnail', False):
@@ -4245,16 +4401,21 @@ class YoutubeDL:
             self.write_debug(f'Skipping writing {label} thumbnail')
             return ret
 
+        if thumbnails and not self._ensure_dir_exists(filename):
+            return None
+
         for idx, t in list(enumerate(thumbnails))[::-1]:
-            thumb_ext = (f'{t["id"]}.' if multiple else '') + determine_ext(t['url'], 'jpg')
+            thumb_ext = t.get('ext') or determine_ext(t['url'], 'jpg')
+            if multiple:
+                thumb_ext = f'{t["id"]}.{thumb_ext}'
             thumb_display_id = f'{label} thumbnail {t["id"]}'
             thumb_filename = replace_extension(filename, thumb_ext, info_dict.get('ext'))
             thumb_filename_final = replace_extension(thumb_filename_base, thumb_ext, info_dict.get('ext'))
 
             existing_thumb = self.existing_file((thumb_filename_final, thumb_filename))
             if existing_thumb:
-                self.to_screen('[info] %s is already present' % (
-                    thumb_display_id if multiple else f'{label} thumbnail').capitalize())
+                self.to_screen('[info] {} is already present'.format((
+                    thumb_display_id if multiple else f'{label} thumbnail').capitalize()))
                 t['filepath'] = existing_thumb
                 ret.append((existing_thumb, thumb_filename_final))
             else:
@@ -4262,7 +4423,7 @@ class YoutubeDL:
                 try:
                     uf = self.urlopen(Request(t['url'], headers=t.get('http_headers', {})))
                     self.to_screen(f'[info] Writing {thumb_display_id} to: {thumb_filename}')
-                    with open(encodeFilename(thumb_filename), 'wb') as thumbf:
+                    with open(thumb_filename, 'wb') as thumbf:
                         shutil.copyfileobj(uf, thumbf)
                     ret.append((thumb_filename, thumb_filename_final))
                     t['filepath'] = thumb_filename
diff --git a/plugins/youtube_download/yt_dlp/__init__.py b/plugins/youtube_download/yt_dlp/__init__.py
index 991dbcd..714d9ad 100644
--- a/plugins/youtube_download/yt_dlp/__init__.py
+++ b/plugins/youtube_download/yt_dlp/__init__.py
@@ -1,10 +1,10 @@
-try:
-    import contextvars  # noqa: F401
-except Exception:
-    raise Exception(
-        f'You are using an unsupported version of Python. Only Python versions 3.7 and above are supported by yt-dlp')  # noqa: F541
+import sys
 
-__license__ = 'Public Domain'
+if sys.version_info < (3, 9):
+    raise ImportError(
+        f'You are using an unsupported version of Python. Only Python versions 3.9 and above are supported by yt-dlp')  # noqa: F541
+
+__license__ = 'The Unlicense'
 
 import collections
 import getpass
@@ -12,15 +12,16 @@ import itertools
 import optparse
 import os
 import re
-import sys
 import traceback
 
-from .compat import compat_shlex_quote
-from .cookies import SUPPORTED_BROWSERS, SUPPORTED_KEYRINGS
+from .cookies import SUPPORTED_BROWSERS, SUPPORTED_KEYRINGS, CookieLoadError
 from .downloader.external import get_external_downloader
 from .extractor import list_extractor_classes
 from .extractor.adobepass import MSO_INFO
+from .networking.impersonate import ImpersonateTarget
+from .globals import IN_CLI, plugin_dirs
 from .options import parseOpts
+from .plugins import load_all_plugins as _load_all_plugins
 from .postprocessor import (
     FFmpegExtractAudioPP,
     FFmpegMergerPP,
@@ -43,12 +44,12 @@ from .utils import (
     GeoUtils,
     PlaylistEntries,
     SameFileError,
-    decodeOption,
     download_range_func,
     expand_path,
     float_or_none,
     format_field,
     int_or_none,
+    join_nonempty,
     match_filter_func,
     parse_bytes,
     parse_duration,
@@ -57,15 +58,15 @@ from .utils import (
     read_stdin,
     render_table,
     setproctitle,
+    shell_quote,
     traverse_obj,
     variadic,
     write_string,
 )
 from .utils.networking import std_headers
+from .utils._utils import _UnsafeExtensionError
 from .YoutubeDL import YoutubeDL
 
-_IN_CLI = False
-
 
 def _exit(status=0, *args):
     for msg in args:
@@ -74,14 +75,16 @@ def _exit(status=0, *args):
 
 
 def get_urls(urls, batchfile, verbose):
-    # Batch file verification
+    """
+    @param verbose      -1: quiet, 0: normal, 1: verbose
+    """
     batch_urls = []
     if batchfile is not None:
         try:
             batch_urls = read_batch_urls(
-                read_stdin('URLs') if batchfile == '-'
+                read_stdin(None if verbose == -1 else 'URLs') if batchfile == '-'
                 else open(expand_path(batchfile), encoding='utf-8', errors='ignore'))
-            if verbose:
+            if verbose == 1:
                 write_string('[debug] Batch file urls: ' + repr(batch_urls) + '\n')
         except OSError:
             _exit(f'ERROR: batch file {batchfile} could not be read')
@@ -112,9 +115,9 @@ def print_extractor_information(opts, urls):
             ie.description(markdown=False, search_examples=_SEARCHES)
             for ie in list_extractor_classes(opts.age_limit) if ie.working() and ie.IE_DESC is not False)
     elif opts.ap_list_mso:
-        out = 'Supported TV Providers:\n%s\n' % render_table(
+        out = 'Supported TV Providers:\n{}\n'.format(render_table(
             ['mso', 'mso name'],
-            [[mso_id, mso_info['name']] for mso_id, mso_info in MSO_INFO.items()])
+            [[mso_id, mso_info['name']] for mso_id, mso_info in MSO_INFO.items()]))
     else:
         return False
     write_string(out, out=sys.stdout)
@@ -126,7 +129,7 @@ def set_compat_opts(opts):
         if name not in opts.compat_opts:
             return False
         opts.compat_opts.discard(name)
-        opts.compat_opts.update(['*%s' % name])
+        opts.compat_opts.update([f'*{name}'])
         return True
 
     def set_default_compat(compat_name, opt_name, default=True, remove_compat=True):
@@ -153,6 +156,9 @@ def set_compat_opts(opts):
             opts.embed_infojson = False
     if 'format-sort' in opts.compat_opts:
         opts.format_sort.extend(FormatSorter.ytdl_default)
+    elif 'prefer-vp9-sort' in opts.compat_opts:
+        opts.format_sort.extend(FormatSorter._prefer_vp9_sort)
+
     _video_multistreams_set = set_default_compat('multistreams', 'allow_multiple_video_streams', False, remove_compat=False)
     _audio_multistreams_set = set_default_compat('multistreams', 'allow_multiple_audio_streams', False, remove_compat=False)
     if _video_multistreams_set is False and _audio_multistreams_set is False:
@@ -219,7 +225,7 @@ def validate_options(opts):
         validate_minmax(opts.sleep_interval, opts.max_sleep_interval, 'sleep interval')
 
     if opts.wait_for_video is not None:
-        min_wait, max_wait, *_ = map(parse_duration, opts.wait_for_video.split('-', 1) + [None])
+        min_wait, max_wait, *_ = map(parse_duration, [*opts.wait_for_video.split('-', 1), None])
         validate(min_wait is not None and not (max_wait is None and '-' in opts.wait_for_video),
                  'time range to wait for video', opts.wait_for_video)
         validate_minmax(min_wait, max_wait, 'time range to wait for video')
@@ -230,6 +236,11 @@ def validate_options(opts):
         validate_regex('format sorting', f, FormatSorter.regex)
 
     # Postprocessor formats
+    if opts.convertsubtitles == 'none':
+        opts.convertsubtitles = None
+    if opts.convertthumbnails == 'none':
+        opts.convertthumbnails = None
+
     validate_regex('merge output format', opts.merge_output_format,
                    r'({0})(/({0}))*'.format('|'.join(map(re.escape, FFmpegMergerPP.SUPPORTED_EXTS))))
     validate_regex('audio format', opts.audioformat, FFmpegExtractAudioPP.FORMAT_RE)
@@ -249,9 +260,11 @@ def validate_options(opts):
         elif value in ('inf', 'infinite'):
             return float('inf')
         try:
-            return int(value)
+            int_value = int(value)
         except (TypeError, ValueError):
             validate(False, f'{name} retry count', value)
+        validate_positive(f'{name} retry count', int_value)
+        return int_value
 
     opts.retries = parse_retries('download', opts.retries)
     opts.fragment_retries = parse_retries('fragment', opts.fragment_retries)
@@ -261,9 +274,9 @@ def validate_options(opts):
     # Retry sleep function
     def parse_sleep_func(expr):
         NUMBER_RE = r'\d+(?:\.\d+)?'
-        op, start, limit, step, *_ = tuple(re.fullmatch(
+        op, start, limit, step, *_ = (*tuple(re.fullmatch(
             rf'(?:(linear|exp)=)?({NUMBER_RE})(?::({NUMBER_RE})?)?(?::({NUMBER_RE}))?',
-            expr.strip()).groups()) + (None, None)
+            expr.strip()).groups()), None, None)
 
         if op == 'exp':
             return lambda n: min(float(start) * (float(step or 2) ** n), float(limit or 'inf'))
@@ -281,18 +294,20 @@ def validate_options(opts):
             raise ValueError(f'invalid {key} retry sleep expression {expr!r}')
 
     # Bytes
-    def validate_bytes(name, value):
+    def validate_bytes(name, value, strict_positive=False):
         if value is None:
             return None
         numeric_limit = parse_bytes(value)
-        validate(numeric_limit is not None, 'rate limit', value)
+        validate(numeric_limit is not None, name, value)
+        if strict_positive:
+            validate_positive(name, numeric_limit, True)
         return numeric_limit
 
-    opts.ratelimit = validate_bytes('rate limit', opts.ratelimit)
+    opts.ratelimit = validate_bytes('rate limit', opts.ratelimit, True)
     opts.throttledratelimit = validate_bytes('throttled rate limit', opts.throttledratelimit)
     opts.min_filesize = validate_bytes('min filesize', opts.min_filesize)
     opts.max_filesize = validate_bytes('max filesize', opts.max_filesize)
-    opts.buffersize = validate_bytes('buffer size', opts.buffersize)
+    opts.buffersize = validate_bytes('buffer size', opts.buffersize, True)
     opts.http_chunk_size = validate_bytes('http chunk size', opts.http_chunk_size)
 
     # Output templates
@@ -387,16 +402,19 @@ def validate_options(opts):
                                  f'Supported keyrings are: {", ".join(sorted(SUPPORTED_KEYRINGS))}')
         opts.cookiesfrombrowser = (browser_name, profile, keyring, container)
 
+    if opts.impersonate is not None:
+        opts.impersonate = ImpersonateTarget.from_str(opts.impersonate.lower())
+
     # MetadataParser
     def metadataparser_actions(f):
         if isinstance(f, str):
-            cmd = '--parse-metadata %s' % compat_shlex_quote(f)
+            cmd = f'--parse-metadata {shell_quote(f)}'
             try:
                 actions = [MetadataFromFieldPP.to_action(f)]
             except Exception as err:
                 raise ValueError(f'{cmd} is invalid; {err}')
         else:
-            cmd = '--replace-in-metadata %s' % ' '.join(map(compat_shlex_quote, f))
+            cmd = f'--replace-in-metadata {shell_quote(f)}'
             actions = ((MetadataParserPP.Actions.REPLACE, x, *f[1:]) for x in f[0].split(','))
 
         for action in actions:
@@ -407,13 +425,17 @@ def validate_options(opts):
             yield action
 
     if opts.metafromtitle is not None:
-        opts.parse_metadata.setdefault('pre_process', []).append('title:%s' % opts.metafromtitle)
+        opts.parse_metadata.setdefault('pre_process', []).append(f'title:{opts.metafromtitle}')
     opts.parse_metadata = {
         k: list(itertools.chain(*map(metadataparser_actions, v)))
         for k, v in opts.parse_metadata.items()
     }
 
     # Other options
+    opts.plugin_dirs = opts.plugin_dirs
+    if opts.plugin_dirs is None:
+        opts.plugin_dirs = ['default']
+
     if opts.playlist_items is not None:
         try:
             tuple(PlaylistEntries.parse_playlist_items(opts.playlist_items))
@@ -460,7 +482,7 @@ def validate_options(opts):
             default_downloader = ed.get_basename()
 
     for policy in opts.color.values():
-        if policy not in ('always', 'auto', 'no_color', 'never'):
+        if policy not in ('always', 'auto', 'auto-tty', 'no_color', 'no_color-tty', 'never'):
             raise ValueError(f'"{policy}" is not a valid color policy')
 
     warnings, deprecation_warnings = [], []
@@ -586,6 +608,13 @@ def validate_options(opts):
     if opts.ap_username is not None and opts.ap_password is None:
         opts.ap_password = getpass.getpass('Type TV provider account password and press [Return]: ')
 
+    # compat option changes global state destructively; only allow from cli
+    if 'allow-unsafe-ext' in opts.compat_opts:
+        warnings.append(
+            'Using allow-unsafe-ext opens you up to potential attacks. '
+            'Use with great care!')
+        _UnsafeExtensionError.sanitize_extension = lambda x, prepend=False: x
+
     return warnings, deprecation_warnings
 
 
@@ -596,7 +625,7 @@ def get_postprocessors(opts):
         yield {
             'key': 'MetadataParser',
             'actions': actions,
-            'when': when
+            'when': when,
         }
     sponsorblock_query = opts.sponsorblock_mark | opts.sponsorblock_remove
     if sponsorblock_query:
@@ -604,19 +633,19 @@ def get_postprocessors(opts):
             'key': 'SponsorBlock',
             'categories': sponsorblock_query,
             'api': opts.sponsorblock_api,
-            'when': 'after_filter'
+            'when': 'after_filter',
         }
     if opts.convertsubtitles:
         yield {
             'key': 'FFmpegSubtitlesConvertor',
             'format': opts.convertsubtitles,
-            'when': 'before_dl'
+            'when': 'before_dl',
         }
     if opts.convertthumbnails:
         yield {
             'key': 'FFmpegThumbnailsConvertor',
             'format': opts.convertthumbnails,
-            'when': 'before_dl'
+            'when': 'before_dl',
         }
     if opts.extractaudio:
         yield {
@@ -641,7 +670,7 @@ def get_postprocessors(opts):
         yield {
             'key': 'FFmpegEmbedSubtitle',
             # already_have_subtitle = True prevents the file from being deleted after embedding
-            'already_have_subtitle': opts.writesubtitles and keep_subs
+            'already_have_subtitle': opts.writesubtitles and keep_subs,
         }
         if not opts.writeautomaticsub and keep_subs:
             opts.writesubtitles = True
@@ -654,7 +683,7 @@ def get_postprocessors(opts):
             'remove_sponsor_segments': opts.sponsorblock_remove,
             'remove_ranges': opts.remove_ranges,
             'sponsorblock_chapter_title': opts.sponsorblock_chapter_title,
-            'force_keyframes': opts.force_keyframes_at_cuts
+            'force_keyframes': opts.force_keyframes_at_cuts,
         }
     # FFmpegMetadataPP should be run after FFmpegVideoConvertorPP and
     # FFmpegExtractAudioPP as containers before conversion may not support
@@ -688,7 +717,7 @@ def get_postprocessors(opts):
         yield {
             'key': 'EmbedThumbnail',
             # already_have_thumbnail = True prevents the file from being deleted after embedding
-            'already_have_thumbnail': opts.writethumbnail
+            'already_have_thumbnail': opts.writethumbnail,
         }
         if not opts.writethumbnail:
             opts.writethumbnail = True
@@ -722,7 +751,7 @@ ParsedOptions = collections.namedtuple('ParsedOptions', ('parser', 'options', 'u
 def parse_options(argv=None):
     """@returns ParsedOptions(parser, opts, urls, ydl_opts)"""
     parser, opts, urls = parseOpts(argv)
-    urls = get_urls(urls, opts.batchfile, opts.verbose)
+    urls = get_urls(urls, opts.batchfile, -1 if opts.quiet and not opts.verbose else opts.verbose)
 
     set_compat_opts(opts)
     try:
@@ -735,7 +764,7 @@ def parse_options(argv=None):
     print_only = bool(opts.forceprint) and all(k not in opts.forceprint for k in POSTPROCESS_WHEN[3:])
     any_getting = any(getattr(opts, k) for k in (
         'dumpjson', 'dump_single_json', 'getdescription', 'getduration', 'getfilename',
-        'getformat', 'getid', 'getthumbnail', 'gettitle', 'geturl'
+        'getformat', 'getid', 'getthumbnail', 'gettitle', 'geturl',
     ))
     if opts.quiet is None:
         opts.quiet = any_getting or opts.print_json or bool(opts.forceprint)
@@ -830,6 +859,7 @@ def parse_options(argv=None):
         'noprogress': opts.quiet if opts.noprogress is None else opts.noprogress,
         'progress_with_newline': opts.progress_with_newline,
         'progress_template': opts.progress_template,
+        'progress_delta': opts.progress_delta,
         'playliststart': opts.playliststart,
         'playlistend': opts.playlistend,
         'playlistreverse': opts.playlist_reverse,
@@ -858,8 +888,8 @@ def parse_options(argv=None):
         'listsubtitles': opts.listsubtitles,
         'subtitlesformat': opts.subtitlesformat,
         'subtitleslangs': opts.subtitleslangs,
-        'matchtitle': decodeOption(opts.matchtitle),
-        'rejecttitle': decodeOption(opts.rejecttitle),
+        'matchtitle': opts.matchtitle,
+        'rejecttitle': opts.rejecttitle,
         'max_downloads': opts.max_downloads,
         'prefer_free_formats': opts.prefer_free_formats,
         'trim_file_name': opts.trim_file_name,
@@ -910,6 +940,7 @@ def parse_options(argv=None):
         'postprocessors': postprocessors,
         'fixup': opts.fixup,
         'source_address': opts.source_address,
+        'impersonate': opts.impersonate,
         'call_home': opts.call_home,
         'sleep_interval_requests': opts.sleep_interval_requests,
         'sleep_interval': opts.sleep_interval,
@@ -959,6 +990,11 @@ def _real_main(argv=None):
     if opts.ffmpeg_location:
         FFmpegPostProcessor._ffmpeg_location.set(opts.ffmpeg_location)
 
+    # load all plugins into the global lookup
+    plugin_dirs.value = opts.plugin_dirs
+    if plugin_dirs.value:
+        _load_all_plugins()
+
     with YoutubeDL(ydl_opts) as ydl:
         pre_process = opts.update_self or opts.rm_cachedir
         actual_use = all_urls or opts.load_info_filename
@@ -979,11 +1015,68 @@ def _real_main(argv=None):
             traceback.print_exc()
             ydl._download_retcode = 100
 
+        if opts.list_impersonate_targets:
+
+            known_targets = [
+                # List of simplified targets we know are supported,
+                # to help users know what dependencies may be required.
+                (ImpersonateTarget('chrome'), 'curl_cffi'),
+                (ImpersonateTarget('safari'), 'curl_cffi'),
+                (ImpersonateTarget('firefox'), 'curl_cffi>=0.10'),
+                (ImpersonateTarget('edge'), 'curl_cffi'),
+            ]
+
+            available_targets = ydl._get_available_impersonate_targets()
+
+            def make_row(target, handler):
+                return [
+                    join_nonempty(target.client.title(), target.version, delim='-') or '-',
+                    join_nonempty((target.os or '').title(), target.os_version, delim='-') or '-',
+                    handler,
+                ]
+
+            rows = [make_row(target, handler) for target, handler in available_targets]
+
+            for known_target, known_handler in known_targets:
+                if not any(
+                    known_target in target and known_handler.startswith(handler)
+                    for target, handler in available_targets
+                ):
+                    rows.insert(0, [
+                        ydl._format_out(text, ydl.Styles.SUPPRESS)
+                        for text in make_row(known_target, f'{known_handler} (unavailable)')
+                    ])
+
+            ydl.to_screen('[info] Available impersonate targets')
+            ydl.to_stdout(render_table(['Client', 'OS', 'Source'], rows, extra_gap=2, delim='-'))
+            return
+
         if not actual_use:
             if pre_process:
                 return ydl._download_retcode
 
-            ydl.warn_if_short_id(sys.argv[1:] if argv is None else argv)
+            args = sys.argv[1:] if argv is None else argv
+            ydl.warn_if_short_id(args)
+
+            # Show a useful error message and wait for keypress if not launched from shell on Windows
+            if not args and os.name == 'nt' and getattr(sys, 'frozen', False):
+                import ctypes.wintypes
+                import msvcrt
+
+                kernel32 = ctypes.WinDLL('Kernel32')
+
+                buffer = (1 * ctypes.wintypes.DWORD)()
+                attached_processes = kernel32.GetConsoleProcessList(buffer, 1)
+                # If we only have a single process attached, then the executable was double clicked
+                # When using `pyinstaller` with `--onefile`, two processes get attached
+                is_onefile = hasattr(sys, '_MEIPASS') and os.path.basename(sys._MEIPASS).startswith('_MEI')
+                if attached_processes == 1 or (is_onefile and attached_processes == 2):
+                    print(parser._generate_error_message(
+                        'Do not double-click the executable, instead call it from a command line.\n'
+                        'Please read the README for further information on how to use yt-dlp: '
+                        'https://github.com/yt-dlp/yt-dlp#readme'))
+                    msvcrt.getch()
+                    _exit(2)
             parser.error(
                 'You must provide at least one URL.\n'
                 'Type yt-dlp --help to see a list of all options.')
@@ -1002,11 +1095,10 @@ def _real_main(argv=None):
 
 
 def main(argv=None):
-    global _IN_CLI
-    _IN_CLI = True
+    IN_CLI.value = True
     try:
         _exit(*variadic(_real_main(argv)))
-    except DownloadError:
+    except (CookieLoadError, DownloadError):
         _exit(1)
     except SameFileError as e:
         _exit(f'ERROR: {e}')
@@ -1024,9 +1116,9 @@ def main(argv=None):
 from .extractor import gen_extractors, list_extractors
 
 __all__ = [
-    'main',
     'YoutubeDL',
-    'parse_options',
     'gen_extractors',
     'list_extractors',
+    'main',
+    'parse_options',
 ]
diff --git a/plugins/youtube_download/yt_dlp/__main__.py b/plugins/youtube_download/yt_dlp/__main__.py
index 78701df..06c3920 100644
--- a/plugins/youtube_download/yt_dlp/__main__.py
+++ b/plugins/youtube_download/yt_dlp/__main__.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 # Execute with
-# $ python -m yt_dlp
+# $ python3 -m yt_dlp
 
 import sys
 
diff --git a/plugins/youtube_download/yt_dlp/__pyinstaller/hook-yt_dlp.py b/plugins/youtube_download/yt_dlp/__pyinstaller/hook-yt_dlp.py
index 88c2b8b..8e7f42f 100644
--- a/plugins/youtube_download/yt_dlp/__pyinstaller/hook-yt_dlp.py
+++ b/plugins/youtube_download/yt_dlp/__pyinstaller/hook-yt_dlp.py
@@ -1,6 +1,6 @@
 import sys
 
-from PyInstaller.utils.hooks import collect_submodules
+from PyInstaller.utils.hooks import collect_submodules, collect_data_files
 
 
 def pycryptodome_module():
@@ -10,7 +10,7 @@ def pycryptodome_module():
         try:
             import Crypto  # noqa: F401
             print('WARNING: Using Crypto since Cryptodome is not available. '
-                  'Install with: pip install pycryptodomex', file=sys.stderr)
+                  'Install with: python3 -m pip install pycryptodomex', file=sys.stderr)
             return 'Crypto'
         except ImportError:
             pass
@@ -21,12 +21,16 @@ def get_hidden_imports():
     yield from ('yt_dlp.compat._legacy', 'yt_dlp.compat._deprecated')
     yield from ('yt_dlp.utils._legacy', 'yt_dlp.utils._deprecated')
     yield pycryptodome_module()
-    yield from collect_submodules('websockets')
+    # Only `websockets` is required, others are collected just in case
+    for module in ('websockets', 'requests', 'urllib3'):
+        yield from collect_submodules(module)
     # These are auto-detected, but explicitly add them just in case
-    yield from ('mutagen', 'brotli', 'certifi')
+    yield from ('mutagen', 'brotli', 'certifi', 'secretstorage', 'curl_cffi')
 
 
 hiddenimports = list(get_hidden_imports())
 print(f'Adding imports: {hiddenimports}')
 
-excludedimports = ['youtube_dl', 'youtube_dlc', 'test', 'ytdlp_plugins', 'devscripts']
+excludedimports = ['youtube_dl', 'youtube_dlc', 'test', 'ytdlp_plugins', 'devscripts', 'bundle']
+
+datas = collect_data_files('curl_cffi', includes=['cacert.pem'])
diff --git a/plugins/youtube_download/yt_dlp/aes.py b/plugins/youtube_download/yt_dlp/aes.py
index b3a383c..065901d 100644
--- a/plugins/youtube_download/yt_dlp/aes.py
+++ b/plugins/youtube_download/yt_dlp/aes.py
@@ -3,7 +3,6 @@ from math import ceil
 
 from .compat import compat_ord
 from .dependencies import Cryptodome
-from .utils import bytes_to_intlist, intlist_to_bytes
 
 if Cryptodome.AES:
     def aes_cbc_decrypt_bytes(data, key, iv):
@@ -17,15 +16,15 @@ if Cryptodome.AES:
 else:
     def aes_cbc_decrypt_bytes(data, key, iv):
         """ Decrypt bytes with AES-CBC using native implementation since pycryptodome is unavailable """
-        return intlist_to_bytes(aes_cbc_decrypt(*map(bytes_to_intlist, (data, key, iv))))
+        return bytes(aes_cbc_decrypt(*map(list, (data, key, iv))))
 
     def aes_gcm_decrypt_and_verify_bytes(data, key, tag, nonce):
         """ Decrypt bytes with AES-GCM using native implementation since pycryptodome is unavailable """
-        return intlist_to_bytes(aes_gcm_decrypt_and_verify(*map(bytes_to_intlist, (data, key, tag, nonce))))
+        return bytes(aes_gcm_decrypt_and_verify(*map(list, (data, key, tag, nonce))))
 
 
 def aes_cbc_encrypt_bytes(data, key, iv, **kwargs):
-    return intlist_to_bytes(aes_cbc_encrypt(*map(bytes_to_intlist, (data, key, iv)), **kwargs))
+    return bytes(aes_cbc_encrypt(*map(list, (data, key, iv)), **kwargs))
 
 
 BLOCK_SIZE_BYTES = 16
@@ -68,7 +67,7 @@ def pad_block(block, padding_mode):
         raise NotImplementedError(f'Padding mode {padding_mode} is not implemented')
 
     if padding_mode == 'iso7816' and padding_size:
-        block = block + [0x80]  # NB: += mutates list
+        block = [*block, 0x80]  # NB: += mutates list
         padding_size -= 1
 
     return block + [PADDING_BYTE[padding_mode]] * padding_size
@@ -84,7 +83,7 @@ def aes_ecb_encrypt(data, key, iv=None):
     @returns {int[]}           encrypted data
     """
     expanded_key = key_expansion(key)
-    block_count = int(ceil(float(len(data)) / BLOCK_SIZE_BYTES))
+    block_count = ceil(len(data) / BLOCK_SIZE_BYTES)
 
     encrypted_data = []
     for i in range(block_count):
@@ -104,15 +103,13 @@ def aes_ecb_decrypt(data, key, iv=None):
     @returns {int[]}           decrypted data
     """
     expanded_key = key_expansion(key)
-    block_count = int(ceil(float(len(data)) / BLOCK_SIZE_BYTES))
+    block_count = ceil(len(data) / BLOCK_SIZE_BYTES)
 
     encrypted_data = []
     for i in range(block_count):
         block = data[i * BLOCK_SIZE_BYTES: (i + 1) * BLOCK_SIZE_BYTES]
         encrypted_data += aes_decrypt(block, expanded_key)
-    encrypted_data = encrypted_data[:len(data)]
-
-    return encrypted_data
+    return encrypted_data[:len(data)]
 
 
 def aes_ctr_decrypt(data, key, iv):
@@ -137,7 +134,7 @@ def aes_ctr_encrypt(data, key, iv):
     @returns {int[]}           encrypted data
     """
     expanded_key = key_expansion(key)
-    block_count = int(ceil(float(len(data)) / BLOCK_SIZE_BYTES))
+    block_count = ceil(len(data) / BLOCK_SIZE_BYTES)
     counter = iter_vector(iv)
 
     encrypted_data = []
@@ -148,9 +145,7 @@ def aes_ctr_encrypt(data, key, iv):
 
         cipher_counter_block = aes_encrypt(counter_block, expanded_key)
         encrypted_data += xor(block, cipher_counter_block)
-    encrypted_data = encrypted_data[:len(data)]
-
-    return encrypted_data
+    return encrypted_data[:len(data)]
 
 
 def aes_cbc_decrypt(data, key, iv):
@@ -163,7 +158,7 @@ def aes_cbc_decrypt(data, key, iv):
     @returns {int[]}           decrypted data
     """
     expanded_key = key_expansion(key)
-    block_count = int(ceil(float(len(data)) / BLOCK_SIZE_BYTES))
+    block_count = ceil(len(data) / BLOCK_SIZE_BYTES)
 
     decrypted_data = []
     previous_cipher_block = iv
@@ -174,9 +169,7 @@ def aes_cbc_decrypt(data, key, iv):
         decrypted_block = aes_decrypt(block, expanded_key)
         decrypted_data += xor(decrypted_block, previous_cipher_block)
         previous_cipher_block = block
-    decrypted_data = decrypted_data[:len(data)]
-
-    return decrypted_data
+    return decrypted_data[:len(data)]
 
 
 def aes_cbc_encrypt(data, key, iv, *, padding_mode='pkcs7'):
@@ -190,7 +183,7 @@ def aes_cbc_encrypt(data, key, iv, *, padding_mode='pkcs7'):
     @returns {int[]}           encrypted data
     """
     expanded_key = key_expansion(key)
-    block_count = int(ceil(float(len(data)) / BLOCK_SIZE_BYTES))
+    block_count = ceil(len(data) / BLOCK_SIZE_BYTES)
 
     encrypted_data = []
     previous_cipher_block = iv
@@ -224,10 +217,10 @@ def aes_gcm_decrypt_and_verify(data, key, tag, nonce):
     hash_subkey = aes_encrypt([0] * BLOCK_SIZE_BYTES, key_expansion(key))
 
     if len(nonce) == 12:
-        j0 = nonce + [0, 0, 0, 1]
+        j0 = [*nonce, 0, 0, 0, 1]
     else:
         fill = (BLOCK_SIZE_BYTES - (len(nonce) % BLOCK_SIZE_BYTES)) % BLOCK_SIZE_BYTES + 8
-        ghash_in = nonce + [0] * fill + bytes_to_intlist((8 * len(nonce)).to_bytes(8, 'big'))
+        ghash_in = nonce + [0] * fill + list((8 * len(nonce)).to_bytes(8, 'big'))
         j0 = ghash(hash_subkey, ghash_in)
 
     # TODO: add nonce support to aes_ctr_decrypt
@@ -236,17 +229,17 @@ def aes_gcm_decrypt_and_verify(data, key, tag, nonce):
     iv_ctr = inc(j0)
 
     decrypted_data = aes_ctr_decrypt(data, key, iv_ctr + [0] * (BLOCK_SIZE_BYTES - len(iv_ctr)))
-    pad_len = len(data) // 16 * 16
+    pad_len = (BLOCK_SIZE_BYTES - (len(data) % BLOCK_SIZE_BYTES)) % BLOCK_SIZE_BYTES
     s_tag = ghash(
         hash_subkey,
         data
-        + [0] * (BLOCK_SIZE_BYTES - len(data) + pad_len)        # pad
-        + bytes_to_intlist((0 * 8).to_bytes(8, 'big')           # length of associated data
-                           + ((len(data) * 8).to_bytes(8, 'big')))  # length of data
+        + [0] * pad_len                                  # pad
+        + list((0 * 8).to_bytes(8, 'big')                # length of associated data
+               + ((len(data) * 8).to_bytes(8, 'big'))),  # length of data
     )
 
     if tag != aes_ctr_encrypt(s_tag, key, j0):
-        raise ValueError("Mismatching authentication tag")
+        raise ValueError('Mismatching authentication tag')
 
     return decrypted_data
 
@@ -288,9 +281,7 @@ def aes_decrypt(data, expanded_key):
             data = list(iter_mix_columns(data, MIX_COLUMN_MATRIX_INV))
         data = shift_rows_inv(data)
         data = sub_bytes_inv(data)
-    data = xor(data, expanded_key[:BLOCK_SIZE_BYTES])
-
-    return data
+    return xor(data, expanded_key[:BLOCK_SIZE_BYTES])
 
 
 def aes_decrypt_text(data, password, key_size_bytes):
@@ -308,8 +299,8 @@ def aes_decrypt_text(data, password, key_size_bytes):
     """
     NONCE_LENGTH_BYTES = 8
 
-    data = bytes_to_intlist(base64.b64decode(data))
-    password = bytes_to_intlist(password.encode())
+    data = list(base64.b64decode(data))
+    password = list(password.encode())
 
     key = password[:key_size_bytes] + [0] * (key_size_bytes - len(password))
     key = aes_encrypt(key[:BLOCK_SIZE_BYTES], key_expansion(key)) * (key_size_bytes // BLOCK_SIZE_BYTES)
@@ -318,9 +309,7 @@ def aes_decrypt_text(data, password, key_size_bytes):
     cipher = data[NONCE_LENGTH_BYTES:]
 
     decrypted_data = aes_ctr_decrypt(cipher, key, nonce + [0] * (BLOCK_SIZE_BYTES - NONCE_LENGTH_BYTES))
-    plaintext = intlist_to_bytes(decrypted_data)
-
-    return plaintext
+    return bytes(decrypted_data)
 
 
 RCON = (0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36)
@@ -428,9 +417,7 @@ def key_expansion(data):
         for _ in range(3 if key_size_bytes == 32 else 2 if key_size_bytes == 24 else 0):
             temp = data[-4:]
             data += xor(temp, data[-key_size_bytes: 4 - key_size_bytes])
-    data = data[:expanded_key_size_bytes]
-
-    return data
+    return data[:expanded_key_size_bytes]
 
 
 def iter_vector(iv):
@@ -511,7 +498,7 @@ def block_product(block_x, block_y):
     # NIST SP 800-38D, Algorithm 1
 
     if len(block_x) != BLOCK_SIZE_BYTES or len(block_y) != BLOCK_SIZE_BYTES:
-        raise ValueError("Length of blocks need to be %d bytes" % BLOCK_SIZE_BYTES)
+        raise ValueError(f'Length of blocks need to be {BLOCK_SIZE_BYTES} bytes')
 
     block_r = [0xE1] + [0] * (BLOCK_SIZE_BYTES - 1)
     block_v = block_y[:]
@@ -534,7 +521,7 @@ def ghash(subkey, data):
     # NIST SP 800-38D, Algorithm 2
 
     if len(data) % BLOCK_SIZE_BYTES:
-        raise ValueError("Length of data should be %d bytes" % BLOCK_SIZE_BYTES)
+        raise ValueError(f'Length of data should be {BLOCK_SIZE_BYTES} bytes')
 
     last_y = [0] * BLOCK_SIZE_BYTES
     for i in range(0, len(data), BLOCK_SIZE_BYTES):
@@ -547,19 +534,17 @@ def ghash(subkey, data):
 __all__ = [
     'aes_cbc_decrypt',
     'aes_cbc_decrypt_bytes',
-    'aes_ctr_decrypt',
-    'aes_decrypt_text',
-    'aes_decrypt',
-    'aes_ecb_decrypt',
-    'aes_gcm_decrypt_and_verify',
-    'aes_gcm_decrypt_and_verify_bytes',
-
     'aes_cbc_encrypt',
     'aes_cbc_encrypt_bytes',
+    'aes_ctr_decrypt',
     'aes_ctr_encrypt',
+    'aes_decrypt',
+    'aes_decrypt_text',
+    'aes_ecb_decrypt',
     'aes_ecb_encrypt',
     'aes_encrypt',
-
+    'aes_gcm_decrypt_and_verify',
+    'aes_gcm_decrypt_and_verify_bytes',
     'key_expansion',
     'pad_block',
     'pkcs7_padding',
diff --git a/plugins/youtube_download/yt_dlp/cache.py b/plugins/youtube_download/yt_dlp/cache.py
index 9dd4f2f..71dca82 100644
--- a/plugins/youtube_download/yt_dlp/cache.py
+++ b/plugins/youtube_download/yt_dlp/cache.py
@@ -81,10 +81,10 @@ class Cache:
 
         cachedir = self._get_root_dir()
         if not any((term in cachedir) for term in ('cache', 'tmp')):
-            raise Exception('Not removing directory %s - this does not look like a cache dir' % cachedir)
+            raise Exception(f'Not removing directory {cachedir} - this does not look like a cache dir')
 
         self._ydl.to_screen(
-            'Removing cache dir %s .' % cachedir, skip_eol=True)
+            f'Removing cache dir {cachedir} .', skip_eol=True)
         if os.path.exists(cachedir):
             self._ydl.to_screen('.', skip_eol=True)
             shutil.rmtree(cachedir)
diff --git a/plugins/youtube_download/yt_dlp/casefold.py b/plugins/youtube_download/yt_dlp/casefold.py
deleted file mode 100644
index 41a53e5..0000000
--- a/plugins/youtube_download/yt_dlp/casefold.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import warnings
-
-warnings.warn(DeprecationWarning(f'{__name__} is deprecated'))
-
-casefold = str.casefold
diff --git a/plugins/youtube_download/yt_dlp/compat/__init__.py b/plugins/youtube_download/yt_dlp/compat/__init__.py
index 832a913..d779620 100644
--- a/plugins/youtube_download/yt_dlp/compat/__init__.py
+++ b/plugins/youtube_download/yt_dlp/compat/__init__.py
@@ -1,5 +1,4 @@
 import os
-import sys
 import xml.etree.ElementTree as etree
 
 from .compat_utils import passthrough_module
@@ -24,36 +23,14 @@ def compat_etree_fromstring(text):
     return etree.XML(text, parser=etree.XMLParser(target=_TreeBuilder()))
 
 
-compat_os_name = os._name if os.name == 'java' else os.name
-
-
-if compat_os_name == 'nt':
-    def compat_shlex_quote(s):
-        import re
-        return s if re.match(r'^[-_\w./]+$', s) else '"%s"' % s.replace('"', '\\"')
-else:
-    from shlex import quote as compat_shlex_quote  # noqa: F401
-
-
 def compat_ord(c):
     return c if isinstance(c, int) else ord(c)
 
 
-if compat_os_name == 'nt' and sys.version_info < (3, 8):
-    # os.path.realpath on Windows does not follow symbolic links
-    # prior to Python 3.8 (see https://bugs.python.org/issue9949)
-    def compat_realpath(path):
-        while os.path.islink(path):
-            path = os.path.abspath(os.readlink(path))
-        return os.path.realpath(path)
-else:
-    compat_realpath = os.path.realpath
-
-
 # Python 3.8+ does not honor %HOME% on windows, but this breaks compatibility with youtube-dl
 # See https://github.com/yt-dlp/yt-dlp/issues/792
 # https://docs.python.org/3/library/os.path.html#os.path.expanduser
-if compat_os_name in ('nt', 'ce'):
+if os.name in ('nt', 'ce'):
     def compat_expanduser(path):
         HOME = os.environ.get('HOME')
         if not HOME:
diff --git a/plugins/youtube_download/yt_dlp/compat/_deprecated.py b/plugins/youtube_download/yt_dlp/compat/_deprecated.py
index 607bae9..445acc1 100644
--- a/plugins/youtube_download/yt_dlp/compat/_deprecated.py
+++ b/plugins/youtube_download/yt_dlp/compat/_deprecated.py
@@ -8,16 +8,14 @@ passthrough_module(__name__, '.._legacy', callback=lambda attr: warnings.warn(
     DeprecationWarning(f'{__name__}.{attr} is deprecated'), stacklevel=6))
 del passthrough_module
 
-import base64
-import urllib.error
-import urllib.parse
+import functools  # noqa: F401
+import os
 
-compat_str = str
 
-compat_b64decode = base64.b64decode
+compat_os_name = os.name
+compat_realpath = os.path.realpath
 
-compat_urlparse = urllib.parse
-compat_parse_qs = urllib.parse.parse_qs
-compat_urllib_parse_unquote = urllib.parse.unquote
-compat_urllib_parse_urlencode = urllib.parse.urlencode
-compat_urllib_parse_urlparse = urllib.parse.urlparse
+
+def compat_shlex_quote(s):
+    from ..utils import shell_quote
+    return shell_quote(s)
diff --git a/plugins/youtube_download/yt_dlp/compat/_legacy.py b/plugins/youtube_download/yt_dlp/compat/_legacy.py
index 90ccf0f..dae2c14 100644
--- a/plugins/youtube_download/yt_dlp/compat/_legacy.py
+++ b/plugins/youtube_download/yt_dlp/compat/_legacy.py
@@ -30,11 +30,12 @@ from asyncio import run as compat_asyncio_run  # noqa: F401
 from re import Pattern as compat_Pattern  # noqa: F401
 from re import match as compat_Match  # noqa: F401
 
-from . import compat_expanduser, compat_HTMLParseError, compat_realpath
+from . import compat_expanduser, compat_HTMLParseError
 from .compat_utils import passthrough_module
 from ..dependencies import brotli as compat_brotli  # noqa: F401
 from ..dependencies import websockets as compat_websockets  # noqa: F401
 from ..dependencies.Cryptodome import AES as compat_pycrypto_AES  # noqa: F401
+from ..networking.exceptions import HTTPError as compat_HTTPError
 
 passthrough_module(__name__, '...utils', ('WINDOWS_VT_MODE', 'windows_enable_vt_mode'))
 
@@ -70,7 +71,6 @@ compat_html_parser_HTMLParseError = compat_HTMLParseError
 compat_HTMLParser = compat_html_parser_HTMLParser = html.parser.HTMLParser
 compat_http_client = http.client
 compat_http_server = http.server
-compat_HTTPError = urllib.error.HTTPError
 compat_input = input
 compat_integer_types = (int, )
 compat_itertools_count = itertools.count
@@ -78,7 +78,7 @@ compat_kwargs = lambda kwargs: kwargs
 compat_map = map
 compat_numeric_types = (int, float, complex)
 compat_os_path_expanduser = compat_expanduser
-compat_os_path_realpath = compat_realpath
+compat_os_path_realpath = os.path.realpath
 compat_print = print
 compat_shlex_split = shlex.split
 compat_socket_create_connection = socket.create_connection
@@ -88,7 +88,7 @@ compat_struct_unpack = struct.unpack
 compat_subprocess_get_DEVNULL = lambda: subprocess.DEVNULL
 compat_tokenize_tokenize = tokenize.tokenize
 compat_urllib_error = urllib.error
-compat_urllib_HTTPError = urllib.error.HTTPError
+compat_urllib_HTTPError = compat_HTTPError
 compat_urllib_parse = urllib.parse
 compat_urllib_parse_parse_qs = urllib.parse.parse_qs
 compat_urllib_parse_quote = urllib.parse.quote
@@ -104,5 +104,12 @@ compat_xml_parse_error = compat_xml_etree_ElementTree_ParseError = etree.ParseEr
 compat_xpath = lambda xpath: xpath
 compat_zip = zip
 workaround_optparse_bug9161 = lambda: None
+compat_str = str
+compat_b64decode = base64.b64decode
+compat_urlparse = urllib.parse
+compat_parse_qs = urllib.parse.parse_qs
+compat_urllib_parse_unquote = urllib.parse.unquote
+compat_urllib_parse_urlencode = urllib.parse.urlencode
+compat_urllib_parse_urlparse = urllib.parse.urlparse
 
 legacy = []
diff --git a/plugins/youtube_download/yt_dlp/compat/compat_utils.py b/plugins/youtube_download/yt_dlp/compat/compat_utils.py
index 3ca46d2..d8b3c45 100644
--- a/plugins/youtube_download/yt_dlp/compat/compat_utils.py
+++ b/plugins/youtube_download/yt_dlp/compat/compat_utils.py
@@ -15,7 +15,7 @@ def get_package_info(module):
         name=getattr(module, '_yt_dlp__identifier', module.__name__),
         version=str(next(filter(None, (
             getattr(module, attr, None)
-            for attr in ('__version__', 'version_string', 'version')
+            for attr in ('_yt_dlp__version', '__version__', 'version_string', 'version')
         )), None)))
 
 
@@ -57,7 +57,7 @@ def passthrough_module(parent, child, allowed_attributes=(..., ), *, callback=la
         callback(attr)
         return ret
 
-    @functools.lru_cache(maxsize=None)
+    @functools.cache
     def from_child(attr):
         nonlocal child
         if attr not in allowed_attributes:
diff --git a/plugins/youtube_download/yt_dlp/compat/functools.py b/plugins/youtube_download/yt_dlp/compat/functools.py
deleted file mode 100644
index ec003ea..0000000
--- a/plugins/youtube_download/yt_dlp/compat/functools.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# flake8: noqa: F405
-from functools import *  # noqa: F403
-
-from .compat_utils import passthrough_module
-
-passthrough_module(__name__, 'functools')
-del passthrough_module
-
-try:
-    cache  # >= 3.9
-except NameError:
-    cache = lru_cache(maxsize=None)
-
-try:
-    cached_property  # >= 3.8
-except NameError:
-    class cached_property:
-        def __init__(self, func):
-            update_wrapper(self, func)
-            self.func = func
-
-        def __get__(self, instance, _):
-            if instance is None:
-                return self
-            setattr(instance, self.func.__name__, self.func(instance))
-            return getattr(instance, self.func.__name__)
diff --git a/plugins/youtube_download/yt_dlp/compat/imghdr.py b/plugins/youtube_download/yt_dlp/compat/imghdr.py
index 5d64ab0..4ae173f 100644
--- a/plugins/youtube_download/yt_dlp/compat/imghdr.py
+++ b/plugins/youtube_download/yt_dlp/compat/imghdr.py
@@ -1,16 +1,22 @@
-tests = {
-    'webp': lambda h: h[0:4] == b'RIFF' and h[8:] == b'WEBP',
-    'png': lambda h: h[:8] == b'\211PNG\r\n\032\n',
-    'jpeg': lambda h: h[6:10] in (b'JFIF', b'Exif'),
-    'gif': lambda h: h[:6] in (b'GIF87a', b'GIF89a'),
-}
-
-
 def what(file=None, h=None):
     """Detect format of image (Currently supports jpeg, png, webp, gif only)
-    Ref: https://github.com/python/cpython/blob/3.10/Lib/imghdr.py
+    Ref: https://github.com/python/cpython/blob/3.11/Lib/imghdr.py
+    Ref: https://www.w3.org/Graphics/JPEG/itu-t81.pdf
     """
     if h is None:
         with open(file, 'rb') as f:
             h = f.read(12)
-    return next((type_ for type_, test in tests.items() if test(h)), None)
+
+    if h.startswith(b'RIFF') and h.startswith(b'WEBP', 8):
+        return 'webp'
+
+    if h.startswith(b'\x89PNG'):
+        return 'png'
+
+    if h.startswith(b'\xFF\xD8\xFF'):
+        return 'jpeg'
+
+    if h.startswith(b'GIF'):
+        return 'gif'
+
+    return None
diff --git a/plugins/youtube_download/yt_dlp/compat/urllib/__init__.py b/plugins/youtube_download/yt_dlp/compat/urllib/__init__.py
index b27cc61..9084b3c 100644
--- a/plugins/youtube_download/yt_dlp/compat/urllib/__init__.py
+++ b/plugins/youtube_download/yt_dlp/compat/urllib/__init__.py
@@ -1,7 +1,7 @@
 # flake8: noqa: F405
 from urllib import *  # noqa: F403
 
-del request
+del request  # noqa: F821
 from . import request  # noqa: F401
 
 from ..compat_utils import passthrough_module
diff --git a/plugins/youtube_download/yt_dlp/compat/urllib/request.py b/plugins/youtube_download/yt_dlp/compat/urllib/request.py
index ff63b2f..dfc7f4a 100644
--- a/plugins/youtube_download/yt_dlp/compat/urllib/request.py
+++ b/plugins/youtube_download/yt_dlp/compat/urllib/request.py
@@ -7,13 +7,13 @@ passthrough_module(__name__, 'urllib.request')
 del passthrough_module
 
 
-from .. import compat_os_name
+import os
 
-if compat_os_name == 'nt':
-    # On older python versions, proxies are extracted from Windows registry erroneously. [1]
+if os.name == 'nt':
+    # On older Python versions, proxies are extracted from Windows registry erroneously. [1]
     # If the https proxy in the registry does not have a scheme, urllib will incorrectly add https:// to it. [2]
     # It is unlikely that the user has actually set it to be https, so we should be fine to safely downgrade
-    # it to http on these older python versions to avoid issues
+    # it to http on these older Python versions to avoid issues
     # This also applies for ftp proxy type, as ftp:// proxy scheme is not supported.
     # 1: https://github.com/python/cpython/issues/86793
     # 2: https://github.com/python/cpython/blob/51f1ae5ceb0673316c4e4b0175384e892e33cc6e/Lib/urllib/request.py#L2683-L2698
@@ -37,4 +37,4 @@ if compat_os_name == 'nt':
     def getproxies():
         return getproxies_environment() or getproxies_registry_patched()
 
-del compat_os_name
+del os
diff --git a/plugins/youtube_download/yt_dlp/cookies.py b/plugins/youtube_download/yt_dlp/cookies.py
index a71fbc2..fad323c 100644
--- a/plugins/youtube_download/yt_dlp/cookies.py
+++ b/plugins/youtube_download/yt_dlp/cookies.py
@@ -1,6 +1,10 @@
 import base64
 import collections
 import contextlib
+import datetime as dt
+import functools
+import glob
+import hashlib
 import http.cookiejar
 import http.cookies
 import io
@@ -14,16 +18,13 @@ import sys
 import tempfile
 import time
 import urllib.request
-from datetime import datetime, timedelta, timezone
 from enum import Enum, auto
-from hashlib import pbkdf2_hmac
 
 from .aes import (
     aes_cbc_decrypt_bytes,
     aes_gcm_decrypt_and_verify_bytes,
     unpad_pkcs7,
 )
-from .compat import functools
 from .dependencies import (
     _SECRETSTORAGE_UNAVAILABLE_REASON,
     secretstorage,
@@ -31,6 +32,8 @@ from .dependencies import (
 )
 from .minicurses import MultilinePrinter, QuietMultilinePrinter
 from .utils import (
+    DownloadError,
+    YoutubeDLError,
     Popen,
     error_to_str,
     expand_path,
@@ -43,7 +46,7 @@ from .utils import (
 from .utils._utils import _YDLLogger
 from .utils.networking import normalize_url
 
-CHROMIUM_BASED_BROWSERS = {'brave', 'chrome', 'chromium', 'edge', 'opera', 'vivaldi'}
+CHROMIUM_BASED_BROWSERS = {'brave', 'chrome', 'chromium', 'edge', 'opera', 'vivaldi', 'whale'}
 SUPPORTED_BROWSERS = CHROMIUM_BASED_BROWSERS | {'firefox', 'safari'}
 
 
@@ -83,24 +86,31 @@ def _create_progress_bar(logger):
     return printer
 
 
+class CookieLoadError(YoutubeDLError):
+    pass
+
+
 def load_cookies(cookie_file, browser_specification, ydl):
-    cookie_jars = []
-    if browser_specification is not None:
-        browser_name, profile, keyring, container = _parse_browser_specification(*browser_specification)
-        cookie_jars.append(
-            extract_cookies_from_browser(browser_name, profile, YDLLogger(ydl), keyring=keyring, container=container))
+    try:
+        cookie_jars = []
+        if browser_specification is not None:
+            browser_name, profile, keyring, container = _parse_browser_specification(*browser_specification)
+            cookie_jars.append(
+                extract_cookies_from_browser(browser_name, profile, YDLLogger(ydl), keyring=keyring, container=container))
 
-    if cookie_file is not None:
-        is_filename = is_path_like(cookie_file)
-        if is_filename:
-            cookie_file = expand_path(cookie_file)
+        if cookie_file is not None:
+            is_filename = is_path_like(cookie_file)
+            if is_filename:
+                cookie_file = expand_path(cookie_file)
 
-        jar = YoutubeDLCookieJar(cookie_file)
-        if not is_filename or os.access(cookie_file, os.R_OK):
-            jar.load()
-        cookie_jars.append(jar)
+            jar = YoutubeDLCookieJar(cookie_file)
+            if not is_filename or os.access(cookie_file, os.R_OK):
+                jar.load()
+            cookie_jars.append(jar)
 
-    return _merge_cookie_jars(cookie_jars)
+        return _merge_cookie_jars(cookie_jars)
+    except Exception:
+        raise CookieLoadError('failed to load cookies')
 
 
 def extract_cookies_from_browser(browser_name, profile=None, logger=YDLLogger(), *, keyring=None, container=None):
@@ -118,17 +128,18 @@ def _extract_firefox_cookies(profile, container, logger):
     logger.info('Extracting cookies from firefox')
     if not sqlite3:
         logger.warning('Cannot extract cookies from firefox without sqlite3 support. '
-                       'Please use a python interpreter compiled with sqlite3 support')
+                       'Please use a Python interpreter compiled with sqlite3 support')
         return YoutubeDLCookieJar()
 
     if profile is None:
-        search_root = _firefox_browser_dir()
+        search_roots = list(_firefox_browser_dirs())
     elif _is_path(profile):
-        search_root = profile
+        search_roots = [profile]
     else:
-        search_root = os.path.join(_firefox_browser_dir(), profile)
+        search_roots = [os.path.join(path, profile) for path in _firefox_browser_dirs()]
+    search_root = ', '.join(map(repr, search_roots))
 
-    cookie_database_path = _find_most_recently_used_file(search_root, 'cookies.sqlite', logger)
+    cookie_database_path = _newest(_firefox_cookie_dbs(search_roots))
     if cookie_database_path is None:
         raise FileNotFoundError(f'could not find firefox cookies database in {search_root}')
     logger.debug(f'Extracting cookies from: "{cookie_database_path}"')
@@ -142,7 +153,7 @@ def _extract_firefox_cookies(profile, container, logger):
             identities = json.load(containers).get('identities', [])
         container_id = next((context.get('userContextId') for context in identities if container in (
             context.get('name'),
-            try_call(lambda: re.fullmatch(r'userContext([^\.]+)\.label', context['l10nID']).group())
+            try_call(lambda: re.fullmatch(r'userContext([^\.]+)\.label', context['l10nID']).group()),
         )), None)
         if not isinstance(container_id, int):
             raise ValueError(f'could not find firefox container "{container}" in containers.json')
@@ -182,12 +193,28 @@ def _extract_firefox_cookies(profile, container, logger):
                 cursor.connection.close()
 
 
-def _firefox_browser_dir():
+def _firefox_browser_dirs():
     if sys.platform in ('cygwin', 'win32'):
-        return os.path.expandvars(R'%APPDATA%\Mozilla\Firefox\Profiles')
+        yield from map(os.path.expandvars, (
+            R'%APPDATA%\Mozilla\Firefox\Profiles',
+            R'%LOCALAPPDATA%\Packages\Mozilla.Firefox_n80bbvh6b1yt2\LocalCache\Roaming\Mozilla\Firefox\Profiles',
+        ))
+
     elif sys.platform == 'darwin':
-        return os.path.expanduser('~/Library/Application Support/Firefox')
-    return os.path.expanduser('~/.mozilla/firefox')
+        yield os.path.expanduser('~/Library/Application Support/Firefox/Profiles')
+
+    else:
+        yield from map(os.path.expanduser, (
+            '~/.mozilla/firefox',
+            '~/snap/firefox/common/.mozilla/firefox',
+            '~/.var/app/org.mozilla.firefox/.mozilla/firefox',
+        ))
+
+
+def _firefox_cookie_dbs(roots):
+    for root in map(os.path.abspath, roots):
+        for pattern in ('', '*/', 'Profiles/*/'):
+            yield from glob.iglob(os.path.join(root, pattern, 'cookies.sqlite'))
 
 
 def _get_chromium_based_browser_settings(browser_name):
@@ -202,6 +229,7 @@ def _get_chromium_based_browser_settings(browser_name):
             'edge': os.path.join(appdata_local, R'Microsoft\Edge\User Data'),
             'opera': os.path.join(appdata_roaming, R'Opera Software\Opera Stable'),
             'vivaldi': os.path.join(appdata_local, R'Vivaldi\User Data'),
+            'whale': os.path.join(appdata_local, R'Naver\Naver Whale\User Data'),
         }[browser_name]
 
     elif sys.platform == 'darwin':
@@ -213,6 +241,7 @@ def _get_chromium_based_browser_settings(browser_name):
             'edge': os.path.join(appdata, 'Microsoft Edge'),
             'opera': os.path.join(appdata, 'com.operasoftware.Opera'),
             'vivaldi': os.path.join(appdata, 'Vivaldi'),
+            'whale': os.path.join(appdata, 'Naver/Whale'),
         }[browser_name]
 
     else:
@@ -224,6 +253,7 @@ def _get_chromium_based_browser_settings(browser_name):
             'edge': os.path.join(config, 'microsoft-edge'),
             'opera': os.path.join(config, 'opera'),
             'vivaldi': os.path.join(config, 'vivaldi'),
+            'whale': os.path.join(config, 'naver-whale'),
         }[browser_name]
 
     # Linux keyring names can be determined by snooping on dbus while opening the browser in KDE:
@@ -235,6 +265,7 @@ def _get_chromium_based_browser_settings(browser_name):
         'edge': 'Microsoft Edge' if sys.platform == 'darwin' else 'Chromium',
         'opera': 'Opera' if sys.platform == 'darwin' else 'Chromium',
         'vivaldi': 'Vivaldi' if sys.platform == 'darwin' else 'Chrome',
+        'whale': 'Whale',
     }[browser_name]
 
     browsers_without_profiles = {'opera'}
@@ -242,7 +273,7 @@ def _get_chromium_based_browser_settings(browser_name):
     return {
         'browser_dir': browser_dir,
         'keyring_name': keyring_name,
-        'supports_profiles': browser_name not in browsers_without_profiles
+        'supports_profiles': browser_name not in browsers_without_profiles,
     }
 
 
@@ -251,7 +282,7 @@ def _extract_chrome_cookies(browser_name, profile, keyring, logger):
 
     if not sqlite3:
         logger.warning(f'Cannot extract cookies from {browser_name} without sqlite3 support. '
-                       'Please use a python interpreter compiled with sqlite3 support')
+                       'Please use a Python interpreter compiled with sqlite3 support')
         return YoutubeDLCookieJar()
 
     config = _get_chromium_based_browser_settings(browser_name)
@@ -268,17 +299,23 @@ def _extract_chrome_cookies(browser_name, profile, keyring, logger):
             logger.error(f'{browser_name} does not support profiles')
             search_root = config['browser_dir']
 
-    cookie_database_path = _find_most_recently_used_file(search_root, 'Cookies', logger)
+    cookie_database_path = _newest(_find_files(search_root, 'Cookies', logger))
     if cookie_database_path is None:
         raise FileNotFoundError(f'could not find {browser_name} cookies database in "{search_root}"')
     logger.debug(f'Extracting cookies from: "{cookie_database_path}"')
 
-    decryptor = get_cookie_decryptor(config['browser_dir'], config['keyring_name'], logger, keyring=keyring)
-
     with tempfile.TemporaryDirectory(prefix='yt_dlp') as tmpdir:
         cursor = None
         try:
             cursor = _open_database_copy(cookie_database_path, tmpdir)
+
+            # meta_version is necessary to determine if we need to trim the hash prefix from the cookies
+            # Ref: https://chromium.googlesource.com/chromium/src/+/b02dcebd7cafab92770734dc2bc317bd07f1d891/net/extras/sqlite/sqlite_persistent_cookie_store.cc#223
+            meta_version = int(cursor.execute('SELECT value FROM meta WHERE key = "version"').fetchone()[0])
+            decryptor = get_cookie_decryptor(
+                config['browser_dir'], config['keyring_name'], logger,
+                keyring=keyring, meta_version=meta_version)
+
             cursor.connection.text_factory = bytes
             column_names = _get_column_names(cursor, 'cookies')
             secure_column = 'is_secure' if 'is_secure' in column_names else 'secure'
@@ -307,6 +344,12 @@ def _extract_chrome_cookies(browser_name, profile, keyring, logger):
             counts['unencrypted'] = unencrypted_cookies
             logger.debug(f'cookie version breakdown: {counts}')
             return jar
+        except PermissionError as error:
+            if os.name == 'nt' and error.errno == 13:
+                message = 'Could not copy Chrome cookie database. See  https://github.com/yt-dlp/yt-dlp/issues/7271  for more info'
+                logger.error(message)
+                raise DownloadError(message)  # force exit
+            raise
         finally:
             if cursor is not None:
                 cursor.connection.close()
@@ -324,6 +367,11 @@ def _process_chrome_cookie(decryptor, host_key, name, value, encrypted_value, pa
         if value is None:
             return is_encrypted, None
 
+    # In chrome, session cookies have expires_utc set to 0
+    # In our cookie-store, cookies that do not expire should have expires set to None
+    if not expires_utc:
+        expires_utc = None
+
     return is_encrypted, http.cookiejar.Cookie(
         version=0, name=name, value=value, port=None, port_specified=False,
         domain=host_key, domain_specified=bool(host_key), domain_initial_dot=host_key.startswith('.'),
@@ -365,22 +413,23 @@ class ChromeCookieDecryptor:
         raise NotImplementedError('Must be implemented by sub classes')
 
 
-def get_cookie_decryptor(browser_root, browser_keyring_name, logger, *, keyring=None):
+def get_cookie_decryptor(browser_root, browser_keyring_name, logger, *, keyring=None, meta_version=None):
     if sys.platform == 'darwin':
-        return MacChromeCookieDecryptor(browser_keyring_name, logger)
+        return MacChromeCookieDecryptor(browser_keyring_name, logger, meta_version=meta_version)
     elif sys.platform in ('win32', 'cygwin'):
-        return WindowsChromeCookieDecryptor(browser_root, logger)
-    return LinuxChromeCookieDecryptor(browser_keyring_name, logger, keyring=keyring)
+        return WindowsChromeCookieDecryptor(browser_root, logger, meta_version=meta_version)
+    return LinuxChromeCookieDecryptor(browser_keyring_name, logger, keyring=keyring, meta_version=meta_version)
 
 
 class LinuxChromeCookieDecryptor(ChromeCookieDecryptor):
-    def __init__(self, browser_keyring_name, logger, *, keyring=None):
+    def __init__(self, browser_keyring_name, logger, *, keyring=None, meta_version=None):
         self._logger = logger
         self._v10_key = self.derive_key(b'peanuts')
         self._empty_key = self.derive_key(b'')
         self._cookie_counts = {'v10': 0, 'v11': 0, 'other': 0}
         self._browser_keyring_name = browser_keyring_name
         self._keyring = keyring
+        self._meta_version = meta_version or 0
 
     @functools.cached_property
     def _v11_key(self):
@@ -409,14 +458,18 @@ class LinuxChromeCookieDecryptor(ChromeCookieDecryptor):
 
         if version == b'v10':
             self._cookie_counts['v10'] += 1
-            return _decrypt_aes_cbc_multi(ciphertext, (self._v10_key, self._empty_key), self._logger)
+            return _decrypt_aes_cbc_multi(
+                ciphertext, (self._v10_key, self._empty_key), self._logger,
+                hash_prefix=self._meta_version >= 24)
 
         elif version == b'v11':
             self._cookie_counts['v11'] += 1
             if self._v11_key is None:
                 self._logger.warning('cannot decrypt v11 cookies: no key found', only_once=True)
                 return None
-            return _decrypt_aes_cbc_multi(ciphertext, (self._v11_key, self._empty_key), self._logger)
+            return _decrypt_aes_cbc_multi(
+                ciphertext, (self._v11_key, self._empty_key), self._logger,
+                hash_prefix=self._meta_version >= 24)
 
         else:
             self._logger.warning(f'unknown cookie version: "{version}"', only_once=True)
@@ -425,11 +478,12 @@ class LinuxChromeCookieDecryptor(ChromeCookieDecryptor):
 
 
 class MacChromeCookieDecryptor(ChromeCookieDecryptor):
-    def __init__(self, browser_keyring_name, logger):
+    def __init__(self, browser_keyring_name, logger, meta_version=None):
         self._logger = logger
         password = _get_mac_keyring_password(browser_keyring_name, logger)
         self._v10_key = None if password is None else self.derive_key(password)
         self._cookie_counts = {'v10': 0, 'other': 0}
+        self._meta_version = meta_version or 0
 
     @staticmethod
     def derive_key(password):
@@ -447,7 +501,8 @@ class MacChromeCookieDecryptor(ChromeCookieDecryptor):
                 self._logger.warning('cannot decrypt v10 cookies: no key found', only_once=True)
                 return None
 
-            return _decrypt_aes_cbc_multi(ciphertext, (self._v10_key,), self._logger)
+            return _decrypt_aes_cbc_multi(
+                ciphertext, (self._v10_key,), self._logger, hash_prefix=self._meta_version >= 24)
 
         else:
             self._cookie_counts['other'] += 1
@@ -457,10 +512,11 @@ class MacChromeCookieDecryptor(ChromeCookieDecryptor):
 
 
 class WindowsChromeCookieDecryptor(ChromeCookieDecryptor):
-    def __init__(self, browser_root, logger):
+    def __init__(self, browser_root, logger, meta_version=None):
         self._logger = logger
         self._v10_key = _get_windows_v10_key(browser_root, logger)
         self._cookie_counts = {'v10': 0, 'other': 0}
+        self._meta_version = meta_version or 0
 
     def decrypt(self, encrypted_value):
         version = encrypted_value[:3]
@@ -484,7 +540,9 @@ class WindowsChromeCookieDecryptor(ChromeCookieDecryptor):
             ciphertext = raw_ciphertext[nonce_length:-authentication_tag_length]
             authentication_tag = raw_ciphertext[-authentication_tag_length:]
 
-            return _decrypt_aes_gcm(ciphertext, self._v10_key, nonce, authentication_tag, self._logger)
+            return _decrypt_aes_gcm(
+                ciphertext, self._v10_key, nonce, authentication_tag, self._logger,
+                hash_prefix=self._meta_version >= 24)
 
         else:
             self._cookie_counts['other'] += 1
@@ -575,7 +633,7 @@ class DataParser:
 
 
 def _mac_absolute_time_to_posix(timestamp):
-    return int((datetime(2001, 1, 1, 0, 0, tzinfo=timezone.utc) + timedelta(seconds=timestamp)).timestamp())
+    return int((dt.datetime(2001, 1, 1, 0, 0, tzinfo=dt.timezone.utc) + dt.timedelta(seconds=timestamp)).timestamp())
 
 
 def _parse_safari_cookies_header(data, logger):
@@ -708,40 +766,38 @@ def _get_linux_desktop_environment(env, logger):
     xdg_current_desktop = env.get('XDG_CURRENT_DESKTOP', None)
     desktop_session = env.get('DESKTOP_SESSION', None)
     if xdg_current_desktop is not None:
-        xdg_current_desktop = xdg_current_desktop.split(':')[0].strip()
-
-        if xdg_current_desktop == 'Unity':
-            if desktop_session is not None and 'gnome-fallback' in desktop_session:
+        for part in map(str.strip, xdg_current_desktop.split(':')):
+            if part == 'Unity':
+                if desktop_session is not None and 'gnome-fallback' in desktop_session:
+                    return _LinuxDesktopEnvironment.GNOME
+                else:
+                    return _LinuxDesktopEnvironment.UNITY
+            elif part == 'Deepin':
+                return _LinuxDesktopEnvironment.DEEPIN
+            elif part == 'GNOME':
                 return _LinuxDesktopEnvironment.GNOME
-            else:
-                return _LinuxDesktopEnvironment.UNITY
-        elif xdg_current_desktop == 'Deepin':
-            return _LinuxDesktopEnvironment.DEEPIN
-        elif xdg_current_desktop == 'GNOME':
-            return _LinuxDesktopEnvironment.GNOME
-        elif xdg_current_desktop == 'X-Cinnamon':
-            return _LinuxDesktopEnvironment.CINNAMON
-        elif xdg_current_desktop == 'KDE':
-            kde_version = env.get('KDE_SESSION_VERSION', None)
-            if kde_version == '5':
-                return _LinuxDesktopEnvironment.KDE5
-            elif kde_version == '6':
-                return _LinuxDesktopEnvironment.KDE6
-            elif kde_version == '4':
-                return _LinuxDesktopEnvironment.KDE4
-            else:
-                logger.info(f'unknown KDE version: "{kde_version}". Assuming KDE4')
-                return _LinuxDesktopEnvironment.KDE4
-        elif xdg_current_desktop == 'Pantheon':
-            return _LinuxDesktopEnvironment.PANTHEON
-        elif xdg_current_desktop == 'XFCE':
-            return _LinuxDesktopEnvironment.XFCE
-        elif xdg_current_desktop == 'UKUI':
-            return _LinuxDesktopEnvironment.UKUI
-        elif xdg_current_desktop == 'LXQt':
-            return _LinuxDesktopEnvironment.LXQT
-        else:
-            logger.info(f'XDG_CURRENT_DESKTOP is set to an unknown value: "{xdg_current_desktop}"')
+            elif part == 'X-Cinnamon':
+                return _LinuxDesktopEnvironment.CINNAMON
+            elif part == 'KDE':
+                kde_version = env.get('KDE_SESSION_VERSION', None)
+                if kde_version == '5':
+                    return _LinuxDesktopEnvironment.KDE5
+                elif kde_version == '6':
+                    return _LinuxDesktopEnvironment.KDE6
+                elif kde_version == '4':
+                    return _LinuxDesktopEnvironment.KDE4
+                else:
+                    logger.info(f'unknown KDE version: "{kde_version}". Assuming KDE4')
+                    return _LinuxDesktopEnvironment.KDE4
+            elif part == 'Pantheon':
+                return _LinuxDesktopEnvironment.PANTHEON
+            elif part == 'XFCE':
+                return _LinuxDesktopEnvironment.XFCE
+            elif part == 'UKUI':
+                return _LinuxDesktopEnvironment.UKUI
+            elif part == 'LXQt':
+                return _LinuxDesktopEnvironment.LXQT
+        logger.info(f'XDG_CURRENT_DESKTOP is set to an unknown value: "{xdg_current_desktop}"')
 
     elif desktop_session is not None:
         if desktop_session == 'deepin':
@@ -794,7 +850,7 @@ def _choose_linux_keyring(logger):
     elif desktop_environment == _LinuxDesktopEnvironment.KDE6:
         linux_keyring = _LinuxKeyring.KWALLET6
     elif desktop_environment in (
-        _LinuxDesktopEnvironment.KDE3, _LinuxDesktopEnvironment.LXQT, _LinuxDesktopEnvironment.OTHER
+        _LinuxDesktopEnvironment.KDE3, _LinuxDesktopEnvironment.LXQT, _LinuxDesktopEnvironment.OTHER,
     ):
         linux_keyring = _LinuxKeyring.BASICTEXT
     else:
@@ -829,7 +885,7 @@ def _get_kwallet_network_wallet(keyring, logger):
             'dbus-send', '--session', '--print-reply=literal',
             f'--dest={service_name}',
             wallet_path,
-            'org.kde.KWallet.networkWallet'
+            'org.kde.KWallet.networkWallet',
         ], text=True, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
 
         if returncode:
@@ -859,7 +915,7 @@ def _get_kwallet_password(browser_keyring_name, keyring, logger):
             'kwallet-query',
             '--read-password', f'{browser_keyring_name} Safe Storage',
             '--folder', f'{browser_keyring_name} Keys',
-            network_wallet
+            network_wallet,
         ], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
 
         if returncode:
@@ -899,9 +955,8 @@ def _get_gnome_keyring_password(browser_keyring_name, logger):
         for item in col.get_all_items():
             if item.get_label() == f'{browser_keyring_name} Safe Storage':
                 return item.get_secret()
-        else:
-            logger.error('failed to read from keyring')
-            return b''
+        logger.error('failed to read from keyring')
+        return b''
 
 
 def _get_linux_keyring_password(browser_keyring_name, keyring, logger):
@@ -947,7 +1002,7 @@ def _get_windows_v10_key(browser_root, logger):
     References:
         - [1] https://chromium.googlesource.com/chromium/src/+/refs/heads/main/components/os_crypt/sync/os_crypt_win.cc
     """
-    path = _find_most_recently_used_file(browser_root, 'Local State', logger)
+    path = _newest(_find_files(browser_root, 'Local State', logger))
     if path is None:
         logger.error('could not find local state file')
         return None
@@ -970,13 +1025,15 @@ def _get_windows_v10_key(browser_root, logger):
 
 
 def pbkdf2_sha1(password, salt, iterations, key_length):
-    return pbkdf2_hmac('sha1', password, salt, iterations, key_length)
+    return hashlib.pbkdf2_hmac('sha1', password, salt, iterations, key_length)
 
 
-def _decrypt_aes_cbc_multi(ciphertext, keys, logger, initialization_vector=b' ' * 16):
+def _decrypt_aes_cbc_multi(ciphertext, keys, logger, initialization_vector=b' ' * 16, hash_prefix=False):
     for key in keys:
         plaintext = unpad_pkcs7(aes_cbc_decrypt_bytes(ciphertext, key, initialization_vector))
         try:
+            if hash_prefix:
+                return plaintext[32:].decode()
             return plaintext.decode()
         except UnicodeDecodeError:
             pass
@@ -984,7 +1041,7 @@ def _decrypt_aes_cbc_multi(ciphertext, keys, logger, initialization_vector=b' '
     return None
 
 
-def _decrypt_aes_gcm(ciphertext, key, nonce, authentication_tag, logger):
+def _decrypt_aes_gcm(ciphertext, key, nonce, authentication_tag, logger, hash_prefix=False):
     try:
         plaintext = aes_gcm_decrypt_and_verify_bytes(ciphertext, key, authentication_tag, nonce)
     except ValueError:
@@ -992,6 +1049,8 @@ def _decrypt_aes_gcm(ciphertext, key, nonce, authentication_tag, logger):
         return None
 
     try:
+        if hash_prefix:
+            return plaintext[32:].decode()
         return plaintext.decode()
     except UnicodeDecodeError:
         logger.warning('failed to decrypt cookie (AES-GCM) because UTF-8 decoding failed. Possibly the key is wrong?', only_once=True)
@@ -1021,11 +1080,12 @@ def _decrypt_windows_dpapi(ciphertext, logger):
         None,  # pvReserved: must be NULL
         None,  # pPromptStruct: information about prompts to display
         0,  # dwFlags
-        ctypes.byref(blob_out)  # pDataOut
+        ctypes.byref(blob_out),  # pDataOut
     )
     if not ret:
-        logger.warning('failed to decrypt with DPAPI', only_once=True)
-        return None
+        message = 'Failed to decrypt with DPAPI. See  https://github.com/yt-dlp/yt-dlp/issues/10927  for more info'
+        logger.error(message)
+        raise DownloadError(message)  # force exit
 
     result = ctypes.string_at(blob_out.pbData, blob_out.cbData)
     ctypes.windll.kernel32.LocalFree(blob_out.pbData)
@@ -1049,17 +1109,20 @@ def _get_column_names(cursor, table_name):
     return [row[1].decode() for row in table_info]
 
 
-def _find_most_recently_used_file(root, filename, logger):
+def _newest(files):
+    return max(files, key=lambda path: os.lstat(path).st_mtime, default=None)
+
+
+def _find_files(root, filename, logger):
     # if there are multiple browser profiles, take the most recently used one
-    i, paths = 0, []
+    i = 0
     with _create_progress_bar(logger) as progress_bar:
-        for curr_root, dirs, files in os.walk(root):
+        for curr_root, _, files in os.walk(root):
             for file in files:
                 i += 1
                 progress_bar.print(f'Searching for "{filename}": {i: 6d} files searched')
                 if file == filename:
-                    paths.append(os.path.join(curr_root, file))
-    return None if not paths else max(paths, key=lambda path: os.lstat(path).st_mtime)
+                    yield os.path.join(curr_root, file)
 
 
 def _merge_cookie_jars(jars):
@@ -1073,7 +1136,7 @@ def _merge_cookie_jars(jars):
 
 
 def _is_path(value):
-    return os.path.sep in value
+    return any(sep in value for sep in (os.path.sep, os.path.altsep) if sep)
 
 
 def _parse_browser_specification(browser_name, profile=None, keyring=None, container=None):
@@ -1094,24 +1157,24 @@ class LenientSimpleCookie(http.cookies.SimpleCookie):
     _LEGAL_VALUE_CHARS = _LEGAL_KEY_CHARS + re.escape('(),/<=>?@[]{}')
 
     _RESERVED = {
-        "expires",
-        "path",
-        "comment",
-        "domain",
-        "max-age",
-        "secure",
-        "httponly",
-        "version",
-        "samesite",
+        'expires',
+        'path',
+        'comment',
+        'domain',
+        'max-age',
+        'secure',
+        'httponly',
+        'version',
+        'samesite',
     }
 
-    _FLAGS = {"secure", "httponly"}
+    _FLAGS = {'secure', 'httponly'}
 
     # Added 'bad' group to catch the remaining value
-    _COOKIE_PATTERN = re.compile(r"""
+    _COOKIE_PATTERN = re.compile(r'''
         \s*                            # Optional whitespace at start of cookie
         (?P<key>                       # Start of group 'key'
-        [""" + _LEGAL_KEY_CHARS + r"""]+?# Any word of at least one letter
+        [''' + _LEGAL_KEY_CHARS + r''']+?# Any word of at least one letter
         )                              # End of group 'key'
         (                              # Optional group: there may not be a value.
         \s*=\s*                          # Equal Sign
@@ -1121,7 +1184,7 @@ class LenientSimpleCookie(http.cookies.SimpleCookie):
         |                                    # or
         \w{3},\s[\w\d\s-]{9,11}\s[\d:]{8}\sGMT # Special case for "expires" attr
         |                                    # or
-        [""" + _LEGAL_VALUE_CHARS + r"""]*     # Any word or empty string
+        [''' + _LEGAL_VALUE_CHARS + r''']*     # Any word or empty string
         )                                  # End of group 'val'
         |                                  # or
         (?P<bad>(?:\\;|[^;])*?)            # 'bad' group fallback for invalid values
@@ -1129,7 +1192,7 @@ class LenientSimpleCookie(http.cookies.SimpleCookie):
         )?                             # End of optional value group
         \s*                            # Any number of spaces.
         (\s+|;|$)                      # Ending either at space, semicolon, or EOS.
-        """, re.ASCII | re.VERBOSE)
+        ''', re.ASCII | re.VERBOSE)
 
     def load(self, data):
         # Workaround for https://github.com/yt-dlp/yt-dlp/issues/4776
@@ -1216,8 +1279,8 @@ class YoutubeDLCookieJar(http.cookiejar.MozillaCookieJar):
     def _really_save(self, f, ignore_discard, ignore_expires):
         now = time.time()
         for cookie in self:
-            if (not ignore_discard and cookie.discard
-                    or not ignore_expires and cookie.is_expired(now)):
+            if ((not ignore_discard and cookie.discard)
+                    or (not ignore_expires and cookie.is_expired(now))):
                 continue
             name, value = cookie.name, cookie.value
             if value is None:
@@ -1225,14 +1288,14 @@ class YoutubeDLCookieJar(http.cookiejar.MozillaCookieJar):
                 # with no name, whereas http.cookiejar regards it as a
                 # cookie with no value.
                 name, value = '', name
-            f.write('%s\n' % '\t'.join((
+            f.write('{}\n'.format('\t'.join((
                 cookie.domain,
                 self._true_or_false(cookie.domain.startswith('.')),
                 cookie.path,
                 self._true_or_false(cookie.secure),
                 str_or_none(cookie.expires, default=''),
-                name, value
-            )))
+                name, value,
+            ))))
 
     def save(self, filename=None, ignore_discard=True, ignore_expires=True):
         """
@@ -1271,10 +1334,10 @@ class YoutubeDLCookieJar(http.cookiejar.MozillaCookieJar):
                 return line
             cookie_list = line.split('\t')
             if len(cookie_list) != self._ENTRY_LEN:
-                raise http.cookiejar.LoadError('invalid length %d' % len(cookie_list))
+                raise http.cookiejar.LoadError(f'invalid length {len(cookie_list)}')
             cookie = self._CookieFileEntry(*cookie_list)
             if cookie.expires_at and not cookie.expires_at.isdigit():
-                raise http.cookiejar.LoadError('invalid expires at %s' % cookie.expires_at)
+                raise http.cookiejar.LoadError(f'invalid expires at {cookie.expires_at}')
             return line
 
         cf = io.StringIO()
diff --git a/plugins/youtube_download/yt_dlp/dependencies/Cryptodome.py b/plugins/youtube_download/yt_dlp/dependencies/Cryptodome.py
index 2cfa4c9..0e4404d 100644
--- a/plugins/youtube_download/yt_dlp/dependencies/Cryptodome.py
+++ b/plugins/youtube_download/yt_dlp/dependencies/Cryptodome.py
@@ -24,7 +24,7 @@ try:
         from Crypto.Cipher import AES, PKCS1_OAEP, Blowfish, PKCS1_v1_5  # noqa: F401
         from Crypto.Hash import CMAC, SHA1  # noqa: F401
         from Crypto.PublicKey import RSA  # noqa: F401
-except ImportError:
+except (ImportError, OSError):
     __version__ = f'broken {__version__}'.strip()
 
 
diff --git a/plugins/youtube_download/yt_dlp/dependencies/__init__.py b/plugins/youtube_download/yt_dlp/dependencies/__init__.py
index 6e7d29c..0d58da2 100644
--- a/plugins/youtube_download/yt_dlp/dependencies/__init__.py
+++ b/plugins/youtube_download/yt_dlp/dependencies/__init__.py
@@ -43,19 +43,28 @@ except Exception as _err:
 
 try:
     import sqlite3
+    # We need to get the underlying `sqlite` version, see https://github.com/yt-dlp/yt-dlp/issues/8152
+    sqlite3._yt_dlp__version = sqlite3.sqlite_version
 except ImportError:
-    # although sqlite3 is part of the standard library, it is possible to compile python without
+    # although sqlite3 is part of the standard library, it is possible to compile Python without
     # sqlite support. See: https://github.com/yt-dlp/yt-dlp/issues/544
     sqlite3 = None
 
 
 try:
     import websockets
-except (ImportError, SyntaxError):
-    # websockets 3.10 on python 3.6 causes SyntaxError
-    # See https://github.com/yt-dlp/yt-dlp/issues/2633
+except ImportError:
     websockets = None
 
+try:
+    import urllib3
+except ImportError:
+    urllib3 = None
+
+try:
+    import requests
+except ImportError:
+    requests = None
 
 try:
     import xattr  # xattr or pyxattr
@@ -65,6 +74,10 @@ else:
     if hasattr(xattr, 'set'):  # pyxattr
         xattr._yt_dlp__identifier = 'pyxattr'
 
+try:
+    import curl_cffi
+except ImportError:
+    curl_cffi = None
 
 from . import Cryptodome
 
diff --git a/plugins/youtube_download/yt_dlp/downloader/__init__.py b/plugins/youtube_download/yt_dlp/downloader/__init__.py
index 51a9f28..9c34bd2 100644
--- a/plugins/youtube_download/yt_dlp/downloader/__init__.py
+++ b/plugins/youtube_download/yt_dlp/downloader/__init__.py
@@ -30,11 +30,12 @@ from .hls import HlsFD
 from .http import HttpFD
 from .ism import IsmFD
 from .mhtml import MhtmlFD
-from .niconico import NiconicoDmcFD, NiconicoLiveFD
+from .niconico import NiconicoLiveFD
 from .rtmp import RtmpFD
 from .rtsp import RtspFD
 from .websocket import WebSocketFragmentFD
 from .youtube_live_chat import YoutubeLiveChatFD
+from .bunnycdn import BunnyCdnFD
 
 PROTOCOL_MAP = {
     'rtmp': RtmpFD,
@@ -49,12 +50,12 @@ PROTOCOL_MAP = {
     'http_dash_segments_generator': DashSegmentsFD,
     'ism': IsmFD,
     'mhtml': MhtmlFD,
-    'niconico_dmc': NiconicoDmcFD,
     'niconico_live': NiconicoLiveFD,
     'fc2_live': FC2LiveFD,
     'websocket_frag': WebSocketFragmentFD,
     'youtube_live_chat': YoutubeLiveChatFD,
     'youtube_live_chat_replay': YoutubeLiveChatFD,
+    'bunnycdn': BunnyCdnFD,
 }
 
 
@@ -65,7 +66,6 @@ def shorten_protocol_name(proto, simplify=False):
         'rtmp_ffmpeg': 'rtmpF',
         'http_dash_segments': 'dash',
         'http_dash_segments_generator': 'dashG',
-        'niconico_dmc': 'dmc',
         'websocket_frag': 'WSfrag',
     }
     if simplify:
diff --git a/plugins/youtube_download/yt_dlp/downloader/bunnycdn.py b/plugins/youtube_download/yt_dlp/downloader/bunnycdn.py
new file mode 100644
index 0000000..e787f69
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/downloader/bunnycdn.py
@@ -0,0 +1,50 @@
+import hashlib
+import random
+import threading
+
+from .common import FileDownloader
+from . import HlsFD
+from ..networking import Request
+from ..networking.exceptions import network_exceptions
+
+
+class BunnyCdnFD(FileDownloader):
+    """
+    Downloads from BunnyCDN with required pings
+    Note, this is not a part of public API, and will be removed without notice.
+    DO NOT USE
+    """
+
+    def real_download(self, filename, info_dict):
+        self.to_screen(f'[{self.FD_NAME}] Downloading from BunnyCDN')
+
+        fd = HlsFD(self.ydl, self.params)
+
+        stop_event = threading.Event()
+        ping_thread = threading.Thread(target=self.ping_thread, args=(stop_event,), kwargs=info_dict['_bunnycdn_ping_data'])
+        ping_thread.start()
+
+        try:
+            return fd.real_download(filename, info_dict)
+        finally:
+            stop_event.set()
+
+    def ping_thread(self, stop_event, url, headers, secret, context_id):
+        # Site sends ping every 4 seconds, but this throttles the download. Pinging every 2 seconds seems to work.
+        ping_interval = 2
+        # Hard coded resolution as it doesn't seem to matter
+        res = 1080
+        paused = 'false'
+        current_time = 0
+
+        while not stop_event.wait(ping_interval):
+            current_time += ping_interval
+
+            time = current_time + round(random.random(), 6)
+            md5_hash = hashlib.md5(f'{secret}_{context_id}_{time}_{paused}_{res}'.encode()).hexdigest()
+            ping_url = f'{url}?hash={md5_hash}&time={time}&paused={paused}&resolution={res}'
+
+            try:
+                self.ydl.urlopen(Request(ping_url, headers=headers)).read()
+            except network_exceptions as e:
+                self.to_screen(f'[{self.FD_NAME}] Ping failed: {e}')
diff --git a/plugins/youtube_download/yt_dlp/downloader/common.py b/plugins/youtube_download/yt_dlp/downloader/common.py
index b71d7ee..bb9303f 100644
--- a/plugins/youtube_download/yt_dlp/downloader/common.py
+++ b/plugins/youtube_download/yt_dlp/downloader/common.py
@@ -4,6 +4,7 @@ import functools
 import os
 import random
 import re
+import threading
 import time
 
 from ..minicurses import (
@@ -19,9 +20,7 @@ from ..utils import (
     Namespace,
     RetryManager,
     classproperty,
-    decodeArgument,
     deprecation_warning,
-    encodeFilename,
     format_bytes,
     join_nonempty,
     parse_bytes,
@@ -32,6 +31,7 @@ from ..utils import (
     timetuple_from_msec,
     try_call,
 )
+from ..utils._utils import _ProgressState
 
 
 class FileDownloader:
@@ -63,6 +63,7 @@ class FileDownloader:
     min_filesize:       Skip files smaller than this size
     max_filesize:       Skip files larger than this size
     xattr_set_filesize: Set ytdl.filesize user xattribute with expected size.
+    progress_delta:     The minimum time between progress output, in seconds
     external_downloader_args:  A dictionary of downloader keys (in lower case)
                         and a list of additional command-line arguments for the
                         executable. Use 'default' as the name for arguments to be
@@ -88,6 +89,9 @@ class FileDownloader:
         self.params = params
         self._prepare_multiline_status()
         self.add_progress_hook(self.report_progress)
+        if self.params.get('progress_delta'):
+            self._progress_delta_lock = threading.Lock()
+            self._progress_delta_time = time.monotonic()
 
     def _set_ydl(self, ydl):
         self.ydl = ydl
@@ -214,7 +218,7 @@ class FileDownloader:
     def temp_name(self, filename):
         """Returns a temporary filename for the given filename."""
         if self.params.get('nopart', False) or filename == '-' or \
-                (os.path.exists(encodeFilename(filename)) and not os.path.isfile(encodeFilename(filename))):
+                (os.path.exists(filename) and not os.path.isfile(filename)):
             return filename
         return filename + '.part'
 
@@ -268,7 +272,7 @@ class FileDownloader:
         """Try to set the last-modified time of the given file."""
         if last_modified_hdr is None:
             return
-        if not os.path.isfile(encodeFilename(filename)):
+        if not os.path.isfile(filename):
             return
         timestr = last_modified_hdr
         if timestr is None:
@@ -330,7 +334,7 @@ class FileDownloader:
             progress_dict), s.get('progress_idx') or 0)
         self.to_console_title(self.ydl.evaluate_outtmpl(
             progress_template.get('download-title') or 'yt-dlp %(progress._default_template)s',
-            progress_dict))
+            progress_dict), _ProgressState.from_dict(s), s.get('_percent'))
 
     def _format_progress(self, *args, **kwargs):
         return self.ydl._format_text(
@@ -354,6 +358,7 @@ class FileDownloader:
                 '_speed_str': self.format_speed(speed).strip(),
                 '_total_bytes_str': _format_bytes('total_bytes'),
                 '_elapsed_str': self.format_seconds(s.get('elapsed')),
+                '_percent': 100.0,
                 '_percent_str': self.format_percent(100),
             })
             self._report_progress_status(s, join_nonempty(
@@ -366,13 +371,21 @@ class FileDownloader:
         if s['status'] != 'downloading':
             return
 
+        if update_delta := self.params.get('progress_delta'):
+            with self._progress_delta_lock:
+                if time.monotonic() < self._progress_delta_time:
+                    return
+                self._progress_delta_time += update_delta
+
+        progress = try_call(
+            lambda: 100 * s['downloaded_bytes'] / s['total_bytes'],
+            lambda: 100 * s['downloaded_bytes'] / s['total_bytes_estimate'],
+            lambda: s['downloaded_bytes'] == 0 and 0)
         s.update({
             '_eta_str': self.format_eta(s.get('eta')).strip(),
             '_speed_str': self.format_speed(s.get('speed')),
-            '_percent_str': self.format_percent(try_call(
-                lambda: 100 * s['downloaded_bytes'] / s['total_bytes'],
-                lambda: 100 * s['downloaded_bytes'] / s['total_bytes_estimate'],
-                lambda: s['downloaded_bytes'] == 0 and 0)),
+            '_percent': progress,
+            '_percent_str': self.format_percent(progress),
             '_total_bytes_str': _format_bytes('total_bytes'),
             '_total_bytes_estimate_str': _format_bytes('total_bytes_estimate'),
             '_downloaded_bytes_str': _format_bytes('downloaded_bytes'),
@@ -393,7 +406,7 @@ class FileDownloader:
 
     def report_resuming_byte(self, resume_len):
         """Report attempt to resume at given byte."""
-        self.to_screen('[download] Resuming download at byte %s' % resume_len)
+        self.to_screen(f'[download] Resuming download at byte {resume_len}')
 
     def report_retry(self, err, count, retries, frag_index=NO_DEFAULT, fatal=True):
         """Report retry"""
@@ -421,13 +434,13 @@ class FileDownloader:
         """
         nooverwrites_and_exists = (
             not self.params.get('overwrites', True)
-            and os.path.exists(encodeFilename(filename))
+            and os.path.exists(filename)
         )
 
         if not hasattr(filename, 'write'):
             continuedl_and_exists = (
                 self.params.get('continuedl', True)
-                and os.path.isfile(encodeFilename(filename))
+                and os.path.isfile(filename)
                 and not self.params.get('nopart', False)
             )
 
@@ -437,7 +450,7 @@ class FileDownloader:
                 self._hook_progress({
                     'filename': filename,
                     'status': 'finished',
-                    'total_bytes': os.path.getsize(encodeFilename(filename)),
+                    'total_bytes': os.path.getsize(filename),
                 }, info_dict)
                 self._finish_multiline_status()
                 return True, False
@@ -478,9 +491,7 @@ class FileDownloader:
         if not self.params.get('verbose', False):
             return
 
-        str_args = [decodeArgument(a) for a in args]
-
         if exe is None:
-            exe = os.path.basename(str_args[0])
+            exe = os.path.basename(args[0])
 
-        self.write_debug(f'{exe} command line: {shell_quote(str_args)}')
+        self.write_debug(f'{exe} command line: {shell_quote(args)}')
diff --git a/plugins/youtube_download/yt_dlp/downloader/dash.py b/plugins/youtube_download/yt_dlp/downloader/dash.py
index 4328d73..afc79b6 100644
--- a/plugins/youtube_download/yt_dlp/downloader/dash.py
+++ b/plugins/youtube_download/yt_dlp/downloader/dash.py
@@ -15,12 +15,15 @@ class DashSegmentsFD(FragmentFD):
     FD_NAME = 'dashsegments'
 
     def real_download(self, filename, info_dict):
-        if info_dict.get('is_live') and set(info_dict['protocol'].split('+')) != {'http_dash_segments_generator'}:
-            self.report_error('Live DASH videos are not supported')
+        if 'http_dash_segments_generator' in info_dict['protocol'].split('+'):
+            real_downloader = None  # No external FD can support --live-from-start
+        else:
+            if info_dict.get('is_live'):
+                self.report_error('Live DASH videos are not supported')
+            real_downloader = get_suitable_downloader(
+                info_dict, self.params, None, protocol='dash_frag_urls', to_stdout=(filename == '-'))
 
         real_start = time.time()
-        real_downloader = get_suitable_downloader(
-            info_dict, self.params, None, protocol='dash_frag_urls', to_stdout=(filename == '-'))
 
         requested_formats = [{**info_dict, **fmt} for fmt in info_dict.get('requested_formats', [])]
         args = []
diff --git a/plugins/youtube_download/yt_dlp/downloader/external.py b/plugins/youtube_download/yt_dlp/downloader/external.py
index 4ce8a3b..ee73ac0 100644
--- a/plugins/youtube_download/yt_dlp/downloader/external.py
+++ b/plugins/youtube_download/yt_dlp/downloader/external.py
@@ -1,4 +1,5 @@
 import enum
+import functools
 import json
 import os
 import re
@@ -9,7 +10,6 @@ import time
 import uuid
 
 from .fragment import FragmentFD
-from ..compat import functools
 from ..networking import Request
 from ..postprocessor.ffmpeg import EXT_TO_OUT_FORMATS, FFmpegPostProcessor
 from ..utils import (
@@ -23,7 +23,6 @@ from ..utils import (
     cli_valueless_option,
     determine_ext,
     encodeArgument,
-    encodeFilename,
     find_available_port,
     remove_end,
     traverse_obj,
@@ -55,7 +54,7 @@ class ExternalFD(FragmentFD):
             # correct and expected termination thus all postprocessing
             # should take place
             retval = 0
-            self.to_screen('[%s] Interrupted by user' % self.get_basename())
+            self.to_screen(f'[{self.get_basename()}] Interrupted by user')
         finally:
             if self._cookies_tempfile:
                 self.try_remove(self._cookies_tempfile)
@@ -67,7 +66,7 @@ class ExternalFD(FragmentFD):
                 'elapsed': time.time() - started,
             }
             if filename != '-':
-                fsize = os.path.getsize(encodeFilename(tmpfilename))
+                fsize = os.path.getsize(tmpfilename)
                 self.try_rename(tmpfilename, filename)
                 status.update({
                     'downloaded_bytes': fsize,
@@ -108,7 +107,7 @@ class ExternalFD(FragmentFD):
         return all((
             not info_dict.get('to_stdout') or Features.TO_STDOUT in cls.SUPPORTED_FEATURES,
             '+' not in info_dict['protocol'] or Features.MULTIPLE_FORMATS in cls.SUPPORTED_FEATURES,
-            not traverse_obj(info_dict, ('hls_aes', ...), 'extra_param_to_segment_url'),
+            not traverse_obj(info_dict, ('hls_aes', ...), 'extra_param_to_segment_url', 'extra_param_to_key_url'),
             all(proto in cls.SUPPORTED_PROTOCOLS for proto in info_dict['protocol'].split('+')),
         ))
 
@@ -172,7 +171,7 @@ class ExternalFD(FragmentFD):
         decrypt_fragment = self.decrypter(info_dict)
         dest, _ = self.sanitize_open(tmpfilename, 'wb')
         for frag_index, fragment in enumerate(info_dict['fragments']):
-            fragment_filename = '%s-Frag%d' % (tmpfilename, frag_index)
+            fragment_filename = f'{tmpfilename}-Frag{frag_index}'
             try:
                 src, _ = self.sanitize_open(fragment_filename, 'rb')
             except OSError as err:
@@ -184,9 +183,9 @@ class ExternalFD(FragmentFD):
             dest.write(decrypt_fragment(fragment, src.read()))
             src.close()
             if not self.params.get('keep_fragments', False):
-                self.try_remove(encodeFilename(fragment_filename))
+                self.try_remove(fragment_filename)
         dest.close()
-        self.try_remove(encodeFilename('%s.frag.urls' % tmpfilename))
+        self.try_remove(f'{tmpfilename}.frag.urls')
         return 0
 
     def _call_process(self, cmd, info_dict):
@@ -335,12 +334,12 @@ class Aria2cFD(ExternalFD):
         cmd += ['--auto-file-renaming=false']
 
         if 'fragments' in info_dict:
-            cmd += ['--file-allocation=none', '--uri-selector=inorder']
-            url_list_file = '%s.frag.urls' % tmpfilename
+            cmd += ['--uri-selector=inorder']
+            url_list_file = f'{tmpfilename}.frag.urls'
             url_list = []
             for frag_index, fragment in enumerate(info_dict['fragments']):
-                fragment_filename = '%s-Frag%d' % (os.path.basename(tmpfilename), frag_index)
-                url_list.append('%s\n\tout=%s' % (fragment['url'], self._aria2c_filename(fragment_filename)))
+                fragment_filename = f'{os.path.basename(tmpfilename)}-Frag{frag_index}'
+                url_list.append('{}\n\tout={}'.format(fragment['url'], self._aria2c_filename(fragment_filename)))
             stream, _ = self.sanitize_open(url_list_file, 'wb')
             stream.write('\n'.join(url_list).encode())
             stream.close()
@@ -357,7 +356,7 @@ class Aria2cFD(ExternalFD):
             'id': sanitycheck,
             'method': method,
             'params': [f'token:{rpc_secret}', *params],
-        }).encode('utf-8')
+        }).encode()
         request = Request(
             f'http://localhost:{rpc_port}/jsonrpc',
             data=d, headers={
@@ -416,7 +415,7 @@ class Aria2cFD(ExternalFD):
                     'total_bytes_estimate': total,
                     'eta': (total - downloaded) / (speed or 1),
                     'fragment_index': min(frag_count, len(completed) + 1) if fragmented else None,
-                    'elapsed': time.time() - started
+                    'elapsed': time.time() - started,
                 })
                 self._hook_progress(status, info_dict)
 
@@ -458,8 +457,6 @@ class FFmpegFD(ExternalFD):
 
     @classmethod
     def available(cls, path=None):
-        # TODO: Fix path for ffmpeg
-        # Fixme: This may be wrong when --ffmpeg-location is used
         return FFmpegPostProcessor().available
 
     def on_process_started(self, proc, stdin):
@@ -491,7 +488,7 @@ class FFmpegFD(ExternalFD):
         if not self.params.get('verbose'):
             args += ['-hide_banner']
 
-        args += traverse_obj(info_dict, ('downloader_options', 'ffmpeg_args'), default=[])
+        args += traverse_obj(info_dict, ('downloader_options', 'ffmpeg_args', ...))
 
         # These exists only for compatibility. Extractors should use
         # info_dict['downloader_options']['ffmpeg_args'] instead
@@ -508,13 +505,13 @@ class FFmpegFD(ExternalFD):
         env = None
         proxy = self.params.get('proxy')
         if proxy:
-            if not re.match(r'^[\da-zA-Z]+://', proxy):
-                proxy = 'http://%s' % proxy
+            if not re.match(r'[\da-zA-Z]+://', proxy):
+                proxy = f'http://{proxy}'
 
             if proxy.startswith('socks'):
                 self.report_warning(
-                    '%s does not support SOCKS proxies. Downloading is likely to fail. '
-                    'Consider adding --hls-prefer-native to your command.' % self.get_basename())
+                    f'{self.get_basename()} does not support SOCKS proxies. Downloading is likely to fail. '
+                    'Consider adding --hls-prefer-native to your command.')
 
             # Since December 2015 ffmpeg supports -http_proxy option (see
             # http://git.videolan.org/?p=ffmpeg.git;a=commit;h=b4eb1f29ebddd60c41a2eb39f5af701e38e0d3fd)
@@ -559,7 +556,7 @@ class FFmpegFD(ExternalFD):
 
         selected_formats = info_dict.get('requested_formats') or [info_dict]
         for i, fmt in enumerate(selected_formats):
-            is_http = re.match(r'^https?://', fmt['url'])
+            is_http = re.match(r'https?://', fmt['url'])
             cookies = self.ydl.cookiejar.get_cookies_for_url(fmt['url']) if is_http else []
             if cookies:
                 args.extend(['-cookies', ''.join(
@@ -575,7 +572,7 @@ class FFmpegFD(ExternalFD):
             if end_time:
                 args += ['-t', str(end_time - start_time)]
 
-            args += self._configuration_args((f'_i{i + 1}', '_i')) + ['-i', fmt['url']]
+            args += [*self._configuration_args((f'_i{i + 1}', '_i')), '-i', fmt['url']]
 
         if not (start_time or end_time) or not self.params.get('force_keyframes_at_cuts'):
             args += ['-c', 'copy']
@@ -615,10 +612,12 @@ class FFmpegFD(ExternalFD):
         else:
             args += ['-f', EXT_TO_OUT_FORMATS.get(ext, ext)]
 
+        args += traverse_obj(info_dict, ('downloader_options', 'ffmpeg_args_out', ...))
+
         args += self._configuration_args(('_o1', '_o', ''))
 
         args = [encodeArgument(opt) for opt in args]
-        args.append(encodeFilename(ffpp._ffmpeg_filename_argument(tmpfilename), True))
+        args.append(ffpp._ffmpeg_filename_argument(tmpfilename))
         self._debug_cmd(args)
 
         piped = any(fmt['url'] in ('-', 'pipe:') for fmt in selected_formats)
diff --git a/plugins/youtube_download/yt_dlp/downloader/f4m.py b/plugins/youtube_download/yt_dlp/downloader/f4m.py
index 28cbba0..22d0ebd 100644
--- a/plugins/youtube_download/yt_dlp/downloader/f4m.py
+++ b/plugins/youtube_download/yt_dlp/downloader/f4m.py
@@ -67,12 +67,12 @@ class FlvReader(io.BytesIO):
         self.read_bytes(3)
         quality_entry_count = self.read_unsigned_char()
         # QualityEntryCount
-        for i in range(quality_entry_count):
+        for _ in range(quality_entry_count):
             self.read_string()
 
         segment_run_count = self.read_unsigned_int()
         segments = []
-        for i in range(segment_run_count):
+        for _ in range(segment_run_count):
             first_segment = self.read_unsigned_int()
             fragments_per_segment = self.read_unsigned_int()
             segments.append((first_segment, fragments_per_segment))
@@ -91,12 +91,12 @@ class FlvReader(io.BytesIO):
 
         quality_entry_count = self.read_unsigned_char()
         # QualitySegmentUrlModifiers
-        for i in range(quality_entry_count):
+        for _ in range(quality_entry_count):
             self.read_string()
 
         fragments_count = self.read_unsigned_int()
         fragments = []
-        for i in range(fragments_count):
+        for _ in range(fragments_count):
             first = self.read_unsigned_int()
             first_ts = self.read_unsigned_long_long()
             duration = self.read_unsigned_int()
@@ -135,11 +135,11 @@ class FlvReader(io.BytesIO):
         self.read_string()  # MovieIdentifier
         server_count = self.read_unsigned_char()
         # ServerEntryTable
-        for i in range(server_count):
+        for _ in range(server_count):
             self.read_string()
         quality_count = self.read_unsigned_char()
         # QualityEntryTable
-        for i in range(quality_count):
+        for _ in range(quality_count):
             self.read_string()
         # DrmData
         self.read_string()
@@ -148,14 +148,14 @@ class FlvReader(io.BytesIO):
 
         segments_count = self.read_unsigned_char()
         segments = []
-        for i in range(segments_count):
+        for _ in range(segments_count):
             box_size, box_type, box_data = self.read_box_info()
             assert box_type == b'asrt'
             segment = FlvReader(box_data).read_asrt()
             segments.append(segment)
         fragments_run_count = self.read_unsigned_char()
         fragments = []
-        for i in range(fragments_run_count):
+        for _ in range(fragments_run_count):
             box_size, box_type, box_data = self.read_box_info()
             assert box_type == b'afrt'
             fragments.append(FlvReader(box_data).read_afrt())
@@ -309,7 +309,7 @@ class F4mFD(FragmentFD):
     def real_download(self, filename, info_dict):
         man_url = info_dict['url']
         requested_bitrate = info_dict.get('tbr')
-        self.to_screen('[%s] Downloading f4m manifest' % self.FD_NAME)
+        self.to_screen(f'[{self.FD_NAME}] Downloading f4m manifest')
 
         urlh = self.ydl.urlopen(self._prepare_url(info_dict, man_url))
         man_url = urlh.url
@@ -326,8 +326,8 @@ class F4mFD(FragmentFD):
             formats = sorted(formats, key=lambda f: f[0])
             rate, media = formats[-1]
         else:
-            rate, media = list(filter(
-                lambda f: int(f[0]) == requested_bitrate, formats))[0]
+            rate, media = next(filter(
+                lambda f: int(f[0]) == requested_bitrate, formats))
 
         # Prefer baseURL for relative URLs as per 11.2 of F4M 3.0 spec.
         man_base_url = get_base_url(doc) or man_url
diff --git a/plugins/youtube_download/yt_dlp/downloader/fragment.py b/plugins/youtube_download/yt_dlp/downloader/fragment.py
index b4b680d..98784e7 100644
--- a/plugins/youtube_download/yt_dlp/downloader/fragment.py
+++ b/plugins/youtube_download/yt_dlp/downloader/fragment.py
@@ -9,11 +9,11 @@ import time
 from .common import FileDownloader
 from .http import HttpFD
 from ..aes import aes_cbc_decrypt_bytes, unpad_pkcs7
-from ..compat import compat_os_name
 from ..networking import Request
 from ..networking.exceptions import HTTPError, IncompleteRead
-from ..utils import DownloadError, RetryManager, encodeFilename, traverse_obj
+from ..utils import DownloadError, RetryManager, traverse_obj
 from ..utils.networking import HTTPHeaderDict
+from ..utils.progress import ProgressCalculator
 
 
 class HttpQuietDownloader(HttpFD):
@@ -151,7 +151,7 @@ class FragmentFD(FileDownloader):
             if self.__do_ytdl_file(ctx):
                 self._write_ytdl_file(ctx)
             if not self.params.get('keep_fragments', False):
-                self.try_remove(encodeFilename(ctx['fragment_filename_sanitized']))
+                self.try_remove(ctx['fragment_filename_sanitized'])
             del ctx['fragment_filename_sanitized']
 
     def _prepare_frag_download(self, ctx):
@@ -187,7 +187,7 @@ class FragmentFD(FileDownloader):
         })
 
         if self.__do_ytdl_file(ctx):
-            ytdl_file_exists = os.path.isfile(encodeFilename(self.ytdl_filename(ctx['filename'])))
+            ytdl_file_exists = os.path.isfile(self.ytdl_filename(ctx['filename']))
             continuedl = self.params.get('continuedl', True)
             if continuedl and ytdl_file_exists:
                 self._read_ytdl_file(ctx)
@@ -198,7 +198,7 @@ class FragmentFD(FileDownloader):
                         '.ytdl file is corrupt' if is_corrupt else
                         'Inconsistent state of incomplete fragment download')
                     self.report_warning(
-                        '%s. Restarting from the beginning ...' % message)
+                        f'{message}. Restarting from the beginning ...')
                     ctx['fragment_index'] = resume_len = 0
                     if 'ytdl_corrupt' in ctx:
                         del ctx['ytdl_corrupt']
@@ -226,8 +226,7 @@ class FragmentFD(FileDownloader):
         resume_len = ctx['complete_frags_downloaded_bytes']
         total_frags = ctx['total_frags']
         ctx_id = ctx.get('ctx_id')
-        # This dict stores the download progress, it's updated by the progress
-        # hook
+        # Stores the download progress, updated by the progress hook
         state = {
             'status': 'downloading',
             'downloaded_bytes': resume_len,
@@ -237,14 +236,8 @@ class FragmentFD(FileDownloader):
             'tmpfilename': ctx['tmpfilename'],
         }
 
-        start = time.time()
-        ctx.update({
-            'started': start,
-            'fragment_started': start,
-            # Amount of fragment's bytes downloaded by the time of the previous
-            # frag progress hook invocation
-            'prev_frag_downloaded_bytes': 0,
-        })
+        ctx['started'] = time.time()
+        progress = ProgressCalculator(resume_len)
 
         def frag_progress_hook(s):
             if s['status'] not in ('downloading', 'finished'):
@@ -259,38 +252,35 @@ class FragmentFD(FileDownloader):
             state['max_progress'] = ctx.get('max_progress')
             state['progress_idx'] = ctx.get('progress_idx')
 
-            time_now = time.time()
-            state['elapsed'] = time_now - start
+            state['elapsed'] = progress.elapsed
             frag_total_bytes = s.get('total_bytes') or 0
             s['fragment_info_dict'] = s.pop('info_dict', {})
+
+            # XXX: Fragment resume is not accounted for here
             if not ctx['live']:
                 estimated_size = (
                     (ctx['complete_frags_downloaded_bytes'] + frag_total_bytes)
                     / (state['fragment_index'] + 1) * total_frags)
-                state['total_bytes_estimate'] = estimated_size
+                progress.total = estimated_size
+                progress.update(s.get('downloaded_bytes'))
+                state['total_bytes_estimate'] = progress.total
+            else:
+                progress.update(s.get('downloaded_bytes'))
 
             if s['status'] == 'finished':
                 state['fragment_index'] += 1
                 ctx['fragment_index'] = state['fragment_index']
-                state['downloaded_bytes'] += frag_total_bytes - ctx['prev_frag_downloaded_bytes']
-                ctx['complete_frags_downloaded_bytes'] = state['downloaded_bytes']
-                ctx['speed'] = state['speed'] = self.calc_speed(
-                    ctx['fragment_started'], time_now, frag_total_bytes)
-                ctx['fragment_started'] = time.time()
-                ctx['prev_frag_downloaded_bytes'] = 0
-            else:
-                frag_downloaded_bytes = s['downloaded_bytes']
-                state['downloaded_bytes'] += frag_downloaded_bytes - ctx['prev_frag_downloaded_bytes']
-                ctx['speed'] = state['speed'] = self.calc_speed(
-                    ctx['fragment_started'], time_now, frag_downloaded_bytes - ctx.get('frag_resume_len', 0))
-                if not ctx['live']:
-                    state['eta'] = self.calc_eta(state['speed'], estimated_size - state['downloaded_bytes'])
-                ctx['prev_frag_downloaded_bytes'] = frag_downloaded_bytes
+                progress.thread_reset()
+
+            state['downloaded_bytes'] = ctx['complete_frags_downloaded_bytes'] = progress.downloaded
+            state['speed'] = ctx['speed'] = progress.speed.smooth
+            state['eta'] = progress.eta.smooth
+
             self._hook_progress(state, info_dict)
 
         ctx['dl'].add_progress_hook(frag_progress_hook)
 
-        return start
+        return ctx['started']
 
     def _finish_frag_download(self, ctx, info_dict):
         ctx['dest_stream'].close()
@@ -375,10 +365,10 @@ class FragmentFD(FileDownloader):
         return decrypt_fragment
 
     def download_and_append_fragments_multiple(self, *args, **kwargs):
-        '''
+        """
         @params (ctx1, fragments1, info_dict1), (ctx2, fragments2, info_dict2), ...
                 all args must be either tuple or list
-        '''
+        """
         interrupt_trigger = [True]
         max_progress = len(args)
         if max_progress == 1:
@@ -399,7 +389,7 @@ class FragmentFD(FileDownloader):
             def __exit__(self, exc_type, exc_val, exc_tb):
                 pass
 
-        if compat_os_name == 'nt':
+        if os.name == 'nt':
             def future_result(future):
                 while True:
                     try:
@@ -433,7 +423,7 @@ class FragmentFD(FileDownloader):
             finally:
                 tpe.shutdown(wait=True)
         if not interrupt_trigger[0] and not is_live:
-            raise KeyboardInterrupt()
+            raise KeyboardInterrupt
         # we expect the user wants to stop and DO WANT the preceding postprocessors to run;
         # so returning a intermediate result here instead of KeyboardInterrupt on live
         return result
@@ -500,7 +490,6 @@ class FragmentFD(FileDownloader):
                 download_fragment(fragment, ctx_copy)
                 return fragment, fragment['frag_index'], ctx_copy.get('fragment_filename_sanitized')
 
-            self.report_warning('The download speed shown is only of one thread. This is a known issue')
             with tpe or concurrent.futures.ThreadPoolExecutor(max_workers) as pool:
                 try:
                     for fragment, frag_index, frag_filename in pool.map(_download_fragment, fragments):
diff --git a/plugins/youtube_download/yt_dlp/downloader/hls.py b/plugins/youtube_download/yt_dlp/downloader/hls.py
index d4b3f03..1f36a07 100644
--- a/plugins/youtube_download/yt_dlp/downloader/hls.py
+++ b/plugins/youtube_download/yt_dlp/downloader/hls.py
@@ -16,6 +16,7 @@ from ..utils import (
     update_url_query,
     urljoin,
 )
+from ..utils._utils import _request_dump_filename
 
 
 class HlsFD(FragmentFD):
@@ -72,11 +73,23 @@ class HlsFD(FragmentFD):
 
     def real_download(self, filename, info_dict):
         man_url = info_dict['url']
-        self.to_screen('[%s] Downloading m3u8 manifest' % self.FD_NAME)
 
-        urlh = self.ydl.urlopen(self._prepare_url(info_dict, man_url))
-        man_url = urlh.url
-        s = urlh.read().decode('utf-8', 'ignore')
+        s = info_dict.get('hls_media_playlist_data')
+        if s:
+            self.to_screen(f'[{self.FD_NAME}] Using m3u8 manifest from extracted info')
+        else:
+            self.to_screen(f'[{self.FD_NAME}] Downloading m3u8 manifest')
+            urlh = self.ydl.urlopen(self._prepare_url(info_dict, man_url))
+            man_url = urlh.url
+            s_bytes = urlh.read()
+            if self.params.get('write_pages'):
+                dump_filename = _request_dump_filename(
+                    man_url, info_dict['id'], None,
+                    trim_length=self.params.get('trim_file_name'))
+                self.to_screen(f'[{self.FD_NAME}] Saving request to {dump_filename}')
+                with open(dump_filename, 'wb') as outf:
+                    outf.write(s_bytes)
+            s = s_bytes.decode('utf-8', 'ignore')
 
         can_download, message = self.can_download(s, info_dict, self.params.get('allow_unplayable_formats')), None
         if can_download:
@@ -119,12 +132,12 @@ class HlsFD(FragmentFD):
             self.to_screen(f'[{self.FD_NAME}] Fragment downloads will be delegated to {real_downloader.get_basename()}')
 
         def is_ad_fragment_start(s):
-            return (s.startswith('#ANVATO-SEGMENT-INFO') and 'type=ad' in s
-                    or s.startswith('#UPLYNK-SEGMENT') and s.endswith(',ad'))
+            return ((s.startswith('#ANVATO-SEGMENT-INFO') and 'type=ad' in s)
+                    or (s.startswith('#UPLYNK-SEGMENT') and s.endswith(',ad')))
 
         def is_ad_fragment_end(s):
-            return (s.startswith('#ANVATO-SEGMENT-INFO') and 'type=master' in s
-                    or s.startswith('#UPLYNK-SEGMENT') and s.endswith(',segment'))
+            return ((s.startswith('#ANVATO-SEGMENT-INFO') and 'type=master' in s)
+                    or (s.startswith('#UPLYNK-SEGMENT') and s.endswith(',segment')))
 
         fragments = []
 
@@ -160,10 +173,12 @@ class HlsFD(FragmentFD):
         extra_state = ctx.setdefault('extra_state', {})
 
         format_index = info_dict.get('format_index')
-        extra_query = None
-        extra_param_to_segment_url = info_dict.get('extra_param_to_segment_url')
-        if extra_param_to_segment_url:
-            extra_query = urllib.parse.parse_qs(extra_param_to_segment_url)
+        extra_segment_query = None
+        if extra_param_to_segment_url := info_dict.get('extra_param_to_segment_url'):
+            extra_segment_query = urllib.parse.parse_qs(extra_param_to_segment_url)
+        extra_key_query = None
+        if extra_param_to_key_url := info_dict.get('extra_param_to_key_url'):
+            extra_key_query = urllib.parse.parse_qs(extra_param_to_key_url)
         i = 0
         media_sequence = 0
         decrypt_info = {'METHOD': 'NONE'}
@@ -175,6 +190,7 @@ class HlsFD(FragmentFD):
         if external_aes_iv:
             external_aes_iv = binascii.unhexlify(remove_start(external_aes_iv, '0x').zfill(32))
         byte_range = {}
+        byte_range_offset = 0
         discontinuity_count = 0
         frag_index = 0
         ad_frag_next = False
@@ -190,8 +206,8 @@ class HlsFD(FragmentFD):
                     if frag_index <= ctx['fragment_index']:
                         continue
                     frag_url = urljoin(man_url, line)
-                    if extra_query:
-                        frag_url = update_url_query(frag_url, extra_query)
+                    if extra_segment_query:
+                        frag_url = update_url_query(frag_url, extra_segment_query)
 
                     fragments.append({
                         'frag_index': frag_index,
@@ -202,6 +218,11 @@ class HlsFD(FragmentFD):
                     })
                     media_sequence += 1
 
+                    # If the byte_range is truthy, reset it after appending a fragment that uses it
+                    if byte_range:
+                        byte_range_offset = byte_range['end']
+                        byte_range = {}
+
                 elif line.startswith('#EXT-X-MAP'):
                     if format_index and discontinuity_count != format_index:
                         continue
@@ -212,13 +233,15 @@ class HlsFD(FragmentFD):
                     frag_index += 1
                     map_info = parse_m3u8_attributes(line[11:])
                     frag_url = urljoin(man_url, map_info.get('URI'))
-                    if extra_query:
-                        frag_url = update_url_query(frag_url, extra_query)
+                    if extra_segment_query:
+                        frag_url = update_url_query(frag_url, extra_segment_query)
+
+                    map_byte_range = {}
 
                     if map_info.get('BYTERANGE'):
                         splitted_byte_range = map_info.get('BYTERANGE').split('@')
-                        sub_range_start = int(splitted_byte_range[1]) if len(splitted_byte_range) == 2 else byte_range['end']
-                        byte_range = {
+                        sub_range_start = int(splitted_byte_range[1]) if len(splitted_byte_range) == 2 else 0
+                        map_byte_range = {
                             'start': sub_range_start,
                             'end': sub_range_start + int(splitted_byte_range[0]),
                         }
@@ -227,8 +250,8 @@ class HlsFD(FragmentFD):
                         'frag_index': frag_index,
                         'url': frag_url,
                         'decrypt_info': decrypt_info,
-                        'byte_range': byte_range,
-                        'media_sequence': media_sequence
+                        'byte_range': map_byte_range,
+                        'media_sequence': media_sequence,
                     })
                     media_sequence += 1
 
@@ -244,8 +267,10 @@ class HlsFD(FragmentFD):
                             decrypt_info['KEY'] = external_aes_key
                         else:
                             decrypt_info['URI'] = urljoin(man_url, decrypt_info['URI'])
-                            if extra_query:
-                                decrypt_info['URI'] = update_url_query(decrypt_info['URI'], extra_query)
+                            if extra_key_query or extra_segment_query:
+                                # Fall back to extra_segment_query to key for backwards compat
+                                decrypt_info['URI'] = update_url_query(
+                                    decrypt_info['URI'], extra_key_query or extra_segment_query)
                             if decrypt_url != decrypt_info['URI']:
                                 decrypt_info['KEY'] = None
 
@@ -253,7 +278,7 @@ class HlsFD(FragmentFD):
                     media_sequence = int(line[22:])
                 elif line.startswith('#EXT-X-BYTERANGE'):
                     splitted_byte_range = line[17:].split('@')
-                    sub_range_start = int(splitted_byte_range[1]) if len(splitted_byte_range) == 2 else byte_range['end']
+                    sub_range_start = int(splitted_byte_range[1]) if len(splitted_byte_range) == 2 else byte_range_offset
                     byte_range = {
                         'start': sub_range_start,
                         'end': sub_range_start + int(splitted_byte_range[0]),
@@ -350,9 +375,8 @@ class HlsFD(FragmentFD):
                             # XXX: this should probably be silent as well
                             # or verify that all segments contain the same data
                             self.report_warning(bug_reports_message(
-                                'Discarding a %s block found in the middle of the stream; '
-                                'if the subtitles display incorrectly,'
-                                % (type(block).__name__)))
+                                f'Discarding a {type(block).__name__} block found in the middle of the stream; '
+                                'if the subtitles display incorrectly,'))
                             continue
                     block.write_into(output)
 
@@ -369,7 +393,10 @@ class HlsFD(FragmentFD):
 
                 return output.getvalue().encode()
 
-            self.download_and_append_fragments(
-                ctx, fragments, info_dict, pack_func=pack_fragment, finish_func=fin_fragments)
+            if len(fragments) == 1:
+                self.download_and_append_fragments(ctx, fragments, info_dict)
+            else:
+                self.download_and_append_fragments(
+                    ctx, fragments, info_dict, pack_func=pack_fragment, finish_func=fin_fragments)
         else:
             return self.download_and_append_fragments(ctx, fragments, info_dict)
diff --git a/plugins/youtube_download/yt_dlp/downloader/http.py b/plugins/youtube_download/yt_dlp/downloader/http.py
index f523744..9c6dd8b 100644
--- a/plugins/youtube_download/yt_dlp/downloader/http.py
+++ b/plugins/youtube_download/yt_dlp/downloader/http.py
@@ -15,7 +15,6 @@ from ..utils import (
     ThrottledDownload,
     XAttrMetadataError,
     XAttrUnavailableError,
-    encodeFilename,
     int_or_none,
     parse_http_range,
     try_call,
@@ -58,9 +57,8 @@ class HttpFD(FileDownloader):
 
         if self.params.get('continuedl', True):
             # Establish possible resume length
-            if os.path.isfile(encodeFilename(ctx.tmpfilename)):
-                ctx.resume_len = os.path.getsize(
-                    encodeFilename(ctx.tmpfilename))
+            if os.path.isfile(ctx.tmpfilename):
+                ctx.resume_len = os.path.getsize(ctx.tmpfilename)
 
         ctx.is_resume = ctx.resume_len > 0
 
@@ -176,7 +174,7 @@ class HttpFD(FileDownloader):
                                 'downloaded_bytes': ctx.resume_len,
                                 'total_bytes': ctx.resume_len,
                             }, info_dict)
-                            raise SucceedDownload()
+                            raise SucceedDownload
                         else:
                             # The length does not match, we start the download over
                             self.report_unable_to_resume()
@@ -194,7 +192,7 @@ class HttpFD(FileDownloader):
 
         def close_stream():
             if ctx.stream is not None:
-                if not ctx.tmpfilename == '-':
+                if ctx.tmpfilename != '-':
                     ctx.stream.close()
                 ctx.stream = None
 
@@ -237,8 +235,13 @@ class HttpFD(FileDownloader):
 
             def retry(e):
                 close_stream()
-                ctx.resume_len = (byte_counter if ctx.tmpfilename == '-'
-                                  else os.path.getsize(encodeFilename(ctx.tmpfilename)))
+                if ctx.tmpfilename == '-':
+                    ctx.resume_len = byte_counter
+                else:
+                    try:
+                        ctx.resume_len = os.path.getsize(ctx.tmpfilename)
+                    except FileNotFoundError:
+                        ctx.resume_len = 0
                 raise RetryDownload(e)
 
             while True:
@@ -263,20 +266,20 @@ class HttpFD(FileDownloader):
                         ctx.filename = self.undo_temp_name(ctx.tmpfilename)
                         self.report_destination(ctx.filename)
                     except OSError as err:
-                        self.report_error('unable to open for writing: %s' % str(err))
+                        self.report_error(f'unable to open for writing: {err}')
                         return False
 
                     if self.params.get('xattr_set_filesize', False) and data_len is not None:
                         try:
                             write_xattr(ctx.tmpfilename, 'user.ytdl.filesize', str(data_len).encode())
                         except (XAttrUnavailableError, XAttrMetadataError) as err:
-                            self.report_error('unable to set filesize xattr: %s' % str(err))
+                            self.report_error(f'unable to set filesize xattr: {err}')
 
                 try:
                     ctx.stream.write(data_block)
                 except OSError as err:
                     self.to_stderr('\n')
-                    self.report_error('unable to write data: %s' % str(err))
+                    self.report_error(f'unable to write data: {err}')
                     return False
 
                 # Apply rate limit
@@ -322,7 +325,7 @@ class HttpFD(FileDownloader):
                     elif now - ctx.throttle_start > 3:
                         if ctx.stream is not None and ctx.tmpfilename != '-':
                             ctx.stream.close()
-                        raise ThrottledDownload()
+                        raise ThrottledDownload
                 elif speed:
                     ctx.throttle_start = None
 
@@ -333,7 +336,7 @@ class HttpFD(FileDownloader):
 
             if not is_test and ctx.chunk_size and ctx.content_len is not None and byte_counter < ctx.content_len:
                 ctx.resume_len = byte_counter
-                raise NextFragment()
+                raise NextFragment
 
             if ctx.tmpfilename != '-':
                 ctx.stream.close()
diff --git a/plugins/youtube_download/yt_dlp/downloader/ism.py b/plugins/youtube_download/yt_dlp/downloader/ism.py
index dd688f5..62c3a3b 100644
--- a/plugins/youtube_download/yt_dlp/downloader/ism.py
+++ b/plugins/youtube_download/yt_dlp/downloader/ism.py
@@ -251,7 +251,7 @@ class IsmFD(FragmentFD):
         skip_unavailable_fragments = self.params.get('skip_unavailable_fragments', True)
 
         frag_index = 0
-        for i, segment in enumerate(segments):
+        for segment in segments:
             frag_index += 1
             if frag_index <= ctx['fragment_index']:
                 continue
diff --git a/plugins/youtube_download/yt_dlp/downloader/mhtml.py b/plugins/youtube_download/yt_dlp/downloader/mhtml.py
index d977dce..3d4f2d7 100644
--- a/plugins/youtube_download/yt_dlp/downloader/mhtml.py
+++ b/plugins/youtube_download/yt_dlp/downloader/mhtml.py
@@ -10,7 +10,7 @@ from ..version import __version__ as YT_DLP_VERSION
 
 
 class MhtmlFD(FragmentFD):
-    _STYLESHEET = """\
+    _STYLESHEET = '''\
 html, body {
     margin: 0;
     padding: 0;
@@ -45,7 +45,7 @@ body > figure > img {
     max-width: 100%;
     max-height: calc(100vh - 5em);
 }
-"""
+'''
     _STYLESHEET = re.sub(r'\s+', ' ', _STYLESHEET)
     _STYLESHEET = re.sub(r'\B \B|(?<=[\w\-]) (?=[^\w\-])|(?<=[^\w\-]) (?=[\w\-])', '', _STYLESHEET)
 
@@ -57,24 +57,19 @@ body > figure > img {
         )).decode('us-ascii') + '?='
 
     def _gen_cid(self, i, fragment, frag_boundary):
-        return '%u.%s@yt-dlp.github.io.invalid' % (i, frag_boundary)
+        return f'{i}.{frag_boundary}@yt-dlp.github.io.invalid'
 
     def _gen_stub(self, *, fragments, frag_boundary, title):
         output = io.StringIO()
 
-        output.write((
+        output.write(
             '<!DOCTYPE html>'
             '<html>'
             '<head>'
-            ''  '<meta name="generator" content="yt-dlp {version}">'
-            ''  '<title>{title}</title>'
-            ''  '<style>{styles}</style>'
-            '<body>'
-        ).format(
-            version=escapeHTML(YT_DLP_VERSION),
-            styles=self._STYLESHEET,
-            title=escapeHTML(title)
-        ))
+            f'<meta name="generator" content="yt-dlp {escapeHTML(YT_DLP_VERSION)}">'
+            f'<title>{escapeHTML(title)}</title>'
+            f'<style>{self._STYLESHEET}</style>'
+            '<body>')
 
         t0 = 0
         for i, frag in enumerate(fragments):
@@ -87,15 +82,12 @@ body > figure > img {
                     num=i + 1,
                     t0=srt_subtitles_timecode(t0),
                     t1=srt_subtitles_timecode(t1),
-                    duration=formatSeconds(frag['duration'], msec=True)
+                    duration=formatSeconds(frag['duration'], msec=True),
                 ))
             except (KeyError, ValueError, TypeError):
                 t1 = None
-                output.write((
-                    '<figcaption>Slide #{num}</figcaption>'
-                ).format(num=i + 1))
-            output.write('<img src="cid:{cid}">'.format(
-                cid=self._gen_cid(i, frag, frag_boundary)))
+                output.write(f'<figcaption>Slide #{i + 1}</figcaption>')
+            output.write(f'<img src="cid:{self._gen_cid(i, frag, frag_boundary)}">')
             output.write('</figure>')
             t0 = t1
 
@@ -126,31 +118,24 @@ body > figure > img {
             stub = self._gen_stub(
                 fragments=fragments,
                 frag_boundary=frag_boundary,
-                title=title
+                title=title,
             )
 
             ctx['dest_stream'].write((
                 'MIME-Version: 1.0\r\n'
                 'From: <nowhere@yt-dlp.github.io.invalid>\r\n'
                 'To: <nowhere@yt-dlp.github.io.invalid>\r\n'
-                'Subject: {title}\r\n'
+                f'Subject: {self._escape_mime(title)}\r\n'
                 'Content-type: multipart/related; '
-                ''  'boundary="{boundary}"; '
-                ''  'type="text/html"\r\n'
-                'X.yt-dlp.Origin: {origin}\r\n'
+                f'boundary="{frag_boundary}"; '
+                'type="text/html"\r\n'
+                f'X.yt-dlp.Origin: {origin}\r\n'
                 '\r\n'
-                '--{boundary}\r\n'
+                f'--{frag_boundary}\r\n'
                 'Content-Type: text/html; charset=utf-8\r\n'
-                'Content-Length: {length}\r\n'
+                f'Content-Length: {len(stub)}\r\n'
                 '\r\n'
-                '{stub}\r\n'
-            ).format(
-                origin=origin,
-                boundary=frag_boundary,
-                length=len(stub),
-                title=self._escape_mime(title),
-                stub=stub
-            ).encode())
+                f'{stub}\r\n').encode())
             extra_state['header_written'] = True
 
         for i, fragment in enumerate(fragments):
diff --git a/plugins/youtube_download/yt_dlp/downloader/niconico.py b/plugins/youtube_download/yt_dlp/downloader/niconico.py
index 5720f6e..33cf15d 100644
--- a/plugins/youtube_download/yt_dlp/downloader/niconico.py
+++ b/plugins/youtube_download/yt_dlp/downloader/niconico.py
@@ -2,58 +2,10 @@ import json
 import threading
 import time
 
-from . import get_suitable_downloader
 from .common import FileDownloader
 from .external import FFmpegFD
 from ..networking import Request
-from ..utils import DownloadError, WebSocketsWrapper, str_or_none, try_get
-
-
-class NiconicoDmcFD(FileDownloader):
-    """ Downloading niconico douga from DMC with heartbeat """
-
-    def real_download(self, filename, info_dict):
-        from ..extractor.niconico import NiconicoIE
-
-        self.to_screen('[%s] Downloading from DMC' % self.FD_NAME)
-        ie = NiconicoIE(self.ydl)
-        info_dict, heartbeat_info_dict = ie._get_heartbeat_info(info_dict)
-
-        fd = get_suitable_downloader(info_dict, params=self.params)(self.ydl, self.params)
-
-        success = download_complete = False
-        timer = [None]
-        heartbeat_lock = threading.Lock()
-        heartbeat_url = heartbeat_info_dict['url']
-        heartbeat_data = heartbeat_info_dict['data'].encode()
-        heartbeat_interval = heartbeat_info_dict.get('interval', 30)
-
-        request = Request(heartbeat_url, heartbeat_data)
-
-        def heartbeat():
-            try:
-                self.ydl.urlopen(request).read()
-            except Exception:
-                self.to_screen('[%s] Heartbeat failed' % self.FD_NAME)
-
-            with heartbeat_lock:
-                if not download_complete:
-                    timer[0] = threading.Timer(heartbeat_interval, heartbeat)
-                    timer[0].start()
-
-        heartbeat_info_dict['ping']()
-        self.to_screen('[%s] Heartbeat with %d second interval ...' % (self.FD_NAME, heartbeat_interval))
-        try:
-            heartbeat()
-            if type(fd).__name__ == 'HlsFD':
-                info_dict.update(ie._extract_m3u8_formats(info_dict['url'], info_dict['id'])[0])
-            success = fd.real_download(filename, info_dict)
-        finally:
-            if heartbeat_lock:
-                with heartbeat_lock:
-                    timer[0].cancel()
-                    download_complete = True
-        return success
+from ..utils import DownloadError, str_or_none, try_get
 
 
 class NiconicoLiveFD(FileDownloader):
@@ -64,7 +16,6 @@ class NiconicoLiveFD(FileDownloader):
         ws_url = info_dict['url']
         ws_extractor = info_dict['ws']
         ws_origin_host = info_dict['origin']
-        cookies = info_dict.get('cookies')
         live_quality = info_dict.get('live_quality', 'high')
         live_latency = info_dict.get('live_latency', 'high')
         dl = FFmpegFD(self.ydl, self.params or {})
@@ -76,12 +27,7 @@ class NiconicoLiveFD(FileDownloader):
 
         def communicate_ws(reconnect):
             if reconnect:
-                ws = WebSocketsWrapper(ws_url, {
-                    'Cookies': str_or_none(cookies) or '',
-                    'Origin': f'https://{ws_origin_host}',
-                    'Accept': '*/*',
-                    'User-Agent': self.params['http_headers']['User-Agent'],
-                })
+                ws = self.ydl.urlopen(Request(ws_url, headers={'Origin': f'https://{ws_origin_host}'}))
                 if self.ydl.params.get('verbose', False):
                     self.to_screen('[debug] Sending startWatching request')
                 ws.send(json.dumps({
@@ -91,14 +37,15 @@ class NiconicoLiveFD(FileDownloader):
                             'quality': live_quality,
                             'protocol': 'hls+fmp4',
                             'latency': live_latency,
-                            'chasePlay': False
+                            'accessRightMethod': 'single_cookie',
+                            'chasePlay': False,
                         },
                         'room': {
                             'protocol': 'webSocket',
-                            'commentable': True
+                            'commentable': True,
                         },
                         'reconnect': True,
-                    }
+                    },
                 }))
             else:
                 ws = ws_extractor
@@ -124,7 +71,7 @@ class NiconicoLiveFD(FileDownloader):
                     elif self.ydl.params.get('verbose', False):
                         if len(recv) > 100:
                             recv = recv[:100] + '...'
-                        self.to_screen('[debug] Server said: %s' % recv)
+                        self.to_screen(f'[debug] Server said: {recv}')
 
         def ws_main():
             reconnect = False
@@ -134,7 +81,7 @@ class NiconicoLiveFD(FileDownloader):
                     if ret is True:
                         return
                 except BaseException as e:
-                    self.to_screen('[%s] %s: Connection error occured, reconnecting after 10 seconds: %s' % ('niconico:live', video_id, str_or_none(e)))
+                    self.to_screen('[{}] {}: Connection error occured, reconnecting after 10 seconds: {}'.format('niconico:live', video_id, str_or_none(e)))
                     time.sleep(10)
                     continue
                 finally:
diff --git a/plugins/youtube_download/yt_dlp/downloader/rtmp.py b/plugins/youtube_download/yt_dlp/downloader/rtmp.py
index 0e09525..1b831e5 100644
--- a/plugins/youtube_download/yt_dlp/downloader/rtmp.py
+++ b/plugins/youtube_download/yt_dlp/downloader/rtmp.py
@@ -8,7 +8,6 @@ from ..utils import (
     Popen,
     check_executable,
     encodeArgument,
-    encodeFilename,
     get_exe_version,
 )
 
@@ -179,15 +178,15 @@ class RtmpFD(FileDownloader):
             return False
 
         while retval in (RD_INCOMPLETE, RD_FAILED) and not test and not live:
-            prevsize = os.path.getsize(encodeFilename(tmpfilename))
-            self.to_screen('[rtmpdump] Downloaded %s bytes' % prevsize)
+            prevsize = os.path.getsize(tmpfilename)
+            self.to_screen(f'[rtmpdump] Downloaded {prevsize} bytes')
             time.sleep(5.0)  # This seems to be needed
-            args = basic_args + ['--resume']
+            args = [*basic_args, '--resume']
             if retval == RD_FAILED:
                 args += ['--skip', '1']
             args = [encodeArgument(a) for a in args]
             retval = run_rtmpdump(args)
-            cursize = os.path.getsize(encodeFilename(tmpfilename))
+            cursize = os.path.getsize(tmpfilename)
             if prevsize == cursize and retval == RD_FAILED:
                 break
             # Some rtmp streams seem abort after ~ 99.8%. Don't complain for those
@@ -196,8 +195,8 @@ class RtmpFD(FileDownloader):
                 retval = RD_SUCCESS
                 break
         if retval == RD_SUCCESS or (test and retval == RD_INCOMPLETE):
-            fsize = os.path.getsize(encodeFilename(tmpfilename))
-            self.to_screen('[rtmpdump] Downloaded %s bytes' % fsize)
+            fsize = os.path.getsize(tmpfilename)
+            self.to_screen(f'[rtmpdump] Downloaded {fsize} bytes')
             self.try_rename(tmpfilename, filename)
             self._hook_progress({
                 'downloaded_bytes': fsize,
diff --git a/plugins/youtube_download/yt_dlp/downloader/rtsp.py b/plugins/youtube_download/yt_dlp/downloader/rtsp.py
index e89269f..b4b0be7 100644
--- a/plugins/youtube_download/yt_dlp/downloader/rtsp.py
+++ b/plugins/youtube_download/yt_dlp/downloader/rtsp.py
@@ -2,7 +2,7 @@ import os
 import subprocess
 
 from .common import FileDownloader
-from ..utils import check_executable, encodeFilename
+from ..utils import check_executable
 
 
 class RtspFD(FileDownloader):
@@ -26,7 +26,7 @@ class RtspFD(FileDownloader):
 
         retval = subprocess.call(args)
         if retval == 0:
-            fsize = os.path.getsize(encodeFilename(tmpfilename))
+            fsize = os.path.getsize(tmpfilename)
             self.to_screen(f'\r[{args[0]}] {fsize} bytes')
             self.try_rename(tmpfilename, filename)
             self._hook_progress({
diff --git a/plugins/youtube_download/yt_dlp/downloader/youtube_live_chat.py b/plugins/youtube_download/yt_dlp/downloader/youtube_live_chat.py
index c7a8637..ddd912c 100644
--- a/plugins/youtube_download/yt_dlp/downloader/youtube_live_chat.py
+++ b/plugins/youtube_download/yt_dlp/downloader/youtube_live_chat.py
@@ -18,7 +18,7 @@ class YoutubeLiveChatFD(FragmentFD):
 
     def real_download(self, filename, info_dict):
         video_id = info_dict['video_id']
-        self.to_screen('[%s] Downloading live chat' % self.FD_NAME)
+        self.to_screen(f'[{self.FD_NAME}] Downloading live chat')
         if not self.params.get('skip_download') and info_dict['protocol'] == 'youtube_live_chat':
             self.report_warning('Live chat download runs until the livestream ends. '
                                 'If you wish to download the video simultaneously, run a separate yt-dlp instance')
@@ -123,8 +123,8 @@ class YoutubeLiveChatFD(FragmentFD):
                         data,
                         lambda x: x['continuationContents']['liveChatContinuation'], dict) or {}
 
-                    func = (info_dict['protocol'] == 'youtube_live_chat' and parse_actions_live
-                            or frag_index == 1 and try_refresh_replay_beginning
+                    func = ((info_dict['protocol'] == 'youtube_live_chat' and parse_actions_live)
+                            or (frag_index == 1 and try_refresh_replay_beginning)
                             or parse_actions_replay)
                     return (True, *func(live_chat_continuation))
                 except HTTPError as err:
diff --git a/plugins/youtube_download/yt_dlp/extractor/__init__.py b/plugins/youtube_download/yt_dlp/extractor/__init__.py
index 6bfa4bd..a090e94 100644
--- a/plugins/youtube_download/yt_dlp/extractor/__init__.py
+++ b/plugins/youtube_download/yt_dlp/extractor/__init__.py
@@ -1,16 +1,25 @@
 from ..compat.compat_utils import passthrough_module
+from ..globals import extractors as _extractors_context
+from ..globals import plugin_ies as _plugin_ies_context
+from ..plugins import PluginSpec, register_plugin_spec
 
 passthrough_module(__name__, '.extractors')
 del passthrough_module
 
+register_plugin_spec(PluginSpec(
+    module_name='extractor',
+    suffix='IE',
+    destination=_extractors_context,
+    plugin_destination=_plugin_ies_context,
+))
+
 
 def gen_extractor_classes():
     """ Return a list of supported extractors.
     The order does matter; the first extractor matched is the one handling the URL.
     """
-    from .extractors import _ALL_CLASSES
-
-    return _ALL_CLASSES
+    import_extractors()
+    return list(_extractors_context.value.values())
 
 
 def gen_extractors():
@@ -37,6 +46,9 @@ def list_extractors(age_limit=None):
 
 def get_info_extractor(ie_name):
     """Returns the info extractor class with the given ie_name"""
-    from . import extractors
+    import_extractors()
+    return _extractors_context.value[f'{ie_name}IE']
 
-    return getattr(extractors, f'{ie_name}IE')
+
+def import_extractors():
+    from . import extractors  # noqa: F401
diff --git a/plugins/youtube_download/yt_dlp/extractor/_extractors.py b/plugins/youtube_download/yt_dlp/extractor/_extractors.py
index 63bb55e..bb1c3db 100644
--- a/plugins/youtube_download/yt_dlp/extractor/_extractors.py
+++ b/plugins/youtube_download/yt_dlp/extractor/_extractors.py
@@ -1,4 +1,5 @@
 # flake8: noqa: F401
+# isort: off
 
 from .youtube import (  # Youtube is moved to the top to improve performance
     YoutubeIE,
@@ -24,6 +25,8 @@ from .youtube import (  # Youtube is moved to the top to improve performance
     YoutubeConsentRedirectIE,
 )
 
+# isort: on
+
 from .abc import (
     ABCIE,
     ABCIViewIE,
@@ -43,30 +46,37 @@ from .abematv import (
 )
 from .academicearth import AcademicEarthCourseIE
 from .acast import (
-    ACastIE,
     ACastChannelIE,
+    ACastIE,
+)
+from .acfun import (
+    AcFunBangumiIE,
+    AcFunVideoIE,
+)
+from .adn import (
+    ADNIE,
+    ADNSeasonIE,
 )
-from .acfun import AcFunVideoIE, AcFunBangumiIE
-from .adn import ADNIE
 from .adobeconnect import AdobeConnectIE
 from .adobetv import (
+    AdobeTVChannelIE,
     AdobeTVEmbedIE,
     AdobeTVIE,
     AdobeTVShowIE,
-    AdobeTVChannelIE,
     AdobeTVVideoIE,
 )
 from .adultswim import AdultSwimIE
 from .aenetworks import (
-    AENetworksIE,
     AENetworksCollectionIE,
+    AENetworksIE,
     AENetworksShowIE,
-    HistoryTopicIE,
-    HistoryPlayerIE,
     BiographyIE,
+    HistoryPlayerIE,
+    HistoryTopicIE,
 )
 from .aeonco import AeonCoIE
 from .afreecatv import (
+    AfreecaTVCatchStoryIE,
     AfreecaTVIE,
     AfreecaTVLiveIE,
     AfreecaTVUserIE,
@@ -77,74 +87,90 @@ from .agora import (
     WyborczaPodcastIE,
     WyborczaVideoIE,
 )
-from .airmozilla import AirMozillaIE
 from .airtv import AirTVIE
 from .aitube import AitubeKZVideoIE
+from .aliexpress import AliExpressLiveIE
 from .aljazeera import AlJazeeraIE
-from .alphaporno import AlphaPornoIE
-from .amara import AmaraIE
-from .alura import (
-    AluraIE,
-    AluraCourseIE
+from .allocine import AllocineIE
+from .allstar import (
+    AllstarIE,
+    AllstarProfileIE,
 )
-from .amcnetworks import AMCNetworksIE
+from .alphaporno import AlphaPornoIE
+from .alsace20tv import (
+    Alsace20TVEmbedIE,
+    Alsace20TVIE,
+)
+from .altcensored import (
+    AltCensoredChannelIE,
+    AltCensoredIE,
+)
+from .alura import (
+    AluraCourseIE,
+    AluraIE,
+)
+from .amadeustv import AmadeusTVIE
+from .amara import AmaraIE
 from .amazon import (
-    AmazonStoreIE,
     AmazonReviewsIE,
+    AmazonStoreIE,
 )
 from .amazonminitv import (
     AmazonMiniTVIE,
     AmazonMiniTVSeasonIE,
     AmazonMiniTVSeriesIE,
 )
+from .amcnetworks import AMCNetworksIE
 from .americastestkitchen import (
     AmericasTestKitchenIE,
     AmericasTestKitchenSeasonIE,
 )
 from .anchorfm import AnchorFMEpisodeIE
 from .angel import AngelIE
+from .antenna import (
+    Ant1NewsGrArticleIE,
+    Ant1NewsGrEmbedIE,
+    AntennaGrWatchIE,
+)
 from .anvato import AnvatoIE
 from .aol import AolIE
-from .allocine import AllocineIE
-from .aliexpress import AliExpressLiveIE
-from .alsace20tv import (
-    Alsace20TVIE,
-    Alsace20TVEmbedIE,
-)
 from .apa import APAIE
 from .aparat import AparatIE
 from .appleconnect import AppleConnectIE
+from .applepodcasts import ApplePodcastsIE
 from .appletrailers import (
     AppleTrailersIE,
     AppleTrailersSectionIE,
 )
-from .applepodcasts import ApplePodcastsIE
 from .archiveorg import (
     ArchiveOrgIE,
     YoutubeWebArchiveIE,
-    VLiveWebArchiveIE,
 )
 from .arcpublishing import ArcPublishingIE
-from .arkena import ArkenaIE
 from .ard import (
-    ARDBetaMediathekIE,
     ARDIE,
-    ARDMediathekIE,
+    ARDBetaMediathekIE,
+    ARDMediathekCollectionIE,
+)
+from .arkena import ArkenaIE
+from .arnes import ArnesIE
+from .art19 import (
+    Art19IE,
+    Art19ShowIE,
 )
 from .arte import (
-    ArteTVIE,
-    ArteTVEmbedIE,
-    ArteTVPlaylistIE,
     ArteTVCategoryIE,
+    ArteTVEmbedIE,
+    ArteTVIE,
+    ArteTVPlaylistIE,
 )
-from .arnes import ArnesIE
-from .asiancrush import (
-    AsianCrushIE,
-    AsianCrushPlaylistIE,
+from .asobichannel import (
+    AsobiChannelIE,
+    AsobiChannelTagURLIE,
 )
+from .asobistage import AsobiStageIE
 from .atresplayer import AtresPlayerIE
 from .atscaleconf import AtScaleConfEventIE
-from .atttechchannel import ATTTechChannelIE
 from .atvat import ATVAtIE
 from .audimedia import AudiMediaIE
 from .audioboom import AudioBoomIE
@@ -152,56 +178,65 @@ from .audiodraft import (
     AudiodraftCustomIE,
     AudiodraftGenericIE,
 )
-from .audiomack import AudiomackIE, AudiomackAlbumIE
+from .audiomack import (
+    AudiomackAlbumIE,
+    AudiomackIE,
+)
 from .audius import (
     AudiusIE,
-    AudiusTrackIE,
     AudiusPlaylistIE,
     AudiusProfileIE,
+    AudiusTrackIE,
 )
 from .awaan import (
     AWAANIE,
-    AWAANVideoIE,
     AWAANLiveIE,
     AWAANSeasonIE,
+    AWAANVideoIE,
 )
+from .axs import AxsIE
 from .azmedien import AZMedienIE
 from .baidu import BaiduVideoIE
 from .banbye import (
-    BanByeIE,
     BanByeChannelIE,
+    BanByeIE,
 )
 from .bandaichannel import BandaiChannelIE
 from .bandcamp import (
-    BandcampIE,
     BandcampAlbumIE,
-    BandcampWeeklyIE,
+    BandcampIE,
     BandcampUserIE,
+    BandcampWeeklyIE,
+)
+from .bandlab import (
+    BandlabIE,
+    BandlabPlaylistIE,
 )
 from .bannedvideo import BannedVideoIE
 from .bbc import (
-    BBCCoUkIE,
+    BBCIE,
     BBCCoUkArticleIE,
+    BBCCoUkIE,
     BBCCoUkIPlayerEpisodesIE,
     BBCCoUkIPlayerGroupIE,
     BBCCoUkPlaylistIE,
-    BBCIE,
 )
+from .beacon import BeaconTvIE
+from .beatbump import (
+    BeatBumpPlaylistIE,
+    BeatBumpVideoIE,
+)
+from .beatport import BeatportIE
 from .beeg import BeegIE
 from .behindkink import BehindKinkIE
 from .bellmedia import BellMediaIE
-from .beatbump import (
-    BeatBumpVideoIE,
-    BeatBumpPlaylistIE,
-)
-from .beatport import BeatportIE
 from .berufetv import BerufeTVIE
 from .bet import BetIE
 from .bfi import BFIPlayerIE
 from .bfmtv import (
     BFMTVIE,
-    BFMTVLiveIE,
     BFMTVArticleIE,
+    BFMTVLiveIE,
 )
 from .bibeltv import (
     BibelTVLiveIE,
@@ -212,112 +247,116 @@ from .bigflix import BigflixIE
 from .bigo import BigoIE
 from .bild import BildIE
 from .bilibili import (
-    BiliBiliIE,
-    BiliBiliBangumiIE,
-    BiliBiliBangumiSeasonIE,
-    BiliBiliBangumiMediaIE,
-    BiliBiliSearchIE,
-    BilibiliCategoryIE,
-    BilibiliAudioIE,
     BilibiliAudioAlbumIE,
+    BilibiliAudioIE,
+    BiliBiliBangumiIE,
+    BiliBiliBangumiMediaIE,
+    BiliBiliBangumiSeasonIE,
+    BilibiliCategoryIE,
+    BilibiliCheeseIE,
+    BilibiliCheeseSeasonIE,
+    BilibiliCollectionListIE,
+    BiliBiliDynamicIE,
+    BilibiliFavoritesListIE,
+    BiliBiliIE,
     BiliBiliPlayerIE,
-    BilibiliSpaceVideoIE,
+    BilibiliPlaylistIE,
+    BiliBiliSearchIE,
+    BilibiliSeriesListIE,
     BilibiliSpaceAudioIE,
-    BilibiliSpacePlaylistIE,
+    BilibiliSpaceVideoIE,
+    BilibiliWatchlaterIE,
     BiliIntlIE,
     BiliIntlSeriesIE,
     BiliLiveIE,
 )
 from .biobiochiletv import BioBioChileTVIE
 from .bitchute import (
-    BitChuteIE,
     BitChuteChannelIE,
+    BitChuteIE,
 )
-from .bitwave import (
-    BitwaveReplayIE,
-    BitwaveStreamIE,
-)
-from .biqle import BIQLEIE
 from .blackboardcollaborate import BlackboardCollaborateIE
 from .bleacherreport import (
-    BleacherReportIE,
     BleacherReportCMSIE,
+    BleacherReportIE,
 )
 from .blerp import BlerpIE
 from .blogger import BloggerIE
 from .bloomberg import BloombergIE
+from .bluesky import BlueskyIE
 from .bokecc import BokeCCIE
 from .bongacams import BongaCamsIE
+from .boosty import BoostyIE
 from .bostonglobe import BostonGlobeIE
 from .box import BoxIE
 from .boxcast import BoxCastVideoIE
 from .bpb import BpbIE
-from .br import (
-    BRIE,
-    BRMediathekIE,
-)
-from .bravotv import BravoTVIE
+from .br import BRIE
 from .brainpop import (
-    BrainPOPIE,
-    BrainPOPJrIE,
     BrainPOPELLIE,
     BrainPOPEspIE,
     BrainPOPFrIE,
+    BrainPOPIE,
     BrainPOPIlIE,
+    BrainPOPJrIE,
 )
-from .breakcom import BreakIE
+from .bravotv import BravoTVIE
 from .breitbart import BreitBartIE
 from .brightcove import (
     BrightcoveLegacyIE,
     BrightcoveNewIE,
 )
-from .businessinsider import BusinessInsiderIE
+from .brilliantpala import (
+    BrilliantpalaClassesIE,
+    BrilliantpalaElearnIE,
+)
 from .bundesliga import BundesligaIE
+from .bundestag import BundestagIE
+from .bunnycdn import BunnyCdnIE
+from .businessinsider import BusinessInsiderIE
 from .buzzfeed import BuzzFeedIE
 from .byutv import BYUtvIE
 from .c56 import C56IE
-from .cableav import CableAVIE
+from .caffeinetv import CaffeineTVIE
 from .callin import CallinIE
 from .caltrans import CaltransIE
 from .cam4 import CAM4IE
 from .camdemy import (
+    CamdemyFolderIE,
     CamdemyIE,
-    CamdemyFolderIE
 )
 from .camfm import (
     CamFMEpisodeIE,
-    CamFMShowIE
+    CamFMShowIE,
 )
 from .cammodels import CamModelsIE
 from .camsoda import CamsodaIE
 from .camtasia import CamtasiaEmbedIE
-from .camwithher import CamWithHerIE
+from .canal1 import Canal1IE
 from .canalalpha import CanalAlphaIE
-from .canalplus import CanalplusIE
 from .canalc2 import Canalc2IE
-from .carambatv import (
-    CarambaTVIE,
-    CarambaTVPageIE,
-)
+from .canalplus import CanalplusIE
+from .canalsurmas import CanalsurmasIE
+from .caracoltv import CaracolTvPlayIE
 from .cartoonnetwork import CartoonNetworkIE
 from .cbc import (
     CBCIE,
-    CBCPlayerIE,
     CBCGemIE,
-    CBCGemPlaylistIE,
     CBCGemLiveIE,
+    CBCGemPlaylistIE,
+    CBCPlayerIE,
+    CBCPlayerPlaylistIE,
 )
 from .cbs import (
     CBSIE,
     ParamountPressExpressIE,
 )
-from .cbsinteractive import CBSInteractiveIE
 from .cbsnews import (
+    CBSLocalArticleIE,
+    CBSLocalIE,
+    CBSLocalLiveIE,
     CBSNewsEmbedIE,
     CBSNewsIE,
-    CBSLocalIE,
-    CBSLocalArticleIE,
-    CBSLocalLiveIE,
     CBSNewsLiveIE,
     CBSNewsLiveVideoIE,
 )
@@ -332,58 +371,55 @@ from .ccc import (
 )
 from .ccma import CCMAIE
 from .cctv import CCTVIE
-from .cda import CDAIE
+from .cda import (
+    CDAIE,
+    CDAFolderIE,
+)
 from .cellebrite import CellebriteIE
 from .ceskatelevize import CeskaTelevizeIE
 from .cgtn import CGTNIE
-from .channel9 import Channel9IE
 from .charlierose import CharlieRoseIE
 from .chaturbate import ChaturbateIE
 from .chilloutzone import ChilloutzoneIE
-from .chingari import (
-    ChingariIE,
-    ChingariUserIE,
+from .chzzk import (
+    CHZZKLiveIE,
+    CHZZKVideoIE,
 )
-from .chirbit import (
-    ChirbitIE,
-    ChirbitProfileIE,
-)
-from .cinchcast import CinchcastIE
 from .cinemax import CinemaxIE
 from .cinetecamilano import CinetecaMilanoIE
+from .cineverse import (
+    CineverseDetailsIE,
+    CineverseIE,
+)
 from .ciscolive import (
-    CiscoLiveSessionIE,
     CiscoLiveSearchIE,
+    CiscoLiveSessionIE,
 )
 from .ciscowebex import CiscoWebexIE
 from .cjsw import CJSWIE
 from .clipchamp import ClipchampIE
-from .cliphunter import CliphunterIE
 from .clippit import ClippitIE
 from .cliprs import ClipRsIE
-from .clipsyndicate import ClipsyndicateIE
 from .closertotruth import CloserToTruthIE
 from .cloudflarestream import CloudflareStreamIE
-from .cloudy import CloudyIE
+from .cloudycdn import CloudyCDNIE
 from .clubic import ClubicIE
 from .clyp import ClypIE
 from .cmt import CMTIE
-from .cnbc import (
-    CNBCIE,
-    CNBCVideoIE,
-)
+from .cnbc import CNBCVideoIE
 from .cnn import (
     CNNIE,
-    CNNBlogsIE,
-    CNNArticleIE,
     CNNIndonesiaIE,
 )
-from .coub import CoubIE
 from .comedycentral import (
     ComedyCentralIE,
     ComedyCentralTVIE,
 )
-from .commonmistakes import CommonMistakesIE, UnicodeBOMIE
+from .commonmistakes import (
+    BlobIE,
+    CommonMistakesIE,
+    UnicodeBOMIE,
+)
 from .commonprotocols import (
     MmsIE,
     RtmpIE,
@@ -392,50 +428,51 @@ from .commonprotocols import (
 from .condenast import CondeNastIE
 from .contv import CONtvIE
 from .corus import CorusIE
+from .coub import CoubIE
+from .cozytv import CozyTVIE
 from .cpac import (
     CPACIE,
     CPACPlaylistIE,
 )
-from .cozytv import CozyTVIE
 from .cracked import CrackedIE
 from .crackle import CrackleIE
 from .craftsy import CraftsyIE
 from .crooksandliars import CrooksAndLiarsIE
 from .crowdbunker import (
-    CrowdBunkerIE,
     CrowdBunkerChannelIE,
+    CrowdBunkerIE,
 )
 from .crtvg import CrtvgIE
-from .crunchyroll import (
-    CrunchyrollBetaIE,
-    CrunchyrollBetaShowIE,
-    CrunchyrollMusicIE,
-    CrunchyrollArtistIE,
+from .cspan import (
+    CSpanCongressIE,
+    CSpanIE,
 )
-from .cspan import CSpanIE, CSpanCongressIE
 from .ctsnews import CtsNewsIE
 from .ctv import CTVIE
 from .ctvnews import CTVNewsIE
 from .cultureunplugged import CultureUnpluggedIE
 from .curiositystream import (
-    CuriosityStreamIE,
     CuriosityStreamCollectionsIE,
+    CuriosityStreamIE,
     CuriosityStreamSeriesIE,
 )
-from .cwtv import CWTVIE
+from .cwtv import (
+    CWTVIE,
+    CWTVMovieIE,
+)
 from .cybrary import (
+    CybraryCourseIE,
     CybraryIE,
-    CybraryCourseIE
 )
 from .dacast import (
-    DacastVODIE,
     DacastPlaylistIE,
+    DacastVODIE,
 )
-from .daftsex import DaftsexIE
 from .dailymail import DailyMailIE
 from .dailymotion import (
     DailymotionIE,
     DailymotionPlaylistIE,
+    DailymotionSearchIE,
     DailymotionUserIE,
 )
 from .dailywire import (
@@ -446,61 +483,76 @@ from .damtomo import (
     DamtomoRecordIE,
     DamtomoVideoIE,
 )
+from .dangalplay import (
+    DangalPlayIE,
+    DangalPlaySeasonIE,
+)
 from .daum import (
-    DaumIE,
     DaumClipIE,
+    DaumIE,
     DaumPlaylistIE,
     DaumUserIE,
 )
 from .daystar import DaystarClipIE
 from .dbtv import DBTVIE
 from .dctp import DctpTvIE
-from .deezer import (
-    DeezerPlaylistIE,
-    DeezerAlbumIE,
-)
 from .democracynow import DemocracynowIE
 from .detik import DetikEmbedIE
+from .deuxm import (
+    DeuxMIE,
+    DeuxMNewsIE,
+)
+from .dfb import DFBIE
+from .dhm import DHMIE
+from .digitalconcerthall import DigitalConcertHallIE
+from .digiteka import DigitekaIE
+from .digiview import DigiviewIE
+from .discogs import DiscogsReleasePlaylistIE
+from .disney import DisneyIE
+from .dispeak import DigitallySpeakingIE
 from .dlf import (
     DLFIE,
     DLFCorpusIE,
 )
-from .dfb import DFBIE
-from .dhm import DHMIE
-from .digg import DiggIE
-from .dotsub import DotsubIE
+from .dlive import (
+    DLiveStreamIE,
+    DLiveVODIE,
+)
 from .douyutv import (
     DouyuShowIE,
     DouyuTVIE,
 )
 from .dplay import (
-    DPlayIE,
-    DiscoveryPlusIE,
-    HGTVDeIE,
-    GoDiscoveryIE,
-    TravelChannelIE,
-    CookingChannelIE,
-    HGTVUsaIE,
-    FoodNetworkIE,
-    InvestigationDiscoveryIE,
-    DestinationAmericaIE,
-    AmHistoryChannelIE,
-    ScienceChannelIE,
-    DIYNetworkIE,
-    DiscoveryLifeIE,
-    AnimalPlanetIE,
     TLCIE,
-    MotorTrendIE,
-    MotorTrendOnDemandIE,
-    DiscoveryPlusIndiaIE,
+    AmHistoryChannelIE,
+    AnimalPlanetIE,
+    CookingChannelIE,
+    DestinationAmericaIE,
+    DiscoveryLifeIE,
     DiscoveryNetworksDeIE,
+    DiscoveryPlusIE,
+    DiscoveryPlusIndiaIE,
+    DiscoveryPlusIndiaShowIE,
     DiscoveryPlusItalyIE,
     DiscoveryPlusItalyShowIE,
-    DiscoveryPlusIndiaShowIE,
-    GlobalCyclingNetworkPlusIE,
+    DPlayIE,
+    FoodNetworkIE,
+    GoDiscoveryIE,
+    HGTVDeIE,
+    HGTVUsaIE,
+    InvestigationDiscoveryIE,
+    ScienceChannelIE,
+    TravelChannelIE,
 )
-from .dreisat import DreiSatIE
 from .drbonanza import DRBonanzaIE
+from .dreisat import DreiSatIE
+from .drooble import DroobleIE
+from .dropbox import DropboxIE
+from .dropout import (
+    DropoutIE,
+    DropoutSeasonIE,
+)
+from .drtalks import DrTalksIE
 from .drtuber import DrTuberIE
 from .drtv import (
     DRTVIE,
@@ -509,97 +561,86 @@ from .drtv import (
     DRTVSeriesIE,
 )
 from .dtube import DTubeIE
-from .dvtv import DVTVIE
 from .duboku import (
     DubokuIE,
-    DubokuPlaylistIE
+    DubokuPlaylistIE,
 )
 from .dumpert import DumpertIE
-from .defense import DefenseGouvFrIE
-from .deuxm import (
-    DeuxMIE,
-    DeuxMNewsIE
-)
-from .digitalconcerthall import DigitalConcertHallIE
-from .discogs import DiscogsReleasePlaylistIE
-from .discovery import DiscoveryIE
-from .disney import DisneyIE
-from .dispeak import DigitallySpeakingIE
-from .dropbox import DropboxIE
-from .dropout import (
-    DropoutSeasonIE,
-    DropoutIE
-)
+from .duoplay import DuoplayIE
+from .dvtv import DVTVIE
 from .dw import (
     DWIE,
     DWArticleIE,
 )
-from .eagleplatform import EaglePlatformIE, ClipYouEmbedIE
+from .eagleplatform import (
+    ClipYouEmbedIE,
+    EaglePlatformIE,
+)
 from .ebaumsworld import EbaumsWorldIE
 from .ebay import EbayIE
-from .echomsk import EchoMskIE
 from .egghead import (
     EggheadCourseIE,
     EggheadLessonIE,
 )
-from .ehow import EHowIE
-from .eighttracks import EightTracksIE
-from .einthusan import EinthusanIE
-from .eitb import EitbIE
-from .elevensports import ElevenSportsIE
-from .ellentube import (
-    EllenTubeIE,
-    EllenTubeVideoIE,
-    EllenTubePlaylistIE,
+from .eggs import (
+    EggsArtistIE,
+    EggsIE,
 )
+from .eighttracks import EightTracksIE
+from .eitb import EitbIE
+from .elementorembed import ElementorEmbedIE
 from .elonet import ElonetIE
 from .elpais import ElPaisIE
+from .eltrecetv import ElTreceTVIE
 from .embedly import EmbedlyIE
-from .engadget import EngadgetIE
 from .epicon import (
     EpiconIE,
     EpiconSeriesIE,
 )
+from .epidemicsound import EpidemicSoundIE
+from .eplus import EplusIbIE
 from .epoch import EpochIE
 from .eporner import EpornerIE
+from .erocast import ErocastIE
 from .eroprofile import (
-    EroProfileIE,
     EroProfileAlbumIE,
+    EroProfileIE,
 )
+from .err import ERRJupiterIE
 from .ertgr import (
     ERTFlixCodenameIE,
     ERTFlixIE,
     ERTWebtvEmbedIE,
 )
-from .escapist import EscapistIE
 from .espn import (
     ESPNIE,
-    WatchESPNIE,
     ESPNArticleIE,
-    FiveThirtyEightIE,
     ESPNCricInfoIE,
+    FiveThirtyEightIE,
+    WatchESPNIE,
 )
-from .esri import EsriVideoIE
 from .ettutv import EttuTvIE
-from .europa import EuropaIE, EuroParlWebstreamIE
+from .europa import (
+    EuropaIE,
+    EuroParlWebstreamIE,
+)
 from .europeantour import EuropeanTourIE
 from .eurosport import EurosportIE
 from .euscreen import EUScreenIE
-from .expotv import ExpoTVIE
 from .expressen import ExpressenIE
-from .extremetube import ExtremeTubeIE
 from .eyedotv import EyedoTVIE
 from .facebook import (
+    FacebookAdsIE,
     FacebookIE,
     FacebookPluginsVideoIE,
     FacebookRedirectURLIE,
     FacebookReelIE,
 )
 from .fancode import (
+    FancodeLiveIE,
     FancodeVodIE,
-    FancodeLiveIE
 )
-
+from .fathom import FathomIE
 from .faz import FazIE
 from .fc2 import (
     FC2IE,
@@ -608,136 +649,144 @@ from .fc2 import (
 )
 from .fczenit import FczenitIE
 from .fifa import FifaIE
-from .filmmodu import FilmmoduIE
 from .filmon import (
-    FilmOnIE,
     FilmOnChannelIE,
+    FilmOnIE,
 )
 from .filmweb import FilmwebIE
 from .firsttv import FirstTVIE
 from .fivetv import FiveTVIE
+from .flextv import FlexTVIE
 from .flickr import FlickrIE
+from .floatplane import (
+    FloatplaneChannelIE,
+    FloatplaneIE,
+)
 from .folketinget import FolketingetIE
 from .footyroom import FootyRoomIE
 from .formula1 import Formula1IE
 from .fourtube import (
     FourTubeIE,
-    PornTubeIE,
-    PornerBrosIE,
     FuxIE,
-)
-from .fourzerostudio import (
-    FourZeroStudioArchiveIE,
-    FourZeroStudioClipIE,
+    PornerBrosIE,
+    PornTubeIE,
 )
 from .fox import FOXIE
 from .fox9 import (
     FOX9IE,
     FOX9NewsIE,
 )
-from .foxgay import FoxgayIE
 from .foxnews import (
-    FoxNewsIE,
     FoxNewsArticleIE,
+    FoxNewsIE,
     FoxNewsVideoIE,
 )
 from .foxsports import FoxSportsIE
 from .fptplay import FptplayIE
+from .francaisfacile import FrancaisFacileIE
 from .franceinter import FranceInterIE
 from .francetv import (
     FranceTVIE,
-    FranceTVSiteIE,
     FranceTVInfoIE,
+    FranceTVSiteIE,
 )
 from .freesound import FreesoundIE
 from .freespeech import FreespeechIE
-from .frontendmasters import (
-    FrontendMastersIE,
-    FrontendMastersLessonIE,
-    FrontendMastersCourseIE
-)
 from .freetv import (
     FreeTvIE,
     FreeTvMoviesIE,
 )
-from .fujitv import FujiTVFODPlus7IE
-from .funimation import (
-    FunimationIE,
-    FunimationPageIE,
-    FunimationShowIE,
+from .frontendmasters import (
+    FrontendMastersCourseIE,
+    FrontendMastersIE,
+    FrontendMastersLessonIE,
 )
+from .fujitv import FujiTVFODPlus7IE
 from .funk import FunkIE
 from .funker530 import Funker530IE
-from .fusion import FusionIE
 from .fuyintv import FuyinTVIE
 from .gab import (
-    GabTVIE,
     GabIE,
+    GabTVIE,
 )
 from .gaia import GaiaIE
-from .gameinformer import GameInformerIE
+from .gamedevtv import GameDevTVDashboardIE
 from .gamejolt import (
-    GameJoltIE,
-    GameJoltUserIE,
+    GameJoltCommunityIE,
     GameJoltGameIE,
     GameJoltGameSoundtrackIE,
-    GameJoltCommunityIE,
+    GameJoltIE,
     GameJoltSearchIE,
+    GameJoltUserIE,
 )
 from .gamespot import GameSpotIE
 from .gamestar import GameStarIE
 from .gaskrank import GaskrankIE
 from .gazeta import GazetaIE
+from .gbnews import GBNewsIE
 from .gdcvault import GDCVaultIE
 from .gedidigital import GediDigitalIE
 from .generic import GenericIE
+from .genericembeds import (
+    HTML5MediaEmbedIE,
+    QuotedHTMLIE,
+)
 from .genius import (
     GeniusIE,
     GeniusLyricsIE,
 )
+from .germanupa import GermanupaIE
+from .getcourseru import (
+    GetCourseRuIE,
+    GetCourseRuPlayerIE,
+)
 from .gettr import (
     GettrIE,
     GettrStreamingIE,
 )
-from .gfycat import GfycatIE
 from .giantbomb import GiantBombIE
-from .giga import GigaIE
 from .glide import GlideIE
 from .globalplayer import (
+    GlobalPlayerAudioEpisodeIE,
+    GlobalPlayerAudioIE,
     GlobalPlayerLiveIE,
     GlobalPlayerLivePlaylistIE,
-    GlobalPlayerAudioIE,
-    GlobalPlayerAudioEpisodeIE,
-    GlobalPlayerVideoIE
+    GlobalPlayerVideoIE,
 )
 from .globo import (
-    GloboIE,
     GloboArticleIE,
+    GloboIE,
+)
+from .glomex import (
+    GlomexEmbedIE,
+    GlomexIE,
 )
 from .gmanetwork import GMANetworkVideoIE
 from .go import GoIE
+from .godresource import GodResourceIE
 from .godtube import GodTubeIE
 from .gofile import GofileIE
 from .golem import GolemIE
 from .goodgame import GoodGameIE
 from .googledrive import (
-    GoogleDriveIE,
     GoogleDriveFolderIE,
+    GoogleDriveIE,
 )
 from .googlepodcasts import (
-    GooglePodcastsIE,
     GooglePodcastsFeedIE,
+    GooglePodcastsIE,
 )
 from .googlesearch import GoogleSearchIE
-from .gopro import GoProIE
 from .goplay import GoPlayIE
+from .gopro import GoProIE
 from .goshgay import GoshgayIE
 from .gotostage import GoToStageIE
 from .gputechconf import GPUTechConfIE
+from .graspop import GraspopIE
 from .gronkh import (
-    GronkhIE,
     GronkhFeedIE,
-    GronkhVodsIE
+    GronkhIE,
+    GronkhVodsIE,
 )
 from .groupon import GrouponIE
 from .harpodeon import HarpodeonIE
@@ -745,13 +794,11 @@ from .hbo import HBOIE
 from .hearthisat import HearThisAtIE
 from .heise import HeiseIE
 from .hellporno import HellPornoIE
-from .helsinki import HelsinkiIE
 from .hgtv import HGTVComShowIE
-from .hketv import HKETVIE
 from .hidive import HiDiveIE
 from .historicfilms import HistoricFilmsIE
-from .hitbox import HitboxIE, HitboxLiveIE
 from .hitrecord import HitRecordIE
+from .hketv import HKETVIE
 from .hollywoodreporter import (
     HollywoodReporterIE,
     HollywoodReporterPlaylistIE,
@@ -760,13 +807,11 @@ from .holodex import HolodexIE
 from .hotnewhiphop import HotNewHipHopIE
 from .hotstar import (
     HotStarIE,
-    HotStarPrefixIE,
     HotStarPlaylistIE,
+    HotStarPrefixIE,
     HotStarSeasonIE,
     HotStarSeriesIE,
 )
-from .howcast import HowcastIE
-from .howstuffworks import HowStuffWorksIE
 from .hrefli import HrefLiRedirectIE
 from .hrfensehen import HRFernsehenIE
 from .hrti import (
@@ -774,48 +819,49 @@ from .hrti import (
     HRTiPlaylistIE,
 )
 from .hse import (
-    HSEShowIE,
     HSEProductIE,
-)
-from .genericembeds import (
-    HTML5MediaEmbedIE,
-    QuotedHTMLIE,
+    HSEShowIE,
 )
 from .huajiao import HuajiaoIE
-from .huya import HuyaLiveIE
 from .huffpost import HuffPostIE
 from .hungama import (
+    HungamaAlbumPlaylistIE,
     HungamaIE,
     HungamaSongIE,
-    HungamaAlbumPlaylistIE,
+)
+from .huya import (
+    HuyaLiveIE,
+    HuyaVideoIE,
 )
 from .hypem import HypemIE
 from .hypergryph import MonsterSirenHypergryphMusicIE
 from .hytale import HytaleIE
 from .icareus import IcareusIE
 from .ichinanalive import (
-    IchinanaLiveIE,
     IchinanaLiveClipIE,
+    IchinanaLiveIE,
+    IchinanaLiveVODIE,
 )
 from .idolplus import IdolPlusIE
 from .ign import (
     IGNIE,
-    IGNVideoIE,
     IGNArticleIE,
+    IGNVideoIE,
 )
 from .iheart import (
     IHeartRadioIE,
     IHeartRadioPodcastIE,
 )
+from .ilpost import IlPostIE
 from .iltalehti import IltalehtiIE
 from .imdb import (
     ImdbIE,
-    ImdbListIE
+    ImdbListIE,
 )
 from .imgur import (
-    ImgurIE,
     ImgurAlbumIE,
     ImgurGalleryIE,
+    ImgurIE,
 )
 from .ina import InaIE
 from .inc import IncIE
@@ -824,20 +870,20 @@ from .infoq import InfoQIE
 from .instagram import (
     InstagramIE,
     InstagramIOSIE,
-    InstagramUserIE,
-    InstagramTagIE,
     InstagramStoryIE,
+    InstagramTagIE,
+    InstagramUserIE,
 )
 from .internazionale import InternazionaleIE
 from .internetvideoarchive import InternetVideoArchiveIE
 from .iprima import (
+    IPrimaCNNIE,
     IPrimaIE,
-    IPrimaCNNIE
 )
 from .iqiyi import (
-    IqiyiIE,
+    IqAlbumIE,
     IqIE,
-    IqAlbumIE
+    IqiyiIE,
 )
 from .islamchannel import (
     IslamChannelIE,
@@ -845,18 +891,19 @@ from .islamchannel import (
 )
 from .israelnationalnews import IsraelNationalNewsIE
 from .itprotv import (
+    ITProTVCourseIE,
     ITProTVIE,
-    ITProTVCourseIE
 )
 from .itv import (
-    ITVIE,
     ITVBTCCIE,
+    ITVIE,
 )
 from .ivi import (
+    IviCompilationIE,
     IviIE,
-    IviCompilationIE
 )
 from .ivideon import IvideonIE
+from .ivoox import IvooxIE
 from .iwara import (
     IwaraIE,
     IwaraPlaylistIE,
@@ -864,92 +911,108 @@ from .iwara import (
 )
 from .ixigua import IxiguaIE
 from .izlesene import IzleseneIE
-from .jable import (
-    JableIE,
-    JablePlaylistIE,
-)
 from .jamendo import (
-    JamendoIE,
     JamendoAlbumIE,
+    JamendoIE,
 )
 from .japandiet import (
+    SangiinIE,
+    SangiinInstructionIE,
     ShugiinItvLiveIE,
     ShugiinItvLiveRoomIE,
     ShugiinItvVodIE,
-    SangiinInstructionIE,
-    SangiinIE,
 )
 from .jeuxvideo import JeuxVideoIE
-from .jove import JoveIE
+from .jiocinema import (
+    JioCinemaIE,
+    JioCinemaSeriesIE,
+)
+from .jiosaavn import (
+    JioSaavnAlbumIE,
+    JioSaavnPlaylistIE,
+    JioSaavnSongIE,
+)
 from .joj import JojIE
+from .joqrag import JoqrAgIE
+from .jove import JoveIE
 from .jstream import JStreamIE
+from .jtbc import (
+    JTBCIE,
+    JTBCProgramIE,
+)
 from .jwplatform import JWPlatformIE
 from .kakao import KakaoIE
 from .kaltura import KalturaIE
-from .kanal2 import Kanal2IE
 from .kankanews import KankaNewsIE
 from .karaoketv import KaraoketvIE
-from .karrierevideos import KarriereVideosIE
-from .keezmovies import KeezMoviesIE
 from .kelbyone import KelbyOneIE
+from .kenh14 import (
+    Kenh14PlaylistIE,
+    Kenh14VideoIE,
+)
 from .khanacademy import (
     KhanAcademyIE,
     KhanAcademyUnitIE,
 )
 from .kick import (
+    KickClipIE,
     KickIE,
     KickVODIE,
 )
 from .kicker import KickerIE
 from .kickstarter import KickStarterIE
+from .kika import (
+    KikaIE,
+    KikaPlaylistIE,
+)
 from .kinja import KinjaEmbedIE
 from .kinopoisk import KinoPoiskIE
 from .kommunetv import KommunetvIE
 from .kompas import KompasVideoIE
-from .konserthusetplay import KonserthusetPlayIE
 from .koo import KooIE
-from .kth import KTHIE
 from .krasview import KrasViewIE
+from .kth import KTHIE
 from .ku6 import Ku6IE
-from .kusi import KUSIIE
+from .kukululive import KukuluLiveIE
 from .kuwo import (
-    KuwoIE,
     KuwoAlbumIE,
-    KuwoChartIE,
-    KuwoSingerIE,
     KuwoCategoryIE,
+    KuwoChartIE,
+    KuwoIE,
     KuwoMvIE,
+    KuwoSingerIE,
 )
 from .la7 import (
     LA7IE,
     LA7PodcastEpisodeIE,
     LA7PodcastIE,
 )
-from .laola1tv import (
-    Laola1TvEmbedIE,
-    Laola1TvIE,
-    EHFTVIE,
-    ITTFIE,
+from .laracasts import (
+    LaracastsIE,
+    LaracastsPlaylistIE,
 )
 from .lastfm import (
     LastFMIE,
     LastFMPlaylistIE,
     LastFMUserIE,
 )
+from .laxarxames import LaXarxaMesIE
 from .lbry import (
     LBRYIE,
     LBRYChannelIE,
+    LBRYPlaylistIE,
 )
 from .lci import LCIIE
 from .lcp import (
-    LcpPlayIE,
     LcpIE,
+    LcpPlayIE,
 )
+from .learningonscreen import LearningOnScreenIE
 from .lecture2go import Lecture2GoIE
 from .lecturio import (
-    LecturioIE,
     LecturioCourseIE,
     LecturioDeCourseIE,
+    LecturioIE,
 )
 from .leeco import (
     LeIE,
@@ -966,24 +1029,24 @@ from .lenta import LentaIE
 from .libraryofcongress import LibraryOfCongressIE
 from .libsyn import LibsynIE
 from .lifenews import (
-    LifeNewsIE,
     LifeEmbedIE,
+    LifeNewsIE,
 )
 from .likee import (
     LikeeIE,
-    LikeeUserIE
+    LikeeUserIE,
 )
 from .limelight import (
-    LimelightMediaIE,
     LimelightChannelIE,
     LimelightChannelListIE,
+    LimelightMediaIE,
 )
 from .linkedin import (
+    LinkedInEventsIE,
     LinkedInIE,
-    LinkedInLearningIE,
     LinkedInLearningCourseIE,
+    LinkedInLearningIE,
 )
-from .linuxacademy import LinuxAcademyIE
 from .liputan6 import Liputan6IE
 from .listennotes import ListenNotesIE
 from .litv import LiTVIE
@@ -994,41 +1057,45 @@ from .livestream import (
     LivestreamShortenerIE,
 )
 from .livestreamfails import LivestreamfailsIE
-from .lnkgo import (
-    LnkGoIE,
-    LnkIE,
+from .lnk import LnkIE
+from .loco import LocoIE
+from .loom import (
+    LoomFolderIE,
+    LoomIE,
 )
-from .localnews8 import LocalNews8IE
 from .lovehomeporn import LoveHomePornIE
 from .lrt import (
     LRTVODIE,
-    LRTStreamIE
+    LRTRadioIE,
+    LRTStreamIE,
 )
-from .lumni import (
-    LumniIE
+from .lsm import (
+    LSMLREmbedIE,
+    LSMLTVEmbedIE,
+    LSMReplayIE,
 )
+from .lumni import LumniIE
 from .lynda import (
+    LyndaCourseIE,
     LyndaIE,
-    LyndaCourseIE
 )
-from .m6 import M6IE
+from .maariv import MaarivIE
 from .magellantv import MagellanTVIE
-from .magentamusik360 import MagentaMusik360IE
+from .magentamusik import MagentaMusikIE
 from .mailru import (
     MailRuIE,
     MailRuMusicIE,
     MailRuMusicSearchIE,
 )
 from .mainstreaming import MainStreamingIE
-from .malltv import MallTVIE
 from .mangomolo import (
-    MangomoloVideoIE,
     MangomoloLiveIE,
+    MangomoloVideoIE,
 )
 from .manoto import (
     ManotoTVIE,
-    ManotoTVShowIE,
     ManotoTVLiveIE,
+    ManotoTVShowIE,
 )
 from .manyvids import ManyVidsIE
 from .maoritv import MaoriTVIE
@@ -1039,17 +1106,19 @@ from .markiza import (
 from .massengeschmacktv import MassengeschmackTVIE
 from .masters import MastersIE
 from .matchtv import MatchTVIE
+from .mbn import MBNIE
 from .mdr import MDRIE
 from .medaltv import MedalTVIE
 from .mediaite import MediaiteIE
 from .mediaklikk import MediaKlikkIE
+from .medialaan import MedialaanIE
 from .mediaset import (
     MediasetIE,
     MediasetShowIE,
 )
 from .mediasite import (
-    MediasiteIE,
     MediasiteCatalogIE,
+    MediasiteIE,
     MediasiteNamedCatalogIE,
 )
 from .mediastream import (
@@ -1059,109 +1128,108 @@ from .mediastream import (
 from .mediaworksnz import MediaWorksNZVODIE
 from .medici import MediciIE
 from .megaphone import MegaphoneIE
+from .megatvcom import (
+    MegaTVComEmbedIE,
+    MegaTVComIE,
+)
 from .meipai import MeipaiIE
 from .melonvod import MelonVODIE
-from .meta import METAIE
-from .metacafe import MetacafeIE
 from .metacritic import MetacriticIE
-from .mgoon import MgoonIE
 from .mgtv import MGTVIE
-from .miaopai import MiaoPaiIE
+from .microsoftembed import (
+    MicrosoftBuildIE,
+    MicrosoftEmbedIE,
+    MicrosoftLearnEpisodeIE,
+    MicrosoftLearnPlaylistIE,
+    MicrosoftLearnSessionIE,
+    MicrosoftMediusIE,
+)
 from .microsoftstream import MicrosoftStreamIE
-from .microsoftvirtualacademy import (
-    MicrosoftVirtualAcademyIE,
-    MicrosoftVirtualAcademyCourseIE,
-)
-from .microsoftembed import MicrosoftEmbedIE
-from .mildom import (
-    MildomIE,
-    MildomVodIE,
-    MildomClipIE,
-    MildomUserVodIE,
-)
 from .minds import (
-    MindsIE,
     MindsChannelIE,
     MindsGroupIE,
+    MindsIE,
 )
-from .ministrygrid import MinistryGridIE
 from .minoto import MinotoIE
-from .miomio import MioMioIE
 from .mirrativ import (
     MirrativIE,
     MirrativUserIE,
 )
 from .mirrorcouk import MirrorCoUKIE
-from .mit import TechTVMITIE, OCWMITIE
+from .mit import (
+    OCWMITIE,
+    TechTVMITIE,
+)
 from .mitele import MiTeleIE
 from .mixch import (
-    MixchIE,
     MixchArchiveIE,
+    MixchIE,
+    MixchMovieIE,
 )
 from .mixcloud import (
     MixcloudIE,
-    MixcloudUserIE,
     MixcloudPlaylistIE,
+    MixcloudUserIE,
 )
 from .mlb import (
     MLBIE,
-    MLBVideoIE,
     MLBTVIE,
     MLBArticleIE,
+    MLBVideoIE,
 )
 from .mlssoccer import MLSSoccerIE
-from .mnet import MnetIE
 from .mocha import MochaVideoIE
-from .moevideo import MoeVideoIE
-from .mofosex import (
-    MofosexIE,
-    MofosexEmbedIE,
-)
+from .mojevideo import MojevideoIE
 from .mojvideo import MojvideoIE
-from .morningstar import MorningstarIE
+from .monstercat import MonstercatIE
 from .motherless import (
-    MotherlessIE,
-    MotherlessGroupIE,
     MotherlessGalleryIE,
+    MotherlessGroupIE,
+    MotherlessIE,
+    MotherlessUploaderIE,
 )
 from .motorsport import MotorsportIE
-from .movieclips import MovieClipsIE
 from .moviepilot import MoviepilotIE
 from .moview import MoviewPlayIE
 from .moviezine import MoviezineIE
 from .movingimage import MovingImageIE
 from .msn import MSNIE
 from .mtv import (
-    MTVIE,
-    MTVVideoIE,
-    MTVServicesEmbeddedIE,
     MTVDEIE,
-    MTVJapanIE,
+    MTVIE,
     MTVItaliaIE,
     MTVItaliaProgrammaIE,
+    MTVJapanIE,
+    MTVServicesEmbeddedIE,
+    MTVVideoIE,
 )
 from .muenchentv import MuenchenTVIE
-from .murrtube import MurrtubeIE, MurrtubeUserIE
+from .murrtube import (
+    MurrtubeIE,
+    MurrtubeUserIE,
+)
 from .museai import MuseAIIE
 from .musescore import MuseScoreIE
 from .musicdex import (
-    MusicdexSongIE,
     MusicdexAlbumIE,
     MusicdexArtistIE,
     MusicdexPlaylistIE,
+    MusicdexSongIE,
+)
+from .mx3 import (
+    Mx3IE,
+    Mx3NeoIE,
+    Mx3VolksmusikIE,
 )
-from .mwave import MwaveIE, MwaveMeetGreetIE
 from .mxplayer import (
     MxplayerIE,
     MxplayerShowIE,
 )
-from .mychannels import MyChannelsIE
-from .myspace import MySpaceIE, MySpaceAlbumIE
-from .myspass import MySpassIE
-from .myvi import (
-    MyviIE,
-    MyviEmbedIE,
+from .myspace import (
+    MySpaceAlbumIE,
+    MySpaceIE,
 )
+from .myspass import MySpassIE
 from .myvideoge import MyVideoGeIE
 from .myvidster import MyVidsterIE
 from .mzaalo import MzaaloIE
@@ -1174,8 +1242,8 @@ from .nate import (
     NateProgramIE,
 )
 from .nationalgeographic import (
-    NationalGeographicVideoIE,
     NationalGeographicTVIE,
+    NationalGeographicVideoIE,
 )
 from .naver import (
     NaverIE,
@@ -1183,12 +1251,12 @@ from .naver import (
     NaverNowIE,
 )
 from .nba import (
-    NBAWatchEmbedIE,
-    NBAWatchIE,
-    NBAWatchCollectionIE,
-    NBAEmbedIE,
     NBAIE,
     NBAChannelIE,
+    NBAEmbedIE,
+    NBAWatchCollectionIE,
+    NBAWatchEmbedIE,
+    NBAWatchIE,
 )
 from .nbc import (
     NBCIE,
@@ -1202,53 +1270,60 @@ from .nbc import (
 )
 from .ndr import (
     NDRIE,
-    NJoyIE,
     NDREmbedBaseIE,
     NDREmbedIE,
     NJoyEmbedIE,
+    NJoyIE,
 )
 from .ndtv import NDTVIE
 from .nebula import (
+    NebulaChannelIE,
+    NebulaClassIE,
     NebulaIE,
     NebulaSubscriptionsIE,
-    NebulaChannelIE,
 )
 from .nekohacker import NekoHackerIE
 from .nerdcubed import NerdCubedFeedIE
-from .netzkino import NetzkinoIE
+from .nest import (
+    NestClipIE,
+    NestIE,
+)
 from .neteasemusic import (
-    NetEaseMusicIE,
     NetEaseMusicAlbumIE,
-    NetEaseMusicSingerIE,
+    NetEaseMusicDjRadioIE,
+    NetEaseMusicIE,
     NetEaseMusicListIE,
     NetEaseMusicMvIE,
     NetEaseMusicProgramIE,
-    NetEaseMusicDjRadioIE,
+    NetEaseMusicSingerIE,
 )
 from .netverse import (
     NetverseIE,
     NetversePlaylistIE,
     NetverseSearchIE,
 )
+from .netzkino import NetzkinoIE
 from .newgrounds import (
     NewgroundsIE,
     NewgroundsPlaylistIE,
     NewgroundsUserIE,
 )
 from .newspicks import NewsPicksIE
-from .newstube import NewstubeIE
 from .newsy import NewsyIE
 from .nextmedia import (
-    NextMediaIE,
-    NextMediaActionNewsIE,
     AppleDailyIE,
+    NextMediaActionNewsIE,
+    NextMediaIE,
     NextTVIE,
 )
 from .nexx import (
-    NexxIE,
     NexxEmbedIE,
+    NexxIE,
+)
+from .nfb import (
+    NFBIE,
+    NFBSeriesIE,
 )
-from .nfb import NFBIE
 from .nfhsnetwork import NFHSNetworkIE
 from .nfl import (
     NFLIE,
@@ -1257,51 +1332,54 @@ from .nfl import (
     NFLPlusReplayIE,
 )
 from .nhk import (
-    NhkVodIE,
-    NhkVodProgramIE,
     NhkForSchoolBangumiIE,
-    NhkForSchoolSubjectIE,
     NhkForSchoolProgramListIE,
+    NhkForSchoolSubjectIE,
     NhkRadioNewsPageIE,
     NhkRadiruIE,
     NhkRadiruLiveIE,
+    NhkVodIE,
+    NhkVodProgramIE,
 )
 from .nhl import NHLIE
 from .nick import (
-    NickIE,
     NickBrIE,
     NickDeIE,
-    NickNightIE,
+    NickIE,
     NickRuIE,
 )
 from .niconico import (
-    NiconicoIE,
-    NiconicoPlaylistIE,
-    NiconicoUserIE,
-    NiconicoSeriesIE,
     NiconicoHistoryIE,
+    NiconicoIE,
+    NiconicoLiveIE,
+    NiconicoPlaylistIE,
+    NiconicoSeriesIE,
+    NiconicoUserIE,
     NicovideoSearchDateIE,
     NicovideoSearchIE,
     NicovideoSearchURLIE,
     NicovideoTagURLIE,
-    NiconicoLiveIE,
 )
+from .niconicochannelplus import (
+    NiconicoChannelPlusChannelLivesIE,
+    NiconicoChannelPlusChannelVideosIE,
+    NiconicoChannelPlusIE,
+)
+from .ninaprotocol import NinaProtocolIE
 from .ninecninemedia import (
-    NineCNineMediaIE,
     CPTwentyFourIE,
+    NineCNineMediaIE,
 )
 from .ninegag import NineGagIE
+from .ninenews import NineNewsIE
 from .ninenow import NineNowIE
 from .nintendo import NintendoIE
 from .nitter import NitterIE
-from .njpwworld import NJPWWorldIE
 from .nobelprize import NobelPrizeIE
 from .noice import NoicePodcastIE
 from .nonktube import NonkTubeIE
 from .noodlemagazine import NoodleMagazineIE
 from .noovo import NoovoIE
-from .normalboots import NormalbootsIE
-from .nosvideo import NosVideoIE
 from .nosnl import NOSNLArticleIE
 from .nova import (
     NovaEmbedIE,
@@ -1315,100 +1393,105 @@ from .nowness import (
 )
 from .noz import NozIE
 from .npo import (
-    AndereTijdenIE,
     NPOIE,
-    NPOLiveIE,
-    NPORadioIE,
-    NPORadioFragmentIE,
-    SchoolTVIE,
-    HetKlokhuisIE,
     VPROIE,
     WNLIE,
+    AndereTijdenIE,
+    HetKlokhuisIE,
+    NPOLiveIE,
+    NPORadioFragmentIE,
+    NPORadioIE,
+    SchoolTVIE,
 )
 from .npr import NprIE
 from .nrk import (
     NRKIE,
-    NRKPlaylistIE,
-    NRKSkoleIE,
     NRKTVIE,
-    NRKTVDirekteIE,
+    NRKPlaylistIE,
     NRKRadioPodkastIE,
+    NRKSkoleIE,
+    NRKTVDirekteIE,
     NRKTVEpisodeIE,
     NRKTVEpisodesIE,
     NRKTVSeasonIE,
     NRKTVSeriesIE,
 )
 from .nrl import NRLTVIE
+from .nts import NTSLiveIE
 from .ntvcojp import NTVCoJpCUIE
 from .ntvde import NTVDeIE
 from .ntvru import NTVRuIE
 from .nubilesporn import NubilesPornIE
-from .nytimes import (
-    NYTimesIE,
-    NYTimesArticleIE,
-    NYTimesCookingIE,
+from .nuum import (
+    NuumLiveIE,
+    NuumMediaIE,
+    NuumTabIE,
 )
 from .nuvid import NuvidIE
+from .nytimes import (
+    NYTimesArticleIE,
+    NYTimesCookingIE,
+    NYTimesCookingRecipeIE,
+    NYTimesIE,
+)
 from .nzherald import NZHeraldIE
 from .nzonscreen import NZOnScreenIE
 from .nzz import NZZIE
-from .odatv import OdaTVIE
 from .odkmedia import OnDemandChinaEpisodeIE
 from .odnoklassniki import OdnoklassnikiIE
 from .oftv import (
     OfTVIE,
-    OfTVPlaylistIE
+    OfTVPlaylistIE,
 )
 from .oktoberfesttv import OktoberfestTVIE
 from .olympics import OlympicsReplayIE
 from .on24 import On24IE
-from .ondemandkorea import OnDemandKoreaIE
+from .ondemandkorea import (
+    OnDemandKoreaIE,
+    OnDemandKoreaProgramIE,
+)
 from .onefootball import OneFootballIE
 from .onenewsnz import OneNewsNZIE
 from .oneplace import OnePlacePodcastIE
 from .onet import (
-    OnetIE,
     OnetChannelIE,
+    OnetIE,
     OnetMVPIE,
     OnetPlIE,
 )
 from .onionstudios import OnionStudiosIE
-from .ooyala import (
-    OoyalaIE,
-    OoyalaExternalIE,
-)
 from .opencast import (
     OpencastIE,
     OpencastPlaylistIE,
 )
 from .openrec import (
-    OpenRecIE,
     OpenRecCaptureIE,
+    OpenRecIE,
     OpenRecMovieIE,
 )
 from .ora import OraTVIE
 from .orf import (
-    ORFTVthekIE,
-    ORFFM4StoryIE,
-    ORFRadioIE,
     ORFIPTVIE,
+    ORFONIE,
+    ORFFM4StoryIE,
+    ORFPodcastIE,
+    ORFRadioIE,
 )
 from .outsidetv import OutsideTVIE
 from .owncloud import OwnCloudIE
 from .packtpub import (
-    PacktPubIE,
     PacktPubCourseIE,
+    PacktPubIE,
 )
 from .palcomp3 import (
-    PalcoMP3IE,
     PalcoMP3ArtistIE,
+    PalcoMP3IE,
     PalcoMP3VideoIE,
 )
-from .pandoratv import PandoraTVIE
 from .panopto import (
     PanoptoIE,
     PanoptoListIE,
-    PanoptoPlaylistIE
+    PanoptoPlaylistIE,
 )
 from .paramountplus import (
     ParamountPlusIE,
@@ -1416,13 +1499,23 @@ from .paramountplus import (
 )
 from .parler import ParlerIE
 from .parlview import ParlviewIE
-from .patreon import (
-    PatreonIE,
-    PatreonCampaignIE
+from .parti import (
+    PartiLivestreamIE,
+    PartiVideoIE,
+)
+from .patreon import (
+    PatreonCampaignIE,
+    PatreonIE,
+)
+from .pbs import (
+    PBSIE,
+    PBSKidsIE,
 )
-from .pbs import PBSIE, PBSKidsIE
 from .pearvideo import PearVideoIE
-from .peekvids import PeekVidsIE, PlayVidsIE
+from .peekvids import (
+    PeekVidsIE,
+    PlayVidsIE,
+)
 from .peertube import (
     PeerTubeIE,
     PeerTubePlaylistIE,
@@ -1430,9 +1523,8 @@ from .peertube import (
 from .peertv import PeerTVIE
 from .peloton import (
     PelotonIE,
-    PelotonLiveIE
+    PelotonLiveIE,
 )
-from .people import PeopleIE
 from .performgroup import PerformGroupIE
 from .periscope import (
     PeriscopeIE,
@@ -1442,6 +1534,7 @@ from .pgatour import PGATourIE
 from .philharmoniedeparis import PhilharmonieDeParisIE
 from .phoenix import PhoenixIE
 from .photobucket import PhotobucketIE
+from .pialive import PiaLiveIE
 from .piapro import PiaproIE
 from .picarto import (
     PicartoIE,
@@ -1450,8 +1543,12 @@ from .picarto import (
 from .piksel import PikselIE
 from .pinkbike import PinkbikeIE
 from .pinterest import (
-    PinterestIE,
     PinterestCollectionIE,
+    PinterestIE,
+)
+from .piramidetv import (
+    PiramideTVChannelIE,
+    PiramideTVIE,
 )
 from .pixivsketch import (
     PixivSketchIE,
@@ -1460,131 +1557,142 @@ from .pixivsketch import (
 from .pladform import PladformIE
 from .planetmarathi import PlanetMarathiIE
 from .platzi import (
-    PlatziIE,
     PlatziCourseIE,
+    PlatziIE,
 )
-from .playfm import PlayFMIE
 from .playplustv import PlayPlusTVIE
-from .plays import PlaysTVIE
-from .playstuff import PlayStuffIE
 from .playsuisse import PlaySuisseIE
 from .playtvak import PlaytvakIE
-from .playvid import PlayvidIE
 from .playwire import PlaywireIE
-from .plutotv import PlutoTVIE
 from .pluralsight import (
-    PluralsightIE,
     PluralsightCourseIE,
+    PluralsightIE,
+)
+from .plutotv import PlutoTVIE
+from .plvideo import PlVideoIE
+from .podbayfm import (
+    PodbayFMChannelIE,
+    PodbayFMIE,
 )
-from .podbayfm import PodbayFMIE, PodbayFMChannelIE
 from .podchaser import PodchaserIE
 from .podomatic import PodomaticIE
-from .pokemon import (
-    PokemonIE,
-    PokemonWatchIE,
-)
 from .pokergo import (
-    PokerGoIE,
     PokerGoCollectionIE,
+    PokerGoIE,
 )
 from .polsatgo import PolsatGoIE
 from .polskieradio import (
-    PolskieRadioIE,
-    PolskieRadioLegacyIE,
     PolskieRadioAuditionIE,
     PolskieRadioCategoryIE,
+    PolskieRadioIE,
+    PolskieRadioLegacyIE,
     PolskieRadioPlayerIE,
     PolskieRadioPodcastIE,
     PolskieRadioPodcastListIE,
 )
 from .popcorntimes import PopcorntimesIE
 from .popcorntv import PopcornTVIE
-from .porn91 import Porn91IE
-from .porncom import PornComIE
+from .pornbox import PornboxIE
 from .pornflip import PornFlipIE
-from .pornhd import PornHdIE
 from .pornhub import (
     PornHubIE,
-    PornHubUserIE,
-    PornHubPlaylistIE,
     PornHubPagedVideoListIE,
+    PornHubPlaylistIE,
+    PornHubUserIE,
     PornHubUserVideosUploadIE,
 )
 from .pornotube import PornotubeIE
 from .pornovoisines import PornoVoisinesIE
 from .pornoxo import PornoXOIE
-from .pornez import PornezIE
-from .puhutv import (
-    PuhuTVIE,
-    PuhuTVSerieIE,
+from .pr0gramm import Pr0grammIE
+from .prankcast import (
+    PrankCastIE,
+    PrankCastPostIE,
 )
-from .pr0gramm import Pr0grammStaticIE, Pr0grammIE
-from .prankcast import PrankCastIE
 from .premiershiprugby import PremiershipRugbyIE
 from .presstv import PressTVIE
 from .projectveritas import ProjectVeritasIE
 from .prosiebensat1 import ProSiebenSat1IE
 from .prx import (
-    PRXStoryIE,
-    PRXSeriesIE,
     PRXAccountIE,
+    PRXSeriesIE,
+    PRXSeriesSearchIE,
     PRXStoriesSearchIE,
-    PRXSeriesSearchIE
+    PRXStoryIE,
+)
+from .puhutv import (
+    PuhuTVIE,
+    PuhuTVSerieIE,
 )
 from .puls4 import Puls4IE
 from .pyvideo import PyvideoIE
 from .qdance import QDanceIE
 from .qingting import QingTingIE
 from .qqmusic import (
-    QQMusicIE,
-    QQMusicSingerIE,
     QQMusicAlbumIE,
-    QQMusicToplistIE,
+    QQMusicIE,
     QQMusicPlaylistIE,
+    QQMusicSingerIE,
+    QQMusicToplistIE,
+    QQMusicVideoIE,
 )
 from .r7 import (
     R7IE,
     R7ArticleIE,
 )
-from .radiko import RadikoIE, RadikoRadioIE
+from .radiko import (
+    RadikoIE,
+    RadikoRadioIE,
+)
 from .radiocanada import (
-    RadioCanadaIE,
     RadioCanadaAudioVideoIE,
+    RadioCanadaIE,
+)
+from .radiocomercial import (
+    RadioComercialIE,
+    RadioComercialPlaylistIE,
 )
 from .radiode import RadioDeIE
+from .radiofrance import (
+    FranceCultureIE,
+    RadioFranceIE,
+    RadioFranceLiveIE,
+    RadioFrancePodcastIE,
+    RadioFranceProfileIE,
+    RadioFranceProgramScheduleIE,
+)
 from .radiojavan import RadioJavanIE
-from .radiobremen import RadioBremenIE
-from .radiofrance import FranceCultureIE, RadioFranceIE
-from .radiozet import RadioZetPodcastIE
 from .radiokapital import (
     RadioKapitalIE,
     RadioKapitalShowIE,
 )
+from .radioradicale import RadioRadicaleIE
+from .radiozet import RadioZetPodcastIE
 from .radlive import (
-    RadLiveIE,
     RadLiveChannelIE,
+    RadLiveIE,
     RadLiveSeasonIE,
 )
 from .rai import (
-    RaiIE,
     RaiCulturaIE,
+    RaiIE,
+    RaiNewsIE,
     RaiPlayIE,
     RaiPlayLiveIE,
     RaiPlayPlaylistIE,
     RaiPlaySoundIE,
     RaiPlaySoundLiveIE,
     RaiPlaySoundPlaylistIE,
-    RaiNewsIE,
     RaiSudtirolIE,
 )
 from .raywenderlich import (
-    RayWenderlichIE,
     RayWenderlichCourseIE,
+    RayWenderlichIE,
 )
-from .rbmaradio import RBMARadioIE
 from .rbgtum import (
-    RbgTumIE,
     RbgTumCourseIE,
+    RbgTumIE,
+    RbgTumNewCourseIE,
 )
 from .rcs import (
     RCSIE,
@@ -1597,22 +1705,24 @@ from .rcti import (
     RCTIPlusTVIE,
 )
 from .rds import RDSIE
-from .recurbate import RecurbateIE
-from .redbee import ParliamentLiveUKIE, RTBFIE
+from .redbee import (
+    RTBFIE,
+    ParliamentLiveUKIE,
+)
 from .redbulltv import (
-    RedBullTVIE,
     RedBullEmbedIE,
-    RedBullTVRrnContentIE,
     RedBullIE,
+    RedBullTVIE,
+    RedBullTVRrnContentIE,
 )
 from .reddit import RedditIE
+from .redge import RedCDNLivxIE
 from .redgifs import (
     RedGifsIE,
     RedGifsSearchIE,
     RedGifsUserIE,
 )
 from .redtube import RedTubeIE
-from .regiotv import RegioTVIE
 from .rentv import (
     RENTVIE,
     RENTVArticleIE,
@@ -1621,176 +1731,187 @@ from .restudy import RestudyIE
 from .reuters import ReutersIE
 from .reverbnation import ReverbNationIE
 from .rheinmaintv import RheinMainTVIE
-from .rice import RICEIE
+from .ridehome import RideHomeIE
+from .rinsefm import (
+    RinseFMArtistPlaylistIE,
+    RinseFMIE,
+)
 from .rmcdecouverte import RMCDecouverteIE
 from .rockstargames import RockstarGamesIE
 from .rokfin import (
-    RokfinIE,
-    RokfinStackIE,
     RokfinChannelIE,
+    RokfinIE,
     RokfinSearchIE,
+    RokfinStackIE,
+)
+from .roosterteeth import (
+    RoosterTeethIE,
+    RoosterTeethSeriesIE,
 )
-from .roosterteeth import RoosterTeethIE, RoosterTeethSeriesIE
 from .rottentomatoes import RottenTomatoesIE
+from .roya import RoyaLiveIE
 from .rozhlas import (
+    MujRozhlasIE,
     RozhlasIE,
     RozhlasVltavaIE,
-    MujRozhlasIE,
 )
-from .rte import RteIE, RteRadioIE
+from .rte import (
+    RteIE,
+    RteRadioIE,
+)
+from .rtl2 import RTL2IE
 from .rtlnl import (
-    RtlNlIE,
-    RTLLuTeleVODIE,
     RTLLuArticleIE,
     RTLLuLiveIE,
     RTLLuRadioIE,
-)
-from .rtl2 import (
-    RTL2IE,
-    RTL2YouIE,
-    RTL2YouSeriesIE,
+    RTLLuTeleVODIE,
+    RtlNlIE,
 )
 from .rtnews import (
-    RTNewsIE,
     RTDocumentryIE,
     RTDocumentryPlaylistIE,
+    RTNewsIE,
     RuptlyIE,
 )
 from .rtp import RTPIE
 from .rtrfm import RTRFMIE
 from .rts import RTSIE
 from .rtvcplay import (
-    RTVCPlayIE,
-    RTVCPlayEmbedIE,
     RTVCKalturaIE,
+    RTVCPlayEmbedIE,
+    RTVCPlayIE,
 )
 from .rtve import (
     RTVEALaCartaIE,
     RTVEAudioIE,
     RTVELiveIE,
-    RTVEInfantilIE,
     RTVETelevisionIE,
 )
-from .rtvnh import RTVNHIE
 from .rtvs import RTVSIE
-from .rtvslo import RTVSLOIE
-from .ruhd import RUHDIE
+from .rtvslo import (
+    RTVSLOIE,
+    RTVSLOShowIE,
+)
+from .rudovideo import RudoVideoIE
 from .rule34video import Rule34VideoIE
 from .rumble import (
+    RumbleChannelIE,
     RumbleEmbedIE,
     RumbleIE,
-    RumbleChannelIE,
 )
 from .rutube import (
-    RutubeIE,
     RutubeChannelIE,
     RutubeEmbedIE,
+    RutubeIE,
     RutubeMovieIE,
     RutubePersonIE,
     RutubePlaylistIE,
     RutubeTagsIE,
 )
-from .glomex import (
-    GlomexIE,
-    GlomexEmbedIE,
-)
-from .megatvcom import (
-    MegaTVComIE,
-    MegaTVComEmbedIE,
-)
-from .ant1newsgr import (
-    Ant1NewsGrWatchIE,
-    Ant1NewsGrArticleIE,
-    Ant1NewsGrEmbedIE,
-)
 from .rutv import RUTVIE
 from .ruutu import RuutuIE
 from .ruv import (
     RuvIE,
-    RuvSpilaIE
+    RuvSpilaIE,
+)
+from .s4c import (
+    S4CIE,
+    S4CSeriesIE,
 )
-from .s4c import S4CIE
 from .safari import (
-    SafariIE,
     SafariApiIE,
     SafariCourseIE,
+    SafariIE,
 )
 from .saitosan import SaitosanIE
 from .samplefocus import SampleFocusIE
 from .sapo import SapoIE
-from .savefrom import SaveFromIE
 from .sbs import SBSIE
+from .sbscokr import (
+    SBSCoKrAllvodProgramIE,
+    SBSCoKrIE,
+    SBSCoKrProgramsVodIE,
+)
 from .screen9 import Screen9IE
 from .screencast import ScreencastIE
 from .screencastify import ScreencastifyIE
 from .screencastomatic import ScreencastOMaticIE
+from .screenrec import ScreenRecIE
 from .scrippsnetworks import (
-    ScrippsNetworksWatchIE,
     ScrippsNetworksIE,
+    ScrippsNetworksWatchIE,
 )
+from .scrolller import ScrolllerIE
 from .scte import (
     SCTEIE,
     SCTECourseIE,
 )
-from .scrolller import ScrolllerIE
-from .seeker import SeekerIE
+from .sejmpl import SejmIE
+from .sen import SenIE
 from .senalcolombia import SenalColombiaLiveIE
-from .senategov import SenateISVPIE, SenateGovIE
+from .senategov import (
+    SenateGovIE,
+    SenateISVPIE,
+)
 from .sendtonews import SendtoNewsIE
 from .servus import ServusIE
 from .sevenplus import SevenPlusIE
 from .sexu import SexuIE
 from .seznamzpravy import (
-    SeznamZpravyIE,
     SeznamZpravyArticleIE,
+    SeznamZpravyIE,
 )
 from .shahid import (
     ShahidIE,
     ShahidShowIE,
 )
-from .shared import (
-    SharedIE,
-    VivoIE,
-)
+from .sharepoint import SharePointIE
 from .sharevideos import ShareVideosEmbedIE
-from .sibnet import SibnetEmbedIE
 from .shemaroome import ShemarooMeIE
 from .showroomlive import ShowRoomLiveIE
+from .sibnet import SibnetEmbedIE
 from .simplecast import (
-    SimplecastIE,
     SimplecastEpisodeIE,
+    SimplecastIE,
     SimplecastPodcastIE,
 )
 from .sina import SinaIE
 from .sixplay import SixPlayIE
 from .skeb import SkebIE
-from .skyit import (
-    SkyItPlayerIE,
-    SkyItVideoIE,
-    SkyItVideoLiveIE,
-    SkyItIE,
-    SkyItArteIE,
-    CieloTVItIE,
-    TV8ItIE,
-)
-from .skylinewebcams import SkylineWebcamsIE
-from .skynewsarabia import (
-    SkyNewsArabiaIE,
-    SkyNewsArabiaArticleIE,
-)
-from .skynewsau import SkyNewsAUIE
 from .sky import (
     SkyNewsIE,
     SkyNewsStoryIE,
     SkySportsIE,
     SkySportsNewsIE,
 )
+from .skyit import (
+    CieloTVItIE,
+    SkyItArteIE,
+    SkyItIE,
+    SkyItPlayerIE,
+    SkyItVideoIE,
+    SkyItVideoLiveIE,
+    TV8ItIE,
+    TV8ItLiveIE,
+    TV8ItPlaylistIE,
+)
+from .skylinewebcams import SkylineWebcamsIE
+from .skynewsarabia import (
+    SkyNewsArabiaArticleIE,
+    SkyNewsArabiaIE,
+)
+from .skynewsau import SkyNewsAUIE
 from .slideshare import SlideshareIE
 from .slideslive import SlidesLiveIE
 from .slutload import SlutloadIE
 from .smotrim import SmotrimIE
+from .snapchat import SnapchatSpotlightIE
 from .snotr import SnotrIE
-from .sohu import SohuIE
+from .softwhiteunderbelly import SoftWhiteUnderbellyIE
+from .sohu import (
+    SohuIE,
+    SohuVIE,
+)
 from .sonyliv import (
     SonyLIVIE,
     SonyLIVSeriesIE,
@@ -1798,46 +1919,39 @@ from .sonyliv import (
 from .soundcloud import (
     SoundcloudEmbedIE,
     SoundcloudIE,
-    SoundcloudSetIE,
+    SoundcloudPlaylistIE,
     SoundcloudRelatedIE,
+    SoundcloudSearchIE,
+    SoundcloudSetIE,
+    SoundcloudTrackStationIE,
     SoundcloudUserIE,
     SoundcloudUserPermalinkIE,
-    SoundcloudTrackStationIE,
-    SoundcloudPlaylistIE,
-    SoundcloudSearchIE,
 )
 from .soundgasm import (
     SoundgasmIE,
-    SoundgasmProfileIE
+    SoundgasmProfileIE,
 )
 from .southpark import (
-    SouthParkIE,
     SouthParkDeIE,
     SouthParkDkIE,
     SouthParkEsIE,
+    SouthParkIE,
     SouthParkLatIE,
-    SouthParkNlIE
+    SouthParkNlIE,
 )
 from .sovietscloset import (
     SovietsClosetIE,
-    SovietsClosetPlaylistIE
+    SovietsClosetPlaylistIE,
 )
 from .spankbang import (
     SpankBangIE,
     SpankBangPlaylistIE,
 )
-from .spankwire import SpankwireIE
 from .spiegel import SpiegelIE
 from .spike import (
     BellatorIE,
     ParamountNetworkIE,
 )
-from .stageplus import StagePlusVODConcertIE
-from .startrek import StarTrekIE
-from .stitcher import (
-    StitcherIE,
-    StitcherShowIE,
-)
 from .sport5 import Sport5IE
 from .sportbox import SportBoxIE
 from .sportdeutschland import SportDeutschlandIE
@@ -1847,12 +1961,14 @@ from .spotify import (
 )
 from .spreaker import (
     SpreakerIE,
-    SpreakerPageIE,
     SpreakerShowIE,
-    SpreakerShowPageIE,
 )
 from .springboardplatform import SpringboardPlatformIE
 from .sprout import SproutIE
+from .sproutvideo import (
+    SproutVideoIE,
+    VidsIoIE,
+)
 from .srgssr import (
     SRGSSRIE,
     SRGSSRPlayIE,
@@ -1861,26 +1977,37 @@ from .srmediathek import SRMediathekIE
 from .stacommu import (
     StacommuLiveIE,
     StacommuVODIE,
+    TheaterComplexTownPPVIE,
+    TheaterComplexTownVODIE,
 )
+from .stageplus import StagePlusVODConcertIE
 from .stanfordoc import StanfordOpenClassroomIE
+from .startrek import StarTrekIE
 from .startv import StarTVIE
 from .steam import (
-    SteamIE,
     SteamCommunityBroadcastIE,
+    SteamIE,
+)
+from .stitcher import (
+    StitcherIE,
+    StitcherShowIE,
 )
 from .storyfire import (
     StoryFireIE,
-    StoryFireUserIE,
     StoryFireSeriesIE,
+    StoryFireUserIE,
 )
+from .streaks import StreaksIE
 from .streamable import StreamableIE
-from .streamcloud import StreamcloudIE
 from .streamcz import StreamCZIE
-from .streamff import StreamFFIE
 from .streetvoice import StreetVoiceIE
 from .stretchinternet import StretchInternetIE
 from .stripchat import StripchatIE
 from .stv import STVPlayerIE
+from .subsplash import (
+    SubsplashIE,
+    SubsplashPlaylistIE,
+)
 from .substack import SubstackIE
 from .sunporno import SunPornoIE
 from .sverigesradio import (
@@ -1894,17 +2021,26 @@ from .svt import (
     SVTSeriesIE,
 )
 from .swearnet import SwearnetEpisodeIE
-from .swrmediathek import SWRMediathekIE
-from .syvdk import SYVDKIE
 from .syfy import SyfyIE
+from .syvdk import SYVDKIE
 from .sztvhu import SztvHuIE
 from .tagesschau import TagesschauIE
+from .taptap import (
+    TapTapAppIE,
+    TapTapAppIntlIE,
+    TapTapMomentIE,
+    TapTapPostIntlIE,
+)
 from .tass import TassIE
 from .tbs import TBSIE
-from .tdslifeway import TDSLifewayIE
+from .tbsjp import (
+    TBSJPEpisodeIE,
+    TBSJPPlaylistIE,
+    TBSJPProgramIE,
+)
 from .teachable import (
-    TeachableIE,
     TeachableCourseIE,
+    TeachableIE,
 )
 from .teachertube import (
     TeacherTubeIE,
@@ -1912,11 +2048,10 @@ from .teachertube import (
 )
 from .teachingchannel import TeachingChannelIE
 from .teamcoco import (
-    TeamcocoIE,
     ConanClassicIE,
+    TeamcocoIE,
 )
 from .teamtreehouse import TeamTreeHouseIE
-from .techtalks import TechTalksIE
 from .ted import (
     TedEmbedIE,
     TedPlaylistIE,
@@ -1933,15 +2068,18 @@ from .telegram import TelegramEmbedIE
 from .telemb import TeleMBIE
 from .telemundo import TelemundoIE
 from .telequebec import (
-    TeleQuebecIE,
-    TeleQuebecSquatIE,
     TeleQuebecEmissionIE,
+    TeleQuebecIE,
     TeleQuebecLiveIE,
+    TeleQuebecSquatIE,
     TeleQuebecVideoIE,
 )
 from .teletask import TeleTaskIE
 from .telewebion import TelewebionIE
-from .tempo import TempoIE, IVXPlayerIE
+from .tempo import (
+    IVXPlayerIE,
+    TempoIE,
+)
 from .tencent import (
     IflixEpisodeIE,
     IflixSeriesIE,
@@ -1951,110 +2089,107 @@ from .tencent import (
     WeTvSeriesIE,
 )
 from .tennistv import TennisTVIE
-from .tenplay import TenPlayIE
+from .tenplay import (
+    TenPlayIE,
+    TenPlaySeasonIE,
+)
 from .testurl import TestURLIE
 from .tf1 import TF1IE
 from .tfo import TFOIE
+from .theguardian import (
+    TheGuardianPodcastIE,
+    TheGuardianPodcastPlaylistIE,
+)
 from .theholetv import TheHoleTvIE
 from .theintercept import TheInterceptIE
 from .theplatform import (
-    ThePlatformIE,
     ThePlatformFeedIE,
+    ThePlatformIE,
 )
 from .thestar import TheStarIE
 from .thesun import TheSunIE
-from .theta import (
-    ThetaVideoIE,
-    ThetaStreamIE,
-)
 from .theweatherchannel import TheWeatherChannelIE
 from .thisamericanlife import ThisAmericanLifeIE
-from .thisav import ThisAVIE
 from .thisoldhouse import ThisOldHouseIE
 from .thisvid import (
     ThisVidIE,
     ThisVidMemberIE,
     ThisVidPlaylistIE,
 )
+from .threeqsdn import ThreeQSDNIE
 from .threespeak import (
     ThreeSpeakIE,
     ThreeSpeakUserIE,
 )
-from .threeqsdn import ThreeQSDNIE
 from .tiktok import (
-    TikTokIE,
-    TikTokUserIE,
-    TikTokSoundIE,
-    TikTokEffectIE,
-    TikTokTagIE,
-    TikTokVMIE,
-    TikTokLiveIE,
     DouyinIE,
+    TikTokCollectionIE,
+    TikTokEffectIE,
+    TikTokIE,
+    TikTokLiveIE,
+    TikTokSoundIE,
+    TikTokTagIE,
+    TikTokUserIE,
+    TikTokVMIE,
 )
-from .tinypic import TinyPicIE
 from .tmz import TMZIE
 from .tnaflix import (
-    TNAFlixNetworkEmbedIE,
-    TNAFlixIE,
     EMPFlixIE,
     MovieFapIE,
+    TNAFlixIE,
+    TNAFlixNetworkEmbedIE,
 )
 from .toggle import (
-    ToggleIE,
     MeWatchIE,
+    ToggleIE,
 )
-from .toggo import (
-    ToggoIE,
-)
-from .tokentube import (
-    TokentubeIE,
-    TokentubeChannelIE
-)
+from .toggo import ToggoIE
 from .tonline import TOnlineIE
 from .toongoggles import ToonGogglesIE
 from .toutv import TouTvIE
-from .toypics import ToypicsUserIE, ToypicsIE
+from .toypics import (
+    ToypicsIE,
+    ToypicsUserIE,
+)
 from .traileraddict import TrailerAddictIE
 from .triller import (
     TrillerIE,
-    TrillerUserIE,
     TrillerShortIE,
+    TrillerUserIE,
 )
-from .trilulilu import TriluliluIE
 from .trovo import (
+    TrovoChannelClipIE,
+    TrovoChannelVodIE,
     TrovoIE,
     TrovoVodIE,
-    TrovoChannelVodIE,
-    TrovoChannelClipIE,
 )
 from .trtcocuk import TrtCocukVideoIE
+from .trtworld import TrtWorldIE
 from .trueid import TrueIDIE
 from .trunews import TruNewsIE
 from .truth import TruthIE
 from .trutv import TruTVIE
 from .tube8 import Tube8IE
-from .tubetugraz import TubeTuGrazIE, TubeTuGrazSeriesIE
+from .tubetugraz import (
+    TubeTuGrazIE,
+    TubeTuGrazSeriesIE,
+)
 from .tubitv import (
     TubiTvIE,
     TubiTvShowIE,
 )
 from .tumblr import TumblrIE
 from .tunein import (
-    TuneInStationIE,
-    TuneInPodcastIE,
     TuneInPodcastEpisodeIE,
+    TuneInPodcastIE,
     TuneInShortenerIE,
+    TuneInStationIE,
 )
-from .tunepk import TunePkIE
-from .turbo import TurboIE
 from .tv2 import (
     TV2IE,
-    TV2ArticleIE,
     KatsomoIE,
     MTVUutisetArticleIE,
-)
-from .tv24ua import (
-    TV24UAVideoIE,
+    TV2ArticleIE,
 )
 from .tv2dk import (
     TV2DKIE,
@@ -2067,16 +2202,14 @@ from .tv2hu import (
 from .tv4 import TV4IE
 from .tv5mondeplus import TV5MondePlusIE
 from .tv5unis import (
-    TV5UnisVideoIE,
     TV5UnisIE,
+    TV5UnisVideoIE,
 )
-from .tva import (
-    TVAIE,
-    QubIE,
-)
+from .tv24ua import TV24UAVideoIE
+from .tva import TVAIE
 from .tvanouvelles import (
-    TVANouvellesIE,
     TVANouvellesArticleIE,
+    TVANouvellesIE,
 )
 from .tvc import (
     TVCIE,
@@ -2087,34 +2220,28 @@ from .tvigle import TvigleIE
 from .tviplayer import TVIPlayerIE
 from .tvland import TVLandIE
 from .tvn24 import TVN24IE
-from .tvnet import TVNetIE
 from .tvnoe import TVNoeIE
-from .tvnow import (
-    TVNowIE,
-    TVNowFilmIE,
-    TVNowNewIE,
-    TVNowSeasonIE,
-    TVNowAnnualIE,
-    TVNowShowIE,
-)
 from .tvopengr import (
-    TVOpenGrWatchIE,
     TVOpenGrEmbedIE,
+    TVOpenGrWatchIE,
 )
 from .tvp import (
-    TVPEmbedIE,
     TVPIE,
+    TVPEmbedIE,
     TVPStreamIE,
     TVPVODSeriesIE,
     TVPVODVideoIE,
 )
 from .tvplay import (
-    TVPlayIE,
     TVPlayHomeIE,
+    TVPlayIE,
 )
 from .tvplayer import TVPlayerIE
+from .tvw import (
+    TvwIE,
+    TvwTvChannelsIE,
+)
 from .tweakers import TweakersIE
-from .twentyfourvideo import TwentyFourVideoIE
 from .twentymin import TwentyMinutenIE
 from .twentythreevideo import TwentyThreeVideoIE
 from .twitcasting import (
@@ -2123,29 +2250,29 @@ from .twitcasting import (
     TwitCastingUserIE,
 )
 from .twitch import (
-    TwitchVodIE,
+    TwitchClipsIE,
     TwitchCollectionIE,
-    TwitchVideosIE,
+    TwitchStreamIE,
     TwitchVideosClipsIE,
     TwitchVideosCollectionsIE,
-    TwitchStreamIE,
-    TwitchClipsIE,
+    TwitchVideosIE,
+    TwitchVodIE,
 )
 from .twitter import (
-    TwitterCardIE,
-    TwitterIE,
     TwitterAmplifyIE,
     TwitterBroadcastIE,
-    TwitterSpacesIE,
+    TwitterCardIE,
+    TwitterIE,
     TwitterShortenerIE,
+    TwitterSpacesIE,
 )
 from .txxx import (
-    TxxxIE,
     PornTopIE,
+    TxxxIE,
 )
 from .udemy import (
+    UdemyCourseIE,
     UdemyIE,
-    UdemyCourseIE
 )
 from .udn import UDNEmbedIE
 from .ufctv import (
@@ -2154,17 +2281,17 @@ from .ufctv import (
 )
 from .ukcolumn import UkColumnIE
 from .uktvplay import UKTVPlayIE
-from .digiteka import DigitekaIE
-from .dlive import (
-    DLiveVODIE,
-    DLiveStreamIE,
+from .uliza import (
+    UlizaPlayerIE,
+    UlizaPortalIE,
 )
-from .drooble import DroobleIE
 from .umg import UMGDeIE
 from .unistra import UnistraIE
 from .unity import UnityIE
-from .unscripted import UnscriptedNewsVideoIE
-from .unsupported import KnownDRMIE, KnownPiracyIE
+from .unsupported import (
+    KnownDRMIE,
+    KnownPiracyIE,
+)
 from .uol import UOLIE
 from .uplynk import (
     UplynkIE,
@@ -2174,37 +2301,34 @@ from .urort import UrortIE
 from .urplay import URPlayIE
 from .usanetwork import USANetworkIE
 from .usatoday import USATodayIE
-from .ustream import UstreamIE, UstreamChannelIE
+from .ustream import (
+    UstreamChannelIE,
+    UstreamIE,
+)
 from .ustudio import (
-    UstudioIE,
     UstudioEmbedIE,
+    UstudioIE,
 )
 from .utreon import UtreonIE
 from .varzesh3 import Varzesh3IE
 from .vbox7 import Vbox7IE
-from .veehd import VeeHDIE
 from .veo import VeoIE
-from .veoh import (
-    VeohIE,
-    VeohUserIE
-)
 from .vesti import VestiIE
 from .vevo import (
     VevoIE,
     VevoPlaylistIE,
 )
 from .vgtv import (
+    VGTVIE,
     BTArticleIE,
     BTVestlendingenIE,
-    VGTVIE,
 )
 from .vh1 import VH1IE
 from .vice import (
-    ViceIE,
     ViceArticleIE,
+    ViceIE,
     ViceShowIE,
 )
-from .vidbit import VidbitIE
 from .viddler import ViddlerIE
 from .videa import VideaIE
 from .videocampus_sachsen import (
@@ -2214,133 +2338,114 @@ from .videocampus_sachsen import (
 from .videodetective import VideoDetectiveIE
 from .videofyme import VideofyMeIE
 from .videoken import (
+    VideoKenCategoryIE,
     VideoKenIE,
     VideoKenPlayerIE,
     VideoKenPlaylistIE,
-    VideoKenCategoryIE,
     VideoKenTopicIE,
 )
 from .videomore import (
     VideomoreIE,
-    VideomoreVideoIE,
     VideomoreSeasonIE,
+    VideomoreVideoIE,
 )
 from .videopress import VideoPressIE
+from .vidflex import VidflexIE
 from .vidio import (
     VidioIE,
+    VidioLiveIE,
     VidioPremierIE,
-    VidioLiveIE
 )
 from .vidlii import VidLiiIE
+from .vidly import VidlyIE
+from .vidyard import VidyardIE
 from .viewlift import (
-    ViewLiftIE,
     ViewLiftEmbedIE,
+    ViewLiftIE,
 )
 from .viidea import ViideaIE
 from .vimeo import (
-    VimeoIE,
+    VHXEmbedIE,
     VimeoAlbumIE,
     VimeoChannelIE,
     VimeoGroupsIE,
+    VimeoIE,
     VimeoLikesIE,
     VimeoOndemandIE,
     VimeoProIE,
     VimeoReviewIE,
     VimeoUserIE,
     VimeoWatchLaterIE,
-    VHXEmbedIE,
 )
 from .vimm import (
     VimmIE,
     VimmRecordingIE,
 )
-from .vimple import VimpleIE
-from .vine import (
-    VineIE,
-    VineUserIE,
-)
-from .viki import (
-    VikiIE,
-    VikiChannelIE,
-)
+from .viously import ViouslyIE
 from .viqeo import ViqeoIE
 from .viu import (
     ViuIE,
-    ViuPlaylistIE,
     ViuOTTIE,
     ViuOTTIndonesiaIE,
+    ViuPlaylistIE,
 )
 from .vk import (
     VKIE,
-    VKUserVideosIE,
-    VKWallPostIE,
     VKPlayIE,
     VKPlayLiveIE,
+    VKUserVideosIE,
+    VKWallPostIE,
 )
 from .vocaroo import VocarooIE
-from .vodlocker import VodlockerIE
 from .vodpl import VODPlIE
 from .vodplatform import VODPlatformIE
-from .voicerepublic import VoiceRepublicIE
 from .voicy import (
-    VoicyIE,
     VoicyChannelIE,
+    VoicyIE,
 )
 from .volejtv import VolejTVIE
-from .voot import (
-    VootIE,
-    VootSeriesIE,
-)
 from .voxmedia import (
-    VoxMediaVolumeIE,
     VoxMediaIE,
+    VoxMediaVolumeIE,
+)
+from .vrsquare import (
+    VrSquareChannelIE,
+    VrSquareIE,
+    VrSquareSearchIE,
+    VrSquareSectionIE,
 )
 from .vrt import (
     VRTIE,
-    VrtNUIE,
-    KetnetIE,
     DagelijkseKostIE,
+    Radio1BeIE,
+    VrtNUIE,
 )
-from .vrak import VrakIE
-from .vrv import (
-    VRVIE,
-    VRVSeriesIE,
-)
-from .vshare import VShareIE
 from .vtm import VTMIE
-from .medialaan import MedialaanIE
+from .vtv import (
+    VTVIE,
+    VTVGoIE,
+)
 from .vuclip import VuClipIE
-from .vupload import VuploadIE
 from .vvvvid import (
     VVVVIDIE,
     VVVVIDShowIE,
 )
-from .vyborymos import VyboryMosIE
-from .vzaar import VzaarIE
-from .wakanim import WakanimIE
 from .walla import WallaIE
 from .washingtonpost import (
-    WashingtonPostIE,
     WashingtonPostArticleIE,
-)
-from .wasdtv import (
-    WASDTVStreamIE,
-    WASDTVRecordIE,
-    WASDTVClipIE,
+    WashingtonPostIE,
 )
 from .wat import WatIE
-from .watchbox import WatchBoxIE
-from .watchindianporn import WatchIndianPornIE
 from .wdr import (
     WDRIE,
-    WDRPageIE,
     WDRElefantIE,
     WDRMobileIE,
+    WDRPageIE,
 )
 from .webcamerapl import WebcameraplIE
 from .webcaster import (
-    WebcasterIE,
     WebcasterFeedIE,
+    WebcasterIE,
 )
 from .webofstories import (
     WebOfStoriesIE,
@@ -2348,42 +2453,42 @@ from .webofstories import (
 )
 from .weibo import (
     WeiboIE,
-    WeiboMobileIE
+    WeiboUserIE,
+    WeiboVideoIE,
 )
 from .weiqitv import WeiqiTVIE
 from .weverse import (
     WeverseIE,
-    WeverseMediaIE,
-    WeverseMomentIE,
-    WeverseLiveTabIE,
-    WeverseMediaTabIE,
     WeverseLiveIE,
+    WeverseLiveTabIE,
+    WeverseMediaIE,
+    WeverseMediaTabIE,
+    WeverseMomentIE,
 )
 from .wevidi import WeVidiIE
 from .weyyak import WeyyakIE
+from .whowatch import WhoWatchIE
 from .whyp import WhypIE
 from .wikimedia import WikimediaIE
-from .willow import WillowIE
 from .wimbledon import WimbledonIE
 from .wimtv import WimTVIE
-from .whowatch import WhoWatchIE
 from .wistia import (
+    WistiaChannelIE,
     WistiaIE,
     WistiaPlaylistIE,
-    WistiaChannelIE,
 )
 from .wordpress import (
-    WordpressPlaylistEmbedIE,
     WordpressMiniAudioPlayerEmbedIE,
+    WordpressPlaylistEmbedIE,
 )
 from .worldstarhiphop import WorldStarHipHopIE
 from .wppilot import (
-    WPPilotIE,
     WPPilotChannelsIE,
+    WPPilotIE,
 )
 from .wrestleuniverse import (
-    WrestleUniverseVODIE,
     WrestleUniversePPVIE,
+    WrestleUniverseVODIE,
 )
 from .wsj import (
     WSJIE,
@@ -2391,89 +2496,91 @@ from .wsj import (
 )
 from .wwe import WWEIE
 from .wykop import (
-    WykopDigIE,
     WykopDigCommentIE,
-    WykopPostIE,
+    WykopDigIE,
     WykopPostCommentIE,
+    WykopPostIE,
 )
 from .xanimu import XanimuIE
-from .xbef import XBefIE
 from .xboxclips import XboxClipsIE
-from .xfileshare import XFileShareIE
 from .xhamster import (
-    XHamsterIE,
     XHamsterEmbedIE,
+    XHamsterIE,
     XHamsterUserIE,
 )
+from .xiaohongshu import XiaoHongShuIE
 from .ximalaya import (
+    XimalayaAlbumIE,
     XimalayaIE,
-    XimalayaAlbumIE
 )
 from .xinpianchang import XinpianchangIE
 from .xminus import XMinusIE
 from .xnxx import XNXXIE
 from .xstream import XstreamIE
-from .xtube import XTubeUserIE, XTubeIE
-from .xuite import XuiteIE
 from .xvideos import (
     XVideosIE,
-    XVideosQuickiesIE
+    XVideosQuickiesIE,
 )
 from .xxxymovies import XXXYMoviesIE
 from .yahoo import (
     YahooIE,
-    YahooSearchIE,
     YahooJapanNewsIE,
+    YahooSearchIE,
 )
 from .yandexdisk import YandexDiskIE
 from .yandexmusic import (
-    YandexMusicTrackIE,
     YandexMusicAlbumIE,
-    YandexMusicPlaylistIE,
-    YandexMusicArtistTracksIE,
     YandexMusicArtistAlbumsIE,
+    YandexMusicArtistTracksIE,
+    YandexMusicPlaylistIE,
+    YandexMusicTrackIE,
 )
 from .yandexvideo import (
     YandexVideoIE,
     YandexVideoPreviewIE,
-    ZenYandexIE,
     ZenYandexChannelIE,
+    ZenYandexIE,
 )
 from .yapfiles import YapFilesIE
 from .yappy import (
     YappyIE,
     YappyProfileIE,
 )
-from .yesjapan import YesJapanIE
-from .yinyuetai import YinYueTaiIE
 from .yle_areena import YleAreenaIE
-from .ynet import YnetIE
 from .youjizz import YouJizzIE
 from .youku import (
     YoukuIE,
     YoukuShowIE,
 )
 from .younow import (
-    YouNowLiveIE,
     YouNowChannelIE,
+    YouNowLiveIE,
     YouNowMomentIE,
 )
-from .youporn import YouPornIE
-from .yourporn import YourPornIE
-from .yourupload import YourUploadIE
+from .youporn import (
+    YouPornCategoryIE,
+    YouPornChannelIE,
+    YouPornCollectionIE,
+    YouPornIE,
+    YouPornStarIE,
+    YouPornTagIE,
+    YouPornVideosIE,
+)
 from .zaiko import (
-    ZaikoIE,
     ZaikoETicketIE,
+    ZaikoIE,
 )
 from .zapiks import ZapiksIE
 from .zattoo import (
     BBVTVIE,
+    EWETVIE,
+    SAKTVIE,
+    VTXTVIE,
     BBVTVLiveIE,
     BBVTVRecordingsIE,
     EinsUndEinsTVIE,
     EinsUndEinsTVLiveIE,
     EinsUndEinsTVRecordingsIE,
-    EWETVIE,
     EWETVLiveIE,
     EWETVRecordingsIE,
     GlattvisionTVIE,
@@ -2491,13 +2598,11 @@ from .zattoo import (
     QuantumTVIE,
     QuantumTVLiveIE,
     QuantumTVRecordingsIE,
+    SAKTVLiveIE,
+    SAKTVRecordingsIE,
     SaltTVIE,
     SaltTVLiveIE,
     SaltTVRecordingsIE,
-    SAKTVIE,
-    SAKTVLiveIE,
-    SAKTVRecordingsIE,
-    VTXTVIE,
     VTXTVLiveIE,
     VTXTVRecordingsIE,
     WalyTVIE,
@@ -2508,21 +2613,29 @@ from .zattoo import (
     ZattooMoviesIE,
     ZattooRecordingsIE,
 )
-from .zdf import ZDFIE, ZDFChannelIE
+from .zdf import (
+    ZDFIE,
+    ZDFChannelIE,
+)
 from .zee5 import (
     Zee5IE,
     Zee5SeriesIE,
 )
 from .zeenews import ZeeNewsIE
+from .zenporn import ZenPornIE
+from .zetland import ZetlandDKArticleIE
 from .zhihu import ZhihuIE
 from .zingmp3 import (
-    ZingMp3IE,
     ZingMp3AlbumIE,
     ZingMp3ChartHomeIE,
-    ZingMp3WeekChartIE,
     ZingMp3ChartMusicVideoIE,
-    ZingMp3UserIE,
     ZingMp3HubIE,
+    ZingMp3IE,
+    ZingMp3LiveRadioIE,
+    ZingMp3PodcastEpisodeIE,
+    ZingMp3PodcastIE,
+    ZingMp3UserIE,
+    ZingMp3WeekChartIE,
 )
 from .zoom import ZoomIE
 from .zype import ZypeIE
diff --git a/plugins/youtube_download/yt_dlp/extractor/abc.py b/plugins/youtube_download/yt_dlp/extractor/abc.py
index f56133e..7296be7 100644
--- a/plugins/youtube_download/yt_dlp/extractor/abc.py
+++ b/plugins/youtube_download/yt_dlp/extractor/abc.py
@@ -4,18 +4,18 @@ import re
 import time
 
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
-    dict_get,
     ExtractorError,
-    js_to_json,
+    dict_get,
     int_or_none,
+    js_to_json,
     parse_iso8601,
     str_or_none,
     traverse_obj,
     try_get,
     unescapeHTML,
     update_url_query,
+    url_or_none,
 )
 
 
@@ -66,7 +66,7 @@ class ABCIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'WWI Centenary',
             'description': 'md5:c2379ec0ca84072e86b446e536954546',
-        }
+        },
     }, {
         'url': 'https://www.abc.net.au/news/programs/the-world/2020-06-10/black-lives-matter-protests-spawn-support-for/12342074',
         'info_dict': {
@@ -74,7 +74,7 @@ class ABCIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'Black Lives Matter protests spawn support for Papuans in Indonesia',
             'description': 'md5:2961a17dc53abc558589ccd0fb8edd6f',
-        }
+        },
     }, {
         'url': 'https://www.abc.net.au/btn/newsbreak/btn-newsbreak-20200814/12560476',
         'info_dict': {
@@ -85,7 +85,7 @@ class ABCIE(InfoExtractor):
             'upload_date': '20200813',
             'uploader': 'Behind the News',
             'uploader_id': 'behindthenews',
-        }
+        },
     }, {
         'url': 'https://www.abc.net.au/news/2023-06-25/wagner-boss-orders-troops-back-to-bases-to-avoid-bloodshed/102520540',
         'info_dict': {
@@ -94,7 +94,7 @@ class ABCIE(InfoExtractor):
             'ext': 'mp4',
             'description': 'Wagner troops leave Rostov-on-Don and\xa0Yevgeny Prigozhin will move to Belarus under a deal brokered by Belarusian President Alexander Lukashenko to end the mutiny.',
             'thumbnail': 'https://live-production.wcms.abc-cdn.net.au/0c170f5b57f0105c432f366c0e8e267b?impolicy=wcms_crop_resize&cropH=2813&cropW=5000&xPos=0&yPos=249&width=862&height=485',
-        }
+        },
     }]
 
     def _real_extract(self, url):
@@ -125,7 +125,7 @@ class ABCIE(InfoExtractor):
                 if mobj is None:
                     expired = self._html_search_regex(r'(?s)class="expired-(?:video|audio)".+?<span>(.+?)</span>', webpage, 'expired', None)
                     if expired:
-                        raise ExtractorError('%s said: %s' % (self.IE_NAME, expired), expected=True)
+                        raise ExtractorError(f'{self.IE_NAME} said: {expired}', expected=True)
                     raise ExtractorError('Unable to extract video urls')
 
             urls_info = self._parse_json(
@@ -163,7 +163,7 @@ class ABCIE(InfoExtractor):
                 'height': height,
                 'tbr': bitrate,
                 'filesize': int_or_none(url_info.get('filesize')),
-                'format_id': format_id
+                'format_id': format_id,
             })
 
         return {
@@ -180,20 +180,100 @@ class ABCIViewIE(InfoExtractor):
     _VALID_URL = r'https?://iview\.abc\.net\.au/(?:[^/]+/)*video/(?P<id>[^/?#]+)'
     _GEO_COUNTRIES = ['AU']
 
-    # ABC iview programs are normally available for 14 days only.
     _TESTS = [{
+        'url': 'https://iview.abc.net.au/show/utopia/series/1/video/CO1211V001S00',
+        'md5': '52a942bfd7a0b79a6bfe9b4ce6c9d0ed',
+        'info_dict': {
+            'id': 'CO1211V001S00',
+            'ext': 'mp4',
+            'title': 'Series 1 Ep 1 Wood For The Trees',
+            'series': 'Utopia',
+            'description': 'md5:0cfb2c183c1b952d1548fd65c8a95c00',
+            'upload_date': '20230726',
+            'uploader_id': 'abc1',
+            'series_id': 'CO1211V',
+            'episode_id': 'CO1211V001S00',
+            'season_number': 1,
+            'season': 'Season 1',
+            'episode_number': 1,
+            'episode': 'Wood For The Trees',
+            'thumbnail': 'https://cdn.iview.abc.net.au/thumbs/i/co/CO1211V001S00_5ad8353f4df09_1280.jpg',
+            'timestamp': 1690403700,
+        },
+        'params': {
+            'skip_download': True,
+        },
+    }, {
+        'note': 'No episode name',
         'url': 'https://iview.abc.net.au/show/gruen/series/11/video/LE1927H001S00',
         'md5': '67715ce3c78426b11ba167d875ac6abf',
         'info_dict': {
             'id': 'LE1927H001S00',
             'ext': 'mp4',
-            'title': "Series 11 Ep 1",
-            'series': "Gruen",
+            'title': 'Series 11 Ep 1',
+            'series': 'Gruen',
             'description': 'md5:52cc744ad35045baf6aded2ce7287f67',
             'upload_date': '20190925',
             'uploader_id': 'abc1',
+            'series_id': 'LE1927H',
+            'episode_id': 'LE1927H001S00',
+            'season_number': 11,
+            'season': 'Season 11',
+            'episode_number': 1,
+            'episode': 'Episode 1',
+            'thumbnail': 'https://cdn.iview.abc.net.au/thumbs/i/le/LE1927H001S00_5d954fbd79e25_1280.jpg',
             'timestamp': 1569445289,
         },
+        'expected_warnings': ['Ignoring subtitle tracks found in the HLS manifest'],
+        'params': {
+            'skip_download': True,
+        },
+    }, {
+        'note': 'No episode number',
+        'url': 'https://iview.abc.net.au/show/four-corners/series/2022/video/NC2203H039S00',
+        'md5': '77cb7d8434440e3b28fbebe331c2456a',
+        'info_dict': {
+            'id': 'NC2203H039S00',
+            'ext': 'mp4',
+            'title': 'Series 2022 Locking Up Kids',
+            'series': 'Four Corners',
+            'description': 'md5:54829ca108846d1a70e1fcce2853e720',
+            'upload_date': '20221114',
+            'uploader_id': 'abc1',
+            'series_id': 'NC2203H',
+            'episode_id': 'NC2203H039S00',
+            'season_number': 2022,
+            'season': 'Season 2022',
+            'episode': 'Locking Up Kids',
+            'thumbnail': 'https://cdn.iview.abc.net.au/thumbs/i/nc/NC2203H039S00_636d8a0944a22_1920.jpg',
+            'timestamp': 1668460497,
+
+        },
+        'expected_warnings': ['Ignoring subtitle tracks found in the HLS manifest'],
+        'params': {
+            'skip_download': True,
+        },
+    }, {
+        'note': 'No episode name or number',
+        'url': 'https://iview.abc.net.au/show/landline/series/2021/video/RF2004Q043S00',
+        'md5': '2e17dec06b13cc81dc119d2565289396',
+        'info_dict': {
+            'id': 'RF2004Q043S00',
+            'ext': 'mp4',
+            'title': 'Series 2021',
+            'series': 'Landline',
+            'description': 'md5:c9f30d9c0c914a7fd23842f6240be014',
+            'upload_date': '20211205',
+            'uploader_id': 'abc1',
+            'series_id': 'RF2004Q',
+            'episode_id': 'RF2004Q043S00',
+            'season_number': 2021,
+            'season': 'Season 2021',
+            'thumbnail': 'https://cdn.iview.abc.net.au/thumbs/i/rf/RF2004Q043S00_61a950639dbc0_1920.jpg',
+            'timestamp': 1638710705,
+
+        },
+        'expected_warnings': ['Ignoring subtitle tracks found in the HLS manifest'],
         'params': {
             'skip_download': True,
         },
@@ -207,13 +287,12 @@ class ABCIViewIE(InfoExtractor):
         stream = next(s for s in video_params['playlist'] if s.get('type') in ('program', 'livestream'))
 
         house_number = video_params.get('episodeHouseNumber') or video_id
-        path = '/auth/hls/sign?ts={0}&hn={1}&d=android-tablet'.format(
-            int(time.time()), house_number)
+        path = f'/auth/hls/sign?ts={int(time.time())}&hn={house_number}&d=android-tablet'
         sig = hmac.new(
             b'android.content.res.Resources',
-            path.encode('utf-8'), hashlib.sha256).hexdigest()
+            path.encode(), hashlib.sha256).hexdigest()
         token = self._download_webpage(
-            'http://iview.abc.net.au{0}&sig={1}'.format(path, sig), video_id)
+            f'http://iview.abc.net.au{path}&sig={sig}', video_id)
 
         def tokenize_url(url, token):
             return update_url_query(url, {
@@ -222,7 +301,7 @@ class ABCIViewIE(InfoExtractor):
 
         for sd in ('1080', '720', 'sd', 'sd-low'):
             sd_url = try_get(
-                stream, lambda x: x['streams']['hls'][sd], compat_str)
+                stream, lambda x: x['streams']['hls'][sd], str)
             if not sd_url:
                 continue
             formats = self._extract_m3u8_formats(
@@ -255,6 +334,8 @@ class ABCIViewIE(InfoExtractor):
             'episode_number': int_or_none(self._search_regex(
                 r'\bEp\s+(\d+)\b', title, 'episode number', default=None)),
             'episode_id': house_number,
+            'episode': self._search_regex(
+                r'^(?:Series\s+\d+)?\s*(?:Ep\s+\d+)?\s*(.*)$', title, 'episode', default='') or None,
             'uploader_id': video_params.get('channel'),
             'formats': formats,
             'subtitles': subtitles,
@@ -275,7 +356,7 @@ class ABCIViewShowSeriesIE(InfoExtractor):
             'description': 'md5:93119346c24a7c322d446d8eece430ff',
             'series': 'Upper Middle Bogan',
             'season': 'Series 1',
-            'thumbnail': r're:^https?://cdn\.iview\.abc\.net\.au/thumbs/.*\.jpg$'
+            'thumbnail': r're:^https?://cdn\.iview\.abc\.net\.au/thumbs/.*\.jpg$',
         },
         'playlist_count': 8,
     }, {
@@ -294,17 +375,39 @@ class ABCIViewShowSeriesIE(InfoExtractor):
             'noplaylist': True,
             'skip_download': 'm3u8',
         },
+    }, {
+        # 'videoEpisodes' is a dict with `items` key
+        'url': 'https://iview.abc.net.au/show/7-30-mark-humphries-satire',
+        'info_dict': {
+            'id': '178458-0',
+            'title': 'Episodes',
+            'description': 'Satirist Mark Humphries brings his unique perspective on current political events for 7.30.',
+            'series': '7.30 Mark Humphries Satire',
+            'season': 'Episodes',
+            'thumbnail': r're:^https?://cdn\.iview\.abc\.net\.au/thumbs/.*\.jpg$',
+        },
+        'playlist_count': 15,
+        'skip': 'This program is not currently available in ABC iview',
+    }, {
+        'url': 'https://iview.abc.net.au/show/inbestigators',
+        'info_dict': {
+            'id': '175343-1',
+            'title': 'Series 1',
+            'description': 'md5:b9976935a6450e5b78ce2a940a755685',
+            'series': 'The Inbestigators',
+            'season': 'Series 1',
+            'thumbnail': r're:^https?://cdn\.iview\.abc\.net\.au/thumbs/.+\.jpg',
+        },
+        'playlist_count': 17,
     }]
 
     def _real_extract(self, url):
         show_id = self._match_id(url)
         webpage = self._download_webpage(url, show_id)
-        webpage_data = self._search_regex(
-            r'window\.__INITIAL_STATE__\s*=\s*[\'"](.+?)[\'"]\s*;',
-            webpage, 'initial state')
-        video_data = self._parse_json(
-            unescapeHTML(webpage_data).encode('utf-8').decode('unicode_escape'), show_id)
-        video_data = video_data['route']['pageData']['_embedded']
+        video_data = self._search_json(
+            r'window\.__INITIAL_STATE__\s*=\s*[\'"]', webpage, 'initial state', show_id,
+            transform_source=lambda x: x.encode().decode('unicode_escape'),
+            end_pattern=r'[\'"]\s*;')['route']['pageData']['_embedded']
 
         highlight = try_get(video_data, lambda x: x['highlightVideo']['shareUrl'])
         if not self._yes_playlist(show_id, bool(highlight), video_label='highlight video'):
@@ -313,12 +416,14 @@ class ABCIViewShowSeriesIE(InfoExtractor):
         series = video_data['selectedSeries']
         return {
             '_type': 'playlist',
-            'entries': [self.url_result(episode['shareUrl'])
-                        for episode in series['_embedded']['videoEpisodes']],
+            'entries': [self.url_result(episode_url, ABCIViewIE)
+                        for episode_url in traverse_obj(series, (
+                            '_embedded', 'videoEpisodes', (None, 'items'), ..., 'shareUrl', {url_or_none}))],
             'id': series.get('id'),
             'title': dict_get(series, ('title', 'displaySubtitle')),
             'description': series.get('description'),
             'series': dict_get(series, ('showTitle', 'displayTitle')),
             'season': dict_get(series, ('title', 'displaySubtitle')),
-            'thumbnail': series.get('thumbnail'),
+            'thumbnail': traverse_obj(
+                series, 'thumbnail', ('images', lambda _, v: v['name'] == 'seriesThumbnail', 'url'), get_all=False),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/abcnews.py b/plugins/youtube_download/yt_dlp/extractor/abcnews.py
index a57295b..7215500 100644
--- a/plugins/youtube_download/yt_dlp/extractor/abcnews.py
+++ b/plugins/youtube_download/yt_dlp/extractor/abcnews.py
@@ -58,7 +58,7 @@ class AbcNewsVideoIE(AMPIE):
         display_id = mobj.group('display_id')
         video_id = mobj.group('id')
         info_dict = self._extract_feed_info(
-            'http://abcnews.go.com/video/itemfeed?id=%s' % video_id)
+            f'http://abcnews.go.com/video/itemfeed?id={video_id}')
         info_dict.update({
             'id': video_id,
             'display_id': display_id,
diff --git a/plugins/youtube_download/yt_dlp/extractor/abcotvs.py b/plugins/youtube_download/yt_dlp/extractor/abcotvs.py
index 6dca19d..ea5882b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/abcotvs.py
+++ b/plugins/youtube_download/yt_dlp/extractor/abcotvs.py
@@ -1,5 +1,4 @@
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     dict_get,
     int_or_none,
@@ -57,11 +56,11 @@ class ABCOTVSIE(InfoExtractor):
         data = self._download_json(
             'https://api.abcotvs.com/v2/content', display_id, query={
                 'id': video_id,
-                'key': 'otv.web.%s.story' % station,
+                'key': f'otv.web.{station}.story',
                 'station': station,
             })['data']
         video = try_get(data, lambda x: x['featuredMedia']['video'], dict) or data
-        video_id = compat_str(dict_get(video, ('id', 'publishedKey'), video_id))
+        video_id = str(dict_get(video, ('id', 'publishedKey'), video_id))
         title = video.get('title') or video['linkText']
 
         formats = []
diff --git a/plugins/youtube_download/yt_dlp/extractor/abematv.py b/plugins/youtube_download/yt_dlp/extractor/abematv.py
index 163b83c..8f2fc4c 100644
--- a/plugins/youtube_download/yt_dlp/extractor/abematv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/abematv.py
@@ -6,53 +6,54 @@ import hmac
 import io
 import json
 import re
-import struct
 import time
 import urllib.parse
-import urllib.request
-import urllib.response
 import uuid
 
 from .common import InfoExtractor
 from ..aes import aes_ecb_decrypt
+from ..networking import RequestHandler, Response
+from ..networking.exceptions import TransportError
 from ..utils import (
     ExtractorError,
-    bytes_to_intlist,
+    OnDemandPagedList,
     decode_base_n,
     int_or_none,
-    intlist_to_bytes,
-    OnDemandPagedList,
     time_seconds,
     traverse_obj,
+    update_url,
     update_url_query,
 )
 
 
-def add_opener(ydl, handler):  # FIXME: Create proper API in .networking
-    """Add a handler for opening URLs, like _download_webpage"""
-    # https://github.com/python/cpython/blob/main/Lib/urllib/request.py#L426
-    # https://github.com/python/cpython/blob/main/Lib/urllib/request.py#L605
-    rh = ydl._request_director.handlers['Urllib']
-    if 'abematv-license' in rh._SUPPORTED_URL_SCHEMES:
-        return
-    opener = rh._get_instance(cookiejar=ydl.cookiejar, proxies=ydl.proxies)
-    assert isinstance(opener, urllib.request.OpenerDirector)
-    opener.add_handler(handler)
-    rh._SUPPORTED_URL_SCHEMES = (*rh._SUPPORTED_URL_SCHEMES, 'abematv-license')
+class AbemaLicenseRH(RequestHandler):
+    _SUPPORTED_URL_SCHEMES = ('abematv-license',)
+    _SUPPORTED_PROXY_SCHEMES = None
+    _SUPPORTED_FEATURES = None
+    RH_NAME = 'abematv_license'
 
+    _STRTABLE = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'
+    _HKEY = b'3AF0298C219469522A313570E8583005A642E73EDD58E3EA2FB7339D3DF1597E'
 
-class AbemaLicenseHandler(urllib.request.BaseHandler):
-    handler_order = 499
-    STRTABLE = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'
-    HKEY = b'3AF0298C219469522A313570E8583005A642E73EDD58E3EA2FB7339D3DF1597E'
-
-    def __init__(self, ie: 'AbemaTVIE'):
-        # the protocol that this should really handle is 'abematv-license://'
-        # abematv_license_open is just a placeholder for development purposes
-        # ref. https://github.com/python/cpython/blob/f4c03484da59049eb62a9bf7777b963e2267d187/Lib/urllib/request.py#L510
-        setattr(self, 'abematv-license_open', getattr(self, 'abematv_license_open'))
+    def __init__(self, *, ie: 'AbemaTVIE', **kwargs):
+        super().__init__(**kwargs)
         self.ie = ie
 
+    def _send(self, request):
+        url = request.url
+        ticket = urllib.parse.urlparse(url).netloc
+
+        try:
+            response_data = self._get_videokey_from_ticket(ticket)
+        except ExtractorError as e:
+            raise TransportError(cause=e.cause) from e
+        except (IndexError, KeyError, TypeError) as e:
+            raise TransportError(cause=repr(e)) from e
+
+        return Response(
+            io.BytesIO(response_data), url,
+            headers={'Content-Length': str(len(response_data))})
+
     def _get_videokey_from_ticket(self, ticket):
         to_show = self.ie.get_param('verbose', False)
         media_token = self.ie._get_media_token(to_show=to_show)
@@ -62,33 +63,27 @@ class AbemaLicenseHandler(urllib.request.BaseHandler):
             query={'t': media_token},
             data=json.dumps({
                 'kv': 'a',
-                'lt': ticket
-            }).encode('utf-8'),
+                'lt': ticket,
+            }).encode(),
             headers={
                 'Content-Type': 'application/json',
             })
 
-        res = decode_base_n(license_response['k'], table=self.STRTABLE)
-        encvideokey = bytes_to_intlist(struct.pack('>QQ', res >> 64, res & 0xffffffffffffffff))
+        res = decode_base_n(license_response['k'], table=self._STRTABLE)
+        encvideokey = list(res.to_bytes(16, 'big'))
 
         h = hmac.new(
-            binascii.unhexlify(self.HKEY),
-            (license_response['cid'] + self.ie._DEVICE_ID).encode('utf-8'),
+            binascii.unhexlify(self._HKEY),
+            (license_response['cid'] + self.ie._DEVICE_ID).encode(),
             digestmod=hashlib.sha256)
-        enckey = bytes_to_intlist(h.digest())
+        enckey = list(h.digest())
 
-        return intlist_to_bytes(aes_ecb_decrypt(encvideokey, enckey))
-
-    def abematv_license_open(self, url):
-        url = url.get_full_url() if isinstance(url, urllib.request.Request) else url
-        ticket = urllib.parse.urlparse(url).netloc
-        response_data = self._get_videokey_from_ticket(ticket)
-        return urllib.response.addinfourl(io.BytesIO(response_data), headers={
-            'Content-Length': str(len(response_data)),
-        }, url=url, code=200)
+        return bytes(aes_ecb_decrypt(encvideokey, enckey))
 
 
 class AbemaTVBaseIE(InfoExtractor):
+    _NETRC_MACHINE = 'abematv'
+
     _USERTOKEN = None
     _DEVICE_ID = None
     _MEDIATOKEN = None
@@ -97,11 +92,11 @@ class AbemaTVBaseIE(InfoExtractor):
 
     @classmethod
     def _generate_aks(cls, deviceid):
-        deviceid = deviceid.encode('utf-8')
+        deviceid = deviceid.encode()
         # add 1 hour and then drop minute and secs
         ts_1hour = int((time_seconds() // 3600 + 1) * 3600)
         time_struct = time.gmtime(ts_1hour)
-        ts_1hour_str = str(ts_1hour).encode('utf-8')
+        ts_1hour_str = str(ts_1hour).encode()
 
         tmp = None
 
@@ -113,7 +108,7 @@ class AbemaTVBaseIE(InfoExtractor):
 
         def mix_tmp(count):
             nonlocal tmp
-            for i in range(count):
+            for _ in range(count):
                 mix_once(tmp)
 
         def mix_twist(nonce):
@@ -133,11 +128,15 @@ class AbemaTVBaseIE(InfoExtractor):
         if self._USERTOKEN:
             return self._USERTOKEN
 
+        self._downloader._request_director.add_handler(AbemaLicenseRH(ie=self, logger=None))
+
         username, _ = self._get_login_info()
-        AbemaTVBaseIE._USERTOKEN = username and self.cache.load(self._NETRC_MACHINE, username)
+        auth_cache = username and self.cache.load(self._NETRC_MACHINE, username, min_ver='2024.01.19')
+        AbemaTVBaseIE._USERTOKEN = auth_cache and auth_cache.get('usertoken')
         if AbemaTVBaseIE._USERTOKEN:
             # try authentication with locally stored token
             try:
+                AbemaTVBaseIE._DEVICE_ID = auth_cache.get('device_id')
                 self._get_media_token(True)
                 return
             except ExtractorError as e:
@@ -150,13 +149,12 @@ class AbemaTVBaseIE(InfoExtractor):
             data=json.dumps({
                 'deviceId': self._DEVICE_ID,
                 'applicationKeySecret': aks,
-            }).encode('utf-8'),
+            }).encode(),
             headers={
                 'Content-Type': 'application/json',
             })
         AbemaTVBaseIE._USERTOKEN = user_data['token']
 
-        add_opener(self._downloader, AbemaLicenseHandler(self))
         return self._USERTOKEN
 
     def _get_media_token(self, invalidate=False, to_show=True):
@@ -171,13 +169,44 @@ class AbemaTVBaseIE(InfoExtractor):
                 'osLang': 'ja_JP',
                 'osTimezone': 'Asia/Tokyo',
                 'appId': 'tv.abema',
-                'appVersion': '3.27.1'
+                'appVersion': '3.27.1',
             }, headers={
                 'Authorization': f'bearer {self._get_device_token()}',
             })['token']
 
         return self._MEDIATOKEN
 
+    def _perform_login(self, username, password):
+        self._get_device_token()
+        if self.cache.load(self._NETRC_MACHINE, username, min_ver='2024.01.19') and self._get_media_token():
+            self.write_debug('Skipping logging in')
+            return
+
+        if '@' in username:  # don't strictly check if it's email address or not
+            ep, method = 'user/email', 'email'
+        else:
+            ep, method = 'oneTimePassword', 'userId'
+
+        login_response = self._download_json(
+            f'https://api.abema.io/v1/auth/{ep}', None, note='Logging in',
+            data=json.dumps({
+                method: username,
+                'password': password,
+            }).encode(), headers={
+                'Authorization': f'bearer {self._get_device_token()}',
+                'Origin': 'https://abema.tv',
+                'Referer': 'https://abema.tv/',
+                'Content-Type': 'application/json',
+            })
+
+        AbemaTVBaseIE._USERTOKEN = login_response['token']
+        self._get_media_token(True)
+        auth_cache = {
+            'device_id': AbemaTVBaseIE._DEVICE_ID,
+            'usertoken': AbemaTVBaseIE._USERTOKEN,
+        }
+        self.cache.store(self._NETRC_MACHINE, username, auth_cache)
+
     def _call_api(self, endpoint, video_id, query=None, note='Downloading JSON metadata'):
         return self._download_json(
             f'https://api.abema.io/{endpoint}', video_id, query=query or {},
@@ -201,14 +230,14 @@ class AbemaTVBaseIE(InfoExtractor):
 
 class AbemaTVIE(AbemaTVBaseIE):
     _VALID_URL = r'https?://abema\.tv/(?P<type>now-on-air|video/episode|channels/.+?/slots)/(?P<id>[^?/]+)'
-    _NETRC_MACHINE = 'abematv'
     _TESTS = [{
         'url': 'https://abema.tv/video/episode/194-25_s2_p1',
         'info_dict': {
             'id': '194-25_s2_p1',
             'title': '第1話 「チーズケーキ」　「モーニング再び」',
             'series': '異世界食堂２',
-            'series_number': 2,
+            'season': 'シーズン2',
+            'season_number': 2,
             'episode': '第1話 「チーズケーキ」　「モーニング再び」',
             'episode_number': 1,
         },
@@ -220,7 +249,7 @@ class AbemaTVIE(AbemaTVBaseIE):
             'title': 'ゆるキャン△ SEASON２ 全話一挙【無料ビデオ72時間】',
             'series': 'ゆるキャン△ SEASON２',
             'episode': 'ゆるキャン△ SEASON２ 全話一挙【無料ビデオ72時間】',
-            'series_number': 2,
+            'season_number': 2,
             'episode_number': 1,
             'description': 'md5:9c5a3172ae763278f9303922f0ea5b17',
         },
@@ -249,33 +278,6 @@ class AbemaTVIE(AbemaTVBaseIE):
     }]
     _TIMETABLE = None
 
-    def _perform_login(self, username, password):
-        self._get_device_token()
-        if self.cache.load(self._NETRC_MACHINE, username) and self._get_media_token():
-            self.write_debug('Skipping logging in')
-            return
-
-        if '@' in username:  # don't strictly check if it's email address or not
-            ep, method = 'user/email', 'email'
-        else:
-            ep, method = 'oneTimePassword', 'userId'
-
-        login_response = self._download_json(
-            f'https://api.abema.io/v1/auth/{ep}', None, note='Logging in',
-            data=json.dumps({
-                method: username,
-                'password': password
-            }).encode('utf-8'), headers={
-                'Authorization': f'bearer {self._get_device_token()}',
-                'Origin': 'https://abema.tv',
-                'Referer': 'https://abema.tv/',
-                'Content-Type': 'application/json',
-            })
-
-        AbemaTVBaseIE._USERTOKEN = login_response['token']
-        self._get_media_token(True)
-        self.cache.store(self._NETRC_MACHINE, username, AbemaTVBaseIE._USERTOKEN)
-
     def _real_extract(self, url):
         # starting download using infojson from this extractor is undefined behavior,
         # and never be fixed in the future; you must trigger downloads by directly specifying URL.
@@ -331,7 +333,7 @@ class AbemaTVIE(AbemaTVBaseIE):
 
         description = self._html_search_regex(
             (r'<p\s+class="com-video-EpisodeDetailsBlock__content"><span\s+class=".+?">(.+?)</span></p><div',
-             r'<span\s+class=".+?SlotSummary.+?">(.+?)</span></div><div',),
+             r'<span\s+class=".+?SlotSummary.+?">(.+?)</span></div><div'),
             webpage, 'description', default=None, group=1)
         if not description:
             og_desc = self._html_search_meta(
@@ -344,17 +346,18 @@ class AbemaTVIE(AbemaTVBaseIE):
                     )?
                 ''', r'\1', og_desc)
 
-        # canonical URL may contain series and episode number
+        # canonical URL may contain season and episode number
         mobj = re.search(r's(\d+)_p(\d+)$', canonical_url)
         if mobj:
             seri = int_or_none(mobj.group(1), default=float('inf'))
             epis = int_or_none(mobj.group(2), default=float('inf'))
-            info['series_number'] = seri if seri < 100 else None
+            info['season_number'] = seri if seri < 100 else None
             # some anime like Detective Conan (though not available in AbemaTV)
             # has more than 1000 episodes (1026 as of 2021/11/15)
             info['episode_number'] = epis if epis < 2000 else None
 
         is_live, m3u8_url = False, None
+        availability = 'public'
         if video_type == 'now-on-air':
             is_live = True
             channel_url = 'https://api.abema.io/v1/channels'
@@ -372,13 +375,13 @@ class AbemaTVIE(AbemaTVBaseIE):
                 f'https://api.abema.io/v1/video/programs/{video_id}', video_id,
                 note='Checking playability',
                 headers=headers)
-            ondemand_types = traverse_obj(api_response, ('terms', ..., 'onDemandType'))
-            if 3 not in ondemand_types:
+            if not traverse_obj(api_response, ('label', 'free', {bool})):
                 # cannot acquire decryption key for these streams
                 self.report_warning('This is a premium-only stream')
+                availability = 'premium_only'
             info.update(traverse_obj(api_response, {
                 'series': ('series', 'title'),
-                'season': ('season', 'title'),
+                'season': ('season', 'name'),
                 'season_number': ('season', 'sequence'),
                 'episode_number': ('episode', 'number'),
             }))
@@ -395,6 +398,7 @@ class AbemaTVIE(AbemaTVBaseIE):
                 headers=headers)
             if not traverse_obj(api_response, ('slot', 'flags', 'timeshiftFree'), default=False):
                 self.report_warning('This is a premium-only stream')
+                availability = 'premium_only'
 
             m3u8_url = f'https://vod-abematv.akamaized.net/slot/{video_id}/playlist.m3u8'
         else:
@@ -412,19 +416,25 @@ class AbemaTVIE(AbemaTVBaseIE):
             'description': description,
             'formats': formats,
             'is_live': is_live,
+            'availability': availability,
         })
+
+        if thumbnail := update_url(self._og_search_thumbnail(webpage, default=''), query=None):
+            info['thumbnails'] = [{'url': thumbnail}]
+
         return info
 
 
 class AbemaTVTitleIE(AbemaTVBaseIE):
-    _VALID_URL = r'https?://abema\.tv/video/title/(?P<id>[^?/]+)'
+    _VALID_URL = r'https?://abema\.tv/video/title/(?P<id>[^?/#]+)/?(?:\?(?:[^#]+&)?s=(?P<season>[^&#]+))?'
     _PAGE_SIZE = 25
 
     _TESTS = [{
-        'url': 'https://abema.tv/video/title/90-1597',
+        'url': 'https://abema.tv/video/title/90-1887',
         'info_dict': {
-            'id': '90-1597',
+            'id': '90-1887',
             'title': 'シャッフルアイランド',
+            'description': 'md5:61b2425308f41a5282a926edda66f178',
         },
         'playlist_mincount': 2,
     }, {
@@ -432,41 +442,54 @@ class AbemaTVTitleIE(AbemaTVBaseIE):
         'info_dict': {
             'id': '193-132',
             'title': '真心が届く~僕とスターのオフィス・ラブ!?~',
+            'description': 'md5:9b59493d1f3a792bafbc7319258e7af8',
         },
         'playlist_mincount': 16,
     }, {
-        'url': 'https://abema.tv/video/title/25-102',
+        'url': 'https://abema.tv/video/title/25-1nzan-whrxe',
         'info_dict': {
-            'id': '25-102',
-            'title': 'ソードアート・オンライン アリシゼーション',
+            'id': '25-1nzan-whrxe',
+            'title': 'ソードアート・オンライン',
+            'description': 'md5:c094904052322e6978495532bdbf06e6',
         },
-        'playlist_mincount': 24,
+        'playlist_mincount': 25,
+    }, {
+        'url': 'https://abema.tv/video/title/26-2mzbynr-cph?s=26-2mzbynr-cph_s40',
+        'info_dict': {
+            'title': '〈物語〉シリーズ',
+            'id': '26-2mzbynr-cph',
+            'description': 'md5:e67873de1c88f360af1f0a4b84847a52',
+        },
+        'playlist_count': 59,
     }]
 
-    def _fetch_page(self, playlist_id, series_version, page):
+    def _fetch_page(self, playlist_id, series_version, season_id, page):
+        query = {
+            'seriesVersion': series_version,
+            'offset': str(page * self._PAGE_SIZE),
+            'order': 'seq',
+            'limit': str(self._PAGE_SIZE),
+        }
+        if season_id:
+            query['seasonId'] = season_id
         programs = self._call_api(
             f'v1/video/series/{playlist_id}/programs', playlist_id,
             note=f'Downloading page {page + 1}',
-            query={
-                'seriesVersion': series_version,
-                'offset': str(page * self._PAGE_SIZE),
-                'order': 'seq',
-                'limit': str(self._PAGE_SIZE),
-            })
+            query=query)
         yield from (
             self.url_result(f'https://abema.tv/video/episode/{x}')
             for x in traverse_obj(programs, ('programs', ..., 'id')))
 
-    def _entries(self, playlist_id, series_version):
+    def _entries(self, playlist_id, series_version, season_id):
         return OnDemandPagedList(
-            functools.partial(self._fetch_page, playlist_id, series_version),
+            functools.partial(self._fetch_page, playlist_id, series_version, season_id),
             self._PAGE_SIZE)
 
     def _real_extract(self, url):
-        playlist_id = self._match_id(url)
+        playlist_id, season_id = self._match_valid_url(url).group('id', 'season')
         series_info = self._call_api(f'v1/video/series/{playlist_id}', playlist_id)
 
         return self.playlist_result(
-            self._entries(playlist_id, series_info['version']), playlist_id=playlist_id,
+            self._entries(playlist_id, series_info['version'], season_id), playlist_id=playlist_id,
             playlist_title=series_info.get('title'),
             playlist_description=series_info.get('content'))
diff --git a/plugins/youtube_download/yt_dlp/extractor/academicearth.py b/plugins/youtube_download/yt_dlp/extractor/academicearth.py
index d9691cb..b997a02 100644
--- a/plugins/youtube_download/yt_dlp/extractor/academicearth.py
+++ b/plugins/youtube_download/yt_dlp/extractor/academicearth.py
@@ -4,7 +4,7 @@ from .common import InfoExtractor
 
 
 class AcademicEarthCourseIE(InfoExtractor):
-    _VALID_URL = r'^https?://(?:www\.)?academicearth\.org/playlists/(?P<id>[^?#/]+)'
+    _VALID_URL = r'https?://(?:www\.)?academicearth\.org/playlists/(?P<id>[^?#/]+)'
     IE_NAME = 'AcademicEarth:Course'
     _TEST = {
         'url': 'http://academicearth.org/playlists/laws-of-nature/',
diff --git a/plugins/youtube_download/yt_dlp/extractor/acast.py b/plugins/youtube_download/yt_dlp/extractor/acast.py
index 427d04c..eb467cb 100644
--- a/plugins/youtube_download/yt_dlp/extractor/acast.py
+++ b/plugins/youtube_download/yt_dlp/extractor/acast.py
@@ -43,14 +43,14 @@ class ACastIE(ACastBaseIE):
     _VALID_URL = r'''(?x:
                     https?://
                         (?:
-                            (?:(?:embed|www)\.)?acast\.com/|
+                            (?:(?:embed|www|shows)\.)?acast\.com/|
                             play\.acast\.com/s/
                         )
-                        (?P<channel>[^/]+)/(?P<id>[^/#?"]+)
+                        (?P<channel>[^/?#]+)/(?:episodes/)?(?P<id>[^/#?"]+)
                     )'''
     _EMBED_REGEX = [rf'(?x)<iframe[^>]+\bsrc=[\'"](?P<url>{_VALID_URL})']
     _TESTS = [{
-        'url': 'https://www.acast.com/sparpodcast/2.raggarmordet-rosterurdetforflutna',
+        'url': 'https://shows.acast.com/sparpodcast/episodes/2.raggarmordet-rosterurdetforflutna',
         'info_dict': {
             'id': '2a92b283-1a75-4ad8-8396-499c641de0d9',
             'ext': 'mp3',
@@ -59,7 +59,7 @@ class ACastIE(ACastBaseIE):
             'timestamp': 1477346700,
             'upload_date': '20161024',
             'duration': 2766,
-            'creator': 'Third Ear Studio',
+            'creators': ['Third Ear Studio'],
             'series': 'Spår',
             'episode': '2. Raggarmordet - Röster ur det förflutna',
             'thumbnail': 'https://assets.pippa.io/shows/616ebe1886d7b1398620b943/616ebe33c7e6e70013cae7da.jpg',
@@ -67,13 +67,16 @@ class ACastIE(ACastBaseIE):
             'display_id': '2.raggarmordet-rosterurdetforflutna',
             'season_number': 4,
             'season': 'Season 4',
-        }
+        },
     }, {
         'url': 'http://embed.acast.com/adambuxton/ep.12-adam-joeschristmaspodcast2015',
         'only_matching': True,
     }, {
         'url': 'https://play.acast.com/s/rattegangspodden/s04e09styckmordetihelenelund-del2-2',
         'only_matching': True,
+    }, {
+        'url': 'https://www.acast.com/sparpodcast/2.raggarmordet-rosterurdetforflutna',
+        'only_matching': True,
     }, {
         'url': 'https://play.acast.com/s/sparpodcast/2a92b283-1a75-4ad8-8396-499c641de0d9',
         'only_matching': True,
@@ -93,13 +96,13 @@ class ACastIE(ACastBaseIE):
             'series': 'Democracy Sausage with Mark Kenny',
             'timestamp': 1684826362,
             'description': 'md5:feabe1fc5004c78ee59c84a46bf4ba16',
-        }
+        },
     }]
 
     def _real_extract(self, url):
         channel, display_id = self._match_valid_url(url).groups()
         episode = self._call_api(
-            '%s/episodes/%s' % (channel, display_id),
+            f'{channel}/episodes/{display_id}',
             display_id, {'showInfo': 'true'})
         return self._extract_episode(
             episode, self._extract_show_info(episode.get('show') or {}))
@@ -110,7 +113,7 @@ class ACastChannelIE(ACastBaseIE):
     _VALID_URL = r'''(?x)
                     https?://
                         (?:
-                            (?:www\.)?acast\.com/|
+                            (?:(?:www|shows)\.)?acast\.com/|
                             play\.acast\.com/s/
                         )
                         (?P<id>[^/#?]+)
@@ -120,17 +123,20 @@ class ACastChannelIE(ACastBaseIE):
         'info_dict': {
             'id': '4efc5294-5385-4847-98bd-519799ce5786',
             'title': 'Today in Focus',
-            'description': 'md5:c09ce28c91002ce4ffce71d6504abaae',
+            'description': 'md5:feca253de9947634605080cd9eeea2bf',
         },
         'playlist_mincount': 200,
     }, {
         'url': 'http://play.acast.com/s/ft-banking-weekly',
         'only_matching': True,
+    }, {
+        'url': 'https://shows.acast.com/sparpodcast',
+        'only_matching': True,
     }]
 
     @classmethod
     def suitable(cls, url):
-        return False if ACastIE.suitable(url) else super(ACastChannelIE, cls).suitable(url)
+        return False if ACastIE.suitable(url) else super().suitable(url)
 
     def _real_extract(self, url):
         show_slug = self._match_id(url)
diff --git a/plugins/youtube_download/yt_dlp/extractor/acfun.py b/plugins/youtube_download/yt_dlp/extractor/acfun.py
index dc57929..28559ba 100644
--- a/plugins/youtube_download/yt_dlp/extractor/acfun.py
+++ b/plugins/youtube_download/yt_dlp/extractor/acfun.py
@@ -3,9 +3,10 @@ from ..utils import (
     float_or_none,
     format_field,
     int_or_none,
-    traverse_obj,
     parse_codecs,
     parse_qs,
+    str_or_none,
+    traverse_obj,
 )
 
 
@@ -24,7 +25,7 @@ class AcFunVideoBaseIE(InfoExtractor):
                     'width': int_or_none(video.get('width')),
                     'height': int_or_none(video.get('height')),
                     'tbr': float_or_none(video.get('avgBitrate')),
-                    **parse_codecs(video.get('codecs', ''))
+                    **parse_codecs(video.get('codecs', '')),
                 })
 
         return {
@@ -76,7 +77,7 @@ class AcFunVideoIE(AcFunVideoBaseIE):
             'comment_count': int,
             'thumbnail': r're:^https?://.*\.(jpg|jpeg)',
             'description': 'md5:67583aaf3a0f933bd606bc8a2d3ebb17',
-        }
+        },
     }]
 
     def _real_extract(self, url):
@@ -129,7 +130,7 @@ class AcFunBangumiIE(AcFunVideoBaseIE):
             'title': '红孩儿之趴趴蛙寻石记 第5话 ',
             'duration': 760.0,
             'season': '红孩儿之趴趴蛙寻石记',
-            'season_id': 5023171,
+            'season_id': '5023171',
             'season_number': 1,  # series has only 1 season
             'episode': 'Episode 5',
             'episode_number': 5,
@@ -146,7 +147,7 @@ class AcFunBangumiIE(AcFunVideoBaseIE):
             'title': '叽歪老表（第二季） 第5话 坚不可摧',
             'season': '叽歪老表（第二季）',
             'season_number': 2,
-            'season_id': 6065485,
+            'season_id': '6065485',
             'episode': '坚不可摧',
             'episode_number': 5,
             'upload_date': '20220324',
@@ -191,7 +192,7 @@ class AcFunBangumiIE(AcFunVideoBaseIE):
             'title': json_bangumi_data.get('showTitle'),
             'thumbnail': json_bangumi_data.get('image'),
             'season': json_bangumi_data.get('bangumiTitle'),
-            'season_id': season_id,
+            'season_id': str_or_none(season_id),
             'season_number': season_number,
             'episode': json_bangumi_data.get('title'),
             'episode_number': episode_number,
diff --git a/plugins/youtube_download/yt_dlp/extractor/adn.py b/plugins/youtube_download/yt_dlp/extractor/adn.py
index b59dbc8..7dff405 100644
--- a/plugins/youtube_download/yt_dlp/extractor/adn.py
+++ b/plugins/youtube_download/yt_dlp/extractor/adn.py
@@ -3,33 +3,53 @@ import binascii
 import json
 import os
 import random
+import time
 
 from .common import InfoExtractor
 from ..aes import aes_cbc_decrypt_bytes, unpad_pkcs7
-from ..compat import compat_b64decode
 from ..networking.exceptions import HTTPError
 from ..utils import (
-    ass_subtitles_timecode,
-    bytes_to_intlist,
-    bytes_to_long,
     ExtractorError,
+    ass_subtitles_timecode,
+    bytes_to_long,
     float_or_none,
     int_or_none,
-    intlist_to_bytes,
+    join_nonempty,
     long_to_bytes,
+    parse_iso8601,
     pkcs1pad,
+    str_or_none,
     strip_or_none,
     try_get,
     unified_strdate,
     urlencode_postdata,
 )
+from ..utils.traversal import traverse_obj
 
 
-class ADNIE(InfoExtractor):
+class ADNBaseIE(InfoExtractor):
     IE_DESC = 'Animation Digital Network'
-    _VALID_URL = r'https?://(?:www\.)?(?:animation|anime)digitalnetwork\.fr/video/[^/]+/(?P<id>\d+)'
+    _NETRC_MACHINE = 'animationdigitalnetwork'
+    _BASE = 'animationdigitalnetwork.fr'
+    _API_BASE_URL = f'https://gw.api.{_BASE}/'
+    _PLAYER_BASE_URL = f'{_API_BASE_URL}player/'
+    _HEADERS = {}
+    _LOGIN_ERR_MESSAGE = 'Unable to log in'
+    _RSA_KEY = (0x9B42B08905199A5CCE2026274399CA560ECB209EE9878A708B1C0812E1BB8CB5D1FB7441861147C1A1F2F3A0476DD63A9CAC20D3E983613346850AA6CB38F16DC7D720FD7D86FC6E5B3D5BBC72E14CD0BF9E869F2CEA2CCAD648F1DCE38F1FF916CEFB2D339B64AA0264372344BC775E265E8A852F88144AB0BD9AA06C1A4ABB, 65537)
+    _POS_ALIGN_MAP = {
+        'start': 1,
+        'end': 3,
+    }
+    _LINE_ALIGN_MAP = {
+        'middle': 8,
+        'end': 4,
+    }
+
+
+class ADNIE(ADNBaseIE):
+    _VALID_URL = r'https?://(?:www\.)?animationdigitalnetwork\.com/(?:(?P<lang>de)/)?video/[^/?#]+/(?P<id>\d+)'
     _TESTS = [{
-        'url': 'https://animationdigitalnetwork.fr/video/fruits-basket/9841-episode-1-a-ce-soir',
+        'url': 'https://animationdigitalnetwork.com/video/558-fruits-basket/9841-episode-1-a-ce-soir',
         'md5': '1c9ef066ceb302c86f80c2b371615261',
         'info_dict': {
             'id': '9841',
@@ -44,29 +64,32 @@ class ADNIE(InfoExtractor):
             'season_number': 1,
             'episode': 'À ce soir !',
             'episode_number': 1,
+            'thumbnail': str,
+            'season': 'Season 1',
         },
-        'skip': 'Only available in region (FR, ...)',
+        'skip': 'Only available in French and German speaking Europe',
     }, {
-        'url': 'http://animedigitalnetwork.fr/video/blue-exorcist-kyoto-saga/7778-episode-1-debut-des-hostilites',
-        'only_matching': True,
+        'url': 'https://animationdigitalnetwork.com/de/video/973-the-eminence-in-shadow/23550-folge-1',
+        'md5': '5c5651bf5791fa6fcd7906012b9d94e8',
+        'info_dict': {
+            'id': '23550',
+            'ext': 'mp4',
+            'episode_number': 1,
+            'duration': 1417,
+            'release_date': '20231004',
+            'series': 'The Eminence in Shadow',
+            'season_number': 2,
+            'episode': str,
+            'title': str,
+            'thumbnail': str,
+            'season': 'Season 2',
+            'comment_count': int,
+            'average_rating': float,
+            'description': str,
+        },
+        # 'skip': 'Only available in French and German speaking Europe',
     }]
 
-    _NETRC_MACHINE = 'animationdigitalnetwork'
-    _BASE = 'animationdigitalnetwork.fr'
-    _API_BASE_URL = 'https://gw.api.' + _BASE + '/'
-    _PLAYER_BASE_URL = _API_BASE_URL + 'player/'
-    _HEADERS = {}
-    _LOGIN_ERR_MESSAGE = 'Unable to log in'
-    _RSA_KEY = (0x9B42B08905199A5CCE2026274399CA560ECB209EE9878A708B1C0812E1BB8CB5D1FB7441861147C1A1F2F3A0476DD63A9CAC20D3E983613346850AA6CB38F16DC7D720FD7D86FC6E5B3D5BBC72E14CD0BF9E869F2CEA2CCAD648F1DCE38F1FF916CEFB2D339B64AA0264372344BC775E265E8A852F88144AB0BD9AA06C1A4ABB, 65537)
-    _POS_ALIGN_MAP = {
-        'start': 1,
-        'end': 3,
-    }
-    _LINE_ALIGN_MAP = {
-        'middle': 8,
-        'end': 4,
-    }
-
     def _get_subtitles(self, sub_url, video_id):
         if not sub_url:
             return None
@@ -83,9 +106,9 @@ class ADNIE(InfoExtractor):
 
         # http://animationdigitalnetwork.fr/components/com_vodvideo/videojs/adn-vjs.min.js
         dec_subtitles = unpad_pkcs7(aes_cbc_decrypt_bytes(
-            compat_b64decode(enc_subtitles[24:]),
+            base64.b64decode(enc_subtitles[24:]),
             binascii.unhexlify(self._K + '7fac1178830cfe0c'),
-            compat_b64decode(enc_subtitles[:24])))
+            base64.b64decode(enc_subtitles[:24])))
         subtitles_json = self._parse_json(dec_subtitles.decode(), None, fatal=False)
         if not subtitles_json:
             return None
@@ -108,7 +131,7 @@ Format: Marked,Start,End,Style,Name,MarginL,MarginR,MarginV,Effect,Text'''
                 if start is None or end is None or text is None:
                     continue
                 alignment = self._POS_ALIGN_MAP.get(position_align, 2) + self._LINE_ALIGN_MAP.get(line_align, 0)
-                ssa += os.linesep + 'Dialogue: Marked=0,%s,%s,Default,,0,0,0,,%s%s' % (
+                ssa += os.linesep + 'Dialogue: Marked=0,{},{},Default,,0,0,0,,{}{}'.format(
                     ass_subtitles_timecode(start),
                     ass_subtitles_timecode(end),
                     '{\\a%d}' % alignment if alignment != 2 else '',
@@ -116,6 +139,8 @@ Format: Marked,Start,End,Style,Name,MarginL,MarginR,MarginV,Effect,Text'''
 
             if sub_lang == 'vostf':
                 sub_lang = 'fr'
+            elif sub_lang == 'vostde':
+                sub_lang = 'de'
             subtitles.setdefault(sub_lang, []).extend([{
                 'ext': 'json',
                 'data': json.dumps(sub),
@@ -137,7 +162,7 @@ Format: Marked,Start,End,Style,Name,MarginL,MarginR,MarginV,Effect,Text'''
                     'username': username,
                 })) or {}).get('accessToken')
             if access_token:
-                self._HEADERS = {'authorization': 'Bearer ' + access_token}
+                self._HEADERS['Authorization'] = f'Bearer {access_token}'
         except ExtractorError as e:
             message = None
             if isinstance(e.cause, HTTPError) and e.cause.status == 401:
@@ -147,8 +172,9 @@ Format: Marked,Start,End,Style,Name,MarginL,MarginR,MarginV,Effect,Text'''
             self.report_warning(message or self._LOGIN_ERR_MESSAGE)
 
     def _real_extract(self, url):
-        video_id = self._match_id(url)
-        video_base_url = self._PLAYER_BASE_URL + 'video/%s/' % video_id
+        lang, video_id = self._match_valid_url(url).group('lang', 'id')
+        self._HEADERS['X-Target-Distribution'] = lang or 'fr'
+        video_base_url = self._PLAYER_BASE_URL + f'video/{video_id}/'
         player = self._download_json(
             video_base_url + 'configuration', video_id,
             'Downloading player config JSON metadata',
@@ -157,26 +183,29 @@ Format: Marked,Start,End,Style,Name,MarginL,MarginR,MarginV,Effect,Text'''
 
         user = options['user']
         if not user.get('hasAccess'):
-            self.raise_login_required()
+            start_date = traverse_obj(options, ('video', 'startDate', {str}))
+            if (parse_iso8601(start_date) or 0) > time.time():
+                raise ExtractorError(f'This video is not available yet. Release date: {start_date}', expected=True)
+            self.raise_login_required('This video requires a subscription', method='password')
 
         token = self._download_json(
             user.get('refreshTokenUrl') or (self._PLAYER_BASE_URL + 'refresh/token'),
             video_id, 'Downloading access token', headers={
-                'x-player-refresh-token': user['refreshToken']
+                'X-Player-Refresh-Token': user['refreshToken'],
             }, data=b'')['token']
 
         links_url = try_get(options, lambda x: x['video']['url']) or (video_base_url + 'link')
         self._K = ''.join(random.choices('0123456789abcdef', k=16))
-        message = bytes_to_intlist(json.dumps({
+        message = list(json.dumps({
             'k': self._K,
             't': token,
-        }))
+        }).encode())
 
         # Sometimes authentication fails for no good reason, retry with
         # a different random padding
         links_data = None
         for _ in range(3):
-            padded_message = intlist_to_bytes(pkcs1pad(message, 128))
+            padded_message = bytes(pkcs1pad(message, 128))
             n, e = self._RSA_KEY
             encrypted_message = long_to_bytes(pow(bytes_to_long(padded_message), e, n))
             authorization = base64.b64encode(encrypted_message).decode()
@@ -184,12 +213,13 @@ Format: Marked,Start,End,Style,Name,MarginL,MarginR,MarginV,Effect,Text'''
             try:
                 links_data = self._download_json(
                     links_url, video_id, 'Downloading links JSON metadata', headers={
-                        'X-Player-Token': authorization
+                        'X-Player-Token': authorization,
+                        **self._HEADERS,
                     }, query={
                         'freeWithAds': 'true',
                         'adaptive': 'false',
                         'withMetadata': 'true',
-                        'source': 'Web'
+                        'source': 'Web',
                     })
                 break
             except ExtractorError as e:
@@ -202,7 +232,7 @@ Format: Marked,Start,End,Style,Name,MarginL,MarginR,MarginV,Effect,Text'''
 
                 error = self._parse_json(e.cause.response.read(), video_id)
                 message = error.get('message')
-                if e.cause.code == 403 and error.get('code') == 'player-bad-geolocation-country':
+                if e.cause.status == 403 and error.get('code') == 'player-bad-geolocation-country':
                     self.raise_geo_restricted(msg=message)
                 raise ExtractorError(message)
         else:
@@ -221,7 +251,8 @@ Format: Marked,Start,End,Style,Name,MarginL,MarginR,MarginV,Effect,Text'''
             for quality, load_balancer_url in qualities.items():
                 load_balancer_data = self._download_json(
                     load_balancer_url, video_id,
-                    'Downloading %s %s JSON metadata' % (format_id, quality),
+                    f'Downloading {format_id} {quality} JSON metadata',
+                    headers=self._HEADERS,
                     fatal=False) or {}
                 m3u8_url = load_balancer_data.get('location')
                 if not m3u8_url:
@@ -232,11 +263,17 @@ Format: Marked,Start,End,Style,Name,MarginL,MarginR,MarginV,Effect,Text'''
                 if format_id == 'vf':
                     for f in m3u8_formats:
                         f['language'] = 'fr'
+                elif format_id == 'vde':
+                    for f in m3u8_formats:
+                        f['language'] = 'de'
                 formats.extend(m3u8_formats)
 
+        if not formats:
+            self.raise_login_required('This video requires a subscription', method='password')
+
         video = (self._download_json(
-            self._API_BASE_URL + 'video/%s' % video_id, video_id,
-            'Downloading additional video metadata', fatal=False) or {}).get('video') or {}
+            self._API_BASE_URL + f'video/{video_id}', video_id,
+            'Downloading additional video metadata', fatal=False, headers=self._HEADERS) or {}).get('video') or {}
         show = video.get('show') or {}
 
         return {
@@ -255,3 +292,38 @@ Format: Marked,Start,End,Style,Name,MarginL,MarginR,MarginV,Effect,Text'''
             'average_rating': float_or_none(video.get('rating') or metas.get('rating')),
             'comment_count': int_or_none(video.get('commentsCount')),
         }
+
+
+class ADNSeasonIE(ADNBaseIE):
+    _VALID_URL = r'https?://(?:www\.)?animationdigitalnetwork\.com/(?:(?P<lang>de)/)?video/(?P<id>\d+)[^/?#]*/?(?:$|[#?])'
+    _TESTS = [{
+        'url': 'https://animationdigitalnetwork.com/video/911-tokyo-mew-mew-new',
+        'playlist_count': 12,
+        'info_dict': {
+            'id': '911',
+            'title': 'Tokyo Mew Mew New',
+        },
+        # 'skip': 'Only available in French end German speaking Europe',
+    }]
+
+    def _real_extract(self, url):
+        lang, video_show_slug = self._match_valid_url(url).group('lang', 'id')
+        self._HEADERS['X-Target-Distribution'] = lang or 'fr'
+        show = self._download_json(
+            f'{self._API_BASE_URL}show/{video_show_slug}/', video_show_slug,
+            'Downloading show JSON metadata', headers=self._HEADERS)['show']
+        show_id = str(show['id'])
+        episodes = self._download_json(
+            f'{self._API_BASE_URL}video/show/{show_id}', video_show_slug,
+            'Downloading episode list', headers=self._HEADERS, query={
+                'order': 'asc',
+                'limit': '-1',
+            })
+
+        def entries():
+            for episode_id in traverse_obj(episodes, ('videos', ..., 'id', {str_or_none})):
+                yield self.url_result(join_nonempty(
+                    'https://animationdigitalnetwork.com', lang, 'video',
+                    video_show_slug, episode_id, delim='/'), ADNIE, episode_id)
+
+        return self.playlist_result(entries(), show_id, show.get('title'))
diff --git a/plugins/youtube_download/yt_dlp/extractor/adobeconnect.py b/plugins/youtube_download/yt_dlp/extractor/adobeconnect.py
index 8963b12..b2934d6 100644
--- a/plugins/youtube_download/yt_dlp/extractor/adobeconnect.py
+++ b/plugins/youtube_download/yt_dlp/extractor/adobeconnect.py
@@ -1,8 +1,6 @@
+import urllib.parse
+
 from .common import InfoExtractor
-from ..compat import (
-    compat_parse_qs,
-    compat_urlparse,
-)
 
 
 class AdobeConnectIE(InfoExtractor):
@@ -12,13 +10,13 @@ class AdobeConnectIE(InfoExtractor):
         video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
         title = self._html_extract_title(webpage)
-        qs = compat_parse_qs(self._search_regex(r"swfUrl\s*=\s*'([^']+)'", webpage, 'swf url').split('?')[1])
+        qs = urllib.parse.parse_qs(self._search_regex(r"swfUrl\s*=\s*'([^']+)'", webpage, 'swf url').split('?')[1])
         is_live = qs.get('isLive', ['false'])[0] == 'true'
         formats = []
         for con_string in qs['conStrings'][0].split(','):
             formats.append({
                 'format_id': con_string.split('://')[0],
-                'app': compat_urlparse.quote('?' + con_string.split('?')[1] + 'flvplayerapp/' + qs['appInstance'][0]),
+                'app': urllib.parse.quote('?' + con_string.split('?')[1] + 'flvplayerapp/' + qs['appInstance'][0]),
                 'ext': 'flv',
                 'play_path': 'mp4:' + qs['streamName'][0],
                 'rtmp_conn': 'S:' + qs['ticket'][0],
diff --git a/plugins/youtube_download/yt_dlp/extractor/adobepass.py b/plugins/youtube_download/yt_dlp/extractor/adobepass.py
index 5eed0ca..f1b8779 100644
--- a/plugins/youtube_download/yt_dlp/extractor/adobepass.py
+++ b/plugins/youtube_download/yt_dlp/extractor/adobepass.py
@@ -2,10 +2,10 @@ import getpass
 import json
 import re
 import time
+import urllib.parse
 import xml.etree.ElementTree as etree
 
 from .common import InfoExtractor
-from ..compat import compat_urlparse
 from ..networking.exceptions import HTTPError
 from ..utils import (
     NO_DEFAULT,
@@ -68,7 +68,7 @@ MSO_INFO = {
     },
     'Philo': {
         'name': 'Philo',
-        'username_field': 'ident'
+        'username_field': 'ident',
     },
     'Verizon': {
         'name': 'Verizon FiOS',
@@ -81,1258 +81,1258 @@ MSO_INFO = {
         'password_field': 'j_password',
     },
     'thr030': {
-        'name': '3 Rivers Communications'
+        'name': '3 Rivers Communications',
     },
     'com140': {
-        'name': 'Access Montana'
+        'name': 'Access Montana',
     },
     'acecommunications': {
-        'name': 'AcenTek'
+        'name': 'AcenTek',
     },
     'acm010': {
-        'name': 'Acme Communications'
+        'name': 'Acme Communications',
     },
     'ada020': {
-        'name': 'Adams Cable Service'
+        'name': 'Adams Cable Service',
     },
     'alb020': {
-        'name': 'Albany Mutual Telephone'
+        'name': 'Albany Mutual Telephone',
     },
     'algona': {
-        'name': 'Algona Municipal Utilities'
+        'name': 'Algona Municipal Utilities',
     },
     'allwest': {
-        'name': 'All West Communications'
+        'name': 'All West Communications',
     },
     'all025': {
-        'name': 'Allen\'s Communications'
+        'name': 'Allen\'s Communications',
     },
     'spl010': {
-        'name': 'Alliance Communications'
+        'name': 'Alliance Communications',
     },
     'all070': {
-        'name': 'ALLO Communications'
+        'name': 'ALLO Communications',
     },
     'alpine': {
-        'name': 'Alpine Communications'
+        'name': 'Alpine Communications',
     },
     'hun015': {
-        'name': 'American Broadband'
+        'name': 'American Broadband',
     },
     'nwc010': {
-        'name': 'American Broadband Missouri'
+        'name': 'American Broadband Missouri',
     },
     'com130-02': {
-        'name': 'American Community Networks'
+        'name': 'American Community Networks',
     },
     'com130-01': {
-        'name': 'American Warrior Networks'
+        'name': 'American Warrior Networks',
     },
     'tom020': {
-        'name': 'Amherst Telephone/Tomorrow Valley'
+        'name': 'Amherst Telephone/Tomorrow Valley',
     },
     'tvc020': {
-        'name': 'Andycable'
+        'name': 'Andycable',
     },
     'arkwest': {
-        'name': 'Arkwest Communications'
+        'name': 'Arkwest Communications',
     },
     'art030': {
-        'name': 'Arthur Mutual Telephone Company'
+        'name': 'Arthur Mutual Telephone Company',
     },
     'arvig': {
-        'name': 'Arvig'
+        'name': 'Arvig',
     },
     'nttcash010': {
-        'name': 'Ashland Home Net'
+        'name': 'Ashland Home Net',
     },
     'astound': {
-        'name': 'Astound (now Wave)'
+        'name': 'Astound (now Wave)',
     },
     'dix030': {
-        'name': 'ATC Broadband'
+        'name': 'ATC Broadband',
     },
     'ara010': {
-        'name': 'ATC Communications'
+        'name': 'ATC Communications',
     },
     'she030-02': {
-        'name': 'Ayersville Communications'
+        'name': 'Ayersville Communications',
     },
     'baldwin': {
-        'name': 'Baldwin Lightstream'
+        'name': 'Baldwin Lightstream',
     },
     'bal040': {
-        'name': 'Ballard TV'
+        'name': 'Ballard TV',
     },
     'cit025': {
-        'name': 'Bardstown Cable TV'
+        'name': 'Bardstown Cable TV',
     },
     'bay030': {
-        'name': 'Bay Country Communications'
+        'name': 'Bay Country Communications',
     },
     'tel095': {
-        'name': 'Beaver Creek Cooperative Telephone'
+        'name': 'Beaver Creek Cooperative Telephone',
     },
     'bea020': {
-        'name': 'Beaver Valley Cable'
+        'name': 'Beaver Valley Cable',
     },
     'bee010': {
-        'name': 'Bee Line Cable'
+        'name': 'Bee Line Cable',
     },
     'wir030': {
-        'name': 'Beehive Broadband'
+        'name': 'Beehive Broadband',
     },
     'bra020': {
-        'name': 'BELD'
+        'name': 'BELD',
     },
     'bel020': {
-        'name': 'Bellevue Municipal Cable'
+        'name': 'Bellevue Municipal Cable',
     },
     'vol040-01': {
-        'name': 'Ben Lomand Connect / BLTV'
+        'name': 'Ben Lomand Connect / BLTV',
     },
     'bev010': {
-        'name': 'BEVCOMM'
+        'name': 'BEVCOMM',
     },
     'big020': {
-        'name': 'Big Sandy Broadband'
+        'name': 'Big Sandy Broadband',
     },
     'ble020': {
-        'name': 'Bledsoe Telephone Cooperative'
+        'name': 'Bledsoe Telephone Cooperative',
     },
     'bvt010': {
-        'name': 'Blue Valley Tele-Communications'
+        'name': 'Blue Valley Tele-Communications',
     },
     'bra050': {
-        'name': 'Brandenburg Telephone Co.'
+        'name': 'Brandenburg Telephone Co.',
     },
     'bte010': {
-        'name': 'Bristol Tennessee Essential Services'
+        'name': 'Bristol Tennessee Essential Services',
     },
     'annearundel': {
-        'name': 'Broadstripe'
+        'name': 'Broadstripe',
     },
     'btc010': {
-        'name': 'BTC Communications'
+        'name': 'BTC Communications',
     },
     'btc040': {
-        'name': 'BTC Vision - Nahunta'
+        'name': 'BTC Vision - Nahunta',
     },
     'bul010': {
-        'name': 'Bulloch Telephone Cooperative'
+        'name': 'Bulloch Telephone Cooperative',
     },
     'but010': {
-        'name': 'Butler-Bremer Communications'
+        'name': 'Butler-Bremer Communications',
     },
     'tel160-csp': {
-        'name': 'C Spire SNAP'
+        'name': 'C Spire SNAP',
     },
     'csicable': {
-        'name': 'Cable Services Inc.'
+        'name': 'Cable Services Inc.',
     },
     'cableamerica': {
-        'name': 'CableAmerica'
+        'name': 'CableAmerica',
     },
     'cab038': {
-        'name': 'CableSouth Media 3'
+        'name': 'CableSouth Media 3',
     },
     'weh010-camtel': {
-        'name': 'Cam-Tel Company'
+        'name': 'Cam-Tel Company',
     },
     'car030': {
-        'name': 'Cameron Communications'
+        'name': 'Cameron Communications',
     },
     'canbytel': {
-        'name': 'Canby Telcom'
+        'name': 'Canby Telcom',
     },
     'crt020': {
-        'name': 'CapRock Tv'
+        'name': 'CapRock Tv',
     },
     'car050': {
-        'name': 'Carnegie Cable'
+        'name': 'Carnegie Cable',
     },
     'cas': {
-        'name': 'CAS Cable'
+        'name': 'CAS Cable',
     },
     'casscomm': {
-        'name': 'CASSCOMM'
+        'name': 'CASSCOMM',
     },
     'mid180-02': {
-        'name': 'Catalina Broadband Solutions'
+        'name': 'Catalina Broadband Solutions',
     },
     'cccomm': {
-        'name': 'CC Communications'
+        'name': 'CC Communications',
     },
     'nttccde010': {
-        'name': 'CDE Lightband'
+        'name': 'CDE Lightband',
     },
     'cfunet': {
-        'name': 'Cedar Falls Utilities'
+        'name': 'Cedar Falls Utilities',
     },
     'dem010-01': {
-        'name': 'Celect-Bloomer Telephone Area'
+        'name': 'Celect-Bloomer Telephone Area',
     },
     'dem010-02': {
-        'name': 'Celect-Bruce Telephone Area'
+        'name': 'Celect-Bruce Telephone Area',
     },
     'dem010-03': {
-        'name': 'Celect-Citizens Connected Area'
+        'name': 'Celect-Citizens Connected Area',
     },
     'dem010-04': {
-        'name': 'Celect-Elmwood/Spring Valley Area'
+        'name': 'Celect-Elmwood/Spring Valley Area',
     },
     'dem010-06': {
-        'name': 'Celect-Mosaic Telecom'
+        'name': 'Celect-Mosaic Telecom',
     },
     'dem010-05': {
-        'name': 'Celect-West WI Telephone Area'
+        'name': 'Celect-West WI Telephone Area',
     },
     'net010-02': {
-        'name': 'Cellcom/Nsight Telservices'
+        'name': 'Cellcom/Nsight Telservices',
     },
     'cen100': {
-        'name': 'CentraCom'
+        'name': 'CentraCom',
     },
     'nttccst010': {
-        'name': 'Central Scott / CSTV'
+        'name': 'Central Scott / CSTV',
     },
     'cha035': {
-        'name': 'Chaparral CableVision'
+        'name': 'Chaparral CableVision',
     },
     'cha050': {
-        'name': 'Chariton Valley Communication Corporation, Inc.'
+        'name': 'Chariton Valley Communication Corporation, Inc.',
     },
     'cha060': {
-        'name': 'Chatmoss Cablevision'
+        'name': 'Chatmoss Cablevision',
     },
     'nttcche010': {
-        'name': 'Cherokee Communications'
+        'name': 'Cherokee Communications',
     },
     'che050': {
-        'name': 'Chesapeake Bay Communications'
+        'name': 'Chesapeake Bay Communications',
     },
     'cimtel': {
-        'name': 'Cim-Tel Cable, LLC.'
+        'name': 'Cim-Tel Cable, LLC.',
     },
     'cit180': {
-        'name': 'Citizens Cablevision - Floyd, VA'
+        'name': 'Citizens Cablevision - Floyd, VA',
     },
     'cit210': {
-        'name': 'Citizens Cablevision, Inc.'
+        'name': 'Citizens Cablevision, Inc.',
     },
     'cit040': {
-        'name': 'Citizens Fiber'
+        'name': 'Citizens Fiber',
     },
     'cit250': {
-        'name': 'Citizens Mutual'
+        'name': 'Citizens Mutual',
     },
     'war040': {
-        'name': 'Citizens Telephone Corporation'
+        'name': 'Citizens Telephone Corporation',
     },
     'wat025': {
-        'name': 'City Of Monroe'
+        'name': 'City Of Monroe',
     },
     'wadsworth': {
-        'name': 'CityLink'
+        'name': 'CityLink',
     },
     'nor100': {
-        'name': 'CL Tel'
+        'name': 'CL Tel',
     },
     'cla010': {
-        'name': 'Clarence Telephone and Cedar Communications'
+        'name': 'Clarence Telephone and Cedar Communications',
     },
     'ser060': {
-        'name': 'Clear Choice Communications'
+        'name': 'Clear Choice Communications',
     },
     'tac020': {
-        'name': 'Click! Cable TV'
+        'name': 'Click! Cable TV',
     },
     'war020': {
-        'name': 'CLICK1.NET'
+        'name': 'CLICK1.NET',
     },
     'cml010': {
-        'name': 'CML Telephone Cooperative Association'
+        'name': 'CML Telephone Cooperative Association',
     },
     'cns': {
-        'name': 'CNS'
+        'name': 'CNS',
     },
     'com160': {
-        'name': 'Co-Mo Connect'
+        'name': 'Co-Mo Connect',
     },
     'coa020': {
-        'name': 'Coast Communications'
+        'name': 'Coast Communications',
     },
     'coa030': {
-        'name': 'Coaxial Cable TV'
+        'name': 'Coaxial Cable TV',
     },
     'mid055': {
-        'name': 'Cobalt TV (Mid-State Community TV)'
+        'name': 'Cobalt TV (Mid-State Community TV)',
     },
     'col070': {
-        'name': 'Columbia Power & Water Systems'
+        'name': 'Columbia Power & Water Systems',
     },
     'col080': {
-        'name': 'Columbus Telephone'
+        'name': 'Columbus Telephone',
     },
     'nor105': {
-        'name': 'Communications 1 Cablevision, Inc.'
+        'name': 'Communications 1 Cablevision, Inc.',
     },
     'com150': {
-        'name': 'Community Cable & Broadband'
+        'name': 'Community Cable & Broadband',
     },
     'com020': {
-        'name': 'Community Communications Company'
+        'name': 'Community Communications Company',
     },
     'coy010': {
-        'name': 'commZoom'
+        'name': 'commZoom',
     },
     'com025': {
-        'name': 'Complete Communication Services'
+        'name': 'Complete Communication Services',
     },
     'cat020': {
-        'name': 'Comporium'
+        'name': 'Comporium',
     },
     'com071': {
-        'name': 'ComSouth Telesys'
+        'name': 'ComSouth Telesys',
     },
     'consolidatedcable': {
-        'name': 'Consolidated'
+        'name': 'Consolidated',
     },
     'conwaycorp': {
-        'name': 'Conway Corporation'
+        'name': 'Conway Corporation',
     },
     'coo050': {
-        'name': 'Coon Valley Telecommunications Inc'
+        'name': 'Coon Valley Telecommunications Inc',
     },
     'coo080': {
-        'name': 'Cooperative Telephone Company'
+        'name': 'Cooperative Telephone Company',
     },
     'cpt010': {
-        'name': 'CP-TEL'
+        'name': 'CP-TEL',
     },
     'cra010': {
-        'name': 'Craw-Kan Telephone'
+        'name': 'Craw-Kan Telephone',
     },
     'crestview': {
-        'name': 'Crestview Cable Communications'
+        'name': 'Crestview Cable Communications',
     },
     'cross': {
-        'name': 'Cross TV'
+        'name': 'Cross TV',
     },
     'cro030': {
-        'name': 'Crosslake Communications'
+        'name': 'Crosslake Communications',
     },
     'ctc040': {
-        'name': 'CTC - Brainerd MN'
+        'name': 'CTC - Brainerd MN',
     },
     'phe030': {
-        'name': 'CTV-Beam - East Alabama'
+        'name': 'CTV-Beam - East Alabama',
     },
     'cun010': {
-        'name': 'Cunningham Telephone & Cable'
+        'name': 'Cunningham Telephone & Cable',
     },
     'dpc010': {
-        'name': 'D & P Communications'
+        'name': 'D & P Communications',
     },
     'dak030': {
-        'name': 'Dakota Central Telecommunications'
+        'name': 'Dakota Central Telecommunications',
     },
     'nttcdel010': {
-        'name': 'Delcambre Telephone LLC'
+        'name': 'Delcambre Telephone LLC',
     },
     'tel160-del': {
-        'name': 'Delta Telephone Company'
+        'name': 'Delta Telephone Company',
     },
     'sal040': {
-        'name': 'DiamondNet'
+        'name': 'DiamondNet',
     },
     'ind060-dc': {
-        'name': 'Direct Communications'
+        'name': 'Direct Communications',
     },
     'doy010': {
-        'name': 'Doylestown Cable TV'
+        'name': 'Doylestown Cable TV',
     },
     'dic010': {
-        'name': 'DRN'
+        'name': 'DRN',
     },
     'dtc020': {
-        'name': 'DTC'
+        'name': 'DTC',
     },
     'dtc010': {
-        'name': 'DTC Cable (Delhi)'
+        'name': 'DTC Cable (Delhi)',
     },
     'dum010': {
-        'name': 'Dumont Telephone Company'
+        'name': 'Dumont Telephone Company',
     },
     'dun010': {
-        'name': 'Dunkerton Telephone Cooperative'
+        'name': 'Dunkerton Telephone Cooperative',
     },
     'cci010': {
-        'name': 'Duo County Telecom'
+        'name': 'Duo County Telecom',
     },
     'eagle': {
-        'name': 'Eagle Communications'
+        'name': 'Eagle Communications',
     },
     'weh010-east': {
-        'name': 'East Arkansas Cable TV'
+        'name': 'East Arkansas Cable TV',
     },
     'eatel': {
-        'name': 'EATEL Video, LLC'
+        'name': 'EATEL Video, LLC',
     },
     'ell010': {
-        'name': 'ECTA'
+        'name': 'ECTA',
     },
     'emerytelcom': {
-        'name': 'Emery Telcom Video LLC'
+        'name': 'Emery Telcom Video LLC',
     },
     'nor200': {
-        'name': 'Empire Access'
+        'name': 'Empire Access',
     },
     'endeavor': {
-        'name': 'Endeavor Communications'
+        'name': 'Endeavor Communications',
     },
     'sun045': {
-        'name': 'Enhanced Telecommunications Corporation'
+        'name': 'Enhanced Telecommunications Corporation',
     },
     'mid030': {
-        'name': 'enTouch'
+        'name': 'enTouch',
     },
     'epb020': {
-        'name': 'EPB Smartnet'
+        'name': 'EPB Smartnet',
     },
     'jea010': {
-        'name': 'EPlus Broadband'
+        'name': 'EPlus Broadband',
     },
     'com065': {
-        'name': 'ETC'
+        'name': 'ETC',
     },
     'ete010': {
-        'name': 'Etex Communications'
+        'name': 'Etex Communications',
     },
     'fbc-tele': {
-        'name': 'F&B Communications'
+        'name': 'F&B Communications',
     },
     'fal010': {
-        'name': 'Falcon Broadband'
+        'name': 'Falcon Broadband',
     },
     'fam010': {
-        'name': 'FamilyView CableVision'
+        'name': 'FamilyView CableVision',
     },
     'far020': {
-        'name': 'Farmers Mutual Telephone Company'
+        'name': 'Farmers Mutual Telephone Company',
     },
     'fay010': {
-        'name': 'Fayetteville Public Utilities'
+        'name': 'Fayetteville Public Utilities',
     },
     'sal060': {
-        'name': 'fibrant'
+        'name': 'fibrant',
     },
     'fid010': {
-        'name': 'Fidelity Communications'
+        'name': 'Fidelity Communications',
     },
     'for030': {
-        'name': 'FJ Communications'
+        'name': 'FJ Communications',
     },
     'fli020': {
-        'name': 'Flint River Communications'
+        'name': 'Flint River Communications',
     },
     'far030': {
-        'name': 'FMT - Jesup'
+        'name': 'FMT - Jesup',
     },
     'foo010': {
-        'name': 'Foothills Communications'
+        'name': 'Foothills Communications',
     },
     'for080': {
-        'name': 'Forsyth CableNet'
+        'name': 'Forsyth CableNet',
     },
     'fbcomm': {
-        'name': 'Frankfort Plant Board'
+        'name': 'Frankfort Plant Board',
     },
     'tel160-fra': {
-        'name': 'Franklin Telephone Company'
+        'name': 'Franklin Telephone Company',
     },
     'nttcftc010': {
-        'name': 'FTC'
+        'name': 'FTC',
     },
     'fullchannel': {
-        'name': 'Full Channel, Inc.'
+        'name': 'Full Channel, Inc.',
     },
     'gar040': {
-        'name': 'Gardonville Cooperative Telephone Association'
+        'name': 'Gardonville Cooperative Telephone Association',
     },
     'gbt010': {
-        'name': 'GBT Communications, Inc.'
+        'name': 'GBT Communications, Inc.',
     },
     'tec010': {
-        'name': 'Genuine Telecom'
+        'name': 'Genuine Telecom',
     },
     'clr010': {
-        'name': 'Giant Communications'
+        'name': 'Giant Communications',
     },
     'gla010': {
-        'name': 'Glasgow EPB'
+        'name': 'Glasgow EPB',
     },
     'gle010': {
-        'name': 'Glenwood Telecommunications'
+        'name': 'Glenwood Telecommunications',
     },
     'gra060': {
-        'name': 'GLW Broadband Inc.'
+        'name': 'GLW Broadband Inc.',
     },
     'goldenwest': {
-        'name': 'Golden West Cablevision'
+        'name': 'Golden West Cablevision',
     },
     'vis030': {
-        'name': 'Grantsburg Telcom'
+        'name': 'Grantsburg Telcom',
     },
     'gpcom': {
-        'name': 'Great Plains Communications'
+        'name': 'Great Plains Communications',
     },
     'gri010': {
-        'name': 'Gridley Cable Inc'
+        'name': 'Gridley Cable Inc',
     },
     'hbc010': {
-        'name': 'H&B Cable Services'
+        'name': 'H&B Cable Services',
     },
     'hae010': {
-        'name': 'Haefele TV Inc.'
+        'name': 'Haefele TV Inc.',
     },
     'htc010': {
-        'name': 'Halstad Telephone Company'
+        'name': 'Halstad Telephone Company',
     },
     'har005': {
-        'name': 'Harlan Municipal Utilities'
+        'name': 'Harlan Municipal Utilities',
     },
     'har020': {
-        'name': 'Hart Communications'
+        'name': 'Hart Communications',
     },
     'ced010': {
-        'name': 'Hartelco TV'
+        'name': 'Hartelco TV',
     },
     'hea040': {
-        'name': 'Heart of Iowa Communications Cooperative'
+        'name': 'Heart of Iowa Communications Cooperative',
     },
     'htc020': {
-        'name': 'Hickory Telephone Company'
+        'name': 'Hickory Telephone Company',
     },
     'nttchig010': {
-        'name': 'Highland Communication Services'
+        'name': 'Highland Communication Services',
     },
     'hig030': {
-        'name': 'Highland Media'
+        'name': 'Highland Media',
     },
     'spc010': {
-        'name': 'Hilliary Communications'
+        'name': 'Hilliary Communications',
     },
     'hin020': {
-        'name': 'Hinton CATV Co.'
+        'name': 'Hinton CATV Co.',
     },
     'hometel': {
-        'name': 'HomeTel Entertainment, Inc.'
+        'name': 'HomeTel Entertainment, Inc.',
     },
     'hoodcanal': {
-        'name': 'Hood Canal Communications'
+        'name': 'Hood Canal Communications',
     },
     'weh010-hope': {
-        'name': 'Hope - Prescott Cable TV'
+        'name': 'Hope - Prescott Cable TV',
     },
     'horizoncable': {
-        'name': 'Horizon Cable TV, Inc.'
+        'name': 'Horizon Cable TV, Inc.',
     },
     'hor040': {
-        'name': 'Horizon Chillicothe Telephone'
+        'name': 'Horizon Chillicothe Telephone',
     },
     'htc030': {
-        'name': 'HTC Communications Co. - IL'
+        'name': 'HTC Communications Co. - IL',
     },
     'htccomm': {
-        'name': 'HTC Communications, Inc. - IA'
+        'name': 'HTC Communications, Inc. - IA',
     },
     'wal005': {
-        'name': 'Huxley Communications'
+        'name': 'Huxley Communications',
     },
     'imon': {
-        'name': 'ImOn Communications'
+        'name': 'ImOn Communications',
     },
     'ind040': {
-        'name': 'Independence Telecommunications'
+        'name': 'Independence Telecommunications',
     },
     'rrc010': {
-        'name': 'Inland Networks'
+        'name': 'Inland Networks',
     },
     'stc020': {
-        'name': 'Innovative Cable TV St Croix'
+        'name': 'Innovative Cable TV St Croix',
     },
     'car100': {
-        'name': 'Innovative Cable TV St Thomas-St John'
+        'name': 'Innovative Cable TV St Thomas-St John',
     },
     'icc010': {
-        'name': 'Inside Connect Cable'
+        'name': 'Inside Connect Cable',
     },
     'int100': {
-        'name': 'Integra Telecom'
+        'name': 'Integra Telecom',
     },
     'int050': {
-        'name': 'Interstate Telecommunications Coop'
+        'name': 'Interstate Telecommunications Coop',
     },
     'irv010': {
-        'name': 'Irvine Cable'
+        'name': 'Irvine Cable',
     },
     'k2c010': {
-        'name': 'K2 Communications'
+        'name': 'K2 Communications',
     },
     'kal010': {
-        'name': 'Kalida Telephone Company, Inc.'
+        'name': 'Kalida Telephone Company, Inc.',
     },
     'kal030': {
-        'name': 'Kalona Cooperative Telephone Company'
+        'name': 'Kalona Cooperative Telephone Company',
     },
     'kmt010': {
-        'name': 'KMTelecom'
+        'name': 'KMTelecom',
     },
     'kpu010': {
-        'name': 'KPU Telecommunications'
+        'name': 'KPU Telecommunications',
     },
     'kuh010': {
-        'name': 'Kuhn Communications, Inc.'
+        'name': 'Kuhn Communications, Inc.',
     },
     'lak130': {
-        'name': 'Lakeland Communications'
+        'name': 'Lakeland Communications',
     },
     'lan010': {
-        'name': 'Langco'
+        'name': 'Langco',
     },
     'lau020': {
-        'name': 'Laurel Highland Total Communications, Inc.'
+        'name': 'Laurel Highland Total Communications, Inc.',
     },
     'leh010': {
-        'name': 'Lehigh Valley Cooperative Telephone'
+        'name': 'Lehigh Valley Cooperative Telephone',
     },
     'bra010': {
-        'name': 'Limestone Cable/Bracken Cable'
+        'name': 'Limestone Cable/Bracken Cable',
     },
     'loc020': {
-        'name': 'LISCO'
+        'name': 'LISCO',
     },
     'lit020': {
-        'name': 'Litestream'
+        'name': 'Litestream',
     },
     'tel140': {
-        'name': 'LivCom'
+        'name': 'LivCom',
     },
     'loc010': {
-        'name': 'LocalTel Communications'
+        'name': 'LocalTel Communications',
     },
     'weh010-longview': {
-        'name': 'Longview - Kilgore Cable TV'
+        'name': 'Longview - Kilgore Cable TV',
     },
     'lon030': {
-        'name': 'Lonsdale Video Ventures, LLC'
+        'name': 'Lonsdale Video Ventures, LLC',
     },
     'lns010': {
-        'name': 'Lost Nation-Elwood Telephone Co.'
+        'name': 'Lost Nation-Elwood Telephone Co.',
     },
     'nttclpc010': {
-        'name': 'LPC Connect'
+        'name': 'LPC Connect',
     },
     'lumos': {
-        'name': 'Lumos Networks'
+        'name': 'Lumos Networks',
     },
     'madison': {
-        'name': 'Madison Communications'
+        'name': 'Madison Communications',
     },
     'mad030': {
-        'name': 'Madison County Cable Inc.'
+        'name': 'Madison County Cable Inc.',
     },
     'nttcmah010': {
-        'name': 'Mahaska Communication Group'
+        'name': 'Mahaska Communication Group',
     },
     'mar010': {
-        'name': 'Marne & Elk Horn Telephone Company'
+        'name': 'Marne & Elk Horn Telephone Company',
     },
     'mcc040': {
-        'name': 'McClure Telephone Co.'
+        'name': 'McClure Telephone Co.',
     },
     'mctv': {
-        'name': 'MCTV'
+        'name': 'MCTV',
     },
     'merrimac': {
-        'name': 'Merrimac Communications Ltd.'
+        'name': 'Merrimac Communications Ltd.',
     },
     'metronet': {
-        'name': 'Metronet'
+        'name': 'Metronet',
     },
     'mhtc': {
-        'name': 'MHTC'
+        'name': 'MHTC',
     },
     'midhudson': {
-        'name': 'Mid-Hudson Cable'
+        'name': 'Mid-Hudson Cable',
     },
     'midrivers': {
-        'name': 'Mid-Rivers Communications'
+        'name': 'Mid-Rivers Communications',
     },
     'mid045': {
-        'name': 'Midstate Communications'
+        'name': 'Midstate Communications',
     },
     'mil080': {
-        'name': 'Milford Communications'
+        'name': 'Milford Communications',
     },
     'min030': {
-        'name': 'MINET'
+        'name': 'MINET',
     },
     'nttcmin010': {
-        'name': 'Minford TV'
+        'name': 'Minford TV',
     },
     'san040-02': {
-        'name': 'Mitchell Telecom'
+        'name': 'Mitchell Telecom',
     },
     'mlg010': {
-        'name': 'MLGC'
+        'name': 'MLGC',
     },
     'mon060': {
-        'name': 'Mon-Cre TVE'
+        'name': 'Mon-Cre TVE',
     },
     'mou110': {
-        'name': 'Mountain Telephone'
+        'name': 'Mountain Telephone',
     },
     'mou050': {
-        'name': 'Mountain Village Cable'
+        'name': 'Mountain Village Cable',
     },
     'mtacomm': {
-        'name': 'MTA Communications, LLC'
+        'name': 'MTA Communications, LLC',
     },
     'mtc010': {
-        'name': 'MTC Cable'
+        'name': 'MTC Cable',
     },
     'med040': {
-        'name': 'MTC Technologies'
+        'name': 'MTC Technologies',
     },
     'man060': {
-        'name': 'MTCC'
+        'name': 'MTCC',
     },
     'mtc030': {
-        'name': 'MTCO Communications'
+        'name': 'MTCO Communications',
     },
     'mul050': {
-        'name': 'Mulberry Telecommunications'
+        'name': 'Mulberry Telecommunications',
     },
     'mur010': {
-        'name': 'Murray Electric System'
+        'name': 'Murray Electric System',
     },
     'musfiber': {
-        'name': 'MUS FiberNET'
+        'name': 'MUS FiberNET',
     },
     'mpw': {
-        'name': 'Muscatine Power & Water'
+        'name': 'Muscatine Power & Water',
     },
     'nttcsli010': {
-        'name': 'myEVTV.com'
+        'name': 'myEVTV.com',
     },
     'nor115': {
-        'name': 'NCC'
+        'name': 'NCC',
     },
     'nor260': {
-        'name': 'NDTC'
+        'name': 'NDTC',
     },
     'nctc': {
-        'name': 'Nebraska Central Telecom, Inc.'
+        'name': 'Nebraska Central Telecom, Inc.',
     },
     'nel020': {
-        'name': 'Nelsonville TV Cable'
+        'name': 'Nelsonville TV Cable',
     },
     'nem010': {
-        'name': 'Nemont'
+        'name': 'Nemont',
     },
     'new075': {
-        'name': 'New Hope Telephone Cooperative'
+        'name': 'New Hope Telephone Cooperative',
     },
     'nor240': {
-        'name': 'NICP'
+        'name': 'NICP',
     },
     'cic010': {
-        'name': 'NineStar Connect'
+        'name': 'NineStar Connect',
     },
     'nktelco': {
-        'name': 'NKTelco'
+        'name': 'NKTelco',
     },
     'nortex': {
-        'name': 'Nortex Communications'
+        'name': 'Nortex Communications',
     },
     'nor140': {
-        'name': 'North Central Telephone Cooperative'
+        'name': 'North Central Telephone Cooperative',
     },
     'nor030': {
-        'name': 'Northland Communications'
+        'name': 'Northland Communications',
     },
     'nor075': {
-        'name': 'Northwest Communications'
+        'name': 'Northwest Communications',
     },
     'nor125': {
-        'name': 'Norwood Light Broadband'
+        'name': 'Norwood Light Broadband',
     },
     'net010': {
-        'name': 'Nsight Telservices'
+        'name': 'Nsight Telservices',
     },
     'dur010': {
-        'name': 'Ntec'
+        'name': 'Ntec',
     },
     'nts010': {
-        'name': 'NTS Communications'
+        'name': 'NTS Communications',
     },
     'new045': {
-        'name': 'NU-Telecom'
+        'name': 'NU-Telecom',
     },
     'nulink': {
-        'name': 'NuLink'
+        'name': 'NuLink',
     },
     'jam030': {
-        'name': 'NVC'
+        'name': 'NVC',
     },
     'far035': {
-        'name': 'OmniTel Communications'
+        'name': 'OmniTel Communications',
     },
     'onesource': {
-        'name': 'OneSource Communications'
+        'name': 'OneSource Communications',
     },
     'cit230': {
-        'name': 'Opelika Power Services'
+        'name': 'Opelika Power Services',
     },
     'daltonutilities': {
-        'name': 'OptiLink'
+        'name': 'OptiLink',
     },
     'mid140': {
-        'name': 'OPTURA'
+        'name': 'OPTURA',
     },
     'ote010': {
-        'name': 'OTEC Communication Company'
+        'name': 'OTEC Communication Company',
     },
     'cci020': {
-        'name': 'Packerland Broadband'
+        'name': 'Packerland Broadband',
     },
     'pan010': {
-        'name': 'Panora Telco/Guthrie Center Communications'
+        'name': 'Panora Telco/Guthrie Center Communications',
     },
     'otter': {
-        'name': 'Park Region Telephone & Otter Tail Telcom'
+        'name': 'Park Region Telephone & Otter Tail Telcom',
     },
     'mid050': {
-        'name': 'Partner Communications Cooperative'
+        'name': 'Partner Communications Cooperative',
     },
     'fib010': {
-        'name': 'Pathway'
+        'name': 'Pathway',
     },
     'paulbunyan': {
-        'name': 'Paul Bunyan Communications'
+        'name': 'Paul Bunyan Communications',
     },
     'pem020': {
-        'name': 'Pembroke Telephone Company'
+        'name': 'Pembroke Telephone Company',
     },
     'mck010': {
-        'name': 'Peoples Rural Telephone Cooperative'
+        'name': 'Peoples Rural Telephone Cooperative',
     },
     'pul010': {
-        'name': 'PES Energize'
+        'name': 'PES Energize',
     },
     'phi010': {
-        'name': 'Philippi Communications System'
+        'name': 'Philippi Communications System',
     },
     'phonoscope': {
-        'name': 'Phonoscope Cable'
+        'name': 'Phonoscope Cable',
     },
     'pin070': {
-        'name': 'Pine Belt Communications, Inc.'
+        'name': 'Pine Belt Communications, Inc.',
     },
     'weh010-pine': {
-        'name': 'Pine Bluff Cable TV'
+        'name': 'Pine Bluff Cable TV',
     },
     'pin060': {
-        'name': 'Pineland Telephone Cooperative'
+        'name': 'Pineland Telephone Cooperative',
     },
     'cam010': {
-        'name': 'Pinpoint Communications'
+        'name': 'Pinpoint Communications',
     },
     'pio060': {
-        'name': 'Pioneer Broadband'
+        'name': 'Pioneer Broadband',
     },
     'pioncomm': {
-        'name': 'Pioneer Communications'
+        'name': 'Pioneer Communications',
     },
     'pioneer': {
-        'name': 'Pioneer DTV'
+        'name': 'Pioneer DTV',
     },
     'pla020': {
-        'name': 'Plant TiftNet, Inc.'
+        'name': 'Plant TiftNet, Inc.',
     },
     'par010': {
-        'name': 'PLWC'
+        'name': 'PLWC',
     },
     'pro035': {
-        'name': 'PMT'
+        'name': 'PMT',
     },
     'vik011': {
-        'name': 'Polar Cablevision'
+        'name': 'Polar Cablevision',
     },
     'pottawatomie': {
-        'name': 'Pottawatomie Telephone Co.'
+        'name': 'Pottawatomie Telephone Co.',
     },
     'premiercomm': {
-        'name': 'Premier Communications'
+        'name': 'Premier Communications',
     },
     'psc010': {
-        'name': 'PSC'
+        'name': 'PSC',
     },
     'pan020': {
-        'name': 'PTCI'
+        'name': 'PTCI',
     },
     'qco010': {
-        'name': 'QCOL'
+        'name': 'QCOL',
     },
     'qua010': {
-        'name': 'Quality Cablevision'
+        'name': 'Quality Cablevision',
     },
     'rad010': {
-        'name': 'Radcliffe Telephone Company'
+        'name': 'Radcliffe Telephone Company',
     },
     'car040': {
-        'name': 'Rainbow Communications'
+        'name': 'Rainbow Communications',
     },
     'rai030': {
-        'name': 'Rainier Connect'
+        'name': 'Rainier Connect',
     },
     'ral010': {
-        'name': 'Ralls Technologies'
+        'name': 'Ralls Technologies',
     },
     'rct010': {
-        'name': 'RC Technologies'
+        'name': 'RC Technologies',
     },
     'red040': {
-        'name': 'Red River Communications'
+        'name': 'Red River Communications',
     },
     'ree010': {
-        'name': 'Reedsburg Utility Commission'
+        'name': 'Reedsburg Utility Commission',
     },
     'mol010': {
-        'name': 'Reliance Connects- Oregon'
+        'name': 'Reliance Connects- Oregon',
     },
     'res020': {
-        'name': 'Reserve Telecommunications'
+        'name': 'Reserve Telecommunications',
     },
     'weh010-resort': {
-        'name': 'Resort TV Cable'
+        'name': 'Resort TV Cable',
     },
     'rld010': {
-        'name': 'Richland Grant Telephone Cooperative, Inc.'
+        'name': 'Richland Grant Telephone Cooperative, Inc.',
     },
     'riv030': {
-        'name': 'River Valley Telecommunications Coop'
+        'name': 'River Valley Telecommunications Coop',
     },
     'rockportcable': {
-        'name': 'Rock Port Cablevision'
+        'name': 'Rock Port Cablevision',
     },
     'rsf010': {
-        'name': 'RS Fiber'
+        'name': 'RS Fiber',
     },
     'rtc': {
-        'name': 'RTC Communication Corp'
+        'name': 'RTC Communication Corp',
     },
     'res040': {
-        'name': 'RTC-Reservation Telephone Coop.'
+        'name': 'RTC-Reservation Telephone Coop.',
     },
     'rte010': {
-        'name': 'RTEC Communications'
+        'name': 'RTEC Communications',
     },
     'stc010': {
-        'name': 'S&T'
+        'name': 'S&T',
     },
     'san020': {
-        'name': 'San Bruno Cable TV'
+        'name': 'San Bruno Cable TV',
     },
     'san040-01': {
-        'name': 'Santel'
+        'name': 'Santel',
     },
     'sav010': {
-        'name': 'SCI Broadband-Savage Communications Inc.'
+        'name': 'SCI Broadband-Savage Communications Inc.',
     },
     'sco050': {
-        'name': 'Scottsboro Electric Power Board'
+        'name': 'Scottsboro Electric Power Board',
     },
     'scr010': {
-        'name': 'Scranton Telephone Company'
+        'name': 'Scranton Telephone Company',
     },
     'selco': {
-        'name': 'SELCO'
+        'name': 'SELCO',
     },
     'she010': {
-        'name': 'Shentel'
+        'name': 'Shentel',
     },
     'she030': {
-        'name': 'Sherwood Mutual Telephone Association, Inc.'
+        'name': 'Sherwood Mutual Telephone Association, Inc.',
     },
     'ind060-ssc': {
-        'name': 'Silver Star Communications'
+        'name': 'Silver Star Communications',
     },
     'sjoberg': {
-        'name': 'Sjoberg\'s Inc.'
+        'name': 'Sjoberg\'s Inc.',
     },
     'sou025': {
-        'name': 'SKT'
+        'name': 'SKT',
     },
     'sky050': {
-        'name': 'SkyBest TV'
+        'name': 'SkyBest TV',
     },
     'nttcsmi010': {
-        'name': 'Smithville Communications'
+        'name': 'Smithville Communications',
     },
     'woo010': {
-        'name': 'Solarus'
+        'name': 'Solarus',
     },
     'sou075': {
-        'name': 'South Central Rural Telephone Cooperative'
+        'name': 'South Central Rural Telephone Cooperative',
     },
     'sou065': {
-        'name': 'South Holt Cablevision, Inc.'
+        'name': 'South Holt Cablevision, Inc.',
     },
     'sou035': {
-        'name': 'South Slope Cooperative Communications'
+        'name': 'South Slope Cooperative Communications',
     },
     'spa020': {
-        'name': 'Spanish Fork Community Network'
+        'name': 'Spanish Fork Community Network',
     },
     'spe010': {
-        'name': 'Spencer Municipal Utilities'
+        'name': 'Spencer Municipal Utilities',
     },
     'spi005': {
-        'name': 'Spillway Communications, Inc.'
+        'name': 'Spillway Communications, Inc.',
     },
     'srt010': {
-        'name': 'SRT'
+        'name': 'SRT',
     },
     'cccsmc010': {
-        'name': 'St. Maarten Cable TV'
+        'name': 'St. Maarten Cable TV',
     },
     'sta025': {
-        'name': 'Star Communications'
+        'name': 'Star Communications',
     },
     'sco020': {
-        'name': 'STE'
+        'name': 'STE',
     },
     'uin010': {
-        'name': 'STRATA Networks'
+        'name': 'STRATA Networks',
     },
     'sum010': {
-        'name': 'Sumner Cable TV'
+        'name': 'Sumner Cable TV',
     },
     'pie010': {
-        'name': 'Surry TV/PCSI TV'
+        'name': 'Surry TV/PCSI TV',
     },
     'swa010': {
-        'name': 'Swayzee Communications'
+        'name': 'Swayzee Communications',
     },
     'sweetwater': {
-        'name': 'Sweetwater Cable Television Co'
+        'name': 'Sweetwater Cable Television Co',
     },
     'weh010-talequah': {
-        'name': 'Tahlequah Cable TV'
+        'name': 'Tahlequah Cable TV',
     },
     'tct': {
-        'name': 'TCT'
+        'name': 'TCT',
     },
     'tel050': {
-        'name': 'Tele-Media Company'
+        'name': 'Tele-Media Company',
     },
     'com050': {
-        'name': 'The Community Agency'
+        'name': 'The Community Agency',
     },
     'thr020': {
-        'name': 'Three River'
+        'name': 'Three River',
     },
     'cab140': {
-        'name': 'Town & Country Technologies'
+        'name': 'Town & Country Technologies',
     },
     'tra010': {
-        'name': 'Trans-Video'
+        'name': 'Trans-Video',
     },
     'tre010': {
-        'name': 'Trenton TV Cable Company'
+        'name': 'Trenton TV Cable Company',
     },
     'tcc': {
-        'name': 'Tri County Communications Cooperative'
+        'name': 'Tri County Communications Cooperative',
     },
     'tri025': {
-        'name': 'TriCounty Telecom'
+        'name': 'TriCounty Telecom',
     },
     'tri110': {
-        'name': 'TrioTel Communications, Inc.'
+        'name': 'TrioTel Communications, Inc.',
     },
     'tro010': {
-        'name': 'Troy Cablevision, Inc.'
+        'name': 'Troy Cablevision, Inc.',
     },
     'tsc': {
-        'name': 'TSC'
+        'name': 'TSC',
     },
     'cit220': {
-        'name': 'Tullahoma Utilities Board'
+        'name': 'Tullahoma Utilities Board',
     },
     'tvc030': {
-        'name': 'TV Cable of Rensselaer'
+        'name': 'TV Cable of Rensselaer',
     },
     'tvc015': {
-        'name': 'TVC Cable'
+        'name': 'TVC Cable',
     },
     'cab180': {
-        'name': 'TVision'
+        'name': 'TVision',
     },
     'twi040': {
-        'name': 'Twin Lakes'
+        'name': 'Twin Lakes',
     },
     'tvtinc': {
-        'name': 'Twin Valley'
+        'name': 'Twin Valley',
     },
     'uis010': {
-        'name': 'Union Telephone Company'
+        'name': 'Union Telephone Company',
     },
     'uni110': {
-        'name': 'United Communications - TN'
+        'name': 'United Communications - TN',
     },
     'uni120': {
-        'name': 'United Services'
+        'name': 'United Services',
     },
     'uss020': {
-        'name': 'US Sonet'
+        'name': 'US Sonet',
     },
     'cab060': {
-        'name': 'USA Communications'
+        'name': 'USA Communications',
     },
     'she005': {
-        'name': 'USA Communications/Shellsburg, IA'
+        'name': 'USA Communications/Shellsburg, IA',
     },
     'val040': {
-        'name': 'Valley TeleCom Group'
+        'name': 'Valley TeleCom Group',
     },
     'val025': {
-        'name': 'Valley Telecommunications'
+        'name': 'Valley Telecommunications',
     },
     'val030': {
-        'name': 'Valparaiso Broadband'
+        'name': 'Valparaiso Broadband',
     },
     'cla050': {
-        'name': 'Vast Broadband'
+        'name': 'Vast Broadband',
     },
     'sul015': {
-        'name': 'Venture Communications Cooperative, Inc.'
+        'name': 'Venture Communications Cooperative, Inc.',
     },
     'ver025': {
-        'name': 'Vernon Communications Co-op'
+        'name': 'Vernon Communications Co-op',
     },
     'weh010-vicksburg': {
-        'name': 'Vicksburg Video'
+        'name': 'Vicksburg Video',
     },
     'vis070': {
-        'name': 'Vision Communications'
+        'name': 'Vision Communications',
     },
     'volcanotel': {
-        'name': 'Volcano Vision, Inc.'
+        'name': 'Volcano Vision, Inc.',
     },
     'vol040-02': {
-        'name': 'VolFirst / BLTV'
+        'name': 'VolFirst / BLTV',
     },
     'ver070': {
-        'name': 'VTel'
+        'name': 'VTel',
     },
     'nttcvtx010': {
-        'name': 'VTX1'
+        'name': 'VTX1',
     },
     'bci010-02': {
-        'name': 'Vyve Broadband'
+        'name': 'Vyve Broadband',
     },
     'wab020': {
-        'name': 'Wabash Mutual Telephone'
+        'name': 'Wabash Mutual Telephone',
     },
     'waitsfield': {
-        'name': 'Waitsfield Cable'
+        'name': 'Waitsfield Cable',
     },
     'wal010': {
-        'name': 'Walnut Communications'
+        'name': 'Walnut Communications',
     },
     'wavebroadband': {
-        'name': 'Wave'
+        'name': 'Wave',
     },
     'wav030': {
-        'name': 'Waverly Communications Utility'
+        'name': 'Waverly Communications Utility',
     },
     'wbi010': {
-        'name': 'WBI'
+        'name': 'WBI',
     },
     'web020': {
-        'name': 'Webster-Calhoun Cooperative Telephone Association'
+        'name': 'Webster-Calhoun Cooperative Telephone Association',
     },
     'wes005': {
-        'name': 'West Alabama TV Cable'
+        'name': 'West Alabama TV Cable',
     },
     'carolinata': {
-        'name': 'West Carolina Communications'
+        'name': 'West Carolina Communications',
     },
     'wct010': {
-        'name': 'West Central Telephone Association'
+        'name': 'West Central Telephone Association',
     },
     'wes110': {
-        'name': 'West River Cooperative Telephone Company'
+        'name': 'West River Cooperative Telephone Company',
     },
     'ani030': {
-        'name': 'WesTel Systems'
+        'name': 'WesTel Systems',
     },
     'westianet': {
-        'name': 'Western Iowa Networks'
+        'name': 'Western Iowa Networks',
     },
     'nttcwhi010': {
-        'name': 'Whidbey Telecom'
+        'name': 'Whidbey Telecom',
     },
     'weh010-white': {
-        'name': 'White County Cable TV'
+        'name': 'White County Cable TV',
     },
     'wes130': {
-        'name': 'Wiatel'
+        'name': 'Wiatel',
     },
     'wik010': {
-        'name': 'Wiktel'
+        'name': 'Wiktel',
     },
     'wil070': {
-        'name': 'Wilkes Communications, Inc./RiverStreet Networks'
+        'name': 'Wilkes Communications, Inc./RiverStreet Networks',
     },
     'wil015': {
-        'name': 'Wilson Communications'
+        'name': 'Wilson Communications',
     },
     'win010': {
-        'name': 'Windomnet/SMBS'
+        'name': 'Windomnet/SMBS',
     },
     'win090': {
-        'name': 'Windstream Cable TV'
+        'name': 'Windstream Cable TV',
     },
     'wcta': {
-        'name': 'Winnebago Cooperative Telecom Association'
+        'name': 'Winnebago Cooperative Telecom Association',
     },
     'wtc010': {
-        'name': 'WTC'
+        'name': 'WTC',
     },
     'wil040': {
-        'name': 'WTC Communications, Inc.'
+        'name': 'WTC Communications, Inc.',
     },
     'wya010': {
-        'name': 'Wyandotte Cable'
+        'name': 'Wyandotte Cable',
     },
     'hin020-02': {
-        'name': 'X-Stream Services'
+        'name': 'X-Stream Services',
     },
     'xit010': {
-        'name': 'XIT Communications'
+        'name': 'XIT Communications',
     },
     'yel010': {
-        'name': 'Yelcot Communications'
+        'name': 'Yelcot Communications',
     },
     'mid180-01': {
-        'name': 'yondoo'
+        'name': 'yondoo',
     },
     'cou060': {
-        'name': 'Zito Media'
+        'name': 'Zito Media',
     },
     'slingtv': {
         'name': 'Sling TV',
@@ -1355,15 +1355,16 @@ MSO_INFO = {
 class AdobePassIE(InfoExtractor):  # XXX: Conventionally, base classes should end with BaseIE/InfoExtractor
     _SERVICE_PROVIDER_TEMPLATE = 'https://sp.auth.adobe.com/adobe-services/%s'
     _USER_AGENT = 'Mozilla/5.0 (X11; Linux i686; rv:47.0) Gecko/20100101 Firefox/47.0'
+    _MODERN_USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; rv:131.0) Gecko/20100101 Firefox/131.0'
     _MVPD_CACHE = 'ap-mvpd'
 
     _DOWNLOADING_LOGIN_PAGE = 'Downloading Provider Login Page'
 
     def _download_webpage_handle(self, *args, **kwargs):
         headers = self.geo_verification_headers()
-        headers.update(kwargs.get('headers', {}))
+        headers.update(kwargs.get('headers') or {})
         kwargs['headers'] = headers
-        return super(AdobePassIE, self)._download_webpage_handle(
+        return super()._download_webpage_handle(
             *args, **kwargs)
 
     @staticmethod
@@ -1384,7 +1385,7 @@ class AdobePassIE(InfoExtractor):  # XXX: Conventionally, base classes should en
     def _extract_mvpd_auth(self, url, video_id, requestor_id, resource):
         def xml_text(xml_str, tag):
             return self._search_regex(
-                '<%s>(.+?)</%s>' % (tag, tag), xml_str, tag)
+                f'<{tag}>(.+?)</{tag}>', xml_str, tag)
 
         def is_expired(token, date_ele):
             token_expires = unified_timestamp(re.sub(r'[_ ]GMT', '', xml_text(token, date_ele)))
@@ -1394,7 +1395,7 @@ class AdobePassIE(InfoExtractor):  # XXX: Conventionally, base classes should en
             form_page, urlh = form_page_res
             post_url = self._html_search_regex(r'<form[^>]+action=(["\'])(?P<url>.+?)\1', form_page, 'post url', group='url')
             if not re.match(r'https?://', post_url):
-                post_url = compat_urlparse.urljoin(urlh.url, post_url)
+                post_url = urllib.parse.urljoin(urlh.url, post_url)
             form_data = self._hidden_inputs(form_page)
             form_data.update(data)
             return self._download_webpage_handle(
@@ -1414,13 +1415,13 @@ class AdobePassIE(InfoExtractor):  # XXX: Conventionally, base classes should en
             REDIRECT_REGEX = r'[0-9]{,2};\s*(?:URL|url)=\'?([^\'"]+)'
             redirect_url = self._search_regex(
                 r'(?i)<meta\s+(?=(?:[a-z-]+="[^"]+"\s+)*http-equiv="refresh")'
-                r'(?:[a-z-]+="[^"]+"\s+)*?content="%s' % REDIRECT_REGEX,
+                rf'(?:[a-z-]+="[^"]+"\s+)*?content="{REDIRECT_REGEX}',
                 html, 'meta refresh redirect',
                 default=NO_DEFAULT if fatal else None, fatal=fatal)
             if not redirect_url:
                 return None
             if url:
-                redirect_url = compat_urlparse.urljoin(url, unescapeHTML(redirect_url))
+                redirect_url = urllib.parse.urljoin(url, unescapeHTML(redirect_url))
             return redirect_url
 
         mvpd_headers = {
@@ -1454,7 +1455,11 @@ class AdobePassIE(InfoExtractor):  # XXX: Conventionally, base classes should en
                             'no_iframe': 'false',
                             'domain_name': 'adobe.com',
                             'redirect_url': url,
-                        })
+                        }, headers={
+                            # yt-dlp's default user-agent is usually too old for Comcast_SSO
+                            # See: https://github.com/yt-dlp/yt-dlp/issues/10848
+                            'User-Agent': self._MODERN_USER_AGENT,
+                        } if mso_id == 'Comcast_SSO' else None)
                 elif not self._cookies_passed:
                     raise_mvpd_required()
 
@@ -1506,12 +1511,12 @@ class AdobePassIE(InfoExtractor):  # XXX: Conventionally, base classes should en
                             'ident': username,
                             'device': 'web',
                             'send_confirm_link': False,
-                            'send_token': True
+                            'send_token': True,
                         }))
                     philo_code = getpass.getpass('Type auth code you have received [Return]: ')
                     self._download_webpage(
                         'https://idp.philo.com/auth/update/login_code', video_id, 'Submitting token', data=urlencode_postdata({
-                            'token': philo_code
+                            'token': philo_code,
                         }))
                     mvpd_confirm_page_res = self._download_webpage_handle('https://idp.philo.com/idp/submit', video_id, 'Confirming Philo Login')
                     post_form(mvpd_confirm_page_res, 'Confirming Login')
@@ -1569,9 +1574,9 @@ class AdobePassIE(InfoExtractor):  # XXX: Conventionally, base classes should en
                         saml_response_json['targetValue'], video_id,
                         'Confirming Login', data=urlencode_postdata({
                             'SAMLResponse': saml_response_json['SAMLResponse'],
-                            'RelayState': saml_response_json['RelayState']
+                            'RelayState': saml_response_json['RelayState'],
                         }), headers={
-                            'Content-Type': 'application/x-www-form-urlencoded'
+                            'Content-Type': 'application/x-www-form-urlencoded',
                         })
                 elif mso_id in ('Spectrum', 'Charter_Direct'):
                     # Spectrum's login for is dynamically loaded via JS so we need to hardcode the flow
@@ -1606,7 +1611,7 @@ class AdobePassIE(InfoExtractor):  # XXX: Conventionally, base classes should en
                             'SAMLResponse': saml_response_json['SAMLResponse'],
                             'RelayState': relay_state,
                         }), headers={
-                            'Content-Type': 'application/x-www-form-urlencoded'
+                            'Content-Type': 'application/x-www-form-urlencoded',
                         })
                 elif mso_id == 'slingtv':
                     # SlingTV has a meta-refresh based authentication, but also
@@ -1625,7 +1630,7 @@ class AdobePassIE(InfoExtractor):  # XXX: Conventionally, base classes should en
                     provider_association_redirect, urlh = post_form(
                         provider_login_page_res, 'Logging in', {
                             mso_info['username_field']: username,
-                            mso_info['password_field']: password
+                            mso_info['password_field']: password,
                         })
 
                     provider_refresh_redirect_url = extract_redirect_url(
@@ -1676,7 +1681,7 @@ class AdobePassIE(InfoExtractor):  # XXX: Conventionally, base classes should en
                     provider_association_redirect, urlh = post_form(
                         provider_login_page_res, 'Logging in', {
                             mso_info['username_field']: username,
-                            mso_info['password_field']: password
+                            mso_info['password_field']: password,
                         })
 
                     provider_refresh_redirect_url = extract_redirect_url(
@@ -1708,7 +1713,7 @@ class AdobePassIE(InfoExtractor):  # XXX: Conventionally, base classes should en
                         provider_redirect_page_res, self._DOWNLOADING_LOGIN_PAGE)
                     form_data = {
                         mso_info.get('username_field', 'username'): username,
-                        mso_info.get('password_field', 'password'): password
+                        mso_info.get('password_field', 'password'): password,
                     }
                     if mso_id in ('Cablevision', 'AlticeOne'):
                         form_data['_eventId_proceed'] = ''
diff --git a/plugins/youtube_download/yt_dlp/extractor/adobetv.py b/plugins/youtube_download/yt_dlp/extractor/adobetv.py
index d1525a1..4608e5c 100644
--- a/plugins/youtube_download/yt_dlp/extractor/adobetv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/adobetv.py
@@ -2,13 +2,12 @@ import functools
 import re
 
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
+    ISO639Utils,
+    OnDemandPagedList,
     float_or_none,
     int_or_none,
-    ISO639Utils,
     join_nonempty,
-    OnDemandPagedList,
     parse_duration,
     str_or_none,
     str_to_int,
@@ -36,7 +35,7 @@ class AdobeTVBaseIE(InfoExtractor):
         return subtitles
 
     def _parse_video_data(self, video_data):
-        video_id = compat_str(video_data['id'])
+        video_id = str(video_data['id'])
         title = video_data['title']
 
         s3_extracted = False
@@ -151,7 +150,7 @@ class AdobeTVPlaylistBaseIE(AdobeTVBaseIE):
         page += 1
         query['page'] = page
         for element_data in self._call_api(
-                self._RESOURCE, display_id, query, 'Download Page %d' % page):
+                self._RESOURCE, display_id, query, f'Download Page {page}'):
             yield self._process_data(element_data)
 
     def _extract_playlist_entries(self, display_id, query):
diff --git a/plugins/youtube_download/yt_dlp/extractor/adultswim.py b/plugins/youtube_download/yt_dlp/extractor/adultswim.py
index daaedde..2c83701 100644
--- a/plugins/youtube_download/yt_dlp/extractor/adultswim.py
+++ b/plugins/youtube_download/yt_dlp/extractor/adultswim.py
@@ -91,7 +91,7 @@ class AdultSwimIE(TurnerBaseIE):
   getShowBySlug(slug:"%s") {
     %%s
   }
-}''' % show_path
+}''' % show_path  # noqa: UP031
         if episode_path:
             query = query % '''title
     getVideoBySlug(slug:"%s") {
@@ -107,7 +107,6 @@ class AdultSwimIE(TurnerBaseIE):
       title
       tvRating
     }''' % episode_path
-            ['getVideoBySlug']
         else:
             query = query % '''metaDescription
     title
@@ -129,7 +128,7 @@ class AdultSwimIE(TurnerBaseIE):
             episode_title = title = video_data['title']
             series = show_data.get('title')
             if series:
-                title = '%s - %s' % (series, title)
+                title = f'{series} - {title}'
             info = {
                 'id': video_id,
                 'title': title,
@@ -192,7 +191,7 @@ class AdultSwimIE(TurnerBaseIE):
                 if not slug:
                     continue
                 entries.append(self.url_result(
-                    'http://adultswim.com/videos/%s/%s' % (show_path, slug),
+                    f'http://adultswim.com/videos/{show_path}/{slug}',
                     'AdultSwim', video.get('_id')))
             return self.playlist_result(
                 entries, show_path, show_data.get('title'),
diff --git a/plugins/youtube_download/yt_dlp/extractor/aenetworks.py b/plugins/youtube_download/yt_dlp/extractor/aenetworks.py
index f049a0f..8e25786 100644
--- a/plugins/youtube_download/yt_dlp/extractor/aenetworks.py
+++ b/plugins/youtube_download/yt_dlp/extractor/aenetworks.py
@@ -73,8 +73,8 @@ class AENetworksBaseIE(ThePlatformIE):  # XXX: Do not subclass from concrete IE
     def _extract_aetn_info(self, domain, filter_key, filter_value, url):
         requestor_id, brand = self._DOMAIN_MAP[domain]
         result = self._download_json(
-            'https://feeds.video.aetnd.com/api/v2/%s/videos' % brand,
-            filter_value, query={'filter[%s]' % filter_key: filter_value})
+            f'https://feeds.video.aetnd.com/api/v2/{brand}/videos',
+            filter_value, query={f'filter[{filter_key}]': filter_value})
         result = traverse_obj(
             result, ('results',
                      lambda k, v: k == 0 and v[filter_key] == filter_value),
@@ -93,7 +93,7 @@ class AENetworksBaseIE(ThePlatformIE):  # XXX: Do not subclass from concrete IE
             resource = self._get_mvpd_resource(
                 requestor_id, theplatform_metadata['title'],
                 theplatform_metadata.get('AETN$PPL_pplProgramId') or theplatform_metadata.get('AETN$PPL_pplProgramId_OLD'),
-                theplatform_metadata['ratings'][0]['rating'])
+                traverse_obj(theplatform_metadata, ('ratings', 0, 'rating')))
             auth = self._extract_mvpd_auth(
                 url, video_id, requestor_id, resource)
         info.update(self._extract_aen_smil(media_url, video_id, auth))
@@ -121,18 +121,28 @@ class AENetworksIE(AENetworksBaseIE):
         'info_dict': {
             'id': '22253814',
             'ext': 'mp4',
-            'title': 'Winter is Coming',
-            'description': 'md5:641f424b7a19d8e24f26dea22cf59d74',
+            'title': 'Winter Is Coming',
+            'description': 'md5:a40e370925074260b1c8a633c632c63a',
             'timestamp': 1338306241,
             'upload_date': '20120529',
             'uploader': 'AENE-NEW',
+            'duration': 2592.0,
+            'thumbnail': r're:^https?://.*\.jpe?g$',
+            'chapters': 'count:5',
+            'tags': 'count:14',
+            'categories': ['Mountain Men'],
+            'episode_number': 1,
+            'episode': 'Episode 1',
+            'season': 'Season 1',
+            'season_number': 1,
+            'series': 'Mountain Men',
         },
         'params': {
             # m3u8 download
             'skip_download': True,
         },
         'add_ie': ['ThePlatform'],
-        'skip': 'Geo-restricted - This content is not available in your location.'
+        'skip': 'Geo-restricted - This content is not available in your location.',
     }, {
         'url': 'http://www.aetv.com/shows/duck-dynasty/season-9/episode-1',
         'info_dict': {
@@ -143,6 +153,15 @@ class AENetworksIE(AENetworksBaseIE):
             'timestamp': 1452634428,
             'upload_date': '20160112',
             'uploader': 'AENE-NEW',
+            'duration': 1277.695,
+            'thumbnail': r're:^https?://.*\.jpe?g$',
+            'chapters': 'count:4',
+            'tags': 'count:23',
+            'episode': 'Episode 1',
+            'episode_number': 1,
+            'season': 'Season 9',
+            'season_number': 9,
+            'series': 'Duck Dynasty',
         },
         'params': {
             # m3u8 download
@@ -152,28 +171,28 @@ class AENetworksIE(AENetworksBaseIE):
         'skip': 'This video is only available for users of participating TV providers.',
     }, {
         'url': 'http://www.fyi.tv/shows/tiny-house-nation/season-1/episode-8',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'http://www.mylifetime.com/shows/project-runway-junior/season-1/episode-6',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'http://www.mylifetime.com/movies/center-stage-on-pointe/full-movie',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://watch.lifetimemovieclub.com/movies/10-year-reunion/full-movie',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'http://www.history.com/specials/sniper-into-the-kill-zone/full-special',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.aetv.com/specials/hunting-jonbenets-killer-the-untold-story/preview-hunting-jonbenets-killer-the-untold-story',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'http://www.history.com/videos/history-of-valentines-day',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://play.aetv.com/shows/duck-dynasty/videos/best-of-duck-dynasty-getting-quack-in-shape',
-        'only_matching': True
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
@@ -190,14 +209,14 @@ class AENetworksListBaseIE(AENetworksBaseIE):
   %s(slug: "%s") {
     %s
   }
-}''' % (resource, slug, fields),
+}''' % (resource, slug, fields),  # noqa: UP031
             }))['data'][resource]
 
     def _real_extract(self, url):
         domain, slug = self._match_valid_url(url).groups()
         _, brand = self._DOMAIN_MAP[domain]
         playlist = self._call_api(self._RESOURCE, slug, brand, self._FIELDS)
-        base_url = 'http://watch.%s' % domain
+        base_url = f'http://watch.{domain}'
 
         entries = []
         for item in (playlist.get(self._ITEMS_KEY) or []):
@@ -229,10 +248,10 @@ class AENetworksCollectionIE(AENetworksListBaseIE):
         'playlist_mincount': 12,
     }, {
         'url': 'https://watch.historyvault.com/shows/america-the-story-of-us-2/season-1/list/america-the-story-of-us',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.historyvault.com/collections/mysteryquest',
-        'only_matching': True
+        'only_matching': True,
     }]
     _RESOURCE = 'list'
     _ITEMS_KEY = 'items'
@@ -290,7 +309,7 @@ class HistoryTopicIE(AENetworksBaseIE):
         'info_dict': {
             'id': '40700995724',
             'ext': 'mp4',
-            'title': "History of Valentine’s Day",
+            'title': 'History of Valentine’s Day',
             'description': 'md5:7b57ea4829b391995b405fa60bd7b5f7',
             'timestamp': 1375819729,
             'upload_date': '20130806',
@@ -338,12 +357,13 @@ class BiographyIE(AENetworksBaseIE):
             'skip_download': True,
         },
         'add_ie': ['ThePlatform'],
+        'skip': '404 Not Found',
     }]
 
     def _real_extract(self, url):
         display_id = self._match_id(url)
         webpage = self._download_webpage(url, display_id)
         player_url = self._search_regex(
-            r'<phoenix-iframe[^>]+src="(%s)' % HistoryPlayerIE._VALID_URL,
+            rf'<phoenix-iframe[^>]+src="({HistoryPlayerIE._VALID_URL})',
             webpage, 'player URL')
         return self.url_result(player_url, HistoryPlayerIE.ie_key())
diff --git a/plugins/youtube_download/yt_dlp/extractor/aeonco.py b/plugins/youtube_download/yt_dlp/extractor/aeonco.py
index 390eae3..22d0266 100644
--- a/plugins/youtube_download/yt_dlp/extractor/aeonco.py
+++ b/plugins/youtube_download/yt_dlp/extractor/aeonco.py
@@ -16,8 +16,8 @@ class AeonCoIE(InfoExtractor):
             'uploader': 'Semiconductor',
             'uploader_id': 'semiconductor',
             'uploader_url': 'https://vimeo.com/semiconductor',
-            'duration': 348
-        }
+            'duration': 348,
+        },
     }, {
         'url': 'https://aeon.co/videos/dazzling-timelapse-shows-how-microbes-spoil-our-food-and-sometimes-enrich-it',
         'md5': '03582d795382e49f2fd0b427b55de409',
@@ -29,8 +29,8 @@ class AeonCoIE(InfoExtractor):
             'uploader': 'Aeon Video',
             'uploader_id': 'aeonvideo',
             'uploader_url': 'https://vimeo.com/aeonvideo',
-            'duration': 1344
-        }
+            'duration': 1344,
+        },
     }, {
         'url': 'https://aeon.co/videos/chew-over-the-prisoners-dilemma-and-see-if-you-can-find-the-rational-path-out',
         'md5': '1cfda0bf3ae24df17d00f2c0cb6cc21b',
diff --git a/plugins/youtube_download/yt_dlp/extractor/afreecatv.py b/plugins/youtube_download/yt_dlp/extractor/afreecatv.py
index 3d26d9c..aadb4d6 100644
--- a/plugins/youtube_download/yt_dlp/extractor/afreecatv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/afreecatv.py
@@ -1,142 +1,26 @@
+import datetime as dt
 import functools
-import re
 
 from .common import InfoExtractor
+from ..networking import Request
 from ..utils import (
     ExtractorError,
     OnDemandPagedList,
-    date_from_str,
+    UserNotLive,
     determine_ext,
+    filter_dict,
     int_or_none,
-    qualities,
-    traverse_obj,
-    unified_strdate,
-    unified_timestamp,
-    update_url_query,
+    orderedSet,
+    parse_iso8601,
     url_or_none,
     urlencode_postdata,
-    xpath_text,
+    urljoin,
 )
+from ..utils.traversal import traverse_obj
 
 
-class AfreecaTVIE(InfoExtractor):
-    IE_NAME = 'afreecatv'
-    IE_DESC = 'afreecatv.com'
-    _VALID_URL = r'''(?x)
-                    https?://
-                        (?:
-                            (?:(?:live|afbbs|www)\.)?afreeca(?:tv)?\.com(?::\d+)?
-                            (?:
-                                /app/(?:index|read_ucc_bbs)\.cgi|
-                                /player/[Pp]layer\.(?:swf|html)
-                            )\?.*?\bnTitleNo=|
-                            vod\.afreecatv\.com/(PLAYER/STATION|player)/
-                        )
-                        (?P<id>\d+)
-                    '''
+class AfreecaTVBaseIE(InfoExtractor):
     _NETRC_MACHINE = 'afreecatv'
-    _TESTS = [{
-        'url': 'http://live.afreecatv.com:8079/app/index.cgi?szType=read_ucc_bbs&szBjId=dailyapril&nStationNo=16711924&nBbsNo=18605867&nTitleNo=36164052&szSkin=',
-        'md5': 'f72c89fe7ecc14c1b5ce506c4996046e',
-        'info_dict': {
-            'id': '36164052',
-            'ext': 'mp4',
-            'title': '데일리 에이프릴 요정들의 시상식!',
-            'thumbnail': 're:^https?://(?:video|st)img.afreecatv.com/.*$',
-            'uploader': 'dailyapril',
-            'uploader_id': 'dailyapril',
-            'upload_date': '20160503',
-        },
-        'skip': 'Video is gone',
-    }, {
-        'url': 'http://afbbs.afreecatv.com:8080/app/read_ucc_bbs.cgi?nStationNo=16711924&nTitleNo=36153164&szBjId=dailyapril&nBbsNo=18605867',
-        'info_dict': {
-            'id': '36153164',
-            'title': "BJ유트루와 함께하는 '팅커벨 메이크업!'",
-            'thumbnail': 're:^https?://(?:video|st)img.afreecatv.com/.*$',
-            'uploader': 'dailyapril',
-            'uploader_id': 'dailyapril',
-        },
-        'playlist_count': 2,
-        'playlist': [{
-            'md5': 'd8b7c174568da61d774ef0203159bf97',
-            'info_dict': {
-                'id': '36153164_1',
-                'ext': 'mp4',
-                'title': "BJ유트루와 함께하는 '팅커벨 메이크업!'",
-                'upload_date': '20160502',
-            },
-        }, {
-            'md5': '58f2ce7f6044e34439ab2d50612ab02b',
-            'info_dict': {
-                'id': '36153164_2',
-                'ext': 'mp4',
-                'title': "BJ유트루와 함께하는 '팅커벨 메이크업!'",
-                'upload_date': '20160502',
-            },
-        }],
-        'skip': 'Video is gone',
-    }, {
-        # non standard key
-        'url': 'http://vod.afreecatv.com/PLAYER/STATION/20515605',
-        'info_dict': {
-            'id': '20170411_BE689A0E_190960999_1_2_h',
-            'ext': 'mp4',
-            'title': '혼자사는여자집',
-            'thumbnail': 're:^https?://(?:video|st)img.afreecatv.com/.*$',
-            'uploader': '♥이슬이',
-            'uploader_id': 'dasl8121',
-            'upload_date': '20170411',
-            'duration': 213,
-        },
-        'params': {
-            'skip_download': True,
-        },
-    }, {
-        # adult content
-        'url': 'https://vod.afreecatv.com/player/97267690',
-        'info_dict': {
-            'id': '20180327_27901457_202289533_1',
-            'ext': 'mp4',
-            'title': '[생]빨개요♥ (part 1)',
-            'thumbnail': 're:^https?://(?:video|st)img.afreecatv.com/.*$',
-            'uploader': '[SA]서아',
-            'uploader_id': 'bjdyrksu',
-            'upload_date': '20180327',
-            'duration': 3601,
-        },
-        'params': {
-            'skip_download': True,
-        },
-        'skip': 'The VOD does not exist',
-    }, {
-        'url': 'http://www.afreecatv.com/player/Player.swf?szType=szBjId=djleegoon&nStationNo=11273158&nBbsNo=13161095&nTitleNo=36327652',
-        'only_matching': True,
-    }, {
-        'url': 'https://vod.afreecatv.com/player/96753363',
-        'info_dict': {
-            'id': '20230108_9FF5BEE1_244432674_1',
-            'ext': 'mp4',
-            'uploader_id': 'rlantnghks',
-            'uploader': '페이즈으',
-            'duration': 10840,
-            'thumbnail': 'http://videoimg.afreecatv.com/php/SnapshotLoad.php?rowKey=20230108_9FF5BEE1_244432674_1_r',
-            'upload_date': '20230108',
-            'title': '젠지 페이즈',
-        },
-        'params': {
-            'skip_download': True,
-        },
-    }]
-
-    @staticmethod
-    def parse_video_key(key):
-        video_key = {}
-        m = re.match(r'^(?P<upload_date>\d{8})_\w+_(?P<part>\d+)$', key)
-        if m:
-            video_key['upload_date'] = m.group('upload_date')
-            video_key['part'] = int(m.group('part'))
-        return video_key
 
     def _perform_login(self, username, password):
         login_form = {
@@ -150,21 +34,21 @@ class AfreecaTVIE(InfoExtractor):
         }
 
         response = self._download_json(
-            'https://login.afreecatv.com/app/LoginAction.php', None,
+            'https://login.sooplive.co.kr/app/LoginAction.php', None,
             'Logging in', data=urlencode_postdata(login_form))
 
         _ERRORS = {
             -4: 'Your account has been suspended due to a violation of our terms and policies.',
-            -5: 'https://member.afreecatv.com/app/user_delete_progress.php',
-            -6: 'https://login.afreecatv.com/membership/changeMember.php',
-            -8: "Hello! AfreecaTV here.\nThe username you have entered belongs to \n an account that requires a legal guardian's consent. \nIf you wish to use our services without restriction, \nplease make sure to go through the necessary verification process.",
-            -9: 'https://member.afreecatv.com/app/pop_login_block.php',
-            -11: 'https://login.afreecatv.com/afreeca/second_login.php',
-            -12: 'https://member.afreecatv.com/app/user_security.php',
+            -5: 'https://member.sooplive.co.kr/app/user_delete_progress.php',
+            -6: 'https://login.sooplive.co.kr/membership/changeMember.php',
+            -8: "Hello! Soop here.\nThe username you have entered belongs to \n an account that requires a legal guardian's consent. \nIf you wish to use our services without restriction, \nplease make sure to go through the necessary verification process.",
+            -9: 'https://member.sooplive.co.kr/app/pop_login_block.php',
+            -11: 'https://login.sooplive.co.kr/afreeca/second_login.php',
+            -12: 'https://member.sooplive.co.kr/app/user_security.php',
             0: 'The username does not exist or you have entered the wrong password.',
             -1: 'The username does not exist or you have entered the wrong password.',
             -3: 'You have entered your username/password incorrectly.',
-            -7: 'You cannot use your Global AfreecaTV account to access Korean AfreecaTV.',
+            -7: 'You cannot use your Global Soop account to access Korean Soop.',
             -10: 'Sorry for the inconvenience. \nYour account has been blocked due to an unauthorized access. \nPlease contact our Help Center for assistance.',
             -32008: 'You have failed to log in. Please contact our Help Center.',
         }
@@ -173,169 +57,206 @@ class AfreecaTVIE(InfoExtractor):
         if result != 1:
             error = _ERRORS.get(result, 'You have failed to log in.')
             raise ExtractorError(
-                'Unable to login: %s said: %s' % (self.IE_NAME, error),
+                f'Unable to login: {self.IE_NAME} said: {error}',
                 expected=True)
 
+    def _call_api(self, endpoint, display_id, data=None, headers=None, query=None):
+        return self._download_json(Request(
+            f'https://api.m.sooplive.co.kr/{endpoint}',
+            data=data, headers=headers, query=query,
+            extensions={'legacy_ssl': True}), display_id,
+            'Downloading API JSON', 'Unable to download API JSON')
+
+    @staticmethod
+    def _fixup_thumb(thumb_url):
+        if not url_or_none(thumb_url):
+            return None
+        # Core would determine_ext as 'php' from the url, so we need to provide the real ext
+        # See: https://github.com/yt-dlp/yt-dlp/issues/11537
+        return [{'url': thumb_url, 'ext': 'jpg'}]
+
+
+class AfreecaTVIE(AfreecaTVBaseIE):
+    IE_NAME = 'soop'
+    IE_DESC = 'sooplive.co.kr'
+    _VALID_URL = r'https?://vod\.(?:sooplive\.co\.kr|afreecatv\.com)/(?:PLAYER/STATION|player)/(?P<id>\d+)/?(?:$|[?#&])'
+    _TESTS = [{
+        'url': 'https://vod.sooplive.co.kr/player/96753363',
+        'info_dict': {
+            'id': '20230108_9FF5BEE1_244432674_1',
+            'ext': 'mp4',
+            'uploader_id': 'rlantnghks',
+            'uploader': '페이즈으',
+            'duration': 10840,
+            'thumbnail': r're:https?://videoimg\.(?:sooplive\.co\.kr|afreecatv\.com)/.+',
+            'upload_date': '20230108',
+            'timestamp': 1673186405,
+            'title': '젠지 페이즈',
+        },
+        'params': {
+            'skip_download': True,
+        },
+    }, {
+        # non standard key
+        'url': 'http://vod.sooplive.co.kr/PLAYER/STATION/20515605',
+        'info_dict': {
+            'id': '20170411_BE689A0E_190960999_1_2_h',
+            'ext': 'mp4',
+            'title': '혼자사는여자집',
+            'thumbnail': r're:https?://(?:video|st)img\.(?:sooplive\.co\.kr|afreecatv\.com)/.+',
+            'uploader': '♥이슬이',
+            'uploader_id': 'dasl8121',
+            'upload_date': '20170411',
+            'timestamp': 1491929865,
+            'duration': 213,
+        },
+        'params': {
+            'skip_download': True,
+        },
+    }, {
+        # adult content
+        'url': 'https://vod.sooplive.co.kr/player/97267690',
+        'info_dict': {
+            'id': '20180327_27901457_202289533_1',
+            'ext': 'mp4',
+            'title': '[생]빨개요♥ (part 1)',
+            'thumbnail': r're:https?://(?:video|st)img\.(?:sooplive\.co\.kr|afreecatv\.com)/.+',
+            'uploader': '[SA]서아',
+            'uploader_id': 'bjdyrksu',
+            'upload_date': '20180327',
+            'duration': 3601,
+        },
+        'params': {
+            'skip_download': True,
+        },
+        'skip': 'The VOD does not exist',
+    }, {
+        # adult content
+        'url': 'https://vod.sooplive.co.kr/player/70395877',
+        'only_matching': True,
+    }, {
+        # subscribers only
+        'url': 'https://vod.sooplive.co.kr/player/104647403',
+        'only_matching': True,
+    }, {
+        # private
+        'url': 'https://vod.sooplive.co.kr/player/81669846',
+        'only_matching': True,
+    }]
+
     def _real_extract(self, url):
         video_id = self._match_id(url)
-
-        partial_view = False
-        adult_view = False
-        for _ in range(2):
-            data = self._download_json(
-                'https://api.m.afreecatv.com/station/video/a/view',
-                video_id, headers={'Referer': url}, data=urlencode_postdata({
-                    'nTitleNo': video_id,
-                    'nApiLevel': 10,
-                }))['data']
-            if traverse_obj(data, ('code', {int})) == -6221:
-                raise ExtractorError('The VOD does not exist', expected=True)
-            query = {
+        data = self._call_api(
+            'station/video/a/view', video_id, headers={'Referer': url},
+            data=urlencode_postdata({
                 'nTitleNo': video_id,
-                'nStationNo': data['station_no'],
-                'nBbsNo': data['bbs_no'],
-            }
-            if partial_view:
-                query['partialView'] = 'SKIP_ADULT'
-            if adult_view:
-                query['adultView'] = 'ADULT_VIEW'
-            video_xml = self._download_xml(
-                'http://afbbs.afreecatv.com:8080/api/video/get_video_info.php',
-                video_id, 'Downloading video info XML%s'
-                % (' (skipping adult)' if partial_view else ''),
-                video_id, headers={
-                    'Referer': url,
-                }, query=query)
+                'nApiLevel': 10,
+            }))['data']
 
-            flag = xpath_text(video_xml, './track/flag', 'flag', default=None)
-            if flag and flag == 'SUCCEED':
-                break
-            if flag == 'PARTIAL_ADULT':
-                self.report_warning(
-                    'In accordance with local laws and regulations, underage users are restricted from watching adult content. '
-                    'Only content suitable for all ages will be downloaded. '
-                    'Provide account credentials if you wish to download restricted content.')
-                partial_view = True
-                continue
-            elif flag == 'ADULT':
-                if not adult_view:
-                    adult_view = True
-                    continue
-                error = 'Only users older than 19 are able to watch this video. Provide account credentials to download this content.'
-            else:
-                error = flag
-            raise ExtractorError(
-                '%s said: %s' % (self.IE_NAME, error), expected=True)
-        else:
-            raise ExtractorError('Unable to download video info')
+        error_code = traverse_obj(data, ('code', {int}))
+        if error_code == -6221:
+            raise ExtractorError('The VOD does not exist', expected=True)
+        elif error_code == -6205:
+            raise ExtractorError('This VOD is private', expected=True)
 
-        video_element = video_xml.findall('./track/video')[-1]
-        if video_element is None or video_element.text is None:
-            raise ExtractorError(
-                'Video %s does not exist' % video_id, expected=True)
-
-        video_url = video_element.text.strip()
-
-        title = xpath_text(video_xml, './track/title', 'title', fatal=True)
-
-        uploader = xpath_text(video_xml, './track/nickname', 'uploader')
-        uploader_id = xpath_text(video_xml, './track/bj_id', 'uploader id')
-        duration = int_or_none(xpath_text(
-            video_xml, './track/duration', 'duration'))
-        thumbnail = xpath_text(video_xml, './track/titleImage', 'thumbnail')
-
-        common_entry = {
-            'uploader': uploader,
-            'uploader_id': uploader_id,
-            'thumbnail': thumbnail,
-        }
-
-        info = common_entry.copy()
-        info.update({
-            'id': video_id,
-            'title': title,
-            'duration': duration,
+        common_info = traverse_obj(data, {
+            'title': ('title', {str}),
+            'uploader': ('writer_nick', {str}),
+            'uploader_id': ('bj_id', {str}),
+            'duration': ('total_file_duration', {int_or_none(scale=1000)}),
+            'thumbnails': ('thumb', {self._fixup_thumb}),
         })
 
-        if not video_url:
-            entries = []
-            file_elements = video_element.findall('./file')
-            one = len(file_elements) == 1
-            for file_num, file_element in enumerate(file_elements, start=1):
-                file_url = url_or_none(file_element.text)
-                if not file_url:
-                    continue
-                key = file_element.get('key', '')
-                upload_date = unified_strdate(self._search_regex(
-                    r'^(\d{8})_', key, 'upload date', default=None))
-                if upload_date is not None:
-                    # sometimes the upload date isn't included in the file name
-                    # instead, another random ID is, which may parse as a valid
-                    # date but be wildly out of a reasonable range
-                    parsed_date = date_from_str(upload_date)
-                    if parsed_date.year < 2000 or parsed_date.year >= 2100:
-                        upload_date = None
-                file_duration = int_or_none(file_element.get('duration'))
-                format_id = key if key else '%s_%s' % (video_id, file_num)
-                if determine_ext(file_url) == 'm3u8':
-                    formats = self._extract_m3u8_formats(
-                        file_url, video_id, 'mp4', entry_protocol='m3u8_native',
-                        m3u8_id='hls',
-                        note='Downloading part %d m3u8 information' % file_num)
-                else:
-                    formats = [{
-                        'url': file_url,
-                        'format_id': 'http',
-                    }]
-                if not formats and not self.get_param('ignore_no_formats'):
-                    continue
-                file_info = common_entry.copy()
-                file_info.update({
-                    'id': format_id,
-                    'title': title if one else '%s (part %d)' % (title, file_num),
-                    'upload_date': upload_date,
-                    'duration': file_duration,
-                    'formats': formats,
-                })
-                entries.append(file_info)
-            entries_info = info.copy()
-            entries_info.update({
-                '_type': 'multi_video',
-                'entries': entries,
-            })
-            return entries_info
+        entries = []
+        for file_num, file_element in enumerate(
+                traverse_obj(data, ('files', lambda _, v: url_or_none(v['file']))), start=1):
+            file_url = file_element['file']
+            if determine_ext(file_url) == 'm3u8':
+                formats = self._extract_m3u8_formats(
+                    file_url, video_id, 'mp4', m3u8_id='hls',
+                    note=f'Downloading part {file_num} m3u8 information')
+            else:
+                formats = [{
+                    'url': file_url,
+                    'format_id': 'http',
+                }]
 
-        info = {
-            'id': video_id,
-            'title': title,
-            'uploader': uploader,
-            'uploader_id': uploader_id,
-            'duration': duration,
-            'thumbnail': thumbnail,
-        }
-
-        if determine_ext(video_url) == 'm3u8':
-            info['formats'] = self._extract_m3u8_formats(
-                video_url, video_id, 'mp4', entry_protocol='m3u8_native',
-                m3u8_id='hls')
-        else:
-            app, playpath = video_url.split('mp4:')
-            info.update({
-                'url': app,
-                'ext': 'flv',
-                'play_path': 'mp4:' + playpath,
-                'rtmp_live': True,  # downloading won't end without this
+            entries.append({
+                **common_info,
+                'id': file_element.get('file_info_key') or f'{video_id}_{file_num}',
+                'title': f'{common_info.get("title") or "Untitled"} (part {file_num})',
+                'formats': formats,
+                **traverse_obj(file_element, {
+                    'duration': ('duration', {int_or_none(scale=1000)}),
+                    'timestamp': ('file_start', {parse_iso8601(delimiter=' ', timezone=dt.timedelta(hours=9))}),
+                }),
             })
 
-        return info
+        if traverse_obj(data, ('adult_status', {str})) == 'notLogin':
+            if not entries:
+                self.raise_login_required(
+                    'Only users older than 19 are able to watch this video', method='password')
+            self.report_warning(
+                'In accordance with local laws and regulations, underage users are '
+                'restricted from watching adult content. Only content suitable for all '
+                f'ages will be downloaded. {self._login_hint("password")}')
+
+        if not entries and traverse_obj(data, ('sub_upload_type', {str})):
+            self.raise_login_required('This VOD is for subscribers only', method='password')
+
+        if len(entries) == 1:
+            return {
+                **entries[0],
+                'title': common_info.get('title'),
+            }
+
+        common_info['timestamp'] = traverse_obj(entries, (..., 'timestamp'), get_all=False)
+
+        return self.playlist_result(entries, video_id, multi_video=True, **common_info)
 
 
-class AfreecaTVLiveIE(AfreecaTVIE):  # XXX: Do not subclass from concrete IE
-
-    IE_NAME = 'afreecatv:live'
-    _VALID_URL = r'https?://play\.afreeca(?:tv)?\.com/(?P<id>[^/]+)(?:/(?P<bno>\d+))?'
+class AfreecaTVCatchStoryIE(AfreecaTVBaseIE):
+    IE_NAME = 'soop:catchstory'
+    IE_DESC = 'sooplive.co.kr catch story'
+    _VALID_URL = r'https?://vod\.(?:sooplive\.co\.kr|afreecatv\.com)/player/(?P<id>\d+)/catchstory'
     _TESTS = [{
-        'url': 'https://play.afreecatv.com/pyh3646/237852185',
+        'url': 'https://vod.sooplive.co.kr/player/103247/catchstory',
+        'info_dict': {
+            'id': '103247',
+        },
+        'playlist_count': 2,
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        data = self._call_api(
+            'catchstory/a/view', video_id, headers={'Referer': url},
+            query={'aStoryListIdx': '', 'nStoryIdx': video_id})
+
+        return self.playlist_result(self._entries(data), video_id)
+
+    def _entries(self, data):
+        # 'files' is always a list with 1 element
+        yield from traverse_obj(data, (
+            'data', lambda _, v: v['story_type'] == 'catch',
+            'catch_list', lambda _, v: v['files'][0]['file'], {
+                'id': ('files', 0, 'file_info_key', {str}),
+                'url': ('files', 0, 'file', {url_or_none}),
+                'duration': ('files', 0, 'duration', {int_or_none(scale=1000)}),
+                'title': ('title', {str}),
+                'uploader': ('writer_nick', {str}),
+                'uploader_id': ('writer_id', {str}),
+                'thumbnails': ('thumb', {self._fixup_thumb}),
+                'timestamp': ('write_timestamp', {int_or_none}),
+            }))
+
+
+class AfreecaTVLiveIE(AfreecaTVBaseIE):
+    IE_NAME = 'soop:live'
+    IE_DESC = 'sooplive.co.kr livestreams'
+    _VALID_URL = r'https?://play\.(?:sooplive\.co\.kr|afreecatv\.com)/(?P<id>[^/?#]+)(?:/(?P<bno>\d+))?'
+    _TESTS = [{
+        'url': 'https://play.sooplive.co.kr/pyh3646/237852185',
         'info_dict': {
             'id': '237852185',
             'ext': 'mp4',
@@ -347,94 +268,121 @@ class AfreecaTVLiveIE(AfreecaTVIE):  # XXX: Do not subclass from concrete IE
         },
         'skip': 'Livestream has ended',
     }, {
-        'url': 'http://play.afreeca.com/pyh3646/237852185',
+        'url': 'https://play.sooplive.co.kr/pyh3646/237852185',
         'only_matching': True,
     }, {
-        'url': 'http://play.afreeca.com/pyh3646',
+        'url': 'https://play.sooplive.co.kr/pyh3646',
         'only_matching': True,
     }]
 
-    _LIVE_API_URL = 'https://live.afreecatv.com/afreeca/player_live_api.php'
+    _LIVE_API_URL = 'https://live.sooplive.co.kr/afreeca/player_live_api.php'
+    _WORKING_CDNS = [
+        'gcp_cdn',  # live-global-cdn-v02.sooplive.co.kr
+        'gs_cdn_pc_app',  # pc-app.stream.sooplive.co.kr
+        'gs_cdn_mobile_web',  # mobile-web.stream.sooplive.co.kr
+        'gs_cdn_pc_web',  # pc-web.stream.sooplive.co.kr
+    ]
+    _BAD_CDNS = [
+        'gs_cdn',  # chromecast.afreeca.gscdn.com (cannot resolve)
+        'gs_cdn_chromecast',  # chromecast.stream.sooplive.co.kr (HTTP Error 400)
+        'azure_cdn',  # live-global-cdn-v01.sooplive.co.kr (cannot resolve)
+        'aws_cf',  # live-global-cdn-v03.sooplive.co.kr (cannot resolve)
+        'kt_cdn',  # kt.stream.sooplive.co.kr (HTTP Error 400)
+    ]
 
-    _QUALITIES = ('sd', 'hd', 'hd2k', 'original')
+    def _extract_formats(self, channel_info, broadcast_no, aid):
+        stream_base_url = channel_info.get('RMD') or 'https://livestream-manager.sooplive.co.kr'
+
+        # If user has not passed CDN IDs, try API-provided CDN ID followed by other working CDN IDs
+        default_cdn_ids = orderedSet([
+            *traverse_obj(channel_info, ('CDN', {str}, all, lambda _, v: v not in self._BAD_CDNS)),
+            *self._WORKING_CDNS,
+        ])
+        cdn_ids = self._configuration_arg('cdn', default_cdn_ids)
+
+        for attempt, cdn_id in enumerate(cdn_ids, start=1):
+            m3u8_url = traverse_obj(self._download_json(
+                urljoin(stream_base_url, 'broad_stream_assign.html'), broadcast_no,
+                f'Downloading {cdn_id} stream info', f'Unable to download {cdn_id} stream info',
+                fatal=False, query={
+                    'return_type': cdn_id,
+                    'broad_key': f'{broadcast_no}-common-master-hls',
+                }), ('view_url', {url_or_none}))
+            try:
+                return self._extract_m3u8_formats(
+                    m3u8_url, broadcast_no, 'mp4', m3u8_id='hls', query={'aid': aid},
+                    headers={'Referer': 'https://play.sooplive.co.kr/'})
+            except ExtractorError as e:
+                if attempt == len(cdn_ids):
+                    raise
+                self.report_warning(
+                    f'{e.cause or e.msg}. Retrying... (attempt {attempt} of {len(cdn_ids)})')
 
     def _real_extract(self, url):
         broadcaster_id, broadcast_no = self._match_valid_url(url).group('id', 'bno')
-        password = self.get_param('videopassword')
+        channel_info = traverse_obj(self._download_json(
+            self._LIVE_API_URL, broadcaster_id, data=urlencode_postdata({'bid': broadcaster_id})),
+            ('CHANNEL', {dict})) or {}
 
-        info = self._download_json(self._LIVE_API_URL, broadcaster_id, fatal=False,
-                                   data=urlencode_postdata({'bid': broadcaster_id})) or {}
-        channel_info = info.get('CHANNEL') or {}
         broadcaster_id = channel_info.get('BJID') or broadcaster_id
         broadcast_no = channel_info.get('BNO') or broadcast_no
-        password_protected = channel_info.get('BPWD')
         if not broadcast_no:
-            raise ExtractorError(f'Unable to extract broadcast number ({broadcaster_id} may not be live)', expected=True)
-        if password_protected == 'Y' and password is None:
+            result = channel_info.get('RESULT')
+            if result == 0:
+                raise UserNotLive(video_id=broadcaster_id)
+            elif result == -6:
+                self.raise_login_required(
+                    'This channel is streaming for subscribers only', method='password')
+            raise ExtractorError('Unable to extract broadcast number')
+
+        password = self.get_param('videopassword')
+        if channel_info.get('BPWD') == 'Y' and password is None:
             raise ExtractorError(
                 'This livestream is protected by a password, use the --video-password option',
                 expected=True)
 
-        formats = []
-        quality_key = qualities(self._QUALITIES)
-        for quality_str in self._QUALITIES:
-            params = {
+        token_info = traverse_obj(self._download_json(
+            self._LIVE_API_URL, broadcast_no, 'Downloading access token for stream',
+            'Unable to download access token for stream', data=urlencode_postdata(filter_dict({
                 'bno': broadcast_no,
                 'stream_type': 'common',
                 'type': 'aid',
-                'quality': quality_str,
-            }
-            if password is not None:
-                params['pwd'] = password
-            aid_response = self._download_json(
-                self._LIVE_API_URL, broadcast_no, fatal=False,
-                data=urlencode_postdata(params),
-                note=f'Downloading access token for {quality_str} stream',
-                errnote=f'Unable to download access token for {quality_str} stream')
-            aid = traverse_obj(aid_response, ('CHANNEL', 'AID'))
-            if not aid:
-                continue
+                'quality': 'master',
+                'pwd': password,
+            }))), ('CHANNEL', {dict})) or {}
+        aid = token_info.get('AID')
+        if not aid:
+            result = token_info.get('RESULT')
+            if result == 0:
+                raise ExtractorError('This livestream has ended', expected=True)
+            elif result == -6:
+                self.raise_login_required('This livestream is for subscribers only', method='password')
+            raise ExtractorError('Unable to extract access token')
 
-            stream_base_url = channel_info.get('RMD') or 'https://livestream-manager.afreecatv.com'
-            stream_info = self._download_json(
-                f'{stream_base_url}/broad_stream_assign.html', broadcast_no, fatal=False,
-                query={
-                    'return_type': channel_info.get('CDN', 'gcp_cdn'),
-                    'broad_key': f'{broadcast_no}-common-{quality_str}-hls',
-                },
-                note=f'Downloading metadata for {quality_str} stream',
-                errnote=f'Unable to download metadata for {quality_str} stream') or {}
+        formats = self._extract_formats(channel_info, broadcast_no, aid)
 
-            if stream_info.get('view_url'):
-                formats.append({
-                    'format_id': quality_str,
-                    'url': update_url_query(stream_info['view_url'], {'aid': aid}),
-                    'ext': 'mp4',
-                    'protocol': 'm3u8',
-                    'quality': quality_key(quality_str),
-                })
-
-        station_info = self._download_json(
-            'https://st.afreecatv.com/api/get_station_status.php', broadcast_no,
-            query={'szBjId': broadcaster_id}, fatal=False,
-            note='Downloading channel metadata', errnote='Unable to download channel metadata') or {}
+        station_info = traverse_obj(self._download_json(
+            'https://st.sooplive.co.kr/api/get_station_status.php', broadcast_no,
+            'Downloading channel metadata', 'Unable to download channel metadata',
+            query={'szBjId': broadcaster_id}, fatal=False), {dict}) or {}
 
         return {
             'id': broadcast_no,
             'title': channel_info.get('TITLE') or station_info.get('station_title'),
             'uploader': channel_info.get('BJNICK') or station_info.get('station_name'),
             'uploader_id': broadcaster_id,
-            'timestamp': unified_timestamp(station_info.get('broad_start')),
+            'timestamp': parse_iso8601(station_info.get('broad_start'), delimiter=' ', timezone=dt.timedelta(hours=9)),
             'formats': formats,
             'is_live': True,
+            'http_headers': {'Referer': url},
         }
 
 
-class AfreecaTVUserIE(InfoExtractor):
-    IE_NAME = 'afreecatv:user'
-    _VALID_URL = r'https?://bj\.afreeca(?:tv)?\.com/(?P<id>[^/]+)/vods/?(?P<slug_type>[^/]+)?'
+class AfreecaTVUserIE(AfreecaTVBaseIE):
+    IE_NAME = 'soop:user'
+    _VALID_URL = r'https?://ch\.(?:sooplive\.co\.kr|afreecatv\.com)/(?P<id>[^/?#]+)/vods/?(?P<slug_type>[^/?#]+)?'
     _TESTS = [{
-        'url': 'https://bj.afreecatv.com/ryuryu24/vods/review',
+        'url': 'https://ch.sooplive.co.kr/ryuryu24/vods/review',
         'info_dict': {
             '_type': 'playlist',
             'id': 'ryuryu24',
@@ -442,7 +390,7 @@ class AfreecaTVUserIE(InfoExtractor):
         },
         'playlist_count': 218,
     }, {
-        'url': 'https://bj.afreecatv.com/parang1995/vods/highlight',
+        'url': 'https://ch.sooplive.co.kr/parang1995/vods/highlight',
         'info_dict': {
             '_type': 'playlist',
             'id': 'parang1995',
@@ -450,7 +398,7 @@ class AfreecaTVUserIE(InfoExtractor):
         },
         'playlist_count': 997,
     }, {
-        'url': 'https://bj.afreecatv.com/ryuryu24/vods',
+        'url': 'https://ch.sooplive.co.kr/ryuryu24/vods',
         'info_dict': {
             '_type': 'playlist',
             'id': 'ryuryu24',
@@ -458,7 +406,7 @@ class AfreecaTVUserIE(InfoExtractor):
         },
         'playlist_count': 221,
     }, {
-        'url': 'https://bj.afreecatv.com/ryuryu24/vods/balloonclip',
+        'url': 'https://ch.sooplive.co.kr/ryuryu24/vods/balloonclip',
         'info_dict': {
             '_type': 'playlist',
             'id': 'ryuryu24',
@@ -470,12 +418,12 @@ class AfreecaTVUserIE(InfoExtractor):
 
     def _fetch_page(self, user_id, user_type, page):
         page += 1
-        info = self._download_json(f'https://bjapi.afreecatv.com/api/{user_id}/vods/{user_type}', user_id,
+        info = self._download_json(f'https://chapi.sooplive.co.kr/api/{user_id}/vods/{user_type}', user_id,
                                    query={'page': page, 'per_page': self._PER_PAGE, 'orderby': 'reg_date'},
                                    note=f'Downloading {user_type} video page {page}')
         for item in info['data']:
             yield self.url_result(
-                f'https://vod.afreecatv.com/player/{item["title_no"]}/', AfreecaTVIE, item['title_no'])
+                f'https://vod.sooplive.co.kr/player/{item["title_no"]}/', AfreecaTVIE, item['title_no'])
 
     def _real_extract(self, url):
         user_id, user_type = self._match_valid_url(url).group('id', 'slug_type')
diff --git a/plugins/youtube_download/yt_dlp/extractor/agora.py b/plugins/youtube_download/yt_dlp/extractor/agora.py
index abb2d3f..e040db6 100644
--- a/plugins/youtube_download/yt_dlp/extractor/agora.py
+++ b/plugins/youtube_download/yt_dlp/extractor/agora.py
@@ -146,7 +146,7 @@ class TokFMPodcastIE(InfoExtractor):
         'url': 'https://audycje.tokfm.pl/podcast/91275,-Systemowy-rasizm-Czy-zamieszki-w-USA-po-morderstwie-w-Minneapolis-doprowadza-do-zmian-w-sluzbach-panstwowych',
         'info_dict': {
             'id': '91275',
-            'ext': 'aac',
+            'ext': 'mp3',
             'title': 'md5:a9b15488009065556900169fb8061cce',
             'episode': 'md5:a9b15488009065556900169fb8061cce',
             'series': 'Analizy',
@@ -164,23 +164,20 @@ class TokFMPodcastIE(InfoExtractor):
             raise ExtractorError('No such podcast', expected=True)
         metadata = metadata[0]
 
-        formats = []
-        for ext in ('aac', 'mp3'):
-            url_data = self._download_json(
-                f'https://api.podcast.radioagora.pl/api4/getSongUrl?podcast_id={media_id}&device_id={uuid.uuid4()}&ppre=false&audio={ext}',
-                media_id, 'Downloading podcast %s URL' % ext)
-            # prevents inserting the mp3 (default) multiple times
-            if 'link_ssl' in url_data and f'.{ext}' in url_data['link_ssl']:
-                formats.append({
-                    'url': url_data['link_ssl'],
-                    'ext': ext,
-                    'vcodec': 'none',
-                    'acodec': ext,
-                })
+        mp3_url = self._download_json(
+            'https://api.podcast.radioagora.pl/api4/getSongUrl',
+            media_id, 'Downloading podcast mp3 URL', query={
+                'podcast_id': media_id,
+                'device_id': str(uuid.uuid4()),
+                'ppre': 'false',
+                'audio': 'mp3',
+            })['link_ssl']
 
         return {
             'id': media_id,
-            'formats': formats,
+            'url': mp3_url,
+            'vcodec': 'none',
+            'ext': 'mp3',
             'title': metadata.get('podcast_name'),
             'series': metadata.get('series_name'),
             'episode': metadata.get('podcast_name'),
@@ -206,8 +203,8 @@ class TokFMAuditionIE(InfoExtractor):
     }
 
     @staticmethod
-    def _create_url(id):
-        return f'https://audycje.tokfm.pl/audycja/{id}'
+    def _create_url(video_id):
+        return f'https://audycje.tokfm.pl/audycja/{video_id}'
 
     def _real_extract(self, url):
         audition_id = self._match_id(url)
diff --git a/plugins/youtube_download/yt_dlp/extractor/airmozilla.py b/plugins/youtube_download/yt_dlp/extractor/airmozilla.py
deleted file mode 100644
index 669556b..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/airmozilla.py
+++ /dev/null
@@ -1,63 +0,0 @@
-import re
-
-from .common import InfoExtractor
-from ..utils import (
-    int_or_none,
-    parse_duration,
-    parse_iso8601,
-)
-
-
-class AirMozillaIE(InfoExtractor):
-    _VALID_URL = r'https?://air\.mozilla\.org/(?P<id>[0-9a-z-]+)/?'
-    _TEST = {
-        'url': 'https://air.mozilla.org/privacy-lab-a-meetup-for-privacy-minded-people-in-san-francisco/',
-        'md5': '8d02f53ee39cf006009180e21df1f3ba',
-        'info_dict': {
-            'id': '6x4q2w',
-            'ext': 'mp4',
-            'title': 'Privacy Lab - a meetup for privacy minded people in San Francisco',
-            'thumbnail': r're:https?://.*/poster\.jpg',
-            'description': 'Brings together privacy professionals and others interested in privacy at for-profits, non-profits, and NGOs in an effort to contribute to the state of the ecosystem...',
-            'timestamp': 1422487800,
-            'upload_date': '20150128',
-            'location': 'SFO Commons',
-            'duration': 3780,
-            'view_count': int,
-            'categories': ['Main', 'Privacy'],
-        }
-    }
-
-    def _real_extract(self, url):
-        display_id = self._match_id(url)
-        webpage = self._download_webpage(url, display_id)
-        video_id = self._html_search_regex(r'//vid\.ly/(.*?)/embed', webpage, 'id')
-
-        embed_script = self._download_webpage('https://vid.ly/{0}/embed'.format(video_id), video_id)
-        jwconfig = self._parse_json(self._search_regex(
-            r'initCallback\((.*)\);', embed_script, 'metadata'), video_id)['config']
-
-        info_dict = self._parse_jwplayer_data(jwconfig, video_id)
-        view_count = int_or_none(self._html_search_regex(
-            r'Views since archived: ([0-9]+)',
-            webpage, 'view count', fatal=False))
-        timestamp = parse_iso8601(self._html_search_regex(
-            r'<time datetime="(.*?)"', webpage, 'timestamp', fatal=False))
-        duration = parse_duration(self._search_regex(
-            r'Duration:\s*(\d+\s*hours?\s*\d+\s*minutes?)',
-            webpage, 'duration', fatal=False))
-
-        info_dict.update({
-            'id': video_id,
-            'title': self._og_search_title(webpage),
-            'url': self._og_search_url(webpage),
-            'display_id': display_id,
-            'description': self._og_search_description(webpage),
-            'timestamp': timestamp,
-            'location': self._html_search_regex(r'Location: (.*)', webpage, 'location', default=None),
-            'duration': duration,
-            'view_count': view_count,
-            'categories': re.findall(r'<a href=".*?" class="channel">(.*?)</a>', webpage),
-        })
-
-        return info_dict
diff --git a/plugins/youtube_download/yt_dlp/extractor/airtv.py b/plugins/youtube_download/yt_dlp/extractor/airtv.py
index 0b73a96..cee660d 100644
--- a/plugins/youtube_download/yt_dlp/extractor/airtv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/airtv.py
@@ -5,7 +5,7 @@ from ..utils import (
     int_or_none,
     mimetype2ext,
     parse_iso8601,
-    traverse_obj
+    traverse_obj,
 )
 
 
@@ -26,7 +26,7 @@ class AirTVIE(InfoExtractor):
             'view_count': int,
             'thumbnail': 'https://cdn-sp-gcs.air.tv/videos/W/8/W87jcWleSn2hXZN47zJZsQ/b13fc56464f47d9d62a36d110b9b5a72-4096x2160_9.jpg',
             'timestamp': 1664792603,
-        }
+        },
     }, {
         # with youtube_id
         'url': 'https://www.air.tv/watch?v=sv57EC8tRXG6h8dNXFUU1Q',
@@ -54,7 +54,7 @@ class AirTVIE(InfoExtractor):
             'channel': 'Newsflare',
             'duration': 37,
             'upload_date': '20180511',
-        }
+        },
     }]
 
     def _get_formats_and_subtitle(self, json_data, video_id):
diff --git a/plugins/youtube_download/yt_dlp/extractor/aitube.py b/plugins/youtube_download/yt_dlp/extractor/aitube.py
index 89a6450..5179b72 100644
--- a/plugins/youtube_download/yt_dlp/extractor/aitube.py
+++ b/plugins/youtube_download/yt_dlp/extractor/aitube.py
@@ -22,7 +22,7 @@ class AitubeKZVideoIE(InfoExtractor):
             'timestamp': 1667370519,
             'title': 'Ангел хранитель 1 серия',
             'channel_follower_count': int,
-        }
+        },
     }, {
         # embed url
         'url': 'https://aitube.kz/embed/?id=9291d29b-c038-49a1-ad42-3da2051d353c',
diff --git a/plugins/youtube_download/yt_dlp/extractor/aliexpress.py b/plugins/youtube_download/yt_dlp/extractor/aliexpress.py
index 2e83f2e..e8f8618 100644
--- a/plugins/youtube_download/yt_dlp/extractor/aliexpress.py
+++ b/plugins/youtube_download/yt_dlp/extractor/aliexpress.py
@@ -1,5 +1,4 @@
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     float_or_none,
     try_get,
@@ -44,7 +43,7 @@ class AliExpressLiveIE(InfoExtractor):
             'title': title,
             'thumbnail': data.get('coverUrl'),
             'uploader': try_get(
-                data, lambda x: x['followBar']['name'], compat_str),
+                data, lambda x: x['followBar']['name'], str),
             'timestamp': float_or_none(data.get('startTimeLong'), scale=1000),
             'formats': formats,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/aljazeera.py b/plugins/youtube_download/yt_dlp/extractor/aljazeera.py
index 124bab0..9715b49 100644
--- a/plugins/youtube_download/yt_dlp/extractor/aljazeera.py
+++ b/plugins/youtube_download/yt_dlp/extractor/aljazeera.py
@@ -18,7 +18,7 @@ class AlJazeeraIE(InfoExtractor):
             'timestamp': 1636219149,
             'description': 'U sarajevskim naseljima Rajlovac i Reljevo stambeni objekti, ali i industrijska postrojenja i dalje su pod vodom.',
             'upload_date': '20211106',
-        }
+        },
     }, {
         'url': 'https://balkans.aljazeera.net/videos/2021/11/6/djokovic-usao-u-finale-mastersa-u-parizu',
         'info_dict': {
@@ -33,7 +33,7 @@ class AlJazeeraIE(InfoExtractor):
     BRIGHTCOVE_URL_RE = r'https?://players.brightcove.net/(?P<account>\d+)/(?P<player_id>[a-zA-Z0-9]+)_(?P<embed>[^/]+)/index.html\?videoId=(?P<id>\d+)'
 
     def _real_extract(self, url):
-        base, post_type, id = self._match_valid_url(url).groups()
+        base, post_type, display_id = self._match_valid_url(url).groups()
         wp = {
             'balkans.aljazeera.net': 'ajb',
             'chinese.aljazeera.net': 'chinese',
@@ -47,11 +47,11 @@ class AlJazeeraIE(InfoExtractor):
             'news': 'news',
         }[post_type.split('/')[0]]
         video = self._download_json(
-            f'https://{base}/graphql', id, query={
+            f'https://{base}/graphql', display_id, query={
                 'wp-site': wp,
                 'operationName': 'ArchipelagoSingleArticleQuery',
                 'variables': json.dumps({
-                    'name': id,
+                    'name': display_id,
                     'postType': post_type,
                 }),
             }, headers={
@@ -64,7 +64,7 @@ class AlJazeeraIE(InfoExtractor):
         embed = 'default'
 
         if video_id is None:
-            webpage = self._download_webpage(url, id)
+            webpage = self._download_webpage(url, display_id)
 
             account, player_id, embed, video_id = self._search_regex(self.BRIGHTCOVE_URL_RE, webpage, 'video id',
                                                                      group=(1, 2, 3, 4), default=(None, None, None, None))
@@ -73,11 +73,11 @@ class AlJazeeraIE(InfoExtractor):
                 return {
                     '_type': 'url_transparent',
                     'url': url,
-                    'ie_key': 'Generic'
+                    'ie_key': 'Generic',
                 }
 
         return {
             '_type': 'url_transparent',
             'url': f'https://players.brightcove.net/{account}/{player_id}_{embed}/index.html?videoId={video_id}',
-            'ie_key': 'BrightcoveNew'
+            'ie_key': 'BrightcoveNew',
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/allocine.py b/plugins/youtube_download/yt_dlp/extractor/allocine.py
index 2d342cf..e0859d4 100644
--- a/plugins/youtube_download/yt_dlp/extractor/allocine.py
+++ b/plugins/youtube_download/yt_dlp/extractor/allocine.py
@@ -1,5 +1,4 @@
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     int_or_none,
     qualities,
@@ -95,11 +94,11 @@ class AllocineIE(InfoExtractor):
             duration = int_or_none(video.get('duration'))
             view_count = int_or_none(video.get('view_count'))
             timestamp = unified_timestamp(try_get(
-                video, lambda x: x['added_at']['date'], compat_str))
+                video, lambda x: x['added_at']['date'], str))
         else:
             video_id = display_id
             media_data = self._download_json(
-                'http://www.allocine.fr/ws/AcVisiondataV5.ashx?media=%s' % video_id, display_id)
+                f'http://www.allocine.fr/ws/AcVisiondataV5.ashx?media={video_id}', display_id)
             title = remove_end(strip_or_none(self._html_extract_title(webpage), ' - AlloCiné'))
             for key, value in media_data['video'].items():
                 if not key.endswith('Path'):
diff --git a/plugins/youtube_download/yt_dlp/extractor/allstar.py b/plugins/youtube_download/yt_dlp/extractor/allstar.py
new file mode 100644
index 0000000..697d83c
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/allstar.py
@@ -0,0 +1,252 @@
+import functools
+import json
+
+from .common import InfoExtractor
+from ..utils import (
+    ExtractorError,
+    OnDemandPagedList,
+    int_or_none,
+    join_nonempty,
+    parse_qs,
+    urljoin,
+)
+from ..utils.traversal import traverse_obj
+
+_FIELDS = '''
+    _id
+    clipImageSource
+    clipImageThumb
+    clipLink
+    clipTitle
+    createdDate
+    shareId
+    user { _id }
+    username
+    views'''
+
+_EXTRA_FIELDS = '''
+    clipLength
+    clipSizeBytes'''
+
+_QUERIES = {
+    'clip': '''query ($id: String!) {
+        video: getClip(clipIdentifier: $id) {
+            %s %s
+        }
+    }''' % (_FIELDS, _EXTRA_FIELDS),  # noqa: UP031
+    'montage': '''query ($id: String!) {
+        video: getMontage(clipIdentifier: $id) {
+            %s
+        }
+    }''' % _FIELDS,  # noqa: UP031
+    'Clips': '''query ($page: Int!, $user: String!, $game: Int) {
+        videos: clips(search: createdDate, page: $page, user: $user, mobile: false, game: $game) {
+            data { %s %s }
+        }
+    }''' % (_FIELDS, _EXTRA_FIELDS),  # noqa: UP031
+    'Montages': '''query ($page: Int!, $user: String!) {
+        videos: montages(search: createdDate, page: $page, user: $user) {
+            data { %s }
+        }
+    }''' % _FIELDS,  # noqa: UP031
+    'Mobile Clips': '''query ($page: Int!, $user: String!) {
+        videos: clips(search: createdDate, page: $page, user: $user, mobile: true) {
+            data { %s %s }
+        }
+    }''' % (_FIELDS, _EXTRA_FIELDS),  # noqa: UP031
+}
+
+
+class AllstarBaseIE(InfoExtractor):
+    @staticmethod
+    def _parse_video_data(video_data):
+        def media_url_or_none(path):
+            return urljoin('https://media.allstar.gg/', path)
+
+        info = traverse_obj(video_data, {
+            'id': ('_id', {str}),
+            'display_id': ('shareId', {str}),
+            'title': ('clipTitle', {str}),
+            'url': ('clipLink', {media_url_or_none}),
+            'thumbnails': (('clipImageThumb', 'clipImageSource'), {'url': {media_url_or_none}}),
+            'duration': ('clipLength', {int_or_none}),
+            'filesize': ('clipSizeBytes', {int_or_none}),
+            'timestamp': ('createdDate', {int_or_none(scale=1000)}),
+            'uploader': ('username', {str}),
+            'uploader_id': ('user', '_id', {str}),
+            'view_count': ('views', {int_or_none}),
+        })
+
+        if info.get('id') and info.get('url'):
+            basename = 'clip' if '/clips/' in info['url'] else 'montage'
+            info['webpage_url'] = f'https://allstar.gg/{basename}?{basename}={info["id"]}'
+
+        info.update({
+            'extractor_key': AllstarIE.ie_key(),
+            'extractor': AllstarIE.IE_NAME,
+            'uploader_url': urljoin('https://allstar.gg/u/', info.get('uploader_id')),
+        })
+
+        return info
+
+    def _call_api(self, query, variables, path, video_id=None, note=None):
+        response = self._download_json(
+            'https://a1.allstar.gg/graphql', video_id, note=note,
+            headers={'content-type': 'application/json'},
+            data=json.dumps({'variables': variables, 'query': query}).encode())
+
+        errors = traverse_obj(response, ('errors', ..., 'message', {str}))
+        if errors:
+            raise ExtractorError('; '.join(errors))
+
+        return traverse_obj(response, path)
+
+
+class AllstarIE(AllstarBaseIE):
+    _VALID_URL = r'https?://(?:www\.)?allstar\.gg/(?P<type>(?:clip|montage))\?(?P=type)=(?P<id>[^/?#&]+)'
+
+    _TESTS = [{
+        'url': 'https://allstar.gg/clip?clip=64482c2da9eec30008a67d1b',
+        'info_dict': {
+            'id': '64482c2da9eec30008a67d1b',
+            'title': '4K on Inferno',
+            'url': 'md5:66befb5381eef0c9456026386c25fa55',
+            'thumbnail': r're:https://media\.allstar\.gg/.+\.(?:png|jpg)$',
+            'uploader': 'chrk.',
+            'ext': 'mp4',
+            'duration': 20,
+            'filesize': 21199257,
+            'timestamp': 1682451501,
+            'uploader_id': '62b8bdfc9021052f7905882d',
+            'uploader_url': 'https://allstar.gg/u/62b8bdfc9021052f7905882d',
+            'upload_date': '20230425',
+            'view_count': int,
+        },
+    }, {
+        'url': 'https://allstar.gg/clip?clip=8LJLY4JKB',
+        'info_dict': {
+            'id': '64a1ec6b887f4c0008dc50b8',
+            'display_id': '8LJLY4JKB',
+            'title': 'AK-47 3K on Mirage',
+            'url': 'md5:dde224fd12f035c0e2529a4ae34c4283',
+            'ext': 'mp4',
+            'thumbnail': r're:https://media\.allstar\.gg/.+\.(?:png|jpg)$',
+            'duration': 16,
+            'filesize': 30175859,
+            'timestamp': 1688333419,
+            'uploader': 'cherokee',
+            'uploader_id': '62b8bdfc9021052f7905882d',
+            'uploader_url': 'https://allstar.gg/u/62b8bdfc9021052f7905882d',
+            'upload_date': '20230702',
+            'view_count': int,
+        },
+    }, {
+        'url': 'https://allstar.gg/montage?montage=643e64089da7e9363e1fa66c',
+        'info_dict': {
+            'id': '643e64089da7e9363e1fa66c',
+            'display_id': 'APQLGM2IMXW',
+            'title': 'cherokee Rapid Fire Snipers Montage',
+            'url': 'md5:a3ee356022115db2b27c81321d195945',
+            'thumbnail': r're:https://media\.allstar\.gg/.+\.(?:png|jpg)$',
+            'ext': 'mp4',
+            'timestamp': 1681810448,
+            'uploader': 'cherokee',
+            'uploader_id': '62b8bdfc9021052f7905882d',
+            'uploader_url': 'https://allstar.gg/u/62b8bdfc9021052f7905882d',
+            'upload_date': '20230418',
+            'view_count': int,
+        },
+    }, {
+        'url': 'https://allstar.gg/montage?montage=RILJMH6QOS',
+        'info_dict': {
+            'id': '64a2697372ce3703de29e868',
+            'display_id': 'RILJMH6QOS',
+            'title': 'cherokee Rapid Fire Snipers Montage',
+            'url': 'md5:d5672e6f88579730c2310a80fdbc4030',
+            'thumbnail': r're:https://media\.allstar\.gg/.+\.(?:png|jpg)$',
+            'ext': 'mp4',
+            'timestamp': 1688365434,
+            'uploader': 'cherokee',
+            'uploader_id': '62b8bdfc9021052f7905882d',
+            'uploader_url': 'https://allstar.gg/u/62b8bdfc9021052f7905882d',
+            'upload_date': '20230703',
+            'view_count': int,
+        },
+    }]
+
+    def _real_extract(self, url):
+        query_id, video_id = self._match_valid_url(url).group('type', 'id')
+
+        return self._parse_video_data(
+            self._call_api(
+                _QUERIES.get(query_id), {'id': video_id}, ('data', 'video'), video_id))
+
+
+class AllstarProfileIE(AllstarBaseIE):
+    _VALID_URL = r'https?://(?:www\.)?allstar\.gg/(?:profile\?user=|u/)(?P<id>[^/?#&]+)'
+
+    _TESTS = [{
+        'url': 'https://allstar.gg/profile?user=62b8bdfc9021052f7905882d',
+        'info_dict': {
+            'id': '62b8bdfc9021052f7905882d-clips',
+            'title': 'cherokee - Clips',
+        },
+        'playlist_mincount': 15,
+    }, {
+        'url': 'https://allstar.gg/u/cherokee?game=730&view=Clips',
+        'info_dict': {
+            'id': '62b8bdfc9021052f7905882d-clips-730',
+            'title': 'cherokee - Clips - 730',
+        },
+        'playlist_mincount': 15,
+    }, {
+        'url': 'https://allstar.gg/u/62b8bdfc9021052f7905882d?view=Montages',
+        'info_dict': {
+            'id': '62b8bdfc9021052f7905882d-montages',
+            'title': 'cherokee - Montages',
+        },
+        'playlist_mincount': 4,
+    }, {
+        'url': 'https://allstar.gg/profile?user=cherokee&view=Mobile Clips',
+        'info_dict': {
+            'id': '62b8bdfc9021052f7905882d-mobile',
+            'title': 'cherokee - Mobile Clips',
+        },
+        'playlist_mincount': 1,
+    }]
+
+    _PAGE_SIZE = 10
+
+    def _get_page(self, user_id, display_id, game, query, page_num):
+        page_num += 1
+
+        for video_data in self._call_api(
+                query, {
+                    'user': user_id,
+                    'page': page_num,
+                    'game': game,
+                }, ('data', 'videos', 'data'), display_id, f'Downloading page {page_num}'):
+            yield self._parse_video_data(video_data)
+
+    def _real_extract(self, url):
+        display_id = self._match_id(url)
+        profile_data = self._download_json(
+            urljoin('https://api.allstar.gg/v1/users/profile/', display_id), display_id)
+        user_id = traverse_obj(profile_data, ('data', ('_id'), {str}))
+        if not user_id:
+            raise ExtractorError('Unable to extract the user id')
+
+        username = traverse_obj(profile_data, ('data', 'profile', ('username'), {str}))
+        url_query = parse_qs(url)
+        game = traverse_obj(url_query, ('game', 0, {int_or_none}))
+        query_id = traverse_obj(url_query, ('view', 0), default='Clips')
+
+        if query_id not in ('Clips', 'Montages', 'Mobile Clips'):
+            raise ExtractorError(f'Unsupported playlist URL type {query_id!r}')
+
+        return self.playlist_result(
+            OnDemandPagedList(
+                functools.partial(
+                    self._get_page, user_id, display_id, game, _QUERIES.get(query_id)), self._PAGE_SIZE),
+            playlist_id=join_nonempty(user_id, query_id.lower().split()[0], game),
+            playlist_title=join_nonempty((username or display_id), query_id, game, delim=' - '))
diff --git a/plugins/youtube_download/yt_dlp/extractor/alphaporno.py b/plugins/youtube_download/yt_dlp/extractor/alphaporno.py
index 8d5b472..7b74d55 100644
--- a/plugins/youtube_download/yt_dlp/extractor/alphaporno.py
+++ b/plugins/youtube_download/yt_dlp/extractor/alphaporno.py
@@ -1,9 +1,9 @@
 from .common import InfoExtractor
 from ..utils import (
-    parse_iso8601,
+    int_or_none,
     parse_duration,
     parse_filesize,
-    int_or_none,
+    parse_iso8601,
 )
 
 
@@ -25,7 +25,7 @@ class AlphaPornoIE(InfoExtractor):
             'tbr': 1145,
             'categories': list,
             'age_limit': 18,
-        }
+        },
     }
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/alsace20tv.py b/plugins/youtube_download/yt_dlp/extractor/alsace20tv.py
index ea3332e..c315e4f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/alsace20tv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/alsace20tv.py
@@ -12,7 +12,7 @@ from ..utils import (
 class Alsace20TVBaseIE(InfoExtractor):
     def _extract_video(self, video_id, url=None):
         info = self._download_json(
-            'https://www.alsace20.tv/visionneuse/visio_v9_js.php?key=%s&habillage=0&mode=html' % (video_id, ),
+            f'https://www.alsace20.tv/visionneuse/visio_v9_js.php?key={video_id}&habillage=0&mode=html',
             video_id) or {}
         title = info.get('titre')
 
@@ -24,9 +24,9 @@ class Alsace20TVBaseIE(InfoExtractor):
                 else self._extract_mpd_formats(fmt_url, video_id, mpd_id=res, fatal=False))
 
         webpage = (url and self._download_webpage(url, video_id, fatal=False)) or ''
-        thumbnail = url_or_none(dict_get(info, ('image', 'preview', )) or self._og_search_thumbnail(webpage))
+        thumbnail = url_or_none(dict_get(info, ('image', 'preview')) or self._og_search_thumbnail(webpage))
         upload_date = self._search_regex(r'/(\d{6})_', thumbnail, 'upload_date', default=None)
-        upload_date = unified_strdate('20%s-%s-%s' % (upload_date[:2], upload_date[2:4], upload_date[4:])) if upload_date else None
+        upload_date = unified_strdate(f'20{upload_date[:2]}-{upload_date[2:4]}-{upload_date[4:]}') if upload_date else None
         return {
             'id': video_id,
             'title': title,
diff --git a/plugins/youtube_download/yt_dlp/extractor/altcensored.py b/plugins/youtube_download/yt_dlp/extractor/altcensored.py
new file mode 100644
index 0000000..bfbf6b6
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/altcensored.py
@@ -0,0 +1,104 @@
+import re
+
+from .archiveorg import ArchiveOrgIE
+from .common import InfoExtractor
+from ..utils import (
+    InAdvancePagedList,
+    clean_html,
+    int_or_none,
+    orderedSet,
+    str_to_int,
+    urljoin,
+)
+
+
+class AltCensoredIE(InfoExtractor):
+    IE_NAME = 'altcensored'
+    _VALID_URL = r'https?://(?:www\.)?altcensored\.com/(?:watch\?v=|embed/)(?P<id>[^/?#]+)'
+    _TESTS = [{
+        'url': 'https://www.altcensored.com/watch?v=k0srjLSkga8',
+        'info_dict': {
+            'id': 'youtube-k0srjLSkga8',
+            'ext': 'webm',
+            'title': "QUELLES SONT LES CONSÉQUENCES DE L'HYPERSEXUALISATION DE LA SOCIÉTÉ ?",
+            'display_id': 'k0srjLSkga8.webm',
+            'release_date': '20180403',
+            'creators': ['Virginie Vota'],
+            'release_year': 2018,
+            'upload_date': '20230318',
+            'uploader': 'admin@altcensored.com',
+            'description': 'md5:0b38a8fc04103579d5c1db10a247dc30',
+            'timestamp': 1679161343,
+            'track': 'k0srjLSkga8',
+            'duration': 926.09,
+            'thumbnail': 'https://archive.org/download/youtube-k0srjLSkga8/youtube-k0srjLSkga8.thumbs/k0srjLSkga8_000925.jpg',
+            'view_count': int,
+            'categories': ['News & Politics'],
+        },
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+        category = clean_html(self._html_search_regex(
+            r'<a href="/category/\d+">([^<]+)</a>', webpage, 'category', default=None))
+
+        return {
+            '_type': 'url_transparent',
+            'url': f'https://archive.org/details/youtube-{video_id}',
+            'ie_key': ArchiveOrgIE.ie_key(),
+            'view_count': str_to_int(self._html_search_regex(
+                r'YouTube Views:(?:\s|&nbsp;)*([\d,]+)', webpage, 'view count', default=None)),
+            'categories': [category] if category else None,
+        }
+
+
+class AltCensoredChannelIE(InfoExtractor):
+    IE_NAME = 'altcensored:channel'
+    _VALID_URL = r'https?://(?:www\.)?altcensored\.com/channel/(?!page|table)(?P<id>[^/?#]+)'
+    _PAGE_SIZE = 24
+    _TESTS = [{
+        'url': 'https://www.altcensored.com/channel/UCFPTO55xxHqFqkzRZHu4kcw',
+        'info_dict': {
+            'title': 'Virginie Vota',
+            'id': 'UCFPTO55xxHqFqkzRZHu4kcw',
+        },
+        'playlist_count': 85,
+    }, {
+        'url': 'https://altcensored.com/channel/UC9CcJ96HKMWn0LZlcxlpFTw',
+        'info_dict': {
+            'title': 'yukikaze775',
+            'id': 'UC9CcJ96HKMWn0LZlcxlpFTw',
+        },
+        'playlist_count': 4,
+    }, {
+        'url': 'https://altcensored.com/channel/UCfYbb7nga6-icsFWWgS-kWw',
+        'info_dict': {
+            'title': 'Mister Metokur',
+            'id': 'UCfYbb7nga6-icsFWWgS-kWw',
+        },
+        'playlist_count': 121,
+    }]
+
+    def _real_extract(self, url):
+        channel_id = self._match_id(url)
+        webpage = self._download_webpage(
+            url, channel_id, 'Download channel webpage', 'Unable to get channel webpage')
+        title = self._html_search_meta('altcen_title', webpage, 'title', fatal=False)
+        page_count = int_or_none(self._html_search_regex(
+            r'<a[^>]+href="/channel/[\w-]+/page/(\d+)">(?:\1)</a>',
+            webpage, 'page count', default='1'))
+
+        def page_func(page_num):
+            page_num += 1
+            webpage = self._download_webpage(
+                f'https://altcensored.com/channel/{channel_id}/page/{page_num}',
+                channel_id, note=f'Downloading page {page_num}')
+
+            items = re.findall(r'<a[^>]+href="(/watch\?v=[^"]+)', webpage)
+            return [self.url_result(urljoin('https://www.altcensored.com', path), AltCensoredIE)
+                    for path in orderedSet(items)]
+
+        return self.playlist_result(
+            InAdvancePagedList(page_func, page_count, self._PAGE_SIZE),
+            playlist_id=channel_id, playlist_title=title)
diff --git a/plugins/youtube_download/yt_dlp/extractor/alura.py b/plugins/youtube_download/yt_dlp/extractor/alura.py
index bfe066b..ce03a42 100644
--- a/plugins/youtube_download/yt_dlp/extractor/alura.py
+++ b/plugins/youtube_download/yt_dlp/extractor/alura.py
@@ -1,17 +1,13 @@
 import re
+import urllib.parse
 
 from .common import InfoExtractor
-
-from ..compat import (
-    compat_urlparse,
-)
-
 from ..utils import (
+    ExtractorError,
+    clean_html,
+    int_or_none,
     urlencode_postdata,
     urljoin,
-    int_or_none,
-    clean_html,
-    ExtractorError
 )
 
 
@@ -25,7 +21,7 @@ class AluraIE(InfoExtractor):
         'info_dict': {
             'id': '60095',
             'ext': 'mp4',
-            'title': 'Referências, ref-set e alter'
+            'title': 'Referências, ref-set e alter',
         },
         'skip': 'Requires alura account credentials'},
         {
@@ -34,12 +30,12 @@ class AluraIE(InfoExtractor):
             'only_matching': True},
         {
             'url': 'https://cursos.alura.com.br/course/fundamentos-market-digital/task/55219',
-            'only_matching': True}
+            'only_matching': True},
     ]
 
     def _real_extract(self, url):
 
-        course, video_id = self._match_valid_url(url)
+        course, video_id = self._match_valid_url(url).group('course_name', 'id')
         video_url = self._VIDEO_URL % (course, video_id)
 
         video_dict = self._download_json(video_url, video_id, 'Searching for videos')
@@ -52,7 +48,7 @@ class AluraIE(InfoExtractor):
 
             formats = []
             for video_obj in video_dict:
-                video_url_m3u8 = video_obj.get('link')
+                video_url_m3u8 = video_obj.get('mp4')
                 video_format = self._extract_m3u8_formats(
                     video_url_m3u8, None, 'mp4', entry_protocol='m3u8_native',
                     m3u8_id='hls', fatal=False)
@@ -66,7 +62,7 @@ class AluraIE(InfoExtractor):
             return {
                 'id': video_id,
                 'title': video_title,
-                "formats": formats
+                'formats': formats,
             }
 
     def _perform_login(self, username, password):
@@ -95,7 +91,7 @@ class AluraIE(InfoExtractor):
             'post url', default=self._LOGIN_URL, group='url')
 
         if not post_url.startswith('http'):
-            post_url = compat_urlparse.urljoin(self._LOGIN_URL, post_url)
+            post_url = urllib.parse.urljoin(self._LOGIN_URL, post_url)
 
         response = self._download_webpage(
             post_url, None, 'Logging in',
@@ -107,7 +103,7 @@ class AluraIE(InfoExtractor):
                 r'(?s)<p[^>]+class="alert-message[^"]*">(.+?)</p>',
                 response, 'error message', default=None)
             if error:
-                raise ExtractorError('Unable to login: %s' % error, expected=True)
+                raise ExtractorError(f'Unable to login: {error}', expected=True)
             raise ExtractorError('Unable to log in')
 
 
@@ -123,7 +119,7 @@ class AluraCourseIE(AluraIE):  # XXX: Do not subclass from concrete IE
 
     @classmethod
     def suitable(cls, url):
-        return False if AluraIE.suitable(url) else super(AluraCourseIE, cls).suitable(url)
+        return False if AluraIE.suitable(url) else super().suitable(url)
 
     def _real_extract(self, url):
 
@@ -161,7 +157,7 @@ class AluraCourseIE(AluraIE):  # XXX: Do not subclass from concrete IE
                         'url': video_url,
                         'id_key': self.ie_key(),
                         'chapter': chapter,
-                        'chapter_number': chapter_number
+                        'chapter_number': chapter_number,
                     }
                     entries.append(entry)
         return self.playlist_result(entries, course_path, course_title)
diff --git a/plugins/youtube_download/yt_dlp/extractor/amadeustv.py b/plugins/youtube_download/yt_dlp/extractor/amadeustv.py
new file mode 100644
index 0000000..f4ea04e
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/amadeustv.py
@@ -0,0 +1,77 @@
+from .common import InfoExtractor
+from ..utils import (
+    ExtractorError,
+    float_or_none,
+    int_or_none,
+    parse_iso8601,
+    url_or_none,
+)
+from ..utils.traversal import traverse_obj
+
+
+class AmadeusTVIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?amadeus\.tv/library/(?P<id>[\da-f]+)'
+    _TESTS = [{
+        'url': 'http://www.amadeus.tv/library/65091a87ff85af59d9fc54c3',
+        'info_dict': {
+            'id': '5576678021301411311',
+            'ext': 'mp4',
+            'title': 'Jieon Park - 第五届珠海莫扎特国际青少年音乐周小提琴C组第三轮',
+            'thumbnail': 'http://1253584441.vod2.myqcloud.com/a0046a27vodtransbj1253584441/7db4af535576678021301411311/coverBySnapshot_10_0.jpg',
+            'duration': 1264.8,
+            'upload_date': '20230918',
+            'timestamp': 1695034800,
+            'display_id': '65091a87ff85af59d9fc54c3',
+            'view_count': int,
+            'description': 'md5:a0357b9c215489e2067cbae0b777bb95',
+        },
+    }]
+
+    def _real_extract(self, url):
+        display_id = self._match_id(url)
+        webpage = self._download_webpage(url, display_id)
+
+        nuxt_data = self._search_nuxt_data(webpage, display_id, traverse=('fetch', '0'))
+        video_id = traverse_obj(nuxt_data, ('item', 'video', {str}))
+
+        if not video_id:
+            raise ExtractorError('Unable to extract actual video ID')
+
+        video_data = self._download_json(
+            f'http://playvideo.qcloud.com/getplayinfo/v2/1253584441/{video_id}',
+            video_id, headers={'Referer': 'http://www.amadeus.tv/'})
+
+        formats = []
+        for video in traverse_obj(video_data, ('videoInfo', ('sourceVideo', ('transcodeList', ...)), {dict})):
+            if not url_or_none(video.get('url')):
+                continue
+            formats.append({
+                **traverse_obj(video, {
+                    'url': 'url',
+                    'format_id': ('definition', {lambda x: f'http-{x or "0"}'}),
+                    'width': ('width', {int_or_none}),
+                    'height': ('height', {int_or_none}),
+                    'filesize': (('totalSize', 'size'), {int_or_none}),
+                    'vcodec': ('videoStreamList', 0, 'codec'),
+                    'acodec': ('audioStreamList', 0, 'codec'),
+                    'fps': ('videoStreamList', 0, 'fps', {float_or_none}),
+                }, get_all=False),
+                'http_headers': {'Referer': 'http://www.amadeus.tv/'},
+            })
+
+        return {
+            'id': video_id,
+            'display_id': display_id,
+            'formats': formats,
+            **traverse_obj(video_data, {
+                'title': ('videoInfo', 'basicInfo', 'name', {str}),
+                'thumbnail': ('coverInfo', 'coverUrl', {url_or_none}),
+                'duration': ('videoInfo', 'sourceVideo', ('floatDuration', 'duration'), {float_or_none}),
+            }, get_all=False),
+            **traverse_obj(nuxt_data, ('item', {
+                'title': (('title', 'title_en', 'title_cn'), {str}),
+                'description': (('description', 'description_en', 'description_cn'), {str}),
+                'timestamp': ('date', {parse_iso8601}),
+                'view_count': ('view', {int_or_none}),
+            }), get_all=False),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/amara.py b/plugins/youtube_download/yt_dlp/extractor/amara.py
index 5018710..ed0f0cd 100644
--- a/plugins/youtube_download/yt_dlp/extractor/amara.py
+++ b/plugins/youtube_download/yt_dlp/extractor/amara.py
@@ -1,6 +1,6 @@
 from .common import InfoExtractor
-from .youtube import YoutubeIE
 from .vimeo import VimeoIE
+from .youtube import YoutubeIE
 from ..utils import (
     int_or_none,
     parse_iso8601,
@@ -25,7 +25,7 @@ class AmaraIE(InfoExtractor):
             'uploader': 'PBS NewsHour',
             'uploader_id': 'PBSNewsHour',
             'timestamp': 1549639570,
-        }
+        },
     }, {
         # Vimeo
         'url': 'https://amara.org/en/videos/kYkK1VUTWW5I/info/vimeo-at-ces-2011',
@@ -40,8 +40,8 @@ class AmaraIE(InfoExtractor):
             'timestamp': 1294763658,
             'upload_date': '20110111',
             'uploader': 'Sam Morrill',
-            'uploader_id': 'sammorrill'
-        }
+            'uploader_id': 'sammorrill',
+        },
     }, {
         # Direct Link
         'url': 'https://amara.org/en/videos/s8KL7I3jLmh6/info/the-danger-of-a-single-story/',
@@ -55,13 +55,13 @@ class AmaraIE(InfoExtractor):
             'subtitles': dict,
             'upload_date': '20091007',
             'timestamp': 1254942511,
-        }
+        },
     }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
         meta = self._download_json(
-            'https://amara.org/api/videos/%s/' % video_id,
+            f'https://amara.org/api/videos/{video_id}/',
             video_id, query={'format': 'json'})
         title = meta['title']
         video_url = meta['all_urls'][0]
diff --git a/plugins/youtube_download/yt_dlp/extractor/amazon.py b/plugins/youtube_download/yt_dlp/extractor/amazon.py
index a03f983..d1b9166 100644
--- a/plugins/youtube_download/yt_dlp/extractor/amazon.py
+++ b/plugins/youtube_download/yt_dlp/extractor/amazon.py
@@ -61,13 +61,13 @@ class AmazonStoreIE(InfoExtractor):
     }]
 
     def _real_extract(self, url):
-        id = self._match_id(url)
+        playlist_id = self._match_id(url)
 
         for retry in self.RetryManager():
-            webpage = self._download_webpage(url, id)
+            webpage = self._download_webpage(url, playlist_id)
             try:
                 data_json = self._search_json(
-                    r'var\s?obj\s?=\s?jQuery\.parseJSON\(\'', webpage, 'data', id,
+                    r'var\s?obj\s?=\s?jQuery\.parseJSON\(\'', webpage, 'data', playlist_id,
                     transform_source=js_to_json)
             except ExtractorError as e:
                 retry.error = e
@@ -81,7 +81,7 @@ class AmazonStoreIE(InfoExtractor):
             'height': int_or_none(video.get('videoHeight')),
             'width': int_or_none(video.get('videoWidth')),
         } for video in (data_json.get('videos') or []) if video.get('isVideo') and video.get('url')]
-        return self.playlist_result(entries, playlist_id=id, playlist_title=data_json.get('title'))
+        return self.playlist_result(entries, playlist_id=playlist_id, playlist_title=data_json.get('title'))
 
 
 class AmazonReviewsIE(InfoExtractor):
diff --git a/plugins/youtube_download/yt_dlp/extractor/amazonminitv.py b/plugins/youtube_download/yt_dlp/extractor/amazonminitv.py
index b57d985..0590a34 100644
--- a/plugins/youtube_download/yt_dlp/extractor/amazonminitv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/amazonminitv.py
@@ -22,8 +22,11 @@ class AmazonMiniTVBaseIE(InfoExtractor):
 
         resp = self._download_json(
             f'https://www.amazon.in/minitv/api/web/{"graphql" if data else "prs"}',
-            asin, note=note, headers={'Content-Type': 'application/json'},
-            data=json.dumps(data).encode() if data else None,
+            asin, note=note, headers={
+                'Content-Type': 'application/json',
+                'currentpageurl': '/',
+                'currentplatform': 'dWeb',
+            }, data=json.dumps(data).encode() if data else None,
             query=None if data else {
                 'deviceType': 'A1WMMUXPCUJL4N',
                 'contentId': asin,
@@ -46,7 +49,7 @@ class AmazonMiniTVIE(AmazonMiniTVBaseIE):
             'ext': 'mp4',
             'title': 'May I Kiss You?',
             'language': 'Hindi',
-            'thumbnail': r're:^https?://.*\.jpg$',
+            'thumbnail': r're:^https?://.*\.(?:jpg|png)$',
             'description': 'md5:a549bfc747973e04feb707833474e59d',
             'release_timestamp': 1644710400,
             'release_date': '20220213',
@@ -68,7 +71,7 @@ class AmazonMiniTVIE(AmazonMiniTVBaseIE):
             'ext': 'mp4',
             'title': 'Jahaan',
             'language': 'Hindi',
-            'thumbnail': r're:^https?://.*\.jpg',
+            'thumbnail': r're:^https?://.*\.(?:jpg|png)',
             'description': 'md5:05eb765a77bf703f322f120ec6867339',
             'release_timestamp': 1647475200,
             'release_date': '20220317',
diff --git a/plugins/youtube_download/yt_dlp/extractor/amcnetworks.py b/plugins/youtube_download/yt_dlp/extractor/amcnetworks.py
index c58bc7b..15a86e2 100644
--- a/plugins/youtube_download/yt_dlp/extractor/amcnetworks.py
+++ b/plugins/youtube_download/yt_dlp/extractor/amcnetworks.py
@@ -26,6 +26,7 @@ class AMCNetworksIE(ThePlatformIE):  # XXX: Do not subclass from concrete IE
             # m3u8 download
             'skip_download': True,
         },
+        'skip': '404 Not Found',
     }, {
         'url': 'http://www.bbcamerica.com/shows/the-hunt/full-episodes/season-1/episode-01-the-hardest-challenge',
         'only_matching': True,
@@ -63,8 +64,8 @@ class AMCNetworksIE(ThePlatformIE):  # XXX: Do not subclass from concrete IE
         site, display_id = self._match_valid_url(url).groups()
         requestor_id = self._REQUESTOR_ID_MAP[site]
         page_data = self._download_json(
-            'https://content-delivery-gw.svc.ds.amcn.com/api/v2/content/amcn/%s/url/%s'
-            % (requestor_id.lower(), display_id), display_id)['data']
+            f'https://content-delivery-gw.svc.ds.amcn.com/api/v2/content/amcn/{requestor_id.lower()}/url/{display_id}',
+            display_id)['data']
         properties = page_data.get('properties') or {}
         query = {
             'mbr': 'true',
@@ -75,15 +76,15 @@ class AMCNetworksIE(ThePlatformIE):  # XXX: Do not subclass from concrete IE
         try:
             for v in page_data['children']:
                 if v.get('type') == 'video-player':
-                    releasePid = v['properties']['currentVideo']['meta']['releasePid']
-                    tp_path = 'M_UwQC/' + releasePid
+                    release_pid = v['properties']['currentVideo']['meta']['releasePid']
+                    tp_path = 'M_UwQC/' + release_pid
                     media_url = 'https://link.theplatform.com/s/' + tp_path
                     video_player_count += 1
         except KeyError:
             pass
         if video_player_count > 1:
             self.report_warning(
-                'The JSON data has %d video players. Only one will be extracted' % video_player_count)
+                f'The JSON data has {video_player_count} video players. Only one will be extracted')
 
         # Fall back to videoPid if releasePid not found.
         # TODO: Fall back to videoPid if releasePid manifest uses DRM.
@@ -130,7 +131,7 @@ class AMCNetworksIE(ThePlatformIE):  # XXX: Do not subclass from concrete IE
         })
         ns_keys = theplatform_metadata.get('$xmlns', {}).keys()
         if ns_keys:
-            ns = list(ns_keys)[0]
+            ns = next(iter(ns_keys))
             episode = theplatform_metadata.get(ns + '$episodeTitle') or None
             episode_number = int_or_none(
                 theplatform_metadata.get(ns + '$episode'))
diff --git a/plugins/youtube_download/yt_dlp/extractor/americastestkitchen.py b/plugins/youtube_download/yt_dlp/extractor/americastestkitchen.py
index e889458..a6337e4 100644
--- a/plugins/youtube_download/yt_dlp/extractor/americastestkitchen.py
+++ b/plugins/youtube_download/yt_dlp/extractor/americastestkitchen.py
@@ -87,13 +87,13 @@ class AmericasTestKitchenIE(InfoExtractor):
             resource_type = 'episodes'
 
         resource = self._download_json(
-            'https://www.americastestkitchen.com/api/v6/%s/%s' % (resource_type, video_id), video_id)
+            f'https://www.americastestkitchen.com/api/v6/{resource_type}/{video_id}', video_id)
         video = resource['video'] if is_episode else resource
         episode = resource if is_episode else resource.get('episode') or {}
 
         return {
             '_type': 'url_transparent',
-            'url': 'https://player.zype.com/embed/%s.js?api_key=jZ9GUhRmxcPvX7M3SlfejB6Hle9jyHTdk2jVxG7wOHPLODgncEKVdPYBhuz9iWXQ' % video['zypeId'],
+            'url': 'https://player.zype.com/embed/{}.js?api_key=jZ9GUhRmxcPvX7M3SlfejB6Hle9jyHTdk2jVxG7wOHPLODgncEKVdPYBhuz9iWXQ'.format(video['zypeId']),
             'ie_key': 'Zype',
             'description': clean_html(video.get('description')),
             'timestamp': unified_timestamp(video.get('publishDate')),
@@ -174,22 +174,22 @@ class AmericasTestKitchenSeasonIE(InfoExtractor):
         ]
 
         if season_number:
-            playlist_id = 'season_%d' % season_number
-            playlist_title = 'Season %d' % season_number
+            playlist_id = f'season_{season_number}'
+            playlist_title = f'Season {season_number}'
             facet_filters.append('search_season_list:' + playlist_title)
         else:
             playlist_id = show
             playlist_title = title
 
         season_search = self._download_json(
-            'https://y1fnzxui30-dsn.algolia.net/1/indexes/everest_search_%s_season_desc_production' % slug,
+            f'https://y1fnzxui30-dsn.algolia.net/1/indexes/everest_search_{slug}_season_desc_production',
             playlist_id, headers={
                 'Origin': 'https://www.americastestkitchen.com',
                 'X-Algolia-API-Key': '8d504d0099ed27c1b73708d22871d805',
                 'X-Algolia-Application-Id': 'Y1FNZXUI30',
             }, query={
                 'facetFilters': json.dumps(facet_filters),
-                'attributesToRetrieve': 'description,search_%s_episode_number,search_document_date,search_url,title,search_atk_episode_season' % slug,
+                'attributesToRetrieve': f'description,search_{slug}_episode_number,search_document_date,search_url,title,search_atk_episode_season',
                 'attributesToHighlight': '',
                 'hitsPerPage': 1000,
             })
@@ -207,7 +207,7 @@ class AmericasTestKitchenSeasonIE(InfoExtractor):
                     'description': episode.get('description'),
                     'timestamp': unified_timestamp(episode.get('search_document_date')),
                     'season_number': season_number,
-                    'episode_number': int_or_none(episode.get('search_%s_episode_number' % slug)),
+                    'episode_number': int_or_none(episode.get(f'search_{slug}_episode_number')),
                     'ie_key': AmericasTestKitchenIE.ie_key(),
                 }
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/amp.py b/plugins/youtube_download/yt_dlp/extractor/amp.py
index 0d259c5..adf4733 100644
--- a/plugins/youtube_download/yt_dlp/extractor/amp.py
+++ b/plugins/youtube_download/yt_dlp/extractor/amp.py
@@ -1,7 +1,7 @@
 from .common import InfoExtractor
 from ..utils import (
-    determine_ext,
     ExtractorError,
+    determine_ext,
     int_or_none,
     mimetype2ext,
     parse_iso8601,
@@ -19,12 +19,12 @@ class AMPIE(InfoExtractor):  # XXX: Conventionally, base classes should end with
             'Unable to download Akamai AMP feed', transform_source=strip_jsonp)
         item = feed.get('channel', {}).get('item')
         if not item:
-            raise ExtractorError('%s said: %s' % (self.IE_NAME, feed['error']))
+            raise ExtractorError('{} said: {}'.format(self.IE_NAME, feed['error']))
 
         video_id = item['guid']
 
         def get_media_node(name, default=None):
-            media_name = 'media-%s' % name
+            media_name = f'media-{name}'
             media_group = item.get('media-group') or item
             return media_group.get(media_name) or item.get(media_name) or item.get(name, default)
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/anchorfm.py b/plugins/youtube_download/yt_dlp/extractor/anchorfm.py
index 52f2ad0..652154a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/anchorfm.py
+++ b/plugins/youtube_download/yt_dlp/extractor/anchorfm.py
@@ -5,7 +5,7 @@ from ..utils import (
     int_or_none,
     str_or_none,
     traverse_obj,
-    unified_timestamp
+    unified_timestamp,
 )
 
 
@@ -29,7 +29,7 @@ class AnchorFMEpisodeIE(InfoExtractor):
             'release_date': '20230121',
             'release_timestamp': 1674285179,
             'episode_id': 'e1tpt3d',
-        }
+        },
     }, {
         # embed url
         'url': 'https://anchor.fm/apakatatempo/embed/episodes/S2E75-Perang-Bintang-di-Balik-Kasus-Ferdy-Sambo-dan-Ismail-Bolong-e1shjqd',
@@ -50,7 +50,7 @@ class AnchorFMEpisodeIE(InfoExtractor):
             'season': 'Season 2',
             'season_number': 2,
             'episode_id': 'e1shjqd',
-        }
+        },
     }]
 
     _WEBPAGE_TESTS = [{
@@ -72,7 +72,7 @@ class AnchorFMEpisodeIE(InfoExtractor):
             'thumbnail': 'https://s3-us-west-2.amazonaws.com/anchor-generated-image-bank/production/podcast_uploaded_episode400/2627805/2627805-1671590688729-4db3882ac9e4b.jpg',
             'uploader': 'Podcast Tempo',
             'channel': 'apakatatempo',
-        }
+        },
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/angel.py b/plugins/youtube_download/yt_dlp/extractor/angel.py
index 306b365..6800fe3 100644
--- a/plugins/youtube_download/yt_dlp/extractor/angel.py
+++ b/plugins/youtube_download/yt_dlp/extractor/angel.py
@@ -1,7 +1,7 @@
 import re
 
 from .common import InfoExtractor
-from ..utils import url_or_none, merge_dicts
+from ..utils import merge_dicts, url_or_none
 
 
 class AngelIE(InfoExtractor):
@@ -15,8 +15,8 @@ class AngelIE(InfoExtractor):
             'title': 'Tuttle Twins Season 1, Episode 1: When Laws Give You Lemons',
             'description': 'md5:73b704897c20ab59c433a9c0a8202d5e',
             'thumbnail': r're:^https?://images.angelstudios.com/image/upload/angel-app/.*$',
-            'duration': 1359.0
-        }
+            'duration': 1359.0,
+        },
     }, {
         'url': 'https://www.angel.com/watch/the-chosen/episode/8dfb714d-bca5-4812-8125-24fb9514cd10/season-1/episode-1/i-have-called-you-by-name',
         'md5': 'e4774bad0a5f0ad2e90d175cafdb797d',
@@ -26,8 +26,8 @@ class AngelIE(InfoExtractor):
             'title': 'The Chosen Season 1, Episode 1: I Have Called You By Name',
             'description': 'md5:aadfb4827a94415de5ff6426e6dee3be',
             'thumbnail': r're:^https?://images.angelstudios.com/image/upload/angel-app/.*$',
-            'duration': 3276.0
-        }
+            'duration': 3276.0,
+        },
     }]
 
     def _real_extract(self, url):
@@ -44,7 +44,7 @@ class AngelIE(InfoExtractor):
             'title': self._og_search_title(webpage),
             'description': self._og_search_description(webpage),
             'formats': formats,
-            'subtitles': subtitles
+            'subtitles': subtitles,
         }
 
         # Angel uses cloudinary in the background and supports image transformations.
diff --git a/plugins/youtube_download/yt_dlp/extractor/ant1newsgr.py b/plugins/youtube_download/yt_dlp/extractor/antenna.py
similarity index 67%
rename from plugins/youtube_download/yt_dlp/extractor/ant1newsgr.py
rename to plugins/youtube_download/yt_dlp/extractor/antenna.py
index 217e3ac..b1a0179 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ant1newsgr.py
+++ b/plugins/youtube_download/yt_dlp/extractor/antenna.py
@@ -5,22 +5,26 @@ from ..networking import HEADRequest
 from ..utils import (
     ExtractorError,
     determine_ext,
+    make_archive_id,
     scale_thumbnails_to_max_format_width,
 )
 
 
-class Ant1NewsGrBaseIE(InfoExtractor):
+class AntennaBaseIE(InfoExtractor):
     def _download_and_extract_api_data(self, video_id, netloc, cid=None):
-        url = f'{self.http_scheme()}//{netloc}{self._API_PATH}'
-        info = self._download_json(url, video_id, query={'cid': cid or video_id})
-        try:
-            source = info['url']
-        except KeyError:
-            raise ExtractorError('no source found for %s' % video_id)
-        formats, subs = (self._extract_m3u8_formats_and_subtitles(source, video_id, 'mp4')
-                         if determine_ext(source) == 'm3u8' else ([{'url': source}], {}))
+        info = self._download_json(f'{self.http_scheme()}//{netloc}{self._API_PATH}',
+                                   video_id, query={'cid': cid or video_id})
+        if not info.get('url'):
+            raise ExtractorError(f'No source found for {video_id}')
+
+        ext = determine_ext(info['url'])
+        if ext == 'm3u8':
+            formats, subs = self._extract_m3u8_formats_and_subtitles(info['url'], video_id, 'mp4')
+        else:
+            formats, subs = [{'url': info['url'], 'format_id': ext}], {}
+
         thumbnails = scale_thumbnails_to_max_format_width(
-            formats, [{'url': info['thumb']}], r'(?<=/imgHandler/)\d+')
+            formats, [{'url': info['thumb']}], r'(?<=/imgHandler/)\d+') if info.get('thumb') else []
         return {
             'id': video_id,
             'title': info.get('title'),
@@ -30,21 +34,31 @@ class Ant1NewsGrBaseIE(InfoExtractor):
         }
 
 
-class Ant1NewsGrWatchIE(Ant1NewsGrBaseIE):
-    IE_NAME = 'ant1newsgr:watch'
-    IE_DESC = 'ant1news.gr videos'
-    _VALID_URL = r'https?://(?P<netloc>(?:www\.)?ant1news\.gr)/watch/(?P<id>\d+)/'
+class AntennaGrWatchIE(AntennaBaseIE):
+    IE_NAME = 'antenna:watch'
+    IE_DESC = 'antenna.gr and ant1news.gr videos'
+    _VALID_URL = r'https?://(?P<netloc>(?:www\.)?(?:antenna|ant1news)\.gr)/watch/(?P<id>\d+)/'
     _API_PATH = '/templates/data/player'
 
     _TESTS = [{
         'url': 'https://www.ant1news.gr/watch/1506168/ant1-news-09112021-stis-18-45',
-        'md5': '95925e6b32106754235f2417e0d2dfab',
+        'md5': 'c472d9dd7cd233c63aff2ea42201cda6',
         'info_dict': {
             'id': '1506168',
             'ext': 'mp4',
             'title': 'md5:0ad00fa66ecf8aa233d26ab0dba7514a',
             'description': 'md5:18665af715a6dcfeac1d6153a44f16b0',
-            'thumbnail': 'https://ant1media.azureedge.net/imgHandler/640/26d46bf6-8158-4f02-b197-7096c714b2de.jpg',
+            'thumbnail': r're:https://ant1media\.azureedge\.net/imgHandler/\d+/26d46bf6-8158-4f02-b197-7096c714b2de\.jpg',
+        },
+    }, {
+        'url': 'https://www.antenna.gr/watch/1643812/oi-prodotes-epeisodio-01',
+        'md5': '8f6f7dd3b1dba4d835ba990e25f31243',
+        'info_dict': {
+            'id': '1643812',
+            'ext': 'mp4',
+            'format_id': 'mp4',
+            'title': 'ΟΙ ΠΡΟΔΟΤΕΣ – ΕΠΕΙΣΟΔΙΟ 01',
+            'thumbnail': r're:https://ant1media\.azureedge\.net/imgHandler/\d+/b3d63096-e72d-43c4-87a0-00d4363d242f\.jpg',
         },
     }]
 
@@ -52,25 +66,26 @@ class Ant1NewsGrWatchIE(Ant1NewsGrBaseIE):
         video_id, netloc = self._match_valid_url(url).group('id', 'netloc')
         webpage = self._download_webpage(url, video_id)
         info = self._download_and_extract_api_data(video_id, netloc)
-        info['description'] = self._og_search_description(webpage)
+        info['description'] = self._og_search_description(webpage, default=None)
+        info['_old_archive_ids'] = [make_archive_id('Ant1NewsGrWatch', video_id)]
         return info
 
 
-class Ant1NewsGrArticleIE(Ant1NewsGrBaseIE):
+class Ant1NewsGrArticleIE(AntennaBaseIE):
     IE_NAME = 'ant1newsgr:article'
     IE_DESC = 'ant1news.gr articles'
     _VALID_URL = r'https?://(?:www\.)?ant1news\.gr/[^/]+/article/(?P<id>\d+)/'
 
     _TESTS = [{
         'url': 'https://www.ant1news.gr/afieromata/article/549468/o-tzeims-mpont-sta-meteora-oi-apeiles-kai-o-xesikomos-ton-kalogeron',
-        'md5': '294f18331bb516539d72d85a82887dcc',
+        'md5': '57eb8d12181f0fa2b14b0b138e1de9b6',
         'info_dict': {
             'id': '_xvg/m_cmbatw=',
             'ext': 'mp4',
             'title': 'md5:a93e8ecf2e4073bfdffcb38f59945411',
-            'timestamp': 1603092840,
-            'upload_date': '20201019',
-            'thumbnail': 'https://ant1media.azureedge.net/imgHandler/640/756206d2-d640-40e2-b201-3555abdfc0db.jpg',
+            'timestamp': 1666166520,
+            'upload_date': '20221019',
+            'thumbnail': 'https://ant1media.azureedge.net/imgHandler/1920/756206d2-d640-40e2-b201-3555abdfc0db.jpg',
         },
     }, {
         'url': 'https://ant1news.gr/Society/article/620286/symmoria-anilikon-dikigoros-thymaton-ithelan-na-toys-apoteleiosoyn',
@@ -90,19 +105,19 @@ class Ant1NewsGrArticleIE(Ant1NewsGrBaseIE):
         info = self._search_json_ld(webpage, video_id, expected_type='NewsArticle')
         embed_urls = list(Ant1NewsGrEmbedIE._extract_embed_urls(url, webpage))
         if not embed_urls:
-            raise ExtractorError('no videos found for %s' % video_id, expected=True)
+            raise ExtractorError(f'no videos found for {video_id}', expected=True)
         return self.playlist_from_matches(
             embed_urls, video_id, info.get('title'), ie=Ant1NewsGrEmbedIE.ie_key(),
             video_kwargs={'url_transparent': True, 'timestamp': info.get('timestamp')})
 
 
-class Ant1NewsGrEmbedIE(Ant1NewsGrBaseIE):
+class Ant1NewsGrEmbedIE(AntennaBaseIE):
     IE_NAME = 'ant1newsgr:embed'
     IE_DESC = 'ant1news.gr embedded videos'
     _BASE_PLAYER_URL_RE = r'(?:https?:)?//(?:[a-zA-Z0-9\-]+\.)?(?:antenna|ant1news)\.gr/templates/pages/player'
     _VALID_URL = rf'{_BASE_PLAYER_URL_RE}\?([^#]+&)?cid=(?P<id>[^#&]+)'
     _EMBED_REGEX = [rf'<iframe[^>]+?src=(?P<_q1>["\'])(?P<url>{_BASE_PLAYER_URL_RE}\?(?:(?!(?P=_q1)).)+)(?P=_q1)']
-    _API_PATH = '/news/templates/data/jsonPlayer'
+    _API_PATH = '/templates/data/jsonPlayer'
 
     _TESTS = [{
         'url': 'https://www.antenna.gr/templates/pages/player?cid=3f_li_c_az_jw_y_u=&w=670&h=377',
diff --git a/plugins/youtube_download/yt_dlp/extractor/anvato.py b/plugins/youtube_download/yt_dlp/extractor/anvato.py
index 0df5033..bd3b19b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/anvato.py
+++ b/plugins/youtube_download/yt_dlp/extractor/anvato.py
@@ -8,10 +8,8 @@ import time
 from .common import InfoExtractor
 from ..aes import aes_encrypt
 from ..utils import (
-    bytes_to_intlist,
     determine_ext,
     int_or_none,
-    intlist_to_bytes,
     join_nonempty,
     smuggle_url,
     strip_jsonp,
@@ -33,24 +31,6 @@ class AnvatoIE(InfoExtractor):
     _AUTH_KEY = b'\x31\xc2\x42\x84\x9e\x73\xa0\xce'  # from anvplayer.min.js
 
     _TESTS = [{
-        # from https://www.nfl.com/videos/baker-mayfield-s-game-changing-plays-from-3-td-game-week-14
-        'url': 'anvato:GXvEgwyJeWem8KCYXfeoHWknwP48Mboj:899441',
-        'md5': '921919dab3cd0b849ff3d624831ae3e2',
-        'info_dict': {
-            'id': '899441',
-            'ext': 'mp4',
-            'title': 'Baker Mayfield\'s game-changing plays from 3-TD game Week 14',
-            'description': 'md5:85e05a3cc163f8c344340f220521136d',
-            'upload_date': '20201215',
-            'timestamp': 1608009755,
-            'thumbnail': r're:^https?://.*\.jpg',
-            'uploader': 'NFL',
-            'tags': ['Baltimore Ravens at Cleveland Browns (2020-REG-14)', 'Baker Mayfield', 'Game Highlights',
-                     'Player Highlights', 'Cleveland Browns', 'league'],
-            'duration': 157,
-            'categories': ['Entertainment', 'Game', 'Highlights'],
-        },
-    }, {
         # from https://ktla.com/news/99-year-old-woman-learns-to-fly-in-torrance-checks-off-bucket-list-dream/
         'url': 'anvato:X8POa4zpGZMmeiq0wqiO8IP5rMqQM9VN:8032455',
         'md5': '837718bcfb3a7778d022f857f7a9b19e',
@@ -238,32 +218,7 @@ class AnvatoIE(InfoExtractor):
         'gray': 'anvato_mcp_gray_web_prod_4c10f067c393ed8fc453d3930f8ab2b159973900',
         'hearst': 'anvato_mcp_hearst_web_prod_5356c3de0fc7c90a3727b4863ca7fec3a4524a99',
         'cbs': 'anvato_mcp_cbs_web_prod_02f26581ff80e5bda7aad28226a8d369037f2cbe',
-        'telemundo': 'anvato_mcp_telemundo_web_prod_c5278d51ad46fda4b6ca3d0ea44a7846a054f582'
-    }
-
-    def _generate_nfl_token(self, anvack, mcp_id):
-        reroute = self._download_json(
-            'https://api.nfl.com/v1/reroute', mcp_id, data=b'grant_type=client_credentials',
-            headers={'X-Domain-Id': 100}, note='Fetching token info')
-        token_type = reroute.get('token_type') or 'Bearer'
-        auth_token = f'{token_type} {reroute["access_token"]}'
-        response = self._download_json(
-            'https://api.nfl.com/v3/shield/', mcp_id, data=json.dumps({
-                'query': '''{
-  viewer {
-    mediaToken(anvack: "%s", id: %s) {
-      token
-    }
-  }
-}''' % (anvack, mcp_id),
-            }).encode(), headers={
-                'Authorization': auth_token,
-                'Content-Type': 'application/json',
-            }, note='Fetching NFL API token')
-        return traverse_obj(response, ('data', 'viewer', 'mediaToken', 'token'))
-
-    _TOKEN_GENERATORS = {
-        'GXvEgwyJeWem8KCYXfeoHWknwP48Mboj': _generate_nfl_token,
+        'telemundo': 'anvato_mcp_telemundo_web_prod_c5278d51ad46fda4b6ca3d0ea44a7846a054f582',
     }
 
     def _server_time(self, access_key, video_id):
@@ -277,8 +232,8 @@ class AnvatoIE(InfoExtractor):
         server_time = self._server_time(access_key, video_id)
         input_data = f'{server_time}~{md5_text(video_data_url)}~{md5_text(server_time)}'
 
-        auth_secret = intlist_to_bytes(aes_encrypt(
-            bytes_to_intlist(input_data[:64]), bytes_to_intlist(self._AUTH_KEY)))
+        auth_secret = bytes(aes_encrypt(
+            list(input_data[:64].encode()), list(self._AUTH_KEY)))
         query = {
             'X-Anvato-Adst-Auth': base64.b64encode(auth_secret).decode('ascii'),
             'rtyp': 'fp',
@@ -290,8 +245,6 @@ class AnvatoIE(InfoExtractor):
         }
         if extracted_token is not None:
             api['anvstk2'] = extracted_token
-        elif self._TOKEN_GENERATORS.get(access_key) is not None:
-            api['anvstk2'] = self._TOKEN_GENERATORS[access_key](self, access_key, video_id)
         elif self._ANVACK_TABLE.get(access_key) is not None:
             api['anvstk'] = md5_text(f'{access_key}|{anvrid}|{server_time}|{self._ANVACK_TABLE[access_key]}')
         else:
@@ -299,7 +252,7 @@ class AnvatoIE(InfoExtractor):
 
         return self._download_json(
             video_data_url, video_id, transform_source=strip_jsonp, query=query,
-            data=json.dumps({'api': api}, separators=(',', ':')).encode('utf-8'))
+            data=json.dumps({'api': api}, separators=(',', ':')).encode())
 
     def _get_anvato_videos(self, access_key, video_id, token):
         video_data = self._get_video_json(access_key, video_id, token)
@@ -358,7 +311,7 @@ class AnvatoIE(InfoExtractor):
         for caption in video_data.get('captions', []):
             a_caption = {
                 'url': caption['url'],
-                'ext': 'tt' if caption.get('format') == 'SMPTE-TT' else None
+                'ext': 'tt' if caption.get('format') == 'SMPTE-TT' else None,
             }
             subtitles.setdefault(caption['language'], []).append(a_caption)
         subtitles = self._merge_subtitles(subtitles, hls_subs, vtt_subs)
diff --git a/plugins/youtube_download/yt_dlp/extractor/aol.py b/plugins/youtube_download/yt_dlp/extractor/aol.py
index 6949ca9..893dce7 100644
--- a/plugins/youtube_download/yt_dlp/extractor/aol.py
+++ b/plugins/youtube_download/yt_dlp/extractor/aol.py
@@ -10,6 +10,7 @@ from ..utils import (
 
 
 class AolIE(YahooIE):  # XXX: Do not subclass from concrete IE
+    _WORKING = False
     IE_NAME = 'aol.com'
     _VALID_URL = r'(?:aol-video:|https?://(?:www\.)?aol\.(?:com|ca|co\.uk|de|jp)/video/(?:[^/]+/)*)(?P<id>\d{9}|[0-9a-f]{24}|[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12})'
 
@@ -29,7 +30,7 @@ class AolIE(YahooIE):  # XXX: Do not subclass from concrete IE
         'params': {
             # m3u8 download
             'skip_download': True,
-        }
+        },
     }, {
         # video with vidible ID
         'url': 'https://www.aol.com/video/view/netflix-is-raising-rates/5707d6b8e4b090497b04f706/',
@@ -45,7 +46,7 @@ class AolIE(YahooIE):  # XXX: Do not subclass from concrete IE
         'params': {
             # m3u8 download
             'skip_download': True,
-        }
+        },
     }, {
         'url': 'https://www.aol.com/video/view/park-bench-season-2-trailer/559a1b9be4b0c3bfad3357a7/',
         'only_matching': True,
@@ -82,10 +83,10 @@ class AolIE(YahooIE):  # XXX: Do not subclass from concrete IE
             return self._extract_yahoo_video(video_id, 'us')
 
         response = self._download_json(
-            'https://feedapi.b2c.on.aol.com/v1.0/app/videos/aolon/%s/details' % video_id,
+            f'https://feedapi.b2c.on.aol.com/v1.0/app/videos/aolon/{video_id}/details',
             video_id)['response']
         if response['statusText'] != 'Ok':
-            raise ExtractorError('%s said: %s' % (self.IE_NAME, response['statusText']), expected=True)
+            raise ExtractorError('{} said: {}'.format(self.IE_NAME, response['statusText']), expected=True)
 
         video_data = response['data']
         formats = []
diff --git a/plugins/youtube_download/yt_dlp/extractor/apa.py b/plugins/youtube_download/yt_dlp/extractor/apa.py
index 1ea0b1d..fed5970 100644
--- a/plugins/youtube_download/yt_dlp/extractor/apa.py
+++ b/plugins/youtube_download/yt_dlp/extractor/apa.py
@@ -34,7 +34,7 @@ class APAIE(InfoExtractor):
         video_id, base_url = mobj.group('id', 'base_url')
 
         webpage = self._download_webpage(
-            '%s/player/%s' % (base_url, video_id), video_id)
+            f'{base_url}/player/{video_id}', video_id)
 
         jwplatform_id = self._search_regex(
             r'media[iI]d\s*:\s*["\'](?P<id>[a-zA-Z0-9]{8})', webpage,
@@ -47,7 +47,7 @@ class APAIE(InfoExtractor):
 
         def extract(field, name=None):
             return self._search_regex(
-                r'\b%s["\']\s*:\s*(["\'])(?P<value>(?:(?!\1).)+)\1' % field,
+                rf'\b{field}["\']\s*:\s*(["\'])(?P<value>(?:(?!\1).)+)\1',
                 webpage, name or field, default=None, group='value')
 
         title = extract('title') or video_id
diff --git a/plugins/youtube_download/yt_dlp/extractor/appleconnect.py b/plugins/youtube_download/yt_dlp/extractor/appleconnect.py
index d00b0f9..433eb4e 100644
--- a/plugins/youtube_download/yt_dlp/extractor/appleconnect.py
+++ b/plugins/youtube_download/yt_dlp/extractor/appleconnect.py
@@ -1,8 +1,5 @@
 from .common import InfoExtractor
-from ..utils import (
-    str_to_int,
-    ExtractorError
-)
+from ..utils import ExtractorError, str_to_int
 
 
 class AppleConnectIE(InfoExtractor):
diff --git a/plugins/youtube_download/yt_dlp/extractor/applepodcasts.py b/plugins/youtube_download/yt_dlp/extractor/applepodcasts.py
index 49bbeab..b99d24e 100644
--- a/plugins/youtube_download/yt_dlp/extractor/applepodcasts.py
+++ b/plugins/youtube_download/yt_dlp/extractor/applepodcasts.py
@@ -1,30 +1,45 @@
 from .common import InfoExtractor
 from ..utils import (
-    clean_html,
     clean_podcast_url,
-    get_element_by_class,
     int_or_none,
     parse_iso8601,
-    try_get,
 )
+from ..utils.traversal import traverse_obj
 
 
 class ApplePodcastsIE(InfoExtractor):
     _VALID_URL = r'https?://podcasts\.apple\.com/(?:[^/]+/)?podcast(?:/[^/]+){1,2}.*?\bi=(?P<id>\d+)'
     _TESTS = [{
+        'url': 'https://podcasts.apple.com/us/podcast/ferreck-dawn-to-the-break-of-dawn-117/id1625658232?i=1000665010654',
+        'md5': '82cc219b8cc1dcf8bfc5a5e99b23b172',
+        'info_dict': {
+            'id': '1000665010654',
+            'ext': 'mp3',
+            'title': 'Ferreck Dawn - To The Break of Dawn 117',
+            'episode': 'Ferreck Dawn - To The Break of Dawn 117',
+            'description': 'md5:1fc571102f79dbd0a77bfd71ffda23bc',
+            'upload_date': '20240812',
+            'timestamp': 1723449600,
+            'duration': 3596,
+            'series': 'Ferreck Dawn - To The Break of Dawn',
+            'thumbnail': 're:.+[.](png|jpe?g|webp)',
+        },
+    }, {
         'url': 'https://podcasts.apple.com/us/podcast/207-whitney-webb-returns/id1135137367?i=1000482637777',
-        'md5': '41dc31cd650143e530d9423b6b5a344f',
+        'md5': 'baf8a6b8b8aa6062dbb4639ed73d0052',
         'info_dict': {
             'id': '1000482637777',
             'ext': 'mp3',
             'title': '207 - Whitney Webb Returns',
+            'episode': '207 - Whitney Webb Returns',
+            'episode_number': 207,
             'description': 'md5:75ef4316031df7b41ced4e7b987f79c6',
             'upload_date': '20200705',
             'timestamp': 1593932400,
-            'duration': 6454,
+            'duration': 5369,
             'series': 'The Tim Dillon Show',
             'thumbnail': 're:.+[.](png|jpe?g|webp)',
-        }
+        },
     }, {
         'url': 'https://podcasts.apple.com/podcast/207-whitney-webb-returns/id1135137367?i=1000482637777',
         'only_matching': True,
@@ -39,47 +54,24 @@ class ApplePodcastsIE(InfoExtractor):
     def _real_extract(self, url):
         episode_id = self._match_id(url)
         webpage = self._download_webpage(url, episode_id)
-        episode_data = {}
-        ember_data = {}
-        # new page type 2021-11
-        amp_data = self._parse_json(self._search_regex(
-            r'(?s)id="shoebox-media-api-cache-amp-podcasts"[^>]*>\s*({.+?})\s*<',
-            webpage, 'AMP data', default='{}'), episode_id, fatal=False) or {}
-        amp_data = try_get(amp_data,
-                           lambda a: self._parse_json(
-                               next(a[x] for x in iter(a) if episode_id in x),
-                               episode_id),
-                           dict) or {}
-        amp_data = amp_data.get('d') or []
-        episode_data = try_get(
-            amp_data,
-            lambda a: next(x for x in a
-                           if x['type'] == 'podcast-episodes' and x['id'] == episode_id),
-            dict)
-        if not episode_data:
-            # try pre 2021-11 page type: TODO: consider deleting if no longer used
-            ember_data = self._parse_json(self._search_regex(
-                r'(?s)id="shoebox-ember-data-store"[^>]*>\s*({.+?})\s*<',
-                webpage, 'ember data'), episode_id) or {}
-            ember_data = ember_data.get(episode_id) or ember_data
-            episode_data = try_get(ember_data, lambda x: x['data'], dict)
-        episode = episode_data['attributes']
-        description = episode.get('description') or {}
-
-        series = None
-        for inc in (amp_data or ember_data.get('included') or []):
-            if inc.get('type') == 'media/podcast':
-                series = try_get(inc, lambda x: x['attributes']['name'])
-        series = series or clean_html(get_element_by_class('podcast-header__identity', webpage))
+        server_data = self._search_json(
+            r'<script [^>]*\bid=["\']serialized-server-data["\'][^>]*>', webpage,
+            'server data', episode_id, contains_pattern=r'\[{(?s:.+)}\]')[0]['data']
+        model_data = traverse_obj(server_data, (
+            'headerButtonItems', lambda _, v: v['$kind'] == 'bookmark' and v['modelType'] == 'EpisodeOffer',
+            'model', {dict}, any))
 
         return {
             'id': episode_id,
-            'title': episode.get('name'),
-            'url': clean_podcast_url(episode['assetUrl']),
-            'description': description.get('standard') or description.get('short'),
-            'timestamp': parse_iso8601(episode.get('releaseDateTime')),
-            'duration': int_or_none(episode.get('durationInMilliseconds'), 1000),
-            'series': series,
+            **self._json_ld(
+                traverse_obj(server_data, ('seoData', 'schemaContent', {dict}))
+                or self._yield_json_ld(webpage, episode_id, fatal=False), episode_id, fatal=False),
+            **traverse_obj(model_data, {
+                'title': ('title', {str}),
+                'url': ('streamUrl', {clean_podcast_url}),
+                'timestamp': ('releaseDate', {parse_iso8601}),
+                'duration': ('duration', {int_or_none}),
+            }),
             'thumbnail': self._og_search_thumbnail(webpage),
             'vcodec': 'none',
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/appletrailers.py b/plugins/youtube_download/yt_dlp/extractor/appletrailers.py
index 2e0b0a8..0a600f6 100644
--- a/plugins/youtube_download/yt_dlp/extractor/appletrailers.py
+++ b/plugins/youtube_download/yt_dlp/extractor/appletrailers.py
@@ -1,8 +1,8 @@
-import re
 import json
+import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import compat_urlparse
 from ..utils import (
     int_or_none,
     parse_duration,
@@ -64,7 +64,7 @@ class AppleTrailersIE(InfoExtractor):
                     'uploader_id': 'wb',
                 },
             },
-        ]
+        ],
     }, {
         'url': 'http://trailers.apple.com/trailers/magnolia/blackthorn/',
         'info_dict': {
@@ -99,7 +99,7 @@ class AppleTrailersIE(InfoExtractor):
         webpage = self._download_webpage(url, movie)
         film_id = self._search_regex(r"FilmId\s*=\s*'(\d+)'", webpage, 'film id')
         film_data = self._download_json(
-            'http://trailers.apple.com/trailers/feeds/data/%s.json' % film_id,
+            f'http://trailers.apple.com/trailers/feeds/data/{film_id}.json',
             film_id, fatal=False)
 
         if film_data:
@@ -114,7 +114,7 @@ class AppleTrailersIE(InfoExtractor):
                         if not src:
                             continue
                         formats.append({
-                            'format_id': '%s-%s' % (version, size),
+                            'format_id': f'{version}-{size}',
                             'url': re.sub(r'_(\d+p\.mov)', r'_h\1', src),
                             'width': int_or_none(size_data.get('width')),
                             'height': int_or_none(size_data.get('height')),
@@ -134,7 +134,7 @@ class AppleTrailersIE(InfoExtractor):
             page_data = film_data.get('page', {})
             return self.playlist_result(entries, film_id, page_data.get('movie_title'))
 
-        playlist_url = compat_urlparse.urljoin(url, 'includes/playlists/itunes.inc')
+        playlist_url = urllib.parse.urljoin(url, 'includes/playlists/itunes.inc')
 
         def fix_html(s):
             s = re.sub(r'(?s)<script[^<]*?>.*?</script>', '', s)
@@ -143,10 +143,9 @@ class AppleTrailersIE(InfoExtractor):
             # like: http://trailers.apple.com/trailers/wb/gravity/
 
             def _clean_json(m):
-                return 'iTunes.playURL(%s);' % m.group(1).replace('\'', '&#39;')
+                return 'iTunes.playURL({});'.format(m.group(1).replace('\'', '&#39;'))
             s = re.sub(self._JSON_RE, _clean_json, s)
-            s = '<html>%s</html>' % s
-            return s
+            return f'<html>{s}</html>'
         doc = self._download_xml(playlist_url, movie, transform_source=fix_html)
 
         playlist = []
@@ -170,18 +169,18 @@ class AppleTrailersIE(InfoExtractor):
                 duration = 60 * int(m.group('minutes')) + int(m.group('seconds'))
 
             trailer_id = first_url.split('/')[-1].rpartition('_')[0].lower()
-            settings_json_url = compat_urlparse.urljoin(url, 'includes/settings/%s.json' % trailer_id)
+            settings_json_url = urllib.parse.urljoin(url, f'includes/settings/{trailer_id}.json')
             settings = self._download_json(settings_json_url, trailer_id, 'Downloading settings json')
 
             formats = []
-            for format in settings['metadata']['sizes']:
+            for fmt in settings['metadata']['sizes']:
                 # The src is a file pointing to the real video file
-                format_url = re.sub(r'_(\d*p\.mov)', r'_h\1', format['src'])
+                format_url = re.sub(r'_(\d*p\.mov)', r'_h\1', fmt['src'])
                 formats.append({
                     'url': format_url,
-                    'format': format['type'],
-                    'width': int_or_none(format['width']),
-                    'height': int_or_none(format['height']),
+                    'format': fmt['type'],
+                    'width': int_or_none(fmt['width']),
+                    'height': int_or_none(fmt['height']),
                 })
 
             playlist.append({
@@ -229,7 +228,7 @@ class AppleTrailersSectionIE(InfoExtractor):
             'title': 'Movie Studios',
         },
     }
-    _VALID_URL = r'https?://(?:www\.)?trailers\.apple\.com/#section=(?P<id>%s)' % '|'.join(_SECTIONS)
+    _VALID_URL = r'https?://(?:www\.)?trailers\.apple\.com/#section=(?P<id>{})'.format('|'.join(_SECTIONS))
     _TESTS = [{
         'url': 'http://trailers.apple.com/#section=justadded',
         'info_dict': {
@@ -270,7 +269,7 @@ class AppleTrailersSectionIE(InfoExtractor):
     def _real_extract(self, url):
         section = self._match_id(url)
         section_data = self._download_json(
-            'http://trailers.apple.com/trailers/home/feeds/%s.json' % self._SECTIONS[section]['feed_path'],
+            'http://trailers.apple.com/trailers/home/feeds/{}.json'.format(self._SECTIONS[section]['feed_path']),
             section)
         entries = [
             self.url_result('http://trailers.apple.com' + e['location'])
diff --git a/plugins/youtube_download/yt_dlp/extractor/archiveorg.py b/plugins/youtube_download/yt_dlp/extractor/archiveorg.py
index 2541cd6..2849d9f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/archiveorg.py
+++ b/plugins/youtube_download/yt_dlp/extractor/archiveorg.py
@@ -1,11 +1,11 @@
+from __future__ import annotations
+
 import json
 import re
 import urllib.parse
 
 from .common import InfoExtractor
-from .naver import NaverBaseIE
 from .youtube import YoutubeBaseInfoExtractor, YoutubeIE
-from ..compat import compat_urllib_parse_unquote
 from ..networking import HEADRequest
 from ..networking.exceptions import HTTPError
 from ..utils import (
@@ -32,6 +32,7 @@ from ..utils import (
     unified_timestamp,
     url_or_none,
     urlhandle_detect_ext,
+    variadic,
 )
 
 
@@ -50,10 +51,9 @@ class ArchiveOrgIE(InfoExtractor):
             'release_date': '19681210',
             'timestamp': 1268695290,
             'upload_date': '20100315',
-            'creator': 'SRI International',
+            'creators': ['SRI International'],
             'uploader': 'laura@archive.org',
             'thumbnail': r're:https://archive\.org/download/.*\.jpg',
-            'release_year': 1968,
             'display_id': 'XD300-23_68HighlightsAResearchCntAugHumanIntellect.cdr',
             'track': 'XD300-23 68HighlightsAResearchCntAugHumanIntellect',
 
@@ -111,7 +111,7 @@ class ArchiveOrgIE(InfoExtractor):
             'title': 'Turning',
             'ext': 'flac',
             'track': 'Turning',
-            'creator': 'Grateful Dead',
+            'creators': ['Grateful Dead'],
             'display_id': 'gd1977-05-08d01t01.flac',
             'track_number': 1,
             'album': '1977-05-08 - Barton Hall - Cornell University',
@@ -131,11 +131,10 @@ class ArchiveOrgIE(InfoExtractor):
             'location': 'Barton Hall - Cornell University',
             'duration': 438.68,
             'track': 'Deal',
-            'creator': 'Grateful Dead',
+            'creators': ['Grateful Dead'],
             'album': '1977-05-08 - Barton Hall - Cornell University',
             'release_date': '19770508',
             'display_id': 'gd1977-05-08d01t07.flac',
-            'release_year': 1977,
             'track_number': 7,
         },
     }, {
@@ -147,7 +146,7 @@ class ArchiveOrgIE(InfoExtractor):
             'title': 'Bells Of Rostov',
             'ext': 'mp3',
         },
-        'skip': 'restricted'
+        'skip': 'restricted',
     }, {
         'url': 'https://archive.org/details/lp_the-music-of-russia_various-artists-a-askaryan-alexander-melik/disc1/02.02.+Song+And+Chorus+In+The+Polovetsian+Camp+From+%22Prince+Igor%22+(Act+2%2C+Scene+1).mp3',
         'md5': '1d0aabe03edca83ca58d9ed3b493a3c3',
@@ -160,7 +159,7 @@ class ArchiveOrgIE(InfoExtractor):
             'description': 'md5:012b2d668ae753be36896f343d12a236',
             'upload_date': '20190928',
         },
-        'skip': 'restricted'
+        'skip': 'restricted',
     }, {
         # Original formats are private
         'url': 'https://archive.org/details/irelandthemakingofarepublic',
@@ -170,7 +169,7 @@ class ArchiveOrgIE(InfoExtractor):
             'upload_date': '20160610',
             'description': 'md5:f70956a156645a658a0dc9513d9e78b7',
             'uploader': 'dimitrios@archive.org',
-            'creator': ['British Broadcasting Corporation', 'Time-Life Films'],
+            'creators': ['British Broadcasting Corporation', 'Time-Life Films'],
             'timestamp': 1465594947,
         },
         'playlist': [
@@ -204,8 +203,28 @@ class ArchiveOrgIE(InfoExtractor):
                     'thumbnail': 'https://archive.org/download/irelandthemakingofarepublic/irelandthemakingofarepublic.thumbs/irelandthemakingofarepublicreel2_001554.jpg',
                     'display_id': 'irelandthemakingofarepublicreel2.mov',
                 },
-            }
-        ]
+            },
+        ],
+    }, {
+        # The reviewbody is None for one of the reviews; just need to extract data without crashing
+        'url': 'https://archive.org/details/gd95-04-02.sbd.11622.sbeok.shnf/gd95-04-02d1t04.shn',
+        'info_dict': {
+            'id': 'gd95-04-02.sbd.11622.sbeok.shnf/gd95-04-02d1t04.shn',
+            'ext': 'mp3',
+            'title': 'Stuck Inside of Mobile with the Memphis Blues Again',
+            'creators': ['Grateful Dead'],
+            'duration': 338.31,
+            'track': 'Stuck Inside of Mobile with the Memphis Blues Again',
+            'description': 'md5:764348a470b986f1217ffd38d6ac7b72',
+            'display_id': 'gd95-04-02d1t04.shn',
+            'location': 'Pyramid Arena',
+            'uploader': 'jon@archive.org',
+            'album': '1995-04-02 - Pyramid Arena',
+            'upload_date': '20040519',
+            'track_number': 4,
+            'release_date': '19950402',
+            'timestamp': 1084927901,
+        },
     }]
 
     @staticmethod
@@ -222,7 +241,7 @@ class ArchiveOrgIE(InfoExtractor):
 
     def _real_extract(self, url):
         video_id = urllib.parse.unquote_plus(self._match_id(url))
-        identifier, entry_id = (video_id.split('/', 1) + [None])[:2]
+        identifier, _, entry_id = video_id.partition('/')
 
         # Archive.org metadata API doesn't clearly demarcate playlist entries
         # or subtitle tracks, so we get them from the embeddable player.
@@ -248,7 +267,7 @@ class ArchiveOrgIE(InfoExtractor):
                 if track['kind'] != 'subtitles':
                     continue
                 entries[p['orig']][track['label']] = {
-                    'url': 'https://archive.org/' + track['file'].lstrip('/')
+                    'url': 'https://archive.org/' + track['file'].lstrip('/'),
                 }
 
         metadata = self._download_json('http://archive.org/metadata/' + identifier, identifier)
@@ -260,7 +279,7 @@ class ArchiveOrgIE(InfoExtractor):
             'title': m['title'],
             'description': clean_html(m.get('description')),
             'uploader': dict_get(m, ['uploader', 'adder']),
-            'creator': m.get('creator'),
+            'creators': traverse_obj(m, ('creator', {variadic}, {lambda x: x[0] and list(x)})),
             'license': m.get('licenseurl'),
             'release_date': unified_strdate(m.get('date')),
             'timestamp': unified_timestamp(dict_get(m, ['publicdate', 'addeddate'])),
@@ -275,7 +294,7 @@ class ArchiveOrgIE(InfoExtractor):
                     'title': f.get('title') or f['name'],
                     'display_id': f['name'],
                     'description': clean_html(f.get('description')),
-                    'creator': f.get('creator'),
+                    'creators': traverse_obj(f, ('creator', {variadic}, {lambda x: x[0] and list(x)})),
                     'duration': parse_duration(f.get('length')),
                     'track_number': int_or_none(f.get('track')),
                     'album': f.get('album'),
@@ -295,7 +314,9 @@ class ArchiveOrgIE(InfoExtractor):
                     'height': int_or_none(f.get('width')),
                     'filesize': int_or_none(f.get('size'))})
 
-            extension = (f['name'].rsplit('.', 1) + [None])[1]
+            _, has_ext, extension = f['name'].rpartition('.')
+            if not has_ext:
+                extension = None
 
             # We don't want to skip private formats if the user has access to them,
             # however without access to an account with such privileges we can't implement/test this.
@@ -303,14 +324,14 @@ class ArchiveOrgIE(InfoExtractor):
             is_logged_in = bool(self._get_cookies('https://archive.org').get('logged-in-sig'))
             if extension in KNOWN_EXTENSIONS and (not f.get('private') or is_logged_in):
                 entry['formats'].append({
-                    'url': 'https://archive.org/download/' + identifier + '/' + f['name'],
+                    'url': 'https://archive.org/download/' + identifier + '/' + urllib.parse.quote(f['name']),
                     'format': f.get('format'),
                     'width': int_or_none(f.get('width')),
                     'height': int_or_none(f.get('height')),
                     'filesize': int_or_none(f.get('size')),
                     'protocol': 'https',
                     'source_preference': 0 if f.get('source') == 'original' else -1,
-                    'format_note': f.get('source')
+                    'format_note': f.get('source'),
                 })
 
         for entry in entries.values():
@@ -334,7 +355,7 @@ class ArchiveOrgIE(InfoExtractor):
                 info['comments'].append({
                     'id': review.get('review_id'),
                     'author': review.get('reviewer'),
-                    'text': str_or_none(review.get('reviewtitle'), '') + '\n\n' + review.get('reviewbody'),
+                    'text': join_nonempty('reviewtitle', 'reviewbody', from_dict=review, delim='\n\n'),
                     'timestamp': unified_timestamp(review.get('createdate')),
                     'parent': 'root'})
 
@@ -373,7 +394,7 @@ class YoutubeWebArchiveIE(InfoExtractor):
                 'uploader_url': 'https://www.youtube.com/user/Zeurel',
                 'thumbnail': r're:https?://.*\.(jpg|webp)',
                 'channel_url': 'https://www.youtube.com/channel/UCukCyHaD-bK3in_pKpfH9Eg',
-            }
+            },
         }, {
             # Internal link
             'url': 'https://web.archive.org/web/2oe/http://wayback-fakeurl.archive.org/yt/97t7Xj_iBv0',
@@ -390,7 +411,7 @@ class YoutubeWebArchiveIE(InfoExtractor):
                 'uploader_url': 'https://www.youtube.com/user/1veritasium',
                 'thumbnail': r're:https?://.*\.(jpg|webp)',
                 'channel_url': 'https://www.youtube.com/channel/UCHnyfMqiRRG1u-2MsSQLbXA',
-            }
+            },
         }, {
             # Video from 2012, webm format itag 45. Newest capture is deleted video, with an invalid description.
             # Should use the date in the link. Title ends with '- Youtube'. Capture has description in eow-description
@@ -405,8 +426,8 @@ class YoutubeWebArchiveIE(InfoExtractor):
                 'uploader_id': 'machinima',
                 'uploader_url': 'https://www.youtube.com/user/machinima',
                 'thumbnail': r're:https?://.*\.(jpg|webp)',
-                'uploader': 'machinima'
-            }
+                'uploader': 'machinima',
+            },
         }, {
             # FLV video. Video file URL does not provide itag information
             'url': 'https://web.archive.org/web/20081211103536/http://www.youtube.com/watch?v=jNQXAC9IVRw',
@@ -423,7 +444,7 @@ class YoutubeWebArchiveIE(InfoExtractor):
                 'channel_url': 'https://www.youtube.com/channel/UC4QobU6STFB0P71PMvOGN5A',
                 'thumbnail': r're:https?://.*\.(jpg|webp)',
                 'uploader': 'jawed',
-            }
+            },
         }, {
             'url': 'https://web.archive.org/web/20110712231407/http://www.youtube.com/watch?v=lTx3G6h2xyA',
             'info_dict': {
@@ -439,7 +460,7 @@ class YoutubeWebArchiveIE(InfoExtractor):
                 'uploader_url': 'https://www.youtube.com/user/itsmadeon',
                 'channel_url': 'https://www.youtube.com/channel/UCqMDNf3Pn5L7pcNkuSEeO3w',
                 'thumbnail': r're:https?://.*\.(jpg|webp)',
-            }
+            },
         }, {
             # First capture is of dead video, second is the oldest from CDX response.
             'url': 'https://web.archive.org/https://www.youtube.com/watch?v=1JYutPM8O6E',
@@ -456,7 +477,7 @@ class YoutubeWebArchiveIE(InfoExtractor):
                 'channel_url': 'https://www.youtube.com/channel/UCdIaNUarhzLSXGoItz7BHVA',
                 'thumbnail': r're:https?://.*\.(jpg|webp)',
                 'uploader': 'ETC News',
-            }
+            },
         }, {
             # First capture of dead video, capture date in link links to dead capture.
             'url': 'https://web.archive.org/web/20180803221945/https://www.youtube.com/watch?v=6FPhZJGvf4E',
@@ -475,15 +496,15 @@ class YoutubeWebArchiveIE(InfoExtractor):
                 'uploader': 'ETC News',
             },
             'expected_warnings': [
-                r'unable to download capture webpage \(it may not be archived\)'
-            ]
+                r'unable to download capture webpage \(it may not be archived\)',
+            ],
         }, {   # Very old YouTube page, has - YouTube in title.
             'url': 'http://web.archive.org/web/20070302011044/http://youtube.com/watch?v=-06-KB9XTzg',
             'info_dict': {
                 'id': '-06-KB9XTzg',
                 'ext': 'flv',
-                'title': 'New Coin Hack!! 100% Safe!!'
-            }
+                'title': 'New Coin Hack!! 100% Safe!!',
+            },
         }, {
             'url': 'web.archive.org/https://www.youtube.com/watch?v=dWW7qP423y8',
             'info_dict': {
@@ -497,7 +518,7 @@ class YoutubeWebArchiveIE(InfoExtractor):
                 'description': 'md5:7b567f898d8237b256f36c1a07d6d7bc',
                 'thumbnail': r're:https?://.*\.(jpg|webp)',
                 'uploader': 'DankPods',
-            }
+            },
         }, {
             # player response contains '};' See: https://github.com/ytdl-org/youtube-dl/issues/27093
             'url': 'https://web.archive.org/web/20200827003909if_/http://www.youtube.com/watch?v=6Dh-RL__uN4',
@@ -514,7 +535,7 @@ class YoutubeWebArchiveIE(InfoExtractor):
                 'uploader_id': 'PewDiePie',
                 'uploader_url': 'https://www.youtube.com/user/PewDiePie',
                 'thumbnail': r're:https?://.*\.(jpg|webp)',
-            }
+            },
         }, {
             # ~June 2010 Capture. swfconfig
             'url': 'https://web.archive.org/web/0/https://www.youtube.com/watch?v=8XeW5ilk-9Y',
@@ -529,7 +550,7 @@ class YoutubeWebArchiveIE(InfoExtractor):
                 'thumbnail': r're:https?://.*\.(jpg|webp)',
                 'uploader_url': 'https://www.youtube.com/user/HowTheWorldWorks',
                 'upload_date': '20090520',
-            }
+            },
         }, {
             # Jan 2011: watch-video-date/eow-date surrounded by whitespace
             'url': 'https://web.archive.org/web/20110126141719/http://www.youtube.com/watch?v=Q_yjX80U7Yc',
@@ -544,7 +565,7 @@ class YoutubeWebArchiveIE(InfoExtractor):
                 'thumbnail': r're:https?://.*\.(jpg|webp)',
                 'duration': 132,
                 'uploader_url': 'https://www.youtube.com/user/claybutlermusic',
-            }
+            },
         }, {
             # ~May 2009 swfArgs. ytcfg is spread out over various vars
             'url': 'https://web.archive.org/web/0/https://www.youtube.com/watch?v=c5uJgG05xUY',
@@ -559,7 +580,7 @@ class YoutubeWebArchiveIE(InfoExtractor):
                 'description': 'md5:4ca77d79538064e41e4cc464e93f44f0',
                 'thumbnail': r're:https?://.*\.(jpg|webp)',
                 'duration': 754,
-            }
+            },
         }, {
             # ~June 2012. Upload date is in another lang so cannot extract.
             'url': 'https://web.archive.org/web/20120607174520/http://www.youtube.com/watch?v=xWTLLl-dQaA',
@@ -573,7 +594,7 @@ class YoutubeWebArchiveIE(InfoExtractor):
                 'uploader': 'BlackNerdComedy',
                 'duration': 182,
                 'thumbnail': r're:https?://.*\.(jpg|webp)',
-            }
+            },
         }, {
             # ~July 2013
             'url': 'https://web.archive.org/web/*/https://www.youtube.com/watch?v=9eO1aasHyTM',
@@ -589,7 +610,7 @@ class YoutubeWebArchiveIE(InfoExtractor):
                 'channel_url': 'https://www.youtube.com/channel/UC62R2cBezNBOqxSerfb1nMQ',
                 'upload_date': '20060428',
                 'uploader': 'punkybird',
-            }
+            },
         }, {
             # April 2020: Player response in player config
             'url': 'https://web.archive.org/web/20200416034815/https://www.youtube.com/watch?v=Cf7vS8jc7dY&gl=US&hl=en',
@@ -606,7 +627,7 @@ class YoutubeWebArchiveIE(InfoExtractor):
                 'thumbnail': r're:https?://.*\.(jpg|webp)',
                 'description': 'md5:c625bb3c02c4f5fb4205971e468fa341',
                 'uploader_url': 'https://www.youtube.com/user/GameGrumps',
-            }
+            },
         }, {
             # watch7-user-header with yt-user-info
             'url': 'ytarchive:kbh4T_b4Ixw:20160307085057',
@@ -621,7 +642,7 @@ class YoutubeWebArchiveIE(InfoExtractor):
                 'thumbnail': r're:https?://.*\.(jpg|webp)',
                 'upload_date': '20150503',
                 'channel_id': 'UCnTaGvsHmMy792DWeT6HbGA',
-            }
+            },
         }, {
             # April 2012
             'url': 'https://web.archive.org/web/0/https://www.youtube.com/watch?v=SOm7mPoPskU',
@@ -636,35 +657,35 @@ class YoutubeWebArchiveIE(InfoExtractor):
                 'duration': 200,
                 'upload_date': '20120407',
                 'uploader_id': 'thecomputernerd01',
-            }
+            },
         }, {
             'url': 'https://web.archive.org/web/http://www.youtube.com/watch?v=kH-G_aIBlFw',
-            'only_matching': True
+            'only_matching': True,
         }, {
             'url': 'https://web.archive.org/web/20050214000000_if/http://www.youtube.com/watch?v=0altSZ96U4M',
-            'only_matching': True
+            'only_matching': True,
         }, {
             # Video not archived, only capture is unavailable video page
             'url': 'https://web.archive.org/web/20210530071008/https://www.youtube.com/watch?v=lHJTf93HL1s&spfreload=10',
-            'only_matching': True
+            'only_matching': True,
         }, {   # Encoded url
             'url': 'https://web.archive.org/web/20120712231619/http%3A//www.youtube.com/watch%3Fgl%3DUS%26v%3DAkhihxRKcrs%26hl%3Den',
-            'only_matching': True
+            'only_matching': True,
         }, {
             'url': 'https://web.archive.org/web/20120712231619/http%3A//www.youtube.com/watch%3Fv%3DAkhihxRKcrs%26gl%3DUS%26hl%3Den',
-            'only_matching': True
+            'only_matching': True,
         }, {
             'url': 'https://web.archive.org/web/20060527081937/http://www.youtube.com:80/watch.php?v=ELTFsLT73fA&amp;search=soccer',
-            'only_matching': True
+            'only_matching': True,
         }, {
             'url': 'https://web.archive.org/http://www.youtube.com:80/watch?v=-05VVye-ffg',
-            'only_matching': True
+            'only_matching': True,
         }, {
             'url': 'ytarchive:BaW_jenozKc:20050214000000',
-            'only_matching': True
+            'only_matching': True,
         }, {
             'url': 'ytarchive:BaW_jenozKc',
-            'only_matching': True
+            'only_matching': True,
         },
     ]
     _YT_INITIAL_DATA_RE = YoutubeBaseInfoExtractor._YT_INITIAL_DATA_RE
@@ -675,13 +696,13 @@ class YoutubeWebArchiveIE(InfoExtractor):
 
     _YT_DEFAULT_THUMB_SERVERS = ['i.ytimg.com']  # thumbnails most likely archived on these servers
     _YT_ALL_THUMB_SERVERS = orderedSet(
-        _YT_DEFAULT_THUMB_SERVERS + ['img.youtube.com', *[f'{c}{n or ""}.ytimg.com' for c in ('i', 's') for n in (*range(0, 5), 9)]])
+        [*_YT_DEFAULT_THUMB_SERVERS, 'img.youtube.com', *[f'{c}{n or ""}.ytimg.com' for c in ('i', 's') for n in (*range(5), 9)]])
 
     _WAYBACK_BASE_URL = 'https://web.archive.org/web/%sif_/'
     _OLDEST_CAPTURE_DATE = 20050214000000
     _NEWEST_CAPTURE_DATE = 20500101000000
 
-    def _call_cdx_api(self, item_id, url, filters: list = None, collapse: list = None, query: dict = None, note=None, fatal=False):
+    def _call_cdx_api(self, item_id, url, filters: list | None = None, collapse: list | None = None, query: dict | None = None, note=None, fatal=False):
         # CDX docs: https://github.com/internetarchive/wayback/blob/master/wayback-cdx-server/README.md
         query = {
             'url': url,
@@ -690,14 +711,14 @@ class YoutubeWebArchiveIE(InfoExtractor):
             'limit': 500,
             'filter': ['statuscode:200'] + (filters or []),
             'collapse': collapse or [],
-            **(query or {})
+            **(query or {}),
         }
         res = self._download_json(
             'https://web.archive.org/cdx/search/cdx', item_id,
             note or 'Downloading CDX API JSON', query=query, fatal=fatal)
         if isinstance(res, list) and len(res) >= 2:
             # format response to make it easier to use
-            return list(dict(zip(res[0], v)) for v in res[1:])
+            return [dict(zip(res[0], v)) for v in res[1:]]
         elif not isinstance(res, list) or len(res) != 0:
             self.report_warning('Error while parsing CDX API response' + bug_reports_message())
 
@@ -854,7 +875,7 @@ class YoutubeWebArchiveIE(InfoExtractor):
                 {
                     'url': (self._WAYBACK_BASE_URL % (int_or_none(thumbnail_dict.get('timestamp')) or self._OLDEST_CAPTURE_DATE)) + thumbnail_dict.get('original'),
                     'filesize': int_or_none(thumbnail_dict.get('length')),
-                    'preference': int_or_none(thumbnail_dict.get('length'))
+                    'preference': int_or_none(thumbnail_dict.get('length')),
                 } for thumbnail_dict in response)
             if not try_all:
                 break
@@ -895,7 +916,7 @@ class YoutubeWebArchiveIE(InfoExtractor):
         for retry in retry_manager:
             try:
                 urlh = self._request_webpage(
-                    HEADRequest('https://web.archive.org/web/2oe_/http://wayback-fakeurl.archive.org/yt/%s' % video_id),
+                    HEADRequest(f'https://web.archive.org/web/2oe_/http://wayback-fakeurl.archive.org/yt/{video_id}'),
                     video_id, note='Fetching archived video file url', expected_status=True)
             except ExtractorError as e:
                 # HTTP Error 404 is expected if the video is not saved.
@@ -926,258 +947,24 @@ class YoutubeWebArchiveIE(InfoExtractor):
         info['thumbnails'] = self._extract_thumbnails(video_id)
 
         if urlh:
-            url = compat_urllib_parse_unquote(urlh.url)
+            url = urllib.parse.unquote(urlh.url)
             video_file_url_qs = parse_qs(url)
             # Attempt to recover any ext & format info from playback url & response headers
-            format = {'url': url, 'filesize': int_or_none(urlh.headers.get('x-archive-orig-content-length'))}
+            fmt = {'url': url, 'filesize': int_or_none(urlh.headers.get('x-archive-orig-content-length'))}
             itag = try_get(video_file_url_qs, lambda x: x['itag'][0])
             if itag and itag in YoutubeIE._formats:
-                format.update(YoutubeIE._formats[itag])
-                format.update({'format_id': itag})
+                fmt.update(YoutubeIE._formats[itag])
+                fmt.update({'format_id': itag})
             else:
                 mime = try_get(video_file_url_qs, lambda x: x['mime'][0])
                 ext = (mimetype2ext(mime)
                        or urlhandle_detect_ext(urlh)
                        or mimetype2ext(urlh.headers.get('x-archive-guessed-content-type')))
-                format.update({'ext': ext})
-            info['formats'] = [format]
+                fmt.update({'ext': ext})
+            info['formats'] = [fmt]
             if not info.get('duration'):
                 info['duration'] = str_to_int(try_get(video_file_url_qs, lambda x: x['dur'][0]))
 
         if not info.get('title'):
             info['title'] = video_id
         return info
-
-
-class VLiveWebArchiveIE(InfoExtractor):
-    IE_NAME = 'web.archive:vlive'
-    IE_DESC = 'web.archive.org saved vlive videos'
-    _VALID_URL = r'''(?x)
-            (?:https?://)?web\.archive\.org/
-            (?:web/)?(?:(?P<date>[0-9]{14})?[0-9A-Za-z_*]*/)?  # /web and the version index is optional
-            (?:https?(?::|%3[Aa])//)?(?:
-                (?:(?:www|m)\.)?vlive\.tv(?::(?:80|443))?/(?:video|embed)/(?P<id>[0-9]+)  # VLive URL
-            )
-        '''
-    _TESTS = [{
-        'url': 'https://web.archive.org/web/20221221144331/http://www.vlive.tv/video/1326',
-        'md5': 'cc7314812855ce56de70a06a27314983',
-        'info_dict': {
-            'id': '1326',
-            'ext': 'mp4',
-            'title': "Girl's Day's Broadcast",
-            'creator': "Girl's Day",
-            'view_count': int,
-            'uploader_id': 'muploader_a',
-            'uploader_url': None,
-            'uploader': None,
-            'upload_date': '20150817',
-            'thumbnail': r're:^https?://.*\.(?:jpg|png)$',
-            'timestamp': 1439816449,
-            'like_count': int,
-            'channel': 'Girl\'s Day',
-            'channel_id': 'FDF27',
-            'comment_count': int,
-            'release_timestamp': 1439818140,
-            'release_date': '20150817',
-            'duration': 1014,
-        },
-        'params': {
-            'skip_download': True,
-        },
-    }, {
-        'url': 'https://web.archive.org/web/20221221182103/http://www.vlive.tv/video/16937',
-        'info_dict': {
-            'id': '16937',
-            'ext': 'mp4',
-            'title': '첸백시 걍방',
-            'creator': 'EXO',
-            'view_count': int,
-            'subtitles': 'mincount:12',
-            'uploader_id': 'muploader_j',
-            'uploader_url': 'http://vlive.tv',
-            'uploader': None,
-            'upload_date': '20161112',
-            'thumbnail': r're:^https?://.*\.(?:jpg|png)$',
-            'timestamp': 1478923074,
-            'like_count': int,
-            'channel': 'EXO',
-            'channel_id': 'F94BD',
-            'comment_count': int,
-            'release_timestamp': 1478924280,
-            'release_date': '20161112',
-            'duration': 906,
-        },
-        'params': {
-            'skip_download': True,
-        },
-    }, {
-        'url': 'https://web.archive.org/web/20221127190050/http://www.vlive.tv/video/101870',
-        'info_dict': {
-            'id': '101870',
-            'ext': 'mp4',
-            'title': '[ⓓ xV] “레벨이들 매력에 반해? 안 반해?” 움직이는 HD 포토 (레드벨벳:Red Velvet)',
-            'creator': 'Dispatch',
-            'view_count': int,
-            'subtitles': 'mincount:6',
-            'uploader_id': 'V__FRA08071',
-            'uploader_url': 'http://vlive.tv',
-            'uploader': None,
-            'upload_date': '20181130',
-            'thumbnail': r're:^https?://.*\.(?:jpg|png)$',
-            'timestamp': 1543601327,
-            'like_count': int,
-            'channel': 'Dispatch',
-            'channel_id': 'C796F3',
-            'comment_count': int,
-            'release_timestamp': 1543601040,
-            'release_date': '20181130',
-            'duration': 279,
-        },
-        'params': {
-            'skip_download': True,
-        },
-    }]
-
-    # The wayback machine has special timestamp and "mode" values:
-    # timestamp:
-    #   1 = the first capture
-    #   2 = the last capture
-    # mode:
-    #   id_ = Identity - perform no alterations of the original resource, return it as it was archived.
-    _WAYBACK_BASE_URL = 'https://web.archive.org/web/2id_/'
-
-    def _download_archived_page(self, url, video_id, *, timestamp='2', **kwargs):
-        for retry in self.RetryManager():
-            try:
-                return self._download_webpage(f'https://web.archive.org/web/{timestamp}id_/{url}', video_id, **kwargs)
-            except ExtractorError as e:
-                if isinstance(e.cause, HTTPError) and e.cause.status == 404:
-                    raise ExtractorError('Page was not archived', expected=True)
-                retry.error = e
-                continue
-
-    def _download_archived_json(self, url, video_id, **kwargs):
-        page = self._download_archived_page(url, video_id, **kwargs)
-        if not page:
-            raise ExtractorError('Page was not archived', expected=True)
-        else:
-            return self._parse_json(page, video_id)
-
-    def _extract_formats_from_m3u8(self, m3u8_url, params, video_id):
-        m3u8_doc = self._download_archived_page(m3u8_url, video_id, note='Downloading m3u8', query=params, fatal=False)
-        if not m3u8_doc:
-            return
-
-        # M3U8 document should be changed to archive domain
-        m3u8_doc = m3u8_doc.splitlines()
-        url_base = m3u8_url.rsplit('/', 1)[0]
-        first_segment = None
-        for i, line in enumerate(m3u8_doc):
-            if not line.startswith('#'):
-                m3u8_doc[i] = f'{self._WAYBACK_BASE_URL}{url_base}/{line}?{urllib.parse.urlencode(params)}'
-                first_segment = first_segment or m3u8_doc[i]
-
-        # Segments may not have been archived. See https://web.archive.org/web/20221127190050/http://www.vlive.tv/video/101870
-        urlh = self._request_webpage(HEADRequest(first_segment), video_id, errnote=False,
-                                     fatal=False, note='Check first segment availablity')
-        if urlh:
-            formats, subtitles = self._parse_m3u8_formats_and_subtitles('\n'.join(m3u8_doc), ext='mp4', video_id=video_id)
-            if subtitles:
-                self._report_ignoring_subs('m3u8')
-            return formats
-
-    # Closely follows the logic of the ArchiveTeam grab script
-    # See: https://github.com/ArchiveTeam/vlive-grab/blob/master/vlive.lua
-    def _real_extract(self, url):
-        video_id, url_date = self._match_valid_url(url).group('id', 'date')
-
-        webpage = self._download_archived_page(f'https://www.vlive.tv/video/{video_id}', video_id, timestamp=url_date)
-
-        player_info = self._search_json(r'__PRELOADED_STATE__\s*=', webpage, 'player info', video_id)
-        user_country = traverse_obj(player_info, ('common', 'userCountry'))
-
-        main_script_url = self._search_regex(r'<script\s+src="([^"]+/js/main\.[^"]+\.js)"', webpage, 'main script url')
-        main_script = self._download_archived_page(main_script_url, video_id, note='Downloading main script')
-        app_id = self._search_regex(r'appId\s*=\s*"([^"]+)"', main_script, 'app id')
-
-        inkey = self._download_archived_json(
-            f'https://www.vlive.tv/globalv-web/vam-web/video/v1.0/vod/{video_id}/inkey', video_id, note='Fetching inkey', query={
-                'appId': app_id,
-                'platformType': 'PC',
-                'gcc': user_country,
-                'locale': 'en_US',
-            }, fatal=False)
-
-        vod_id = traverse_obj(player_info, ('postDetail', 'post', 'officialVideo', 'vodId'))
-
-        vod_data = self._download_archived_json(
-            f'https://apis.naver.com/rmcnmv/rmcnmv/vod/play/v2.0/{vod_id}', video_id, note='Fetching vod data', query={
-                'key': inkey.get('inkey'),
-                'pid': 'rmcPlayer_16692457559726800',  # partially unix time and partially random. Fixed value used by archiveteam project
-                'sid': '2024',
-                'ver': '2.0',
-                'devt': 'html5_pc',
-                'doct': 'json',
-                'ptc': 'https',
-                'sptc': 'https',
-                'cpt': 'vtt',
-                'ctls': '%7B%22visible%22%3A%7B%22fullscreen%22%3Atrue%2C%22logo%22%3Afalse%2C%22playbackRate%22%3Afalse%2C%22scrap%22%3Afalse%2C%22playCount%22%3Atrue%2C%22commentCount%22%3Atrue%2C%22title%22%3Atrue%2C%22writer%22%3Atrue%2C%22expand%22%3Afalse%2C%22subtitles%22%3Atrue%2C%22thumbnails%22%3Atrue%2C%22quality%22%3Atrue%2C%22setting%22%3Atrue%2C%22script%22%3Afalse%2C%22logoDimmed%22%3Atrue%2C%22badge%22%3Atrue%2C%22seekingTime%22%3Atrue%2C%22muted%22%3Atrue%2C%22muteButton%22%3Afalse%2C%22viewerNotice%22%3Afalse%2C%22linkCount%22%3Afalse%2C%22createTime%22%3Afalse%2C%22thumbnail%22%3Atrue%7D%2C%22clicked%22%3A%7B%22expand%22%3Afalse%2C%22subtitles%22%3Afalse%7D%7D',
-                'pv': '4.26.9',
-                'dr': '1920x1080',
-                'cpl': 'en_US',
-                'lc': 'en_US',
-                'adi': '%5B%7B%22type%22%3A%22pre%22%2C%22exposure%22%3Afalse%2C%22replayExposure%22%3Afalse%7D%5D',
-                'adu': '%2F',
-                'videoId': vod_id,
-                'cc': user_country,
-            })
-
-        formats = []
-
-        streams = traverse_obj(vod_data, ('streams', ...))
-        if len(streams) > 1:
-            self.report_warning('Multiple streams found. Only the first stream will be downloaded.')
-        stream = streams[0]
-
-        max_stream = max(
-            stream.get('videos') or [],
-            key=lambda v: traverse_obj(v, ('bitrate', 'video'), default=0), default=None)
-        if max_stream is not None:
-            params = {arg.get('name'): arg.get('value') for arg in stream.get('keys', []) if arg.get('type') == 'param'}
-            formats = self._extract_formats_from_m3u8(max_stream.get('source'), params, video_id) or []
-
-        # For parts of the project MP4 files were archived
-        max_video = max(
-            traverse_obj(vod_data, ('videos', 'list', ...)),
-            key=lambda v: traverse_obj(v, ('bitrate', 'video'), default=0), default=None)
-        if max_video is not None:
-            video_url = self._WAYBACK_BASE_URL + max_video.get('source')
-            urlh = self._request_webpage(HEADRequest(video_url), video_id, errnote=False,
-                                         fatal=False, note='Check video availablity')
-            if urlh:
-                formats.append({'url': video_url})
-
-        return {
-            'id': video_id,
-            'formats': formats,
-            **traverse_obj(player_info, ('postDetail', 'post', {
-                'title': ('officialVideo', 'title', {str}),
-                'creator': ('author', 'nickname', {str}),
-                'channel': ('channel', 'channelName', {str}),
-                'channel_id': ('channel', 'channelCode', {str}),
-                'duration': ('officialVideo', 'playTime', {int_or_none}),
-                'view_count': ('officialVideo', 'playCount', {int_or_none}),
-                'like_count': ('officialVideo', 'likeCount', {int_or_none}),
-                'comment_count': ('officialVideo', 'commentCount', {int_or_none}),
-                'timestamp': ('officialVideo', 'createdAt', {lambda x: int_or_none(x, scale=1000)}),
-                'release_timestamp': ('officialVideo', 'willStartAt', {lambda x: int_or_none(x, scale=1000)}),
-            })),
-            **traverse_obj(vod_data, ('meta', {
-                'uploader_id': ('user', 'id', {str}),
-                'uploader': ('user', 'name', {str}),
-                'uploader_url': ('user', 'url', {url_or_none}),
-                'thumbnail': ('cover', 'source', {url_or_none}),
-            }), expected_type=lambda x: x or None),
-            **NaverBaseIE.process_subtitles(vod_data, lambda x: [self._WAYBACK_BASE_URL + x]),
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/arcpublishing.py b/plugins/youtube_download/yt_dlp/extractor/arcpublishing.py
index febd3d2..8da9bc4 100644
--- a/plugins/youtube_download/yt_dlp/extractor/arcpublishing.py
+++ b/plugins/youtube_download/yt_dlp/extractor/arcpublishing.py
@@ -4,6 +4,7 @@ from .common import InfoExtractor
 from ..utils import (
     extract_attributes,
     int_or_none,
+    join_nonempty,
     parse_iso8601,
     try_get,
 )
@@ -11,7 +12,7 @@ from ..utils import (
 
 class ArcPublishingIE(InfoExtractor):
     _UUID_REGEX = r'[\da-f]{8}-(?:[\da-f]{4}-){3}[\da-f]{12}'
-    _VALID_URL = r'arcpublishing:(?P<org>[a-z]+):(?P<id>%s)' % _UUID_REGEX
+    _VALID_URL = rf'arcpublishing:(?P<org>[a-z]+):(?P<id>{_UUID_REGEX})'
     _TESTS = [{
         # https://www.adn.com/politics/2020/11/02/video-senate-candidates-campaign-in-anchorage-on-eve-of-election-day/
         'url': 'arcpublishing:adn:8c99cb6e-b29c-4bc9-9173-7bf9979225ab',
@@ -74,12 +75,12 @@ class ArcPublishingIE(InfoExtractor):
     def _extract_embed_urls(cls, url, webpage):
         entries = []
         # https://arcpublishing.atlassian.net/wiki/spaces/POWA/overview
-        for powa_el in re.findall(r'(<div[^>]+class="[^"]*\bpowa\b[^"]*"[^>]+data-uuid="%s"[^>]*>)' % ArcPublishingIE._UUID_REGEX, webpage):
+        for powa_el in re.findall(rf'(<div[^>]+class="[^"]*\bpowa\b[^"]*"[^>]+data-uuid="{ArcPublishingIE._UUID_REGEX}"[^>]*>)', webpage):
             powa = extract_attributes(powa_el) or {}
             org = powa.get('data-org')
             uuid = powa.get('data-uuid')
             if org and uuid:
-                entries.append('arcpublishing:%s:%s' % (org, uuid))
+                entries.append(f'arcpublishing:{org}:{uuid}')
         return entries
 
     def _real_extract(self, url):
@@ -122,7 +123,7 @@ class ArcPublishingIE(InfoExtractor):
             elif stream_type in ('ts', 'hls'):
                 m3u8_formats = self._extract_m3u8_formats(
                     s_url, uuid, 'mp4', live=is_live, m3u8_id='hls', fatal=False)
-                if all([f.get('acodec') == 'none' for f in m3u8_formats]):
+                if all(f.get('acodec') == 'none' for f in m3u8_formats):
                     continue
                 for f in m3u8_formats:
                     height = f.get('height')
@@ -136,7 +137,7 @@ class ArcPublishingIE(InfoExtractor):
             else:
                 vbr = int_or_none(s.get('bitrate'))
                 formats.append({
-                    'format_id': '%s-%d' % (stream_type, vbr) if vbr else stream_type,
+                    'format_id': join_nonempty(stream_type, vbr),
                     'vbr': vbr,
                     'width': int_or_none(s.get('width')),
                     'height': int_or_none(s.get('height')),
diff --git a/plugins/youtube_download/yt_dlp/extractor/ard.py b/plugins/youtube_download/yt_dlp/extractor/ard.py
index ca1faa7..89d3299 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ard.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ard.py
@@ -1,24 +1,25 @@
-import json
+import functools
 import re
 
 from .common import InfoExtractor
-from .generic import GenericIE
 from ..utils import (
+    OnDemandPagedList,
+    bug_reports_message,
     determine_ext,
-    ExtractorError,
     int_or_none,
+    join_nonempty,
+    jwt_decode_hs256,
+    make_archive_id,
     parse_duration,
-    qualities,
+    parse_iso8601,
+    remove_start,
     str_or_none,
-    try_get,
     unified_strdate,
-    unified_timestamp,
-    update_url,
     update_url_query,
     url_or_none,
     xpath_text,
 )
-from ..compat import compat_etree_fromstring
+from ..utils.traversal import traverse_obj
 
 
 class ARDMediathekBaseIE(InfoExtractor):
@@ -61,45 +62,6 @@ class ARDMediathekBaseIE(InfoExtractor):
             'subtitles': subtitles,
         }
 
-    def _ARD_extract_episode_info(self, title):
-        """Try to extract season/episode data from the title."""
-        res = {}
-        if not title:
-            return res
-
-        for pattern in [
-            # Pattern for title like "Homo sapiens (S06/E07) - Originalversion"
-            # from: https://www.ardmediathek.de/one/sendung/doctor-who/Y3JpZDovL3dkci5kZS9vbmUvZG9jdG9yIHdobw
-            r'.*(?P<ep_info> \(S(?P<season_number>\d+)/E(?P<episode_number>\d+)\)).*',
-            # E.g.: title="Fritjof aus Norwegen (2) (AD)"
-            # from: https://www.ardmediathek.de/ard/sammlung/der-krieg-und-ich/68cMkqJdllm639Skj4c7sS/
-            r'.*(?P<ep_info> \((?:Folge |Teil )?(?P<episode_number>\d+)(?:/\d+)?\)).*',
-            r'.*(?P<ep_info>Folge (?P<episode_number>\d+)(?:\:| -|) )\"(?P<episode>.+)\".*',
-            # E.g.: title="Folge 25/42: Symmetrie"
-            # from: https://www.ardmediathek.de/ard/video/grips-mathe/folge-25-42-symmetrie/ard-alpha/Y3JpZDovL2JyLmRlL3ZpZGVvLzMyYzI0ZjczLWQ1N2MtNDAxNC05ZmZhLTFjYzRkZDA5NDU5OQ/
-            # E.g.: title="Folge 1063 - Vertrauen"
-            # from: https://www.ardmediathek.de/ard/sendung/die-fallers/Y3JpZDovL3N3ci5kZS8yMzAyMDQ4/
-            r'.*(?P<ep_info>Folge (?P<episode_number>\d+)(?:/\d+)?(?:\:| -|) ).*',
-        ]:
-            m = re.match(pattern, title)
-            if m:
-                groupdict = m.groupdict()
-                res['season_number'] = int_or_none(groupdict.get('season_number'))
-                res['episode_number'] = int_or_none(groupdict.get('episode_number'))
-                res['episode'] = str_or_none(groupdict.get('episode'))
-                # Build the episode title by removing numeric episode information:
-                if groupdict.get('ep_info') and not res['episode']:
-                    res['episode'] = str_or_none(
-                        title.replace(groupdict.get('ep_info'), ''))
-                if res['episode']:
-                    res['episode'] = res['episode'].strip()
-                break
-
-        # As a fallback use the whole title as the episode name:
-        if not res.get('episode'):
-            res['episode'] = title.strip()
-        return res
-
     def _extract_formats(self, media_info, video_id):
         type_ = media_info.get('_type')
         media_array = media_info.get('_mediaArray', [])
@@ -123,7 +85,7 @@ class ARDMediathekBaseIE(InfoExtractor):
                         formats.extend(self._extract_f4m_formats(
                             update_url_query(stream_url, {
                                 'hdcore': '3.1.1',
-                                'plugin': 'aasp-3.1.1.69.124'
+                                'plugin': 'aasp-3.1.1.69.124',
                             }), video_id, f4m_id='hds', fatal=False))
                     elif ext == 'm3u8':
                         formats.extend(self._extract_m3u8_formats(
@@ -134,12 +96,12 @@ class ARDMediathekBaseIE(InfoExtractor):
                             f = {
                                 'url': server,
                                 'play_path': stream_url,
-                                'format_id': 'a%s-rtmp-%s' % (num, quality),
+                                'format_id': f'a{num}-rtmp-{quality}',
                             }
                         else:
                             f = {
                                 'url': stream_url,
-                                'format_id': 'a%s-%s-%s' % (num, ext, quality)
+                                'format_id': f'a{num}-{ext}-{quality}',
                             }
                         m = re.search(
                             r'_(?P<width>\d+)x(?P<height>\d+)\.mp4$',
@@ -155,144 +117,12 @@ class ARDMediathekBaseIE(InfoExtractor):
         return formats
 
 
-class ARDMediathekIE(ARDMediathekBaseIE):
-    IE_NAME = 'ARD:mediathek'
-    _VALID_URL = r'^https?://(?:(?:(?:www|classic)\.)?ardmediathek\.de|mediathek\.(?:daserste|rbb-online)\.de|one\.ard\.de)/(?:.*/)(?P<video_id>[0-9]+|[^0-9][^/\?]+)[^/\?]*(?:\?.*)?'
-
-    _TESTS = [{
-        # available till 26.07.2022
-        'url': 'http://www.ardmediathek.de/tv/S%C3%9CDLICHT/Was-ist-die-Kunst-der-Zukunft-liebe-Ann/BR-Fernsehen/Video?bcastId=34633636&documentId=44726822',
-        'info_dict': {
-            'id': '44726822',
-            'ext': 'mp4',
-            'title': 'Was ist die Kunst der Zukunft, liebe Anna McCarthy?',
-            'description': 'md5:4ada28b3e3b5df01647310e41f3a62f5',
-            'duration': 1740,
-        },
-        'params': {
-            # m3u8 download
-            'skip_download': True,
-        }
-    }, {
-        'url': 'https://one.ard.de/tv/Mord-mit-Aussicht/Mord-mit-Aussicht-6-39-T%C3%B6dliche-Nach/ONE/Video?bcastId=46384294&documentId=55586872',
-        'only_matching': True,
-    }, {
-        # audio
-        'url': 'http://www.ardmediathek.de/tv/WDR-H%C3%B6rspiel-Speicher/Tod-eines-Fu%C3%9Fballers/WDR-3/Audio-Podcast?documentId=28488308&bcastId=23074086',
-        'only_matching': True,
-    }, {
-        'url': 'http://mediathek.daserste.de/sendungen_a-z/328454_anne-will/22429276_vertrauen-ist-gut-spionieren-ist-besser-geht',
-        'only_matching': True,
-    }, {
-        # audio
-        'url': 'http://mediathek.rbb-online.de/radio/Hörspiel/Vor-dem-Fest/kulturradio/Audio?documentId=30796318&topRessort=radio&bcastId=9839158',
-        'only_matching': True,
-    }, {
-        'url': 'https://classic.ardmediathek.de/tv/Panda-Gorilla-Co/Panda-Gorilla-Co-Folge-274/Das-Erste/Video?bcastId=16355486&documentId=58234698',
-        'only_matching': True,
-    }]
-
-    @classmethod
-    def suitable(cls, url):
-        return False if ARDBetaMediathekIE.suitable(url) else super(ARDMediathekIE, cls).suitable(url)
-
-    def _real_extract(self, url):
-        # determine video id from url
-        m = self._match_valid_url(url)
-
-        document_id = None
-
-        numid = re.search(r'documentId=([0-9]+)', url)
-        if numid:
-            document_id = video_id = numid.group(1)
-        else:
-            video_id = m.group('video_id')
-
-        webpage = self._download_webpage(url, video_id)
-
-        ERRORS = (
-            ('>Leider liegt eine Störung vor.', 'Video %s is unavailable'),
-            ('>Der gewünschte Beitrag ist nicht mehr verfügbar.<',
-             'Video %s is no longer available'),
-        )
-
-        for pattern, message in ERRORS:
-            if pattern in webpage:
-                raise ExtractorError(message % video_id, expected=True)
-
-        if re.search(r'[\?&]rss($|[=&])', url):
-            doc = compat_etree_fromstring(webpage.encode('utf-8'))
-            if doc.tag == 'rss':
-                return GenericIE()._extract_rss(url, video_id, doc)
-
-        title = self._og_search_title(webpage, default=None) or self._html_search_regex(
-            [r'<h1(?:\s+class="boxTopHeadline")?>(.*?)</h1>',
-             r'<meta name="dcterms\.title" content="(.*?)"/>',
-             r'<h4 class="headline">(.*?)</h4>',
-             r'<title[^>]*>(.*?)</title>'],
-            webpage, 'title')
-        description = self._og_search_description(webpage, default=None) or self._html_search_meta(
-            'dcterms.abstract', webpage, 'description', default=None)
-        if description is None:
-            description = self._html_search_meta(
-                'description', webpage, 'meta description', default=None)
-        if description is None:
-            description = self._html_search_regex(
-                r'<p\s+class="teasertext">(.+?)</p>',
-                webpage, 'teaser text', default=None)
-
-        # Thumbnail is sometimes not present.
-        # It is in the mobile version, but that seems to use a different URL
-        # structure altogether.
-        thumbnail = self._og_search_thumbnail(webpage, default=None)
-
-        media_streams = re.findall(r'''(?x)
-            mediaCollection\.addMediaStream\([0-9]+,\s*[0-9]+,\s*"[^"]*",\s*
-            "([^"]+)"''', webpage)
-
-        if media_streams:
-            QUALITIES = qualities(['lo', 'hi', 'hq'])
-            formats = []
-            for furl in set(media_streams):
-                if furl.endswith('.f4m'):
-                    fid = 'f4m'
-                else:
-                    fid_m = re.match(r'.*\.([^.]+)\.[^.]+$', furl)
-                    fid = fid_m.group(1) if fid_m else None
-                formats.append({
-                    'quality': QUALITIES(fid),
-                    'format_id': fid,
-                    'url': furl,
-                })
-            info = {
-                'formats': formats,
-            }
-        else:  # request JSON file
-            if not document_id:
-                video_id = self._search_regex(
-                    (r'/play/(?:config|media|sola)/(\d+)', r'contentId["\']\s*:\s*(\d+)'),
-                    webpage, 'media id', default=None)
-            info = self._extract_media_info(
-                'http://www.ardmediathek.de/play/media/%s' % video_id,
-                webpage, video_id)
-
-        info.update({
-            'id': video_id,
-            'title': title,
-            'description': description,
-            'thumbnail': thumbnail,
-        })
-        info.update(self._ARD_extract_episode_info(info['title']))
-
-        return info
-
-
 class ARDIE(InfoExtractor):
     _VALID_URL = r'(?P<mainurl>https?://(?:www\.)?daserste\.de/(?:[^/?#&]+/)+(?P<id>[^/?#&]+))\.html'
     _TESTS = [{
         # available till 7.12.2023
         'url': 'https://www.daserste.de/information/talk/maischberger/videos/maischberger-video-424.html',
-        'md5': 'a438f671e87a7eba04000336a119ccc4',
+        'md5': '94812e6438488fb923c361a44469614b',
         'info_dict': {
             'id': 'maischberger-video-424',
             'display_id': 'maischberger-video-424',
@@ -399,31 +229,36 @@ class ARDIE(InfoExtractor):
         }
 
 
-class ARDBetaMediathekIE(ARDMediathekBaseIE):
-    _VALID_URL = r'''(?x)https://
+class ARDBetaMediathekIE(InfoExtractor):
+    IE_NAME = 'ARDMediathek'
+    _VALID_URL = r'''(?x)https?://
         (?:(?:beta|www)\.)?ardmediathek\.de/
-        (?:(?P<client>[^/]+)/)?
-        (?:player|live|video|(?P<playlist>sendung|sammlung))/
-        (?:(?P<display_id>(?(playlist)[^?#]+?|[^?#]+))/)?
-        (?P<id>(?(playlist)|Y3JpZDovL)[a-zA-Z0-9]+)
-        (?(playlist)/(?P<season>\d+)?/?(?:[?#]|$))'''
+        (?:[^/]+/)?
+        (?:player|live|video)/
+        (?:[^?#]+/)?
+        (?P<id>[a-zA-Z0-9]+)
+        /?(?:[?#]|$)'''
+    _GEO_COUNTRIES = ['DE']
+    _TOKEN_URL = 'https://sso.ardmediathek.de/sso/token'
 
     _TESTS = [{
-        'url': 'https://www.ardmediathek.de/video/filme-im-mdr/wolfsland-die-traurigen-schwestern/mdr-fernsehen/Y3JpZDovL21kci5kZS9iZWl0cmFnL2Ntcy8xZGY0ZGJmZS00ZWQwLTRmMGItYjhhYy0wOGQ4ZmYxNjVhZDI',
-        'md5': '3fd5fead7a370a819341129c8d713136',
+        'url': 'https://www.ardmediathek.de/video/filme-im-mdr/liebe-auf-vier-pfoten/mdr-fernsehen/Y3JpZDovL21kci5kZS9zZW5kdW5nLzI4MjA0MC80MjIwOTEtNDAyNTM0',
+        'md5': 'b6e8ab03f2bcc6e1f9e6cef25fcc03c4',
         'info_dict': {
-            'display_id': 'filme-im-mdr/wolfsland-die-traurigen-schwestern/mdr-fernsehen',
-            'id': '12172961',
-            'title': 'Wolfsland - Die traurigen Schwestern',
-            'description': r're:^Als der Polizeiobermeister Raaben',
-            'duration': 5241,
-            'thumbnail': 'https://api.ardmediathek.de/image-service/images/urn:ard:image:efa186f7b0054957',
-            'timestamp': 1670710500,
-            'upload_date': '20221210',
+            'display_id': 'Y3JpZDovL21kci5kZS9zZW5kdW5nLzI4MjA0MC80MjIwOTEtNDAyNTM0',
+            'id': '12939099',
+            'title': 'Liebe auf vier Pfoten',
+            'description': r're:^Claudia Schmitt, Anwältin in Salzburg',
+            'duration': 5222,
+            'thumbnail': 'https://api.ardmediathek.de/image-service/images/urn:ard:image:aee7cbf8f06de976?w=960&ch=ae4d0f2ee47d8b9b',
+            'timestamp': 1701343800,
+            'upload_date': '20231130',
             'ext': 'mp4',
-            'age_limit': 12,
-            'episode': 'Wolfsland - Die traurigen Schwestern',
-            'series': 'Filme im MDR'
+            'episode': 'Liebe auf vier Pfoten',
+            'series': 'Filme im MDR',
+            'age_limit': 0,
+            'channel': 'MDR',
+            '_old_archive_ids': ['ardbetamediathek Y3JpZDovL21kci5kZS9zZW5kdW5nLzI4MjA0MC80MjIwOTEtNDAyNTM0'],
         },
     }, {
         'url': 'https://www.ardmediathek.de/mdr/video/die-robuste-roswita/Y3JpZDovL21kci5kZS9iZWl0cmFnL2Ntcy84MWMxN2MzZC0wMjkxLTRmMzUtODk4ZS0wYzhlOWQxODE2NGI/',
@@ -450,11 +285,49 @@ class ARDBetaMediathekIE(ARDMediathekBaseIE):
             'timestamp': 1636398000,
             'description': 'md5:39578c7b96c9fe50afdf5674ad985e6b',
             'upload_date': '20211108',
-            'display_id': 'tagesschau-oder-tagesschau-20-00-uhr/das-erste',
+            'display_id': 'Y3JpZDovL2Rhc2Vyc3RlLmRlL3RhZ2Vzc2NoYXUvZmM4ZDUxMjgtOTE0ZC00Y2MzLTgzNzAtNDZkNGNiZWJkOTll',
             'duration': 915,
             'episode': 'tagesschau, 20:00 Uhr',
             'series': 'tagesschau',
-            'thumbnail': 'https://api.ardmediathek.de/image-service/images/urn:ard:image:fbb21142783b0a49',
+            'thumbnail': 'https://api.ardmediathek.de/image-service/images/urn:ard:image:fbb21142783b0a49?w=960&ch=ee69108ae344f678',
+            'channel': 'ARD-Aktuell',
+            '_old_archive_ids': ['ardbetamediathek Y3JpZDovL2Rhc2Vyc3RlLmRlL3RhZ2Vzc2NoYXUvZmM4ZDUxMjgtOTE0ZC00Y2MzLTgzNzAtNDZkNGNiZWJkOTll'],
+        },
+    }, {
+        'url': 'https://www.ardmediathek.de/video/7-tage/7-tage-unter-harten-jungs/hr-fernsehen/N2I2YmM5MzgtNWFlOS00ZGFlLTg2NzMtYzNjM2JlNjk4MDg3',
+        'md5': 'c428b9effff18ff624d4f903bda26315',
+        'info_dict': {
+            'id': '94834686',
+            'ext': 'mp4',
+            'duration': 2670,
+            'episode': '7 Tage ... unter harten Jungs',
+            'description': 'md5:0f215470dcd2b02f59f4bd10c963f072',
+            'upload_date': '20231005',
+            'timestamp': 1696491171,
+            'display_id': 'N2I2YmM5MzgtNWFlOS00ZGFlLTg2NzMtYzNjM2JlNjk4MDg3',
+            'series': '7 Tage ...',
+            'channel': 'HR',
+            'thumbnail': 'https://api.ardmediathek.de/image-service/images/urn:ard:image:430c86d233afa42d?w=960&ch=fa32ba69bc87989a',
+            'title': '7 Tage ... unter harten Jungs',
+            '_old_archive_ids': ['ardbetamediathek N2I2YmM5MzgtNWFlOS00ZGFlLTg2NzMtYzNjM2JlNjk4MDg3'],
+        },
+    }, {
+        'url': 'https://www.ardmediathek.de/video/lokalzeit-aus-duesseldorf/lokalzeit-aus-duesseldorf-oder-31-10-2024/wdr-duesseldorf/Y3JpZDovL3dkci5kZS9CZWl0cmFnLXNvcGhvcmEtOWFkMTc0ZWMtMDA5ZS00ZDEwLWFjYjctMGNmNTdhNzVmNzUz',
+        'info_dict': {
+            'id': '13847165',
+            'chapters': 'count:8',
+            'ext': 'mp4',
+            'channel': 'WDR',
+            'display_id': 'Y3JpZDovL3dkci5kZS9CZWl0cmFnLXNvcGhvcmEtOWFkMTc0ZWMtMDA5ZS00ZDEwLWFjYjctMGNmNTdhNzVmNzUz',
+            'episode': 'Lokalzeit aus Düsseldorf | 31.10.2024',
+            'series': 'Lokalzeit aus Düsseldorf',
+            'thumbnail': 'https://api.ardmediathek.de/image-service/images/urn:ard:image:f02ec9bd9b7bd5f6?w=960&ch=612491dcd5e09b0c',
+            'title': 'Lokalzeit aus Düsseldorf | 31.10.2024',
+            'upload_date': '20241031',
+            'timestamp': 1730399400,
+            'description': 'md5:12db30b3b706314efe3778b8df1a7058',
+            'duration': 1759,
+            '_old_archive_ids': ['ardbetamediathek Y3JpZDovL3dkci5kZS9CZWl0cmFnLXNvcGhvcmEtOWFkMTc0ZWMtMDA5ZS00ZDEwLWFjYjctMGNmNTdhNzVmNzUz'],
         },
     }, {
         'url': 'https://beta.ardmediathek.de/ard/video/Y3JpZDovL2Rhc2Vyc3RlLmRlL3RhdG9ydC9mYmM4NGM1NC0xNzU4LTRmZGYtYWFhZS0wYzcyZTIxNGEyMDE',
@@ -471,203 +344,260 @@ class ARDBetaMediathekIE(ARDMediathekBaseIE):
     }, {
         'url': 'https://www.ardmediathek.de/swr/live/Y3JpZDovL3N3ci5kZS8xMzQ4MTA0Mg',
         'only_matching': True,
+    }, {
+        'url': 'https://www.ardmediathek.de/video/coronavirus-update-ndr-info/astrazeneca-kurz-lockdown-und-pims-syndrom-81/ndr/Y3JpZDovL25kci5kZS84NzE0M2FjNi0wMWEwLTQ5ODEtOTE5NS1mOGZhNzdhOTFmOTI/',
+        'only_matching': True,
+    }]
+
+    def _extract_episode_info(self, title):
+        patterns = [
+            # Pattern for title like "Homo sapiens (S06/E07) - Originalversion"
+            # from: https://www.ardmediathek.de/one/sendung/doctor-who/Y3JpZDovL3dkci5kZS9vbmUvZG9jdG9yIHdobw
+            r'.*(?P<ep_info> \(S(?P<season_number>\d+)/E(?P<episode_number>\d+)\)).*',
+            # E.g.: title="Fritjof aus Norwegen (2) (AD)"
+            # from: https://www.ardmediathek.de/ard/sammlung/der-krieg-und-ich/68cMkqJdllm639Skj4c7sS/
+            r'.*(?P<ep_info> \((?:Folge |Teil )?(?P<episode_number>\d+)(?:/\d+)?\)).*',
+            r'.*(?P<ep_info>Folge (?P<episode_number>\d+)(?:\:| -|) )\"(?P<episode>.+)\".*',
+            # E.g.: title="Folge 25/42: Symmetrie"
+            # from: https://www.ardmediathek.de/ard/video/grips-mathe/folge-25-42-symmetrie/ard-alpha/Y3JpZDovL2JyLmRlL3ZpZGVvLzMyYzI0ZjczLWQ1N2MtNDAxNC05ZmZhLTFjYzRkZDA5NDU5OQ/
+            # E.g.: title="Folge 1063 - Vertrauen"
+            # from: https://www.ardmediathek.de/ard/sendung/die-fallers/Y3JpZDovL3N3ci5kZS8yMzAyMDQ4/
+            r'.*(?P<ep_info>Folge (?P<episode_number>\d+)(?:/\d+)?(?:\:| -|) ).*',
+            # As a fallback use the full title
+            r'(?P<title>.*)',
+        ]
+
+        return traverse_obj(patterns, (..., {functools.partial(re.match, string=title)}, {
+            'season_number': ('season_number', {int_or_none}),
+            'episode_number': ('episode_number', {int_or_none}),
+            'episode': ((
+                ('episode', {str_or_none}),
+                ('ep_info', {lambda x: title.replace(x, '')}),
+                ('title', {str}),
+            ), {str.strip}),
+        }), get_all=False)
+
+    def _real_extract(self, url):
+        display_id = self._match_id(url)
+        query = {'embedded': 'false', 'mcV6': 'true'}
+        headers = {}
+
+        if self._get_cookies(self._TOKEN_URL).get('ams'):
+            token = self._download_json(
+                self._TOKEN_URL, display_id, 'Fetching token for age verification',
+                'Unable to fetch age verification token', fatal=False)
+            id_token = traverse_obj(token, ('idToken', {str}))
+            decoded_token = traverse_obj(id_token, ({jwt_decode_hs256}, {dict}))
+            user_id = traverse_obj(decoded_token, (('user_id', 'sub'), {str}), get_all=False)
+            if not user_id:
+                self.report_warning('Unable to extract token, continuing without authentication')
+            else:
+                headers['x-authorization'] = f'Bearer {id_token}'
+                query['userId'] = user_id
+                if decoded_token.get('age_rating') != 18:
+                    self.report_warning('Account is not verified as 18+; video may be unavailable')
+
+        page_data = self._download_json(
+            f'https://api.ardmediathek.de/page-gateway/pages/ard/item/{display_id}',
+            display_id, query=query, headers=headers)
+
+        # For user convenience we use the old contentId instead of the longer crid
+        # Ref: https://github.com/yt-dlp/yt-dlp/issues/8731#issuecomment-1874398283
+        old_id = traverse_obj(page_data, ('tracking', 'atiCustomVars', 'contentId', {int}))
+        if old_id is not None:
+            video_id = str(old_id)
+            archive_ids = [make_archive_id(ARDBetaMediathekIE, display_id)]
+        else:
+            self.report_warning(f'Could not extract contentId{bug_reports_message()}')
+            video_id = display_id
+            archive_ids = None
+
+        player_data = traverse_obj(
+            page_data, ('widgets', lambda _, v: v['type'] in ('player_ondemand', 'player_live'), {dict}), get_all=False)
+        is_live = player_data.get('type') == 'player_live'
+        media_data = traverse_obj(player_data, ('mediaCollection', 'embedded', {dict}))
+
+        if player_data.get('blockedByFsk'):
+            self.raise_login_required('This video is only available for age verified users or after 22:00')
+
+        formats = []
+        subtitles = {}
+        for stream in traverse_obj(media_data, ('streams', ..., {dict})):
+            kind = stream.get('kind')
+            # Prioritize main stream over sign language and others
+            preference = 1 if kind == 'main' else None
+            for media in traverse_obj(stream, ('media', lambda _, v: url_or_none(v['url']))):
+                media_url = media['url']
+
+                audio_kind = traverse_obj(media, (
+                    'audios', 0, 'kind', {str}), default='').replace('standard', '')
+                lang_code = traverse_obj(media, ('audios', 0, 'languageCode', {str})) or 'deu'
+                lang = join_nonempty(lang_code, audio_kind)
+                language_preference = 10 if lang == 'deu' else -10
+
+                if determine_ext(media_url) == 'm3u8':
+                    fmts, subs = self._extract_m3u8_formats_and_subtitles(
+                        media_url, video_id, m3u8_id=f'hls-{kind}', preference=preference, fatal=False, live=is_live)
+                    for f in fmts:
+                        f['language'] = lang
+                        f['language_preference'] = language_preference
+                    formats.extend(fmts)
+                    self._merge_subtitles(subs, target=subtitles)
+                else:
+                    formats.append({
+                        'url': media_url,
+                        'format_id': f'http-{kind}',
+                        'preference': preference,
+                        'language': lang,
+                        'language_preference': language_preference,
+                        **traverse_obj(media, {
+                            'format_note': ('forcedLabel', {str}),
+                            'width': ('maxHResolutionPx', {int_or_none}),
+                            'height': ('maxVResolutionPx', {int_or_none}),
+                            'vcodec': ('videoCodec', {str}),
+                        }),
+                    })
+
+        for sub in traverse_obj(media_data, ('subtitles', ..., {dict})):
+            for sources in traverse_obj(sub, ('sources', lambda _, v: url_or_none(v['url']))):
+                subtitles.setdefault(sub.get('languageCode') or 'deu', []).append({
+                    'url': sources['url'],
+                    'ext': {'webvtt': 'vtt', 'ebutt': 'ttml'}.get(sources.get('kind')),
+                })
+
+        age_limit = traverse_obj(page_data, ('fskRating', {lambda x: remove_start(x, 'FSK')}, {int_or_none}))
+        return {
+            'id': video_id,
+            'display_id': display_id,
+            'formats': formats,
+            'subtitles': subtitles,
+            'is_live': is_live,
+            'age_limit': age_limit,
+            **traverse_obj(media_data, {
+                'chapters': ('pluginData', 'jumpmarks@all', 'chapterArray', lambda _, v: int_or_none(v['chapterTime']), {
+                    'start_time': ('chapterTime', {int_or_none}),
+                    'title': ('chapterTitle', {str}),
+                }),
+            }),
+            **traverse_obj(media_data, ('meta', {
+                'title': 'title',
+                'description': 'synopsis',
+                'timestamp': ('broadcastedOnDateTime', {parse_iso8601}),
+                'series': 'seriesTitle',
+                'thumbnail': ('images', 0, 'url', {url_or_none}),
+                'duration': ('durationSeconds', {int_or_none}),
+                'channel': 'clipSourceName',
+            })),
+            **self._extract_episode_info(page_data.get('title')),
+            '_old_archive_ids': archive_ids,
+        }
+
+
+class ARDMediathekCollectionIE(InfoExtractor):
+    _VALID_URL = r'''(?x)https?://
+        (?:(?:beta|www)\.)?ardmediathek\.de/
+        (?:[^/?#]+/)?
+        (?P<playlist>sendung|serie|sammlung)/
+        (?:(?P<display_id>[^?#]+?)/)?
+        (?P<id>[a-zA-Z0-9]+)
+        (?:/(?P<season>\d+)(?:/(?P<version>OV|AD))?)?/?(?:[?#]|$)'''
+    _GEO_COUNTRIES = ['DE']
+
+    _TESTS = [{
+        'url': 'https://www.ardmediathek.de/serie/quiz/staffel-1-originalversion/Y3JpZDovL3dkci5kZS9vbmUvcXVpeg/1/OV',
+        'info_dict': {
+            'id': 'Y3JpZDovL3dkci5kZS9vbmUvcXVpeg_1_OV',
+            'display_id': 'quiz/staffel-1-originalversion',
+            'title': 'Staffel 1 Originalversion',
+        },
+        'playlist_count': 3,
+    }, {
+        'url': 'https://www.ardmediathek.de/serie/babylon-berlin/staffel-4-mit-audiodeskription/Y3JpZDovL2Rhc2Vyc3RlLmRlL2JhYnlsb24tYmVybGlu/4/AD',
+        'info_dict': {
+            'id': 'Y3JpZDovL2Rhc2Vyc3RlLmRlL2JhYnlsb24tYmVybGlu_4_AD',
+            'display_id': 'babylon-berlin/staffel-4-mit-audiodeskription',
+            'title': 'Staffel 4 mit Audiodeskription',
+        },
+        'playlist_count': 12,
+    }, {
+        'url': 'https://www.ardmediathek.de/serie/babylon-berlin/staffel-1/Y3JpZDovL2Rhc2Vyc3RlLmRlL2JhYnlsb24tYmVybGlu/1/',
+        'info_dict': {
+            'id': 'Y3JpZDovL2Rhc2Vyc3RlLmRlL2JhYnlsb24tYmVybGlu_1',
+            'display_id': 'babylon-berlin/staffel-1',
+            'title': 'Staffel 1',
+        },
+        'playlist_count': 8,
+    }, {
+        'url': 'https://www.ardmediathek.de/sendung/tatort/Y3JpZDovL2Rhc2Vyc3RlLmRlL3RhdG9ydA',
+        'info_dict': {
+            'id': 'Y3JpZDovL2Rhc2Vyc3RlLmRlL3RhdG9ydA',
+            'display_id': 'tatort',
+            'title': 'Tatort',
+        },
+        'playlist_mincount': 500,
+    }, {
+        'url': 'https://www.ardmediathek.de/sammlung/die-kirche-bleibt-im-dorf/5eOHzt8XB2sqeFXbIoJlg2',
+        'info_dict': {
+            'id': '5eOHzt8XB2sqeFXbIoJlg2',
+            'display_id': 'die-kirche-bleibt-im-dorf',
+            'title': 'Die Kirche bleibt im Dorf',
+            'description': 'Die Kirche bleibt im Dorf',
+        },
+        'playlist_count': 4,
     }, {
         # playlist of type 'sendung'
         'url': 'https://www.ardmediathek.de/ard/sendung/doctor-who/Y3JpZDovL3dkci5kZS9vbmUvZG9jdG9yIHdobw/',
         'only_matching': True,
+    }, {
+        # playlist of type 'serie'
+        'url': 'https://www.ardmediathek.de/serie/nachtstreife/staffel-1/Y3JpZDovL3N3ci5kZS9zZGIvc3RJZC8xMjQy/1',
+        'only_matching': True,
     }, {
         # playlist of type 'sammlung'
         'url': 'https://www.ardmediathek.de/ard/sammlung/team-muenster/5JpTzLSbWUAK8184IOvEir/',
         'only_matching': True,
-    }, {
-        'url': 'https://www.ardmediathek.de/video/coronavirus-update-ndr-info/astrazeneca-kurz-lockdown-und-pims-syndrom-81/ndr/Y3JpZDovL25kci5kZS84NzE0M2FjNi0wMWEwLTQ5ODEtOTE5NS1mOGZhNzdhOTFmOTI/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.ardmediathek.de/ard/player/Y3JpZDovL3dkci5kZS9CZWl0cmFnLWQ2NDJjYWEzLTMwZWYtNGI4NS1iMTI2LTU1N2UxYTcxOGIzOQ/tatort-duo-koeln-leipzig-ihr-kinderlein-kommet',
-        'only_matching': True,
     }]
 
-    def _ARD_load_playlist_snipped(self, playlist_id, display_id, client, mode, pageNumber):
-        """ Query the ARD server for playlist information
-        and returns the data in "raw" format """
-        if mode == 'sendung':
-            graphQL = json.dumps({
-                'query': '''{
-                    showPage(
-                        client: "%s"
-                        showId: "%s"
-                        pageNumber: %d
-                    ) {
-                        pagination {
-                            pageSize
-                            totalElements
-                        }
-                        teasers {        # Array
-                            mediumTitle
-                            links { target { id href title } }
-                            type
-                        }
-                    }}''' % (client, playlist_id, pageNumber),
-            }).encode()
-        else:  # mode == 'sammlung'
-            graphQL = json.dumps({
-                'query': '''{
-                    morePage(
-                        client: "%s"
-                        compilationId: "%s"
-                        pageNumber: %d
-                    ) {
-                        widget {
-                            pagination {
-                                pageSize
-                                totalElements
-                            }
-                            teasers {        # Array
-                                mediumTitle
-                                links { target { id href title } }
-                                type
-                            }
-                        }
-                    }}''' % (client, playlist_id, pageNumber),
-            }).encode()
-        # Ressources for ARD graphQL debugging:
-        # https://api-test.ardmediathek.de/public-gateway
-        show_page = self._download_json(
-            'https://api.ardmediathek.de/public-gateway',
-            '[Playlist] %s' % display_id,
-            data=graphQL,
-            headers={'Content-Type': 'application/json'})['data']
-        # align the structure of the returned data:
-        if mode == 'sendung':
-            show_page = show_page['showPage']
-        else:  # mode == 'sammlung'
-            show_page = show_page['morePage']['widget']
-        return show_page
-
-    def _ARD_extract_playlist(self, url, playlist_id, display_id, client, mode):
-        """ Collects all playlist entries and returns them as info dict.
-        Supports playlists of mode 'sendung' and 'sammlung', and also nested
-        playlists. """
-        entries = []
-        pageNumber = 0
-        while True:  # iterate by pageNumber
-            show_page = self._ARD_load_playlist_snipped(
-                playlist_id, display_id, client, mode, pageNumber)
-            for teaser in show_page['teasers']:  # process playlist items
-                if '/compilation/' in teaser['links']['target']['href']:
-                    # alternativ cond.: teaser['type'] == "compilation"
-                    # => This is an nested compilation, e.g. like:
-                    # https://www.ardmediathek.de/ard/sammlung/die-kirche-bleibt-im-dorf/5eOHzt8XB2sqeFXbIoJlg2/
-                    link_mode = 'sammlung'
-                else:
-                    link_mode = 'video'
-
-                item_url = 'https://www.ardmediathek.de/%s/%s/%s/%s/%s' % (
-                    client, link_mode, display_id,
-                    # perform HTLM quoting of episode title similar to ARD:
-                    re.sub('^-|-$', '',  # remove '-' from begin/end
-                           re.sub('[^a-zA-Z0-9]+', '-',  # replace special chars by -
-                                  teaser['links']['target']['title'].lower()
-                                  .replace('ä', 'ae').replace('ö', 'oe')
-                                  .replace('ü', 'ue').replace('ß', 'ss'))),
-                    teaser['links']['target']['id'])
-                entries.append(self.url_result(
-                    item_url,
-                    ie=ARDBetaMediathekIE.ie_key()))
-
-            if (show_page['pagination']['pageSize'] * (pageNumber + 1)
-               >= show_page['pagination']['totalElements']):
-                # we've processed enough pages to get all playlist entries
-                break
-            pageNumber = pageNumber + 1
-
-        return self.playlist_result(entries, playlist_id, playlist_title=display_id)
+    _PAGE_SIZE = 100
 
     def _real_extract(self, url):
-        video_id, display_id, playlist_type, client, season_number = self._match_valid_url(url).group(
-            'id', 'display_id', 'playlist', 'client', 'season')
-        display_id, client = display_id or video_id, client or 'ard'
+        playlist_id, display_id, playlist_type, season_number, version = self._match_valid_url(url).group(
+            'id', 'display_id', 'playlist', 'season', 'version')
 
-        if playlist_type:
-            # TODO: Extract only specified season
-            return self._ARD_extract_playlist(url, video_id, display_id, client, playlist_type)
+        def call_api(page_num):
+            api_path = 'compilations/ard' if playlist_type == 'sammlung' else 'widgets/ard/asset'
+            return self._download_json(
+                f'https://api.ardmediathek.de/page-gateway/{api_path}/{playlist_id}', playlist_id,
+                f'Downloading playlist page {page_num}', query={
+                    'pageNumber': page_num,
+                    'pageSize': self._PAGE_SIZE,
+                    **({
+                        'seasoned': 'true',
+                        'seasonNumber': season_number,
+                        'withOriginalversion': 'true' if version == 'OV' else 'false',
+                        'withAudiodescription': 'true' if version == 'AD' else 'false',
+                    } if season_number else {}),
+                })
 
-        player_page = self._download_json(
-            'https://api.ardmediathek.de/public-gateway',
-            display_id, data=json.dumps({
-                'query': '''{
-  playerPage(client:"%s", clipId: "%s") {
-    blockedByFsk
-    broadcastedOn
-    maturityContentRating
-    mediaCollection {
-      _duration
-      _geoblocked
-      _isLive
-      _mediaArray {
-        _mediaStreamArray {
-          _quality
-          _server
-          _stream
-        }
-      }
-      _previewImage
-      _subtitleUrl
-      _type
-    }
-    show {
-      title
-    }
-    image {
-      src
-    }
-    synopsis
-    title
-    tracking {
-      atiCustomVars {
-        contentId
-      }
-    }
-  }
-}''' % (client, video_id),
-            }).encode(), headers={
-                'Content-Type': 'application/json'
-            })['data']['playerPage']
-        title = player_page['title']
-        content_id = str_or_none(try_get(
-            player_page, lambda x: x['tracking']['atiCustomVars']['contentId']))
-        media_collection = player_page.get('mediaCollection') or {}
-        if not media_collection and content_id:
-            media_collection = self._download_json(
-                'https://www.ardmediathek.de/play/media/' + content_id,
-                content_id, fatal=False) or {}
-        info = self._parse_media_info(
-            media_collection, content_id or video_id,
-            player_page.get('blockedByFsk'))
-        age_limit = None
-        description = player_page.get('synopsis')
-        maturity_content_rating = player_page.get('maturityContentRating')
-        if maturity_content_rating:
-            age_limit = int_or_none(maturity_content_rating.lstrip('FSK'))
-        if not age_limit and description:
-            age_limit = int_or_none(self._search_regex(
-                r'\(FSK\s*(\d+)\)\s*$', description, 'age limit', default=None))
-        info.update({
-            'age_limit': age_limit,
-            'display_id': display_id,
-            'title': title,
-            'description': description,
-            'timestamp': unified_timestamp(player_page.get('broadcastedOn')),
-            'series': try_get(player_page, lambda x: x['show']['title']),
-            'thumbnail': (media_collection.get('_previewImage')
-                          or try_get(player_page, lambda x: update_url(x['image']['src'], query=None, fragment=None))
-                          or self.get_thumbnail_from_html(display_id, url)),
-        })
-        info.update(self._ARD_extract_episode_info(info['title']))
-        return info
+        def fetch_page(page_num):
+            for item in traverse_obj(call_api(page_num), ('teasers', ..., {dict})):
+                item_id = traverse_obj(item, ('links', 'target', ('urlId', 'id')), 'id', get_all=False)
+                if not item_id or item_id == playlist_id:
+                    continue
+                item_mode = 'sammlung' if item.get('type') == 'compilation' else 'video'
+                yield self.url_result(
+                    f'https://www.ardmediathek.de/{item_mode}/{item_id}',
+                    ie=(ARDMediathekCollectionIE if item_mode == 'sammlung' else ARDBetaMediathekIE),
+                    **traverse_obj(item, {
+                        'id': ('id', {str}),
+                        'title': ('longTitle', {str}),
+                        'duration': ('duration', {int_or_none}),
+                        'timestamp': ('broadcastedOn', {parse_iso8601}),
+                    }))
 
-    def get_thumbnail_from_html(self, display_id, url):
-        webpage = self._download_webpage(url, display_id, fatal=False) or ''
-        return (
-            self._og_search_thumbnail(webpage, default=None)
-            or self._html_search_meta('thumbnailUrl', webpage, default=None))
+        page_data = call_api(0)
+        full_id = join_nonempty(playlist_id, season_number, version, delim='_')
+
+        return self.playlist_result(
+            OnDemandPagedList(fetch_page, self._PAGE_SIZE), full_id, display_id=display_id,
+            title=page_data.get('title'), description=page_data.get('synopsis'))
diff --git a/plugins/youtube_download/yt_dlp/extractor/arkena.py b/plugins/youtube_download/yt_dlp/extractor/arkena.py
index de36ec8..aa6c5ca 100644
--- a/plugins/youtube_download/yt_dlp/extractor/arkena.py
+++ b/plugins/youtube_download/yt_dlp/extractor/arkena.py
@@ -64,7 +64,7 @@ class ArkenaIE(InfoExtractor):
                 raise ExtractorError('Invalid URL', expected=True)
 
         media = self._download_json(
-            'https://video.qbrick.com/api/v1/public/accounts/%s/medias/%s' % (account_id, video_id),
+            f'https://video.qbrick.com/api/v1/public/accounts/{account_id}/medias/{video_id}',
             video_id, query={
                 # https://video.qbrick.com/docs/api/examples/library-api.html
                 'fields': 'asset/resources/*/renditions/*(height,id,language,links/*(href,mimeType),type,size,videos/*(audios/*(codec,sampleRate),bitrate,codec,duration,height,width),width),created,metadata/*(title,description),tags',
@@ -131,8 +131,8 @@ class ArkenaIE(InfoExtractor):
                             formats.extend(self._extract_f4m_formats(
                                 href, video_id, f4m_id='hds', fatal=False))
                         elif mime_type == 'application/dash+xml':
-                            formats.extend(self._extract_f4m_formats(
-                                href, video_id, f4m_id='hds', fatal=False))
+                            formats.extend(self._extract_mpd_formats(
+                                href, video_id, mpd_id='dash', fatal=False))
                         elif mime_type == 'application/vnd.ms-sstr+xml':
                             formats.extend(self._extract_ism_formats(
                                 href, video_id, ism_id='mss', fatal=False))
diff --git a/plugins/youtube_download/yt_dlp/extractor/arnes.py b/plugins/youtube_download/yt_dlp/extractor/arnes.py
index a493714..f196f61 100644
--- a/plugins/youtube_download/yt_dlp/extractor/arnes.py
+++ b/plugins/youtube_download/yt_dlp/extractor/arnes.py
@@ -1,11 +1,9 @@
+import urllib.parse
+
 from .common import InfoExtractor
-from ..compat import (
-    compat_parse_qs,
-    compat_urllib_parse_urlparse,
-)
 from ..utils import (
-    format_field,
     float_or_none,
+    format_field,
     int_or_none,
     parse_iso8601,
     remove_start,
@@ -35,7 +33,7 @@ class ArnesIE(InfoExtractor):
             'view_count': int,
             'tags': ['linearna_algebra'],
             'start_time': 10,
-        }
+        },
     }, {
         'url': 'https://video.arnes.si/api/asset/s1YjnV7hadlC/play.mp4',
         'only_matching': True,
@@ -93,6 +91,6 @@ class ArnesIE(InfoExtractor):
             'duration': float_or_none(video.get('duration'), 1000),
             'view_count': int_or_none(video.get('views')),
             'tags': video.get('hashtags'),
-            'start_time': int_or_none(compat_parse_qs(
-                compat_urllib_parse_urlparse(url).query).get('t', [None])[0]),
+            'start_time': int_or_none(urllib.parse.parse_qs(
+                urllib.parse.urlparse(url).query).get('t', [None])[0]),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/art19.py b/plugins/youtube_download/yt_dlp/extractor/art19.py
new file mode 100644
index 0000000..deec7ad
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/art19.py
@@ -0,0 +1,303 @@
+import re
+
+from .common import InfoExtractor
+from ..utils import float_or_none, int_or_none, parse_iso8601, url_or_none
+from ..utils.traversal import traverse_obj
+
+
+class Art19IE(InfoExtractor):
+    _UUID_REGEX = r'[\da-f]{8}-?[\da-f]{4}-?[\da-f]{4}-?[\da-f]{4}-?[\da-f]{12}'
+    _VALID_URL = [
+        rf'https?://(?:www\.)?art19\.com/shows/[^/#?]+/episodes/(?P<id>{_UUID_REGEX})',
+        rf'https?://rss\.art19\.com/episodes/(?P<id>{_UUID_REGEX})\.mp3',
+    ]
+    _EMBED_REGEX = [rf'<iframe[^>]+\bsrc=[\'"](?P<url>{_VALID_URL[0]})']
+
+    _TESTS = [{
+        'url': 'https://rss.art19.com/episodes/5ba1413c-48b8-472b-9cc3-cfd952340bdb.mp3',
+        'info_dict': {
+            'id': '5ba1413c-48b8-472b-9cc3-cfd952340bdb',
+            'ext': 'mp3',
+            'title': 'Why Did DeSantis Drop Out?',
+            'series': 'The Daily Briefing',
+            'release_timestamp': 1705941275,
+            'description': 'md5:da38961da4a3f7e419471365e3c6b49f',
+            'episode': 'Episode 582',
+            'thumbnail': r're:^https?://content\.production\.cdn\.art19\.com.*\.jpeg$',
+            'series_id': 'ed52a0ab-08b1-4def-8afc-549e4d93296d',
+            'upload_date': '20240122',
+            'timestamp': 1705940815,
+            'episode_number': 582,
+            'modified_date': '20240122',
+            'episode_id': '5ba1413c-48b8-472b-9cc3-cfd952340bdb',
+            'modified_timestamp': 1705941275,
+            'release_date': '20240122',
+            'duration': 527.4,
+        },
+    }, {
+        'url': 'https://art19.com/shows/scamfluencers/episodes/8319b776-4153-4d22-8630-631f204a03dd',
+        'info_dict': {
+            'id': '8319b776-4153-4d22-8630-631f204a03dd',
+            'ext': 'mp3',
+            'title': 'Martha Stewart: The Homemaker Hustler Part 2',
+            'modified_date': '20240116',
+            'upload_date': '20240105',
+            'modified_timestamp': 1705435802,
+            'episode_id': '8319b776-4153-4d22-8630-631f204a03dd',
+            'series_id': 'd3c9b8ca-26b3-42f4-9bd8-21d1a9031e75',
+            'thumbnail': r're:^https?://content\.production\.cdn\.art19\.com.*\.jpeg$',
+            'description': 'md5:4aa7cfd1358dc57e729835bc208d7893',
+            'release_timestamp': 1705305660,
+            'release_date': '20240115',
+            'timestamp': 1704481536,
+            'episode_number': 88,
+            'series': 'Scamfluencers',
+            'duration': 2588.37501,
+            'episode': 'Episode 88',
+        },
+    }]
+    _WEBPAGE_TESTS = [{
+        'url': 'https://www.nu.nl/formule-1/6291456/verstappen-wordt-een-synoniem-voor-formule-1.html',
+        'info_dict': {
+            'id': '7d42626a-7301-47db-bb8a-3b6f054d77d7',
+            'ext': 'mp3',
+            'title': "'Verstappen wordt een synoniem voor Formule 1'",
+            'season': 'Seizoen 6',
+            'description': 'md5:39a7159a31c4cda312b2e893bdd5c071',
+            'episode_id': '7d42626a-7301-47db-bb8a-3b6f054d77d7',
+            'duration': 3061.82111,
+            'series_id': '93f4e113-2a60-4609-a564-755058fa40d8',
+            'release_date': '20231126',
+            'modified_timestamp': 1701156004,
+            'thumbnail': r're:^https?://content\.production\.cdn\.art19\.com.*\.jpeg$',
+            'season_number': 6,
+            'episode_number': 52,
+            'modified_date': '20231128',
+            'upload_date': '20231126',
+            'timestamp': 1701025981,
+            'season_id': '36097c1e-7455-490d-a2fe-e2f10b4d5f26',
+            'series': 'De Boordradio',
+            'release_timestamp': 1701026308,
+            'episode': 'Episode 52',
+        },
+    }, {
+        'url': 'https://www.wishtv.com/podcast-episode/larry-bucshon-announces-retirement-from-congress/',
+        'info_dict': {
+            'id': '8da368bd-08d1-46d0-afaa-c134a4af7dc0',
+            'ext': 'mp3',
+            'title': 'Larry Bucshon announces retirement from congress',
+            'upload_date': '20240115',
+            'episode_number': 148,
+            'episode': 'Episode 148',
+            'thumbnail': r're:^https?://content\.production\.cdn\.art19\.com.*\.jpeg$',
+            'release_date': '20240115',
+            'timestamp': 1705328205,
+            'release_timestamp': 1705329275,
+            'series': 'All INdiana Politics',
+            'modified_date': '20240117',
+            'modified_timestamp': 1705458901,
+            'series_id': 'c4af6c27-b10f-4ff2-9f84-0f407df86ff1',
+            'episode_id': '8da368bd-08d1-46d0-afaa-c134a4af7dc0',
+            'description': 'md5:53b5239e4d14973a87125c217c255b2a',
+            'duration': 1256.18848,
+        },
+    }]
+
+    @classmethod
+    def _extract_embed_urls(cls, url, webpage):
+        yield from super()._extract_embed_urls(url, webpage)
+        for episode_id in re.findall(
+                rf'<div[^>]+\bclass=[\'"][^\'"]*art19-web-player[^\'"]*[\'"][^>]+\bdata-episode-id=[\'"]({cls._UUID_REGEX})[\'"]', webpage):
+            yield f'https://rss.art19.com/episodes/{episode_id}.mp3'
+
+    def _real_extract(self, url):
+        episode_id = self._match_id(url)
+
+        player_metadata = self._download_json(
+            f'https://art19.com/episodes/{episode_id}', episode_id,
+            note='Downloading player metadata', fatal=False,
+            headers={'Accept': 'application/vnd.art19.v0+json'})
+        rss_metadata = self._download_json(
+            f'https://rss.art19.com/episodes/{episode_id}.json', episode_id, fatal=False,
+            note='Downloading RSS metadata')
+
+        formats = [{
+            'format_id': 'direct',
+            'url': f'https://rss.art19.com/episodes/{episode_id}.mp3',
+            'vcodec': 'none',
+            'acodec': 'mp3',
+        }]
+        for fmt_id, fmt_data in traverse_obj(rss_metadata, ('content', 'media', {dict.items}, ...)):
+            if fmt_id == 'waveform_bin':
+                continue
+            fmt_url = traverse_obj(fmt_data, ('url', {url_or_none}))
+            if not fmt_url:
+                continue
+            formats.append({
+                'format_id': fmt_id,
+                'url': fmt_url,
+                'vcodec': 'none',
+                'acodec': fmt_id,
+                'quality': -2 if fmt_id == 'ogg' else -1,
+            })
+
+        return {
+            'id': episode_id,
+            'formats': formats,
+            **traverse_obj(player_metadata, ('episode', {
+                'title': ('title', {str}),
+                'description': ('description_plain', {str}),
+                'episode_id': ('id', {str}),
+                'episode_number': ('episode_number', {int_or_none}),
+                'season_id': ('season_id', {str}),
+                'series_id': ('series_id', {str}),
+                'timestamp': ('created_at', {parse_iso8601}),
+                'release_timestamp': ('released_at', {parse_iso8601}),
+                'modified_timestamp': ('updated_at', {parse_iso8601}),
+            })),
+            **traverse_obj(rss_metadata, ('content', {
+                'title': ('episode_title', {str}),
+                'description': ('episode_description_plain', {str}),
+                'episode_id': ('episode_id', {str}),
+                'episode_number': ('episode_number', {int_or_none}),
+                'season': ('season_title', {str}),
+                'season_id': ('season_id', {str}),
+                'season_number': ('season_number', {int_or_none}),
+                'series': ('series_title', {str}),
+                'series_id': ('series_id', {str}),
+                'thumbnail': ('cover_image', {url_or_none}),
+                'duration': ('duration', {float_or_none}),
+            })),
+        }
+
+
+class Art19ShowIE(InfoExtractor):
+    _VALID_URL_BASE = r'https?://(?:www\.)?art19\.com/shows/(?P<id>[\w-]+)(?:/embed)?/?'
+    _VALID_URL = [
+        rf'{_VALID_URL_BASE}(?:$|[#?])',
+        r'https?://rss\.art19\.com/(?P<id>[\w-]+)/?(?:$|[#?])',
+    ]
+    _EMBED_REGEX = [rf'<iframe[^>]+\bsrc=[\'"](?P<url>{_VALID_URL_BASE}[^\'"])']
+
+    _TESTS = [{
+        'url': 'https://www.art19.com/shows/5898c087-a14f-48dc-b6fc-a2280a1ff6e0/',
+        'info_dict': {
+            '_type': 'playlist',
+            'id': '5898c087-a14f-48dc-b6fc-a2280a1ff6e0',
+            'display_id': 'echt-gebeurd',
+            'title': 'Echt Gebeurd',
+            'description': 'md5:5fd11dc80b76e51ffd34b6067fd5e560',
+            'timestamp': 1492642167,
+            'upload_date': '20170419',
+            'modified_timestamp': int,
+            'modified_date': str,
+            'tags': 'count:7',
+        },
+        'playlist_mincount': 425,
+    }, {
+        'url': 'https://www.art19.com/shows/echt-gebeurd',
+        'info_dict': {
+            '_type': 'playlist',
+            'id': '5898c087-a14f-48dc-b6fc-a2280a1ff6e0',
+            'display_id': 'echt-gebeurd',
+            'title': 'Echt Gebeurd',
+            'description': 'md5:5fd11dc80b76e51ffd34b6067fd5e560',
+            'timestamp': 1492642167,
+            'upload_date': '20170419',
+            'modified_timestamp': int,
+            'modified_date': str,
+            'tags': 'count:7',
+        },
+        'playlist_mincount': 425,
+    }, {
+        'url': 'https://rss.art19.com/scamfluencers',
+        'info_dict': {
+            '_type': 'playlist',
+            'id': 'd3c9b8ca-26b3-42f4-9bd8-21d1a9031e75',
+            'display_id': 'scamfluencers',
+            'title': 'Scamfluencers',
+            'description': 'md5:7d239d670c0ced6dadbf71c4caf764b7',
+            'timestamp': 1647368573,
+            'upload_date': '20220315',
+            'modified_timestamp': int,
+            'modified_date': str,
+            'tags': [],
+        },
+        'playlist_mincount': 90,
+    }, {
+        'url': 'https://art19.com/shows/enthuellt/embed',
+        'info_dict': {
+            '_type': 'playlist',
+            'id': 'e2cacf57-bb8a-4263-aa81-719bcdd4f80c',
+            'display_id': 'enthuellt',
+            'title': 'Enthüllt',
+            'description': 'md5:17752246643414a2fd51744fc9a1c08e',
+            'timestamp': 1601645860,
+            'upload_date': '20201002',
+            'modified_timestamp': int,
+            'modified_date': str,
+            'tags': 'count:10',
+        },
+        'playlist_mincount': 10,
+    }]
+    _WEBPAGE_TESTS = [{
+        'url': 'https://deconstructingyourself.com/deconstructing-yourself-podcast',
+        'info_dict': {
+            '_type': 'playlist',
+            'id': 'cfbb9b01-c295-4adb-8726-adde7c03cf21',
+            'display_id': 'deconstructing-yourself',
+            'title': 'Deconstructing Yourself',
+            'description': 'md5:dab5082b28b248a35476abf64768854d',
+            'timestamp': 1570581181,
+            'upload_date': '20191009',
+            'modified_timestamp': int,
+            'modified_date': str,
+            'tags': 'count:5',
+        },
+        'playlist_mincount': 80,
+    }, {
+        'url': 'https://chicagoreader.com/columns-opinion/podcasts/ben-joravsky-show-podcast-episodes/',
+        'info_dict': {
+            '_type': 'playlist',
+            'id': '9dfa2c37-ab87-4c13-8388-4897914313ec',
+            'display_id': 'the-ben-joravsky-show',
+            'title': 'The Ben Joravsky Show',
+            'description': 'md5:c0f3ec0ee0dbea764390e521adc8780a',
+            'timestamp': 1550875095,
+            'upload_date': '20190222',
+            'modified_timestamp': int,
+            'modified_date': str,
+            'tags': ['Chicago Politics', 'chicago', 'Ben Joravsky'],
+        },
+        'playlist_mincount': 1900,
+    }]
+
+    @classmethod
+    def _extract_embed_urls(cls, url, webpage):
+        yield from super()._extract_embed_urls(url, webpage)
+        for series_id in re.findall(
+                r'<div[^>]+\bclass=[\'"][^\'"]*art19-web-player[^\'"]*[\'"][^>]+\bdata-series-id=[\'"]([\w-]+)[\'"]', webpage):
+            yield f'https://art19.com/shows/{series_id}'
+
+    def _real_extract(self, url):
+        series_id = self._match_id(url)
+        series_metadata = self._download_json(
+            f'https://art19.com/series/{series_id}', series_id, note='Downloading series metadata',
+            headers={'Accept': 'application/vnd.art19.v0+json'})
+
+        return {
+            '_type': 'playlist',
+            'entries': [
+                self.url_result(f'https://rss.art19.com/episodes/{episode_id}.mp3', Art19IE)
+                for episode_id in traverse_obj(series_metadata, ('series', 'episode_ids', ..., {str}))
+            ],
+            **traverse_obj(series_metadata, ('series', {
+                'id': ('id', {str}),
+                'display_id': ('slug', {str}),
+                'title': ('title', {str}),
+                'description': ('description_plain', {str}),
+                'timestamp': ('created_at', {parse_iso8601}),
+                'modified_timestamp': ('updated_at', {parse_iso8601}),
+            })),
+            'tags': traverse_obj(series_metadata, ('tags', ..., 'name', {str})),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/arte.py b/plugins/youtube_download/yt_dlp/extractor/arte.py
index e3cc5af..142d4b0 100644
--- a/plugins/youtube_download/yt_dlp/extractor/arte.py
+++ b/plugins/youtube_download/yt_dlp/extractor/arte.py
@@ -5,6 +5,7 @@ from ..utils import (
     ExtractorError,
     GeoRestrictedError,
     int_or_none,
+    join_nonempty,
     parse_iso8601,
     parse_qs,
     strip_or_none,
@@ -19,46 +20,22 @@ class ArteTVBaseIE(InfoExtractor):
 
 
 class ArteTVIE(ArteTVBaseIE):
-    _VALID_URL = r'''(?x)
+    _VALID_URL = rf'''(?x)
                     (?:https?://
                         (?:
-                            (?:www\.)?arte\.tv/(?P<lang>%(langs)s)/videos|
-                            api\.arte\.tv/api/player/v\d+/config/(?P<lang_2>%(langs)s)
+                            (?:www\.)?arte\.tv/(?P<lang>{ArteTVBaseIE._ARTE_LANGUAGES})/videos|
+                            api\.arte\.tv/api/player/v\d+/config/(?P<lang_2>{ArteTVBaseIE._ARTE_LANGUAGES})
                         )
                     |arte://program)
-                        /(?P<id>\d{6}-\d{3}-[AF]|LIVE)
-                    ''' % {'langs': ArteTVBaseIE._ARTE_LANGUAGES}
+                        /(?P<id>\d{{6}}-\d{{3}}-[AF]|LIVE)
+                    '''
     _TESTS = [{
         'url': 'https://www.arte.tv/en/videos/088501-000-A/mexico-stealing-petrol-to-survive/',
         'only_matching': True,
-    }, {
-        'url': 'https://www.arte.tv/pl/videos/100103-000-A/usa-dyskryminacja-na-porodowce/',
-        'info_dict': {
-            'id': '100103-000-A',
-            'title': 'USA: Dyskryminacja na porodówce',
-            'description': 'md5:242017b7cce59ffae340a54baefcafb1',
-            'alt_title': 'ARTE Reportage',
-            'upload_date': '20201103',
-            'duration': 554,
-            'thumbnail': r're:https://api-cdn\.arte\.tv/.+940x530',
-            'timestamp': 1604417980,
-            'ext': 'mp4',
-        },
-        'params': {'skip_download': 'm3u8'}
     }, {
         'note': 'No alt_title',
         'url': 'https://www.arte.tv/fr/videos/110371-000-A/la-chaleur-supplice-des-arbres-de-rue/',
-        'info_dict': {
-            'id': '110371-000-A',
-            'ext': 'mp4',
-            'upload_date': '20220718',
-            'duration': 154,
-            'timestamp': 1658162460,
-            'description': 'md5:5890f36fe7dccfadb8b7c0891de54786',
-            'title': 'La chaleur, supplice des arbres de rue',
-            'thumbnail': 'https://api-cdn.arte.tv/img/v2/image/CPE2sQDtD8GLQgt8DuYHLf/940x530',
-        },
-        'params': {'skip_download': 'm3u8'}
+        'only_matching': True,
     }, {
         'url': 'https://api.arte.tv/api/player/v2/config/de/100605-013-A',
         'only_matching': True,
@@ -67,19 +44,38 @@ class ArteTVIE(ArteTVBaseIE):
         'only_matching': True,
     }, {
         'url': 'https://www.arte.tv/de/videos/110203-006-A/zaz/',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.arte.tv/fr/videos/109067-000-A/la-loi-de-teheran/',
         'info_dict': {
-            'id': '110203-006-A',
-            'chapters': 'count:16',
-            'description': 'md5:cf592f1df52fe52007e3f8eac813c084',
-            'alt_title': 'Zaz',
-            'title': 'Baloise Session 2022',
-            'timestamp': 1668445200,
-            'duration': 4054,
-            'thumbnail': 'https://api-cdn.arte.tv/img/v2/image/ubQjmVCGyRx3hmBuZEK9QZ/940x530',
-            'upload_date': '20221114',
+            'id': '109067-000-A',
+            'ext': 'mp4',
+            'description': 'md5:d2ca367b8ecee028dddaa8bd1aebc739',
+            'timestamp': 1713927600,
+            'thumbnail': 'https://api-cdn.arte.tv/img/v2/image/3rR6PLzfbigSkkeHtkCZNF/940x530',
+            'duration': 7599,
+            'title': 'La loi de Téhéran',
+            'upload_date': '20240424',
+            'subtitles': {
+                'fr': 'mincount:1',
+                'fr-acc': 'mincount:1',
+                'fr-forced': 'mincount:1',
+            },
+        },
+    }, {
+        'note': 'age-restricted',
+        'url': 'https://www.arte.tv/de/videos/006785-000-A/the-element-of-crime/',
+        'info_dict': {
+            'id': '006785-000-A',
+            'description': 'md5:c2f94fdfefc8a280e4dab68ab96ab0ba',
+            'title': 'The Element of Crime',
+            'timestamp': 1696111200,
+            'duration': 5849,
+            'thumbnail': 'https://api-cdn.arte.tv/img/v2/image/q82dTTfyuCXupPsGxXsd7B/940x530',
+            'upload_date': '20230930',
             'ext': 'mp4',
         },
-        'expected_warnings': ['geo restricted']
+        'skip': '404 Not Found',
     }]
 
     _GEO_BYPASS = True
@@ -130,13 +126,27 @@ class ArteTVIE(ArteTVBaseIE):
         ),
     }
 
+    @staticmethod
+    def _fix_accessible_subs_locale(subs):
+        updated_subs = {}
+        for lang, sub_formats in subs.items():
+            for fmt in sub_formats:
+                url = fmt.get('url') or ''
+                suffix = ('acc' if url.endswith('-MAL.m3u8')
+                          else 'forced' if '_VO' not in url
+                          else None)
+                updated_subs.setdefault(join_nonempty(lang, suffix), []).append(fmt)
+        return updated_subs
+
     def _real_extract(self, url):
         mobj = self._match_valid_url(url)
         video_id = mobj.group('id')
         lang = mobj.group('lang') or mobj.group('lang_2')
-        langauge_code = self._LANG_MAP.get(lang)
+        language_code = self._LANG_MAP.get(lang)
 
-        config = self._download_json(f'{self._API_BASE}/config/{lang}/{video_id}', video_id)
+        config = self._download_json(f'{self._API_BASE}/config/{lang}/{video_id}', video_id, headers={
+            'x-validated-age': '18',
+        })
 
         geoblocking = traverse_obj(config, ('data', 'attributes', 'restriction', 'geoblocking')) or {}
         if geoblocking.get('restrictedArea'):
@@ -160,16 +170,16 @@ class ArteTVIE(ArteTVBaseIE):
             m = self._VERSION_CODE_RE.match(stream_version_code)
             if m:
                 lang_pref = int(''.join('01'[x] for x in (
-                    m.group('vlang') == langauge_code,      # we prefer voice in the requested language
+                    m.group('vlang') == language_code,      # we prefer voice in the requested language
                     not m.group('audio_desc'),              # and not the audio description version
                     bool(m.group('original_voice')),        # but if voice is not in the requested language, at least choose the original voice
-                    m.group('sub_lang') == langauge_code,   # if subtitles are present, we prefer them in the requested language
+                    m.group('sub_lang') == language_code,   # if subtitles are present, we prefer them in the requested language
                     not m.group('has_sub'),                 # but we prefer no subtitles otherwise
                     not m.group('sdh_sub'),                 # and we prefer not the hard-of-hearing subtitles if there are subtitles
                 )))
 
             short_label = traverse_obj(stream_version, 'shortLabel', expected_type=str, default='?')
-            if stream['protocol'].startswith('HLS'):
+            if 'HLS' in stream['protocol']:
                 fmts, subs = self._extract_m3u8_formats_and_subtitles(
                     stream['url'], video_id=video_id, ext='mp4', m3u8_id=stream_version_code, fatal=False)
                 for fmt in fmts:
@@ -181,6 +191,7 @@ class ArteTVIE(ArteTVBaseIE):
                     secondary_formats.extend(fmts)
                 else:
                     formats.extend(fmts)
+                subs = self._fix_accessible_subs_locale(subs)
                 self._merge_subtitles(subs, target=subtitles)
 
             elif stream['protocol'] in ('HTTPS', 'RTMP'):
@@ -236,7 +247,7 @@ class ArteTVEmbedIE(InfoExtractor):
             'description': 'md5:be40b667f45189632b78c1425c7c2ce1',
             'upload_date': '20201116',
         },
-        'skip': 'No video available'
+        'skip': 'No video available',
     }, {
         'url': 'https://www.arte.tv/player/v3/index.php?json_url=https://api.arte.tv/api/player/v2/config/de/100605-013-A',
         'only_matching': True,
@@ -251,7 +262,7 @@ class ArteTVEmbedIE(InfoExtractor):
 
 
 class ArteTVPlaylistIE(ArteTVBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?arte\.tv/(?P<lang>%s)/videos/(?P<id>RC-\d{6})' % ArteTVBaseIE._ARTE_LANGUAGES
+    _VALID_URL = rf'https?://(?:www\.)?arte\.tv/(?P<lang>{ArteTVBaseIE._ARTE_LANGUAGES})/videos/(?P<id>RC-\d{{6}})'
     _TESTS = [{
         'url': 'https://www.arte.tv/en/videos/RC-016954/earn-a-living/',
         'only_matching': True,
@@ -287,7 +298,7 @@ class ArteTVPlaylistIE(ArteTVBaseIE):
 
 
 class ArteTVCategoryIE(ArteTVBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?arte\.tv/(?P<lang>%s)/videos/(?P<id>[\w-]+(?:/[\w-]+)*)/?\s*$' % ArteTVBaseIE._ARTE_LANGUAGES
+    _VALID_URL = rf'https?://(?:www\.)?arte\.tv/(?P<lang>{ArteTVBaseIE._ARTE_LANGUAGES})/videos/(?P<id>[\w-]+(?:/[\w-]+)*)/?\s*$'
     _TESTS = [{
         'url': 'https://www.arte.tv/en/videos/politics-and-society/',
         'info_dict': {
@@ -301,7 +312,7 @@ class ArteTVCategoryIE(ArteTVBaseIE):
     @classmethod
     def suitable(cls, url):
         return (
-            not any(ie.suitable(url) for ie in (ArteTVIE, ArteTVPlaylistIE, ))
+            not any(ie.suitable(url) for ie in (ArteTVIE, ArteTVPlaylistIE))
             and super().suitable(url))
 
     def _real_extract(self, url):
@@ -310,12 +321,12 @@ class ArteTVCategoryIE(ArteTVBaseIE):
 
         items = []
         for video in re.finditer(
-                r'<a\b[^>]*?href\s*=\s*(?P<q>"|\'|\b)(?P<url>https?://www\.arte\.tv/%s/videos/[\w/-]+)(?P=q)' % lang,
+                rf'<a\b[^>]*?href\s*=\s*(?P<q>"|\'|\b)(?P<url>https?://www\.arte\.tv/{lang}/videos/[\w/-]+)(?P=q)',
                 webpage):
             video = video.group('url')
             if video == url:
                 continue
-            if any(ie.suitable(video) for ie in (ArteTVIE, ArteTVPlaylistIE, )):
+            if any(ie.suitable(video) for ie in (ArteTVIE, ArteTVPlaylistIE)):
                 items.append(video)
 
         title = strip_or_none(self._generic_title('', webpage, default='').rsplit('|', 1)[0]) or None
diff --git a/plugins/youtube_download/yt_dlp/extractor/asiancrush.py b/plugins/youtube_download/yt_dlp/extractor/asiancrush.py
deleted file mode 100644
index 23f310e..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/asiancrush.py
+++ /dev/null
@@ -1,196 +0,0 @@
-import functools
-import re
-
-from .common import InfoExtractor
-from .kaltura import KalturaIE
-from ..utils import (
-    extract_attributes,
-    int_or_none,
-    OnDemandPagedList,
-    parse_age_limit,
-    strip_or_none,
-    try_get,
-)
-
-
-class AsianCrushBaseIE(InfoExtractor):
-    _VALID_URL_BASE = r'https?://(?:www\.)?(?P<host>(?:(?:asiancrush|yuyutv|midnightpulp)\.com|(?:cocoro|retrocrush)\.tv))'
-    _KALTURA_KEYS = [
-        'video_url', 'progressive_url', 'download_url', 'thumbnail_url',
-        'widescreen_thumbnail_url', 'screencap_widescreen',
-    ]
-    _API_SUFFIX = {'retrocrush.tv': '-ott'}
-
-    def _call_api(self, host, endpoint, video_id, query, resource):
-        return self._download_json(
-            'https://api%s.%s/%s' % (self._API_SUFFIX.get(host, ''), host, endpoint), video_id,
-            'Downloading %s JSON metadata' % resource, query=query,
-            headers=self.geo_verification_headers())['objects']
-
-    def _download_object_data(self, host, object_id, resource):
-        return self._call_api(
-            host, 'search', object_id, {'id': object_id}, resource)[0]
-
-    def _get_object_description(self, obj):
-        return strip_or_none(obj.get('long_description') or obj.get('short_description'))
-
-    def _parse_video_data(self, video):
-        title = video['name']
-
-        entry_id, partner_id = [None] * 2
-        for k in self._KALTURA_KEYS:
-            k_url = video.get(k)
-            if k_url:
-                mobj = re.search(r'/p/(\d+)/.+?/entryId/([^/]+)/', k_url)
-                if mobj:
-                    partner_id, entry_id = mobj.groups()
-                    break
-
-        meta_categories = try_get(video, lambda x: x['meta']['categories'], list) or []
-        categories = list(filter(None, [c.get('name') for c in meta_categories]))
-
-        show_info = video.get('show_info') or {}
-
-        return {
-            '_type': 'url_transparent',
-            'url': 'kaltura:%s:%s' % (partner_id, entry_id),
-            'ie_key': KalturaIE.ie_key(),
-            'id': entry_id,
-            'title': title,
-            'description': self._get_object_description(video),
-            'age_limit': parse_age_limit(video.get('mpaa_rating') or video.get('tv_rating')),
-            'categories': categories,
-            'series': show_info.get('show_name'),
-            'season_number': int_or_none(show_info.get('season_num')),
-            'season_id': show_info.get('season_id'),
-            'episode_number': int_or_none(show_info.get('episode_num')),
-        }
-
-
-class AsianCrushIE(AsianCrushBaseIE):
-    _VALID_URL = r'%s/video/(?:[^/]+/)?0+(?P<id>\d+)v\b' % AsianCrushBaseIE._VALID_URL_BASE
-    _TESTS = [{
-        'url': 'https://www.asiancrush.com/video/004289v/women-who-flirt',
-        'md5': 'c3b740e48d0ba002a42c0b72857beae6',
-        'info_dict': {
-            'id': '1_y4tmjm5r',
-            'ext': 'mp4',
-            'title': 'Women Who Flirt',
-            'description': 'md5:b65c7e0ae03a85585476a62a186f924c',
-            'timestamp': 1496936429,
-            'upload_date': '20170608',
-            'uploader_id': 'craig@crifkin.com',
-            'age_limit': 13,
-            'categories': 'count:5',
-            'duration': 5812,
-        },
-    }, {
-        'url': 'https://www.asiancrush.com/video/she-was-pretty/011886v-pretty-episode-3/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.yuyutv.com/video/013886v/the-act-of-killing/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.yuyutv.com/video/peep-show/013922v-warring-factions/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.midnightpulp.com/video/010400v/drifters/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.midnightpulp.com/video/mononoke/016378v-zashikiwarashi-part-1/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.cocoro.tv/video/the-wonderful-wizard-of-oz/008878v-the-wonderful-wizard-of-oz-ep01/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.retrocrush.tv/video/true-tears/012328v-i...gave-away-my-tears',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        host, video_id = self._match_valid_url(url).groups()
-
-        if host == 'cocoro.tv':
-            webpage = self._download_webpage(url, video_id)
-            embed_vars = self._parse_json(self._search_regex(
-                r'iEmbedVars\s*=\s*({.+?})', webpage, 'embed vars',
-                default='{}'), video_id, fatal=False) or {}
-            video_id = embed_vars.get('entry_id') or video_id
-
-        video = self._download_object_data(host, video_id, 'video')
-        return self._parse_video_data(video)
-
-
-class AsianCrushPlaylistIE(AsianCrushBaseIE):
-    _VALID_URL = r'%s/series/0+(?P<id>\d+)s\b' % AsianCrushBaseIE._VALID_URL_BASE
-    _TESTS = [{
-        'url': 'https://www.asiancrush.com/series/006447s/fruity-samurai',
-        'info_dict': {
-            'id': '6447',
-            'title': 'Fruity Samurai',
-            'description': 'md5:7535174487e4a202d3872a7fc8f2f154',
-        },
-        'playlist_count': 13,
-    }, {
-        'url': 'https://www.yuyutv.com/series/013920s/peep-show/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.midnightpulp.com/series/016375s/mononoke/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.cocoro.tv/series/008549s/the-wonderful-wizard-of-oz/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.retrocrush.tv/series/012355s/true-tears',
-        'only_matching': True,
-    }]
-    _PAGE_SIZE = 1000000000
-
-    def _fetch_page(self, domain, parent_id, page):
-        videos = self._call_api(
-            domain, 'getreferencedobjects', parent_id, {
-                'max': self._PAGE_SIZE,
-                'object_type': 'video',
-                'parent_id': parent_id,
-                'start': page * self._PAGE_SIZE,
-            }, 'page %d' % (page + 1))
-        for video in videos:
-            yield self._parse_video_data(video)
-
-    def _real_extract(self, url):
-        host, playlist_id = self._match_valid_url(url).groups()
-
-        if host == 'cocoro.tv':
-            webpage = self._download_webpage(url, playlist_id)
-
-            entries = []
-
-            for mobj in re.finditer(
-                    r'<a[^>]+href=(["\'])(?P<url>%s.*?)\1[^>]*>' % AsianCrushIE._VALID_URL,
-                    webpage):
-                attrs = extract_attributes(mobj.group(0))
-                if attrs.get('class') == 'clearfix':
-                    entries.append(self.url_result(
-                        mobj.group('url'), ie=AsianCrushIE.ie_key()))
-
-            title = self._html_search_regex(
-                r'(?s)<h1\b[^>]\bid=["\']movieTitle[^>]+>(.+?)</h1>', webpage,
-                'title', default=None) or self._og_search_title(
-                webpage, default=None) or self._html_search_meta(
-                'twitter:title', webpage, 'title',
-                default=None) or self._html_extract_title(webpage)
-            if title:
-                title = re.sub(r'\s*\|\s*.+?$', '', title)
-
-            description = self._og_search_description(
-                webpage, default=None) or self._html_search_meta(
-                'twitter:description', webpage, 'description', fatal=False)
-        else:
-            show = self._download_object_data(host, playlist_id, 'show')
-            title = show.get('name')
-            description = self._get_object_description(show)
-            entries = OnDemandPagedList(
-                functools.partial(self._fetch_page, host, playlist_id),
-                self._PAGE_SIZE)
-
-        return self.playlist_result(entries, playlist_id, title, description)
diff --git a/plugins/youtube_download/yt_dlp/extractor/asobichannel.py b/plugins/youtube_download/yt_dlp/extractor/asobichannel.py
new file mode 100644
index 0000000..e3479ed
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/asobichannel.py
@@ -0,0 +1,168 @@
+from .common import InfoExtractor
+from ..utils import (
+    ExtractorError,
+    clean_html,
+    merge_dicts,
+    parse_iso8601,
+    url_or_none,
+)
+from ..utils.traversal import traverse_obj
+
+
+class AsobiChannelBaseIE(InfoExtractor):
+    _MICROCMS_HEADER = {'X-MICROCMS-API-KEY': 'qRaKehul9AHU8KtL0dnq1OCLKnFec6yrbcz3'}
+
+    def _extract_info(self, metadata):
+        return traverse_obj(metadata, {
+            'id': ('id', {str}),
+            'title': ('title', {str}),
+            'description': ('body', {clean_html}),
+            'thumbnail': ('contents', 'video_thumb', 'url', {url_or_none}),
+            'timestamp': ('publishedAt', {parse_iso8601}),
+            'modified_timestamp': ('updatedAt', {parse_iso8601}),
+            'channel': ('channel', 'name', {str}),
+            'channel_id': ('channel', 'id', {str}),
+        })
+
+
+class AsobiChannelIE(AsobiChannelBaseIE):
+    IE_NAME = 'asobichannel'
+    IE_DESC = 'ASOBI CHANNEL'
+
+    _VALID_URL = r'https?://asobichannel\.asobistore\.jp/watch/(?P<id>[\w-]+)'
+    _TESTS = [{
+        'url': 'https://asobichannel.asobistore.jp/watch/1ypp48qd32p',
+        'md5': '39df74e872afe032c4eb27b89144fc92',
+        'info_dict': {
+            'id': '1ypp48qd32p',
+            'ext': 'mp4',
+            'title': 'アイドルマスター ミリオンライブ！ 765プロch 原っぱ通信 #1',
+            'description': 'md5:b930bd2199c9b2fd75951ce4aaa7efd2',
+            'thumbnail': 'https://images.microcms-assets.io/assets/d2420de4b9194e11beb164f99edb1f95/a8e6f84119f54eb9ab4ce16729239905/%E3%82%B5%E3%83%A0%E3%83%8D%20(1).png',
+            'timestamp': 1697098247,
+            'upload_date': '20231012',
+            'modified_timestamp': 1698381162,
+            'modified_date': '20231027',
+            'channel': 'アイドルマスター',
+            'channel_id': 'idolmaster',
+        },
+    }, {
+        'url': 'https://asobichannel.asobistore.jp/watch/redigiwnjzqj',
+        'md5': '229fa8fb5c591c75ce8c37a497f113f6',
+        'info_dict': {
+            'id': 'redigiwnjzqj',
+            'ext': 'mp4',
+            'title': '【おまけ放送】アイドルマスター ミリオンライブ！ 765プロch 原っぱ通信 #1',
+            'description': 'md5:7d9cd35fb54425a6967822bd564ea2d9',
+            'thumbnail': 'https://images.microcms-assets.io/assets/d2420de4b9194e11beb164f99edb1f95/20e5c1d6184242eebc2512a5dec59bf0/P1_%E5%8E%9F%E3%81%A3%E3%81%B1%E3%82%B5%E3%83%A0%E3%83%8D.png',
+            'modified_timestamp': 1697797125,
+            'modified_date': '20231020',
+            'timestamp': 1697261769,
+            'upload_date': '20231014',
+            'channel': 'アイドルマスター',
+            'channel_id': 'idolmaster',
+        },
+    }]
+
+    _survapi_header = None
+
+    def _real_initialize(self):
+        token = self._download_json(
+            'https://asobichannel-api.asobistore.jp/api/v1/vspf/token', None,
+            note='Retrieving API token')
+        self._survapi_header = {'Authorization': f'Bearer {token}'}
+
+    def _process_vod(self, video_id, metadata):
+        content_id = metadata['contents']['video_id']
+
+        vod_data = self._download_json(
+            f'https://survapi.channel.or.jp/proxy/v1/contents/{content_id}/get_by_cuid', video_id,
+            headers=self._survapi_header, note='Downloading vod data')
+
+        return {
+            'formats': self._extract_m3u8_formats(vod_data['ex_content']['streaming_url'], video_id),
+        }
+
+    def _process_live(self, video_id, metadata):
+        content_id = metadata['contents']['video_id']
+        event_data = self._download_json(
+            f'https://survapi.channel.or.jp/ex/events/{content_id}?embed=channel', video_id,
+            headers=self._survapi_header, note='Downloading event data')
+
+        player_type = traverse_obj(event_data, ('data', 'Player_type', {str}))
+        if player_type == 'poster':
+            self.raise_no_formats('Live event has not yet started', expected=True)
+            live_status = 'is_upcoming'
+            formats = []
+        elif player_type == 'player':
+            live_status = 'is_live'
+            formats = self._extract_m3u8_formats(
+                event_data['data']['Channel']['Custom_live_url'], video_id, live=True)
+        else:
+            raise ExtractorError('Unsupported player type {player_type!r}')
+
+        return {
+            'release_timestamp': traverse_obj(metadata, ('period', 'start', {parse_iso8601})),
+            'live_status': live_status,
+            'formats': formats,
+        }
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+
+        metadata = self._download_json(
+            f'https://channel.microcms.io/api/v1/media/{video_id}', video_id,
+            headers=self._MICROCMS_HEADER)
+
+        info = self._extract_info(metadata)
+
+        video_type = traverse_obj(metadata, ('contents', 'video_type', 0, {str}))
+        if video_type == 'VOD':
+            return merge_dicts(info, self._process_vod(video_id, metadata))
+        if video_type == 'LIVE':
+            return merge_dicts(info, self._process_live(video_id, metadata))
+
+        raise ExtractorError(f'Unexpected video type {video_type!r}')
+
+
+class AsobiChannelTagURLIE(AsobiChannelBaseIE):
+    IE_NAME = 'asobichannel:tag'
+    IE_DESC = 'ASOBI CHANNEL'
+
+    _VALID_URL = r'https?://asobichannel\.asobistore\.jp/tag/(?P<id>[a-z0-9-_]+)'
+    _TESTS = [{
+        'url': 'https://asobichannel.asobistore.jp/tag/bjhh-nbcja',
+        'info_dict': {
+            'id': 'bjhh-nbcja',
+            'title': 'アイドルマスター ミリオンライブ！ 765プロch 原っぱ通信',
+        },
+        'playlist_mincount': 16,
+    }, {
+        'url': 'https://asobichannel.asobistore.jp/tag/hvm5qw3c6od',
+        'info_dict': {
+            'id': 'hvm5qw3c6od',
+            'title': 'アイマスMOIW2023ラジオ',
+        },
+        'playlist_mincount': 13,
+    }]
+
+    def _real_extract(self, url):
+        tag_id = self._match_id(url)
+        webpage = self._download_webpage(url, tag_id)
+        title = traverse_obj(self._search_nextjs_data(
+            webpage, tag_id, fatal=False), ('props', 'pageProps', 'data', 'name', {str}))
+
+        media = self._download_json(
+            f'https://channel.microcms.io/api/v1/media?limit=999&filters=(tag[contains]{tag_id})',
+            tag_id, headers=self._MICROCMS_HEADER)
+
+        def entries():
+            for metadata in traverse_obj(media, ('contents', lambda _, v: v['id'])):
+                yield {
+                    '_type': 'url',
+                    'url': f'https://asobichannel.asobistore.jp/watch/{metadata["id"]}',
+                    'ie_key': AsobiChannelIE.ie_key(),
+                    **self._extract_info(metadata),
+                }
+
+        return self.playlist_result(entries(), tag_id, title)
diff --git a/plugins/youtube_download/yt_dlp/extractor/asobistage.py b/plugins/youtube_download/yt_dlp/extractor/asobistage.py
new file mode 100644
index 0000000..0437908
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/asobistage.py
@@ -0,0 +1,155 @@
+import functools
+
+from .common import InfoExtractor
+from ..utils import str_or_none, url_or_none
+from ..utils.traversal import traverse_obj
+
+
+class AsobiStageIE(InfoExtractor):
+    IE_DESC = 'ASOBISTAGE (アソビステージ)'
+    _VALID_URL = r'https?://asobistage\.asobistore\.jp/event/(?P<id>(?P<event>\w+)/(?P<type>archive|player)/(?P<slug>\w+))(?:[?#]|$)'
+    _TESTS = [{
+        'url': 'https://asobistage.asobistore.jp/event/315passionhour_2022summer/archive/frame',
+        'info_dict': {
+            'id': '315passionhour_2022summer/archive/frame',
+            'title': '315プロダクションプレゼンツ 315パッションアワー!!!',
+            'thumbnail': r're:^https?://[\w.-]+/\w+/\w+',
+        },
+        'playlist_count': 1,
+        'playlist': [{
+            'info_dict': {
+                'id': 'edff52f2',
+                'ext': 'mp4',
+                'title': '315passion_FRAME_only',
+                'thumbnail': r're:^https?://[\w.-]+/\w+/\w+',
+            },
+        }],
+    }, {
+        'url': 'https://asobistage.asobistore.jp/event/idolmaster_idolworld2023_goods/archive/live',
+        'info_dict': {
+            'id': 'idolmaster_idolworld2023_goods/archive/live',
+            'title': 'md5:378510b6e830129d505885908bd6c576',
+            'thumbnail': r're:^https?://[\w.-]+/\w+/\w+',
+        },
+        'playlist_count': 1,
+        'playlist': [{
+            'info_dict': {
+                'id': '3aef7110',
+                'ext': 'mp4',
+                'title': 'asobistore_station_1020_serverREC',
+                'thumbnail': r're:^https?://[\w.-]+/\w+/\w+',
+            },
+        }],
+    }, {
+        'url': 'https://asobistage.asobistore.jp/event/sidem_fclive_bpct/archive/premium_hc',
+        'playlist_count': 4,
+        'info_dict': {
+            'id': 'sidem_fclive_bpct/archive/premium_hc',
+            'title': '315 Production presents F＠NTASTIC COMBINATION LIVE ～BRAINPOWER!!～/～CONNECTIME!!!!～',
+            'thumbnail': r're:^https?://[\w.-]+/\w+/\w+',
+        },
+    }, {
+        'url': 'https://asobistage.asobistore.jp/event/ijigenfes_utagassen/player/day1',
+        'only_matching': True,
+    }]
+
+    _API_HOST = 'https://asobistage-api.asobistore.jp'
+    _HEADERS = {}
+    _is_logged_in = False
+
+    @functools.cached_property
+    def _owned_tickets(self):
+        owned_tickets = set()
+        if not self._is_logged_in:
+            return owned_tickets
+
+        for path, name in [
+            ('api/v1/purchase_history/list', 'ticket purchase history'),
+            ('api/v1/serialcode/list', 'redemption history'),
+        ]:
+            response = self._download_json(
+                f'{self._API_HOST}/{path}', None, f'Downloading {name}',
+                f'Unable to download {name}', expected_status=400)
+            if traverse_obj(response, ('payload', 'error_message'), 'error') == 'notlogin':
+                self._is_logged_in = False
+                break
+            owned_tickets.update(
+                traverse_obj(response, ('payload', 'value', ..., 'digital_product_id', {str_or_none})))
+
+        return owned_tickets
+
+    def _get_available_channel_id(self, channel):
+        channel_id = traverse_obj(channel, ('chennel_vspf_id', {str}))
+        if not channel_id:
+            return None
+        # if rights_type_id == 6, then 'No conditions (no login required - non-members are OK)'
+        if traverse_obj(channel, ('viewrights', lambda _, v: v['rights_type_id'] == 6)):
+            return channel_id
+        available_tickets = traverse_obj(channel, (
+            'viewrights', ..., ('tickets', 'serialcodes'), ..., 'digital_product_id', {str_or_none}))
+        if not self._owned_tickets.intersection(available_tickets):
+            self.report_warning(
+                f'You are not a ticketholder for "{channel.get("channel_name") or channel_id}"')
+            return None
+        return channel_id
+
+    def _real_initialize(self):
+        if self._get_cookies(self._API_HOST):
+            self._is_logged_in = True
+        token = self._download_json(
+            f'{self._API_HOST}/api/v1/vspf/token', None, 'Getting token', 'Unable to get token')
+        self._HEADERS['Authorization'] = f'Bearer {token}'
+
+    def _real_extract(self, url):
+        webpage, urlh = self._download_webpage_handle(url, self._match_id(url))
+        video_id, event, type_, slug = self._match_valid_url(urlh.url).group('id', 'event', 'type', 'slug')
+        video_type = {'archive': 'archives', 'player': 'broadcasts'}[type_]
+
+        event_data = traverse_obj(
+            self._search_nextjs_data(webpage, video_id, default={}),
+            ('props', 'pageProps', 'eventCMSData', {
+                'title': ('event_name', {str}),
+                'thumbnail': ('event_thumbnail_image', {url_or_none}),
+            }))
+
+        available_channels = traverse_obj(self._download_json(
+            f'https://asobistage.asobistore.jp/cdn/v101/events/{event}/{video_type}.json',
+            video_id, 'Getting channel list', 'Unable to get channel list'), (
+            video_type, lambda _, v: v['broadcast_slug'] == slug,
+            'channels', lambda _, v: v['chennel_vspf_id'] != '00000'))
+
+        entries = []
+        for channel_id in traverse_obj(available_channels, (..., {self._get_available_channel_id})):
+            if video_type == 'archives':
+                channel_json = self._download_json(
+                    f'https://survapi.channel.or.jp/proxy/v1/contents/{channel_id}/get_by_cuid', channel_id,
+                    'Getting archive channel info', 'Unable to get archive channel info', fatal=False,
+                    headers=self._HEADERS)
+                channel_data = traverse_obj(channel_json, ('ex_content', {
+                    'm3u8_url': 'streaming_url',
+                    'title': 'title',
+                    'thumbnail': ('thumbnail', 'url'),
+                }))
+            else:  # video_type == 'broadcasts'
+                channel_json = self._download_json(
+                    f'https://survapi.channel.or.jp/ex/events/{channel_id}', channel_id,
+                    'Getting live channel info', 'Unable to get live channel info', fatal=False,
+                    headers=self._HEADERS, query={'embed': 'channel'})
+                channel_data = traverse_obj(channel_json, ('data', {
+                    'm3u8_url': ('Channel', 'Custom_live_url'),
+                    'title': 'Name',
+                    'thumbnail': 'Poster_url',
+                }))
+
+            entries.append({
+                'id': channel_id,
+                'title': channel_data.get('title'),
+                'formats': self._extract_m3u8_formats(channel_data.get('m3u8_url'), channel_id, fatal=False),
+                'is_live': video_type == 'broadcasts',
+                'thumbnail': url_or_none(channel_data.get('thumbnail')),
+            })
+
+        if not self._is_logged_in and not entries:
+            self.raise_login_required()
+
+        return self.playlist_result(entries, video_id, **event_data)
diff --git a/plugins/youtube_download/yt_dlp/extractor/atresplayer.py b/plugins/youtube_download/yt_dlp/extractor/atresplayer.py
index 3a44e52..1258a57 100644
--- a/plugins/youtube_download/yt_dlp/extractor/atresplayer.py
+++ b/plugins/youtube_download/yt_dlp/extractor/atresplayer.py
@@ -1,104 +1,152 @@
+import urllib.parse
+
 from .common import InfoExtractor
 from ..networking.exceptions import HTTPError
 from ..utils import (
     ExtractorError,
     int_or_none,
+    parse_age_limit,
+    url_or_none,
     urlencode_postdata,
 )
+from ..utils.traversal import traverse_obj
 
 
 class AtresPlayerIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?atresplayer\.com/[^/]+/[^/]+/[^/]+/[^/]+/(?P<display_id>.+?)_(?P<id>[0-9a-f]{24})'
+    _VALID_URL = r'https?://(?:www\.)?atresplayer\.com/(?:[^/?#]+/){4}(?P<display_id>.+?)_(?P<id>[0-9a-f]{24})'
     _NETRC_MACHINE = 'atresplayer'
-    _TESTS = [
-        {
-            'url': 'https://www.atresplayer.com/antena3/series/pequenas-coincidencias/temporada-1/capitulo-7-asuntos-pendientes_5d4aa2c57ed1a88fc715a615/',
-            'info_dict': {
-                'id': '5d4aa2c57ed1a88fc715a615',
-                'ext': 'mp4',
-                'title': 'Capítulo 7: Asuntos pendientes',
-                'description': 'md5:7634cdcb4d50d5381bedf93efb537fbc',
-                'duration': 3413,
-            },
-            'skip': 'This video is only available for registered users'
+    _TESTS = [{
+        'url': 'https://www.atresplayer.com/lasexta/programas/el-objetivo/clips/mbappe-describe-como-entrenador-a-carlo-ancelotti-sabe-cuando-tiene-que-ser-padre-jefe-amigo-entrenador_67f2dfb2fb6ab0e4c7203849/',
+        'info_dict': {
+            'ext': 'mp4',
+            'id': '67f2dfb2fb6ab0e4c7203849',
+            'display_id': 'md5:c203f8d4e425ed115ba56a1c6e4b3e6c',
+            'title': 'Mbappé describe como entrenador a Carlo Ancelotti: "Sabe cuándo tiene que ser padre, jefe, amigo, entrenador..."',
+            'channel': 'laSexta',
+            'duration': 31,
+            'thumbnail': 'https://imagenes.atresplayer.com/atp/clipping/cmsimages02/2025/04/06/B02DBE1E-D59B-4683-8404-1A9595D15269/1920x1080.jpg',
+            'tags': ['Entrevista informativa', 'Actualidad', 'Debate informativo', 'Política', 'Economía', 'Sociedad', 'Cara a cara', 'Análisis', 'Más periodismo'],
+            'series': 'El Objetivo',
+            'season': 'Temporada 12',
+            'timestamp': 1743970079,
+            'upload_date': '20250406',
         },
-        {
-            'url': 'https://www.atresplayer.com/lasexta/programas/el-club-de-la-comedia/temporada-4/capitulo-10-especial-solidario-nochebuena_5ad08edf986b2855ed47adc4/',
-            'only_matching': True,
+    }, {
+        'url': 'https://www.atresplayer.com/antena3/programas/el-hormiguero/clips/revive-la-entrevista-completa-a-miguel-bose-en-el-hormiguero_67f836baa4a5b0e4147ca59a/',
+        'info_dict': {
+            'ext': 'mp4',
+            'id': '67f836baa4a5b0e4147ca59a',
+            'display_id': 'revive-la-entrevista-completa-a-miguel-bose-en-el-hormiguero',
+            'title': 'Revive la entrevista completa a Miguel Bosé en El Hormiguero',
+            'description': 'md5:c6d2b591408d45a7bc2986dfb938eb72',
+            'channel': 'Antena 3',
+            'duration': 2556,
+            'thumbnail': 'https://imagenes.atresplayer.com/atp/clipping/cmsimages02/2025/04/10/9076395F-F1FD-48BE-9F18-540DBA10EBAD/1920x1080.jpg',
+            'tags': ['Entrevista', 'Variedades', 'Humor', 'Entretenimiento', 'Te sigo', 'Buen rollo', 'Cara a cara'],
+            'series': 'El Hormiguero ',
+            'season': 'Temporada 14',
+            'timestamp': 1744320111,
+            'upload_date': '20250410',
         },
-        {
-            'url': 'https://www.atresplayer.com/antena3/series/el-secreto-de-puente-viejo/el-chico-de-los-tres-lunares/capitulo-977-29-12-14_5ad51046986b2886722ccdea/',
-            'only_matching': True,
+    }, {
+        'url': 'https://www.atresplayer.com/flooxer/series/biara-proyecto-lazarus/temporada-1/capitulo-3-supervivientes_67a6038b64ceca00070f4f69/',
+        'info_dict': {
+            'ext': 'mp4',
+            'id': '67a6038b64ceca00070f4f69',
+            'display_id': 'capitulo-3-supervivientes',
+            'title': 'Capítulo 3: Supervivientes',
+            'description': 'md5:65b231f20302f776c2b0dd24594599a1',
+            'channel': 'Flooxer',
+            'duration': 1196,
+            'thumbnail': 'https://imagenes.atresplayer.com/atp/clipping/cmsimages01/2025/02/14/17CF90D3-FE67-40C5-A941-7825B3E13992/1920x1080.jpg',
+            'tags': ['Juvenil', 'Terror', 'Piel de gallina', 'Te sigo', 'Un break', 'Del tirón'],
+            'series': 'BIARA: Proyecto Lázarus',
+            'season': 'Temporada 1',
+            'season_number': 1,
+            'episode': 'Episode 3',
+            'episode_number': 3,
+            'timestamp': 1743095191,
+            'upload_date': '20250327',
         },
-    ]
+    }, {
+        'url': 'https://www.atresplayer.com/lasexta/programas/el-club-de-la-comedia/temporada-4/capitulo-10-especial-solidario-nochebuena_5ad08edf986b2855ed47adc4/',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.atresplayer.com/antena3/series/el-secreto-de-puente-viejo/el-chico-de-los-tres-lunares/capitulo-977-29-12-14_5ad51046986b2886722ccdea/',
+        'only_matching': True,
+    }]
     _API_BASE = 'https://api.atresplayer.com/'
 
-    def _handle_error(self, e, code):
-        if isinstance(e.cause, HTTPError) and e.cause.status == code:
-            error = self._parse_json(e.cause.response.read(), None)
-            if error.get('error') == 'required_registered':
-                self.raise_login_required()
-            raise ExtractorError(error['error_description'], expected=True)
-        raise
-
     def _perform_login(self, username, password):
-        self._request_webpage(
-            self._API_BASE + 'login', None, 'Downloading login page')
-
         try:
-            target_url = self._download_json(
-                'https://account.atresmedia.com/api/login', None,
-                'Logging in', headers={
-                    'Content-Type': 'application/x-www-form-urlencoded'
-                }, data=urlencode_postdata({
+            self._download_webpage(
+                'https://account.atresplayer.com/auth/v1/login', None,
+                'Logging in', 'Failed to log in', data=urlencode_postdata({
                     'username': username,
                     'password': password,
-                }))['targetUrl']
+                }))
         except ExtractorError as e:
-            self._handle_error(e, 400)
-
-        self._request_webpage(target_url, None, 'Following Target URL')
+            if isinstance(e.cause, HTTPError) and e.cause.status == 400:
+                raise ExtractorError('Invalid username and/or password', expected=True)
+            raise
 
     def _real_extract(self, url):
         display_id, video_id = self._match_valid_url(url).groups()
 
-        try:
-            episode = self._download_json(
-                self._API_BASE + 'client/v1/player/episode/' + video_id, video_id)
-        except ExtractorError as e:
-            self._handle_error(e, 403)
+        metadata_url = self._download_json(
+            self._API_BASE + 'client/v1/url', video_id, 'Downloading API endpoint data',
+            query={'href': urllib.parse.urlparse(url).path})['href']
+        metadata = self._download_json(metadata_url, video_id)
 
-        title = episode['titulo']
+        try:
+            video_data = self._download_json(metadata['urlVideo'], video_id, 'Downloading video data')
+        except ExtractorError as e:
+            if isinstance(e.cause, HTTPError) and e.cause.status == 403:
+                error = self._parse_json(e.cause.response.read(), None)
+                if error.get('error') == 'required_registered':
+                    self.raise_login_required()
+                raise ExtractorError(error['error_description'], expected=True)
+            raise
 
         formats = []
         subtitles = {}
-        for source in episode.get('sources', []):
-            src = source.get('src')
-            if not src:
-                continue
+        for source in traverse_obj(video_data, ('sources', lambda _, v: url_or_none(v['src']))):
+            src_url = source['src']
             src_type = source.get('type')
-            if src_type == 'application/vnd.apple.mpegurl':
-                formats, subtitles = self._extract_m3u8_formats(
-                    src, video_id, 'mp4', 'm3u8_native',
-                    m3u8_id='hls', fatal=False)
-            elif src_type == 'application/dash+xml':
-                formats, subtitles = self._extract_mpd_formats(
-                    src, video_id, mpd_id='dash', fatal=False)
-
-        heartbeat = episode.get('heartbeat') or {}
-        omniture = episode.get('omniture') or {}
-        get_meta = lambda x: heartbeat.get(x) or omniture.get(x)
+            if src_type in ('application/vnd.apple.mpegurl', 'application/hls+legacy', 'application/hls+hevc'):
+                fmts, subs = self._extract_m3u8_formats_and_subtitles(
+                    src_url, video_id, 'mp4', m3u8_id='hls', fatal=False)
+            elif src_type in ('application/dash+xml', 'application/dash+hevc'):
+                fmts, subs = self._extract_mpd_formats_and_subtitles(
+                    src_url, video_id, mpd_id='dash', fatal=False)
+            else:
+                continue
+            formats.extend(fmts)
+            self._merge_subtitles(subs, target=subtitles)
 
         return {
             'display_id': display_id,
             'id': video_id,
-            'title': title,
-            'description': episode.get('descripcion'),
-            'thumbnail': episode.get('imgPoster'),
-            'duration': int_or_none(episode.get('duration')),
             'formats': formats,
-            'channel': get_meta('channel'),
-            'season': get_meta('season'),
-            'episode_number': int_or_none(get_meta('episodeNumber')),
             'subtitles': subtitles,
+            **traverse_obj(video_data, {
+                'title': ('titulo', {str}),
+                'description': ('descripcion', {str}),
+                'duration': ('duration', {int_or_none}),
+                'thumbnail': ('imgPoster', {url_or_none}, {lambda v: f'{v}1920x1080.jpg'}),
+                'age_limit': ('ageRating', {parse_age_limit}),
+            }),
+            **traverse_obj(metadata, {
+                'title': ('title', {str}),
+                'description': ('description', {str}),
+                'duration': ('duration', {int_or_none}),
+                'tags': ('tags', ..., 'title', {str}),
+                'age_limit': ('ageRating', {parse_age_limit}),
+                'series': ('format', 'title', {str}),
+                'season': ('currentSeason', 'title', {str}),
+                'season_number': ('currentSeason', 'seasonNumber', {int_or_none}),
+                'episode_number': ('numberOfEpisode', {int_or_none}),
+                'timestamp': ('publicationDate', {int_or_none(scale=1000)}),
+                'channel': ('channel', 'title', {str}),
+            }),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/atscaleconf.py b/plugins/youtube_download/yt_dlp/extractor/atscaleconf.py
index 3f7b1e9..b219eee 100644
--- a/plugins/youtube_download/yt_dlp/extractor/atscaleconf.py
+++ b/plugins/youtube_download/yt_dlp/extractor/atscaleconf.py
@@ -12,7 +12,7 @@ class AtScaleConfEventIE(InfoExtractor):
         'info_dict': {
             'id': 'data-scale-spring-2022',
             'title': 'Data @Scale Spring 2022',
-            'description': 'md5:7d7ca1c42ac9c6d8a785092a1aea4b55'
+            'description': 'md5:7d7ca1c42ac9c6d8a785092a1aea4b55',
         },
     }, {
         'url': 'https://atscaleconference.com/events/video-scale-2021/',
@@ -20,15 +20,15 @@ class AtScaleConfEventIE(InfoExtractor):
         'info_dict': {
             'id': 'video-scale-2021',
             'title': 'Video @Scale 2021',
-            'description': 'md5:7d7ca1c42ac9c6d8a785092a1aea4b55'
+            'description': 'md5:7d7ca1c42ac9c6d8a785092a1aea4b55',
         },
     }]
 
     def _real_extract(self, url):
-        id = self._match_id(url)
-        webpage = self._download_webpage(url, id)
+        playlist_id = self._match_id(url)
+        webpage = self._download_webpage(url, playlist_id)
 
         return self.playlist_from_matches(
             re.findall(r'data-url\s*=\s*"(https?://(?:www\.)?atscaleconference\.com/videos/[^"]+)"', webpage),
-            ie='Generic', playlist_id=id,
+            ie='Generic', playlist_id=playlist_id,
             title=self._og_search_title(webpage), description=self._og_search_description(webpage))
diff --git a/plugins/youtube_download/yt_dlp/extractor/atttechchannel.py b/plugins/youtube_download/yt_dlp/extractor/atttechchannel.py
deleted file mode 100644
index 6ff4ec0..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/atttechchannel.py
+++ /dev/null
@@ -1,53 +0,0 @@
-from .common import InfoExtractor
-from ..utils import unified_strdate
-
-
-class ATTTechChannelIE(InfoExtractor):
-    _VALID_URL = r'https?://techchannel\.att\.com/play-video\.cfm/([^/]+/)*(?P<id>.+)'
-    _TEST = {
-        'url': 'http://techchannel.att.com/play-video.cfm/2014/1/27/ATT-Archives-The-UNIX-System-Making-Computers-Easier-to-Use',
-        'info_dict': {
-            'id': '11316',
-            'display_id': 'ATT-Archives-The-UNIX-System-Making-Computers-Easier-to-Use',
-            'ext': 'flv',
-            'title': 'AT&T Archives : The UNIX System: Making Computers Easier to Use',
-            'description': 'A 1982 film about UNIX is the foundation for software in use around Bell Labs and AT&T.',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'upload_date': '20140127',
-        },
-        'params': {
-            # rtmp download
-            'skip_download': True,
-        },
-    }
-
-    def _real_extract(self, url):
-        display_id = self._match_id(url)
-
-        webpage = self._download_webpage(url, display_id)
-
-        video_url = self._search_regex(
-            r"url\s*:\s*'(rtmp://[^']+)'",
-            webpage, 'video URL')
-
-        video_id = self._search_regex(
-            r'mediaid\s*=\s*(\d+)',
-            webpage, 'video id', fatal=False)
-
-        title = self._og_search_title(webpage)
-        description = self._og_search_description(webpage)
-        thumbnail = self._og_search_thumbnail(webpage)
-        upload_date = unified_strdate(self._search_regex(
-            r'[Rr]elease\s+date:\s*(\d{1,2}/\d{1,2}/\d{4})',
-            webpage, 'upload date', fatal=False), False)
-
-        return {
-            'id': video_id,
-            'display_id': display_id,
-            'url': video_url,
-            'ext': 'flv',
-            'title': title,
-            'description': description,
-            'thumbnail': thumbnail,
-            'upload_date': upload_date,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/atvat.py b/plugins/youtube_download/yt_dlp/extractor/atvat.py
index d6ed9e4..37bb616 100644
--- a/plugins/youtube_download/yt_dlp/extractor/atvat.py
+++ b/plugins/youtube_download/yt_dlp/extractor/atvat.py
@@ -1,11 +1,11 @@
-import datetime
+import datetime as dt
 
 from .common import InfoExtractor
 from ..utils import (
+    ExtractorError,
     float_or_none,
     jwt_encode_hs256,
     try_get,
-    ExtractorError,
 )
 
 
@@ -19,7 +19,7 @@ class ATVAtIE(InfoExtractor):
             'id': 'v-ce9cgn1e70n5-1',
             'ext': 'mp4',
             'title': 'Bauer sucht Frau - Staffel 18 Folge 3 - Die Hofwochen',
-        }
+        },
     }, {
         'url': 'https://www.atv.at/tv/bauer-sucht-frau/staffel-18/episode-01/bauer-sucht-frau-staffel-18-vorstellungsfolge-1',
         'only_matching': True,
@@ -66,14 +66,14 @@ class ATVAtIE(InfoExtractor):
             video_id=video_id)
 
         video_title = json_data['views']['default']['page']['title']
-        contentResource = json_data['views']['default']['page']['contentResource']
-        content_id = contentResource[0]['id']
-        content_ids = [{'id': id, 'subclip_start': content['start'], 'subclip_end': content['end']}
-                       for id, content in enumerate(contentResource)]
+        content_resource = json_data['views']['default']['page']['contentResource']
+        content_id = content_resource[0]['id']
+        content_ids = [{'id': id_, 'subclip_start': content['start'], 'subclip_end': content['end']}
+                       for id_, content in enumerate(content_resource)]
 
-        time_of_request = datetime.datetime.now()
-        not_before = time_of_request - datetime.timedelta(minutes=5)
-        expire = time_of_request + datetime.timedelta(minutes=5)
+        time_of_request = dt.datetime.now()
+        not_before = time_of_request - dt.timedelta(minutes=5)
+        expire = time_of_request + dt.timedelta(minutes=5)
         payload = {
             'content_ids': {
                 content_id: content_ids,
@@ -87,17 +87,17 @@ class ATVAtIE(InfoExtractor):
         videos = self._download_json(
             'https://vas-v4.p7s1video.net/4.0/getsources',
             content_id, 'Downloading videos JSON', query={
-                'token': jwt_token.decode('utf-8')
+                'token': jwt_token.decode('utf-8'),
             })
 
-        video_id, videos_data = list(videos['data'].items())[0]
+        video_id, videos_data = next(iter(videos['data'].items()))
         error_msg = try_get(videos_data, lambda x: x['error']['title'])
         if error_msg == 'Geo check failed':
             self.raise_geo_restricted(error_msg)
         elif error_msg:
             raise ExtractorError(error_msg)
         entries = [
-            self._extract_video_info(url, contentResource[video['id']], video)
+            self._extract_video_info(url, content_resource[video['id']], video)
             for video in videos_data]
 
         return {
diff --git a/plugins/youtube_download/yt_dlp/extractor/audimedia.py b/plugins/youtube_download/yt_dlp/extractor/audimedia.py
index 35114e5..c5a9c7e 100644
--- a/plugins/youtube_download/yt_dlp/extractor/audimedia.py
+++ b/plugins/youtube_download/yt_dlp/extractor/audimedia.py
@@ -19,7 +19,7 @@ class AudiMediaIE(InfoExtractor):
             'timestamp': 1448354940,
             'duration': 74022,
             'view_count': int,
-        }
+        },
     }, {
         'url': 'https://www.audi-mediacenter.com/en/audimediatv/video/60-seconds-of-audi-sport-104-2015-wec-bahrain-rookie-test-2991',
         'only_matching': True,
@@ -73,7 +73,7 @@ class AudiMediaIE(InfoExtractor):
                 bitrate = self._search_regex(r'(\d+)k', video_version_url, 'bitrate', default=None)
                 if bitrate:
                     f.update({
-                        'format_id': 'http-%s' % bitrate,
+                        'format_id': f'http-{bitrate}',
                     })
                 formats.append(f)
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/audioboom.py b/plugins/youtube_download/yt_dlp/extractor/audioboom.py
index a23fcd2..751b74a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/audioboom.py
+++ b/plugins/youtube_download/yt_dlp/extractor/audioboom.py
@@ -15,7 +15,7 @@ class AudioBoomIE(InfoExtractor):
             'duration': 4000.99,
             'uploader': 'Sue Perkins: An hour or so with...',
             'uploader_url': r're:https?://(?:www\.)?audioboom\.com/channel/perkins',
-        }
+        },
     }, {  # Direct mp3-file link
         'url': 'https://audioboom.com/posts/8128496.mp3',
         'md5': 'e329edf304d450def95c7f86a9165ee1',
@@ -27,7 +27,7 @@ class AudioBoomIE(InfoExtractor):
             'duration': 1689.7,
             'uploader': 'Lost Dot Podcast: The Trans Pyrenees and Transcontinental Race',
             'uploader_url': r're:https?://(?:www\.)?audioboom\.com/channels/5003904',
-        }
+        },
     }, {
         'url': 'https://audioboom.com/posts/4279833-3-09-2016-czaban-hour-3?t=0',
         'only_matching': True,
diff --git a/plugins/youtube_download/yt_dlp/extractor/audiodraft.py b/plugins/youtube_download/yt_dlp/extractor/audiodraft.py
index 71e5afd..484ad4e 100644
--- a/plugins/youtube_download/yt_dlp/extractor/audiodraft.py
+++ b/plugins/youtube_download/yt_dlp/extractor/audiodraft.py
@@ -9,7 +9,7 @@ class AudiodraftBaseIE(InfoExtractor):
             headers={
                 'Content-type': 'application/x-www-form-urlencoded; charset=UTF-8',
                 'X-Requested-With': 'XMLHttpRequest',
-            }, data=f'id={player_entry_id}'.encode('utf-8'))
+            }, data=f'id={player_entry_id}'.encode())
 
         return {
             'id': str(data_json['entry_id']),
@@ -65,9 +65,10 @@ class AudiodraftCustomIE(AudiodraftBaseIE):
     }]
 
     def _real_extract(self, url):
-        id = self._match_id(url)
-        webpage = self._download_webpage(url, id)
-        player_entry_id = self._search_regex(r'playAudio\(\'(player_entry_\d+)\'\);', webpage, id, 'play entry id')
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+        player_entry_id = self._search_regex(
+            r'playAudio\(\'(player_entry_\d+)\'\);', webpage, video_id, 'play entry id')
         return self._audiodraft_extract_from_id(player_entry_id)
 
 
@@ -89,5 +90,5 @@ class AudiodraftGenericIE(AudiodraftBaseIE):
     }]
 
     def _real_extract(self, url):
-        id = self._match_id(url)
-        return self._audiodraft_extract_from_id(f'player_entry_{id}')
+        video_id = self._match_id(url)
+        return self._audiodraft_extract_from_id(f'player_entry_{video_id}')
diff --git a/plugins/youtube_download/yt_dlp/extractor/audiomack.py b/plugins/youtube_download/yt_dlp/extractor/audiomack.py
index 5c4160f..1d4460c 100644
--- a/plugins/youtube_download/yt_dlp/extractor/audiomack.py
+++ b/plugins/youtube_download/yt_dlp/extractor/audiomack.py
@@ -3,7 +3,6 @@ import time
 
 from .common import InfoExtractor
 from .soundcloud import SoundcloudIE
-from ..compat import compat_str
 from ..utils import (
     ExtractorError,
     url_basename,
@@ -22,8 +21,8 @@ class AudiomackIE(InfoExtractor):
                 'id': '310086',
                 'ext': 'mp3',
                 'uploader': 'Roosh Williams',
-                'title': 'Extraordinary'
-            }
+                'title': 'Extraordinary',
+            },
         },
         # audiomack wrapper around soundcloud song
         # Needs new test URL.
@@ -56,7 +55,7 @@ class AudiomackIE(InfoExtractor):
 
         # API is inconsistent with errors
         if 'url' not in api_response or not api_response['url'] or 'error' in api_response:
-            raise ExtractorError('Invalid url %s' % url)
+            raise ExtractorError(f'Invalid url {url}')
 
         # Audiomack wraps a lot of soundcloud tracks in their branded wrapper
         # if so, pass the work off to the soundcloud extractor
@@ -64,7 +63,7 @@ class AudiomackIE(InfoExtractor):
             return self.url_result(api_response['url'], SoundcloudIE.ie_key())
 
         return {
-            'id': compat_str(api_response.get('id', album_url_tag)),
+            'id': str(api_response.get('id', album_url_tag)),
             'uploader': api_response.get('artist'),
             'title': api_response.get('title'),
             'url': api_response['url'],
@@ -82,8 +81,8 @@ class AudiomackAlbumIE(InfoExtractor):
             'info_dict':
             {
                 'id': '812251',
-                'title': 'Tha Tour: Part 2 (Official Mixtape)'
-            }
+                'title': 'Tha Tour: Part 2 (Official Mixtape)',
+            },
         },
         # Album playlist ripped from fakeshoredrive with no metadata
         {
@@ -98,16 +97,16 @@ class AudiomackAlbumIE(InfoExtractor):
                     'id': '837576',
                     'ext': 'mp3',
                     'uploader': 'Lil Herb a.k.a. G Herbo',
-                }
+                },
             }, {
                 'info_dict': {
                     'title': 'PPP (Pistol P Project) - 10. 4 Minutes Of Hell Part 4 (prod by DY OF 808 MAFIA)',
                     'id': '837580',
                     'ext': 'mp3',
                     'uploader': 'Lil Herb a.k.a. G Herbo',
-                }
+                },
             }],
-        }
+        },
     ]
 
     def _real_extract(self, url):
@@ -123,12 +122,12 @@ class AudiomackAlbumIE(InfoExtractor):
             api_response = self._download_json(
                 'http://www.audiomack.com/api/music/url/album/%s/%d?extended=1&_=%d'
                 % (album_url_tag, track_no, time.time()), album_url_tag,
-                note='Querying song information (%d)' % (track_no + 1))
+                note=f'Querying song information ({track_no + 1})')
 
             # Total failure, only occurs when url is totally wrong
             # Won't happen in middle of valid playlist (next case)
             if 'url' not in api_response or 'error' in api_response:
-                raise ExtractorError('Invalid url for track %d of album url %s' % (track_no, url))
+                raise ExtractorError(f'Invalid url for track {track_no} of album url {url}')
             # URL is good but song id doesn't exist - usually means end of playlist
             elif not api_response['url']:
                 break
@@ -136,10 +135,10 @@ class AudiomackAlbumIE(InfoExtractor):
                 # Pull out the album metadata and add to result (if it exists)
                 for resultkey, apikey in [('id', 'album_id'), ('title', 'album_title')]:
                     if apikey in api_response and resultkey not in result:
-                        result[resultkey] = compat_str(api_response[apikey])
+                        result[resultkey] = str(api_response[apikey])
                 song_id = url_basename(api_response['url']).rpartition('.')[0]
                 result['entries'].append({
-                    'id': compat_str(api_response.get('id', song_id)),
+                    'id': str(api_response.get('id', song_id)),
                     'uploader': api_response.get('artist'),
                     'title': api_response.get('title', song_id),
                     'url': api_response['url'],
diff --git a/plugins/youtube_download/yt_dlp/extractor/audius.py b/plugins/youtube_download/yt_dlp/extractor/audius.py
index 6448b44..c611c6e 100644
--- a/plugins/youtube_download/yt_dlp/extractor/audius.py
+++ b/plugins/youtube_download/yt_dlp/extractor/audius.py
@@ -1,7 +1,7 @@
 import random
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import compat_str, compat_urllib_parse_unquote
 from ..utils import ExtractorError, str_or_none, try_get
 
 
@@ -15,13 +15,13 @@ class AudiusBaseIE(InfoExtractor):
             if response_data is not None:
                 return response_data
             if len(response) == 1 and 'message' in response:
-                raise ExtractorError('API error: %s' % response['message'],
+                raise ExtractorError('API error: {}'.format(response['message']),
                                      expected=True)
         raise ExtractorError('Unexpected API response')
 
     def _select_api_base(self):
         """Selecting one of the currently available API hosts"""
-        response = super(AudiusBaseIE, self)._download_json(
+        response = super()._download_json(
             'https://api.audius.co/', None,
             note='Requesting available API hosts',
             errnote='Unable to request available API hosts')
@@ -41,8 +41,8 @@ class AudiusBaseIE(InfoExtractor):
         anything from this link, since the Audius API won't be able to resolve
         this url
         """
-        url = compat_urllib_parse_unquote(url)
-        title = compat_urllib_parse_unquote(title)
+        url = urllib.parse.unquote(url)
+        title = urllib.parse.unquote(title)
         if '/' in title or '%2F' in title:
             fixed_title = title.replace('/', '%5C').replace('%2F', '%5C')
             return url.replace(title, fixed_title)
@@ -54,19 +54,19 @@ class AudiusBaseIE(InfoExtractor):
         if self._API_BASE is None:
             self._select_api_base()
         try:
-            response = super(AudiusBaseIE, self)._download_json(
-                '%s%s%s' % (self._API_BASE, self._API_V, path), item_id, note=note,
+            response = super()._download_json(
+                f'{self._API_BASE}{self._API_V}{path}', item_id, note=note,
                 errnote=errnote, expected_status=expected_status)
         except ExtractorError as exc:
             # some of Audius API hosts may not work as expected and return HTML
-            if 'Failed to parse JSON' in compat_str(exc):
+            if 'Failed to parse JSON' in str(exc):
                 raise ExtractorError('An error occurred while receiving data. Try again',
                                      expected=True)
             raise exc
         return self._get_response_data(response)
 
     def _resolve_url(self, url, item_id):
-        return self._api_request('/resolve?url=%s' % url, item_id,
+        return self._api_request(f'/resolve?url={url}', item_id,
                                  expected_status=404)
 
 
@@ -91,7 +91,7 @@ class AudiusIE(AudiusBaseIE):
                 'view_count': int,
                 'like_count': int,
                 'repost_count': int,
-            }
+            },
         },
         {
             # Regular track
@@ -109,14 +109,14 @@ class AudiusIE(AudiusBaseIE):
                 'view_count': int,
                 'like_count': int,
                 'repost_count': int,
-            }
+            },
         },
     ]
 
     _ARTWORK_MAP = {
-        "150x150": 150,
-        "480x480": 480,
-        "1000x1000": 1000
+        '150x150': 150,
+        '480x480': 480,
+        '1000x1000': 1000,
     }
 
     def _real_extract(self, url):
@@ -130,7 +130,7 @@ class AudiusIE(AudiusBaseIE):
         else:  # API link
             title = None
             # uploader = None
-            track_data = self._api_request('/tracks/%s' % track_id, track_id)
+            track_data = self._api_request(f'/tracks/{track_id}', track_id)
 
         if not isinstance(track_data, dict):
             raise ExtractorError('Unexpected API response')
@@ -144,7 +144,7 @@ class AudiusIE(AudiusBaseIE):
         if isinstance(artworks_data, dict):
             for quality_key, thumbnail_url in artworks_data.items():
                 thumbnail = {
-                    "url": thumbnail_url
+                    'url': thumbnail_url,
                 }
                 quality_code = self._ARTWORK_MAP.get(quality_key)
                 if quality_code is not None:
@@ -154,12 +154,12 @@ class AudiusIE(AudiusBaseIE):
         return {
             'id': track_id,
             'title': track_data.get('title', title),
-            'url': '%s/v1/tracks/%s/stream' % (self._API_BASE, track_id),
+            'url': f'{self._API_BASE}/v1/tracks/{track_id}/stream',
             'ext': 'mp3',
             'description': track_data.get('description'),
             'duration': track_data.get('duration'),
             'track': track_data.get('title'),
-            'artist': try_get(track_data, lambda x: x['user']['name'], compat_str),
+            'artist': try_get(track_data, lambda x: x['user']['name'], str),
             'genre': track_data.get('genre'),
             'thumbnails': thumbnails,
             'view_count': track_data.get('play_count'),
@@ -175,11 +175,11 @@ class AudiusTrackIE(AudiusIE):  # XXX: Do not subclass from concrete IE
     _TESTS = [
         {
             'url': 'audius:9RWlo',
-            'only_matching': True
+            'only_matching': True,
         },
         {
             'url': 'audius:http://discoveryprovider.audius.prod-us-west-2.staked.cloud/v1/tracks/9RWlo',
-            'only_matching': True
+            'only_matching': True,
         },
     ]
 
@@ -207,7 +207,7 @@ class AudiusPlaylistIE(AudiusBaseIE):
             if not track_id:
                 raise ExtractorError('Unable to get track ID from playlist')
             entries.append(self.url_result(
-                'audius:%s' % track_id,
+                f'audius:{track_id}',
                 ie=AudiusTrackIE.ie_key(), video_id=track_id))
         return entries
 
@@ -231,7 +231,7 @@ class AudiusPlaylistIE(AudiusBaseIE):
             raise ExtractorError('Unable to get playlist ID')
 
         playlist_tracks = self._api_request(
-            '/playlists/%s/tracks' % playlist_id,
+            f'/playlists/{playlist_id}/tracks',
             title, note='Downloading playlist tracks metadata',
             errnote='Unable to download playlist tracks metadata')
         if not isinstance(playlist_tracks, list):
@@ -267,5 +267,5 @@ class AudiusProfileIE(AudiusPlaylistIE):  # XXX: Do not subclass from concrete I
         profile_audius_id = _profile_data[0]['id']
         profile_bio = _profile_data[0].get('bio')
 
-        api_call = self._api_request('/full/users/handle/%s/tracks' % profile_id, profile_id)
+        api_call = self._api_request(f'/full/users/handle/{profile_id}/tracks', profile_id)
         return self.playlist_result(self._build_playlist(api_call), profile_audius_id, profile_id, profile_bio)
diff --git a/plugins/youtube_download/yt_dlp/extractor/awaan.py b/plugins/youtube_download/yt_dlp/extractor/awaan.py
index 6fc938d..4066a5a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/awaan.py
+++ b/plugins/youtube_download/yt_dlp/extractor/awaan.py
@@ -1,10 +1,7 @@
 import base64
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_urllib_parse_urlencode,
-    compat_str,
-)
 from ..utils import (
     format_field,
     int_or_none,
@@ -22,14 +19,14 @@ class AWAANIE(InfoExtractor):
         show_id, video_id, season_id = self._match_valid_url(url).groups()
         if video_id and int(video_id) > 0:
             return self.url_result(
-                'http://awaan.ae/media/%s' % video_id, 'AWAANVideo')
+                f'http://awaan.ae/media/{video_id}', 'AWAANVideo')
         elif season_id and int(season_id) > 0:
             return self.url_result(smuggle_url(
-                'http://awaan.ae/program/season/%s' % season_id,
+                f'http://awaan.ae/program/season/{season_id}',
                 {'show_id': show_id}), 'AWAANSeason')
         else:
             return self.url_result(
-                'http://awaan.ae/program/%s' % show_id, 'AWAANSeason')
+                f'http://awaan.ae/program/{show_id}', 'AWAANSeason')
 
 
 class AWAANBaseIE(InfoExtractor):
@@ -75,11 +72,11 @@ class AWAANVideoIE(AWAANBaseIE):
         video_id = self._match_id(url)
 
         video_data = self._download_json(
-            'http://admin.mangomolo.com/analytics/index.php/plus/video?id=%s' % video_id,
+            f'http://admin.mangomolo.com/analytics/index.php/plus/video?id={video_id}',
             video_id, headers={'Origin': 'http://awaan.ae'})
         info = self._parse_video_data(video_data, video_id, False)
 
-        embed_url = 'http://admin.mangomolo.com/analytics/index.php/customers/embed/video?' + compat_urllib_parse_urlencode({
+        embed_url = 'http://admin.mangomolo.com/analytics/index.php/customers/embed/video?' + urllib.parse.urlencode({
             'id': video_data['id'],
             'user_id': video_data['user_id'],
             'signature': video_data['signature'],
@@ -117,11 +114,11 @@ class AWAANLiveIE(AWAANBaseIE):
         channel_id = self._match_id(url)
 
         channel_data = self._download_json(
-            'http://admin.mangomolo.com/analytics/index.php/plus/getchanneldetails?channel_id=%s' % channel_id,
+            f'http://admin.mangomolo.com/analytics/index.php/plus/getchanneldetails?channel_id={channel_id}',
             channel_id, headers={'Origin': 'http://awaan.ae'})
         info = self._parse_video_data(channel_data, channel_id, True)
 
-        embed_url = 'http://admin.mangomolo.com/analytics/index.php/customers/embed/index?' + compat_urllib_parse_urlencode({
+        embed_url = 'http://admin.mangomolo.com/analytics/index.php/customers/embed/index?' + urllib.parse.urlencode({
             'id': base64.b64encode(channel_data['user_id'].encode()).decode(),
             'channelid': base64.b64encode(channel_data['id'].encode()).decode(),
             'signature': channel_data['signature'],
@@ -159,7 +156,7 @@ class AWAANSeasonIE(InfoExtractor):
             show_id = smuggled_data.get('show_id')
             if show_id is None:
                 season = self._download_json(
-                    'http://admin.mangomolo.com/analytics/index.php/plus/season_info?id=%s' % season_id,
+                    f'http://admin.mangomolo.com/analytics/index.php/plus/season_info?id={season_id}',
                     season_id, headers={'Origin': 'http://awaan.ae'})
                 show_id = season['id']
         data['show_id'] = show_id
@@ -167,7 +164,7 @@ class AWAANSeasonIE(InfoExtractor):
             'http://admin.mangomolo.com/analytics/index.php/plus/show',
             show_id, data=urlencode_postdata(data), headers={
                 'Origin': 'http://awaan.ae',
-                'Content-Type': 'application/x-www-form-urlencoded'
+                'Content-Type': 'application/x-www-form-urlencoded',
             })
         if not season_id:
             season_id = show['default_season']
@@ -177,8 +174,8 @@ class AWAANSeasonIE(InfoExtractor):
 
                 entries = []
                 for video in show['videos']:
-                    video_id = compat_str(video['id'])
+                    video_id = str(video['id'])
                     entries.append(self.url_result(
-                        'http://awaan.ae/media/%s' % video_id, 'AWAANVideo', video_id))
+                        f'http://awaan.ae/media/{video_id}', 'AWAANVideo', video_id))
 
                 return self.playlist_result(entries, season_id, title)
diff --git a/plugins/youtube_download/yt_dlp/extractor/aws.py b/plugins/youtube_download/yt_dlp/extractor/aws.py
index eb831a1..177c410 100644
--- a/plugins/youtube_download/yt_dlp/extractor/aws.py
+++ b/plugins/youtube_download/yt_dlp/extractor/aws.py
@@ -1,9 +1,9 @@
-import datetime
+import datetime as dt
 import hashlib
 import hmac
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import compat_urllib_parse_urlencode
 
 
 class AWSIE(InfoExtractor):  # XXX: Conventionally, base classes should end with BaseIE/InfoExtractor
@@ -12,26 +12,26 @@ class AWSIE(InfoExtractor):  # XXX: Conventionally, base classes should end with
 
     def _aws_execute_api(self, aws_dict, video_id, query=None):
         query = query or {}
-        amz_date = datetime.datetime.utcnow().strftime('%Y%m%dT%H%M%SZ')
+        amz_date = dt.datetime.now(dt.timezone.utc).strftime('%Y%m%dT%H%M%SZ')
         date = amz_date[:8]
         headers = {
             'Accept': 'application/json',
             'Host': self._AWS_PROXY_HOST,
             'X-Amz-Date': amz_date,
-            'X-Api-Key': self._AWS_API_KEY
+            'X-Api-Key': self._AWS_API_KEY,
         }
         session_token = aws_dict.get('session_token')
         if session_token:
             headers['X-Amz-Security-Token'] = session_token
 
         def aws_hash(s):
-            return hashlib.sha256(s.encode('utf-8')).hexdigest()
+            return hashlib.sha256(s.encode()).hexdigest()
 
         # Task 1: http://docs.aws.amazon.com/general/latest/gr/sigv4-create-canonical-request.html
-        canonical_querystring = compat_urllib_parse_urlencode(query)
+        canonical_querystring = urllib.parse.urlencode(query)
         canonical_headers = ''
         for header_name, header_value in sorted(headers.items()):
-            canonical_headers += '%s:%s\n' % (header_name.lower(), header_value)
+            canonical_headers += f'{header_name.lower()}:{header_value}\n'
         signed_headers = ';'.join([header.lower() for header in sorted(headers.keys())])
         canonical_request = '\n'.join([
             'GET',
@@ -39,7 +39,7 @@ class AWSIE(InfoExtractor):  # XXX: Conventionally, base classes should end with
             canonical_querystring,
             canonical_headers,
             signed_headers,
-            aws_hash('')
+            aws_hash(''),
         ])
 
         # Task 2: http://docs.aws.amazon.com/general/latest/gr/sigv4-create-string-to-sign.html
@@ -49,7 +49,7 @@ class AWSIE(InfoExtractor):  # XXX: Conventionally, base classes should end with
 
         # Task 3: http://docs.aws.amazon.com/general/latest/gr/sigv4-calculate-signature.html
         def aws_hmac(key, msg):
-            return hmac.new(key, msg.encode('utf-8'), hashlib.sha256)
+            return hmac.new(key, msg.encode(), hashlib.sha256)
 
         def aws_hmac_digest(key, msg):
             return aws_hmac(key, msg).digest()
@@ -57,7 +57,7 @@ class AWSIE(InfoExtractor):  # XXX: Conventionally, base classes should end with
         def aws_hmac_hexdigest(key, msg):
             return aws_hmac(key, msg).hexdigest()
 
-        k_signing = ('AWS4' + aws_dict['secret_key']).encode('utf-8')
+        k_signing = ('AWS4' + aws_dict['secret_key']).encode()
         for value in credential_scope_list:
             k_signing = aws_hmac_digest(k_signing, value)
 
@@ -65,11 +65,11 @@ class AWSIE(InfoExtractor):  # XXX: Conventionally, base classes should end with
 
         # Task 4: http://docs.aws.amazon.com/general/latest/gr/sigv4-add-signature-to-request.html
         headers['Authorization'] = ', '.join([
-            '%s Credential=%s/%s' % (self._AWS_ALGORITHM, aws_dict['access_key'], credential_scope),
-            'SignedHeaders=%s' % signed_headers,
-            'Signature=%s' % signature,
+            '{} Credential={}/{}'.format(self._AWS_ALGORITHM, aws_dict['access_key'], credential_scope),
+            f'SignedHeaders={signed_headers}',
+            f'Signature={signature}',
         ])
 
         return self._download_json(
-            'https://%s%s%s' % (self._AWS_PROXY_HOST, aws_dict['uri'], '?' + canonical_querystring if canonical_querystring else ''),
+            'https://{}{}{}'.format(self._AWS_PROXY_HOST, aws_dict['uri'], '?' + canonical_querystring if canonical_querystring else ''),
             video_id, headers=headers)
diff --git a/plugins/youtube_download/yt_dlp/extractor/axs.py b/plugins/youtube_download/yt_dlp/extractor/axs.py
new file mode 100644
index 0000000..7e91667
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/axs.py
@@ -0,0 +1,89 @@
+from .common import InfoExtractor
+from ..utils import (
+    float_or_none,
+    js_to_json,
+    parse_iso8601,
+    traverse_obj,
+    url_or_none,
+)
+
+
+class AxsIE(InfoExtractor):
+    IE_NAME = 'axs.tv'
+    _VALID_URL = r'https?://(?:www\.)?axs\.tv/(?:channel/(?:[^/?#]+/)+)?video/(?P<id>[^/?#]+)'
+
+    _TESTS = [{
+        'url': 'https://www.axs.tv/video/5f4dc776b70e4f1c194f22ef/',
+        'md5': '8d97736ae8e50c64df528e5e676778cf',
+        'info_dict': {
+            'id': '5f4dc776b70e4f1c194f22ef',
+            'title': 'Small Town',
+            'ext': 'mp4',
+            'description': 'md5:e314d28bfaa227a4d7ec965fae19997f',
+            'upload_date': '20230602',
+            'timestamp': 1685729564,
+            'duration': 1284.216,
+            'series': 'Rock & Roll Road Trip with Sammy Hagar',
+            'season': 'Season 2',
+            'season_number': 2,
+            'episode': '3',
+            'thumbnail': 'https://images.dotstudiopro.com/5f4e9d330a0c3b295a7e8394',
+        },
+    }, {
+        'url': 'https://www.axs.tv/channel/rock-star-interview/video/daryl-hall',
+        'md5': '300ae795cd8f9984652c0949734ffbdc',
+        'info_dict': {
+            'id': '5f488148b70e4f392572977c',
+            'display_id': 'daryl-hall',
+            'title': 'Daryl Hall',
+            'ext': 'mp4',
+            'description': 'md5:e54ecaa0f4b5683fc9259e9e4b196628',
+            'upload_date': '20230214',
+            'timestamp': 1676403615,
+            'duration': 2570.668,
+            'series': 'The Big Interview with Dan Rather',
+            'season': 'Season 3',
+            'season_number': 3,
+            'episode': '5',
+            'thumbnail': 'https://images.dotstudiopro.com/5f4d1901f340b50d937cec32',
+        },
+    }]
+
+    def _real_extract(self, url):
+        display_id = self._match_id(url)
+        webpage = self._download_webpage(url, display_id)
+
+        webpage_json_data = self._search_json(
+            r'mountObj\s*=', webpage, 'video ID data', display_id,
+            transform_source=js_to_json)
+        video_id = webpage_json_data['video_id']
+        company_id = webpage_json_data['company_id']
+
+        meta = self._download_json(
+            f'https://api.myspotlight.tv/dotplayer/video/{company_id}/{video_id}',
+            video_id, query={'device_type': 'desktop_web'})['video']
+
+        formats = self._extract_m3u8_formats(
+            meta['video_m3u8'], video_id, 'mp4', m3u8_id='hls')
+
+        subtitles = {}
+        for cc in traverse_obj(meta, ('closeCaption', lambda _, v: url_or_none(v['srtPath']))):
+            subtitles.setdefault(cc.get('srtShortLang') or 'en', []).append(
+                {'ext': cc.get('srtExt'), 'url': cc['srtPath']})
+
+        return {
+            'id': video_id,
+            'display_id': display_id,
+            'formats': formats,
+            **traverse_obj(meta, {
+                'title': ('title', {str}),
+                'description': ('description', {str}),
+                'series': ('seriestitle', {str}),
+                'season_number': ('season', {int}),
+                'episode': ('episode', {str}),
+                'duration': ('duration', {float_or_none}),
+                'timestamp': ('updated_at', {parse_iso8601}),
+                'thumbnail': ('thumb', {url_or_none}),
+            }),
+            'subtitles': subtitles,
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/azmedien.py b/plugins/youtube_download/yt_dlp/extractor/azmedien.py
index d1686ee..9f6bd82 100644
--- a/plugins/youtube_download/yt_dlp/extractor/azmedien.py
+++ b/plugins/youtube_download/yt_dlp/extractor/azmedien.py
@@ -1,7 +1,6 @@
-import json
-
 from .common import InfoExtractor
 from .kaltura import KalturaIE
+from ..utils.traversal import require, traverse_obj
 
 
 class AZMedienIE(InfoExtractor):
@@ -9,15 +8,15 @@ class AZMedienIE(InfoExtractor):
     _VALID_URL = r'''(?x)
                     https?://
                         (?:www\.|tv\.)?
-                        (?P<host>
+                        (?:
                             telezueri\.ch|
                             telebaern\.tv|
                             telem1\.ch|
                             tvo-online\.ch
                         )/
-                        [^/]+/
+                        [^/?#]+/
                         (?P<id>
-                            [^/]+-(?P<article_id>\d+)
+                            [^/?#]+-\d+
                         )
                         (?:
                             \#video=
@@ -38,29 +37,27 @@ class AZMedienIE(InfoExtractor):
             'timestamp': 1538328802,
             'view_count': int,
             'thumbnail': 'http://cfvod.kaltura.com/p/1719221/sp/171922100/thumbnail/entry_id/1_anruz3wy/version/100031',
-            'duration': 1930
+            'duration': 1930,
         },
         'params': {
             'skip_download': True,
         },
     }, {
         'url': 'https://www.telebaern.tv/telebaern-news/montag-1-oktober-2018-ganze-sendung-133531189#video=0_7xjo9lf1',
-        'only_matching': True
+        'only_matching': True,
     }]
-    _API_TEMPL = 'https://www.%s/api/pub/gql/%s/NewsArticleTeaser/a4016f65fe62b81dc6664dd9f4910e4ab40383be'
     _PARTNER_ID = '1719221'
 
     def _real_extract(self, url):
-        host, display_id, article_id, entry_id = self._match_valid_url(url).groups()
+        display_id, entry_id = self._match_valid_url(url).groups()
 
         if not entry_id:
-            entry_id = self._download_json(
-                self._API_TEMPL % (host, host.split('.')[0]), display_id, query={
-                    'variables': json.dumps({
-                        'contextId': 'NewsArticle:' + article_id,
-                    }),
-                })['data']['context']['mainAsset']['video']['kaltura']['kalturaId']
+            webpage = self._download_webpage(url, display_id)
+            data = self._search_json(
+                r'window\.__APOLLO_STATE__\s*=', webpage, 'video data', display_id)
+            entry_id = traverse_obj(data, (
+                lambda _, v: v['__typename'] == 'KalturaData', 'kalturaId', any, {require('kaltura id')}))
 
         return self.url_result(
-            'kaltura:%s:%s' % (self._PARTNER_ID, entry_id),
+            f'kaltura:{self._PARTNER_ID}:{entry_id}',
             ie=KalturaIE.ie_key(), video_id=entry_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/baidu.py b/plugins/youtube_download/yt_dlp/extractor/baidu.py
index 8786d67..a1ad424 100644
--- a/plugins/youtube_download/yt_dlp/extractor/baidu.py
+++ b/plugins/youtube_download/yt_dlp/extractor/baidu.py
@@ -24,8 +24,9 @@ class BaiduVideoIE(InfoExtractor):
     }]
 
     def _call_api(self, path, category, playlist_id, note):
-        return self._download_json('http://app.video.baidu.com/%s/?worktype=adnative%s&id=%s' % (
-            path, category, playlist_id), playlist_id, note)
+        return self._download_json(
+            f'http://app.video.baidu.com/{path}/?worktype=adnative{category}&id={playlist_id}',
+            playlist_id, note)
 
     def _real_extract(self, url):
         category, playlist_id = self._match_valid_url(url).groups()
@@ -44,7 +45,7 @@ class BaiduVideoIE(InfoExtractor):
             'xqsingle', category, playlist_id, 'Download episodes JSON metadata')
 
         entries = [self.url_result(
-            episode['url'], video_title=episode['title']
+            episode['url'], video_title=episode['title'],
         ) for episode in episodes_detail['videos']]
 
         return self.playlist_result(
diff --git a/plugins/youtube_download/yt_dlp/extractor/banbye.py b/plugins/youtube_download/yt_dlp/extractor/banbye.py
index c873425..148a170 100644
--- a/plugins/youtube_download/yt_dlp/extractor/banbye.py
+++ b/plugins/youtube_download/yt_dlp/extractor/banbye.py
@@ -1,15 +1,16 @@
 import math
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_urllib_parse_urlparse,
-    compat_parse_qs,
-)
 from ..utils import (
-    format_field,
     InAdvancePagedList,
+    determine_ext,
+    format_field,
+    int_or_none,
+    join_nonempty,
     traverse_obj,
     unified_timestamp,
+    url_or_none,
 )
 
 
@@ -20,8 +21,8 @@ class BanByeBaseIE(InfoExtractor):
 
     @staticmethod
     def _extract_playlist_id(url, param='playlist'):
-        return compat_parse_qs(
-            compat_urllib_parse_urlparse(url).query).get(param, [None])[0]
+        return urllib.parse.parse_qs(
+            urllib.parse.urlparse(url).query).get(param, [None])[0]
 
     def _extract_playlist(self, playlist_id):
         data = self._download_json(f'{self._API_BASE}/playlists/{playlist_id}', playlist_id)
@@ -31,8 +32,9 @@ class BanByeBaseIE(InfoExtractor):
 
 
 class BanByeIE(BanByeBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?banbye.com/(?:en/)?watch/(?P<id>\w+)'
+    _VALID_URL = r'https?://(?:www\.)?banbye\.com/(?:en/)?watch/(?P<id>[\w-]+)'
     _TESTS = [{
+        # ['src']['mp4']['levels'] direct mp4 urls only
         'url': 'https://banbye.com/watch/v_ytfmvkVYLE8T',
         'md5': '2f4ea15c5ca259a73d909b2cfd558eb5',
         'info_dict': {
@@ -59,7 +61,70 @@ class BanByeIE(BanByeBaseIE):
             'title': 'Krzysztof Karoń',
             'id': 'p_Ld82N6gBw_OJ',
         },
-        'playlist_count': 9,
+        'playlist_mincount': 9,
+    }, {
+        # ['src']['mp4']['levels'] direct mp4 urls only
+        'url': 'https://banbye.com/watch/v_kb6_o1Kyq-CD',
+        'info_dict': {
+            'id': 'v_kb6_o1Kyq-CD',
+            'ext': 'mp4',
+            'title': 'Co tak naprawdę dzieje się we Francji?! Czy Warszawa a potem cała Polska będzie drugim Paryżem?!🤔🇵🇱',
+            'description': 'md5:82be4c0e13eae8ea1ca8b9f2e07226a8',
+            'uploader': 'Marcin Rola - MOIM ZDANIEM!🇵🇱',
+            'channel_id': 'ch_QgWnHvDG2fo5',
+            'channel_url': 'https://banbye.com/channel/ch_QgWnHvDG2fo5',
+            'duration': 597,
+            'timestamp': 1688642656,
+            'upload_date': '20230706',
+            'thumbnail': 'https://cdn.banbye.com/video/v_kb6_o1Kyq-CD/96.webp',
+            'tags': ['Paryż', 'Francja', 'Polska', 'Imigranci', 'Morawiecki', 'Tusk'],
+            'like_count': int,
+            'dislike_count': int,
+            'view_count': int,
+            'comment_count': int,
+        },
+    }, {
+        # ['src']['hls']['levels'] variant m3u8 urls only; master m3u8 is 404
+        'url': 'https://banbye.com/watch/v_a_gPFuC9LoW5',
+        'info_dict': {
+            'id': 'v_a_gPFuC9LoW5',
+            'ext': 'mp4',
+            'title': 'md5:183524056bebdfa245fd6d214f63c0fe',
+            'description': 'md5:943ac87287ca98d28d8b8797719827c6',
+            'uploader': 'wRealu24',
+            'channel_id': 'ch_wrealu24',
+            'channel_url': 'https://banbye.com/channel/ch_wrealu24',
+            'upload_date': '20231113',
+            'timestamp': 1699874062,
+            'view_count': int,
+            'like_count': int,
+            'dislike_count': int,
+            'comment_count': int,
+            'thumbnail': 'https://cdn.banbye.com/video/v_a_gPFuC9LoW5/96.webp',
+            'tags': ['jaszczur', 'sejm', 'lewica', 'polska', 'ukrainizacja', 'pierwszeposiedzeniesejmu'],
+        },
+        'expected_warnings': ['Failed to download m3u8'],
+    }, {
+        # ['src']['hls']['masterPlaylist'] m3u8 only
+        'url': 'https://banbye.com/watch/v_B0rsKWsr-aaa',
+        'info_dict': {
+            'id': 'v_B0rsKWsr-aaa',
+            'ext': 'mp4',
+            'title': 'md5:00b254164b82101b3f9e5326037447ed',
+            'description': 'md5:3fd8b48aa81954ba024bc60f5de6e167',
+            'uploader': 'PSTV Piotr Szlachtowicz ',
+            'channel_id': 'ch_KV9EVObkB9wB',
+            'channel_url': 'https://banbye.com/channel/ch_KV9EVObkB9wB',
+            'upload_date': '20240629',
+            'timestamp': 1719646816,
+            'duration': 2377,
+            'view_count': int,
+            'like_count': int,
+            'dislike_count': int,
+            'comment_count': int,
+            'thumbnail': 'https://cdn.banbye.com/video/v_B0rsKWsr-aaa/96.webp',
+            'tags': ['Biden', 'Trump', 'Wybory', 'USA'],
+        },
     }]
 
     def _real_extract(self, url):
@@ -74,11 +139,24 @@ class BanByeIE(BanByeBaseIE):
             'id': f'{quality}p',
             'url': f'{self._CDN_BASE}/video/{video_id}/{quality}.webp',
         } for quality in [48, 96, 144, 240, 512, 1080]]
-        formats = [{
-            'format_id': f'http-{quality}p',
-            'quality': quality,
-            'url': f'{self._CDN_BASE}/video/{video_id}/{quality}.mp4',
-        } for quality in data['quality']]
+
+        formats = []
+        url_data = self._download_json(f'{self._API_BASE}/videos/{video_id}/url', video_id, data=b'')
+        if master_url := traverse_obj(url_data, ('src', 'hls', 'masterPlaylist', {url_or_none})):
+            formats = self._extract_m3u8_formats(master_url, video_id, 'mp4', m3u8_id='hls', fatal=False)
+
+        for format_id, format_url in traverse_obj(url_data, (
+                'src', ('mp4', 'hls'), 'levels', {dict.items}, lambda _, v: url_or_none(v[1]))):
+            ext = determine_ext(format_url)
+            is_hls = ext == 'm3u8'
+            formats.append({
+                'url': format_url,
+                'ext': 'mp4' if is_hls else ext,
+                'format_id': join_nonempty(is_hls and 'hls', format_id),
+                'protocol': 'm3u8_native' if is_hls else 'https',
+                'height': int_or_none(format_id),
+            })
+        self._remove_duplicate_formats(formats)
 
         return {
             'id': video_id,
@@ -100,7 +178,7 @@ class BanByeIE(BanByeBaseIE):
 
 
 class BanByeChannelIE(BanByeBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?banbye.com/(?:en/)?channel/(?P<id>\w+)'
+    _VALID_URL = r'https?://(?:www\.)?banbye\.com/(?:en/)?channel/(?P<id>\w+)'
     _TESTS = [{
         'url': 'https://banbye.com/channel/ch_wrealu24',
         'info_dict': {
@@ -132,7 +210,7 @@ class BanByeChannelIE(BanByeBaseIE):
                 'sort': 'new',
                 'limit': self._PAGE_SIZE,
                 'offset': page_num * self._PAGE_SIZE,
-            }, note=f'Downloading page {page_num+1}')
+            }, note=f'Downloading page {page_num + 1}')
             return [
                 self.url_result(f"{self._VIDEO_BASE}/{video['_id']}", BanByeIE)
                 for video in data['items']
diff --git a/plugins/youtube_download/yt_dlp/extractor/bandcamp.py b/plugins/youtube_download/yt_dlp/extractor/bandcamp.py
index e89b3a6..939c280 100644
--- a/plugins/youtube_download/yt_dlp/extractor/bandcamp.py
+++ b/plugins/youtube_download/yt_dlp/extractor/bandcamp.py
@@ -1,12 +1,13 @@
+import json
 import random
 import re
 import time
 
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     KNOWN_EXTENSIONS,
     ExtractorError,
+    extract_attributes,
     float_or_none,
     int_or_none,
     parse_filesize,
@@ -18,6 +19,7 @@ from ..utils import (
     url_or_none,
     urljoin,
 )
+from ..utils.traversal import find_element, traverse_obj
 
 
 class BandcampIE(InfoExtractor):
@@ -41,8 +43,10 @@ class BandcampIE(InfoExtractor):
             'uploader_url': 'https://youtube-dl.bandcamp.com',
             'uploader_id': 'youtube-dl',
             'thumbnail': 'https://f4.bcbits.com/img/a3216802731_5.jpg',
+            'artists': ['youtube-dl "\'/\\ä↭'],
+            'album_artists': ['youtube-dl "\'/\\ä↭'],
         },
-        '_skip': 'There is a limit of 200 free downloads / month for the test song'
+        'skip': 'There is a limit of 200 free downloads / month for the test song',
     }, {
         # free download
         'url': 'http://benprunty.bandcamp.com/track/lanius-battle',
@@ -119,7 +123,7 @@ class BandcampIE(InfoExtractor):
 
     def _extract_data_attr(self, webpage, video_id, attr='tralbum', fatal=True):
         return self._parse_json(self._html_search_regex(
-            r'data-%s=(["\'])({.+?})\1' % attr, webpage,
+            rf'data-{attr}=(["\'])({{.+?}})\1', webpage,
             attr + ' data', group=2), video_id, fatal=fatal)
 
     def _real_extract(self, url):
@@ -167,7 +171,7 @@ class BandcampIE(InfoExtractor):
 
         download_link = tralbum.get('freeDownloadPage')
         if download_link:
-            track_id = compat_str(tralbum['id'])
+            track_id = str(tralbum['id'])
 
             download_webpage = self._download_webpage(
                 download_link, track_id, 'Downloading free downloads page')
@@ -192,7 +196,7 @@ class BandcampIE(InfoExtractor):
                     if isinstance(download_formats_list, list):
                         for f in blob['download_formats']:
                             name, ext = f.get('name'), f.get('file_extension')
-                            if all(isinstance(x, compat_str) for x in (name, ext)):
+                            if all(isinstance(x, str) for x in (name, ext)):
                                 download_formats[name] = ext.strip('.')
 
                     for format_id, f in downloads.items():
@@ -207,7 +211,7 @@ class BandcampIE(InfoExtractor):
                             })
                         format_id = f.get('encoding_name') or format_id
                         stat = self._download_json(
-                            stat_url, track_id, 'Downloading %s JSON' % format_id,
+                            stat_url, track_id, f'Downloading {format_id} JSON',
                             transform_source=lambda s: s[s.index('{'):s.rindex('}') + 1],
                             fatal=False)
                         if not stat:
@@ -225,7 +229,7 @@ class BandcampIE(InfoExtractor):
                             'acodec': format_id.split('-')[0],
                         })
 
-        title = '%s - %s' % (artist, track) if artist else track
+        title = f'{artist} - {track}' if artist else track
 
         if not duration:
             duration = float_or_none(self._html_search_meta(
@@ -267,7 +271,19 @@ class BandcampAlbumIE(BandcampIE):  # XXX: Do not subclass from concrete IE
                     'timestamp': 1311756226,
                     'upload_date': '20110727',
                     'uploader': 'Blazo',
-                }
+                    'thumbnail': 'https://f4.bcbits.com/img/a1721150828_5.jpg',
+                    'album_artists': ['Blazo'],
+                    'uploader_url': 'https://blazo.bandcamp.com',
+                    'release_date': '20110727',
+                    'release_timestamp': 1311724800.0,
+                    'track': 'Intro',
+                    'uploader_id': 'blazo',
+                    'track_number': 1,
+                    'album': 'Jazz Format Mixtape vol.1',
+                    'artists': ['Blazo'],
+                    'duration': 19.335,
+                    'track_id': '1353101989',
+                },
             },
             {
                 'md5': '1a2c32e2691474643e912cc6cd4bffaa',
@@ -278,18 +294,31 @@ class BandcampAlbumIE(BandcampIE):  # XXX: Do not subclass from concrete IE
                     'timestamp': 1311757238,
                     'upload_date': '20110727',
                     'uploader': 'Blazo',
-                }
+                    'track': 'Kero One - Keep It Alive (Blazo remix)',
+                    'release_date': '20110727',
+                    'track_id': '38097443',
+                    'track_number': 2,
+                    'duration': 181.467,
+                    'uploader_url': 'https://blazo.bandcamp.com',
+                    'album': 'Jazz Format Mixtape vol.1',
+                    'uploader_id': 'blazo',
+                    'album_artists': ['Blazo'],
+                    'artists': ['Blazo'],
+                    'thumbnail': 'https://f4.bcbits.com/img/a1721150828_5.jpg',
+                    'release_timestamp': 1311724800.0,
+                },
             },
         ],
         'info_dict': {
             'title': 'Jazz Format Mixtape vol.1',
             'id': 'jazz-format-mixtape-vol-1',
             'uploader_id': 'blazo',
+            'description': 'md5:38052a93217f3ffdc033cd5dbbce2989',
         },
         'params': {
-            'playlistend': 2
+            'playlistend': 2,
         },
-        'skip': 'Bandcamp imposes download limits.'
+        'skip': 'Bandcamp imposes download limits.',
     }, {
         'url': 'http://nightbringer.bandcamp.com/album/hierophany-of-the-open-grave',
         'info_dict': {
@@ -324,7 +353,7 @@ class BandcampAlbumIE(BandcampIE):  # XXX: Do not subclass from concrete IE
     def suitable(cls, url):
         return (False
                 if BandcampWeeklyIE.suitable(url) or BandcampIE.suitable(url)
-                else super(BandcampAlbumIE, cls).suitable(url))
+                else super().suitable(url))
 
     def _real_extract(self, url):
         uploader_id, album_id = self._match_valid_url(url).groups()
@@ -359,10 +388,10 @@ class BandcampWeeklyIE(BandcampIE):  # XXX: Do not subclass from concrete IE
     _VALID_URL = r'https?://(?:www\.)?bandcamp\.com/?\?(?:.*?&)?show=(?P<id>\d+)'
     _TESTS = [{
         'url': 'https://bandcamp.com/?show=224',
-        'md5': 'b00df799c733cf7e0c567ed187dea0fd',
+        'md5': '61acc9a002bed93986b91168aa3ab433',
         'info_dict': {
             'id': '224',
-            'ext': 'opus',
+            'ext': 'mp3',
             'title': 'BC Weekly April 4th 2017 - Magic Moments',
             'description': 'md5:5d48150916e8e02d030623a48512c874',
             'duration': 5829.77,
@@ -372,11 +401,11 @@ class BandcampWeeklyIE(BandcampIE):  # XXX: Do not subclass from concrete IE
             'episode_id': '224',
         },
         'params': {
-            'format': 'opus-lo',
+            'format': 'mp3-128',
         },
     }, {
         'url': 'https://bandcamp.com/?blah/blah@&show=228',
-        'only_matching': True
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
@@ -407,7 +436,7 @@ class BandcampWeeklyIE(BandcampIE):  # XXX: Do not subclass from concrete IE
         title = show.get('audio_title') or 'Bandcamp Weekly'
         subtitle = show.get('subtitle')
         if subtitle:
-            title += ' - %s' % subtitle
+            title += f' - {subtitle}'
 
         return {
             'id': show_id,
@@ -419,7 +448,7 @@ class BandcampWeeklyIE(BandcampIE):  # XXX: Do not subclass from concrete IE
             'series': 'Bandcamp Weekly',
             'episode': show.get('subtitle'),
             'episode_id': show_id,
-            'formats': formats
+            'formats': formats,
         }
 
 
@@ -440,7 +469,7 @@ class BandcampUserIE(InfoExtractor):
         'url': 'http://dotscale.bandcamp.com',
         'info_dict': {
             'id': 'dotscale',
-            'title': 'Discography of dotscale'
+            'title': 'Discography of dotscale',
         },
         'playlist_count': 1,
     }, {
@@ -460,7 +489,7 @@ class BandcampUserIE(InfoExtractor):
         },
     }, {
         'url': 'https://coldworldofficial.bandcamp.com/music',
-        'playlist_mincount': 10,
+        'playlist_mincount': 7,
         'info_dict': {
             'id': 'coldworldofficial',
             'title': 'Discography of coldworldofficial',
@@ -474,12 +503,19 @@ class BandcampUserIE(InfoExtractor):
         },
     }]
 
+    def _yield_items(self, webpage):
+        yield from (
+            re.findall(r'<li data-item-id=["\'][^>]+>\s*<a href=["\'](?![^"\'/]*?/merch)([^"\']+)', webpage)
+            or re.findall(r'<div[^>]+trackTitle["\'][^"\']+["\']([^"\']+)', webpage))
+
+        yield from traverse_obj(webpage, (
+            {find_element(id='music-grid', html=True)}, {extract_attributes},
+            'data-client-items', {json.loads}, ..., 'page_url', {str}))
+
     def _real_extract(self, url):
         uploader = self._match_id(url)
         webpage = self._download_webpage(url, uploader)
 
-        discography_data = (re.findall(r'<li data-item-id=["\'][^>]+>\s*<a href=["\'](?![^"\'/]*?/merch)([^"\']+)', webpage)
-                            or re.findall(r'<div[^>]+trackTitle["\'][^"\']+["\']([^"\']+)', webpage))
-
         return self.playlist_from_matches(
-            discography_data, uploader, f'Discography of {uploader}', getter=lambda x: urljoin(url, x))
+            self._yield_items(webpage), uploader, f'Discography of {uploader}',
+            getter=urljoin(url))
diff --git a/plugins/youtube_download/yt_dlp/extractor/bandlab.py b/plugins/youtube_download/yt_dlp/extractor/bandlab.py
new file mode 100644
index 0000000..f110b79
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/bandlab.py
@@ -0,0 +1,437 @@
+from .common import InfoExtractor
+from ..utils import (
+    ExtractorError,
+    float_or_none,
+    format_field,
+    int_or_none,
+    parse_iso8601,
+    parse_qs,
+    truncate_string,
+    url_or_none,
+)
+from ..utils.traversal import traverse_obj, value
+
+
+class BandlabBaseIE(InfoExtractor):
+    def _call_api(self, endpoint, asset_id, **kwargs):
+        headers = kwargs.pop('headers', None) or {}
+        return self._download_json(
+            f'https://www.bandlab.com/api/v1.3/{endpoint}/{asset_id}',
+            asset_id, headers={
+                'accept': 'application/json',
+                'referer': 'https://www.bandlab.com/',
+                'x-client-id': 'BandLab-Web',
+                'x-client-version': '10.1.124',
+                **headers,
+            }, **kwargs)
+
+    def _parse_revision(self, revision_data, url=None):
+        return {
+            'vcodec': 'none',
+            'media_type': 'revision',
+            'extractor_key': BandlabIE.ie_key(),
+            'extractor': BandlabIE.IE_NAME,
+            **traverse_obj(revision_data, {
+                'webpage_url': (
+                    'id', ({value(url)}, {format_field(template='https://www.bandlab.com/revision/%s')}), filter, any),
+                'id': (('revisionId', 'id'), {str}, any),
+                'title': ('song', 'name', {str}),
+                'track': ('song', 'name', {str}),
+                'url': ('mixdown', 'file', {url_or_none}),
+                'thumbnail': ('song', 'picture', 'url', {url_or_none}),
+                'description': ('description', {str}),
+                'uploader': ('creator', 'name', {str}),
+                'uploader_id': ('creator', 'username', {str}),
+                'timestamp': ('createdOn', {parse_iso8601}),
+                'duration': ('mixdown', 'duration', {float_or_none}),
+                'view_count': ('counters', 'plays', {int_or_none}),
+                'like_count': ('counters', 'likes', {int_or_none}),
+                'comment_count': ('counters', 'comments', {int_or_none}),
+                'genres': ('genres', ..., 'name', {str}),
+            }),
+        }
+
+    def _parse_track(self, track_data, url=None):
+        return {
+            'vcodec': 'none',
+            'media_type': 'track',
+            'extractor_key': BandlabIE.ie_key(),
+            'extractor': BandlabIE.IE_NAME,
+            **traverse_obj(track_data, {
+                'webpage_url': (
+                    'id', ({value(url)}, {format_field(template='https://www.bandlab.com/post/%s')}), filter, any),
+                'id': (('revisionId', 'id'), {str}, any),
+                'url': ('track', 'sample', 'audioUrl', {url_or_none}),
+                'title': ('track', 'name', {str}),
+                'track': ('track', 'name', {str}),
+                'description': ('caption', {str}),
+                'thumbnail': ('track', 'picture', ('original', 'url'), {url_or_none}, any),
+                'view_count': ('counters', 'plays', {int_or_none}),
+                'like_count': ('counters', 'likes', {int_or_none}),
+                'comment_count': ('counters', 'comments', {int_or_none}),
+                'duration': ('track', 'sample', 'duration', {float_or_none}),
+                'uploader': ('creator', 'name', {str}),
+                'uploader_id': ('creator', 'username', {str}),
+                'timestamp': ('createdOn', {parse_iso8601}),
+            }),
+        }
+
+    def _parse_video(self, video_data, url=None):
+        return {
+            'media_type': 'video',
+            'extractor_key': BandlabIE.ie_key(),
+            'extractor': BandlabIE.IE_NAME,
+            **traverse_obj(video_data, {
+                'id': ('id', {str}),
+                'webpage_url': (
+                    'id', ({value(url)}, {format_field(template='https://www.bandlab.com/post/%s')}), filter, any),
+                'url': ('video', 'url', {url_or_none}),
+                'title': ('caption', {lambda x: x.replace('\n', ' ')}, {truncate_string(left=72)}),
+                'description': ('caption', {str}),
+                'thumbnail': ('video', 'picture', 'url', {url_or_none}),
+                'view_count': ('video', 'counters', 'plays', {int_or_none}),
+                'like_count': ('video', 'counters', 'likes', {int_or_none}),
+                'comment_count': ('counters', 'comments', {int_or_none}),
+                'duration': ('video', 'duration', {float_or_none}),
+                'uploader': ('creator', 'name', {str}),
+                'uploader_id': ('creator', 'username', {str}),
+            }),
+        }
+
+
+class BandlabIE(BandlabBaseIE):
+    _VALID_URL = [
+        r'https?://(?:www\.)?bandlab.com/(?P<url_type>track|post|revision)/(?P<id>[\da-f_-]+)',
+        r'https?://(?:www\.)?bandlab.com/(?P<url_type>embed)/\?(?:[^#]*&)?id=(?P<id>[\da-f-]+)',
+    ]
+    _EMBED_REGEX = [rf'<iframe[^>]+src=[\'"](?P<url>{_VALID_URL[1]})[\'"]']
+    _TESTS = [{
+        'url': 'https://www.bandlab.com/track/04b37e88dba24967b9dac8eb8567ff39_07d7f906fc96ee11b75e000d3a428fff',
+        'md5': '46f7b43367dd268bbcf0bbe466753b2c',
+        'info_dict': {
+            'id': '02d7f906-fc96-ee11-b75e-000d3a428fff',
+            'ext': 'm4a',
+            'uploader_id': 'ender_milze',
+            'track': 'sweet black',
+            'description': 'composed by juanjn3737',
+            'timestamp': 1702171963,
+            'view_count': int,
+            'like_count': int,
+            'duration': 54.629999999999995,
+            'title': 'sweet black',
+            'upload_date': '20231210',
+            'thumbnail': 'https://bl-prod-images.azureedge.net/v1.0/songs/fa082beb-b856-4730-9170-a57e4e32cc2c/',
+            'genres': ['Lofi'],
+            'uploader': 'ender milze',
+            'comment_count': int,
+            'media_type': 'revision',
+        },
+    }, {
+        # Same track as above but post URL
+        'url': 'https://www.bandlab.com/post/07d7f906-fc96-ee11-b75e-000d3a428fff',
+        'md5': '46f7b43367dd268bbcf0bbe466753b2c',
+        'info_dict': {
+            'id': '02d7f906-fc96-ee11-b75e-000d3a428fff',
+            'ext': 'm4a',
+            'uploader_id': 'ender_milze',
+            'track': 'sweet black',
+            'description': 'composed by juanjn3737',
+            'timestamp': 1702171973,
+            'view_count': int,
+            'like_count': int,
+            'duration': 54.629999999999995,
+            'title': 'sweet black',
+            'upload_date': '20231210',
+            'thumbnail': 'https://bl-prod-images.azureedge.net/v1.0/songs/fa082beb-b856-4730-9170-a57e4e32cc2c/',
+            'genres': ['Lofi'],
+            'uploader': 'ender milze',
+            'comment_count': int,
+            'media_type': 'revision',
+        },
+    }, {
+        # SharedKey Example
+        'url': 'https://www.bandlab.com/track/048916c2-c6da-ee11-85f9-6045bd2e11f9?sharedKey=0NNWX8qYAEmI38lWAzCNDA',
+        'md5': '15174b57c44440e2a2008be9cae00250',
+        'info_dict': {
+            'id': '038916c2-c6da-ee11-85f9-6045bd2e11f9',
+            'ext': 'm4a',
+            'comment_count': int,
+            'genres': ['Other'],
+            'uploader_id': 'user8353034818103753',
+            'thumbnail': 'https://bl-prod-images.azureedge.net/v1.0/songs/51b18363-da23-4b9b-a29c-2933a3e561ca/',
+            'timestamp': 1709625771,
+            'track': 'PodcastMaerchen4b',
+            'duration': 468.14,
+            'view_count': int,
+            'description': 'Podcast: Neues aus der Märchenwelt',
+            'like_count': int,
+            'upload_date': '20240305',
+            'uploader': 'Erna Wageneder',
+            'title': 'PodcastMaerchen4b',
+            'media_type': 'revision',
+        },
+    }, {
+        # Different Revision selected
+        'url': 'https://www.bandlab.com/track/130343fc-148b-ea11-96d2-0003ffd1fc09?revId=110343fc-148b-ea11-96d2-0003ffd1fc09',
+        'md5': '74e055ef9325d63f37088772fbfe4454',
+        'info_dict': {
+            'id': '110343fc-148b-ea11-96d2-0003ffd1fc09',
+            'ext': 'm4a',
+            'timestamp': 1588273294,
+            'thumbnail': 'https://bl-prod-images.azureedge.net/v1.0/users/b612e533-e4f7-4542-9f50-3fcfd8dd822c/',
+            'description': 'Final Revision.',
+            'title': 'Replay ( Instrumental)',
+            'uploader': 'David R Sparks',
+            'uploader_id': 'davesnothome69',
+            'view_count': int,
+            'comment_count': int,
+            'track': 'Replay ( Instrumental)',
+            'genres': ['Rock'],
+            'upload_date': '20200430',
+            'like_count': int,
+            'duration': 279.43,
+            'media_type': 'revision',
+        },
+    }, {
+        # Video
+        'url': 'https://www.bandlab.com/post/5cdf9036-3857-ef11-991a-6045bd36e0d9',
+        'md5': '8caa2ef28e86c1dacf167293cfdbeba9',
+        'info_dict': {
+            'id': '5cdf9036-3857-ef11-991a-6045bd36e0d9',
+            'ext': 'mp4',
+            'duration': 44.705,
+            'thumbnail': 'https://bl-prod-images.azureedge.net/v1.0/videos/67c6cef1-cef6-40d3-831e-a55bc1dcb972/',
+            'comment_count': int,
+            'title': 'backing vocals',
+            'uploader_id': 'marliashya',
+            'uploader': 'auraa',
+            'like_count': int,
+            'description': 'backing vocals',
+            'media_type': 'video',
+        },
+    }, {
+        # Embed Example
+        'url': 'https://www.bandlab.com/embed/?blur=false&id=014de0a4-7d82-ea11-a94c-0003ffd19c0f',
+        'md5': 'a4ad05cb68c54faaed9b0a8453a8cf4a',
+        'info_dict': {
+            'id': '014de0a4-7d82-ea11-a94c-0003ffd19c0f',
+            'ext': 'm4a',
+            'comment_count': int,
+            'genres': ['Electronic'],
+            'uploader': 'Charlie Henson',
+            'timestamp': 1587328674,
+            'upload_date': '20200419',
+            'view_count': int,
+            'track': 'Positronic Meltdown',
+            'duration': 318.55,
+            'thumbnail': 'https://bl-prod-images.azureedge.net/v1.0/songs/87165bc3-5439-496e-b1f7-a9f13b541ff2/',
+            'description': 'Checkout my tracks at AOMX http://aomxsounds.com/',
+            'uploader_id': 'microfreaks',
+            'title': 'Positronic Meltdown',
+            'like_count': int,
+            'media_type': 'revision',
+        },
+    }, {
+        # Track without revisions available
+        'url': 'https://www.bandlab.com/track/55767ac51789ea11a94c0003ffd1fc09_2f007b0a37b94ec7a69bc25ae15108a5',
+        'md5': 'f05d68a3769952c2d9257c473e14c15f',
+        'info_dict': {
+            'id': '55767ac51789ea11a94c0003ffd1fc09_2f007b0a37b94ec7a69bc25ae15108a5',
+            'ext': 'm4a',
+            'track': 'insame',
+            'like_count': int,
+            'duration': 84.03,
+            'title': 'insame',
+            'view_count': int,
+            'comment_count': int,
+            'uploader': 'Sorakime',
+            'uploader_id': 'sorakime',
+            'thumbnail': 'https://bl-prod-images.azureedge.net/v1.0/users/572a351a-0f3a-4c6a-ac39-1a5defdeeb1c/',
+            'timestamp': 1691162128,
+            'upload_date': '20230804',
+            'media_type': 'track',
+        },
+    }, {
+        'url': 'https://www.bandlab.com/revision/014de0a4-7d82-ea11-a94c-0003ffd19c0f',
+        'only_matching': True,
+    }]
+    _WEBPAGE_TESTS = [{
+        'url': 'https://phantomluigi.github.io/',
+        'info_dict': {
+            'id': 'e14223c3-7871-ef11-bdfd-000d3a980db3',
+            'ext': 'm4a',
+            'view_count': int,
+            'upload_date': '20240913',
+            'uploader_id': 'phantommusicofficial',
+            'timestamp': 1726194897,
+            'uploader': 'Phantom',
+            'comment_count': int,
+            'genres': ['Progresive Rock'],
+            'description': 'md5:a38cd668f7a2843295ef284114f18429',
+            'duration': 225.23,
+            'like_count': int,
+            'title': 'Vermilion Pt. 2 (Cover)',
+            'track': 'Vermilion Pt. 2 (Cover)',
+            'thumbnail': 'https://bandlabimages.azureedge.net/v1.0/songs/62b10750-7aef-4f42-ad08-1af52f577e97/',
+            'media_type': 'revision',
+        },
+    }]
+
+    def _real_extract(self, url):
+        display_id, url_type = self._match_valid_url(url).group('id', 'url_type')
+
+        qs = parse_qs(url)
+        revision_id = traverse_obj(qs, (('revId', 'id'), 0, any))
+        if url_type == 'revision':
+            revision_id = display_id
+
+        revision_data = None
+        if not revision_id:
+            post_data = self._call_api(
+                'posts', display_id, note='Downloading post data',
+                query=traverse_obj(qs, {'sharedKey': ('sharedKey', 0)}))
+
+            revision_id = traverse_obj(post_data, (('revisionId', ('revision', 'id')), {str}, any))
+            revision_data = traverse_obj(post_data, ('revision', {dict}))
+
+            if not revision_data and not revision_id:
+                post_type = post_data.get('type')
+                if post_type == 'Video':
+                    return self._parse_video(post_data, url=url)
+                if post_type == 'Track':
+                    return self._parse_track(post_data, url=url)
+                raise ExtractorError(f'Could not extract data for post type {post_type!r}')
+
+        if not revision_data:
+            revision_data = self._call_api(
+                'revisions', revision_id, note='Downloading revision data', query={'edit': 'false'})
+
+        return self._parse_revision(revision_data, url=url)
+
+
+class BandlabPlaylistIE(BandlabBaseIE):
+    _VALID_URL = [
+        r'https?://(?:www\.)?bandlab.com/(?:[\w]+/)?(?P<type>albums|collections)/(?P<id>[\da-f-]+)',
+        r'https?://(?:www\.)?bandlab.com/(?P<type>embed)/collection/\?(?:[^#]*&)?id=(?P<id>[\da-f-]+)',
+    ]
+    _EMBED_REGEX = [rf'<iframe[^>]+src=[\'"](?P<url>{_VALID_URL[1]})[\'"]']
+    _TESTS = [{
+        'url': 'https://www.bandlab.com/davesnothome69/albums/89b79ea6-de42-ed11-b495-00224845aac7',
+        'info_dict': {
+            'thumbnail': 'https://bl-prod-images.azureedge.net/v1.3/albums/69507ff3-579a-45be-afca-9e87eddec944/',
+            'release_date': '20221003',
+            'title': 'Remnants',
+            'album': 'Remnants',
+            'like_count': int,
+            'album_type': 'LP',
+            'description': 'A collection of some feel good, rock hits.',
+            'comment_count': int,
+            'view_count': int,
+            'id': '89b79ea6-de42-ed11-b495-00224845aac7',
+            'uploader': 'David R Sparks',
+            'uploader_id': 'davesnothome69',
+        },
+        'playlist_count': 10,
+    }, {
+        'url': 'https://www.bandlab.com/slytheband/collections/955102d4-1040-ef11-86c3-000d3a42581b',
+        'info_dict': {
+            'id': '955102d4-1040-ef11-86c3-000d3a42581b',
+            'timestamp': 1720762659,
+            'view_count': int,
+            'title': 'My Shit 🖤',
+            'uploader_id': 'slytheband',
+            'uploader': '𝓢𝓛𝓨',
+            'upload_date': '20240712',
+            'like_count': int,
+            'thumbnail': 'https://bandlabimages.azureedge.net/v1.0/collections/2c64ca12-b180-4b76-8587-7a8da76bddc8/',
+        },
+        'playlist_count': 15,
+    }, {
+        # Embeds can contain both albums and collections with the same URL pattern. This is an album
+        'url': 'https://www.bandlab.com/embed/collection/?id=12cc6f7f-951b-ee11-907c-00224844f303',
+        'info_dict': {
+            'id': '12cc6f7f-951b-ee11-907c-00224844f303',
+            'release_date': '20230706',
+            'description': 'This is a collection of songs I created when I had an Amiga computer.',
+            'view_count': int,
+            'title': 'Mark Salud The Amiga Collection',
+            'uploader_id': 'mssirmooth1962',
+            'comment_count': int,
+            'thumbnail': 'https://bl-prod-images.azureedge.net/v1.3/albums/d618bd7b-0537-40d5-bdd8-61b066e77d59/',
+            'like_count': int,
+            'uploader': 'Mark Salud',
+            'album': 'Mark Salud The Amiga Collection',
+            'album_type': 'LP',
+        },
+        'playlist_count': 24,
+    }, {
+        # Tracks without revision id
+        'url': 'https://www.bandlab.com/embed/collection/?id=e98aafb5-d932-ee11-b8f0-00224844c719',
+        'info_dict': {
+            'like_count': int,
+            'uploader_id': 'sorakime',
+            'comment_count': int,
+            'uploader': 'Sorakime',
+            'view_count': int,
+            'description': 'md5:4ec31c568a5f5a5a2b17572ea64c3825',
+            'release_date': '20230812',
+            'title': 'Art',
+            'album': 'Art',
+            'album_type': 'Album',
+            'id': 'e98aafb5-d932-ee11-b8f0-00224844c719',
+            'thumbnail': 'https://bl-prod-images.azureedge.net/v1.3/albums/20c890de-e94a-4422-828a-2da6377a13c8/',
+        },
+        'playlist_count': 13,
+    }, {
+        'url': 'https://www.bandlab.com/albums/89b79ea6-de42-ed11-b495-00224845aac7',
+        'only_matching': True,
+    }]
+
+    def _entries(self, album_data):
+        for post in traverse_obj(album_data, ('posts', lambda _, v: v['type'])):
+            post_type = post['type']
+            if post_type == 'Revision':
+                yield self._parse_revision(post.get('revision'))
+            elif post_type == 'Track':
+                yield self._parse_track(post)
+            elif post_type == 'Video':
+                yield self._parse_video(post)
+            else:
+                self.report_warning(f'Skipping unknown post type: "{post_type}"')
+
+    def _real_extract(self, url):
+        playlist_id, playlist_type = self._match_valid_url(url).group('id', 'type')
+
+        endpoints = {
+            'albums': ['albums'],
+            'collections': ['collections'],
+            'embed': ['collections', 'albums'],
+        }.get(playlist_type)
+        for endpoint in endpoints:
+            playlist_data = self._call_api(
+                endpoint, playlist_id, note=f'Downloading {endpoint[:-1]} data',
+                fatal=False, expected_status=404)
+            if not playlist_data.get('errorCode'):
+                playlist_type = endpoint
+                break
+        if error_code := playlist_data.get('errorCode'):
+            raise ExtractorError(f'Could not find playlist data. Error code: "{error_code}"')
+
+        return self.playlist_result(
+            self._entries(playlist_data), playlist_id,
+            **traverse_obj(playlist_data, {
+                'title': ('name', {str}),
+                'description': ('description', {str}),
+                'uploader': ('creator', 'name', {str}),
+                'uploader_id': ('creator', 'username', {str}),
+                'timestamp': ('createdOn', {parse_iso8601}),
+                'release_date': ('releaseDate', {lambda x: x.replace('-', '')}, filter),
+                'thumbnail': ('picture', ('original', 'url'), {url_or_none}, any),
+                'like_count': ('counters', 'likes', {int_or_none}),
+                'comment_count': ('counters', 'comments', {int_or_none}),
+                'view_count': ('counters', 'plays', {int_or_none}),
+            }),
+            **(traverse_obj(playlist_data, {
+                'album': ('name', {str}),
+                'album_type': ('type', {str}),
+            }) if playlist_type == 'albums' else {}))
diff --git a/plugins/youtube_download/yt_dlp/extractor/bannedvideo.py b/plugins/youtube_download/yt_dlp/extractor/bannedvideo.py
index 51e7220..46f2978 100644
--- a/plugins/youtube_download/yt_dlp/extractor/bannedvideo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/bannedvideo.py
@@ -2,11 +2,11 @@ import json
 
 from .common import InfoExtractor
 from ..utils import (
-    try_get,
-    int_or_none,
-    url_or_none,
     float_or_none,
+    int_or_none,
+    try_get,
     unified_timestamp,
+    url_or_none,
 )
 
 
@@ -23,7 +23,7 @@ class BannedVideoIE(InfoExtractor):
             'description': 'md5:560d96f02abbebe6c6b78b47465f6b28',
             'upload_date': '20200324',
             'timestamp': 1585087895,
-        }
+        },
     }]
 
     _GRAPHQL_GETMETADATA_QUERY = '''
@@ -84,15 +84,15 @@ query GetCommentReplies($id: String!) {
         'GetCommentReplies': _GRAPHQL_GETCOMMENTSREPLIES_QUERY,
     }
 
-    def _call_api(self, video_id, id, operation, note):
+    def _call_api(self, video_id, id_var, operation, note):
         return self._download_json(
             'https://api.infowarsmedia.com/graphql', video_id, note=note,
             headers={
-                'Content-Type': 'application/json; charset=utf-8'
+                'Content-Type': 'application/json; charset=utf-8',
             }, data=json.dumps({
-                'variables': {'id': id},
+                'variables': {'id': id_var},
                 'operationName': operation,
-                'query': self._GRAPHQL_QUERIES[operation]
+                'query': self._GRAPHQL_QUERIES[operation],
             }).encode('utf8')).get('data')
 
     def _get_comments(self, video_id, comments, comment_data):
@@ -151,5 +151,5 @@ query GetCommentReplies($id: String!) {
             'tags': [tag.get('name') for tag in video_info.get('tags')],
             'availability': self._availability(is_unlisted=video_info.get('unlisted')),
             'comments': comments,
-            '__post_extractor': self.extract_comments(video_id, comments, video_json.get('getVideoComments'))
+            '__post_extractor': self.extract_comments(video_id, comments, video_json.get('getVideoComments')),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/bbc.py b/plugins/youtube_download/yt_dlp/extractor/bbc.py
index a55cdef..89fcf44 100644
--- a/plugins/youtube_download/yt_dlp/extractor/bbc.py
+++ b/plugins/youtube_download/yt_dlp/extractor/bbc.py
@@ -2,10 +2,10 @@ import functools
 import itertools
 import json
 import re
+import urllib.parse
 import xml.etree.ElementTree
 
 from .common import InfoExtractor
-from ..compat import compat_str, compat_urlparse
 from ..networking.exceptions import HTTPError
 from ..utils import (
     ExtractorError,
@@ -15,11 +15,13 @@ from ..utils import (
     float_or_none,
     get_element_by_class,
     int_or_none,
+    join_nonempty,
     js_to_json,
     parse_duration,
     parse_iso8601,
     parse_qs,
     strip_or_none,
+    traverse_obj,
     try_get,
     unescapeHTML,
     unified_timestamp,
@@ -33,7 +35,7 @@ class BBCCoUkIE(InfoExtractor):
     IE_NAME = 'bbc.co.uk'
     IE_DESC = 'BBC iPlayer'
     _ID_REGEX = r'(?:[pbml][\da-z]{7}|w[\da-z]{7,14})'
-    _VALID_URL = r'''(?x)
+    _VALID_URL = rf'''(?x)
                     https?://
                         (?:www\.)?bbc\.co\.uk/
                         (?:
@@ -41,11 +43,10 @@ class BBCCoUkIE(InfoExtractor):
                             iplayer(?:/[^/]+)?/(?:episode/|playlist/)|
                             music/(?:clips|audiovideo/popular)[/#]|
                             radio/player/|
-                            sounds/play/|
                             events/[^/]+/play/[^/]+/
                         )
-                        (?P<id>%s)(?!/(?:episodes|broadcasts|clips))
-                    ''' % _ID_REGEX
+                        (?P<id>{_ID_REGEX})(?!/(?:episodes|broadcasts|clips))
+                    '''
     _EMBED_REGEX = [r'setPlaylist\("(?P<url>https?://www\.bbc\.co\.uk/iplayer/[^/]+/[\da-z]{8})"\)']
 
     _LOGIN_URL = 'https://account.bbc.com/signin'
@@ -74,7 +75,7 @@ class BBCCoUkIE(InfoExtractor):
             'params': {
                 # rtmp download
                 'skip_download': True,
-            }
+            },
         },
         {
             'url': 'http://www.bbc.co.uk/iplayer/episode/b00yng5w/The_Man_in_Black_Series_3_The_Printed_Name/',
@@ -147,7 +148,7 @@ class BBCCoUkIE(InfoExtractor):
             'params': {
                 # rtmp download
                 'skip_download': True,
-            }
+            },
         }, {
             'url': 'http://www.bbc.co.uk/music/clips/p025c0zz',
             'note': 'Video',
@@ -161,7 +162,7 @@ class BBCCoUkIE(InfoExtractor):
             'params': {
                 # rtmp download
                 'skip_download': True,
-            }
+            },
         }, {
             'url': 'http://www.bbc.co.uk/iplayer/episode/b054fn09/ad/natural-world-20152016-2-super-powered-owls',
             'info_dict': {
@@ -218,20 +219,6 @@ class BBCCoUkIE(InfoExtractor):
                 # rtmp download
                 'skip_download': True,
             },
-        }, {
-            'url': 'https://www.bbc.co.uk/sounds/play/m0007jzb',
-            'note': 'Audio',
-            'info_dict': {
-                'id': 'm0007jz9',
-                'ext': 'mp4',
-                'title': 'BBC Proms, 2019, Prom 34: West–Eastern Divan Orchestra',
-                'description': "Live BBC Proms. West–Eastern Divan Orchestra with Daniel Barenboim and Martha Argerich.",
-                'duration': 9840,
-            },
-            'params': {
-                # rtmp download
-                'skip_download': True,
-            }
         }, {
             'url': 'http://www.bbc.co.uk/iplayer/playlist/p01dvks4',
             'only_matching': True,
@@ -281,19 +268,19 @@ class BBCCoUkIE(InfoExtractor):
             error = clean_html(get_element_by_class('form-message', response))
             if error:
                 raise ExtractorError(
-                    'Unable to login: %s' % error, expected=True)
+                    f'Unable to login: {error}', expected=True)
             raise ExtractorError('Unable to log in')
 
     class MediaSelectionError(Exception):
-        def __init__(self, id):
-            self.id = id
+        def __init__(self, error_id):
+            self.id = error_id
 
     def _extract_asx_playlist(self, connection, programme_id):
         asx = self._download_xml(connection.get('href'), programme_id, 'Downloading ASX playlist')
         return [ref.get('href') for ref in asx.findall('./Entry/ref')]
 
     def _extract_items(self, playlist):
-        return playlist.findall('./{%s}item' % self._EMP_PLAYLIST_NS)
+        return playlist.findall(f'./{{{self._EMP_PLAYLIST_NS}}}item')
 
     def _extract_medias(self, media_selection):
         error = media_selection.get('result')
@@ -325,21 +312,30 @@ class BBCCoUkIE(InfoExtractor):
 
     def _raise_extractor_error(self, media_selection_error):
         raise ExtractorError(
-            '%s returned error: %s' % (self.IE_NAME, media_selection_error.id),
+            f'{self.IE_NAME} returned error: {media_selection_error.id}',
             expected=True)
 
     def _download_media_selector(self, programme_id):
         last_exception = None
+        formats, subtitles = [], {}
         for media_set in self._MEDIA_SETS:
             try:
-                return self._download_media_selector_url(
+                fmts, subs = self._download_media_selector_url(
                     self._MEDIA_SELECTOR_URL_TEMPL % (media_set, programme_id), programme_id)
+                formats.extend(fmts)
+                if subs:
+                    self._merge_subtitles(subs, target=subtitles)
             except BBCCoUkIE.MediaSelectionError as e:
                 if e.id in ('notukerror', 'geolocation', 'selectionunavailable'):
                     last_exception = e
                     continue
                 self._raise_extractor_error(e)
-        self._raise_extractor_error(last_exception)
+        if last_exception:
+            if formats or subtitles:
+                self.report_warning(f'{self.IE_NAME} returned error: {last_exception.id}')
+            else:
+                self._raise_extractor_error(last_exception)
+        return formats, subtitles
 
     def _download_media_selector_url(self, url, programme_id=None):
         media_selection = self._download_json(
@@ -376,7 +372,7 @@ class BBCCoUkIE(InfoExtractor):
                         for i, ref in enumerate(self._extract_asx_playlist(connection, programme_id)):
                             formats.append({
                                 'url': ref,
-                                'format_id': 'ref%s_%s' % (i, format_id),
+                                'format_id': f'ref{i}_{format_id}',
                             })
                     elif transfer_format == 'dash':
                         formats.extend(self._extract_mpd_formats(
@@ -398,7 +394,7 @@ class BBCCoUkIE(InfoExtractor):
                             href, programme_id, f4m_id=format_id, fatal=False))
                     else:
                         if not supplier and bitrate:
-                            format_id += '-%d' % bitrate
+                            format_id += f'-{bitrate}'
                         fmt = {
                             'format_id': format_id,
                             'filesize': file_size,
@@ -427,9 +423,9 @@ class BBCCoUkIE(InfoExtractor):
                             identifier = connection.get('identifier')
                             server = connection.get('server')
                             fmt.update({
-                                'url': '%s://%s/%s?%s' % (protocol, server, application, auth_string),
+                                'url': f'{protocol}://{server}/{application}?{auth_string}',
                                 'play_path': identifier,
-                                'app': '%s?%s' % (application, auth_string),
+                                'app': f'{application}?{auth_string}',
                                 'page_url': 'http://www.bbc.co.uk',
                                 'player_url': 'http://www.bbc.co.uk/emp/releases/iplayer/revisions/617463_618125_4/617463_618125_4_emp.swf',
                                 'rtmp_live': False,
@@ -445,7 +441,7 @@ class BBCCoUkIE(InfoExtractor):
     def _download_playlist(self, playlist_id):
         try:
             playlist = self._download_json(
-                'http://www.bbc.co.uk/programmes/%s/playlist.json' % playlist_id,
+                f'http://www.bbc.co.uk/programmes/{playlist_id}/playlist.json',
                 playlist_id, 'Downloading playlist JSON')
             formats = []
             subtitles = {}
@@ -484,32 +480,32 @@ class BBCCoUkIE(InfoExtractor):
 
     def _process_legacy_playlist(self, playlist_id):
         return self._process_legacy_playlist_url(
-            'http://www.bbc.co.uk/iplayer/playlist/%s' % playlist_id, playlist_id)
+            f'http://www.bbc.co.uk/iplayer/playlist/{playlist_id}', playlist_id)
 
     def _download_legacy_playlist_url(self, url, playlist_id=None):
         return self._download_xml(
             url, playlist_id, 'Downloading legacy playlist XML')
 
     def _extract_from_legacy_playlist(self, playlist, playlist_id):
-        no_items = playlist.find('./{%s}noItems' % self._EMP_PLAYLIST_NS)
+        no_items = playlist.find(f'./{{{self._EMP_PLAYLIST_NS}}}noItems')
         if no_items is not None:
             reason = no_items.get('reason')
             if reason == 'preAvailability':
-                msg = 'Episode %s is not yet available' % playlist_id
+                msg = f'Episode {playlist_id} is not yet available'
             elif reason == 'postAvailability':
-                msg = 'Episode %s is no longer available' % playlist_id
+                msg = f'Episode {playlist_id} is no longer available'
             elif reason == 'noMedia':
-                msg = 'Episode %s is not currently available' % playlist_id
+                msg = f'Episode {playlist_id} is not currently available'
             else:
-                msg = 'Episode %s is not available: %s' % (playlist_id, reason)
+                msg = f'Episode {playlist_id} is not available: {reason}'
             raise ExtractorError(msg, expected=True)
 
         for item in self._extract_items(playlist):
             kind = item.get('kind')
             if kind not in ('programme', 'radioProgramme'):
                 continue
-            title = playlist.find('./{%s}title' % self._EMP_PLAYLIST_NS).text
-            description_el = playlist.find('./{%s}summary' % self._EMP_PLAYLIST_NS)
+            title = playlist.find(f'./{{{self._EMP_PLAYLIST_NS}}}title').text
+            description_el = playlist.find(f'./{{{self._EMP_PLAYLIST_NS}}}summary')
             description = description_el.text if description_el is not None else None
 
             def get_programme_id(item):
@@ -519,7 +515,7 @@ class BBCCoUkIE(InfoExtractor):
                         if value and re.match(r'^[pb][\da-z]{7}$', value):
                             return value
                 get_from_attributes(item)
-                mediator = item.find('./{%s}mediator' % self._EMP_PLAYLIST_NS)
+                mediator = item.find(f'./{{{self._EMP_PLAYLIST_NS}}}mediator')
                 if mediator is not None:
                     return get_from_attributes(mediator)
 
@@ -559,7 +555,7 @@ class BBCCoUkIE(InfoExtractor):
 
         if not programme_id:
             programme_id = self._search_regex(
-                r'"vpid"\s*:\s*"(%s)"' % self._ID_REGEX, webpage, 'vpid', fatal=False, default=None)
+                rf'"vpid"\s*:\s*"({self._ID_REGEX})"', webpage, 'vpid', fatal=False, default=None)
 
         if programme_id:
             formats, subtitles = self._download_media_selector(programme_id)
@@ -606,7 +602,7 @@ class BBCIE(BBCCoUkIE):  # XXX: Do not subclass from concrete IE
         'url': 'http://www.bbc.com/news/world-europe-32668511',
         'info_dict': {
             'id': 'world-europe-32668511',
-            'title': 'Russia stages massive WW2 parade',
+            'title': 'Russia stages massive WW2 parade despite Western boycott',
             'description': 'md5:00ff61976f6081841f759a08bf78cc9c',
         },
         'playlist_count': 2,
@@ -627,6 +623,7 @@ class BBCIE(BBCCoUkIE):  # XXX: Do not subclass from concrete IE
         'info_dict': {
             'id': '3662a707-0af9-3149-963f-47bea720b460',
             'title': 'BUGGER',
+            'description': r're:BUGGER  The recent revelations by the whistleblower Edward Snowden were fascinating. .{211}\.{3}$',
         },
         'playlist_count': 18,
     }, {
@@ -635,16 +632,16 @@ class BBCIE(BBCCoUkIE):  # XXX: Do not subclass from concrete IE
         'info_dict': {
             'id': 'p02mprgb',
             'ext': 'mp4',
-            'title': 'Aerial footage showed the site of the crash in the Alps - courtesy BFM TV',
-            'description': 'md5:2868290467291b37feda7863f7a83f54',
+            'title': 'Germanwings crash site aerial video',
+            'description': r're:(?s)Aerial video showed the site where the Germanwings flight 4U 9525, .{156} BFM TV\.$',
             'duration': 47,
             'timestamp': 1427219242,
             'upload_date': '20150324',
+            'thumbnail': 'https://ichef.bbci.co.uk/news/1024/media/images/81879000/jpg/_81879090_81879089.jpg',
         },
         'params': {
-            # rtmp download
             'skip_download': True,
-        }
+        },
     }, {
         # article with single video embedded with data-playable containing XML playlist
         # with direct video links as progressiveDownloadUrl (for now these are extracted)
@@ -660,21 +657,24 @@ class BBCIE(BBCCoUkIE):  # XXX: Do not subclass from concrete IE
         },
         'params': {
             'skip_download': True,
-        }
+        },
+        'skip': 'now SIMORGH_DATA with no video',
     }, {
         # single video embedded with data-playable containing XML playlists (regional section)
         'url': 'http://www.bbc.com/mundo/video_fotos/2015/06/150619_video_honduras_militares_hospitales_corrupcion_aw',
         'info_dict': {
-            'id': '150619_video_honduras_militares_hospitales_corrupcion_aw',
+            'id': '39275083',
+            'display_id': '150619_video_honduras_militares_hospitales_corrupcion_aw',
             'ext': 'mp4',
             'title': 'Honduras militariza sus hospitales por nuevo escándalo de corrupción',
-            'description': 'md5:1525f17448c4ee262b64b8f0c9ce66c8',
+            'description': 'Honduras militariza sus hospitales por nuevo escándalo de corrupción',
             'timestamp': 1434713142,
             'upload_date': '20150619',
+            'thumbnail': 'https://a.files.bbci.co.uk/worldservice/live/assets/images/2015/06/19/150619132146_honduras_hsopitales_militares_640x360_aptn_nocredit.jpg',
         },
         'params': {
             'skip_download': True,
-        }
+        },
     }, {
         # single video from video playlist embedded with vxp-playlist-data JSON
         'url': 'http://www.bbc.com/news/video_and_audio/must_see/33376376',
@@ -687,22 +687,21 @@ class BBCIE(BBCCoUkIE):  # XXX: Do not subclass from concrete IE
         },
         'params': {
             'skip_download': True,
-        }
+        },
+        'skip': '404 Not Found',
     }, {
-        # single video story with digitalData
+        # single video story with __PWA_PRELOADED_STATE__
         'url': 'http://www.bbc.com/travel/story/20150625-sri-lankas-spicy-secret',
         'info_dict': {
             'id': 'p02q6gc4',
-            'ext': 'flv',
-            'title': 'Sri Lanka’s spicy secret',
-            'description': 'As a new train line to Jaffna opens up the country’s north, travellers can experience a truly distinct slice of Tamil culture.',
-            'timestamp': 1437674293,
-            'upload_date': '20150723',
+            'ext': 'mp4',
+            'title': 'Tasting the spice of life in Jaffna',
+            'description': r're:(?s)BBC Travel Show’s Henry Golding explores the city of Jaffna .{151} aftertaste\.$',
+            'timestamp': 1646058397,
+            'upload_date': '20220228',
+            'duration': 255,
+            'thumbnail': 'https://ichef.bbci.co.uk/images/ic/1920xn/p02vxvkn.jpg',
         },
-        'params': {
-            # rtmp download
-            'skip_download': True,
-        }
     }, {
         # single video story without digitalData
         'url': 'http://www.bbc.com/autos/story/20130513-hyundais-rock-star',
@@ -714,12 +713,10 @@ class BBCIE(BBCCoUkIE):  # XXX: Do not subclass from concrete IE
             'timestamp': 1415867444,
             'upload_date': '20141113',
         },
-        'params': {
-            # rtmp download
-            'skip_download': True,
-        }
+        'skip': 'redirects to TopGear home page',
     }, {
         # single video embedded with Morph
+        # TODO: replacement test page
         'url': 'http://www.bbc.co.uk/sport/live/olympics/36895975',
         'info_dict': {
             'id': 'p041vhd0',
@@ -730,27 +727,22 @@ class BBCIE(BBCCoUkIE):  # XXX: Do not subclass from concrete IE
             'uploader': 'BBC Sport',
             'uploader_id': 'bbc_sport',
         },
-        'params': {
-            # m3u8 download
-            'skip_download': True,
-        },
-        'skip': 'Georestricted to UK',
+        'skip': 'Video no longer in page',
     }, {
-        # single video with playlist.sxml URL in playlist param
+        # single video in __INITIAL_DATA__
         'url': 'http://www.bbc.com/sport/0/football/33653409',
         'info_dict': {
             'id': 'p02xycnp',
             'ext': 'mp4',
-            'title': 'Transfers: Cristiano Ronaldo to Man Utd, Arsenal to spend?',
-            'description': 'BBC Sport\'s David Ornstein has the latest transfer gossip, including rumours of a Manchester United return for Cristiano Ronaldo.',
+            'title': 'Ronaldo to Man Utd, Arsenal to spend?',
+            'description': r're:(?s)BBC Sport\'s David Ornstein rounds up the latest transfer reports, .{359} here\.$',
+            'timestamp': 1437750175,
+            'upload_date': '20150724',
+            'thumbnail': r're:https?://.+/.+media/images/69320000/png/_69320754_mmgossipcolumnextraaugust18.png',
             'duration': 140,
         },
-        'params': {
-            # rtmp download
-            'skip_download': True,
-        }
     }, {
-        # article with multiple videos embedded with playlist.sxml in playlist param
+        # article with multiple videos embedded with Morph.setPayload
         'url': 'http://www.bbc.com/sport/0/football/34475836',
         'info_dict': {
             'id': '34475836',
@@ -758,6 +750,21 @@ class BBCIE(BBCCoUkIE):  # XXX: Do not subclass from concrete IE
             'description': 'Fast-paced football, wit, wisdom and a ready smile - why Liverpool fans should come to love new boss Jurgen Klopp.',
         },
         'playlist_count': 3,
+    }, {
+        # Testing noplaylist
+        'url': 'http://www.bbc.com/sport/0/football/34475836',
+        'info_dict': {
+            'id': 'p034ppnv',
+            'ext': 'mp4',
+            'title': 'All you need to know about Jurgen Klopp',
+            'timestamp': 1444335081,
+            'upload_date': '20151008',
+            'duration': 122.0,
+            'thumbnail': 'https://ichef.bbci.co.uk/onesport/cps/976/cpsprodpb/7542/production/_85981003_klopp.jpg',
+        },
+        'params': {
+            'noplaylist': True,
+        },
     }, {
         # school report article with single video
         'url': 'http://www.bbc.co.uk/schoolreport/35744779',
@@ -766,6 +773,7 @@ class BBCIE(BBCCoUkIE):  # XXX: Do not subclass from concrete IE
             'title': 'School which breaks down barriers in Jerusalem',
         },
         'playlist_count': 1,
+        'skip': 'redirects to Young Reporter home page https://www.bbc.co.uk/news/topics/cg41ylwv43pt',
     }, {
         # single video with playlist URL from weather section
         'url': 'http://www.bbc.com/weather/features/33601775',
@@ -782,18 +790,33 @@ class BBCIE(BBCCoUkIE):  # XXX: Do not subclass from concrete IE
             'thumbnail': r're:https?://.+/.+\.jpg',
             'timestamp': 1437785037,
             'upload_date': '20150725',
+            'duration': 105,
         },
     }, {
         # video with window.__INITIAL_DATA__ and value as JSON string
         'url': 'https://www.bbc.com/news/av/world-europe-59468682',
         'info_dict': {
-            'id': 'p0b71qth',
+            'id': 'p0b779gc',
             'ext': 'mp4',
             'title': 'Why France is making this woman a national hero',
-            'description': 'md5:7affdfab80e9c3a1f976230a1ff4d5e4',
+            'description': r're:(?s)France is honouring the US-born 20th Century singer and activist Josephine .{208} Second World War.',
             'thumbnail': r're:https?://.+/.+\.jpg',
-            'timestamp': 1638230731,
-            'upload_date': '20211130',
+            'timestamp': 1638215626,
+            'upload_date': '20211129',
+            'duration': 125,
+        },
+    }, {
+        # video with script id __NEXT_DATA__ and value as JSON string
+        'url': 'https://www.bbc.com/news/uk-68546268',
+        'info_dict': {
+            'id': 'p0hj0lq7',
+            'ext': 'mp4',
+            'title': 'Nasser Hospital doctor describes his treatment by IDF',
+            'description': r're:(?s)Doctor Abu Sabha said he was detained by Israeli forces after .{276} hostages\."$',
+            'thumbnail': r're:https?://.+/.+\.jpg',
+            'timestamp': 1710188248,
+            'upload_date': '20240311',
+            'duration': 104,
         },
     }, {
         # single video article embedded with data-media-vpid
@@ -821,6 +844,7 @@ class BBCIE(BBCCoUkIE):  # XXX: Do not subclass from concrete IE
             'uploader': 'Radio 3',
             'uploader_id': 'bbc_radio_three',
         },
+        'skip': '404 Not Found',
     }, {
         'url': 'http://www.bbc.co.uk/learningenglish/chinese/features/lingohack/ep-181227',
         'info_dict': {
@@ -828,6 +852,7 @@ class BBCIE(BBCCoUkIE):  # XXX: Do not subclass from concrete IE
             'ext': 'mp4',
             'title': 'md5:2fabf12a726603193a2879a055f72514',
             'description': 'Learn English words and phrases from this story',
+            'thumbnail': 'https://ichef.bbci.co.uk/images/ic/1200x675/p06pq9gk.jpg',
         },
         'add_ie': [BBCCoUkIE.ie_key()],
     }, {
@@ -836,13 +861,29 @@ class BBCIE(BBCCoUkIE):  # XXX: Do not subclass from concrete IE
         'info_dict': {
             'id': 'p07c6sb9',
             'ext': 'mp4',
-            'title': 'How positive thinking is harming your happiness',
-            'alt_title': 'The downsides of positive thinking',
-            'description': 'md5:fad74b31da60d83b8265954ee42d85b4',
+            'title': 'The downsides of positive thinking',
+            'description': 'The downsides of positive thinking',
             'duration': 235,
-            'thumbnail': r're:https?://.+/p07c9dsr.jpg',
-            'upload_date': '20190604',
-            'categories': ['Psychology'],
+            'thumbnail': r're:https?://.+/p07c9dsr\.(?:jpg|webp|png)',
+            'upload_date': '20220223',
+            'timestamp': 1645632746,
+        },
+    }, {
+        # BBC Sounds
+        'url': 'https://www.bbc.co.uk/sounds/play/w3ct5rgx',
+        'info_dict': {
+            'id': 'p0hrw4nr',
+            'ext': 'mp4',
+            'title': 'Are our coastlines being washed away?',
+            'description': r're:(?s)Around the world, coastlines are constantly changing .{2000,} Images\)$',
+            'timestamp': 1713556800,
+            'upload_date': '20240419',
+            'duration': 1588,
+            'thumbnail': 'https://ichef.bbci.co.uk/images/ic/raw/p0hrnxbl.jpg',
+            'uploader': 'World Service',
+            'uploader_id': 'bbc_world_service',
+            'series': 'CrowdScience',
+            'chapters': [],
         },
     }, {  # onion routes
         'url': 'https://www.bbcnewsd73hkzno2ini43t4gblxvycyac5aw4gnv7t2rccijh7745uqd.onion/news/av/world-europe-63208576',
@@ -856,7 +897,7 @@ class BBCIE(BBCCoUkIE):  # XXX: Do not subclass from concrete IE
     def suitable(cls, url):
         EXCLUDE_IE = (BBCCoUkIE, BBCCoUkArticleIE, BBCCoUkIPlayerEpisodesIE, BBCCoUkIPlayerGroupIE, BBCCoUkPlaylistIE)
         return (False if any(ie.suitable(url) for ie in EXCLUDE_IE)
-                else super(BBCIE, cls).suitable(url))
+                else super().suitable(url))
 
     def _extract_from_media_meta(self, media_meta, video_id):
         # Direct links to media in media metadata (e.g.
@@ -968,7 +1009,7 @@ class BBCIE(BBCCoUkIE):  # XXX: Do not subclass from concrete IE
                         if playlist:
                             entry = None
                             for key in ('streaming', 'progressiveDownload'):
-                                playlist_url = playlist.get('%sUrl' % key)
+                                playlist_url = playlist.get(f'{key}Url')
                                 if not playlist_url:
                                     continue
                                 try:
@@ -994,18 +1035,17 @@ class BBCIE(BBCCoUkIE):  # XXX: Do not subclass from concrete IE
 
         # http://www.bbc.co.uk/learningenglish/chinese/features/lingohack/ep-181227
         group_id = self._search_regex(
-            r'<div[^>]+\bclass=["\']video["\'][^>]+\bdata-pid=["\'](%s)' % self._ID_REGEX,
+            rf'<div[^>]+\bclass=["\']video["\'][^>]+\bdata-pid=["\']({self._ID_REGEX})',
             webpage, 'group id', default=None)
         if group_id:
             return self.url_result(
-                'https://www.bbc.co.uk/programmes/%s' % group_id,
-                ie=BBCCoUkIE.ie_key())
+                f'https://www.bbc.co.uk/programmes/{group_id}', BBCCoUkIE)
 
         # single video story (e.g. http://www.bbc.com/travel/story/20150625-sri-lankas-spicy-secret)
         programme_id = self._search_regex(
-            [r'data-(?:video-player|media)-vpid="(%s)"' % self._ID_REGEX,
-             r'<param[^>]+name="externalIdentifier"[^>]+value="(%s)"' % self._ID_REGEX,
-             r'videoId\s*:\s*["\'](%s)["\']' % self._ID_REGEX],
+            [rf'data-(?:video-player|media)-vpid="({self._ID_REGEX})"',
+             rf'<param[^>]+name="externalIdentifier"[^>]+value="({self._ID_REGEX})"',
+             rf'videoId\s*:\s*["\']({self._ID_REGEX})["\']'],
             webpage, 'vpid', default=None)
 
         if programme_id:
@@ -1059,76 +1099,133 @@ class BBCIE(BBCCoUkIE):  # XXX: Do not subclass from concrete IE
                 }
 
         # Morph based embed (e.g. http://www.bbc.co.uk/sport/live/olympics/36895975)
-        # There are several setPayload calls may be present but the video
-        # seems to be always related to the first one
-        morph_payload = self._parse_json(
-            self._search_regex(
-                r'Morph\.setPayload\([^,]+,\s*({.+?})\);',
-                webpage, 'morph payload', default='{}'),
-            playlist_id, fatal=False)
+        # Several setPayload calls may be present but the video(s)
+        # should be in one that mentions leadMedia or videoData
+        morph_payload = self._search_json(
+            r'\bMorph\s*\.\s*setPayload\s*\([^,]+,', webpage, 'morph payload', playlist_id,
+            contains_pattern=r'{(?s:(?:(?!</script>).)+(?:"leadMedia"|\\"videoData\\")\s*:.+)}',
+            default={})
         if morph_payload:
-            components = try_get(morph_payload, lambda x: x['body']['components'], list) or []
-            for component in components:
-                if not isinstance(component, dict):
-                    continue
-                lead_media = try_get(component, lambda x: x['props']['leadMedia'], dict)
-                if not lead_media:
-                    continue
-                identifiers = lead_media.get('identifiers')
-                if not identifiers or not isinstance(identifiers, dict):
-                    continue
-                programme_id = identifiers.get('vpid') or identifiers.get('playablePid')
+            for lead_media in traverse_obj(morph_payload, (
+                    'body', 'components', ..., 'props', 'leadMedia', {dict})):
+                programme_id = traverse_obj(lead_media, ('identifiers', ('vpid', 'playablePid'), {str}, any))
                 if not programme_id:
                     continue
-                title = lead_media.get('title') or self._og_search_title(webpage)
                 formats, subtitles = self._download_media_selector(programme_id)
-                description = lead_media.get('summary')
-                uploader = lead_media.get('masterBrand')
-                uploader_id = lead_media.get('mid')
-                duration = None
-                duration_d = lead_media.get('duration')
-                if isinstance(duration_d, dict):
-                    duration = parse_duration(dict_get(
-                        duration_d, ('rawDuration', 'formattedDuration', 'spokenDuration')))
                 return {
                     'id': programme_id,
-                    'title': title,
-                    'description': description,
-                    'duration': duration,
-                    'uploader': uploader,
-                    'uploader_id': uploader_id,
+                    'title': lead_media.get('title') or self._og_search_title(webpage),
+                    **traverse_obj(lead_media, {
+                        'description': ('summary', {str}),
+                        'duration': ('duration', ('rawDuration', 'formattedDuration', 'spokenDuration'), {parse_duration}),
+                        'uploader': ('masterBrand', {str}),
+                        'uploader_id': ('mid', {str}),
+                    }),
                     'formats': formats,
                     'subtitles': subtitles,
                 }
+            body = self._parse_json(traverse_obj(morph_payload, (
+                'body', 'content', 'article', 'body')), playlist_id, fatal=False)
+            for video_data in traverse_obj(body, (lambda _, v: v['videoData']['pid'], 'videoData')):
+                if video_data.get('vpid'):
+                    video_id = video_data['vpid']
+                    formats, subtitles = self._download_media_selector(video_id)
+                    entry = {
+                        'id': video_id,
+                        'formats': formats,
+                        'subtitles': subtitles,
+                    }
+                else:
+                    video_id = video_data['pid']
+                    entry = self.url_result(
+                        f'https://www.bbc.co.uk/programmes/{video_id}', BBCCoUkIE,
+                        video_id, url_transparent=True)
+                entry.update({
+                    'timestamp': traverse_obj(morph_payload, (
+                        'body', 'content', 'article', 'dateTimeInfo', 'dateTime', {parse_iso8601}),
+                    ),
+                    **traverse_obj(video_data, {
+                        'thumbnail': (('iChefImage', 'image'), {url_or_none}, any),
+                        'title': (('title', 'caption'), {str}, any),
+                        'duration': ('duration', {parse_duration}),
+                    }),
+                })
+                if video_data.get('isLead') and not self._yes_playlist(playlist_id, video_id):
+                    return entry
+                entries.append(entry)
+            if entries:
+                playlist_title = traverse_obj(morph_payload, (
+                    'body', 'content', 'article', 'headline', {str})) or playlist_title
+                return self.playlist_result(
+                    entries, playlist_id, playlist_title, playlist_description)
 
-        preload_state = self._parse_json(self._search_regex(
-            r'window\.__PRELOADED_STATE__\s*=\s*({.+?});', webpage,
-            'preload state', default='{}'), playlist_id, fatal=False)
-        if preload_state:
-            current_programme = preload_state.get('programmes', {}).get('current') or {}
-            programme_id = current_programme.get('id')
-            if current_programme and programme_id and current_programme.get('type') == 'playable_item':
-                title = current_programme.get('titles', {}).get('tertiary') or playlist_title
-                formats, subtitles = self._download_media_selector(programme_id)
-                synopses = current_programme.get('synopses') or {}
-                network = current_programme.get('network') or {}
-                duration = int_or_none(
-                    current_programme.get('duration', {}).get('value'))
-                thumbnail = None
-                image_url = current_programme.get('image_url')
-                if image_url:
-                    thumbnail = image_url.replace('{recipe}', 'raw')
+        # various PRELOADED_STATE JSON
+        preload_state = self._search_json(
+            r'window\.__(?:PWA_)?PRELOADED_STATE__\s*=', webpage,
+            'preload state', playlist_id, transform_source=js_to_json, default={})
+        # PRELOADED_STATE with current programmme
+        current_programme = traverse_obj(preload_state, ('programmes', 'current', {dict}))
+        programme_id = traverse_obj(current_programme, ('id', {str}))
+        if programme_id and current_programme.get('type') == 'playable_item':
+            title = traverse_obj(current_programme, ('titles', ('tertiary', 'secondary'), {str}, any)) or playlist_title
+            formats, subtitles = self._download_media_selector(programme_id)
+            return {
+                'id': programme_id,
+                'title': title,
+                'formats': formats,
+                **traverse_obj(current_programme, {
+                    'description': ('synopses', ('long', 'medium', 'short'), {str}, any),
+                    'thumbnail': ('image_url', {lambda u: url_or_none(u.replace('{recipe}', 'raw'))}),
+                    'duration': ('duration', 'value', {int_or_none}),
+                    'uploader': ('network', 'short_title', {str}),
+                    'uploader_id': ('network', 'id', {str}),
+                    'timestamp': ((('availability', 'from'), ('release', 'date')), {parse_iso8601}, any),
+                    'series': ('titles', 'primary', {str}),
+                }),
+                'subtitles': subtitles,
+                'chapters': traverse_obj(preload_state, (
+                    'tracklist', 'tracks', lambda _, v: float(v['offset']['start']), {
+                        'title': ('titles', {lambda x: join_nonempty(
+                            'primary', 'secondary', 'tertiary', delim=' - ', from_dict=x)}),
+                        'start_time': ('offset', 'start', {float_or_none}),
+                        'end_time': ('offset', 'end', {float_or_none}),
+                    }),
+                ),
+            }
+
+        # PWA_PRELOADED_STATE with article video asset
+        asset_id = traverse_obj(preload_state, (
+            'entities', 'articles', lambda k, _: k.rsplit('/', 1)[-1] == playlist_id,
+            'assetVideo', 0, {str}, any))
+        if asset_id:
+            video_id = traverse_obj(preload_state, ('entities', 'videos', asset_id, 'vpid', {str}))
+            if video_id:
+                article = traverse_obj(preload_state, (
+                    'entities', 'articles', lambda _, v: v['assetVideo'][0] == asset_id, any))
+
+                def image_url(image_id):
+                    return traverse_obj(preload_state, (
+                        'entities', 'images', image_id, 'url',
+                        {lambda u: url_or_none(u.replace('$recipe', 'raw'))}))
+
+                formats, subtitles = self._download_media_selector(video_id)
                 return {
-                    'id': programme_id,
-                    'title': title,
-                    'description': dict_get(synopses, ('long', 'medium', 'short')),
-                    'thumbnail': thumbnail,
-                    'duration': duration,
-                    'uploader': network.get('short_title'),
-                    'uploader_id': network.get('id'),
+                    'id': video_id,
+                    **traverse_obj(preload_state, ('entities', 'videos', asset_id, {
+                        'title': ('title', {str}),
+                        'description': (('synopsisLong', 'synopsisMedium', 'synopsisShort'), {str}, any),
+                        'thumbnail': (0, {image_url}),
+                        'duration': ('duration', {int_or_none}),
+                    })),
                     'formats': formats,
                     'subtitles': subtitles,
+                    'timestamp': traverse_obj(article, ('displayDate', {parse_iso8601})),
                 }
+            else:
+                return self.url_result(
+                    f'https://www.bbc.co.uk/programmes/{asset_id}', BBCCoUkIE,
+                    asset_id, playlist_title, display_id=playlist_id,
+                    description=playlist_description)
 
         bbc3_config = self._parse_json(
             self._search_regex(
@@ -1174,17 +1271,52 @@ class BBCIE(BBCCoUkIE):  # XXX: Do not subclass from concrete IE
                 return self.playlist_result(
                     entries, playlist_id, playlist_title, playlist_description)
 
+        def parse_model(model):
+            """Extract single video from model structure"""
+            item_id = traverse_obj(model, ('versions', 0, 'versionId', {str}))
+            if not item_id:
+                return
+            formats, subtitles = self._download_media_selector(item_id)
+            return {
+                'id': item_id,
+                'formats': formats,
+                'subtitles': subtitles,
+                **traverse_obj(model, {
+                    'title': ('title', {str}),
+                    'thumbnail': ('imageUrl', {lambda u: urljoin(url, u.replace('$recipe', 'raw'))}),
+                    'description': ('synopses', ('long', 'medium', 'short'), {str}, filter, any),
+                    'duration': ('versions', 0, 'duration', {int}),
+                    'timestamp': ('versions', 0, 'availableFrom', {int_or_none(scale=1000)}),
+                }),
+            }
+
+        def is_type(*types):
+            return lambda _, v: v['type'] in types
+
         initial_data = self._search_regex(
             r'window\.__INITIAL_DATA__\s*=\s*("{.+?}")\s*;', webpage,
             'quoted preload state', default=None)
         if initial_data is None:
             initial_data = self._search_regex(
                 r'window\.__INITIAL_DATA__\s*=\s*({.+?})\s*;', webpage,
-                'preload state', default={})
+                'preload state', default='{}')
         else:
             initial_data = self._parse_json(initial_data or '"{}"', playlist_id, fatal=False)
         initial_data = self._parse_json(initial_data, playlist_id, fatal=False)
         if initial_data:
+            for video_data in traverse_obj(initial_data, (
+                    'stores', 'article', 'articleBodyContent', is_type('video'))):
+                model = traverse_obj(video_data, (
+                    'model', 'blocks', is_type('aresMedia'),
+                    'model', 'blocks', is_type('aresMediaMetadata'),
+                    'model', {dict}, any))
+                entry = parse_model(model)
+                if entry:
+                    entries.append(entry)
+            if entries:
+                return self.playlist_result(
+                    entries, playlist_id, playlist_title, playlist_description)
+
             def parse_media(media):
                 if not media:
                     return
@@ -1199,7 +1331,7 @@ class BBCIE(BBCCoUkIE):  # XXX: Do not subclass from concrete IE
                     if blocks:
                         summary = []
                         for block in blocks:
-                            text = try_get(block, lambda x: x['model']['text'], compat_str)
+                            text = try_get(block, lambda x: x['model']['text'], str)
                             if text:
                                 summary.append(text)
                         if summary:
@@ -1217,37 +1349,100 @@ class BBCIE(BBCCoUkIE):  # XXX: Do not subclass from concrete IE
                         'subtitles': subtitles,
                         'timestamp': item_time,
                         'description': strip_or_none(item_desc),
+                        'duration': int_or_none(item.get('duration')),
                     })
-            for resp in (initial_data.get('data') or {}).values():
-                name = resp.get('name')
+
+            for resp in traverse_obj(initial_data, ('data', lambda _, v: v['name'])):
+                name = resp['name']
                 if name == 'media-experience':
                     parse_media(try_get(resp, lambda x: x['data']['initialItem']['mediaItem'], dict))
                 elif name == 'article':
-                    for block in (try_get(resp,
-                                          (lambda x: x['data']['blocks'],
-                                           lambda x: x['data']['content']['model']['blocks'],),
-                                          list) or []):
-                        if block.get('type') not in ['media', 'video']:
-                            continue
-                        parse_media(block.get('model'))
+                    for block in traverse_obj(resp, (
+                            'data', (None, ('content', 'model')), 'blocks',
+                            is_type('media', 'video'), 'model', {dict})):
+                        parse_media(block)
             return self.playlist_result(
                 entries, playlist_id, playlist_title, playlist_description)
 
+        # extract from SIMORGH_DATA hydration JSON
+        simorgh_data = self._search_json(
+            r'window\s*\.\s*SIMORGH_DATA\s*=', webpage,
+            'simorgh data', playlist_id, default={})
+        if simorgh_data:
+            done = False
+            for video_data in traverse_obj(simorgh_data, (
+                    'pageData', 'content', 'model', 'blocks', is_type('video', 'legacyMedia'))):
+                model = traverse_obj(video_data, (
+                    'model', 'blocks', is_type('aresMedia'),
+                    'model', 'blocks', is_type('aresMediaMetadata'),
+                    'model', {dict}, any))
+                if video_data['type'] == 'video':
+                    entry = parse_model(model)
+                else:  # legacyMedia: no duration, subtitles
+                    block_id, entry = traverse_obj(model, ('blockId', {str})), None
+                    media_data = traverse_obj(simorgh_data, (
+                        'pageData', 'promo', 'media',
+                        {lambda x: x if x['id'] == block_id else None}))
+                    formats = traverse_obj(media_data, ('playlist', lambda _, v: url_or_none(v['url']), {
+                        'url': ('url', {url_or_none}),
+                        'ext': ('format', {str}),
+                        'tbr': ('bitrate', {int_or_none(scale=1000)}),
+                    }))
+                    if formats:
+                        entry = {
+                            'id': block_id,
+                            'display_id': playlist_id,
+                            'formats': formats,
+                            'description': traverse_obj(simorgh_data, ('pageData', 'promo', 'summary', {str})),
+                            **traverse_obj(model, {
+                                'title': ('title', {str}),
+                                'thumbnail': ('imageUrl', {lambda u: urljoin(url, u.replace('$recipe', 'raw'))}),
+                                'description': ('synopses', ('long', 'medium', 'short'), {str}, any),
+                                'timestamp': ('firstPublished', {int_or_none(scale=1000)}),
+                            }),
+                        }
+                        done = True
+                if entry:
+                    entries.append(entry)
+                if done:
+                    break
+            if entries:
+                return self.playlist_result(
+                    entries, playlist_id, playlist_title, playlist_description)
+
         def extract_all(pattern):
-            return list(filter(None, map(
-                lambda s: self._parse_json(s, playlist_id, fatal=False),
-                re.findall(pattern, webpage))))
+            return list(filter(None, (
+                self._parse_json(s, playlist_id, fatal=False)
+                for s in re.findall(pattern, webpage))))
+
+        # US accessed article with single embedded video (e.g.
+        # https://www.bbc.com/news/uk-68546268)
+        next_data = traverse_obj(self._search_nextjs_data(webpage, playlist_id, default={}),
+                                 ('props', 'pageProps', 'page'))
+        model = traverse_obj(next_data, (
+            ..., 'contents', is_type('video'),
+            'model', 'blocks', is_type('media'),
+            'model', 'blocks', is_type('mediaMetadata'),
+            'model', {dict}, any))
+        if model and (entry := parse_model(model)):
+            if not entry.get('timestamp'):
+                entry['timestamp'] = traverse_obj(next_data, (
+                    ..., 'contents', is_type('timestamp'), 'model',
+                    'timestamp', {int_or_none(scale=1000)}, any))
+            entries.append(entry)
+            return self.playlist_result(
+                entries, playlist_id, playlist_title, playlist_description)
 
         # Multiple video article (e.g.
         # http://www.bbc.co.uk/blogs/adamcurtis/entries/3662a707-0af9-3149-963f-47bea720b460)
-        EMBED_URL = r'https?://(?:www\.)?bbc\.co\.uk/(?:[^/]+/)+%s(?:\b[^"]+)?' % self._ID_REGEX
+        EMBED_URL = rf'https?://(?:www\.)?bbc\.co\.uk/(?:[^/]+/)+{self._ID_REGEX}(?:\b[^"]+)?'
         entries = []
         for match in extract_all(r'new\s+SMP\(({.+?})\)'):
             embed_url = match.get('playerSettings', {}).get('externalEmbedUrl')
             if embed_url and re.match(EMBED_URL, embed_url):
                 entries.append(embed_url)
         entries.extend(re.findall(
-            r'setPlaylist\("(%s)"\)' % EMBED_URL, webpage))
+            rf'setPlaylist\("({EMBED_URL})"\)', webpage))
         if entries:
             return self.playlist_result(
                 [self.url_result(entry_, 'BBCCoUk') for entry_ in entries],
@@ -1297,11 +1492,11 @@ class BBCIE(BBCCoUkIE):  # XXX: Do not subclass from concrete IE
 
             video_id = media_meta.get('externalId')
             if not video_id:
-                video_id = playlist_id if len(medias) == 1 else '%s-%s' % (playlist_id, num)
+                video_id = playlist_id if len(medias) == 1 else f'{playlist_id}-{num}'
 
             title = media_meta.get('caption')
             if not title:
-                title = playlist_title if len(medias) == 1 else '%s - Video %s' % (playlist_title, num)
+                title = playlist_title if len(medias) == 1 else f'{playlist_title} - Video {num}'
 
             duration = int_or_none(media_meta.get('durationInSeconds')) or parse_duration(media_meta.get('duration'))
 
@@ -1362,8 +1557,8 @@ class BBCCoUkArticleIE(InfoExtractor):
 
 class BBCCoUkPlaylistBaseIE(InfoExtractor):
     def _entries(self, webpage, url, playlist_id):
-        single_page = 'page' in compat_urlparse.parse_qs(
-            compat_urlparse.urlparse(url).query)
+        single_page = 'page' in urllib.parse.parse_qs(
+            urllib.parse.urlparse(url).query)
         for page_num in itertools.count(2):
             for video_id in re.findall(
                     self._VIDEO_ID_TEMPLATE % BBCCoUkIE._ID_REGEX, webpage):
@@ -1377,8 +1572,8 @@ class BBCCoUkPlaylistBaseIE(InfoExtractor):
             if not next_page:
                 break
             webpage = self._download_webpage(
-                compat_urlparse.urljoin(url, next_page), playlist_id,
-                'Downloading page %d' % page_num, page_num)
+                urllib.parse.urljoin(url, next_page), playlist_id,
+                f'Downloading page {page_num}', page_num)
 
     def _real_extract(self, url):
         playlist_id = self._match_id(url)
@@ -1393,7 +1588,7 @@ class BBCCoUkPlaylistBaseIE(InfoExtractor):
 
 
 class BBCCoUkIPlayerPlaylistBaseIE(InfoExtractor):
-    _VALID_URL_TMPL = r'https?://(?:www\.)?bbc\.co\.uk/iplayer/%%s/(?P<id>%s)' % BBCCoUkIE._ID_REGEX
+    _VALID_URL_TMPL = rf'https?://(?:www\.)?bbc\.co\.uk/iplayer/%s/(?P<id>{BBCCoUkIE._ID_REGEX})'
 
     @staticmethod
     def _get_default(episode, key, default_key='default'):
@@ -1517,11 +1712,11 @@ class BBCCoUkIPlayerEpisodesIE(BBCCoUkIPlayerPlaylistBaseIE):
             variables['sliceId'] = series_id
         return self._download_json(
             'https://graph.ibl.api.bbc.co.uk/', pid, headers={
-                'Content-Type': 'application/json'
+                'Content-Type': 'application/json',
             }, data=json.dumps({
                 'id': '5692d93d5aac8d796a0305e895e61551',
                 'variables': variables,
-            }).encode('utf-8'))['data']['programme']
+            }).encode())['data']['programme']
 
     @staticmethod
     def _get_playlist_data(data):
@@ -1581,7 +1776,7 @@ class BBCCoUkIPlayerGroupIE(BBCCoUkIPlayerPlaylistBaseIE):
 
     def _call_api(self, pid, per_page, page=1, series_id=None):
         return self._download_json(
-            'http://ibl.api.bbc.co.uk/ibl/v1/groups/%s/episodes' % pid,
+            f'http://ibl.api.bbc.co.uk/ibl/v1/groups/{pid}/episodes',
             pid, query={
                 'page': page,
                 'per_page': per_page,
@@ -1597,7 +1792,7 @@ class BBCCoUkIPlayerGroupIE(BBCCoUkIPlayerPlaylistBaseIE):
 
 class BBCCoUkPlaylistIE(BBCCoUkPlaylistBaseIE):
     IE_NAME = 'bbc.co.uk:playlist'
-    _VALID_URL = r'https?://(?:www\.)?bbc\.co\.uk/programmes/(?P<id>%s)/(?:episodes|broadcasts|clips)' % BBCCoUkIE._ID_REGEX
+    _VALID_URL = rf'https?://(?:www\.)?bbc\.co\.uk/programmes/(?P<id>{BBCCoUkIE._ID_REGEX})/(?:episodes|broadcasts|clips)'
     _URL_TEMPLATE = 'http://www.bbc.co.uk/programmes/%s'
     _VIDEO_ID_TEMPLATE = r'data-pid=["\'](%s)'
     _TESTS = [{
diff --git a/plugins/youtube_download/yt_dlp/extractor/beacon.py b/plugins/youtube_download/yt_dlp/extractor/beacon.py
new file mode 100644
index 0000000..ae47687
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/beacon.py
@@ -0,0 +1,68 @@
+import json
+
+from .common import InfoExtractor
+from ..utils import (
+    ExtractorError,
+    parse_iso8601,
+    traverse_obj,
+)
+
+
+class BeaconTvIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?beacon\.tv/content/(?P<id>[\w-]+)'
+
+    _TESTS = [{
+        'url': 'https://beacon.tv/content/welcome-to-beacon',
+        'md5': 'b3f5932d437f288e662f10f3bfc5bd04',
+        'info_dict': {
+            'id': 'welcome-to-beacon',
+            'ext': 'mp4',
+            'upload_date': '20240509',
+            'description': 'md5:ea2bd32e71acf3f9fca6937412cc3563',
+            'thumbnail': 'https://cdn.jwplayer.com/v2/media/I4CkkEvN/poster.jpg?width=720',
+            'title': 'Your home for Critical Role!',
+            'timestamp': 1715227200,
+            'duration': 105.494,
+        },
+    }, {
+        'url': 'https://beacon.tv/content/re-slayers-take-trailer',
+        'md5': 'd879b091485dbed2245094c8152afd89',
+        'info_dict': {
+            'id': 're-slayers-take-trailer',
+            'ext': 'mp4',
+            'title': 'The Re-Slayer’s Take | Official Trailer',
+            'timestamp': 1715189040,
+            'upload_date': '20240508',
+            'duration': 53.249,
+            'thumbnail': 'https://cdn.jwplayer.com/v2/media/PW5ApIw3/poster.jpg?width=720',
+        },
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+
+        content_data = traverse_obj(self._search_nextjs_data(webpage, video_id), (
+            'props', 'pageProps', '__APOLLO_STATE__',
+            lambda k, v: k.startswith('Content:') and v['slug'] == video_id, any))
+        if not content_data:
+            raise ExtractorError('Failed to extract content data')
+
+        jwplayer_data = traverse_obj(content_data, (
+            (('contentVideo', 'video', 'videoData'),
+             ('contentPodcast', 'podcast', 'audioData')), {json.loads}, {dict}, any))
+        if not jwplayer_data:
+            if content_data.get('contentType') not in ('videoPodcast', 'video', 'podcast'):
+                raise ExtractorError('Content is not a video/podcast', expected=True)
+            if traverse_obj(content_data, ('contentTier', '__ref')) != 'MemberTier:65b258d178f89be87b4dc0a4':
+                self.raise_login_required('This video/podcast is for members only')
+            raise ExtractorError('Failed to extract content')
+
+        return {
+            **self._parse_jwplayer_data(jwplayer_data, video_id),
+            **traverse_obj(content_data, {
+                'title': ('title', {str}),
+                'description': ('description', {str}),
+                'timestamp': ('publishedAt', {parse_iso8601}),
+            }),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/beatbump.py b/plugins/youtube_download/yt_dlp/extractor/beatbump.py
index 0f40ebe..777a1b3 100644
--- a/plugins/youtube_download/yt_dlp/extractor/beatbump.py
+++ b/plugins/youtube_download/yt_dlp/extractor/beatbump.py
@@ -3,14 +3,13 @@ from .youtube import YoutubeIE, YoutubeTabIE
 
 
 class BeatBumpVideoIE(InfoExtractor):
-    _VALID_URL = r'https://beatbump\.ml/listen\?id=(?P<id>[\w-]+)'
+    _VALID_URL = r'https?://beatbump\.(?:ml|io)/listen\?id=(?P<id>[\w-]+)'
     _TESTS = [{
         'url': 'https://beatbump.ml/listen?id=MgNrAu2pzNs',
         'md5': '5ff3fff41d3935b9810a9731e485fe66',
         'info_dict': {
             'id': 'MgNrAu2pzNs',
             'ext': 'mp4',
-            'uploader_url': 'http://www.youtube.com/channel/UC-pWHpBjdGG69N9mM2auIAA',
             'artist': 'Stephen',
             'thumbnail': 'https://i.ytimg.com/vi_webp/MgNrAu2pzNs/maxresdefault.webp',
             'channel_url': 'https://www.youtube.com/channel/UC-pWHpBjdGG69N9mM2auIAA',
@@ -22,10 +21,9 @@ class BeatBumpVideoIE(InfoExtractor):
             'alt_title': 'Voyeur Girl',
             'view_count': int,
             'track': 'Voyeur Girl',
-            'uploader': 'Stephen - Topic',
+            'uploader': 'Stephen',
             'title': 'Voyeur Girl',
             'channel_follower_count': int,
-            'uploader_id': 'UC-pWHpBjdGG69N9mM2auIAA',
             'age_limit': 0,
             'availability': 'public',
             'live_status': 'not_live',
@@ -36,7 +34,12 @@ class BeatBumpVideoIE(InfoExtractor):
             'tags': 'count:11',
             'creator': 'Stephen',
             'channel_id': 'UC-pWHpBjdGG69N9mM2auIAA',
-        }
+            'channel_is_verified': True,
+            'heatmap': 'count:100',
+        },
+    }, {
+        'url': 'https://beatbump.io/listen?id=LDGZAprNGWo',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
@@ -45,7 +48,7 @@ class BeatBumpVideoIE(InfoExtractor):
 
 
 class BeatBumpPlaylistIE(InfoExtractor):
-    _VALID_URL = r'https://beatbump\.ml/(?:release\?id=|artist/|playlist/)(?P<id>[\w-]+)'
+    _VALID_URL = r'https?://beatbump\.(?:ml|io)/(?:release\?id=|artist/|playlist/)(?P<id>[\w-]+)'
     _TESTS = [{
         'url': 'https://beatbump.ml/release?id=MPREb_gTAcphH99wE',
         'playlist_count': 50,
@@ -56,25 +59,28 @@ class BeatBumpPlaylistIE(InfoExtractor):
             'title': 'Album - Royalty Free Music Library V2 (50 Songs)',
             'description': '',
             'tags': [],
-            'modified_date': '20221223',
-        }
+            'modified_date': '20231110',
+        },
+        'expected_warnings': ['YouTube Music is not directly supported'],
     }, {
         'url': 'https://beatbump.ml/artist/UC_aEa8K-EOJ3D6gOs7HcyNg',
         'playlist_mincount': 1,
         'params': {'flatplaylist': True},
         'info_dict': {
             'id': 'UC_aEa8K-EOJ3D6gOs7HcyNg',
-            'uploader_url': 'https://www.youtube.com/channel/UC_aEa8K-EOJ3D6gOs7HcyNg',
+            'uploader_url': 'https://www.youtube.com/@NoCopyrightSounds',
             'channel_url': 'https://www.youtube.com/channel/UC_aEa8K-EOJ3D6gOs7HcyNg',
-            'uploader_id': 'UC_aEa8K-EOJ3D6gOs7HcyNg',
+            'uploader_id': '@NoCopyrightSounds',
             'channel_follower_count': int,
-            'title': 'NoCopyrightSounds - Videos',
+            'title': 'NoCopyrightSounds',
             'uploader': 'NoCopyrightSounds',
             'description': 'md5:cd4fd53d81d363d05eee6c1b478b491a',
             'channel': 'NoCopyrightSounds',
-            'tags': 'count:12',
+            'tags': 'count:65',
             'channel_id': 'UC_aEa8K-EOJ3D6gOs7HcyNg',
+            'channel_is_verified': True,
         },
+        'expected_warnings': ['YouTube Music is not directly supported'],
     }, {
         'url': 'https://beatbump.ml/playlist/VLPLRBp0Fe2GpgmgoscNFLxNyBVSFVdYmFkq',
         'playlist_mincount': 1,
@@ -84,16 +90,20 @@ class BeatBumpPlaylistIE(InfoExtractor):
             'uploader_url': 'https://www.youtube.com/@NoCopyrightSounds',
             'description': 'Providing you with copyright free / safe music for gaming, live streaming, studying and more!',
             'view_count': int,
-            'channel_url': 'https://www.youtube.com/@NoCopyrightSounds',
-            'uploader_id': 'UC_aEa8K-EOJ3D6gOs7HcyNg',
+            'channel_url': 'https://www.youtube.com/channel/UC_aEa8K-EOJ3D6gOs7HcyNg',
+            'uploader_id': '@NoCopyrightSounds',
             'title': 'NCS : All Releases 💿',
             'uploader': 'NoCopyrightSounds',
             'availability': 'public',
             'channel': 'NoCopyrightSounds',
             'tags': [],
-            'modified_date': '20221225',
+            'modified_date': '20231112',
             'channel_id': 'UC_aEa8K-EOJ3D6gOs7HcyNg',
-        }
+        },
+        'expected_warnings': ['YouTube Music is not directly supported'],
+    }, {
+        'url': 'https://beatbump.io/playlist/VLPLFCHGavqRG-q_2ZhmgU2XB2--ZY6irT1c',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/beatport.py b/plugins/youtube_download/yt_dlp/extractor/beatport.py
index 0aecbd0..acc8d12 100644
--- a/plugins/youtube_download/yt_dlp/extractor/beatport.py
+++ b/plugins/youtube_download/yt_dlp/extractor/beatport.py
@@ -1,7 +1,6 @@
 import re
 
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import int_or_none
 
 
@@ -33,7 +32,7 @@ class BeatportIE(InfoExtractor):
             'display_id': 'birds-original-mix',
             'ext': 'mp4',
             'title': "Tos, Middle Milk, Mumblin' Johnsson - Birds (Original Mix)",
-        }
+        },
     }]
 
     def _real_extract(self, url):
@@ -51,7 +50,7 @@ class BeatportIE(InfoExtractor):
 
         track = next(t for t in playables['tracks'] if t['id'] == int(track_id))
 
-        title = ', '.join((a['name'] for a in track['artists'])) + ' - ' + track['name']
+        title = ', '.join(a['name'] for a in track['artists']) + ' - ' + track['name']
         if track['mix']:
             title += ' (' + track['mix'] + ')'
 
@@ -89,7 +88,7 @@ class BeatportIE(InfoExtractor):
             images.append(image)
 
         return {
-            'id': compat_str(track.get('id')) or track_id,
+            'id': str(track.get('id')) or track_id,
             'display_id': track.get('slug') or display_id,
             'title': title,
             'formats': formats,
diff --git a/plugins/youtube_download/yt_dlp/extractor/beeg.py b/plugins/youtube_download/yt_dlp/extractor/beeg.py
index 52ee68e..960cdfa 100644
--- a/plugins/youtube_download/yt_dlp/extractor/beeg.py
+++ b/plugins/youtube_download/yt_dlp/extractor/beeg.py
@@ -1,7 +1,7 @@
 from .common import InfoExtractor
-
 from ..utils import (
     int_or_none,
+    str_or_none,
     traverse_obj,
     try_get,
     unified_timestamp,
@@ -22,8 +22,8 @@ class BeegIE(InfoExtractor):
             'age_limit': 18,
             'upload_date': '20220131',
             'timestamp': 1643656455,
-            'display_id': 2540839,
-        }
+            'display_id': '2540839',
+        },
     }, {
         'url': 'https://beeg.com/-0599050563103750?t=4-861',
         'md5': 'bd8b5ea75134f7f07fad63008db2060e',
@@ -36,9 +36,9 @@ class BeegIE(InfoExtractor):
             'age_limit': 18,
             'description': 'md5:b4fc879a58ae6c604f8f259155b7e3b9',
             'timestamp': 1643623200,
-            'display_id': 2569965,
+            'display_id': '2569965',
             'upload_date': '20220131',
-        }
+        },
     }, {
         # api/v6 v2
         'url': 'https://beeg.com/1941093077?t=911-1391',
@@ -55,8 +55,8 @@ class BeegIE(InfoExtractor):
         webpage = self._download_webpage(url, video_id)
 
         video = self._download_json(
-            'https://store.externulls.com/facts/file/%s' % video_id,
-            video_id, 'Downloading JSON for %s' % video_id)
+            f'https://store.externulls.com/facts/file/{video_id}',
+            video_id, f'Downloading JSON for {video_id}')
 
         fc_facts = video.get('fc_facts')
         first_fact = {}
@@ -78,7 +78,7 @@ class BeegIE(InfoExtractor):
 
         return {
             'id': video_id,
-            'display_id': first_fact.get('id'),
+            'display_id': str_or_none(first_fact.get('id')),
             'title': traverse_obj(video, ('file', 'stuff', 'sf_name')),
             'description': traverse_obj(video, ('file', 'stuff', 'sf_story')),
             'timestamp': unified_timestamp(first_fact.get('fc_created')),
diff --git a/plugins/youtube_download/yt_dlp/extractor/behindkink.py b/plugins/youtube_download/yt_dlp/extractor/behindkink.py
index ca44981..45f45d0 100644
--- a/plugins/youtube_download/yt_dlp/extractor/behindkink.py
+++ b/plugins/youtube_download/yt_dlp/extractor/behindkink.py
@@ -3,6 +3,7 @@ from ..utils import url_basename
 
 
 class BehindKinkIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?behindkink\.com/(?P<year>[0-9]{4})/(?P<month>[0-9]{2})/(?P<day>[0-9]{2})/(?P<id>[^/#?_]+)'
     _TEST = {
         'url': 'http://www.behindkink.com/2014/12/05/what-are-you-passionate-about-marley-blaze/',
@@ -15,7 +16,7 @@ class BehindKinkIE(InfoExtractor):
             'upload_date': '20141205',
             'thumbnail': 'http://www.behindkink.com/wp-content/uploads/2014/12/blaze-1.jpg',
             'age_limit': 18,
-        }
+        },
     }
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/bellmedia.py b/plugins/youtube_download/yt_dlp/extractor/bellmedia.py
index 5ae4b91..ac45dd4 100644
--- a/plugins/youtube_download/yt_dlp/extractor/bellmedia.py
+++ b/plugins/youtube_download/yt_dlp/extractor/bellmedia.py
@@ -32,7 +32,7 @@ class BellMediaIE(InfoExtractor):
             'description': 'md5:810f7f8c6a83ad5b48677c3f8e5bb2c3',
             'upload_date': '20180525',
             'timestamp': 1527288600,
-            'season_id': 73997,
+            'season_id': '73997',
             'season': '2018',
             'thumbnail': 'http://images2.9c9media.com/image_asset/2018_5_25_baf30cbd-b28d-4a18-9903-4bb8713b00f5_PNG_956x536.jpg',
             'tags': [],
@@ -86,6 +86,6 @@ class BellMediaIE(InfoExtractor):
         return {
             '_type': 'url_transparent',
             'id': video_id,
-            'url': '9c9media:%s_web:%s' % (self._DOMAINS.get(domain, domain), video_id),
+            'url': f'9c9media:{self._DOMAINS.get(domain, domain)}_web:{video_id}',
             'ie_key': 'NineCNineMedia',
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/berufetv.py b/plugins/youtube_download/yt_dlp/extractor/berufetv.py
index 8160cbd..5bba33a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/berufetv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/berufetv.py
@@ -16,7 +16,7 @@ class BerufeTVIE(InfoExtractor):
             'tags': ['Studienfilm'],
             'duration': 602.440,
             'thumbnail': r're:^https://asset-out-cdn\.video-cdn\.net/private/videos/DvKC3DUpMKvUZ_6fEnfg3u/thumbnails/793063\?quality=thumbnail&__token__=[^\s]+$',
-        }
+        },
     }]
 
     def _real_extract(self, url):
@@ -54,7 +54,7 @@ class BerufeTVIE(InfoExtractor):
             subtitles.setdefault(track['language'], []).append({
                 'url': track['source'],
                 'name': track.get('label'),
-                'ext': 'vtt'
+                'ext': 'vtt',
             })
 
         return {
diff --git a/plugins/youtube_download/yt_dlp/extractor/bet.py b/plugins/youtube_download/yt_dlp/extractor/bet.py
index 6b867d1..3a8e743 100644
--- a/plugins/youtube_download/yt_dlp/extractor/bet.py
+++ b/plugins/youtube_download/yt_dlp/extractor/bet.py
@@ -1,10 +1,9 @@
 from .mtv import MTVServicesInfoExtractor
 from ..utils import unified_strdate
 
-# TODO Remove - Reason: Outdated Site
-
 
 class BetIE(MTVServicesInfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?bet\.com/(?:[^/]+/)+(?P<id>.+?)\.html'
     _TESTS = [
         {
@@ -20,7 +19,7 @@ class BetIE(MTVServicesInfoExtractor):
                 'thumbnail': r're:(?i)^https?://.*\.jpg$',
                 'subtitles': {
                     'en': 'mincount:2',
-                }
+                },
             },
             'params': {
                 # rtmp download
@@ -40,16 +39,16 @@ class BetIE(MTVServicesInfoExtractor):
                 'thumbnail': r're:(?i)^https?://.*\.jpg$',
                 'subtitles': {
                     'en': 'mincount:2',
-                }
+                },
             },
             'params': {
                 # rtmp download
                 'skip_download': True,
             },
-        }
+        },
     ]
 
-    _FEED_URL = "http://feeds.mtvnservices.com/od/feed/bet-mrss-player"
+    _FEED_URL = 'http://feeds.mtvnservices.com/od/feed/bet-mrss-player'
 
     def _get_feed_query(self, uri):
         return {
diff --git a/plugins/youtube_download/yt_dlp/extractor/bfi.py b/plugins/youtube_download/yt_dlp/extractor/bfi.py
index 76f0516..a6ebfed 100644
--- a/plugins/youtube_download/yt_dlp/extractor/bfi.py
+++ b/plugins/youtube_download/yt_dlp/extractor/bfi.py
@@ -5,6 +5,7 @@ from ..utils import extract_attributes
 
 
 class BFIPlayerIE(InfoExtractor):
+    _WORKING = False
     IE_NAME = 'bfi:player'
     _VALID_URL = r'https?://player\.bfi\.org\.uk/[^/]+/film/watch-(?P<id>[\w-]+)-online'
     _TEST = {
diff --git a/plugins/youtube_download/yt_dlp/extractor/bfmtv.py b/plugins/youtube_download/yt_dlp/extractor/bfmtv.py
index a7be0e6..49d4819 100644
--- a/plugins/youtube_download/yt_dlp/extractor/bfmtv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/bfmtv.py
@@ -1,18 +1,33 @@
 import re
 
 from .common import InfoExtractor
-from ..utils import extract_attributes
+from ..utils import ExtractorError, extract_attributes
 
 
 class BFMTVBaseIE(InfoExtractor):
     _VALID_URL_BASE = r'https?://(?:www\.|rmc\.)?bfmtv\.com/'
     _VALID_URL_TMPL = _VALID_URL_BASE + r'(?:[^/]+/)*[^/?&#]+_%s[A-Z]-(?P<id>\d{12})\.html'
-    _VIDEO_BLOCK_REGEX = r'(<div[^>]+class="video_block"[^>]*>)'
+    _VIDEO_BLOCK_REGEX = r'(<div[^>]+class="video_block[^"]*"[^>]*>.*?</div>)'
+    _VIDEO_ELEMENT_REGEX = r'(<video-js[^>]+>)'
     BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/%s/%s_default/index.html?videoId=%s'
 
-    def _brightcove_url_result(self, video_id, video_block):
-        account_id = video_block.get('accountid') or '876450612001'
-        player_id = video_block.get('playerid') or 'I2qBTln4u'
+    def _extract_video(self, video_block):
+        video_element = self._search_regex(
+            self._VIDEO_ELEMENT_REGEX, video_block, 'video element', default=None)
+        if video_element:
+            video_element_attrs = extract_attributes(video_element)
+            video_id = video_element_attrs.get('data-video-id')
+            if not video_id:
+                return
+            account_id = video_element_attrs.get('data-account') or '876450610001'
+            player_id = video_element_attrs.get('adjustplayer') or '19dszYXgm'
+        else:
+            video_block_attrs = extract_attributes(video_block)
+            video_id = video_block_attrs.get('videoid')
+            if not video_id:
+                return
+            account_id = video_block_attrs.get('accountid') or '876630703001'
+            player_id = video_block_attrs.get('playerid') or 'KbPwEbuHx'
         return self.url_result(
             self.BRIGHTCOVE_URL_TEMPLATE % (account_id, player_id, video_id),
             'BrightcoveNew', video_id)
@@ -40,23 +55,28 @@ class BFMTVIE(BFMTVBaseIE):
     def _real_extract(self, url):
         bfmtv_id = self._match_id(url)
         webpage = self._download_webpage(url, bfmtv_id)
-        video_block = extract_attributes(self._search_regex(
+        video = self._extract_video(self._search_regex(
             self._VIDEO_BLOCK_REGEX, webpage, 'video block'))
-        return self._brightcove_url_result(video_block['videoid'], video_block)
+        if not video:
+            raise ExtractorError('Failed to extract video')
+        return video
 
 
-class BFMTVLiveIE(BFMTVIE):  # XXX: Do not subclass from concrete IE
+class BFMTVLiveIE(BFMTVBaseIE):
     IE_NAME = 'bfmtv:live'
     _VALID_URL = BFMTVBaseIE._VALID_URL_BASE + '(?P<id>(?:[^/]+/)?en-direct)'
     _TESTS = [{
         'url': 'https://www.bfmtv.com/en-direct/',
         'info_dict': {
-            'id': '5615950982001',
+            'id': '6346069778112',
             'ext': 'mp4',
-            'title': r're:^le direct BFMTV WEB \d{4}-\d{2}-\d{2} \d{2}:\d{2}$',
+            'title': r're:^Le Live BFM TV \d{4}-\d{2}-\d{2} \d{2}:\d{2}$',
             'uploader_id': '876450610001',
-            'upload_date': '20171018',
-            'timestamp': 1508329950,
+            'upload_date': '20240202',
+            'timestamp': 1706887572,
+            'live_status': 'is_live',
+            'thumbnail': r're:https://.+/image\.jpg',
+            'tags': [],
         },
         'params': {
             'skip_download': True,
@@ -66,6 +86,15 @@ class BFMTVLiveIE(BFMTVIE):  # XXX: Do not subclass from concrete IE
         'only_matching': True,
     }]
 
+    def _real_extract(self, url):
+        bfmtv_id = self._match_id(url)
+        webpage = self._download_webpage(url, bfmtv_id)
+        video = self._extract_video(self._search_regex(
+            self._VIDEO_BLOCK_REGEX, webpage, 'video block'))
+        if not video:
+            raise ExtractorError('Failed to extract video')
+        return video
+
 
 class BFMTVArticleIE(BFMTVBaseIE):
     IE_NAME = 'bfmtv:article'
@@ -90,28 +119,25 @@ class BFMTVArticleIE(BFMTVBaseIE):
             'id': '6318445464112',
             'ext': 'mp4',
             'title': 'Le plein de bioéthanol fait de plus en plus mal à la pompe',
-            'description': None,
             'uploader_id': '876630703001',
             'upload_date': '20230110',
             'timestamp': 1673341692,
             'duration': 109.269,
             'tags': ['rmc', 'show', 'apolline de malherbe', 'info', 'talk', 'matinale', 'radio'],
-            'thumbnail': 'https://cf-images.eu-west-1.prod.boltdns.net/v1/static/876630703001/5bef74b8-9d5e-4480-a21f-60c2e2480c46/96c88b74-f9db-45e1-8040-e199c5da216c/1920x1080/match/image.jpg'
-        }
+            'thumbnail': 'https://cf-images.eu-west-1.prod.boltdns.net/v1/static/876630703001/5bef74b8-9d5e-4480-a21f-60c2e2480c46/96c88b74-f9db-45e1-8040-e199c5da216c/1920x1080/match/image.jpg',
+        },
     }]
 
+    def _entries(self, webpage):
+        for video_block_el in re.findall(self._VIDEO_BLOCK_REGEX, webpage):
+            video = self._extract_video(video_block_el)
+            if video:
+                yield video
+
     def _real_extract(self, url):
         bfmtv_id = self._match_id(url)
         webpage = self._download_webpage(url, bfmtv_id)
 
-        entries = []
-        for video_block_el in re.findall(self._VIDEO_BLOCK_REGEX, webpage):
-            video_block = extract_attributes(video_block_el)
-            video_id = video_block.get('videoid')
-            if not video_id:
-                continue
-            entries.append(self._brightcove_url_result(video_id, video_block))
-
         return self.playlist_result(
-            entries, bfmtv_id, self._og_search_title(webpage, fatal=False),
+            self._entries(webpage), bfmtv_id, self._og_search_title(webpage, fatal=False),
             self._html_search_meta(['og:description', 'description'], webpage))
diff --git a/plugins/youtube_download/yt_dlp/extractor/bibeltv.py b/plugins/youtube_download/yt_dlp/extractor/bibeltv.py
index 34464da..ad00245 100644
--- a/plugins/youtube_download/yt_dlp/extractor/bibeltv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/bibeltv.py
@@ -1,4 +1,3 @@
-from functools import partial
 
 from .common import InfoExtractor
 from ..utils import (
@@ -50,7 +49,7 @@ class BibelTVBaseIE(InfoExtractor):
             **traverse_obj(data, {
                 'title': 'title',
                 'description': 'description',
-                'duration': ('duration', {partial(int_or_none, scale=1000)}),
+                'duration': ('duration', {int_or_none(scale=1000)}),
                 'timestamp': ('schedulingStart', {parse_iso8601}),
                 'season_number': 'seasonNumber',
                 'episode_number': 'episodeNumber',
diff --git a/plugins/youtube_download/yt_dlp/extractor/bigflix.py b/plugins/youtube_download/yt_dlp/extractor/bigflix.py
index 02d1ba0..9c55bb9 100644
--- a/plugins/youtube_download/yt_dlp/extractor/bigflix.py
+++ b/plugins/youtube_download/yt_dlp/extractor/bigflix.py
@@ -1,10 +1,8 @@
+import base64
 import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_b64decode,
-    compat_urllib_parse_unquote,
-)
 
 
 class BigflixIE(InfoExtractor):
@@ -21,7 +19,7 @@ class BigflixIE(InfoExtractor):
         },
         'params': {
             'skip_download': True,
-        }
+        },
     }, {
         # multiple formats
         'url': 'http://www.bigflix.com/Malayalam-movies/Drama-movies/Indian-Rupee/15967',
@@ -38,7 +36,7 @@ class BigflixIE(InfoExtractor):
             webpage, 'title')
 
         def decode_url(quoted_b64_url):
-            return compat_b64decode(compat_urllib_parse_unquote(
+            return base64.b64decode(urllib.parse.unquote(
                 quoted_b64_url)).decode('utf-8')
 
         formats = []
@@ -47,7 +45,7 @@ class BigflixIE(InfoExtractor):
             video_url = decode_url(encoded_url)
             f = {
                 'url': video_url,
-                'format_id': '%sp' % height,
+                'format_id': f'{height}p',
                 'height': int(height),
             }
             if video_url.startswith('rtmp'):
@@ -69,5 +67,5 @@ class BigflixIE(InfoExtractor):
             'id': video_id,
             'title': title,
             'description': description,
-            'formats': formats
+            'formats': formats,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/bigo.py b/plugins/youtube_download/yt_dlp/extractor/bigo.py
index 1cb6e58..b1c230f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/bigo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/bigo.py
@@ -29,13 +29,14 @@ class BigoIE(InfoExtractor):
 
         info_raw = self._download_json(
             'https://ta.bigo.tv/official_website/studio/getInternalStudioInfo',
-            user_id, data=urlencode_postdata({'siteId': user_id}))
+            user_id, data=urlencode_postdata({'siteId': user_id}),
+            headers={'Accept': 'application/json'})
 
         if not isinstance(info_raw, dict):
             raise ExtractorError('Received invalid JSON data')
         if info_raw.get('code'):
             raise ExtractorError(
-                'Bigo says: %s (code %s)' % (info_raw.get('msg'), info_raw.get('code')), expected=True)
+                'Bigo says: {} (code {})'.format(info_raw.get('msg'), info_raw.get('code')), expected=True)
         info = info_raw.get('data') or {}
 
         if not info.get('alive'):
diff --git a/plugins/youtube_download/yt_dlp/extractor/bild.py b/plugins/youtube_download/yt_dlp/extractor/bild.py
index f3dea33..2ba6370 100644
--- a/plugins/youtube_download/yt_dlp/extractor/bild.py
+++ b/plugins/youtube_download/yt_dlp/extractor/bild.py
@@ -1,6 +1,7 @@
 from .common import InfoExtractor
 from ..utils import (
     int_or_none,
+    traverse_obj,
     unescapeHTML,
 )
 
@@ -8,7 +9,8 @@ from ..utils import (
 class BildIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?bild\.de/(?:[^/]+/)+(?P<display_id>[^/]+)-(?P<id>\d+)(?:,auto=true)?\.bild\.html'
     IE_DESC = 'Bild.de'
-    _TEST = {
+    _TESTS = [{
+        'note': 'static MP4 only',
         'url': 'http://www.bild.de/video/clip/apple-ipad-air/das-koennen-die-neuen-ipads-38184146.bild.html',
         'md5': 'dd495cbd99f2413502a1713a1156ac8a',
         'info_dict': {
@@ -18,8 +20,20 @@ class BildIE(InfoExtractor):
             'description': 'md5:a4058c4fa2a804ab59c00d7244bbf62f',
             'thumbnail': r're:^https?://.*\.jpg$',
             'duration': 196,
-        }
-    }
+        },
+    }, {
+        'note': 'static MP4 and HLS',
+        'url': 'https://www.bild.de/video/clip/news-ausland/deftiger-abgang-vom-10m-turm-bademeister-sorgt-fuer-skandal-85158620.bild.html',
+        'md5': 'fb0ed4f09c495d4ba7ce2eee0bb90de1',
+        'info_dict': {
+            'id': '85158620',
+            'ext': 'mp4',
+            'title': 'Der Sprungturm-Skandal',
+            'description': 'md5:709b543c24dc31bbbffee73bccda34ad',
+            'thumbnail': r're:^https?://.*\.jpg$',
+            'duration': 69,
+        },
+    }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
@@ -27,11 +41,23 @@ class BildIE(InfoExtractor):
         video_data = self._download_json(
             url.split('.bild.html')[0] + ',view=json.bild.html', video_id)
 
+        formats = []
+        for src in traverse_obj(video_data, ('clipList', 0, 'srces', lambda _, v: v['src'])):
+            src_type = src.get('type')
+            if src_type == 'application/x-mpegURL':
+                formats.extend(
+                    self._extract_m3u8_formats(
+                        src['src'], video_id, 'mp4', m3u8_id='hls', fatal=False))
+            elif src_type == 'video/mp4':
+                formats.append({'url': src['src'], 'format_id': 'http-mp4'})
+            else:
+                self.report_warning(f'Skipping unsupported format type: "{src_type}"')
+
         return {
             'id': video_id,
             'title': unescapeHTML(video_data['title']).strip(),
             'description': unescapeHTML(video_data.get('description')),
-            'url': video_data['clipList'][0]['srces'][0]['src'],
+            'formats': formats,
             'thumbnail': video_data.get('poster'),
             'duration': int_or_none(video_data.get('durationSec')),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/bilibili.py b/plugins/youtube_download/yt_dlp/extractor/bilibili.py
index cb7ab2a..6508942 100644
--- a/plugins/youtube_download/yt_dlp/extractor/bilibili.py
+++ b/plugins/youtube_download/yt_dlp/extractor/bilibili.py
@@ -2,9 +2,14 @@ import base64
 import functools
 import hashlib
 import itertools
+import json
 import math
+import random
+import re
+import string
 import time
 import urllib.parse
+import uuid
 
 from .common import InfoExtractor, SearchInfoExtractor
 from ..dependencies import Cryptodome
@@ -14,9 +19,12 @@ from ..utils import (
     GeoRestrictedError,
     InAdvancePagedList,
     OnDemandPagedList,
+    bool_or_none,
+    determine_ext,
     filter_dict,
     float_or_none,
     format_field,
+    get_element_by_class,
     int_or_none,
     join_nonempty,
     make_archive_id,
@@ -24,37 +32,59 @@ from ..utils import (
     mimetype2ext,
     parse_count,
     parse_qs,
+    parse_resolution,
     qualities,
     smuggle_url,
     srt_subtitles_timecode,
     str_or_none,
     traverse_obj,
-    try_call,
     unified_timestamp,
     unsmuggle_url,
     url_or_none,
     urlencode_postdata,
+    variadic,
 )
 
 
 class BilibiliBaseIE(InfoExtractor):
+    _HEADERS = {'Referer': 'https://www.bilibili.com/'}
+    _FORMAT_ID_RE = re.compile(r'-(\d+)\.m4s\?')
+    _WBI_KEY_CACHE_TIMEOUT = 30  # exact expire timeout is unclear, use 30s for one session
+    _wbi_key_cache = {}
+
+    @property
+    def is_logged_in(self):
+        return bool(self._get_cookies('https://api.bilibili.com').get('SESSDATA'))
+
+    def _check_missing_formats(self, play_info, formats):
+        parsed_qualities = set(traverse_obj(formats, (..., 'quality')))
+        missing_formats = join_nonempty(*[
+            traverse_obj(fmt, 'new_description', 'display_desc', 'quality')
+            for fmt in traverse_obj(play_info, (
+                'support_formats', lambda _, v: v['quality'] not in parsed_qualities))], delim=', ')
+        if missing_formats:
+            self.to_screen(
+                f'Format(s) {missing_formats} are missing; you have to '
+                f'become a premium member to download them. {self._login_hint()}')
+
     def extract_formats(self, play_info):
         format_names = {
             r['quality']: traverse_obj(r, 'new_description', 'display_desc')
             for r in traverse_obj(play_info, ('support_formats', lambda _, v: v['quality']))
         }
 
-        audios = traverse_obj(play_info, ('dash', 'audio', ...))
+        audios = traverse_obj(play_info, ('dash', (None, 'dolby'), 'audio', ..., {dict}))
         flac_audio = traverse_obj(play_info, ('dash', 'flac', 'audio'))
         if flac_audio:
             audios.append(flac_audio)
         formats = [{
             'url': traverse_obj(audio, 'baseUrl', 'base_url', 'url'),
             'ext': mimetype2ext(traverse_obj(audio, 'mimeType', 'mime_type')),
-            'acodec': audio.get('codecs'),
+            'acodec': traverse_obj(audio, ('codecs', {str.lower})),
             'vcodec': 'none',
             'tbr': float_or_none(audio.get('bandwidth'), scale=1000),
-            'filesize': int_or_none(audio.get('size'))
+            'filesize': int_or_none(audio.get('size')),
+            'format_id': str_or_none(audio.get('id')),
         } for audio in audios]
 
         formats.extend({
@@ -65,19 +95,90 @@ class BilibiliBaseIE(InfoExtractor):
             'height': int_or_none(video.get('height')),
             'vcodec': video.get('codecs'),
             'acodec': 'none' if audios else None,
+            'dynamic_range': {126: 'DV', 125: 'HDR10'}.get(int_or_none(video.get('id'))),
             'tbr': float_or_none(video.get('bandwidth'), scale=1000),
             'filesize': int_or_none(video.get('size')),
             'quality': int_or_none(video.get('id')),
+            'format_id': traverse_obj(
+                video, (('baseUrl', 'base_url'), {self._FORMAT_ID_RE.search}, 1),
+                ('id', {str_or_none}), get_all=False),
             'format': format_names.get(video.get('id')),
         } for video in traverse_obj(play_info, ('dash', 'video', ...)))
 
-        missing_formats = format_names.keys() - set(traverse_obj(formats, (..., 'quality')))
-        if missing_formats:
-            self.to_screen(f'Format(s) {", ".join(format_names[i] for i in missing_formats)} are missing; '
-                           f'you have to login or become premium member to download them. {self._login_hint()}')
+        if formats:
+            self._check_missing_formats(play_info, formats)
 
+        fragments = traverse_obj(play_info, ('durl', lambda _, v: url_or_none(v['url']), {
+            'url': ('url', {url_or_none}),
+            'duration': ('length', {float_or_none(scale=1000)}),
+            'filesize': ('size', {int_or_none}),
+        }))
+        if fragments:
+            formats.append({
+                'url': fragments[0]['url'],
+                'filesize': sum(traverse_obj(fragments, (..., 'filesize'))),
+                **({
+                    'fragments': fragments,
+                    'protocol': 'http_dash_segments',
+                } if len(fragments) > 1 else {}),
+                **traverse_obj(play_info, {
+                    'quality': ('quality', {int_or_none}),
+                    'format_id': ('quality', {str_or_none}),
+                    'format_note': ('quality', {lambda x: format_names.get(x)}),
+                    'duration': ('timelength', {float_or_none(scale=1000)}),
+                }),
+                **parse_resolution(format_names.get(play_info.get('quality'))),
+            })
         return formats
 
+    def _get_wbi_key(self, video_id):
+        if time.time() < self._wbi_key_cache.get('ts', 0) + self._WBI_KEY_CACHE_TIMEOUT:
+            return self._wbi_key_cache['key']
+
+        session_data = self._download_json(
+            'https://api.bilibili.com/x/web-interface/nav', video_id, note='Downloading wbi sign')
+
+        lookup = ''.join(traverse_obj(session_data, (
+            'data', 'wbi_img', ('img_url', 'sub_url'),
+            {lambda x: x.rpartition('/')[2].partition('.')[0]})))
+
+        # from getMixinKey() in the vendor js
+        mixin_key_enc_tab = [
+            46, 47, 18, 2, 53, 8, 23, 32, 15, 50, 10, 31, 58, 3, 45, 35, 27, 43, 5, 49,
+            33, 9, 42, 19, 29, 28, 14, 39, 12, 38, 41, 13, 37, 48, 7, 16, 24, 55, 40,
+            61, 26, 17, 0, 1, 60, 51, 30, 4, 22, 25, 54, 21, 56, 59, 6, 63, 57, 62, 11,
+            36, 20, 34, 44, 52,
+        ]
+
+        self._wbi_key_cache.update({
+            'key': ''.join(lookup[i] for i in mixin_key_enc_tab)[:32],
+            'ts': time.time(),
+        })
+        return self._wbi_key_cache['key']
+
+    def _sign_wbi(self, params, video_id):
+        params['wts'] = round(time.time())
+        params = {
+            k: ''.join(filter(lambda char: char not in "!'()*", str(v)))
+            for k, v in sorted(params.items())
+        }
+        query = urllib.parse.urlencode(params)
+        params['w_rid'] = hashlib.md5(f'{query}{self._get_wbi_key(video_id)}'.encode()).hexdigest()
+        return params
+
+    def _download_playinfo(self, bvid, cid, headers=None, query=None):
+        params = {'bvid': bvid, 'cid': cid, 'fnval': 4048, **(query or {})}
+        if self.is_logged_in:
+            params.pop('try_look', None)
+        if qn := params.get('qn'):
+            note = f'Downloading video format {qn} for cid {cid}'
+        else:
+            note = f'Downloading video formats for cid {cid}'
+
+        return self._download_json(
+            'https://api.bilibili.com/x/player/wbi/playurl', bvid,
+            query=self._sign_wbi(params, bvid), headers=headers, note=note)['data']
+
     def json2srt(self, json_data):
         srt_data = ''
         for idx, line in enumerate(json_data.get('body') or []):
@@ -86,26 +187,33 @@ class BilibiliBaseIE(InfoExtractor):
                          f'{line["content"]}\n\n')
         return srt_data
 
-    def _get_subtitles(self, video_id, aid, cid):
+    def _get_subtitles(self, video_id, cid, aid=None):
         subtitles = {
             'danmaku': [{
                 'ext': 'xml',
                 'url': f'https://comment.bilibili.com/{cid}.xml',
-            }]
+            }],
         }
 
-        video_info_json = self._download_json(f'https://api.bilibili.com/x/player/v2?aid={aid}&cid={cid}', video_id)
-        for s in traverse_obj(video_info_json, ('data', 'subtitle', 'subtitles', ...)):
+        video_info = self._download_json(
+            'https://api.bilibili.com/x/player/wbi/v2', video_id,
+            query={'aid': aid, 'cid': cid} if aid else {'bvid': video_id, 'cid': cid},
+            note=f'Extracting subtitle info {cid}', headers=self._HEADERS)
+        if traverse_obj(video_info, ('data', 'need_login_subtitle')):
+            self.report_warning(
+                f'Subtitles are only available when logged in. {self._login_hint()}', only_once=True)
+        for s in traverse_obj(video_info, (
+                'data', 'subtitle', 'subtitles', lambda _, v: v['subtitle_url'] and v['lan'])):
             subtitles.setdefault(s['lan'], []).append({
                 'ext': 'srt',
-                'data': self.json2srt(self._download_json(s['subtitle_url'], video_id))
+                'data': self.json2srt(self._download_json(s['subtitle_url'], video_id)),
             })
         return subtitles
 
     def _get_chapters(self, aid, cid):
         chapters = aid and cid and self._download_json(
-            'https://api.bilibili.com/x/player/v2', aid, query={'aid': aid, 'cid': cid},
-            note='Extracting chapters', fatal=False)
+            'https://api.bilibili.com/x/player/wbi/v2', aid, query={'aid': aid, 'cid': cid},
+            note='Extracting chapters', fatal=False, headers=self._HEADERS)
         return traverse_obj(chapters, ('data', 'view_points', ..., {
             'title': 'content',
             'start_time': 'from',
@@ -145,11 +253,58 @@ class BilibiliBaseIE(InfoExtractor):
         for entry in traverse_obj(season_info, (
                 'result', 'main_section', 'episodes',
                 lambda _, v: url_or_none(v['share_url']) and v['id'])):
-            yield self.url_result(entry['share_url'], BiliBiliBangumiIE, f'ep{entry["id"]}')
+            yield self.url_result(entry['share_url'], BiliBiliBangumiIE, str_or_none(entry.get('id')))
+
+    def _get_divisions(self, video_id, graph_version, edges, edge_id, cid_edges=None):
+        cid_edges = cid_edges or {}
+        division_data = self._download_json(
+            'https://api.bilibili.com/x/stein/edgeinfo_v2', video_id,
+            query={'graph_version': graph_version, 'edge_id': edge_id, 'bvid': video_id},
+            note=f'Extracting divisions from edge {edge_id}')
+        edges.setdefault(edge_id, {}).update(
+            traverse_obj(division_data, ('data', 'story_list', lambda _, v: v['edge_id'] == edge_id, {
+                'title': ('title', {str}),
+                'cid': ('cid', {int_or_none}),
+            }), get_all=False))
+
+        edges[edge_id].update(traverse_obj(division_data, ('data', {
+            'title': ('title', {str}),
+            'choices': ('edges', 'questions', ..., 'choices', ..., {
+                'edge_id': ('id', {int_or_none}),
+                'cid': ('cid', {int_or_none}),
+                'text': ('option', {str}),
+            }),
+        })))
+        # use dict to combine edges that use the same video section (same cid)
+        cid_edges.setdefault(edges[edge_id]['cid'], {})[edge_id] = edges[edge_id]
+        for choice in traverse_obj(edges, (edge_id, 'choices', ...)):
+            if choice['edge_id'] not in edges:
+                edges[choice['edge_id']] = {'cid': choice['cid']}
+                self._get_divisions(video_id, graph_version, edges, choice['edge_id'], cid_edges=cid_edges)
+        return cid_edges
+
+    def _get_interactive_entries(self, video_id, cid, metainfo, headers=None):
+        graph_version = traverse_obj(
+            self._download_json(
+                'https://api.bilibili.com/x/player/wbi/v2', video_id,
+                'Extracting graph version', query={'bvid': video_id, 'cid': cid}, headers=headers),
+            ('data', 'interaction', 'graph_version', {int_or_none}))
+        cid_edges = self._get_divisions(video_id, graph_version, {1: {'cid': cid}}, 1)
+        for cid, edges in cid_edges.items():
+            play_info = self._download_playinfo(video_id, cid, headers=headers, query={'try_look': 1})
+            yield {
+                **metainfo,
+                'id': f'{video_id}_{cid}',
+                'title': f'{metainfo.get("title")} - {next(iter(edges.values())).get("title")}',
+                'formats': self.extract_formats(play_info),
+                'description': f'{json.dumps(edges, ensure_ascii=False)}\n{metainfo.get("description", "")}',
+                'duration': float_or_none(play_info.get('timelength'), scale=1000),
+                'subtitles': self.extract_subtitles(video_id, cid),
+            }
 
 
 class BiliBiliIE(BilibiliBaseIE):
-    _VALID_URL = r'https?://www\.bilibili\.com/(?:video/|festival/\w+\?(?:[^#]*&)?bvid=)[aAbB][vV](?P<id>[^/?#&]+)'
+    _VALID_URL = r'https?://(?:www\.)?bilibili\.com/(?:video/|festival/[^/?#]+\?(?:[^#]*&)?bvid=)[aAbB][vV](?P<id>[^/?#&]+)'
 
     _TESTS = [{
         'url': 'https://www.bilibili.com/video/BV13x41117TL',
@@ -168,17 +323,17 @@ class BiliBiliIE(BilibiliBaseIE):
             'timestamp': 1488353834,
             'like_count': int,
             'view_count': int,
+            '_old_archive_ids': ['bilibili 8903802_part1'],
         },
     }, {
-        # old av URL version
+        'note': 'old av URL version',
         'url': 'http://www.bilibili.com/video/av1074402/',
         'info_dict': {
-            'thumbnail': r're:^https?://.*\.(jpg|jpeg)$',
+            'id': 'BV11x411K7CN',
             'ext': 'mp4',
+            'title': '【金坷垃】金泡沫',
             'uploader': '菊子桑',
             'uploader_id': '156160',
-            'id': 'BV11x411K7CN',
-            'title': '【金坷垃】金泡沫',
             'duration': 308.36,
             'upload_date': '20140420',
             'timestamp': 1397983878,
@@ -187,6 +342,8 @@ class BiliBiliIE(BilibiliBaseIE):
             'comment_count': int,
             'view_count': int,
             'tags': list,
+            'thumbnail': r're:^https?://.*\.(jpg|jpeg)$',
+            '_old_archive_ids': ['bilibili 1074402_part1'],
         },
         'params': {'skip_download': True},
     }, {
@@ -194,7 +351,7 @@ class BiliBiliIE(BilibiliBaseIE):
         'url': 'https://www.bilibili.com/video/BV1bK411W797',
         'info_dict': {
             'id': 'BV1bK411W797',
-            'title': '物语中的人物是如何吐槽自己的OP的'
+            'title': '物语中的人物是如何吐槽自己的OP的',
         },
         'playlist_count': 18,
         'playlist': [{
@@ -202,7 +359,7 @@ class BiliBiliIE(BilibiliBaseIE):
                 'id': 'BV1bK411W797_p1',
                 'ext': 'mp4',
                 'title': '物语中的人物是如何吐槽自己的OP的 p01 Staple Stable/战场原+羽川',
-                'tags': 'count:11',
+                'tags': 'count:10',
                 'timestamp': 1589601697,
                 'thumbnail': r're:^https?://.*\.(jpg|jpeg|png)$',
                 'uploader': '打牌还是打桩',
@@ -213,8 +370,9 @@ class BiliBiliIE(BilibiliBaseIE):
                 'view_count': int,
                 'description': 'md5:e3c401cf7bc363118d1783dd74068a68',
                 'duration': 90.314,
-            }
-        }]
+                '_old_archive_ids': ['bilibili 498159642_part1'],
+            },
+        }],
     }, {
         'note': 'Specific page of Anthology',
         'url': 'https://www.bilibili.com/video/BV1bK411W797?p=1',
@@ -222,7 +380,7 @@ class BiliBiliIE(BilibiliBaseIE):
             'id': 'BV1bK411W797_p1',
             'ext': 'mp4',
             'title': '物语中的人物是如何吐槽自己的OP的 p01 Staple Stable/战场原+羽川',
-            'tags': 'count:11',
+            'tags': 'count:10',
             'timestamp': 1589601697,
             'thumbnail': r're:^https?://.*\.(jpg|jpeg|png)$',
             'uploader': '打牌还是打桩',
@@ -233,28 +391,8 @@ class BiliBiliIE(BilibiliBaseIE):
             'view_count': int,
             'description': 'md5:e3c401cf7bc363118d1783dd74068a68',
             'duration': 90.314,
-        }
-    }, {
-        'note': 'video has subtitles',
-        'url': 'https://www.bilibili.com/video/BV12N4y1M7rh',
-        'info_dict': {
-            'id': 'BV12N4y1M7rh',
-            'ext': 'mp4',
-            'title': 'md5:96e8bb42c2b432c0d4ce3434a61479c1',
-            'tags': list,
-            'description': 'md5:afde2b7ba9025c01d9e3dde10de221e4',
-            'duration': 313.557,
-            'upload_date': '20220709',
-            'uploader': '小夫Tech',
-            'timestamp': 1657347907,
-            'uploader_id': '1326814124',
-            'comment_count': int,
-            'view_count': int,
-            'like_count': int,
-            'thumbnail': r're:^https?://.*\.(jpg|jpeg|png)$',
-            'subtitles': 'count:2'
+            '_old_archive_ids': ['bilibili 498159642_part1'],
         },
-        'params': {'listsubtitles': True},
     }, {
         'url': 'https://www.bilibili.com/video/av8903802/',
         'info_dict': {
@@ -272,6 +410,7 @@ class BiliBiliIE(BilibiliBaseIE):
             'comment_count': int,
             'view_count': int,
             'like_count': int,
+            '_old_archive_ids': ['bilibili 8903802_part1'],
         },
         'params': {
             'skip_download': True,
@@ -295,6 +434,7 @@ class BiliBiliIE(BilibiliBaseIE):
             'view_count': int,
             'like_count': int,
             'thumbnail': r're:^https?://.*\.(jpg|jpeg|png)$',
+            '_old_archive_ids': ['bilibili 463665680_part1'],
         },
         'params': {'skip_download': True},
     }, {
@@ -313,8 +453,8 @@ class BiliBiliIE(BilibiliBaseIE):
             'view_count': int,
             'like_count': int,
             'thumbnail': r're:^https?://.*\.(jpg|jpeg|png)$',
+            '_old_archive_ids': ['bilibili 893839363_part1'],
         },
-        'params': {'skip_download': True},
     }, {
         'note': 'newer festival video',
         'url': 'https://www.bilibili.com/festival/2023honkaiimpact3gala?bvid=BV1ay4y1d77f',
@@ -331,31 +471,202 @@ class BiliBiliIE(BilibiliBaseIE):
             'view_count': int,
             'like_count': int,
             'thumbnail': r're:^https?://.*\.(jpg|jpeg|png)$',
+            '_old_archive_ids': ['bilibili 778246196_part1'],
         },
-        'params': {'skip_download': True},
+    }, {
+        'note': 'legacy flv/mp4 video',
+        'url': 'https://www.bilibili.com/video/BV1ms411Q7vw/?p=4',
+        'info_dict': {
+            'id': 'BV1ms411Q7vw_p4',
+            'title': '[搞笑]【动画】云南方言快乐生产线出品 p04 新烧包谷之漫游桃花岛',
+            'timestamp': 1458222815,
+            'upload_date': '20160317',
+            'description': '云南方言快乐生产线出品',
+            'duration': float,
+            'uploader': '一笑颠天',
+            'uploader_id': '3916081',
+            'view_count': int,
+            'comment_count': int,
+            'like_count': int,
+            'tags': list,
+            'thumbnail': r're:^https?://.*\.(jpg|jpeg|png)$',
+            '_old_archive_ids': ['bilibili 4120229_part4'],
+        },
+        'params': {'extractor_args': {'bilibili': {'prefer_multi_flv': ['32']}}},
+        'playlist_count': 19,
+        'playlist': [{
+            'info_dict': {
+                'id': 'BV1ms411Q7vw_p4_0',
+                'ext': 'flv',
+                'title': '[搞笑]【动画】云南方言快乐生产线出品 p04 新烧包谷之漫游桃花岛',
+                'duration': 399.102,
+            },
+        }],
+    }, {
+        'note': 'legacy mp4-only video',
+        'url': 'https://www.bilibili.com/video/BV1nx411u79K',
+        'info_dict': {
+            'id': 'BV1nx411u79K',
+            'ext': 'mp4',
+            'title': '【练习室】201603声乐练习《No Air》with VigoVan',
+            'timestamp': 1508893551,
+            'upload_date': '20171025',
+            'description': '@ZERO-G伯远\n声乐练习 《No Air》with Vigo Van',
+            'duration': 80.384,
+            'uploader': '伯远',
+            'uploader_id': '10584494',
+            'comment_count': int,
+            'view_count': int,
+            'like_count': int,
+            'tags': list,
+            'thumbnail': r're:^https?://.*\.(jpg|jpeg|png)$',
+            '_old_archive_ids': ['bilibili 15700301_part1'],
+        },
+    }, {
+        'note': 'interactive/split-path video',
+        'url': 'https://www.bilibili.com/video/BV1af4y1H7ga/',
+        'info_dict': {
+            'id': 'BV1af4y1H7ga',
+            'title': '【互动游戏】花了大半年时间做的自我介绍~请查收！！',
+            'timestamp': 1630500414,
+            'upload_date': '20210901',
+            'description': 'md5:01113e39ab06e28042d74ac356a08786',
+            'tags': list,
+            'uploader': '钉宫妮妮Ninico',
+            'duration': 1503,
+            'uploader_id': '8881297',
+            'comment_count': int,
+            'view_count': int,
+            'like_count': int,
+            'thumbnail': r're:^https?://.*\.(jpg|jpeg|png)$',
+            '_old_archive_ids': ['bilibili 292734508_part1'],
+        },
+        'playlist_count': 33,
+        'playlist': [{
+            'info_dict': {
+                'id': 'BV1af4y1H7ga_400950101',
+                'ext': 'mp4',
+                'title': '【互动游戏】花了大半年时间做的自我介绍~请查收！！ - 听见猫猫叫~',
+                'timestamp': 1630500414,
+                'upload_date': '20210901',
+                'description': 'md5:db66ac7a2813a94b8291dbce990cc5b2',
+                'tags': list,
+                'uploader': '钉宫妮妮Ninico',
+                'duration': 11.605,
+                'uploader_id': '8881297',
+                'comment_count': int,
+                'view_count': int,
+                'like_count': int,
+                'thumbnail': r're:^https?://.*\.(jpg|jpeg|png)$',
+                '_old_archive_ids': ['bilibili 292734508_part1'],
+            },
+        }],
+    }, {
+        'note': '301 redirect to bangumi link',
+        'url': 'https://www.bilibili.com/video/BV1TE411f7f1',
+        'info_dict': {
+            'id': '288525',
+            'title': '李永乐老师 钱学森弹道和乘波体飞行器是什么？',
+            'ext': 'mp4',
+            'series': '我和我的祖国',
+            'series_id': '4780',
+            'season': '幕后纪实',
+            'season_id': '28609',
+            'season_number': 1,
+            'episode': '钱学森弹道和乘波体飞行器是什么？',
+            'episode_id': '288525',
+            'episode_number': 105,
+            'duration': 1183.957,
+            'timestamp': 1571648124,
+            'upload_date': '20191021',
+            'thumbnail': r're:^https?://.*\.(jpg|jpeg|png)$',
+        },
+    }, {
+        'note': 'video has subtitles, which requires login',
+        'url': 'https://www.bilibili.com/video/BV12N4y1M7rh',
+        'info_dict': {
+            'id': 'BV12N4y1M7rh',
+            'ext': 'mp4',
+            'title': 'md5:96e8bb42c2b432c0d4ce3434a61479c1',
+            'tags': list,
+            'description': 'md5:afde2b7ba9025c01d9e3dde10de221e4',
+            'duration': 313.557,
+            'upload_date': '20220709',
+            'uploader': '小夫太渴',
+            'timestamp': 1657347907,
+            'uploader_id': '1326814124',
+            'comment_count': int,
+            'view_count': int,
+            'like_count': int,
+            'thumbnail': r're:^https?://.*\.(jpg|jpeg|png)$',
+            'subtitles': 'count:2',  # login required for CC subtitle
+            '_old_archive_ids': ['bilibili 898179753_part1'],
+        },
+        'params': {'listsubtitles': True},
+        'skip': 'login required for subtitle',
+    }, {
+        'url': 'https://www.bilibili.com/video/BV1jL41167ZG/',
+        'info_dict': {
+            'id': 'BV1jL41167ZG',
+            'title': '一场大火引发的离奇死亡！古典推理经典短篇集《不可能犯罪诊断书》！',
+            'ext': 'mp4',
+        },
+        'skip': 'supporter-only video',
+    }, {
+        'url': 'https://www.bilibili.com/video/BV1Ks411f7aQ/',
+        'info_dict': {
+            'id': 'BV1Ks411f7aQ',
+            'title': '【BD1080P】狼与香辛料I【华盟】',
+            'ext': 'mp4',
+        },
+        'skip': 'login required',
+    }, {
+        'url': 'https://www.bilibili.com/video/BV1GJ411x7h7/',
+        'info_dict': {
+            'id': 'BV1GJ411x7h7',
+            'title': '【官方 MV】Never Gonna Give You Up - Rick Astley',
+            'ext': 'mp4',
+        },
+        'skip': 'geo-restricted',
+    }, {
+        'note': 'has - in the last path segment of the url',
+        'url': 'https://www.bilibili.com/festival/bh3-7th?bvid=BV1tr4y1f7p2&',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
+        headers = self.geo_verification_headers()
+        webpage, urlh = self._download_webpage_handle(url, video_id, headers=headers)
+        if not self._match_valid_url(urlh.url):
+            return self.url_result(urlh.url)
+
+        headers['Referer'] = url
+
         initial_state = self._search_json(r'window\.__INITIAL_STATE__\s*=', webpage, 'initial state', video_id)
 
+        if traverse_obj(initial_state, ('error', 'trueCode')) == -403:
+            self.raise_login_required()
+        if traverse_obj(initial_state, ('error', 'trueCode')) == -404:
+            raise ExtractorError(
+                'This video may be deleted or geo-restricted. '
+                'You might want to try a VPN or a proxy server (with --proxy)', expected=True)
+
         is_festival = 'videoData' not in initial_state
         if is_festival:
             video_data = initial_state['videoInfo']
         else:
-            play_info = self._search_json(r'window\.__playinfo__\s*=', webpage, 'play info', video_id)['data']
             video_data = initial_state['videoData']
 
         video_id, title = video_data['bvid'], video_data.get('title')
 
         # Bilibili anthologies are similar to playlists but all videos share the same video ID as the anthology itself.
-        page_list_json = not is_festival and traverse_obj(
+        page_list_json = (not is_festival and traverse_obj(
             self._download_json(
                 'https://api.bilibili.com/x/player/pagelist', video_id,
                 fatal=False, query={'bvid': video_id, 'jsonp': 'jsonp'},
-                note='Extracting videos in anthology'),
-            'data', expected_type=list) or []
+                note='Extracting videos in anthology', headers=headers),
+            'data', expected_type=list)) or []
         is_anthology = len(page_list_json) > 1
 
         part_id = int_or_none(parse_qs(url).get('p', [None])[-1])
@@ -370,16 +681,10 @@ class BiliBiliIE(BilibiliBaseIE):
 
         aid = video_data.get('aid')
         old_video_id = format_field(aid, None, f'%s_part{part_id or 1}')
-
         cid = traverse_obj(video_data, ('pages', part_id - 1, 'cid')) if part_id else video_data.get('cid')
 
         festival_info = {}
         if is_festival:
-            play_info = self._download_json(
-                'https://api.bilibili.com/x/player/playurl', video_id,
-                query={'bvid': video_id, 'cid': cid, 'fnval': 4048},
-                note='Extracting festival video formats')['data']
-
             festival_info = traverse_obj(initial_state, {
                 'uploader': ('videoInfo', 'upName'),
                 'uploader_id': ('videoInfo', 'upMid', {str_or_none}),
@@ -387,7 +692,7 @@ class BiliBiliIE(BilibiliBaseIE):
                 'thumbnail': ('sectionEpisodes', lambda _, v: v['bvid'] == video_id, 'cover'),
             }, get_all=False)
 
-        return {
+        metainfo = {
             **traverse_obj(initial_state, {
                 'uploader': ('upData', 'name'),
                 'uploader_id': ('upData', 'mid', {str_or_none}),
@@ -403,28 +708,122 @@ class BiliBiliIE(BilibiliBaseIE):
                 'comment_count': ('stat', 'reply', {int_or_none}),
             }, get_all=False),
             'id': f'{video_id}{format_field(part_id, None, "_p%d")}',
-            'formats': self.extract_formats(play_info),
             '_old_archive_ids': [make_archive_id(self, old_video_id)] if old_video_id else None,
             'title': title,
+            'http_headers': {'Referer': url},
+        }
+
+        is_interactive = traverse_obj(video_data, ('rights', 'is_stein_gate'))
+        if is_interactive:
+            return self.playlist_result(
+                self._get_interactive_entries(video_id, cid, metainfo, headers=headers), **metainfo,
+                duration=traverse_obj(initial_state, ('videoData', 'duration', {int_or_none})),
+                __post_extractor=self.extract_comments(aid))
+
+        play_info = None
+        if self.is_logged_in:
+            play_info = traverse_obj(
+                self._search_json(r'window\.__playinfo__\s*=', webpage, 'play info', video_id, default=None),
+                ('data', {dict}))
+        if not play_info:
+            play_info = self._download_playinfo(video_id, cid, headers=headers, query={'try_look': 1})
+        formats = self.extract_formats(play_info)
+
+        if video_data.get('is_upower_exclusive'):
+            high_level = traverse_obj(initial_state, ('elecFullInfo', 'show_info', 'high_level', {dict})) or {}
+            msg = f'{join_nonempty("title", "sub_title", from_dict=high_level, delim="，")}. {self._login_hint()}'
+            if not formats:
+                raise ExtractorError(f'This is a supporter-only video: {msg}', expected=True)
+            if '试看' in traverse_obj(play_info, ('accept_description', ..., {str})):
+                self.report_warning(
+                    f'This is a supporter-only video, only the preview will be extracted: {msg}',
+                    video_id=video_id)
+
+        if not traverse_obj(play_info, 'dash'):
+            # we only have legacy formats and need additional work
+            has_qn = lambda x: x in traverse_obj(formats, (..., 'quality'))
+            for qn in traverse_obj(play_info, ('accept_quality', lambda _, v: not has_qn(v), {int})):
+                formats.extend(traverse_obj(
+                    self.extract_formats(self._download_playinfo(video_id, cid, headers=headers, query={'qn': qn})),
+                    lambda _, v: not has_qn(v['quality'])))
+            self._check_missing_formats(play_info, formats)
+            flv_formats = traverse_obj(formats, lambda _, v: v['fragments'])
+            if flv_formats and len(flv_formats) < len(formats):
+                # Flv and mp4 are incompatible due to `multi_video` workaround, so drop one
+                if not self._configuration_arg('prefer_multi_flv'):
+                    dropped_fmts = ', '.join(
+                        f'{f.get("format_note")} ({f.get("format_id")})' for f in flv_formats)
+                    formats = traverse_obj(formats, lambda _, v: not v.get('fragments'))
+                    if dropped_fmts:
+                        self.to_screen(
+                            f'Dropping incompatible flv format(s) {dropped_fmts} since mp4 is available. '
+                            'To extract flv, pass --extractor-args "bilibili:prefer_multi_flv"')
+                else:
+                    formats = traverse_obj(
+                        # XXX: Filtering by extractor-arg is for testing purposes
+                        formats, lambda _, v: v['quality'] == int(self._configuration_arg('prefer_multi_flv')[0]),
+                    ) or [max(flv_formats, key=lambda x: x['quality'])]
+
+        if traverse_obj(formats, (0, 'fragments')):
+            # We have flv formats, which are individual short videos with their own timestamps and metainfo
+            # Binary concatenation corrupts their timestamps, so we need a `multi_video` workaround
+            return {
+                **metainfo,
+                '_type': 'multi_video',
+                'entries': [{
+                    'id': f'{metainfo["id"]}_{idx}',
+                    'title': metainfo['title'],
+                    'http_headers': metainfo['http_headers'],
+                    'formats': [{
+                        **fragment,
+                        'format_id': formats[0].get('format_id'),
+                    }],
+                    'subtitles': self.extract_subtitles(video_id, cid) if idx == 0 else None,
+                    '__post_extractor': self.extract_comments(aid) if idx == 0 else None,
+                } for idx, fragment in enumerate(formats[0]['fragments'])],
+                'duration': float_or_none(play_info.get('timelength'), scale=1000),
+            }
+
+        return {
+            **metainfo,
+            'formats': formats,
             'duration': float_or_none(play_info.get('timelength'), scale=1000),
             'chapters': self._get_chapters(aid, cid),
-            'subtitles': self.extract_subtitles(video_id, aid, cid),
+            'subtitles': self.extract_subtitles(video_id, cid),
             '__post_extractor': self.extract_comments(aid),
-            'http_headers': {'Referer': url},
         }
 
 
 class BiliBiliBangumiIE(BilibiliBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?bilibili\.com/bangumi/play/(?P<id>ep\d+)'
+    _VALID_URL = r'https?://(?:www\.)?bilibili\.com/bangumi/play/ep(?P<id>\d+)'
 
     _TESTS = [{
+        'url': 'https://www.bilibili.com/bangumi/play/ep21495/',
+        'info_dict': {
+            'id': '21495',
+            'ext': 'mp4',
+            'series': '悠久之翼',
+            'series_id': '774',
+            'season': '第二季',
+            'season_id': '1182',
+            'season_number': 2,
+            'episode': 'forever／ef',
+            'episode_id': '21495',
+            'episode_number': 12,
+            'title': '12 forever／ef',
+            'duration': 1420.791,
+            'timestamp': 1320412200,
+            'upload_date': '20111104',
+            'thumbnail': r're:^https?://.*\.(jpg|jpeg|png)$',
+        },
+    }, {
         'url': 'https://www.bilibili.com/bangumi/play/ep267851',
         'info_dict': {
             'id': '267851',
             'ext': 'mp4',
             'series': '鬼灭之刃',
             'series_id': '4358',
-            'season': '鬼灭之刃',
+            'season': '立志篇',
             'season_id': '26801',
             'season_number': 1,
             'episode': '残酷',
@@ -434,26 +833,52 @@ class BiliBiliBangumiIE(BilibiliBaseIE):
             'duration': 1425.256,
             'timestamp': 1554566400,
             'upload_date': '20190406',
-            'thumbnail': r're:^https?://.*\.(jpg|jpeg|png)$'
+            'thumbnail': r're:^https?://.*\.(jpg|jpeg|png)$',
+        },
+        'skip': 'Geo-restricted',
+    }, {
+        'note': 'a making-of which falls outside main section',
+        'url': 'https://www.bilibili.com/bangumi/play/ep345120',
+        'info_dict': {
+            'id': '345120',
+            'ext': 'mp4',
+            'series': '鬼灭之刃',
+            'series_id': '4358',
+            'season': '立志篇',
+            'season_id': '26801',
+            'season_number': 1,
+            'episode': '炭治郎篇',
+            'episode_id': '345120',
+            'episode_number': 27,
+            'title': '#1 炭治郎篇',
+            'duration': 1922.129,
+            'timestamp': 1602853860,
+            'upload_date': '20201016',
+            'thumbnail': r're:^https?://.*\.(jpg|jpeg|png)$',
         },
-        'skip': 'According to the copyright owner\'s request, you may only watch the video after you are premium member.'
     }]
 
     def _real_extract(self, url):
-        video_id = self._match_id(url)
-        episode_id = video_id[2:]
-        webpage = self._download_webpage(url, video_id)
+        episode_id = self._match_id(url)
+        headers = self.geo_verification_headers()
+        webpage = self._download_webpage(url, episode_id, headers=headers)
 
         if '您所在的地区无法观看本片' in webpage:
             raise GeoRestrictedError('This video is restricted')
         elif '正在观看预览，大会员免费看全片' in webpage:
             self.raise_login_required('This video is for premium members only')
 
-        headers = {'Referer': url, **self.geo_verification_headers()}
-        play_info = self._download_json(
-            'https://api.bilibili.com/pgc/player/web/v2/playurl', video_id,
-            'Extracting episode', query={'fnval': '4048', 'ep_id': episode_id},
-            headers=headers)
+        headers['Referer'] = url
+
+        play_info = (
+            self._search_json(
+                r'playurlSSRData\s*=', webpage, 'embedded page info', episode_id,
+                end_pattern='\n', default=None)
+            or self._download_json(
+                'https://api.bilibili.com/pgc/player/web/v2/playurl', episode_id,
+                'Extracting episode', query={'fnval': 12240, 'ep_id': episode_id},
+                headers=headers))
+
         premium_only = play_info.get('code') == -10403
         play_info = traverse_obj(play_info, ('result', 'video_info', {dict})) or {}
 
@@ -462,81 +887,286 @@ class BiliBiliBangumiIE(BilibiliBaseIE):
             self.raise_login_required('This video is for premium members only')
 
         bangumi_info = self._download_json(
-            'https://api.bilibili.com/pgc/view/web/season', video_id, 'Get episode details',
+            'https://api.bilibili.com/pgc/view/web/season', episode_id, 'Get episode details',
             query={'ep_id': episode_id}, headers=headers)['result']
 
         episode_number, episode_info = next((
             (idx, ep) for idx, ep in enumerate(traverse_obj(
-                bangumi_info, ('episodes', ..., {dict})), 1)
+                bangumi_info, (('episodes', ('section', ..., 'episodes')), ..., {dict})), 1)
             if str_or_none(ep.get('id')) == episode_id), (1, {}))
 
         season_id = bangumi_info.get('season_id')
-        season_number = season_id and next((
-            idx + 1 for idx, e in enumerate(
+        season_number, season_title = season_id and next((
+            (idx + 1, e.get('season_title')) for idx, e in enumerate(
                 traverse_obj(bangumi_info, ('seasons', ...)))
             if e.get('season_id') == season_id
-        ), None)
+        ), (None, None))
 
         aid = episode_info.get('aid')
 
         return {
-            'id': video_id,
+            'id': episode_id,
             'formats': formats,
             **traverse_obj(bangumi_info, {
                 'series': ('series', 'series_title', {str}),
                 'series_id': ('series', 'series_id', {str_or_none}),
                 'thumbnail': ('square_cover', {url_or_none}),
             }),
-            'title': join_nonempty('title', 'long_title', delim=' ', from_dict=episode_info),
-            'episode': episode_info.get('long_title'),
+            **traverse_obj(episode_info, {
+                'episode': ('long_title', {str}),
+                'episode_number': ('title', {int_or_none}, {lambda x: x or episode_number}),
+                'timestamp': ('pub_time', {int_or_none}),
+                'title': {lambda v: v and join_nonempty('title', 'long_title', delim=' ', from_dict=v)},
+            }),
             'episode_id': episode_id,
-            'episode_number': int_or_none(episode_info.get('title')) or episode_number,
+            'season': str_or_none(season_title),
             'season_id': str_or_none(season_id),
             'season_number': season_number,
-            'timestamp': int_or_none(episode_info.get('pub_time')),
             'duration': float_or_none(play_info.get('timelength'), scale=1000),
-            'subtitles': self.extract_subtitles(video_id, aid, episode_info.get('cid')),
+            'subtitles': self.extract_subtitles(episode_id, episode_info.get('cid'), aid=aid),
             '__post_extractor': self.extract_comments(aid),
-            'http_headers': headers,
+            'http_headers': {'Referer': url},
         }
 
 
 class BiliBiliBangumiMediaIE(BilibiliBaseIE):
-    _VALID_URL = r'https?://www\.bilibili\.com/bangumi/media/md(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:www\.)?bilibili\.com/bangumi/media/md(?P<id>\d+)'
     _TESTS = [{
         'url': 'https://www.bilibili.com/bangumi/media/md24097891',
         'info_dict': {
             'id': '24097891',
+            'title': 'CAROLE & TUESDAY',
+            'description': 'md5:42417ad33d1eaa1c93bfd2dd1626b829',
         },
         'playlist_mincount': 25,
+    }, {
+        'url': 'https://www.bilibili.com/bangumi/media/md1565/',
+        'info_dict': {
+            'id': '1565',
+            'title': '攻壳机动队 S.A.C. 2nd GIG',
+            'description': 'md5:46cac00bafd645b97f4d6df616fc576d',
+        },
+        'playlist_count': 26,
+        'playlist': [{
+            'info_dict': {
+                'id': '68540',
+                'ext': 'mp4',
+                'series': '攻壳机动队',
+                'series_id': '1077',
+                'season': '第二季',
+                'season_id': '1565',
+                'season_number': 2,
+                'episode': '再启动 REEMBODY',
+                'episode_id': '68540',
+                'episode_number': 1,
+                'title': '1 再启动 REEMBODY',
+                'duration': 1525.777,
+                'timestamp': 1425074413,
+                'upload_date': '20150227',
+                'thumbnail': r're:^https?://.*\.(jpg|jpeg|png)$',
+            },
+        }],
     }]
 
     def _real_extract(self, url):
         media_id = self._match_id(url)
         webpage = self._download_webpage(url, media_id)
-        ss_id = self._search_json(
-            r'window\.__INITIAL_STATE__\s*=', webpage, 'initial_state', media_id)['mediaInfo']['season_id']
 
-        return self.playlist_result(self._get_episodes_from_season(ss_id, url), media_id)
+        initial_state = self._search_json(
+            r'window\.__INITIAL_STATE__\s*=', webpage, 'initial_state', media_id)
+        ss_id = initial_state['mediaInfo']['season_id']
+
+        return self.playlist_result(
+            self._get_episodes_from_season(ss_id, url), media_id,
+            **traverse_obj(initial_state, ('mediaInfo', {
+                'title': ('title', {str}),
+                'description': ('evaluate', {str}),
+            })))
 
 
 class BiliBiliBangumiSeasonIE(BilibiliBaseIE):
-    _VALID_URL = r'(?x)https?://www\.bilibili\.com/bangumi/play/ss(?P<id>\d+)'
+    _VALID_URL = r'(?x)https?://(?:www\.)?bilibili\.com/bangumi/play/ss(?P<id>\d+)'
     _TESTS = [{
         'url': 'https://www.bilibili.com/bangumi/play/ss26801',
         'info_dict': {
-            'id': '26801'
+            'id': '26801',
+            'title': '鬼灭之刃',
+            'description': 'md5:e2cc9848b6f69be6db79fc2a82d9661b',
         },
-        'playlist_mincount': 26
+        'playlist_mincount': 26,
+    }, {
+        'url': 'https://www.bilibili.com/bangumi/play/ss2251',
+        'info_dict': {
+            'id': '2251',
+            'title': '玲音',
+            'description': 'md5:1fd40e3df4c08d4d9d89a6a34844bdc4',
+        },
+        'playlist_count': 13,
+        'playlist': [{
+            'info_dict': {
+                'id': '50188',
+                'ext': 'mp4',
+                'series': '玲音',
+                'series_id': '1526',
+                'season': 'TV',
+                'season_id': '2251',
+                'season_number': 1,
+                'episode': 'WEIRD',
+                'episode_id': '50188',
+                'episode_number': 1,
+                'title': '1 WEIRD',
+                'duration': 1436.992,
+                'timestamp': 1343185080,
+                'upload_date': '20120725',
+                'thumbnail': r're:^https?://.*\.(jpg|jpeg|png)$',
+            },
+        }],
     }]
 
     def _real_extract(self, url):
         ss_id = self._match_id(url)
+        webpage = self._download_webpage(url, ss_id)
+        metainfo = traverse_obj(
+            self._search_json(r'<script[^>]+type="application/ld\+json"[^>]*>', webpage, 'info', ss_id),
+            ('itemListElement', ..., {
+                'title': ('name', {str}),
+                'description': ('description', {str}),
+            }), get_all=False)
 
-        return self.playlist_result(self._get_episodes_from_season(ss_id, url), ss_id)
+        return self.playlist_result(self._get_episodes_from_season(ss_id, url), ss_id, **metainfo)
 
 
-class BilibiliSpaceBaseIE(InfoExtractor):
+class BilibiliCheeseBaseIE(BilibiliBaseIE):
+    def _extract_episode(self, season_info, ep_id):
+        episode_info = traverse_obj(season_info, (
+            'episodes', lambda _, v: v['id'] == int(ep_id)), get_all=False)
+        aid, cid = episode_info['aid'], episode_info['cid']
+
+        if traverse_obj(episode_info, 'ep_status') == -1:
+            raise ExtractorError('This course episode is not yet available.', expected=True)
+        if not traverse_obj(episode_info, 'playable'):
+            self.raise_login_required('You need to purchase the course to download this episode')
+
+        play_info = self._download_json(
+            'https://api.bilibili.com/pugv/player/web/playurl', ep_id,
+            query={'avid': aid, 'cid': cid, 'ep_id': ep_id, 'fnval': 16, 'fourk': 1},
+            headers=self._HEADERS, note='Downloading playinfo')['data']
+
+        return {
+            'id': str_or_none(ep_id),
+            'episode_id': str_or_none(ep_id),
+            'formats': self.extract_formats(play_info),
+            'extractor_key': BilibiliCheeseIE.ie_key(),
+            'extractor': BilibiliCheeseIE.IE_NAME,
+            'webpage_url': f'https://www.bilibili.com/cheese/play/ep{ep_id}',
+            **traverse_obj(episode_info, {
+                'episode': ('title', {str}),
+                'title': {lambda v: v and join_nonempty('index', 'title', delim=' - ', from_dict=v)},
+                'alt_title': ('subtitle', {str}),
+                'duration': ('duration', {int_or_none}),
+                'episode_number': ('index', {int_or_none}),
+                'thumbnail': ('cover', {url_or_none}),
+                'timestamp': ('release_date', {int_or_none}),
+                'view_count': ('play', {int_or_none}),
+            }),
+            **traverse_obj(season_info, {
+                'uploader': ('up_info', 'uname', {str}),
+                'uploader_id': ('up_info', 'mid', {str_or_none}),
+            }),
+            'subtitles': self.extract_subtitles(ep_id, cid, aid=aid),
+            '__post_extractor': self.extract_comments(aid),
+            'http_headers': self._HEADERS,
+        }
+
+    def _download_season_info(self, query_key, video_id):
+        return self._download_json(
+            f'https://api.bilibili.com/pugv/view/web/season?{query_key}={video_id}', video_id,
+            headers=self._HEADERS, note='Downloading season info')['data']
+
+
+class BilibiliCheeseIE(BilibiliCheeseBaseIE):
+    _VALID_URL = r'https?://(?:www\.)?bilibili\.com/cheese/play/ep(?P<id>\d+)'
+    _TESTS = [{
+        'url': 'https://www.bilibili.com/cheese/play/ep229832',
+        'info_dict': {
+            'id': '229832',
+            'ext': 'mp4',
+            'title': '1 - 课程先导片',
+            'alt_title': '视频课 · 3分41秒',
+            'uploader': '马督工',
+            'uploader_id': '316568752',
+            'episode': '课程先导片',
+            'episode_id': '229832',
+            'episode_number': 1,
+            'duration': 221,
+            'timestamp': 1695549606,
+            'upload_date': '20230924',
+            'thumbnail': r're:^https?://.*\.(jpg|jpeg|png)$',
+            'view_count': int,
+        },
+    }]
+
+    def _real_extract(self, url):
+        ep_id = self._match_id(url)
+        return self._extract_episode(self._download_season_info('ep_id', ep_id), ep_id)
+
+
+class BilibiliCheeseSeasonIE(BilibiliCheeseBaseIE):
+    _VALID_URL = r'https?://(?:www\.)?bilibili\.com/cheese/play/ss(?P<id>\d+)'
+    _TESTS = [{
+        'url': 'https://www.bilibili.com/cheese/play/ss5918',
+        'info_dict': {
+            'id': '5918',
+            'title': '【限时五折】新闻系学不到：马督工教你做自媒体',
+            'description': '帮普通人建立世界模型，降低人与人的沟通门槛',
+        },
+        'playlist': [{
+            'info_dict': {
+                'id': '229832',
+                'ext': 'mp4',
+                'title': '1 - 课程先导片',
+                'alt_title': '视频课 · 3分41秒',
+                'uploader': '马督工',
+                'uploader_id': '316568752',
+                'episode': '课程先导片',
+                'episode_id': '229832',
+                'episode_number': 1,
+                'duration': 221,
+                'timestamp': 1695549606,
+                'upload_date': '20230924',
+                'thumbnail': r're:^https?://.*\.(jpg|jpeg|png)$',
+                'view_count': int,
+            },
+        }],
+        'params': {'playlist_items': '1'},
+    }, {
+        'url': 'https://www.bilibili.com/cheese/play/ss5918',
+        'info_dict': {
+            'id': '5918',
+            'title': '【限时五折】新闻系学不到：马督工教你做自媒体',
+            'description': '帮普通人建立世界模型，降低人与人的沟通门槛',
+        },
+        'playlist_mincount': 5,
+        'skip': 'paid video in list',
+    }]
+
+    def _get_cheese_entries(self, season_info):
+        for ep_id in traverse_obj(season_info, ('episodes', lambda _, v: v['episode_can_view'], 'id')):
+            yield self._extract_episode(season_info, ep_id)
+
+    def _real_extract(self, url):
+        season_id = self._match_id(url)
+        season_info = self._download_season_info('season_id', season_id)
+
+        return self.playlist_result(
+            self._get_cheese_entries(season_info), season_id,
+            **traverse_obj(season_info, {
+                'title': ('title', {str}),
+                'description': ('subtitle', {str}),
+            }))
+
+
+class BilibiliSpaceBaseIE(BilibiliBaseIE):
     def _extract_playlist(self, fetch_page, get_metadata, get_entries):
         first_page = fetch_page(0)
         metadata = get_metadata(first_page)
@@ -549,7 +1179,7 @@ class BilibiliSpaceBaseIE(InfoExtractor):
 
 
 class BilibiliSpaceVideoIE(BilibiliSpaceBaseIE):
-    _VALID_URL = r'https?://space\.bilibili\.com/(?P<id>\d+)(?P<video>/video)?/?(?:[?#]|$)'
+    _VALID_URL = r'https?://space\.bilibili\.com/(?P<id>\d+)(?P<video>(?:/upload)?/video)?/?(?:[?#]|$)'
     _TESTS = [{
         'url': 'https://space.bilibili.com/3985676/video',
         'info_dict': {
@@ -564,63 +1194,49 @@ class BilibiliSpaceVideoIE(BilibiliSpaceBaseIE):
         'playlist_mincount': 92,
     }]
 
-    def _extract_signature(self, playlist_id):
-        session_data = self._download_json('https://api.bilibili.com/x/web-interface/nav', playlist_id, fatal=False)
-
-        key_from_url = lambda x: x[x.rfind('/') + 1:].split('.')[0]
-        img_key = traverse_obj(
-            session_data, ('data', 'wbi_img', 'img_url', {key_from_url})) or '34478ba821254d9d93542680e3b86100'
-        sub_key = traverse_obj(
-            session_data, ('data', 'wbi_img', 'sub_url', {key_from_url})) or '7e16a90d190a4355a78fd00b32a38de6'
-
-        session_key = img_key + sub_key
-
-        signature_values = []
-        for position in (
-            46, 47, 18, 2, 53, 8, 23, 32, 15, 50, 10, 31, 58, 3, 45, 35, 27, 43, 5, 49, 33, 9, 42, 19, 29, 28, 14, 39,
-            12, 38, 41, 13, 37, 48, 7, 16, 24, 55, 40, 61, 26, 17, 0, 1, 60, 51, 30, 4, 22, 25, 54, 21, 56, 59, 6, 63,
-            57, 62, 11, 36, 20, 34, 44, 52
-        ):
-            char_at_position = try_call(lambda: session_key[position])
-            if char_at_position:
-                signature_values.append(char_at_position)
-
-        return ''.join(signature_values)[:32]
-
     def _real_extract(self, url):
         playlist_id, is_video_url = self._match_valid_url(url).group('id', 'video')
         if not is_video_url:
             self.to_screen('A channel URL was given. Only the channel\'s videos will be downloaded. '
-                           'To download audios, add a "/audio" to the URL')
-
-        signature = self._extract_signature(playlist_id)
+                           'To download audios, add a "/upload/audio" to the URL')
 
         def fetch_page(page_idx):
             query = {
                 'keyword': '',
                 'mid': playlist_id,
-                'order': 'pubdate',
+                'order': traverse_obj(parse_qs(url), ('order', 0)) or 'pubdate',
                 'order_avoided': 'true',
                 'platform': 'web',
                 'pn': page_idx + 1,
                 'ps': 30,
                 'tid': 0,
                 'web_location': 1550101,
-                'wts': int(time.time()),
+                'dm_img_list': '[]',
+                'dm_img_str': base64.b64encode(
+                    ''.join(random.choices(string.printable, k=random.randint(16, 64))).encode())[:-2].decode(),
+                'dm_cover_img_str': base64.b64encode(
+                    ''.join(random.choices(string.printable, k=random.randint(32, 128))).encode())[:-2].decode(),
+                'dm_img_inter': '{"ds":[],"wh":[6093,6631,31],"of":[430,760,380]}',
             }
-            query['w_rid'] = hashlib.md5(f'{urllib.parse.urlencode(query)}{signature}'.encode()).hexdigest()
 
             try:
-                response = self._download_json('https://api.bilibili.com/x/space/wbi/arc/search',
-                                               playlist_id, note=f'Downloading page {page_idx}', query=query)
+                response = self._download_json(
+                    'https://api.bilibili.com/x/space/wbi/arc/search', playlist_id,
+                    query=self._sign_wbi(query, playlist_id),
+                    note=f'Downloading space page {page_idx}', headers={'Referer': url})
             except ExtractorError as e:
                 if isinstance(e.cause, HTTPError) and e.cause.status == 412:
                     raise ExtractorError(
-                        'Request is blocked by server (412), please add cookies, wait and try later.', expected=True)
+                        'Request is blocked by server (412), please wait and try later.', expected=True)
                 raise
-            if response['code'] == -401:
+            status_code = response['code']
+            if status_code == -401:
                 raise ExtractorError(
-                    'Request is blocked by server (401), please add cookies, wait and try later.', expected=True)
+                    'Request is blocked by server (401), please wait and try later.', expected=True)
+            elif status_code == -352:
+                raise ExtractorError('Request is rejected by server (352)', expected=True)
+            elif status_code != 0:
+                raise ExtractorError(f'Request failed ({status_code}): {response.get("message") or "Unknown error"}')
             return response['data']
 
         def get_metadata(page_data):
@@ -640,9 +1256,9 @@ class BilibiliSpaceVideoIE(BilibiliSpaceBaseIE):
 
 
 class BilibiliSpaceAudioIE(BilibiliSpaceBaseIE):
-    _VALID_URL = r'https?://space\.bilibili\.com/(?P<id>\d+)/audio'
+    _VALID_URL = r'https?://space\.bilibili\.com/(?P<id>\d+)/(?:upload/)?audio'
     _TESTS = [{
-        'url': 'https://space.bilibili.com/313580179/audio',
+        'url': 'https://space.bilibili.com/313580179/upload/audio',
         'info_dict': {
             'id': '313580179',
         },
@@ -665,32 +1281,68 @@ class BilibiliSpaceAudioIE(BilibiliSpaceBaseIE):
             }
 
         def get_entries(page_data):
-            for entry in page_data.get('data', []):
+            # data is None when the playlist is empty
+            for entry in page_data.get('data') or []:
                 yield self.url_result(f'https://www.bilibili.com/audio/au{entry["id"]}', BilibiliAudioIE, entry['id'])
 
         metadata, paged_list = self._extract_playlist(fetch_page, get_metadata, get_entries)
         return self.playlist_result(paged_list, playlist_id)
 
 
-class BilibiliSpacePlaylistIE(BilibiliSpaceBaseIE):
-    _VALID_URL = r'https?://space.bilibili\.com/(?P<mid>\d+)/channel/collectiondetail\?sid=(?P<sid>\d+)'
+class BilibiliSpaceListBaseIE(BilibiliSpaceBaseIE):
+    def _get_entries(self, page_data, bvid_keys, ending_key='bvid'):
+        for bvid in traverse_obj(page_data, (*variadic(bvid_keys, (str, bytes, dict, set)), ..., ending_key, {str})):
+            yield self.url_result(f'https://www.bilibili.com/video/{bvid}', BiliBiliIE, bvid)
+
+    def _get_uploader(self, uid, playlist_id):
+        webpage = self._download_webpage(f'https://space.bilibili.com/{uid}', playlist_id, fatal=False)
+        return self._search_regex(r'(?s)<title\b[^>]*>([^<]+)的个人空间-', webpage, 'uploader', fatal=False)
+
+    def _extract_playlist(self, fetch_page, get_metadata, get_entries):
+        metadata, page_list = super()._extract_playlist(fetch_page, get_metadata, get_entries)
+        metadata.pop('page_count', None)
+        metadata.pop('page_size', None)
+        return metadata, page_list
+
+
+class BilibiliCollectionListIE(BilibiliSpaceListBaseIE):
+    _VALID_URL = [
+        r'https?://space\.bilibili\.com/(?P<mid>\d+)/channel/collectiondetail/?\?sid=(?P<sid>\d+)',
+        r'https?://space\.bilibili\.com/(?P<mid>\d+)/lists/(?P<sid>\d+)',
+    ]
     _TESTS = [{
-        'url': 'https://space.bilibili.com/2142762/channel/collectiondetail?sid=57445',
+        'url': 'https://space.bilibili.com/2142762/lists/3662502?type=season',
         'info_dict': {
-            'id': '2142762_57445',
-            'title': '《底特律 变人》'
+            'id': '2142762_3662502',
+            'title': '合集·《黑神话悟空》流程解说',
+            'description': '黑神话悟空 相关节目',
+            'uploader': '老戴在此',
+            'uploader_id': '2142762',
+            'timestamp': int,
+            'upload_date': str,
+            'thumbnail': 'https://archive.biliimg.com/bfs/archive/22302e17dc849dd4533606d71bc89df162c3a9bf.jpg',
         },
-        'playlist_mincount': 31,
+        'playlist_mincount': 62,
+    }, {
+        'url': 'https://space.bilibili.com/2142762/lists/3662502',
+        'only_matching': True,
+    }, {
+        'url': 'https://space.bilibili.com/2142762/channel/collectiondetail?sid=57445',
+        'only_matching': True,
     }]
 
+    @classmethod
+    def suitable(cls, url):
+        return False if BilibiliSeriesListIE.suitable(url) else super().suitable(url)
+
     def _real_extract(self, url):
         mid, sid = self._match_valid_url(url).group('mid', 'sid')
         playlist_id = f'{mid}_{sid}'
 
         def fetch_page(page_idx):
             return self._download_json(
-                'https://api.bilibili.com/x/polymer/space/seasons_archives_list',
-                playlist_id, note=f'Downloading page {page_idx}',
+                'https://api.bilibili.com/x/polymer/web-space/seasons_archives_list',
+                playlist_id, note=f'Downloading page {page_idx}', headers={'Referer': url},
                 query={'mid': mid, 'season_id': sid, 'page_num': page_idx + 1, 'page_size': 30})['data']
 
         def get_metadata(page_data):
@@ -699,46 +1351,314 @@ class BilibiliSpacePlaylistIE(BilibiliSpaceBaseIE):
             return {
                 'page_count': math.ceil(entry_count / page_size),
                 'page_size': page_size,
-                'title': traverse_obj(page_data, ('meta', 'name'))
+                'uploader': self._get_uploader(mid, playlist_id),
+                **traverse_obj(page_data, {
+                    'title': ('meta', 'name', {str}),
+                    'description': ('meta', 'description', {str}),
+                    'uploader_id': ('meta', 'mid', {str_or_none}),
+                    'timestamp': ('meta', 'ptime', {int_or_none}),
+                    'thumbnail': ('meta', 'cover', {url_or_none}),
+                }),
             }
 
         def get_entries(page_data):
-            for entry in page_data.get('archives', []):
-                yield self.url_result(f'https://www.bilibili.com/video/{entry["bvid"]}',
-                                      BiliBiliIE, entry['bvid'])
+            return self._get_entries(page_data, 'archives')
 
         metadata, paged_list = self._extract_playlist(fetch_page, get_metadata, get_entries)
-        return self.playlist_result(paged_list, playlist_id, metadata['title'])
+        return self.playlist_result(paged_list, playlist_id, **metadata)
+
+
+class BilibiliSeriesListIE(BilibiliSpaceListBaseIE):
+    _VALID_URL = [
+        r'https?://space\.bilibili\.com/(?P<mid>\d+)/channel/seriesdetail/?\?\bsid=(?P<sid>\d+)',
+        r'https?://space\.bilibili\.com/(?P<mid>\d+)/lists/(?P<sid>\d+)/?\?(?:[^#]+&)?type=series(?:[&#]|$)',
+    ]
+    _TESTS = [{
+        'url': 'https://space.bilibili.com/1958703906/lists/547718?type=series',
+        'info_dict': {
+            'id': '1958703906_547718',
+            'title': '直播回放',
+            'description': '直播回放',
+            'uploader': '靡烟miya',
+            'uploader_id': '1958703906',
+            'timestamp': 1637985853,
+            'upload_date': '20211127',
+            'modified_timestamp': int,
+            'modified_date': str,
+        },
+        'playlist_mincount': 513,
+    }, {
+        'url': 'https://space.bilibili.com/1958703906/channel/seriesdetail?sid=547718&ctype=0',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        mid, sid = self._match_valid_url(url).group('mid', 'sid')
+        playlist_id = f'{mid}_{sid}'
+        playlist_meta = traverse_obj(self._download_json(
+            f'https://api.bilibili.com/x/series/series?series_id={sid}', playlist_id, fatal=False,
+        ), {
+            'title': ('data', 'meta', 'name', {str}),
+            'description': ('data', 'meta', 'description', {str}),
+            'uploader_id': ('data', 'meta', 'mid', {str_or_none}),
+            'timestamp': ('data', 'meta', 'ctime', {int_or_none}),
+            'modified_timestamp': ('data', 'meta', 'mtime', {int_or_none}),
+        })
+
+        def fetch_page(page_idx):
+            return self._download_json(
+                'https://api.bilibili.com/x/series/archives',
+                playlist_id, note=f'Downloading page {page_idx}', headers={'Referer': url},
+                query={'mid': mid, 'series_id': sid, 'pn': page_idx + 1, 'ps': 30})['data']
+
+        def get_metadata(page_data):
+            page_size = page_data['page']['size']
+            entry_count = page_data['page']['total']
+            return {
+                'page_count': math.ceil(entry_count / page_size),
+                'page_size': page_size,
+                'uploader': self._get_uploader(mid, playlist_id),
+                **playlist_meta,
+            }
+
+        def get_entries(page_data):
+            return self._get_entries(page_data, 'archives')
+
+        metadata, paged_list = self._extract_playlist(fetch_page, get_metadata, get_entries)
+        return self.playlist_result(paged_list, playlist_id, **metadata)
+
+
+class BilibiliFavoritesListIE(BilibiliSpaceListBaseIE):
+    _VALID_URL = r'https?://(?:space\.bilibili\.com/\d+/favlist/?\?fid=|(?:www\.)?bilibili\.com/medialist/detail/ml)(?P<id>\d+)'
+    _TESTS = [{
+        'url': 'https://space.bilibili.com/84912/favlist?fid=1103407912&ftype=create',
+        'info_dict': {
+            'id': '1103407912',
+            'title': '【V2】（旧）',
+            'description': '',
+            'uploader': '晓月春日',
+            'uploader_id': '84912',
+            'timestamp': 1604905176,
+            'upload_date': '20201109',
+            'modified_timestamp': int,
+            'modified_date': str,
+            'thumbnail': r're:http://i\d\.hdslb\.com/bfs/archive/14b83c62aa8871b79083df1e9ab4fbc699ad16fe\.jpg',
+            'view_count': int,
+            'like_count': int,
+        },
+        'playlist_mincount': 22,
+    }, {
+        'url': 'https://www.bilibili.com/medialist/detail/ml1103407912',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        fid = self._match_id(url)
+
+        list_info = self._download_json(
+            f'https://api.bilibili.com/x/v3/fav/resource/list?media_id={fid}&pn=1&ps=20',
+            fid, note='Downloading favlist metadata')
+        if list_info['code'] == -403:
+            self.raise_login_required(msg='This is a private favorites list. You need to log in as its owner')
+
+        entries = self._get_entries(self._download_json(
+            f'https://api.bilibili.com/x/v3/fav/resource/ids?media_id={fid}',
+            fid, note='Download favlist entries'), 'data')
+
+        return self.playlist_result(entries, fid, **traverse_obj(list_info, ('data', 'info', {
+            'title': ('title', {str}),
+            'description': ('intro', {str}),
+            'uploader': ('upper', 'name', {str}),
+            'uploader_id': ('upper', 'mid', {str_or_none}),
+            'timestamp': ('ctime', {int_or_none}),
+            'modified_timestamp': ('mtime', {int_or_none}),
+            'thumbnail': ('cover', {url_or_none}),
+            'view_count': ('cnt_info', 'play', {int_or_none}),
+            'like_count': ('cnt_info', 'thumb_up', {int_or_none}),
+        })))
+
+
+class BilibiliWatchlaterIE(BilibiliSpaceListBaseIE):
+    _VALID_URL = r'https?://(?:www\.)?bilibili\.com/watchlater/?(?:[?#]|$)'
+    _TESTS = [{
+        'url': 'https://www.bilibili.com/watchlater/#/list',
+        'info_dict': {
+            'id': r're:\d+',
+            'title': '稍后再看',
+        },
+        'playlist_mincount': 0,
+        'skip': 'login required',
+    }]
+
+    def _real_extract(self, url):
+        list_id = getattr(self._get_cookies(url).get('DedeUserID'), 'value', 'watchlater')
+        watchlater_info = self._download_json(
+            'https://api.bilibili.com/x/v2/history/toview/web?jsonp=jsonp', list_id)
+        if watchlater_info['code'] == -101:
+            self.raise_login_required(msg='You need to login to access your watchlater list')
+        entries = self._get_entries(watchlater_info, ('data', 'list'))
+        return self.playlist_result(entries, id=list_id, title='稍后再看')
+
+
+class BilibiliPlaylistIE(BilibiliSpaceListBaseIE):
+    _VALID_URL = r'https?://(?:www\.)?bilibili\.com/(?:medialist/play|list)/(?P<id>\w+)'
+    _TESTS = [{
+        'url': 'https://www.bilibili.com/list/1958703906?sid=547718',
+        'info_dict': {
+            'id': '5_547718',
+            'title': '直播回放',
+            'uploader': '靡烟miya',
+            'uploader_id': '1958703906',
+            'timestamp': 1637985853,
+            'upload_date': '20211127',
+        },
+        'playlist_mincount': 513,
+    }, {
+        'url': 'https://www.bilibili.com/list/1958703906?sid=547718&oid=687146339&bvid=BV1DU4y1r7tz',
+        'info_dict': {
+            'id': 'BV1DU4y1r7tz',
+            'ext': 'mp4',
+            'title': '【直播回放】8.20晚9:30 3d发布喵 2022年8月20日21点场',
+            'upload_date': '20220820',
+            'description': '',
+            'timestamp': 1661016330,
+            'uploader_id': '1958703906',
+            'uploader': '靡烟miya',
+            'thumbnail': r're:^https?://.*\.(jpg|jpeg|png)$',
+            'duration': 9552.903,
+            'tags': list,
+            'comment_count': int,
+            'view_count': int,
+            'like_count': int,
+            '_old_archive_ids': ['bilibili 687146339_part1'],
+        },
+        'params': {'noplaylist': True},
+    }, {
+        'url': 'https://www.bilibili.com/medialist/play/1958703906?business=space_series&business_id=547718&desc=1',
+        'info_dict': {
+            'id': '5_547718',
+        },
+        'playlist_mincount': 513,
+        'skip': 'redirect url',
+    }, {
+        'url': 'https://www.bilibili.com/list/ml1103407912',
+        'info_dict': {
+            'id': '3_1103407912',
+            'title': '【V2】（旧）',
+            'uploader': '晓月春日',
+            'uploader_id': '84912',
+            'timestamp': 1604905176,
+            'upload_date': '20201109',
+            'thumbnail': r're:http://i\d\.hdslb\.com/bfs/archive/14b83c62aa8871b79083df1e9ab4fbc699ad16fe\.jpg',
+        },
+        'playlist_mincount': 22,
+    }, {
+        'url': 'https://www.bilibili.com/medialist/play/ml1103407912',
+        'info_dict': {
+            'id': '3_1103407912',
+        },
+        'playlist_mincount': 22,
+        'skip': 'redirect url',
+    }, {
+        'url': 'https://www.bilibili.com/list/watchlater',
+        'info_dict': {
+            'id': r're:2_\d+',
+            'title': '稍后再看',
+            'uploader': str,
+            'uploader_id': str,
+        },
+        'playlist_mincount': 0,
+        'skip': 'login required',
+    }, {
+        'url': 'https://www.bilibili.com/medialist/play/watchlater',
+        'info_dict': {'id': 'watchlater'},
+        'playlist_mincount': 0,
+        'skip': 'redirect url & login required',
+    }]
+
+    def _extract_medialist(self, query, list_id):
+        for page_num in itertools.count(1):
+            page_data = self._download_json(
+                'https://api.bilibili.com/x/v2/medialist/resource/list',
+                list_id, query=query, note=f'getting playlist {query["biz_id"]} page {page_num}',
+            )['data']
+            yield from self._get_entries(page_data, 'media_list', ending_key='bv_id')
+            query['oid'] = traverse_obj(page_data, ('media_list', -1, 'id'))
+            if not page_data.get('has_more', False):
+                break
+
+    def _real_extract(self, url):
+        list_id = self._match_id(url)
+
+        bvid = traverse_obj(parse_qs(url), ('bvid', 0))
+        if not self._yes_playlist(list_id, bvid):
+            return self.url_result(f'https://www.bilibili.com/video/{bvid}', BiliBiliIE)
+
+        webpage = self._download_webpage(url, list_id)
+        initial_state = self._search_json(r'window\.__INITIAL_STATE__\s*=', webpage, 'initial state', list_id)
+        error = traverse_obj(initial_state, (('error', 'listError'), all, lambda _, v: v['code'], any))
+        if error and error['code'] != 200:
+            error_code = error.get('trueCode')
+            if error_code == -400 and list_id == 'watchlater':
+                self.raise_login_required('You need to login to access your watchlater playlist')
+            elif error_code == -403:
+                self.raise_login_required('This is a private playlist. You need to login as its owner')
+            elif error_code == 11010:
+                raise ExtractorError('Playlist is no longer available', expected=True)
+            raise ExtractorError(f'Could not access playlist: {error_code} {error.get("message")}')
+
+        query = {
+            'ps': 20,
+            'with_current': False,
+            **traverse_obj(initial_state, {
+                'type': ('playlist', 'type', {int_or_none}),
+                'biz_id': ('playlist', 'id', {int_or_none}),
+                'tid': ('tid', {int_or_none}),
+                'sort_field': ('sortFiled', {int_or_none}),
+                'desc': ('desc', {bool_or_none}, {str_or_none}, {str.lower}),
+            }),
+        }
+        metadata = {
+            'id': f'{query["type"]}_{query["biz_id"]}',
+            **traverse_obj(initial_state, ('mediaListInfo', {
+                'title': ('title', {str}),
+                'uploader': ('upper', 'name', {str}),
+                'uploader_id': ('upper', 'mid', {str_or_none}),
+                'timestamp': ('ctime', {int_or_none}, filter),
+                'thumbnail': ('cover', {url_or_none}),
+            })),
+        }
+        return self.playlist_result(self._extract_medialist(query, list_id), **metadata)
 
 
 class BilibiliCategoryIE(InfoExtractor):
     IE_NAME = 'Bilibili category extractor'
     _MAX_RESULTS = 1000000
-    _VALID_URL = r'https?://www\.bilibili\.com/v/[a-zA-Z]+\/[a-zA-Z]+'
+    _VALID_URL = r'https?://(?:www\.)?bilibili\.com/v/[a-zA-Z]+\/[a-zA-Z]+'
     _TESTS = [{
         'url': 'https://www.bilibili.com/v/kichiku/mad',
         'info_dict': {
             'id': 'kichiku: mad',
-            'title': 'kichiku: mad'
+            'title': 'kichiku: mad',
         },
         'playlist_mincount': 45,
         'params': {
-            'playlistend': 45
-        }
+            'playlistend': 45,
+        },
     }]
 
     def _fetch_page(self, api_url, num_pages, query, page_num):
         parsed_json = self._download_json(
             api_url, query, query={'Search_key': query, 'pn': page_num},
-            note='Extracting results from page %s of %s' % (page_num, num_pages))
+            note=f'Extracting results from page {page_num} of {num_pages}')
 
         video_list = traverse_obj(parsed_json, ('data', 'archives'), expected_type=list)
         if not video_list:
-            raise ExtractorError('Failed to retrieve video list for page %d' % page_num)
+            raise ExtractorError(f'Failed to retrieve video list for page {page_num}')
 
         for video in video_list:
             yield self.url_result(
-                'https://www.bilibili.com/video/%s' % video['bvid'], 'BiliBili', video['bvid'])
+                'https://www.bilibili.com/video/{}'.format(video['bvid']), 'BiliBili', video['bvid'])
 
     def _entries(self, category, subcategory, query):
         # map of categories : subcategories : RIDs
@@ -748,7 +1668,7 @@ class BilibiliCategoryIE(InfoExtractor):
                 'manual_vocaloid': 126,
                 'guide': 22,
                 'theatre': 216,
-                'course': 127
+                'course': 127,
             },
         }
 
@@ -774,7 +1694,7 @@ class BilibiliCategoryIE(InfoExtractor):
 
     def _real_extract(self, url):
         category, subcategory = urllib.parse.urlparse(url).path.split('/')[2:4]
-        query = '%s: %s' % (category, subcategory)
+        query = f'{category}: {subcategory}'
 
         return self.playlist_result(self._entries(category, subcategory, query), query, query)
 
@@ -783,8 +1703,37 @@ class BiliBiliSearchIE(SearchInfoExtractor):
     IE_DESC = 'Bilibili video search'
     _MAX_RESULTS = 100000
     _SEARCH_KEY = 'bilisearch'
+    _TESTS = [{
+        'url': 'bilisearch3:靡烟 出道一年，我怎么还在等你单推的女人睡觉后开播啊',
+        'playlist_count': 3,
+        'info_dict': {
+            'id': '靡烟 出道一年，我怎么还在等你单推的女人睡觉后开播啊',
+            'title': '靡烟 出道一年，我怎么还在等你单推的女人睡觉后开播啊',
+        },
+        'playlist': [{
+            'info_dict': {
+                'id': 'BV1n44y1Q7sc',
+                'ext': 'mp4',
+                'title': '“出道一年，我怎么还在等你单推的女人睡觉后开播啊？”【一分钟了解靡烟miya】',
+                'timestamp': 1669889987,
+                'upload_date': '20221201',
+                'description': 'md5:43343c0973defff527b5a4b403b4abf9',
+                'tags': list,
+                'uploader': '靡烟miya',
+                'duration': 123.156,
+                'uploader_id': '1958703906',
+                'comment_count': int,
+                'view_count': int,
+                'like_count': int,
+                'thumbnail': r're:^https?://.*\.(jpg|jpeg|png)$',
+                '_old_archive_ids': ['bilibili 988222410_part1'],
+            },
+        }],
+    }]
 
     def _search_results(self, query):
+        if not self._get_cookies('https://api.bilibili.com').get('buvid3'):
+            self._set_cookie('.bilibili.com', 'buvid3', f'{uuid.uuid4()}infoc')
         for page_num in itertools.count(1):
             videos = self._download_json(
                 'https://api.bilibili.com/x/web-interface/search/type', query,
@@ -848,7 +1797,7 @@ class BilibiliAudioIE(BilibiliAudioBaseIE):
         formats = [{
             'url': play_data['cdns'][0],
             'filesize': int_or_none(play_data.get('size')),
-            'vcodec': 'none'
+            'vcodec': 'none',
         }]
 
         for a_format in formats:
@@ -866,7 +1815,7 @@ class BilibiliAudioIE(BilibiliAudioBaseIE):
             subtitles = {
                 'origin': [{
                     'url': lyric,
-                }]
+                }],
             }
 
         return {
@@ -934,13 +1883,55 @@ class BiliBiliPlayerIE(InfoExtractor):
     def _real_extract(self, url):
         video_id = self._match_id(url)
         return self.url_result(
-            'http://www.bilibili.tv/video/av%s/' % video_id,
+            f'http://www.bilibili.tv/video/av{video_id}/',
             ie=BiliBiliIE.ie_key(), video_id=video_id)
 
 
+class BiliBiliDynamicIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:t\.bilibili\.com|(?:www\.)?bilibili\.com/opus)/(?P<id>\d+)'
+    _TESTS = [{
+        'url': 'https://t.bilibili.com/998134289197432852',
+        'info_dict': {
+            'id': 'BV1TAmBYVEJr',
+            'ext': 'mp4',
+            'uploader_id': '1192648858',
+            'comment_count': int,
+            '_old_archive_ids': ['bilibili 113457567568273_part1'],
+            'thumbnail': 'http://i2.hdslb.com/bfs/archive/50091efd965d9f13ff6814f7ad374f90ab21e77d.jpg',
+            'duration': 929.238,
+            'upload_date': '20241110',
+            'uploader': '何同学工作室',
+            'like_count': int,
+            'view_count': int,
+            'title': '美国小朋友就玩这个？！何同学工作室11月开箱',
+            'description': '本期产品信息：\n机器狗\n气味模拟器\nCloudboom Strike LS\n无弦吉他\n蓝牙磁带音箱\n神奇画板',
+            'timestamp': 1731232800,
+            'tags': list,
+            'chapters': list,
+        },
+    }]
+
+    def _real_extract(self, url):
+        post_id = self._match_id(url)
+        # Without the newer chrome UA, the API will return an error (-352)
+        post_data = self._download_json(
+            'https://api.bilibili.com/x/polymer/web-dynamic/v1/detail', post_id,
+            query={'id': post_id}, headers={
+                'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
+            })
+        video_url = traverse_obj(post_data, (
+            'data', 'item', (None, 'orig'), 'modules', 'module_dynamic',
+            (('major', ('archive', 'pgc')), ('additional', ('reserve', 'common'))),
+            'jump_url', {url_or_none}, any, {self._proto_relative_url}))
+        if not video_url or (self.suitable(video_url) and post_id == self._match_id(video_url)):
+            raise ExtractorError('No valid video URL found', expected=True)
+        return self.url_result(video_url)
+
+
 class BiliIntlBaseIE(InfoExtractor):
     _API_URL = 'https://api.bilibili.tv/intl/gateway'
     _NETRC_MACHINE = 'biliintl'
+    _HEADERS = {'Referer': 'https://www.bilibili.tv/'}
 
     def _call_api(self, endpoint, *args, **kwargs):
         json = self._download_json(self._API_URL + endpoint, *args, **kwargs)
@@ -961,11 +1952,10 @@ class BiliIntlBaseIE(InfoExtractor):
         return json.get('data')
 
     def json2srt(self, json):
-        data = '\n\n'.join(
+        return '\n\n'.join(
             f'{i + 1}\n{srt_subtitles_timecode(line["from"])} --> {srt_subtitles_timecode(line["to"])}\n{line["content"]}'
             for i, line in enumerate(traverse_obj(json, (
                 'body', lambda _, l: l['content'] and l['from'] and l['to']))))
-        return data
 
     def _get_subtitles(self, *, ep_id=None, aid=None):
         sub_json = self._call_api(
@@ -978,19 +1968,34 @@ class BiliIntlBaseIE(InfoExtractor):
                 'aid': aid,
             })) or {}
         subtitles = {}
-        for sub in sub_json.get('subtitles') or []:
-            sub_url = sub.get('url')
-            if not sub_url:
-                continue
-            sub_data = self._download_json(
-                sub_url, ep_id or aid, errnote='Unable to download subtitles', fatal=False,
-                note='Downloading subtitles%s' % f' for {sub["lang"]}' if sub.get('lang') else '')
-            if not sub_data:
-                continue
-            subtitles.setdefault(sub.get('lang_key', 'en'), []).append({
-                'ext': 'srt',
-                'data': self.json2srt(sub_data)
-            })
+        fetched_urls = set()
+        for sub in traverse_obj(sub_json, (('subtitles', 'video_subtitle'), ..., {dict})):
+            for url in traverse_obj(sub, ((None, 'ass', 'srt'), 'url', {url_or_none})):
+                if url in fetched_urls:
+                    continue
+                fetched_urls.add(url)
+                sub_ext = determine_ext(url)
+                sub_lang = sub.get('lang_key') or 'en'
+
+                if sub_ext == 'ass':
+                    subtitles.setdefault(sub_lang, []).append({
+                        'ext': 'ass',
+                        'url': url,
+                    })
+                elif sub_ext == 'json':
+                    sub_data = self._download_json(
+                        url, ep_id or aid, fatal=False,
+                        note=f'Downloading subtitles{format_field(sub, "lang", " for %s")} ({sub_lang})',
+                        errnote='Unable to download subtitles')
+
+                    if sub_data:
+                        subtitles.setdefault(sub_lang, []).append({
+                            'ext': 'srt',
+                            'data': self.json2srt(sub_data),
+                        })
+                else:
+                    self.report_warning('Unexpected subtitle extension', ep_id or aid)
+
         return subtitles
 
     def _get_formats(self, *, ep_id=None, aid=None):
@@ -1036,7 +2041,9 @@ class BiliIntlBaseIE(InfoExtractor):
     def _parse_video_metadata(self, video_data):
         return {
             'title': video_data.get('title_display') or video_data.get('title'),
+            'description': video_data.get('desc'),
             'thumbnail': video_data.get('cover'),
+            'timestamp': unified_timestamp(video_data.get('formatted_pub_date')),
             'episode_number': int_or_none(self._search_regex(
                 r'^E(\d+)(?:$| - )', video_data.get('title_display') or '', 'episode number', default=None)),
         }
@@ -1050,14 +2057,15 @@ class BiliIntlBaseIE(InfoExtractor):
             note='Downloading login key', errnote='Unable to download login key')['data']
 
         public_key = Cryptodome.RSA.importKey(key_data['key'])
-        password_hash = Cryptodome.PKCS1_v1_5.new(public_key).encrypt((key_data['hash'] + password).encode('utf-8'))
+        password_hash = Cryptodome.PKCS1_v1_5.new(public_key).encrypt((key_data['hash'] + password).encode())
         login_post = self._download_json(
-            'https://passport.bilibili.tv/x/intl/passport-login/web/login/password?lang=en-US', None, data=urlencode_postdata({
+            'https://passport.bilibili.tv/x/intl/passport-login/web/login/password?lang=en-US', None,
+            data=urlencode_postdata({
                 'username': username,
                 'password': base64.b64encode(password_hash).decode('ascii'),
                 'keep_me': 'true',
                 's_locale': 'en_US',
-                'isTrusted': 'true'
+                'isTrusted': 'true',
             }), note='Logging in', errnote='Unable to log in')
         if login_post.get('code'):
             if login_post.get('message'):
@@ -1084,17 +2092,17 @@ class BiliIntlIE(BiliIntlBaseIE):
             'chapters': [{
                 'start_time': 0,
                 'end_time': 76.242,
-                'title': '<Untitled Chapter 1>'
+                'title': '<Untitled Chapter 1>',
             }, {
                 'start_time': 76.242,
                 'end_time': 161.161,
-                'title': 'Intro'
+                'title': 'Intro',
             }, {
                 'start_time': 1325.742,
                 'end_time': 1403.903,
-                'title': 'Outro'
+                'title': 'Outro',
             }],
-        }
+        },
     }, {
         # Non-Bstation page
         'url': 'https://www.bilibili.tv/en/play/1033760/11005006',
@@ -1111,17 +2119,17 @@ class BiliIntlIE(BiliIntlBaseIE):
             'chapters': [{
                 'start_time': 0,
                 'end_time': 88.0,
-                'title': '<Untitled Chapter 1>'
+                'title': '<Untitled Chapter 1>',
             }, {
                 'start_time': 88.0,
                 'end_time': 156.0,
-                'title': 'Intro'
+                'title': 'Intro',
             }, {
                 'start_time': 1173.0,
                 'end_time': 1259.535,
-                'title': 'Outro'
+                'title': 'Outro',
             }],
-        }
+        },
     }, {
         # Subtitle with empty content
         'url': 'https://www.bilibili.tv/en/play/1005144/10131790',
@@ -1132,18 +2140,7 @@ class BiliIntlIE(BiliIntlBaseIE):
             'thumbnail': r're:^https://pic\.bstarstatic\.com/ogv/.+\.png$',
             'episode_number': 140,
         },
-        'skip': 'According to the copyright owner\'s request, you may only watch the video after you log in.'
-    }, {
-        'url': 'https://www.bilibili.tv/en/video/2041863208',
-        'info_dict': {
-            'id': '2041863208',
-            'ext': 'mp4',
-            'timestamp': 1670874843,
-            'description': 'Scheduled for April 2023.\nStudio: ufotable',
-            'thumbnail': r're:https?://pic[-\.]bstarstatic.+/ugc/.+\.jpg$',
-            'upload_date': '20221212',
-            'title': 'Kimetsu no Yaiba Season 3 Official Trailer - Bstation',
-        },
+        'skip': 'According to the copyright owner\'s request, you may only watch the video after you log in.',
     }, {
         # episode comment extraction
         'url': 'https://www.bilibili.tv/en/play/34580/340317',
@@ -1161,20 +2158,20 @@ class BiliIntlIE(BiliIntlBaseIE):
             'chapters': [{
                 'start_time': 0,
                 'end_time': 61.0,
-                'title': '<Untitled Chapter 1>'
+                'title': '<Untitled Chapter 1>',
             }, {
                 'start_time': 61.0,
                 'end_time': 134.0,
-                'title': 'Intro'
+                'title': 'Intro',
             }, {
                 'start_time': 1290.0,
                 'end_time': 1379.0,
-                'title': 'Outro'
+                'title': 'Outro',
             }],
         },
         'params': {
-            'getcomments': True
-        }
+            'getcomments': True,
+        },
     }, {
         # user generated content comment extraction
         'url': 'https://www.bilibili.tv/en/video/2045730385',
@@ -1184,13 +2181,13 @@ class BiliIntlIE(BiliIntlBaseIE):
             'description': 'md5:693b6f3967fb4e7e7764ea817857c33a',
             'timestamp': 1667891924,
             'upload_date': '20221108',
-            'title': 'That Time I Got Reincarnated as a Slime: Scarlet Bond - Official Trailer 3| AnimeStan - Bstation',
+            'title': 'That Time I Got Reincarnated as a Slime: Scarlet Bond - Official Trailer 3| AnimeStan',
             'comment_count': int,
-            'thumbnail': 'https://pic.bstarstatic.com/ugc/f6c363659efd2eabe5683fbb906b1582.jpg',
+            'thumbnail': r're:https://pic\.bstarstatic\.(?:com|net)/ugc/f6c363659efd2eabe5683fbb906b1582\.jpg',
         },
         'params': {
-            'getcomments': True
-        }
+            'getcomments': True,
+        },
     }, {
         # episode id without intro and outro
         'url': 'https://www.bilibili.tv/en/play/1048837/11246489',
@@ -1222,6 +2219,7 @@ class BiliIntlIE(BiliIntlBaseIE):
         'only_matching': True,
     }]
 
+    @staticmethod
     def _make_url(video_id, series_id=None):
         if series_id:
             return f'https://www.bilibili.tv/en/play/{series_id}/{video_id}'
@@ -1244,15 +2242,17 @@ class BiliIntlIE(BiliIntlBaseIE):
             # Non-Bstation layout, read through episode list
             season_json = self._call_api(f'/web/v2/ogv/play/episodes?season_id={season_id}&platform=web', video_id)
             video_data = traverse_obj(season_json, (
-                'sections', ..., 'episodes', lambda _, v: str(v['episode_id']) == video_id
+                'sections', ..., 'episodes', lambda _, v: str(v['episode_id']) == video_id,
             ), expected_type=dict, get_all=False)
 
         # XXX: webpage metadata may not accurate, it just used to not crash when video_data not found
         return merge_dicts(
-            self._parse_video_metadata(video_data), self._search_json_ld(webpage, video_id, fatal=False), {
-                'title': self._html_search_meta('og:title', webpage),
-                'description': self._html_search_meta('og:description', webpage)
-            })
+            self._parse_video_metadata(video_data), {
+                'title': get_element_by_class(
+                    'bstar-meta__title', webpage) or self._html_search_meta('og:title', webpage),
+                'description': get_element_by_class(
+                    'bstar-meta__desc', webpage) or self._html_search_meta('og:description', webpage),
+            }, self._search_json_ld(webpage, video_id, default={}))
 
     def _get_comments_reply(self, root_id, next_id=0, display_id=None):
         comment_api_raw_data = self._download_json(
@@ -1274,7 +2274,7 @@ class BiliIntlIE(BiliIntlBaseIE):
                 'id': replies.get('rpid'),
                 'like_count': int_or_none(replies.get('like_count')),
                 'parent': replies.get('parent'),
-                'timestamp': unified_timestamp(replies.get('ctime_text'))
+                'timestamp': unified_timestamp(replies.get('ctime_text')),
             }
 
         if not traverse_obj(comment_api_raw_data, ('data', 'cursor', 'is_end')):
@@ -1327,11 +2327,11 @@ class BiliIntlIE(BiliIntlBaseIE):
                 chapters = [{
                     'start_time': float_or_none(traverse_obj(intro_ending_json, ('skip', 'opening_start_time')), 1000),
                     'end_time': float_or_none(traverse_obj(intro_ending_json, ('skip', 'opening_end_time')), 1000),
-                    'title': 'Intro'
+                    'title': 'Intro',
                 }, {
                     'start_time': float_or_none(traverse_obj(intro_ending_json, ('skip', 'ending_start_time')), 1000),
                     'end_time': float_or_none(traverse_obj(intro_ending_json, ('skip', 'ending_end_time')), 1000),
-                    'title': 'Outro'
+                    'title': 'Outro',
                 }]
 
         return {
@@ -1340,7 +2340,8 @@ class BiliIntlIE(BiliIntlBaseIE):
             'formats': self._get_formats(ep_id=ep_id, aid=aid),
             'subtitles': self.extract_subtitles(ep_id=ep_id, aid=aid),
             'chapters': chapters,
-            '__post_extractor': self.extract_comments(video_id, ep_id)
+            '__post_extractor': self.extract_comments(video_id, ep_id),
+            'http_headers': self._HEADERS,
         }
 
 
@@ -1386,12 +2387,13 @@ class BiliIntlSeriesIE(BiliIntlBaseIE):
             episode_id = str(episode['episode_id'])
             yield self.url_result(smuggle_url(
                 BiliIntlIE._make_url(episode_id, series_id),
-                self._parse_video_metadata(episode)
+                self._parse_video_metadata(episode),
             ), BiliIntlIE, episode_id)
 
     def _real_extract(self, url):
         series_id = self._match_id(url)
-        series_info = self._call_api(f'/web/v2/ogv/play/season_info?season_id={series_id}&platform=web', series_id).get('season') or {}
+        series_info = self._call_api(
+            f'/web/v2/ogv/play/season_info?season_id={series_id}&platform=web', series_id).get('season') or {}
         return self.playlist_result(
             self._entries(series_id), series_id, series_info.get('title'), series_info.get('description'),
             categories=traverse_obj(series_info, ('styles', ..., 'title'), expected_type=str_or_none),
@@ -1399,25 +2401,25 @@ class BiliIntlSeriesIE(BiliIntlBaseIE):
 
 
 class BiliLiveIE(InfoExtractor):
-    _VALID_URL = r'https?://live.bilibili.com/(?:blanc/)?(?P<id>\d+)'
+    _VALID_URL = r'https?://live\.bilibili\.com/(?:blanc/)?(?P<id>\d+)'
 
     _TESTS = [{
         'url': 'https://live.bilibili.com/196',
         'info_dict': {
             'id': '33989',
-            'description': "周六杂谈回，其他时候随机游戏。 | \n录播：@下播型泛式录播组。 | \n直播通知群（全员禁言）：666906670，902092584，59971⑧481 （功能一样，别多加）",
+            'description': '周六杂谈回，其他时候随机游戏。 | \n录播：@下播型泛式录播组。 | \n直播通知群（全员禁言）：666906670，902092584，59971⑧481 （功能一样，别多加）',
             'ext': 'flv',
-            'title': "太空狼人杀联动，不被爆杀就算赢",
-            'thumbnail': "https://i0.hdslb.com/bfs/live/new_room_cover/e607bc1529057ef4b332e1026e62cf46984c314d.jpg",
+            'title': '太空狼人杀联动，不被爆杀就算赢',
+            'thumbnail': 'https://i0.hdslb.com/bfs/live/new_room_cover/e607bc1529057ef4b332e1026e62cf46984c314d.jpg',
             'timestamp': 1650802769,
         },
-        'skip': 'not live'
+        'skip': 'not live',
     }, {
         'url': 'https://live.bilibili.com/196?broadcast_type=0&is_room_feed=1?spm_id_from=333.999.space_home.strengthen_live_card.click',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://live.bilibili.com/blanc/196',
-        'only_matching': True
+        'only_matching': True,
     }]
 
     _FORMATS = {
@@ -1458,7 +2460,7 @@ class BiliLiveIE(InfoExtractor):
             raise ExtractorError('Streamer is not live', expected=True)
 
         formats = []
-        for qn in self._FORMATS.keys():
+        for qn in self._FORMATS:
             stream_data = self._call_api('xlive/web-room/v2/index/getRoomPlayInfo', room_id, {
                 'room_id': room_id,
                 'qn': qn,
diff --git a/plugins/youtube_download/yt_dlp/extractor/biqle.py b/plugins/youtube_download/yt_dlp/extractor/biqle.py
deleted file mode 100644
index 0277535..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/biqle.py
+++ /dev/null
@@ -1,110 +0,0 @@
-from .common import InfoExtractor
-from .vk import VKIE
-from ..compat import compat_b64decode
-from ..utils import (
-    int_or_none,
-    js_to_json,
-    traverse_obj,
-    unified_timestamp,
-)
-
-
-class BIQLEIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?biqle\.(?:com|org|ru)/watch/(?P<id>-?\d+_\d+)'
-    _TESTS = [{
-        'url': 'https://biqle.ru/watch/-2000421746_85421746',
-        'md5': 'ae6ef4f04d19ac84e4658046d02c151c',
-        'info_dict': {
-            'id': '-2000421746_85421746',
-            'ext': 'mp4',
-            'title': 'Forsaken By Hope Studio Clip',
-            'description': 'Forsaken By Hope Studio Clip — Смотреть онлайн',
-            'upload_date': '19700101',
-            'thumbnail': r're:https://[^/]+/impf/7vN3ACwSTgChP96OdOfzFjUCzFR6ZglDQgWsIw/KPaACiVJJxM\.jpg\?size=800x450&quality=96&keep_aspect_ratio=1&background=000000&sign=b48ea459c4d33dbcba5e26d63574b1cb&type=video_thumb',
-            'timestamp': 0,
-        },
-    }, {
-        'url': 'http://biqle.org/watch/-44781847_168547604',
-        'md5': '7f24e72af1db0edf7c1aaba513174f97',
-        'info_dict': {
-            'id': '-44781847_168547604',
-            'ext': 'mp4',
-            'title': 'Ребенок в шоке от автоматической мойки',
-            'description': 'Ребенок в шоке от автоматической мойки — Смотреть онлайн',
-            'timestamp': 1396633454,
-            'upload_date': '20140404',
-            'thumbnail': r're:https://[^/]+/c535507/u190034692/video/l_b84df002\.jpg',
-        },
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-
-        title = self._html_search_meta('name', webpage, 'Title', fatal=False)
-        timestamp = unified_timestamp(self._html_search_meta('uploadDate', webpage, 'Upload Date', default=None))
-        description = self._html_search_meta('description', webpage, 'Description', default=None)
-
-        global_embed_url = self._search_regex(
-            r'<script[^<]+?window.globEmbedUrl\s*=\s*\'((?:https?:)?//(?:daxab\.com|dxb\.to|[^/]+/player)/[^\']+)\'',
-            webpage, 'global Embed url')
-        hash = self._search_regex(
-            r'<script id="data-embed-video[^<]+?hash: "([^"]+)"[^<]*</script>', webpage, 'Hash')
-
-        embed_url = global_embed_url + hash
-
-        if VKIE.suitable(embed_url):
-            return self.url_result(embed_url, VKIE.ie_key(), video_id)
-
-        embed_page = self._download_webpage(
-            embed_url, video_id, 'Downloading embed webpage', headers={'Referer': url})
-
-        glob_params = self._parse_json(self._search_regex(
-            r'<script id="globParams">[^<]*window.globParams = ([^;]+);[^<]+</script>',
-            embed_page, 'Global Parameters'), video_id, transform_source=js_to_json)
-        host_name = compat_b64decode(glob_params['server'][::-1]).decode()
-
-        item = self._download_json(
-            f'https://{host_name}/method/video.get/{video_id}', video_id,
-            headers={'Referer': url}, query={
-                'token': glob_params['video']['access_token'],
-                'videos': video_id,
-                'ckey': glob_params['c_key'],
-                'credentials': glob_params['video']['credentials'],
-            })['response']['items'][0]
-
-        formats = []
-        for f_id, f_url in item.get('files', {}).items():
-            if f_id == 'external':
-                return self.url_result(f_url)
-            ext, height = f_id.split('_')
-            height_extra_key = traverse_obj(glob_params, ('video', 'partial', 'quality', height))
-            if height_extra_key:
-                formats.append({
-                    'format_id': f'{height}p',
-                    'url': f'https://{host_name}/{f_url[8:]}&videos={video_id}&extra_key={height_extra_key}',
-                    'height': int_or_none(height),
-                    'ext': ext,
-                })
-
-        thumbnails = []
-        for k, v in item.items():
-            if k.startswith('photo_') and v:
-                width = k.replace('photo_', '')
-                thumbnails.append({
-                    'id': width,
-                    'url': v,
-                    'width': int_or_none(width),
-                })
-
-        return {
-            'id': video_id,
-            'title': title,
-            'formats': formats,
-            'comment_count': int_or_none(item.get('comments')),
-            'description': description,
-            'duration': int_or_none(item.get('duration')),
-            'thumbnails': thumbnails,
-            'timestamp': timestamp,
-            'view_count': int_or_none(item.get('views')),
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/bitchute.py b/plugins/youtube_download/yt_dlp/extractor/bitchute.py
index 0805b8b..c83222e 100644
--- a/plugins/youtube_download/yt_dlp/extractor/bitchute.py
+++ b/plugins/youtube_download/yt_dlp/extractor/bitchute.py
@@ -7,8 +7,10 @@ from ..utils import (
     ExtractorError,
     OnDemandPagedList,
     clean_html,
+    extract_attributes,
     get_element_by_class,
     get_element_by_id,
+    get_element_html_by_class,
     get_elements_html_by_class,
     int_or_none,
     orderedSet,
@@ -17,11 +19,12 @@ from ..utils import (
     traverse_obj,
     unified_strdate,
     urlencode_postdata,
+    urljoin,
 )
 
 
 class BitChuteIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?bitchute\.com/(?:video|embed|torrent/[^/]+)/(?P<id>[^/?#&]+)'
+    _VALID_URL = r'https?://(?:(?:www|old)\.)?bitchute\.com/(?:video|embed|torrent/[^/]+)/(?P<id>[^/?#&]+)'
     _EMBED_REGEX = [rf'<(?:script|iframe)[^>]+\bsrc=(["\'])(?P<url>{_VALID_URL})']
     _TESTS = [{
         'url': 'https://www.bitchute.com/video/UGlrF9o9b-Q/',
@@ -34,6 +37,25 @@ class BitChuteIE(InfoExtractor):
             'thumbnail': r're:^https?://.*\.jpg$',
             'uploader': 'BitChute',
             'upload_date': '20170103',
+            'uploader_url': 'https://www.bitchute.com/profile/I5NgtHZn9vPj/',
+            'channel': 'BitChute',
+            'channel_url': 'https://www.bitchute.com/channel/bitchute/',
+        },
+    }, {
+        # test case: video with different channel and uploader
+        'url': 'https://www.bitchute.com/video/Yti_j9A-UZ4/',
+        'md5': 'f10e6a8e787766235946d0868703f1d0',
+        'info_dict': {
+            'id': 'Yti_j9A-UZ4',
+            'ext': 'mp4',
+            'title': 'Israel at War | Full Measure',
+            'description': 'md5:38cf7bc6f42da1a877835539111c69ef',
+            'thumbnail': r're:^https?://.*\.jpg$',
+            'uploader': 'sharylattkisson',
+            'upload_date': '20231106',
+            'uploader_url': 'https://www.bitchute.com/profile/9K0kUWA9zmd9/',
+            'channel': 'Full Measure with Sharyl Attkisson',
+            'channel_url': 'https://www.bitchute.com/channel/sharylattkisson/',
         },
     }, {
         # video not downloadable in browser, but we can recover it
@@ -48,6 +70,9 @@ class BitChuteIE(InfoExtractor):
             'thumbnail': r're:^https?://.*\.jpg$',
             'uploader': 'BitChute',
             'upload_date': '20181113',
+            'uploader_url': 'https://www.bitchute.com/profile/I5NgtHZn9vPj/',
+            'channel': 'BitChute',
+            'channel_url': 'https://www.bitchute.com/channel/bitchute/',
         },
         'params': {'check_formats': None},
     }, {
@@ -66,6 +91,9 @@ class BitChuteIE(InfoExtractor):
     }, {
         'url': 'https://www.bitchute.com/torrent/Zee5BE49045h/szoMrox2JEI.webtorrent',
         'only_matching': True,
+    }, {
+        'url': 'https://old.bitchute.com/video/UGlrF9o9b-Q/',
+        'only_matching': True,
     }]
     _GEO_BYPASS = False
 
@@ -90,7 +118,7 @@ class BitChuteIE(InfoExtractor):
                 continue
             return {
                 'url': url,
-                'filesize': int_or_none(response.headers.get('Content-Length'))
+                'filesize': int_or_none(response.headers.get('Content-Length')),
             }
 
     def _raise_if_restricted(self, webpage):
@@ -99,10 +127,15 @@ class BitChuteIE(InfoExtractor):
             reason = clean_html(get_element_by_id('page-detail', webpage)) or page_title
             self.raise_geo_restricted(reason)
 
+    @staticmethod
+    def _make_url(html):
+        path = extract_attributes(get_element_html_by_class('spa', html) or '').get('href')
+        return urljoin('https://www.bitchute.com', path)
+
     def _real_extract(self, url):
         video_id = self._match_id(url)
         webpage = self._download_webpage(
-            f'https://www.bitchute.com/video/{video_id}', video_id, headers=self._HEADERS)
+            f'https://old.bitchute.com/video/{video_id}', video_id, headers=self._HEADERS)
 
         self._raise_if_restricted(webpage)
         publish_date = clean_html(get_element_by_class('video-publish-date', webpage))
@@ -121,12 +154,19 @@ class BitChuteIE(InfoExtractor):
                 'Video is unavailable. Please make sure this video is playable in the browser '
                 'before reporting this issue.', expected=True, video_id=video_id)
 
+        details = get_element_by_class('details', webpage) or ''
+        uploader_html = get_element_html_by_class('creator', details) or ''
+        channel_html = get_element_html_by_class('name', details) or ''
+
         return {
             'id': video_id,
             'title': self._html_extract_title(webpage) or self._og_search_title(webpage),
             'description': self._og_search_description(webpage, default=None),
             'thumbnail': self._og_search_thumbnail(webpage),
-            'uploader': clean_html(get_element_by_class('owner', webpage)),
+            'uploader': clean_html(uploader_html),
+            'uploader_url': self._make_url(uploader_html),
+            'channel': clean_html(channel_html),
+            'channel_url': self._make_url(channel_html),
             'upload_date': unified_strdate(self._search_regex(
                 r'at \d+:\d+ UTC on (.+?)\.', publish_date, 'upload date', fatal=False)),
             'formats': formats,
@@ -134,13 +174,13 @@ class BitChuteIE(InfoExtractor):
 
 
 class BitChuteChannelIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?bitchute\.com/(?P<type>channel|playlist)/(?P<id>[^/?#&]+)'
+    _VALID_URL = r'https?://(?:(?:www|old)\.)?bitchute\.com/(?P<type>channel|playlist)/(?P<id>[^/?#&]+)'
     _TESTS = [{
         'url': 'https://www.bitchute.com/channel/bitchute/',
         'info_dict': {
             'id': 'bitchute',
             'title': 'BitChute',
-            'description': 'md5:5329fb3866125afa9446835594a9b138',
+            'description': 'md5:2134c37d64fc3a4846787c402956adac',
         },
         'playlist': [
             {
@@ -148,16 +188,18 @@ class BitChuteChannelIE(InfoExtractor):
                 'info_dict': {
                     'id': 'UGlrF9o9b-Q',
                     'ext': 'mp4',
-                    'filesize': None,
                     'title': 'This is the first video on #BitChute !',
                     'description': 'md5:a0337e7b1fe39e32336974af8173a034',
                     'thumbnail': r're:^https?://.*\.jpg$',
                     'uploader': 'BitChute',
                     'upload_date': '20170103',
+                    'uploader_url': 'https://www.bitchute.com/profile/I5NgtHZn9vPj/',
+                    'channel': 'BitChute',
+                    'channel_url': 'https://www.bitchute.com/channel/bitchute/',
                     'duration': 16,
                     'view_count': int,
                 },
-            }
+            },
         ],
         'params': {
             'skip_download': True,
@@ -169,8 +211,11 @@ class BitChuteChannelIE(InfoExtractor):
         'info_dict': {
             'id': 'wV9Imujxasw9',
             'title': 'Bruce MacDonald and "The Light of Darkness"',
-            'description': 'md5:04913227d2714af1d36d804aa2ab6b1e',
-        }
+            'description': 'md5:747724ef404eebdfc04277714f81863e',
+        },
+    }, {
+        'url': 'https://old.bitchute.com/playlist/wV9Imujxasw9/',
+        'only_matching': True,
     }]
 
     _TOKEN = 'zyG6tQcGPE5swyAEFLqKUwMuMMuF6IO2DZ6ZDQjGfsL0e4dcTLwqkTTul05Jdve7'
@@ -185,13 +230,13 @@ class BitChuteChannelIE(InfoExtractor):
             'container': 'playlist-video',
             'title': 'title',
             'description': 'description',
-        }
+        },
 
     }
 
     @staticmethod
     def _make_url(playlist_id, playlist_type):
-        return f'https://www.bitchute.com/{playlist_type}/{playlist_id}/'
+        return f'https://old.bitchute.com/{playlist_type}/{playlist_id}/'
 
     def _fetch_page(self, playlist_id, playlist_type, page_num):
         playlist_url = self._make_url(playlist_id, playlist_type)
diff --git a/plugins/youtube_download/yt_dlp/extractor/bitwave.py b/plugins/youtube_download/yt_dlp/extractor/bitwave.py
deleted file mode 100644
index a82cd26..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/bitwave.py
+++ /dev/null
@@ -1,58 +0,0 @@
-from .common import InfoExtractor
-
-
-class BitwaveReplayIE(InfoExtractor):
-    IE_NAME = 'bitwave:replay'
-    _VALID_URL = r'https?://(?:www\.)?bitwave\.tv/(?P<user>\w+)/replay/(?P<id>\w+)/?$'
-    _TEST = {
-        'url': 'https://bitwave.tv/RhythmicCarnage/replay/z4P6eq5L7WDrM85UCrVr',
-        'only_matching': True
-    }
-
-    def _real_extract(self, url):
-        replay_id = self._match_id(url)
-        replay = self._download_json(
-            'https://api.bitwave.tv/v1/replays/' + replay_id,
-            replay_id
-        )
-
-        return {
-            'id': replay_id,
-            'title': replay['data']['title'],
-            'uploader': replay['data']['name'],
-            'uploader_id': replay['data']['name'],
-            'url': replay['data']['url'],
-            'thumbnails': [
-                {'url': x} for x in replay['data']['thumbnails']
-            ],
-        }
-
-
-class BitwaveStreamIE(InfoExtractor):
-    IE_NAME = 'bitwave:stream'
-    _VALID_URL = r'https?://(?:www\.)?bitwave\.tv/(?P<id>\w+)/?$'
-    _TEST = {
-        'url': 'https://bitwave.tv/doomtube',
-        'only_matching': True
-    }
-
-    def _real_extract(self, url):
-        username = self._match_id(url)
-        channel = self._download_json(
-            'https://api.bitwave.tv/v1/channels/' + username,
-            username)
-
-        formats = self._extract_m3u8_formats(
-            channel['data']['url'], username,
-            'mp4')
-
-        return {
-            'id': username,
-            'title': channel['data']['title'],
-            'uploader': username,
-            'uploader_id': username,
-            'formats': formats,
-            'thumbnail': channel['data']['thumbnail'],
-            'is_live': True,
-            'view_count': channel['data']['viewCount']
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/blackboardcollaborate.py b/plugins/youtube_download/yt_dlp/extractor/blackboardcollaborate.py
index 8f41c89..5358909 100644
--- a/plugins/youtube_download/yt_dlp/extractor/blackboardcollaborate.py
+++ b/plugins/youtube_download/yt_dlp/extractor/blackboardcollaborate.py
@@ -47,7 +47,7 @@ class BlackboardCollaborateIE(InfoExtractor):
         region = mobj.group('region')
         video_id = mobj.group('id')
         info = self._download_json(
-            'https://{}.bbcollab.com/collab/api/csa/recordings/{}/data'.format(region, video_id), video_id)
+            f'https://{region}.bbcollab.com/collab/api/csa/recordings/{video_id}/data', video_id)
         duration = info.get('duration')
         title = info['name']
         upload_date = info.get('created')
diff --git a/plugins/youtube_download/yt_dlp/extractor/bleacherreport.py b/plugins/youtube_download/yt_dlp/extractor/bleacherreport.py
index 8d8fabe..71b237d 100644
--- a/plugins/youtube_download/yt_dlp/extractor/bleacherreport.py
+++ b/plugins/youtube_download/yt_dlp/extractor/bleacherreport.py
@@ -1,13 +1,15 @@
-from .common import InfoExtractor
 from .amp import AMPIE
+from .common import InfoExtractor
 from ..utils import (
     ExtractorError,
     int_or_none,
     parse_iso8601,
+    str_or_none,
 )
 
 
 class BleacherReportIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?bleacherreport\.com/articles/(?P<id>\d+)'
     _TESTS = [{
         'url': 'http://bleacherreport.com/articles/2496438-fsu-stat-projections-is-jalen-ramsey-best-defensive-player-in-college-football',
@@ -16,13 +18,13 @@ class BleacherReportIE(InfoExtractor):
             'id': '2496438',
             'ext': 'mp4',
             'title': 'FSU Stat Projections: Is Jalen Ramsey Best Defensive Player in College Football?',
-            'uploader_id': 3992341,
+            'uploader_id': '3992341',
             'description': 'CFB, ACC, Florida State',
             'timestamp': 1434380212,
             'upload_date': '20150615',
             'uploader': 'Team Stream Now ',
         },
-        'add_ie': ['Ooyala'],
+        'skip': 'Video removed',
     }, {
         'url': 'http://bleacherreport.com/articles/2586817-aussie-golfers-get-fright-of-their-lives-after-being-chased-by-angry-kangaroo',
         'md5': '6a5cd403418c7b01719248ca97fb0692',
@@ -33,7 +35,7 @@ class BleacherReportIE(InfoExtractor):
             'timestamp': 1446839961,
             'uploader': 'Sean Fay',
             'description': 'md5:b1601e2314c4d8eec23b6eafe086a757',
-            'uploader_id': 6466954,
+            'uploader_id': '6466954',
             'upload_date': '20151011',
         },
         'add_ie': ['Youtube'],
@@ -42,7 +44,7 @@ class BleacherReportIE(InfoExtractor):
     def _real_extract(self, url):
         article_id = self._match_id(url)
 
-        article_data = self._download_json('http://api.bleacherreport.com/api/v1/articles/%s' % article_id, article_id)['article']
+        article_data = self._download_json(f'http://api.bleacherreport.com/api/v1/articles/{article_id}', article_id)['article']
 
         thumbnails = []
         primary_photo = article_data.get('primaryPhoto')
@@ -58,7 +60,7 @@ class BleacherReportIE(InfoExtractor):
             'id': article_id,
             'title': article_data['title'],
             'uploader': article_data.get('author', {}).get('name'),
-            'uploader_id': article_data.get('authorId'),
+            'uploader_id': str_or_none(article_data.get('authorId')),
             'timestamp': parse_iso8601(article_data.get('createdAt')),
             'thumbnails': thumbnails,
             'comment_count': int_or_none(article_data.get('commentsCount')),
@@ -69,13 +71,11 @@ class BleacherReportIE(InfoExtractor):
         if video:
             video_type = video['type']
             if video_type in ('cms.bleacherreport.com', 'vid.bleacherreport.com'):
-                info['url'] = 'http://bleacherreport.com/video_embed?id=%s' % video['id']
-            elif video_type == 'ooyala.com':
-                info['url'] = 'ooyala:%s' % video['id']
+                info['url'] = 'http://bleacherreport.com/video_embed?id={}'.format(video['id'])
             elif video_type == 'youtube.com':
                 info['url'] = video['id']
             elif video_type == 'vine.co':
-                info['url'] = 'https://vine.co/v/%s' % video['id']
+                info['url'] = 'https://vine.co/v/{}'.format(video['id'])
             else:
                 info['url'] = video_type + video['id']
             return info
@@ -84,6 +84,7 @@ class BleacherReportIE(InfoExtractor):
 
 
 class BleacherReportCMSIE(AMPIE):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?bleacherreport\.com/video_embed\?id=(?P<id>[0-9a-f-]{36}|\d{5})'
     _TESTS = [{
         'url': 'http://bleacherreport.com/video_embed?id=8fd44c2f-3dc5-4821-9118-2c825a98c0e1&library=video-cms',
@@ -98,12 +99,12 @@ class BleacherReportCMSIE(AMPIE):
 
         },
         'expected_warnings': [
-            'Unable to download f4m manifest'
-        ]
+            'Unable to download f4m manifest',
+        ],
     }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        info = self._extract_feed_info('http://vid.bleacherreport.com/videos/%s.akamai' % video_id)
+        info = self._extract_feed_info(f'http://vid.bleacherreport.com/videos/{video_id}.akamai')
         info['id'] = video_id
         return info
diff --git a/plugins/youtube_download/yt_dlp/extractor/blerp.py b/plugins/youtube_download/yt_dlp/extractor/blerp.py
index 4631ad2..f4f2248 100644
--- a/plugins/youtube_download/yt_dlp/extractor/blerp.py
+++ b/plugins/youtube_download/yt_dlp/extractor/blerp.py
@@ -16,7 +16,7 @@ class BlerpIE(InfoExtractor):
             'uploader_id': '5fb81e51aa66ae000c395478',
             'ext': 'mp3',
             'tags': ['samsung', 'galaxy', 's8', 'over the horizon', '2016', 'ringtone'],
-        }
+        },
     }, {
         'url': 'https://blerp.com/soundbites/5bc94ef4796001000498429f',
         'info_dict': {
@@ -25,11 +25,11 @@ class BlerpIE(InfoExtractor):
             'uploader': '179617322678353920',
             'uploader_id': '5ba99cf71386730004552c42',
             'ext': 'mp3',
-            'tags': ['YEE', 'YEET', 'wo ha haah catchy tune yee', 'yee']
-        }
+            'tags': ['YEE', 'YEET', 'wo ha haah catchy tune yee', 'yee'],
+        },
     }]
 
-    _GRAPHQL_OPERATIONNAME = "webBitePageGetBite"
+    _GRAPHQL_OPERATIONNAME = 'webBitePageGetBite'
     _GRAPHQL_QUERY = (
         '''query webBitePageGetBite($_id: MongoID!) {
             web {
@@ -141,27 +141,26 @@ class BlerpIE(InfoExtractor):
             'operationName': self._GRAPHQL_OPERATIONNAME,
             'query': self._GRAPHQL_QUERY,
             'variables': {
-                '_id': audio_id
-            }
+                '_id': audio_id,
+            },
         }
 
         headers = {
-            'Content-Type': 'application/json'
+            'Content-Type': 'application/json',
         }
 
-        json_result = self._download_json('https://api.blerp.com/graphql',
-                                          audio_id, data=json.dumps(data).encode('utf-8'), headers=headers)
+        json_result = self._download_json(
+            'https://api.blerp.com/graphql', audio_id,
+            data=json.dumps(data).encode(), headers=headers)
 
         bite_json = json_result['data']['web']['biteById']
 
-        info_dict = {
+        return {
             'id': bite_json['_id'],
             'url': bite_json['audio']['mp3']['url'],
             'title': bite_json['title'],
             'uploader': traverse_obj(bite_json, ('ownerObject', 'username'), expected_type=strip_or_none),
             'uploader_id': traverse_obj(bite_json, ('ownerObject', '_id'), expected_type=strip_or_none),
             'ext': 'mp3',
-            'tags': list(filter(None, map(strip_or_none, (traverse_obj(bite_json, 'userKeywords', expected_type=list) or []))) or None)
+            'tags': list(filter(None, map(strip_or_none, (traverse_obj(bite_json, 'userKeywords', expected_type=list) or []))) or None),
         }
-
-        return info_dict
diff --git a/plugins/youtube_download/yt_dlp/extractor/blogger.py b/plugins/youtube_download/yt_dlp/extractor/blogger.py
index 3d6e033..1614b6f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/blogger.py
+++ b/plugins/youtube_download/yt_dlp/extractor/blogger.py
@@ -1,3 +1,4 @@
+from .common import InfoExtractor
 from ..utils import (
     mimetype2ext,
     parse_duration,
@@ -5,7 +6,6 @@ from ..utils import (
     str_or_none,
     traverse_obj,
 )
-from .common import InfoExtractor
 
 
 class BloggerIE(InfoExtractor):
@@ -21,14 +21,14 @@ class BloggerIE(InfoExtractor):
             'ext': 'mp4',
             'thumbnail': r're:^https?://.*',
             'duration': 76.068,
-        }
+        },
     }]
 
     def _real_extract(self, url):
         token_id = self._match_id(url)
         webpage = self._download_webpage(url, token_id)
         data_json = self._search_regex(r'var\s+VIDEO_CONFIG\s*=\s*(\{.*)', webpage, 'JSON data')
-        data = self._parse_json(data_json.encode('utf-8').decode('unicode_escape'), token_id)
+        data = self._parse_json(data_json.encode().decode('unicode_escape'), token_id)
         streams = data['streams']
         formats = [{
             'ext': mimetype2ext(traverse_obj(parse_qs(stream['play_url']), ('mime', 0))),
diff --git a/plugins/youtube_download/yt_dlp/extractor/bloomberg.py b/plugins/youtube_download/yt_dlp/extractor/bloomberg.py
index 792155e..ec6b7a8 100644
--- a/plugins/youtube_download/yt_dlp/extractor/bloomberg.py
+++ b/plugins/youtube_download/yt_dlp/extractor/bloomberg.py
@@ -55,7 +55,7 @@ class BloombergIE(InfoExtractor):
         title = re.sub(': Video$', '', self._og_search_title(webpage))
 
         embed_info = self._download_json(
-            'http://www.bloomberg.com/multimedia/api/embed?id=%s' % video_id, video_id)
+            f'http://www.bloomberg.com/multimedia/api/embed?id={video_id}', video_id)
         formats = []
         for stream in embed_info['streams']:
             stream_url = stream.get('url')
diff --git a/plugins/youtube_download/yt_dlp/extractor/bluesky.py b/plugins/youtube_download/yt_dlp/extractor/bluesky.py
new file mode 100644
index 0000000..8cb5c0d
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/bluesky.py
@@ -0,0 +1,393 @@
+from .common import InfoExtractor
+from ..utils import (
+    ExtractorError,
+    format_field,
+    int_or_none,
+    mimetype2ext,
+    orderedSet,
+    parse_iso8601,
+    truncate_string,
+    update_url_query,
+    url_basename,
+    url_or_none,
+    variadic,
+)
+from ..utils.traversal import traverse_obj
+
+
+class BlueskyIE(InfoExtractor):
+    _VALID_URL = [
+        r'https?://(?:www\.)?(?:bsky\.app|main\.bsky\.dev)/profile/(?P<handle>[\w.:%-]+)/post/(?P<id>\w+)',
+        r'at://(?P<handle>[\w.:%-]+)/app\.bsky\.feed\.post/(?P<id>\w+)',
+    ]
+    _TESTS = [{
+        'url': 'https://bsky.app/profile/blu3blue.bsky.social/post/3l4omssdl632g',
+        'md5': '375539c1930ab05d15585ed772ab54fd',
+        'info_dict': {
+            'id': '3l4omssdl632g',
+            'ext': 'mp4',
+            'uploader': 'Blu3Blu3Lilith',
+            'uploader_id': 'blu3blue.bsky.social',
+            'uploader_url': 'https://bsky.app/profile/blu3blue.bsky.social',
+            'channel_id': 'did:plc:pzdr5ylumf7vmvwasrpr5bf2',
+            'channel_url': 'https://bsky.app/profile/did:plc:pzdr5ylumf7vmvwasrpr5bf2',
+            'thumbnail': r're:https://video.bsky.app/watch/.*\.jpg$',
+            'title': 'OMG WE HAVE VIDEOS NOW',
+            'description': 'OMG WE HAVE VIDEOS NOW',
+            'upload_date': '20240921',
+            'timestamp': 1726940605,
+            'like_count': int,
+            'repost_count': int,
+            'comment_count': int,
+            'tags': [],
+        },
+    }, {
+        'url': 'https://bsky.app/profile/bsky.app/post/3l3vgf77uco2g',
+        'md5': 'b9e344fdbce9f2852c668a97efefb105',
+        'info_dict': {
+            'id': '3l3vgf77uco2g',
+            'ext': 'mp4',
+            'uploader': 'Bluesky',
+            'uploader_id': 'bsky.app',
+            'uploader_url': 'https://bsky.app/profile/bsky.app',
+            'channel_id': 'did:plc:z72i7hdynmk6r22z27h6tvur',
+            'channel_url': 'https://bsky.app/profile/did:plc:z72i7hdynmk6r22z27h6tvur',
+            'thumbnail': r're:https://video.bsky.app/watch/.*\.jpg$',
+            'title': 'Bluesky now has video! Update your app to version 1.91 or refresh on ...',
+            'alt_title': 'Bluesky video feature announcement',
+            'description': r're:(?s)Bluesky now has video! .{239}',
+            'upload_date': '20240911',
+            'timestamp': 1726074716,
+            'like_count': int,
+            'repost_count': int,
+            'comment_count': int,
+            'tags': [],
+            'subtitles': {
+                'en': 'mincount:1',
+            },
+        },
+    }, {
+        'url': 'https://main.bsky.dev/profile/souris.moe/post/3l4qhp7bcs52c',
+        'md5': '5f2df8c200b5633eb7fb2c984d29772f',
+        'info_dict': {
+            'id': '3l4qhp7bcs52c',
+            'ext': 'mp4',
+            'uploader': 'souris',
+            'uploader_id': 'souris.moe',
+            'uploader_url': 'https://bsky.app/profile/souris.moe',
+            'channel_id': 'did:plc:tj7g244gl5v6ai6cm4f4wlqp',
+            'channel_url': 'https://bsky.app/profile/did:plc:tj7g244gl5v6ai6cm4f4wlqp',
+            'thumbnail': r're:https://video.bsky.app/watch/.*\.jpg$',
+            'title': 'Bluesky video #3l4qhp7bcs52c',
+            'upload_date': '20240922',
+            'timestamp': 1727003838,
+            'like_count': int,
+            'repost_count': int,
+            'comment_count': int,
+            'tags': [],
+        },
+    }, {
+        'url': 'https://bsky.app/profile/de1.pds.tentacle.expert/post/3l3w4tnezek2e',
+        'md5': 'cc0110ed1f6b0247caac8234cc1e861d',
+        'info_dict': {
+            'id': '3l3w4tnezek2e',
+            'ext': 'mp4',
+            'uploader': 'clean',
+            'uploader_id': 'de1.pds.tentacle.expert',
+            'uploader_url': 'https://bsky.app/profile/de1.pds.tentacle.expert',
+            'channel_id': 'did:web:de1.tentacle.expert',
+            'channel_url': 'https://bsky.app/profile/did:web:de1.tentacle.expert',
+            'thumbnail': r're:https://video.bsky.app/watch/.*\.jpg$',
+            'title': 'Bluesky video #3l3w4tnezek2e',
+            'upload_date': '20240911',
+            'timestamp': 1726098823,
+            'like_count': int,
+            'repost_count': int,
+            'comment_count': int,
+            'tags': [],
+        },
+    }, {
+        'url': 'https://bsky.app/profile/yunayuispink.bsky.social/post/3l7gqcfes742o',
+        'info_dict': {
+            'id': 'XxK3t_5V3ao',
+            'ext': 'mp4',
+            'uploader': 'yunayu',
+            'uploader_id': '@yunayuispink',
+            'uploader_url': 'https://www.youtube.com/@yunayuispink',
+            'channel': 'yunayu',
+            'channel_id': 'UCPLvXnHa7lTyNoR_dGsU14w',
+            'channel_url': 'https://www.youtube.com/channel/UCPLvXnHa7lTyNoR_dGsU14w',
+            'thumbnail': 'https://i.ytimg.com/vi_webp/XxK3t_5V3ao/maxresdefault.webp',
+            'description': r're:Have a good goodx10000day',
+            'title': '5min vs 5hours drawing',
+            'availability': 'public',
+            'live_status': 'not_live',
+            'playable_in_embed': True,
+            'upload_date': '20241026',
+            'timestamp': 1729967784,
+            'duration': 321,
+            'age_limit': 0,
+            'like_count': int,
+            'view_count': int,
+            'comment_count': int,
+            'channel_follower_count': int,
+            'categories': ['Entertainment'],
+            'tags': [],
+            'chapters': list,
+            'heatmap': 'count:100',
+        },
+        'add_ie': ['Youtube'],
+    }, {
+        'url': 'https://bsky.app/profile/endshark.bsky.social/post/3jzxjkcemae2m',
+        'info_dict': {
+            'id': '222792849',
+            'ext': 'mp3',
+            'uploader': 'LASERBAT',
+            'uploader_id': 'laserbatx',
+            'uploader_url': 'https://laserbatx.bandcamp.com',
+            'artists': ['LASERBAT'],
+            'album_artists': ['LASERBAT'],
+            'album': 'Hari Nezumi [EP]',
+            'track': 'Forward to the End',
+            'title': 'LASERBAT - Forward to the End',
+            'thumbnail': 'https://f4.bcbits.com/img/a2507705510_5.jpg',
+            'duration': 228.571,
+            'track_id': '222792849',
+            'release_date': '20230423',
+            'upload_date': '20230423',
+            'timestamp': 1682276040.0,
+            'release_timestamp': 1682276040.0,
+            'track_number': 1,
+        },
+        'add_ie': ['Bandcamp'],
+    }, {
+        'url': 'https://bsky.app/profile/dannybhoix.bsky.social/post/3l6oe5mtr2c2j',
+        'md5': 'b9e344fdbce9f2852c668a97efefb105',
+        'info_dict': {
+            'id': '3l3vgf77uco2g',
+            'ext': 'mp4',
+            'uploader': 'Bluesky',
+            'uploader_id': 'bsky.app',
+            'uploader_url': 'https://bsky.app/profile/bsky.app',
+            'channel_id': 'did:plc:z72i7hdynmk6r22z27h6tvur',
+            'channel_url': 'https://bsky.app/profile/did:plc:z72i7hdynmk6r22z27h6tvur',
+            'thumbnail': r're:https://video.bsky.app/watch/.*\.jpg$',
+            'title': 'Bluesky now has video! Update your app to version 1.91 or refresh on ...',
+            'alt_title': 'Bluesky video feature announcement',
+            'description': r're:(?s)Bluesky now has video! .{239}',
+            'upload_date': '20240911',
+            'timestamp': 1726074716,
+            'like_count': int,
+            'repost_count': int,
+            'comment_count': int,
+            'tags': [],
+            'subtitles': {
+                'en': 'mincount:1',
+            },
+        },
+    }, {
+        'url': 'https://bsky.app/profile/cinny.bun.how/post/3l7rdfxhyds2f',
+        'md5': '8775118b235cf9fa6b5ad30f95cda75c',
+        'info_dict': {
+            'id': '3l7rdfxhyds2f',
+            'ext': 'mp4',
+            'uploader': 'cinnamon 🐇 🏳️‍⚧️',
+            'uploader_id': 'cinny.bun.how',
+            'uploader_url': 'https://bsky.app/profile/cinny.bun.how',
+            'channel_id': 'did:plc:7x6rtuenkuvxq3zsvffp2ide',
+            'channel_url': 'https://bsky.app/profile/did:plc:7x6rtuenkuvxq3zsvffp2ide',
+            'thumbnail': r're:https://video.bsky.app/watch/.*\.jpg$',
+            'title': 'crazy that i look like this tbh',
+            'description': 'crazy that i look like this tbh',
+            'upload_date': '20241030',
+            'timestamp': 1730332128,
+            'like_count': int,
+            'repost_count': int,
+            'comment_count': int,
+            'tags': ['sexual'],
+            'age_limit': 18,
+        },
+    }, {
+        'url': 'at://did:plc:ia76kvnndjutgedggx2ibrem/app.bsky.feed.post/3l6zrz6zyl2dr',
+        'md5': '71b0eb6d85d03145e6af6642c7fc6d78',
+        'info_dict': {
+            'id': '3l6zrz6zyl2dr',
+            'ext': 'mp4',
+            'uploader': 'mary🐇',
+            'uploader_id': 'mary.my.id',
+            'uploader_url': 'https://bsky.app/profile/mary.my.id',
+            'channel_id': 'did:plc:ia76kvnndjutgedggx2ibrem',
+            'channel_url': 'https://bsky.app/profile/did:plc:ia76kvnndjutgedggx2ibrem',
+            'thumbnail': r're:https://video.bsky.app/watch/.*\.jpg$',
+            'title': 'Bluesky video #3l6zrz6zyl2dr',
+            'upload_date': '20241021',
+            'timestamp': 1729523172,
+            'like_count': int,
+            'repost_count': int,
+            'comment_count': int,
+            'tags': [],
+        },
+    }, {
+        'url': 'https://bsky.app/profile/purpleicetea.bsky.social/post/3l7gv55dc2o2w',
+        'info_dict': {
+            'id': '3l7gv55dc2o2w',
+        },
+        'playlist': [{
+            'info_dict': {
+                'id': '3l7gv55dc2o2w',
+                'ext': 'mp4',
+                'upload_date': '20241026',
+                'description': 'One of my favorite videos',
+                'comment_count': int,
+                'uploader_url': 'https://bsky.app/profile/purpleicetea.bsky.social',
+                'uploader': 'Purple.Ice.Tea',
+                'thumbnail': r're:https://video.bsky.app/watch/.*\.jpg$',
+                'channel_url': 'https://bsky.app/profile/did:plc:bjh5ffwya5f53dfy47dezuwx',
+                'like_count': int,
+                'channel_id': 'did:plc:bjh5ffwya5f53dfy47dezuwx',
+                'repost_count': int,
+                'timestamp': 1729973202,
+                'tags': [],
+                'uploader_id': 'purpleicetea.bsky.social',
+                'title': 'One of my favorite videos',
+            },
+        }, {
+            'info_dict': {
+                'id': '3l77u64l7le2e',
+                'ext': 'mp4',
+                'title': "hearing people on twitter say that bluesky isn't funny yet  so post t...",
+                'like_count': int,
+                'uploader_id': 'thafnine.net',
+                'uploader_url': 'https://bsky.app/profile/thafnine.net',
+                'upload_date': '20241024',
+                'channel_url': 'https://bsky.app/profile/did:plc:6ttyq36rhiyed7wu3ws7dmqj',
+                'description': r're:(?s)hearing people on twitter say that bluesky .{93}',
+                'tags': [],
+                'alt_title': 'md5:9b1ee1937fb3d1a81e932f9ec14d560e',
+                'uploader': 'T9',
+                'channel_id': 'did:plc:6ttyq36rhiyed7wu3ws7dmqj',
+                'thumbnail': r're:https://video.bsky.app/watch/.*\.jpg$',
+                'timestamp': 1729731642,
+                'comment_count': int,
+                'repost_count': int,
+            },
+        }],
+    }]
+    _BLOB_URL_TMPL = '{}/xrpc/com.atproto.sync.getBlob'
+
+    def _get_service_endpoint(self, did, video_id):
+        if did.startswith('did:web:'):
+            url = f'https://{did[8:]}/.well-known/did.json'
+        else:
+            url = f'https://plc.directory/{did}'
+        services = self._download_json(
+            url, video_id, 'Fetching service endpoint', 'Falling back to bsky.social', fatal=False)
+        return traverse_obj(
+            services, ('service', lambda _, x: x['type'] == 'AtprotoPersonalDataServer',
+                       'serviceEndpoint', {url_or_none}, any)) or 'https://bsky.social'
+
+    def _extract_post(self, handle, post_id):
+        return self._download_json(
+            'https://public.api.bsky.app/xrpc/app.bsky.feed.getPostThread',
+            post_id, query={
+                'uri': f'at://{handle}/app.bsky.feed.post/{post_id}',
+                'depth': 0,
+                'parentHeight': 0,
+            })['thread']['post']
+
+    def _real_extract(self, url):
+        handle, video_id = self._match_valid_url(url).group('handle', 'id')
+        post = self._extract_post(handle, video_id)
+
+        entries = []
+        # app.bsky.embed.video.view/app.bsky.embed.external.view
+        entries.extend(self._extract_videos(post, video_id))
+        # app.bsky.embed.recordWithMedia.view
+        entries.extend(self._extract_videos(
+            post, video_id, embed_path=('embed', 'media'), record_subpath=('embed', 'media')))
+        # app.bsky.embed.record.view
+        if nested_post := traverse_obj(post, ('embed', 'record', ('record', None), {dict}, any)):
+            entries.extend(self._extract_videos(
+                nested_post, video_id, embed_path=('embeds', 0), record_path='value'))
+
+        if not entries:
+            raise ExtractorError('No video could be found in this post', expected=True)
+        if len(entries) == 1:
+            return entries[0]
+        return self.playlist_result(entries, video_id)
+
+    @staticmethod
+    def _build_profile_url(path):
+        return format_field(path, None, 'https://bsky.app/profile/%s', default=None)
+
+    def _extract_videos(self, root, video_id, embed_path='embed', record_path='record', record_subpath='embed'):
+        embed_path = variadic(embed_path, (str, bytes, dict, set))
+        record_path = variadic(record_path, (str, bytes, dict, set))
+        record_subpath = variadic(record_subpath, (str, bytes, dict, set))
+
+        entries = []
+        if external_uri := traverse_obj(root, (
+                ((*record_path, *record_subpath), embed_path), 'external', 'uri', {url_or_none}, any)):
+            entries.append(self.url_result(external_uri))
+        if playlist := traverse_obj(root, (*embed_path, 'playlist', {url_or_none})):
+            formats, subtitles = self._extract_m3u8_formats_and_subtitles(
+                playlist, video_id, 'mp4', m3u8_id='hls', fatal=False)
+        else:
+            return entries
+
+        video_cid = traverse_obj(
+            root, (*embed_path, 'cid', {str}),
+            (*record_path, *record_subpath, 'video', 'ref', '$link', {str}))
+        did = traverse_obj(root, ('author', 'did', {str}))
+
+        if did and video_cid:
+            endpoint = self._get_service_endpoint(did, video_id)
+
+            formats.append({
+                'format_id': 'blob',
+                'quality': 1,
+                'url': update_url_query(
+                    self._BLOB_URL_TMPL.format(endpoint), {'did': did, 'cid': video_cid}),
+                **traverse_obj(root, (*embed_path, 'aspectRatio', {
+                    'width': ('width', {int_or_none}),
+                    'height': ('height', {int_or_none}),
+                })),
+                **traverse_obj(root, (*record_path, *record_subpath, 'video', {
+                    'filesize': ('size', {int_or_none}),
+                    'ext': ('mimeType', {mimetype2ext}),
+                })),
+            })
+
+            for sub_data in traverse_obj(root, (
+                    *record_path, *record_subpath, 'captions', lambda _, v: v['file']['ref']['$link'])):
+                subtitles.setdefault(sub_data.get('lang') or 'und', []).append({
+                    'url': update_url_query(
+                        self._BLOB_URL_TMPL.format(endpoint), {'did': did, 'cid': sub_data['file']['ref']['$link']}),
+                    'ext': traverse_obj(sub_data, ('file', 'mimeType', {mimetype2ext})),
+                })
+
+        entries.append({
+            'id': video_id,
+            'formats': formats,
+            'subtitles': subtitles,
+            **traverse_obj(root, {
+                'id': ('uri', {url_basename}),
+                'thumbnail': (*embed_path, 'thumbnail', {url_or_none}),
+                'alt_title': (*embed_path, 'alt', {str}, filter),
+                'uploader': ('author', 'displayName', {str}),
+                'uploader_id': ('author', 'handle', {str}),
+                'uploader_url': ('author', 'handle', {self._build_profile_url}),
+                'channel_id': ('author', 'did', {str}),
+                'channel_url': ('author', 'did', {self._build_profile_url}),
+                'like_count': ('likeCount', {int_or_none}),
+                'repost_count': ('repostCount', {int_or_none}),
+                'comment_count': ('replyCount', {int_or_none}),
+                'timestamp': ('indexedAt', {parse_iso8601}),
+                'tags': ('labels', ..., 'val', {str}, all, {orderedSet}),
+                'age_limit': (
+                    'labels', ..., 'val', {lambda x: 18 if x in ('sexual', 'porn', 'graphic-media') else None}, any),
+                'description': (*record_path, 'text', {str}, filter),
+                'title': (*record_path, 'text', {lambda x: x.replace('\n', ' ')}, {truncate_string(left=72)}),
+            }),
+        })
+        return entries
diff --git a/plugins/youtube_download/yt_dlp/extractor/bokecc.py b/plugins/youtube_download/yt_dlp/extractor/bokecc.py
index ca326f2..42047ac 100644
--- a/plugins/youtube_download/yt_dlp/extractor/bokecc.py
+++ b/plugins/youtube_download/yt_dlp/extractor/bokecc.py
@@ -1,5 +1,6 @@
+import urllib.parse
+
 from .common import InfoExtractor
-from ..compat import compat_parse_qs
 from ..utils import ExtractorError
 
 
@@ -9,23 +10,21 @@ class BokeCCBaseIE(InfoExtractor):
             r'<(?:script|embed)[^>]+src=(?P<q>["\'])(?:https?:)?//p\.bokecc\.com/(?:player|flash/player\.swf)\?(?P<query>.+?)(?P=q)',
             webpage, 'player params', group='query')
 
-        player_params = compat_parse_qs(player_params_str)
+        player_params = urllib.parse.parse_qs(player_params_str)
 
         info_xml = self._download_xml(
-            'http://p.bokecc.com/servlet/playinfo?uid=%s&vid=%s&m=1' % (
+            'http://p.bokecc.com/servlet/playinfo?uid={}&vid={}&m=1'.format(
                 player_params['siteid'][0], player_params['vid'][0]), video_id)
 
-        formats = [{
+        return [{
             'format_id': format_id,
             'url': quality.find('./copy').attrib['playurl'],
             'quality': int(quality.attrib['value']),
         } for quality in info_xml.findall('./video/quality')]
 
-        return formats
-
 
 class BokeCCIE(BokeCCBaseIE):
-    _IE_DESC = 'CC视频'
+    IE_DESC = 'CC视频'
     _VALID_URL = r'https?://union\.bokecc\.com/playvideo\.bo\?(?P<query>.*)'
 
     _TESTS = [{
@@ -38,11 +37,11 @@ class BokeCCIE(BokeCCBaseIE):
     }]
 
     def _real_extract(self, url):
-        qs = compat_parse_qs(self._match_valid_url(url).group('query'))
+        qs = urllib.parse.parse_qs(self._match_valid_url(url).group('query'))
         if not qs.get('vid') or not qs.get('uid'):
             raise ExtractorError('Invalid URL', expected=True)
 
-        video_id = '%s_%s' % (qs['uid'][0], qs['vid'][0])
+        video_id = '{}_{}'.format(qs['uid'][0], qs['vid'][0])
 
         webpage = self._download_webpage(url, video_id)
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/bongacams.py b/plugins/youtube_download/yt_dlp/extractor/bongacams.py
index bf95566..ab85477 100644
--- a/plugins/youtube_download/yt_dlp/extractor/bongacams.py
+++ b/plugins/youtube_download/yt_dlp/extractor/bongacams.py
@@ -1,5 +1,4 @@
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     int_or_none,
     try_get,
@@ -38,7 +37,7 @@ class BongaCamsIE(InfoExtractor):
         channel_id = mobj.group('id')
 
         amf = self._download_json(
-            'https://%s/tools/amf.php' % host, channel_id,
+            f'https://{host}/tools/amf.php', channel_id,
             data=urlencode_postdata((
                 ('method', 'getRoomData'),
                 ('args[]', channel_id),
@@ -48,14 +47,14 @@ class BongaCamsIE(InfoExtractor):
         server_url = amf['localData']['videoServerUrl']
 
         uploader_id = try_get(
-            amf, lambda x: x['performerData']['username'], compat_str) or channel_id
+            amf, lambda x: x['performerData']['username'], str) or channel_id
         uploader = try_get(
-            amf, lambda x: x['performerData']['displayName'], compat_str)
+            amf, lambda x: x['performerData']['displayName'], str)
         like_count = int_or_none(try_get(
             amf, lambda x: x['performerData']['loversCount']))
 
         formats = self._extract_m3u8_formats(
-            '%s/hls/stream_%s/playlist.m3u8' % (server_url, uploader_id),
+            f'{server_url}/hls/stream_{uploader_id}/playlist.m3u8',
             channel_id, 'mp4', m3u8_id='hls', live=True)
 
         return {
diff --git a/plugins/youtube_download/yt_dlp/extractor/boosty.py b/plugins/youtube_download/yt_dlp/extractor/boosty.py
new file mode 100644
index 0000000..d3aab7a
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/boosty.py
@@ -0,0 +1,225 @@
+import json
+import urllib.parse
+
+from .common import InfoExtractor
+from .youtube import YoutubeIE
+from ..utils import (
+    ExtractorError,
+    bug_reports_message,
+    int_or_none,
+    qualities,
+    str_or_none,
+    url_or_none,
+)
+from ..utils.traversal import traverse_obj
+
+
+class BoostyIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?boosty\.to/(?P<user>[^/#?]+)/posts/(?P<post_id>[^/#?]+)'
+    _TESTS = [{
+        # single ok_video
+        'url': 'https://boosty.to/kuplinov/posts/e55d050c-e3bb-4873-a7db-ac7a49b40c38',
+        'info_dict': {
+            'id': 'd7473824-352e-48e2-ae53-d4aa39459968',
+            'title': 'phasma_3',
+            'channel': 'Kuplinov',
+            'channel_id': '7958701',
+            'timestamp': 1655031975,
+            'upload_date': '20220612',
+            'release_timestamp': 1655049000,
+            'release_date': '20220612',
+            'modified_timestamp': 1668680993,
+            'modified_date': '20221117',
+            'tags': ['куплинов', 'phasmophobia'],
+            'like_count': int,
+            'ext': 'mp4',
+            'duration': 105,
+            'view_count': int,
+            'thumbnail': r're:^https://i\.mycdn\.me/videoPreview\?',
+        },
+    }, {
+        # multiple ok_video
+        'url': 'https://boosty.to/maddyson/posts/0c652798-3b35-471f-8b48-a76a0b28736f',
+        'info_dict': {
+            'id': '0c652798-3b35-471f-8b48-a76a0b28736f',
+            'title': 'то что не пропустил юта6',
+            'channel': 'Илья Давыдов',
+            'channel_id': '6808257',
+            'timestamp': 1694017040,
+            'upload_date': '20230906',
+            'release_timestamp': 1694017040,
+            'release_date': '20230906',
+            'modified_timestamp': 1694071178,
+            'modified_date': '20230907',
+            'like_count': int,
+        },
+        'playlist_count': 3,
+        'playlist': [{
+            'info_dict': {
+                'id': 'cc325a9f-a563-41c6-bf47-516c1b506c9a',
+                'title': 'то что не пропустил юта6',
+                'channel': 'Илья Давыдов',
+                'channel_id': '6808257',
+                'timestamp': 1694017040,
+                'upload_date': '20230906',
+                'release_timestamp': 1694017040,
+                'release_date': '20230906',
+                'modified_timestamp': 1694071178,
+                'modified_date': '20230907',
+                'like_count': int,
+                'ext': 'mp4',
+                'duration': 31204,
+                'view_count': int,
+                'thumbnail': r're:^https://i\.mycdn\.me/videoPreview\?',
+            },
+        }, {
+            'info_dict': {
+                'id': 'd07b0a72-9493-4512-b54e-55ce468fd4b7',
+                'title': 'то что не пропустил юта6',
+                'channel': 'Илья Давыдов',
+                'channel_id': '6808257',
+                'timestamp': 1694017040,
+                'upload_date': '20230906',
+                'release_timestamp': 1694017040,
+                'release_date': '20230906',
+                'modified_timestamp': 1694071178,
+                'modified_date': '20230907',
+                'like_count': int,
+                'ext': 'mp4',
+                'duration': 25704,
+                'view_count': int,
+                'thumbnail': r're:^https://i\.mycdn\.me/videoPreview\?',
+            },
+        }, {
+            'info_dict': {
+                'id': '4a3bba32-78c8-422a-9432-2791aff60b42',
+                'title': 'то что не пропустил юта6',
+                'channel': 'Илья Давыдов',
+                'channel_id': '6808257',
+                'timestamp': 1694017040,
+                'upload_date': '20230906',
+                'release_timestamp': 1694017040,
+                'release_date': '20230906',
+                'modified_timestamp': 1694071178,
+                'modified_date': '20230907',
+                'like_count': int,
+                'ext': 'mp4',
+                'duration': 31867,
+                'view_count': int,
+                'thumbnail': r're:^https://i\.mycdn\.me/videoPreview\?',
+            },
+        }],
+    }, {
+        # single external video (youtube)
+        'url': 'https://boosty.to/denischuzhoy/posts/6094a487-bcec-4cf8-a453-43313b463c38',
+        'info_dict': {
+            'id': 'EXelTnve5lY',
+            'title': 'Послание Президента Федеральному Собранию | Класс народа',
+            'upload_date': '20210425',
+            'channel': 'Денис Чужой',
+            'tags': 'count:10',
+            'like_count': int,
+            'ext': 'mp4',
+            'duration': 816,
+            'view_count': int,
+            'thumbnail': r're:^https://i\.ytimg\.com/',
+            'age_limit': 0,
+            'availability': 'public',
+            'categories': list,
+            'channel_follower_count': int,
+            'channel_id': 'UCCzVNbWZfYpBfyofCCUD_0w',
+            'channel_is_verified': bool,
+            'channel_url': r're:^https://www\.youtube\.com/',
+            'comment_count': int,
+            'description': str,
+            'heatmap': 'count:100',
+            'live_status': str,
+            'playable_in_embed': bool,
+            'uploader': str,
+            'uploader_id': str,
+            'uploader_url': r're:^https://www\.youtube\.com/',
+        },
+    }]
+
+    _MP4_TYPES = ('tiny', 'lowest', 'low', 'medium', 'high', 'full_hd', 'quad_hd', 'ultra_hd')
+
+    def _extract_formats(self, player_urls, video_id):
+        formats = []
+        quality = qualities(self._MP4_TYPES)
+        for player_url in traverse_obj(player_urls, lambda _, v: url_or_none(v['url'])):
+            url = player_url['url']
+            format_type = player_url.get('type')
+            if format_type in ('hls', 'hls_live', 'live_ondemand_hls', 'live_playback_hls'):
+                formats.extend(self._extract_m3u8_formats(url, video_id, m3u8_id='hls', fatal=False))
+            elif format_type in ('dash', 'dash_live', 'live_playback_dash'):
+                formats.extend(self._extract_mpd_formats(url, video_id, mpd_id='dash', fatal=False))
+            elif format_type in self._MP4_TYPES:
+                formats.append({
+                    'url': url,
+                    'ext': 'mp4',
+                    'format_id': format_type,
+                    'quality': quality(format_type),
+                })
+            else:
+                self.report_warning(f'Unknown format type: {format_type!r}')
+        return formats
+
+    def _real_extract(self, url):
+        user, post_id = self._match_valid_url(url).group('user', 'post_id')
+
+        auth_headers = {}
+        auth_cookie = self._get_cookies('https://boosty.to/').get('auth')
+        if auth_cookie is not None:
+            try:
+                auth_data = json.loads(urllib.parse.unquote(auth_cookie.value))
+                auth_headers['Authorization'] = f'Bearer {auth_data["accessToken"]}'
+            except (json.JSONDecodeError, KeyError):
+                self.report_warning(f'Failed to extract token from auth cookie{bug_reports_message()}')
+
+        post = self._download_json(
+            f'https://api.boosty.to/v1/blog/{user}/post/{post_id}', post_id,
+            note='Downloading post data', errnote='Unable to download post data', headers=auth_headers)
+
+        post_title = post.get('title')
+        if not post_title:
+            self.report_warning('Unable to extract post title. Falling back to parsing html page')
+            webpage = self._download_webpage(url, video_id=post_id)
+            post_title = self._og_search_title(webpage, default=None) or self._html_extract_title(webpage)
+
+        common_metadata = {
+            'title': post_title,
+            **traverse_obj(post, {
+                'channel': ('user', 'name', {str}),
+                'channel_id': ('user', 'id', {str_or_none}),
+                'timestamp': ('createdAt', {int_or_none}),
+                'release_timestamp': ('publishTime', {int_or_none}),
+                'modified_timestamp': ('updatedAt', {int_or_none}),
+                'tags': ('tags', ..., 'title', {str}),
+                'like_count': ('count', 'likes', {int_or_none}),
+            }),
+        }
+        entries = []
+        for item in traverse_obj(post, ('data', ..., {dict})):
+            item_type = item.get('type')
+            if item_type == 'video' and url_or_none(item.get('url')):
+                entries.append(self.url_result(item['url'], YoutubeIE))
+            elif item_type == 'ok_video':
+                video_id = item.get('id') or post_id
+                entries.append({
+                    'id': video_id,
+                    'formats': self._extract_formats(item.get('playerUrls'), video_id),
+                    **common_metadata,
+                    **traverse_obj(item, {
+                        'title': ('title', {str}),
+                        'duration': ('duration', {int_or_none}),
+                        'view_count': ('viewsCounter', {int_or_none}),
+                        'thumbnail': (('previewUrl', 'defaultPreview'), {url_or_none}),
+                    }, get_all=False)})
+
+        if not entries and not post.get('hasAccess'):
+            self.raise_login_required('This post requires a subscription', metadata_available=True)
+        elif not entries:
+            raise ExtractorError('No videos found', expected=True)
+        if len(entries) == 1:
+            return entries[0]
+        return self.playlist_result(entries, post_id, post_title, **common_metadata)
diff --git a/plugins/youtube_download/yt_dlp/extractor/bostonglobe.py b/plugins/youtube_download/yt_dlp/extractor/bostonglobe.py
index 92f8ea2..f5b8196 100644
--- a/plugins/youtube_download/yt_dlp/extractor/bostonglobe.py
+++ b/plugins/youtube_download/yt_dlp/extractor/bostonglobe.py
@@ -1,7 +1,6 @@
 import re
 
 from .common import InfoExtractor
-
 from ..utils import (
     extract_attributes,
 )
@@ -58,8 +57,7 @@ class BostonGlobeIE(InfoExtractor):
 
             if video_id and account_id and player_id and embed:
                 entries.append(
-                    'http://players.brightcove.net/%s/%s_%s/index.html?videoId=%s'
-                    % (account_id, player_id, embed, video_id))
+                    f'http://players.brightcove.net/{account_id}/{player_id}_{embed}/index.html?videoId={video_id}')
 
         if len(entries) == 0:
             return self.url_result(url, 'Generic')
diff --git a/plugins/youtube_download/yt_dlp/extractor/box.py b/plugins/youtube_download/yt_dlp/extractor/box.py
index 8ab1496..f06339f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/box.py
+++ b/plugins/youtube_download/yt_dlp/extractor/box.py
@@ -1,45 +1,82 @@
 import json
+import urllib.parse
 
 from .common import InfoExtractor
 from ..utils import (
-    determine_ext,
+    ExtractorError,
     parse_iso8601,
-    # try_get,
     update_url_query,
+    url_or_none,
 )
+from ..utils.traversal import traverse_obj
 
 
 class BoxIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:[^.]+\.)?app\.box\.com/s/(?P<shared_name>[^/]+)/file/(?P<id>\d+)'
-    _TEST = {
+    _VALID_URL = r'https?://(?:[^.]+\.)?(?P<service>app|ent)\.box\.com/s/(?P<shared_name>[^/?#]+)(?:/file/(?P<id>\d+))?'
+    _TESTS = [{
         'url': 'https://mlssoccer.app.box.com/s/0evd2o3e08l60lr4ygukepvnkord1o1x/file/510727257538',
         'md5': '1f81b2fd3960f38a40a3b8823e5fcd43',
         'info_dict': {
             'id': '510727257538',
             'ext': 'mp4',
             'title': 'Garber   St. Louis will be 28th MLS team  +scarving.mp4',
-            'uploader': 'MLS Video',
+            'uploader': '',
             'timestamp': 1566320259,
             'upload_date': '20190820',
             'uploader_id': '235196876',
-        }
-    }
+        },
+        'params': {'skip_download': 'dash fragment too small'},
+    }, {
+        'url': 'https://utexas.app.box.com/s/2x6vanv85fdl8j2eqlcxmv0gp1wvps6e',
+        'info_dict': {
+            'id': '787379022466',
+            'ext': 'mp4',
+            'title': 'Webinar recording: Take the Leap!.mp4',
+            'uploader': 'Patricia Mosele',
+            'timestamp': 1615824864,
+            'upload_date': '20210315',
+            'uploader_id': '239068974',
+        },
+        'params': {'skip_download': 'dash fragment too small'},
+    }, {
+        'url': 'https://thejacksonlaboratory.ent.box.com/s/2x09dm6vcg6y28o0oox1so4l0t8wzt6l/file/1536173056065',
+        'info_dict': {
+            'id': '1536173056065',
+            'ext': 'mp4',
+            'uploader_id': '18523128264',
+            'uploader': 'Lexi Hennigan',
+            'title': 'iPSC Symposium recording part 1.mp4',
+            'timestamp': 1716228343,
+            'upload_date': '20240520',
+        },
+        'params': {'skip_download': 'dash fragment too small'},
+    }]
 
     def _real_extract(self, url):
-        shared_name, file_id = self._match_valid_url(url).groups()
-        webpage = self._download_webpage(url, file_id)
-        request_token = self._parse_json(self._search_regex(
-            r'Box\.config\s*=\s*({.+?});', webpage,
-            'Box config'), file_id)['requestToken']
+        shared_name, file_id, service = self._match_valid_url(url).group('shared_name', 'id', 'service')
+        webpage = self._download_webpage(url, file_id or shared_name)
+
+        if not file_id:
+            post_stream_data = self._search_json(
+                r'Box\.postStreamData\s*=', webpage, 'Box post-stream data', shared_name)
+            shared_item = traverse_obj(
+                post_stream_data, ('/app-api/enduserapp/shared-item', {dict})) or {}
+            if shared_item.get('itemType') != 'file':
+                raise ExtractorError('The requested resource is not a file', expected=True)
+
+            file_id = str(shared_item['itemID'])
+
+        request_token = self._search_json(
+            r'Box\.config\s*=', webpage, 'Box config', file_id)['requestToken']
         access_token = self._download_json(
-            'https://app.box.com/app-api/enduserapp/elements/tokens', file_id,
+            f'https://{service}.box.com/app-api/enduserapp/elements/tokens', file_id,
             'Downloading token JSON metadata',
             data=json.dumps({'fileIDs': [file_id]}).encode(), headers={
                 'Content-Type': 'application/json',
                 'X-Request-Token': request_token,
                 'X-Box-EndUser-API': 'sharedName=' + shared_name,
             })[file_id]['read']
-        shared_link = 'https://app.box.com/s/' + shared_name
+        shared_link = f'https://{service}.box.com/s/{shared_name}'
         f = self._download_json(
             'https://api.box.com/2.0/files/' + file_id, file_id,
             'Downloading file JSON metadata', headers={
@@ -47,37 +84,26 @@ class BoxIE(InfoExtractor):
                 'BoxApi': 'shared_link=' + shared_link,
                 'X-Rep-Hints': '[dash]',  # TODO: extract `hls` formats
             }, query={
-                'fields': 'authenticated_download_url,created_at,created_by,description,extension,is_download_available,name,representations,size'
+                'fields': 'authenticated_download_url,created_at,created_by,description,extension,is_download_available,name,representations,size',
             })
         title = f['name']
 
         query = {
             'access_token': access_token,
-            'shared_link': shared_link
+            'shared_link': shared_link,
         }
 
         formats = []
 
-        # for entry in (try_get(f, lambda x: x['representations']['entries'], list) or []):
-        #     entry_url_template = try_get(
-        #         entry, lambda x: x['content']['url_template'])
-        #     if not entry_url_template:
-        #         continue
-        #     representation = entry.get('representation')
-        #     if representation == 'dash':
-        #         TODO: append query to every fragment URL
-        #         formats.extend(self._extract_mpd_formats(
-        #             entry_url_template.replace('{+asset_path}', 'manifest.mpd'),
-        #             file_id, query=query))
-
-        authenticated_download_url = f.get('authenticated_download_url')
-        if authenticated_download_url and f.get('is_download_available'):
-            formats.append({
-                'ext': f.get('extension') or determine_ext(title),
-                'filesize': f.get('size'),
-                'format_id': 'download',
-                'url': update_url_query(authenticated_download_url, query),
-            })
+        for url_tmpl in traverse_obj(f, (
+            'representations', 'entries', lambda _, v: v['representation'] == 'dash',
+            'content', 'url_template', {url_or_none},
+        )):
+            manifest_url = update_url_query(url_tmpl.replace('{+asset_path}', 'manifest.mpd'), query)
+            fmts = self._extract_mpd_formats(manifest_url, file_id)
+            for fmt in fmts:
+                fmt['extra_param_to_segment_url'] = urllib.parse.urlparse(manifest_url).query
+            formats.extend(fmts)
 
         creator = f.get('created_by') or {}
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/boxcast.py b/plugins/youtube_download/yt_dlp/extractor/boxcast.py
index 51f9eb7..efa6699 100644
--- a/plugins/youtube_download/yt_dlp/extractor/boxcast.py
+++ b/plugins/youtube_download/yt_dlp/extractor/boxcast.py
@@ -1,9 +1,5 @@
 from .common import InfoExtractor
-from ..utils import (
-    js_to_json,
-    traverse_obj,
-    unified_timestamp
-)
+from ..utils import js_to_json, traverse_obj, unified_timestamp
 
 
 class BoxCastVideoIE(InfoExtractor):
@@ -25,7 +21,7 @@ class BoxCastVideoIE(InfoExtractor):
             'release_date': '20221210',
             'uploader_id': 're8w0v8hohhvpqtbskpe',
             'uploader': 'Children\'s Health Defense',
-        }
+        },
     }, {
         'url': 'https://boxcast.tv/video-portal/vctwevwntun3o0ikq7af/rvyblnn0fxbfjx5nwxhl/otbpltj2kzkveo2qz3ad',
         'info_dict': {
@@ -34,8 +30,8 @@ class BoxCastVideoIE(InfoExtractor):
             'uploader_id': 'vctwevwntun3o0ikq7af',
             'uploader': 'Legacy Christian Church',
             'title': 'The Quest | 1: Beginner\'s Bay | Jamie Schools',
-            'thumbnail': r're:https?://uploads.boxcast.com/(?:[\w-]+/){3}.+\.jpg'
-        }
+            'thumbnail': r're:https?://uploads.boxcast.com/(?:[\w-]+/){3}.+\.jpg',
+        },
     }, {
         'url': 'https://boxcast.tv/channel/z03fqwaeaby5lnaawox2?b=ssihlw5gvfij2by8tkev',
         'info_dict': {
@@ -48,7 +44,7 @@ class BoxCastVideoIE(InfoExtractor):
             'uploader': 'Lighthouse Ministries International  - Beltsville, Maryland',
             'description': 'md5:ac23e3d01b0b0be592e8f7fe0ec3a340',
             'title': 'New Year\'s Eve CROSSOVER Service at LHMI | December 31, 2022',
-        }
+        },
     }]
     _WEBPAGE_TESTS = [{
         'url': 'https://childrenshealthdefense.eu/live-stream/',
@@ -61,7 +57,7 @@ class BoxCastVideoIE(InfoExtractor):
             'release_date': '20221210',
             'uploader_id': 're8w0v8hohhvpqtbskpe',
             'uploader': 'Children\'s Health Defense',
-        }
+        },
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/bpb.py b/plugins/youtube_download/yt_dlp/extractor/bpb.py
index f28e581..a2a9082 100644
--- a/plugins/youtube_download/yt_dlp/extractor/bpb.py
+++ b/plugins/youtube_download/yt_dlp/extractor/bpb.py
@@ -2,55 +2,156 @@ import re
 
 from .common import InfoExtractor
 from ..utils import (
+    clean_html,
+    extract_attributes,
+    join_nonempty,
     js_to_json,
-    determine_ext,
+    mimetype2ext,
+    parse_resolution,
+    unified_strdate,
+    url_or_none,
+    urljoin,
+)
+from ..utils.traversal import (
+    find_element,
+    traverse_obj,
 )
 
 
 class BpbIE(InfoExtractor):
     IE_DESC = 'Bundeszentrale für politische Bildung'
-    _VALID_URL = r'https?://(?:www\.)?bpb\.de/mediathek/(?P<id>[0-9]+)/'
+    _VALID_URL = r'https?://(?:www\.|m\.)?bpb\.de/(?:[^/?#]+/)*(?P<id>\d+)(?:[/?#]|$)'
 
-    _TEST = {
+    _TESTS = [{
         'url': 'http://www.bpb.de/mediathek/297/joachim-gauck-zu-1989-und-die-erinnerung-an-die-ddr',
-        'md5': 'c4f84c8a8044ca9ff68bb8441d300b3f',
         'info_dict': {
             'id': '297',
             'ext': 'mp4',
+            'creators': ['Kooperative Berlin'],
+            'description': r're:Joachim Gauck, .*\n\nKamera: .*',
+            'release_date': '20150716',
+            'series': 'Interview auf dem Geschichtsforum 1989 | 2009',
+            'tags': [],
+            'thumbnail': r're:https?://www\.bpb\.de/cache/images/7/297_teaser_16x9_1240\.jpg.*',
             'title': 'Joachim Gauck zu 1989 und die Erinnerung an die DDR',
-            'description': 'Joachim Gauck, erster Beauftragter für die Stasi-Unterlagen, spricht auf dem Geschichtsforum über die friedliche Revolution 1989 und eine "gewisse Traurigkeit" im Umgang mit der DDR-Vergangenheit.'
+            'uploader': 'Bundeszentrale für politische Bildung',
+        },
+    }, {
+        'url': 'https://www.bpb.de/mediathek/video/522184/krieg-flucht-und-falschmeldungen-wirstattdesinformation-2/',
+        'info_dict': {
+            'id': '522184',
+            'ext': 'mp4',
+            'creators': ['Institute for Strategic Dialogue Germany gGmbH (ISD)'],
+            'description': 'md5:f83c795ff8f825a69456a9e51fc15903',
+            'release_date': '20230621',
+            'series': 'Narrative über den Krieg Russlands gegen die Ukraine (NUK)',
+            'tags': [],
+            'thumbnail': r're:https://www\.bpb\.de/cache/images/4/522184_teaser_16x9_1240\.png.*',
+            'title': 'md5:9b01ccdbf58dbf9e5c9f6e771a803b1c',
+            'uploader': 'Bundeszentrale für politische Bildung',
+        },
+    }, {
+        'url': 'https://www.bpb.de/lernen/bewegtbild-und-politische-bildung/webvideo/518789/krieg-flucht-und-falschmeldungen-wirstattdesinformation-1/',
+        'info_dict': {
+            'id': '518789',
+            'ext': 'mp4',
+            'creators': ['Institute for Strategic Dialogue Germany gGmbH (ISD)'],
+            'description': 'md5:85228aed433e84ff0ff9bc582abd4ea8',
+            'release_date': '20230302',
+            'series': 'Narrative über den Krieg Russlands gegen die Ukraine (NUK)',
+            'tags': [],
+            'thumbnail': r're:https://www\.bpb\.de/cache/images/9/518789_teaser_16x9_1240\.jpeg.*',
+            'title': 'md5:3e956f264bb501f6383f10495a401da4',
+            'uploader': 'Bundeszentrale für politische Bildung',
+        },
+    }, {
+        'url': 'https://www.bpb.de/mediathek/podcasts/apuz-podcast/539727/apuz-20-china/',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.bpb.de/mediathek/audio/315813/folge-1-eine-einfuehrung/',
+        'info_dict': {
+            'id': '315813',
+            'ext': 'mp3',
+            'creators': ['Axel Schröder'],
+            'description': 'md5:eda9d1af34e5912efef5baf54fba4427',
+            'release_date': '20200921',
+            'series': 'Auf Endlagersuche. Der deutsche Weg zu einem sicheren Atommülllager',
+            'tags': ['Atomenergie', 'Endlager', 'hoch-radioaktiver Abfall', 'Endlagersuche', 'Atommüll', 'Atomendlager', 'Gorleben', 'Deutschland'],
+            'thumbnail': r're:https://www\.bpb\.de/cache/images/3/315813_teaser_16x9_1240\.png.*',
+            'title': 'Folge 1: Eine Einführung',
+            'uploader': 'Bundeszentrale für politische Bildung',
+        },
+    }, {
+        'url': 'https://www.bpb.de/517806/die-weltanschauung-der-neuen-rechten/',
+        'info_dict': {
+            'id': '517806',
+            'ext': 'mp3',
+            'creators': ['Bundeszentrale für politische Bildung'],
+            'description': 'md5:594689600e919912aade0b2871cc3fed',
+            'release_date': '20230127',
+            'series': 'Vorträge des Fachtags "Modernisierer. Grenzgänger. Anstifter. Sechs Jahrzehnte \'Neue Rechte\'"',
+            'tags': ['Rechtsextremismus', 'Konservatismus', 'Konservativismus', 'neue Rechte', 'Rechtspopulismus', 'Schnellroda', 'Deutschland'],
+            'thumbnail': r're:https://www\.bpb\.de/cache/images/6/517806_teaser_16x9_1240\.png.*',
+            'title': 'Die Weltanschauung der "Neuen Rechten"',
+            'uploader': 'Bundeszentrale für politische Bildung',
+        },
+    }, {
+        'url': 'https://www.bpb.de/mediathek/reihen/zahlen-und-fakten-soziale-situation-filme/520153/zahlen-und-fakten-die-soziale-situation-in-deutschland-migration/',
+        'only_matching': True,
+    }]
+
+    _TITLE_RE = re.compile('(?P<title>[^<]*)<[^>]+>(?P<series>[^<]*)')
+
+    def _parse_vue_attributes(self, name, string, video_id):
+        attributes = extract_attributes(self._search_regex(rf'(<{name}(?:"[^"]*?"|[^>])*>)', string, name))
+
+        for key, value in attributes.items():
+            if key.startswith(':'):
+                attributes[key] = self._parse_json(value, video_id, transform_source=js_to_json, fatal=False)
+
+        return attributes
+
+    def _process_source(self, source):
+        url = url_or_none(source['src'])
+        if not url:
+            return None
+
+        source_type = source.get('type', '')
+        extension = mimetype2ext(source_type)
+        note = self._search_regex(r'[_-]([a-z]+)\.[\da-z]+(?:$|\?)', url, 'note', default=None)
+
+        return {
+            'url': url,
+            'ext': extension,
+            'vcodec': None if source_type.startswith('video') else 'none',
+            'quality': 10 if note == 'high' else 0,
+            'format_note': note,
+            'format_id': join_nonempty(extension, note),
+            **parse_resolution(source.get('label')),
         }
-    }
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
 
-        title = self._html_search_regex(
-            r'<h2 class="white">(.*?)</h2>', webpage, 'title')
-        video_info_dicts = re.findall(
-            r"({\s*src\s*:\s*'https?://film\.bpb\.de/[^}]+})", webpage)
-
-        formats = []
-        for video_info in video_info_dicts:
-            video_info = self._parse_json(
-                video_info, video_id, transform_source=js_to_json, fatal=False)
-            if not video_info:
-                continue
-            video_url = video_info.get('src')
-            if not video_url:
-                continue
-            quality = 'high' if '_high' in video_url else 'low'
-            formats.append({
-                'url': video_url,
-                'quality': 10 if quality == 'high' else 0,
-                'format_note': quality,
-                'format_id': '%s-%s' % (quality, determine_ext(video_url)),
-            })
+        title_result = traverse_obj(webpage, ({find_element(cls='opening-header__title')}, {self._TITLE_RE.match}))
+        json_lds = list(self._yield_json_ld(webpage, video_id, fatal=False))
 
         return {
             'id': video_id,
-            'formats': formats,
-            'title': title,
-            'description': self._og_search_description(webpage),
+            'title': traverse_obj(title_result, ('title', {str.strip})) or None,
+            # This metadata could be interpreted otherwise, but it fits "series" the most
+            'series': traverse_obj(title_result, ('series', {str.strip})) or None,
+            'description': join_nonempty(*traverse_obj(webpage, [(
+                {find_element(cls='opening-intro')},
+                [{find_element(tag='bpb-accordion-item')}, {find_element(cls='text-content')}],
+            ), {clean_html}]), delim='\n\n') or None,
+            'creators': traverse_obj(self._html_search_meta('author', webpage), all),
+            'uploader': self._html_search_meta('publisher', webpage),
+            'release_date': unified_strdate(self._html_search_meta('date', webpage)),
+            'tags': traverse_obj(json_lds, (..., 'keywords', {lambda x: x.split(',')}, ...)),
+            **traverse_obj(self._parse_vue_attributes('bpb-player', webpage, video_id), {
+                'formats': (':sources', ..., {self._process_source}),
+                'thumbnail': ('poster', {urljoin(url)}),
+            }),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/br.py b/plugins/youtube_download/yt_dlp/extractor/br.py
index 309452d..0568e06 100644
--- a/plugins/youtube_download/yt_dlp/extractor/br.py
+++ b/plugins/youtube_download/yt_dlp/extractor/br.py
@@ -1,18 +1,15 @@
-import json
-
 from .common import InfoExtractor
 from ..utils import (
-    determine_ext,
     ExtractorError,
     int_or_none,
     parse_duration,
-    parse_iso8601,
     xpath_element,
     xpath_text,
 )
 
 
 class BRIE(InfoExtractor):
+    _WORKING = False
     IE_DESC = 'Bayerischer Rundfunk'
     _VALID_URL = r'(?P<base_url>https?://(?:www\.)?br(?:-klassik)?\.de)/(?:[a-z0-9\-_]+/)+(?P<id>[a-z0-9\-_]+)\.html'
 
@@ -64,7 +61,7 @@ class BRIE(InfoExtractor):
                 'title': 'Umweltbewusster Häuslebauer',
                 'description': 'md5:d52dae9792d00226348c1dbb13c9bae2',
                 'duration': 116,
-            }
+            },
         },
         {
             'url': 'http://www.br.de/fernsehen/br-alpha/sendungen/kant-fuer-anfaenger/kritik-der-reinen-vernunft/kant-kritik-01-metaphysik100.html',
@@ -77,7 +74,7 @@ class BRIE(InfoExtractor):
                 'duration': 893,
                 'uploader': 'Eva Maria Steimle',
                 'upload_date': '20170208',
-            }
+            },
         },
     ]
 
@@ -145,7 +142,7 @@ class BRIE(InfoExtractor):
                     http_format_info = format_info.copy()
                     http_format_info.update({
                         'url': format_url,
-                        'format_id': 'http-%s' % asset_type,
+                        'format_id': f'http-{asset_type}',
                     })
                     formats.append(http_format_info)
                 server_prefix = xpath_text(asset, 'serverPrefix')
@@ -154,7 +151,7 @@ class BRIE(InfoExtractor):
                     rtmp_format_info.update({
                         'url': server_prefix,
                         'play_path': xpath_text(asset, 'fileName'),
-                        'format_id': 'rtmp-%s' % asset_type,
+                        'format_id': f'rtmp-{asset_type}',
                     })
                     formats.append(rtmp_format_info)
         return formats
@@ -167,142 +164,3 @@ class BRIE(InfoExtractor):
         } for variant in variants.findall('variant') if xpath_text(variant, 'url')]
         thumbnails.sort(key=lambda x: x['width'] * x['height'], reverse=True)
         return thumbnails
-
-
-class BRMediathekIE(InfoExtractor):
-    IE_DESC = 'Bayerischer Rundfunk Mediathek'
-    _VALID_URL = r'https?://(?:www\.)?br\.de/mediathek//?video/(?:[^/?&#]+?-)?(?P<id>av:[0-9a-f]{24})'
-
-    _TESTS = [{
-        'url': 'https://www.br.de/mediathek/video/gesundheit-die-sendung-vom-28112017-av:5a1e6a6e8fce6d001871cc8e',
-        'md5': 'fdc3d485835966d1622587d08ba632ec',
-        'info_dict': {
-            'id': 'av:5a1e6a6e8fce6d001871cc8e',
-            'ext': 'mp4',
-            'title': 'Die Sendung vom 28.11.2017',
-            'description': 'md5:6000cdca5912ab2277e5b7339f201ccc',
-            'timestamp': 1511942766,
-            'upload_date': '20171129',
-        }
-    }, {
-        'url': 'https://www.br.de/mediathek//video/av:61b0db581aed360007558c12',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        clip_id = self._match_id(url)
-
-        clip = self._download_json(
-            'https://proxy-base.master.mango.express/graphql',
-            clip_id, data=json.dumps({
-                "query": """{
-  viewer {
-    clip(id: "%s") {
-      title
-      description
-      duration
-      createdAt
-      ageRestriction
-      videoFiles {
-        edges {
-          node {
-            publicLocation
-            fileSize
-            videoProfile {
-              width
-              height
-              bitrate
-              encoding
-            }
-          }
-        }
-      }
-      captionFiles {
-        edges {
-          node {
-            publicLocation
-          }
-        }
-      }
-      teaserImages {
-        edges {
-          node {
-            imageFiles {
-              edges {
-                node {
-                  publicLocation
-                  width
-                  height
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}""" % clip_id}).encode(), headers={
-                'Content-Type': 'application/json',
-            })['data']['viewer']['clip']
-        title = clip['title']
-
-        formats = []
-        for edge in clip.get('videoFiles', {}).get('edges', []):
-            node = edge.get('node', {})
-            n_url = node.get('publicLocation')
-            if not n_url:
-                continue
-            ext = determine_ext(n_url)
-            if ext == 'm3u8':
-                formats.extend(self._extract_m3u8_formats(
-                    n_url, clip_id, 'mp4', 'm3u8_native',
-                    m3u8_id='hls', fatal=False))
-            else:
-                video_profile = node.get('videoProfile', {})
-                tbr = int_or_none(video_profile.get('bitrate'))
-                format_id = 'http'
-                if tbr:
-                    format_id += '-%d' % tbr
-                formats.append({
-                    'format_id': format_id,
-                    'url': n_url,
-                    'width': int_or_none(video_profile.get('width')),
-                    'height': int_or_none(video_profile.get('height')),
-                    'tbr': tbr,
-                    'filesize': int_or_none(node.get('fileSize')),
-                })
-
-        subtitles = {}
-        for edge in clip.get('captionFiles', {}).get('edges', []):
-            node = edge.get('node', {})
-            n_url = node.get('publicLocation')
-            if not n_url:
-                continue
-            subtitles.setdefault('de', []).append({
-                'url': n_url,
-            })
-
-        thumbnails = []
-        for edge in clip.get('teaserImages', {}).get('edges', []):
-            for image_edge in edge.get('node', {}).get('imageFiles', {}).get('edges', []):
-                node = image_edge.get('node', {})
-                n_url = node.get('publicLocation')
-                if not n_url:
-                    continue
-                thumbnails.append({
-                    'url': n_url,
-                    'width': int_or_none(node.get('width')),
-                    'height': int_or_none(node.get('height')),
-                })
-
-        return {
-            'id': clip_id,
-            'title': title,
-            'description': clip.get('description'),
-            'duration': int_or_none(clip.get('duration')),
-            'timestamp': parse_iso8601(clip.get('createdAt')),
-            'age_limit': int_or_none(clip.get('ageRestriction')),
-            'formats': formats,
-            'subtitles': subtitles,
-            'thumbnails': thumbnails,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/brainpop.py b/plugins/youtube_download/yt_dlp/extractor/brainpop.py
index 1200437..df10299 100644
--- a/plugins/youtube_download/yt_dlp/extractor/brainpop.py
+++ b/plugins/youtube_download/yt_dlp/extractor/brainpop.py
@@ -6,7 +6,7 @@ from ..utils import (
     classproperty,
     int_or_none,
     traverse_obj,
-    urljoin
+    urljoin,
 )
 
 
@@ -52,8 +52,8 @@ class BrainPOPBaseIE(InfoExtractor):
             '%s': {},
             'ad_%s': {
                 'format_note': 'Audio description',
-                'source_preference': -2
-            }
+                'source_preference': -2,
+            },
         }
         for additional_key_format, additional_key_fields in additional_key_formats.items():
             for key_quality, key_index in enumerate(('high', 'low')):
@@ -62,7 +62,7 @@ class BrainPOPBaseIE(InfoExtractor):
                     formats.extend(self._assemble_formats(data[full_key_index], full_key_index, display_id, token, {
                         'quality': -1 - key_quality,
                         **additional_key_fields,
-                        **extra_fields
+                        **extra_fields,
                     }))
         return formats
 
@@ -72,7 +72,7 @@ class BrainPOPBaseIE(InfoExtractor):
             data=json.dumps({'username': username, 'password': password}).encode(),
             headers={
                 'Content-Type': 'application/json',
-                'Referer': self._ORIGIN
+                'Referer': self._ORIGIN,
             }, note='Logging in', errnote='Unable to log in', expected_status=400)
         status_code = int_or_none(login_res['status_code'])
         if status_code != 1505:
@@ -131,12 +131,12 @@ class BrainPOPIE(BrainPOPBaseIE):
         formats, subtitles = [], {}
         formats.extend(self._extract_adaptive_formats(movie_feature_data, movie_feature_data.get('token', ''), display_id, '%s_v2', {
             'language': movie_feature.get('language') or 'en',
-            'language_preference': 10
+            'language_preference': 10,
         }))
         for lang, localized_feature in traverse_obj(movie_feature, 'localization', default={}, expected_type=dict).items():
             formats.extend(self._extract_adaptive_formats(localized_feature, localized_feature.get('token', ''), display_id, '%s_v2', {
                 'language': lang,
-                'language_preference': -10
+                'language_preference': -10,
             }))
 
         # TODO: Do localization fields also have subtitles?
@@ -145,7 +145,7 @@ class BrainPOPIE(BrainPOPBaseIE):
                 r'^subtitles_(?P<lang>\w+)$', name, 'subtitle metadata', default=None)
             if lang and url:
                 subtitles.setdefault(lang, []).append({
-                    'url': urljoin(self._CDN_URL, url)
+                    'url': urljoin(self._CDN_URL, url),
                 })
 
         return {
diff --git a/plugins/youtube_download/yt_dlp/extractor/bravotv.py b/plugins/youtube_download/yt_dlp/extractor/bravotv.py
index 419fe8c..0b2c447 100644
--- a/plugins/youtube_download/yt_dlp/extractor/bravotv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/bravotv.py
@@ -145,10 +145,9 @@ class BravoTVIE(AdobePassIE):
         tp_metadata = self._download_json(
             update_url_query(tp_url, {'format': 'preview'}), video_id, fatal=False)
 
-        seconds_or_none = lambda x: float_or_none(x, 1000)
         chapters = traverse_obj(tp_metadata, ('chapters', ..., {
-            'start_time': ('startTime', {seconds_or_none}),
-            'end_time': ('endTime', {seconds_or_none}),
+            'start_time': ('startTime', {float_or_none(scale=1000)}),
+            'end_time': ('endTime', {float_or_none(scale=1000)}),
         }))
         # prune pointless single chapters that span the entire duration from short videos
         if len(chapters) == 1 and not traverse_obj(chapters, (0, 'end_time')):
@@ -168,8 +167,8 @@ class BravoTVIE(AdobePassIE):
             **merge_dicts(traverse_obj(tp_metadata, {
                 'title': 'title',
                 'description': 'description',
-                'duration': ('duration', {seconds_or_none}),
-                'timestamp': ('pubDate', {seconds_or_none}),
+                'duration': ('duration', {float_or_none(scale=1000)}),
+                'timestamp': ('pubDate', {float_or_none(scale=1000)}),
                 'season_number': (('pl1$seasonNumber', 'nbcu$seasonNumber'), {int_or_none}),
                 'episode_number': (('pl1$episodeNumber', 'nbcu$episodeNumber'), {int_or_none}),
                 'series': (('pl1$show', 'nbcu$show'), (None, ...), {str}),
@@ -185,5 +184,5 @@ class BravoTVIE(AdobePassIE):
                 'episode_number': ('episodeNumber', {int_or_none}),
                 'episode': 'episodeTitle',
                 'series': 'show',
-            }))
+            })),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/breakcom.py b/plugins/youtube_download/yt_dlp/extractor/breakcom.py
deleted file mode 100644
index 00cf308..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/breakcom.py
+++ /dev/null
@@ -1,86 +0,0 @@
-from .common import InfoExtractor
-from .youtube import YoutubeIE
-from ..utils import (
-    int_or_none,
-    url_or_none,
-)
-
-
-class BreakIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?break\.com/video/(?P<display_id>[^/]+?)(?:-(?P<id>\d+))?(?:[/?#&]|$)'
-    _TESTS = [{
-        'url': 'http://www.break.com/video/when-girls-act-like-guys-2468056',
-        'info_dict': {
-            'id': '2468056',
-            'ext': 'mp4',
-            'title': 'When Girls Act Like D-Bags',
-            'age_limit': 13,
-        },
-    }, {
-        # youtube embed
-        'url': 'http://www.break.com/video/someone-forgot-boat-brakes-work',
-        'info_dict': {
-            'id': 'RrrDLdeL2HQ',
-            'ext': 'mp4',
-            'title': 'Whale Watching Boat Crashing Into San Diego Dock',
-            'description': 'md5:afc1b2772f0a8468be51dd80eb021069',
-            'upload_date': '20160331',
-            'uploader': 'Steve Holden',
-            'uploader_id': 'sdholden07',
-        },
-        'params': {
-            'skip_download': True,
-        }
-    }, {
-        'url': 'http://www.break.com/video/ugc/baby-flex-2773063',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        display_id, video_id = self._match_valid_url(url).groups()
-
-        webpage = self._download_webpage(url, display_id)
-
-        youtube_url = YoutubeIE._extract_url(webpage)
-        if youtube_url:
-            return self.url_result(youtube_url, ie=YoutubeIE.ie_key())
-
-        content = self._parse_json(
-            self._search_regex(
-                r'(?s)content["\']\s*:\s*(\[.+?\])\s*[,\n]', webpage,
-                'content'),
-            display_id)
-
-        formats = []
-        for video in content:
-            video_url = url_or_none(video.get('url'))
-            if not video_url:
-                continue
-            bitrate = int_or_none(self._search_regex(
-                r'(\d+)_kbps', video_url, 'tbr', default=None))
-            formats.append({
-                'url': video_url,
-                'format_id': 'http-%d' % bitrate if bitrate else 'http',
-                'tbr': bitrate,
-            })
-
-        title = self._search_regex(
-            (r'title["\']\s*:\s*(["\'])(?P<value>(?:(?!\1).)+)\1',
-             r'<h1[^>]*>(?P<value>[^<]+)'), webpage, 'title', group='value')
-
-        def get(key, name):
-            return int_or_none(self._search_regex(
-                r'%s["\']\s*:\s*["\'](\d+)' % key, webpage, name,
-                default=None))
-
-        age_limit = get('ratings', 'age limit')
-        video_id = video_id or get('pid', 'video id') or display_id
-
-        return {
-            'id': video_id,
-            'display_id': display_id,
-            'title': title,
-            'thumbnail': self._og_search_thumbnail(webpage),
-            'age_limit': age_limit,
-            'formats': formats,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/breitbart.py b/plugins/youtube_download/yt_dlp/extractor/breitbart.py
index ea0a59c..fedf477 100644
--- a/plugins/youtube_download/yt_dlp/extractor/breitbart.py
+++ b/plugins/youtube_download/yt_dlp/extractor/breitbart.py
@@ -2,7 +2,7 @@ from .common import InfoExtractor
 
 
 class BreitBartIE(InfoExtractor):
-    _VALID_URL = r'https?:\/\/(?:www\.)breitbart.com/videos/v/(?P<id>[^/]+)'
+    _VALID_URL = r'https?://(?:www\.)?breitbart\.com/videos/v/(?P<id>[^/?#]+)'
     _TESTS = [{
         'url': 'https://www.breitbart.com/videos/v/5cOz1yup/?pl=Ij6NDOji',
         'md5': '0aa6d1d6e183ac5ca09207fe49f17ade',
@@ -13,7 +13,7 @@ class BreitBartIE(InfoExtractor):
             'description': 'md5:bac35eb0256d1cb17f517f54c79404d5',
             'thumbnail': 'https://cdn.jwplayer.com/thumbs/5cOz1yup-1920.jpg',
             'age_limit': 0,
-        }
+        },
     }, {
         'url': 'https://www.breitbart.com/videos/v/eaiZjVOn/',
         'only_matching': True,
@@ -30,5 +30,5 @@ class BreitBartIE(InfoExtractor):
             'description': self._og_search_description(webpage),
             'thumbnail': self._og_search_thumbnail(webpage),
             'age_limit': self._rta_search(webpage),
-            'formats': formats
+            'formats': formats,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/brightcove.py b/plugins/youtube_download/yt_dlp/extractor/brightcove.py
index 61b1841..3ada1fd 100644
--- a/plugins/youtube_download/yt_dlp/extractor/brightcove.py
+++ b/plugins/youtube_download/yt_dlp/extractor/brightcove.py
@@ -1,25 +1,24 @@
 import base64
 import re
 import struct
+import urllib.parse
 import xml.etree.ElementTree
 
 from .adobepass import AdobePassIE
 from .common import InfoExtractor
-from ..compat import (
-    compat_etree_fromstring,
-    compat_parse_qs,
-    compat_urlparse,
-)
+from ..compat import compat_etree_fromstring
 from ..networking.exceptions import HTTPError
 from ..utils import (
+    ExtractorError,
+    UnsupportedError,
     clean_html,
     dict_get,
     extract_attributes,
-    ExtractorError,
     find_xpath_attr,
     fix_xml_ampersands,
     float_or_none,
     int_or_none,
+    join_nonempty,
     js_to_json,
     mimetype2ext,
     parse_iso8601,
@@ -29,10 +28,10 @@ from ..utils import (
     try_get,
     unescapeHTML,
     unsmuggle_url,
-    UnsupportedError,
     update_url_query,
     url_or_none,
 )
+from ..utils.traversal import traverse_obj
 
 
 class BrightcoveLegacyIE(InfoExtractor):
@@ -142,7 +141,7 @@ class BrightcoveLegacyIE(InfoExtractor):
             # from http://www.un.org/chinese/News/story.asp?NewsID=27724
             'url': 'https://link.brightcove.com/services/player/bcpid1722935254001/?bctid=5360463607001&autoStart=false&secureConnections=true&width=650&height=350',
             'only_matching': True,  # Tested in GenericIE
-        }
+        },
     ]
 
     _WEBPAGE_TESTS = [{
@@ -315,7 +314,7 @@ class BrightcoveLegacyIE(InfoExtractor):
         object_str = fix_xml_ampersands(object_str)
 
         try:
-            object_doc = compat_etree_fromstring(object_str.encode('utf-8'))
+            object_doc = compat_etree_fromstring(object_str.encode())
         except xml.etree.ElementTree.ParseError:
             return
 
@@ -323,7 +322,7 @@ class BrightcoveLegacyIE(InfoExtractor):
         if fv_el is not None:
             flashvars = dict(
                 (k, v[0])
-                for k, v in compat_parse_qs(fv_el.attrib['value']).items())
+                for k, v in urllib.parse.parse_qs(fv_el.attrib['value']).items())
         else:
             flashvars = {}
 
@@ -340,32 +339,32 @@ class BrightcoveLegacyIE(InfoExtractor):
 
         params = {}
 
-        playerID = find_param('playerID') or find_param('playerId')
-        if playerID is None:
+        player_id = find_param('playerID') or find_param('playerId')
+        if player_id is None:
             raise ExtractorError('Cannot find player ID')
-        params['playerID'] = playerID
+        params['playerID'] = player_id
 
-        playerKey = find_param('playerKey')
+        player_key = find_param('playerKey')
         # Not all pages define this value
-        if playerKey is not None:
-            params['playerKey'] = playerKey
+        if player_key is not None:
+            params['playerKey'] = player_key
         # These fields hold the id of the video
-        videoPlayer = find_param('@videoPlayer') or find_param('videoId') or find_param('videoID') or find_param('@videoList')
-        if videoPlayer is not None:
-            if isinstance(videoPlayer, list):
-                videoPlayer = videoPlayer[0]
-            videoPlayer = videoPlayer.strip()
+        video_player = find_param('@videoPlayer') or find_param('videoId') or find_param('videoID') or find_param('@videoList')
+        if video_player is not None:
+            if isinstance(video_player, list):
+                video_player = video_player[0]
+            video_player = video_player.strip()
             # UUID is also possible for videoPlayer (e.g.
             # http://www.popcornflix.com/hoodies-vs-hooligans/7f2d2b87-bbf2-4623-acfb-ea942b4f01dd
             # or http://www8.hp.com/cn/zh/home.html)
             if not (re.match(
                     r'^(?:\d+|[\da-fA-F]{8}-?[\da-fA-F]{4}-?[\da-fA-F]{4}-?[\da-fA-F]{4}-?[\da-fA-F]{12})$',
-                    videoPlayer) or videoPlayer.startswith('ref:')):
+                    video_player) or video_player.startswith('ref:')):
                 return None
-            params['@videoPlayer'] = videoPlayer
-        linkBase = find_param('linkBaseURL')
-        if linkBase is not None:
-            params['linkBaseURL'] = linkBase
+            params['@videoPlayer'] = video_player
+        link_base = find_param('linkBaseURL')
+        if link_base is not None:
+            params['linkBaseURL'] = link_base
         return cls._make_brightcove_url(params)
 
     @classmethod
@@ -389,7 +388,7 @@ class BrightcoveLegacyIE(InfoExtractor):
     @classmethod
     def _make_brightcove_url(cls, params):
         return update_url_query(
-            'http://c.brightcove.com/services/viewer/htmlFederated', params)
+            'https://c.brightcove.com/services/viewer/htmlFederated', params)
 
     @classmethod
     def _extract_brightcove_url(cls, webpage):
@@ -448,13 +447,13 @@ class BrightcoveLegacyIE(InfoExtractor):
         url = re.sub(r'(?<=[?&])bckey', 'playerKey', url)
         mobj = self._match_valid_url(url)
         query_str = mobj.group('query')
-        query = compat_urlparse.parse_qs(query_str)
+        query = urllib.parse.parse_qs(query_str)
 
-        videoPlayer = query.get('@videoPlayer')
-        if videoPlayer:
+        video_player = query.get('@videoPlayer')
+        if video_player:
             # We set the original url as the default 'Referer' header
             referer = query.get('linkBaseURL', [None])[0] or smuggled_data.get('Referer', url)
-            video_id = videoPlayer[0]
+            video_id = video_player[0]
             if 'playerID' not in query:
                 mobj = re.search(r'/bcpid(\d+)', url)
                 if mobj is not None:
@@ -473,7 +472,7 @@ class BrightcoveLegacyIE(InfoExtractor):
                         if referer:
                             headers['Referer'] = referer
                         player_page = self._download_webpage(
-                            'http://link.brightcove.com/services/player/bcpid' + player_id[0],
+                            'https://link.brightcove.com/services/player/bcpid' + player_id[0],
                             video_id, headers=headers, fatal=False)
                         if player_page:
                             player_key = self._search_regex(
@@ -483,7 +482,7 @@ class BrightcoveLegacyIE(InfoExtractor):
                     enc_pub_id = player_key.split(',')[1].replace('~', '=')
                     publisher_id = struct.unpack('>Q', base64.urlsafe_b64decode(enc_pub_id))[0]
             if publisher_id:
-                brightcove_new_url = 'http://players.brightcove.net/%s/default_default/index.html?videoId=%s' % (publisher_id, video_id)
+                brightcove_new_url = f'https://players.brightcove.net/{publisher_id}/default_default/index.html?videoId={video_id}'
                 if referer:
                     brightcove_new_url = smuggle_url(brightcove_new_url, {'referrer': referer})
                 return self.url_result(brightcove_new_url, BrightcoveNewIE.ie_key(), video_id)
@@ -541,12 +540,7 @@ class BrightcoveNewBaseIE(AdobePassIE):
                     })
 
                 def build_format_id(kind):
-                    format_id = kind
-                    if tbr:
-                        format_id += '-%dk' % int(tbr)
-                    if height:
-                        format_id += '-%dp' % height
-                    return format_id
+                    return join_nonempty(kind, tbr and f'{int(tbr)}k', height and f'{height}p')
 
                 if src or streaming_src:
                     f.update({
@@ -654,7 +648,7 @@ class BrightcoveNewIE(BrightcoveNewBaseIE):
         'params': {
             # m3u8 download
             'skip_download': True,
-        }
+        },
     }, {
         # playlist stream
         'url': 'https://players.brightcove.net/1752604059001/S13cJdUBz_default/index.html?playlistId=5718313430001',
@@ -666,7 +660,7 @@ class BrightcoveNewIE(BrightcoveNewBaseIE):
         'params': {
             # m3u8 download
             'skip_download': True,
-        }
+        },
     }, {
         'url': 'http://players.brightcove.net/5690807595001/HyZNerRl7_default/index.html?playlistId=5743160747001',
         'only_matching': True,
@@ -804,7 +798,7 @@ class BrightcoveNewIE(BrightcoveNewBaseIE):
         # Look for iframe embeds [1]
         for _, url in re.findall(
                 r'<iframe[^>]+src=(["\'])((?:https?:)?//players\.brightcove\.net/\d+/[^/]+/index\.html.+?)\1', webpage):
-            entries.append(url if url.startswith('http') else 'http:' + url)
+            entries.append(url if url.startswith(('http:', 'https:')) else 'https:' + url)
 
         # Look for <video> tags [2] and embed_in_page embeds [3]
         # [2] looks like:
@@ -833,8 +827,7 @@ class BrightcoveNewIE(BrightcoveNewBaseIE):
             player_id = player_id or attrs.get('data-player') or 'default'
             embed = embed or attrs.get('data-embed') or 'default'
 
-            bc_url = 'http://players.brightcove.net/%s/%s_%s/index.html?videoId=%s' % (
-                account_id, player_id, embed, video_id)
+            bc_url = f'https://players.brightcove.net/{account_id}/{player_id}_{embed}/index.html?videoId={video_id}'
 
             # Some brightcove videos may be embedded with video tag only and
             # without script tag or any mentioning of brightcove at all. Such
@@ -865,13 +858,13 @@ class BrightcoveNewIE(BrightcoveNewBaseIE):
 
         account_id, player_id, embed, content_type, video_id = self._match_valid_url(url).groups()
 
-        policy_key_id = '%s_%s' % (account_id, player_id)
+        policy_key_id = f'{account_id}_{player_id}'
         policy_key = self.cache.load('brightcove', policy_key_id)
         policy_key_extracted = False
         store_pk = lambda x: self.cache.store('brightcove', policy_key_id, x)
 
         def extract_policy_key():
-            base_url = 'http://players.brightcove.net/%s/%s_%s/' % (account_id, player_id, embed)
+            base_url = f'https://players.brightcove.net/{account_id}/{player_id}_{embed}/'
             config = self._download_json(
                 base_url + 'config.json', video_id, fatal=False) or {}
             policy_key = try_get(
@@ -910,7 +903,7 @@ class BrightcoveNewIE(BrightcoveNewBaseIE):
             if not policy_key:
                 policy_key = extract_policy_key()
                 policy_key_extracted = True
-            headers['Accept'] = 'application/json;pk=%s' % policy_key
+            headers['Accept'] = f'application/json;pk={policy_key}'
             try:
                 json_data = self._download_json(api_url, video_id, headers=headers)
                 break
@@ -936,15 +929,15 @@ class BrightcoveNewIE(BrightcoveNewBaseIE):
                 custom_fields['bcadobepassresourceid'])
             json_data = self._download_json(
                 api_url, video_id, headers={
-                    'Accept': 'application/json;pk=%s' % policy_key
+                    'Accept': f'application/json;pk={policy_key}',
                 }, query={
                     'tveToken': tve_token,
                 })
 
         if content_type == 'playlist':
             return self.playlist_result(
-                [self._parse_brightcove_metadata(vid, vid.get('id'), headers)
-                 for vid in json_data.get('videos', []) if vid.get('id')],
+                (self._parse_brightcove_metadata(vid, vid['id'], headers)
+                 for vid in traverse_obj(json_data, ('videos', lambda _, v: v['id']))),
                 json_data.get('id'), json_data.get('name'),
                 json_data.get('description'))
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/brilliantpala.py b/plugins/youtube_download/yt_dlp/extractor/brilliantpala.py
new file mode 100644
index 0000000..950a70a
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/brilliantpala.py
@@ -0,0 +1,136 @@
+import hashlib
+
+from .common import InfoExtractor
+from ..utils import (
+    ExtractorError,
+    traverse_obj,
+    urlencode_postdata,
+)
+
+
+class BrilliantpalaBaseIE(InfoExtractor):
+    _NETRC_MACHINE = 'brilliantpala'
+    _DOMAIN = '{subdomain}.brilliantpala.org'
+
+    def _initialize_pre_login(self):
+        self._HOMEPAGE = f'https://{self._DOMAIN}'
+        self._LOGIN_API = f'{self._HOMEPAGE}/login/'
+        self._LOGOUT_DEVICES_API = f'{self._HOMEPAGE}/logout_devices/?next=/'
+        self._CONTENT_API = f'{self._HOMEPAGE}/api/v2.4/contents/{{content_id}}/'
+        self._HLS_AES_URI = f'{self._HOMEPAGE}/api/v2.5/video_contents/{{content_id}}/key/'
+
+    def _get_logged_in_username(self, url, video_id):
+        webpage, urlh = self._download_webpage_handle(url, video_id)
+        if urlh.url.startswith(self._LOGIN_API):
+            self.raise_login_required()
+        return self._html_search_regex(
+            r'"username"\s*:\s*"(?P<username>[^"]+)"', webpage, 'logged-in username')
+
+    def _perform_login(self, username, password):
+        login_page, urlh = self._download_webpage_handle(
+            self._LOGIN_API, None, 'Downloading login page', expected_status=401)
+        if urlh.status != 401 and not urlh.url.startswith(self._LOGIN_API):
+            self.write_debug('Cookies are valid, no login required.')
+            return
+
+        if urlh.status == 401:
+            self.write_debug('Got HTTP Error 401; cookies have been invalidated')
+            login_page = self._download_webpage(self._LOGIN_API, None, 'Re-downloading login page')
+
+        login_form = self._hidden_inputs(login_page)
+        login_form.update({
+            'username': username,
+            'password': password,
+        })
+        self._set_cookie(self._DOMAIN, 'csrftoken', login_form['csrfmiddlewaretoken'])
+
+        logged_page = self._download_webpage(
+            self._LOGIN_API, None, note='Logging in', headers={'Referer': self._LOGIN_API},
+            data=urlencode_postdata(login_form))
+
+        if self._html_search_regex(
+                r'(Your username / email and password)', logged_page, 'auth fail', default=None):
+            raise ExtractorError('wrong username or password', expected=True)
+
+        # the maximum number of logins is one
+        if self._html_search_regex(
+                r'(Logout Other Devices)', logged_page, 'logout devices button', default=None):
+            logout_device_form = self._hidden_inputs(logged_page)
+            self._download_webpage(
+                self._LOGOUT_DEVICES_API, None, headers={'Referer': self._LOGIN_API},
+                note='Logging out other devices', data=urlencode_postdata(logout_device_form))
+
+    def _real_extract(self, url):
+        course_id, content_id = self._match_valid_url(url).group('course_id', 'content_id')
+        video_id = f'{course_id}-{content_id}'
+
+        username = self._get_logged_in_username(url, video_id)
+
+        content_json = self._download_json(
+            self._CONTENT_API.format(content_id=content_id), video_id,
+            note='Fetching content info', errnote='Unable to fetch content info')
+
+        entries = []
+        for stream in traverse_obj(content_json, ('video', 'streams', lambda _, v: v['id'] and v['url'])):
+            formats = self._extract_m3u8_formats(stream['url'], video_id, fatal=False)
+            if not formats:
+                continue
+            entries.append({
+                'id': str(stream['id']),
+                'title': content_json.get('title'),
+                'formats': formats,
+                'hls_aes': {'uri': self._HLS_AES_URI.format(content_id=content_id)},
+                'http_headers': {'X-Key': hashlib.sha256(username.encode('ascii')).hexdigest()},
+                'thumbnail': content_json.get('cover_image'),
+            })
+
+        return self.playlist_result(
+            entries, playlist_id=video_id, playlist_title=content_json.get('title'))
+
+
+class BrilliantpalaElearnIE(BrilliantpalaBaseIE):
+    IE_NAME = 'Brilliantpala:Elearn'
+    IE_DESC = 'VoD on elearn.brilliantpala.org'
+    _VALID_URL = r'https?://elearn\.brilliantpala\.org/courses/(?P<course_id>\d+)/contents/(?P<content_id>\d+)/?'
+    _TESTS = [{
+        'url': 'https://elearn.brilliantpala.org/courses/42/contents/12345/',
+        'only_matching': True,
+    }, {
+        'url': 'https://elearn.brilliantpala.org/courses/98/contents/36683/',
+        'info_dict': {
+            'id': '23577',
+            'ext': 'mp4',
+            'title': 'Physical World, Units and Measurements  - 1',
+            'thumbnail': 'https://d1j3vi2u94ebt0.cloudfront.net/institute/brilliantpalalms/chapter_contents/26237/e657f81b90874be19795c7ea081f8d5c.png',
+            'live_status': 'not_live',
+        },
+        'params': {
+            'skip_download': True,
+        },
+    }]
+
+    _DOMAIN = BrilliantpalaBaseIE._DOMAIN.format(subdomain='elearn')
+
+
+class BrilliantpalaClassesIE(BrilliantpalaBaseIE):
+    IE_NAME = 'Brilliantpala:Classes'
+    IE_DESC = 'VoD on classes.brilliantpala.org'
+    _VALID_URL = r'https?://classes\.brilliantpala\.org/courses/(?P<course_id>\d+)/contents/(?P<content_id>\d+)/?'
+    _TESTS = [{
+        'url': 'https://classes.brilliantpala.org/courses/42/contents/12345/',
+        'only_matching': True,
+    }, {
+        'url': 'https://classes.brilliantpala.org/courses/416/contents/25445/',
+        'info_dict': {
+            'id': '9128',
+            'ext': 'mp4',
+            'title': 'Motion in a Straight Line - Class 1',
+            'thumbnail': 'https://d3e4y8hquds3ek.cloudfront.net/institute/brilliantpalaelearn/chapter_contents/ff5ba838d0ec43419f67387fe1a01fa8.png',
+            'live_status': 'not_live',
+        },
+        'params': {
+            'skip_download': True,
+        },
+    }]
+
+    _DOMAIN = BrilliantpalaBaseIE._DOMAIN.format(subdomain='classes')
diff --git a/plugins/youtube_download/yt_dlp/extractor/bundesliga.py b/plugins/youtube_download/yt_dlp/extractor/bundesliga.py
index e76dd58..29f8f94 100644
--- a/plugins/youtube_download/yt_dlp/extractor/bundesliga.py
+++ b/plugins/youtube_download/yt_dlp/extractor/bundesliga.py
@@ -16,17 +16,17 @@ class BundesligaIE(InfoExtractor):
                 'upload_date': '20220928',
                 'duration': 146,
                 'timestamp': 1664366511,
-                'description': 'md5:803d4411bd134140c774021dd4b7598b'
-            }
+                'description': 'md5:803d4411bd134140c774021dd4b7598b',
+            },
         },
         {
             'url': 'https://www.bundesliga.com/en/bundesliga/videos/latest-features/T8IKc8TX?vid=ROHjs06G',
-            'only_matching': True
+            'only_matching': True,
         },
         {
             'url': 'https://www.bundesliga.com/en/bundesliga/videos/goals?vid=mOG56vWA',
-            'only_matching': True
-        }
+            'only_matching': True,
+        },
     ]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/bundestag.py b/plugins/youtube_download/yt_dlp/extractor/bundestag.py
new file mode 100644
index 0000000..3dacbbd
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/bundestag.py
@@ -0,0 +1,124 @@
+import functools
+import re
+
+from .common import InfoExtractor
+from ..networking.exceptions import HTTPError
+from ..utils import (
+    ExtractorError,
+    bug_reports_message,
+    clean_html,
+    format_field,
+    int_or_none,
+    url_or_none,
+)
+from ..utils.traversal import (
+    find_element,
+    traverse_obj,
+)
+
+
+class BundestagIE(InfoExtractor):
+    _VALID_URL = [
+        r'https?://dbtg\.tv/[cf]vid/(?P<id>\d+)',
+        r'https?://www\.bundestag\.de/mediathek/?\?(?:[^#]+&)?videoid=(?P<id>\d+)',
+    ]
+    _TESTS = [{
+        'url': 'https://dbtg.tv/cvid/7605304',
+        'info_dict': {
+            'id': '7605304',
+            'ext': 'mp4',
+            'title': '145. Sitzung vom 15.12.2023, TOP 24 Barrierefreiheit',
+            'description': 'md5:321a9dc6bdad201264c0045efc371561',
+        },
+    }, {
+        'url': 'https://www.bundestag.de/mediathek?videoid=7602120&url=L21lZGlhdGhla292ZXJsYXk=&mod=mediathek',
+        'info_dict': {
+            'id': '7602120',
+            'ext': 'mp4',
+            'title': '130. Sitzung vom 18.10.2023, TOP 1 Befragung der Bundesregierung',
+            'description': 'Befragung der Bundesregierung',
+        },
+    }, {
+        'url': 'https://www.bundestag.de/mediathek?videoid=7604941#url=L21lZGlhdGhla292ZXJsYXk/dmlkZW9pZD03NjA0OTQx&mod=mediathek',
+        'only_matching': True,
+    }, {
+        'url': 'http://dbtg.tv/fvid/3594346',
+        'only_matching': True,
+    }]
+
+    _OVERLAY_URL = 'https://www.bundestag.de/mediathekoverlay'
+    _INSTANCE_FORMAT = 'https://cldf-wzw-od.r53.cdn.tv1.eu/13014bundestagod/_definst_/13014bundestag/ondemand/3777parlamentsfernsehen/archiv/app144277506/145293313/{0}/{0}_playlist.smil/playlist.m3u8'
+
+    _SHARE_URL = 'https://webtv.bundestag.de/player/macros/_x_s-144277506/shareData.json?contentId='
+    _SHARE_AUDIO_REGEX = r'/\d+_(?P<codec>\w+)_(?P<bitrate>\d+)kb_(?P<channels>\w+)_\w+_\d+\.(?P<ext>\w+)'
+    _SHARE_VIDEO_REGEX = r'/\d+_(?P<codec>\w+)_(?P<width>\w+)_(?P<height>\w+)_(?P<bitrate>\d+)kb_\w+_\w+_\d+\.(?P<ext>\w+)'
+
+    def _bt_extract_share_formats(self, video_id):
+        share_data = self._download_json(
+            f'{self._SHARE_URL}{video_id}', video_id, note='Downloading share format JSON')
+        if traverse_obj(share_data, ('status', 'code', {int})) != 1:
+            self.report_warning(format_field(
+                share_data, [('status', 'message', {str})],
+                'Share API response: %s', default='Unknown Share API Error')
+                + bug_reports_message())
+            return
+
+        for name, url in share_data.items():
+            if not isinstance(name, str) or not url_or_none(url):
+                continue
+
+            elif name.startswith('audio'):
+                match = re.search(self._SHARE_AUDIO_REGEX, url)
+                yield {
+                    'format_id': name,
+                    'url': url,
+                    'vcodec': 'none',
+                    **traverse_obj(match, {
+                        'acodec': 'codec',
+                        'audio_channels': ('channels', {{'mono': 1, 'stereo': 2}.get}),
+                        'abr': ('bitrate', {int_or_none}),
+                        'ext': 'ext',
+                    }),
+                }
+
+            elif name.startswith('download'):
+                match = re.search(self._SHARE_VIDEO_REGEX, url)
+                yield {
+                    'format_id': name,
+                    'url': url,
+                    **traverse_obj(match, {
+                        'vcodec': 'codec',
+                        'tbr': ('bitrate', {int_or_none}),
+                        'width': ('width', {int_or_none}),
+                        'height': ('height', {int_or_none}),
+                        'ext': 'ext',
+                    }),
+                }
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        formats = []
+        result = {'id': video_id, 'formats': formats}
+
+        try:
+            formats.extend(self._extract_m3u8_formats(
+                self._INSTANCE_FORMAT.format(video_id), video_id, m3u8_id='instance'))
+        except ExtractorError as error:
+            if isinstance(error.cause, HTTPError) and error.cause.status == 404:
+                raise ExtractorError('Could not find video id', expected=True)
+            self.report_warning(f'Error extracting hls formats: {error}', video_id)
+        formats.extend(self._bt_extract_share_formats(video_id))
+        if not formats:
+            self.raise_no_formats('Could not find suitable formats', video_id=video_id)
+
+        result.update(traverse_obj(self._download_webpage(
+            self._OVERLAY_URL, video_id,
+            query={'videoid': video_id, 'view': 'main'},
+            note='Downloading metadata overlay', fatal=False,
+        ), {
+            'title': (
+                {find_element(tag='h3')}, {functools.partial(re.sub, r'<span[^>]*>[^<]+</span>', '')}, {clean_html}),
+            'description': ({find_element(tag='p')}, {clean_html}),
+        }))
+
+        return result
diff --git a/plugins/youtube_download/yt_dlp/extractor/bunnycdn.py b/plugins/youtube_download/yt_dlp/extractor/bunnycdn.py
new file mode 100644
index 0000000..d787533
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/bunnycdn.py
@@ -0,0 +1,178 @@
+import json
+
+from .common import InfoExtractor
+from ..networking import HEADRequest
+from ..utils import (
+    ExtractorError,
+    extract_attributes,
+    int_or_none,
+    parse_qs,
+    smuggle_url,
+    unsmuggle_url,
+    url_or_none,
+    urlhandle_detect_ext,
+)
+from ..utils.traversal import find_element, traverse_obj
+
+
+class BunnyCdnIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:iframe\.mediadelivery\.net|video\.bunnycdn\.com)/(?:embed|play)/(?P<library_id>\d+)/(?P<id>[\da-f-]+)'
+    _EMBED_REGEX = [rf'<iframe[^>]+src=[\'"](?P<url>{_VALID_URL}[^\'"]*)[\'"]']
+    _TESTS = [{
+        'url': 'https://iframe.mediadelivery.net/embed/113933/e73edec1-e381-4c8b-ae73-717a140e0924',
+        'info_dict': {
+            'id': 'e73edec1-e381-4c8b-ae73-717a140e0924',
+            'ext': 'mp4',
+            'title': 'mistress morgana (3).mp4',
+            'description': '',
+            'timestamp': 1693251673,
+            'thumbnail': r're:^https?://.*\.b-cdn\.net/e73edec1-e381-4c8b-ae73-717a140e0924/thumbnail\.jpg',
+            'duration': 7.0,
+            'upload_date': '20230828',
+        },
+        'params': {'skip_download': True},
+    }, {
+        'url': 'https://iframe.mediadelivery.net/play/136145/32e34c4b-0d72-437c-9abb-05e67657da34',
+        'info_dict': {
+            'id': '32e34c4b-0d72-437c-9abb-05e67657da34',
+            'ext': 'mp4',
+            'timestamp': 1691145748,
+            'thumbnail': r're:^https?://.*\.b-cdn\.net/32e34c4b-0d72-437c-9abb-05e67657da34/thumbnail_9172dc16\.jpg',
+            'duration': 106.0,
+            'description': 'md5:981a3e899a5c78352b21ed8b2f1efd81',
+            'upload_date': '20230804',
+            'title': 'Sanela ist Teil der #arbeitsmarktkraft',
+        },
+        'params': {'skip_download': True},
+    }, {
+        # Stream requires activation and pings
+        'url': 'https://iframe.mediadelivery.net/embed/200867/2e8545ec-509d-4571-b855-4cf0235ccd75',
+        'info_dict': {
+            'id': '2e8545ec-509d-4571-b855-4cf0235ccd75',
+            'ext': 'mp4',
+            'timestamp': 1708497752,
+            'title': 'netflix part 1',
+            'duration': 3959.0,
+            'description': '',
+            'upload_date': '20240221',
+            'thumbnail': r're:^https?://.*\.b-cdn\.net/2e8545ec-509d-4571-b855-4cf0235ccd75/thumbnail\.jpg',
+        },
+        'params': {'skip_download': True},
+    }]
+    _WEBPAGE_TESTS = [{
+        # Stream requires Referer
+        'url': 'https://conword.io/',
+        'info_dict': {
+            'id': '3a5d863e-9cd6-447e-b6ef-e289af50b349',
+            'ext': 'mp4',
+            'title': 'Conword bei der Stadt Köln und Stadt Dortmund',
+            'description': '',
+            'upload_date': '20231031',
+            'duration': 31.0,
+            'thumbnail': 'https://video.watchuh.com/3a5d863e-9cd6-447e-b6ef-e289af50b349/thumbnail.jpg',
+            'timestamp': 1698783879,
+        },
+        'params': {'skip_download': True},
+    }, {
+        # URL requires token and expires
+        'url': 'https://www.stockphotos.com/video/moscow-subway-the-train-is-arriving-at-the-park-kultury-station-10017830',
+        'info_dict': {
+            'id': '0b02fa20-4e8c-4140-8f87-f64d820a3386',
+            'ext': 'mp4',
+            'thumbnail': r're:^https?://.*\.b-cdn\.net/0b02fa20-4e8c-4140-8f87-f64d820a3386/thumbnail\.jpg',
+            'title': 'Moscow subway. The train is arriving at the Park Kultury station.',
+            'upload_date': '20240531',
+            'duration': 18.0,
+            'timestamp': 1717152269,
+            'description': '',
+        },
+        'params': {'skip_download': True},
+    }]
+
+    @classmethod
+    def _extract_embed_urls(cls, url, webpage):
+        for embed_url in super()._extract_embed_urls(url, webpage):
+            yield smuggle_url(embed_url, {'Referer': url})
+
+    def _real_extract(self, url):
+        url, smuggled_data = unsmuggle_url(url, {})
+
+        video_id, library_id = self._match_valid_url(url).group('id', 'library_id')
+        webpage = self._download_webpage(
+            f'https://iframe.mediadelivery.net/embed/{library_id}/{video_id}', video_id,
+            headers=traverse_obj(smuggled_data, {'Referer': 'Referer'}),
+            query=traverse_obj(parse_qs(url), {'token': 'token', 'expires': 'expires'}))
+
+        if html_title := self._html_extract_title(webpage, default=None) == '403':
+            raise ExtractorError(
+                'This video is inaccessible. Setting a Referer header '
+                'might be required to access the video', expected=True)
+        elif html_title == '404':
+            raise ExtractorError('This video does not exist', expected=True)
+
+        headers = {'Referer': url}
+
+        info = traverse_obj(self._parse_html5_media_entries(url, webpage, video_id, _headers=headers), 0) or {}
+        formats = info.get('formats') or []
+        subtitles = info.get('subtitles') or {}
+
+        original_url = self._search_regex(
+            r'(?:var|const|let)\s+originalUrl\s*=\s*["\']([^"\']+)["\']', webpage, 'original url', default=None)
+        if url_or_none(original_url):
+            urlh = self._request_webpage(
+                HEADRequest(original_url), video_id=video_id, note='Checking original',
+                headers=headers, fatal=False, expected_status=(403, 404))
+            if urlh and urlh.status == 200:
+                formats.append({
+                    'url': original_url,
+                    'format_id': 'source',
+                    'quality': 1,
+                    'http_headers': headers,
+                    'ext': urlhandle_detect_ext(urlh, default='mp4'),
+                    'filesize': int_or_none(urlh.get_header('Content-Length')),
+                })
+
+        # MediaCage Streams require activation and pings
+        src_url = self._search_regex(
+            r'\.setAttribute\([\'"]src[\'"],\s*[\'"]([^\'"]+)[\'"]\)', webpage, 'src url', default=None)
+        activation_url = self._search_regex(
+            r'loadUrl\([\'"]([^\'"]+/activate)[\'"]', webpage, 'activation url', default=None)
+        ping_url = self._search_regex(
+            r'loadUrl\([\'"]([^\'"]+/ping)[\'"]', webpage, 'ping url', default=None)
+        secret = traverse_obj(parse_qs(src_url), ('secret', 0))
+        context_id = traverse_obj(parse_qs(src_url), ('contextId', 0))
+        ping_data = {}
+        if src_url and activation_url and ping_url and secret and context_id:
+            self._download_webpage(
+                activation_url, video_id, headers=headers, note='Downloading activation data')
+
+            fmts, subs = self._extract_m3u8_formats_and_subtitles(
+                src_url, video_id, 'mp4', headers=headers, m3u8_id='hls', fatal=False)
+            for fmt in fmts:
+                fmt.update({
+                    'protocol': 'bunnycdn',
+                    'http_headers': headers,
+                })
+            formats.extend(fmts)
+            self._merge_subtitles(subs, target=subtitles)
+
+            ping_data = {
+                '_bunnycdn_ping_data': {
+                    'url': ping_url,
+                    'headers': headers,
+                    'secret': secret,
+                    'context_id': context_id,
+                },
+            }
+
+        return {
+            'id': video_id,
+            'formats': formats,
+            'subtitles': subtitles,
+            **traverse_obj(webpage, ({find_element(id='main-video', html=True)}, {extract_attributes}, {
+                'title': ('data-plyr-config', {json.loads}, 'title', {str}),
+                'thumbnail': ('data-poster', {url_or_none}),
+            })),
+            **ping_data,
+            **self._search_json_ld(webpage, video_id, fatal=False),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/businessinsider.py b/plugins/youtube_download/yt_dlp/extractor/businessinsider.py
index 4b3f5e6..7cb9af6 100644
--- a/plugins/youtube_download/yt_dlp/extractor/businessinsider.py
+++ b/plugins/youtube_download/yt_dlp/extractor/businessinsider.py
@@ -10,7 +10,7 @@ class BusinessInsiderIE(InfoExtractor):
         'info_dict': {
             'id': 'cjGDb0X9',
             'ext': 'mp4',
-            'title': "Bananas give you more radiation exposure than living next to a nuclear power plant",
+            'title': 'Bananas give you more radiation exposure than living next to a nuclear power plant',
             'description': 'md5:0175a3baf200dd8fa658f94cade841b3',
             'upload_date': '20160611',
             'timestamp': 1465675620,
@@ -41,5 +41,5 @@ class BusinessInsiderIE(InfoExtractor):
              r'(?:jwplatform\.com/players/|jwplayer_)([a-zA-Z0-9]{8})'),
             webpage, 'jwplatform id')
         return self.url_result(
-            'jwplatform:%s' % jwplatform_id, ie=JWPlatformIE.ie_key(),
+            f'jwplatform:{jwplatform_id}', ie=JWPlatformIE.ie_key(),
             video_id=video_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/buzzfeed.py b/plugins/youtube_download/yt_dlp/extractor/buzzfeed.py
index b30a3b7..9847095 100644
--- a/plugins/youtube_download/yt_dlp/extractor/buzzfeed.py
+++ b/plugins/youtube_download/yt_dlp/extractor/buzzfeed.py
@@ -23,8 +23,8 @@ class BuzzFeedIE(InfoExtractor):
                 'upload_date': '20141024',
                 'uploader_id': 'Buddhanz1',
                 'uploader': 'Angry Ram',
-            }
-        }]
+            },
+        }],
     }, {
         'url': 'http://www.buzzfeed.com/sheridanwatson/look-at-this-cute-dog-omg?utm_term=4ldqpia',
         'params': {
@@ -45,7 +45,7 @@ class BuzzFeedIE(InfoExtractor):
                 'uploader_id': 'CindysMunchkin',
                 'uploader': 're:^Munchkin the',
             },
-        }]
+        }],
     }, {
         'url': 'http://www.buzzfeed.com/craigsilverman/the-most-adorable-crash-landing-ever#.eq7pX0BAmK',
         'info_dict': {
diff --git a/plugins/youtube_download/yt_dlp/extractor/byutv.py b/plugins/youtube_download/yt_dlp/extractor/byutv.py
index 9ed6efe..e9796f7 100644
--- a/plugins/youtube_download/yt_dlp/extractor/byutv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/byutv.py
@@ -8,9 +8,9 @@ from ..utils import (
 
 
 class BYUtvIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?byutv\.org/(?:watch|player)/(?!event/)(?P<id>[0-9a-f-]+)(?:/(?P<display_id>[^/?#&]+))?'
     _TESTS = [{
-        # ooyalaVOD
         'url': 'http://www.byutv.org/watch/6587b9a3-89d2-42a6-a7f7-fd2f81840a7d/studio-c-season-5-episode-5',
         'info_dict': {
             'id': 'ZvanRocTpW-G5_yZFeltTAMv6jxOU9KH',
@@ -24,7 +24,6 @@ class BYUtvIE(InfoExtractor):
         'params': {
             'skip_download': True,
         },
-        'add_ie': ['Ooyala'],
     }, {
         # dvr
         'url': 'https://www.byutv.org/player/8f1dab9b-b243-47c8-b525-3e2d021a3451/byu-softball-pacific-vs-byu-41219---game-2',
@@ -37,7 +36,7 @@ class BYUtvIE(InfoExtractor):
             'duration': 11645,
         },
         'params': {
-            'skip_download': True
+            'skip_download': True,
         },
     }, {
         'url': 'http://www.byutv.org/watch/6587b9a3-89d2-42a6-a7f7-fd2f81840a7d',
@@ -63,19 +62,6 @@ class BYUtvIE(InfoExtractor):
                 'x-byutv-platformkey': 'xsaaw9c7y5',
             })
 
-        ep = video.get('ooyalaVOD')
-        if ep:
-            return {
-                '_type': 'url_transparent',
-                'ie_key': 'Ooyala',
-                'url': 'ooyala:%s' % ep['providerId'],
-                'id': video_id,
-                'display_id': display_id,
-                'title': ep.get('title'),
-                'description': ep.get('description'),
-                'thumbnail': ep.get('imageThumbnail'),
-            }
-
         info = {}
         formats = []
         subtitles = {}
diff --git a/plugins/youtube_download/yt_dlp/extractor/c56.py b/plugins/youtube_download/yt_dlp/extractor/c56.py
index e4b1c9a..6264803 100644
--- a/plugins/youtube_download/yt_dlp/extractor/c56.py
+++ b/plugins/youtube_download/yt_dlp/extractor/c56.py
@@ -38,7 +38,7 @@ class C56IE(InfoExtractor):
             return self.url_result(sohu_video_info['url'], 'Sohu')
 
         page = self._download_json(
-            'http://vxml.56.com/json/%s/' % text_id, text_id, 'Downloading video info')
+            f'http://vxml.56.com/json/{text_id}/', text_id, 'Downloading video info')
 
         info = page['info']
 
@@ -46,7 +46,7 @@ class C56IE(InfoExtractor):
             {
                 'format_id': f['type'],
                 'filesize': int(f['filesize']),
-                'url': f['url']
+                'url': f['url'],
             } for f in info['rfiles']
         ]
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/cableav.py b/plugins/youtube_download/yt_dlp/extractor/cableav.py
deleted file mode 100644
index 2e374e5..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/cableav.py
+++ /dev/null
@@ -1,32 +0,0 @@
-from .common import InfoExtractor
-
-
-class CableAVIE(InfoExtractor):
-    _VALID_URL = r'https://cableav\.tv/(?P<id>[a-zA-Z0-9]+)'
-    _TESTS = [{
-        'url': 'https://cableav.tv/lS4iR9lWjN8/',
-        'md5': '7e3fe5e49d61c4233b7f5b0f69b15e18',
-        'info_dict': {
-            'id': 'lS4iR9lWjN8',
-            'ext': 'mp4',
-            'title': '國產麻豆AV 叮叮映畫 DDF001 情欲小說家 - CableAV',
-            'description': '國產AV 480p, 720p 国产麻豆AV 叮叮映画 DDF001 情欲小说家',
-            'thumbnail': r're:^https?://.*\.jpg$',
-        }
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-
-        video_url = self._og_search_video_url(webpage, secure=False)
-
-        formats = self._extract_m3u8_formats(video_url, video_id, 'mp4')
-
-        return {
-            'id': video_id,
-            'title': self._og_search_title(webpage),
-            'description': self._og_search_description(webpage),
-            'thumbnail': self._og_search_thumbnail(webpage),
-            'formats': formats,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/caffeinetv.py b/plugins/youtube_download/yt_dlp/extractor/caffeinetv.py
new file mode 100644
index 0000000..ea5134d
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/caffeinetv.py
@@ -0,0 +1,74 @@
+from .common import InfoExtractor
+from ..utils import (
+    determine_ext,
+    int_or_none,
+    parse_iso8601,
+    traverse_obj,
+    urljoin,
+)
+
+
+class CaffeineTVIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?caffeine\.tv/[^/?#]+/video/(?P<id>[\da-f-]+)'
+    _TESTS = [{
+        'url': 'https://www.caffeine.tv/TsuSurf/video/cffc0a00-e73f-11ec-8080-80017d29f26e',
+        'info_dict': {
+            'id': 'cffc0a00-e73f-11ec-8080-80017d29f26e',
+            'ext': 'mp4',
+            'title': 'GOOOOD MORNINNNNN #highlights',
+            'timestamp': 1654702180,
+            'upload_date': '20220608',
+            'uploader': 'RahJON Wicc',
+            'uploader_id': 'TsuSurf',
+            'duration': 3145,
+            'age_limit': 17,
+            'thumbnail': 'https://www.caffeine.tv/broadcasts/776b6f84-9cd5-42e3-af1d-4a776eeed697/replay/lobby.jpg',
+            'comment_count': int,
+            'view_count': int,
+            'like_count': int,
+            'tags': ['highlights', 'battlerap'],
+        },
+        'params': {
+            'skip_download': 'm3u8',
+        },
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        json_data = self._download_json(
+            f'https://api.caffeine.tv/social/public/activity/{video_id}', video_id)
+        broadcast_info = traverse_obj(json_data, ('broadcast_info', {dict})) or {}
+
+        video_url = broadcast_info['video_url']
+        ext = determine_ext(video_url)
+        if ext == 'm3u8':
+            formats = self._extract_m3u8_formats(video_url, video_id, 'mp4')
+        else:
+            formats = [{'url': video_url}]
+
+        return {
+            'id': video_id,
+            'formats': formats,
+            **traverse_obj(json_data, {
+                'like_count': ('like_count', {int_or_none}),
+                'view_count': ('view_count', {int_or_none}),
+                'comment_count': ('comment_count', {int_or_none}),
+                'tags': ('tags', ..., {str}, filter),
+                'uploader': ('user', 'name', {str}),
+                'uploader_id': (((None, 'user'), 'username'), {str}, any),
+                'is_live': ('is_live', {bool}),
+            }),
+            **traverse_obj(broadcast_info, {
+                'title': ('broadcast_title', {str}),
+                'duration': ('content_duration', {int_or_none}),
+                'timestamp': ('broadcast_start_time', {parse_iso8601}),
+                'thumbnail': ('preview_image_path', {urljoin(url)}),
+            }),
+            'age_limit': {
+                # assume Apple Store ratings: https://en.wikipedia.org/wiki/Mobile_software_content_rating_system
+                'FOUR_PLUS': 0,
+                'NINE_PLUS': 9,
+                'TWELVE_PLUS': 12,
+                'SEVENTEEN_PLUS': 17,
+            }.get(broadcast_info.get('content_rating'), 17),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/callin.py b/plugins/youtube_download/yt_dlp/extractor/callin.py
index c77179c..ee2e56f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/callin.py
+++ b/plugins/youtube_download/yt_dlp/extractor/callin.py
@@ -3,7 +3,7 @@ from ..utils import float_or_none, int_or_none, make_archive_id, traverse_obj
 
 
 class CallinIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?callin\.com/(episode)/(?P<id>[-a-zA-Z]+)'
+    _VALID_URL = r'https?://(?:www\.)?callin\.com/episode/(?P<id>[-a-zA-Z]+)'
     _TESTS = [{
         'url': 'https://www.callin.com/episode/the-title-ix-regime-and-the-long-march-through-EBfXYSrsjc',
         'info_dict': {
@@ -29,8 +29,8 @@ class CallinIE(InfoExtractor):
             'series_id': '436d1f82ddeb30cd2306ea9156044d8d2cfdc3f1f1552d245117a42173e78553',
             'episode': 'The Title IX Regime and the Long March Through and Beyond the Institutions',
             'episode_number': 1,
-            'episode_id': '218b979630a35ead12c6fd096f2996c56c37e4d0dc1f6dc0feada32dcf7b31cd'
-        }
+            'episode_id': '218b979630a35ead12c6fd096f2996c56c37e4d0dc1f6dc0feada32dcf7b31cd',
+        },
     }, {
         'url': 'https://www.callin.com/episode/fcc-commissioner-brendan-carr-on-elons-PrumRdSQJW',
         'md5': '14ede27ee2c957b7e4db93140fc0745c',
@@ -54,7 +54,7 @@ class CallinIE(InfoExtractor):
             'thumbnail': 'https://d1z76fhpoqkd01.cloudfront.net/shows/legacy/1ade9142625344045dc17cf523469ced1d93610762f4c886d06aa190a2f979e8.png',
             'episode_id': 'c3dab47f237bf953d180d3f243477a84302798be0e0b29bc9ade6d60a69f04f5',
             'timestamp': 1662100688.005,
-        }
+        },
     }, {
         'url': 'https://www.callin.com/episode/episode-81-elites-melt-down-over-student-debt-lzxMidUnjA',
         'md5': '16f704ddbf82a27e3930533b12062f07',
@@ -78,7 +78,7 @@ class CallinIE(InfoExtractor):
             'thumbnail': 'https://d1z76fhpoqkd01.cloudfront.net/shows/legacy/461ea0d86172cb6aff7d6c80fd49259cf5e64bdf737a4650f8bc24cf392ca218.png',
             'episode_id': '8d06f869798f93a7814e380bceabea72d501417e620180416ff6bd510596e83c',
             'timestamp': 1661476708.282,
-        }
+        },
     }]
 
     def try_get_user_name(self, d):
@@ -94,7 +94,7 @@ class CallinIE(InfoExtractor):
         next_data = self._search_nextjs_data(webpage, display_id)
         episode = next_data['props']['pageProps']['episode']
 
-        id = episode['id']
+        video_id = episode['id']
         title = episode.get('title') or self._generic_title('', webpage)
         url = episode['m3u8']
         formats = self._extract_m3u8_formats(url, display_id, ext='ts')
@@ -125,11 +125,11 @@ class CallinIE(InfoExtractor):
 
         episode_list = traverse_obj(show_json, ('pageProps', 'show', 'episodes')) or []
         episode_number = next(
-            (len(episode_list) - i for (i, e) in enumerate(episode_list) if e.get('id') == id),
+            (len(episode_list) - i for i, e in enumerate(episode_list) if e.get('id') == video_id),
             None)
 
         return {
-            'id': id,
+            'id': video_id,
             '_old_archive_ids': [make_archive_id(self, display_id.rsplit('-', 1)[-1])],
             'display_id': display_id,
             'title': title,
@@ -151,5 +151,5 @@ class CallinIE(InfoExtractor):
             'series_id': show_id,
             'episode': title,
             'episode_number': episode_number,
-            'episode_id': id
+            'episode_id': video_id,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/caltrans.py b/plugins/youtube_download/yt_dlp/extractor/caltrans.py
index f4a4a83..5513bb2 100644
--- a/plugins/youtube_download/yt_dlp/extractor/caltrans.py
+++ b/plugins/youtube_download/yt_dlp/extractor/caltrans.py
@@ -11,7 +11,7 @@ class CaltransIE(InfoExtractor):
             'title': 'US-50 : Sacramento : Hwy 50 at 24th',
             'live_status': 'is_live',
             'thumbnail': 'https://cwwp2.dot.ca.gov/data/d3/cctv/image/hwy50at24th/hwy50at24th.jpg',
-        }
+        },
     }
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/cam4.py b/plugins/youtube_download/yt_dlp/extractor/cam4.py
index 2650cc1..0d0dccb 100644
--- a/plugins/youtube_download/yt_dlp/extractor/cam4.py
+++ b/plugins/youtube_download/yt_dlp/extractor/cam4.py
@@ -12,12 +12,12 @@ class CAM4IE(InfoExtractor):
             'age_limit': 18,
             'live_status': 'is_live',
             'thumbnail': 'https://snapshots.xcdnpro.com/thumbnails/foxynesss',
-        }
+        },
     }
 
     def _real_extract(self, url):
         channel_id = self._match_id(url)
-        m3u8_playlist = self._download_json('https://www.cam4.com/rest/v1.0/profile/{}/streamInfo'.format(channel_id), channel_id).get('cdnURL')
+        m3u8_playlist = self._download_json(f'https://www.cam4.com/rest/v1.0/profile/{channel_id}/streamInfo', channel_id).get('cdnURL')
 
         formats = self._extract_m3u8_formats(m3u8_playlist, channel_id, 'mp4', m3u8_id='hls', live=True)
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/camdemy.py b/plugins/youtube_download/yt_dlp/extractor/camdemy.py
index c7079e4..34dc095 100644
--- a/plugins/youtube_download/yt_dlp/extractor/camdemy.py
+++ b/plugins/youtube_download/yt_dlp/extractor/camdemy.py
@@ -1,10 +1,7 @@
 import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_urllib_parse_urlencode,
-    compat_urlparse,
-)
 from ..utils import (
     clean_html,
     parse_duration,
@@ -28,7 +25,7 @@ class CamdemyIE(InfoExtractor):
             'duration': 1591,
             'upload_date': '20130114',
             'view_count': int,
-        }
+        },
     }, {
         # With non-empty description
         # webpage returns "No permission or not login"
@@ -42,7 +39,7 @@ class CamdemyIE(InfoExtractor):
             'description': 'md5:2a9f989c2b153a2342acee579c6e7db6',
             'creator': 'evercam',
             'duration': 318,
-        }
+        },
     }, {
         # External source (YouTube)
         'url': 'http://www.camdemy.com/media/14842',
@@ -76,12 +73,12 @@ class CamdemyIE(InfoExtractor):
 
         title = oembed_obj['title']
         thumb_url = oembed_obj['thumbnail_url']
-        video_folder = compat_urlparse.urljoin(thumb_url, 'video/')
+        video_folder = urllib.parse.urljoin(thumb_url, 'video/')
         file_list_doc = self._download_xml(
-            compat_urlparse.urljoin(video_folder, 'fileList.xml'),
+            urllib.parse.urljoin(video_folder, 'fileList.xml'),
             video_id, 'Downloading filelist XML')
         file_name = file_list_doc.find('./video/item/fileName').text
-        video_url = compat_urlparse.urljoin(video_folder, file_name)
+        video_url = urllib.parse.urljoin(video_folder, file_name)
 
         # Some URLs return "No permission or not login" in a webpage despite being
         # freely available via oembed JSON URL (e.g. http://www.camdemy.com/media/13885)
@@ -117,35 +114,35 @@ class CamdemyFolderIE(InfoExtractor):
             'id': '450',
             'title': '信號與系統 2012 & 2011 (Signals and Systems)',
         },
-        'playlist_mincount': 145
+        'playlist_mincount': 145,
     }, {
         # links without trailing slash
         # and multi-page
         'url': 'http://www.camdemy.com/folder/853',
         'info_dict': {
             'id': '853',
-            'title': '科學計算 - 使用 Matlab'
+            'title': '科學計算 - 使用 Matlab',
         },
-        'playlist_mincount': 20
+        'playlist_mincount': 20,
     }, {
         # with displayMode parameter. For testing the codes to add parameters
         'url': 'http://www.camdemy.com/folder/853/?displayMode=defaultOrderByOrg',
         'info_dict': {
             'id': '853',
-            'title': '科學計算 - 使用 Matlab'
+            'title': '科學計算 - 使用 Matlab',
         },
-        'playlist_mincount': 20
+        'playlist_mincount': 20,
     }]
 
     def _real_extract(self, url):
         folder_id = self._match_id(url)
 
         # Add displayMode=list so that all links are displayed in a single page
-        parsed_url = list(compat_urlparse.urlparse(url))
-        query = dict(compat_urlparse.parse_qsl(parsed_url[4]))
+        parsed_url = list(urllib.parse.urlparse(url))
+        query = dict(urllib.parse.parse_qsl(parsed_url[4]))
         query.update({'displayMode': 'list'})
-        parsed_url[4] = compat_urllib_parse_urlencode(query)
-        final_url = compat_urlparse.urlunparse(parsed_url)
+        parsed_url[4] = urllib.parse.urlencode(query)
+        final_url = urllib.parse.urlunparse(parsed_url)
 
         page = self._download_webpage(final_url, folder_id)
         matches = re.findall(r"href='(/media/\d+/?)'", page)
diff --git a/plugins/youtube_download/yt_dlp/extractor/camfm.py b/plugins/youtube_download/yt_dlp/extractor/camfm.py
index a9850f4..6036f13 100644
--- a/plugins/youtube_download/yt_dlp/extractor/camfm.py
+++ b/plugins/youtube_download/yt_dlp/extractor/camfm.py
@@ -13,7 +13,7 @@ from ..utils import (
 
 
 class CamFMShowIE(InfoExtractor):
-    _VALID_URL = r'https://(?:www\.)?camfm\.co\.uk/shows/(?P<id>[^/]+)'
+    _VALID_URL = r'https?://(?:www\.)?camfm\.co\.uk/shows/(?P<id>[^/]+)'
     _TESTS = [{
         'playlist_mincount': 5,
         'url': 'https://camfm.co.uk/shows/soul-mining/',
@@ -37,12 +37,12 @@ class CamFMShowIE(InfoExtractor):
             'thumbnail': urljoin('https://camfm.co.uk', self._search_regex(
                 r'<img[^>]+class="thumb-expand"[^>]+src="([^"]+)"', page, 'thumbnail', fatal=False)),
             'title': self._html_search_regex('<h1>([^<]+)</h1>', page, 'title', fatal=False),
-            'description': clean_html(get_element_by_class('small-12 medium-8 cell', page))
+            'description': clean_html(get_element_by_class('small-12 medium-8 cell', page)),
         }
 
 
 class CamFMEpisodeIE(InfoExtractor):
-    _VALID_URL = r'https://(?:www\.)?camfm\.co\.uk/player/(?P<id>[^/]+)'
+    _VALID_URL = r'https?://(?:www\.)?camfm\.co\.uk/player/(?P<id>[^/]+)'
     _TESTS = [{
         'url': 'https://camfm.co.uk/player/43336',
         'skip': 'Episode will expire - don\'t actually know when, but it will go eventually',
@@ -56,7 +56,7 @@ class CamFMEpisodeIE(InfoExtractor):
             'series': 'AITAA: Am I the Agony Aunt?',
             'thumbnail': 'md5:5980a831360d0744c3764551be3d09c1',
             'categories': ['Entertainment'],
-        }
+        },
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/cammodels.py b/plugins/youtube_download/yt_dlp/extractor/cammodels.py
index 135b315..7388cfb 100644
--- a/plugins/youtube_download/yt_dlp/extractor/cammodels.py
+++ b/plugins/youtube_download/yt_dlp/extractor/cammodels.py
@@ -7,14 +7,14 @@ class CamModelsIE(InfoExtractor):
     _TESTS = [{
         'url': 'https://www.cammodels.com/cam/AutumnKnight/',
         'only_matching': True,
-        'age_limit': 18
+        'age_limit': 18,
     }]
 
     def _real_extract(self, url):
         user_id = self._match_id(url)
 
         manifest = self._download_json(
-            'https://manifest-server.naiadsystems.com/live/s:%s.json' % user_id, user_id)
+            f'https://manifest-server.naiadsystems.com/live/s:{user_id}.json', user_id)
 
         formats = []
         thumbnails = []
@@ -36,7 +36,7 @@ class CamModelsIE(InfoExtractor):
                 format_id_list = [format_id]
                 height = int_or_none(media.get('videoHeight'))
                 if height is not None:
-                    format_id_list.append('%dp' % height)
+                    format_id_list.append(f'{height}p')
                 f = {
                     'url': media_url,
                     'format_id': '-'.join(format_id_list),
@@ -73,5 +73,5 @@ class CamModelsIE(InfoExtractor):
             'thumbnails': thumbnails,
             'is_live': True,
             'formats': formats,
-            'age_limit': 18
+            'age_limit': 18,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/camtasia.py b/plugins/youtube_download/yt_dlp/extractor/camtasia.py
index 70ab6c6..3266431 100644
--- a/plugins/youtube_download/yt_dlp/extractor/camtasia.py
+++ b/plugins/youtube_download/yt_dlp/extractor/camtasia.py
@@ -17,7 +17,7 @@ class CamtasiaEmbedIE(InfoExtractor):
                     'title': 'Fenn-AA_PA_Radar_Course_Lecture_1c_Final - video1',
                     'ext': 'flv',
                     'duration': 2235.90,
-                }
+                },
             }, {
                 'md5': '10e4bb3aaca9fd630e273ff92d9f3c63',
                 'info_dict': {
@@ -25,12 +25,12 @@ class CamtasiaEmbedIE(InfoExtractor):
                     'title': 'Fenn-AA_PA_Radar_Course_Lecture_1c_Final - pip',
                     'ext': 'flv',
                     'duration': 2235.93,
-                }
+                },
             }],
             'info_dict': {
                 'title': 'Fenn-AA_PA_Radar_Course_Lecture_1c_Final',
             },
-            'skip': 'webpage dead'
+            'skip': 'webpage dead',
         },
 
     ]
diff --git a/plugins/youtube_download/yt_dlp/extractor/camwithher.py b/plugins/youtube_download/yt_dlp/extractor/camwithher.py
deleted file mode 100644
index a0b3749..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/camwithher.py
+++ /dev/null
@@ -1,87 +0,0 @@
-import re
-
-from .common import InfoExtractor
-from ..utils import (
-    int_or_none,
-    parse_duration,
-    unified_strdate,
-)
-
-
-class CamWithHerIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?camwithher\.tv/view_video\.php\?.*\bviewkey=(?P<id>\w+)'
-
-    _TESTS = [{
-        'url': 'http://camwithher.tv/view_video.php?viewkey=6e9a24e2c0e842e1f177&page=&viewtype=&category=',
-        'info_dict': {
-            'id': '5644',
-            'ext': 'flv',
-            'title': 'Periscope Tease',
-            'description': 'In the clouds teasing on periscope to my favorite song',
-            'duration': 240,
-            'view_count': int,
-            'comment_count': int,
-            'uploader': 'MileenaK',
-            'upload_date': '20160322',
-            'age_limit': 18,
-        },
-        'params': {
-            'skip_download': True,
-        }
-    }, {
-        'url': 'http://camwithher.tv/view_video.php?viewkey=6dfd8b7c97531a459937',
-        'only_matching': True,
-    }, {
-        'url': 'http://camwithher.tv/view_video.php?page=&viewkey=6e9a24e2c0e842e1f177&viewtype=&category=',
-        'only_matching': True,
-    }, {
-        'url': 'http://camwithher.tv/view_video.php?viewkey=b6c3b5bea9515d1a1fc4&page=&viewtype=&category=mv',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        webpage = self._download_webpage(url, video_id)
-
-        flv_id = self._html_search_regex(
-            r'<a[^>]+href=["\']/download/\?v=(\d+)', webpage, 'video id')
-
-        # Video URL construction algorithm is reverse-engineered from cwhplayer.swf
-        rtmp_url = 'rtmp://camwithher.tv/clipshare/%s' % (
-            ('mp4:%s.mp4' % flv_id) if int(flv_id) > 2010 else flv_id)
-
-        title = self._html_search_regex(
-            r'<div[^>]+style="float:left"[^>]*>\s*<h2>(.+?)</h2>', webpage, 'title')
-        description = self._html_search_regex(
-            r'>Description:</span>(.+?)</div>', webpage, 'description', default=None)
-
-        runtime = self._search_regex(
-            r'Runtime\s*:\s*(.+?) \|', webpage, 'duration', default=None)
-        if runtime:
-            runtime = re.sub(r'[\s-]', '', runtime)
-        duration = parse_duration(runtime)
-        view_count = int_or_none(self._search_regex(
-            r'Views\s*:\s*(\d+)', webpage, 'view count', default=None))
-        comment_count = int_or_none(self._search_regex(
-            r'Comments\s*:\s*(\d+)', webpage, 'comment count', default=None))
-
-        uploader = self._search_regex(
-            r'Added by\s*:\s*<a[^>]+>([^<]+)</a>', webpage, 'uploader', default=None)
-        upload_date = unified_strdate(self._search_regex(
-            r'Added on\s*:\s*([\d-]+)', webpage, 'upload date', default=None))
-
-        return {
-            'id': flv_id,
-            'url': rtmp_url,
-            'ext': 'flv',
-            'no_resume': True,
-            'title': title,
-            'description': description,
-            'duration': duration,
-            'view_count': view_count,
-            'comment_count': comment_count,
-            'uploader': uploader,
-            'upload_date': upload_date,
-            'age_limit': 18
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/canal1.py b/plugins/youtube_download/yt_dlp/extractor/canal1.py
new file mode 100644
index 0000000..587a11a
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/canal1.py
@@ -0,0 +1,39 @@
+from .common import InfoExtractor
+
+
+class Canal1IE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.|noticias\.)?canal1\.com\.co/(?:[^?#&])+/(?P<id>[\w-]+)'
+
+    _TESTS = [{
+        'url': 'https://canal1.com.co/noticias/napa-i-una-cadena-de-produccion-de-arroz-que-se-quedo-en-veremos-y-abandonada-en-el-departamento-del-choco/',
+        'info_dict': {
+            'id': '63b39f6b354977084b85ab54',
+            'display_id': 'napa-i-una-cadena-de-produccion-de-arroz-que-se-quedo-en-veremos-y-abandonada-en-el-departamento-del-choco',
+            'title': 'Ñapa I Una cadena de producción de arroz que se quedó en veremos y abandonada en el departamento del Chocó',
+            'description': 'md5:bc49c6d64d20610ea1e7daf079a0d013',
+            'thumbnail': r're:^https?://[^?#]+63b39f6b354977084b85ab54',
+            'ext': 'mp4',
+        },
+    }, {
+        'url': 'https://noticias.canal1.com.co/noticias/tres-i-el-triste-record-que-impuso-elon-musk-el-dueno-de-tesla-y-de-twitter/',
+        'info_dict': {
+            'id': '63b39e93f5fd223aa32250fb',
+            'display_id': 'tres-i-el-triste-record-que-impuso-elon-musk-el-dueno-de-tesla-y-de-twitter',
+            'title': 'Tres I El triste récord que impuso Elon Musk, el dueño de Tesla y de Twitter',
+            'description': 'md5:d9f691f131a21ce6767ca6c05d17d791',
+            'thumbnail': r're:^https?://[^?#]+63b39e93f5fd223aa32250fb',
+            'ext': 'mp4',
+        },
+    }, {
+        # Geo-restricted to Colombia
+        'url': 'https://canal1.com.co/programas/guerreros-canal-1/video-inedito-guerreros-despedida-kewin-zarate/',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        display_id = self._match_id(url)
+        webpage = self._download_webpage(url, display_id)
+
+        return self.url_result(
+            self._search_regex(r'"embedUrl"\s*:\s*"([^"]+)', webpage, 'embed url'),
+            display_id=display_id, url_transparent=True)
diff --git a/plugins/youtube_download/yt_dlp/extractor/canalalpha.py b/plugins/youtube_download/yt_dlp/extractor/canalalpha.py
index df5ca58..3a0df95 100644
--- a/plugins/youtube_download/yt_dlp/extractor/canalalpha.py
+++ b/plugins/youtube_download/yt_dlp/extractor/canalalpha.py
@@ -21,7 +21,7 @@ class CanalAlphaIE(InfoExtractor):
             'upload_date': '20211028',
             'duration': 1125,
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }, {
         'url': 'https://www.canalalpha.ch/play/le-journal/topic/24512/la-poste-fait-de-neuchatel-un-pole-cryptographique',
         'info_dict': {
@@ -33,19 +33,19 @@ class CanalAlphaIE(InfoExtractor):
             'upload_date': '20211028',
             'duration': 138,
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }, {
         'url': 'https://www.canalalpha.ch/play/eureka/episode/24484/ces-innovations-qui-veulent-rendre-lagriculture-plus-durable',
         'info_dict': {
             'id': '24484',
             'ext': 'mp4',
             'title': 'Ces innovations qui veulent rendre l’agriculture plus durable',
-            'description': 'md5:3de3f151180684621e85be7c10e4e613',
+            'description': 'md5:85d594a3b5dc6ccfc4a85aba6e73b129',
             'thumbnail': 'https://static.canalalpha.ch/poster/magazine/magazine_10236.jpg',
             'upload_date': '20211026',
             'duration': 360,
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }, {
         'url': 'https://www.canalalpha.ch/play/avec-le-temps/episode/23516/redonner-de-leclat-grace-au-polissage',
         'info_dict': {
@@ -57,15 +57,26 @@ class CanalAlphaIE(InfoExtractor):
             'upload_date': '20210726',
             'duration': 360,
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
+    }, {
+        'url': 'https://www.canalalpha.ch/play/le-journal/topic/33500/encore-des-mesures-deconomie-dans-le-jura',
+        'info_dict': {
+            'id': '33500',
+            'ext': 'mp4',
+            'title': 'Encore des mesures d\'économie dans le Jura',
+            'description': 'md5:938b5b556592f2d1b9ab150268082a80',
+            'thumbnail': 'https://static.canalalpha.ch/poster/news/news_46665.jpg',
+            'upload_date': '20240411',
+            'duration': 105,
+        },
     }]
 
     def _real_extract(self, url):
-        id = self._match_id(url)
-        webpage = self._download_webpage(url, id)
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
         data_json = self._parse_json(self._search_regex(
             r'window\.__SERVER_STATE__\s?=\s?({(?:(?!};)[^"]|"([^"]|\\")*")+})\s?;',
-            webpage, 'data_json'), id)['1']['data']['data']
+            webpage, 'data_json'), video_id)['1']['data']['data']
         manifests = try_get(data_json, lambda x: x['video']['manifests'], expected_type=dict) or {}
         subtitles = {}
         formats = [{
@@ -75,15 +86,17 @@ class CanalAlphaIE(InfoExtractor):
             'height': try_get(video, lambda x: x['res']['height'], expected_type=int),
         } for video in try_get(data_json, lambda x: x['video']['mp4'], expected_type=list) or [] if video.get('$url')]
         if manifests.get('hls'):
-            m3u8_frmts, m3u8_subs = self._parse_m3u8_formats_and_subtitles(manifests['hls'], video_id=id)
-            formats.extend(m3u8_frmts)
-            subtitles = self._merge_subtitles(subtitles, m3u8_subs)
+            fmts, subs = self._extract_m3u8_formats_and_subtitles(
+                manifests['hls'], video_id, m3u8_id='hls', fatal=False)
+            formats.extend(fmts)
+            self._merge_subtitles(subs, target=subtitles)
         if manifests.get('dash'):
-            dash_frmts, dash_subs = self._parse_mpd_formats_and_subtitles(manifests['dash'])
-            formats.extend(dash_frmts)
-            subtitles = self._merge_subtitles(subtitles, dash_subs)
+            fmts, subs = self._extract_mpd_formats_and_subtitles(
+                manifests['dash'], video_id, mpd_id='dash', fatal=False)
+            formats.extend(fmts)
+            self._merge_subtitles(subs, target=subtitles)
         return {
-            'id': id,
+            'id': video_id,
             'title': data_json.get('title').strip(),
             'description': clean_html(dict_get(data_json, ('longDesc', 'shortDesc'))),
             'thumbnail': data_json.get('poster'),
diff --git a/plugins/youtube_download/yt_dlp/extractor/canalc2.py b/plugins/youtube_download/yt_dlp/extractor/canalc2.py
index 597cb2a..c725545 100644
--- a/plugins/youtube_download/yt_dlp/extractor/canalc2.py
+++ b/plugins/youtube_download/yt_dlp/extractor/canalc2.py
@@ -26,7 +26,7 @@ class Canalc2IE(InfoExtractor):
         video_id = self._match_id(url)
 
         webpage = self._download_webpage(
-            'http://www.canalc2.tv/video/%s' % video_id, video_id)
+            f'http://www.canalc2.tv/video/{video_id}', video_id)
 
         title = self._html_search_regex(
             r'(?s)class="[^"]*col_description[^"]*">.*?<h3>(.+?)</h3>',
diff --git a/plugins/youtube_download/yt_dlp/extractor/canalplus.py b/plugins/youtube_download/yt_dlp/extractor/canalplus.py
index 3ff5c3f..728b7a0 100644
--- a/plugins/youtube_download/yt_dlp/extractor/canalplus.py
+++ b/plugins/youtube_download/yt_dlp/extractor/canalplus.py
@@ -53,7 +53,7 @@ class CanalplusIE(InfoExtractor):
         video_data = self._download_json(info_url, video_id, 'Downloading video JSON')
 
         if isinstance(video_data, list):
-            video_data = [video for video in video_data if video.get('ID') == video_id][0]
+            video_data = next(video for video in video_data if video.get('ID') == video_id)
         media = video_data['MEDIA']
         infos = video_data['INFOS']
 
@@ -97,8 +97,7 @@ class CanalplusIE(InfoExtractor):
         return {
             'id': video_id,
             'display_id': display_id,
-            'title': '%s - %s' % (titrage['TITRE'],
-                                  titrage['SOUS_TITRE']),
+            'title': '{} - {}'.format(titrage['TITRE'], titrage['SOUS_TITRE']),
             'upload_date': unified_strdate(infos.get('PUBLICATION', {}).get('DATE')),
             'thumbnails': thumbnails,
             'description': infos.get('DESCRIPTION'),
diff --git a/plugins/youtube_download/yt_dlp/extractor/canalsurmas.py b/plugins/youtube_download/yt_dlp/extractor/canalsurmas.py
new file mode 100644
index 0000000..210973a
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/canalsurmas.py
@@ -0,0 +1,84 @@
+import json
+import time
+
+from .common import InfoExtractor
+from ..utils import (
+    determine_ext,
+    float_or_none,
+    jwt_decode_hs256,
+    parse_iso8601,
+    url_or_none,
+    variadic,
+)
+from ..utils.traversal import traverse_obj
+
+
+class CanalsurmasIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?canalsurmas\.es/videos/(?P<id>\d+)'
+    _TESTS = [{
+        'url': 'https://www.canalsurmas.es/videos/44006-el-gran-queo-1-lora-del-rio-sevilla-20072014',
+        'md5': '861f86fdc1221175e15523047d0087ef',
+        'info_dict': {
+            'id': '44006',
+            'ext': 'mp4',
+            'title': 'Lora del Río (Sevilla)',
+            'description': 'md5:3d9ee40a9b1b26ed8259e6b71ed27b8b',
+            'thumbnail': 'https://cdn2.rtva.interactvty.com/content_cards/00f3e8f67b0a4f3b90a4a14618a48b0d.jpg',
+            'timestamp': 1648123182,
+            'upload_date': '20220324',
+        },
+    }]
+    _API_BASE = 'https://api-rtva.interactvty.com'
+    _access_token = None
+
+    @staticmethod
+    def _is_jwt_expired(token):
+        return jwt_decode_hs256(token)['exp'] - time.time() < 300
+
+    def _call_api(self, endpoint, video_id, fields=None):
+        if not self._access_token or self._is_jwt_expired(self._access_token):
+            self._access_token = self._download_json(
+                f'{self._API_BASE}/jwt/token/', None,
+                'Downloading access token', 'Failed to download access token',
+                headers={'Content-Type': 'application/json'},
+                data=json.dumps({
+                    'username': 'canalsur_demo',
+                    'password': 'dsUBXUcI',
+                }).encode())['access']
+
+        return self._download_json(
+            f'{self._API_BASE}/api/2.0/contents/{endpoint}/{video_id}/', video_id,
+            f'Downloading {endpoint} API JSON', f'Failed to download {endpoint} API JSON',
+            headers={'Authorization': f'jwtok {self._access_token}'},
+            query={'optional_fields': ','.join(variadic(fields))} if fields else None)
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        video_info = self._call_api('content', video_id, fields=[
+            'description', 'image', 'duration', 'created_at', 'tags',
+        ])
+        stream_info = self._call_api('content_resources', video_id, 'media_url')
+
+        formats, subtitles = [], {}
+        for stream_url in traverse_obj(stream_info, ('results', ..., 'media_url', {url_or_none})):
+            if determine_ext(stream_url) == 'm3u8':
+                fmts, subs = self._extract_m3u8_formats_and_subtitles(
+                    stream_url, video_id, m3u8_id='hls', fatal=False)
+                formats.extend(fmts)
+                self._merge_subtitles(subs, target=subtitles)
+            else:
+                formats.append({'url': stream_url})
+
+        return {
+            'id': video_id,
+            'formats': formats,
+            'subtitles': subtitles,
+            **traverse_obj(video_info, {
+                'title': ('name', {str.strip}),
+                'description': ('description', {str}),
+                'thumbnail': ('image', {url_or_none}),
+                'duration': ('duration', {float_or_none}),
+                'timestamp': ('created_at', {parse_iso8601}),
+                'tags': ('tags', ..., {str}),
+            }),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/caracoltv.py b/plugins/youtube_download/yt_dlp/extractor/caracoltv.py
new file mode 100644
index 0000000..493ffda
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/caracoltv.py
@@ -0,0 +1,136 @@
+import base64
+import json
+import uuid
+
+from .common import InfoExtractor
+from ..utils import (
+    int_or_none,
+    js_to_json,
+    traverse_obj,
+    urljoin,
+)
+
+
+class CaracolTvPlayIE(InfoExtractor):
+    _VALID_URL = r'https?://play\.caracoltv\.com/videoDetails/(?P<id>[^/?#]+)'
+    _NETRC_MACHINE = 'caracoltv-play'
+
+    _TESTS = [{
+        'url': 'https://play.caracoltv.com/videoDetails/OTo4NGFmNjUwOWQ2ZmM0NTg2YWRiOWU0MGNhOWViOWJkYQ==',
+        'info_dict': {
+            'id': 'OTo4NGFmNjUwOWQ2ZmM0NTg2YWRiOWU0MGNhOWViOWJkYQ==',
+            'title': 'La teoría del promedio',
+            'description': 'md5:1cdd6d2c13f19ef0d9649ab81a023ac3',
+        },
+        'playlist_count': 6,
+    }, {
+        'url': 'https://play.caracoltv.com/videoDetails/OTo3OWM4ZTliYzQxMmM0MTMxYTk4Mjk2YjdjNGQ4NGRkOQ==/ella?season=0',
+        'info_dict': {
+            'id': 'OTo3OWM4ZTliYzQxMmM0MTMxYTk4Mjk2YjdjNGQ4NGRkOQ==',
+            'title': 'Ella',
+            'description': 'md5:a639b1feb5ddcc0cff92a489b4e544b8',
+        },
+        'playlist_count': 10,
+    }, {
+        'url': 'https://play.caracoltv.com/videoDetails/OTpiYTY1YTVmOTI5MzI0ZWJhOGZiY2Y3MmRlOWZlYmJkOA==/la-vuelta-al-mundo-en-80-risas-2022?season=0',
+        'info_dict': {
+            'id': 'OTpiYTY1YTVmOTI5MzI0ZWJhOGZiY2Y3MmRlOWZlYmJkOA==',
+            'title': 'La vuelta al mundo en 80 risas 2022',
+            'description': 'md5:e97aac36106e5c37ebf947b3350106a4',
+        },
+        'playlist_count': 17,
+    }, {
+        'url': 'https://play.caracoltv.com/videoDetails/MzoxX3BwbjRmNjB1',
+        'only_matching': True,
+    }]
+
+    _USER_TOKEN = None
+
+    def _extract_app_token(self, webpage):
+        config_js_path = self._search_regex(
+            r'<script[^>]+src\s*=\s*"([^"]+coreConfig.js[^"]+)', webpage, 'config js url', fatal=False)
+
+        mediation_config = {} if not config_js_path else self._search_json(
+            r'mediation\s*:', self._download_webpage(
+                urljoin('https://play.caracoltv.com/', config_js_path), None, fatal=False, note='Extracting JS config'),
+            'mediation_config', None, transform_source=js_to_json, fatal=False)
+
+        key = traverse_obj(
+            mediation_config, ('live', 'key')) or '795cd9c089a1fc48094524a5eba85a3fca1331817c802f601735907c8bbb4f50'
+        secret = traverse_obj(
+            mediation_config, ('live', 'secret')) or '64dec00a6989ba83d087621465b5e5d38bdac22033b0613b659c442c78976fa0'
+
+        return base64.b64encode(f'{key}:{secret}'.encode()).decode()
+
+    def _perform_login(self, email, password):
+        webpage = self._download_webpage('https://play.caracoltv.com/', None, fatal=False)
+        app_token = self._extract_app_token(webpage)
+
+        bearer_token = self._download_json(
+            'https://eu-gateway.inmobly.com/applications/oauth', None, data=b'', note='Retrieving bearer token',
+            headers={'Authorization': f'Basic {app_token}'})['token']
+
+        self._USER_TOKEN = self._download_json(
+            'https://eu-gateway.inmobly.com/user/login', None, note='Performing login', headers={
+                'Content-Type': 'application/json',
+                'Authorization': f'Bearer {bearer_token}',
+            }, data=json.dumps({
+                'device_data': {
+                    'device_id': str(uuid.uuid4()),
+                    'device_token': '',
+                    'device_type': 'web',
+                },
+                'login_data': {
+                    'enabled': True,
+                    'email': email,
+                    'password': password,
+                },
+            }).encode())['user_token']
+
+    def _extract_video(self, video_data, series_id=None, season_id=None, season_number=None):
+        formats, subtitles = self._extract_m3u8_formats_and_subtitles(video_data['stream_url'], series_id, 'mp4')
+
+        return {
+            'id': video_data['id'],
+            'title': video_data.get('name'),
+            'description': video_data.get('description'),
+            'formats': formats,
+            'subtitles': subtitles,
+            'thumbnails': traverse_obj(
+                video_data, ('extra_thumbs', ..., {'url': 'thumb_url', 'height': 'height', 'width': 'width'})),
+            'series_id': series_id,
+            'season_id': season_id,
+            'season_number': int_or_none(season_number),
+            'episode_number': int_or_none(video_data.get('item_order')),
+            'is_live': video_data.get('entry_type') == 3,
+        }
+
+    def _extract_series_seasons(self, seasons, series_id):
+        for season in seasons:
+            api_response = self._download_json(
+                'https://eu-gateway.inmobly.com/feed', series_id, query={'season_id': season['id']},
+                headers={'Authorization': f'Bearer {self._USER_TOKEN}'})
+
+            season_number = season.get('order')
+            for episode in api_response['items']:
+                yield self._extract_video(episode, series_id, season['id'], season_number)
+
+    def _real_extract(self, url):
+        series_id = self._match_id(url)
+
+        if self._USER_TOKEN is None:
+            self._perform_login('guest@inmobly.com', 'Test@gus1')
+
+        api_response = self._download_json(
+            'https://eu-gateway.inmobly.com/feed', series_id, query={'include_ids': series_id},
+            headers={'Authorization': f'Bearer {self._USER_TOKEN}'})['items'][0]
+
+        if not api_response.get('seasons'):
+            return self._extract_video(api_response)
+
+        return self.playlist_result(
+            self._extract_series_seasons(api_response['seasons'], series_id),
+            series_id, **traverse_obj(api_response, {
+                'title': 'name',
+                'description': 'description',
+            }))
diff --git a/plugins/youtube_download/yt_dlp/extractor/carambatv.py b/plugins/youtube_download/yt_dlp/extractor/carambatv.py
deleted file mode 100644
index d6044a3..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/carambatv.py
+++ /dev/null
@@ -1,105 +0,0 @@
-from .common import InfoExtractor
-from ..compat import compat_str
-from ..utils import (
-    format_field,
-    float_or_none,
-    int_or_none,
-    try_get,
-)
-
-from .videomore import VideomoreIE
-
-
-class CarambaTVIE(InfoExtractor):
-    _VALID_URL = r'(?:carambatv:|https?://video1\.carambatv\.ru/v/)(?P<id>\d+)'
-    _TESTS = [{
-        'url': 'http://video1.carambatv.ru/v/191910501',
-        'md5': '2f4a81b7cfd5ab866ee2d7270cb34a2a',
-        'info_dict': {
-            'id': '191910501',
-            'ext': 'mp4',
-            'title': '[BadComedian] - Разборка в Маниле (Абсолютный обзор)',
-            'thumbnail': r're:^https?://.*\.jpg',
-            'duration': 2678.31,
-        },
-    }, {
-        'url': 'carambatv:191910501',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        video = self._download_json(
-            'http://video1.carambatv.ru/v/%s/videoinfo.js' % video_id,
-            video_id)
-
-        title = video['title']
-
-        base_url = video.get('video') or 'http://video1.carambatv.ru/v/%s/' % video_id
-
-        formats = [{
-            'url': base_url + f['fn'],
-            'height': int_or_none(f.get('height')),
-            'format_id': format_field(f, 'height', '%sp'),
-        } for f in video['qualities'] if f.get('fn')]
-
-        thumbnail = video.get('splash')
-        duration = float_or_none(try_get(
-            video, lambda x: x['annotations'][0]['end_time'], compat_str))
-
-        return {
-            'id': video_id,
-            'title': title,
-            'thumbnail': thumbnail,
-            'duration': duration,
-            'formats': formats,
-        }
-
-
-class CarambaTVPageIE(InfoExtractor):
-    _VALID_URL = r'https?://carambatv\.ru/(?:[^/]+/)+(?P<id>[^/?#&]+)'
-    _TEST = {
-        'url': 'http://carambatv.ru/movie/bad-comedian/razborka-v-manile/',
-        'md5': 'a49fb0ec2ad66503eeb46aac237d3c86',
-        'info_dict': {
-            'id': '475222',
-            'ext': 'flv',
-            'title': '[BadComedian] - Разборка в Маниле (Абсолютный обзор)',
-            'thumbnail': r're:^https?://.*\.jpg',
-            # duration reported by videomore is incorrect
-            'duration': int,
-        },
-        'add_ie': [VideomoreIE.ie_key()],
-    }
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        webpage = self._download_webpage(url, video_id)
-
-        videomore_url = VideomoreIE._extract_url(webpage)
-        if not videomore_url:
-            videomore_id = self._search_regex(
-                r'getVMCode\s*\(\s*["\']?(\d+)', webpage, 'videomore id',
-                default=None)
-            if videomore_id:
-                videomore_url = 'videomore:%s' % videomore_id
-        if videomore_url:
-            title = self._og_search_title(webpage)
-            return {
-                '_type': 'url_transparent',
-                'url': videomore_url,
-                'ie_key': VideomoreIE.ie_key(),
-                'title': title,
-            }
-
-        video_url = self._og_search_property('video:iframe', webpage, default=None)
-
-        if not video_url:
-            video_id = self._search_regex(
-                r'(?:video_id|crmb_vuid)\s*[:=]\s*["\']?(\d+)',
-                webpage, 'video id')
-            video_url = 'carambatv:%s' % video_id
-
-        return self.url_result(video_url, CarambaTVIE.ie_key())
diff --git a/plugins/youtube_download/yt_dlp/extractor/cartoonnetwork.py b/plugins/youtube_download/yt_dlp/extractor/cartoonnetwork.py
index 4dd7ac4..1749a00 100644
--- a/plugins/youtube_download/yt_dlp/extractor/cartoonnetwork.py
+++ b/plugins/youtube_download/yt_dlp/extractor/cartoonnetwork.py
@@ -27,7 +27,7 @@ class CartoonNetworkIE(TurnerBaseIE):
             if content_re:
                 metadata_re = r'|video_metadata\.content_' + content_re
             return self._search_regex(
-                r'(?:_cnglobal\.currentVideo\.%s%s)\s*=\s*"(%s)";' % (global_re, metadata_re, value_re),
+                rf'(?:_cnglobal\.currentVideo\.{global_re}{metadata_re})\s*=\s*"({value_re})";',
                 webpage, name, fatal=fatal)
 
         media_id = find_field('mediaId', 'media id', 'id', '[0-9a-f]{40}', True)
diff --git a/plugins/youtube_download/yt_dlp/extractor/cbc.py b/plugins/youtube_download/yt_dlp/extractor/cbc.py
index 9413281..3197716 100644
--- a/plugins/youtube_download/yt_dlp/extractor/cbc.py
+++ b/plugins/youtube_download/yt_dlp/extractor/cbc.py
@@ -1,24 +1,32 @@
+import functools
 import re
-import json
-import base64
 import time
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_str,
-)
+from ..networking import HEADRequest
+from ..networking.exceptions import HTTPError
 from ..utils import (
     ExtractorError,
+    float_or_none,
     int_or_none,
-    join_nonempty,
     js_to_json,
+    jwt_decode_hs256,
+    mimetype2ext,
     orderedSet,
+    parse_age_limit,
     parse_iso8601,
+    replace_extension,
     smuggle_url,
     strip_or_none,
-    traverse_obj,
     try_get,
+    unified_timestamp,
+    update_url,
+    url_basename,
+    url_or_none,
+    urlencode_postdata,
 )
+from ..utils.traversal import require, traverse_obj, trim_str
 
 
 class CBCIE(InfoExtractor):
@@ -65,6 +73,7 @@ class CBCIE(InfoExtractor):
             'uploader': 'CBCC-NEW',
             'timestamp': 255977160,
         },
+        'skip': '404 Not Found',
     }, {
         # multiple iframes
         'url': 'http://www.cbc.ca/natureofthings/blog/birds-eye-view-from-vancouvers-burrard-street-bridge-how-we-got-the-shot',
@@ -96,7 +105,7 @@ class CBCIE(InfoExtractor):
         # multiple CBC.APP.Caffeine.initInstance(...)
         'url': 'http://www.cbc.ca/news/canada/calgary/dog-indoor-exercise-winter-1.3928238',
         'info_dict': {
-            'title': 'Keep Rover active during the deep freeze with doggie pushups and other fun indoor tasks',
+            'title': 'Keep Rover active during the deep freeze with doggie pushups and other fun indoor tasks',  # FIXME: actual title includes " | CBC News"
             'id': 'dog-indoor-exercise-winter-1.3928238',
             'description': 'md5:c18552e41726ee95bd75210d1ca9194c',
         },
@@ -105,7 +114,7 @@ class CBCIE(InfoExtractor):
 
     @classmethod
     def suitable(cls, url):
-        return False if CBCPlayerIE.suitable(url) else super(CBCIE, cls).suitable(url)
+        return False if CBCPlayerIE.suitable(url) else super().suitable(url)
 
     def _extract_player_init(self, player_init, display_id):
         player_info = self._parse_json(player_init, display_id, js_to_json)
@@ -113,15 +122,15 @@ class CBCIE(InfoExtractor):
         if not media_id:
             clip_id = player_info['clipId']
             feed = self._download_json(
-                'http://tpfeed.cbc.ca/f/ExhSPC/vms_5akSXx4Ng_Zn?byCustomValue={:mpsReleases}{%s}' % clip_id,
+                f'http://tpfeed.cbc.ca/f/ExhSPC/vms_5akSXx4Ng_Zn?byCustomValue={{:mpsReleases}}{{{clip_id}}}',
                 clip_id, fatal=False)
             if feed:
-                media_id = try_get(feed, lambda x: x['entries'][0]['guid'], compat_str)
+                media_id = try_get(feed, lambda x: x['entries'][0]['guid'], str)
             if not media_id:
                 media_id = self._download_json(
                     'http://feed.theplatform.com/f/h9dtGB/punlNGjMlc1F?fields=id&byContent=byReleases%3DbyId%253D' + clip_id,
                     clip_id)['entries'][0]['id'].split('/')[-1]
-        return self.url_result('cbcplayer:%s' % media_id, 'CBCPlayer', media_id)
+        return self.url_result(f'cbcplayer:{media_id}', 'CBCPlayer', media_id)
 
     def _real_extract(self, url):
         display_id = self._match_id(url)
@@ -139,7 +148,7 @@ class CBCIE(InfoExtractor):
                 r'guid["\']\s*:\s*["\'](\d+)'):
             media_ids.extend(re.findall(media_id_re, webpage))
         entries.extend([
-            self.url_result('cbcplayer:%s' % media_id, 'CBCPlayer', media_id)
+            self.url_result(f'cbcplayer:{media_id}', 'CBCPlayer', media_id)
             for media_id in orderedSet(media_ids)])
         return self.playlist_result(
             entries, display_id, strip_or_none(title),
@@ -148,7 +157,8 @@ class CBCIE(InfoExtractor):
 
 class CBCPlayerIE(InfoExtractor):
     IE_NAME = 'cbc.ca:player'
-    _VALID_URL = r'(?:cbcplayer:|https?://(?:www\.)?cbc\.ca/(?:player/play/|i/caffeine/syndicate/\?mediaId=))(?P<id>\d+)'
+    _VALID_URL = r'(?:cbcplayer:|https?://(?:www\.)?cbc\.ca/(?:player/play/(?:video/)?|i/caffeine/syndicate/\?mediaId=))(?P<id>(?:\d\.)?\d+)'
+    _GEO_COUNTRIES = ['CA']
     _TESTS = [{
         'url': 'http://www.cbc.ca/player/play/2683190193',
         'md5': '64d25f841ddf4ddb28a235338af32e2c',
@@ -163,24 +173,29 @@ class CBCPlayerIE(InfoExtractor):
         },
         'skip': 'Geo-restricted to Canada and no longer available',
     }, {
-        # Redirected from http://www.cbc.ca/player/AudioMobile/All%20in%20a%20Weekend%20Montreal/ID/2657632011/
-        'url': 'http://www.cbc.ca/player/play/2657631896',
+        'url': 'http://www.cbc.ca/i/caffeine/syndicate/?mediaId=2657631896',
         'md5': 'e5e708c34ae6fca156aafe17c43e8b75',
         'info_dict': {
             'id': '2657631896',
             'ext': 'mp3',
             'title': 'CBC Montreal is organizing its first ever community hackathon!',
-            'description': 'The modern technology we tend to depend on so heavily, is never without it\'s share of hiccups and headaches. Next weekend - CBC Montreal will be getting members of the public for its first Hackathon.',
+            'description': 'md5:dd3b692f0a139b0369943150bd1c46a9',
             'timestamp': 1425704400,
             'upload_date': '20150307',
-            'uploader': 'CBCC-NEW',
-            'thumbnail': 'http://thumbnails.cbc.ca/maven_legacy/thumbnails/sonali-karnick-220.jpg',
+            'thumbnail': 'https://i.cbc.ca/ais/1.2985700,1717262248558/full/max/0/default.jpg',
             'chapters': [],
             'duration': 494.811,
+            'categories': ['All in a Weekend Montreal'],
+            'tags': 'count:11',
+            'location': 'Quebec',
+            'series': 'All in a Weekend Montreal',
+            'season': 'Season 2015',
+            'season_number': 2015,
+            'media_type': 'Excerpt',
+            'genres': ['Other'],
         },
     }, {
-        'url': 'http://www.cbc.ca/player/play/2164402062',
-        'md5': '33fcd8f6719b9dd60a5e73adcb83b9f6',
+        'url': 'http://www.cbc.ca/i/caffeine/syndicate/?mediaId=2164402062',
         'info_dict': {
             'id': '2164402062',
             'ext': 'mp4',
@@ -188,207 +203,513 @@ class CBCPlayerIE(InfoExtractor):
             'description': 'Tim Mayer has beaten three different forms of cancer four times in five years.',
             'timestamp': 1320410746,
             'upload_date': '20111104',
-            'uploader': 'CBCC-NEW',
-            'thumbnail': 'https://thumbnails.cbc.ca/maven_legacy/thumbnails/277/67/cancer_852x480_2164412612.jpg',
+            'thumbnail': 'https://i.cbc.ca/ais/1.1711287,1717139372111/full/max/0/default.jpg',
             'chapters': [],
             'duration': 186.867,
+            'series': 'CBC News: Windsor at 6:00',
+            'categories': ['Windsor'],
+            'location': 'Windsor',
+            'tags': ['Cancer', 'News/Canada/Windsor', 'Windsor'],
+            'media_type': 'Excerpt',
+            'genres': ['News'],
         },
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        # Redirected from http://www.cbc.ca/player/AudioMobile/All%20in%20a%20Weekend%20Montreal/ID/2657632011/
+        'url': 'https://www.cbc.ca/player/play/1.2985700',
+        'md5': 'e5e708c34ae6fca156aafe17c43e8b75',
+        'info_dict': {
+            'id': '1.2985700',
+            'ext': 'mp3',
+            'title': 'CBC Montreal is organizing its first ever community hackathon!',
+            'description': 'The modern technology we tend to depend on so heavily, is never without it\'s share of hiccups and headaches. Next weekend - CBC Montreal will be getting members of the public for its first Hackathon.',
+            'timestamp': 1425704400,
+            'upload_date': '20150307',
+            'thumbnail': 'https://i.cbc.ca/ais/1.2985700,1717262248558/full/max/0/default.jpg',
+            'chapters': [],
+            'duration': 494.811,
+            'categories': ['All in a Weekend Montreal'],
+            'tags': 'count:11',
+            'location': 'Quebec',
+            'series': 'All in a Weekend Montreal',
+            'season': 'Season 2015',
+            'season_number': 2015,
+            'media_type': 'Excerpt',
+            'genres': ['Other'],
+        },
+    }, {
+        'url': 'https://www.cbc.ca/player/play/1.1711287',
+        'info_dict': {
+            'id': '1.1711287',
+            'ext': 'mp4',
+            'title': 'Cancer survivor four times over',
+            'description': 'Tim Mayer has beaten three different forms of cancer four times in five years.',
+            'timestamp': 1320410746,
+            'upload_date': '20111104',
+            'thumbnail': 'https://i.cbc.ca/ais/1.1711287,1717139372111/full/max/0/default.jpg',
+            'chapters': [],
+            'duration': 186.867,
+            'series': 'CBC News: Windsor at 6:00',
+            'categories': ['Windsor'],
+            'location': 'Windsor',
+            'tags': ['Cancer', 'News/Canada/Windsor', 'Windsor'],
+            'media_type': 'Excerpt',
+            'genres': ['News'],
+        },
+        'params': {'skip_download': 'm3u8'},
     }, {
         # Has subtitles
         # These broadcasts expire after ~1 month, can find new test URL here:
         # https://www.cbc.ca/player/news/TV%20Shows/The%20National/Latest%20Broadcast
-        'url': 'http://www.cbc.ca/player/play/2249992771553',
-        'md5': '2f2fb675dd4f0f8a5bb7588d1b13bacd',
+        'url': 'https://www.cbc.ca/player/play/video/9.6424403',
+        'md5': '8025909eaffcf0adf59922904def9a5e',
         'info_dict': {
-            'id': '2249992771553',
+            'id': '9.6424403',
             'ext': 'mp4',
-            'title': 'The National | Women’s soccer pay, Florida seawater, Swift quake',
-            'description': 'md5:adba28011a56cfa47a080ff198dad27a',
-            'timestamp': 1690596000,
-            'duration': 2716.333,
-            'subtitles': {'eng': [{'ext': 'vtt', 'protocol': 'm3u8_native'}]},
-            'thumbnail': 'https://thumbnails.cbc.ca/maven_legacy/thumbnails/481/326/thumbnail.jpeg',
-            'uploader': 'CBCC-NEW',
+            'title': 'The National | N.W.T. wildfire emergency',
+            'description': 'md5:ada33d36d1df69347ed575905bfd496c',
+            'timestamp': 1718589600,
+            'duration': 2692.833,
+            'subtitles': {
+                'en-US': [{
+                    'name': 'English Captions',
+                    'url': 'https://cbchls.akamaized.net/delivery/news-shows/2024/06/17/NAT_JUN16-00-55-00/NAT_JUN16_cc.vtt',
+                }],
+            },
+            'thumbnail': 'https://i.cbc.ca/ais/6272b5c6-5e78-4c05-915d-0e36672e33d1,1714756287822/full/max/0/default.jpg',
             'chapters': 'count:5',
-            'upload_date': '20230729',
+            'upload_date': '20240617',
+            'categories': ['News', 'The National', 'The National Latest Broadcasts'],
+            'series': 'The National - Full Show',
+            'tags': ['The National'],
+            'location': 'Canada',
+            'media_type': 'Full Program',
+            'genres': ['News'],
+        },
+    }, {
+        'url': 'https://www.cbc.ca/player/play/video/1.7194274',
+        'md5': '188b96cf6bdcb2540e178a6caa957128',
+        'info_dict': {
+            'id': '1.7194274',
+            'ext': 'mp4',
+            'title': '#TheMoment a rare white spirit moose was spotted in Alberta',
+            'description': 'md5:18ae269a2d0265c5b0bbe4b2e1ac61a3',
+            'timestamp': 1714788791,
+            'duration': 77.678,
+            'subtitles': {'eng': [{'ext': 'vtt', 'protocol': 'm3u8_native'}]},
+            'thumbnail': 'https://i.cbc.ca/ais/1.7194274,1717224990425/full/max/0/default.jpg',
+            'chapters': [],
+            'categories': 'count:3',
+            'series': 'The National',
+            'tags': 'count:17',
+            'location': 'Canada',
+            'media_type': 'Excerpt',
+            'upload_date': '20240504',
+            'genres': ['News'],
+        },
+    }, {
+        'url': 'https://www.cbc.ca/player/play/video/9.6427282',
+        'info_dict': {
+            'id': '9.6427282',
+            'ext': 'mp4',
+            'title': 'Men\'s Soccer - Argentina vs Morocco',
+            'description': 'Argentina faces Morocco on the football pitch at Saint Etienne Stadium.',
+            'series': 'CBC Sports',
+            'media_type': 'Event Coverage',
+            'thumbnail': 'https://i.cbc.ca/ais/a4c5c0c2-99fa-4bd3-8061-5a63879c1b33,1718828053500/full/max/0/default.jpg',
+            'timestamp': 1721825400.0,
+            'upload_date': '20240724',
+            'duration': 10568.0,
+            'chapters': [],
+            'genres': [],
+            'tags': ['2024 Paris Olympic Games'],
+            'categories': ['Olympics Summer Soccer', 'Summer Olympics Replays', 'Summer Olympics Soccer Replays'],
+            'location': 'Canada',
+        },
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        'url': 'https://www.cbc.ca/player/play/video/9.6459530',
+        'md5': '6c1bb76693ab321a2e99c347a1d5ecbc',
+        'info_dict': {
+            'id': '9.6459530',
+            'ext': 'mp4',
+            'title': 'Parts of Jasper incinerated as wildfire rages',
+            'description': 'md5:6f1caa8d128ad3f629257ef5fecf0962',
+            'series': 'The National',
+            'media_type': 'Excerpt',
+            'thumbnail': 'https://i.cbc.ca/ais/507c0086-31a2-494d-96e4-bffb1048d045,1721953984375/full/max/0/default.jpg',
+            'timestamp': 1721964091.012,
+            'upload_date': '20240726',
+            'duration': 952.285,
+            'chapters': [],
+            'genres': [],
+            'tags': 'count:23',
+            'categories': ['News (FAST)', 'News', 'The National', 'TV News Shows', 'The National '],
+        },
+    }, {
+        'url': 'https://www.cbc.ca/player/play/video/9.6420651',
+        'md5': '71a850c2c6ee5e912de169f5311bb533',
+        'info_dict': {
+            'id': '9.6420651',
+            'ext': 'mp4',
+            'title': 'Is it a breath of fresh air? Measuring air quality in Edmonton',
+            'description': 'md5:3922b92cc8b69212d739bd9dd095b1c3',
+            'series': 'CBC News Edmonton',
+            'media_type': 'Excerpt',
+            'thumbnail': 'https://i.cbc.ca/ais/73c4ab9c-7ad4-46ee-bb9b-020fdc01c745,1718214547576/full/max/0/default.jpg',
+            'timestamp': 1718220065.768,
+            'upload_date': '20240612',
+            'duration': 286.086,
+            'chapters': [],
+            'genres': ['News'],
+            'categories': ['News', 'Edmonton'],
+            'tags': 'count:7',
+            'location': 'Edmonton',
+        },
+    }, {
+        'url': 'cbcplayer:1.7159484',
+        'only_matching': True,
+    }, {
+        'url': 'cbcplayer:2164402062',
+        'only_matching': True,
+    }, {
+        'url': 'http://www.cbc.ca/player/play/2657631896',
+        'only_matching': True,
+    }]
+
+    def _parse_param(self, asset_data, name):
+        return traverse_obj(asset_data, ('params', lambda _, v: v['name'] == name, 'value', {str}, any))
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(f'https://www.cbc.ca/player/play/{video_id}', video_id)
+        data = self._search_json(
+            r'window\.__INITIAL_STATE__\s*=', webpage, 'initial state', video_id)['video']['currentClip']
+        assets = traverse_obj(
+            data, ('media', 'assets', lambda _, v: url_or_none(v['key']) and v['type']))
+
+        if not assets and (media_id := traverse_obj(data, ('mediaId', {str}))):
+            # XXX: Deprecated; CBC is migrating off of ThePlatform
+            return {
+                '_type': 'url_transparent',
+                'ie_key': 'ThePlatform',
+                'url': smuggle_url(
+                    f'http://link.theplatform.com/s/ExhSPC/media/guid/2655402169/{media_id}?mbr=true&formats=MPEG4,FLV,MP3', {
+                        'force_smil_url': True,
+                    }),
+                'id': media_id,
+                '_format_sort_fields': ('res', 'proto'),  # Prioritize direct http formats over HLS
+            }
+
+        is_live = traverse_obj(data, ('media', 'streamType', {str})) == 'Live'
+        formats, subtitles = [], {}
+
+        for sub in traverse_obj(data, ('media', 'textTracks', lambda _, v: url_or_none(v['src']))):
+            subtitles.setdefault(sub.get('language') or 'und', []).append({
+                'url': sub['src'],
+                'name': sub.get('label'),
+            })
+
+        for asset in assets:
+            asset_key = asset['key']
+            asset_type = asset['type']
+            if asset_type != 'medianet':
+                self.report_warning(f'Skipping unsupported asset type "{asset_type}": {asset_key}')
+                continue
+            asset_data = self._download_json(asset_key, video_id, f'Downloading {asset_type} JSON')
+            ext = mimetype2ext(self._parse_param(asset_data, 'contentType'))
+            if ext == 'm3u8':
+                fmts, subs = self._extract_m3u8_formats_and_subtitles(
+                    asset_data['url'], video_id, 'mp4', m3u8_id='hls', live=is_live)
+                formats.extend(fmts)
+                # Avoid slow/error-prone webvtt-over-m3u8 if direct https vtt is available
+                if not subtitles:
+                    self._merge_subtitles(subs, target=subtitles)
+                if is_live or not fmts:
+                    continue
+                # Check for direct https mp4 format
+                best_video_fmt = traverse_obj(fmts, (
+                    lambda _, v: v.get('vcodec') != 'none' and v['tbr'], all,
+                    {functools.partial(sorted, key=lambda x: x['tbr'])}, -1, {dict})) or {}
+                base_url = self._search_regex(
+                    r'(https?://[^?#]+?/)hdntl=', best_video_fmt.get('url'), 'base url', default=None)
+                if not base_url or '/live/' in base_url:
+                    continue
+                mp4_url = base_url + replace_extension(url_basename(best_video_fmt['url']), 'mp4')
+                if self._request_webpage(
+                        HEADRequest(mp4_url), video_id, 'Checking for https format',
+                        errnote=False, fatal=False):
+                    formats.append({
+                        **best_video_fmt,
+                        'url': mp4_url,
+                        'format_id': 'https-mp4',
+                        'protocol': 'https',
+                        'manifest_url': None,
+                        'acodec': None,
+                    })
+            else:
+                formats.append({
+                    'url': asset_data['url'],
+                    'ext': ext,
+                    'vcodec': 'none' if self._parse_param(asset_data, 'mediaType') == 'audio' else None,
+                })
+
+        chapters = traverse_obj(data, (
+            'media', 'chapters', lambda _, v: float(v['startTime']) is not None, {
+                'start_time': ('startTime', {float_or_none(scale=1000)}),
+                'end_time': ('endTime', {float_or_none(scale=1000)}),
+                'title': ('name', {str}),
+            }))
+        # Filter out pointless single chapters with start_time==0 and no end_time
+        if len(chapters) == 1 and not (chapters[0].get('start_time') or chapters[0].get('end_time')):
+            chapters = []
+
+        return {
+            **traverse_obj(data, {
+                'title': ('title', {str}),
+                'description': ('description', {str.strip}),
+                'thumbnail': ('image', 'url', {url_or_none}, {update_url(query=None)}),
+                'timestamp': ('publishedAt', {float_or_none(scale=1000)}),
+                'media_type': ('media', 'clipType', {str}),
+                'series': ('showName', {str}),
+                'season_number': ('media', 'season', {int_or_none}),
+                'duration': ('media', 'duration', {float_or_none}, {lambda x: None if is_live else x}),
+                'location': ('media', 'region', {str}),
+                'tags': ('tags', ..., 'name', {str}),
+                'genres': ('media', 'genre', all),
+                'categories': ('categories', ..., 'name', {str}),
+            }),
+            'id': video_id,
+            'formats': formats,
+            'subtitles': subtitles,
+            'chapters': chapters,
+            'is_live': is_live,
+        }
+
+
+class CBCPlayerPlaylistIE(InfoExtractor):
+    IE_NAME = 'cbc.ca:player:playlist'
+    _VALID_URL = r'https?://(?:www\.)?cbc\.ca/(?:player/)(?!play/)(?P<id>[^?#]+)'
+    _TESTS = [{
+        'url': 'https://www.cbc.ca/player/news/TV%20Shows/The%20National/Latest%20Broadcast',
+        'playlist_mincount': 25,
+        'info_dict': {
+            'id': 'news/tv shows/the national/latest broadcast',
+        },
+    }, {
+        'url': 'https://www.cbc.ca/player/news/Canada/North',
+        'playlist_mincount': 25,
+        'info_dict': {
+            'id': 'news/canada/north',
         },
     }]
 
     def _real_extract(self, url):
-        video_id = self._match_id(url)
+        playlist_id = urllib.parse.unquote(self._match_id(url)).lower()
+        webpage = self._download_webpage(url, playlist_id)
+        json_content = self._search_json(
+            r'window\.__INITIAL_STATE__\s*=', webpage, 'initial state', playlist_id)
+
+        def entries():
+            for video_id in traverse_obj(json_content, (
+                'video', 'clipsByCategory', lambda k, _: k.lower() == playlist_id, 'items', ..., 'id',
+            )):
+                yield self.url_result(f'https://www.cbc.ca/player/play/{video_id}', CBCPlayerIE)
+
+        return self.playlist_result(entries(), playlist_id)
+
+
+class CBCGemBaseIE(InfoExtractor):
+    _NETRC_MACHINE = 'cbcgem'
+    _GEO_COUNTRIES = ['CA']
+
+    def _call_show_api(self, item_id, display_id=None):
+        return self._download_json(
+            f'https://services.radio-canada.ca/ott/catalog/v2/gem/show/{item_id}',
+            display_id or item_id, query={'device': 'web'})
+
+    def _extract_item_info(self, item_info):
+        episode_number = None
+        title = traverse_obj(item_info, ('title', {str}))
+        if title and (mobj := re.match(r'(?P<episode>\d+)\. (?P<title>.+)', title)):
+            episode_number = int_or_none(mobj.group('episode'))
+            title = mobj.group('title')
+
         return {
-            '_type': 'url_transparent',
-            'ie_key': 'ThePlatform',
-            'url': smuggle_url(
-                'http://link.theplatform.com/s/ExhSPC/media/guid/2655402169/%s?mbr=true&formats=MPEG4,FLV,MP3' % video_id, {
-                    'force_smil_url': True
-                }),
-            'id': video_id,
-            '_format_sort_fields': ('res', 'proto')  # Prioritize direct http formats over HLS
+            'episode_number': episode_number,
+            **traverse_obj(item_info, {
+                'id': ('url', {str}),
+                'episode_id': ('url', {str}),
+                'description': ('description', {str}),
+                'thumbnail': ('images', 'card', 'url', {url_or_none}, {update_url(query=None)}),
+                'episode_number': ('episodeNumber', {int_or_none}),
+                'duration': ('metadata', 'duration', {int_or_none}),
+                'release_timestamp': ('metadata', 'airDate', {unified_timestamp}),
+                'timestamp': ('metadata', 'availabilityDate', {unified_timestamp}),
+                'age_limit': ('metadata', 'rating', {trim_str(start='C')}, {parse_age_limit}),
+            }),
+            'episode': title,
+            'title': title,
         }
 
 
-class CBCGemIE(InfoExtractor):
+class CBCGemIE(CBCGemBaseIE):
     IE_NAME = 'gem.cbc.ca'
-    _VALID_URL = r'https?://gem\.cbc\.ca/(?:media/)?(?P<id>[0-9a-z-]+/s[0-9]+[a-z][0-9]+)'
+    _VALID_URL = r'https?://gem\.cbc\.ca/(?:media/)?(?P<id>[0-9a-z-]+/s(?P<season>[0-9]+)[a-z][0-9]+)'
     _TESTS = [{
         # This is a normal, public, TV show video
         'url': 'https://gem.cbc.ca/media/schitts-creek/s06e01',
-        'md5': '93dbb31c74a8e45b378cf13bd3f6f11e',
         'info_dict': {
             'id': 'schitts-creek/s06e01',
             'ext': 'mp4',
             'title': 'Smoke Signals',
             'description': 'md5:929868d20021c924020641769eb3e7f1',
-            'thumbnail': 'https://images.radio-canada.ca/v1/synps-cbc/episode/perso/cbc_schitts_creek_season_06e01_thumbnail_v01.jpg?im=Resize=(Size)',
-            'duration': 1314,
-            'categories': ['comedy'],
+            'thumbnail': r're:https://images\.radio-canada\.ca/[^#?]+/cbc_schitts_creek_season_06e01_thumbnail_v01\.jpg',
+            'duration': 1324,
+            'genres': ['Comédie et humour'],
             'series': 'Schitt\'s Creek',
             'season': 'Season 6',
             'season_number': 6,
             'episode': 'Smoke Signals',
             'episode_number': 1,
             'episode_id': 'schitts-creek/s06e01',
+            'upload_date': '20210618',
+            'timestamp': 1623974400,
+            'release_date': '20200107',
+            'release_timestamp': 1578355200,
+            'age_limit': 14,
         },
         'params': {'format': 'bv'},
-        'skip': 'Geo-restricted to Canada',
     }, {
         # This video requires an account in the browser, but works fine in yt-dlp
         'url': 'https://gem.cbc.ca/media/schitts-creek/s01e01',
-        'md5': '297a9600f554f2258aed01514226a697',
         'info_dict': {
             'id': 'schitts-creek/s01e01',
             'ext': 'mp4',
             'title': 'The Cup Runneth Over',
             'description': 'md5:9bca14ea49ab808097530eb05a29e797',
-            'thumbnail': 'https://images.radio-canada.ca/v1/synps-cbc/episode/perso/cbc_schitts_creek_season_01e01_thumbnail_v01.jpg?im=Resize=(Size)',
+            'thumbnail': r're:https://images\.radio-canada\.ca/[^#?]+/cbc_schitts_creek_season_01e01_thumbnail_v01\.jpg',
             'series': 'Schitt\'s Creek',
             'season_number': 1,
             'season': 'Season 1',
             'episode_number': 1,
             'episode': 'The Cup Runneth Over',
             'episode_id': 'schitts-creek/s01e01',
-            'duration': 1309,
-            'categories': ['comedy'],
+            'duration': 1308,
+            'genres': ['Comédie et humour'],
+            'upload_date': '20210617',
+            'timestamp': 1623888000,
+            'release_date': '20151123',
+            'release_timestamp': 1448236800,
+            'age_limit': 14,
         },
         'params': {'format': 'bv'},
-        'skip': 'Geo-restricted to Canada',
     }, {
         'url': 'https://gem.cbc.ca/nadiyas-family-favourites/s01e01',
         'only_matching': True,
     }]
 
-    _GEO_COUNTRIES = ['CA']
-    _TOKEN_API_KEY = '3f4beddd-2061-49b0-ae80-6f1f2ed65b37'
-    _NETRC_MACHINE = 'cbcgem'
+    _CLIENT_ID = 'fc05b0ee-3865-4400-a3cc-3da82c330c23'
+    _refresh_token = None
+    _access_token = None
     _claims_token = None
 
-    def _new_claims_token(self, email, password):
-        data = json.dumps({
-            'email': email,
-            'password': password,
-        }).encode()
-        headers = {'content-type': 'application/json'}
-        query = {'apikey': self._TOKEN_API_KEY}
-        resp = self._download_json('https://api.loginradius.com/identity/v2/auth/login',
-                                   None, data=data, headers=headers, query=query)
-        access_token = resp['access_token']
+    @functools.cached_property
+    def _ropc_settings(self):
+        return self._download_json(
+            'https://services.radio-canada.ca/ott/catalog/v1/gem/settings', None,
+            'Downloading site settings', query={'device': 'web'})['identityManagement']['ropc']
 
-        query = {
-            'access_token': access_token,
-            'apikey': self._TOKEN_API_KEY,
-            'jwtapp': 'jwt',
-        }
-        resp = self._download_json('https://cloud-api.loginradius.com/sso/jwt/api/token',
-                                   None, headers=headers, query=query)
-        sig = resp['signature']
+    def _is_jwt_expired(self, token):
+        return jwt_decode_hs256(token)['exp'] - time.time() < 300
 
-        data = json.dumps({'jwt': sig}).encode()
-        headers = {'content-type': 'application/json', 'ott-device-type': 'web'}
-        resp = self._download_json('https://services.radio-canada.ca/ott/cbc-api/v2/token',
-                                   None, data=data, headers=headers)
-        cbc_access_token = resp['accessToken']
+    def _call_oauth_api(self, oauth_data, note='Refreshing access token'):
+        response = self._download_json(
+            self._ropc_settings['url'], None, note, data=urlencode_postdata({
+                'client_id': self._CLIENT_ID,
+                **oauth_data,
+                'scope': self._ropc_settings['scopes'],
+            }))
+        self._refresh_token = response['refresh_token']
+        self._access_token = response['access_token']
+        self.cache.store(self._NETRC_MACHINE, 'token_data', [self._refresh_token, self._access_token])
 
-        headers = {'content-type': 'application/json', 'ott-device-type': 'web', 'ott-access-token': cbc_access_token}
-        resp = self._download_json('https://services.radio-canada.ca/ott/cbc-api/v2/profile',
-                                   None, headers=headers)
-        return resp['claimsToken']
+    def _perform_login(self, username, password):
+        if not self._refresh_token:
+            self._refresh_token, self._access_token = self.cache.load(
+                self._NETRC_MACHINE, 'token_data', default=[None, None])
 
-    def _get_claims_token_expiry(self):
-        # Token is a JWT
-        # JWT is decoded here and 'exp' field is extracted
-        # It is a Unix timestamp for when the token expires
-        b64_data = self._claims_token.split('.')[1]
-        data = base64.urlsafe_b64decode(b64_data + "==")
-        return json.loads(data)['exp']
+        if self._refresh_token and self._access_token:
+            self.write_debug('Using cached refresh token')
+            if not self._claims_token:
+                self._claims_token = self.cache.load(self._NETRC_MACHINE, 'claims_token')
+            return
 
-    def claims_token_expired(self):
-        exp = self._get_claims_token_expiry()
-        if exp - time.time() < 10:
-            # It will expire in less than 10 seconds, or has already expired
-            return True
-        return False
+        try:
+            self._call_oauth_api({
+                'grant_type': 'password',
+                'username': username,
+                'password': password,
+            }, note='Logging in')
+        except ExtractorError as e:
+            if isinstance(e.cause, HTTPError) and e.cause.status == 400:
+                raise ExtractorError('Invalid username and/or password', expected=True)
+            raise
 
-    def claims_token_valid(self):
-        return self._claims_token is not None and not self.claims_token_expired()
+    def _fetch_access_token(self):
+        if self._is_jwt_expired(self._access_token):
+            try:
+                self._call_oauth_api({
+                    'grant_type': 'refresh_token',
+                    'refresh_token': self._refresh_token,
+                })
+            except ExtractorError:
+                self._refresh_token, self._access_token = None, None
+                self.cache.store(self._NETRC_MACHINE, 'token_data', [None, None])
+                self.report_warning('Refresh token has been invalidated; retrying with credentials')
+                self._perform_login(*self._get_login_info())
 
-    def _get_claims_token(self, email, password):
-        if not self.claims_token_valid():
-            self._claims_token = self._new_claims_token(email, password)
+        return self._access_token
+
+    def _fetch_claims_token(self):
+        if not self._get_login_info()[0]:
+            return None
+
+        if not self._claims_token or self._is_jwt_expired(self._claims_token):
+            self._claims_token = self._download_json(
+                'https://services.radio-canada.ca/ott/subscription/v2/gem/Subscriber/profile',
+                None, 'Downloading claims token', query={'device': 'web'},
+                headers={'Authorization': f'Bearer {self._fetch_access_token()}'})['claimsToken']
             self.cache.store(self._NETRC_MACHINE, 'claims_token', self._claims_token)
+        else:
+            self.write_debug('Using cached claims token')
+
         return self._claims_token
 
-    def _real_initialize(self):
-        if self.claims_token_valid():
-            return
-        self._claims_token = self.cache.load(self._NETRC_MACHINE, 'claims_token')
-
-    def _find_secret_formats(self, formats, video_id):
-        """ Find a valid video url and convert it to the secret variant """
-        base_format = next((f for f in formats if f.get('vcodec') != 'none'), None)
-        if not base_format:
-            return
-
-        base_url = re.sub(r'(Manifest\(.*?),filter=[\w-]+(.*?\))', r'\1\2', base_format['url'])
-        url = re.sub(r'(Manifest\(.*?),format=[\w-]+(.*?\))', r'\1\2', base_url)
-
-        secret_xml = self._download_xml(url, video_id, note='Downloading secret XML', fatal=False)
-        if not secret_xml:
-            return
-
-        for child in secret_xml:
-            if child.attrib.get('Type') != 'video':
-                continue
-            for video_quality in child:
-                bitrate = int_or_none(video_quality.attrib.get('Bitrate'))
-                if not bitrate or 'Index' not in video_quality.attrib:
-                    continue
-                height = int_or_none(video_quality.attrib.get('MaxHeight'))
-
-                yield {
-                    **base_format,
-                    'format_id': join_nonempty('sec', height),
-                    # Note: \g<1> is necessary instead of \1 since bitrate is a number
-                    'url': re.sub(r'(QualityLevels\()\d+(\))', fr'\g<1>{bitrate}\2', base_url),
-                    'width': int_or_none(video_quality.attrib.get('MaxWidth')),
-                    'tbr': bitrate / 1000.0,
-                    'height': height,
-                }
-
     def _real_extract(self, url):
-        video_id = self._match_id(url)
-        video_info = self._download_json(
-            f'https://services.radio-canada.ca/ott/cbc-api/v2/assets/{video_id}',
-            video_id, expected_status=426)
+        video_id, season_number = self._match_valid_url(url).group('id', 'season')
+        video_info = self._call_show_api(video_id)
+        item_info = traverse_obj(video_info, (
+            'content', ..., 'lineups', ..., 'items',
+            lambda _, v: v['url'] == video_id, any, {require('item info')}))
 
-        email, password = self._get_login_info()
-        if email and password:
-            claims_token = self._get_claims_token(email, password)
-            headers = {'x-claims-token': claims_token}
-        else:
-            headers = {}
-        m3u8_info = self._download_json(video_info['playSession']['url'], video_id, headers=headers)
-        m3u8_url = m3u8_info.get('url')
+        headers = {}
+        if claims_token := self._fetch_claims_token():
+            headers['x-claims-token'] = claims_token
+
+        m3u8_info = self._download_json(
+            'https://services.radio-canada.ca/media/validation/v2/',
+            video_id, headers=headers, query={
+                'appCode': 'gem',
+                'connectionType': 'hd',
+                'deviceType': 'ipad',
+                'multibitrate': 'true',
+                'output': 'json',
+                'tech': 'hls',
+                'manifestVersion': '2',
+                'manifestType': 'desktop',
+                'idMedia': item_info['idMedia'],
+            })
 
         if m3u8_info.get('errorCode') == 1:
             self.raise_geo_restricted(countries=['CA'])
@@ -397,42 +718,37 @@ class CBCGemIE(InfoExtractor):
         elif m3u8_info.get('errorCode') != 0:
             raise ExtractorError(f'{self.IE_NAME} said: {m3u8_info.get("errorCode")} - {m3u8_info.get("message")}')
 
-        formats = self._extract_m3u8_formats(m3u8_url, video_id, m3u8_id='hls')
+        formats = self._extract_m3u8_formats(
+            m3u8_info['url'], video_id, 'mp4', m3u8_id='hls', query={'manifestType': ''})
         self._remove_duplicate_formats(formats)
-        formats.extend(self._find_secret_formats(formats, video_id))
 
-        for format in formats:
-            if format.get('vcodec') == 'none':
-                if format.get('ext') is None:
-                    format['ext'] = 'm4a'
-                if format.get('acodec') is None:
-                    format['acodec'] = 'mp4a.40.2'
+        for fmt in formats:
+            if fmt.get('vcodec') == 'none':
+                if fmt.get('ext') is None:
+                    fmt['ext'] = 'm4a'
+                if fmt.get('acodec') is None:
+                    fmt['acodec'] = 'mp4a.40.2'
 
                 # Put described audio at the beginning of the list, so that it
                 # isn't chosen by default, as most people won't want it.
-                if 'descriptive' in format['format_id'].lower():
-                    format['preference'] = -2
+                if 'descriptive' in fmt['format_id'].lower():
+                    fmt['preference'] = -2
 
         return {
+            'season_number': int_or_none(season_number),
+            **traverse_obj(video_info, {
+                'series': ('title', {str}),
+                'season_number': ('structuredMetadata', 'partofSeason', 'seasonNumber', {int_or_none}),
+                'genres': ('structuredMetadata', 'genre', ..., {str}),
+            }),
+            **self._extract_item_info(item_info),
             'id': video_id,
-            'title': video_info['title'],
-            'description': video_info.get('description'),
-            'thumbnail': video_info.get('image'),
-            'series': video_info.get('series'),
-            'season_number': video_info.get('season'),
-            'season': f'Season {video_info.get("season")}',
-            'episode_number': video_info.get('episode'),
-            'episode': video_info.get('title'),
             'episode_id': video_id,
-            'duration': video_info.get('duration'),
-            'categories': [video_info.get('category')],
             'formats': formats,
-            'release_timestamp': video_info.get('airDate'),
-            'timestamp': video_info.get('availableDate'),
         }
 
 
-class CBCGemPlaylistIE(InfoExtractor):
+class CBCGemPlaylistIE(CBCGemBaseIE):
     IE_NAME = 'gem.cbc.ca:playlist'
     _VALID_URL = r'https?://gem\.cbc\.ca/(?:media/)?(?P<id>(?P<show>[0-9a-z-]+)/s(?P<season>[0-9]+))/?(?:[?#]|$)'
     _TESTS = [{
@@ -442,66 +758,35 @@ class CBCGemPlaylistIE(InfoExtractor):
         'info_dict': {
             'id': 'schitts-creek/s06',
             'title': 'Season 6',
-            'description': 'md5:6a92104a56cbeb5818cc47884d4326a2',
+            'series': 'Schitt\'s Creek',
+            'season_number': 6,
+            'season': 'Season 6',
         },
     }, {
         'url': 'https://gem.cbc.ca/schitts-creek/s06',
         'only_matching': True,
     }]
-    _API_BASE = 'https://services.radio-canada.ca/ott/cbc-api/v2/shows/'
+
+    def _entries(self, season_info):
+        for episode in traverse_obj(season_info, ('items', lambda _, v: v['url'])):
+            yield self.url_result(
+                f'https://gem.cbc.ca/media/{episode["url"]}', CBCGemIE,
+                **self._extract_item_info(episode))
 
     def _real_extract(self, url):
-        match = self._match_valid_url(url)
-        season_id = match.group('id')
-        show = match.group('show')
-        show_info = self._download_json(self._API_BASE + show, season_id, expected_status=426)
-        season = int(match.group('season'))
+        season_id, show, season = self._match_valid_url(url).group('id', 'show', 'season')
+        show_info = self._call_show_api(show, display_id=season_id)
+        season_info = traverse_obj(show_info, (
+            'content', ..., 'lineups',
+            lambda _, v: v['seasonNumber'] == int(season), any, {require('season info')}))
 
-        season_info = next((s for s in show_info['seasons'] if s.get('season') == season), None)
-
-        if season_info is None:
-            raise ExtractorError(f'Couldn\'t find season {season} of {show}')
-
-        episodes = []
-        for episode in season_info['assets']:
-            episodes.append({
-                '_type': 'url_transparent',
-                'ie_key': 'CBCGem',
-                'url': 'https://gem.cbc.ca/media/' + episode['id'],
-                'id': episode['id'],
-                'title': episode.get('title'),
-                'description': episode.get('description'),
-                'thumbnail': episode.get('image'),
-                'series': episode.get('series'),
-                'season_number': episode.get('season'),
-                'season': season_info['title'],
-                'season_id': season_info.get('id'),
-                'episode_number': episode.get('episode'),
-                'episode': episode.get('title'),
-                'episode_id': episode['id'],
-                'duration': episode.get('duration'),
-                'categories': [episode.get('category')],
-            })
-
-        thumbnail = None
-        tn_uri = season_info.get('image')
-        # the-national was observed to use a "data:image/png;base64"
-        # URI for their 'image' value. The image was 1x1, and is
-        # probably just a placeholder, so it is ignored.
-        if tn_uri is not None and not tn_uri.startswith('data:'):
-            thumbnail = tn_uri
-
-        return {
-            '_type': 'playlist',
-            'entries': episodes,
-            'id': season_id,
-            'title': season_info['title'],
-            'description': season_info.get('description'),
-            'thumbnail': thumbnail,
-            'series': show_info.get('title'),
-            'season_number': season_info.get('season'),
-            'season': season_info['title'],
-        }
+        return self.playlist_result(
+            self._entries(season_info), season_id,
+            **traverse_obj(season_info, {
+                'title': ('title', {str}),
+                'season': ('title', {str}),
+                'season_number': ('seasonNumber', {int_or_none}),
+            }), series=traverse_obj(show_info, ('title', {str})))
 
 
 class CBCGemLiveIE(InfoExtractor):
@@ -514,11 +799,11 @@ class CBCGemLiveIE(InfoExtractor):
                 'title': 'Ottawa',
                 'description': 'The live TV channel and local programming from Ottawa',
                 'thumbnail': 'https://thumbnails.cbc.ca/maven_legacy/thumbnails/CBC_OTT_VMS/Live_Channel_Static_Images/Ottawa_2880x1620.jpg',
-                'is_live': True,
+                'live_status': 'is_live',
                 'id': 'AyqZwxRqh8EH',
                 'ext': 'mp4',
-                'timestamp': 1492106160,
-                'upload_date': '20170413',
+                'release_timestamp': 1492106160,
+                'release_date': '20170413',
                 'uploader': 'CBCC-NEW',
             },
             'skip': 'Live might have ended',
@@ -532,7 +817,7 @@ class CBCGemLiveIE(InfoExtractor):
                 'title': r're:^Ottawa [0-9\-: ]+',
                 'description': 'The live TV channel and local programming from Ottawa',
                 'live_status': 'is_live',
-                'thumbnail': r're:https://images.gem.cbc.ca/v1/cbc-gem/live/.*'
+                'thumbnail': r're:https://images.gem.cbc.ca/v1/cbc-gem/live/.*',
             },
             'params': {'skip_download': True},
             'skip': 'Live might have ended',
@@ -547,49 +832,84 @@ class CBCGemLiveIE(InfoExtractor):
                 'description': 'March 24, 2023 | President Biden’s Ottawa visit ends with big pledges from both countries. Plus, Gwyneth Paltrow testifies in her ski collision trial.',
                 'live_status': 'is_live',
                 'thumbnail': r're:https://images.gem.cbc.ca/v1/cbc-gem/live/.*',
-                'timestamp': 1679706000,
-                'upload_date': '20230325',
+                'release_timestamp': 1679706000,
+                'release_date': '20230325',
             },
             'params': {'skip_download': True},
             'skip': 'Live might have ended',
-        }
+        },
+        {   # event replay (medianetlive)
+            'url': 'https://gem.cbc.ca/live-event/42314',
+            'md5': '297a9600f554f2258aed01514226a697',
+            'info_dict': {
+                'id': '42314',
+                'ext': 'mp4',
+                'live_status': 'was_live',
+                'title': 'Women\'s Soccer - Canada vs New Zealand',
+                'description': 'md5:36200e5f1a70982277b5a6ecea86155d',
+                'thumbnail': r're:https://.+default\.jpg',
+                'release_timestamp': 1721917200,
+                'release_date': '20240725',
+            },
+            'params': {'skip_download': True},
+            'skip': 'Replay might no longer be available',
+        },
+        {   # event replay (medianetlive)
+            'url': 'https://gem.cbc.ca/live-event/43273',
+            'only_matching': True,
+        },
     ]
+    _GEO_COUNTRIES = ['CA']
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
         video_info = self._search_nextjs_data(webpage, video_id)['props']['pageProps']['data']
 
-        # Two types of metadata JSON
+        # Three types of video_info JSON: info in root, freeTv stream/item, event replay
         if not video_info.get('formattedIdMedia'):
-            video_info = traverse_obj(
-                video_info, (('freeTv', ('streams', ...)), 'items', lambda _, v: v['key'] == video_id, {dict}),
-                get_all=False, default={})
+            if traverse_obj(video_info, ('event', 'key')) == video_id:
+                video_info = video_info['event']
+            else:
+                video_info = traverse_obj(video_info, (
+                    ('freeTv', ('streams', ...)), 'items',
+                    lambda _, v: v['key'].partition('-')[0] == video_id, any)) or {}
 
         video_stream_id = video_info.get('formattedIdMedia')
         if not video_stream_id:
-            raise ExtractorError('Couldn\'t find video metadata, maybe this livestream is now offline', expected=True)
+            raise ExtractorError(
+                'Couldn\'t find video metadata, maybe this livestream is now offline', expected=True)
 
-        stream_data = self._download_json(
-            'https://services.radio-canada.ca/media/validation/v2/', video_id, query={
-                'appCode': 'mpx',
-                'connectionType': 'hd',
-                'deviceType': 'ipad',
-                'idMedia': video_stream_id,
-                'multibitrate': 'true',
-                'output': 'json',
-                'tech': 'hls',
-                'manifestType': 'desktop',
-            })
+        live_status = 'was_live' if video_info.get('isVodEnabled') else 'is_live'
+        release_timestamp = traverse_obj(video_info, ('airDate', {parse_iso8601}))
+
+        if live_status == 'is_live' and release_timestamp and release_timestamp > time.time():
+            formats = []
+            live_status = 'is_upcoming'
+            self.raise_no_formats('This livestream has not yet started', expected=True)
+        else:
+            stream_data = self._download_json(
+                'https://services.radio-canada.ca/media/validation/v2/', video_id, query={
+                    'appCode': 'medianetlive',
+                    'connectionType': 'hd',
+                    'deviceType': 'ipad',
+                    'idMedia': video_stream_id,
+                    'multibitrate': 'true',
+                    'output': 'json',
+                    'tech': 'hls',
+                    'manifestType': 'desktop',
+                })
+            formats = self._extract_m3u8_formats(
+                stream_data['url'], video_id, 'mp4', live=live_status == 'is_live')
 
         return {
             'id': video_id,
-            'formats': self._extract_m3u8_formats(stream_data['url'], video_id, 'mp4', live=True),
-            'is_live': True,
+            'formats': formats,
+            'live_status': live_status,
+            'release_timestamp': release_timestamp,
             **traverse_obj(video_info, {
-                'title': 'title',
-                'description': 'description',
+                'title': ('title', {str}),
+                'description': ('description', {str}),
                 'thumbnail': ('images', 'card', 'url'),
-                'timestamp': ('airDate', {parse_iso8601}),
-            })
+            }),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/cbs.py b/plugins/youtube_download/yt_dlp/extractor/cbs.py
index 1c0dbde..e825588 100644
--- a/plugins/youtube_download/yt_dlp/extractor/cbs.py
+++ b/plugins/youtube_download/yt_dlp/extractor/cbs.py
@@ -5,14 +5,14 @@ from .youtube import YoutubeIE
 from ..utils import (
     ExtractorError,
     extract_attributes,
+    find_xpath_attr,
     get_element_html_by_id,
     int_or_none,
-    find_xpath_attr,
     smuggle_url,
-    xpath_element,
-    xpath_text,
     update_url_query,
     url_or_none,
+    xpath_element,
+    xpath_text,
 )
 
 
@@ -31,7 +31,7 @@ class CBSBaseIE(ThePlatformFeedIE):  # XXX: Do not subclass from concrete IE
         return subtitles
 
     def _extract_common_video_info(self, content_id, asset_types, mpx_acc, extra_info):
-        tp_path = 'dJ5BDC/media/guid/%d/%s' % (mpx_acc, content_id)
+        tp_path = f'dJ5BDC/media/guid/{mpx_acc}/{content_id}'
         tp_release_url = f'https://link.theplatform.com/s/{tp_path}'
         info = self._extract_theplatform_metadata(tp_path, content_id)
 
@@ -41,7 +41,7 @@ class CBSBaseIE(ThePlatformFeedIE):  # XXX: Do not subclass from concrete IE
             try:
                 tp_formats, tp_subtitles = self._extract_theplatform_smil(
                     update_url_query(tp_release_url, query), content_id,
-                    'Downloading %s SMIL data' % asset_type)
+                    f'Downloading {asset_type} SMIL data')
             except ExtractorError as e:
                 last_e = e
                 if asset_type != 'fallback':
@@ -50,7 +50,7 @@ class CBSBaseIE(ThePlatformFeedIE):  # XXX: Do not subclass from concrete IE
                 try:
                     tp_formats, tp_subtitles = self._extract_theplatform_smil(
                         update_url_query(tp_release_url, query), content_id,
-                        'Downloading %s SMIL data, trying again with another format' % asset_type)
+                        f'Downloading {asset_type} SMIL data, trying again with another format')
                 except ExtractorError as e:
                     last_e = e
                     continue
@@ -76,6 +76,7 @@ class CBSBaseIE(ThePlatformFeedIE):  # XXX: Do not subclass from concrete IE
 
 
 class CBSIE(CBSBaseIE):
+    _WORKING = False
     _VALID_URL = r'''(?x)
         (?:
             cbs:|
@@ -101,6 +102,7 @@ class CBSIE(CBSBaseIE):
             # m3u8 download
             'skip_download': True,
         },
+        'skip': 'Subscription required',
     }, {
         'url': 'https://www.cbs.com/shows/video/sZH1MGgomIosZgxGJ1l263MFq16oMtW1/',
         'info_dict': {
@@ -117,6 +119,7 @@ class CBSIE(CBSBaseIE):
         },
         'expected_warnings': [
             'This content expired on', 'No video formats found', 'Requested format is not available'],
+        'skip': '404 Not Found',
     }, {
         'url': 'http://colbertlateshow.com/video/8GmB0oY0McANFvp2aEffk9jZZZ2YyXxy/the-colbeard/',
         'only_matching': True,
diff --git a/plugins/youtube_download/yt_dlp/extractor/cbsinteractive.py b/plugins/youtube_download/yt_dlp/extractor/cbsinteractive.py
deleted file mode 100644
index b09e982..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/cbsinteractive.py
+++ /dev/null
@@ -1,98 +0,0 @@
-from .cbs import CBSIE
-from ..utils import int_or_none
-
-
-class CBSInteractiveIE(CBSIE):  # XXX: Do not subclass from concrete IE
-    _VALID_URL = r'https?://(?:www\.)?(?P<site>cnet|zdnet)\.com/(?:videos|video(?:/share)?)/(?P<id>[^/?]+)'
-    _TESTS = [{
-        'url': 'http://www.cnet.com/videos/hands-on-with-microsofts-windows-8-1-update/',
-        'info_dict': {
-            'id': 'R49SYt__yAfmlXR85z4f7gNmCBDcN_00',
-            'display_id': 'hands-on-with-microsofts-windows-8-1-update',
-            'ext': 'mp4',
-            'title': 'Hands-on with Microsoft Windows 8.1 Update',
-            'description': 'The new update to the Windows 8 OS brings improved performance for mouse and keyboard users.',
-            'uploader_id': '6085384d-619e-11e3-b231-14feb5ca9861',
-            'uploader': 'Sarah Mitroff',
-            'duration': 70,
-            'timestamp': 1396479627,
-            'upload_date': '20140402',
-        },
-        'params': {
-            # m3u8 download
-            'skip_download': True,
-        },
-    }, {
-        'url': 'http://www.cnet.com/videos/whiny-pothole-tweets-at-local-government-when-hit-by-cars-tomorrow-daily-187/',
-        'md5': 'f11d27b2fa18597fbf92444d2a9ed386',
-        'info_dict': {
-            'id': 'kjOJd_OoVJqbg_ZD8MZCOk8Wekb9QccK',
-            'display_id': 'whiny-pothole-tweets-at-local-government-when-hit-by-cars-tomorrow-daily-187',
-            'ext': 'mp4',
-            'title': 'Whiny potholes tweet at local government when hit by cars (Tomorrow Daily 187)',
-            'description': 'md5:d2b9a95a5ffe978ae6fbd4cf944d618f',
-            'uploader_id': 'b163284d-6b73-44fc-b3e6-3da66c392d40',
-            'uploader': 'Ashley Esqueda',
-            'duration': 1482,
-            'timestamp': 1433289889,
-            'upload_date': '20150603',
-        },
-    }, {
-        'url': 'http://www.zdnet.com/video/share/video-keeping-android-smartphones-and-tablets-secure/',
-        'info_dict': {
-            'id': 'k0r4T_ehht4xW_hAOqiVQPuBDPZ8SRjt',
-            'display_id': 'video-keeping-android-smartphones-and-tablets-secure',
-            'ext': 'mp4',
-            'title': 'Video: Keeping Android smartphones and tablets secure',
-            'description': 'Here\'s the best way to keep Android devices secure, and what you do when they\'ve come to the end of their lives.',
-            'uploader_id': 'f2d97ea2-8175-11e2-9d12-0018fe8a00b0',
-            'uploader': 'Adrian Kingsley-Hughes',
-            'duration': 731,
-            'timestamp': 1449129925,
-            'upload_date': '20151203',
-        },
-        'params': {
-            # m3u8 download
-            'skip_download': True,
-        },
-    }, {
-        'url': 'http://www.zdnet.com/video/huawei-matebook-x-video/',
-        'only_matching': True,
-    }]
-
-    MPX_ACCOUNTS = {
-        'cnet': 2198311517,
-        'zdnet': 2387448114,
-    }
-
-    def _real_extract(self, url):
-        site, display_id = self._match_valid_url(url).groups()
-        webpage = self._download_webpage(url, display_id)
-
-        data_json = self._html_search_regex(
-            r"data(?:-(?:cnet|zdnet))?-video(?:-(?:uvp(?:js)?|player))?-options='([^']+)'",
-            webpage, 'data json')
-        data = self._parse_json(data_json, display_id)
-        vdata = data.get('video') or (data.get('videos') or data.get('playlist'))[0]
-
-        video_id = vdata['mpxRefId']
-
-        title = vdata['title']
-        author = vdata.get('author')
-        if author:
-            uploader = '%s %s' % (author['firstName'], author['lastName'])
-            uploader_id = author.get('id')
-        else:
-            uploader = None
-            uploader_id = None
-
-        info = self._extract_video_info(video_id, site, self.MPX_ACCOUNTS[site])
-        info.update({
-            'id': video_id,
-            'display_id': display_id,
-            'title': title,
-            'duration': int_or_none(vdata.get('duration')),
-            'uploader': uploader,
-            'uploader_id': uploader_id,
-        })
-        return info
diff --git a/plugins/youtube_download/yt_dlp/extractor/cbsnews.py b/plugins/youtube_download/yt_dlp/extractor/cbsnews.py
index 5a8ebb8..b01c0ef 100644
--- a/plugins/youtube_download/yt_dlp/extractor/cbsnews.py
+++ b/plugins/youtube_download/yt_dlp/extractor/cbsnews.py
@@ -1,6 +1,5 @@
 import base64
 import re
-import urllib.error
 import urllib.parse
 import zlib
 
@@ -97,7 +96,7 @@ class CBSNewsBaseIE(InfoExtractor):
             **traverse_obj(item, {
                 'title': (None, ('fulltitle', 'title')),
                 'description': 'dek',
-                'timestamp': ('timestamp', {lambda x: float_or_none(x, 1000)}),
+                'timestamp': ('timestamp', {float_or_none(scale=1000)}),
                 'duration': ('duration', {float_or_none}),
                 'subtitles': ('captions', {get_subtitles}),
                 'thumbnail': ('images', ('hd', 'sd'), {url_or_none}),
diff --git a/plugins/youtube_download/yt_dlp/extractor/cbssports.py b/plugins/youtube_download/yt_dlp/extractor/cbssports.py
index b5d85af..b9c82da 100644
--- a/plugins/youtube_download/yt_dlp/extractor/cbssports.py
+++ b/plugins/youtube_download/yt_dlp/extractor/cbssports.py
@@ -8,6 +8,7 @@ from ..utils import (
 
 # class CBSSportsEmbedIE(CBSBaseIE):
 class CBSSportsEmbedIE(InfoExtractor):
+    _WORKING = False
     IE_NAME = 'cbssports:embed'
     _VALID_URL = r'''(?ix)https?://(?:(?:www\.)?cbs|embed\.247)sports\.com/player/embed.+?
         (?:
@@ -75,6 +76,7 @@ class CBSSportsBaseIE(InfoExtractor):
 
 
 class CBSSportsIE(CBSSportsBaseIE):
+    _WORKING = False
     IE_NAME = 'cbssports'
     _VALID_URL = r'https?://(?:www\.)?cbssports\.com/[^/]+/video/(?P<id>[^/?#&]+)'
     _TESTS = [{
@@ -92,6 +94,7 @@ class CBSSportsIE(CBSSportsBaseIE):
 
 
 class TwentyFourSevenSportsIE(CBSSportsBaseIE):
+    _WORKING = False
     IE_NAME = '247sports'
     _VALID_URL = r'https?://(?:www\.)?247sports\.com/Video/(?:[^/?#&]+-)?(?P<id>\d+)'
     _TESTS = [{
diff --git a/plugins/youtube_download/yt_dlp/extractor/ccc.py b/plugins/youtube_download/yt_dlp/extractor/ccc.py
index 22e3a22..1d781cc 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ccc.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ccc.py
@@ -25,7 +25,7 @@ class CCCIE(InfoExtractor):
             'timestamp': 1388188800,
             'duration': 3710,
             'tags': list,
-        }
+        },
     }, {
         'url': 'https://media.ccc.de/v/32c3-7368-shopshifting#download',
         'only_matching': True,
@@ -35,7 +35,7 @@ class CCCIE(InfoExtractor):
         display_id = self._match_id(url)
         webpage = self._download_webpage(url, display_id)
         event_id = self._search_regex(r"data-id='(\d+)'", webpage, 'event id')
-        event_data = self._download_json('https://media.ccc.de/public/events/%s' % event_id, event_id)
+        event_data = self._download_json(f'https://media.ccc.de/public/events/{event_id}', event_id)
 
         formats = []
         for recording in event_data.get('recordings', []):
@@ -90,10 +90,17 @@ class CCCPlaylistIE(InfoExtractor):
             'id': '30c3',
         },
         'playlist_count': 135,
+    }, {
+        'url': 'https://media.ccc.de/c/DS2023',
+        'info_dict': {
+            'title': 'Datenspuren 2023',
+            'id': 'DS2023',
+        },
+        'playlist_count': 37,
     }]
 
     def _real_extract(self, url):
-        playlist_id = self._match_id(url).lower()
+        playlist_id = self._match_id(url)
 
         conf = self._download_json(
             'https://media.ccc.de/public/conferences/' + playlist_id,
diff --git a/plugins/youtube_download/yt_dlp/extractor/ccma.py b/plugins/youtube_download/yt_dlp/extractor/ccma.py
index 88ff82f..7014c20 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ccma.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ccma.py
@@ -1,6 +1,7 @@
 from .common import InfoExtractor
 from ..utils import (
     clean_html,
+    determine_ext,
     int_or_none,
     parse_duration,
     parse_resolution,
@@ -11,55 +12,89 @@ from ..utils import (
 
 
 class CCMAIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?ccma\.cat/(?:[^/]+/)*?(?P<type>video|audio)/(?P<id>\d+)'
+    IE_DESC = '3Cat, TV3 and Catalunya Ràdio'
+    _VALID_URL = r'https?://(?:www\.)?3cat\.cat/(?:3cat|tv3/sx3)/[^/?#]+/(?P<type>video|audio)/(?P<id>\d+)'
     _TESTS = [{
-        'url': 'http://www.ccma.cat/tv3/alacarta/lespot-de-la-marato-de-tv3/lespot-de-la-marato-de-tv3/video/5630208/',
+        # ccma.cat/tv3/alacarta/ URLs redirect to 3cat.cat/3cat/
+        'url': 'https://www.3cat.cat/3cat/lespot-de-la-marato-de-tv3/video/5630208/',
         'md5': '7296ca43977c8ea4469e719c609b0871',
         'info_dict': {
             'id': '5630208',
             'ext': 'mp4',
-            'title': 'L\'espot de La Marató de TV3',
+            'title': 'L\'espot de La Marató 2016: Ictus i les lesions medul·lars i cerebrals traumàtiques',
             'description': 'md5:f12987f320e2f6e988e9908e4fe97765',
             'timestamp': 1478608140,
             'upload_date': '20161108',
             'age_limit': 0,
-        }
+            'alt_title': 'EsportMarató2016WEB_PerPublicar',
+            'duration': 79,
+            'thumbnail': 'https://img.3cat.cat/multimedia/jpg/4/6/1478536106664.jpg',
+            'series': 'Dedicada a l\'ictus i les lesions medul·lars i cerebrals traumàtiques',
+            'categories': ['Divulgació'],
+        },
     }, {
-        'url': 'http://www.ccma.cat/catradio/alacarta/programa/el-consell-de-savis-analitza-el-derbi/audio/943685/',
+        # ccma.cat/catradio/alacarta/ URLs redirect to 3cat.cat/3cat/
+        'url': 'https://www.3cat.cat/3cat/el-consell-de-savis-analitza-el-derbi/audio/943685/',
         'md5': 'fa3e38f269329a278271276330261425',
         'info_dict': {
             'id': '943685',
             'ext': 'mp3',
             'title': 'El Consell de Savis analitza el derbi',
             'description': 'md5:e2a3648145f3241cb9c6b4b624033e53',
-            'upload_date': '20170512',
-            'timestamp': 1494622500,
+            'upload_date': '20161217',
+            'timestamp': 1482011700,
             'vcodec': 'none',
             'categories': ['Esports'],
-        }
+            'series': 'Tot gira',
+            'duration': 821,
+            'thumbnail': 'https://img.3cat.cat/multimedia/jpg/8/9/1482002602598.jpg',
+        },
     }, {
-        'url': 'http://www.ccma.cat/tv3/alacarta/crims/crims-josep-tallada-lespereu-me-capitol-1/video/6031387/',
-        'md5': 'b43c3d3486f430f3032b5b160d80cbc3',
+        'url': 'https://www.3cat.cat/3cat/crims-josep-tallada-lespereu-me-part-1/video/6031387/',
+        'md5': '27493513d08a3e5605814aee9bb778d2',
         'info_dict': {
             'id': '6031387',
             'ext': 'mp4',
-            'title': 'Crims - Josep Talleda, l\'"Espereu-me" (capítol 1)',
+            'title': 'T1xC5 - Josep Talleda, l\'"Espereu-me" (part 1)',
             'description': 'md5:7cbdafb640da9d0d2c0f62bad1e74e60',
-            'timestamp': 1582577700,
+            'timestamp': 1582577919,
             'upload_date': '20200224',
-            'subtitles': 'mincount:4',
-            'age_limit': 16,
+            'subtitles': 'mincount:1',
+            'age_limit': 13,
             'series': 'Crims',
-        }
+            'thumbnail': 'https://img.3cat.cat/multimedia/jpg/1/9/1582564376991.jpg',
+            'duration': 3203,
+            'categories': ['Divulgació'],
+            'alt_title': 'Crims - 5 - Josep Talleda, l\'"Espereu-me" (1a part) - Josep Talleda, l\'"Espereu-me" (part 1)',
+            'episode_number': 5,
+            'episode': 'Episode 5',
+        },
+    }, {
+        'url': 'https://www.3cat.cat/tv3/sx3/una-mosca-volava-per-la-llum/video/5759227/',
+        'info_dict': {
+            'id': '5759227',
+            'ext': 'mp4',
+            'title': 'Una mosca volava per la llum',
+            'alt_title': '17Z004Ç UNA MOSCA VOLAVA PER LA LLUM',
+            'description': 'md5:9ab64276944b0825336f4147f13f7854',
+            'series': 'Mic',
+            'upload_date': '20180411',
+            'timestamp': 1523440105,
+            'duration': 160,
+            'age_limit': 0,
+            'thumbnail': 'https://img.3cat.cat/multimedia/jpg/6/1/1524071667216.jpg',
+            'categories': ['Música'],
+        },
     }]
 
     def _real_extract(self, url):
-        media_type, media_id = self._match_valid_url(url).groups()
+        media_type, media_id = self._match_valid_url(url).group('type', 'id')
 
         media = self._download_json(
-            'http://dinamics.ccma.cat/pvideo/media.jsp', media_id, query={
+            'http://api-media.3cat.cat/pvideo/media.jsp', media_id, query={
                 'media': media_type,
                 'idint': media_id,
+                'format': 'dm',
             })
 
         formats = []
@@ -69,6 +104,10 @@ class CCMAIE(InfoExtractor):
                 format_url = url_or_none(format_.get('file'))
                 if not format_url:
                     continue
+                if determine_ext(format_url) == 'mpd':
+                    formats.extend(self._extract_mpd_formats(
+                        format_url, media_id, mpd_id='dash', fatal=False))
+                    continue
                 label = format_.get('label')
                 f = parse_resolution(label)
                 f.update({
diff --git a/plugins/youtube_download/yt_dlp/extractor/cctv.py b/plugins/youtube_download/yt_dlp/extractor/cctv.py
index 466bdfb..18c080d 100644
--- a/plugins/youtube_download/yt_dlp/extractor/cctv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/cctv.py
@@ -1,7 +1,6 @@
 import re
 
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     float_or_none,
     try_get,
@@ -88,6 +87,20 @@ class CCTVIE(InfoExtractor):
         'params': {
             'skip_download': True,
         },
+    }, {
+        # videoCenterId: "id"
+        'url': 'http://news.cctv.com/2024/02/21/ARTIcU5tKIOIF2myEGCATkLo240221.shtml',
+        'info_dict': {
+            'id': '5c846c0518444308ba32c4159df3b3e0',
+            'ext': 'mp4',
+            'title': '《平“语”近人——习近平喜欢的典故》第三季 第5集：风物长宜放眼量',
+            'uploader': 'yangjuan',
+            'timestamp': 1708554940,
+            'upload_date': '20240221',
+        },
+        'params': {
+            'skip_download': True,
+        },
     }, {
         # var ids = ["id"]
         'url': 'http://www.ncpa-classic.com/clt/more/416/index.shtml',
@@ -128,7 +141,7 @@ class CCTVIE(InfoExtractor):
 
         video_id = self._search_regex(
             [r'var\s+guid\s*=\s*["\']([\da-fA-F]+)',
-             r'videoCenterId["\']\s*,\s*["\']([\da-fA-F]+)',
+             r'videoCenterId(?:["\']\s*,|:)\s*["\']([\da-fA-F]+)',
              r'changePlayer\s*\(\s*["\']([\da-fA-F]+)',
              r'load[Vv]ideo\s*\(\s*["\']([\da-fA-F]+)',
              r'var\s+initMyAray\s*=\s*["\']([\da-fA-F]+)',
@@ -153,17 +166,17 @@ class CCTVIE(InfoExtractor):
         if isinstance(video, dict):
             for quality, chapters_key in enumerate(('lowChapters', 'chapters')):
                 video_url = try_get(
-                    video, lambda x: x[chapters_key][0]['url'], compat_str)
+                    video, lambda x: x[chapters_key][0]['url'], str)
                 if video_url:
                     formats.append({
                         'url': video_url,
                         'format_id': 'http',
                         'quality': quality,
                         # Sample clip
-                        'preference': -10
+                        'preference': -10,
                     })
 
-        hls_url = try_get(data, lambda x: x['hls_url'], compat_str)
+        hls_url = try_get(data, lambda x: x['hls_url'], str)
         if hls_url:
             hls_url = re.sub(r'maxbr=\d+&?', '', hls_url)
             formats.extend(self._extract_m3u8_formats(
diff --git a/plugins/youtube_download/yt_dlp/extractor/cda.py b/plugins/youtube_download/yt_dlp/extractor/cda.py
index 1157114..027b37d 100644
--- a/plugins/youtube_download/yt_dlp/extractor/cda.py
+++ b/plugins/youtube_download/yt_dlp/extractor/cda.py
@@ -1,27 +1,29 @@
 import base64
 import codecs
-import datetime
+import datetime as dt
 import hashlib
 import hmac
 import json
 import random
 import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import compat_ord, compat_urllib_parse_unquote
+from ..compat import compat_ord
 from ..utils import (
     ExtractorError,
+    OnDemandPagedList,
+    determine_ext,
     float_or_none,
     int_or_none,
     merge_dicts,
     multipart_encode,
     parse_duration,
-    random_birthday,
-    traverse_obj,
     try_call,
-    try_get,
+    url_or_none,
     urljoin,
 )
+from ..utils.traversal import traverse_obj
 
 
 class CDAIE(InfoExtractor):
@@ -52,7 +54,7 @@ class CDAIE(InfoExtractor):
             'age_limit': 0,
             'upload_date': '20160221',
             'timestamp': 1456078244,
-        }
+        },
     }, {
         'url': 'http://www.cda.pl/video/57413289',
         'md5': 'a88828770a8310fc00be6c95faf7f4d5',
@@ -63,26 +65,47 @@ class CDAIE(InfoExtractor):
             'description': 'md5:60d76b71186dcce4e0ba6d4bbdb13e1a',
             'thumbnail': r're:^https?://.*\.jpg$',
             'uploader': 'crash404',
-            'view_count': int,
             'average_rating': float,
             'duration': 137,
             'age_limit': 0,
-        }
+            'upload_date': '20160220',
+            'timestamp': 1455968218,
+        },
     }, {
-        # Age-restricted
-        'url': 'http://www.cda.pl/video/1273454c4',
+        # Age-restricted with vfilm redirection
+        'url': 'https://www.cda.pl/video/8753244c4',
+        'md5': 'd8eeb83d63611289507010d3df3bb8b3',
         'info_dict': {
-            'id': '1273454c4',
+            'id': '8753244c4',
             'ext': 'mp4',
-            'title': 'Bronson (2008) napisy HD 1080p',
-            'description': 'md5:1b6cb18508daf2dc4e0fa4db77fec24c',
+            'title': '[18+] Bez Filtra: Rezerwowe Psy czyli...  najwulgarniejsza polska gra?',
+            'description': 'md5:ae80bac31bd6a9f077a6cce03c7c077e',
             'height': 1080,
-            'uploader': 'boniek61',
+            'uploader': 'arhn eu',
             'thumbnail': r're:^https?://.*\.jpg$',
-            'duration': 5554,
+            'duration': 991,
             'age_limit': 18,
-            'view_count': int,
             'average_rating': float,
+            'timestamp': 1633888264,
+            'upload_date': '20211010',
+        },
+    }, {
+        # Age-restricted without vfilm redirection
+        'url': 'https://www.cda.pl/video/17028157b8',
+        'md5': 'c1fe5ff4582bace95d4f0ce0fbd0f992',
+        'info_dict': {
+            'id': '17028157b8',
+            'ext': 'mp4',
+            'title': 'STENDUPY MICHAŁ OGIŃSKI',
+            'description': 'md5:5851f3272bfc31f762d616040a1d609a',
+            'height': 480,
+            'uploader': 'oginski',
+            'thumbnail': r're:^https?://.*\.jpg$',
+            'duration': 18855,
+            'age_limit': 18,
+            'average_rating': float,
+            'timestamp': 1699705901,
+            'upload_date': '20231111',
         },
     }, {
         'url': 'http://ebd.cda.pl/0x0/5749950c',
@@ -90,21 +113,16 @@ class CDAIE(InfoExtractor):
     }]
 
     def _download_age_confirm_page(self, url, video_id, *args, **kwargs):
-        form_data = random_birthday('rok', 'miesiac', 'dzien')
-        form_data.update({'return': url, 'module': 'video', 'module_id': video_id})
-        data, content_type = multipart_encode(form_data)
+        data, content_type = multipart_encode({'age_confirm': ''})
         return self._download_webpage(
-            urljoin(url, '/a/validatebirth'), video_id, *args,
+            url, video_id, *args,
             data=data, headers={
                 'Referer': url,
                 'Content-Type': content_type,
             }, **kwargs)
 
     def _perform_login(self, username, password):
-        app_version = random.choice((
-            '1.2.88 build 15306',
-            '1.2.174 build 18469',
-        ))
+        app_version = '1.2.255 build 21541'
         android_version = random.randrange(8, 14)
         phone_model = random.choice((
             # x-kom.pl top selling Android smartphones, as of 2022-12-26
@@ -134,7 +152,7 @@ class CDAIE(InfoExtractor):
         self._API_HEADERS['User-Agent'] = f'pl.cda 1.0 (version {app_version}; Android {android_version}; {phone_model})'
 
         cached_bearer = self.cache.load(self._BEARER_CACHE, username) or {}
-        if cached_bearer.get('valid_until', 0) > datetime.datetime.now().timestamp() + 5:
+        if cached_bearer.get('valid_until', 0) > dt.datetime.now().timestamp() + 5:
             self._API_HEADERS['Authorization'] = f'Bearer {cached_bearer["token"]}'
             return
 
@@ -154,7 +172,7 @@ class CDAIE(InfoExtractor):
             })
         self.cache.store(self._BEARER_CACHE, username, {
             'token': token_res['access_token'],
-            'valid_until': token_res['expires_in'] + datetime.datetime.now().timestamp(),
+            'valid_until': token_res['expires_in'] + dt.datetime.now().timestamp(),
         })
         self._API_HEADERS['Authorization'] = f'Bearer {token_res["access_token"]}'
 
@@ -164,13 +182,13 @@ class CDAIE(InfoExtractor):
         if 'Authorization' in self._API_HEADERS:
             return self._api_extract(video_id)
         else:
-            return self._web_extract(video_id, url)
+            return self._web_extract(video_id)
 
     def _api_extract(self, video_id):
         meta = self._download_json(
             f'{self._BASE_API_URL}/video/{video_id}', video_id, headers=self._API_HEADERS)['video']
 
-        uploader = traverse_obj(meta, 'author', 'login')
+        uploader = traverse_obj(meta, ('author', 'login', {str}))
 
         formats = [{
             'url': quality['file'],
@@ -197,9 +215,9 @@ class CDAIE(InfoExtractor):
             'view_count': meta.get('views'),
         }
 
-    def _web_extract(self, video_id, url):
+    def _web_extract(self, video_id):
         self._set_cookie('cda.pl', 'cda.player', 'html5')
-        webpage = self._download_webpage(
+        webpage, urlh = self._download_webpage_handle(
             f'{self._BASE_URL}/video/{video_id}/vfilm', video_id)
 
         if 'Ten film jest dostępny dla użytkowników premium' in webpage:
@@ -209,10 +227,10 @@ class CDAIE(InfoExtractor):
             self.raise_geo_restricted()
 
         need_confirm_age = False
-        if self._html_search_regex(r'(<form[^>]+action="[^"]*/a/validatebirth[^"]*")',
+        if self._html_search_regex(r'(<button[^>]+name="[^"]*age_confirm[^"]*")',
                                    webpage, 'birthday validate form', default=None):
             webpage = self._download_age_confirm_page(
-                url, video_id, note='Confirming age')
+                urlh.url, video_id, note='Confirming age')
             need_confirm_age = True
 
         formats = []
@@ -222,9 +240,6 @@ class CDAIE(InfoExtractor):
             (?:<\1[^>]*>[^<]*</\1>|(?!</\1>)(?:.|\n))*?
             <(span|meta)[^>]+itemprop=(["\'])name\4[^>]*>(?P<uploader>[^<]+)</\3>
         ''', webpage, 'uploader', default=None, group='uploader')
-        view_count = self._search_regex(
-            r'Odsłony:(?:\s|&nbsp;)*([0-9]+)', webpage,
-            'view_count', default=None)
         average_rating = self._search_regex(
             (r'<(?:span|meta)[^>]+itemprop=(["\'])ratingValue\1[^>]*>(?P<rating_value>[0-9.]+)',
              r'<span[^>]+\bclass=["\']rating["\'][^>]*>(?P<rating_value>[0-9.]+)'), webpage, 'rating', fatal=False,
@@ -235,7 +250,6 @@ class CDAIE(InfoExtractor):
             'title': self._og_search_title(webpage),
             'description': self._og_search_description(webpage),
             'uploader': uploader,
-            'view_count': int_or_none(view_count),
             'average_rating': float_or_none(average_rating),
             'thumbnail': self._og_search_thumbnail(webpage),
             'formats': formats,
@@ -249,7 +263,7 @@ class CDAIE(InfoExtractor):
         def decrypt_file(a):
             for p in ('_XDDD', '_CDA', '_ADC', '_CXD', '_QWE', '_Q5', '_IKSDE'):
                 a = a.replace(p, '')
-            a = compat_urllib_parse_unquote(a)
+            a = urllib.parse.unquote(a)
             b = []
             for c in a:
                 f = compat_ord(c)
@@ -266,49 +280,62 @@ class CDAIE(InfoExtractor):
         def extract_format(page, version):
             json_str = self._html_search_regex(
                 r'player_data=(\\?["\'])(?P<player_data>.+?)\1', page,
-                '%s player_json' % version, fatal=False, group='player_data')
+                f'{version} player_json', fatal=False, group='player_data')
             if not json_str:
                 return
             player_data = self._parse_json(
-                json_str, '%s player_data' % version, fatal=False)
+                json_str, f'{version} player_data', fatal=False)
             if not player_data:
                 return
             video = player_data.get('video')
             if not video or 'file' not in video:
-                self.report_warning('Unable to extract %s version information' % version)
+                self.report_warning(f'Unable to extract {version} version information')
                 return
-            if video['file'].startswith('uggc'):
-                video['file'] = codecs.decode(video['file'], 'rot_13')
-                if video['file'].endswith('adc.mp4'):
-                    video['file'] = video['file'].replace('adc.mp4', '.mp4')
-            elif not video['file'].startswith('http'):
-                video['file'] = decrypt_file(video['file'])
             video_quality = video.get('quality')
             qualities = video.get('qualities', {})
             video_quality = next((k for k, v in qualities.items() if v == video_quality), video_quality)
-            info_dict['formats'].append({
-                'url': video['file'],
-                'format_id': video_quality,
-                'height': int_or_none(video_quality[:-1]),
-            })
+            if video.get('file'):
+                if video['file'].startswith('uggc'):
+                    video['file'] = codecs.decode(video['file'], 'rot_13')
+                    if video['file'].endswith('adc.mp4'):
+                        video['file'] = video['file'].replace('adc.mp4', '.mp4')
+                elif not video['file'].startswith('http'):
+                    video['file'] = decrypt_file(video['file'])
+                info_dict['formats'].append({
+                    'url': video['file'],
+                    'format_id': video_quality,
+                    'height': int_or_none(video_quality[:-1]),
+                })
             for quality, cda_quality in qualities.items():
                 if quality == video_quality:
                     continue
                 data = {'jsonrpc': '2.0', 'method': 'videoGetLink', 'id': 2,
                         'params': [video_id, cda_quality, video.get('ts'), video.get('hash2'), {}]}
-                data = json.dumps(data).encode('utf-8')
-                video_url = self._download_json(
+                data = json.dumps(data).encode()
+                response = self._download_json(
                     f'https://www.cda.pl/video/{video_id}', video_id, headers={
                         'Content-Type': 'application/json',
-                        'X-Requested-With': 'XMLHttpRequest'
+                        'X-Requested-With': 'XMLHttpRequest',
                     }, data=data, note=f'Fetching {quality} url',
                     errnote=f'Failed to fetch {quality} url', fatal=False)
-                if try_get(video_url, lambda x: x['result']['status']) == 'ok':
-                    video_url = try_get(video_url, lambda x: x['result']['resp'])
+                if (
+                    traverse_obj(response, ('result', 'status')) != 'ok'
+                    or not traverse_obj(response, ('result', 'resp', {url_or_none}))
+                ):
+                    continue
+                video_url = response['result']['resp']
+                ext = determine_ext(video_url)
+                if ext == 'mpd':
+                    info_dict['formats'].extend(self._extract_mpd_formats(
+                        video_url, video_id, mpd_id='dash', fatal=False))
+                elif ext == 'm3u8':
+                    info_dict['formats'].extend(self._extract_m3u8_formats(
+                        video_url, video_id, 'mp4', m3u8_id='hls', fatal=False))
+                else:
                     info_dict['formats'].append({
                         'url': video_url,
                         'format_id': quality,
-                        'height': int_or_none(quality[:-1])
+                        'height': int_or_none(quality[:-1]),
                     })
 
             if not info_dict['duration']:
@@ -326,13 +353,63 @@ class CDAIE(InfoExtractor):
 
             webpage = handler(
                 urljoin(self._BASE_URL, href), video_id,
-                'Downloading %s version information' % resolution, fatal=False)
+                f'Downloading {resolution} version information', fatal=False)
             if not webpage:
                 # Manually report warning because empty page is returned when
                 # invalid version is requested.
-                self.report_warning('Unable to download %s version information' % resolution)
+                self.report_warning(f'Unable to download {resolution} version information')
                 continue
 
             extract_format(webpage, resolution)
 
         return merge_dicts(info_dict, info)
+
+
+class CDAFolderIE(InfoExtractor):
+    _MAX_PAGE_SIZE = 36
+    _VALID_URL = r'https?://(?:www\.)?cda\.pl/(?P<channel>[\w-]+)/folder/(?P<id>\d+)'
+    _TESTS = [
+        {
+            'url': 'https://www.cda.pl/domino264/folder/31188385',
+            'info_dict': {
+                'id': '31188385',
+                'title': 'SERIA DRUGA',
+            },
+            'playlist_mincount': 13,
+        },
+        {
+            'url': 'https://www.cda.pl/smiechawaTV/folder/2664592/vfilm',
+            'info_dict': {
+                'id': '2664592',
+                'title': 'VideoDowcipy - wszystkie odcinki',
+            },
+            'playlist_mincount': 71,
+        },
+        {
+            'url': 'https://www.cda.pl/DeliciousBeauty/folder/19129979/vfilm',
+            'info_dict': {
+                'id': '19129979',
+                'title': 'TESTY KOSMETYKÓW',
+            },
+            'playlist_mincount': 139,
+        }, {
+            'url': 'https://www.cda.pl/FILMY-SERIALE-ANIME-KRESKOWKI-BAJKI/folder/18493422',
+            'only_matching': True,
+        }]
+
+    def _real_extract(self, url):
+        folder_id, channel = self._match_valid_url(url).group('id', 'channel')
+
+        webpage = self._download_webpage(url, folder_id)
+
+        def extract_page_entries(page):
+            webpage = self._download_webpage(
+                f'https://www.cda.pl/{channel}/folder/{folder_id}/vfilm/{page + 1}', folder_id,
+                f'Downloading page {page + 1}', expected_status=404)
+            items = re.findall(r'<a[^>]+href="/video/([0-9a-z]+)"', webpage)
+            for video_id in items:
+                yield self.url_result(f'https://www.cda.pl/video/{video_id}', CDAIE, video_id)
+
+        return self.playlist_result(
+            OnDemandPagedList(extract_page_entries, self._MAX_PAGE_SIZE),
+            folder_id, self._og_search_title(webpage))
diff --git a/plugins/youtube_download/yt_dlp/extractor/cellebrite.py b/plugins/youtube_download/yt_dlp/extractor/cellebrite.py
index 9896a31..54367c4 100644
--- a/plugins/youtube_download/yt_dlp/extractor/cellebrite.py
+++ b/plugins/youtube_download/yt_dlp/extractor/cellebrite.py
@@ -1,63 +1,50 @@
-from .common import InfoExtractor
-from ..utils import traverse_obj
+from .vidyard import VidyardBaseIE, VidyardIE
+from ..utils import ExtractorError, make_archive_id, url_basename
 
 
-class CellebriteIE(InfoExtractor):
+class CellebriteIE(VidyardBaseIE):
     _VALID_URL = r'https?://cellebrite\.com/(?:\w+)?/(?P<id>[\w-]+)'
     _TESTS = [{
         'url': 'https://cellebrite.com/en/collect-data-from-android-devices-with-cellebrite-ufed/',
         'info_dict': {
-            'id': '16025876',
+            'id': 'ZqmUss3dQfEMGpauambPuH',
+            'display_id': '16025876',
             'ext': 'mp4',
-            'description': 'md5:174571cb97083fd1d457d75c684f4e2b',
-            'thumbnail': 'https://cellebrite.com/wp-content/uploads/2021/05/Chat-Capture-1024x559.png',
             'title': 'Ask the Expert: Chat Capture - Collect Data from Android Devices in Cellebrite UFED',
-            'duration': 455,
-            'tags': [],
-        }
+            'description': 'md5:dee48fe12bbae5c01fe6a053f7676da4',
+            'thumbnail': 'https://cellebrite.com/wp-content/uploads/2021/05/Chat-Capture-1024x559.png',
+            'duration': 455.979,
+            '_old_archive_ids': ['cellebrite 16025876'],
+        },
     }, {
         'url': 'https://cellebrite.com/en/how-to-lawfully-collect-the-maximum-amount-of-data-from-android-devices/',
         'info_dict': {
-            'id': '29018255',
+            'id': 'QV1U8a2yzcxigw7VFnqKyg',
+            'display_id': '29018255',
             'ext': 'mp4',
-            'duration': 134,
-            'tags': [],
-            'description': 'md5:e9a3d124c7287b0b07bad2547061cacf',
+            'title': 'How to Lawfully Collect the Maximum Amount of Data From Android Devices',
+            'description': 'md5:0e943a9ac14c374d5d74faed634d773c',
             'thumbnail': 'https://cellebrite.com/wp-content/uploads/2022/07/How-to-Lawfully-Collect-the-Maximum-Amount-of-Data-From-Android-Devices.png',
-            'title': 'Android Extractions Explained',
-        }
+            'duration': 134.315,
+            '_old_archive_ids': ['cellebrite 29018255'],
+        },
     }]
 
-    def _get_formats_and_subtitles(self, json_data, display_id):
-        formats = [{'url': url} for url in traverse_obj(json_data, ('mp4', ..., 'url')) or []]
-        subtitles = {}
-
-        for url in traverse_obj(json_data, ('hls', ..., 'url')) or []:
-            fmt, sub = self._extract_m3u8_formats_and_subtitles(
-                url, display_id, ext='mp4', headers={'Referer': 'https://play.vidyard.com/'})
-            formats.extend(fmt)
-            self._merge_subtitles(sub, target=subtitles)
-
-        return formats, subtitles
-
     def _real_extract(self, url):
-        display_id = self._match_id(url)
-        webpage = self._download_webpage(url, display_id)
+        slug = self._match_id(url)
+        webpage = self._download_webpage(url, slug)
+        vidyard_url = next(VidyardIE._extract_embed_urls(url, webpage), None)
+        if not vidyard_url:
+            raise ExtractorError('No Vidyard video embeds found on page')
 
-        player_uuid = self._search_regex(
-            r'<img\s[^>]*\bdata-uuid\s*=\s*"([^"\?]+)', webpage, 'player UUID')
-        json_data = self._download_json(
-            f'https://play.vidyard.com/player/{player_uuid}.json', display_id)['payload']['chapters'][0]
+        video_id = url_basename(vidyard_url)
+        info = self._process_video_json(self._fetch_video_json(video_id)['chapters'][0], video_id)
+        if info.get('display_id'):
+            info['_old_archive_ids'] = [make_archive_id(self, info['display_id'])]
+        if thumbnail := self._og_search_thumbnail(webpage, default=None):
+            info.setdefault('thumbnails', []).append({'url': thumbnail})
 
-        formats, subtitles = self._get_formats_and_subtitles(json_data['sources'], display_id)
         return {
-            'id': str(json_data['videoId']),
-            'title': json_data.get('name') or self._og_search_title(webpage),
-            'formats': formats,
-            'subtitles': subtitles,
-            'description': json_data.get('description') or self._og_search_description(webpage),
-            'duration': json_data.get('seconds'),
-            'tags': json_data.get('tags'),
-            'thumbnail': self._og_search_thumbnail(webpage),
-            'http_headers': {'Referer': 'https://play.vidyard.com/'},
+            'description': self._og_search_description(webpage, default=None),
+            **info,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/ceskatelevize.py b/plugins/youtube_download/yt_dlp/extractor/ceskatelevize.py
index 8390160..c323985 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ceskatelevize.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ceskatelevize.py
@@ -1,7 +1,7 @@
 import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import compat_urllib_parse_unquote, compat_urllib_parse_urlparse
 from ..networking import Request
 from ..utils import (
     ExtractorError,
@@ -51,7 +51,7 @@ class CeskaTelevizeIE(InfoExtractor):
         'url': 'http://www.ceskatelevize.cz/ivysilani/zive/ct4/',
         'only_matching': True,
         'info_dict': {
-            'id': 402,
+            'id': '402',
             'ext': 'mp4',
             'title': r're:^ČT Sport \d{4}-\d{2}-\d{2} \d{2}:\d{2}$',
             'is_live': True,
@@ -97,11 +97,11 @@ class CeskaTelevizeIE(InfoExtractor):
     def _real_extract(self, url):
         playlist_id = self._match_id(url)
         webpage, urlh = self._download_webpage_handle(url, playlist_id)
-        parsed_url = compat_urllib_parse_urlparse(urlh.url)
+        parsed_url = urllib.parse.urlparse(urlh.url)
         site_name = self._og_search_property('site_name', webpage, fatal=False, default='Česká televize')
         playlist_title = self._og_search_title(webpage, default=None)
         if site_name and playlist_title:
-            playlist_title = re.split(r'\s*[—|]\s*%s' % (site_name, ), playlist_title, 1)[0]
+            playlist_title = re.split(rf'\s*[—|]\s*{site_name}', playlist_title, maxsplit=1)[0]
         playlist_description = self._og_search_description(webpage, default=None)
         if playlist_description:
             playlist_description = playlist_description.replace('\xa0', ' ')
@@ -122,15 +122,15 @@ class CeskaTelevizeIE(InfoExtractor):
             iframe_hash = self._download_webpage(
                 'https://www.ceskatelevize.cz/v-api/iframe-hash/',
                 playlist_id, note='Getting IFRAME hash')
-            query = {'hash': iframe_hash, 'origin': 'iVysilani', 'autoStart': 'true', type_: idec, }
+            query = {'hash': iframe_hash, 'origin': 'iVysilani', 'autoStart': 'true', type_: idec}
             webpage = self._download_webpage(
                 'https://www.ceskatelevize.cz/ivysilani/embed/iFramePlayer.php',
                 playlist_id, note='Downloading player', query=query)
 
         NOT_AVAILABLE_STRING = 'This content is not available at your territory due to limited copyright.'
-        if '%s</p>' % NOT_AVAILABLE_STRING in webpage:
+        if f'{NOT_AVAILABLE_STRING}</p>' in webpage:
             self.raise_geo_restricted(NOT_AVAILABLE_STRING)
-        if any(not_found in webpage for not_found in ('Neplatný parametr pro videopřehrávač', 'IDEC nebyl nalezen', )):
+        if any(not_found in webpage for not_found in ('Neplatný parametr pro videopřehrávač', 'IDEC nebyl nalezen')):
             raise ExtractorError('no video with IDEC available', video_id=idec, expected=True)
 
         type_ = None
@@ -183,7 +183,7 @@ class CeskaTelevizeIE(InfoExtractor):
             if playlist_url == 'error_region':
                 raise ExtractorError(NOT_AVAILABLE_STRING, expected=True)
 
-            req = Request(compat_urllib_parse_unquote(playlist_url))
+            req = Request(urllib.parse.unquote(playlist_url))
             req.headers['Referer'] = url
 
             playlist = self._download_json(req, playlist_id, fatal=False)
@@ -203,11 +203,11 @@ class CeskaTelevizeIE(InfoExtractor):
                     if 'playerType=flash' in stream_url:
                         stream_formats = self._extract_m3u8_formats(
                             stream_url, playlist_id, 'mp4', 'm3u8_native',
-                            m3u8_id='hls-%s' % format_id, fatal=False)
+                            m3u8_id=f'hls-{format_id}', fatal=False)
                     else:
                         stream_formats = self._extract_mpd_formats(
                             stream_url, playlist_id,
-                            mpd_id='dash-%s' % format_id, fatal=False)
+                            mpd_id=f'dash-{format_id}', fatal=False)
                     if 'drmOnly=true' in stream_url:
                         for f in stream_formats:
                             f['has_drm'] = True
@@ -236,7 +236,7 @@ class CeskaTelevizeIE(InfoExtractor):
                 if playlist_len == 1:
                     final_title = playlist_title or title
                 else:
-                    final_title = '%s (%s)' % (playlist_title, title)
+                    final_title = f'{playlist_title} ({title})'
 
                 entries.append({
                     'id': item_id,
@@ -261,7 +261,7 @@ class CeskaTelevizeIE(InfoExtractor):
             'cs': [{
                 'ext': 'srt',
                 'data': srt_subs,
-            }]
+            }],
         }
 
     @staticmethod
@@ -282,7 +282,7 @@ class CeskaTelevizeIE(InfoExtractor):
                 if m:
                     yield m.group(1)
                     start, stop = (_msectotimecode(int(t)) for t in m.groups()[1:])
-                    yield '{0} --> {1}'.format(start, stop)
+                    yield f'{start} --> {stop}'
                 else:
                     yield line
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/cgtn.py b/plugins/youtube_download/yt_dlp/extractor/cgtn.py
index aaafa02..b9757e0 100644
--- a/plugins/youtube_download/yt_dlp/extractor/cgtn.py
+++ b/plugins/youtube_download/yt_dlp/extractor/cgtn.py
@@ -17,10 +17,11 @@ class CGTNIE(InfoExtractor):
                 'thumbnail': r're:^https?://.*\.jpg$',
                 'timestamp': 1615295940,
                 'upload_date': '20210309',
+                'categories': ['Video'],
             },
             'params': {
-                'skip_download': True
-            }
+                'skip_download': True,
+            },
         }, {
             'url': 'https://news.cgtn.com/news/2021-06-06/China-Indonesia-vow-to-further-deepen-maritime-cooperation-10REvJCewCY/index.html',
             'info_dict': {
@@ -29,15 +30,15 @@ class CGTNIE(InfoExtractor):
                 'title': 'China, Indonesia vow to further deepen maritime cooperation',
                 'thumbnail': r're:^https?://.*\.png$',
                 'description': 'China and Indonesia vowed to upgrade their cooperation into the maritime sector and also for political security, economy, and cultural and people-to-people exchanges.',
-                'author': 'CGTN',
-                'category': 'China',
+                'creators': ['CGTN'],
+                'categories': ['China'],
                 'timestamp': 1622950200,
                 'upload_date': '20210606',
             },
             'params': {
-                'skip_download': False
-            }
-        }
+                'skip_download': False,
+            },
+        },
     ]
 
     def _real_extract(self, url):
@@ -45,7 +46,12 @@ class CGTNIE(InfoExtractor):
         webpage = self._download_webpage(url, video_id)
 
         download_url = self._html_search_regex(r'data-video ="(?P<url>.+m3u8)"', webpage, 'download_url')
-        datetime_str = self._html_search_regex(r'<span class="date">\s*(.+?)\s*</span>', webpage, 'datetime_str', fatal=False)
+        datetime_str = self._html_search_regex(
+            r'<span class="date">\s*(.+?)\s*</span>', webpage, 'datetime_str', fatal=False)
+        category = self._html_search_regex(
+            r'<span class="section">\s*(.+?)\s*</span>', webpage, 'category', fatal=False)
+        author = self._search_regex(
+            r'<div class="news-author-name">\s*(.+?)\s*</div>', webpage, 'author', default=None)
 
         return {
             'id': video_id,
@@ -53,9 +59,7 @@ class CGTNIE(InfoExtractor):
             'description': self._og_search_description(webpage, default=None),
             'thumbnail': self._og_search_thumbnail(webpage),
             'formats': self._extract_m3u8_formats(download_url, video_id, 'mp4', 'm3u8_native', m3u8_id='hls'),
-            'category': self._html_search_regex(r'<span class="section">\s*(.+?)\s*</span>',
-                                                webpage, 'category', fatal=False),
-            'author': self._html_search_regex(r'<div class="news-author-name">\s*(.+?)\s*</div>',
-                                              webpage, 'author', default=None, fatal=False),
+            'categories': [category] if category else None,
+            'creators': [author] if author else None,
             'timestamp': try_get(unified_timestamp(datetime_str), lambda x: x - 8 * 3600),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/channel9.py b/plugins/youtube_download/yt_dlp/extractor/channel9.py
deleted file mode 100644
index a884740..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/channel9.py
+++ /dev/null
@@ -1,252 +0,0 @@
-import re
-
-from .common import InfoExtractor
-from ..utils import (
-    clean_html,
-    int_or_none,
-    parse_iso8601,
-    qualities,
-    unescapeHTML,
-)
-
-
-class Channel9IE(InfoExtractor):
-    IE_DESC = 'Channel 9'
-    IE_NAME = 'channel9'
-    _VALID_URL = r'https?://(?:www\.)?(?:channel9\.msdn\.com|s\.ch9\.ms)/(?P<contentpath>.+?)(?P<rss>/RSS)?/?(?:[?#&]|$)'
-    _EMBED_REGEX = [r'<iframe[^>]+src=["\'](?P<url>https?://channel9\.msdn\.com/(?:[^/]+/)+)player\b']
-
-    _TESTS = [{
-        'url': 'http://channel9.msdn.com/Events/TechEd/Australia/2013/KOS002',
-        'md5': '32083d4eaf1946db6d454313f44510ca',
-        'info_dict': {
-            'id': '6c413323-383a-49dc-88f9-a22800cab024',
-            'ext': 'wmv',
-            'title': 'Developer Kick-Off Session: Stuff We Love',
-            'description': 'md5:b80bf9355a503c193aff7ec6cd5a7731',
-            'duration': 4576,
-            'thumbnail': r're:https?://.*\.jpg',
-            'timestamp': 1377717420,
-            'upload_date': '20130828',
-            'session_code': 'KOS002',
-            'session_room': 'Arena 1A',
-            'session_speakers': 'count:5',
-        },
-    }, {
-        'url': 'http://channel9.msdn.com/posts/Self-service-BI-with-Power-BI-nuclear-testing',
-        'md5': 'dcf983ee6acd2088e7188c3cf79b46bc',
-        'info_dict': {
-            'id': 'fe8e435f-bb93-4e01-8e97-a28c01887024',
-            'ext': 'wmv',
-            'title': 'Self-service BI with Power BI - nuclear testing',
-            'description': 'md5:2d17fec927fc91e9e17783b3ecc88f54',
-            'duration': 1540,
-            'thumbnail': r're:https?://.*\.jpg',
-            'timestamp': 1386381991,
-            'upload_date': '20131207',
-            'authors': ['Mike Wilmot'],
-        },
-    }, {
-        # low quality mp4 is best
-        'url': 'https://channel9.msdn.com/Events/CPP/CppCon-2015/Ranges-for-the-Standard-Library',
-        'info_dict': {
-            'id': '33ad69d2-6a4e-4172-83a1-a523013dec76',
-            'ext': 'mp4',
-            'title': 'Ranges for the Standard Library',
-            'description': 'md5:9895e0a9fd80822d2f01c454b8f4a372',
-            'duration': 5646,
-            'thumbnail': r're:https?://.*\.jpg',
-            'upload_date': '20150930',
-            'timestamp': 1443640735,
-        },
-        'params': {
-            'skip_download': True,
-        },
-    }, {
-        'url': 'https://channel9.msdn.com/Events/DEVintersection/DEVintersection-2016/RSS',
-        'info_dict': {
-            'id': 'Events/DEVintersection/DEVintersection-2016',
-            'title': 'DEVintersection 2016 Orlando Sessions',
-        },
-        'playlist_mincount': 14,
-    }, {
-        'url': 'https://channel9.msdn.com/Niners/Splendid22/Queue/76acff796e8f411184b008028e0d492b/RSS',
-        'only_matching': True,
-    }, {
-        'url': 'https://channel9.msdn.com/Events/Speakers/scott-hanselman/RSS?UrlSafeName=scott-hanselman',
-        'only_matching': True,
-    }]
-
-    _RSS_URL = 'http://channel9.msdn.com/%s/RSS'
-
-    def _extract_list(self, video_id, rss_url=None):
-        if not rss_url:
-            rss_url = self._RSS_URL % video_id
-        rss = self._download_xml(rss_url, video_id, 'Downloading RSS')
-        entries = [self.url_result(session_url.text, 'Channel9')
-                   for session_url in rss.findall('./channel/item/link')]
-        title_text = rss.find('./channel/title').text
-        return self.playlist_result(entries, video_id, title_text)
-
-    def _real_extract(self, url):
-        content_path, rss = self._match_valid_url(url).groups()
-
-        if rss:
-            return self._extract_list(content_path, url)
-
-        webpage = self._download_webpage(
-            url, content_path, 'Downloading web page')
-
-        episode_data = self._search_regex(
-            r"data-episode='([^']+)'", webpage, 'episode data', default=None)
-        if episode_data:
-            episode_data = self._parse_json(unescapeHTML(
-                episode_data), content_path)
-            content_id = episode_data['contentId']
-            is_session = '/Sessions(' in episode_data['api']
-            content_url = 'https://channel9.msdn.com/odata' + episode_data['api'] + '?$select=Captions,CommentCount,MediaLengthInSeconds,PublishedDate,Rating,RatingCount,Title,VideoMP4High,VideoMP4Low,VideoMP4Medium,VideoPlayerPreviewImage,VideoWMV,VideoWMVHQ,Views,'
-            if is_session:
-                content_url += 'Code,Description,Room,Slides,Speakers,ZipFile&$expand=Speakers'
-            else:
-                content_url += 'Authors,Body&$expand=Authors'
-            content_data = self._download_json(content_url, content_id)
-            title = content_data['Title']
-
-            QUALITIES = (
-                'mp3',
-                'wmv', 'mp4',
-                'wmv-low', 'mp4-low',
-                'wmv-mid', 'mp4-mid',
-                'wmv-high', 'mp4-high',
-            )
-
-            quality_key = qualities(QUALITIES)
-
-            def quality(quality_id, format_url):
-                return (len(QUALITIES) if '_Source.' in format_url
-                        else quality_key(quality_id))
-
-            formats = []
-            urls = set()
-
-            SITE_QUALITIES = {
-                'MP3': 'mp3',
-                'MP4': 'mp4',
-                'Low Quality WMV': 'wmv-low',
-                'Low Quality MP4': 'mp4-low',
-                'Mid Quality WMV': 'wmv-mid',
-                'Mid Quality MP4': 'mp4-mid',
-                'High Quality WMV': 'wmv-high',
-                'High Quality MP4': 'mp4-high',
-            }
-
-            formats_select = self._search_regex(
-                r'(?s)<select[^>]+name=["\']format[^>]+>(.+?)</select', webpage,
-                'formats select', default=None)
-            if formats_select:
-                for mobj in re.finditer(
-                        r'<option\b[^>]+\bvalue=(["\'])(?P<url>(?:(?!\1).)+)\1[^>]*>\s*(?P<format>[^<]+?)\s*<',
-                        formats_select):
-                    format_url = mobj.group('url')
-                    if format_url in urls:
-                        continue
-                    urls.add(format_url)
-                    format_id = mobj.group('format')
-                    quality_id = SITE_QUALITIES.get(format_id, format_id)
-                    formats.append({
-                        'url': format_url,
-                        'format_id': quality_id,
-                        'quality': quality(quality_id, format_url),
-                        'vcodec': 'none' if quality_id == 'mp3' else None,
-                    })
-
-            API_QUALITIES = {
-                'VideoMP4Low': 'mp4-low',
-                'VideoWMV': 'wmv-mid',
-                'VideoMP4Medium': 'mp4-mid',
-                'VideoMP4High': 'mp4-high',
-                'VideoWMVHQ': 'wmv-hq',
-            }
-
-            for format_id, q in API_QUALITIES.items():
-                q_url = content_data.get(format_id)
-                if not q_url or q_url in urls:
-                    continue
-                urls.add(q_url)
-                formats.append({
-                    'url': q_url,
-                    'format_id': q,
-                    'quality': quality(q, q_url),
-                })
-
-            slides = content_data.get('Slides')
-            zip_file = content_data.get('ZipFile')
-
-            if not formats and not slides and not zip_file:
-                self.raise_no_formats(
-                    'None of recording, slides or zip are available for %s' % content_path)
-
-            subtitles = {}
-            for caption in content_data.get('Captions', []):
-                caption_url = caption.get('Url')
-                if not caption_url:
-                    continue
-                subtitles.setdefault(caption.get('Language', 'en'), []).append({
-                    'url': caption_url,
-                    'ext': 'vtt',
-                })
-
-            common = {
-                'id': content_id,
-                'title': title,
-                'description': clean_html(content_data.get('Description') or content_data.get('Body')),
-                'thumbnail': content_data.get('VideoPlayerPreviewImage'),
-                'duration': int_or_none(content_data.get('MediaLengthInSeconds')),
-                'timestamp': parse_iso8601(content_data.get('PublishedDate')),
-                'avg_rating': int_or_none(content_data.get('Rating')),
-                'rating_count': int_or_none(content_data.get('RatingCount')),
-                'view_count': int_or_none(content_data.get('Views')),
-                'comment_count': int_or_none(content_data.get('CommentCount')),
-                'subtitles': subtitles,
-            }
-            if is_session:
-                speakers = []
-                for s in content_data.get('Speakers', []):
-                    speaker_name = s.get('FullName')
-                    if not speaker_name:
-                        continue
-                    speakers.append(speaker_name)
-
-                common.update({
-                    'session_code': content_data.get('Code'),
-                    'session_room': content_data.get('Room'),
-                    'session_speakers': speakers,
-                })
-            else:
-                authors = []
-                for a in content_data.get('Authors', []):
-                    author_name = a.get('DisplayName')
-                    if not author_name:
-                        continue
-                    authors.append(author_name)
-                common['authors'] = authors
-
-            contents = []
-
-            if slides:
-                d = common.copy()
-                d.update({'title': title + '-Slides', 'url': slides})
-                contents.append(d)
-
-            if zip_file:
-                d = common.copy()
-                d.update({'title': title + '-Zip', 'url': zip_file})
-                contents.append(d)
-
-            if formats:
-                d = common.copy()
-                d.update({'title': title, 'formats': formats})
-                contents.append(d)
-            return self.playlist_result(contents)
-        else:
-            return self._extract_list(content_path)
diff --git a/plugins/youtube_download/yt_dlp/extractor/chaturbate.py b/plugins/youtube_download/yt_dlp/extractor/chaturbate.py
index 99dfcfd..d031d39 100644
--- a/plugins/youtube_download/yt_dlp/extractor/chaturbate.py
+++ b/plugins/youtube_download/yt_dlp/extractor/chaturbate.py
@@ -5,11 +5,12 @@ from ..utils import (
     ExtractorError,
     lowercase_escape,
     url_or_none,
+    urlencode_postdata,
 )
 
 
 class ChaturbateIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:[^/]+\.)?chaturbate\.com/(?:fullvideo/?\?.*?\bb=)?(?P<id>[^/?&#]+)'
+    _VALID_URL = r'https?://(?:[^/]+\.)?chaturbate\.(?P<tld>com|eu|global)/(?:fullvideo/?\?.*?\bb=)?(?P<id>[^/?&#]+)'
     _TESTS = [{
         'url': 'https://www.chaturbate.com/siswet19/',
         'info_dict': {
@@ -29,16 +30,58 @@ class ChaturbateIE(InfoExtractor):
     }, {
         'url': 'https://en.chaturbate.com/siswet19/',
         'only_matching': True,
+    }, {
+        'url': 'https://chaturbate.eu/siswet19/',
+        'only_matching': True,
+    }, {
+        'url': 'https://chaturbate.eu/fullvideo/?b=caylin',
+        'only_matching': True,
+    }, {
+        'url': 'https://chaturbate.global/siswet19/',
+        'only_matching': True,
     }]
 
-    _ROOM_OFFLINE = 'Room is currently offline'
+    _ERROR_MAP = {
+        'offline': 'Room is currently offline',
+        'private': 'Room is currently in a private show',
+        'away': 'Performer is currently away',
+        'password protected': 'Room is password protected',
+        'hidden': 'Hidden session in progress',
+    }
 
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
+    def _extract_from_api(self, video_id, tld):
+        response = self._download_json(
+            f'https://chaturbate.{tld}/get_edge_hls_url_ajax/', video_id,
+            data=urlencode_postdata({'room_slug': video_id}),
+            headers={
+                **self.geo_verification_headers(),
+                'X-Requested-With': 'XMLHttpRequest',
+                'Accept': 'application/json',
+            }, fatal=False, impersonate=True) or {}
 
+        m3u8_url = response.get('url')
+        if not m3u8_url:
+            status = response.get('room_status')
+            if error := self._ERROR_MAP.get(status):
+                raise ExtractorError(error, expected=True)
+            if status == 'public':
+                self.raise_geo_restricted()
+            self.report_warning(f'Got status "{status}" from API; falling back to webpage extraction')
+            return None
+
+        return {
+            'id': video_id,
+            'title': video_id,
+            'thumbnail': f'https://roomimg.stream.highwebmedia.com/ri/{video_id}.jpg',
+            'is_live': True,
+            'age_limit': 18,
+            'formats': self._extract_m3u8_formats(m3u8_url, video_id, ext='mp4', live=True),
+        }
+
+    def _extract_from_html(self, video_id, tld):
         webpage = self._download_webpage(
-            'https://chaturbate.com/%s/' % video_id, video_id,
-            headers=self.geo_verification_headers())
+            f'https://chaturbate.{tld}/{video_id}/', video_id,
+            headers=self.geo_verification_headers(), impersonate=True)
 
         found_m3u8_urls = []
 
@@ -76,8 +119,8 @@ class ChaturbateIE(InfoExtractor):
                 webpage, 'error', group='error', default=None)
             if not error:
                 if any(p in webpage for p in (
-                        self._ROOM_OFFLINE, 'offline_tipping', 'tip_offline')):
-                    error = self._ROOM_OFFLINE
+                        self._ERROR_MAP['offline'], 'offline_tipping', 'tip_offline')):
+                    error = self._ERROR_MAP['offline']
             if error:
                 raise ExtractorError(error, expected=True)
             raise ExtractorError('Unable to find stream URL')
@@ -85,7 +128,7 @@ class ChaturbateIE(InfoExtractor):
         formats = []
         for m3u8_url in m3u8_urls:
             for known_id in ('fast', 'slow'):
-                if '_%s' % known_id in m3u8_url:
+                if f'_{known_id}' in m3u8_url:
                     m3u8_id = known_id
                     break
             else:
@@ -99,8 +142,12 @@ class ChaturbateIE(InfoExtractor):
         return {
             'id': video_id,
             'title': video_id,
-            'thumbnail': 'https://roomimg.stream.highwebmedia.com/ri/%s.jpg' % video_id,
+            'thumbnail': f'https://roomimg.stream.highwebmedia.com/ri/{video_id}.jpg',
             'age_limit': self._rta_search(webpage),
             'is_live': True,
             'formats': formats,
         }
+
+    def _real_extract(self, url):
+        video_id, tld = self._match_valid_url(url).group('id', 'tld')
+        return self._extract_from_api(video_id, tld) or self._extract_from_html(video_id, tld)
diff --git a/plugins/youtube_download/yt_dlp/extractor/chingari.py b/plugins/youtube_download/yt_dlp/extractor/chingari.py
deleted file mode 100644
index 48091dd..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/chingari.py
+++ /dev/null
@@ -1,207 +0,0 @@
-import itertools
-import json
-import urllib.parse
-
-from .common import InfoExtractor
-from ..utils import (
-    ExtractorError,
-    clean_html,
-    int_or_none,
-    str_to_int,
-    url_or_none,
-)
-
-
-class ChingariBaseIE(InfoExtractor):
-    def _get_post(self, id, post_data):
-        media_data = post_data['mediaLocation']
-        base_url = media_data['base']
-        author_data = post_data.get('authorData', {})
-        song_data = post_data.get('song', {})  # revist this in future for differentiating b/w 'art' and 'author'
-
-        formats = [{
-            'format_id': frmt,
-            'width': str_to_int(frmt[1:]),
-            'url': base_url + frmt_path,
-        } for frmt, frmt_path in media_data.get('transcoded', {}).items()]
-
-        if media_data.get('path'):
-            formats.append({
-                'format_id': 'original',
-                'format_note': 'Direct video.',
-                'url': base_url + '/apipublic' + media_data['path'],
-                'quality': 10,
-            })
-        timestamp = str_to_int(post_data.get('created_at'))
-        if timestamp:
-            timestamp = int_or_none(timestamp, 1000)
-
-        thumbnail, uploader_url = None, None
-        if media_data.get('thumbnail'):
-            thumbnail = base_url + media_data.get('thumbnail')
-        if author_data.get('username'):
-            uploader_url = 'https://chingari.io/' + author_data.get('username')
-
-        return {
-            'id': id,
-            'extractor_key': ChingariIE.ie_key(),
-            'extractor': 'Chingari',
-            'title': urllib.parse.unquote_plus(clean_html(post_data.get('caption'))),
-            'description': urllib.parse.unquote_plus(clean_html(post_data.get('caption'))),
-            'duration': media_data.get('duration'),
-            'thumbnail': url_or_none(thumbnail),
-            'like_count': post_data.get('likeCount'),
-            'view_count': post_data.get('viewsCount'),
-            'comment_count': post_data.get('commentCount'),
-            'repost_count': post_data.get('shareCount'),
-            'timestamp': timestamp,
-            'uploader_id': post_data.get('userId') or author_data.get('_id'),
-            'uploader': author_data.get('name'),
-            'uploader_url': url_or_none(uploader_url),
-            'track': song_data.get('title'),
-            'artist': song_data.get('author'),
-            'formats': formats,
-        }
-
-
-class ChingariIE(ChingariBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?chingari\.io/share/post\?id=(?P<id>[^&/#?]+)'
-    _TESTS = [{
-        'url': 'https://chingari.io/share/post?id=612f8f4ce1dc57090e8a7beb',
-        'info_dict': {
-            'id': '612f8f4ce1dc57090e8a7beb',
-            'ext': 'mp4',
-            'title': 'Happy birthday Srila Prabhupada',
-            'description': 'md5:c7080ebfdfeb06016e638c286d6bc3fa',
-            'duration': 0,
-            'thumbnail': 'https://media.chingari.io/uploads/c41d30e2-06b6-4e3b-9b4b-edbb929cec06-1630506826911/thumbnail/198f993f-ce87-4623-82c6-cd071bd6d4f4-1630506828016.jpg',
-            'like_count': int,
-            'view_count': int,
-            'comment_count': int,
-            'repost_count': int,
-            'timestamp': 1630506828,
-            'upload_date': '20210901',
-            'uploader_id': '5f0403982c8bd344f4813f8c',
-            'uploader': 'ISKCON,Inc.',
-            'uploader_url': 'https://chingari.io/iskcon,inc',
-            'track': None,
-            'artist': None,
-        },
-        'params': {'skip_download': True}
-    }]
-
-    def _real_extract(self, url):
-        id = self._match_id(url)
-        post_json = self._download_json(f'https://api.chingari.io/post/post_details/{id}', id)
-        if post_json['code'] != 200:
-            raise ExtractorError(post_json['message'], expected=True)
-        post_data = post_json['data']
-        return self._get_post(id, post_data)
-
-
-class ChingariUserIE(ChingariBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?chingari\.io/(?!share/post)(?P<id>[^/?]+)'
-    _TESTS = [{
-        'url': 'https://chingari.io/dada1023',
-        'info_dict': {
-            'id': 'dada1023',
-        },
-        'params': {'playlistend': 3},
-        'playlist': [{
-            'url': 'https://chingari.io/share/post?id=614781f3ade60b3a0bfff42a',
-            'info_dict': {
-                'id': '614781f3ade60b3a0bfff42a',
-                'ext': 'mp4',
-                'title': '#chingaribappa ',
-                'description': 'md5:d1df21d84088770468fa63afe3b17857',
-                'duration': 7,
-                'thumbnail': 'https://media.chingari.io/uploads/346d86d4-abb2-474e-a164-ffccf2bbcb72-1632076273717/thumbnail/b0b3aac2-2b86-4dd1-909d-9ed6e57cf77c-1632076275552.jpg',
-                'like_count': int,
-                'view_count': int,
-                'comment_count': int,
-                'repost_count': int,
-                'timestamp': 1632076275,
-                'upload_date': '20210919',
-                'uploader_id': '5efc4b12cca35c3d1794c2d3',
-                'uploader': 'dada (girish) dhawale',
-                'uploader_url': 'https://chingari.io/dada1023',
-                'track': None,
-                'artist': None
-            },
-            'params': {'skip_download': True}
-        }, {
-            'url': 'https://chingari.io/share/post?id=6146b132bcbf860959e12cba',
-            'info_dict': {
-                'id': '6146b132bcbf860959e12cba',
-                'ext': 'mp4',
-                'title': 'Tactor harvesting',
-                'description': 'md5:8403f12dce68828b77ecee7eb7e887b7',
-                'duration': 59.3,
-                'thumbnail': 'https://media.chingari.io/uploads/b353ca70-7a87-400d-93a6-fa561afaec86-1632022814584/thumbnail/c09302e3-2043-41b1-a2fe-77d97e5bd676-1632022834260.jpg',
-                'like_count': int,
-                'view_count': int,
-                'comment_count': int,
-                'repost_count': int,
-                'timestamp': 1632022834,
-                'upload_date': '20210919',
-                'uploader_id': '5efc4b12cca35c3d1794c2d3',
-                'uploader': 'dada (girish) dhawale',
-                'uploader_url': 'https://chingari.io/dada1023',
-                'track': None,
-                'artist': None
-            },
-            'params': {'skip_download': True}
-        }, {
-            'url': 'https://chingari.io/share/post?id=6145651b74cb030a64c40b82',
-            'info_dict': {
-                'id': '6145651b74cb030a64c40b82',
-                'ext': 'mp4',
-                'title': '#odiabhajan ',
-                'description': 'md5:687ea36835b9276cf2af90f25e7654cb',
-                'duration': 56.67,
-                'thumbnail': 'https://media.chingari.io/uploads/6cbf216b-babc-4cce-87fe-ceaac8d706ac-1631937782708/thumbnail/8855754f-6669-48ce-b269-8cc0699ed6da-1631937819522.jpg',
-                'like_count': int,
-                'view_count': int,
-                'comment_count': int,
-                'repost_count': int,
-                'timestamp': 1631937819,
-                'upload_date': '20210918',
-                'uploader_id': '5efc4b12cca35c3d1794c2d3',
-                'uploader': 'dada (girish) dhawale',
-                'uploader_url': 'https://chingari.io/dada1023',
-                'track': None,
-                'artist': None
-            },
-            'params': {'skip_download': True}
-        }],
-    }, {
-        'url': 'https://chingari.io/iskcon%2Cinc',
-        'playlist_mincount': 1025,
-        'info_dict': {
-            'id': 'iskcon%2Cinc',
-        },
-    }]
-
-    def _entries(self, id):
-        skip = 0
-        has_more = True
-        for page in itertools.count():
-            posts = self._download_json('https://api.chingari.io/users/getPosts', id,
-                                        data=json.dumps({'userId': id, 'ownerId': id, 'skip': skip, 'limit': 20}).encode(),
-                                        headers={'content-type': 'application/json;charset=UTF-8'},
-                                        note='Downloading page %s' % page)
-            for post in posts.get('data', []):
-                post_data = post['post']
-                yield self._get_post(post_data['_id'], post_data)
-            skip += 20
-            has_more = posts['hasMoreData']
-            if not has_more:
-                break
-
-    def _real_extract(self, url):
-        alt_id = self._match_id(url)
-        post_json = self._download_json(f'https://api.chingari.io/user/{alt_id}', alt_id)
-        if post_json['code'] != 200:
-            raise ExtractorError(post_json['message'], expected=True)
-        id = post_json['data']['_id']
-        return self.playlist_result(self._entries(id), playlist_id=alt_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/chirbit.py b/plugins/youtube_download/yt_dlp/extractor/chirbit.py
deleted file mode 100644
index 452711d..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/chirbit.py
+++ /dev/null
@@ -1,88 +0,0 @@
-import re
-
-from .common import InfoExtractor
-from ..compat import compat_b64decode
-from ..utils import parse_duration
-
-
-class ChirbitIE(InfoExtractor):
-    IE_NAME = 'chirbit'
-    _VALID_URL = r'https?://(?:www\.)?chirb\.it/(?:(?:wp|pl)/|fb_chirbit_player\.swf\?key=)?(?P<id>[\da-zA-Z]+)'
-    _TESTS = [{
-        'url': 'http://chirb.it/be2abG',
-        'info_dict': {
-            'id': 'be2abG',
-            'ext': 'mp3',
-            'title': 'md5:f542ea253f5255240be4da375c6a5d7e',
-            'description': 'md5:f24a4e22a71763e32da5fed59e47c770',
-            'duration': 306,
-            'uploader': 'Gerryaudio',
-        },
-        'params': {
-            'skip_download': True,
-        }
-    }, {
-        'url': 'https://chirb.it/fb_chirbit_player.swf?key=PrIPv5',
-        'only_matching': True,
-    }, {
-        'url': 'https://chirb.it/wp/MN58c2',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        audio_id = self._match_id(url)
-
-        webpage = self._download_webpage(
-            'http://chirb.it/%s' % audio_id, audio_id)
-
-        data_fd = self._search_regex(
-            r'data-fd=(["\'])(?P<url>(?:(?!\1).)+)\1',
-            webpage, 'data fd', group='url')
-
-        # Reverse engineered from https://chirb.it/js/chirbit.player.js (look
-        # for soundURL)
-        audio_url = compat_b64decode(data_fd[::-1]).decode('utf-8')
-
-        title = self._search_regex(
-            r'class=["\']chirbit-title["\'][^>]*>([^<]+)', webpage, 'title')
-        description = self._search_regex(
-            r'<h3>Description</h3>\s*<pre[^>]*>([^<]+)</pre>',
-            webpage, 'description', default=None)
-        duration = parse_duration(self._search_regex(
-            r'class=["\']c-length["\'][^>]*>([^<]+)',
-            webpage, 'duration', fatal=False))
-        uploader = self._search_regex(
-            r'id=["\']chirbit-username["\'][^>]*>([^<]+)',
-            webpage, 'uploader', fatal=False)
-
-        return {
-            'id': audio_id,
-            'url': audio_url,
-            'title': title,
-            'description': description,
-            'duration': duration,
-            'uploader': uploader,
-        }
-
-
-class ChirbitProfileIE(InfoExtractor):
-    IE_NAME = 'chirbit:profile'
-    _VALID_URL = r'https?://(?:www\.)?chirbit\.com/(?:rss/)?(?P<id>[^/]+)'
-    _TEST = {
-        'url': 'http://chirbit.com/ScarletBeauty',
-        'info_dict': {
-            'id': 'ScarletBeauty',
-        },
-        'playlist_mincount': 3,
-    }
-
-    def _real_extract(self, url):
-        profile_id = self._match_id(url)
-
-        webpage = self._download_webpage(url, profile_id)
-
-        entries = [
-            self.url_result(self._proto_relative_url('//chirb.it/' + video_id))
-            for _, video_id in re.findall(r'<input[^>]+id=([\'"])copy-btn-(?P<id>[0-9a-zA-Z]+)\1', webpage)]
-
-        return self.playlist_result(entries, profile_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/chzzk.py b/plugins/youtube_download/yt_dlp/extractor/chzzk.py
new file mode 100644
index 0000000..a5daf5c
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/chzzk.py
@@ -0,0 +1,205 @@
+from .common import InfoExtractor
+from ..utils import (
+    UserNotLive,
+    float_or_none,
+    int_or_none,
+    parse_iso8601,
+    url_or_none,
+)
+from ..utils.traversal import traverse_obj
+
+
+class CHZZKLiveIE(InfoExtractor):
+    IE_NAME = 'chzzk:live'
+    _VALID_URL = r'https?://chzzk\.naver\.com/live/(?P<id>[\da-f]+)'
+    _TESTS = [{
+        'url': 'https://chzzk.naver.com/live/c68b8ef525fb3d2fa146344d84991753',
+        'info_dict': {
+            'id': 'c68b8ef525fb3d2fa146344d84991753',
+            'ext': 'mp4',
+            'title': str,
+            'channel': '진짜도현',
+            'channel_id': 'c68b8ef525fb3d2fa146344d84991753',
+            'channel_is_verified': False,
+            'thumbnail': r're:https?://.+/.+\.jpg',
+            'timestamp': 1705510344,
+            'upload_date': '20240117',
+            'live_status': 'is_live',
+            'view_count': int,
+            'concurrent_view_count': int,
+        },
+        'skip': 'The channel is not currently live',
+    }]
+
+    def _real_extract(self, url):
+        channel_id = self._match_id(url)
+        live_detail = self._download_json(
+            f'https://api.chzzk.naver.com/service/v3/channels/{channel_id}/live-detail', channel_id,
+            note='Downloading channel info', errnote='Unable to download channel info')['content']
+
+        if live_detail.get('status') == 'CLOSE':
+            raise UserNotLive(video_id=channel_id)
+
+        live_playback = self._parse_json(live_detail['livePlaybackJson'], channel_id)
+
+        thumbnails = []
+        thumbnail_template = traverse_obj(
+            live_playback, ('thumbnail', 'snapshotThumbnailTemplate', {url_or_none}))
+        if thumbnail_template and '{type}' in thumbnail_template:
+            for width in traverse_obj(live_playback, ('thumbnail', 'types', ..., {str})):
+                thumbnails.append({
+                    'id': width,
+                    'url': thumbnail_template.replace('{type}', width),
+                    'width': int_or_none(width),
+                })
+
+        formats, subtitles = [], {}
+        for media in traverse_obj(live_playback, ('media', lambda _, v: url_or_none(v['path']))):
+            is_low_latency = media.get('mediaId') == 'LLHLS'
+            fmts, subs = self._extract_m3u8_formats_and_subtitles(
+                media['path'], channel_id, 'mp4', fatal=False, live=True,
+                m3u8_id='hls-ll' if is_low_latency else 'hls')
+            for f in fmts:
+                if is_low_latency:
+                    f['source_preference'] = -2
+                if '-afragalow.stream-audio.stream' in f['format_id']:
+                    f['quality'] = -2
+            formats.extend(fmts)
+            self._merge_subtitles(subs, target=subtitles)
+
+        return {
+            'id': channel_id,
+            'is_live': True,
+            'formats': formats,
+            'subtitles': subtitles,
+            'thumbnails': thumbnails,
+            **traverse_obj(live_detail, {
+                'title': ('liveTitle', {str}),
+                'timestamp': ('openDate', {parse_iso8601(delimiter=' ')}),
+                'concurrent_view_count': ('concurrentUserCount', {int_or_none}),
+                'view_count': ('accumulateCount', {int_or_none}),
+                'channel': ('channel', 'channelName', {str}),
+                'channel_id': ('channel', 'channelId', {str}),
+                'channel_is_verified': ('channel', 'verifiedMark', {bool}),
+            }),
+        }
+
+
+class CHZZKVideoIE(InfoExtractor):
+    IE_NAME = 'chzzk:video'
+    _VALID_URL = r'https?://chzzk\.naver\.com/video/(?P<id>\d+)'
+    _TESTS = [{
+        'url': 'https://chzzk.naver.com/video/1754',
+        'md5': 'b0c0c1bb888d913b93d702b1512c7f06',
+        'info_dict': {
+            'id': '1754',
+            'ext': 'mp4',
+            'title': '치지직 테스트 방송',
+            'channel': '침착맨',
+            'channel_id': 'bb382c2c0cc9fa7c86ab3b037fb5799c',
+            'channel_is_verified': False,
+            'thumbnail': r're:https?://.+/.+\.jpg',
+            'duration': 15577,
+            'timestamp': 1702970505.417,
+            'upload_date': '20231219',
+            'view_count': int,
+        },
+        'skip': 'Replay video is expired',
+    }, {
+        # Manually uploaded video
+        'url': 'https://chzzk.naver.com/video/1980',
+        'info_dict': {
+            'id': '1980',
+            'ext': 'mp4',
+            'title': '※시청주의※한번보면 잊기 힘든 영상',
+            'channel': '라디유radiyu',
+            'channel_id': '68f895c59a1043bc5019b5e08c83a5c5',
+            'channel_is_verified': False,
+            'thumbnail': r're:https?://.+/.+\.jpg',
+            'duration': 95,
+            'timestamp': 1703102631.722,
+            'upload_date': '20231220',
+            'view_count': int,
+        },
+    }, {
+        # Partner channel replay video
+        'url': 'https://chzzk.naver.com/video/2458',
+        'info_dict': {
+            'id': '2458',
+            'ext': 'mp4',
+            'title': '첫 방송',
+            'channel': '강지',
+            'channel_id': 'b5ed5db484d04faf4d150aedd362f34b',
+            'channel_is_verified': True,
+            'thumbnail': r're:https?://.+/.+\.jpg',
+            'duration': 4433,
+            'timestamp': 1703307460.214,
+            'upload_date': '20231223',
+            'view_count': int,
+        },
+    }, {
+        # video_status == 'NONE' but is downloadable
+        'url': 'https://chzzk.naver.com/video/6325166',
+        'info_dict': {
+            'id': '6325166',
+            'ext': 'mp4',
+            'title': '와이프 숙제빼주기',
+            'channel': '이 다',
+            'channel_id': '0076a519f147ee9fd0959bf02f9571ca',
+            'channel_is_verified': False,
+            'view_count': int,
+            'duration': 28167,
+            'thumbnail': r're:https?://.+/.+\.jpg',
+            'timestamp': 1742139216.86,
+            'upload_date': '20250316',
+            'live_status': 'was_live',
+        },
+        'params': {'skip_download': 'm3u8'},
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        video_meta = self._download_json(
+            f'https://api.chzzk.naver.com/service/v3/videos/{video_id}', video_id,
+            note='Downloading video info', errnote='Unable to download video info')['content']
+
+        live_status = 'was_live' if video_meta.get('liveOpenDate') else 'not_live'
+        video_status = video_meta.get('vodStatus')
+        if video_status == 'ABR_HLS':
+            formats, subtitles = self._extract_mpd_formats_and_subtitles(
+                f'https://apis.naver.com/neonplayer/vodplay/v1/playback/{video_meta["videoId"]}',
+                video_id, query={
+                    'key': video_meta['inKey'],
+                    'env': 'real',
+                    'lc': 'en_US',
+                    'cpl': 'en_US',
+                })
+        else:
+            fatal = video_status == 'UPLOAD'
+            playback = self._parse_json(video_meta['liveRewindPlaybackJson'], video_id, fatal=fatal)
+            formats, subtitles = self._extract_m3u8_formats_and_subtitles(
+                traverse_obj(playback, ('media', 0, 'path')), video_id, 'mp4', m3u8_id='hls', fatal=fatal)
+            if formats and video_status != 'UPLOAD':
+                self.write_debug(f'Video found with status: "{video_status}"')
+            elif not formats:
+                self.raise_no_formats(
+                    f'Unknown video status detected: "{video_status}"', expected=True, video_id=video_id)
+                formats, subtitles = [], {}
+                live_status = 'post_live' if live_status == 'was_live' else None
+
+        return {
+            'id': video_id,
+            'formats': formats,
+            'subtitles': subtitles,
+            'live_status': live_status,
+            **traverse_obj(video_meta, {
+                'title': ('videoTitle', {str}),
+                'thumbnail': ('thumbnailImageUrl', {url_or_none}),
+                'timestamp': ('publishDateAt', {float_or_none(scale=1000)}),
+                'view_count': ('readCount', {int_or_none}),
+                'duration': ('duration', {int_or_none}),
+                'channel': ('channel', 'channelName', {str}),
+                'channel_id': ('channel', 'channelId', {str}),
+                'channel_is_verified': ('channel', 'verifiedMark', {bool}),
+            }),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/cinchcast.py b/plugins/youtube_download/yt_dlp/extractor/cinchcast.py
deleted file mode 100644
index 7a7ea8b..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/cinchcast.py
+++ /dev/null
@@ -1,56 +0,0 @@
-from .common import InfoExtractor
-from ..utils import (
-    unified_strdate,
-    xpath_text,
-)
-
-
-class CinchcastIE(InfoExtractor):
-    _VALID_URL = r'https?://player\.cinchcast\.com/.*?(?:assetId|show_id)=(?P<id>[0-9]+)'
-    _EMBED_REGEX = [r'<iframe[^>]+?src=(["\'])(?P<url>https?://player\.cinchcast\.com/.+?)\1']
-
-    _TESTS = [{
-        'url': 'http://player.cinchcast.com/?show_id=5258197&platformId=1&assetType=single',
-        'info_dict': {
-            'id': '5258197',
-            'ext': 'mp3',
-            'title': 'Train Your Brain to Up Your Game with Coach Mandy',
-            'upload_date': '20130816',
-        },
-    }, {
-        # Actual test is run in generic, look for undergroundwellness
-        'url': 'http://player.cinchcast.com/?platformId=1&#038;assetType=single&#038;assetId=7141703',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        doc = self._download_xml(
-            'http://www.blogtalkradio.com/playerasset/mrss?assetType=single&assetId=%s' % video_id,
-            video_id)
-
-        item = doc.find('.//item')
-        title = xpath_text(item, './title', fatal=True)
-        date_str = xpath_text(
-            item, './{http://developer.longtailvideo.com/trac/}date')
-        upload_date = unified_strdate(date_str, day_first=False)
-        # duration is present but wrong
-        formats = [{
-            'format_id': 'main',
-            'url': item.find('./{http://search.yahoo.com/mrss/}content').attrib['url'],
-        }]
-        backup_url = xpath_text(
-            item, './{http://developer.longtailvideo.com/trac/}backupContent')
-        if backup_url:
-            formats.append({
-                'preference': 2,  # seems to be more reliable
-                'format_id': 'backup',
-                'url': backup_url,
-            })
-
-        return {
-            'id': video_id,
-            'title': title,
-            'upload_date': upload_date,
-            'formats': formats,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/cinemax.py b/plugins/youtube_download/yt_dlp/extractor/cinemax.py
index 54cab22..66831ef 100644
--- a/plugins/youtube_download/yt_dlp/extractor/cinemax.py
+++ b/plugins/youtube_download/yt_dlp/extractor/cinemax.py
@@ -2,6 +2,7 @@ from .hbo import HBOBaseIE
 
 
 class CinemaxIE(HBOBaseIE):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?cinemax\.com/(?P<path>[^/]+/video/[0-9a-z-]+-(?P<id>\d+))'
     _TESTS = [{
         'url': 'https://www.cinemax.com/warrior/video/s1-ep-1-recap-20126903',
@@ -19,6 +20,6 @@ class CinemaxIE(HBOBaseIE):
 
     def _real_extract(self, url):
         path, video_id = self._match_valid_url(url).groups()
-        info = self._extract_info('https://www.cinemax.com/%s.xml' % path, video_id)
+        info = self._extract_info(f'https://www.cinemax.com/{path}.xml', video_id)
         info['id'] = video_id
         return info
diff --git a/plugins/youtube_download/yt_dlp/extractor/cinetecamilano.py b/plugins/youtube_download/yt_dlp/extractor/cinetecamilano.py
index 9cffa11..834890d 100644
--- a/plugins/youtube_download/yt_dlp/extractor/cinetecamilano.py
+++ b/plugins/youtube_download/yt_dlp/extractor/cinetecamilano.py
@@ -1,4 +1,5 @@
 import json
+
 from .common import InfoExtractor
 from ..networking.exceptions import HTTPError
 from ..utils import (
@@ -26,8 +27,8 @@ class CinetecaMilanoIE(InfoExtractor):
             'modified_date': '20200520',
             'duration': 3139,
             'release_timestamp': 1643446208,
-            'modified_timestamp': int
-        }
+            'modified_timestamp': int,
+        },
     }]
 
     def _real_extract(self, url):
@@ -37,7 +38,7 @@ class CinetecaMilanoIE(InfoExtractor):
                 f'https://www.cinetecamilano.it/api/catalogo/{video_id}/?',
                 video_id, headers={
                     'Referer': url,
-                    'Authorization': try_get(self._get_cookies('https://www.cinetecamilano.it'), lambda x: f'Bearer {x["cnt-token"].value}') or ''
+                    'Authorization': try_get(self._get_cookies('https://www.cinetecamilano.it'), lambda x: f'Bearer {x["cnt-token"].value}') or '',
                 })
         except ExtractorError as e:
             if ((isinstance(e.cause, HTTPError) and e.cause.status == 500)
@@ -57,5 +58,5 @@ class CinetecaMilanoIE(InfoExtractor):
             'modified_timestamp': parse_iso8601(archive.get('created_at'), delimiter=' '),
             'thumbnail': urljoin(url, try_get(archive, lambda x: x['thumb']['src'].replace('/public/', '/storage/'))),
             'formats': self._extract_m3u8_formats(
-                urljoin(url, traverse_obj(archive, ('drm', 'hls'))), video_id, 'mp4')
+                urljoin(url, traverse_obj(archive, ('drm', 'hls'))), video_id, 'mp4'),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/cineverse.py b/plugins/youtube_download/yt_dlp/extractor/cineverse.py
new file mode 100644
index 0000000..124c874
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/cineverse.py
@@ -0,0 +1,140 @@
+import re
+
+from .common import InfoExtractor
+from ..utils import (
+    filter_dict,
+    float_or_none,
+    int_or_none,
+    parse_age_limit,
+    smuggle_url,
+    traverse_obj,
+    unsmuggle_url,
+    url_or_none,
+)
+
+
+class CineverseBaseIE(InfoExtractor):
+    _VALID_URL_BASE = r'https?://www\.(?P<host>{})'.format('|'.join(map(re.escape, (
+        'cineverse.com',
+        'asiancrush.com',
+        'dovechannel.com',
+        'screambox.com',
+        'midnightpulp.com',
+        'fandor.com',
+        'retrocrush.tv',
+    ))))
+
+
+class CineverseIE(CineverseBaseIE):
+    _VALID_URL = rf'{CineverseBaseIE._VALID_URL_BASE}/watch/(?P<id>[A-Z0-9]+)'
+    _TESTS = [{
+        'url': 'https://www.asiancrush.com/watch/DMR00018919/Women-Who-Flirt',
+        'skip': 'geo-blocked',
+        'info_dict': {
+            'title': 'Women Who Flirt',
+            'ext': 'mp4',
+            'id': 'DMR00018919',
+            'modified_timestamp': 1678744575289,
+            'cast': ['Xun Zhou', 'Xiaoming Huang', 'Yi-Lin Sie', 'Sonia Sui', 'Quniciren'],
+            'duration': 5811.597,
+            'description': 'md5:892fd62a05611d394141e8394ace0bc6',
+            'age_limit': 13,
+        },
+    }, {
+        'url': 'https://www.retrocrush.tv/watch/1000000023016/Archenemy! Crystal Bowie',
+        'skip': 'geo-blocked',
+        'info_dict': {
+            'title': 'Archenemy! Crystal Bowie',
+            'ext': 'mp4',
+            'id': '1000000023016',
+            'episode_number': 3,
+            'season_number': 1,
+            'cast': ['Nachi Nozawa', 'Yoshiko Sakakibara', 'Toshiko Fujita'],
+            'age_limit': 0,
+            'episode': 'Episode 3',
+            'season': 'Season 1',
+            'duration': 1485.067,
+            'description': 'Cobra meets a beautiful bounty hunter by the name of Jane Royal.',
+            'series': 'Space Adventure COBRA (Original Japanese)',
+        },
+    }]
+
+    def _real_extract(self, url):
+        url, smuggled_data = unsmuggle_url(url, default={})
+        self._initialize_geo_bypass({
+            'countries': smuggled_data.get('geo_countries'),
+        })
+        video_id = self._match_id(url)
+        html = self._download_webpage(url, video_id)
+        idetails = self._search_nextjs_data(html, video_id)['props']['pageProps']['idetails']
+
+        err_code = idetails.get('err_code')
+        if err_code == 1002:
+            self.raise_login_required()
+        elif err_code == 1200:
+            self.raise_geo_restricted(
+                'This video is not available from your location due to geo restriction. '
+                'You may be able to bypass it by using the /details/ page instead of the /watch/ page',
+                countries=smuggled_data.get('geo_countries'))
+
+        return {
+            'subtitles': filter_dict({
+                'en': traverse_obj(idetails, (('cc_url_vtt', 'subtitle_url'), {'url': {url_or_none}})) or None,
+            }),
+            'formats': self._extract_m3u8_formats(idetails['url'], video_id),
+            **traverse_obj(idetails, {
+                'title': 'title',
+                'id': ('details', 'item_id'),
+                'description': ('details', 'description'),
+                'duration': ('duration', {float_or_none(scale=1000)}),
+                'cast': ('details', 'cast', {lambda x: x.split(', ')}),
+                'modified_timestamp': ('details', 'updated_by', 0, 'update_time', 'time', {int_or_none}),
+                'season_number': ('details', 'season', {int_or_none}),
+                'episode_number': ('details', 'episode', {int_or_none}),
+                'age_limit': ('details', 'rating_code', {parse_age_limit}),
+                'series': ('details', 'series_details', 'title'),
+            }),
+        }
+
+
+class CineverseDetailsIE(CineverseBaseIE):
+    _VALID_URL = rf'{CineverseBaseIE._VALID_URL_BASE}/details/(?P<id>[A-Z0-9]+)'
+    _TESTS = [{
+        'url': 'https://www.retrocrush.tv/details/1000000023012/Space-Adventure-COBRA-(Original-Japanese)',
+        'playlist_mincount': 30,
+        'info_dict': {
+            'title': 'Space Adventure COBRA (Original Japanese)',
+            'id': '1000000023012',
+        },
+    }, {
+        'url': 'https://www.asiancrush.com/details/NNVG4938/Hansel-and-Gretel',
+        'info_dict': {
+            'id': 'NNVG4938',
+            'ext': 'mp4',
+            'title': 'Hansel and Gretel',
+            'description': 'md5:e3e4c35309c2e82aee044f972c2fb05d',
+            'cast': ['Jeong-myeong Cheon', 'Eun Won-jae', 'Shim Eun-gyeong', 'Ji-hee Jin', 'Hee-soon Park', 'Lydia Park', 'Kyeong-ik Kim'],
+            'duration': 7030.732,
+        },
+    }]
+
+    def _real_extract(self, url):
+        host, series_id = self._match_valid_url(url).group('host', 'id')
+        html = self._download_webpage(url, series_id)
+        pageprops = self._search_nextjs_data(html, series_id)['props']['pageProps']
+
+        geo_countries = traverse_obj(pageprops, ('itemDetailsData', 'geo_country', {lambda x: x.split(', ')}))
+        geoblocked = traverse_obj(pageprops, (
+            'itemDetailsData', 'playback_err_msg')) == 'This title is not available in your location.'
+
+        def item_result(item):
+            item_url = f'https://www.{host}/watch/{item["item_id"]}/{item["title"]}'
+            if geoblocked:
+                item_url = smuggle_url(item_url, {'geo_countries': geo_countries})
+            return self.url_result(item_url, CineverseIE)
+
+        season = traverse_obj(pageprops, ('seasonEpisodes', ..., 'episodes', lambda _, v: v['item_id'] and v['title']))
+        if season:
+            return self.playlist_result([item_result(ep) for ep in season], playlist_id=series_id,
+                                        playlist_title=traverse_obj(pageprops, ('itemDetailsData', 'title')))
+        return item_result(pageprops['itemDetailsData'])
diff --git a/plugins/youtube_download/yt_dlp/extractor/ciscolive.py b/plugins/youtube_download/yt_dlp/extractor/ciscolive.py
index 0668578..1584ca6 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ciscolive.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ciscolive.py
@@ -105,7 +105,7 @@ class CiscoLiveSearchIE(CiscoLiveBaseIE):
 
     @classmethod
     def suitable(cls, url):
-        return False if CiscoLiveSessionIE.suitable(url) else super(CiscoLiveSearchIE, cls).suitable(url)
+        return False if CiscoLiveSessionIE.suitable(url) else super().suitable(url)
 
     @staticmethod
     def _check_bc_id_exists(rf_item):
@@ -117,7 +117,7 @@ class CiscoLiveSearchIE(CiscoLiveBaseIE):
         for page_num in itertools.count(1):
             results = self._call_api(
                 'search', None, query, url,
-                'Downloading search JSON page %d' % page_num)
+                f'Downloading search JSON page {page_num}')
             sl = try_get(results, lambda x: x['sectionList'][0], dict)
             if sl:
                 results = sl
diff --git a/plugins/youtube_download/yt_dlp/extractor/ciscowebex.py b/plugins/youtube_download/yt_dlp/extractor/ciscowebex.py
index 85585df..d39347c 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ciscowebex.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ciscowebex.py
@@ -46,7 +46,7 @@ class CiscoWebexIE(InfoExtractor):
             headers['accessPwd'] = password
 
         stream, urlh = self._download_json_handle(
-            'https://%s.webex.com/webappng/api/v1/recordings/%s/stream' % (subdomain, video_id),
+            f'https://{subdomain}.webex.com/webappng/api/v1/recordings/{video_id}/stream',
             video_id, headers=headers, query={'siteurl': siteurl}, expected_status=(403, 429))
 
         if urlh.status == 403:
@@ -101,6 +101,6 @@ class CiscoWebexIE(InfoExtractor):
             'uploader_id': stream.get('ownerUserName') or stream.get('ownerId'),
             'timestamp': unified_timestamp(stream.get('createTime')),
             'duration': int_or_none(stream.get('duration'), 1000),
-            'webpage_url': 'https://%s.webex.com/recordingservice/sites/%s/recording/playback/%s' % (subdomain, siteurl, video_id),
+            'webpage_url': f'https://{subdomain}.webex.com/recordingservice/sites/{siteurl}/recording/playback/{video_id}',
             'formats': formats,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/cjsw.py b/plugins/youtube_download/yt_dlp/extractor/cjsw.py
index c37a3b8..b80236a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/cjsw.py
+++ b/plugins/youtube_download/yt_dlp/extractor/cjsw.py
@@ -27,7 +27,7 @@ class CJSWIE(InfoExtractor):
     def _real_extract(self, url):
         mobj = self._match_valid_url(url)
         program, episode_id = mobj.group('program', 'id')
-        audio_id = '%s/%s' % (program, episode_id)
+        audio_id = f'{program}/{episode_id}'
 
         webpage = self._download_webpage(url, episode_id)
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/cliphunter.py b/plugins/youtube_download/yt_dlp/extractor/cliphunter.py
deleted file mode 100644
index 2b907dc..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/cliphunter.py
+++ /dev/null
@@ -1,76 +0,0 @@
-from .common import InfoExtractor
-from ..utils import (
-    int_or_none,
-    url_or_none,
-)
-
-
-class CliphunterIE(InfoExtractor):
-    IE_NAME = 'cliphunter'
-
-    _VALID_URL = r'''(?x)https?://(?:www\.)?cliphunter\.com/w/
-        (?P<id>[0-9]+)/
-        (?P<seo>.+?)(?:$|[#\?])
-    '''
-    _TESTS = [{
-        'url': 'http://www.cliphunter.com/w/1012420/Fun_Jynx_Maze_solo',
-        'md5': 'b7c9bbd4eb3a226ab91093714dcaa480',
-        'info_dict': {
-            'id': '1012420',
-            'ext': 'flv',
-            'title': 'Fun Jynx Maze solo',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'age_limit': 18,
-        },
-        'skip': 'Video gone',
-    }, {
-        'url': 'http://www.cliphunter.com/w/2019449/ShesNew__My_booty_girlfriend_Victoria_Paradices_pussy_filled_with_jizz',
-        'md5': '55a723c67bfc6da6b0cfa00d55da8a27',
-        'info_dict': {
-            'id': '2019449',
-            'ext': 'mp4',
-            'title': 'ShesNew - My booty girlfriend, Victoria Paradice\'s pussy filled with jizz',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'age_limit': 18,
-        },
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-
-        video_title = self._search_regex(
-            r'mediaTitle = "([^"]+)"', webpage, 'title')
-
-        gexo_files = self._parse_json(
-            self._search_regex(
-                r'var\s+gexoFiles\s*=\s*({.+?});', webpage, 'gexo files'),
-            video_id)
-
-        formats = []
-        for format_id, f in gexo_files.items():
-            video_url = url_or_none(f.get('url'))
-            if not video_url:
-                continue
-            fmt = f.get('fmt')
-            height = f.get('h')
-            format_id = '%s_%sp' % (fmt, height) if fmt and height else format_id
-            formats.append({
-                'url': video_url,
-                'format_id': format_id,
-                'width': int_or_none(f.get('w')),
-                'height': int_or_none(height),
-                'tbr': int_or_none(f.get('br')),
-            })
-
-        thumbnail = self._search_regex(
-            r"var\s+mov_thumb\s*=\s*'([^']+)';",
-            webpage, 'thumbnail', fatal=False)
-
-        return {
-            'id': video_id,
-            'title': video_title,
-            'formats': formats,
-            'age_limit': self._rta_search(webpage),
-            'thumbnail': thumbnail,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/clippit.py b/plugins/youtube_download/yt_dlp/extractor/clippit.py
index 006a713..393f217 100644
--- a/plugins/youtube_download/yt_dlp/extractor/clippit.py
+++ b/plugins/youtube_download/yt_dlp/extractor/clippit.py
@@ -1,11 +1,11 @@
+import re
+
 from .common import InfoExtractor
 from ..utils import (
     parse_iso8601,
     qualities,
 )
 
-import re
-
 
 class ClippitIE(InfoExtractor):
 
@@ -23,7 +23,7 @@ class ClippitIE(InfoExtractor):
             'upload_date': '20160826',
             'description': 'BattleBots | ABC',
             'thumbnail': r're:^https?://.*\.jpg$',
-        }
+        },
     }
 
     def _real_extract(self, url):
@@ -36,7 +36,7 @@ class ClippitIE(InfoExtractor):
         quality = qualities(FORMATS)
         formats = []
         for format_id in FORMATS:
-            url = self._html_search_regex(r'data-%s-file="(.+?)"' % format_id,
+            url = self._html_search_regex(rf'data-{format_id}-file="(.+?)"',
                                           webpage, 'url', fatal=False)
             if not url:
                 continue
diff --git a/plugins/youtube_download/yt_dlp/extractor/cliprs.py b/plugins/youtube_download/yt_dlp/extractor/cliprs.py
index 567f77b..42f78ca 100644
--- a/plugins/youtube_download/yt_dlp/extractor/cliprs.py
+++ b/plugins/youtube_download/yt_dlp/extractor/cliprs.py
@@ -2,6 +2,7 @@ from .onet import OnetBaseIE
 
 
 class ClipRsIE(OnetBaseIE):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?clip\.rs/(?P<id>[^/]+)/\d+'
     _TEST = {
         'url': 'http://www.clip.rs/premijera-frajle-predstavljaju-novi-spot-za-pesmu-moli-me-moli/3732',
@@ -14,7 +15,7 @@ class ClipRsIE(OnetBaseIE):
             'duration': 229,
             'timestamp': 1459850243,
             'upload_date': '20160405',
-        }
+        },
     }
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/clipsyndicate.py b/plugins/youtube_download/yt_dlp/extractor/clipsyndicate.py
deleted file mode 100644
index 6064443..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/clipsyndicate.py
+++ /dev/null
@@ -1,52 +0,0 @@
-from .common import InfoExtractor
-from ..utils import (
-    find_xpath_attr,
-    fix_xml_ampersands
-)
-
-
-class ClipsyndicateIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:chic|www)\.clipsyndicate\.com/video/play(list/\d+)?/(?P<id>\d+)'
-
-    _TESTS = [{
-        'url': 'http://www.clipsyndicate.com/video/play/4629301/brick_briscoe',
-        'md5': '4d7d549451bad625e0ff3d7bd56d776c',
-        'info_dict': {
-            'id': '4629301',
-            'ext': 'mp4',
-            'title': 'Brick Briscoe',
-            'duration': 612,
-            'thumbnail': r're:^https?://.+\.jpg',
-        },
-    }, {
-        'url': 'http://chic.clipsyndicate.com/video/play/5844117/shark_attack',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        js_player = self._download_webpage(
-            'http://eplayer.clipsyndicate.com/embed/player.js?va_id=%s' % video_id,
-            video_id, 'Downlaoding player')
-        # it includes a required token
-        flvars = self._search_regex(r'flvars: "(.*?)"', js_player, 'flvars')
-
-        pdoc = self._download_xml(
-            'http://eplayer.clipsyndicate.com/osmf/playlist?%s' % flvars,
-            video_id, 'Downloading video info',
-            transform_source=fix_xml_ampersands)
-
-        track_doc = pdoc.find('trackList/track')
-
-        def find_param(name):
-            node = find_xpath_attr(track_doc, './/param', 'name', name)
-            if node is not None:
-                return node.attrib['value']
-
-        return {
-            'id': video_id,
-            'title': find_param('title'),
-            'url': track_doc.find('location').text,
-            'thumbnail': find_param('thumbnail'),
-            'duration': int(find_param('duration')),
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/closertotruth.py b/plugins/youtube_download/yt_dlp/extractor/closertotruth.py
index e78e26a..77469ed 100644
--- a/plugins/youtube_download/yt_dlp/extractor/closertotruth.py
+++ b/plugins/youtube_download/yt_dlp/extractor/closertotruth.py
@@ -4,6 +4,7 @@ from .common import InfoExtractor
 
 
 class CloserToTruthIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?closertotruth\.com/(?:[^/]+/)*(?P<id>[^/?#&]+)'
     _TESTS = [{
         'url': 'http://closertotruth.com/series/solutions-the-mind-body-problem#video-3688',
@@ -14,7 +15,7 @@ class CloserToTruthIE(InfoExtractor):
             'title': 'Solutions to the Mind-Body Problem?',
             'upload_date': '20140221',
             'timestamp': 1392956007,
-            'uploader_id': 'CTTXML'
+            'uploader_id': 'CTTXML',
         },
         'params': {
             'skip_download': True,
@@ -28,7 +29,7 @@ class CloserToTruthIE(InfoExtractor):
             'title': 'How do Brains Work?',
             'upload_date': '20140221',
             'timestamp': 1392956024,
-            'uploader_id': 'CTTXML'
+            'uploader_id': 'CTTXML',
         },
         'params': {
             'skip_download': True,
@@ -68,7 +69,7 @@ class CloserToTruthIE(InfoExtractor):
                 entry_ids.add(entry_id)
                 entries.append({
                     '_type': 'url_transparent',
-                    'url': 'kaltura:%s:%s' % (partner_id, entry_id),
+                    'url': f'kaltura:{partner_id}:{entry_id}',
                     'ie_key': 'Kaltura',
                     'title': mobj.group('title'),
                 })
@@ -82,7 +83,7 @@ class CloserToTruthIE(InfoExtractor):
         return {
             '_type': 'url_transparent',
             'display_id': display_id,
-            'url': 'kaltura:%s:%s' % (partner_id, entry_id),
+            'url': f'kaltura:{partner_id}:{entry_id}',
             'ie_key': 'Kaltura',
-            'title': title
+            'title': title,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/cloudflarestream.py b/plugins/youtube_download/yt_dlp/extractor/cloudflarestream.py
index 748e8e9..9e9e89a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/cloudflarestream.py
+++ b/plugins/youtube_download/yt_dlp/extractor/cloudflarestream.py
@@ -4,27 +4,33 @@ from .common import InfoExtractor
 
 
 class CloudflareStreamIE(InfoExtractor):
+    _SUBDOMAIN_RE = r'(?:(?:watch|iframe|customer-\w+)\.)?'
     _DOMAIN_RE = r'(?:cloudflarestream\.com|(?:videodelivery|bytehighway)\.net)'
-    _EMBED_RE = r'embed\.%s/embed/[^/]+\.js\?.*?\bvideo=' % _DOMAIN_RE
-    _ID_RE = r'[\da-f]{32}|[\w-]+\.[\w-]+\.[\w-]+'
-    _VALID_URL = r'''(?x)
-                    https?://
-                        (?:
-                            (?:watch\.)?%s/|
-                            %s
-                        )
-                        (?P<id>%s)
-                    ''' % (_DOMAIN_RE, _EMBED_RE, _ID_RE)
-    _EMBED_REGEX = [fr'<script[^>]+\bsrc=(["\'])(?P<url>(?:https?:)?//{_EMBED_RE}(?:{_ID_RE}).*?)\1']
+    _EMBED_RE = rf'(?:embed\.|{_SUBDOMAIN_RE}){_DOMAIN_RE}/embed/[^/?#]+\.js\?(?:[^#]+&)?video='
+    _ID_RE = r'[\da-f]{32}|eyJ[\w-]+\.[\w-]+\.[\w-]+'
+    _VALID_URL = rf'https?://(?:{_SUBDOMAIN_RE}(?P<domain>{_DOMAIN_RE})/|{_EMBED_RE})(?P<id>{_ID_RE})'
+    _EMBED_REGEX = [
+        rf'<script[^>]+\bsrc=(["\'])(?P<url>(?:https?:)?//{_EMBED_RE}(?:{_ID_RE})(?:(?!\1).)*)\1',
+        rf'<iframe[^>]+\bsrc=["\'](?P<url>https?://{_SUBDOMAIN_RE}{_DOMAIN_RE}/[\da-f]{{32}})',
+    ]
     _TESTS = [{
         'url': 'https://embed.cloudflarestream.com/embed/we4g.fla9.latest.js?video=31c9291ab41fac05471db4e73aa11717',
         'info_dict': {
             'id': '31c9291ab41fac05471db4e73aa11717',
             'ext': 'mp4',
             'title': '31c9291ab41fac05471db4e73aa11717',
+            'thumbnail': 'https://cloudflarestream.com/31c9291ab41fac05471db4e73aa11717/thumbnails/thumbnail.jpg',
         },
         'params': {
-            'skip_download': True,
+            'skip_download': 'm3u8',
+        },
+    }, {
+        'url': 'https://watch.cloudflarestream.com/embed/sdk-iframe-integration.fla9.latest.js?video=0e8e040aec776862e1d632a699edf59e',
+        'info_dict': {
+            'id': '0e8e040aec776862e1d632a699edf59e',
+            'ext': 'mp4',
+            'title': '0e8e040aec776862e1d632a699edf59e',
+            'thumbnail': 'https://cloudflarestream.com/0e8e040aec776862e1d632a699edf59e/thumbnails/thumbnail.jpg',
         },
     }, {
         'url': 'https://watch.cloudflarestream.com/9df17203414fd1db3e3ed74abbe936c1',
@@ -35,26 +41,48 @@ class CloudflareStreamIE(InfoExtractor):
     }, {
         'url': 'https://embed.videodelivery.net/embed/r4xu.fla9.latest.js?video=81d80727f3022488598f68d323c1ad5e',
         'only_matching': True,
+    }, {
+        'url': 'https://customer-aw5py76sw8wyqzmh.cloudflarestream.com/2463f6d3e06fa29710a337f5f5389fd8/iframe',
+        'only_matching': True,
+    }, {
+        'url': 'https://watch.cloudflarestream.com/eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJraWQiOiJmYTA0YjViMzQ2NDkwYTM5NWJiNzQ1NWFhZTA2YzYwZSIsInN1YiI6Ijg4ZDQxMDhhMzY0MjA3M2VhYmFhZjg3ZGExODJkMjYzIiwiZXhwIjoxNjAwNjA5MzE5fQ.xkRJwLGkt0nZ%5F0BlPiwU7iW4pqb4lKkznbKfAhGg0tGcxSS6ZBA3lcTUwu7W%2DyCFbnAl%2Dhqk3Fn%5FqeQS%5FQydP27qTHpB9iIFFsMtk1tqzGZV5v4yrYDnwLSKzEKvVd6QwJnfABtxH2JdpSNuWlMUiVXFxGWgjOw6QeTNDDklTQYXV%5FNLV7sErSn5CeOPeRRkdXb%2D8ip%5FVOcfk1nDsFoOo4fctFtGP0wYMyY5ae8nhhatydHwevuvJCcEvEfh%2D4qjq9mCZOodevmtSQ4YWmggf4BxtWnDWYrGW8Otp6oqezrR8oY4%2DbKdV6PaqBj49aJdcls6xK7PmM8%5Fvjy3xfm0Mg',
+        'only_matching': True,
+    }]
+    _WEBPAGE_TESTS = [{
+        'url': 'https://upride.cc/incident/shoulder-pass-at-light/',
+        'info_dict': {
+            'id': 'eaef9dea5159cf968be84241b5cedfe7',
+            'ext': 'mp4',
+            'title': 'eaef9dea5159cf968be84241b5cedfe7',
+            'thumbnail': 'https://cloudflarestream.com/eaef9dea5159cf968be84241b5cedfe7/thumbnails/thumbnail.jpg',
+        },
+        'params': {
+            'skip_download': 'm3u8',
+        },
     }]
 
     def _real_extract(self, url):
-        video_id = self._match_id(url)
-        domain = 'bytehighway.net' if 'bytehighway.net/' in url else 'videodelivery.net'
-        base_url = 'https://%s/%s/' % (domain, video_id)
+        video_id, domain = self._match_valid_url(url).group('id', 'domain')
+        if domain != 'bytehighway.net':
+            domain = 'cloudflarestream.com'
+        base_url = f'https://{domain}/{video_id}/'
         if '.' in video_id:
             video_id = self._parse_json(base64.urlsafe_b64decode(
                 video_id.split('.')[1] + '==='), video_id)['sub']
         manifest_base_url = base_url + 'manifest/video.'
 
-        formats = self._extract_m3u8_formats(
+        formats, subtitles = self._extract_m3u8_formats_and_subtitles(
             manifest_base_url + 'm3u8', video_id, 'mp4',
             'm3u8_native', m3u8_id='hls', fatal=False)
-        formats.extend(self._extract_mpd_formats(
-            manifest_base_url + 'mpd', video_id, mpd_id='dash', fatal=False))
+        fmts, subs = self._extract_mpd_formats_and_subtitles(
+            manifest_base_url + 'mpd', video_id, mpd_id='dash', fatal=False)
+        formats.extend(fmts)
+        self._merge_subtitles(subs, target=subtitles)
 
         return {
             'id': video_id,
             'title': video_id,
             'thumbnail': base_url + 'thumbnails/thumbnail.jpg',
             'formats': formats,
+            'subtitles': subtitles,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/cloudy.py b/plugins/youtube_download/yt_dlp/extractor/cloudy.py
deleted file mode 100644
index 848643e..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/cloudy.py
+++ /dev/null
@@ -1,57 +0,0 @@
-from .common import InfoExtractor
-from ..utils import (
-    str_to_int,
-    unified_strdate,
-)
-
-
-class CloudyIE(InfoExtractor):
-    _IE_DESC = 'cloudy.ec'
-    _VALID_URL = r'https?://(?:www\.)?cloudy\.ec/(?:v/|embed\.php\?.*?\bid=)(?P<id>[A-Za-z0-9]+)'
-    _TESTS = [{
-        'url': 'https://www.cloudy.ec/v/af511e2527aac',
-        'md5': '29832b05028ead1b58be86bf319397ca',
-        'info_dict': {
-            'id': 'af511e2527aac',
-            'ext': 'mp4',
-            'title': 'Funny Cats and Animals Compilation june 2013',
-            'upload_date': '20130913',
-            'view_count': int,
-        }
-    }, {
-        'url': 'http://www.cloudy.ec/embed.php?autoplay=1&id=af511e2527aac',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        webpage = self._download_webpage(
-            'https://www.cloudy.ec/embed.php', video_id, query={
-                'id': video_id,
-                'playerPage': 1,
-                'autoplay': 1,
-            })
-
-        info = self._parse_html5_media_entries(url, webpage, video_id)[0]
-
-        webpage = self._download_webpage(
-            'https://www.cloudy.ec/v/%s' % video_id, video_id, fatal=False)
-
-        if webpage:
-            info.update({
-                'title': self._search_regex(
-                    r'<h\d[^>]*>([^<]+)<', webpage, 'title'),
-                'upload_date': unified_strdate(self._search_regex(
-                    r'>Published at (\d{4}-\d{1,2}-\d{1,2})', webpage,
-                    'upload date', fatal=False)),
-                'view_count': str_to_int(self._search_regex(
-                    r'([\d,.]+) views<', webpage, 'view count', fatal=False)),
-            })
-
-        if not info.get('title'):
-            info['title'] = video_id
-
-        info['id'] = video_id
-
-        return info
diff --git a/plugins/youtube_download/yt_dlp/extractor/cloudycdn.py b/plugins/youtube_download/yt_dlp/extractor/cloudycdn.py
new file mode 100644
index 0000000..6e757d7
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/cloudycdn.py
@@ -0,0 +1,98 @@
+import re
+
+from .common import InfoExtractor
+from ..utils import (
+    int_or_none,
+    parse_iso8601,
+    url_or_none,
+    urlencode_postdata,
+)
+from ..utils.traversal import traverse_obj
+
+
+class CloudyCDNIE(InfoExtractor):
+    _VALID_URL = r'(?:https?:)?//embed\.cloudycdn\.services/(?P<site_id>[^/?#]+)/media/(?P<id>[\w-]+)'
+    _EMBED_REGEX = [rf'<iframe[^>]+\bsrc=[\'"](?P<url>{_VALID_URL})']
+    _TESTS = [{
+        'url': 'https://embed.cloudycdn.services/ltv/media/46k_d23-6000-105?',
+        'md5': '64f72a360ca530d5ed89c77646c9eee5',
+        'info_dict': {
+            'id': '46k_d23-6000-105',
+            'ext': 'mp4',
+            'timestamp': 1700589151,
+            'duration': 1442,
+            'upload_date': '20231121',
+            'title': 'D23-6000-105_cetstud',
+            'thumbnail': 'https://store.cloudycdn.services/tmsp00060/assets/media/660858/placeholder1700589200.jpg',
+        },
+    }, {
+        'url': 'https://embed.cloudycdn.services/izm/media/26e_lv-8-5-1',
+        'md5': '798828a479151e2444d8dcfbec76e482',
+        'info_dict': {
+            'id': '26e_lv-8-5-1',
+            'ext': 'mp4',
+            'title': 'LV-8-5-1',
+            'timestamp': 1669767167,
+            'thumbnail': 'https://store.cloudycdn.services/tmsp00120/assets/media/488306/placeholder1679423604.jpg',
+            'duration': 1205,
+            'upload_date': '20221130',
+        },
+    }, {
+        # Video-only m3u8 formats need manual fixup
+        'url': 'https://embed.cloudycdn.services/ltv/media/08j_d24-6000-074',
+        'md5': 'fc472e40f6e6238446509be411c920e2',
+        'info_dict': {
+            'id': '08j_d24-6000-074',
+            'ext': 'mp4',
+            'upload_date': '20240620',
+            'duration': 1673,
+            'title': 'D24-6000-074-cetstud',
+            'timestamp': 1718902233,
+            'thumbnail': 'https://store.cloudycdn.services/tmsp00060/assets/media/788392/placeholder1718903938.jpg',
+        },
+        'params': {'format': 'bv'},
+    }]
+    _WEBPAGE_TESTS = [{
+        'url': 'https://www.tavaklase.lv/video/es-esmu-mina-um-2/',
+        'md5': '63074e8e6c84ac2a01f2fb8bf03b8f43',
+        'info_dict': {
+            'id': 'cqd_lib-2',
+            'ext': 'mp4',
+            'upload_date': '20230223',
+            'duration': 629,
+            'thumbnail': 'https://store.cloudycdn.services/tmsp00120/assets/media/518407/placeholder1678748124.jpg',
+            'timestamp': 1677181513,
+            'title': 'LIB-2',
+        },
+    }]
+
+    def _real_extract(self, url):
+        site_id, video_id = self._match_valid_url(url).group('site_id', 'id')
+
+        data = self._download_json(
+            f'https://player.cloudycdn.services/player/{site_id}/media/{video_id}/',
+            video_id, data=urlencode_postdata({
+                'version': '6.4.0',
+                'referer': url,
+            }))
+
+        formats, subtitles = [], {}
+        for m3u8_url in traverse_obj(data, ('source', 'sources', ..., 'src', {url_or_none})):
+            fmts, subs = self._extract_m3u8_formats_and_subtitles(m3u8_url, video_id, fatal=False)
+            for fmt in fmts:
+                if re.search(r'chunklist_b\d+_vo_', fmt['url']):
+                    fmt['acodec'] = 'none'
+            formats.extend(fmts)
+            self._merge_subtitles(subs, target=subtitles)
+
+        return {
+            'id': video_id,
+            'formats': formats,
+            'subtitles': subtitles,
+            **traverse_obj(data, {
+                'title': ('name', {str}),
+                'duration': ('duration', {int_or_none}),
+                'timestamp': ('upload_date', {parse_iso8601}),
+                'thumbnail': ('source', 'poster', {url_or_none}),
+            }),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/clubic.py b/plugins/youtube_download/yt_dlp/extractor/clubic.py
index 403e44a..c908e61 100644
--- a/plugins/youtube_download/yt_dlp/extractor/clubic.py
+++ b/plugins/youtube_download/yt_dlp/extractor/clubic.py
@@ -6,6 +6,7 @@ from ..utils import (
 
 
 class ClubicIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?clubic\.com/video/(?:[^/]+/)*video.*-(?P<id>[0-9]+)\.html'
 
     _TESTS = [{
@@ -17,7 +18,7 @@ class ClubicIE(InfoExtractor):
             'title': 'Clubic Week 2.0 : le FBI se lance dans la photo d\u0092identité',
             'description': 're:Gueule de bois chez Nokia. Le constructeur a indiqué cette.*',
             'thumbnail': r're:^http://img\.clubic\.com/.*\.jpg$',
-        }
+        },
     }, {
         'url': 'http://www.clubic.com/video/video-clubic-week-2-0-apple-iphone-6s-et-plus-mais-surtout-le-pencil-469792.html',
         'only_matching': True,
@@ -26,7 +27,7 @@ class ClubicIE(InfoExtractor):
     def _real_extract(self, url):
         video_id = self._match_id(url)
 
-        player_url = 'http://player.m6web.fr/v1/player/clubic/%s.html' % video_id
+        player_url = f'http://player.m6web.fr/v1/player/clubic/{video_id}.html'
         player_page = self._download_webpage(player_url, video_id)
 
         config = self._parse_json(self._search_regex(
diff --git a/plugins/youtube_download/yt_dlp/extractor/clyp.py b/plugins/youtube_download/yt_dlp/extractor/clyp.py
index 273d002..2702427 100644
--- a/plugins/youtube_download/yt_dlp/extractor/clyp.py
+++ b/plugins/youtube_download/yt_dlp/extractor/clyp.py
@@ -58,13 +58,13 @@ class ClypIE(InfoExtractor):
             query['token'] = token
 
         metadata = self._download_json(
-            'https://api.clyp.it/%s' % audio_id, audio_id, query=query)
+            f'https://api.clyp.it/{audio_id}', audio_id, query=query)
 
         formats = []
         for secure in ('', 'Secure'):
             for ext in ('Ogg', 'Mp3'):
-                format_id = '%s%s' % (secure, ext)
-                format_url = metadata.get('%sUrl' % format_id)
+                format_id = f'{secure}{ext}'
+                format_url = metadata.get(f'{format_id}Url')
                 if format_url:
                     formats.append({
                         'url': format_url,
diff --git a/plugins/youtube_download/yt_dlp/extractor/cmt.py b/plugins/youtube_download/yt_dlp/extractor/cmt.py
index 8aed770..8e53b7f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/cmt.py
+++ b/plugins/youtube_download/yt_dlp/extractor/cmt.py
@@ -1,9 +1,10 @@
 from .mtv import MTVIE
 
-# TODO Remove - Reason: Outdated Site
+# TODO: Remove - Reason: Outdated Site
 
 
 class CMTIE(MTVIE):  # XXX: Do not subclass from concrete IE
+    _WORKING = False
     IE_NAME = 'cmt.com'
     _VALID_URL = r'https?://(?:www\.)?cmt\.com/(?:videos|shows|(?:full-)?episodes|video-clips)/(?P<id>[^/]+)'
 
@@ -51,4 +52,4 @@ class CMTIE(MTVIE):  # XXX: Do not subclass from concrete IE
         video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
         mgid = self._extract_mgid(webpage, url)
-        return self.url_result('http://media.mtvnservices.com/embed/%s' % mgid)
+        return self.url_result(f'http://media.mtvnservices.com/embed/{mgid}')
diff --git a/plugins/youtube_download/yt_dlp/extractor/cnbc.py b/plugins/youtube_download/yt_dlp/extractor/cnbc.py
index 68fd025..cedfd3e 100644
--- a/plugins/youtube_download/yt_dlp/extractor/cnbc.py
+++ b/plugins/youtube_download/yt_dlp/extractor/cnbc.py
@@ -1,66 +1,97 @@
 from .common import InfoExtractor
-from ..utils import smuggle_url
-
-
-class CNBCIE(InfoExtractor):
-    _VALID_URL = r'https?://video\.cnbc\.com/gallery/\?video=(?P<id>[0-9]+)'
-    _TEST = {
-        'url': 'http://video.cnbc.com/gallery/?video=3000503714',
-        'info_dict': {
-            'id': '3000503714',
-            'ext': 'mp4',
-            'title': 'Fighting zombies is big business',
-            'description': 'md5:0c100d8e1a7947bd2feec9a5550e519e',
-            'timestamp': 1459332000,
-            'upload_date': '20160330',
-            'uploader': 'NBCU-CNBC',
-        },
-        'params': {
-            # m3u8 download
-            'skip_download': True,
-        },
-    }
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        return {
-            '_type': 'url_transparent',
-            'ie_key': 'ThePlatform',
-            'url': smuggle_url(
-                'http://link.theplatform.com/s/gZWlPC/media/guid/2408950221/%s?mbr=true&manifest=m3u' % video_id,
-                {'force_smil_url': True}),
-            'id': video_id,
-        }
+from ..utils import int_or_none, parse_iso8601, str_or_none, url_or_none
+from ..utils.traversal import traverse_obj
 
 
 class CNBCVideoIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?cnbc\.com(?P<path>/video/(?:[^/]+/)+(?P<id>[^./?#&]+)\.html)'
-    _TEST = {
-        'url': 'https://www.cnbc.com/video/2018/07/19/trump-i-dont-necessarily-agree-with-raising-rates.html',
+    _VALID_URL = r'https?://(?:www\.)?cnbc\.com/video/(?:[^/?#]+/)+(?P<id>[^./?#&]+)\.html'
+
+    _TESTS = [{
+        'url': 'https://www.cnbc.com/video/2023/12/07/mcdonalds-just-unveiled-cosmcsits-new-spinoff-brand.html',
         'info_dict': {
-            'id': '7000031301',
             'ext': 'mp4',
-            'title': "Trump: I don't necessarily agree with raising rates",
-            'description': 'md5:878d8f0b4ebb5bb1dda3514b91b49de3',
-            'timestamp': 1531958400,
-            'upload_date': '20180719',
-            'uploader': 'NBCU-CNBC',
+            'id': '107344774',
+            'display_id': 'mcdonalds-just-unveiled-cosmcsits-new-spinoff-brand',
+            'modified_timestamp': 1702053483,
+            'timestamp': 1701977810,
+            'channel': 'News Videos',
+            'upload_date': '20231207',
+            'description': 'md5:882c001d85cb43d7579b514307b3e78b',
+            'release_timestamp': 1701977375,
+            'modified_date': '20231208',
+            'release_date': '20231207',
+            'duration': 65,
+            'creators': ['Sean Conlon'],
+            'title': 'Here\'s a first look at McDonald\'s new spinoff brand, CosMc\'s',
+            'thumbnail': 'https://image.cnbcfm.com/api/v1/image/107344192-1701894812493-CosMcsskyHero_2336x1040_hero-desktop.jpg?v=1701894855',
         },
-        'params': {
-            'skip_download': True,
+        'expected_warnings': ['Unable to download f4m manifest'],
+    }, {
+        'url': 'https://www.cnbc.com/video/2023/12/08/jim-cramer-shares-his-take-on-seattles-tech-scene.html',
+        'info_dict': {
+            'creators': ['Jim Cramer'],
+            'channel': 'Mad Money with Jim Cramer',
+            'description': 'md5:72925be21b952e95eba51178dddf4e3e',
+            'duration': 299.0,
+            'ext': 'mp4',
+            'id': '107345451',
+            'display_id': 'jim-cramer-shares-his-take-on-seattles-tech-scene',
+            'thumbnail': 'https://image.cnbcfm.com/api/v1/image/107345481-1702079431MM-B-120823.jpg?v=1702079430',
+            'timestamp': 1702080139,
+            'title': 'Jim Cramer shares his take on Seattle\'s tech scene',
+            'release_date': '20231208',
+            'upload_date': '20231209',
+            'modified_timestamp': 1702080139,
+            'modified_date': '20231209',
+            'release_timestamp': 1702073551,
         },
-    }
+        'expected_warnings': ['Unable to download f4m manifest'],
+    }, {
+        'url': 'https://www.cnbc.com/video/2023/12/08/the-epicenter-of-ai-is-in-seattle-says-jim-cramer.html',
+        'info_dict': {
+            'creators': ['Jim Cramer'],
+            'channel': 'Mad Money with Jim Cramer',
+            'description': 'md5:72925be21b952e95eba51178dddf4e3e',
+            'duration': 113.0,
+            'ext': 'mp4',
+            'id': '107345474',
+            'display_id': 'the-epicenter-of-ai-is-in-seattle-says-jim-cramer',
+            'thumbnail': 'https://image.cnbcfm.com/api/v1/image/107345486-Screenshot_2023-12-08_at_70339_PM.png?v=1702080248',
+            'timestamp': 1702080535,
+            'title': 'The epicenter of AI is in Seattle, says Jim Cramer',
+            'release_timestamp': 1702077347,
+            'modified_timestamp': 1702080535,
+            'release_date': '20231208',
+            'upload_date': '20231209',
+            'modified_date': '20231209',
+        },
+        'expected_warnings': ['Unable to download f4m manifest'],
+    }]
 
     def _real_extract(self, url):
-        path, display_id = self._match_valid_url(url).groups()
-        video_id = self._download_json(
-            'https://webql-redesign.cnbcfm.com/graphql', display_id, query={
-                'query': '''{
-  page(path: "%s") {
-    vcpsId
-  }
-}''' % path,
-            })['data']['page']['vcpsId']
-        return self.url_result(
-            'http://video.cnbc.com/gallery/?video=%d' % video_id,
-            CNBCIE.ie_key())
+        display_id = self._match_id(url)
+        webpage = self._download_webpage(url, display_id)
+        data = self._search_json(r'window\.__s_data=', webpage, 'video data', display_id)
+
+        player_data = traverse_obj(data, (
+            'page', 'page', 'layout', ..., 'columns', ..., 'modules',
+            lambda _, v: v['name'] == 'clipPlayer', 'data', {dict}), get_all=False)
+
+        return {
+            'id': display_id,
+            'display_id': display_id,
+            'formats': self._extract_akamai_formats(player_data['playbackURL'], display_id),
+            **self._search_json_ld(webpage, display_id, fatal=False),
+            **traverse_obj(player_data, {
+                'id': ('id', {str_or_none}),
+                'title': ('title', {str}),
+                'description': ('description', {str}),
+                'creators': ('author', ..., 'name', {str}),
+                'timestamp': ('datePublished', {parse_iso8601}),
+                'release_timestamp': ('uploadDate', {parse_iso8601}),
+                'modified_timestamp': ('dateLastPublished', {parse_iso8601}),
+                'thumbnail': ('thumbnail', {url_or_none}),
+                'duration': ('duration', {int_or_none}),
+                'channel': ('section', 'title', {str}),
+            }),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/cnn.py b/plugins/youtube_download/yt_dlp/extractor/cnn.py
index 61b62fa..8148762 100644
--- a/plugins/youtube_download/yt_dlp/extractor/cnn.py
+++ b/plugins/youtube_download/yt_dlp/extractor/cnn.py
@@ -1,146 +1,225 @@
+import json
+import re
+
 from .common import InfoExtractor
-from .turner import TurnerBaseIE
-from ..utils import merge_dicts, try_call, url_basename
+from ..utils import (
+    clean_html,
+    extract_attributes,
+    int_or_none,
+    merge_dicts,
+    parse_duration,
+    parse_iso8601,
+    parse_resolution,
+    try_call,
+    update_url,
+    url_or_none,
+)
+from ..utils.traversal import find_elements, traverse_obj
 
 
-class CNNIE(TurnerBaseIE):
-    _VALID_URL = r'''(?x)https?://(?:(?P<sub_domain>edition|www|money)\.)?cnn\.com/(?:video/(?:data/.+?|\?)/)?videos?/
-        (?P<path>.+?/(?P<title>[^/]+?)(?:\.(?:[a-z\-]+)|(?=&)))'''
+class CNNIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:(?:edition|www|money|cnnespanol)\.)?cnn\.com/(?!audio/)(?P<display_id>[^?#]+?)(?:[?#]|$|/index\.html)'
 
     _TESTS = [{
-        'url': 'http://edition.cnn.com/video/?/video/sports/2013/06/09/nadal-1-on-1.cnn',
-        'md5': '3e6121ea48df7e2259fe73a0628605c4',
+        'url': 'https://www.cnn.com/2024/05/31/sport/video/jadon-sancho-borussia-dortmund-champions-league-exclusive-spt-intl',
         'info_dict': {
-            'id': 'sports/2013/06/09/nadal-1-on-1.cnn',
+            'id': 'med0e97ad0d154f56e29aa96e57192a14226734b6b',
+            'display_id': '2024/05/31/sport/video/jadon-sancho-borussia-dortmund-champions-league-exclusive-spt-intl',
             'ext': 'mp4',
-            'title': 'Nadal wins 8th French Open title',
-            'description': 'World Sport\'s Amanda Davies chats with 2013 French Open champion Rafael Nadal.',
-            'duration': 135,
-            'upload_date': '20130609',
+            'upload_date': '20240531',
+            'description': 'md5:844bcdb0629e1877a7a466c913f4c19c',
+            'thumbnail': 'https://media.cnn.com/api/v1/images/stellar/prod/gettyimages-2151936122.jpg?c=original',
+            'duration': 373.0,
+            'timestamp': 1717148586,
+            'title': 'Borussia Dortmund star Jadon Sancho seeks Wembley redemption after 2020 Euros hurt',
+            'modified_date': '20240531',
+            'modified_timestamp': 1717150140,
         },
-        'expected_warnings': ['Failed to download m3u8 information'],
     }, {
-        'url': 'http://edition.cnn.com/video/?/video/us/2013/08/21/sot-student-gives-epic-speech.georgia-institute-of-technology&utm_source=feedburner&utm_medium=feed&utm_campaign=Feed%3A+rss%2Fcnn_topstories+%28RSS%3A+Top+Stories%29',
-        'md5': 'b5cc60c60a3477d185af8f19a2a26f4e',
+        'url': 'https://edition.cnn.com/2024/06/11/politics/video/inmates-vote-jail-nevada-murray-dnt-ac360-digvid',
         'info_dict': {
-            'id': 'us/2013/08/21/sot-student-gives-epic-speech.georgia-institute-of-technology',
+            'id': 'me522945c4709b299e5cb8657900a7a21ad3b559f9',
+            'display_id': '2024/06/11/politics/video/inmates-vote-jail-nevada-murray-dnt-ac360-digvid',
             'ext': 'mp4',
-            'title': "Student's epic speech stuns new freshmen",
-            'description': "A Georgia Tech student welcomes the incoming freshmen with an epic speech backed by music from \"2001: A Space Odyssey.\"",
-            'upload_date': '20130821',
+            'description': 'md5:e0120fe5da9ad8259fd707c1cbb64a60',
+            'title': 'Here’s how some inmates in closely divided state are now able to vote from jail',
+            'timestamp': 1718158269,
+            'upload_date': '20240612',
+            'thumbnail': 'https://media.cnn.com/api/v1/images/stellar/prod/still-20701554-13565-571-still.jpg?c=original',
+            'duration': 202.0,
+            'modified_date': '20240612',
+            'modified_timestamp': 1718158509,
         },
-        'expected_warnings': ['Failed to download m3u8 information'],
     }, {
-        'url': 'http://www.cnn.com/video/data/2.0/video/living/2014/12/22/growing-america-nashville-salemtown-board-episode-1.hln.html',
-        'md5': 'f14d02ebd264df951feb2400e2c25a1b',
+        'url': 'https://edition.cnn.com/2024/06/11/style/king-charles-portrait-vandalized/index.html',
         'info_dict': {
-            'id': 'living/2014/12/22/growing-america-nashville-salemtown-board-episode-1.hln',
+            'id': 'mef5f52b9e1fe28b1ad192afcbc9206ae984894b68',
+            'display_id': '2024/06/11/style/king-charles-portrait-vandalized',
             'ext': 'mp4',
-            'title': 'Nashville Ep. 1: Hand crafted skateboards',
-            'description': 'md5:e7223a503315c9f150acac52e76de086',
-            'upload_date': '20141222',
+            'thumbnail': 'https://media.cnn.com/api/v1/images/stellar/prod/still-20701257-8846-816-still.jpg?c=original',
+            'description': 'md5:19f78338ccec533db0fa8a4511012dae',
+            'title': 'Video shows King Charles\' portrait being vandalized by activists',
+            'timestamp': 1718113852,
+            'upload_date': '20240611',
+            'duration': 51.0,
+            'modified_timestamp': 1718116193,
+            'modified_date': '20240611',
         },
-        'expected_warnings': ['Failed to download m3u8 information'],
     }, {
-        'url': 'http://money.cnn.com/video/news/2016/08/19/netflix-stunning-stats.cnnmoney/index.html',
-        'md5': '52a515dc1b0f001cd82e4ceda32be9d1',
+        'url': 'https://edition.cnn.com/videos/media/2022/12/05/robin-meade-final-sign-off-broadcast-hln-mxp-contd-vpx.hln',
         'info_dict': {
-            'id': '/video/news/2016/08/19/netflix-stunning-stats.cnnmoney',
+            'id': 'mefba13799201b084ea3b1d0f7ca820ae94d4bb5b2',
+            'display_id': 'videos/media/2022/12/05/robin-meade-final-sign-off-broadcast-hln-mxp-contd-vpx.hln',
             'ext': 'mp4',
-            'title': '5 stunning stats about Netflix',
-            'description': 'Did you know that Netflix has more than 80 million members? Here are five facts about the online video distributor that you probably didn\'t know.',
-            'upload_date': '20160819',
+            'thumbnail': 'https://media.cnn.com/api/v1/images/stellar/prod/221205163510-robin-meade-sign-off.jpg?c=original',
+            'duration': 158.0,
+            'title': 'Robin Meade signs off after HLN\'s last broadcast',
+            'description': 'md5:cff3c62d18d2fbc6c5c75cb029b7353b',
+            'upload_date': '20221205',
+            'timestamp': 1670284296,
+            'modified_timestamp': 1670332404,
+            'modified_date': '20221206',
         },
-        'params': {
-            # m3u8 download
-            'skip_download': True,
+        'params': {'format': 'direct'},
+    }, {
+        'url': 'https://cnnespanol.cnn.com/video/ataque-misil-israel-beirut-libano-octubre-trax',
+        'info_dict': {
+            'id': 'me484a43722642aa00627b812fe928f2e99c6e2997',
+            'ext': 'mp4',
+            'display_id': 'video/ataque-misil-israel-beirut-libano-octubre-trax',
+            'timestamp': 1729501452,
+            'thumbnail': 'https://media.cnn.com/api/v1/images/stellar/prod/ataqeubeirut-1.jpg?c=original',
+            'description': 'md5:256ee7137d161f776cda429654135e52',
+            'upload_date': '20241021',
+            'duration': 31.0,
+            'title': 'VIDEO | Israel lanza un nuevo ataque sobre Beirut',
+            'modified_date': '20241021',
+            'modified_timestamp': 1729501530,
         },
     }, {
-        'url': 'http://cnn.com/video/?/video/politics/2015/03/27/pkg-arizona-senator-church-attendance-mandatory.ktvk',
-        'only_matching': True,
-    }, {
-        'url': 'http://cnn.com/video/?/video/us/2015/04/06/dnt-baker-refuses-anti-gay-order.wkmg',
-        'only_matching': True,
-    }, {
-        'url': 'http://edition.cnn.com/videos/arts/2016/04/21/olympic-games-cultural-a-z-brazil.cnn',
-        'only_matching': True,
+        'url': 'https://edition.cnn.com/2024/10/16/politics/kamala-harris-fox-news-interview/index.html',
+        'info_dict': {
+            'id': '2024/10/16/politics/kamala-harris-fox-news-interview',
+        },
+        'playlist_count': 2,
+        'playlist': [{
+            'md5': '073ffab87b8bef97c9913e71cc18ef9e',
+            'info_dict': {
+                'id': 'me19d548fdd54df0924087039283128ef473ab397d',
+                'ext': 'mp4',
+                'title': '\'I\'m not finished\': Harris interview with Fox News gets heated',
+                'display_id': 'kamala-harris-fox-news-interview-ebof-digvid',
+                'description': 'md5:e7dd3d1a04df916062230b60ca419a0a',
+                'thumbnail': 'https://media.cnn.com/api/v1/images/stellar/prod/harris-20241016234916617.jpg?c=original',
+                'duration': 173.0,
+                'timestamp': 1729122182,
+                'upload_date': '20241016',
+                'modified_timestamp': 1729194706,
+                'modified_date': '20241017',
+            },
+            'params': {'format': 'direct'},
+        }, {
+            'md5': '11604ab4af83b650826753f1ccb8ecff',
+            'info_dict': {
+                'id': 'med04507d8ca3da827001f63d22af321ec29c7d97b',
+                'ext': 'mp4',
+                'title': '\'Wise\': Buttigieg on Harris\' handling of interview question about gender transition surgery',
+                'display_id': 'pete-buttigieg-harris-fox-newssrc-digvid',
+                'description': 'md5:602a8a7e853ed5e574acd3159428c98e',
+                'thumbnail': 'https://media.cnn.com/api/v1/images/stellar/prod/buttigieg-20241017040412074.jpg?c=original',
+                'duration': 145.0,
+                'timestamp': 1729137765,
+                'upload_date': '20241017',
+                'modified_timestamp': 1729138184,
+                'modified_date': '20241017',
+            },
+            'params': {'format': 'direct'},
+        }],
     }]
 
-    _CONFIG = {
-        # http://edition.cnn.com/.element/apps/cvp/3.0/cfg/spider/cnn/expansion/config.xml
-        'edition': {
-            'data_src': 'http://edition.cnn.com/video/data/3.0/video/%s/index.xml',
-            'media_src': 'http://pmd.cdn.turner.com/cnn/big',
-        },
-        # http://money.cnn.com/.element/apps/cvp2/cfg/config.xml
-        'money': {
-            'data_src': 'http://money.cnn.com/video/data/4.0/video/%s.xml',
-            'media_src': 'http://ht3.cdn.turner.com/money/big',
-        },
-    }
-
-    def _extract_timestamp(self, video_data):
-        # TODO: fix timestamp extraction
-        return None
-
     def _real_extract(self, url):
-        sub_domain, path, page_title = self._match_valid_url(url).groups()
-        if sub_domain not in ('money', 'edition'):
-            sub_domain = 'edition'
-        config = self._CONFIG[sub_domain]
-        return self._extract_cvp_info(
-            config['data_src'] % path, page_title, {
-                'default': {
-                    'media_src': config['media_src'],
-                },
-                'f4m': {
-                    'host': 'cnn-vh.akamaihd.net',
-                },
+        display_id = self._match_valid_url(url).group('display_id')
+        webpage = self._download_webpage(url, display_id)
+        app_id = traverse_obj(
+            self._search_json(r'window\.env\s*=', webpage, 'window env', display_id, default={}),
+            ('TOP_AUTH_SERVICE_APP_ID', {str}))
+
+        entries = []
+        for player_data in traverse_obj(webpage, (
+                {find_elements(tag='div', attr='data-component-name', value='video-player', html=True)},
+                ..., {extract_attributes}, all, lambda _, v: v['data-media-id'])):
+            media_id = player_data['data-media-id']
+            parent_uri = player_data.get('data-video-resource-parent-uri')
+            formats, subtitles = [], {}
+
+            video_data = {}
+            if parent_uri:
+                video_data = self._download_json(
+                    'https://fave.api.cnn.io/v1/video', media_id, fatal=False,
+                    query={
+                        'id': media_id,
+                        'stellarUri': parent_uri,
+                    })
+                for direct_url in traverse_obj(video_data, ('files', ..., 'fileUri', {url_or_none})):
+                    resolution, bitrate = None, None
+                    if mobj := re.search(r'-(?P<res>\d+x\d+)_(?P<tbr>\d+)k\.mp4', direct_url):
+                        resolution, bitrate = mobj.group('res', 'tbr')
+                    formats.append({
+                        'url': direct_url,
+                        'format_id': 'direct',
+                        'quality': 1,
+                        'tbr': int_or_none(bitrate),
+                        **parse_resolution(resolution),
+                    })
+                for sub_data in traverse_obj(video_data, (
+                        'closedCaptions', 'types', lambda _, v: url_or_none(v['track']['url']), 'track')):
+                    subtitles.setdefault(sub_data.get('lang') or 'en', []).append({
+                        'url': sub_data['url'],
+                        'name': sub_data.get('label'),
+                    })
+
+            if app_id:
+                media_data = self._download_json(
+                    f'https://medium.ngtv.io/v2/media/{media_id}/desktop', media_id, fatal=False,
+                    query={'appId': app_id})
+                m3u8_url = traverse_obj(media_data, (
+                    'media', 'desktop', 'unprotected', 'unencrypted', 'url', {url_or_none}))
+                if m3u8_url:
+                    fmts, subs = self._extract_m3u8_formats_and_subtitles(
+                        m3u8_url, media_id, 'mp4', m3u8_id='hls', fatal=False)
+                    formats.extend(fmts)
+                    self._merge_subtitles(subs, target=subtitles)
+
+            entries.append({
+                **traverse_obj(player_data, {
+                    'title': ('data-headline', {clean_html}),
+                    'description': ('data-description', {clean_html}),
+                    'duration': ('data-duration', {parse_duration}),
+                    'timestamp': ('data-publish-date', {parse_iso8601}),
+                    'thumbnail': (
+                        'data-poster-image-override', {json.loads}, 'big', 'uri', {url_or_none},
+                        {update_url(query='c=original')}),
+                    'display_id': 'data-video-slug',
+                }),
+                **traverse_obj(video_data, {
+                    'timestamp': ('dateCreated', 'uts', {int_or_none(scale=1000)}),
+                    'description': ('description', {clean_html}),
+                    'title': ('headline', {str}),
+                    'modified_timestamp': ('lastModified', 'uts', {int_or_none(scale=1000)}),
+                    'duration': ('trt', {int_or_none}),
+                }),
+                'id': media_id,
+                'formats': formats,
+                'subtitles': subtitles,
             })
 
+        if len(entries) == 1:
+            return {
+                **entries[0],
+                'display_id': display_id,
+            }
 
-class CNNBlogsIE(InfoExtractor):
-    _VALID_URL = r'https?://[^\.]+\.blogs\.cnn\.com/.+'
-    _TEST = {
-        'url': 'http://reliablesources.blogs.cnn.com/2014/02/09/criminalizing-journalism/',
-        'md5': '3e56f97b0b6ffb4b79f4ea0749551084',
-        'info_dict': {
-            'id': 'bestoftv/2014/02/09/criminalizing-journalism.cnn',
-            'ext': 'mp4',
-            'title': 'Criminalizing journalism?',
-            'description': 'Glenn Greenwald responds to comments made this week on Capitol Hill that journalists could be criminal accessories.',
-            'upload_date': '20140209',
-        },
-        'expected_warnings': ['Failed to download m3u8 information'],
-        'add_ie': ['CNN'],
-    }
-
-    def _real_extract(self, url):
-        webpage = self._download_webpage(url, url_basename(url))
-        cnn_url = self._html_search_regex(r'data-url="(.+?)"', webpage, 'cnn url')
-        return self.url_result(cnn_url, CNNIE.ie_key())
-
-
-class CNNArticleIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:(?:edition|www)\.)?cnn\.com/(?!videos?/)'
-    _TEST = {
-        'url': 'http://www.cnn.com/2014/12/21/politics/obama-north-koreas-hack-not-war-but-cyber-vandalism/',
-        'md5': '689034c2a3d9c6dc4aa72d65a81efd01',
-        'info_dict': {
-            'id': 'bestoftv/2014/12/21/ip-north-korea-obama.cnn',
-            'ext': 'mp4',
-            'title': 'Obama: Cyberattack not an act of war',
-            'description': 'md5:0a802a40d2376f60e6b04c8d5bcebc4b',
-            'upload_date': '20141221',
-        },
-        'expected_warnings': ['Failed to download m3u8 information'],
-        'add_ie': ['CNN'],
-    }
-
-    def _real_extract(self, url):
-        webpage = self._download_webpage(url, url_basename(url))
-        cnn_url = self._html_search_regex(r"video:\s*'([^']+)'", webpage, 'cnn url')
-        return self.url_result('http://cnn.com/video/?/video/' + cnn_url, CNNIE.ie_key())
+        return self.playlist_result(entries, display_id)
 
 
 class CNNIndonesiaIE(InfoExtractor):
@@ -161,7 +240,7 @@ class CNNIndonesiaIE(InfoExtractor):
             'release_timestamp': 1662859088,
             'release_date': '20220911',
             'uploader': 'Asfahan Yahsyi',
-        }
+        },
     }, {
         'url': 'https://www.cnnindonesia.com/internasional/20220911104341-139-846189/video-momen-charles-disambut-meriah-usai-dilantik-jadi-raja-inggris',
         'info_dict': {
@@ -178,7 +257,7 @@ class CNNIndonesiaIE(InfoExtractor):
             'release_date': '20220911',
             'uploader': 'REUTERS',
             'release_timestamp': 1662869995,
-        }
+        },
     }]
 
     def _real_extract(self, url):
@@ -194,5 +273,5 @@ class CNNIndonesiaIE(InfoExtractor):
             '_type': 'url_transparent',
             'url': embed_url,
             'upload_date': upload_date,
-            'tags': try_call(lambda: self._html_search_meta('keywords', webpage).split(', '))
+            'tags': try_call(lambda: self._html_search_meta('keywords', webpage).split(', ')),
         })
diff --git a/plugins/youtube_download/yt_dlp/extractor/common.py b/plugins/youtube_download/yt_dlp/extractor/common.py
index 7deab99..d560729 100644
--- a/plugins/youtube_download/yt_dlp/extractor/common.py
+++ b/plugins/youtube_download/yt_dlp/extractor/common.py
@@ -1,7 +1,7 @@
 import base64
 import collections
+import functools
 import getpass
-import hashlib
 import http.client
 import http.cookiejar
 import http.cookies
@@ -21,22 +21,23 @@ import urllib.parse
 import urllib.request
 import xml.etree.ElementTree
 
-from ..compat import functools  # isort: split
 from ..compat import (
     compat_etree_fromstring,
     compat_expanduser,
-    compat_os_name,
     urllib_req_to_req,
 )
 from ..cookies import LenientSimpleCookie
 from ..downloader.f4m import get_base_url, remove_encrypted_media
 from ..downloader.hls import HlsFD
+from ..globals import plugin_ies_overrides
 from ..networking import HEADRequest, Request
 from ..networking.exceptions import (
     HTTPError,
     IncompleteRead,
+    TransportError,
     network_exceptions,
 )
+from ..networking.impersonate import ImpersonateTarget
 from ..utils import (
     IDENTITY,
     JSON_LD_RE,
@@ -45,6 +46,7 @@ from ..utils import (
     FormatSorter,
     GeoRestrictedError,
     GeoUtils,
+    ISO639Utils,
     LenientJSONDecoder,
     Popen,
     RegexNotFoundError,
@@ -59,7 +61,6 @@ from ..utils import (
     determine_ext,
     dict_get,
     encode_data_uri,
-    error_to_compat_str,
     extract_attributes,
     filter_dict,
     fix_xml_ampersands,
@@ -77,7 +78,7 @@ from ..utils import (
     parse_iso8601,
     parse_m3u8_attributes,
     parse_resolution,
-    sanitize_filename,
+    qualities,
     sanitize_url,
     smuggle_url,
     str_or_none,
@@ -99,6 +100,7 @@ from ..utils import (
     xpath_text,
     xpath_with_ns,
 )
+from ..utils._utils import _request_dump_filename
 
 
 class InfoExtractor:
@@ -170,12 +172,12 @@ class InfoExtractor:
                                  Automatically calculated from width and height
                     * dynamic_range The dynamic range of the video. One of:
                                  "SDR" (None), "HDR10", "HDR10+, "HDR12", "HLG, "DV"
-                    * tbr        Average bitrate of audio and video in KBit/s
-                    * abr        Average audio bitrate in KBit/s
+                    * tbr        Average bitrate of audio and video in kbps (1000 bits/sec)
+                    * abr        Average audio bitrate in kbps (1000 bits/sec)
                     * acodec     Name of the audio codec in use
                     * asr        Audio sampling rate in Hertz
                     * audio_channels  Number of audio channels
-                    * vbr        Average video bitrate in KBit/s
+                    * vbr        Average video bitrate in kbps (1000 bits/sec)
                     * fps        Frame rate
                     * vcodec     Name of the video codec in use
                     * container  Name of the container format
@@ -200,6 +202,11 @@ class InfoExtractor:
                                             fragment_base_url
                                  * "duration" (optional, int or float)
                                  * "filesize" (optional, int)
+                    * hls_media_playlist_data
+                                 The M3U8 media playlist data as a string.
+                                 Only use if the data must be modified during extraction and
+                                 the native HLS downloader should bypass requesting the URL.
+                                 Does not apply if ffmpeg is used as external downloader
                     * is_from_start  Is a live format that can be downloaded
                                 from the start. Boolean
                     * preference Order number of this format. If this field is
@@ -234,7 +241,14 @@ class InfoExtractor:
                                  'maybe' if the format may have DRM and has to be tested before download.
                     * extra_param_to_segment_url  A query string to append to each
                                  fragment's URL, or to update each existing query string
-                                 with. Only applied by the native HLS/DASH downloaders.
+                                 with. If it is an HLS stream with an AES-128 decryption key,
+                                 the query paramaters will be passed to the key URI as well,
+                                 unless there is an `extra_param_to_key_url` given,
+                                 or unless an external key URI is provided via `hls_aes`.
+                                 Only applied by the native HLS/DASH downloaders.
+                    * extra_param_to_key_url  A query string to append to the URL
+                                 of the format's HLS AES-128 decryption key.
+                                 Only applied by the native HLS downloader.
                     * hls_aes    A dictionary of HLS AES-128 decryption information
                                  used by the native HLS downloader to override the
                                  values in the media playlist when an '#EXT-X-KEY' tag
@@ -246,7 +260,10 @@ class InfoExtractor:
                     * downloader_options  A dictionary of downloader options
                                  (For internal use only)
                                  * http_chunk_size Chunk size for HTTP downloads
-                                 * ffmpeg_args     Extra arguments for ffmpeg downloader
+                                 * ffmpeg_args     Extra arguments for ffmpeg downloader (input)
+                                 * ffmpeg_args_out Extra arguments for ffmpeg downloader (output)
+                    * is_dash_periods  Whether the format is a result of merging
+                                 multiple DASH periods.
                     RTMP formats can also have the additional fields: page_url,
                     app, play_path, tc_url, flash_version, rtmp_live, rtmp_conn,
                     rtmp_protocol, rtmp_real_time
@@ -260,13 +277,14 @@ class InfoExtractor:
 
     direct:         True if a direct video file was given (must only be set by GenericIE)
     alt_title:      A secondary title of the video.
-    display_id      An alternative identifier for the video, not necessarily
+    display_id:     An alternative identifier for the video, not necessarily
                     unique, but available before title. Typically, id is
                     something like "4234987", title "Dancing naked mole rats",
                     and display_id "dancing-naked-mole-rats"
     thumbnails:     A list of dictionaries, with the following entries:
                         * "id" (optional, string) - Thumbnail format ID
                         * "url"
+                        * "ext" (optional, string) - actual image extension if not given in URL
                         * "preference" (optional, int) - quality of the image
                         * "width" (optional, int)
                         * "height" (optional, int)
@@ -278,7 +296,7 @@ class InfoExtractor:
     description:    Full video description.
     uploader:       Full name of the video uploader.
     license:        License name the video is licensed under.
-    creator:        The creator of the video.
+    creators:       List of creators of the video.
     timestamp:      UNIX timestamp of the moment the video was uploaded
     upload_date:    Video upload date in UTC (YYYYMMDD).
                     If not explicitly set, calculated from timestamp
@@ -286,6 +304,9 @@ class InfoExtractor:
                     If it is not clear whether to use timestamp or this, use the former
     release_date:   The date (YYYYMMDD) when the video was released in UTC.
                     If not explicitly set, calculated from release_timestamp
+    release_year:   Year (YYYY) as integer when the video or album was released.
+                    To be used if no exact release date is known.
+                    If not explicitly set, calculated from release_date.
     modified_timestamp: UNIX timestamp of the moment the video was last modified.
     modified_date:   The date (YYYYMMDD) when the video was last modified in UTC.
                     If not explicitly set, calculated from modified_timestamp
@@ -319,7 +340,7 @@ class InfoExtractor:
     like_count:     Number of positive ratings of the video
     dislike_count:  Number of negative ratings of the video
     repost_count:   Number of reposts of the video
-    average_rating: Average rating give by users, the scale used depends on the webpage
+    average_rating: Average rating given by users, the scale used depends on the webpage
     comment_count:  Number of comments on the video
     comments:       A list of comments, each with one or more of the following
                     properties (all but one of text or html optional):
@@ -379,6 +400,7 @@ class InfoExtractor:
                     'private', 'premium_only', 'subscriber_only', 'needs_auth',
                     'unlisted' or 'public'. Use 'InfoExtractor._availability'
                     to set it
+    media_type:     The type of media as classified by the site, e.g. "episode", "clip", "trailer"
     _old_archive_ids: A list of old archive ids needed for backward compatibility
     _format_sort_fields: A list of fields to use for sorting formats
     __post_extractor: A function to be called just before the metadata is
@@ -418,17 +440,16 @@ class InfoExtractor:
     track_number:   Number of the track within an album or a disc, as an integer.
     track_id:       Id of the track (useful in case of custom indexing, e.g. 6.iii),
                     as a unicode string.
-    artist:         Artist(s) of the track.
-    genre:          Genre(s) of the track.
+    artists:        List of artists of the track.
+    composers:      List of composers of the piece.
+    genres:         List of genres of the track.
     album:          Title of the album the track belongs to.
     album_type:     Type of the album (e.g. "Demo", "Full-length", "Split", "Compilation", etc).
-    album_artist:   List of all artists appeared on the album (e.g.
-                    "Ash Borer / Fell Voices" or "Various Artists", useful for splits
-                    and compilations).
+    album_artists:  List of all artists appeared on the album.
+                    E.g. ["Ash Borer", "Fell Voices"] or ["Various Artists"].
+                    Useful for splits and compilations.
     disc_number:    Number of the disc or other physical medium the track belongs to,
                     as an integer.
-    release_year:   Year (YYYY) when the album was released.
-    composer:       Composer of the piece
 
     The following fields should only be set for clips that should be cut from the original video:
 
@@ -439,6 +460,18 @@ class InfoExtractor:
     rows:           Number of rows in each storyboard fragment, as an integer
     columns:        Number of columns in each storyboard fragment, as an integer
 
+    The following fields are deprecated and should not be set by new code:
+    composer:       Use "composers" instead.
+                    Composer(s) of the piece, comma-separated.
+    artist:         Use "artists" instead.
+                    Artist(s) of the track, comma-separated.
+    genre:          Use "genres" instead.
+                    Genre(s) of the track, comma-separated.
+    album_artist:   Use "album_artists" instead.
+                    All artists appeared on the album, comma-separated.
+    creator:        Use "creators" instead.
+                    The creator of the video.
+
     Unless mentioned otherwise, the fields should be Unicode strings.
 
     Unless mentioned otherwise, None is equivalent to absence of information.
@@ -494,7 +527,7 @@ class InfoExtractor:
     or _extract_from_webpage as necessary. While these are normally classmethods,
     _extract_from_webpage is allowed to be an instance method.
 
-    _extract_from_webpage may raise self.StopExtraction() to stop further
+    _extract_from_webpage may raise self.StopExtraction to stop further
     processing of the webpage and obtain exclusive rights to it. This is useful
     when the extractor cannot reliably be matched using just the URL,
     e.g. invidious/peertube instances
@@ -547,13 +580,13 @@ class InfoExtractor:
 
     def _login_hint(self, method=NO_DEFAULT, netrc=None):
         password_hint = f'--username and --password, --netrc-cmd, or --netrc ({netrc or self._NETRC_MACHINE}) to provide account credentials'
+        cookies_hint = 'See  https://github.com/yt-dlp/yt-dlp/wiki/FAQ#how-do-i-pass-cookies-to-yt-dlp  for how to manually pass cookies'
         return {
             None: '',
-            'any': f'Use --cookies, --cookies-from-browser, {password_hint}',
+            'any': f'Use --cookies, --cookies-from-browser, {password_hint}. {cookies_hint}',
             'password': f'Use {password_hint}',
-            'cookies': (
-                'Use --cookies-from-browser or --cookies for the authentication. '
-                'See  https://github.com/yt-dlp/yt-dlp/wiki/FAQ#how-do-i-pass-cookies-to-yt-dlp  for how to manually pass cookies'),
+            'cookies': f'Use --cookies-from-browser or --cookies for the authentication. {cookies_hint}',
+            'session_cookies': f'Use --cookies for the authentication (--cookies-from-browser might not work). {cookies_hint}',
         }[method if method is not NO_DEFAULT else 'any' if self.supports_login() else 'cookies']
 
     def __init__(self, downloader=None):
@@ -730,7 +763,7 @@ class InfoExtractor:
             raise
         except ExtractorError as e:
             e.video_id = e.video_id or self.get_temp_id(url)
-            e.ie = e.ie or self.IE_NAME,
+            e.ie = e.ie or self.IE_NAME
             e.traceback = e.traceback or sys.exc_info()[2]
             raise
         except IncompleteRead as e:
@@ -748,8 +781,8 @@ class InfoExtractor:
             self._x_forwarded_for_ip = GeoUtils.random_ipv4(country_code)
             if self._x_forwarded_for_ip:
                 self.report_warning(
-                    'Video is geo restricted. Retrying extraction with fake IP %s (%s) as X-Forwarded-For.'
-                    % (self._x_forwarded_for_ip, country_code.upper()))
+                    'Video is geo restricted. Retrying extraction with fake IP '
+                    f'{self._x_forwarded_for_ip} ({country_code.upper()}) as X-Forwarded-For.')
                 return True
         return False
 
@@ -800,7 +833,7 @@ class InfoExtractor:
         else:
             return err.status in variadic(expected_status)
 
-    def _create_request(self, url_or_request, data=None, headers=None, query=None):
+    def _create_request(self, url_or_request, data=None, headers=None, query=None, extensions=None):
         if isinstance(url_or_request, urllib.request.Request):
             self._downloader.deprecation_warning(
                 'Passing a urllib.request.Request to _create_request() is deprecated. '
@@ -809,10 +842,11 @@ class InfoExtractor:
         elif not isinstance(url_or_request, Request):
             url_or_request = Request(url_or_request)
 
-        url_or_request.update(data=data, headers=headers, query=query)
+        url_or_request.update(data=data, headers=headers, query=query, extensions=extensions)
         return url_or_request
 
-    def _request_webpage(self, url_or_request, video_id, note=None, errnote=None, fatal=True, data=None, headers=None, query=None, expected_status=None):
+    def _request_webpage(self, url_or_request, video_id, note=None, errnote=None, fatal=True, data=None,
+                         headers=None, query=None, expected_status=None, impersonate=None, require_impersonation=False):
         """
         Return the response handle.
 
@@ -821,7 +855,7 @@ class InfoExtractor:
         if not self._downloader._first_webpage_request:
             sleep_interval = self.get_param('sleep_interval_requests') or 0
             if sleep_interval > 0:
-                self.to_screen('Sleeping %s seconds ...' % sleep_interval)
+                self.to_screen(f'Sleeping {sleep_interval} seconds ...')
                 time.sleep(sleep_interval)
         else:
             self._downloader._first_webpage_request = False
@@ -843,8 +877,31 @@ class InfoExtractor:
             headers = (headers or {}).copy()
             headers.setdefault('X-Forwarded-For', self._x_forwarded_for_ip)
 
+        extensions = {}
+
+        if impersonate in (True, ''):
+            impersonate = ImpersonateTarget()
+        requested_targets = [
+            t if isinstance(t, ImpersonateTarget) else ImpersonateTarget.from_str(t)
+            for t in variadic(impersonate)
+        ] if impersonate else []
+
+        available_target = next(filter(self._downloader._impersonate_target_available, requested_targets), None)
+        if available_target:
+            extensions['impersonate'] = available_target
+        elif requested_targets:
+            message = 'The extractor is attempting impersonation, but '
+            message += (
+                'no impersonate target is available' if not str(impersonate)
+                else f'none of these impersonate targets are available: "{", ".join(map(str, requested_targets))}"')
+            info_msg = ('see  https://github.com/yt-dlp/yt-dlp#impersonation  '
+                        'for information on installing the required dependencies')
+            if require_impersonation:
+                raise ExtractorError(f'{message}; {info_msg}', expected=True)
+            self.report_warning(f'{message}; if you encounter errors, then {info_msg}', only_once=True)
+
         try:
-            return self._downloader.urlopen(self._create_request(url_or_request, data, headers, query))
+            return self._downloader.urlopen(self._create_request(url_or_request, data, headers, query, extensions))
         except network_exceptions as err:
             if isinstance(err, HTTPError):
                 if self.__can_accept_status_code(err, expected_status):
@@ -855,7 +912,7 @@ class InfoExtractor:
             if errnote is None:
                 errnote = 'Unable to download webpage'
 
-            errmsg = f'{errnote}: {error_to_compat_str(err)}'
+            errmsg = f'{errnote}: {err}'
             if fatal:
                 raise ExtractorError(errmsg, cause=err)
             else:
@@ -863,13 +920,14 @@ class InfoExtractor:
                 return False
 
     def _download_webpage_handle(self, url_or_request, video_id, note=None, errnote=None, fatal=True,
-                                 encoding=None, data=None, headers={}, query={}, expected_status=None):
+                                 encoding=None, data=None, headers={}, query={}, expected_status=None,
+                                 impersonate=None, require_impersonation=False):
         """
         Return a tuple (page content as string, URL handle).
 
         Arguments:
         url_or_request -- plain text URL as a string or
-            a urllib.request.Request object
+            a yt_dlp.networking.Request object
         video_id -- Video/playlist/item identifier (string)
 
         Keyword arguments:
@@ -894,17 +952,30 @@ class InfoExtractor:
                   returning True if it should be accepted
             Note that this argument does not affect success status codes (2xx)
             which are always accepted.
+        impersonate -- the impersonate target. Can be any of the following entities:
+                - an instance of yt_dlp.networking.impersonate.ImpersonateTarget
+                - a string in the format of CLIENT[:OS]
+                - a list or a tuple of CLIENT[:OS] strings or ImpersonateTarget instances
+                - a boolean value; True means any impersonate target is sufficient
+        require_impersonation -- flag to toggle whether the request should raise an error
+            if impersonation is not possible (bool, default: False)
         """
 
         # Strip hashes from the URL (#1038)
         if isinstance(url_or_request, str):
             url_or_request = url_or_request.partition('#')[0]
 
-        urlh = self._request_webpage(url_or_request, video_id, note, errnote, fatal, data=data, headers=headers, query=query, expected_status=expected_status)
+        urlh = self._request_webpage(url_or_request, video_id, note, errnote, fatal, data=data,
+                                     headers=headers, query=query, expected_status=expected_status,
+                                     impersonate=impersonate, require_impersonation=require_impersonation)
         if urlh is False:
             assert not fatal
             return False
-        content = self._webpage_read_content(urlh, url_or_request, video_id, note, errnote, fatal, encoding=encoding)
+        content = self._webpage_read_content(urlh, url_or_request, video_id, note, errnote, fatal,
+                                             encoding=encoding, data=data)
+        if content is False:
+            assert not fatal
+            return False
         return (content, urlh)
 
     @staticmethod
@@ -933,7 +1004,7 @@ class InfoExtractor:
                 r'<iframe src="([^"]+)"', content,
                 'Websense information URL', default=None)
             if blocked_iframe:
-                msg += ' Visit %s for more details' % blocked_iframe
+                msg += f' Visit {blocked_iframe} for more details'
             raise ExtractorError(msg, expected=True)
         if '<title>The URL you requested has been blocked</title>' in first_block:
             msg = (
@@ -943,7 +1014,7 @@ class InfoExtractor:
                 r'</h1><p>(.*?)</p>',
                 content, 'block message', default=None)
             if block_msg:
-                msg += ' (Message: "%s")' % block_msg.replace('\n', ' ')
+                msg += ' (Message: "{}")'.format(block_msg.replace('\n', ' '))
             raise ExtractorError(msg, expected=True)
         if ('<title>TTK :: Доступ к ресурсу ограничен</title>' in content
                 and 'blocklist.rkn.gov.ru' in content):
@@ -952,21 +1023,6 @@ class InfoExtractor:
                 'Visit http://blocklist.rkn.gov.ru/ for a block reason.',
                 expected=True)
 
-    def _request_dump_filename(self, url, video_id):
-        basen = f'{video_id}_{url}'
-        trim_length = self.get_param('trim_file_name') or 240
-        if len(basen) > trim_length:
-            h = '___' + hashlib.md5(basen.encode('utf-8')).hexdigest()
-            basen = basen[:trim_length - len(h)] + h
-        filename = sanitize_filename(f'{basen}.dump', restricted=True)
-        # Working around MAX_PATH limitation on Windows (see
-        # http://msdn.microsoft.com/en-us/library/windows/desktop/aa365247(v=vs.85).aspx)
-        if compat_os_name == 'nt':
-            absfilepath = os.path.abspath(filename)
-            if len(absfilepath) > 259:
-                filename = fR'\\?\{absfilepath}'
-        return filename
-
     def __decode_webpage(self, webpage_bytes, encoding, headers):
         if not encoding:
             encoding = self._guess_encoding_from_content(headers.get('Content-Type', ''), webpage_bytes)
@@ -975,8 +1031,17 @@ class InfoExtractor:
         except LookupError:
             return webpage_bytes.decode('utf-8', 'replace')
 
-    def _webpage_read_content(self, urlh, url_or_request, video_id, note=None, errnote=None, fatal=True, prefix=None, encoding=None):
-        webpage_bytes = urlh.read()
+    def _webpage_read_content(self, urlh, url_or_request, video_id, note=None, errnote=None, fatal=True,
+                              prefix=None, encoding=None, data=None):
+        try:
+            webpage_bytes = urlh.read()
+        except TransportError as err:
+            errmsg = f'{video_id}: Error reading response: {err.msg}'
+            if fatal:
+                raise ExtractorError(errmsg, cause=err)
+            self.report_warning(errmsg)
+            return False
+
         if prefix is not None:
             webpage_bytes = prefix + webpage_bytes
         if self.get_param('dump_intermediate_pages', False):
@@ -984,7 +1049,11 @@ class InfoExtractor:
             dump = base64.b64encode(webpage_bytes).decode('ascii')
             self._downloader.to_screen(dump)
         if self.get_param('write_pages'):
-            filename = self._request_dump_filename(urlh.url, video_id)
+            if isinstance(url_or_request, Request):
+                data = self._create_request(url_or_request, data).data
+            filename = _request_dump_filename(
+                urlh.url, video_id, data,
+                trim_length=self.get_param('trim_file_name'))
             self.to_screen(f'Saving request to {filename}')
             with open(filename, 'wb') as outf:
                 outf.write(webpage_bytes)
@@ -1004,7 +1073,7 @@ class InfoExtractor:
         if transform_source:
             xml_string = transform_source(xml_string)
         try:
-            return compat_etree_fromstring(xml_string.encode('utf-8'))
+            return compat_etree_fromstring(xml_string.encode())
         except xml.etree.ElementTree.ParseError as ve:
             self.__print_error('Failed to parse XML' if errnote is None else errnote, fatal, video_id, ve)
 
@@ -1029,20 +1098,25 @@ class InfoExtractor:
             return getattr(ie, parser)(content, *args, **kwargs)
 
         def download_handle(self, url_or_request, video_id, note=note, errnote=errnote, transform_source=None,
-                            fatal=True, encoding=None, data=None, headers={}, query={}, expected_status=None):
+                            fatal=True, encoding=None, data=None, headers={}, query={}, expected_status=None,
+                            impersonate=None, require_impersonation=False):
             res = self._download_webpage_handle(
                 url_or_request, video_id, note=note, errnote=errnote, fatal=fatal, encoding=encoding,
-                data=data, headers=headers, query=query, expected_status=expected_status)
+                data=data, headers=headers, query=query, expected_status=expected_status,
+                impersonate=impersonate, require_impersonation=require_impersonation)
             if res is False:
                 return res
             content, urlh = res
             return parse(self, content, video_id, transform_source=transform_source, fatal=fatal, errnote=errnote), urlh
 
         def download_content(self, url_or_request, video_id, note=note, errnote=errnote, transform_source=None,
-                             fatal=True, encoding=None, data=None, headers={}, query={}, expected_status=None):
+                             fatal=True, encoding=None, data=None, headers={}, query={}, expected_status=None,
+                             impersonate=None, require_impersonation=False):
             if self.get_param('load_pages'):
                 url_or_request = self._create_request(url_or_request, data, headers, query)
-                filename = self._request_dump_filename(url_or_request.url, video_id)
+                filename = _request_dump_filename(
+                    url_or_request.url, video_id, url_or_request.data,
+                    trim_length=self.get_param('trim_file_name'))
                 self.to_screen(f'Loading request from {filename}')
                 try:
                     with open(filename, 'rb') as dumpf:
@@ -1062,6 +1136,8 @@ class InfoExtractor:
                 'headers': headers,
                 'query': query,
                 'expected_status': expected_status,
+                'impersonate': impersonate,
+                'require_impersonation': require_impersonation,
             }
             if parser is None:
                 kwargs.pop('transform_source')
@@ -1150,11 +1226,11 @@ class InfoExtractor:
 
     def report_extraction(self, id_or_name):
         """Report information extraction."""
-        self.to_screen('%s: Extracting information' % id_or_name)
+        self.to_screen(f'{id_or_name}: Extracting information')
 
     def report_download_webpage(self, video_id):
         """Report webpage download."""
-        self.to_screen('%s: Downloading webpage' % video_id)
+        self.to_screen(f'{video_id}: Downloading webpage')
 
     def report_age_confirmation(self):
         """Report attempt to confirm age."""
@@ -1260,9 +1336,9 @@ class InfoExtractor:
         elif default is not NO_DEFAULT:
             return default
         elif fatal:
-            raise RegexNotFoundError('Unable to extract %s' % _name)
+            raise RegexNotFoundError(f'Unable to extract {_name}')
         else:
-            self.report_warning('unable to extract %s' % _name + bug_reports_message())
+            self.report_warning(f'unable to extract {_name}' + bug_reports_message())
             return None
 
     def _search_json(self, start_pattern, string, name, video_id, *, end_pattern='',
@@ -1322,7 +1398,17 @@ class InfoExtractor:
         else:
             return None, None
         if not info:
-            raise netrc.NetrcParseError(f'No authenticators for {netrc_machine}')
+            self.to_screen(f'No authenticators for {netrc_machine}')
+            return None, None
+
+        self.write_debug(f'Using netrc for {netrc_machine} authentication')
+
+        # compat: <=py3.10: netrc cannot parse tokens as empty strings, will return `""` instead
+        # Ref: https://github.com/yt-dlp/yt-dlp/issues/11413
+        #      https://github.com/python/cpython/commit/15409c720be0503131713e3d3abc1acd0da07378
+        if sys.version_info < (3, 11):
+            return tuple(x if x != '""' else '' for x in info[::2])
+
         return info[0], info[2]
 
     def _get_login_info(self, username_option='username', password_option='password', netrc_machine=None):
@@ -1358,14 +1444,14 @@ class InfoExtractor:
         if tfa is not None:
             return tfa
 
-        return getpass.getpass('Type %s and press [Return]: ' % note)
+        return getpass.getpass(f'Type {note} and press [Return]: ')
 
     # Helper functions for extracting OpenGraph info
     @staticmethod
     def _og_regexes(prop):
         content_re = r'content=(?:"([^"]+?)"|\'([^\']+?)\'|\s*([^\s"\'=<>`]+?)(?=\s|/?>))'
-        property_re = (r'(?:name|property)=(?:\'og%(sep)s%(prop)s\'|"og%(sep)s%(prop)s"|\s*og%(sep)s%(prop)s\b)'
-                       % {'prop': re.escape(prop), 'sep': '(?:&#x3A;|[:-])'})
+        property_re = r'(?:name|property)=(?:\'og{sep}{prop}\'|"og{sep}{prop}"|\s*og{sep}{prop}\b)'.format(
+            prop=re.escape(prop), sep='(?:&#x3A;|[:-])')
         template = r'<meta[^>]+?%s[^>]+?%s'
         return [
             template % (property_re, content_re),
@@ -1374,14 +1460,14 @@ class InfoExtractor:
 
     @staticmethod
     def _meta_regex(prop):
-        return r'''(?isx)<meta
-                    (?=[^>]+(?:itemprop|name|property|id|http-equiv)=(["\']?)%s\1)
-                    [^>]+?content=(["\'])(?P<content>.*?)\2''' % re.escape(prop)
+        return rf'''(?isx)<meta
+                    (?=[^>]+(?:itemprop|name|property|id|http-equiv)=(["\']?){re.escape(prop)}\1)
+                    [^>]+?content=(["\'])(?P<content>.*?)\2'''
 
     def _og_search_property(self, prop, html, name=None, **kargs):
         prop = variadic(prop)
         if name is None:
-            name = 'OpenGraph %s' % prop[0]
+            name = f'OpenGraph {prop[0]}'
         og_regexes = []
         for p in prop:
             og_regexes.extend(self._og_regexes(p))
@@ -1484,8 +1570,12 @@ class InfoExtractor:
         """Yield all json ld objects in the html"""
         if default is not NO_DEFAULT:
             fatal = False
+        if not fatal and not isinstance(html, str):
+            return
         for mobj in re.finditer(JSON_LD_RE, html):
-            json_ld_item = self._parse_json(mobj.group('json_ld'), video_id, fatal=fatal)
+            json_ld_item = self._parse_json(
+                mobj.group('json_ld'), video_id, fatal=fatal,
+                errnote=False if default is not NO_DEFAULT else None)
             for json_ld in variadic(json_ld_item):
                 if isinstance(json_ld, dict):
                     yield json_ld
@@ -1504,7 +1594,7 @@ class InfoExtractor:
         elif fatal:
             raise RegexNotFoundError('Unable to extract JSON-LD')
         else:
-            self.report_warning('unable to extract JSON-LD %s' % bug_reports_message())
+            self.report_warning(f'unable to extract JSON-LD {bug_reports_message()}')
             return {}
 
     def _json_ld(self, json_ld, video_id, fatal=True, expected_type=None):
@@ -1526,8 +1616,8 @@ class InfoExtractor:
         }
 
         def is_type(e, *expected_types):
-            type = variadic(traverse_obj(e, '@type'))
-            return any(x in type for x in expected_types)
+            type_ = variadic(traverse_obj(e, '@type'))
+            return any(x in type_ for x in expected_types)
 
         def extract_interaction_type(e):
             interaction_type = e.get('interactionType')
@@ -1556,7 +1646,7 @@ class InfoExtractor:
                 count_kind = INTERACTION_TYPE_MAP.get(interaction_type.split('/')[-1])
                 if not count_kind:
                     continue
-                count_key = '%s_count' % count_kind
+                count_key = f'{count_kind}_count'
                 if info.get(count_key) is not None:
                     continue
                 info[count_key] = interaction_count
@@ -1568,7 +1658,7 @@ class InfoExtractor:
                 'end_time': part.get('endOffset'),
             } for part in variadic(e.get('hasPart') or []) if part.get('@type') == 'Clip']
             for idx, (last_c, current_c, next_c) in enumerate(zip(
-                    [{'end_time': 0}] + chapters, chapters, chapters[1:])):
+                    [{'end_time': 0}, *chapters], chapters, chapters[1:])):
                 current_c['end_time'] = current_c['end_time'] or next_c['start_time']
                 current_c['start_time'] = current_c['start_time'] or last_c['end_time']
                 if None in current_c.values():
@@ -1625,7 +1715,7 @@ class InfoExtractor:
                 rating = traverse_obj(e, ('aggregateRating', 'ratingValue'), expected_type=float_or_none)
                 if rating is not None:
                     info['average_rating'] = rating
-                if is_type(e, 'TVEpisode', 'Episode'):
+                if is_type(e, 'TVEpisode', 'Episode', 'PodcastEpisode'):
                     episode_name = unescapeHTML(e.get('name'))
                     info.update({
                         'episode': episode_name,
@@ -1677,17 +1767,21 @@ class InfoExtractor:
         traverse_json_ld(json_ld)
         return filter_dict(info)
 
-    def _search_nextjs_data(self, webpage, video_id, *, transform_source=None, fatal=True, **kw):
-        return self._parse_json(
-            self._search_regex(
-                r'(?s)<script[^>]+id=[\'"]__NEXT_DATA__[\'"][^>]*>([^<]+)</script>',
-                webpage, 'next.js data', fatal=fatal, **kw),
-            video_id, transform_source=transform_source, fatal=fatal)
+    def _search_nextjs_data(self, webpage, video_id, *, fatal=True, default=NO_DEFAULT, **kw):
+        if default == '{}':
+            self._downloader.deprecation_warning('using `default=\'{}\'` is deprecated, use `default={}` instead')
+            default = {}
+        if default is not NO_DEFAULT:
+            fatal = False
+
+        return self._search_json(
+            r'<script[^>]+id=[\'"]__NEXT_DATA__[\'"][^>]*>', webpage, 'next.js data',
+            video_id, end_pattern='</script>', fatal=fatal, default=default, **kw)
 
     def _search_nuxt_data(self, webpage, video_id, context_name='__NUXT__', *, fatal=True, traverse=('data', 0)):
         """Parses Nuxt.js metadata. This works as long as the function __NUXT__ invokes is a pure function"""
         rectx = re.escape(context_name)
-        FUNCTION_RE = r'\(function\((?P<arg_keys>.*?)\){return\s+(?P<js>{.*?})\s*;?\s*}\((?P<arg_vals>.*?)\)'
+        FUNCTION_RE = r'\(function\((?P<arg_keys>.*?)\){.*?\breturn\s+(?P<js>{.*?})\s*;?\s*}\((?P<arg_vals>.*?)\)'
         js, arg_keys, arg_vals = self._search_regex(
             (rf'<script>\s*window\.{rectx}={FUNCTION_RE}\s*\)\s*;?\s*</script>', rf'{rectx}\(.*?{FUNCTION_RE}'),
             webpage, context_name, group=('js', 'arg_keys', 'arg_vals'),
@@ -1705,9 +1799,9 @@ class InfoExtractor:
     def _hidden_inputs(html):
         html = re.sub(r'<!--(?:(?!<!--).)*-->', '', html)
         hidden_inputs = {}
-        for input in re.findall(r'(?i)(<input[^>]+>)', html):
-            attrs = extract_attributes(input)
-            if not input:
+        for input_el in re.findall(r'(?i)(<input[^>]+>)', html):
+            attrs = extract_attributes(input_el)
+            if not input_el:
                 continue
             if attrs.get('type') not in ('hidden', 'submit'):
                 continue
@@ -1719,8 +1813,8 @@ class InfoExtractor:
 
     def _form_hidden_inputs(self, form_id, html):
         form = self._search_regex(
-            r'(?is)<form[^>]+?id=(["\'])%s\1[^>]*>(?P<form>.+?)</form>' % form_id,
-            html, '%s form' % form_id, group='form')
+            rf'(?is)<form[^>]+?id=(["\']){form_id}\1[^>]*>(?P<form>.+?)</form>',
+            html, f'{form_id} form', group='form')
         return self._hidden_inputs(form)
 
     @classproperty(cache=True)
@@ -1750,31 +1844,44 @@ class InfoExtractor:
             formats[:] = filter(
                 lambda f: self._is_valid_url(
                     f['url'], video_id,
-                    item='%s video format' % f.get('format_id') if f.get('format_id') else 'video'),
+                    item='{} video format'.format(f.get('format_id')) if f.get('format_id') else 'video'),
                 formats)
 
     @staticmethod
     def _remove_duplicate_formats(formats):
-        format_urls = set()
+        seen_urls = set()
+        seen_fragment_urls = set()
         unique_formats = []
         for f in formats:
-            if f['url'] not in format_urls:
-                format_urls.add(f['url'])
+            fragments = f.get('fragments')
+            if callable(fragments):
                 unique_formats.append(f)
+
+            elif fragments:
+                fragment_urls = frozenset(
+                    fragment.get('url') or urljoin(f['fragment_base_url'], fragment['path'])
+                    for fragment in fragments)
+                if fragment_urls not in seen_fragment_urls:
+                    seen_fragment_urls.add(fragment_urls)
+                    unique_formats.append(f)
+
+            elif f['url'] not in seen_urls:
+                seen_urls.add(f['url'])
+                unique_formats.append(f)
+
         formats[:] = unique_formats
 
     def _is_valid_url(self, url, video_id, item='video', headers={}):
         url = self._proto_relative_url(url, scheme='http:')
         # For now assume non HTTP(S) URLs always valid
-        if not (url.startswith('http://') or url.startswith('https://')):
+        if not url.startswith(('http://', 'https://')):
             return True
         try:
-            self._request_webpage(url, video_id, 'Checking %s URL' % item, headers=headers)
+            self._request_webpage(url, video_id, f'Checking {item} URL', headers=headers)
             return True
         except ExtractorError as e:
             self.to_screen(
-                '%s: %s URL is invalid, skipping: %s'
-                % (video_id, item, error_to_compat_str(e.cause)))
+                f'{video_id}: {item} URL is invalid, skipping: {e.cause!s}')
             return False
 
     def http_scheme(self):
@@ -1828,8 +1935,8 @@ class InfoExtractor:
         # currently yt-dlp cannot decode the playerVerificationChallenge as Akamai uses Adobe Alchemy
         akamai_pv = manifest.find('{http://ns.adobe.com/f4m/1.0}pv-2.0')
         if akamai_pv is not None and ';' in akamai_pv.text:
-            playerVerificationChallenge = akamai_pv.text.split(';')[0]
-            if playerVerificationChallenge.strip() != '':
+            player_verification_challenge = akamai_pv.text.split(';')[0]
+            if player_verification_challenge.strip() != '':
                 return []
 
         formats = []
@@ -1875,7 +1982,7 @@ class InfoExtractor:
                 if not media_url:
                     continue
                 manifest_url = (
-                    media_url if media_url.startswith('http://') or media_url.startswith('https://')
+                    media_url if media_url.startswith(('http://', 'https://'))
                     else ((manifest_base_url or '/'.join(manifest_url.split('/')[:-1])) + '/' + media_url))
                 # If media_url is itself a f4m manifest do the recursive extraction
                 # since bitrates in parent manifest (this one) and media_url manifest
@@ -1936,7 +2043,7 @@ class InfoExtractor:
     def _report_ignoring_subs(self, name):
         self.report_warning(bug_reports_message(
             f'Ignoring subtitle tracks found in the {name} manifest; '
-            'if any subtitle tracks are missing,'
+            'if any subtitle tracks are missing,',
         ), only_once=True)
 
     def _extract_m3u8_formats(self, *args, **kwargs):
@@ -1989,7 +2096,7 @@ class InfoExtractor:
         has_drm = HlsFD._has_drm(m3u8_doc)
 
         def format_url(url):
-            return url if re.match(r'^https?://', url) else urllib.parse.urljoin(m3u8_url, url)
+            return url if re.match(r'https?://', url) else urllib.parse.urljoin(m3u8_url, url)
 
         if self.get_param('hls_split_discontinuity', False):
             def _extract_m3u8_playlist_indices(manifest_url=None, m3u8_doc=None):
@@ -2027,7 +2134,7 @@ class InfoExtractor:
             formats = [{
                 'format_id': join_nonempty(m3u8_id, idx),
                 'format_index': idx,
-                'url': m3u8_url or encode_data_uri(m3u8_doc.encode('utf-8'), 'application/x-mpegurl'),
+                'url': m3u8_url or encode_data_uri(m3u8_doc.encode(), 'application/x-mpegurl'),
                 'ext': ext,
                 'protocol': entry_protocol,
                 'preference': preference,
@@ -2073,6 +2180,8 @@ class InfoExtractor:
             media_url = media.get('URI')
             if media_url:
                 manifest_url = format_url(media_url)
+                is_audio = media_type == 'AUDIO'
+                is_alternate = media.get('DEFAULT') == 'NO' or media.get('AUTOSELECT') == 'NO'
                 formats.extend({
                     'format_id': join_nonempty(m3u8_id, group_id, name, idx),
                     'format_note': name,
@@ -2085,7 +2194,11 @@ class InfoExtractor:
                     'preference': preference,
                     'quality': quality,
                     'has_drm': has_drm,
-                    'vcodec': 'none' if media_type == 'AUDIO' else None,
+                    'vcodec': 'none' if is_audio else None,
+                    # Alternate audio formats (e.g. audio description) should be deprioritized
+                    'source_preference': -2 if is_audio and is_alternate else None,
+                    # Save this to assign source_preference based on associated video stream
+                    '_audio_group_id': group_id if is_audio and not is_alternate else None,
                 } for idx in _extract_m3u8_playlist_indices(manifest_url))
 
         def build_stream_name():
@@ -2146,6 +2259,11 @@ class InfoExtractor:
                         'quality': quality,
                         'has_drm': has_drm,
                     }
+
+                    # YouTube-specific
+                    if yt_audio_content_id := last_stream_inf.get('YT-EXT-AUDIO-CONTENT-ID'):
+                        f['language'] = yt_audio_content_id.split('.')[0]
+
                     resolution = last_stream_inf.get('RESOLUTION')
                     if resolution:
                         mobj = re.search(r'(?P<width>\d+)[xX](?P<height>\d+)', resolution)
@@ -2175,6 +2293,8 @@ class InfoExtractor:
                     # ignore references to rendition groups and treat them
                     # as complete formats.
                     if audio_group_id and codecs and f.get('vcodec') != 'none':
+                        # Save this to determine quality of audio formats that only have a GROUP-ID
+                        f['_audio_group_id'] = audio_group_id
                         audio_group = groups.get(audio_group_id)
                         if audio_group and audio_group[0].get('URI'):
                             # TODO: update acodec for audio only formats with
@@ -2197,6 +2317,28 @@ class InfoExtractor:
                         formats.append(http_f)
 
                 last_stream_inf = {}
+
+        # Some audio-only formats only have a GROUP-ID without any other quality/bitrate/codec info
+        # Each audio GROUP-ID corresponds with one or more video formats' AUDIO attribute
+        # For sorting purposes, set source_preference based on the quality of the video formats they are grouped with
+        # See https://github.com/yt-dlp/yt-dlp/issues/11178
+        audio_groups_by_quality = orderedSet(f['_audio_group_id'] for f in sorted(
+            traverse_obj(formats, lambda _, v: v.get('vcodec') != 'none' and v['_audio_group_id']),
+            key=lambda x: (x.get('tbr') or 0, x.get('width') or 0)))
+        audio_quality_map = {
+            audio_groups_by_quality[0]: 'low',
+            audio_groups_by_quality[-1]: 'high',
+        } if len(audio_groups_by_quality) > 1 else None
+        audio_preference = qualities(audio_groups_by_quality)
+        for fmt in formats:
+            audio_group_id = fmt.pop('_audio_group_id', None)
+            if not audio_quality_map or not audio_group_id or fmt.get('vcodec') != 'none':
+                continue
+            # Use source_preference since quality and preference are set by params
+            fmt['source_preference'] = audio_preference(audio_group_id)
+            fmt['format_note'] = join_nonempty(
+                fmt.get('format_note'), audio_quality_map.get(audio_group_id), delim=', ')
+
         return formats, subtitles
 
     def _extract_m3u8_vod_duration(
@@ -2225,7 +2367,9 @@ class InfoExtractor:
             mpd_url, video_id,
             note='Downloading MPD VOD manifest' if note is None else note,
             errnote='Failed to download VOD manifest' if errnote is None else errnote,
-            fatal=False, data=data, headers=headers, query=query) or {}
+            fatal=False, data=data, headers=headers, query=query)
+        if not isinstance(mpd_doc, xml.etree.ElementTree.Element):
+            return None
         return int_or_none(parse_duration(mpd_doc.get('mediaPresentationDuration')))
 
     @staticmethod
@@ -2237,7 +2381,7 @@ class InfoExtractor:
             if not c or c == '.':
                 out.append(c)
             else:
-                out.append('{%s}%s' % (namespace, c))
+                out.append(f'{{{namespace}}}{c}')
         return '/'.join(out)
 
     def _extract_smil_formats_and_subtitles(self, smil_url, video_id, fatal=True, f4m_params=None, transform_source=None):
@@ -2339,7 +2483,9 @@ class InfoExtractor:
         imgs_count = 0
 
         srcs = set()
-        media = smil.findall(self._xpath_ns('.//video', namespace)) + smil.findall(self._xpath_ns('.//audio', namespace))
+        media = itertools.chain.from_iterable(
+            smil.findall(self._xpath_ns(arg, namespace))
+            for arg in ['.//video', './/audio', './/media'])
         for medium in media:
             src = medium.get('src')
             if not src or src in srcs:
@@ -2376,7 +2522,7 @@ class InfoExtractor:
                     })
                 continue
 
-            src_url = src if src.startswith('http') else urllib.parse.urljoin(base, src)
+            src_url = src if src.startswith('http') else urllib.parse.urljoin(f'{base}/', src)
             src_url = src_url.strip()
 
             if proto == 'm3u8' or src_ext == 'm3u8':
@@ -2432,7 +2578,7 @@ class InfoExtractor:
 
             imgs_count += 1
             formats.append({
-                'format_id': 'imagestream-%d' % (imgs_count),
+                'format_id': f'imagestream-{imgs_count}',
                 'url': src,
                 'ext': mimetype2ext(medium.get('type')),
                 'acodec': 'none',
@@ -2450,7 +2596,7 @@ class InfoExtractor:
     def _parse_smil_subtitles(self, smil, namespace=None, subtitles_lang='en'):
         urls = []
         subtitles = {}
-        for num, textstream in enumerate(smil.findall(self._xpath_ns('.//textstream', namespace))):
+        for textstream in smil.findall(self._xpath_ns('.//textstream', namespace)):
             src = textstream.get('src')
             if not src or src in urls:
                 continue
@@ -2523,7 +2669,11 @@ class InfoExtractor:
             self._report_ignoring_subs('DASH')
         return fmts
 
-    def _extract_mpd_formats_and_subtitles(
+    def _extract_mpd_formats_and_subtitles(self, *args, **kwargs):
+        periods = self._extract_mpd_periods(*args, **kwargs)
+        return self._merge_mpd_periods(periods)
+
+    def _extract_mpd_periods(
             self, mpd_url, video_id, mpd_id=None, note=None, errnote=None,
             fatal=True, data=None, headers={}, query={}):
 
@@ -2536,17 +2686,16 @@ class InfoExtractor:
             errnote='Failed to download MPD manifest' if errnote is None else errnote,
             fatal=fatal, data=data, headers=headers, query=query)
         if res is False:
-            return [], {}
+            return []
         mpd_doc, urlh = res
         if mpd_doc is None:
-            return [], {}
+            return []
 
         # We could have been redirected to a new url when we retrieved our mpd file.
         mpd_url = urlh.url
         mpd_base_url = base_url(mpd_url)
 
-        return self._parse_mpd_formats_and_subtitles(
-            mpd_doc, mpd_id, mpd_base_url, mpd_url)
+        return self._parse_mpd_periods(mpd_doc, mpd_id, mpd_base_url, mpd_url)
 
     def _parse_mpd_formats(self, *args, **kwargs):
         fmts, subs = self._parse_mpd_formats_and_subtitles(*args, **kwargs)
@@ -2554,8 +2703,39 @@ class InfoExtractor:
             self._report_ignoring_subs('DASH')
         return fmts
 
-    def _parse_mpd_formats_and_subtitles(
-            self, mpd_doc, mpd_id=None, mpd_base_url='', mpd_url=None):
+    def _parse_mpd_formats_and_subtitles(self, *args, **kwargs):
+        periods = self._parse_mpd_periods(*args, **kwargs)
+        return self._merge_mpd_periods(periods)
+
+    def _merge_mpd_periods(self, periods):
+        """
+        Combine all formats and subtitles from an MPD manifest into a single list,
+        by concatenate streams with similar formats.
+        """
+        formats, subtitles = {}, {}
+        for period in periods:
+            for f in period['formats']:
+                assert 'is_dash_periods' not in f, 'format already processed'
+                f['is_dash_periods'] = True
+                format_key = tuple(v for k, v in f.items() if k not in (
+                    ('format_id', 'fragments', 'manifest_stream_number')))
+                if format_key not in formats:
+                    formats[format_key] = f
+                elif 'fragments' in f:
+                    formats[format_key].setdefault('fragments', []).extend(f['fragments'])
+
+            if subtitles and period['subtitles']:
+                self.report_warning(bug_reports_message(
+                    'Found subtitles in multiple periods in the DASH manifest; '
+                    'if part of the subtitles are missing,',
+                ), only_once=True)
+
+            for sub_lang, sub_info in period['subtitles'].items():
+                subtitles.setdefault(sub_lang, []).extend(sub_info)
+
+        return list(formats.values()), subtitles
+
+    def _parse_mpd_periods(self, mpd_doc, mpd_id=None, mpd_base_url='', mpd_url=None):
         """
         Parse formats from MPD manifest.
         References:
@@ -2634,9 +2814,13 @@ class InfoExtractor:
             return ms_info
 
         mpd_duration = parse_duration(mpd_doc.get('mediaPresentationDuration'))
-        formats, subtitles = [], {}
         stream_numbers = collections.defaultdict(int)
-        for period in mpd_doc.findall(_add_ns('Period')):
+        for period_idx, period in enumerate(mpd_doc.findall(_add_ns('Period'))):
+            period_entry = {
+                'id': period.get('id', f'period-{period_idx}'),
+                'formats': [],
+                'subtitles': collections.defaultdict(list),
+            }
             period_duration = parse_duration(period.get('duration')) or mpd_duration
             period_ms_info = extract_multisegment_info(period, {
                 'start_number': 1,
@@ -2669,7 +2853,7 @@ class InfoExtractor:
                         elif mimetype2ext(mime_type) in ('tt', 'dfxp', 'ttml', 'xml', 'json'):
                             content_type = 'text'
                         else:
-                            self.report_warning('Unknown MIME type %s in DASH manifest' % mime_type)
+                            self.report_warning(f'Unknown MIME type {mime_type} in DASH manifest')
                             continue
 
                     base_url = ''
@@ -2677,11 +2861,11 @@ class InfoExtractor:
                         base_url_e = element.find(_add_ns('BaseURL'))
                         if try_call(lambda: base_url_e.text) is not None:
                             base_url = base_url_e.text + base_url
-                            if re.match(r'^https?://', base_url):
+                            if re.match(r'https?://', base_url):
                                 break
                     if mpd_base_url and base_url.startswith('/'):
                         base_url = urllib.parse.urljoin(mpd_base_url, base_url)
-                    elif mpd_base_url and not re.match(r'^https?://', base_url):
+                    elif mpd_base_url and not re.match(r'https?://', base_url):
                         if not mpd_base_url.endswith('/'):
                             mpd_base_url += '/'
                         base_url = mpd_base_url + base_url
@@ -2707,10 +2891,10 @@ class InfoExtractor:
                             'asr': int_or_none(representation_attrib.get('audioSamplingRate')),
                             'fps': int_or_none(representation_attrib.get('frameRate')),
                             'language': lang if lang not in ('mul', 'und', 'zxx', 'mis') else None,
-                            'format_note': 'DASH %s' % content_type,
+                            'format_note': f'DASH {content_type}',
                             'filesize': filesize,
                             'container': mimetype2ext(mime_type) + '_dash',
-                            **codecs
+                            **codecs,
                         }
                     elif content_type == 'text':
                         f = {
@@ -2751,8 +2935,8 @@ class InfoExtractor:
                                 t += c
                         # Next, $...$ templates are translated to their
                         # %(...) counterparts to be used with % operator
-                        t = re.sub(r'\$(%s)\$' % '|'.join(identifiers), r'%(\1)d', t)
-                        t = re.sub(r'\$(%s)%%([^$]+)\$' % '|'.join(identifiers), r'%(\1)\2', t)
+                        t = re.sub(r'\$({})\$'.format('|'.join(identifiers)), r'%(\1)d', t)
+                        t = re.sub(r'\$({})%([^$]+)\$'.format('|'.join(identifiers)), r'%(\1)\2', t)
                         t.replace('$$', '$')
                         return t
 
@@ -2771,7 +2955,7 @@ class InfoExtractor:
                         }
 
                     def location_key(location):
-                        return 'url' if re.match(r'^https?://', location) else 'path'
+                        return 'url' if re.match(r'https?://', location) else 'path'
 
                     if 'segment_urls' not in representation_ms_info and 'media' in representation_ms_info:
 
@@ -2784,8 +2968,7 @@ class InfoExtractor:
                             segment_duration = None
                             if 'total_number' not in representation_ms_info and 'segment_duration' in representation_ms_info:
                                 segment_duration = float_or_none(representation_ms_info['segment_duration'], representation_ms_info['timescale'])
-                                representation_ms_info['total_number'] = int(math.ceil(
-                                    float_or_none(period_duration, segment_duration, default=0)))
+                                representation_ms_info['total_number'] = math.ceil(float_or_none(period_duration, segment_duration, default=0))
                             representation_ms_info['fragments'] = [{
                                 media_location_key: media_template % {
                                     'Number': segment_number,
@@ -2815,12 +2998,12 @@ class InfoExtractor:
                                     'duration': float_or_none(segment_d, representation_ms_info['timescale']),
                                 })
 
-                            for num, s in enumerate(representation_ms_info['s']):
+                            for s in representation_ms_info['s']:
                                 segment_time = s.get('t') or segment_time
                                 segment_d = s['d']
                                 add_segment_url()
                                 segment_number += 1
-                                for r in range(s.get('r', 0)):
+                                for _ in range(s.get('r', 0)):
                                     segment_time += segment_d
                                     add_segment_url()
                                     segment_number += 1
@@ -2834,7 +3017,7 @@ class InfoExtractor:
                         timescale = representation_ms_info['timescale']
                         for s in representation_ms_info['s']:
                             duration = float_or_none(s['d'], timescale)
-                            for r in range(s.get('r', 0) + 1):
+                            for _ in range(s.get('r', 0) + 1):
                                 segment_uri = representation_ms_info['segment_urls'][segment_index]
                                 fragments.append({
                                     location_key(segment_uri): segment_uri,
@@ -2886,11 +3069,10 @@ class InfoExtractor:
                     if content_type in ('video', 'audio', 'image/jpeg'):
                         f['manifest_stream_number'] = stream_numbers[f['url']]
                         stream_numbers[f['url']] += 1
-                        formats.append(f)
+                        period_entry['formats'].append(f)
                     elif content_type == 'text':
-                        subtitles.setdefault(lang or 'und', []).append(f)
-
-        return formats, subtitles
+                        period_entry['subtitles'][lang or 'und'].append(f)
+            yield period_entry
 
     def _extract_ism_formats(self, *args, **kwargs):
         fmts, subs = self._extract_ism_formats_and_subtitles(*args, **kwargs)
@@ -2937,13 +3119,17 @@ class InfoExtractor:
             url_pattern = stream.attrib['Url']
             stream_timescale = int_or_none(stream.get('TimeScale')) or timescale
             stream_name = stream.get('Name')
-            stream_language = stream.get('Language', 'und')
+            # IsmFD expects ISO 639 Set 2 language codes (3-character length)
+            # See: https://github.com/yt-dlp/yt-dlp/issues/11356
+            stream_language = stream.get('Language') or 'und'
+            if len(stream_language) != 3:
+                stream_language = ISO639Utils.short2long(stream_language) or 'und'
             for track in stream.findall('QualityLevel'):
                 KNOWN_TAGS = {'255': 'AACL', '65534': 'EC-3'}
                 fourcc = track.get('FourCC') or KNOWN_TAGS.get(track.get('AudioTag'))
                 # TODO: add support for WVC1 and WMAP
                 if fourcc not in ('H264', 'AVC1', 'AACL', 'TTML', 'EC-3'):
-                    self.report_warning('%s is not a supported codec' % fourcc)
+                    self.report_warning(f'{fourcc} is not a supported codec')
                     continue
                 tbr = int(track.attrib['Bitrate']) // 1000
                 # [1] does not mention Width and Height attributes. However,
@@ -2992,7 +3178,7 @@ class InfoExtractor:
                             'fourcc': fourcc,
                             'language': stream_language,
                             'codec_private_data': track.get('CodecPrivateData'),
-                        }
+                        },
                     })
                 elif stream_type in ('video', 'audio'):
                     formats.append({
@@ -3028,7 +3214,7 @@ class InfoExtractor:
                     })
         return formats, subtitles
 
-    def _parse_html5_media_entries(self, base_url, webpage, video_id, m3u8_id=None, m3u8_entry_protocol='m3u8_native', mpd_id=None, preference=None, quality=None):
+    def _parse_html5_media_entries(self, base_url, webpage, video_id, m3u8_id=None, m3u8_entry_protocol='m3u8_native', mpd_id=None, preference=None, quality=None, _headers=None):
         def absolute_url(item_url):
             return urljoin(base_url, item_url)
 
@@ -3052,11 +3238,11 @@ class InfoExtractor:
                 formats = self._extract_m3u8_formats(
                     full_url, video_id, ext='mp4',
                     entry_protocol=m3u8_entry_protocol, m3u8_id=m3u8_id,
-                    preference=preference, quality=quality, fatal=False)
+                    preference=preference, quality=quality, fatal=False, headers=_headers)
             elif ext == 'mpd':
                 is_plain_url = False
                 formats = self._extract_mpd_formats(
-                    full_url, video_id, mpd_id=mpd_id, fatal=False)
+                    full_url, video_id, mpd_id=mpd_id, fatal=False, headers=_headers)
             else:
                 is_plain_url = True
                 formats = [{
@@ -3074,13 +3260,13 @@ class InfoExtractor:
         _MEDIA_TAG_NAME_RE = r'(?:(?:amp|dl8(?:-live)?)-)?(video|audio)'
         media_tags = [(media_tag, media_tag_name, media_type, '')
                       for media_tag, media_tag_name, media_type
-                      in re.findall(r'(?s)(<(%s)[^>]*/>)' % _MEDIA_TAG_NAME_RE, webpage)]
+                      in re.findall(rf'(?s)(<({_MEDIA_TAG_NAME_RE})[^>]*/>)', webpage)]
         media_tags.extend(re.findall(
             # We only allow video|audio followed by a whitespace or '>'.
             # Allowing more characters may end up in significant slow down (see
             # https://github.com/ytdl-org/youtube-dl/issues/11979,
             # e.g. http://www.porntrex.com/maps/videositemap.xml).
-            r'(?s)(<(?P<tag>%s)(?:\s+[^>]*)?>)(.*?)</(?P=tag)>' % _MEDIA_TAG_NAME_RE, webpage))
+            rf'(?s)(<(?P<tag>{_MEDIA_TAG_NAME_RE})(?:\s+[^>]*)?>)(.*?)</(?P=tag)>', webpage))
         for media_tag, _, media_type, media_content in media_tags:
             media_info = {
                 'formats': [],
@@ -3150,6 +3336,8 @@ class InfoExtractor:
                         })
             for f in media_info['formats']:
                 f.setdefault('http_headers', {})['Referer'] = base_url
+                if _headers:
+                    f['http_headers'].update(_headers)
             if media_info['formats'] or media_info['subtitles']:
                 entries.append(media_info)
         return entries
@@ -3224,13 +3412,13 @@ class InfoExtractor:
         mobj = re.search(
             r'(?:(?:http|rtmp|rtsp)(?P<s>s)?:)?(?P<url>//[^?]+)', url)
         url_base = mobj.group('url')
-        http_base_url = '%s%s:%s' % ('http', mobj.group('s') or '', url_base)
+        http_base_url = '{}{}:{}'.format('http', mobj.group('s') or '', url_base)
         formats = []
 
         def manifest_url(manifest):
             m_url = f'{http_base_url}/{manifest}'
             if query:
-                m_url += '?%s' % query
+                m_url += f'?{query}'
             return m_url
 
         if 'm3u8' not in skip_protocols:
@@ -3252,7 +3440,7 @@ class InfoExtractor:
                     video_id, fatal=False)
                 for rtmp_format in rtmp_formats:
                     rtsp_format = rtmp_format.copy()
-                    rtsp_format['url'] = '%s/%s' % (rtmp_format['url'], rtmp_format['play_path'])
+                    rtsp_format['url'] = '{}/{}'.format(rtmp_format['url'], rtmp_format['play_path'])
                     del rtsp_format['play_path']
                     del rtsp_format['ext']
                     rtsp_format.update({
@@ -3272,23 +3460,16 @@ class InfoExtractor:
         return formats
 
     def _find_jwplayer_data(self, webpage, video_id=None, transform_source=js_to_json):
-        mobj = re.search(
-            r'''(?s)jwplayer\s*\(\s*(?P<q>'|")(?!(?P=q)).+(?P=q)\s*\)(?!</script>).*?\.\s*setup\s*\(\s*(?P<options>(?:\([^)]*\)|[^)])+)\s*\)''',
-            webpage)
-        if mobj:
-            try:
-                jwplayer_data = self._parse_json(mobj.group('options'),
-                                                 video_id=video_id,
-                                                 transform_source=transform_source)
-            except ExtractorError:
-                pass
-            else:
-                if isinstance(jwplayer_data, dict):
-                    return jwplayer_data
+        return self._search_json(
+            r'''(?<!-)\bjwplayer\s*\(\s*(?P<q>'|")(?!(?P=q)).+(?P=q)\s*\)(?:(?!</script>).)*?\.\s*(?:setup\s*\(|(?P<load>load)\s*\(\s*\[)''',
+            webpage, 'JWPlayer data', video_id,
+            # must be a {...} or sequence, ending
+            contains_pattern=r'\{(?s:.*)}(?(load)(?:\s*,\s*\{(?s:.*)})*)', end_pattern=r'(?(load)\]|\))',
+            transform_source=transform_source, default=None)
 
-    def _extract_jwplayer_data(self, webpage, video_id, *args, **kwargs):
+    def _extract_jwplayer_data(self, webpage, video_id, *args, transform_source=js_to_json, **kwargs):
         jwplayer_data = self._find_jwplayer_data(
-            webpage, video_id, transform_source=js_to_json)
+            webpage, video_id, transform_source=transform_source)
         return self._parse_jwplayer_data(
             jwplayer_data, video_id, *args, **kwargs)
 
@@ -3320,22 +3501,14 @@ class InfoExtractor:
                 mpd_id=mpd_id, rtmp_params=rtmp_params, base_url=base_url)
 
             subtitles = {}
-            tracks = video_data.get('tracks')
-            if tracks and isinstance(tracks, list):
-                for track in tracks:
-                    if not isinstance(track, dict):
-                        continue
-                    track_kind = track.get('kind')
-                    if not track_kind or not isinstance(track_kind, str):
-                        continue
-                    if track_kind.lower() not in ('captions', 'subtitles'):
-                        continue
-                    track_url = urljoin(base_url, track.get('file'))
-                    if not track_url:
-                        continue
-                    subtitles.setdefault(track.get('label') or 'en', []).append({
-                        'url': self._proto_relative_url(track_url)
-                    })
+            for track in traverse_obj(video_data, (
+                    'tracks', lambda _, v: v['kind'].lower() in ('captions', 'subtitles'))):
+                track_url = urljoin(base_url, track.get('file'))
+                if not track_url:
+                    continue
+                subtitles.setdefault(track.get('label') or 'en', []).append({
+                    'url': self._proto_relative_url(track_url),
+                })
 
             entry = {
                 'id': this_video_id,
@@ -3380,7 +3553,7 @@ class InfoExtractor:
                 continue
             urls.add(source_url)
             source_type = source.get('type') or ''
-            ext = mimetype2ext(source_type) or determine_ext(source_url)
+            ext = determine_ext(source_url, default_ext=mimetype2ext(source_type))
             if source_type == 'hls' or ext == 'm3u8' or 'format=m3u8-aapl' in source_url:
                 formats.extend(self._extract_m3u8_formats(
                     source_url, video_id, 'mp4', entry_protocol='m3u8_native',
@@ -3413,14 +3586,14 @@ class InfoExtractor:
                     'tbr': int_or_none(source.get('bitrate'), scale=1000),
                     'filesize': int_or_none(source.get('filesize')),
                     'ext': ext,
-                    'format_id': format_id
+                    'format_id': format_id,
                 }
                 if source_url.startswith('rtmp'):
                     a_format['ext'] = 'flv'
                     # See com/longtailvideo/jwplayer/media/RTMPMediaProvider.as
                     # of jwplayer.flash.swf
                     rtmp_url_parts = re.split(
-                        r'((?:mp4|mp3|flv):)', source_url, 1)
+                        r'((?:mp4|mp3|flv):)', source_url, maxsplit=1)
                     if len(rtmp_url_parts) == 3:
                         rtmp_url, prefix, play_path = rtmp_url_parts
                         a_format.update({
@@ -3487,7 +3660,7 @@ class InfoExtractor:
                 continue
             cookies = cookies.encode('iso-8859-1').decode('utf-8')
             cookie_value = re.search(
-                r'%s=(.+?);.*?\b[Dd]omain=(.+?)(?:[,;]|$)' % cookie, cookies)
+                rf'{cookie}=(.+?);.*?\b[Dd]omain=(.+?)(?:[,;]|$)', cookies)
             if cookie_value:
                 value, domain = cookie_value.groups()
                 self._set_cookie(domain, cookie, value)
@@ -3571,7 +3744,7 @@ class InfoExtractor:
             desc += ' (**Currently broken**)' if markdown else ' (Currently broken)'
 
         # Escape emojis. Ref: https://github.com/github/markup/issues/1153
-        name = (' - **%s**' % re.sub(r':(\w+:)', ':\u200B\\g<1>', cls.IE_NAME)) if markdown else cls.IE_NAME
+        name = (' - **{}**'.format(re.sub(r':(\w+:)', ':\u200B\\g<1>', cls.IE_NAME))) if markdown else cls.IE_NAME
         return f'{name}:{desc}' if desc else name
 
     def extract_subtitles(self, *args, **kwargs):
@@ -3611,7 +3784,7 @@ class InfoExtractor:
             self.to_screen(f'Extracted {comment_count} comments')
             return {
                 'comments': comments,
-                'comment_count': None if interrupted else comment_count
+                'comment_count': None if interrupted else comment_count,
             }
         return extractor
 
@@ -3632,7 +3805,7 @@ class InfoExtractor:
         """ Merge subtitle dictionaries, language by language. """
         if target is None:
             target = {}
-        for d in dicts:
+        for d in filter(None, dicts):
             for lang, subs in d.items():
                 target[lang] = cls._merge_subtitle_items(target.get(lang, []), subs)
         return target
@@ -3654,7 +3827,7 @@ class InfoExtractor:
     def mark_watched(self, *args, **kwargs):
         if not self.get_param('mark_watched', False):
             return
-        if self.supports_login() and self._get_login_info()[0] is not None or self._cookies_passed:
+        if (self.supports_login() and self._get_login_info()[0] is not None) or self._cookies_passed:
             self._mark_watched(*args, **kwargs)
 
     def _mark_watched(self, *args, **kwargs):
@@ -3715,9 +3888,9 @@ class InfoExtractor:
 
     @staticmethod
     def _availability(is_private=None, needs_premium=None, needs_subscription=None, needs_auth=None, is_unlisted=None):
-        all_known = all(map(
-            lambda x: x is not None,
-            (is_private, needs_premium, needs_subscription, needs_auth, is_unlisted)))
+        all_known = all(
+            x is not None for x in
+            (is_private, needs_premium, needs_subscription, needs_auth, is_unlisted))
         return (
             'private' if is_private
             else 'premium_only' if needs_premium
@@ -3814,14 +3987,18 @@ class InfoExtractor:
     def __init_subclass__(cls, *, plugin_name=None, **kwargs):
         if plugin_name:
             mro = inspect.getmro(cls)
-            super_class = cls.__wrapped__ = mro[mro.index(cls) + 1]
-            cls.PLUGIN_NAME, cls.ie_key = plugin_name, super_class.ie_key
-            cls.IE_NAME = f'{super_class.IE_NAME}+{plugin_name}'
+            next_mro_class = super_class = mro[mro.index(cls) + 1]
+
             while getattr(super_class, '__wrapped__', None):
                 super_class = super_class.__wrapped__
-            setattr(sys.modules[super_class.__module__], super_class.__name__, cls)
-            _PLUGIN_OVERRIDES[super_class].append(cls)
 
+            if not any(override.PLUGIN_NAME == plugin_name for override in plugin_ies_overrides.value[super_class]):
+                cls.__wrapped__ = next_mro_class
+                cls.PLUGIN_NAME, cls.ie_key = plugin_name, next_mro_class.ie_key
+                cls.IE_NAME = f'{next_mro_class.IE_NAME}+{plugin_name}'
+
+                setattr(sys.modules[super_class.__module__], super_class.__name__, cls)
+                plugin_ies_overrides.value[super_class].append(cls)
         return super().__init_subclass__(**kwargs)
 
 
@@ -3837,7 +4014,7 @@ class SearchInfoExtractor(InfoExtractor):
 
     @classproperty
     def _VALID_URL(cls):
-        return r'%s(?P<prefix>|[1-9][0-9]*|all):(?P<query>[\s\S]+)' % cls._SEARCH_KEY
+        return rf'{cls._SEARCH_KEY}(?P<prefix>|[1-9][0-9]*|all):(?P<query>[\s\S]+)'
 
     def _real_extract(self, query):
         prefix, query = self._match_valid_url(query).group('prefix', 'query')
@@ -3877,6 +4054,3 @@ class UnsupportedURLIE(InfoExtractor):
 
     def _real_extract(self, url):
         raise UnsupportedError(url)
-
-
-_PLUGIN_OVERRIDES = collections.defaultdict(list)
diff --git a/plugins/youtube_download/yt_dlp/extractor/commonmistakes.py b/plugins/youtube_download/yt_dlp/extractor/commonmistakes.py
index 1d3b61c..8ddb164 100644
--- a/plugins/youtube_download/yt_dlp/extractor/commonmistakes.py
+++ b/plugins/youtube_download/yt_dlp/extractor/commonmistakes.py
@@ -16,10 +16,10 @@ class CommonMistakesIE(InfoExtractor):
 
     def _real_extract(self, url):
         msg = (
-            'You\'ve asked yt-dlp to download the URL "%s". '
+            f'You\'ve asked yt-dlp to download the URL "{url}". '
             'That doesn\'t make any sense. '
             'Simply remove the parameter in your command or configuration.'
-        ) % url
+        )
         if not self.get_param('verbose'):
             msg += ' Add -v to the command line to see what arguments and configuration yt-dlp has'
         raise ExtractorError(msg, expected=True)
@@ -38,5 +38,21 @@ class UnicodeBOMIE(InfoExtractor):
         real_url = self._match_id(url)
         self.report_warning(
             'Your URL starts with a Byte Order Mark (BOM). '
-            'Removing the BOM and looking for "%s" ...' % real_url)
+            f'Removing the BOM and looking for "{real_url}" ...')
         return self.url_result(real_url)
+
+
+class BlobIE(InfoExtractor):
+    IE_DESC = False
+    _VALID_URL = r'blob:'
+
+    _TESTS = [{
+        'url': 'blob:https://www.youtube.com/4eb3d090-a761-46e6-8083-c32016a36e3b',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        raise ExtractorError(
+            'You\'ve asked yt-dlp to download a blob URL. '
+            'A blob URL exists only locally in your browser. '
+            'It is not possible for yt-dlp to access it.', expected=True)
diff --git a/plugins/youtube_download/yt_dlp/extractor/commonprotocols.py b/plugins/youtube_download/yt_dlp/extractor/commonprotocols.py
index 2f93e8e..7b3a5b6 100644
--- a/plugins/youtube_download/yt_dlp/extractor/commonprotocols.py
+++ b/plugins/youtube_download/yt_dlp/extractor/commonprotocols.py
@@ -63,7 +63,7 @@ class ViewSourceIE(InfoExtractor):
 
     _TEST = {
         'url': 'view-source:https://www.youtube.com/watch?v=BaW_jenozKc',
-        'only_matching': True
+        'only_matching': True,
     }
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/condenast.py b/plugins/youtube_download/yt_dlp/extractor/condenast.py
index 3170c29..0c84cfd 100644
--- a/plugins/youtube_download/yt_dlp/extractor/condenast.py
+++ b/plugins/youtube_download/yt_dlp/extractor/condenast.py
@@ -1,10 +1,7 @@
 import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_urllib_parse_urlparse,
-    compat_urlparse,
-)
 from ..utils import (
     determine_ext,
     extract_attributes,
@@ -15,6 +12,7 @@ from ..utils import (
     parse_iso8601,
     strip_or_none,
     try_get,
+    urljoin,
 )
 
 
@@ -48,20 +46,20 @@ class CondeNastIE(InfoExtractor):
         'wmagazine': 'W Magazine',
     }
 
-    _VALID_URL = r'''(?x)https?://(?:video|www|player(?:-backend)?)\.(?:%s)\.com/
+    _VALID_URL = r'''(?x)https?://(?:video|www|player(?:-backend)?)\.(?:{})\.com/
         (?:
             (?:
                 embed(?:js)?|
                 (?:script|inline)/video
-            )/(?P<id>[0-9a-f]{24})(?:/(?P<player_id>[0-9a-f]{24}))?(?:.+?\btarget=(?P<target>[^&]+))?|
+            )/(?P<id>[0-9a-f]{{24}})(?:/(?P<player_id>[0-9a-f]{{24}}))?(?:.+?\btarget=(?P<target>[^&]+))?|
             (?P<type>watch|series|video)/(?P<display_id>[^/?#]+)
-        )''' % '|'.join(_SITES.keys())
-    IE_DESC = 'Condé Nast media group: %s' % ', '.join(sorted(_SITES.values()))
+        )'''.format('|'.join(_SITES.keys()))
+    IE_DESC = 'Condé Nast media group: {}'.format(', '.join(sorted(_SITES.values())))
 
     _EMBED_REGEX = [r'''(?x)
         <(?:iframe|script)[^>]+?src=(["\'])(?P<url>
-            (?:https?:)?//player(?:-backend)?\.(?:%s)\.com/(?:embed(?:js)?|(?:script|inline)/video)/.+?
-        )\1''' % '|'.join(_SITES.keys())]
+            (?:https?:)?//player(?:-backend)?\.(?:{})\.com/(?:embed(?:js)?|(?:script|inline)/video)/.+?
+        )\1'''.format('|'.join(_SITES.keys()))]
 
     _TESTS = [{
         'url': 'http://video.wired.com/watch/3d-printed-speakers-lit-with-led',
@@ -74,7 +72,7 @@ class CondeNastIE(InfoExtractor):
             'uploader': 'wired',
             'upload_date': '20130314',
             'timestamp': 1363219200,
-        }
+        },
     }, {
         'url': 'http://video.gq.com/watch/the-closer-with-keith-olbermann-the-only-true-surprise-trump-s-an-idiot?c=series',
         'info_dict': {
@@ -97,7 +95,7 @@ class CondeNastIE(InfoExtractor):
             'uploader': 'arstechnica',
             'upload_date': '20150916',
             'timestamp': 1442434920,
-        }
+        },
     }, {
         'url': 'https://player.cnevids.com/inline/video/59138decb57ac36b83000005.js?target=js-cne-player',
         'only_matching': True,
@@ -110,13 +108,12 @@ class CondeNastIE(InfoExtractor):
         title = self._html_search_regex(
             r'(?s)<div class="cne-series-info">.*?<h1>(.+?)</h1>',
             webpage, 'series title')
-        url_object = compat_urllib_parse_urlparse(url)
-        base_url = '%s://%s' % (url_object.scheme, url_object.netloc)
+        url_object = urllib.parse.urlparse(url)
+        base_url = f'{url_object.scheme}://{url_object.netloc}'
         m_paths = re.finditer(
             r'(?s)<p class="cne-thumb-title">.*?<a href="(/watch/.+?)["\?]', webpage)
         paths = orderedSet(m.group(1) for m in m_paths)
-        build_url = lambda path: compat_urlparse.urljoin(base_url, path)
-        entries = [self.url_result(build_url(path), 'CondeNast') for path in paths]
+        entries = [self.url_result(urljoin(base_url, path), 'CondeNast') for path in paths]
         return self.playlist_result(entries, playlist_title=title)
 
     def _extract_video_params(self, webpage, display_id):
@@ -166,9 +163,9 @@ class CondeNastIE(InfoExtractor):
                 video_id, 'Downloading loader info', query=params)
         if not video_info:
             info_page = self._download_webpage(
-                'https://player.cnevids.com/inline/video/%s.js' % video_id,
+                f'https://player.cnevids.com/inline/video/{video_id}.js',
                 video_id, 'Downloading inline info', query={
-                    'target': params.get('target', 'embedplayer')
+                    'target': params.get('target', 'embedplayer'),
                 })
 
         if not video_info:
@@ -192,7 +189,7 @@ class CondeNastIE(InfoExtractor):
                 continue
             quality = fdata.get('quality')
             formats.append({
-                'format_id': ext + ('-%s' % quality if quality else ''),
+                'format_id': ext + (f'-{quality}' if quality else ''),
                 'url': src,
                 'ext': ext,
                 'quality': 1 if quality == 'high' else 0,
diff --git a/plugins/youtube_download/yt_dlp/extractor/contv.py b/plugins/youtube_download/yt_dlp/extractor/contv.py
index d69e816..63d760a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/contv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/contv.py
@@ -73,7 +73,7 @@ class CONtvIE(InfoExtractor):
         captions = m_details.get('captions') or {}
         for caption_url in captions.values():
             subtitles.setdefault('en', []).append({
-                'url': caption_url
+                'url': caption_url,
             })
 
         thumbnails = []
diff --git a/plugins/youtube_download/yt_dlp/extractor/corus.py b/plugins/youtube_download/yt_dlp/extractor/corus.py
index c03d653..4af2d18 100644
--- a/plugins/youtube_download/yt_dlp/extractor/corus.py
+++ b/plugins/youtube_download/yt_dlp/extractor/corus.py
@@ -1,7 +1,7 @@
 from .theplatform import ThePlatformFeedIE
 from ..utils import (
-    dict_get,
     ExtractorError,
+    dict_get,
     float_or_none,
     int_or_none,
 )
@@ -41,7 +41,7 @@ class CorusIE(ThePlatformFeedIE):  # XXX: Do not subclass from concrete IE
                         )
                     '''
     _TESTS = [{
-        'url': 'http://www.hgtv.ca/shows/bryan-inc/videos/movie-night-popcorn-with-bryan-870923331648/',
+        'url': 'https://www.hgtv.ca/video/bryan-inc/movie-night-popcorn-with-bryan/870923331648/',
         'info_dict': {
             'id': '870923331648',
             'ext': 'mp4',
@@ -54,6 +54,7 @@ class CorusIE(ThePlatformFeedIE):  # XXX: Do not subclass from concrete IE
             'skip_download': True,
         },
         'expected_warnings': ['Failed to parse JSON'],
+        # FIXME: yt-dlp wrongly raises for geo restriction
     }, {
         'url': 'http://www.foodnetwork.ca/shows/chopped/video/episode/chocolate-obsession/video.html?v=872683587753',
         'only_matching': True,
@@ -68,16 +69,16 @@ class CorusIE(ThePlatformFeedIE):  # XXX: Do not subclass from concrete IE
         'only_matching': True,
     }, {
         'url': 'http://www.bigbrothercanada.ca/video/1457812035894/',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.bigbrothercanada.ca/video/big-brother-canada-704/1457812035894/',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.seriesplus.com/emissions/dre-mary-mort-sur-ordonnance/videos/deux-coeurs-battant/SERP0055626330000200/',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.disneychannel.ca/shows/gabby-duran-the-unsittables/video/crybaby-duran-clip/2f557eec-0588-11ea-ae2b-e2c6776b770e/',
-        'only_matching': True
+        'only_matching': True,
     }]
     _GEO_BYPASS = False
     _SITE_MAP = {
@@ -96,7 +97,7 @@ class CorusIE(ThePlatformFeedIE):  # XXX: Do not subclass from concrete IE
         if path != 'series':
             path = 'migration/' + path
         video = self._download_json(
-            'https://globalcontent.corusappservices.com/templates/%s/playlist/' % path,
+            f'https://globalcontent.corusappservices.com/templates/{path}/playlist/',
             video_id, query={'byId': video_id},
             headers={'Accept': 'application/json'})[0]
         title = video['title']
@@ -107,7 +108,7 @@ class CorusIE(ThePlatformFeedIE):  # XXX: Do not subclass from concrete IE
             if not smil_url:
                 continue
             source_type = source.get('type')
-            note = 'Downloading%s smil file' % (' ' + source_type if source_type else '')
+            note = 'Downloading{} smil file'.format(' ' + source_type if source_type else '')
             resp = self._download_webpage(
                 smil_url, video_id, note, fatal=False,
                 headers=self.geo_verification_headers())
diff --git a/plugins/youtube_download/yt_dlp/extractor/coub.py b/plugins/youtube_download/yt_dlp/extractor/coub.py
index 9bab698..95ad665 100644
--- a/plugins/youtube_download/yt_dlp/extractor/coub.py
+++ b/plugins/youtube_download/yt_dlp/extractor/coub.py
@@ -44,11 +44,11 @@ class CoubIE(InfoExtractor):
         video_id = self._match_id(url)
 
         coub = self._download_json(
-            'http://coub.com/api/v2/coubs/%s.json' % video_id, video_id)
+            f'http://coub.com/api/v2/coubs/{video_id}.json', video_id)
 
         if coub.get('error'):
             raise ExtractorError(
-                '%s said: %s' % (self.IE_NAME, coub['error']), expected=True)
+                '{} said: {}'.format(self.IE_NAME, coub['error']), expected=True)
 
         title = coub['title']
 
@@ -80,7 +80,7 @@ class CoubIE(InfoExtractor):
                     continue
                 formats.append({
                     'url': item_url,
-                    'format_id': '%s-%s-%s' % (HTML5, kind, quality),
+                    'format_id': f'{HTML5}-{kind}-{quality}',
                     'filesize': int_or_none(item.get('size')),
                     'vcodec': 'none' if kind == 'audio' else None,
                     'acodec': 'none' if kind == 'video' else None,
@@ -100,7 +100,7 @@ class CoubIE(InfoExtractor):
         if mobile_url:
             formats.append({
                 'url': mobile_url,
-                'format_id': '%s-audio' % MOBILE,
+                'format_id': f'{MOBILE}-audio',
                 'source_preference': preference_key(MOBILE),
             })
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/cozytv.py b/plugins/youtube_download/yt_dlp/extractor/cozytv.py
index 5ef5afc..b84dd2a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/cozytv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/cozytv.py
@@ -16,17 +16,17 @@ class CozyTVIE(InfoExtractor):
             'was_live': True,
             'duration': 7981,
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }]
 
     def _real_extract(self, url):
         uploader, date = self._match_valid_url(url).groups()
-        id = f'{uploader}-{date}'
-        data_json = self._download_json(f'https://api.cozy.tv/cache/{uploader}/replay/{date}', id)
+        video_id = f'{uploader}-{date}'
+        data_json = self._download_json(f'https://api.cozy.tv/cache/{uploader}/replay/{date}', video_id)
         formats, subtitles = self._extract_m3u8_formats_and_subtitles(
-            f'https://cozycdn.foxtrotstream.xyz/replays/{uploader}/{date}/index.m3u8', id, ext='mp4')
+            f'https://cozycdn.foxtrotstream.xyz/replays/{uploader}/{date}/index.m3u8', video_id, ext='mp4')
         return {
-            'id': id,
+            'id': video_id,
             'title': data_json.get('title'),
             'uploader': data_json.get('user') or uploader,
             'upload_date': unified_strdate(data_json.get('date')),
diff --git a/plugins/youtube_download/yt_dlp/extractor/cpac.py b/plugins/youtube_download/yt_dlp/extractor/cpac.py
index 0f23f2b..08d79a2 100644
--- a/plugins/youtube_download/yt_dlp/extractor/cpac.py
+++ b/plugins/youtube_download/yt_dlp/extractor/cpac.py
@@ -1,5 +1,4 @@
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     int_or_none,
     str_or_none,
@@ -38,11 +37,11 @@ class CPACIE(InfoExtractor):
         content = self._download_json(
             'https://www.cpac.ca/api/1/services/contentModel.json?url=/site/website/episode/index.xml&crafterSite=cpacca&id=' + video_id,
             video_id)
-        video_url = try_get(content, lambda x: x['page']['details']['videoUrl'], compat_str)
+        video_url = try_get(content, lambda x: x['page']['details']['videoUrl'], str)
         formats = []
         if video_url:
             content = content['page']
-            title = str_or_none(content['details']['title_%s_t' % (url_lang, )])
+            title = str_or_none(content['details'][f'title_{url_lang}_t'])
             formats = self._extract_m3u8_formats(video_url, video_id, m3u8_id='hls', ext='mp4')
             for fmt in formats:
                 # prefer language to match URL
@@ -54,7 +53,7 @@ class CPACIE(InfoExtractor):
                 else:
                     fmt['language_preference'] = -10
 
-        category = str_or_none(content['details']['category_%s_t' % (url_lang, )])
+        category = str_or_none(content['details'][f'category_{url_lang}_t'])
 
         def is_live(v_type):
             return (v_type == 'live') if v_type is not None else None
@@ -63,10 +62,10 @@ class CPACIE(InfoExtractor):
             'id': video_id,
             'formats': formats,
             'title': title,
-            'description': str_or_none(content['details'].get('description_%s_t' % (url_lang, ))),
+            'description': str_or_none(content['details'].get(f'description_{url_lang}_t')),
             'timestamp': unified_timestamp(content['details'].get('liveDateTime')),
-            'category': [category] if category else None,
-            'thumbnail': urljoin(url, str_or_none(content['details'].get('image_%s_s' % (url_lang, )))),
+            'categories': [category] if category else None,
+            'thumbnail': urljoin(url, str_or_none(content['details'].get(f'image_{url_lang}_s'))),
             'is_live': is_live(content['details'].get('type')),
         }
 
@@ -110,27 +109,26 @@ class CPACPlaylistIE(InfoExtractor):
         url_lang = 'fr' if any(x in url for x in ('/emission?', '/rechercher?')) else 'en'
         pl_type, list_type = ('program', 'itemList') if any(x in url for x in ('/program?', '/emission?')) else ('search', 'searchResult')
         api_url = (
-            'https://www.cpac.ca/api/1/services/contentModel.json?url=/site/website/%s/index.xml&crafterSite=cpacca&%s'
-            % (pl_type, video_id, ))
+            f'https://www.cpac.ca/api/1/services/contentModel.json?url=/site/website/{pl_type}/index.xml&crafterSite=cpacca&{video_id}')
         content = self._download_json(api_url, video_id)
         entries = []
         total_pages = int_or_none(try_get(content, lambda x: x['page'][list_type]['totalPages']), default=1)
         for page in range(1, total_pages + 1):
             if page > 1:
-                api_url = update_url_query(api_url, {'page': '%d' % (page, ), })
+                api_url = update_url_query(api_url, {'page': page})
                 content = self._download_json(
                     api_url, video_id,
-                    note='Downloading continuation - %d' % (page, ),
+                    note=f'Downloading continuation - {page}',
                     fatal=False)
 
             for item in try_get(content, lambda x: x['page'][list_type]['item'], list) or []:
-                episode_url = urljoin(url, try_get(item, lambda x: x['url_%s_s' % (url_lang, )]))
+                episode_url = urljoin(url, try_get(item, lambda x: x[f'url_{url_lang}_s']))
                 if episode_url:
                     entries.append(episode_url)
 
         return self.playlist_result(
             (self.url_result(entry) for entry in entries),
             playlist_id=video_id,
-            playlist_title=try_get(content, lambda x: x['page']['program']['title_%s_t' % (url_lang, )]) or video_id.split('=')[-1],
-            playlist_description=try_get(content, lambda x: x['page']['program']['description_%s_t' % (url_lang, )]),
+            playlist_title=try_get(content, lambda x: x['page']['program'][f'title_{url_lang}_t']) or video_id.split('=')[-1],
+            playlist_description=try_get(content, lambda x: x['page']['program'][f'description_{url_lang}_t']),
         )
diff --git a/plugins/youtube_download/yt_dlp/extractor/cracked.py b/plugins/youtube_download/yt_dlp/extractor/cracked.py
index c6aabcc..f227654 100644
--- a/plugins/youtube_download/yt_dlp/extractor/cracked.py
+++ b/plugins/youtube_download/yt_dlp/extractor/cracked.py
@@ -19,7 +19,7 @@ class CrackedIE(InfoExtractor):
             'title': 'If Animal Actors Got E! True Hollywood Stories',
             'timestamp': 1404954000,
             'upload_date': '20140710',
-        }
+        },
     }, {
         # youtube embed
         'url': 'http://www.cracked.com/video_19006_4-plot-holes-you-didnt-notice-in-your-favorite-movies.html',
@@ -32,7 +32,7 @@ class CrackedIE(InfoExtractor):
             'upload_date': '20140725',
             'uploader_id': 'Cracked',
             'uploader': 'Cracked',
-        }
+        },
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/crackle.py b/plugins/youtube_download/yt_dlp/extractor/crackle.py
index 1ef90b5..c4ceba9 100644
--- a/plugins/youtube_download/yt_dlp/extractor/crackle.py
+++ b/plugins/youtube_download/yt_dlp/extractor/crackle.py
@@ -6,6 +6,7 @@ import time
 from .common import InfoExtractor
 from ..networking.exceptions import HTTPError
 from ..utils import (
+    ExtractorError,
     determine_ext,
     float_or_none,
     int_or_none,
@@ -13,7 +14,6 @@ from ..utils import (
     parse_age_limit,
     parse_duration,
     url_or_none,
-    ExtractorError
 )
 
 
@@ -45,7 +45,7 @@ class CrackleIE(InfoExtractor):
             'skip_download': True,
         },
         'expected_warnings': [
-            'Trying with a list of known countries'
+            'Trying with a list of known countries',
         ],
     }, {
         'url': 'https://www.sonycrackle.com/thanksgiving/2510064',
@@ -89,7 +89,7 @@ class CrackleIE(InfoExtractor):
         for num, country in enumerate(countries):
             if num == 1:  # start hard-coded list
                 self.report_warning('%s. Trying with a list of known countries' % (
-                    'Unable to obtain video formats from %s API' % geo_bypass_country if geo_bypass_country
+                    f'Unable to obtain video formats from {geo_bypass_country} API' if geo_bypass_country
                     else 'No country code was given using --geo-bypass-country'))
             elif num == num_countries:  # end of list
                 geo_info = self._download_json(
@@ -99,17 +99,17 @@ class CrackleIE(InfoExtractor):
                 country = geo_info.get('CountryCode')
                 if country is None:
                     continue
-                self.to_screen('%s identified country as %s' % (self.IE_NAME, country))
+                self.to_screen(f'{self.IE_NAME} identified country as {country}')
                 if country in countries:
-                    self.to_screen('Downloading from %s API was already attempted. Skipping...' % country)
+                    self.to_screen(f'Downloading from {country} API was already attempted. Skipping...')
                     continue
 
             if country is None:
                 continue
             try:
                 media = self._download_json(
-                    'https://web-api-us.crackle.com/Service.svc/details/media/%s/%s?disableProtocols=true' % (video_id, country),
-                    video_id, note='Downloading media JSON from %s API' % country,
+                    f'https://web-api-us.crackle.com/Service.svc/details/media/{video_id}/{country}?disableProtocols=true',
+                    video_id, note=f'Downloading media JSON from {country} API',
                     errnote='Unable to download media JSON')
             except ExtractorError as e:
                 # 401 means geo restriction, trying next country
@@ -120,7 +120,7 @@ class CrackleIE(InfoExtractor):
             status = media.get('status')
             if status.get('messageCode') != '0':
                 raise ExtractorError(
-                    '%s said: %s %s - %s' % (
+                    '{} said: {} {} - {}'.format(
                         self.IE_NAME, status.get('messageCodeDescription'), status.get('messageCode'), status.get('message')),
                     expected=True)
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/craftsy.py b/plugins/youtube_download/yt_dlp/extractor/craftsy.py
index 307bfb9..0d7d759 100644
--- a/plugins/youtube_download/yt_dlp/extractor/craftsy.py
+++ b/plugins/youtube_download/yt_dlp/extractor/craftsy.py
@@ -1,16 +1,17 @@
+import json
+
 from .brightcove import BrightcoveNewIE
 from .common import InfoExtractor
-
 from ..utils import (
-    dict_get,
-    get_element_by_id,
-    js_to_json,
-    traverse_obj,
+    extract_attributes,
+    get_element_html_by_class,
+    get_element_text_and_html_by_tag,
 )
+from ..utils.traversal import traverse_obj
 
 
 class CraftsyIE(InfoExtractor):
-    _VALID_URL = r'https?://www.craftsy.com/class/(?P<id>[a-z0-9_-]+)/'
+    _VALID_URL = r'https?://www\.craftsy\.com/class/(?P<id>[\w-]+)'
     _TESTS = [{
         'url': 'https://www.craftsy.com/class/the-midnight-quilt-show-season-5/',
         'info_dict': {
@@ -41,28 +42,34 @@ class CraftsyIE(InfoExtractor):
         video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
 
-        video_data = self._parse_json(self._search_regex(
-            r'class_video_player_vars\s*=\s*({.*})\s*;',
-            get_element_by_id('vidstore-classes_class-video-player-js-extra', webpage),
-            'video data'), video_id, transform_source=js_to_json)
+        video_player = get_element_html_by_class('class-video-player', webpage)
+        video_data = traverse_obj(video_player, (
+            {extract_attributes}, 'wire:snapshot', {json.loads}, 'data', {dict})) or {}
+        video_js = traverse_obj(video_player, (
+            {lambda x: get_element_text_and_html_by_tag('video-js', x)}, 1, {extract_attributes})) or {}
 
-        account_id = traverse_obj(video_data, ('video_player', 'bc_account_id'))
+        has_access = video_data.get('userHasAccess')
+        lessons = traverse_obj(video_data, ('lessons', ..., ..., lambda _, v: v['video_id']))
 
-        entries = []
-        class_preview = traverse_obj(video_data, ('video_player', 'class_preview'))
-        if class_preview:
-            v_id = class_preview.get('video_id')
-            entries.append(self.url_result(
-                f'http://players.brightcove.net/{account_id}/default_default/index.html?videoId={v_id}',
-                BrightcoveNewIE, v_id, class_preview.get('title')))
+        preview_id = video_js.get('data-video-id')
+        if preview_id and preview_id not in traverse_obj(lessons, (..., 'video_id')):
+            if not lessons and not has_access:
+                self.report_warning(
+                    'Only extracting preview. For the full class, pass cookies '
+                    f'from an account that has access. {self._login_hint()}')
+            lessons.append({'video_id': preview_id})
 
-        if dict_get(video_data, ('is_free', 'user_has_access')):
-            entries += [
-                self.url_result(
+        if not lessons and not has_access:
+            self.raise_login_required('You do not have access to this class')
+
+        account_id = video_data.get('accountId') or video_js['data-account']
+
+        def entries(lessons):
+            for lesson in lessons:
+                yield self.url_result(
                     f'http://players.brightcove.net/{account_id}/default_default/index.html?videoId={lesson["video_id"]}',
                     BrightcoveNewIE, lesson['video_id'], lesson.get('title'))
-                for lesson in video_data['lessons']]
 
         return self.playlist_result(
-            entries, video_id, video_data.get('class_title'),
+            entries(lessons), video_id, self._html_search_meta(('og:title', 'twitter:title'), webpage),
             self._html_search_meta(('og:description', 'description'), webpage, default=None))
diff --git a/plugins/youtube_download/yt_dlp/extractor/crooksandliars.py b/plugins/youtube_download/yt_dlp/extractor/crooksandliars.py
index 4de7e3d..abd3322 100644
--- a/plugins/youtube_download/yt_dlp/extractor/crooksandliars.py
+++ b/plugins/youtube_download/yt_dlp/extractor/crooksandliars.py
@@ -21,7 +21,7 @@ class CrooksAndLiarsIE(InfoExtractor):
             'upload_date': '20150405',
             'uploader': 'Heather',
             'duration': 236,
-        }
+        },
     }, {
         'url': 'http://embed.crooksandliars.com/v/MTE3MjUtMzQ2MzA',
         'only_matching': True,
@@ -31,12 +31,9 @@ class CrooksAndLiarsIE(InfoExtractor):
         video_id = self._match_id(url)
 
         webpage = self._download_webpage(
-            'http://embed.crooksandliars.com/embed/%s' % video_id, video_id)
+            f'http://embed.crooksandliars.com/embed/{video_id}', video_id)
 
-        manifest = self._parse_json(
-            self._search_regex(
-                r'var\s+manifest\s*=\s*({.+?})\n', webpage, 'manifest JSON'),
-            video_id)
+        manifest = self._search_json(r'var\s+manifest\s*=', webpage, 'manifest JSON', video_id)
 
         quality = qualities(('webm_low', 'mp4_low', 'webm_high', 'mp4_high'))
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/crowdbunker.py b/plugins/youtube_download/yt_dlp/extractor/crowdbunker.py
index d83c015..ca03234 100644
--- a/plugins/youtube_download/yt_dlp/extractor/crowdbunker.py
+++ b/plugins/youtube_download/yt_dlp/extractor/crowdbunker.py
@@ -5,7 +5,9 @@ from ..utils import (
     int_or_none,
     try_get,
     unified_strdate,
+    url_or_none,
 )
+from ..utils.traversal import traverse_obj
 
 
 class CrowdBunkerIE(InfoExtractor):
@@ -24,15 +26,16 @@ class CrowdBunkerIE(InfoExtractor):
             'uploader_id': 'UCeN_qQV829NYf0pvPJhW5dQ',
             'like_count': int,
             'upload_date': '20211218',
-            'thumbnail': 'https://scw.divulg.org/cb-medias4/images/0z4Kms8pi8I/maxres.jpg'
+            'thumbnail': 'https://scw.divulg.org/cb-medias4/images/0z4Kms8pi8I/maxres.jpg',
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }]
 
     def _real_extract(self, url):
-        id = self._match_id(url)
-        data_json = self._download_json(f'https://api.divulg.org/post/{id}/details',
-                                        id, headers={'accept': 'application/json, text/plain, */*'})
+        video_id = self._match_id(url)
+        data_json = self._download_json(
+            f'https://api.divulg.org/post/{video_id}/details', video_id,
+            headers={'accept': 'application/json, text/plain, */*'})
         video_json = data_json['video']
         formats, subtitles = [], {}
         for sub in video_json.get('captions') or []:
@@ -43,16 +46,15 @@ class CrowdBunkerIE(InfoExtractor):
                 'url': sub_url,
             })
 
-        mpd_url = try_get(video_json, lambda x: x['dashManifest']['url'])
-        if mpd_url:
-            fmts, subs = self._extract_mpd_formats_and_subtitles(mpd_url, id)
+        if mpd_url := traverse_obj(video_json, ('dashManifest', 'url', {url_or_none})):
+            fmts, subs = self._extract_mpd_formats_and_subtitles(mpd_url, video_id, mpd_id='dash', fatal=False)
             formats.extend(fmts)
-            subtitles = self._merge_subtitles(subtitles, subs)
-        m3u8_url = try_get(video_json, lambda x: x['hlsManifest']['url'])
-        if m3u8_url:
-            fmts, subs = self._extract_m3u8_formats_and_subtitles(mpd_url, id)
+            self._merge_subtitles(subs, target=subtitles)
+
+        if m3u8_url := traverse_obj(video_json, ('hlsManifest', 'url', {url_or_none})):
+            fmts, subs = self._extract_m3u8_formats_and_subtitles(m3u8_url, video_id, m3u8_id='hls', fatal=False)
             formats.extend(fmts)
-            subtitles = self._merge_subtitles(subtitles, subs)
+            self._merge_subtitles(subs, target=subtitles)
 
         thumbnails = [{
             'url': image['url'],
@@ -61,7 +63,7 @@ class CrowdBunkerIE(InfoExtractor):
         } for image in video_json.get('thumbnails') or [] if image.get('url')]
 
         return {
-            'id': id,
+            'id': video_id,
             'title': video_json.get('title'),
             'description': video_json.get('description'),
             'view_count': video_json.get('viewCount'),
@@ -87,23 +89,24 @@ class CrowdBunkerChannelIE(InfoExtractor):
         },
     }]
 
-    def _entries(self, id):
+    def _entries(self, playlist_id):
         last = None
 
         for page in itertools.count():
             channel_json = self._download_json(
-                f'https://api.divulg.org/organization/{id}/posts', id, headers={'accept': 'application/json, text/plain, */*'},
+                f'https://api.divulg.org/organization/{playlist_id}/posts', playlist_id,
+                headers={'accept': 'application/json, text/plain, */*'},
                 query={'after': last} if last else {}, note=f'Downloading Page {page}')
             for item in channel_json.get('items') or []:
                 v_id = item.get('uid')
                 if not v_id:
                     continue
                 yield self.url_result(
-                    'https://crowdbunker.com/v/%s' % v_id, ie=CrowdBunkerIE.ie_key(), video_id=v_id)
+                    f'https://crowdbunker.com/v/{v_id}', ie=CrowdBunkerIE.ie_key(), video_id=v_id)
             last = channel_json.get('last')
             if not last:
                 break
 
     def _real_extract(self, url):
-        id = self._match_id(url)
-        return self.playlist_result(self._entries(id), playlist_id=id)
+        playlist_id = self._match_id(url)
+        return self.playlist_result(self._entries(playlist_id), playlist_id=playlist_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/crtvg.py b/plugins/youtube_download/yt_dlp/extractor/crtvg.py
index 1aa8d77..6d9a778 100644
--- a/plugins/youtube_download/yt_dlp/extractor/crtvg.py
+++ b/plugins/youtube_download/yt_dlp/extractor/crtvg.py
@@ -1,20 +1,34 @@
+import re
+
 from .common import InfoExtractor
-from ..utils import remove_end
+from ..utils import make_archive_id, remove_end
 
 
 class CrtvgIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?crtvg\.es/tvg/a-carta/[^/#?]+-(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:www\.)?crtvg\.es/tvg/a-carta/(?P<id>[^/#?]+)'
     _TESTS = [{
         'url': 'https://www.crtvg.es/tvg/a-carta/os-caimans-do-tea-5839623',
         'md5': 'c0958d9ff90e4503a75544358758921d',
         'info_dict': {
-            'id': '5839623',
+            'id': 'os-caimans-do-tea-5839623',
             'title': 'Os caimáns do Tea',
             'ext': 'mp4',
             'description': 'md5:f71cfba21ae564f0a6f415b31de1f842',
             'thumbnail': r're:^https?://.*\.(?:jpg|png)',
+            '_old_archive_ids': ['crtvg 5839623'],
         },
-        'params': {'skip_download': 'm3u8'}
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        'url': 'https://www.crtvg.es/tvg/a-carta/a-parabolica-love-story',
+        'md5': '9a47b95a1749db7b7eb3214904624584',
+        'info_dict': {
+            'id': 'a-parabolica-love-story',
+            'title': 'A parabólica / Trabuco, o can mordedor / Love Story',
+            'ext': 'mp4',
+            'description': 'md5:f71cfba21ae564f0a6f415b31de1f842',
+            'thumbnail': r're:^https?://.*\.(?:jpg|png)',
+        },
+        'params': {'skip_download': 'm3u8'},
     }]
 
     def _real_extract(self, url):
@@ -24,8 +38,13 @@ class CrtvgIE(InfoExtractor):
         formats = self._extract_m3u8_formats(video_url + '/playlist.m3u8', video_id, fatal=False)
         formats.extend(self._extract_mpd_formats(video_url + '/manifest.mpd', video_id, fatal=False))
 
+        old_video_id = None
+        if mobj := re.fullmatch(r'[^/#?]+-(?P<old_id>\d{7})', video_id):
+            old_video_id = [make_archive_id(self, mobj.group('old_id'))]
+
         return {
             'id': video_id,
+            '_old_archive_ids': old_video_id,
             'formats': formats,
             'title': remove_end(self._html_search_meta(
                 ['og:title', 'twitter:title'], webpage, 'title', default=None), ' | CRTVG'),
diff --git a/plugins/youtube_download/yt_dlp/extractor/crunchyroll.py b/plugins/youtube_download/yt_dlp/extractor/crunchyroll.py
deleted file mode 100644
index ee34ace..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/crunchyroll.py
+++ /dev/null
@@ -1,650 +0,0 @@
-import base64
-
-from .common import InfoExtractor
-from ..networking.exceptions import HTTPError
-from ..utils import (
-    ExtractorError,
-    float_or_none,
-    format_field,
-    int_or_none,
-    join_nonempty,
-    parse_age_limit,
-    parse_count,
-    parse_iso8601,
-    qualities,
-    remove_start,
-    time_seconds,
-    traverse_obj,
-    url_or_none,
-    urlencode_postdata,
-)
-
-
-class CrunchyrollBaseIE(InfoExtractor):
-    _BASE_URL = 'https://www.crunchyroll.com'
-    _API_BASE = 'https://api.crunchyroll.com'
-    _NETRC_MACHINE = 'crunchyroll'
-    _AUTH_HEADERS = None
-    _API_ENDPOINT = None
-    _BASIC_AUTH = None
-    _CLIENT_ID = ('cr_web', 'noaihdevm_6iyg0a8l0q')
-    _LOCALE_LOOKUP = {
-        'ar': 'ar-SA',
-        'de': 'de-DE',
-        '': 'en-US',
-        'es': 'es-419',
-        'es-es': 'es-ES',
-        'fr': 'fr-FR',
-        'it': 'it-IT',
-        'pt-br': 'pt-BR',
-        'pt-pt': 'pt-PT',
-        'ru': 'ru-RU',
-        'hi': 'hi-IN',
-    }
-
-    @property
-    def is_logged_in(self):
-        return bool(self._get_cookies(self._BASE_URL).get('etp_rt'))
-
-    def _perform_login(self, username, password):
-        if self.is_logged_in:
-            return
-
-        upsell_response = self._download_json(
-            f'{self._API_BASE}/get_upsell_data.0.json', None, 'Getting session id',
-            query={
-                'sess_id': 1,
-                'device_id': 'whatvalueshouldbeforweb',
-                'device_type': 'com.crunchyroll.static',
-                'access_token': 'giKq5eY27ny3cqz',
-                'referer': f'{self._BASE_URL}/welcome/login'
-            })
-        if upsell_response['code'] != 'ok':
-            raise ExtractorError('Could not get session id')
-        session_id = upsell_response['data']['session_id']
-
-        login_response = self._download_json(
-            f'{self._API_BASE}/login.1.json', None, 'Logging in',
-            data=urlencode_postdata({
-                'account': username,
-                'password': password,
-                'session_id': session_id
-            }))
-        if login_response['code'] != 'ok':
-            raise ExtractorError('Login failed. Server message: %s' % login_response['message'], expected=True)
-        if not self.is_logged_in:
-            raise ExtractorError('Login succeeded but did not set etp_rt cookie')
-
-    def _update_auth(self):
-        if CrunchyrollBaseIE._AUTH_HEADERS and CrunchyrollBaseIE._AUTH_REFRESH > time_seconds():
-            return
-
-        if not CrunchyrollBaseIE._BASIC_AUTH:
-            cx_api_param = self._CLIENT_ID[self.is_logged_in]
-            self.write_debug(f'Using cxApiParam={cx_api_param}')
-            CrunchyrollBaseIE._BASIC_AUTH = 'Basic ' + base64.b64encode(f'{cx_api_param}:'.encode()).decode()
-
-        grant_type = 'etp_rt_cookie' if self.is_logged_in else 'client_id'
-        try:
-            auth_response = self._download_json(
-                f'{self._BASE_URL}/auth/v1/token', None, note=f'Authenticating with grant_type={grant_type}',
-                headers={'Authorization': CrunchyrollBaseIE._BASIC_AUTH}, data=f'grant_type={grant_type}'.encode())
-        except ExtractorError as error:
-            if isinstance(error.cause, HTTPError) and error.cause.status == 403:
-                raise ExtractorError(
-                    'Request blocked by Cloudflare; navigate to Crunchyroll in your browser, '
-                    'then pass the fresh cookies (with --cookies-from-browser or --cookies) '
-                    'and your browser\'s User-Agent (with --user-agent)', expected=True)
-            raise
-
-        CrunchyrollBaseIE._AUTH_HEADERS = {'Authorization': auth_response['token_type'] + ' ' + auth_response['access_token']}
-        CrunchyrollBaseIE._AUTH_REFRESH = time_seconds(seconds=traverse_obj(auth_response, ('expires_in', {float_or_none}), default=300) - 10)
-
-    def _locale_from_language(self, language):
-        config_locale = self._configuration_arg('metadata', ie_key=CrunchyrollBetaIE, casesense=True)
-        return config_locale[0] if config_locale else self._LOCALE_LOOKUP.get(language)
-
-    def _call_base_api(self, endpoint, internal_id, lang, note=None, query={}):
-        self._update_auth()
-
-        if not endpoint.startswith('/'):
-            endpoint = f'/{endpoint}'
-
-        query = query.copy()
-        locale = self._locale_from_language(lang)
-        if locale:
-            query['locale'] = locale
-
-        return self._download_json(
-            f'{self._BASE_URL}{endpoint}', internal_id, note or f'Calling API: {endpoint}',
-            headers=CrunchyrollBaseIE._AUTH_HEADERS, query=query)
-
-    def _call_api(self, path, internal_id, lang, note='api', query={}):
-        if not path.startswith(f'/content/v2/{self._API_ENDPOINT}/'):
-            path = f'/content/v2/{self._API_ENDPOINT}/{path}'
-
-        try:
-            result = self._call_base_api(
-                path, internal_id, lang, f'Downloading {note} JSON ({self._API_ENDPOINT})', query=query)
-        except ExtractorError as error:
-            if isinstance(error.cause, HTTPError) and error.cause.status == 404:
-                return None
-            raise
-
-        if not result:
-            raise ExtractorError(f'Unexpected response when downloading {note} JSON')
-        return result
-
-    def _extract_formats(self, stream_response, display_id=None):
-        requested_formats = self._configuration_arg('format') or ['adaptive_hls']
-        available_formats = {}
-        for stream_type, streams in traverse_obj(
-                stream_response, (('streams', ('data', 0)), {dict.items}, ...)):
-            if stream_type not in requested_formats:
-                continue
-            for stream in traverse_obj(streams, lambda _, v: v['url']):
-                hardsub_lang = stream.get('hardsub_locale') or ''
-                format_id = join_nonempty(stream_type, format_field(stream, 'hardsub_locale', 'hardsub-%s'))
-                available_formats[hardsub_lang] = (stream_type, format_id, hardsub_lang, stream['url'])
-
-        requested_hardsubs = [('' if val == 'none' else val) for val in (self._configuration_arg('hardsub') or ['none'])]
-        if '' in available_formats and 'all' not in requested_hardsubs:
-            full_format_langs = set(requested_hardsubs)
-            self.to_screen(
-                'To get all formats of a hardsub language, use '
-                '"--extractor-args crunchyrollbeta:hardsub=<language_code or all>". '
-                'See https://github.com/yt-dlp/yt-dlp#crunchyrollbeta-crunchyroll for more info',
-                only_once=True)
-        else:
-            full_format_langs = set(map(str.lower, available_formats))
-
-        audio_locale = traverse_obj(stream_response, ((None, 'meta'), 'audio_locale'), get_all=False)
-        hardsub_preference = qualities(requested_hardsubs[::-1])
-        formats = []
-        for stream_type, format_id, hardsub_lang, stream_url in available_formats.values():
-            if stream_type.endswith('hls'):
-                if hardsub_lang.lower() in full_format_langs:
-                    adaptive_formats = self._extract_m3u8_formats(
-                        stream_url, display_id, 'mp4', m3u8_id=format_id,
-                        fatal=False, note=f'Downloading {format_id} HLS manifest')
-                else:
-                    adaptive_formats = (self._m3u8_meta_format(stream_url, ext='mp4', m3u8_id=format_id),)
-            elif stream_type.endswith('dash'):
-                adaptive_formats = self._extract_mpd_formats(
-                    stream_url, display_id, mpd_id=format_id,
-                    fatal=False, note=f'Downloading {format_id} MPD manifest')
-            else:
-                self.report_warning(f'Encountered unknown stream_type: {stream_type!r}', display_id, only_once=True)
-                continue
-            for f in adaptive_formats:
-                if f.get('acodec') != 'none':
-                    f['language'] = audio_locale
-                f['quality'] = hardsub_preference(hardsub_lang.lower())
-            formats.extend(adaptive_formats)
-
-        return formats
-
-    def _extract_subtitles(self, data):
-        subtitles = {}
-
-        for locale, subtitle in traverse_obj(data, ((None, 'meta'), 'subtitles', {dict.items}, ...)):
-            subtitles[locale] = [traverse_obj(subtitle, {'url': 'url', 'ext': 'format'})]
-
-        return subtitles
-
-
-class CrunchyrollCmsBaseIE(CrunchyrollBaseIE):
-    _API_ENDPOINT = 'cms'
-    _CMS_EXPIRY = None
-
-    def _call_cms_api_signed(self, path, internal_id, lang, note='api'):
-        if not CrunchyrollCmsBaseIE._CMS_EXPIRY or CrunchyrollCmsBaseIE._CMS_EXPIRY <= time_seconds():
-            response = self._call_base_api('index/v2', None, lang, 'Retrieving signed policy')['cms_web']
-            CrunchyrollCmsBaseIE._CMS_QUERY = {
-                'Policy': response['policy'],
-                'Signature': response['signature'],
-                'Key-Pair-Id': response['key_pair_id'],
-            }
-            CrunchyrollCmsBaseIE._CMS_BUCKET = response['bucket']
-            CrunchyrollCmsBaseIE._CMS_EXPIRY = parse_iso8601(response['expires']) - 10
-
-        if not path.startswith('/cms/v2'):
-            path = f'/cms/v2{CrunchyrollCmsBaseIE._CMS_BUCKET}/{path}'
-
-        return self._call_base_api(
-            path, internal_id, lang, f'Downloading {note} JSON (signed cms)', query=CrunchyrollCmsBaseIE._CMS_QUERY)
-
-
-class CrunchyrollBetaIE(CrunchyrollCmsBaseIE):
-    IE_NAME = 'crunchyroll'
-    _VALID_URL = r'''(?x)
-        https?://(?:beta\.|www\.)?crunchyroll\.com/
-        (?:(?P<lang>\w{2}(?:-\w{2})?)/)?
-        watch/(?!concert|musicvideo)(?P<id>\w+)'''
-    _TESTS = [{
-        # Premium only
-        'url': 'https://www.crunchyroll.com/watch/GY2P1Q98Y/to-the-future',
-        'info_dict': {
-            'id': 'GY2P1Q98Y',
-            'ext': 'mp4',
-            'duration': 1380.241,
-            'timestamp': 1459632600,
-            'description': 'md5:a022fbec4fbb023d43631032c91ed64b',
-            'title': 'World Trigger Episode 73 – To the Future',
-            'upload_date': '20160402',
-            'series': 'World Trigger',
-            'series_id': 'GR757DMKY',
-            'season': 'World Trigger',
-            'season_id': 'GR9P39NJ6',
-            'season_number': 1,
-            'episode': 'To the Future',
-            'episode_number': 73,
-            'thumbnail': r're:^https://www.crunchyroll.com/imgsrv/.*\.jpeg?$',
-            'chapters': 'count:2',
-            'age_limit': 14,
-            'like_count': int,
-            'dislike_count': int,
-        },
-        'params': {'skip_download': 'm3u8', 'format': 'all[format_id~=hardsub]'},
-    }, {
-        # Premium only
-        'url': 'https://www.crunchyroll.com/watch/GYE5WKQGR',
-        'info_dict': {
-            'id': 'GYE5WKQGR',
-            'ext': 'mp4',
-            'duration': 366.459,
-            'timestamp': 1476788400,
-            'description': 'md5:74b67283ffddd75f6e224ca7dc031e76',
-            'title': 'SHELTER – Porter Robinson presents Shelter the Animation',
-            'upload_date': '20161018',
-            'series': 'SHELTER',
-            'series_id': 'GYGG09WWY',
-            'season': 'SHELTER',
-            'season_id': 'GR09MGK4R',
-            'season_number': 1,
-            'episode': 'Porter Robinson presents Shelter the Animation',
-            'episode_number': 0,
-            'thumbnail': r're:^https://www.crunchyroll.com/imgsrv/.*\.jpeg?$',
-            'age_limit': 14,
-            'like_count': int,
-            'dislike_count': int,
-        },
-        'params': {'skip_download': True},
-    }, {
-        'url': 'https://www.crunchyroll.com/watch/GJWU2VKK3/cherry-blossom-meeting-and-a-coming-blizzard',
-        'info_dict': {
-            'id': 'GJWU2VKK3',
-            'ext': 'mp4',
-            'duration': 1420.054,
-            'description': 'md5:2d1c67c0ec6ae514d9c30b0b99a625cd',
-            'title': 'The Ice Guy and His Cool Female Colleague Episode 1 – Cherry Blossom Meeting and a Coming Blizzard',
-            'series': 'The Ice Guy and His Cool Female Colleague',
-            'series_id': 'GW4HM75NP',
-            'season': 'The Ice Guy and His Cool Female Colleague',
-            'season_id': 'GY9PC21VE',
-            'season_number': 1,
-            'episode': 'Cherry Blossom Meeting and a Coming Blizzard',
-            'episode_number': 1,
-            'chapters': 'count:2',
-            'thumbnail': r're:^https://www.crunchyroll.com/imgsrv/.*\.jpeg?$',
-            'timestamp': 1672839000,
-            'upload_date': '20230104',
-            'age_limit': 14,
-            'like_count': int,
-            'dislike_count': int,
-        },
-        'params': {'skip_download': 'm3u8'},
-    }, {
-        'url': 'https://www.crunchyroll.com/watch/GM8F313NQ',
-        'info_dict': {
-            'id': 'GM8F313NQ',
-            'ext': 'mp4',
-            'title': 'Garakowa -Restore the World-',
-            'description': 'md5:8d2f8b6b9dd77d87810882e7d2ee5608',
-            'duration': 3996.104,
-            'age_limit': 13,
-            'thumbnail': r're:^https://www.crunchyroll.com/imgsrv/.*\.jpeg?$',
-        },
-        'params': {'skip_download': 'm3u8'},
-    }, {
-        'url': 'https://www.crunchyroll.com/watch/G62PEZ2E6',
-        'info_dict': {
-            'id': 'G62PEZ2E6',
-            'description': 'md5:8d2f8b6b9dd77d87810882e7d2ee5608',
-            'age_limit': 13,
-            'duration': 65.138,
-            'title': 'Garakowa -Restore the World-',
-        },
-        'playlist_mincount': 5,
-    }, {
-        'url': 'https://www.crunchyroll.com/de/watch/GY2P1Q98Y',
-        'only_matching': True,
-    }, {
-        'url': 'https://beta.crunchyroll.com/pt-br/watch/G8WUN8VKP/the-ruler-of-conspiracy',
-        'only_matching': True,
-    }]
-    # We want to support lazy playlist filtering and movie listings cannot be inside a playlist
-    _RETURN_TYPE = 'video'
-
-    def _real_extract(self, url):
-        lang, internal_id = self._match_valid_url(url).group('lang', 'id')
-
-        # We need to use unsigned API call to allow ratings query string
-        response = traverse_obj(self._call_api(
-            f'objects/{internal_id}', internal_id, lang, 'object info', {'ratings': 'true'}), ('data', 0, {dict}))
-        if not response:
-            raise ExtractorError(f'No video with id {internal_id} could be found (possibly region locked?)', expected=True)
-
-        object_type = response.get('type')
-        if object_type == 'episode':
-            result = self._transform_episode_response(response)
-
-        elif object_type == 'movie':
-            result = self._transform_movie_response(response)
-
-        elif object_type == 'movie_listing':
-            first_movie_id = traverse_obj(response, ('movie_listing_metadata', 'first_movie_id'))
-            if not self._yes_playlist(internal_id, first_movie_id):
-                return self.url_result(f'{self._BASE_URL}/{lang}watch/{first_movie_id}', CrunchyrollBetaIE, first_movie_id)
-
-            def entries():
-                movies = self._call_api(f'movie_listings/{internal_id}/movies', internal_id, lang, 'movie list')
-                for movie_response in traverse_obj(movies, ('data', ...)):
-                    yield self.url_result(
-                        f'{self._BASE_URL}/{lang}watch/{movie_response["id"]}',
-                        CrunchyrollBetaIE, **self._transform_movie_response(movie_response))
-
-            return self.playlist_result(entries(), **self._transform_movie_response(response))
-
-        else:
-            raise ExtractorError(f'Unknown object type {object_type}')
-
-        # There might be multiple audio languages for one object (`<object>_metadata.versions`),
-        # so we need to get the id from `streams_link` instead or we dont know which language to choose
-        streams_link = response.get('streams_link')
-        if not streams_link and traverse_obj(response, (f'{object_type}_metadata', 'is_premium_only')):
-            message = f'This {object_type} is for premium members only'
-            if self.is_logged_in:
-                raise ExtractorError(message, expected=True)
-            self.raise_login_required(message)
-
-        # We need go from unsigned to signed api to avoid getting soft banned
-        stream_response = self._call_cms_api_signed(remove_start(
-            streams_link, '/content/v2/cms/'), internal_id, lang, 'stream info')
-        result['formats'] = self._extract_formats(stream_response, internal_id)
-        result['subtitles'] = self._extract_subtitles(stream_response)
-
-        # if no intro chapter is available, a 403 without usable data is returned
-        intro_chapter = self._download_json(
-            f'https://static.crunchyroll.com/datalab-intro-v2/{internal_id}.json',
-            internal_id, note='Downloading chapter info', fatal=False, errnote=False)
-        if isinstance(intro_chapter, dict):
-            result['chapters'] = [{
-                'title': 'Intro',
-                'start_time': float_or_none(intro_chapter.get('startTime')),
-                'end_time': float_or_none(intro_chapter.get('endTime')),
-            }]
-
-        def calculate_count(item):
-            return parse_count(''.join((item['displayed'], item.get('unit') or '')))
-
-        result.update(traverse_obj(response, ('rating', {
-            'like_count': ('up', {calculate_count}),
-            'dislike_count': ('down', {calculate_count}),
-        })))
-
-        return result
-
-    @staticmethod
-    def _transform_episode_response(data):
-        metadata = traverse_obj(data, (('episode_metadata', None), {dict}), get_all=False) or {}
-        return {
-            'id': data['id'],
-            'title': ' \u2013 '.join((
-                ('%s%s' % (
-                    format_field(metadata, 'season_title'),
-                    format_field(metadata, 'episode', ' Episode %s'))),
-                format_field(data, 'title'))),
-            **traverse_obj(data, {
-                'episode': ('title', {str}),
-                'description': ('description', {str}, {lambda x: x.replace(r'\r\n', '\n')}),
-                'thumbnails': ('images', 'thumbnail', ..., ..., {
-                    'url': ('source', {url_or_none}),
-                    'width': ('width', {int_or_none}),
-                    'height': ('height', {int_or_none}),
-                }),
-            }),
-            **traverse_obj(metadata, {
-                'duration': ('duration_ms', {lambda x: float_or_none(x, 1000)}),
-                'timestamp': ('upload_date', {parse_iso8601}),
-                'series': ('series_title', {str}),
-                'series_id': ('series_id', {str}),
-                'season': ('season_title', {str}),
-                'season_id': ('season_id', {str}),
-                'season_number': ('season_number', ({int}, {float_or_none})),
-                'episode_number': ('sequence_number', ({int}, {float_or_none})),
-                'age_limit': ('maturity_ratings', -1, {parse_age_limit}),
-                'language': ('audio_locale', {str}),
-            }, get_all=False),
-        }
-
-    @staticmethod
-    def _transform_movie_response(data):
-        metadata = traverse_obj(data, (('movie_metadata', 'movie_listing_metadata', None), {dict}), get_all=False) or {}
-        return {
-            'id': data['id'],
-            **traverse_obj(data, {
-                'title': ('title', {str}),
-                'description': ('description', {str}, {lambda x: x.replace(r'\r\n', '\n')}),
-                'thumbnails': ('images', 'thumbnail', ..., ..., {
-                    'url': ('source', {url_or_none}),
-                    'width': ('width', {int_or_none}),
-                    'height': ('height', {int_or_none}),
-                }),
-            }),
-            **traverse_obj(metadata, {
-                'duration': ('duration_ms', {lambda x: float_or_none(x, 1000)}),
-                'age_limit': ('maturity_ratings', -1, {parse_age_limit}),
-            }),
-        }
-
-
-class CrunchyrollBetaShowIE(CrunchyrollCmsBaseIE):
-    IE_NAME = 'crunchyroll:playlist'
-    _VALID_URL = r'''(?x)
-        https?://(?:beta\.|www\.)?crunchyroll\.com/
-        (?P<lang>(?:\w{2}(?:-\w{2})?/)?)
-        series/(?P<id>\w+)'''
-    _TESTS = [{
-        'url': 'https://www.crunchyroll.com/series/GY19NQ2QR/Girl-Friend-BETA',
-        'info_dict': {
-            'id': 'GY19NQ2QR',
-            'title': 'Girl Friend BETA',
-            'description': 'md5:99c1b22ee30a74b536a8277ced8eb750',
-            # XXX: `thumbnail` does not get set from `thumbnails` in playlist
-            #  'thumbnail': r're:^https://www.crunchyroll.com/imgsrv/.*\.jpeg?$',
-            'age_limit': 14,
-        },
-        'playlist_mincount': 10,
-    }, {
-        'url': 'https://beta.crunchyroll.com/it/series/GY19NQ2QR',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        lang, internal_id = self._match_valid_url(url).group('lang', 'id')
-
-        def entries():
-            seasons_response = self._call_cms_api_signed(f'seasons?series_id={internal_id}', internal_id, lang, 'seasons')
-            for season in traverse_obj(seasons_response, ('items', ..., {dict})):
-                episodes_response = self._call_cms_api_signed(
-                    f'episodes?season_id={season["id"]}', season["id"], lang, 'episode list')
-                for episode_response in traverse_obj(episodes_response, ('items', ..., {dict})):
-                    yield self.url_result(
-                        f'{self._BASE_URL}/{lang}watch/{episode_response["id"]}',
-                        CrunchyrollBetaIE, **CrunchyrollBetaIE._transform_episode_response(episode_response))
-
-        return self.playlist_result(
-            entries(), internal_id,
-            **traverse_obj(self._call_api(f'series/{internal_id}', internal_id, lang, 'series'), ('data', 0, {
-                'title': ('title', {str}),
-                'description': ('description', {lambda x: x.replace(r'\r\n', '\n')}),
-                'age_limit': ('maturity_ratings', -1, {parse_age_limit}),
-                'thumbnails': ('images', ..., ..., ..., {
-                    'url': ('source', {url_or_none}),
-                    'width': ('width', {int_or_none}),
-                    'height': ('height', {int_or_none}),
-                })
-            })))
-
-
-class CrunchyrollMusicIE(CrunchyrollBaseIE):
-    IE_NAME = 'crunchyroll:music'
-    _VALID_URL = r'''(?x)
-        https?://(?:www\.)?crunchyroll\.com/
-        (?P<lang>(?:\w{2}(?:-\w{2})?/)?)
-        watch/(?P<type>concert|musicvideo)/(?P<id>\w+)'''
-    _TESTS = [{
-        'url': 'https://www.crunchyroll.com/de/watch/musicvideo/MV5B02C79',
-        'info_dict': {
-            'ext': 'mp4',
-            'id': 'MV5B02C79',
-            'display_id': 'egaono-hana',
-            'title': 'Egaono Hana',
-            'track': 'Egaono Hana',
-            'artist': 'Goose house',
-            'thumbnail': r're:(?i)^https://www.crunchyroll.com/imgsrv/.*\.jpeg?$',
-            'genre': ['J-Pop'],
-        },
-        'params': {'skip_download': 'm3u8'},
-    }, {
-        'url': 'https://www.crunchyroll.com/watch/musicvideo/MV88BB7F2C',
-        'info_dict': {
-            'ext': 'mp4',
-            'id': 'MV88BB7F2C',
-            'display_id': 'crossing-field',
-            'title': 'Crossing Field',
-            'track': 'Crossing Field',
-            'artist': 'LiSA',
-            'thumbnail': r're:(?i)^https://www.crunchyroll.com/imgsrv/.*\.jpeg?$',
-            'genre': ['Anime'],
-        },
-        'params': {'skip_download': 'm3u8'},
-    }, {
-        'url': 'https://www.crunchyroll.com/watch/concert/MC2E2AC135',
-        'info_dict': {
-            'ext': 'mp4',
-            'id': 'MC2E2AC135',
-            'display_id': 'live-is-smile-always-364joker-at-yokohama-arena',
-            'title': 'LiVE is Smile Always-364+JOKER- at YOKOHAMA ARENA',
-            'track': 'LiVE is Smile Always-364+JOKER- at YOKOHAMA ARENA',
-            'artist': 'LiSA',
-            'thumbnail': r're:(?i)^https://www.crunchyroll.com/imgsrv/.*\.jpeg?$',
-            'description': 'md5:747444e7e6300907b7a43f0a0503072e',
-            'genre': ['J-Pop'],
-        },
-        'params': {'skip_download': 'm3u8'},
-    }, {
-        'url': 'https://www.crunchyroll.com/de/watch/musicvideo/MV5B02C79/egaono-hana',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.crunchyroll.com/watch/concert/MC2E2AC135/live-is-smile-always-364joker-at-yokohama-arena',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.crunchyroll.com/watch/musicvideo/MV88BB7F2C/crossing-field',
-        'only_matching': True,
-    }]
-    _API_ENDPOINT = 'music'
-
-    def _real_extract(self, url):
-        lang, internal_id, object_type = self._match_valid_url(url).group('lang', 'id', 'type')
-        path, name = {
-            'concert': ('concerts', 'concert info'),
-            'musicvideo': ('music_videos', 'music video info'),
-        }[object_type]
-        response = traverse_obj(self._call_api(f'{path}/{internal_id}', internal_id, lang, name), ('data', 0, {dict}))
-        if not response:
-            raise ExtractorError(f'No video with id {internal_id} could be found (possibly region locked?)', expected=True)
-
-        streams_link = response.get('streams_link')
-        if not streams_link and response.get('isPremiumOnly'):
-            message = f'This {response.get("type") or "media"} is for premium members only'
-            if self.is_logged_in:
-                raise ExtractorError(message, expected=True)
-            self.raise_login_required(message)
-
-        result = self._transform_music_response(response)
-        stream_response = self._call_api(streams_link, internal_id, lang, 'stream info')
-        result['formats'] = self._extract_formats(stream_response, internal_id)
-
-        return result
-
-    @staticmethod
-    def _transform_music_response(data):
-        return {
-            'id': data['id'],
-            **traverse_obj(data, {
-                'display_id': 'slug',
-                'title': 'title',
-                'track': 'title',
-                'artist': ('artist', 'name'),
-                'description': ('description', {str}, {lambda x: x.replace(r'\r\n', '\n') or None}),
-                'thumbnails': ('images', ..., ..., {
-                    'url': ('source', {url_or_none}),
-                    'width': ('width', {int_or_none}),
-                    'height': ('height', {int_or_none}),
-                }),
-                'genre': ('genres', ..., 'displayValue'),
-                'age_limit': ('maturity_ratings', -1, {parse_age_limit}),
-            }),
-        }
-
-
-class CrunchyrollArtistIE(CrunchyrollBaseIE):
-    IE_NAME = 'crunchyroll:artist'
-    _VALID_URL = r'''(?x)
-        https?://(?:www\.)?crunchyroll\.com/
-        (?P<lang>(?:\w{2}(?:-\w{2})?/)?)
-        artist/(?P<id>\w{10})'''
-    _TESTS = [{
-        'url': 'https://www.crunchyroll.com/artist/MA179CB50D',
-        'info_dict': {
-            'id': 'MA179CB50D',
-            'title': 'LiSA',
-            'genre': ['J-Pop', 'Anime', 'Rock'],
-            'description': 'md5:16d87de61a55c3f7d6c454b73285938e',
-        },
-        'playlist_mincount': 83,
-    }, {
-        'url': 'https://www.crunchyroll.com/artist/MA179CB50D/lisa',
-        'only_matching': True,
-    }]
-    _API_ENDPOINT = 'music'
-
-    def _real_extract(self, url):
-        lang, internal_id = self._match_valid_url(url).group('lang', 'id')
-        response = traverse_obj(self._call_api(
-            f'artists/{internal_id}', internal_id, lang, 'artist info'), ('data', 0))
-
-        def entries():
-            for attribute, path in [('concerts', 'concert'), ('videos', 'musicvideo')]:
-                for internal_id in traverse_obj(response, (attribute, ...)):
-                    yield self.url_result(f'{self._BASE_URL}/watch/{path}/{internal_id}', CrunchyrollMusicIE, internal_id)
-
-        return self.playlist_result(entries(), **self._transform_artist_response(response))
-
-    @staticmethod
-    def _transform_artist_response(data):
-        return {
-            'id': data['id'],
-            **traverse_obj(data, {
-                'title': 'name',
-                'description': ('description', {str}, {lambda x: x.replace(r'\r\n', '\n')}),
-                'thumbnails': ('images', ..., ..., {
-                    'url': ('source', {url_or_none}),
-                    'width': ('width', {int_or_none}),
-                    'height': ('height', {int_or_none}),
-                }),
-                'genre': ('genres', ..., 'displayValue'),
-            }),
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/cspan.py b/plugins/youtube_download/yt_dlp/extractor/cspan.py
index 0075680..e940c2d 100644
--- a/plugins/youtube_download/yt_dlp/extractor/cspan.py
+++ b/plugins/youtube_download/yt_dlp/extractor/cspan.py
@@ -1,10 +1,12 @@
 import re
 
 from .common import InfoExtractor
+from .senategov import SenateISVPIE
+from .ustream import UstreamIE
 from ..compat import compat_HTMLParseError
 from ..utils import (
-    determine_ext,
     ExtractorError,
+    determine_ext,
     extract_attributes,
     find_xpath_attr,
     get_element_by_attribute,
@@ -19,8 +21,6 @@ from ..utils import (
     str_to_int,
     unescapeHTML,
 )
-from .senategov import SenateISVPIE
-from .ustream import UstreamIE
 
 
 class CSpanIE(InfoExtractor):
@@ -43,7 +43,7 @@ class CSpanIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'CSPAN - International Health Care Models',
             'description': 'md5:7a985a2d595dba00af3d9c9f0783c967',
-        }
+        },
     }, {
         'url': 'http://www.c-span.org/video/?318608-1/gm-ignition-switch-recall',
         'info_dict': {
@@ -61,7 +61,7 @@ class CSpanIE(InfoExtractor):
         },
         'params': {
             'skip_download': True,  # m3u8 downloads
-        }
+        },
     }, {
         # Ustream embedded video
         'url': 'https://www.c-span.org/video/?114917-1/armed-services',
@@ -151,7 +151,7 @@ class CSpanIE(InfoExtractor):
 
         # Obsolete
         # We first look for clipid, because clipprog always appears before
-        patterns = [r'id=\'clip(%s)\'\s*value=\'([0-9]+)\'' % t for t in ('id', 'prog')]
+        patterns = [rf'id=\'clip({t})\'\s*value=\'([0-9]+)\'' for t in ('id', 'prog')]
         results = list(filter(None, (re.search(p, webpage) for p in patterns)))
         if results:
             matches = results[0]
@@ -183,13 +183,13 @@ class CSpanIE(InfoExtractor):
             return d.get(attr, {}).get('#text')
 
         data = self._download_json(
-            'http://www.c-span.org/assets/player/ajax-player.php?os=android&html5=%s&id=%s' % (video_type, video_id),
+            f'http://www.c-span.org/assets/player/ajax-player.php?os=android&html5={video_type}&id={video_id}',
             video_id)['video']
         if data['@status'] != 'Success':
-            raise ExtractorError('%s said: %s' % (self.IE_NAME, get_text_attr(data, 'error')), expected=True)
+            raise ExtractorError('{} said: {}'.format(self.IE_NAME, get_text_attr(data, 'error')), expected=True)
 
         doc = self._download_xml(
-            'http://www.c-span.org/common/services/flashXml.php?%sid=%s' % (video_type, video_id),
+            f'http://www.c-span.org/common/services/flashXml.php?{video_type}id={video_id}',
             video_id)
 
         description = self._html_search_meta('description', webpage)
@@ -205,7 +205,7 @@ class CSpanIE(InfoExtractor):
             formats = []
             for quality in f.get('qualities', []):
                 formats.append({
-                    'format_id': '%s-%sp' % (get_text_attr(quality, 'bitrate'), get_text_attr(quality, 'height')),
+                    'format_id': '{}-{}p'.format(get_text_attr(quality, 'bitrate'), get_text_attr(quality, 'height')),
                     'url': unescapeHTML(get_text_attr(quality, 'file')),
                     'height': int_or_none(get_text_attr(quality, 'height')),
                     'tbr': int_or_none(get_text_attr(quality, 'bitrate')),
@@ -216,13 +216,13 @@ class CSpanIE(InfoExtractor):
                     continue
                 formats = self._extract_m3u8_formats(
                     path, video_id, 'mp4', entry_protocol='m3u8_native',
-                    m3u8_id='hls') if determine_ext(path) == 'm3u8' else [{'url': path, }]
+                    m3u8_id='hls') if determine_ext(path) == 'm3u8' else [{'url': path}]
             add_referer(formats)
             entries.append({
-                'id': '%s_%d' % (video_id, partnum + 1),
+                'id': f'{video_id}_{partnum + 1}',
                 'title': (
                     title if len(files) == 1 else
-                    '%s part %d' % (title, partnum + 1)),
+                    f'{title} part {partnum + 1}'),
                 'formats': formats,
                 'description': description,
                 'thumbnail': thumbnail,
@@ -230,7 +230,7 @@ class CSpanIE(InfoExtractor):
                 'subtitles': {
                     'en': [{
                         'url': capfile,
-                        'ext': determine_ext(capfile, 'dfxp')
+                        'ext': determine_ext(capfile, 'dfxp'),
                     }],
                 } if capfile else None,
             })
@@ -257,8 +257,8 @@ class CSpanCongressIE(InfoExtractor):
             'title': 'Congressional Chronicle - Members of Congress, Hearings and More',
             'description': 'md5:54c264b7a8f219937987610243305a84',
             'thumbnail': r're:https://ximage.c-spanvideo.org/.+',
-            'ext': 'mp4'
-        }
+            'ext': 'mp4',
+        },
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/ctsnews.py b/plugins/youtube_download/yt_dlp/extractor/ctsnews.py
index cec178f..b249c7b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ctsnews.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ctsnews.py
@@ -1,6 +1,6 @@
 from .common import InfoExtractor
-from ..utils import unified_timestamp
 from .youtube import YoutubeIE
+from ..utils import unified_timestamp
 
 
 class CtsNewsIE(InfoExtractor):
@@ -16,7 +16,7 @@ class CtsNewsIE(InfoExtractor):
             'description': '以色列和黎巴嫩真主黨，爆發五年最嚴重衝突，雙方砲轟交火，兩名以軍死亡，還有一名西班牙籍的聯合國維和人員也不幸罹難。大陸陝西、河南、安徽、江蘇和湖北五個省份出現大暴雪，嚴重影響陸空交通，不過九華山卻出現...',
             'timestamp': 1422528540,
             'upload_date': '20150129',
-        }
+        },
     }, {
         # News count not appear on page but still available in database
         'url': 'http://news.cts.com.tw/cts/international/201309/201309031304098.html',
@@ -29,7 +29,7 @@ class CtsNewsIE(InfoExtractor):
             'thumbnail': r're:^https?://.*\.jpg$',
             'timestamp': 1378205880,
             'upload_date': '20130903',
-        }
+        },
     }, {
         # With Youtube embedded video
         'url': 'http://news.cts.com.tw/cts/money/201501/201501291578003.html',
diff --git a/plugins/youtube_download/yt_dlp/extractor/ctv.py b/plugins/youtube_download/yt_dlp/extractor/ctv.py
index f125c1c..a41dab1 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ctv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ctv.py
@@ -41,9 +41,9 @@ class CTVIE(InfoExtractor):
       }
     }
   }
-}''' % display_id,
+}''' % display_id,  # noqa: UP031
             })['data']['resolvedPath']['lastSegment']['content']
         video_id = content['axisId']
         return self.url_result(
-            '9c9media:%s:%s' % (content['videoPlayerDestCode'], video_id),
+            '9c9media:{}:{}'.format(content['videoPlayerDestCode'], video_id),
             'NineCNineMedia', video_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/ctvnews.py b/plugins/youtube_download/yt_dlp/extractor/ctvnews.py
index ad3f0d8..6d33f85 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ctvnews.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ctvnews.py
@@ -1,14 +1,27 @@
+import json
 import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..utils import orderedSet
+from .ninecninemedia import NineCNineMediaIE
+from ..utils import extract_attributes, orderedSet
+from ..utils.traversal import find_element, traverse_obj
 
 
 class CTVNewsIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:.+?\.)?ctvnews\.ca/(?:video\?(?:clip|playlist|bin)Id=|.*?)(?P<id>[0-9.]+)'
+    _BASE_REGEX = r'https?://(?:[^.]+\.)?ctvnews\.ca/'
+    _VIDEO_ID_RE = r'(?P<id>\d{5,})'
+    _PLAYLIST_ID_RE = r'(?P<id>\d\.\d{5,})'
+    _VALID_URL = [
+        rf'{_BASE_REGEX}video/c{_VIDEO_ID_RE}',
+        rf'{_BASE_REGEX}video(?:-gallery)?/?\?clipId={_VIDEO_ID_RE}',
+        rf'{_BASE_REGEX}video/?\?(?:playlist|bin)Id={_PLAYLIST_ID_RE}',
+        rf'{_BASE_REGEX}(?!video/)[^?#]*?{_PLAYLIST_ID_RE}/?(?:$|[?#])',
+        rf'{_BASE_REGEX}(?!video/)[^?#]+\?binId={_PLAYLIST_ID_RE}',
+    ]
     _TESTS = [{
         'url': 'http://www.ctvnews.ca/video?clipId=901995',
-        'md5': '9b8624ba66351a23e0b6e1391971f9af',
+        'md5': 'b608f466c7fa24b9666c6439d766ab7e',
         'info_dict': {
             'id': '901995',
             'ext': 'flv',
@@ -16,7 +29,34 @@ class CTVNewsIE(InfoExtractor):
             'description': 'md5:958dd3b4f5bbbf0ed4d045c790d89285',
             'timestamp': 1467286284,
             'upload_date': '20160630',
-        }
+            'categories': [],
+            'season_number': 0,
+            'season': 'Season 0',
+            'tags': [],
+            'series': 'CTV News National | Archive | Stories 2',
+            'season_id': '57981',
+            'thumbnail': r're:https?://.*\.jpg$',
+            'duration': 764.631,
+        },
+    }, {
+        'url': 'https://barrie.ctvnews.ca/video/c3030933-here_s-what_s-making-news-for-nov--15?binId=1272429',
+        'md5': '8b8c2b33c5c1803e3c26bc74ff8694d5',
+        'info_dict': {
+            'id': '3030933',
+            'ext': 'flv',
+            'title': 'Here’s what’s making news for Nov. 15',
+            'description': 'Here are the top stories we’re working on for CTV News at 11 for Nov. 15',
+            'thumbnail': 'http://images2.9c9media.com/image_asset/2021_2_22_a602e68e-1514-410e-a67a-e1f7cccbacab_png_2000x1125.jpg',
+            'season_id': '58104',
+            'season_number': 0,
+            'tags': [],
+            'season': 'Season 0',
+            'categories': [],
+            'series': 'CTV News Barrie',
+            'upload_date': '20241116',
+            'duration': 42.943,
+            'timestamp': 1731722452,
+        },
     }, {
         'url': 'http://www.ctvnews.ca/video?playlistId=1.2966224',
         'info_dict':
@@ -31,6 +71,72 @@ class CTVNewsIE(InfoExtractor):
             'id': '1.2876780',
         },
         'playlist_mincount': 100,
+    }, {
+        'url': 'https://www.ctvnews.ca/it-s-been-23-years-since-toronto-called-in-the-army-after-a-major-snowstorm-1.5736957',
+        'info_dict':
+        {
+            'id': '1.5736957',
+        },
+        'playlist_mincount': 6,
+    }, {
+        'url': 'https://www.ctvnews.ca/business/respondents-to-bank-of-canada-questionnaire-largely-oppose-creating-a-digital-loonie-1.6665797',
+        'md5': '24bc4b88cdc17d8c3fc01dfc228ab72c',
+        'info_dict': {
+            'id': '2695026',
+            'ext': 'flv',
+            'season_id': '89852',
+            'series': 'From CTV News Channel',
+            'description': 'md5:796a985a23cacc7e1e2fafefd94afd0a',
+            'season': '2023',
+            'title': 'Bank of Canada asks public about digital currency',
+            'categories': [],
+            'tags': [],
+            'upload_date': '20230526',
+            'season_number': 2023,
+            'thumbnail': 'http://images2.9c9media.com/image_asset/2019_3_28_35f5afc3-10f6-4d92-b194-8b9a86f55c6a_png_1920x1080.jpg',
+            'timestamp': 1685105157,
+            'duration': 253.553,
+        },
+    }, {
+        'url': 'https://stox.ctvnews.ca/video-gallery?clipId=582589',
+        'md5': '135cc592df607d29dddc931f1b756ae2',
+        'info_dict': {
+            'id': '582589',
+            'ext': 'flv',
+            'categories': [],
+            'timestamp': 1427906183,
+            'season_number': 0,
+            'duration': 125.559,
+            'thumbnail': 'http://images2.9c9media.com/image_asset/2019_3_28_35f5afc3-10f6-4d92-b194-8b9a86f55c6a_png_1920x1080.jpg',
+            'series': 'CTV News Stox',
+            'description': 'CTV original footage of the rise and fall of the Berlin Wall.',
+            'title': 'Berlin Wall',
+            'season_id': '63817',
+            'season': 'Season 0',
+            'tags': [],
+            'upload_date': '20150401',
+        },
+    }, {
+        'url': 'https://ottawa.ctvnews.ca/features/regional-contact/regional-contact-archive?binId=1.1164587#3023759',
+        'md5': 'a14c0603557decc6531260791c23cc5e',
+        'info_dict': {
+            'id': '3023759',
+            'ext': 'flv',
+            'season_number': 2024,
+            'timestamp': 1731798000,
+            'season': '2024',
+            'episode': 'Episode 125',
+            'description': 'CTV News Ottawa at Six',
+            'duration': 2712.076,
+            'episode_number': 125,
+            'upload_date': '20241116',
+            'title': 'CTV News Ottawa at Six for Saturday, November 16, 2024',
+            'thumbnail': 'http://images2.9c9media.com/image_asset/2019_3_28_35f5afc3-10f6-4d92-b194-8b9a86f55c6a_png_1920x1080.jpg',
+            'categories': [],
+            'tags': [],
+            'series': 'CTV News Ottawa at Six',
+            'season_id': '92667',
+        },
     }, {
         'url': 'http://www.ctvnews.ca/1.810401',
         'only_matching': True,
@@ -42,29 +148,35 @@ class CTVNewsIE(InfoExtractor):
         'only_matching': True,
     }]
 
+    def _ninecninemedia_url_result(self, clip_id):
+        return self.url_result(f'9c9media:ctvnews_web:{clip_id}', NineCNineMediaIE, clip_id)
+
     def _real_extract(self, url):
         page_id = self._match_id(url)
 
-        def ninecninemedia_url_result(clip_id):
-            return {
-                '_type': 'url_transparent',
-                'id': clip_id,
-                'url': '9c9media:ctvnews_web:%s' % clip_id,
-                'ie_key': 'NineCNineMedia',
-            }
+        if mobj := re.fullmatch(self._VIDEO_ID_RE, urllib.parse.urlparse(url).fragment):
+            page_id = mobj.group('id')
 
-        if page_id.isdigit():
-            return ninecninemedia_url_result(page_id)
-        else:
-            webpage = self._download_webpage('http://www.ctvnews.ca/%s' % page_id, page_id, query={
-                'ot': 'example.AjaxPageLayout.ot',
-                'maxItemsPerPage': 1000000,
-            })
-            entries = [ninecninemedia_url_result(clip_id) for clip_id in orderedSet(
-                re.findall(r'clip\.id\s*=\s*(\d+);', webpage))]
-            if not entries:
-                webpage = self._download_webpage(url, page_id)
-                if 'getAuthStates("' in webpage:
-                    entries = [ninecninemedia_url_result(clip_id) for clip_id in
-                               self._search_regex(r'getAuthStates\("([\d+,]+)"', webpage, 'clip ids').split(',')]
-            return self.playlist_result(entries, page_id)
+        if re.fullmatch(self._VIDEO_ID_RE, page_id):
+            return self._ninecninemedia_url_result(page_id)
+
+        webpage = self._download_webpage(f'https://www.ctvnews.ca/{page_id}', page_id, query={
+            'ot': 'example.AjaxPageLayout.ot',
+            'maxItemsPerPage': 1000000,
+        })
+        entries = [self._ninecninemedia_url_result(clip_id)
+                   for clip_id in orderedSet(re.findall(r'clip\.id\s*=\s*(\d+);', webpage))]
+        if not entries:
+            webpage = self._download_webpage(url, page_id)
+            if 'getAuthStates("' in webpage:
+                entries = [self._ninecninemedia_url_result(clip_id) for clip_id in
+                           self._search_regex(r'getAuthStates\("([\d+,]+)"', webpage, 'clip ids').split(',')]
+            else:
+                entries = [
+                    self._ninecninemedia_url_result(clip_id) for clip_id in
+                    traverse_obj(webpage, (
+                        {find_element(tag='jasper-player-container', html=True)},
+                        {extract_attributes}, 'axis-ids', {json.loads}, ..., 'axisId', {str}))
+                ]
+
+        return self.playlist_result(entries, page_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/cultureunplugged.py b/plugins/youtube_download/yt_dlp/extractor/cultureunplugged.py
index 9c8509f..fa2c2c0 100644
--- a/plugins/youtube_download/yt_dlp/extractor/cultureunplugged.py
+++ b/plugins/youtube_download/yt_dlp/extractor/cultureunplugged.py
@@ -1,12 +1,9 @@
-import time
-
 from .common import InfoExtractor
-from ..networking import HEADRequest
 from ..utils import int_or_none
 
 
 class CultureUnpluggedIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?cultureunplugged\.com/documentary/watch-online/play/(?P<id>\d+)(?:/(?P<display_id>[^/]+))?'
+    _VALID_URL = r'https?://(?:www\.)?cultureunplugged\.com/(?:documentary/watch-online/)?play/(?P<id>\d+)(?:/(?P<display_id>[^/#?]+))?'
     _TESTS = [{
         'url': 'http://www.cultureunplugged.com/documentary/watch-online/play/53662/The-Next--Best-West',
         'md5': 'ac6c093b089f7d05e79934dcb3d228fc',
@@ -15,12 +12,25 @@ class CultureUnpluggedIE(InfoExtractor):
             'display_id': 'The-Next--Best-West',
             'ext': 'mp4',
             'title': 'The Next, Best West',
-            'description': 'md5:0423cd00833dea1519cf014e9d0903b1',
+            'description': 'md5:770033a3b7c2946a3bcfb7f1c6fb7045',
             'thumbnail': r're:^https?://.*\.jpg$',
-            'creator': 'Coldstream Creative',
+            'creators': ['Coldstream Creative'],
             'duration': 2203,
             'view_count': int,
-        }
+        },
+    }, {
+        'url': 'https://www.cultureunplugged.com/play/2833/Koi-Sunta-Hai--Journeys-with-Kumar---Kabir--Someone-is-Listening-',
+        'md5': 'dc2014bc470dfccba389a1c934fa29fa',
+        'info_dict': {
+            'id': '2833',
+            'display_id': 'Koi-Sunta-Hai--Journeys-with-Kumar---Kabir--Someone-is-Listening-',
+            'ext': 'mp4',
+            'title': 'Koi Sunta Hai: Journeys with Kumar & Kabir (Someone is Listening)',
+            'description': 'md5:fa94ac934927c98660362b8285b2cda5',
+            'view_count': int,
+            'thumbnail': 'https://s3.amazonaws.com/cdn.cultureunplugged.com/thumbnails_16_9/lg/2833.jpg',
+            'creators': ['Srishti'],
+        },
     }, {
         'url': 'http://www.cultureunplugged.com/documentary/watch-online/play/53662',
         'only_matching': True,
@@ -31,11 +41,8 @@ class CultureUnpluggedIE(InfoExtractor):
         video_id = mobj.group('id')
         display_id = mobj.group('display_id') or video_id
 
-        # request setClientTimezone.php to get PHPSESSID cookie which is need to get valid json data in the next request
-        self._request_webpage(HEADRequest(
-            'http://www.cultureunplugged.com/setClientTimezone.php?timeOffset=%d' % -(time.timezone / 3600)), display_id)
         movie_data = self._download_json(
-            'http://www.cultureunplugged.com/movie-data/cu-%s.json' % video_id, display_id)
+            f'http://www.cultureunplugged.com/movie-data/cu-{video_id}.json', display_id)
 
         video_url = movie_data['url']
         title = movie_data['title']
@@ -46,11 +53,11 @@ class CultureUnpluggedIE(InfoExtractor):
         view_count = int_or_none(movie_data.get('views'))
 
         thumbnails = [{
-            'url': movie_data['%s_thumb' % size],
+            'url': movie_data[f'{size}_thumb'],
             'id': size,
             'preference': preference,
         } for preference, size in enumerate((
-            'small', 'large')) if movie_data.get('%s_thumb' % size)]
+            'small', 'large')) if movie_data.get(f'{size}_thumb')]
 
         return {
             'id': video_id,
diff --git a/plugins/youtube_download/yt_dlp/extractor/curiositystream.py b/plugins/youtube_download/yt_dlp/extractor/curiositystream.py
index 941cf4e..f5a2c3c 100644
--- a/plugins/youtube_download/yt_dlp/extractor/curiositystream.py
+++ b/plugins/youtube_download/yt_dlp/extractor/curiositystream.py
@@ -2,7 +2,6 @@ import re
 import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import ExtractorError, int_or_none, urlencode_postdata
 
 
@@ -16,7 +15,7 @@ class CuriosityStreamBaseIE(InfoExtractor):
             if isinstance(error, dict):
                 error = ', '.join(error.values())
             raise ExtractorError(
-                '%s said: %s' % (self.IE_NAME, error), expected=True)
+                f'{self.IE_NAME} said: {error}', expected=True)
 
     def _call_api(self, path, video_id, query=None):
         headers = {}
@@ -59,7 +58,7 @@ class CuriosityStreamIE(CuriosityStreamBaseIE):
             'series_id': '2',
             'thumbnail': r're:https://img.curiositystream.com/.+\.jpg',
             'tags': [],
-            'duration': 158
+            'duration': 158,
         },
         'params': {
             # m3u8 download
@@ -157,10 +156,10 @@ class CuriosityStreamCollectionBaseIE(CuriosityStreamBaseIE):
         collection = self._call_api(collection_id, collection_id)
         entries = []
         for media in collection.get('media', []):
-            media_id = compat_str(media.get('id'))
+            media_id = str(media.get('id'))
             media_type, ie = ('series', CuriosityStreamSeriesIE) if media.get('is_collection') else ('video', CuriosityStreamIE)
             entries.append(self.url_result(
-                'https://curiositystream.com/%s/%s' % (media_type, media_id),
+                f'https://curiositystream.com/{media_type}/{media_id}',
                 ie=ie.ie_key(), video_id=media_id))
         return self.playlist_result(
             entries, collection_id,
diff --git a/plugins/youtube_download/yt_dlp/extractor/cwtv.py b/plugins/youtube_download/yt_dlp/extractor/cwtv.py
index 9b83264..cdb29fc 100644
--- a/plugins/youtube_download/yt_dlp/extractor/cwtv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/cwtv.py
@@ -1,23 +1,53 @@
+import re
+
 from .common import InfoExtractor
 from ..utils import (
     ExtractorError,
     int_or_none,
     parse_age_limit,
     parse_iso8601,
+    parse_qs,
     smuggle_url,
     str_or_none,
+    update_url_query,
 )
+from ..utils.traversal import traverse_obj
 
 
 class CWTVIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?cw(?:tv(?:pr)?|seed)\.com/(?:shows/)?(?:[^/]+/)+[^?]*\?.*\b(?:play|watch)=(?P<id>[a-z0-9]{8}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{12})'
+    IE_NAME = 'cwtv'
+    _VALID_URL = r'https?://(?:www\.)?cw(?:tv(?:pr)?|seed)\.com/(?:shows/)?(?:[^/]+/)+[^?]*\?.*\b(?:play|watch|guid)=(?P<id>[a-z0-9]{8}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{12})'
     _TESTS = [{
+        'url': 'https://www.cwtv.com/shows/continuum/a-stitch-in-time/?play=9149a1e1-4cb2-46d7-81b2-47d35bbd332b',
+        'info_dict': {
+            'id': '9149a1e1-4cb2-46d7-81b2-47d35bbd332b',
+            'ext': 'mp4',
+            'title': 'A Stitch in Time',
+            'description': r're:(?s)City Protective Services officer Kiera Cameron is transported from 2077.+',
+            'thumbnail': r're:https?://.+\.jpe?g',
+            'duration': 2632,
+            'timestamp': 1736928000,
+            'uploader': 'CWTV',
+            'chapters': 'count:5',
+            'series': 'Continuum',
+            'season_number': 1,
+            'episode_number': 1,
+            'age_limit': 14,
+            'upload_date': '20250115',
+            'season': 'Season 1',
+            'episode': 'Episode 1',
+        },
+        'params': {
+            # m3u8 download
+            'skip_download': True,
+        },
+    }, {
         'url': 'http://cwtv.com/shows/arrow/legends-of-yesterday/?play=6b15e985-9345-4f60-baf8-56e96be57c63',
         'info_dict': {
             'id': '6b15e985-9345-4f60-baf8-56e96be57c63',
             'ext': 'mp4',
             'title': 'Legends of Yesterday',
-            'description': 'Oliver and Barry Allen take Kendra Saunders and Carter Hall to a remote location to keep them hidden from Vandal Savage while they figure out how to defeat him.',
+            'description': r're:(?s)Oliver and Barry Allen take Kendra Saunders and Carter Hall to a remote.+',
             'duration': 2665,
             'series': 'Arrow',
             'season_number': 4,
@@ -46,6 +76,10 @@ class CWTVIE(InfoExtractor):
             'timestamp': 1444107300,
             'age_limit': 14,
             'uploader': 'CWTV',
+            'thumbnail': r're:https?://.+\.jpe?g',
+            'chapters': 'count:4',
+            'episode': 'Episode 20',
+            'season': 'Season 11',
         },
         'params': {
             # m3u8 download
@@ -60,18 +94,22 @@ class CWTVIE(InfoExtractor):
     }, {
         'url': 'http://cwtv.com/shows/arrow/legends-of-yesterday/?watch=6b15e985-9345-4f60-baf8-56e96be57c63',
         'only_matching': True,
+    }, {
+        'url': 'http://www.cwtv.com/movies/play/?guid=0a8e8b5b-1356-41d5-9a6a-4eda1a6feb6c',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
         data = self._download_json(
-            'http://images.cwtv.com/feed/mobileapp/video-meta/apiversion_8/guid_' + video_id,
-            video_id)
-        if data.get('result') != 'ok':
-            raise ExtractorError(data['msg'], expected=True)
+            f'https://images.cwtv.com/feed/app-2/video-meta/apiversion_22/device_android/guid_{video_id}', video_id)
+        if traverse_obj(data, 'result') != 'ok':
+            raise ExtractorError(traverse_obj(data, (('error_msg', 'msg'), {str}, any)), expected=True)
         video_data = data['video']
         title = video_data['title']
-        mpx_url = video_data.get('mpx_url') or 'http://link.theplatform.com/s/cwtv/media/guid/2703454149/%s?formats=M3U' % video_id
+        mpx_url = update_url_query(
+            video_data.get('mpx_url') or f'https://link.theplatform.com/s/cwtv/media/guid/2703454149/{video_id}',
+            {'formats': 'M3U+none'})
 
         season = str_or_none(video_data.get('season'))
         episode = str_or_none(video_data.get('episode'))
@@ -91,5 +129,52 @@ class CWTVIE(InfoExtractor):
             'timestamp': parse_iso8601(video_data.get('start_time')),
             'age_limit': parse_age_limit(video_data.get('rating')),
             'ie_key': 'ThePlatform',
-            'thumbnail': video_data.get('large_thumbnail')
+            'thumbnail': video_data.get('large_thumbnail'),
         }
+
+
+class CWTVMovieIE(InfoExtractor):
+    IE_NAME = 'cwtv:movie'
+    _VALID_URL = r'https?://(?:www\.)?cwtv\.com/shows/(?P<id>[\w-]+)/?\?(?:[^#]+&)?viewContext=Movies'
+    _TESTS = [{
+        'url': 'https://www.cwtv.com/shows/the-crush/?viewContext=Movies+Swimlane',
+        'info_dict': {
+            'id': '0a8e8b5b-1356-41d5-9a6a-4eda1a6feb6c',
+            'ext': 'mp4',
+            'title': 'The Crush',
+            'upload_date': '20241112',
+            'description': 'md5:1549acd90dff4a8273acd7284458363e',
+            'chapters': 'count:9',
+            'timestamp': 1731398400,
+            'age_limit': 16,
+            'duration': 5337,
+            'series': 'The Crush',
+            'season': 'Season 1',
+            'uploader': 'CWTV',
+            'season_number': 1,
+            'episode': 'Episode 1',
+            'episode_number': 1,
+            'thumbnail': r're:https?://.+\.jpe?g',
+        },
+        'params': {
+            # m3u8 download
+            'skip_download': True,
+        },
+    }]
+    _UUID_RE = r'[\da-f]{8}-(?:[\da-f]{4}-){3}[\da-f]{12}'
+
+    def _real_extract(self, url):
+        display_id = self._match_id(url)
+        webpage = self._download_webpage(url, display_id)
+        app_url = (
+            self._html_search_meta('al:ios:url', webpage, default=None)
+            or self._html_search_meta('al:android:url', webpage, default=None))
+        video_id = (
+            traverse_obj(parse_qs(app_url), ('video_id', 0, {lambda x: re.fullmatch(self._UUID_RE, x)}, 0))
+            or self._search_regex([
+                rf'CWTV\.Site\.curPlayingGUID\s*=\s*["\']({self._UUID_RE})',
+                rf'CWTV\.Site\.viewInAppURL\s*=\s*["\']/shows/[\w-]+/watch-in-app/\?play=({self._UUID_RE})',
+            ], webpage, 'video ID'))
+
+        return self.url_result(
+            f'https://www.cwtv.com/shows/{display_id}/{display_id}/?play={video_id}', CWTVIE, video_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/cybrary.py b/plugins/youtube_download/yt_dlp/extractor/cybrary.py
index 73f2439..59c8ab4 100644
--- a/plugins/youtube_download/yt_dlp/extractor/cybrary.py
+++ b/plugins/youtube_download/yt_dlp/extractor/cybrary.py
@@ -45,7 +45,7 @@ class CybraryBaseIE(InfoExtractor):
 
 
 class CybraryIE(CybraryBaseIE):
-    _VALID_URL = r'https?://app.cybrary.it/immersive/(?P<enrollment>[0-9]+)/activity/(?P<id>[0-9]+)'
+    _VALID_URL = r'https?://app\.cybrary\.it/immersive/(?P<enrollment>[0-9]+)/activity/(?P<id>[0-9]+)'
     _TESTS = [{
         'url': 'https://app.cybrary.it/immersive/12487950/activity/63102',
         'md5': '9ae12d37e555cb2ed554223a71a701d0',
@@ -61,9 +61,9 @@ class CybraryIE(CybraryBaseIE):
             'series': 'Cybrary Orientation',
             'uploader': 'Cybrary',
             'chapter': 'Cybrary Orientation Series',
-            'chapter_id': '63110'
+            'chapter_id': '63110',
         },
-        'expected_warnings': ['No authenticators for vimeo']
+        'expected_warnings': ['No authenticators for vimeo'],
     }, {
         'url': 'https://app.cybrary.it/immersive/12747143/activity/52686',
         'md5': '62f26547dccc59c44363e2a13d4ad08d',
@@ -79,9 +79,9 @@ class CybraryIE(CybraryBaseIE):
             'series': 'AZ-500: Microsoft Azure Security Technologies',
             'uploader': 'Cybrary',
             'chapter': 'Implement Network Security',
-            'chapter_id': '52693'
+            'chapter_id': '52693',
         },
-        'expected_warnings': ['No authenticators for vimeo']
+        'expected_warnings': ['No authenticators for vimeo'],
     }]
 
     def _real_extract(self, url):
@@ -93,7 +93,7 @@ class CybraryIE(CybraryBaseIE):
             raise ExtractorError('The activity is not a video', expected=True)
 
         module = next((m for m in course.get('learning_modules') or []
-                      if int(activity_id) in traverse_obj(m, ('activities', ..., 'id') or [])), None)
+                      if int(activity_id) in traverse_obj(m, ('activities', ..., 'id'))), None)
 
         vimeo_id = self._get_vimeo_id(activity_id)
 
@@ -105,28 +105,28 @@ class CybraryIE(CybraryBaseIE):
             'chapter': module.get('title'),
             'chapter_id': str_or_none(module.get('id')),
             'title': activity.get('title'),
-            'url': smuggle_url(f'https://player.vimeo.com/video/{vimeo_id}', {'http_headers': {'Referer': 'https://api.cybrary.it'}})
+            'url': smuggle_url(f'https://player.vimeo.com/video/{vimeo_id}', {'referer': 'https://api.cybrary.it'}),
         }
 
 
 class CybraryCourseIE(CybraryBaseIE):
-    _VALID_URL = r'https://app.cybrary.it/browse/course/(?P<id>[\w-]+)/?(?:$|[#?])'
+    _VALID_URL = r'https?://app\.cybrary\.it/browse/course/(?P<id>[\w-]+)/?(?:$|[#?])'
     _TESTS = [{
         'url': 'https://app.cybrary.it/browse/course/az-500-microsoft-azure-security-technologies',
         'info_dict': {
-            'id': 898,
+            'id': '898',
             'title': 'AZ-500: Microsoft Azure Security Technologies',
-            'description': 'md5:69549d379c0fc1dec92926d4e8b6fbd4'
+            'description': 'md5:69549d379c0fc1dec92926d4e8b6fbd4',
         },
-        'playlist_count': 59
+        'playlist_count': 59,
     }, {
         'url': 'https://app.cybrary.it/browse/course/cybrary-orientation',
         'info_dict': {
-            'id': 1245,
+            'id': '1245',
             'title': 'Cybrary Orientation',
-            'description': 'md5:9e69ff66b32fe78744e0ad4babe2e88e'
+            'description': 'md5:9e69ff66b32fe78744e0ad4babe2e88e',
         },
-        'playlist_count': 4
+        'playlist_count': 4,
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/dacast.py b/plugins/youtube_download/yt_dlp/extractor/dacast.py
index 4e81aa4..ffc7ca8 100644
--- a/plugins/youtube_download/yt_dlp/extractor/dacast.py
+++ b/plugins/youtube_download/yt_dlp/extractor/dacast.py
@@ -1,3 +1,4 @@
+import functools
 import hashlib
 import re
 import time
@@ -8,6 +9,7 @@ from ..utils import (
     ExtractorError,
     classproperty,
     float_or_none,
+    parse_qs,
     traverse_obj,
     url_or_none,
 )
@@ -51,6 +53,15 @@ class DacastVODIE(DacastBaseIE):
             'thumbnail': 'https://universe-files.dacast.com/26137208-5858-65c1-5e9a-9d6b6bd2b6c2',
         },
         'params': {'skip_download': 'm3u8'},
+    }, {  # /uspaes/ in hls_url
+        'url': 'https://iframe.dacast.com/vod/f9823fc6-faba-b98f-0d00-4a7b50a58c5b/348c5c84-b6af-4859-bb9d-1d01009c795b',
+        'info_dict': {
+            'id': '348c5c84-b6af-4859-bb9d-1d01009c795b',
+            'ext': 'mp4',
+            'title': 'pl1-edyta-rubas-211124.mp4',
+            'uploader_id': 'f9823fc6-faba-b98f-0d00-4a7b50a58c5b',
+            'thumbnail': 'https://universe-files.dacast.com/4d0bd042-a536-752d-fc34-ad2fa44bbcbb.png',
+        },
     }]
     _WEBPAGE_TESTS = [{
         'url': 'https://www.dacast.com/support/knowledgebase/how-can-i-embed-a-video-on-my-website/',
@@ -74,9 +85,22 @@ class DacastVODIE(DacastBaseIE):
         'params': {'skip_download': 'm3u8'},
     }]
 
+    @functools.cached_property
+    def _usp_signing_secret(self):
+        player_js = self._download_webpage(
+            'https://player.dacast.com/js/player.js', None, 'Downloading player JS')
+        # Rotates every so often, but hardcode a fallback in case of JS change/breakage before rotation
+        return self._search_regex(
+            r'\bUSP_SIGNING_SECRET\s*=\s*(["\'])(?P<secret>(?:(?!\1).)+)', player_js,
+            'usp signing secret', group='secret', fatal=False) or 'hGDtqMKYVeFdofrAfFmBcrsakaZELajI'
+
     def _real_extract(self, url):
         user_id, video_id = self._match_valid_url(url).group('user_id', 'id')
-        query = {'contentId': f'{user_id}-vod-{video_id}', 'provider': 'universe'}
+        query = {
+            'contentId': f'{user_id}-vod-{video_id}',
+            'provider': 'universe',
+            **traverse_obj(url, ({parse_qs}, 'uss_token', {'signedKey': -1})),
+        }
         info = self._download_json(self._API_INFO_URL, video_id, query=query, fatal=False)
         access = self._download_json(
             'https://playback.dacast.com/content/access', video_id,
@@ -94,10 +118,10 @@ class DacastVODIE(DacastBaseIE):
         if 'DRM_EXT' in hls_url:
             self.report_drm(video_id)
         elif '/uspaes/' in hls_url:
-            # From https://player.dacast.com/js/player.js
+            # Ref: https://player.dacast.com/js/player.js
             ts = int(time.time())
             signature = hashlib.sha1(
-                f'{10413792000 - ts}{ts}YfaKtquEEpDeusCKbvYszIEZnWmBcSvw').digest().hex()
+                f'{10413792000 - ts}{ts}{self._usp_signing_secret}'.encode()).digest().hex()
             hls_aes['uri'] = f'https://keys.dacast.com/uspaes/{video_id}.key?s={signature}&ts={ts}'
 
         for retry in self.RetryManager():
diff --git a/plugins/youtube_download/yt_dlp/extractor/daftsex.py b/plugins/youtube_download/yt_dlp/extractor/daftsex.py
deleted file mode 100644
index 92510c7..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/daftsex.py
+++ /dev/null
@@ -1,150 +0,0 @@
-from .common import InfoExtractor
-from ..compat import compat_b64decode
-from ..utils import (
-    ExtractorError,
-    int_or_none,
-    js_to_json,
-    parse_count,
-    parse_duration,
-    traverse_obj,
-    try_get,
-    unified_timestamp,
-)
-
-
-class DaftsexIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?daft\.sex/watch/(?P<id>-?\d+_\d+)'
-    _TESTS = [{
-        'url': 'https://daft.sex/watch/-35370899_456246186',
-        'md5': '64c04ef7b4c7b04b308f3b0c78efe7cd',
-        'info_dict': {
-            'id': '-35370899_456246186',
-            'ext': 'mp4',
-            'title': 'just relaxing',
-            'description': 'just relaxing – Watch video Watch video in high quality',
-            'upload_date': '20201113',
-            'timestamp': 1605261911,
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'age_limit': 18,
-            'duration': 15.0,
-            'view_count': int
-        },
-    }, {
-        'url': 'https://daft.sex/watch/-156601359_456242791',
-        'info_dict': {
-            'id': '-156601359_456242791',
-            'ext': 'mp4',
-            'title': 'Skye Blue - Dinner And A Show',
-            'description': 'Skye Blue - Dinner And A Show - Watch video Watch video in high quality',
-            'upload_date': '20200916',
-            'timestamp': 1600250735,
-            'thumbnail': 'https://psv153-1.crazycloud.ru/videos/-156601359/456242791/thumb.jpg?extra=i3D32KaBbBFf9TqDRMAVmQ',
-        },
-        'skip': 'deleted / private'
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-        title = self._html_search_meta('name', webpage, 'title')
-        timestamp = unified_timestamp(self._html_search_meta('uploadDate', webpage, 'Upload Date', default=None))
-        description = self._html_search_meta('description', webpage, 'Description', default=None)
-
-        duration = parse_duration(self._search_regex(
-            r'Duration: ((?:[0-9]{2}:){0,2}[0-9]{2})',
-            webpage, 'duration', fatal=False))
-        views = parse_count(self._search_regex(
-            r'Views: ([0-9 ]+)',
-            webpage, 'views', fatal=False))
-
-        player_hash = self._search_regex(
-            r'DaxabPlayer\.Init\({[\s\S]*hash:\s*"([0-9a-zA-Z_\-]+)"[\s\S]*}',
-            webpage, 'player hash')
-        player_color = self._search_regex(
-            r'DaxabPlayer\.Init\({[\s\S]*color:\s*"([0-9a-z]+)"[\s\S]*}',
-            webpage, 'player color', fatal=False) or ''
-
-        embed_page = self._download_webpage(
-            'https://dxb.to/player/%s?color=%s' % (player_hash, player_color),
-            video_id, headers={'Referer': url})
-        video_params = self._parse_json(
-            self._search_regex(
-                r'window\.globParams\s*=\s*({[\S\s]+})\s*;\s*<\/script>',
-                embed_page, 'video parameters'),
-            video_id, transform_source=js_to_json)
-
-        server_domain = 'https://%s' % compat_b64decode(video_params['server'][::-1]).decode('utf-8')
-
-        cdn_files = traverse_obj(video_params, ('video', 'cdn_files')) or {}
-        if cdn_files:
-            formats = []
-            for format_id, format_data in cdn_files.items():
-                ext, height = format_id.split('_')
-                formats.append({
-                    'format_id': format_id,
-                    'url': f'{server_domain}/videos/{video_id.replace("_", "/")}/{height}.mp4?extra={format_data.split(".")[-1]}',
-                    'height': int_or_none(height),
-                    'ext': ext,
-                })
-
-            return {
-                'id': video_id,
-                'title': title,
-                'formats': formats,
-                'description': description,
-                'duration': duration,
-                'thumbnail': try_get(video_params, lambda vi: 'https:' + compat_b64decode(vi['video']['thumb']).decode('utf-8')),
-                'timestamp': timestamp,
-                'view_count': views,
-                'age_limit': 18,
-            }
-
-        items = self._download_json(
-            f'{server_domain}/method/video.get/{video_id}', video_id,
-            headers={'Referer': url}, query={
-                'token': video_params['video']['access_token'],
-                'videos': video_id,
-                'ckey': video_params['c_key'],
-                'credentials': video_params['video']['credentials'],
-            })['response']['items']
-
-        if not items:
-            raise ExtractorError('Video is not available', video_id=video_id, expected=True)
-
-        item = items[0]
-        formats = []
-        for f_id, f_url in item.get('files', {}).items():
-            if f_id == 'external':
-                return self.url_result(f_url)
-            ext, height = f_id.split('_')
-            height_extra_key = traverse_obj(video_params, ('video', 'partial', 'quality', height))
-            if height_extra_key:
-                formats.append({
-                    'format_id': f'{height}p',
-                    'url': f'{server_domain}/{f_url[8:]}&videos={video_id}&extra_key={height_extra_key}',
-                    'height': int_or_none(height),
-                    'ext': ext,
-                })
-
-        thumbnails = []
-        for k, v in item.items():
-            if k.startswith('photo_') and v:
-                width = k.replace('photo_', '')
-                thumbnails.append({
-                    'id': width,
-                    'url': v,
-                    'width': int_or_none(width),
-                })
-
-        return {
-            'id': video_id,
-            'title': title,
-            'formats': formats,
-            'comment_count': int_or_none(item.get('comments')),
-            'description': description,
-            'duration': duration,
-            'thumbnails': thumbnails,
-            'timestamp': timestamp,
-            'view_count': views,
-            'age_limit': 18,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/dailymail.py b/plugins/youtube_download/yt_dlp/extractor/dailymail.py
index 43401e1..540676a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/dailymail.py
+++ b/plugins/youtube_download/yt_dlp/extractor/dailymail.py
@@ -1,8 +1,8 @@
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
-    int_or_none,
     determine_protocol,
+    int_or_none,
+    join_nonempty,
     try_get,
     unescapeHTML,
 )
@@ -19,7 +19,7 @@ class DailyMailIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'The Mountain appears in sparkling water ad for \'Heavy Bubbles\'',
             'description': 'md5:a93d74b6da172dd5dc4d973e0b766a84',
-        }
+        },
     }, {
         'url': 'http://www.dailymail.co.uk/embed/video/1295863.html',
         'only_matching': True,
@@ -35,8 +35,8 @@ class DailyMailIE(InfoExtractor):
         sources_url = (try_get(
             video_data,
             (lambda x: x['plugins']['sources']['url'],
-             lambda x: x['sources']['url']), compat_str)
-            or 'http://www.dailymail.co.uk/api/player/%s/video-sources.json' % video_id)
+             lambda x: x['sources']['url']), str)
+            or f'http://www.dailymail.co.uk/api/player/{video_id}/video-sources.json')
 
         video_sources = self._download_json(sources_url, video_id)
         body = video_sources.get('body')
@@ -53,7 +53,7 @@ class DailyMailIE(InfoExtractor):
             is_hls = container == 'M2TS'
             protocol = 'm3u8_native' if is_hls else determine_protocol({'url': rendition_url})
             formats.append({
-                'format_id': ('hls' if is_hls else protocol) + ('-%d' % tbr if tbr else ''),
+                'format_id': join_nonempty('hls' if is_hls else protocol, tbr),
                 'url': rendition_url,
                 'width': int_or_none(rendition.get('frameWidth')),
                 'height': int_or_none(rendition.get('frameHeight')),
diff --git a/plugins/youtube_download/yt_dlp/extractor/dailymotion.py b/plugins/youtube_download/yt_dlp/extractor/dailymotion.py
index 21263d4..a81f0a2 100644
--- a/plugins/youtube_download/yt_dlp/extractor/dailymotion.py
+++ b/plugins/youtube_download/yt_dlp/extractor/dailymotion.py
@@ -1,6 +1,7 @@
 import functools
 import json
 import re
+import urllib.parse
 
 from .common import InfoExtractor
 from ..networking.exceptions import HTTPError
@@ -9,11 +10,14 @@ from ..utils import (
     OnDemandPagedList,
     age_restricted,
     clean_html,
+    extract_attributes,
     int_or_none,
     traverse_obj,
     try_get,
     unescapeHTML,
     unsmuggle_url,
+    update_url,
+    url_or_none,
     urlencode_postdata,
 )
 
@@ -44,36 +48,41 @@ class DailymotionBaseInfoExtractor(InfoExtractor):
         self._FAMILY_FILTER = ff == 'on' if ff else age_restricted(18, self.get_param('age_limit'))
         self._set_dailymotion_cookie('ff', 'on' if self._FAMILY_FILTER else 'off')
 
+    def _get_token(self, xid):
+        cookies = self._get_dailymotion_cookies()
+        token = self._get_cookie_value(cookies, 'access_token') or self._get_cookie_value(cookies, 'client_token')
+        if token:
+            return token
+
+        data = {
+            'client_id': 'f1a362d288c1b98099c7',
+            'client_secret': 'eea605b96e01c796ff369935357eca920c5da4c5',
+        }
+        username, password = self._get_login_info()
+        if username:
+            data.update({
+                'grant_type': 'password',
+                'password': password,
+                'username': username,
+            })
+        else:
+            data['grant_type'] = 'client_credentials'
+        try:
+            token = self._download_json(
+                'https://graphql.api.dailymotion.com/oauth/token',
+                None, 'Downloading Access Token',
+                data=urlencode_postdata(data))['access_token']
+        except ExtractorError as e:
+            if isinstance(e.cause, HTTPError) and e.cause.status == 400:
+                raise ExtractorError(self._parse_json(
+                    e.cause.response.read().decode(), xid)['error_description'], expected=True)
+            raise
+        self._set_dailymotion_cookie('access_token' if username else 'client_token', token)
+        return token
+
     def _call_api(self, object_type, xid, object_fields, note, filter_extra=None):
         if not self._HEADERS.get('Authorization'):
-            cookies = self._get_dailymotion_cookies()
-            token = self._get_cookie_value(cookies, 'access_token') or self._get_cookie_value(cookies, 'client_token')
-            if not token:
-                data = {
-                    'client_id': 'f1a362d288c1b98099c7',
-                    'client_secret': 'eea605b96e01c796ff369935357eca920c5da4c5',
-                }
-                username, password = self._get_login_info()
-                if username:
-                    data.update({
-                        'grant_type': 'password',
-                        'password': password,
-                        'username': username,
-                    })
-                else:
-                    data['grant_type'] = 'client_credentials'
-                try:
-                    token = self._download_json(
-                        'https://graphql.api.dailymotion.com/oauth/token',
-                        None, 'Downloading Access Token',
-                        data=urlencode_postdata(data))['access_token']
-                except ExtractorError as e:
-                    if isinstance(e.cause, HTTPError) and e.cause.status == 400:
-                        raise ExtractorError(self._parse_json(
-                            e.cause.response.read().decode(), xid)['error_description'], expected=True)
-                    raise
-                self._set_dailymotion_cookie('access_token' if username else 'client_token', token)
-            self._HEADERS['Authorization'] = 'Bearer ' + token
+            self._HEADERS['Authorization'] = f'Bearer {self._get_token(xid)}'
 
         resp = self._download_json(
             'https://graphql.api.dailymotion.com/', xid, note, data=json.dumps({
@@ -81,7 +90,7 @@ class DailymotionBaseInfoExtractor(InfoExtractor):
   %s(xid: "%s"%s) {
     %s
   }
-}''' % (object_type, xid, ', ' + filter_extra if filter_extra else '', object_fields),
+}''' % (object_type, xid, ', ' + filter_extra if filter_extra else '', object_fields),  # noqa: UP031
             }).encode(), headers=self._HEADERS)
         obj = resp['data'][object_type]
         if not obj:
@@ -91,15 +100,23 @@ class DailymotionBaseInfoExtractor(InfoExtractor):
 
 class DailymotionIE(DailymotionBaseInfoExtractor):
     _VALID_URL = r'''(?ix)
-                    https?://
+                    (?:https?:)?//
+                    (?:
+                        dai\.ly/|
                         (?:
-                            (?:(?:www|touch|geo)\.)?dailymotion\.[a-z]{2,3}/(?:(?:(?:(?:embed|swf|\#)/)|player\.html\?)?video|swf)|
-                            (?:www\.)?lequipe\.fr/video
+                            (?:(?:www|touch|geo)\.)?dailymotion\.[a-z]{2,3}|
+                            (?:www\.)?lequipe\.fr
+                        )/
+                        (?:
+                            swf/(?!video)|
+                            (?:(?:crawler|embed|swf)/)?video/|
+                            player(?:/[\da-z]+)?\.html\?(?:video|(?P<is_playlist>playlist))=
                         )
-                        [/=](?P<id>[^/?_&]+)(?:.+?\bplaylist=(?P<playlist_id>x[0-9a-z]+))?
-                    '''
+                    )
+                    (?P<id>[^/?_&#]+)(?:[\w-]*\?playlist=(?P<playlist_id>x[0-9a-z]+))?
+    '''
     IE_NAME = 'dailymotion'
-    _EMBED_REGEX = [r'<(?:(?:embed|iframe)[^>]+?src=|input[^>]+id=[\'"]dmcloudUrlEmissionSelect[\'"][^>]+value=)(["\'])(?P<url>(?:https?:)?//(?:www\.)?dailymotion\.com/(?:embed|swf)/video/.+?)\1']
+    _EMBED_REGEX = [rf'(?ix)<(?:(?:embed|iframe)[^>]+?src=|input[^>]+id=[\'"]dmcloudUrlEmissionSelect[\'"][^>]+value=)["\'](?P<url>{_VALID_URL[5:]})']
     _TESTS = [{
         'url': 'http://www.dailymotion.com/video/x5kesuj_office-christmas-party-review-jason-bateman-olivia-munn-t-j-miller_news',
         'md5': '074b95bdee76b9e3654137aee9c79dfe',
@@ -107,13 +124,17 @@ class DailymotionIE(DailymotionBaseInfoExtractor):
             'id': 'x5kesuj',
             'ext': 'mp4',
             'title': 'Office Christmas Party Review –  Jason Bateman, Olivia Munn, T.J. Miller',
-            'description': 'Office Christmas Party Review -  Jason Bateman, Olivia Munn, T.J. Miller',
+            'description': 'Office Christmas Party Review - Jason Bateman, Olivia Munn, T.J. Miller',
             'duration': 187,
             'timestamp': 1493651285,
             'upload_date': '20170501',
             'uploader': 'Deadline',
             'uploader_id': 'x1xm8ri',
             'age_limit': 0,
+            'view_count': int,
+            'like_count': int,
+            'tags': ['hollywood', 'celeb', 'celebrity', 'movies', 'red carpet'],
+            'thumbnail': r're:https://(?:s[12]\.)dmcdn\.net/v/K456B1cmt4ZcZ9KiM/x1080',
         },
     }, {
         'url': 'https://geo.dailymotion.com/player.html?video=x89eyek&mute=true',
@@ -132,8 +153,8 @@ class DailymotionIE(DailymotionBaseInfoExtractor):
             'view_count': int,
             'like_count': int,
             'tags': ['en_quete_d_esprit'],
-            'thumbnail': 'https://s2.dmcdn.net/v/Tncwi1YGKdvFbDuDY/x1080',
-        }
+            'thumbnail': r're:https://(?:s[12]\.)dmcdn\.net/v/Tncwi1clTH6StrxMP/x1080',
+        },
     }, {
         'url': 'https://www.dailymotion.com/video/x2iuewm_steam-machine-models-pricing-listed-on-steam-store-ign-news_videogames',
         'md5': '2137c41a8e78554bb09225b8eb322406',
@@ -201,6 +222,111 @@ class DailymotionIE(DailymotionBaseInfoExtractor):
     }, {
         'url': 'https://www.dailymotion.com/video/x3z49k?playlist=xv4bw',
         'only_matching': True,
+    }, {
+        'url': 'https://geo.dailymotion.com/player/x86gw.html?video=k46oCapRs4iikoz9DWy',
+        'only_matching': True,
+    }, {
+        'url': 'https://geo.dailymotion.com/player/xakln.html?video=x8mjju4&customConfig%5BcustomParams%5D=%2Ffr-fr%2Ftennis%2Fwimbledon-mens-singles%2Farticles-video',
+        'only_matching': True,
+    }, {  # playlist-only
+        'url': 'https://geo.dailymotion.com/player/xf7zn.html?playlist=x7wdsj',
+        'only_matching': True,
+    }, {
+        'url': 'https://geo.dailymotion.com/player/xmyye.html?video=x93blhi',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.dailymotion.com/crawler/video/x8u4owg',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.dailymotion.com/embed/video/x8u4owg',
+        'only_matching': True,
+    }, {
+        'url': 'https://dai.ly/x94cnnk',
+        'only_matching': True,
+    }]
+    _WEBPAGE_TESTS = [{
+        # https://geo.dailymotion.com/player/xmyye.html?video=x93blhi
+        'url': 'https://www.financialounge.com/video/2024/08/01/borse-europee-in-rosso-dopo-la-fed-a-milano-volano-mediobanca-e-tim-edizione-del-1-agosto/',
+        'info_dict': {
+            'id': 'x93blhi',
+            'ext': 'mp4',
+            'title': 'OnAir - 01/08/24',
+            'description': '',
+            'duration': 217,
+            'timestamp': 1722505658,
+            'upload_date': '20240801',
+            'uploader': 'Financialounge',
+            'uploader_id': 'x2vtgmm',
+            'age_limit': 0,
+            'tags': [],
+            'view_count': int,
+            'like_count': int,
+            'thumbnail': r're:https://\w+.dmcdn.net/v/WnEY61cmvMxt2Fi6d/x1080',
+        },
+    }, {
+        # https://geo.dailymotion.com/player/xf7zn.html?playlist=x7wdsj
+        'url': 'https://www.cycleworld.com/blogs/ask-kevin/ducati-continues-to-evolve-with-v4/',
+        'info_dict': {
+            'id': 'x7wdsj',
+        },
+        'playlist_mincount': 50,
+    }, {
+        # https://www.dailymotion.com/crawler/video/x8u4owg
+        'url': 'https://www.leparisien.fr/environnement/video-le-veloto-la-voiture-a-pedales-qui-aimerait-se-faire-une-place-sur-les-routes-09-03-2024-KCYMCPM4WFHJXMSKBUI66UNFPU.php',
+        'info_dict': {
+            'id': 'x8u4owg',
+            'ext': 'mp4',
+            'like_count': int,
+            'uploader': 'Le Parisien',
+            'thumbnail': 'https://www.leparisien.fr/resizer/ho_GwveeYftNkLwg_cEta--5Bv4=/1200x675/cloudfront-eu-central-1.images.arcpublishing.com/leparisien/BFXJNEBN75EUNHGYJLORUC3TX4.jpg',
+            'upload_date': '20240309',
+            'view_count': int,
+            'timestamp': 1709997866,
+            'age_limit': 0,
+            'uploader_id': 'x32f7b',
+            'title': 'VIDÉO. Le «\xa0véloto\xa0», la voiture à pédales qui aimerait se faire une place sur les routes',
+            'duration': 428.0,
+            'description': 'À bord du « véloto », l’alternative à la voiture pour la campagne',
+            'tags': ['biclou', 'vélo', 'véloto', 'campagne', 'voiture', 'environnement', 'véhicules intermédiaires'],
+        },
+    }, {
+        # https://geo.dailymotion.com/player/xry80.html?video=x8vu47w
+        'url': 'https://www.metatube.com/en/videos/546765/This-frogs-decorates-Christmas-tree/',
+        'info_dict': {
+            'id': 'x8vu47w',
+            'ext': 'mp4',
+            'like_count': int,
+            'uploader': 'Metatube',
+            'thumbnail': r're:https://\w+.dmcdn.net/v/W1G_S1coGSFTfkTeR/x1080',
+            'upload_date': '20240326',
+            'view_count': int,
+            'timestamp': 1711496732,
+            'age_limit': 0,
+            'uploader_id': 'x2xpy74',
+            'title': 'Está lindas ranitas ponen su arbolito',
+            'duration': 28,
+            'description': 'Que lindura',
+            'tags': [],
+        },
+    }, {
+        # //geo.dailymotion.com/player/xysxq.html?video=k2Y4Mjp7krAF9iCuINM
+        'url': 'https://lcp.fr/programmes/avant-la-catastrophe-la-naissance-de-la-dictature-nazie-1933-1936-346819',
+        'info_dict': {
+            'id': 'k2Y4Mjp7krAF9iCuINM',
+            'ext': 'mp4',
+            'title': 'Avant la catastrophe la naissance de la dictature nazie 1933 -1936',
+            'description': 'md5:7b620d5e26edbe45f27bbddc1c0257c1',
+            'uploader': 'LCP Assemblée nationale',
+            'uploader_id': 'xbz33d',
+            'view_count': int,
+            'like_count': int,
+            'age_limit': 0,
+            'duration': 3220,
+            'thumbnail': 'https://s1.dmcdn.net/v/Xvumk1djJBUZfjj2a/x1080',
+            'tags': [],
+            'timestamp': 1739919947,
+            'upload_date': '20250218',
+        },
     }]
     _GEO_BYPASS = False
     _COMMON_MEDIA_FIELDS = '''description
@@ -215,17 +341,36 @@ class DailymotionIE(DailymotionBaseInfoExtractor):
         yield from super()._extract_embed_urls(url, webpage)
         for mobj in re.finditer(
                 r'(?s)DM\.player\([^,]+,\s*{.*?video[\'"]?\s*:\s*["\']?(?P<id>[0-9a-zA-Z]+).+?}\s*\);', webpage):
-            yield from 'https://www.dailymotion.com/embed/video/' + mobj.group('id')
+            yield 'https://www.dailymotion.com/embed/video/' + mobj.group('id')
+        for mobj in re.finditer(
+                r'(?s)<script [^>]*\bsrc=(["\'])(?:https?:)?//[\w-]+\.dailymotion\.com/player/(?:(?!\1).)+\1[^>]*>', webpage):
+            attrs = extract_attributes(mobj.group(0))
+            player_url = url_or_none(attrs.get('src'))
+            if not player_url:
+                continue
+            player_url = player_url.replace('.js', '.html')
+            if player_url.startswith('//'):
+                player_url = f'https:{player_url}'
+            if video_id := attrs.get('data-video'):
+                query_string = f'video={video_id}'
+            elif playlist_id := attrs.get('data-playlist'):
+                query_string = f'playlist={playlist_id}'
+            else:
+                continue
+            yield update_url(player_url, query=query_string)
 
     def _real_extract(self, url):
         url, smuggled_data = unsmuggle_url(url)
-        video_id, playlist_id = self._match_valid_url(url).groups()
+        video_id, is_playlist, playlist_id = self._match_valid_url(url).group('id', 'is_playlist', 'playlist_id')
 
-        if playlist_id:
-            if self._yes_playlist(playlist_id, video_id):
-                return self.url_result(
-                    'http://www.dailymotion.com/playlist/' + playlist_id,
-                    'DailymotionPlaylist', playlist_id)
+        if is_playlist:  # We matched the playlist query param as video_id
+            playlist_id = video_id
+            video_id = None
+
+        if self._yes_playlist(playlist_id, video_id):
+            return self.url_result(
+                f'http://www.dailymotion.com/playlist/{playlist_id}',
+                'DailymotionPlaylist', playlist_id)
 
         password = self.get_param('videopassword')
         media = self._call_api(
@@ -244,8 +389,8 @@ class DailymotionIE(DailymotionBaseInfoExtractor):
       %s
       audienceCount
       isOnAir
-    }''' % (self._COMMON_MEDIA_FIELDS, self._COMMON_MEDIA_FIELDS), 'Downloading media JSON metadata',
-            'password: "%s"' % self.get_param('videopassword') if password else None)
+    }''' % (self._COMMON_MEDIA_FIELDS, self._COMMON_MEDIA_FIELDS), 'Downloading media JSON metadata',  # noqa: UP031
+            'password: "{}"'.format(self.get_param('videopassword')) if password else None)
         xid = media['xid']
 
         metadata = self._download_json(
@@ -261,11 +406,13 @@ class DailymotionIE(DailymotionBaseInfoExtractor):
                 allowed_countries = try_get(media, lambda x: x['geoblockedCountries']['allowed'], list)
                 self.raise_geo_restricted(msg=title, countries=allowed_countries)
             raise ExtractorError(
-                '%s said: %s' % (self.IE_NAME, title), expected=True)
+                f'{self.IE_NAME} said: {title}', expected=True)
 
         title = metadata['title']
         is_live = media.get('isOnAir')
         formats = []
+        subtitles = {}
+
         for quality, media_list in metadata['qualities'].items():
             for m in media_list:
                 media_url = m.get('url')
@@ -273,8 +420,10 @@ class DailymotionIE(DailymotionBaseInfoExtractor):
                 if not media_url or media_type == 'application/vnd.lumberjack.manifest':
                     continue
                 if media_type == 'application/x-mpegURL':
-                    formats.extend(self._extract_m3u8_formats(
-                        media_url, video_id, 'mp4', live=is_live, m3u8_id='hls', fatal=False))
+                    fmt, subs = self._extract_m3u8_formats_and_subtitles(
+                        media_url, video_id, 'mp4', live=is_live, m3u8_id='hls', fatal=False)
+                    formats.extend(fmt)
+                    self._merge_subtitles(subs, target=subtitles)
                 else:
                     f = {
                         'url': media_url,
@@ -294,20 +443,18 @@ class DailymotionIE(DailymotionBaseInfoExtractor):
             if not f.get('fps') and f['format_id'].endswith('@60'):
                 f['fps'] = 60
 
-        subtitles = {}
         subtitles_data = try_get(metadata, lambda x: x['subtitles']['data'], dict) or {}
         for subtitle_lang, subtitle in subtitles_data.items():
             subtitles[subtitle_lang] = [{
                 'url': subtitle_url,
             } for subtitle_url in subtitle.get('urls', [])]
 
-        thumbnails = []
-        for height, poster_url in metadata.get('posters', {}).items():
-            thumbnails.append({
-                'height': int_or_none(height),
-                'id': height,
-                'url': poster_url,
-            })
+        thumbnails = traverse_obj(metadata, (
+            ('posters', 'thumbnails'), {dict.items}, lambda _, v: url_or_none(v[1]), {
+                'height': (0, {int_or_none}),
+                'id': (0, {str}),
+                'url': 1,
+            }))
 
         owner = metadata.get('owner') or {}
         stats = media.get('stats') or {}
@@ -347,7 +494,7 @@ class DailymotionPlaylistBaseIE(DailymotionBaseInfoExtractor):
         }
       }
     }''' % ('false' if self._FAMILY_FILTER else 'true', self._PAGE_SIZE, page),
-            'Downloading page %d' % page)['videos']
+            f'Downloading page {page}')['videos']
         for edge in videos['edges']:
             node = edge['node']
             yield self.url_result(
@@ -380,12 +527,58 @@ class DailymotionPlaylistIE(DailymotionPlaylistBaseIE):
                 r'<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//(?:www\.)?dailymotion\.[a-z]{2,3}/widget/jukebox\?.+?)\1',
                 webpage):
             for p in re.findall(r'list\[\]=/playlist/([^/]+)/', unescapeHTML(mobj.group('url'))):
-                yield '//dailymotion.com/playlist/%s' % p
+                yield f'//dailymotion.com/playlist/{p}'
+
+
+class DailymotionSearchIE(DailymotionPlaylistBaseIE):
+    IE_NAME = 'dailymotion:search'
+    _VALID_URL = r'https?://(?:www\.)?dailymotion\.[a-z]{2,3}/search/(?P<id>[^/?#]+)/videos'
+    _PAGE_SIZE = 20
+    _TESTS = [{
+        'url': 'http://www.dailymotion.com/search/king of turtles/videos',
+        'info_dict': {
+            'id': 'king of turtles',
+            'title': 'king of turtles',
+        },
+        'playlist_mincount': 90,
+    }]
+    _SEARCH_QUERY = 'query SEARCH_QUERY( $query: String! $page: Int $limit: Int ) { search { videos( query: $query first: $limit page: $page ) { edges { node { xid } } } } } '
+
+    def _call_search_api(self, term, page, note):
+        if not self._HEADERS.get('Authorization'):
+            self._HEADERS['Authorization'] = f'Bearer {self._get_token(term)}'
+        resp = self._download_json(
+            'https://graphql.api.dailymotion.com/', None, note, data=json.dumps({
+                'operationName': 'SEARCH_QUERY',
+                'query': self._SEARCH_QUERY,
+                'variables': {
+                    'limit': 20,
+                    'page': page,
+                    'query': term,
+                },
+            }).encode(), headers=self._HEADERS)
+        obj = traverse_obj(resp, ('data', 'search', {dict}))
+        if not obj:
+            raise ExtractorError(
+                traverse_obj(resp, ('errors', 0, 'message', {str})) or 'Could not fetch search data')
+
+        return obj
+
+    def _fetch_page(self, term, page):
+        page += 1
+        response = self._call_search_api(term, page, f'Searching "{term}" page {page}')
+        for xid in traverse_obj(response, ('videos', 'edges', ..., 'node', 'xid')):
+            yield self.url_result(f'https://www.dailymotion.com/video/{xid}', DailymotionIE, xid)
+
+    def _real_extract(self, url):
+        term = urllib.parse.unquote_plus(self._match_id(url))
+        return self.playlist_result(
+            OnDemandPagedList(functools.partial(self._fetch_page, term), self._PAGE_SIZE), term, term)
 
 
 class DailymotionUserIE(DailymotionPlaylistBaseIE):
     IE_NAME = 'dailymotion:user'
-    _VALID_URL = r'https?://(?:www\.)?dailymotion\.[a-z]{2,3}/(?!(?:embed|swf|#|video|playlist)/)(?:(?:old/)?user/)?(?P<id>[^/]+)'
+    _VALID_URL = r'https?://(?:www\.)?dailymotion\.[a-z]{2,3}/(?!(?:embed|swf|#|video|playlist|search|crawler)/)(?:(?:old/)?user/)?(?P<id>[^/?#]+)'
     _TESTS = [{
         'url': 'https://www.dailymotion.com/user/nqtv',
         'info_dict': {
diff --git a/plugins/youtube_download/yt_dlp/extractor/dailywire.py b/plugins/youtube_download/yt_dlp/extractor/dailywire.py
index f177c9d..3d5bb25 100644
--- a/plugins/youtube_download/yt_dlp/extractor/dailywire.py
+++ b/plugins/youtube_download/yt_dlp/extractor/dailywire.py
@@ -35,7 +35,7 @@ class DailyWireIE(DailyWireBaseIE):
             'creator': 'Caroline Roberts',
             'series_id': 'ckzplm0a097fn0826r2vc3j7h',
             'series': 'China: The Enemy Within',
-        }
+        },
     }, {
         'url': 'https://www.dailywire.com/episode/ep-124-bill-maher',
         'info_dict': {
@@ -48,7 +48,7 @@ class DailyWireIE(DailyWireBaseIE):
             'description': 'md5:adb0de584bcfa9c41374999d9e324e98',
             'series_id': 'cjzvep7270hp00786l9hwccob',
             'series': 'The Sunday Special',
-        }
+        },
     }, {
         'url': 'https://www.dailywire.com/videos/the-hyperions',
         'only_matching': True,
@@ -95,7 +95,7 @@ class DailyWirePodcastIE(DailyWireBaseIE):
             'description': 'md5:c4afbadda4e1c38a4496f6d62be55634',
             'thumbnail': 'https://daily-wire-production.imgix.net/podcasts/ckx4otgd71jm508699tzb6hf4-1639506575562.jpg',
             'duration': 900.117667,
-        }
+        },
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/damtomo.py b/plugins/youtube_download/yt_dlp/extractor/damtomo.py
index 0e08e4f..9ac0b6f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/damtomo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/damtomo.py
@@ -2,7 +2,6 @@ import re
 
 from .common import InfoExtractor
 from ..utils import ExtractorError, clean_html, int_or_none, try_get, unified_strdate
-from ..compat import compat_str
 
 
 class DamtomoBaseIE(InfoExtractor):
@@ -32,7 +31,7 @@ class DamtomoBaseIE(InfoExtractor):
             # and never likely to happen in the future
             transform_source=lambda x: re.sub(r'\s*encoding="[^"]+?"', '', x))
         m3u8_url = try_get(stream_tree, lambda x: x.find(
-            './/d:streamingUrl', {'d': self._DKML_XML_NS}).text.strip(), compat_str)
+            './/d:streamingUrl', {'d': self._DKML_XML_NS}).text.strip(), str)
         if not m3u8_url:
             raise ExtractorError('Failed to obtain m3u8 URL')
         formats = self._extract_m3u8_formats(m3u8_url, video_id, ext='mp4')
@@ -68,7 +67,7 @@ class DamtomoVideoIE(DamtomoBaseIE):
             'track': 'Get Wild',
             'artist': 'TM NETWORK(TMN)',
             'upload_date': '20201226',
-        }
+        },
     }]
 
 
@@ -83,7 +82,6 @@ class DamtomoRecordIE(DamtomoBaseIE):
         'info_dict': {
             'id': '27376862',
             'title': 'イカSUMMER [良音]',
-            'description': None,
             'uploader': 'ＮＡＮＡ',
             'uploader_id': 'MzAyMDExNTY',
             'upload_date': '20210721',
@@ -91,7 +89,7 @@ class DamtomoRecordIE(DamtomoBaseIE):
             'like_count': 1,
             'track': 'イカSUMMER [良音]',
             'artist': 'ORANGE RANGE',
-        }
+        },
     }, {
         'url': 'https://www.clubdam.com/app/damtomo/karaokePost/StreamingKrk.do?karaokeContributeId=27489418',
         'info_dict': {
@@ -105,5 +103,5 @@ class DamtomoRecordIE(DamtomoBaseIE):
             'like_count': 3,
             'track': '心みだれて〜say it with flowers〜(生音)',
             'artist': '小林明子',
-        }
+        },
     }]
diff --git a/plugins/youtube_download/yt_dlp/extractor/dangalplay.py b/plugins/youtube_download/yt_dlp/extractor/dangalplay.py
new file mode 100644
index 0000000..f7b2432
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/dangalplay.py
@@ -0,0 +1,197 @@
+import hashlib
+import json
+import re
+import time
+
+from .common import InfoExtractor
+from ..networking.exceptions import HTTPError
+from ..utils import ExtractorError, int_or_none, join_nonempty, url_or_none
+from ..utils.traversal import traverse_obj
+
+
+class DangalPlayBaseIE(InfoExtractor):
+    _NETRC_MACHINE = 'dangalplay'
+    _OTV_USER_ID = None
+    _LOGIN_HINT = 'Pass credentials as -u "token" -p "USER_ID" where USER_ID is the `otv_user_id` in browser local storage'
+    _API_BASE = 'https://ottapi.dangalplay.com'
+    _AUTH_TOKEN = 'jqeGWxRKK7FK5zEk3xCM'  # from https://www.dangalplay.com/main.48ad19e24eb46acccef3.js
+    _SECRET_KEY = 'f53d31a4377e4ef31fa0'  # same as above
+
+    def _perform_login(self, username, password):
+        if self._OTV_USER_ID:
+            return
+        if username != 'token' or not re.fullmatch(r'[\da-f]{32}', password):
+            raise ExtractorError(self._LOGIN_HINT, expected=True)
+        self._OTV_USER_ID = password
+
+    def _real_initialize(self):
+        if not self._OTV_USER_ID:
+            self.raise_login_required(f'Login required. {self._LOGIN_HINT}', method=None)
+
+    def _extract_episode_info(self, metadata, episode_slug, series_slug):
+        return {
+            'display_id': episode_slug,
+            'episode_number': int_or_none(self._search_regex(
+                r'ep-(?:number-)?(\d+)', episode_slug, 'episode number', default=None)),
+            'season_number': int_or_none(self._search_regex(
+                r'season-(\d+)', series_slug, 'season number', default='1')),
+            'series': series_slug,
+            **traverse_obj(metadata, {
+                'id': ('content_id', {str}),
+                'title': ('display_title', {str}),
+                'episode': ('title', {str}),
+                'series': ('show_name', {str}, filter),
+                'series_id': ('catalog_id', {str}),
+                'duration': ('duration', {int_or_none}),
+                'release_timestamp': ('release_date_uts', {int_or_none}),
+            }),
+        }
+
+    def _call_api(self, path, display_id, note='Downloading JSON metadata', fatal=True, query={}):
+        return self._download_json(
+            f'{self._API_BASE}/{path}', display_id, note, fatal=fatal,
+            headers={'Accept': 'application/json'}, query={
+                'auth_token': self._AUTH_TOKEN,
+                'region': 'IN',
+                **query,
+            })
+
+
+class DangalPlayIE(DangalPlayBaseIE):
+    IE_NAME = 'dangalplay'
+    _VALID_URL = r'https?://(?:www\.)?dangalplay.com/shows/(?P<series>[^/?#]+)/(?P<id>(?!episodes)[^/?#]+)/?(?:$|[?#])'
+    _TESTS = [{
+        'url': 'https://www.dangalplay.com/shows/kitani-mohabbat-hai-season-2/kitani-mohabbat-hai-season-2-ep-number-01',
+        'info_dict': {
+            'id': '647c61dc1e7171310dcd49b4',
+            'ext': 'mp4',
+            'release_timestamp': 1262304000,
+            'episode_number': 1,
+            'episode': 'EP 1 | KITANI MOHABBAT HAI SEASON 2',
+            'series': 'kitani-mohabbat-hai-season-2',
+            'season_number': 2,
+            'title': 'EP 1 | KITANI MOHABBAT HAI SEASON 2',
+            'release_date': '20100101',
+            'duration': 2325,
+            'season': 'Season 2',
+            'display_id': 'kitani-mohabbat-hai-season-2-ep-number-01',
+            'series_id': '645c9ea41e717158ca574966',
+        },
+    }, {
+        'url': 'https://www.dangalplay.com/shows/milke-bhi-hum-na-mile/milke-bhi-hum-na-mile-ep-number-01',
+        'info_dict': {
+            'id': '65d31d9ba73b9c3abd14a7f3',
+            'ext': 'mp4',
+            'episode': 'EP 1 | MILKE BHI HUM NA MILE',
+            'release_timestamp': 1708367411,
+            'episode_number': 1,
+            'season': 'Season 1',
+            'title': 'EP 1 | MILKE BHI HUM NA MILE',
+            'duration': 156048,
+            'release_date': '20240219',
+            'season_number': 1,
+            'series': 'MILKE BHI HUM NA MILE',
+            'series_id': '645c9ea41e717158ca574966',
+            'display_id': 'milke-bhi-hum-na-mile-ep-number-01',
+        },
+    }]
+
+    def _generate_api_data(self, data):
+        catalog_id = data['catalog_id']
+        content_id = data['content_id']
+        timestamp = str(int(time.time()))
+        unhashed = ''.join((catalog_id, content_id, self._OTV_USER_ID, timestamp, self._SECRET_KEY))
+
+        return json.dumps({
+            'catalog_id': catalog_id,
+            'content_id': content_id,
+            'category': '',
+            'region': 'IN',
+            'auth_token': self._AUTH_TOKEN,
+            'id': self._OTV_USER_ID,
+            'md5': hashlib.md5(unhashed.encode()).hexdigest(),
+            'ts': timestamp,
+        }, separators=(',', ':')).encode()
+
+    def _real_extract(self, url):
+        series_slug, episode_slug = self._match_valid_url(url).group('series', 'id')
+        metadata = self._call_api(
+            f'catalogs/shows/{series_slug}/episodes/{episode_slug}.gzip',
+            episode_slug, query={'item_language': ''})['data']
+
+        try:
+            details = self._download_json(
+                f'{self._API_BASE}/v2/users/get_all_details.gzip', episode_slug,
+                'Downloading playback details JSON', headers={
+                    'Accept': 'application/json',
+                    'Content-Type': 'application/json',
+                }, data=self._generate_api_data(metadata))['data']
+        except ExtractorError as e:
+            if isinstance(e.cause, HTTPError) and e.cause.status == 422:
+                error_info = traverse_obj(e.cause.response.read().decode(), ({json.loads}, 'error', {dict})) or {}
+                if error_info.get('code') == '1016':
+                    self.raise_login_required(
+                        f'Your token has expired or is invalid. {self._LOGIN_HINT}', method=None)
+                elif msg := error_info.get('message'):
+                    raise ExtractorError(msg)
+            raise
+
+        m3u8_url = traverse_obj(details, (
+            ('adaptive_url', ('adaptive_urls', 'hd', 'hls', ..., 'playback_url')), {url_or_none}, any))
+        formats, subtitles = self._extract_m3u8_formats_and_subtitles(m3u8_url, episode_slug, 'mp4')
+
+        return {
+            'formats': formats,
+            'subtitles': subtitles,
+            **self._extract_episode_info(metadata, episode_slug, series_slug),
+        }
+
+
+class DangalPlaySeasonIE(DangalPlayBaseIE):
+    IE_NAME = 'dangalplay:season'
+    _VALID_URL = r'https?://(?:www\.)?dangalplay.com/shows/(?P<id>[^/?#]+)(?:/(?P<sub>ep-[^/?#]+)/episodes)?/?(?:$|[?#])'
+    _TESTS = [{
+        'url': 'https://www.dangalplay.com/shows/kitani-mohabbat-hai-season-1',
+        'playlist_mincount': 170,
+        'info_dict': {
+            'id': 'kitani-mohabbat-hai-season-1',
+        },
+    }, {
+        'url': 'https://www.dangalplay.com/shows/kitani-mohabbat-hai-season-1/ep-01-30-1/episodes',
+        'playlist_count': 30,
+        'info_dict': {
+            'id': 'kitani-mohabbat-hai-season-1-ep-01-30-1',
+        },
+    }, {
+        # 1 season only, series page is season page
+        'url': 'https://www.dangalplay.com/shows/milke-bhi-hum-na-mile',
+        'playlist_mincount': 15,
+        'info_dict': {
+            'id': 'milke-bhi-hum-na-mile',
+        },
+    }]
+
+    def _entries(self, subcategories, series_slug):
+        for subcategory in subcategories:
+            data = self._call_api(
+                f'catalogs/shows/items/{series_slug}/subcategories/{subcategory}/episodes.gzip',
+                series_slug, f'Downloading episodes JSON for {subcategory}', fatal=False, query={
+                    'order_by': 'asc',
+                    'status': 'published',
+                })
+            for ep in traverse_obj(data, ('data', 'items', lambda _, v: v['friendly_id'])):
+                episode_slug = ep['friendly_id']
+                yield self.url_result(
+                    f'https://www.dangalplay.com/shows/{series_slug}/{episode_slug}',
+                    DangalPlayIE, **self._extract_episode_info(ep, episode_slug, series_slug))
+
+    def _real_extract(self, url):
+        series_slug, subcategory = self._match_valid_url(url).group('id', 'sub')
+        subcategories = [subcategory] if subcategory else traverse_obj(
+            self._call_api(
+                f'catalogs/shows/items/{series_slug}.gzip', series_slug,
+                'Downloading season info JSON', query={'item_language': ''}),
+            ('data', 'subcategories', ..., 'friendly_id', {str}))
+
+        return self.playlist_result(
+            self._entries(subcategories, series_slug), join_nonempty(series_slug, subcategory))
diff --git a/plugins/youtube_download/yt_dlp/extractor/daum.py b/plugins/youtube_download/yt_dlp/extractor/daum.py
index 3ef5140..ee84449 100644
--- a/plugins/youtube_download/yt_dlp/extractor/daum.py
+++ b/plugins/youtube_download/yt_dlp/extractor/daum.py
@@ -1,9 +1,7 @@
 import itertools
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_urllib_parse_unquote,
-)
 from ..utils import parse_qs
 
 
@@ -27,7 +25,7 @@ class DaumIE(DaumBaseIE):
             'duration': 2117,
             'view_count': int,
             'comment_count': int,
-            'uploader_id': 186139,
+            'uploader_id': '186139',
             'uploader': '콘간지',
             'timestamp': 1387310323,
         },
@@ -44,7 +42,7 @@ class DaumIE(DaumBaseIE):
             'view_count': int,
             'comment_count': int,
             'uploader': 'MBC 예능',
-            'uploader_id': 132251,
+            'uploader_id': '132251',
             'timestamp': 1421604228,
         },
     }, {
@@ -63,7 +61,7 @@ class DaumIE(DaumBaseIE):
             'view_count': int,
             'comment_count': int,
             'uploader': '까칠한 墮落始祖 황비홍님의',
-            'uploader_id': 560824,
+            'uploader_id': '560824',
             'timestamp': 1203770745,
         },
     }, {
@@ -77,13 +75,13 @@ class DaumIE(DaumBaseIE):
             'description': '러블리즈 - Destiny (나의 지구) (Lovelyz - Destiny)\r\n\r\n[쇼! 음악중심] 20160611, 507회',
             'upload_date': '20170129',
             'uploader': '쇼! 음악중심',
-            'uploader_id': 2653210,
+            'uploader_id': '2653210',
             'timestamp': 1485684628,
         },
     }]
 
     def _real_extract(self, url):
-        video_id = compat_urllib_parse_unquote(self._match_id(url))
+        video_id = urllib.parse.unquote(self._match_id(url))
         if not video_id.isdigit():
             video_id += '@my'
         return self.url_result(
@@ -107,7 +105,7 @@ class DaumClipIE(DaumBaseIE):
             'duration': 3868,
             'view_count': int,
             'uploader': 'GOMeXP',
-            'uploader_id': 6667,
+            'uploader_id': '6667',
             'timestamp': 1377911092,
         },
     }, {
@@ -117,7 +115,7 @@ class DaumClipIE(DaumBaseIE):
 
     @classmethod
     def suitable(cls, url):
-        return False if DaumPlaylistIE.suitable(url) or DaumUserIE.suitable(url) else super(DaumClipIE, cls).suitable(url)
+        return False if DaumPlaylistIE.suitable(url) or DaumUserIE.suitable(url) else super().suitable(url)
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
@@ -131,12 +129,12 @@ class DaumListIE(InfoExtractor):  # XXX: Conventionally, base classes should end
         entries = []
         for pagenum in itertools.count(1):
             list_info = self._download_json(
-                'http://tvpot.daum.net/mypot/json/GetClipInfo.do?size=48&init=true&order=date&page=%d&%s=%s' % (
-                    pagenum, list_id_type, list_id), list_id, 'Downloading list info - %s' % pagenum)
+                f'http://tvpot.daum.net/mypot/json/GetClipInfo.do?size=48&init=true&order=date&page={pagenum}&{list_id_type}={list_id}',
+                list_id, f'Downloading list info - {pagenum}')
 
             entries.extend([
                 self.url_result(
-                    'http://tvpot.daum.net/v/%s' % clip['vid'])
+                    'http://tvpot.daum.net/v/{}'.format(clip['vid']))
                 for clip in list_info['clip_list']
             ])
 
@@ -169,7 +167,7 @@ class DaumPlaylistIE(DaumListIE):
             'id': '6213966',
             'title': 'Woorissica Official',
         },
-        'playlist_mincount': 181
+        'playlist_mincount': 181,
     }, {
         'note': 'Playlist url with clipid - noplaylist',
         'url': 'http://tvpot.daum.net/mypot/View.do?playlistid=6213966&clipid=73806844',
@@ -182,12 +180,12 @@ class DaumPlaylistIE(DaumListIE):
         'params': {
             'noplaylist': True,
             'skip_download': True,
-        }
+        },
     }]
 
     @classmethod
     def suitable(cls, url):
-        return False if DaumUserIE.suitable(url) else super(DaumPlaylistIE, cls).suitable(url)
+        return False if DaumUserIE.suitable(url) else super().suitable(url)
 
     def _real_extract(self, url):
         list_id = self._match_id(url)
@@ -211,7 +209,7 @@ class DaumUserIE(DaumListIE):
             'id': 'o2scDLIVbHc0',
             'title': '마이 리틀 텔레비전',
         },
-        'playlist_mincount': 213
+        'playlist_mincount': 213,
     }, {
         'url': 'http://tvpot.daum.net/mypot/View.do?ownerid=o2scDLIVbHc0&clipid=73801156',
         'info_dict': {
@@ -219,12 +217,12 @@ class DaumUserIE(DaumListIE):
             'ext': 'mp4',
             'title': '[미공개] 김구라, 오만석이 부릅니다 \'오케피\' - 마이 리틀 텔레비전 20160116',
             'upload_date': '20160117',
-            'description': 'md5:5e91d2d6747f53575badd24bd62b9f36'
+            'description': 'md5:5e91d2d6747f53575badd24bd62b9f36',
         },
         'params': {
             'noplaylist': True,
             'skip_download': True,
-        }
+        },
     }, {
         'note': 'Playlist url has ownerid and playlistid, playlistid takes precedence',
         'url': 'http://tvpot.daum.net/mypot/View.do?ownerid=o2scDLIVbHc0&playlistid=6196631',
@@ -232,7 +230,7 @@ class DaumUserIE(DaumListIE):
             'id': '6196631',
             'title': '마이 리틀 텔레비전 - 20160109',
         },
-        'playlist_count': 11
+        'playlist_count': 11,
     }, {
         'url': 'http://tvpot.daum.net/mypot/Top.do?ownerid=o2scDLIVbHc0',
         'only_matching': True,
diff --git a/plugins/youtube_download/yt_dlp/extractor/dbtv.py b/plugins/youtube_download/yt_dlp/extractor/dbtv.py
index 18be46f..795fbac 100644
--- a/plugins/youtube_download/yt_dlp/extractor/dbtv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/dbtv.py
@@ -18,7 +18,7 @@ class DBTVIE(InfoExtractor):
             'uploader_id': 'UCk5pvsyZJoYJBd7_oFPTlRQ',
             'uploader': 'Dagbladet',
         },
-        'add_ie': ['Youtube']
+        'add_ie': ['Youtube'],
     }, {
         'url': 'https://www.dagbladet.no/video/embed/xlGmyIeN9Jo/?autoplay=false',
         'only_matching': True,
diff --git a/plugins/youtube_download/yt_dlp/extractor/dctp.py b/plugins/youtube_download/yt_dlp/extractor/dctp.py
index 24bb6ac..09bdbf2 100644
--- a/plugins/youtube_download/yt_dlp/extractor/dctp.py
+++ b/plugins/youtube_download/yt_dlp/extractor/dctp.py
@@ -1,5 +1,4 @@
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     float_or_none,
     int_or_none,
@@ -37,18 +36,18 @@ class DctpTvIE(InfoExtractor):
         display_id = self._match_id(url)
 
         version = self._download_json(
-            '%s/version.json' % self._BASE_URL, display_id,
+            f'{self._BASE_URL}/version.json', display_id,
             'Downloading version JSON')
 
-        restapi_base = '%s/%s/restapi' % (
+        restapi_base = '{}/{}/restapi'.format(
             self._BASE_URL, version['version_name'])
 
         info = self._download_json(
-            '%s/slugs/%s.json' % (restapi_base, display_id), display_id,
+            f'{restapi_base}/slugs/{display_id}.json', display_id,
             'Downloading video info JSON')
 
         media = self._download_json(
-            '%s/media/%s.json' % (restapi_base, compat_str(info['object_id'])),
+            '{}/media/{}.json'.format(restapi_base, str(info['object_id'])),
             display_id, 'Downloading media JSON')
 
         uuid = media['uuid']
@@ -57,7 +56,7 @@ class DctpTvIE(InfoExtractor):
         formats = []
 
         def add_formats(suffix):
-            templ = 'https://%%s/%s_dctp_%s.m4v' % (uuid, suffix)
+            templ = f'https://%s/{uuid}_dctp_{suffix}.m4v'
             formats.extend([{
                 'format_id': 'hls-' + suffix,
                 'url': templ % 'cdn-segments.dctp.tv' + '/playlist.m3u8',
diff --git a/plugins/youtube_download/yt_dlp/extractor/deezer.py b/plugins/youtube_download/yt_dlp/extractor/deezer.py
deleted file mode 100644
index f61f12a..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/deezer.py
+++ /dev/null
@@ -1,142 +0,0 @@
-import json
-
-from .common import InfoExtractor
-from ..utils import (
-    ExtractorError,
-    int_or_none,
-    orderedSet,
-)
-
-
-class DeezerBaseInfoExtractor(InfoExtractor):
-    def get_data(self, url):
-        if not self.get_param('test'):
-            self.report_warning('For now, this extractor only supports the 30 second previews. Patches welcome!')
-
-        mobj = self._match_valid_url(url)
-        data_id = mobj.group('id')
-
-        webpage = self._download_webpage(url, data_id)
-        geoblocking_msg = self._html_search_regex(
-            r'<p class="soon-txt">(.*?)</p>', webpage, 'geoblocking message',
-            default=None)
-        if geoblocking_msg is not None:
-            raise ExtractorError(
-                'Deezer said: %s' % geoblocking_msg, expected=True)
-
-        data_json = self._search_regex(
-            (r'__DZR_APP_STATE__\s*=\s*({.+?})\s*</script>',
-             r'naboo\.display\(\'[^\']+\',\s*(.*?)\);\n'),
-            webpage, 'data JSON')
-        data = json.loads(data_json)
-        return data_id, webpage, data
-
-
-class DeezerPlaylistIE(DeezerBaseInfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?deezer\.com/(../)?playlist/(?P<id>[0-9]+)'
-    _TEST = {
-        'url': 'http://www.deezer.com/playlist/176747451',
-        'info_dict': {
-            'id': '176747451',
-            'title': 'Best!',
-            'uploader': 'anonymous',
-            'thumbnail': r're:^https?://(e-)?cdns-images\.dzcdn\.net/images/cover/.*\.jpg$',
-        },
-        'playlist_count': 29,
-    }
-
-    def _real_extract(self, url):
-        playlist_id, webpage, data = self.get_data(url)
-
-        playlist_title = data.get('DATA', {}).get('TITLE')
-        playlist_uploader = data.get('DATA', {}).get('PARENT_USERNAME')
-        playlist_thumbnail = self._search_regex(
-            r'<img id="naboo_playlist_image".*?src="([^"]+)"', webpage,
-            'playlist thumbnail')
-
-        entries = []
-        for s in data.get('SONGS', {}).get('data'):
-            formats = [{
-                'format_id': 'preview',
-                'url': s.get('MEDIA', [{}])[0].get('HREF'),
-                'preference': -100,  # Only the first 30 seconds
-                'ext': 'mp3',
-            }]
-            artists = ', '.join(
-                orderedSet(a.get('ART_NAME') for a in s.get('ARTISTS')))
-            entries.append({
-                'id': s.get('SNG_ID'),
-                'duration': int_or_none(s.get('DURATION')),
-                'title': '%s - %s' % (artists, s.get('SNG_TITLE')),
-                'uploader': s.get('ART_NAME'),
-                'uploader_id': s.get('ART_ID'),
-                'age_limit': 16 if s.get('EXPLICIT_LYRICS') == '1' else 0,
-                'formats': formats,
-            })
-
-        return {
-            '_type': 'playlist',
-            'id': playlist_id,
-            'title': playlist_title,
-            'uploader': playlist_uploader,
-            'thumbnail': playlist_thumbnail,
-            'entries': entries,
-        }
-
-
-class DeezerAlbumIE(DeezerBaseInfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?deezer\.com/(../)?album/(?P<id>[0-9]+)'
-    _TEST = {
-        'url': 'https://www.deezer.com/fr/album/67505622',
-        'info_dict': {
-            'id': '67505622',
-            'title': 'Last Week',
-            'uploader': 'Home Brew',
-            'thumbnail': r're:^https?://(e-)?cdns-images\.dzcdn\.net/images/cover/.*\.jpg$',
-        },
-        'playlist_count': 7,
-    }
-
-    def _real_extract(self, url):
-        album_id, webpage, data = self.get_data(url)
-
-        album_title = data.get('DATA', {}).get('ALB_TITLE')
-        album_uploader = data.get('DATA', {}).get('ART_NAME')
-        album_thumbnail = self._search_regex(
-            r'<img id="naboo_album_image".*?src="([^"]+)"', webpage,
-            'album thumbnail')
-
-        entries = []
-        for s in data.get('SONGS', {}).get('data'):
-            formats = [{
-                'format_id': 'preview',
-                'url': s.get('MEDIA', [{}])[0].get('HREF'),
-                'preference': -100,  # Only the first 30 seconds
-                'ext': 'mp3',
-            }]
-            artists = ', '.join(
-                orderedSet(a.get('ART_NAME') for a in s.get('ARTISTS')))
-            entries.append({
-                'id': s.get('SNG_ID'),
-                'duration': int_or_none(s.get('DURATION')),
-                'title': '%s - %s' % (artists, s.get('SNG_TITLE')),
-                'uploader': s.get('ART_NAME'),
-                'uploader_id': s.get('ART_ID'),
-                'age_limit': 16 if s.get('EXPLICIT_LYRICS') == '1' else 0,
-                'formats': formats,
-                'track': s.get('SNG_TITLE'),
-                'track_number': int_or_none(s.get('TRACK_NUMBER')),
-                'track_id': s.get('SNG_ID'),
-                'artist': album_uploader,
-                'album': album_title,
-                'album_artist': album_uploader,
-            })
-
-        return {
-            '_type': 'playlist',
-            'id': album_id,
-            'title': album_title,
-            'uploader': album_uploader,
-            'thumbnail': album_thumbnail,
-            'entries': entries,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/defense.py b/plugins/youtube_download/yt_dlp/extractor/defense.py
deleted file mode 100644
index 7d73ea8..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/defense.py
+++ /dev/null
@@ -1,37 +0,0 @@
-from .common import InfoExtractor
-
-
-class DefenseGouvFrIE(InfoExtractor):
-    IE_NAME = 'defense.gouv.fr'
-    _VALID_URL = r'https?://.*?\.defense\.gouv\.fr/layout/set/ligthboxvideo/base-de-medias/webtv/(?P<id>[^/?#]*)'
-
-    _TEST = {
-        'url': 'http://www.defense.gouv.fr/layout/set/ligthboxvideo/base-de-medias/webtv/attaque-chimique-syrienne-du-21-aout-2013-1',
-        'md5': '75bba6124da7e63d2d60b5244ec9430c',
-        'info_dict': {
-            'id': '11213',
-            'ext': 'mp4',
-            'title': 'attaque-chimique-syrienne-du-21-aout-2013-1'
-        }
-    }
-
-    def _real_extract(self, url):
-        title = self._match_id(url)
-        webpage = self._download_webpage(url, title)
-
-        video_id = self._search_regex(
-            r"flashvars.pvg_id=\"(\d+)\";",
-            webpage, 'ID')
-
-        json_url = (
-            'http://static.videos.gouv.fr/brightcovehub/export/json/%s' %
-            video_id)
-        info = self._download_json(json_url, title, 'Downloading JSON config')
-        video_url = info['renditions'][0]['url']
-
-        return {
-            'id': video_id,
-            'ext': 'mp4',
-            'url': video_url,
-            'title': title,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/democracynow.py b/plugins/youtube_download/yt_dlp/extractor/democracynow.py
index 1624d08..80c56b4 100644
--- a/plugins/youtube_download/yt_dlp/extractor/democracynow.py
+++ b/plugins/youtube_download/yt_dlp/extractor/democracynow.py
@@ -1,11 +1,11 @@
-import re
 import os.path
+import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import compat_urlparse
 from ..utils import (
-    url_basename,
     remove_start,
+    url_basename,
 )
 
 
@@ -52,7 +52,7 @@ class DemocracynowIE(InfoExtractor):
             media_url = json_data.get(key, '')
             if not media_url:
                 continue
-            media_url = re.sub(r'\?.*', '', compat_urlparse.urljoin(url, media_url))
+            media_url = re.sub(r'\?.*', '', urllib.parse.urljoin(url, media_url))
             video_id = video_id or remove_start(os.path.splitext(url_basename(media_url))[0], 'dn')
             formats.append({
                 'url': media_url,
@@ -70,13 +70,13 @@ class DemocracynowIE(InfoExtractor):
         # chapter_file are not subtitles
         if 'caption_file' in json_data:
             add_subtitle_item(default_lang, {
-                'url': compat_urlparse.urljoin(url, json_data['caption_file']),
+                'url': urllib.parse.urljoin(url, json_data['caption_file']),
             })
 
         for subtitle_item in json_data.get('captions', []):
             lang = subtitle_item.get('language', '').lower() or default_lang
             add_subtitle_item(lang, {
-                'url': compat_urlparse.urljoin(url, subtitle_item['url']),
+                'url': urllib.parse.urljoin(url, subtitle_item['url']),
             })
 
         description = self._og_search_description(webpage, default=None)
diff --git a/plugins/youtube_download/yt_dlp/extractor/detik.py b/plugins/youtube_download/yt_dlp/extractor/detik.py
index f148054..5097759 100644
--- a/plugins/youtube_download/yt_dlp/extractor/detik.py
+++ b/plugins/youtube_download/yt_dlp/extractor/detik.py
@@ -17,8 +17,8 @@ class DetikEmbedIE(InfoExtractor):
             'tags': ['raja charles', ' raja charles iii', ' ratu elizabeth', ' ratu elizabeth meninggal dunia', ' raja inggris', ' inggris'],
             'release_timestamp': 1662869995,
             'release_date': '20220911',
-            'uploader': 'REUTERS'
-        }
+            'uploader': 'REUTERS',
+        },
     }, {
         # 20.detik
         'url': 'https://20.detik.com/otobuzz/20220704-220704093/mulai-rp-10-jutaan-ini-skema-kredit-mitsubishi-pajero-sport',
@@ -36,8 +36,8 @@ class DetikEmbedIE(InfoExtractor):
             'release_timestamp': 1656926321,
             'release_date': '20220704',
             'age_limit': 0,
-            'uploader': 'Ridwan Arifin '  # TODO: strip trailling whitespace at uploader
-        }
+            'uploader': 'Ridwan Arifin ',  # TODO: strip trailling whitespace at uploader
+        },
     }, {
         # pasangmata.detik
         'url': 'https://pasangmata.detik.com/contribution/366649',
@@ -49,7 +49,7 @@ class DetikEmbedIE(InfoExtractor):
             'age_limit': 0,
             'tags': 'count:17',
             'thumbnail': 'https://akcdn.detik.net.id/community/data/media/thumbs-pasangmata/2022/09/08/366649-16626229351533009620.mp4-03.jpg',
-        }
+        },
     }, {
         # insertlive embed
         'url': 'https://www.insertlive.com/embed/video/290482',
@@ -64,7 +64,7 @@ class DetikEmbedIE(InfoExtractor):
             'title': 'Diincar Leonardo DiCaprio, Gigi Hadid Ngaku Tertarik Tapi Belum Cinta',
             'tags': ['leonardo dicaprio', ' gigi hadid', ' hollywood'],
             'uploader': '!nsertlive',
-        }
+        },
     }, {
         # beautynesia embed
         'url': 'https://www.beautynesia.id/embed/video/261636',
@@ -79,7 +79,7 @@ class DetikEmbedIE(InfoExtractor):
             'tags': ['zodiac update', ' zodiak', ' ramalan bintang', ' zodiak beruntung 2022', ' zodiak hoki september 2022', ' zodiak beruntung september 2022'],
             'thumbnail': 'https://akcdn.detik.net.id/visual/2022/09/05/3-zodiak-paling-beruntung-selama-september-2022_169.jpeg?w=600&q=90',
             'uploader': 'amh',
-        }
+        },
     }, {
         # cnbcindonesia embed
         'url': 'https://www.cnbcindonesia.com/embed/video/371839',
@@ -91,7 +91,7 @@ class DetikEmbedIE(InfoExtractor):
             'age_limit': 0,
             'thumbnail': 'https://awsimages.detik.net.id/visual/2022/09/13/cnbc-indonesia-tv-3_169.png?w=600&q=80',
             'description': 'md5:8b9111e37555fcd95fe549a9b4ae6fdc',
-        }
+        },
     }, {
         # detik shortlink (we can get it from https://dtk.id/?<url>)
         'url': 'https://dtk.id/NkISKr',
@@ -110,7 +110,7 @@ class DetikEmbedIE(InfoExtractor):
             'timestamp': 1663139688,
             'duration': 213.0,
             'tags': ['hacker bjorka', 'bjorka', 'hacker bjorka bocorkan data rahasia presiden jokowi', 'jokowi'],
-        }
+        },
     }]
 
     def _extract_from_webpage(self, url, webpage):
@@ -142,7 +142,7 @@ class DetikEmbedIE(InfoExtractor):
                 'timestamp': int_or_none(self._html_search_meta('dtk:createdateunix', webpage, fatal=False, default=None), 1000),
                 'uploader': self._search_regex(
                     r'([^-]+)', self._html_search_meta('dtk:author', webpage, default='').strip(), 'uploader',
-                    default=None)
+                    default=None),
             }
 
         formats, subtitles = self._extract_m3u8_formats_and_subtitles(video_url, display_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/deuxm.py b/plugins/youtube_download/yt_dlp/extractor/deuxm.py
index 74a6da6..c8ce32c 100644
--- a/plugins/youtube_download/yt_dlp/extractor/deuxm.py
+++ b/plugins/youtube_download/yt_dlp/extractor/deuxm.py
@@ -12,8 +12,8 @@ class DeuxMIE(InfoExtractor):
             'id': '6351d439b15e1a613b3debe8',
             'ext': 'mp4',
             'title': 'Grand Angle : Jeudi 20 Octobre 2022',
-            'thumbnail': r're:^https?://2msoread-ww.amagi.tv/mediasfiles/videos/images/.*\.png$'
-        }
+            'thumbnail': r're:^https?://2msoread-ww.amagi.tv/mediasfiles/videos/images/.*\.png$',
+        },
     }, {
         'url': 'https://2m.ma/fr/replay/single/635c0aeab4eec832622356da',
         'md5': 'ad6af2f5e4d5b2ad2194a84b6e890b4c',
@@ -21,8 +21,8 @@ class DeuxMIE(InfoExtractor):
             'id': '635c0aeab4eec832622356da',
             'ext': 'mp4',
             'title': 'Journal  Amazigh : Vendredi 28 Octobre 2022',
-            'thumbnail': r're:^https?://2msoread-ww.amagi.tv/mediasfiles/videos/images/.*\.png$'
-        }
+            'thumbnail': r're:^https?://2msoread-ww.amagi.tv/mediasfiles/videos/images/.*\.png$',
+        },
     }]
 
     def _real_extract(self, url):
@@ -49,8 +49,8 @@ class DeuxMNewsIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'Kan Ya Mkan d\u00e9poussi\u00e8re l\u2019histoire du phare du Cap Beddouza',
             'description': 'md5:99dcf29b82f1d7f2a4acafed1d487527',
-            'thumbnail': r're:^https?://2msoread-ww.amagi.tv/mediasfiles/videos/images/.*\.png$'
-        }
+            'thumbnail': r're:^https?://2msoread-ww.amagi.tv/mediasfiles/videos/images/.*\.png$',
+        },
     }, {
         'url': 'https://2m.ma/fr/news/Interview-Casablanca-hors-des-sentiers-battus-avec-Abderrahim-KASSOU-Replay--20221017',
         'md5': '7aca29f02230945ef635eb8290283c0c',
@@ -59,8 +59,8 @@ class DeuxMNewsIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'Interview: Casablanca hors des sentiers battus avec Abderrahim KASSOU (Replay) ',
             'description': 'md5:3b8e78111de9fcc6ef7f7dd6cff2430c',
-            'thumbnail': r're:^https?://2msoread-ww.amagi.tv/mediasfiles/videos/images/.*\.png$'
-        }
+            'thumbnail': r're:^https?://2msoread-ww.amagi.tv/mediasfiles/videos/images/.*\.png$',
+        },
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/dfb.py b/plugins/youtube_download/yt_dlp/extractor/dfb.py
index c4fb5c2..b397ed9 100644
--- a/plugins/youtube_download/yt_dlp/extractor/dfb.py
+++ b/plugins/youtube_download/yt_dlp/extractor/dfb.py
@@ -22,7 +22,7 @@ class DFBIE(InfoExtractor):
         display_id, video_id = self._match_valid_url(url).groups()
 
         player_info = self._download_xml(
-            'http://tv.dfb.de/server/hd_video.php?play=%s' % video_id,
+            f'http://tv.dfb.de/server/hd_video.php?play={video_id}',
             display_id)
         video_info = player_info.find('video')
         stream_access_url = self._proto_relative_url(video_info.find('url').text.strip())
@@ -46,7 +46,7 @@ class DFBIE(InfoExtractor):
             'id': video_id,
             'display_id': display_id,
             'title': video_info.find('title').text,
-            'thumbnail': 'http://tv.dfb.de/images/%s_640x360.jpg' % video_id,
+            'thumbnail': f'http://tv.dfb.de/images/{video_id}_640x360.jpg',
             'upload_date': unified_strdate(video_info.find('time_date').text),
             'formats': formats,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/dhm.py b/plugins/youtube_download/yt_dlp/extractor/dhm.py
index 3d42fc2..a5f5f79 100644
--- a/plugins/youtube_download/yt_dlp/extractor/dhm.py
+++ b/plugins/youtube_download/yt_dlp/extractor/dhm.py
@@ -3,6 +3,7 @@ from ..utils import parse_duration
 
 
 class DHMIE(InfoExtractor):
+    _WORKING = False
     IE_DESC = 'Filmarchiv - Deutsches Historisches Museum'
     _VALID_URL = r'https?://(?:www\.)?dhm\.de/filmarchiv/(?:[^/]+/)+(?P<id>[^/]+)'
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/digg.py b/plugins/youtube_download/yt_dlp/extractor/digg.py
deleted file mode 100644
index 86e8a6f..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/digg.py
+++ /dev/null
@@ -1,54 +0,0 @@
-from .common import InfoExtractor
-from ..utils import js_to_json
-
-
-class DiggIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?digg\.com/video/(?P<id>[^/?#&]+)'
-    _TESTS = [{
-        # JWPlatform via provider
-        'url': 'http://digg.com/video/sci-fi-short-jonah-daniel-kaluuya-get-out',
-        'info_dict': {
-            'id': 'LcqvmS0b',
-            'ext': 'mp4',
-            'title': "'Get Out' Star Daniel Kaluuya Goes On 'Moby Dick'-Like Journey In Sci-Fi Short 'Jonah'",
-            'description': 'md5:541bb847648b6ee3d6514bc84b82efda',
-            'upload_date': '20180109',
-            'timestamp': 1515530551,
-        },
-        'params': {
-            'skip_download': True,
-        },
-    }, {
-        # Youtube via provider
-        'url': 'http://digg.com/video/dog-boat-seal-play',
-        'only_matching': True,
-    }, {
-        # vimeo as regular embed
-        'url': 'http://digg.com/video/dream-girl-short-film',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        display_id = self._match_id(url)
-
-        webpage = self._download_webpage(url, display_id)
-
-        info = self._parse_json(
-            self._search_regex(
-                r'(?s)video_info\s*=\s*({.+?});\n', webpage, 'video info',
-                default='{}'), display_id, transform_source=js_to_json,
-            fatal=False)
-
-        video_id = info.get('video_id')
-
-        if video_id:
-            provider = info.get('provider_name')
-            if provider == 'youtube':
-                return self.url_result(
-                    video_id, ie='Youtube', video_id=video_id)
-            elif provider == 'jwplayer':
-                return self.url_result(
-                    'jwplatform:%s' % video_id, ie='JWPlatform',
-                    video_id=video_id)
-
-        return self.url_result(url, 'Generic')
diff --git a/plugins/youtube_download/yt_dlp/extractor/digitalconcerthall.py b/plugins/youtube_download/yt_dlp/extractor/digitalconcerthall.py
index c11cd79..4c4fe47 100644
--- a/plugins/youtube_download/yt_dlp/extractor/digitalconcerthall.py
+++ b/plugins/youtube_download/yt_dlp/extractor/digitalconcerthall.py
@@ -1,19 +1,21 @@
-from .common import InfoExtractor
+import time
 
+from .common import InfoExtractor
+from ..networking.exceptions import HTTPError
 from ..utils import (
     ExtractorError,
-    parse_resolution,
-    traverse_obj,
+    jwt_decode_hs256,
+    parse_codecs,
     try_get,
+    url_or_none,
     urlencode_postdata,
 )
+from ..utils.traversal import traverse_obj
 
 
 class DigitalConcertHallIE(InfoExtractor):
     IE_DESC = 'DigitalConcertHall extractor'
-    _VALID_URL = r'https?://(?:www\.)?digitalconcerthall\.com/(?P<language>[a-z]+)/(?P<type>film|concert)/(?P<id>[0-9]+)'
-    _OAUTH_URL = 'https://api.digitalconcerthall.com/v2/oauth2/token'
-    _ACCESS_TOKEN = None
+    _VALID_URL = r'https?://(?:www\.)?digitalconcerthall\.com/(?P<language>[a-z]+)/(?P<type>film|concert|work)/(?P<id>[0-9]+)-?(?P<part>[0-9]+)?'
     _NETRC_MACHINE = 'digitalconcerthall'
     _TESTS = [{
         'note': 'Playlist with only one video',
@@ -27,7 +29,8 @@ class DigitalConcertHallIE(InfoExtractor):
             'upload_date': '20210624',
             'timestamp': 1624548600,
             'duration': 2798,
-            'album_artist': 'Members of the Berliner Philharmoniker / Simon Rössler',
+            'album_artists': ['Members of the Berliner Philharmoniker', 'Simon Rössler'],
+            'composers': ['Kurt Weill'],
         },
         'params': {'skip_download': 'm3u8'},
     }, {
@@ -35,8 +38,9 @@ class DigitalConcertHallIE(InfoExtractor):
         'url': 'https://www.digitalconcerthall.com/en/concert/53785',
         'info_dict': {
             'id': '53785',
-            'album_artist': 'Berliner Philharmoniker / Kirill Petrenko',
+            'album_artists': ['Berliner Philharmoniker', 'Kirill Petrenko'],
             'title': 'Kirill Petrenko conducts Mendelssohn and Shostakovich',
+            'thumbnail': r're:^https?://images.digitalconcerthall.com/cms/thumbnails.*\.jpg$',
         },
         'params': {'skip_download': 'm3u8'},
         'playlist_count': 3,
@@ -50,63 +54,184 @@ class DigitalConcertHallIE(InfoExtractor):
             'thumbnail': r're:^https?://images.digitalconcerthall.com/cms/thumbnails.*\.jpg$',
             'upload_date': '20220714',
             'timestamp': 1657785600,
-            'album_artist': 'Frank Peter Zimmermann / Benedikt von Bernstorff / Jakob von Bernstorff',
+            'album_artists': ['Frank Peter Zimmermann', 'Benedikt von Bernstorff', 'Jakob von Bernstorff'],
         },
         'params': {'skip_download': 'm3u8'},
+    }, {
+        'note': 'Concert with several works and an interview',
+        'url': 'https://www.digitalconcerthall.com/en/work/53785-1',
+        'info_dict': {
+            'id': '53785',
+            'album_artists': ['Berliner Philharmoniker', 'Kirill Petrenko'],
+            'title': 'Kirill Petrenko conducts Mendelssohn and Shostakovich',
+            'thumbnail': r're:^https?://images.digitalconcerthall.com/cms/thumbnails.*\.jpg$',
+        },
+        'params': {'skip_download': 'm3u8'},
+        'playlist_count': 1,
     }]
+    _LOGIN_HINT = ('Use  --username token --password ACCESS_TOKEN  where ACCESS_TOKEN '
+                   'is the "access_token_production" from your browser local storage')
+    _REFRESH_HINT = 'or else use a "refresh_token" with  --username refresh --password REFRESH_TOKEN'
+    _OAUTH_URL = 'https://api.digitalconcerthall.com/v2/oauth2/token'
+    _CLIENT_ID = 'dch.webapp'
+    _CLIENT_SECRET = '2ySLN+2Fwb'
+    _USER_AGENT = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.5 Safari/605.1.15'
+    _OAUTH_HEADERS = {
+        'Accept': 'application/json',
+        'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
+        'Origin': 'https://www.digitalconcerthall.com',
+        'Referer': 'https://www.digitalconcerthall.com/',
+        'User-Agent': _USER_AGENT,
+    }
+    _access_token = None
+    _access_token_expiry = 0
+    _refresh_token = None
 
-    def _perform_login(self, username, password):
-        token_response = self._download_json(
-            self._OAUTH_URL,
-            None, 'Obtaining token', errnote='Unable to obtain token', data=urlencode_postdata({
+    @property
+    def _access_token_is_expired(self):
+        return self._access_token_expiry - 30 <= int(time.time())
+
+    def _set_access_token(self, value):
+        self._access_token = value
+        self._access_token_expiry = traverse_obj(value, ({jwt_decode_hs256}, 'exp', {int})) or 0
+
+    def _cache_tokens(self, /):
+        self.cache.store(self._NETRC_MACHINE, 'tokens', {
+            'access_token': self._access_token,
+            'refresh_token': self._refresh_token,
+        })
+
+    def _fetch_new_tokens(self, invalidate=False):
+        if invalidate:
+            self.report_warning('Access token has been invalidated')
+            self._set_access_token(None)
+
+        if not self._access_token_is_expired:
+            return
+
+        if not self._refresh_token:
+            self._set_access_token(None)
+            self._cache_tokens()
+            raise ExtractorError(
+                'Access token has expired or been invalidated. '
+                'Get a new "access_token_production" value from your browser '
+                f'and try again, {self._REFRESH_HINT}', expected=True)
+
+        # If we only have a refresh token, we need a temporary "initial token" for the refresh flow
+        bearer_token = self._access_token or self._download_json(
+            self._OAUTH_URL, None, 'Obtaining initial token', 'Unable to obtain initial token',
+            data=urlencode_postdata({
                 'affiliate': 'none',
                 'grant_type': 'device',
                 'device_vendor': 'unknown',
-                'app_id': 'dch.webapp',
-                'app_version': '1.0.0',
-                'client_secret': '2ySLN+2Fwb',
-            }), headers={
-                'Content-Type': 'application/x-www-form-urlencoded',
-            })
-        self._ACCESS_TOKEN = token_response['access_token']
+                # device_model 'Safari' gets split streams of 4K/HEVC video and lossless/FLAC audio,
+                # but this is no longer effective since actual login is not possible anymore
+                'device_model': 'unknown',
+                'app_id': self._CLIENT_ID,
+                'app_distributor': 'berlinphil',
+                'app_version': '1.95.0',
+                'client_secret': self._CLIENT_SECRET,
+            }), headers=self._OAUTH_HEADERS)['access_token']
+
         try:
-            self._download_json(
-                self._OAUTH_URL,
-                None, note='Logging in', errnote='Unable to login', data=urlencode_postdata({
-                    'grant_type': 'password',
-                    'username': username,
-                    'password': password,
+            response = self._download_json(
+                self._OAUTH_URL, None, 'Refreshing token', 'Unable to refresh token',
+                data=urlencode_postdata({
+                    'grant_type': 'refresh_token',
+                    'refresh_token': self._refresh_token,
+                    'client_id': self._CLIENT_ID,
+                    'client_secret': self._CLIENT_SECRET,
                 }), headers={
-                    'Content-Type': 'application/x-www-form-urlencoded',
-                    'Referer': 'https://www.digitalconcerthall.com',
-                    'Authorization': f'Bearer {self._ACCESS_TOKEN}'
+                    **self._OAUTH_HEADERS,
+                    'Authorization': f'Bearer {bearer_token}',
                 })
-        except ExtractorError:
-            self.raise_login_required(msg='Login info incorrect')
+        except ExtractorError as e:
+            if isinstance(e.cause, HTTPError) and e.cause.status == 401:
+                self._set_access_token(None)
+                self._refresh_token = None
+                self._cache_tokens()
+                raise ExtractorError('Your tokens have been invalidated', expected=True)
+            raise
+
+        self._set_access_token(response['access_token'])
+        if refresh_token := traverse_obj(response, ('refresh_token', {str})):
+            self.write_debug('New refresh token granted')
+            self._refresh_token = refresh_token
+        self._cache_tokens()
+
+    def _perform_login(self, username, password):
+        self.report_login()
+
+        if username == 'refresh':
+            self._refresh_token = password
+            self._fetch_new_tokens()
+
+        if username == 'token':
+            if not traverse_obj(password, {jwt_decode_hs256}):
+                raise ExtractorError(
+                    f'The access token passed to yt-dlp is not valid. {self._LOGIN_HINT}', expected=True)
+            self._set_access_token(password)
+            self._cache_tokens()
+
+        if username in ('refresh', 'token'):
+            if self.get_param('cachedir') is not False:
+                token_type = 'access' if username == 'token' else 'refresh'
+                self.to_screen(f'Your {token_type} token has been cached to disk. To use the cached '
+                               'token next time, pass  --username cache  along with any password')
+            return
+
+        if username != 'cache':
+            raise ExtractorError(
+                'Login with username and password is no longer supported '
+                f'for this site. {self._LOGIN_HINT}, {self._REFRESH_HINT}', expected=True)
+
+        # Try cached access_token
+        cached_tokens = self.cache.load(self._NETRC_MACHINE, 'tokens', default={})
+        self._set_access_token(cached_tokens.get('access_token'))
+        self._refresh_token = cached_tokens.get('refresh_token')
+        if not self._access_token_is_expired:
+            return
+
+        # Try cached refresh_token
+        self._fetch_new_tokens(invalidate=True)
 
     def _real_initialize(self):
-        if not self._ACCESS_TOKEN:
-            self.raise_login_required(method='password')
+        if not self._access_token:
+            self.raise_login_required(
+                'All content on this site is only available for registered users. '
+                f'{self._LOGIN_HINT}, {self._REFRESH_HINT}', method=None)
 
     def _entries(self, items, language, type_, **kwargs):
         for item in items:
             video_id = item['id']
-            stream_info = self._download_json(
-                self._proto_relative_url(item['_links']['streams']['href']), video_id, headers={
-                    'Accept': 'application/json',
-                    'Authorization': f'Bearer {self._ACCESS_TOKEN}',
-                    'Accept-Language': language
-                })
 
-            m3u8_url = traverse_obj(
-                stream_info, ('channel', lambda k, _: k.startswith('vod_mixed'), 'stream', 0, 'url'), get_all=False)
-            formats = self._extract_m3u8_formats(m3u8_url, video_id, 'mp4', 'm3u8_native', fatal=False)
+            for should_retry in (True, False):
+                self._fetch_new_tokens(invalidate=not should_retry)
+                try:
+                    stream_info = self._download_json(
+                        self._proto_relative_url(item['_links']['streams']['href']), video_id, headers={
+                            'Accept': 'application/json',
+                            'Authorization': f'Bearer {self._access_token}',
+                            'Accept-Language': language,
+                            'User-Agent': self._USER_AGENT,
+                        })
+                    break
+                except ExtractorError as error:
+                    if should_retry and isinstance(error.cause, HTTPError) and error.cause.status == 401:
+                        continue
+                    raise
+
+            formats = []
+            for m3u8_url in traverse_obj(stream_info, ('channel', ..., 'stream', ..., 'url', {url_or_none})):
+                formats.extend(self._extract_m3u8_formats(m3u8_url, video_id, 'mp4', m3u8_id='hls', fatal=False))
+            for fmt in formats:
+                if fmt.get('format_note') and fmt.get('vcodec') == 'none':
+                    fmt.update(parse_codecs(fmt['format_note']))
 
             yield {
                 'id': video_id,
                 'title': item.get('title'),
                 'composer': item.get('name_composer'),
-                'url': m3u8_url,
                 'formats': formats,
                 'duration': item.get('duration_total'),
                 'timestamp': traverse_obj(item, ('date', 'published')),
@@ -120,31 +245,33 @@ class DigitalConcertHallIE(InfoExtractor):
             }
 
     def _real_extract(self, url):
-        language, type_, video_id = self._match_valid_url(url).group('language', 'type', 'id')
+        language, type_, video_id, part = self._match_valid_url(url).group('language', 'type', 'id', 'part')
         if not language:
             language = 'en'
 
-        thumbnail_url = self._html_search_regex(
-            r'(https?://images\.digitalconcerthall\.com/cms/thumbnails/.*\.jpg)',
-            self._download_webpage(url, video_id), 'thumbnail')
-        thumbnails = [{
-            'url': thumbnail_url,
-            **parse_resolution(thumbnail_url)
-        }]
-
+        api_type = 'concert' if type_ == 'work' else type_
         vid_info = self._download_json(
-            f'https://api.digitalconcerthall.com/v2/{type_}/{video_id}', video_id, headers={
+            f'https://api.digitalconcerthall.com/v2/{api_type}/{video_id}', video_id, headers={
                 'Accept': 'application/json',
-                'Accept-Language': language
+                'Accept-Language': language,
+                'User-Agent': self._USER_AGENT,
             })
-        album_artist = ' / '.join(traverse_obj(vid_info, ('_links', 'artist', ..., 'name')) or '')
         videos = [vid_info] if type_ == 'film' else traverse_obj(vid_info, ('_embedded', ..., ...))
 
+        if type_ == 'work':
+            videos = [videos[int(part) - 1]]
+
+        album_artists = traverse_obj(vid_info, ('_links', 'artist', ..., 'name', {str}))
+        thumbnail = traverse_obj(vid_info, (
+            'image', ..., {self._proto_relative_url}, {url_or_none},
+            {lambda x: x.format(width=0, height=0)}, any))  # NB: 0x0 is the original size
+
         return {
             '_type': 'playlist',
             'id': video_id,
             'title': vid_info.get('title'),
-            'entries': self._entries(videos, language, thumbnails=thumbnails, album_artist=album_artist, type_=type_),
-            'thumbnails': thumbnails,
-            'album_artist': album_artist,
+            'entries': self._entries(
+                videos, language, type_, thumbnail=thumbnail, album_artists=album_artists),
+            'thumbnail': thumbnail,
+            'album_artists': album_artists,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/digiteka.py b/plugins/youtube_download/yt_dlp/extractor/digiteka.py
index 912e33b..e56ec63 100644
--- a/plugins/youtube_download/yt_dlp/extractor/digiteka.py
+++ b/plugins/youtube_download/yt_dlp/extractor/digiteka.py
@@ -65,7 +65,7 @@ class DigitekaIE(InfoExtractor):
             video_type = 'musique'
 
         deliver_info = self._download_json(
-            'http://www.ultimedia.com/deliver/video?video=%s&topic=%s' % (video_id, video_type),
+            f'http://www.ultimedia.com/deliver/video?video={video_id}&topic={video_type}',
             video_id)
 
         yt_id = deliver_info.get('yt_id')
diff --git a/plugins/youtube_download/yt_dlp/extractor/digiview.py b/plugins/youtube_download/yt_dlp/extractor/digiview.py
new file mode 100644
index 0000000..f7f2386
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/digiview.py
@@ -0,0 +1,130 @@
+from .common import InfoExtractor
+from .youtube import YoutubeIE
+from ..utils import clean_html, int_or_none, traverse_obj, url_or_none, urlencode_postdata
+
+
+class DigiviewIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?ladigitale\.dev/digiview/#/v/(?P<id>[0-9a-f]+)'
+    _TESTS = [{
+        # normal video
+        'url': 'https://ladigitale.dev/digiview/#/v/67a8e50aee2ec',
+        'info_dict': {
+            'id': '67a8e50aee2ec',
+            'ext': 'mp4',
+            'title': 'Big Buck Bunny 60fps 4K - Official Blender Foundation Short Film',
+            'thumbnail': 'https://i.ytimg.com/vi/aqz-KE-bpKQ/hqdefault.jpg',
+            'upload_date': '20141110',
+            'playable_in_embed': True,
+            'duration': 635,
+            'view_count': int,
+            'comment_count': int,
+            'channel': 'Blender',
+            'license': 'Creative Commons Attribution license (reuse allowed)',
+            'like_count': int,
+            'tags': 'count:8',
+            'live_status': 'not_live',
+            'channel_id': 'UCSMOQeBJ2RAnuFungnQOxLg',
+            'channel_follower_count': int,
+            'channel_url': 'https://www.youtube.com/channel/UCSMOQeBJ2RAnuFungnQOxLg',
+            'uploader_id': '@BlenderOfficial',
+            'description': 'md5:8f3ed18a53a1bb36cbb3b70a15782fd0',
+            'categories': ['Film & Animation'],
+            'channel_is_verified': True,
+            'heatmap': 'count:100',
+            'section_end': 635,
+            'uploader': 'Blender',
+            'timestamp': 1415628355,
+            'uploader_url': 'https://www.youtube.com/@BlenderOfficial',
+            'age_limit': 0,
+            'section_start': 0,
+            'availability': 'public',
+        },
+    }, {
+        # cut video
+        'url': 'https://ladigitale.dev/digiview/#/v/67a8e51d0dd58',
+        'info_dict': {
+            'id': '67a8e51d0dd58',
+            'ext': 'mp4',
+            'title': 'Big Buck Bunny 60fps 4K - Official Blender Foundation Short Film',
+            'thumbnail': 'https://i.ytimg.com/vi/aqz-KE-bpKQ/hqdefault.jpg',
+            'upload_date': '20141110',
+            'playable_in_embed': True,
+            'duration': 5,
+            'view_count': int,
+            'comment_count': int,
+            'channel': 'Blender',
+            'license': 'Creative Commons Attribution license (reuse allowed)',
+            'like_count': int,
+            'tags': 'count:8',
+            'live_status': 'not_live',
+            'channel_id': 'UCSMOQeBJ2RAnuFungnQOxLg',
+            'channel_follower_count': int,
+            'channel_url': 'https://www.youtube.com/channel/UCSMOQeBJ2RAnuFungnQOxLg',
+            'uploader_id': '@BlenderOfficial',
+            'description': 'md5:8f3ed18a53a1bb36cbb3b70a15782fd0',
+            'categories': ['Film & Animation'],
+            'channel_is_verified': True,
+            'heatmap': 'count:100',
+            'section_end': 10,
+            'uploader': 'Blender',
+            'timestamp': 1415628355,
+            'uploader_url': 'https://www.youtube.com/@BlenderOfficial',
+            'age_limit': 0,
+            'section_start': 5,
+            'availability': 'public',
+        },
+    }, {
+        # changed title
+        'url': 'https://ladigitale.dev/digiview/#/v/67a8ea5644d7a',
+        'info_dict': {
+            'id': '67a8ea5644d7a',
+            'ext': 'mp4',
+            'title': 'Big Buck Bunny (with title changed)',
+            'thumbnail': 'https://i.ytimg.com/vi/aqz-KE-bpKQ/hqdefault.jpg',
+            'upload_date': '20141110',
+            'playable_in_embed': True,
+            'duration': 5,
+            'view_count': int,
+            'comment_count': int,
+            'channel': 'Blender',
+            'license': 'Creative Commons Attribution license (reuse allowed)',
+            'like_count': int,
+            'tags': 'count:8',
+            'live_status': 'not_live',
+            'channel_id': 'UCSMOQeBJ2RAnuFungnQOxLg',
+            'channel_follower_count': int,
+            'channel_url': 'https://www.youtube.com/channel/UCSMOQeBJ2RAnuFungnQOxLg',
+            'uploader_id': '@BlenderOfficial',
+            'description': 'md5:8f3ed18a53a1bb36cbb3b70a15782fd0',
+            'categories': ['Film & Animation'],
+            'channel_is_verified': True,
+            'heatmap': 'count:100',
+            'section_end': 15,
+            'uploader': 'Blender',
+            'timestamp': 1415628355,
+            'uploader_url': 'https://www.youtube.com/@BlenderOfficial',
+            'age_limit': 0,
+            'section_start': 10,
+            'availability': 'public',
+        },
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        video_data = self._download_json(
+            'https://ladigitale.dev/digiview/inc/recuperer_video.php', video_id,
+            data=urlencode_postdata({'id': video_id}))
+
+        clip_id = video_data['videoId']
+        return self.url_result(
+            f'https://www.youtube.com/watch?v={clip_id}',
+            YoutubeIE, video_id, url_transparent=True,
+            **traverse_obj(video_data, {
+                'section_start': ('debut', {int_or_none}),
+                'section_end': ('fin', {int_or_none}),
+                'description': ('description', {clean_html}, filter),
+                'title': ('titre', {str}),
+                'thumbnail': ('vignette', {url_or_none}),
+                'view_count': ('vues', {int_or_none}),
+            }),
+        )
diff --git a/plugins/youtube_download/yt_dlp/extractor/discovery.py b/plugins/youtube_download/yt_dlp/extractor/discovery.py
deleted file mode 100644
index 75b4643..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/discovery.py
+++ /dev/null
@@ -1,115 +0,0 @@
-import random
-import string
-
-from .discoverygo import DiscoveryGoBaseIE
-from ..compat import compat_urllib_parse_unquote
-from ..networking.exceptions import HTTPError
-from ..utils import ExtractorError
-
-
-class DiscoveryIE(DiscoveryGoBaseIE):
-    _VALID_URL = r'''(?x)https?://
-        (?P<site>
-            go\.discovery|
-            www\.
-                (?:
-                    investigationdiscovery|
-                    discoverylife|
-                    animalplanet|
-                    ahctv|
-                    destinationamerica|
-                    sciencechannel|
-                    tlc
-                )|
-            watch\.
-                (?:
-                    hgtv|
-                    foodnetwork|
-                    travelchannel|
-                    diynetwork|
-                    cookingchanneltv|
-                    motortrend
-                )
-        )\.com/tv-shows/(?P<show_slug>[^/]+)/(?:video|full-episode)s/(?P<id>[^./?#]+)'''
-    _TESTS = [{
-        'url': 'https://go.discovery.com/tv-shows/cash-cab/videos/riding-with-matthew-perry',
-        'info_dict': {
-            'id': '5a2f35ce6b66d17a5026e29e',
-            'ext': 'mp4',
-            'title': 'Riding with Matthew Perry',
-            'description': 'md5:a34333153e79bc4526019a5129e7f878',
-            'duration': 84,
-        },
-        'params': {
-            'skip_download': True,  # requires ffmpeg
-        }
-    }, {
-        'url': 'https://www.investigationdiscovery.com/tv-shows/final-vision/full-episodes/final-vision',
-        'only_matching': True,
-    }, {
-        'url': 'https://go.discovery.com/tv-shows/alaskan-bush-people/videos/follow-your-own-road',
-        'only_matching': True,
-    }, {
-        # using `show_slug` is important to get the correct video data
-        'url': 'https://www.sciencechannel.com/tv-shows/mythbusters-on-science/full-episodes/christmas-special',
-        'only_matching': True,
-    }]
-    _GEO_COUNTRIES = ['US']
-    _GEO_BYPASS = False
-    _API_BASE_URL = 'https://api.discovery.com/v1/'
-
-    def _real_extract(self, url):
-        site, show_slug, display_id = self._match_valid_url(url).groups()
-
-        access_token = None
-        cookies = self._get_cookies(url)
-
-        # prefer Affiliate Auth Token over Anonymous Auth Token
-        auth_storage_cookie = cookies.get('eosAf') or cookies.get('eosAn')
-        if auth_storage_cookie and auth_storage_cookie.value:
-            auth_storage = self._parse_json(compat_urllib_parse_unquote(
-                compat_urllib_parse_unquote(auth_storage_cookie.value)),
-                display_id, fatal=False) or {}
-            access_token = auth_storage.get('a') or auth_storage.get('access_token')
-
-        if not access_token:
-            access_token = self._download_json(
-                'https://%s.com/anonymous' % site, display_id,
-                'Downloading token JSON metadata', query={
-                    'authRel': 'authorization',
-                    'client_id': '3020a40c2356a645b4b4',
-                    'nonce': ''.join(random.choices(string.ascii_letters, k=32)),
-                    'redirectUri': 'https://www.discovery.com/',
-                })['access_token']
-
-        headers = self.geo_verification_headers()
-        headers['Authorization'] = 'Bearer ' + access_token
-
-        try:
-            video = self._download_json(
-                self._API_BASE_URL + 'content/videos',
-                display_id, 'Downloading content JSON metadata',
-                headers=headers, query={
-                    'embed': 'show.name',
-                    'fields': 'authenticated,description.detailed,duration,episodeNumber,id,name,parental.rating,season.number,show,tags',
-                    'slug': display_id,
-                    'show_slug': show_slug,
-                })[0]
-            video_id = video['id']
-            stream = self._download_json(
-                self._API_BASE_URL + 'streaming/video/' + video_id,
-                display_id, 'Downloading streaming JSON metadata', headers=headers)
-        except ExtractorError as e:
-            if isinstance(e.cause, HTTPError) and e.cause.status in (401, 403):
-                e_description = self._parse_json(
-                    e.cause.response.read().decode(), display_id)['description']
-                if 'resource not available for country' in e_description:
-                    self.raise_geo_restricted(countries=self._GEO_COUNTRIES)
-                if 'Authorized Networks' in e_description:
-                    raise ExtractorError(
-                        'This video is only available via cable service provider subscription that'
-                        ' is not currently supported. You may want to use --cookies.', expected=True)
-                raise ExtractorError(e_description)
-            raise
-
-        return self._extract_video_info(video, stream, display_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/discoverygo.py b/plugins/youtube_download/yt_dlp/extractor/discoverygo.py
deleted file mode 100644
index 1f3d8e3..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/discoverygo.py
+++ /dev/null
@@ -1,172 +0,0 @@
-import re
-
-from .common import InfoExtractor
-from ..utils import (
-    determine_ext,
-    extract_attributes,
-    ExtractorError,
-    int_or_none,
-    parse_age_limit,
-    remove_end,
-    unescapeHTML,
-    url_or_none,
-)
-
-
-class DiscoveryGoBaseIE(InfoExtractor):
-    _VALID_URL_TEMPLATE = r'''(?x)https?://(?:www\.)?(?:
-            discovery|
-            investigationdiscovery|
-            discoverylife|
-            animalplanet|
-            ahctv|
-            destinationamerica|
-            sciencechannel|
-            tlc|
-            velocitychannel
-        )go\.com/%s(?P<id>[^/?#&]+)'''
-
-    def _extract_video_info(self, video, stream, display_id):
-        title = video['name']
-
-        if not stream:
-            if video.get('authenticated') is True:
-                raise ExtractorError(
-                    'This video is only available via cable service provider subscription that'
-                    ' is not currently supported. You may want to use --cookies.', expected=True)
-            else:
-                raise ExtractorError('Unable to find stream')
-        STREAM_URL_SUFFIX = 'streamUrl'
-        formats = []
-        for stream_kind in ('', 'hds'):
-            suffix = STREAM_URL_SUFFIX.capitalize() if stream_kind else STREAM_URL_SUFFIX
-            stream_url = stream.get('%s%s' % (stream_kind, suffix))
-            if not stream_url:
-                continue
-            if stream_kind == '':
-                formats.extend(self._extract_m3u8_formats(
-                    stream_url, display_id, 'mp4', entry_protocol='m3u8_native',
-                    m3u8_id='hls', fatal=False))
-            elif stream_kind == 'hds':
-                formats.extend(self._extract_f4m_formats(
-                    stream_url, display_id, f4m_id=stream_kind, fatal=False))
-
-        video_id = video.get('id') or display_id
-        description = video.get('description', {}).get('detailed')
-        duration = int_or_none(video.get('duration'))
-
-        series = video.get('show', {}).get('name')
-        season_number = int_or_none(video.get('season', {}).get('number'))
-        episode_number = int_or_none(video.get('episodeNumber'))
-
-        tags = video.get('tags')
-        age_limit = parse_age_limit(video.get('parental', {}).get('rating'))
-
-        subtitles = {}
-        captions = stream.get('captions')
-        if isinstance(captions, list):
-            for caption in captions:
-                subtitle_url = url_or_none(caption.get('fileUrl'))
-                if not subtitle_url or not subtitle_url.startswith('http'):
-                    continue
-                lang = caption.get('fileLang', 'en')
-                ext = determine_ext(subtitle_url)
-                subtitles.setdefault(lang, []).append({
-                    'url': subtitle_url,
-                    'ext': 'ttml' if ext == 'xml' else ext,
-                })
-
-        return {
-            'id': video_id,
-            'display_id': display_id,
-            'title': title,
-            'description': description,
-            'duration': duration,
-            'series': series,
-            'season_number': season_number,
-            'episode_number': episode_number,
-            'tags': tags,
-            'age_limit': age_limit,
-            'formats': formats,
-            'subtitles': subtitles,
-        }
-
-
-class DiscoveryGoIE(DiscoveryGoBaseIE):
-    _VALID_URL = DiscoveryGoBaseIE._VALID_URL_TEMPLATE % r'(?:[^/]+/)+'
-    _GEO_COUNTRIES = ['US']
-    _TEST = {
-        'url': 'https://www.discoverygo.com/bering-sea-gold/reaper-madness/',
-        'info_dict': {
-            'id': '58c167d86b66d12f2addeb01',
-            'ext': 'mp4',
-            'title': 'Reaper Madness',
-            'description': 'md5:09f2c625c99afb8946ed4fb7865f6e78',
-            'duration': 2519,
-            'series': 'Bering Sea Gold',
-            'season_number': 8,
-            'episode_number': 6,
-            'age_limit': 14,
-        },
-    }
-
-    def _real_extract(self, url):
-        display_id = self._match_id(url)
-
-        webpage = self._download_webpage(url, display_id)
-
-        container = extract_attributes(
-            self._search_regex(
-                r'(<div[^>]+class=["\']video-player-container[^>]+>)',
-                webpage, 'video container'))
-
-        video = self._parse_json(
-            container.get('data-video') or container.get('data-json'),
-            display_id)
-
-        stream = video.get('stream')
-
-        return self._extract_video_info(video, stream, display_id)
-
-
-class DiscoveryGoPlaylistIE(DiscoveryGoBaseIE):
-    _VALID_URL = DiscoveryGoBaseIE._VALID_URL_TEMPLATE % ''
-    _TEST = {
-        'url': 'https://www.discoverygo.com/bering-sea-gold/',
-        'info_dict': {
-            'id': 'bering-sea-gold',
-            'title': 'Bering Sea Gold',
-            'description': 'md5:cc5c6489835949043c0cc3ad66c2fa0e',
-        },
-        'playlist_mincount': 6,
-    }
-
-    @classmethod
-    def suitable(cls, url):
-        return False if DiscoveryGoIE.suitable(url) else super(
-            DiscoveryGoPlaylistIE, cls).suitable(url)
-
-    def _real_extract(self, url):
-        display_id = self._match_id(url)
-
-        webpage = self._download_webpage(url, display_id)
-
-        entries = []
-        for mobj in re.finditer(r'data-json=(["\'])(?P<json>{.+?})\1', webpage):
-            data = self._parse_json(
-                mobj.group('json'), display_id,
-                transform_source=unescapeHTML, fatal=False)
-            if not isinstance(data, dict) or data.get('type') != 'episode':
-                continue
-            episode_url = data.get('socialUrl')
-            if not episode_url:
-                continue
-            entries.append(self.url_result(
-                episode_url, ie=DiscoveryGoIE.ie_key(),
-                video_id=data.get('id')))
-
-        return self.playlist_result(
-            entries, display_id,
-            remove_end(self._og_search_title(
-                webpage, fatal=False), ' | Discovery GO'),
-            self._og_search_description(webpage))
diff --git a/plugins/youtube_download/yt_dlp/extractor/disney.py b/plugins/youtube_download/yt_dlp/extractor/disney.py
index 430de32..a90f123 100644
--- a/plugins/youtube_download/yt_dlp/extractor/disney.py
+++ b/plugins/youtube_download/yt_dlp/extractor/disney.py
@@ -2,10 +2,10 @@ import re
 
 from .common import InfoExtractor
 from ..utils import (
-    int_or_none,
-    unified_strdate,
     determine_ext,
+    int_or_none,
     join_nonempty,
+    unified_strdate,
     update_url_query,
 )
 
@@ -26,7 +26,7 @@ class DisneyIE(InfoExtractor):
         'params': {
             # m3u8 download
             'skip_download': True,
-        }
+        },
     }, {
         # Grill.burger
         'url': 'http://www.starwars.com/video/rogue-one-a-star-wars-story-intro-featurette',
@@ -40,7 +40,7 @@ class DisneyIE(InfoExtractor):
         'params': {
             # m3u8 download
             'skip_download': True,
-        }
+        },
     }, {
         'url': 'http://videos.disneylatino.com/ver/spider-man-de-regreso-a-casa-primer-adelanto-543a33a1850bdcfcca13bae2',
         'only_matching': True,
@@ -84,7 +84,7 @@ class DisneyIE(InfoExtractor):
             video_data = page_data['data'][0]
         else:
             webpage = self._download_webpage(
-                'http://%s/embed/%s' % (domain, video_id), video_id)
+                f'http://{domain}/embed/{video_id}', video_id)
             page_data = self._parse_json(self._search_regex(
                 r'Disney\.EmbedVideo\s*=\s*({.+});',
                 webpage, 'embed data'), video_id)
@@ -132,7 +132,7 @@ class DisneyIE(InfoExtractor):
             })
         if not formats and video_data.get('expired'):
             self.raise_no_formats(
-                '%s said: %s' % (self.IE_NAME, page_data['translations']['video_expired']),
+                '{} said: {}'.format(self.IE_NAME, page_data['translations']['video_expired']),
                 expected=True)
 
         subtitles = {}
diff --git a/plugins/youtube_download/yt_dlp/extractor/dispeak.py b/plugins/youtube_download/yt_dlp/extractor/dispeak.py
index 37f89b9..89c27e0 100644
--- a/plugins/youtube_download/yt_dlp/extractor/dispeak.py
+++ b/plugins/youtube_download/yt_dlp/extractor/dispeak.py
@@ -55,7 +55,7 @@ class DigitallySpeakingIE(InfoExtractor):
         if video_root is None:
             http_host = xpath_text(metadata, 'httpHost', default=None)
             if http_host:
-                video_root = 'http://%s/' % http_host
+                video_root = f'http://{http_host}/'
         if video_root is None:
             # Hard-coded in http://evt.dispeak.com/ubm/gdc/sf16/custom/player2.js
             # Works for GPUTechConf, too
@@ -86,7 +86,7 @@ class DigitallySpeakingIE(InfoExtractor):
         audios = metadata.findall('./audios/audio')
         for audio in audios:
             formats.append({
-                'url': 'rtmp://%s/ondemand?ovpfv=1.1' % akamai_url,
+                'url': f'rtmp://{akamai_url}/ondemand?ovpfv=1.1',
                 'play_path': remove_end(audio.get('url'), '.flv'),
                 'ext': 'flv',
                 'vcodec': 'none',
@@ -95,14 +95,14 @@ class DigitallySpeakingIE(InfoExtractor):
             })
         for video_key, format_id, preference in (
                 ('slide', 'slides', -2), ('speaker', 'speaker', -1)):
-            video_path = xpath_text(metadata, './%sVideo' % video_key)
+            video_path = xpath_text(metadata, f'./{video_key}Video')
             if not video_path:
                 continue
             formats.append({
-                'url': 'rtmp://%s/ondemand?ovpfv=1.1' % akamai_url,
+                'url': f'rtmp://{akamai_url}/ondemand?ovpfv=1.1',
                 'play_path': remove_end(video_path, '.flv'),
                 'ext': 'flv',
-                'format_note': '%s video' % video_key,
+                'format_note': f'{video_key} video',
                 'quality': preference,
                 'format_id': format_id,
             })
diff --git a/plugins/youtube_download/yt_dlp/extractor/dlf.py b/plugins/youtube_download/yt_dlp/extractor/dlf.py
index 88a4149..eac2190 100644
--- a/plugins/youtube_download/yt_dlp/extractor/dlf.py
+++ b/plugins/youtube_download/yt_dlp/extractor/dlf.py
@@ -37,7 +37,7 @@ class DLFBaseIE(InfoExtractor):
                 'webpage_url': ('data-audio-download-tracking-path', {url_or_none}),
             }, get_all=False),
             'formats': (self._extract_m3u8_formats(url, audio_id, fatal=False)
-                        if ext == 'm3u8' else [{'url': url, 'ext': ext, 'vcodec': 'none'}])
+                        if ext == 'm3u8' else [{'url': url, 'ext': ext, 'vcodec': 'none'}]),
         }
 
 
@@ -56,12 +56,12 @@ class DLFIE(DLFBaseIE):
                 'thumbnail': 'https://assets.deutschlandfunk.de/FALLBACK-IMAGE-AUDIO/512x512.png?t=1603714364673',
                 'uploader': 'Deutschlandfunk',
                 'series': 'On Stage',
-                'channel': 'deutschlandfunk'
+                'channel': 'deutschlandfunk',
             },
             'params': {
-                'skip_download': 'm3u8'
+                'skip_download': 'm3u8',
             },
-            'skip': 'This webpage no longer exists'
+            'skip': 'This webpage no longer exists',
         }, {
             'url': 'https://www.deutschlandfunk.de/russische-athleten-kehren-zurueck-auf-die-sportbuehne-ein-gefaehrlicher-tueroeffner-dlf-d9cc1856-100.html',
             'info_dict': {
@@ -72,8 +72,8 @@ class DLFIE(DLFBaseIE):
                 'thumbnail': 'https://assets.deutschlandfunk.de/FALLBACK-IMAGE-AUDIO/512x512.png?t=1603714364673',
                 'uploader': 'Deutschlandfunk',
                 'series': 'Kommentare und Themen der Woche',
-                'channel': 'deutschlandfunk'
-            }
+                'channel': 'deutschlandfunk',
+            },
         },
     ]
 
@@ -96,7 +96,7 @@ class DLFCorpusIE(DLFBaseIE):
             'info_dict': {
                 'id': 'fechten-russland-belarus-ukraine-protest-100',
                 'title': r're:Wiederzulassung als neutrale Athleten [-/] Was die Rückkehr russischer und belarussischer Sportler beim Fechten bedeutet',
-                'description': 'md5:91340aab29c71aa7518ad5be13d1e8ad'
+                'description': 'md5:91340aab29c71aa7518ad5be13d1e8ad',
             },
             'playlist_mincount': 5,
             'playlist': [{
@@ -108,8 +108,8 @@ class DLFCorpusIE(DLFBaseIE):
                     'thumbnail': 'https://assets.deutschlandfunk.de/aad16241-6b76-4a09-958b-96d0ee1d6f57/512x512.jpg?t=1679480020313',
                     'uploader': 'Deutschlandfunk',
                     'series': 'Sport',
-                    'channel': 'deutschlandfunk'
-                }
+                    'channel': 'deutschlandfunk',
+                },
             }, {
                 'info_dict': {
                     'id': '2ada145f',
@@ -119,8 +119,8 @@ class DLFCorpusIE(DLFBaseIE):
                     'thumbnail': 'https://assets.deutschlandfunk.de/FILE_93982766f7317df30409b8a184ac044a/512x512.jpg?t=1678547581005',
                     'uploader': 'Deutschlandfunk',
                     'series': 'Deutschlandfunk Nova',
-                    'channel': 'deutschlandfunk-nova'
-                }
+                    'channel': 'deutschlandfunk-nova',
+                },
             }, {
                 'info_dict': {
                     'id': '5e55e8c9',
@@ -130,8 +130,8 @@ class DLFCorpusIE(DLFBaseIE):
                     'thumbnail': 'https://assets.deutschlandfunk.de/a595989d-1ed1-4a2e-8370-b64d7f11d757/512x512.jpg?t=1679173825412',
                     'uploader': 'Deutschlandfunk',
                     'series': 'Sport am Samstag',
-                    'channel': 'deutschlandfunk'
-                }
+                    'channel': 'deutschlandfunk',
+                },
             }, {
                 'info_dict': {
                     'id': '47e1a096',
@@ -141,8 +141,8 @@ class DLFCorpusIE(DLFBaseIE):
                     'thumbnail': 'https://assets.deutschlandfunk.de/da4c494a-21cc-48b4-9cc7-40e09fd442c2/512x512.jpg?t=1678562155770',
                     'uploader': 'Deutschlandfunk',
                     'series': 'Sport am Samstag',
-                    'channel': 'deutschlandfunk'
-                }
+                    'channel': 'deutschlandfunk',
+                },
             }, {
                 'info_dict': {
                     'id': '5e55e8c9',
@@ -152,9 +152,9 @@ class DLFCorpusIE(DLFBaseIE):
                     'thumbnail': 'https://assets.deutschlandfunk.de/a595989d-1ed1-4a2e-8370-b64d7f11d757/512x512.jpg?t=1679173825412',
                     'uploader': 'Deutschlandfunk',
                     'series': 'Sport am Samstag',
-                    'channel': 'deutschlandfunk'
-                }
-            }]
+                    'channel': 'deutschlandfunk',
+                },
+            }],
         },
         # Podcast feed with tag buttons, playlist count fluctuates
         {
diff --git a/plugins/youtube_download/yt_dlp/extractor/dlive.py b/plugins/youtube_download/yt_dlp/extractor/dlive.py
index 30fcf9f..157d06c 100644
--- a/plugins/youtube_download/yt_dlp/extractor/dlive.py
+++ b/plugins/youtube_download/yt_dlp/extractor/dlive.py
@@ -16,7 +16,7 @@ class DLiveVODIE(InfoExtractor):
             'upload_date': '20190701',
             'timestamp': 1562011015,
             'uploader_id': 'pdp',
-        }
+        },
     }, {
         'url': 'https://dlive.tv/p/pdpreplay+D-RD-xSZg',
         'only_matching': True,
@@ -36,7 +36,7 @@ class DLiveVODIE(InfoExtractor):
     thumbnailUrl
     viewCount
   }
-}''' % (uploader_id, vod_id)}).encode())['data']['pastBroadcast']
+}''' % (uploader_id, vod_id)}).encode())['data']['pastBroadcast']  # noqa: UP031
         title = broadcast['title']
         formats = self._extract_m3u8_formats(
             broadcast['playbackUrl'], vod_id, 'mp4', 'm3u8_native')
@@ -71,12 +71,12 @@ class DLiveStreamIE(InfoExtractor):
     }
     username
   }
-}''' % display_name}).encode())['data']['userByDisplayName']
+}''' % display_name}).encode())['data']['userByDisplayName']  # noqa: UP031
         livestream = user['livestream']
         title = livestream['title']
         username = user['username']
         formats = self._extract_m3u8_formats(
-            'https://live.prd.dlive.tv/hls/live/%s.m3u8' % username,
+            f'https://live.prd.dlive.tv/hls/live/{username}.m3u8',
             display_name, 'mp4')
         return {
             'id': display_name,
diff --git a/plugins/youtube_download/yt_dlp/extractor/dotsub.py b/plugins/youtube_download/yt_dlp/extractor/dotsub.py
deleted file mode 100644
index 079f837..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/dotsub.py
+++ /dev/null
@@ -1,81 +0,0 @@
-from .common import InfoExtractor
-from ..utils import (
-    float_or_none,
-    int_or_none,
-)
-
-
-class DotsubIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?dotsub\.com/view/(?P<id>[^/]+)'
-    _TESTS = [{
-        'url': 'https://dotsub.com/view/9c63db2a-fa95-4838-8e6e-13deafe47f09',
-        'md5': '21c7ff600f545358134fea762a6d42b6',
-        'info_dict': {
-            'id': '9c63db2a-fa95-4838-8e6e-13deafe47f09',
-            'ext': 'flv',
-            'title': 'MOTIVATION - "It\'s Possible" Best Inspirational Video Ever',
-            'description': 'md5:41af1e273edbbdfe4e216a78b9d34ac6',
-            'thumbnail': 're:^https?://dotsub.com/media/9c63db2a-fa95-4838-8e6e-13deafe47f09/p',
-            'duration': 198,
-            'uploader': 'liuxt',
-            'timestamp': 1385778501.104,
-            'upload_date': '20131130',
-            'view_count': int,
-        }
-    }, {
-        'url': 'https://dotsub.com/view/747bcf58-bd59-45b7-8c8c-ac312d084ee6',
-        'md5': '2bb4a83896434d5c26be868c609429a3',
-        'info_dict': {
-            'id': '168006778',
-            'ext': 'mp4',
-            'title': 'Apartments and flats in Raipur the white symphony',
-            'description': 'md5:784d0639e6b7d1bc29530878508e38fe',
-            'thumbnail': 're:^https?://dotsub.com/media/747bcf58-bd59-45b7-8c8c-ac312d084ee6/p',
-            'duration': 290,
-            'timestamp': 1476767794.2809999,
-            'upload_date': '20161018',
-            'uploader': 'parthivi001',
-            'uploader_id': 'user52596202',
-            'view_count': int,
-        },
-        'add_ie': ['Vimeo'],
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        info = self._download_json(
-            'https://dotsub.com/api/media/%s/metadata' % video_id, video_id)
-        video_url = info.get('mediaURI')
-
-        if not video_url:
-            webpage = self._download_webpage(url, video_id)
-            video_url = self._search_regex(
-                [r'<source[^>]+src="([^"]+)"', r'"file"\s*:\s*\'([^\']+)'],
-                webpage, 'video url', default=None)
-            info_dict = {
-                'id': video_id,
-                'url': video_url,
-                'ext': 'flv',
-            }
-
-        if not video_url:
-            setup_data = self._parse_json(self._html_search_regex(
-                r'(?s)data-setup=([\'"])(?P<content>(?!\1).+?)\1',
-                webpage, 'setup data', group='content'), video_id)
-            info_dict = {
-                '_type': 'url_transparent',
-                'url': setup_data['src'],
-            }
-
-        info_dict.update({
-            'title': info['title'],
-            'description': info.get('description'),
-            'thumbnail': info.get('screenshotURI'),
-            'duration': int_or_none(info.get('duration'), 1000),
-            'uploader': info.get('user'),
-            'timestamp': float_or_none(info.get('dateCreated'), 1000),
-            'view_count': int_or_none(info.get('numberOfViews')),
-        })
-
-        return info_dict
diff --git a/plugins/youtube_download/yt_dlp/extractor/douyutv.py b/plugins/youtube_download/yt_dlp/extractor/douyutv.py
index fa40844..e36eac9 100644
--- a/plugins/youtube_download/yt_dlp/extractor/douyutv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/douyutv.py
@@ -1,31 +1,74 @@
-import time
 import hashlib
-import re
+import time
 import urllib
+import uuid
 
 from .common import InfoExtractor
+from .openload import PhantomJSwrapper
 from ..utils import (
     ExtractorError,
+    UserNotLive,
+    determine_ext,
+    int_or_none,
+    js_to_json,
+    parse_resolution,
+    str_or_none,
+    traverse_obj,
     unescapeHTML,
-    unified_strdate,
+    url_or_none,
+    urlencode_postdata,
     urljoin,
 )
 
 
-class DouyuTVIE(InfoExtractor):
-    IE_DESC = '斗鱼'
+class DouyuBaseIE(InfoExtractor):
+    def _download_cryptojs_md5(self, video_id):
+        for url in [
+            # XXX: Do NOT use cdn.bootcdn.net; ref: https://sansec.io/research/polyfill-supply-chain-attack
+            'https://cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.2/rollups/md5.js',
+            'https://unpkg.com/cryptojslib@3.1.2/rollups/md5.js',
+        ]:
+            js_code = self._download_webpage(
+                url, video_id, note='Downloading signing dependency', fatal=False)
+            if js_code:
+                self.cache.store('douyu', 'crypto-js-md5', js_code)
+                return js_code
+        raise ExtractorError('Unable to download JS dependency (crypto-js/md5)')
+
+    def _get_cryptojs_md5(self, video_id):
+        return self.cache.load(
+            'douyu', 'crypto-js-md5', min_ver='2024.07.04') or self._download_cryptojs_md5(video_id)
+
+    def _calc_sign(self, sign_func, video_id, a):
+        b = uuid.uuid4().hex
+        c = round(time.time())
+        js_script = f'{self._get_cryptojs_md5(video_id)};{sign_func};console.log(ub98484234("{a}","{b}","{c}"))'
+        phantom = PhantomJSwrapper(self)
+        result = phantom.execute(js_script, video_id,
+                                 note='Executing JS signing script').strip()
+        return {i: v[0] for i, v in urllib.parse.parse_qs(result).items()}
+
+    def _search_js_sign_func(self, webpage, fatal=True):
+        # The greedy look-behind ensures last possible script tag is matched
+        return self._search_regex(
+            r'(?:<script.*)?<script[^>]*>(.*?ub98484234.*?)</script>', webpage, 'JS sign func', fatal=fatal)
+
+
+class DouyuTVIE(DouyuBaseIE):
+    IE_DESC = '斗鱼直播'
     _VALID_URL = r'https?://(?:www\.)?douyu(?:tv)?\.com/(topic/\w+\?rid=|(?:[^/]+/))*(?P<id>[A-Za-z0-9]+)'
     _TESTS = [{
-        'url': 'http://www.douyutv.com/iseven',
+        'url': 'https://www.douyu.com/pigff',
         'info_dict': {
-            'id': '17732',
-            'display_id': 'iseven',
-            'ext': 'flv',
-            'title': 're:^清晨醒脑！根本停不下来！ [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
-            'description': r're:.*m7show@163\.com.*',
-            'thumbnail': r're:^https?://.*\.png',
-            'uploader': '7师傅',
+            'id': '24422',
+            'display_id': 'pigff',
+            'ext': 'mp4',
+            'title': 're:^【PIGFF】.* [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
+            'description': r'≥15级牌子看鱼吧置顶帖进粉丝vx群',
+            'thumbnail': str,
+            'uploader': 'pigff',
             'is_live': True,
+            'live_status': 'is_live',
         },
         'params': {
             'skip_download': True,
@@ -85,15 +128,43 @@ class DouyuTVIE(InfoExtractor):
         'only_matching': True,
     }]
 
+    def _get_sign_func(self, room_id, video_id):
+        return self._download_json(
+            f'https://www.douyu.com/swf_api/homeH5Enc?rids={room_id}', video_id,
+            note='Getting signing script')['data'][f'room{room_id}']
+
+    def _extract_stream_formats(self, stream_formats):
+        formats = []
+        for stream_info in traverse_obj(stream_formats, (..., 'data')):
+            stream_url = urljoin(
+                traverse_obj(stream_info, 'rtmp_url'), traverse_obj(stream_info, 'rtmp_live'))
+            if stream_url:
+                rate_id = traverse_obj(stream_info, ('rate', {int_or_none}))
+                rate_info = traverse_obj(stream_info, ('multirates', lambda _, v: v['rate'] == rate_id), get_all=False)
+                ext = determine_ext(stream_url)
+                formats.append({
+                    'url': stream_url,
+                    'format_id': str_or_none(rate_id),
+                    'ext': 'mp4' if ext == 'm3u8' else ext,
+                    'protocol': 'm3u8_native' if ext == 'm3u8' else 'https',
+                    'quality': rate_id % -10000 if rate_id is not None else None,
+                    **traverse_obj(rate_info, {
+                        'format': ('name', {str_or_none}),
+                        'tbr': ('bit', {int_or_none}),
+                    }),
+                })
+        return formats
+
     def _real_extract(self, url):
         video_id = self._match_id(url)
 
-        if video_id.isdigit():
-            room_id = video_id
-        else:
-            page = self._download_webpage(url, video_id)
-            room_id = self._html_search_regex(
-                r'"room_id\\?"\s*:\s*(\d+),', page, 'room id')
+        webpage = self._download_webpage(url, video_id)
+        room_id = self._search_regex(r'\$ROOM\.room_id\s*=\s*(\d+)', webpage, 'room id')
+
+        if self._search_regex(r'"videoLoop"\s*:\s*(\d+)', webpage, 'loop', default='') == '1':
+            raise UserNotLive('The channel is auto-playing VODs', video_id=video_id)
+        if self._search_regex(r'\$ROOM\.show_status\s*=\s*(\d+)', webpage, 'status', default='') == '2':
+            raise UserNotLive(video_id=video_id)
 
         # Grab metadata from API
         params = {
@@ -102,110 +173,136 @@ class DouyuTVIE(InfoExtractor):
             'time': int(time.time()),
         }
         params['auth'] = hashlib.md5(
-            f'room/{video_id}?{urllib.parse.urlencode(params)}zNzMV1y4EMxOHS6I5WKm'.encode()).hexdigest()
-        room = self._download_json(
+            f'room/{room_id}?{urllib.parse.urlencode(params)}zNzMV1y4EMxOHS6I5WKm'.encode()).hexdigest()
+        room = traverse_obj(self._download_json(
             f'http://www.douyutv.com/api/v1/room/{room_id}', video_id,
-            note='Downloading room info', query=params)['data']
+            note='Downloading room info', query=params, fatal=False), 'data')
 
         # 1 = live, 2 = offline
-        if room.get('show_status') == '2':
-            raise ExtractorError('Live stream is offline', expected=True)
+        if traverse_obj(room, 'show_status') == '2':
+            raise UserNotLive(video_id=video_id)
 
-        video_url = urljoin('https://hls3-akm.douyucdn.cn/', self._search_regex(r'(live/.*)', room['hls_url'], 'URL'))
-        formats, subs = self._extract_m3u8_formats_and_subtitles(video_url, room_id)
+        js_sign_func = self._search_js_sign_func(webpage, fatal=False) or self._get_sign_func(room_id, video_id)
+        form_data = {
+            'rate': 0,
+            **self._calc_sign(js_sign_func, video_id, room_id),
+        }
+        stream_formats = [self._download_json(
+            f'https://www.douyu.com/lapi/live/getH5Play/{room_id}',
+            video_id, note='Downloading livestream format',
+            data=urlencode_postdata(form_data))]
 
-        title = unescapeHTML(room['room_name'])
-        description = room.get('show_details')
-        thumbnail = room.get('room_src')
-        uploader = room.get('nickname')
+        for rate_id in traverse_obj(stream_formats[0], ('data', 'multirates', ..., 'rate')):
+            if rate_id != traverse_obj(stream_formats[0], ('data', 'rate')):
+                form_data['rate'] = rate_id
+                stream_formats.append(self._download_json(
+                    f'https://www.douyu.com/lapi/live/getH5Play/{room_id}',
+                    video_id, note=f'Downloading livestream format {rate_id}',
+                    data=urlencode_postdata(form_data)))
 
         return {
             'id': room_id,
-            'display_id': video_id,
-            'title': title,
-            'description': description,
-            'thumbnail': thumbnail,
-            'uploader': uploader,
+            'formats': self._extract_stream_formats(stream_formats),
             'is_live': True,
-            'subtitles': subs,
-            'formats': formats,
+            **traverse_obj(room, {
+                'display_id': ('url', {str}, {lambda i: i[1:]}),
+                'title': ('room_name', {unescapeHTML}),
+                'description': ('show_details', {str}),
+                'uploader': ('nickname', {str}),
+                'thumbnail': ('room_src', {url_or_none}),
+            }),
         }
 
 
-class DouyuShowIE(InfoExtractor):
+class DouyuShowIE(DouyuBaseIE):
     _VALID_URL = r'https?://v(?:mobile)?\.douyu\.com/show/(?P<id>[0-9a-zA-Z]+)'
 
     _TESTS = [{
-        'url': 'https://v.douyu.com/show/rjNBdvnVXNzvE2yw',
-        'md5': '0c2cfd068ee2afe657801269b2d86214',
+        'url': 'https://v.douyu.com/show/mPyq7oVNe5Yv1gLY',
         'info_dict': {
-            'id': 'rjNBdvnVXNzvE2yw',
+            'id': 'mPyq7oVNe5Yv1gLY',
             'ext': 'mp4',
-            'title': '陈一发儿：砒霜 我有个室友系列！04-01 22点场',
-            'duration': 7150.08,
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'uploader': '陈一发儿',
-            'uploader_id': 'XrZwYelr5wbK',
-            'uploader_url': 'https://v.douyu.com/author/XrZwYelr5wbK',
-            'upload_date': '20170402',
+            'title': '四川人小时候的味道“蒜苗回锅肉”，传统菜不能丢，要常做来吃',
+            'duration': 633,
+            'thumbnail': str,
+            'uploader': '美食作家王刚V',
+            'uploader_id': 'OVAO4NVx1m7Q',
+            'timestamp': 1661850002,
+            'upload_date': '20220830',
+            'view_count': int,
+            'tags': ['美食', '美食综合'],
         },
     }, {
         'url': 'https://vmobile.douyu.com/show/rjNBdvnVXNzvE2yw',
         'only_matching': True,
     }]
 
+    _FORMATS = {
+        'super': '原画',
+        'high': '超清',
+        'normal': '高清',
+    }
+
+    _QUALITIES = {
+        'super': -1,
+        'high': -2,
+        'normal': -3,
+    }
+
+    _RESOLUTIONS = {
+        'super': '1920x1080',
+        'high': '1280x720',
+        'normal': '852x480',
+    }
+
     def _real_extract(self, url):
         url = url.replace('vmobile.', 'v.')
         video_id = self._match_id(url)
 
         webpage = self._download_webpage(url, video_id)
 
-        room_info = self._parse_json(self._search_regex(
-            r'var\s+\$ROOM\s*=\s*({.+});', webpage, 'room info'), video_id)
+        video_info = self._search_json(
+            r'<script>\s*window\.\$DATA\s*=', webpage,
+            'video info', video_id, transform_source=js_to_json)
 
-        video_info = None
+        js_sign_func = self._search_js_sign_func(webpage)
+        form_data = {
+            'vid': video_id,
+            **self._calc_sign(js_sign_func, video_id, video_info['ROOM']['point_id']),
+        }
+        url_info = self._download_json(
+            'https://v.douyu.com/api/stream/getStreamUrl', video_id,
+            data=urlencode_postdata(form_data), note='Downloading video formats')
 
-        for trial in range(5):
-            # Sometimes Douyu rejects our request. Let's try it more times
-            try:
-                video_info = self._download_json(
-                    'https://vmobile.douyu.com/video/getInfo', video_id,
-                    query={'vid': video_id},
-                    headers={
-                        'Referer': url,
-                        'x-requested-with': 'XMLHttpRequest',
-                    })
-                break
-            except ExtractorError:
-                self._sleep(1, video_id)
-
-        if not video_info:
-            raise ExtractorError('Can\'t fetch video info')
-
-        formats = self._extract_m3u8_formats(
-            video_info['data']['video_url'], video_id,
-            entry_protocol='m3u8_native', ext='mp4')
-
-        upload_date = unified_strdate(self._html_search_regex(
-            r'<em>上传时间：</em><span>([^<]+)</span>', webpage,
-            'upload date', fatal=False))
-
-        uploader = uploader_id = uploader_url = None
-        mobj = re.search(
-            r'(?m)<a[^>]+href="/author/([0-9a-zA-Z]+)".+?<strong[^>]+title="([^"]+)"',
-            webpage)
-        if mobj:
-            uploader_id, uploader = mobj.groups()
-            uploader_url = urljoin(url, '/author/' + uploader_id)
+        formats = []
+        for name, url in traverse_obj(url_info, ('data', 'thumb_video', {dict.items}, ...)):
+            video_url = traverse_obj(url, ('url', {url_or_none}))
+            if video_url:
+                ext = determine_ext(video_url)
+                formats.append({
+                    'format': self._FORMATS.get(name),
+                    'format_id': name,
+                    'url': video_url,
+                    'quality': self._QUALITIES.get(name),
+                    'ext': 'mp4' if ext == 'm3u8' else ext,
+                    'protocol': 'm3u8_native' if ext == 'm3u8' else 'https',
+                    **parse_resolution(self._RESOLUTIONS.get(name)),
+                })
+            else:
+                self.to_screen(
+                    f'"{self._FORMATS.get(name, name)}" format may require logging in. {self._login_hint()}')
 
         return {
             'id': video_id,
-            'title': room_info['name'],
             'formats': formats,
-            'duration': room_info.get('duration'),
-            'thumbnail': room_info.get('pic'),
-            'upload_date': upload_date,
-            'uploader': uploader,
-            'uploader_id': uploader_id,
-            'uploader_url': uploader_url,
+            **traverse_obj(video_info, ('DATA', {
+                'title': ('content', 'title', {str}),
+                'uploader': ('content', 'author', {str}),
+                'uploader_id': ('content', 'up_id', {str_or_none}),
+                'duration': ('content', 'video_duration', {int_or_none}),
+                'thumbnail': ('content', 'video_pic', {url_or_none}),
+                'timestamp': ('content', 'create_time', {int_or_none}),
+                'view_count': ('content', 'view_num', {int_or_none}),
+                'tags': ('videoTag', ..., 'tagName', {str}),
+            })),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/dplay.py b/plugins/youtube_download/yt_dlp/extractor/dplay.py
index 363b4be..86950b2 100644
--- a/plugins/youtube_download/yt_dlp/extractor/dplay.py
+++ b/plugins/youtube_download/yt_dlp/extractor/dplay.py
@@ -4,8 +4,8 @@ import uuid
 from .common import InfoExtractor
 from ..networking.exceptions import HTTPError
 from ..utils import (
-    determine_ext,
     ExtractorError,
+    determine_ext,
     float_or_none,
     int_or_none,
     remove_start,
@@ -70,7 +70,7 @@ class DPlayBaseIE(InfoExtractor):
         self._initialize_geo_bypass({
             'countries': geo_countries,
         })
-        disco_base = 'https://%s/' % disco_host
+        disco_base = f'https://{disco_host}/'
         headers = {
             'Referer': url,
         }
@@ -84,7 +84,7 @@ class DPlayBaseIE(InfoExtractor):
                     'fields[show]': 'name',
                     'fields[tag]': 'name',
                     'fields[video]': 'description,episodeNumber,name,publishStart,seasonNumber,videoDuration',
-                    'include': 'images,primaryChannel,show,tags'
+                    'include': 'images,primaryChannel,show,tags',
                 })
         except ExtractorError as e:
             if isinstance(e.cause, HTTPError) and e.cause.status == 400:
@@ -319,35 +319,17 @@ class DPlayIE(DPlayBaseIE):
             url, display_id, host, 'dplay' + country, country, domain)
 
 
-class HGTVDeIE(DPlayBaseIE):
-    _VALID_URL = r'https?://de\.hgtv\.com/sendungen' + DPlayBaseIE._PATH_REGEX
-    _TESTS = [{
-        'url': 'https://de.hgtv.com/sendungen/tiny-house-klein-aber-oho/wer-braucht-schon-eine-toilette/',
-        'info_dict': {
-            'id': '151205',
-            'display_id': 'tiny-house-klein-aber-oho/wer-braucht-schon-eine-toilette',
-            'ext': 'mp4',
-            'title': 'Wer braucht schon eine Toilette',
-            'description': 'md5:05b40a27e7aed2c9172de34d459134e2',
-            'duration': 1177.024,
-            'timestamp': 1595705400,
-            'upload_date': '20200725',
-            'creator': 'HGTV',
-            'series': 'Tiny House - klein, aber oho',
-            'season_number': 3,
-            'episode_number': 3,
-        },
-    }]
-
-    def _real_extract(self, url):
-        display_id = self._match_id(url)
-        return self._get_disco_api_info(
-            url, display_id, 'eu1-prod.disco-api.com', 'hgtv', 'de')
-
-
 class DiscoveryPlusBaseIE(DPlayBaseIE):
+    """Subclasses must set _PRODUCT, _DISCO_API_PARAMS"""
+
+    _DISCO_CLIENT_VER = '27.43.0'
+
     def _update_disco_api_headers(self, headers, disco_base, display_id, realm):
-        headers['x-disco-client'] = f'WEB:UNKNOWN:{self._PRODUCT}:25.2.6'
+        headers.update({
+            'x-disco-params': f'realm={realm},siteLookupKey={self._PRODUCT}',
+            'x-disco-client': f'WEB:UNKNOWN:{self._PRODUCT}:{self._DISCO_CLIENT_VER}',
+            'Authorization': self._get_auth(disco_base, display_id, realm),
+        })
 
     def _download_video_playback_info(self, disco_base, video_id, headers):
         return self._download_json(
@@ -355,21 +337,78 @@ class DiscoveryPlusBaseIE(DPlayBaseIE):
             video_id, headers=headers, data=json.dumps({
                 'deviceInfo': {
                     'adBlocker': False,
+                    'drmSupported': False,
                 },
                 'videoId': video_id,
-                'wisteriaProperties': {
-                    'platform': 'desktop',
-                    'product': self._PRODUCT,
-                },
-            }).encode('utf-8'))['data']['attributes']['streaming']
+                'wisteriaProperties': {},
+            }).encode())['data']['attributes']['streaming']
 
     def _real_extract(self, url):
         return self._get_disco_api_info(url, self._match_id(url), **self._DISCO_API_PARAMS)
 
 
+class HGTVDeIE(DiscoveryPlusBaseIE):
+    _VALID_URL = r'https?://de\.hgtv\.com/sendungen' + DPlayBaseIE._PATH_REGEX
+    _TESTS = [{
+        'url': 'https://de.hgtv.com/sendungen/mein-kleinstadt-traumhaus/vom-landleben-ins-loft',
+        'info_dict': {
+            'id': '7332936',
+            'ext': 'mp4',
+            'display_id': 'mein-kleinstadt-traumhaus/vom-landleben-ins-loft',
+            'title': 'Vom Landleben ins Loft',
+            'description': 'md5:e5f72c02c853970796dd3818f2e25745',
+            'episode': 'Episode 7',
+            'episode_number': 7,
+            'season': 'Season 7',
+            'season_number': 7,
+            'series': 'Mein Kleinstadt-Traumhaus',
+            'duration': 2645.0,
+            'timestamp': 1725998100,
+            'upload_date': '20240910',
+            'creators': ['HGTV'],
+            'tags': [],
+            'thumbnail': 'https://eu1-prod-images.disco-api.com/2024/08/09/82a386b9-c688-32c7-b9ff-0b13865f0bae.jpeg',
+        },
+    }]
+
+    _PRODUCT = 'hgtv'
+    _DISCO_API_PARAMS = {
+        'disco_host': 'eu1-prod.disco-api.com',
+        'realm': 'hgtv',
+        'country': 'de',
+    }
+
+    def _update_disco_api_headers(self, headers, disco_base, display_id, realm):
+        headers.update({
+            'x-disco-params': f'realm={realm}',
+            'x-disco-client': 'Alps:HyogaPlayer:0.0.0',
+            'Authorization': self._get_auth(disco_base, display_id, realm),
+        })
+
+
 class GoDiscoveryIE(DiscoveryPlusBaseIE):
     _VALID_URL = r'https?://(?:go\.)?discovery\.com/video' + DPlayBaseIE._PATH_REGEX
     _TESTS = [{
+        'url': 'https://go.discovery.com/video/in-the-eye-of-the-storm-discovery-atve-us/trapped-in-a-twister',
+        'info_dict': {
+            'id': '5352642',
+            'display_id': 'in-the-eye-of-the-storm-discovery-atve-us/trapped-in-a-twister',
+            'ext': 'mp4',
+            'title': 'Trapped in a Twister',
+            'description': 'Twisters destroy Midwest towns, trapping spotters in the eye of the storm.',
+            'episode_number': 1,
+            'episode': 'Episode 1',
+            'season_number': 1,
+            'season': 'Season 1',
+            'series': 'In The Eye Of The Storm',
+            'duration': 2490.237,
+            'upload_date': '20240715',
+            'timestamp': 1721008800,
+            'tags': [],
+            'creators': ['Discovery'],
+            'thumbnail': 'https://us1-prod-images.disco-api.com/2024/07/10/5e39637d-cabf-3ab3-8e9a-f4e9d37bc036.jpeg',
+        },
+    }, {
         'url': 'https://go.discovery.com/video/dirty-jobs-discovery-atve-us/rodbuster-galvanizer',
         'info_dict': {
             'id': '4164906',
@@ -397,6 +436,26 @@ class GoDiscoveryIE(DiscoveryPlusBaseIE):
 class TravelChannelIE(DiscoveryPlusBaseIE):
     _VALID_URL = r'https?://(?:watch\.)?travelchannel\.com/video' + DPlayBaseIE._PATH_REGEX
     _TESTS = [{
+        'url': 'https://watch.travelchannel.com/video/the-dead-files-travel-channel/protect-the-children',
+        'info_dict': {
+            'id': '4710177',
+            'display_id': 'the-dead-files-travel-channel/protect-the-children',
+            'ext': 'mp4',
+            'title': 'Protect the Children',
+            'description': 'An evil presence threatens an Ohio woman\'s children and marriage.',
+            'season_number': 14,
+            'season': 'Season 14',
+            'episode_number': 10,
+            'episode': 'Episode 10',
+            'series': 'The Dead Files',
+            'duration': 2550.481,
+            'timestamp': 1664510400,
+            'upload_date': '20220930',
+            'tags': [],
+            'creators': ['Travel Channel'],
+            'thumbnail': 'https://us1-prod-images.disco-api.com/2022/03/17/5e45eace-de5d-343a-9293-f400a2aa77d5.jpeg',
+        },
+    }, {
         'url': 'https://watch.travelchannel.com/video/ghost-adventures-travel-channel/ghost-train-of-ely',
         'info_dict': {
             'id': '2220256',
@@ -424,6 +483,26 @@ class TravelChannelIE(DiscoveryPlusBaseIE):
 class CookingChannelIE(DiscoveryPlusBaseIE):
     _VALID_URL = r'https?://(?:watch\.)?cookingchanneltv\.com/video' + DPlayBaseIE._PATH_REGEX
     _TESTS = [{
+        'url': 'https://watch.cookingchanneltv.com/video/bobbys-triple-threat-food-network-atve-us/titans-vs-marcus-samuelsson',
+        'info_dict': {
+            'id': '5350005',
+            'ext': 'mp4',
+            'display_id': 'bobbys-triple-threat-food-network-atve-us/titans-vs-marcus-samuelsson',
+            'title': 'Titans vs Marcus Samuelsson',
+            'description': 'Marcus Samuelsson throws his legendary global tricks at the Titans.',
+            'episode_number': 1,
+            'episode': 'Episode 1',
+            'season_number': 3,
+            'season': 'Season 3',
+            'series': 'Bobby\'s Triple Threat',
+            'duration': 2520.851,
+            'upload_date': '20240710',
+            'timestamp': 1720573200,
+            'tags': [],
+            'creators': ['Food Network'],
+            'thumbnail': 'https://us1-prod-images.disco-api.com/2024/07/04/529cd095-27ec-35c5-84e9-90ebd3e5d2da.jpeg',
+        },
+    }, {
         'url': 'https://watch.cookingchanneltv.com/video/carnival-eats-cooking-channel/the-postman-always-brings-rice-2348634',
         'info_dict': {
             'id': '2348634',
@@ -451,6 +530,22 @@ class CookingChannelIE(DiscoveryPlusBaseIE):
 class HGTVUsaIE(DiscoveryPlusBaseIE):
     _VALID_URL = r'https?://(?:watch\.)?hgtv\.com/video' + DPlayBaseIE._PATH_REGEX
     _TESTS = [{
+        'url': 'https://watch.hgtv.com/video/flip-or-flop-the-final-flip-hgtv-atve-us/flip-or-flop-the-final-flip',
+        'info_dict': {
+            'id': '5025585',
+            'display_id': 'flip-or-flop-the-final-flip-hgtv-atve-us/flip-or-flop-the-final-flip',
+            'ext': 'mp4',
+            'title': 'Flip or Flop: The Final Flip',
+            'description': 'Tarek and Christina are going their separate ways after one last flip!',
+            'series': 'Flip or Flop: The Final Flip',
+            'duration': 2580.644,
+            'upload_date': '20231101',
+            'timestamp': 1698811200,
+            'tags': [],
+            'creators': ['HGTV'],
+            'thumbnail': 'https://us1-prod-images.disco-api.com/2022/11/27/455caa6c-1462-3f14-b63d-a026d7a5e6d3.jpeg',
+        },
+    }, {
         'url': 'https://watch.hgtv.com/video/home-inspector-joe-hgtv-atve-us/this-mold-house',
         'info_dict': {
             'id': '4289736',
@@ -478,6 +573,26 @@ class HGTVUsaIE(DiscoveryPlusBaseIE):
 class FoodNetworkIE(DiscoveryPlusBaseIE):
     _VALID_URL = r'https?://(?:watch\.)?foodnetwork\.com/video' + DPlayBaseIE._PATH_REGEX
     _TESTS = [{
+        'url': 'https://watch.foodnetwork.com/video/guys-grocery-games-food-network/wild-in-the-aisles',
+        'info_dict': {
+            'id': '2152549',
+            'display_id': 'guys-grocery-games-food-network/wild-in-the-aisles',
+            'ext': 'mp4',
+            'title': 'Wild in the Aisles',
+            'description': 'The chefs make spaghetti and meatballs with "Out of Stock" ingredients.',
+            'season_number': 1,
+            'season': 'Season 1',
+            'episode_number': 1,
+            'episode': 'Episode 1',
+            'series': 'Guy\'s Grocery Games',
+            'tags': [],
+            'creators': ['Food Network'],
+            'duration': 2520.651,
+            'upload_date': '20230623',
+            'timestamp': 1687492800,
+            'thumbnail': 'https://us1-prod-images.disco-api.com/2022/06/15/37fb5333-cad2-3dbb-af7c-c20ec77c89c6.jpeg',
+        },
+    }, {
         'url': 'https://watch.foodnetwork.com/video/kids-baking-championship-food-network/float-like-a-butterfly',
         'info_dict': {
             'id': '4116449',
@@ -505,6 +620,26 @@ class FoodNetworkIE(DiscoveryPlusBaseIE):
 class DestinationAmericaIE(DiscoveryPlusBaseIE):
     _VALID_URL = r'https?://(?:www\.)?destinationamerica\.com/video' + DPlayBaseIE._PATH_REGEX
     _TESTS = [{
+        'url': 'https://www.destinationamerica.com/video/bbq-pit-wars-destination-america/smoke-on-the-water',
+        'info_dict': {
+            'id': '2218409',
+            'display_id': 'bbq-pit-wars-destination-america/smoke-on-the-water',
+            'ext': 'mp4',
+            'title': 'Smoke on the Water',
+            'description': 'The pitmasters head to Georgia for the Smoke on the Water BBQ Festival.',
+            'season_number': 2,
+            'season': 'Season 2',
+            'episode_number': 1,
+            'episode': 'Episode 1',
+            'series': 'BBQ Pit Wars',
+            'tags': [],
+            'creators': ['Destination America'],
+            'duration': 2614.878,
+            'upload_date': '20230623',
+            'timestamp': 1687492800,
+            'thumbnail': 'https://us1-prod-images.disco-api.com/2020/05/11/c0f8e85d-9a10-3e6f-8e43-f6faafa81ba2.jpeg',
+        },
+    }, {
         'url': 'https://www.destinationamerica.com/video/alaska-monsters-destination-america-atve-us/central-alaskas-bigfoot',
         'info_dict': {
             'id': '4210904',
@@ -532,6 +667,26 @@ class DestinationAmericaIE(DiscoveryPlusBaseIE):
 class InvestigationDiscoveryIE(DiscoveryPlusBaseIE):
     _VALID_URL = r'https?://(?:www\.)?investigationdiscovery\.com/video' + DPlayBaseIE._PATH_REGEX
     _TESTS = [{
+        'url': 'https://www.investigationdiscovery.com/video/deadly-influence-the-social-media-murders-investigation-discovery-atve-us/rip-bianca',
+        'info_dict': {
+            'id': '5341132',
+            'display_id': 'deadly-influence-the-social-media-murders-investigation-discovery-atve-us/rip-bianca',
+            'ext': 'mp4',
+            'title': 'RIP Bianca',
+            'description': 'A teenage influencer discovers an online world of threat, harm and danger.',
+            'season_number': 1,
+            'season': 'Season 1',
+            'episode_number': 3,
+            'episode': 'Episode 3',
+            'series': 'Deadly Influence: The Social Media Murders',
+            'creators': ['Investigation Discovery'],
+            'tags': [],
+            'duration': 2490.888,
+            'upload_date': '20240618',
+            'timestamp': 1718672400,
+            'thumbnail': 'https://us1-prod-images.disco-api.com/2024/06/15/b567c774-9e44-3c6c-b0ba-db860a73e812.jpeg',
+        },
+    }, {
         'url': 'https://www.investigationdiscovery.com/video/unmasked-investigation-discovery/the-killer-clown',
         'info_dict': {
             'id': '2139409',
@@ -559,6 +714,26 @@ class InvestigationDiscoveryIE(DiscoveryPlusBaseIE):
 class AmHistoryChannelIE(DiscoveryPlusBaseIE):
     _VALID_URL = r'https?://(?:www\.)?ahctv\.com/video' + DPlayBaseIE._PATH_REGEX
     _TESTS = [{
+        'url': 'https://www.ahctv.com/video/blood-and-fury-americas-civil-war-ahc/battle-of-bull-run',
+        'info_dict': {
+            'id': '2139199',
+            'display_id': 'blood-and-fury-americas-civil-war-ahc/battle-of-bull-run',
+            'ext': 'mp4',
+            'title': 'Battle of Bull Run',
+            'description': 'Two untested armies clash in the first real battle of the Civil War.',
+            'season_number': 1,
+            'season': 'Season 1',
+            'episode_number': 1,
+            'episode': 'Episode 1',
+            'series': 'Blood and Fury: America\'s Civil War',
+            'duration': 2612.509,
+            'upload_date': '20220923',
+            'timestamp': 1663905600,
+            'creators': ['AHC'],
+            'tags': [],
+            'thumbnail': 'https://us1-prod-images.disco-api.com/2020/05/11/4af61bd7-d705-3108-82c4-1a6e541e20fa.jpeg',
+        },
+    }, {
         'url': 'https://www.ahctv.com/video/modern-sniper-ahc/army',
         'info_dict': {
             'id': '2309730',
@@ -586,6 +761,26 @@ class AmHistoryChannelIE(DiscoveryPlusBaseIE):
 class ScienceChannelIE(DiscoveryPlusBaseIE):
     _VALID_URL = r'https?://(?:www\.)?sciencechannel\.com/video' + DPlayBaseIE._PATH_REGEX
     _TESTS = [{
+        'url': 'https://www.sciencechannel.com/video/spaces-deepest-secrets-science-atve-us/mystery-of-the-dead-planets',
+        'info_dict': {
+            'id': '2347335',
+            'display_id': 'spaces-deepest-secrets-science-atve-us/mystery-of-the-dead-planets',
+            'ext': 'mp4',
+            'title': 'Mystery of the Dead Planets',
+            'description': 'Astronomers unmask the truly destructive nature of the cosmos.',
+            'season_number': 7,
+            'season': 'Season 7',
+            'episode_number': 1,
+            'episode': 'Episode 1',
+            'series': 'Space\'s Deepest Secrets',
+            'duration': 2524.989,
+            'upload_date': '20230128',
+            'timestamp': 1674882000,
+            'creators': ['Science'],
+            'tags': [],
+            'thumbnail': 'https://us1-prod-images.disco-api.com/2021/03/30/3796829d-aead-3f9a-bd8d-e49048b3cdca.jpeg',
+        },
+    }, {
         'url': 'https://www.sciencechannel.com/video/strangest-things-science-atve-us/nazi-mystery-machine',
         'info_dict': {
             'id': '2842849',
@@ -610,36 +805,29 @@ class ScienceChannelIE(DiscoveryPlusBaseIE):
     }
 
 
-class DIYNetworkIE(DiscoveryPlusBaseIE):
-    _VALID_URL = r'https?://(?:watch\.)?diynetwork\.com/video' + DPlayBaseIE._PATH_REGEX
-    _TESTS = [{
-        'url': 'https://watch.diynetwork.com/video/pool-kings-diy-network/bringing-beach-life-to-texas',
-        'info_dict': {
-            'id': '2309730',
-            'display_id': 'pool-kings-diy-network/bringing-beach-life-to-texas',
-            'ext': 'mp4',
-            'title': 'Bringing Beach Life to Texas',
-            'description': 'The Pool Kings give a family a day at the beach in their own backyard.',
-            'season_number': 10,
-            'episode_number': 2,
-        },
-        'skip': 'Available for Premium users',
-    }, {
-        'url': 'https://watch.diynetwork.com/video/pool-kings-diy-network/bringing-beach-life-to-texas',
-        'only_matching': True,
-    }]
-
-    _PRODUCT = 'diy'
-    _DISCO_API_PARAMS = {
-        'disco_host': 'us1-prod-direct.watch.diynetwork.com',
-        'realm': 'go',
-        'country': 'us',
-    }
-
-
 class DiscoveryLifeIE(DiscoveryPlusBaseIE):
     _VALID_URL = r'https?://(?:www\.)?discoverylife\.com/video' + DPlayBaseIE._PATH_REGEX
     _TESTS = [{
+        'url': 'https://www.discoverylife.com/video/er-files-discovery-life-atve-us/sweet-charity',
+        'info_dict': {
+            'id': '2347614',
+            'display_id': 'er-files-discovery-life-atve-us/sweet-charity',
+            'ext': 'mp4',
+            'title': 'Sweet Charity',
+            'description': 'The staff at Charity Hospital treat a serious foot infection.',
+            'season_number': 1,
+            'season': 'Season 1',
+            'episode_number': 1,
+            'episode': 'Episode 1',
+            'series': 'ER Files',
+            'duration': 2364.261,
+            'upload_date': '20230721',
+            'timestamp': 1689912000,
+            'creators': ['Discovery Life'],
+            'tags': [],
+            'thumbnail': 'https://us1-prod-images.disco-api.com/2021/03/16/4b6f0124-360b-3546-b6a4-5552db886b86.jpeg',
+        },
+    }, {
         'url': 'https://www.discoverylife.com/video/surviving-death-discovery-life-atve-us/bodily-trauma',
         'info_dict': {
             'id': '2218238',
@@ -667,6 +855,26 @@ class DiscoveryLifeIE(DiscoveryPlusBaseIE):
 class AnimalPlanetIE(DiscoveryPlusBaseIE):
     _VALID_URL = r'https?://(?:www\.)?animalplanet\.com/video' + DPlayBaseIE._PATH_REGEX
     _TESTS = [{
+        'url': 'https://www.animalplanet.com/video/mysterious-creatures-with-forrest-galante-animal-planet-atve-us/the-demon-of-peru',
+        'info_dict': {
+            'id': '4650835',
+            'display_id': 'mysterious-creatures-with-forrest-galante-animal-planet-atve-us/the-demon-of-peru',
+            'ext': 'mp4',
+            'title': 'The Demon of Peru',
+            'description': 'In Peru, a farming village is being terrorized by a “man-like beast.”',
+            'season_number': 1,
+            'season': 'Season 1',
+            'episode_number': 4,
+            'episode': 'Episode 4',
+            'series': 'Mysterious Creatures with Forrest Galante',
+            'duration': 2490.488,
+            'upload_date': '20230111',
+            'timestamp': 1673413200,
+            'creators': ['Animal Planet'],
+            'tags': [],
+            'thumbnail': 'https://us1-prod-images.disco-api.com/2022/03/01/6dbaa833-9a2e-3fee-9381-c19eddf67c0c.jpeg',
+        },
+    }, {
         'url': 'https://www.animalplanet.com/video/north-woods-law-animal-planet/squirrel-showdown',
         'info_dict': {
             'id': '3338923',
@@ -694,6 +902,26 @@ class AnimalPlanetIE(DiscoveryPlusBaseIE):
 class TLCIE(DiscoveryPlusBaseIE):
     _VALID_URL = r'https?://(?:go\.)?tlc\.com/video' + DPlayBaseIE._PATH_REGEX
     _TESTS = [{
+        'url': 'https://go.tlc.com/video/90-day-the-last-resort-tlc-atve-us/the-last-chance',
+        'info_dict': {
+            'id': '5186422',
+            'display_id': '90-day-the-last-resort-tlc-atve-us/the-last-chance',
+            'ext': 'mp4',
+            'title': 'The Last Chance',
+            'description': 'Infidelity shakes Kalani and Asuelu\'s world, and Angela threatens divorce.',
+            'season_number': 1,
+            'season': 'Season 1',
+            'episode_number': 1,
+            'episode': 'Episode 1',
+            'series': '90 Day: The Last Resort',
+            'duration': 5123.91,
+            'upload_date': '20230815',
+            'timestamp': 1692061200,
+            'creators': ['TLC'],
+            'tags': [],
+            'thumbnail': 'https://us1-prod-images.disco-api.com/2023/08/08/0ee367e2-ac76-334d-bf23-dbf796696a24.jpeg',
+        },
+    }, {
         'url': 'https://go.tlc.com/video/my-600-lb-life-tlc/melissas-story-part-1',
         'info_dict': {
             'id': '2206540',
@@ -718,93 +946,8 @@ class TLCIE(DiscoveryPlusBaseIE):
     }
 
 
-class MotorTrendIE(DiscoveryPlusBaseIE):
-    _VALID_URL = r'https?://(?:watch\.)?motortrend\.com/video' + DPlayBaseIE._PATH_REGEX
-    _TESTS = [{
-        'url': 'https://watch.motortrend.com/video/car-issues-motortrend-atve-us/double-dakotas',
-        'info_dict': {
-            'id': '"4859182"',
-            'display_id': 'double-dakotas',
-            'ext': 'mp4',
-            'title': 'Double Dakotas',
-            'description': 'Tylers buy-one-get-one Dakota deal has the Wizard pulling double duty.',
-            'season_number': 2,
-            'episode_number': 3,
-        },
-        'skip': 'Available for Premium users',
-    }, {
-        'url': 'https://watch.motortrend.com/video/car-issues-motortrend-atve-us/double-dakotas',
-        'only_matching': True,
-    }]
-
-    _PRODUCT = 'vel'
-    _DISCO_API_PARAMS = {
-        'disco_host': 'us1-prod-direct.watch.motortrend.com',
-        'realm': 'go',
-        'country': 'us',
-    }
-
-
-class MotorTrendOnDemandIE(DiscoveryPlusBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?motortrend(?:ondemand\.com|\.com/plus)/detail' + DPlayBaseIE._PATH_REGEX
-    _TESTS = [{
-        'url': 'https://www.motortrendondemand.com/detail/wheelstanding-dump-truck-stubby-bobs-comeback/37699/784',
-        'info_dict': {
-            'id': '37699',
-            'display_id': 'wheelstanding-dump-truck-stubby-bobs-comeback/37699',
-            'ext': 'mp4',
-            'title': 'Wheelstanding Dump Truck! Stubby Bob’s Comeback',
-            'description': 'md5:996915abe52a1c3dfc83aecea3cce8e7',
-            'season_number': 5,
-            'episode_number': 52,
-            'episode': 'Episode 52',
-            'season': 'Season 5',
-            'thumbnail': r're:^https?://.+\.jpe?g$',
-            'timestamp': 1388534401,
-            'duration': 1887.345,
-            'creator': 'Originals',
-            'series': 'Roadkill',
-            'upload_date': '20140101',
-            'tags': [],
-        },
-    }, {
-        'url': 'https://www.motortrend.com/plus/detail/roadworthy-rescues-teaser-trailer/4922860/',
-        'info_dict': {
-            'id': '4922860',
-            'ext': 'mp4',
-            'title': 'Roadworthy Rescues | Teaser Trailer',
-            'description': 'Derek Bieri helps Freiburger and Finnegan with their \'68 big-block Dart.',
-            'display_id': 'roadworthy-rescues-teaser-trailer/4922860',
-            'creator': 'Originals',
-            'series': 'Roadworthy Rescues',
-            'thumbnail': r're:^https?://.+\.jpe?g$',
-            'upload_date': '20220907',
-            'timestamp': 1662523200,
-            'duration': 1066.356,
-            'tags': [],
-        },
-    }, {
-        'url': 'https://www.motortrend.com/plus/detail/ugly-duckling/2450033/12439',
-        'only_matching': True,
-    }]
-
-    _PRODUCT = 'MTOD'
-    _DISCO_API_PARAMS = {
-        'disco_host': 'us1-prod-direct.motortrendondemand.com',
-        'realm': 'motortrend',
-        'country': 'us',
-    }
-
-    def _update_disco_api_headers(self, headers, disco_base, display_id, realm):
-        headers.update({
-            'x-disco-params': f'realm={realm}',
-            'x-disco-client': f'WEB:UNKNOWN:{self._PRODUCT}:4.39.1-gi1',
-            'Authorization': self._get_auth(disco_base, display_id, realm),
-        })
-
-
 class DiscoveryPlusIE(DiscoveryPlusBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?discoveryplus\.com/(?!it/)(?:\w{2}/)?video' + DPlayBaseIE._PATH_REGEX
+    _VALID_URL = r'https?://(?:www\.)?discoveryplus\.com/(?!it/)(?:(?P<country>[a-z]{2})/)?video(?:/sport|/olympics)?' + DPlayBaseIE._PATH_REGEX
     _TESTS = [{
         'url': 'https://www.discoveryplus.com/video/property-brothers-forever-home/food-and-family',
         'info_dict': {
@@ -825,14 +968,45 @@ class DiscoveryPlusIE(DiscoveryPlusBaseIE):
     }, {
         'url': 'https://discoveryplus.com/ca/video/bering-sea-gold-discovery-ca/goldslingers',
         'only_matching': True,
+    }, {
+        'url': 'https://www.discoveryplus.com/gb/video/sport/eurosport-1-british-eurosport-1-british-sport/6-hours-of-spa-review',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.discoveryplus.com/gb/video/olympics/dplus-sport-dplus-sport-sport/rugby-sevens-australia-samoa',
+        'only_matching': True,
     }]
 
-    _PRODUCT = 'dplus_us'
-    _DISCO_API_PARAMS = {
-        'disco_host': 'us1-prod-direct.discoveryplus.com',
-        'realm': 'go',
-        'country': 'us',
-    }
+    _PRODUCT = None
+    _DISCO_API_PARAMS = None
+
+    def _update_disco_api_headers(self, headers, disco_base, display_id, realm):
+        headers.update({
+            'x-disco-params': f'realm={realm},siteLookupKey={self._PRODUCT}',
+            'x-disco-client': f'WEB:UNKNOWN:dplus_us:{self._DISCO_CLIENT_VER}',
+            'Authorization': self._get_auth(disco_base, display_id, realm),
+        })
+
+    def _real_extract(self, url):
+        video_id, country = self._match_valid_url(url).group('id', 'country')
+        if not country:
+            country = 'us'
+
+        self._PRODUCT = f'dplus_{country}'
+
+        if country in ('br', 'ca', 'us'):
+            self._DISCO_API_PARAMS = {
+                'disco_host': 'us1-prod-direct.discoveryplus.com',
+                'realm': 'go',
+                'country': country,
+            }
+        else:
+            self._DISCO_API_PARAMS = {
+                'disco_host': 'eu1-prod-direct.discoveryplus.com',
+                'realm': 'dplay',
+                'country': country,
+            }
+
+        return self._get_disco_api_info(url, video_id, **self._DISCO_API_PARAMS)
 
 
 class DiscoveryPlusIndiaIE(DiscoveryPlusBaseIE):
@@ -859,7 +1033,7 @@ class DiscoveryPlusIndiaIE(DiscoveryPlusBaseIE):
         },
         'params': {
             'skip_download': True,
-        }
+        },
     }]
 
     _PRODUCT = 'dplus-india'
@@ -872,16 +1046,37 @@ class DiscoveryPlusIndiaIE(DiscoveryPlusBaseIE):
 
     def _update_disco_api_headers(self, headers, disco_base, display_id, realm):
         headers.update({
-            'x-disco-params': 'realm=%s' % realm,
+            'x-disco-params': f'realm={realm}',
             'x-disco-client': f'WEB:UNKNOWN:{self._PRODUCT}:17.0.0',
             'Authorization': self._get_auth(disco_base, display_id, realm),
         })
 
 
-class DiscoveryNetworksDeIE(DPlayBaseIE):
+class DiscoveryNetworksDeIE(DiscoveryPlusBaseIE):
     _VALID_URL = r'https?://(?:www\.)?(?P<domain>(?:tlc|dmax)\.de|dplay\.co\.uk)/(?:programme|show|sendungen)/(?P<programme>[^/]+)/(?:video/)?(?P<alternate_id>[^/]+)'
 
     _TESTS = [{
+        'url': 'https://dmax.de/sendungen/goldrausch-in-australien/german-gold',
+        'info_dict': {
+            'id': '4756322',
+            'ext': 'mp4',
+            'title': 'German Gold',
+            'description': 'md5:f3073306553a8d9b40e6ac4cdbf09fc6',
+            'display_id': 'goldrausch-in-australien/german-gold',
+            'episode': 'Episode 1',
+            'episode_number': 1,
+            'season': 'Season 5',
+            'season_number': 5,
+            'series': 'Goldrausch in Australien',
+            'duration': 2648.0,
+            'upload_date': '20230517',
+            'timestamp': 1684357500,
+            'creators': ['DMAX'],
+            'thumbnail': 'https://eu1-prod-images.disco-api.com/2023/05/09/f72fb510-7992-3b12-af7f-f16a2c22d1e3.jpeg',
+            'tags': ['schatzsucher', 'schatz', 'nugget', 'bodenschätze', 'down under', 'australien', 'goldrausch'],
+        },
+        'params': {'skip_download': 'm3u8'},
+    }, {
         'url': 'https://www.tlc.de/programme/breaking-amish/video/die-welt-da-drauen/DCB331270001100',
         'info_dict': {
             'id': '78867',
@@ -901,9 +1096,7 @@ class DiscoveryNetworksDeIE(DPlayBaseIE):
             'season_number': 1,
             'thumbnail': r're:https://.+\.jpg',
         },
-        'params': {
-            'skip_download': True,
-        },
+        'skip': '404 Not Found',
     }, {
         'url': 'https://www.dmax.de/programme/dmax-highlights/video/tuning-star-sidney-hoffmann-exklusiv-bei-dmax/191023082312316',
         'only_matching': True,
@@ -920,8 +1113,14 @@ class DiscoveryNetworksDeIE(DPlayBaseIE):
         country = 'GB' if domain == 'dplay.co.uk' else 'DE'
         realm = 'questuk' if country == 'GB' else domain.replace('.', '')
         return self._get_disco_api_info(
-            url, '%s/%s' % (programme, alternate_id),
-            'sonic-eu1-prod.disco-api.com', realm, country)
+            url, f'{programme}/{alternate_id}', 'eu1-prod.disco-api.com', realm, country)
+
+    def _update_disco_api_headers(self, headers, disco_base, display_id, realm):
+        headers.update({
+            'x-disco-params': f'realm={realm}',
+            'x-disco-client': 'Alps:HyogaPlayer:0.0.0',
+            'Authorization': self._get_auth(disco_base, display_id, realm),
+        })
 
 
 class DiscoveryPlusShowBaseIE(DPlayBaseIE):
@@ -944,14 +1143,14 @@ class DiscoveryPlusShowBaseIE(DPlayBaseIE):
             while page_num < total_pages:
                 season_json = self._download_json(
                     season_url.format(season_id, show_id, str(page_num + 1)), show_name, headers=headers,
-                    note='Downloading season %s JSON metadata%s' % (season_id, ' page %d' % page_num if page_num else ''))
+                    note='Downloading season {} JSON metadata{}'.format(season_id, f' page {page_num}' if page_num else ''))
                 if page_num == 0:
                     total_pages = try_get(season_json, lambda x: x['meta']['totalPages'], int) or 1
                 episodes_json = season_json['data']
                 for episode in episodes_json:
                     video_path = episode['attributes']['path']
                     yield self.url_result(
-                        '%svideos/%s' % (self._DOMAIN, video_path),
+                        f'{self._DOMAIN}videos/{video_path}',
                         ie=self._VIDEO_IE.ie_key(), video_id=episode.get('id') or video_path)
                 page_num += 1
 
@@ -961,16 +1160,22 @@ class DiscoveryPlusShowBaseIE(DPlayBaseIE):
 
 
 class DiscoveryPlusItalyIE(DiscoveryPlusBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?discoveryplus\.com/it/video' + DPlayBaseIE._PATH_REGEX
+    _VALID_URL = r'https?://(?:www\.)?discoveryplus\.com/it/video(?:/sport|/olympics)?' + DPlayBaseIE._PATH_REGEX
     _TESTS = [{
         'url': 'https://www.discoveryplus.com/it/video/i-signori-della-neve/stagione-2-episodio-1-i-preparativi',
         'only_matching': True,
     }, {
         'url': 'https://www.discoveryplus.com/it/video/super-benny/trailer',
         'only_matching': True,
+    }, {
+        'url': 'https://www.discoveryplus.com/it/video/olympics/dplus-sport-dplus-sport-sport/water-polo-greece-italy',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.discoveryplus.com/it/video/sport/dplus-sport-dplus-sport-sport/lisa-vittozzi-allinferno-e-ritorno',
+        'only_matching': True,
     }]
 
-    _PRODUCT = 'dplus_us'
+    _PRODUCT = 'dplus_it'
     _DISCO_API_PARAMS = {
         'disco_host': 'eu1-prod-direct.discoveryplus.com',
         'realm': 'dplay',
@@ -979,8 +1184,8 @@ class DiscoveryPlusItalyIE(DiscoveryPlusBaseIE):
 
     def _update_disco_api_headers(self, headers, disco_base, display_id, realm):
         headers.update({
-            'x-disco-params': 'realm=%s' % realm,
-            'x-disco-client': f'WEB:UNKNOWN:{self._PRODUCT}:25.2.6',
+            'x-disco-params': f'realm={realm},siteLookupKey={self._PRODUCT}',
+            'x-disco-client': f'WEB:UNKNOWN:dplus_us:{self._DISCO_CLIENT_VER}',
             'Authorization': self._get_auth(disco_base, display_id, realm),
         })
 
@@ -1021,39 +1226,3 @@ class DiscoveryPlusIndiaShowIE(DiscoveryPlusShowBaseIE):
     _SHOW_STR = 'show'
     _INDEX = 4
     _VIDEO_IE = DiscoveryPlusIndiaIE
-
-
-class GlobalCyclingNetworkPlusIE(DiscoveryPlusBaseIE):
-    _VALID_URL = r'https?://plus\.globalcyclingnetwork\.com/watch/(?P<id>\d+)'
-    _TESTS = [{
-        'url': 'https://plus.globalcyclingnetwork.com/watch/1397691',
-        'info_dict': {
-            'id': '1397691',
-            'ext': 'mp4',
-            'title': 'The Athertons: Mountain Biking\'s Fastest Family',
-            'description': 'md5:75a81937fcd8b989eec6083a709cd837',
-            'thumbnail': 'https://us1-prod-images.disco-api.com/2021/03/04/eb9e3026-4849-3001-8281-9356466f0557.png',
-            'series': 'gcn',
-            'creator': 'Gcn',
-            'upload_date': '20210309',
-            'timestamp': 1615248000,
-            'duration': 2531.0,
-            'tags': [],
-        },
-        'skip': 'Subscription required',
-        'params': {'skip_download': 'm3u8'},
-    }]
-
-    _PRODUCT = 'web'
-    _DISCO_API_PARAMS = {
-        'disco_host': 'disco-api-prod.globalcyclingnetwork.com',
-        'realm': 'gcn',
-        'country': 'us',
-    }
-
-    def _update_disco_api_headers(self, headers, disco_base, display_id, realm):
-        headers.update({
-            'x-disco-params': f'realm={realm}',
-            'x-disco-client': f'WEB:UNKNOWN:{self._PRODUCT}:27.3.2',
-            'Authorization': self._get_auth(disco_base, display_id, realm),
-        })
diff --git a/plugins/youtube_download/yt_dlp/extractor/drbonanza.py b/plugins/youtube_download/yt_dlp/extractor/drbonanza.py
index 824d70d..40dc141 100644
--- a/plugins/youtube_download/yt_dlp/extractor/drbonanza.py
+++ b/plugins/youtube_download/yt_dlp/extractor/drbonanza.py
@@ -40,7 +40,7 @@ class DRBonanzaIE(InfoExtractor):
 
         def extract(field):
             return self._search_regex(
-                r'<div[^>]+>\s*<p>%s:<p>\s*</div>\s*<div[^>]+>\s*<p>([^<]+)</p>' % field,
+                rf'<div[^>]+>\s*<p>{field}:<p>\s*</div>\s*<div[^>]+>\s*<p>([^<]+)</p>',
                 webpage, field, default=None)
 
         info.update({
diff --git a/plugins/youtube_download/yt_dlp/extractor/dreisat.py b/plugins/youtube_download/yt_dlp/extractor/dreisat.py
index 8a59c23..edd66e4 100644
--- a/plugins/youtube_download/yt_dlp/extractor/dreisat.py
+++ b/plugins/youtube_download/yt_dlp/extractor/dreisat.py
@@ -1,35 +1,76 @@
-from .zdf import ZDFIE
+from .zdf import ZDFBaseIE
+from ..utils import (
+    int_or_none,
+    merge_dicts,
+    parse_iso8601,
+)
+from ..utils.traversal import require, traverse_obj
 
 
-class DreiSatIE(ZDFIE):  # XXX: Do not subclass from concrete IE
+class DreiSatIE(ZDFBaseIE):
     IE_NAME = '3sat'
-    _VALID_URL = r'https?://(?:www\.)?3sat\.de/(?:[^/]+/)*(?P<id>[^/?#&]+)\.html'
+    _VALID_URL = r'https?://(?:www\.)?3sat\.de/(?:[^/?#]+/)*(?P<id>[^/?#&]+)\.html'
     _TESTS = [{
-        # Same as https://www.zdf.de/dokumentation/ab-18/10-wochen-sommer-102.html
-        'url': 'https://www.3sat.de/film/ab-18/10-wochen-sommer-108.html',
-        'md5': '0aff3e7bc72c8813f5e0fae333316a1d',
+        'url': 'https://www.3sat.de/dokumentation/reise/traumziele-suedostasiens-die-philippinen-und-vietnam-102.html',
         'info_dict': {
-            'id': '141007_ab18_10wochensommer_film',
+            'id': '231124_traumziele_philippinen_und_vietnam_dokreise',
             'ext': 'mp4',
-            'title': 'Ab 18! - 10 Wochen Sommer',
-            'description': 'md5:8253f41dc99ce2c3ff892dac2d65fe26',
-            'duration': 2660,
-            'timestamp': 1608604200,
-            'upload_date': '20201222',
+            'title': 'Traumziele Südostasiens (1/2): Die Philippinen und Vietnam',
+            'description': 'md5:26329ce5197775b596773b939354079d',
+            'duration': 2625.0,
+            'thumbnail': 'https://www.3sat.de/assets/traumziele-suedostasiens-die-philippinen-und-vietnam-100~original?cb=1699870351148',
+            'episode': 'Traumziele Südostasiens (1/2): Die Philippinen und Vietnam',
+            'episode_id': 'POS_cc7ff51c-98cf-4d12-b99d-f7a551de1c95',
+            'timestamp': 1747920900,
+            'upload_date': '20250522',
         },
     }, {
-        'url': 'https://www.3sat.de/gesellschaft/schweizweit/waidmannsheil-100.html',
+        'url': 'https://www.3sat.de/film/ab-18/ab-18---mein-fremdes-ich-100.html',
+        'md5': 'f92638413a11d759bdae95c9d8ec165c',
         'info_dict': {
-            'id': '140913_sendung_schweizweit',
+            'id': '221128_mein_fremdes_ich2_ab18',
             'ext': 'mp4',
-            'title': 'Waidmannsheil',
-            'description': 'md5:cce00ca1d70e21425e72c86a98a56817',
-            'timestamp': 1410623100,
-            'upload_date': '20140913'
+            'title': 'Ab 18! - Mein fremdes Ich',
+            'description': 'md5:cae0c0b27b7426d62ca0dda181738bf0',
+            'duration': 2625.0,
+            'thumbnail': 'https://www.3sat.de/assets/ab-18---mein-fremdes-ich-106~original?cb=1666081865812',
+            'episode': 'Ab 18! - Mein fremdes Ich',
+            'episode_id': 'POS_6225d1ca-a0d5-45e3-870b-e783ee6c8a3f',
+            'timestamp': 1695081600,
+            'upload_date': '20230919',
+        },
+    }, {
+        'url': 'https://www.3sat.de/gesellschaft/37-grad-leben/aus-dem-leben-gerissen-102.html',
+        'md5': 'a903eaf8d1fd635bd3317cd2ad87ec84',
+        'info_dict': {
+            'id': '250323_0903_sendung_sgl',
+            'ext': 'mp4',
+            'title': 'Plötzlich ohne dich',
+            'description': 'md5:380cc10659289dd91510ad8fa717c66b',
+            'duration': 1620.0,
+            'thumbnail': 'https://www.3sat.de/assets/37-grad-leben-106~original?cb=1645537156810',
+            'episode': 'Plötzlich ohne dich',
+            'episode_id': 'POS_faa7a93c-c0f2-4d51-823f-ce2ac3ee191b',
+            'timestamp': 1743162540,
+            'upload_date': '20250328',
+        },
+    }, {
+        # Video with chapters
+        'url': 'https://www.3sat.de/kultur/buchmesse/dein-buch-das-beste-von-der-leipziger-buchmesse-2025-teil-1-100.html',
+        'md5': '6b95790ce52e75f0d050adcdd2711ee6',
+        'info_dict': {
+            'id': '250330_dein_buch1_bum',
+            'ext': 'mp4',
+            'title': 'dein buch  - Das Beste von der Leipziger Buchmesse 2025 - Teil 1',
+            'description': 'md5:bae51bfc22f15563ce3acbf97d2e8844',
+            'duration': 5399.0,
+            'thumbnail': 'https://www.3sat.de/assets/buchmesse-kerkeling-100~original?cb=1743329640903',
+            'chapters': 'count:24',
+            'episode': 'dein buch  - Das Beste von der Leipziger Buchmesse 2025 - Teil 1',
+            'episode_id': 'POS_1ef236cc-b390-401e-acd0-4fb4b04315fb',
+            'timestamp': 1743327000,
+            'upload_date': '20250330',
         },
-        'params': {
-            'skip_download': True,
-        }
     }, {
         # Same as https://www.zdf.de/filme/filme-sonstige/der-hauptmann-112.html
         'url': 'https://www.3sat.de/film/spielfilm/der-hauptmann-100.html',
@@ -39,3 +80,45 @@ class DreiSatIE(ZDFIE):  # XXX: Do not subclass from concrete IE
         'url': 'https://www.3sat.de/wissen/nano/nano-21-mai-2019-102.html',
         'only_matching': True,
     }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+        player = self._search_json(
+            r'data-zdfplayer-jsb=(["\'])', webpage, 'player JSON', video_id)
+        player_url = player['content']
+        api_token = f'Bearer {player["apiToken"]}'
+
+        content = self._call_api(player_url, video_id, 'video metadata', api_token)
+
+        video_target = content['mainVideoContent']['http://zdf.de/rels/target']
+        ptmd_path = traverse_obj(video_target, (
+            (('streams', 'default'), None),
+            ('http://zdf.de/rels/streams/ptmd', 'http://zdf.de/rels/streams/ptmd-template'),
+            {str}, any, {require('ptmd path')}))
+        ptmd_url = self._expand_ptmd_template(player_url, ptmd_path)
+        aspect_ratio = self._parse_aspect_ratio(video_target.get('aspectRatio'))
+        info = self._extract_ptmd(ptmd_url, video_id, api_token, aspect_ratio)
+
+        return merge_dicts(info, {
+            **traverse_obj(content, {
+                'title': (('title', 'teaserHeadline'), {str}, any),
+                'episode': (('title', 'teaserHeadline'), {str}, any),
+                'description': (('leadParagraph', 'teasertext'), {str}, any),
+                'timestamp': ('editorialDate', {parse_iso8601}),
+            }),
+            **traverse_obj(video_target, {
+                'duration': ('duration', {int_or_none}),
+                'chapters': ('streamAnchorTag', {self._extract_chapters}),
+            }),
+            'thumbnails': self._extract_thumbnails(traverse_obj(content, ('teaserImageRef', 'layouts', {dict}))),
+            **traverse_obj(content, ('programmeItem', 0, 'http://zdf.de/rels/target', {
+                'series_id': ('http://zdf.de/rels/cmdm/series', 'seriesUuid', {str}),
+                'series': ('http://zdf.de/rels/cmdm/series', 'seriesTitle', {str}),
+                'season': ('http://zdf.de/rels/cmdm/season', 'seasonTitle', {str}),
+                'season_number': ('http://zdf.de/rels/cmdm/season', 'seasonNumber', {int_or_none}),
+                'season_id': ('http://zdf.de/rels/cmdm/season', 'seasonUuid', {str}),
+                'episode_number': ('episodeNumber', {int_or_none}),
+                'episode_id': ('contentId', {str}),
+            })),
+        })
diff --git a/plugins/youtube_download/yt_dlp/extractor/drooble.py b/plugins/youtube_download/yt_dlp/extractor/drooble.py
index 106e5c4..16e9a61 100644
--- a/plugins/youtube_download/yt_dlp/extractor/drooble.py
+++ b/plugins/youtube_download/yt_dlp/extractor/drooble.py
@@ -24,7 +24,7 @@ class DroobleIE(InfoExtractor):
             'timestamp': 1596241390,
             'uploader_id': '95894',
             'uploader': 'Bluebeat Shelter',
-        }
+        },
     }, {
         'url': 'https://drooble.com/karl340758/videos/2859183',
         'info_dict': {
@@ -35,7 +35,7 @@ class DroobleIE(InfoExtractor):
             'description': 'md5:ffc0bd8ba383db5341a86a6cd7d9bcca',
             'upload_date': '20200731',
             'uploader': 'Bluebeat Shelter',
-        }
+        },
     }, {
         'url': 'https://drooble.com/karl340758/music/albums/2858031',
         'info_dict': {
@@ -88,7 +88,7 @@ class DroobleIE(InfoExtractor):
                 entites.append({
                     '_type': 'url',
                     'url': url,
-                    'ie_key': 'Youtube'
+                    'ie_key': 'Youtube',
                 })
                 continue
             is_audio = (media.get('type') or '').lower() == 'audio'
diff --git a/plugins/youtube_download/yt_dlp/extractor/dropbox.py b/plugins/youtube_download/yt_dlp/extractor/dropbox.py
index 214b309..ce8435c 100644
--- a/plugins/youtube_download/yt_dlp/extractor/dropbox.py
+++ b/plugins/youtube_download/yt_dlp/extractor/dropbox.py
@@ -1,72 +1,108 @@
+import base64
 import os.path
 import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import compat_urllib_parse_unquote
 from ..utils import (
     ExtractorError,
-    traverse_obj,
-    try_get,
+    update_url,
+    update_url_query,
     url_basename,
+    urlencode_postdata,
 )
 
 
 class DropboxIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?dropbox[.]com/sh?/(?P<id>[a-zA-Z0-9]{15})/.*'
+    _VALID_URL = r'https?://(?:www\.)?dropbox\.com/(?:(?:e/)?scl/fi|sh?)/(?P<id>\w+)'
     _TESTS = [
         {
             'url': 'https://www.dropbox.com/s/nelirfsxnmcfbfh/youtube-dl%20test%20video%20%27%C3%A4%22BaW_jenozKc.mp4?dl=0',
             'info_dict': {
                 'id': 'nelirfsxnmcfbfh',
                 'ext': 'mp4',
-                'title': 'youtube-dl test video \'ä"BaW_jenozKc'
-            }
+                'title': 'youtube-dl test video \'ä"BaW_jenozKc',
+            },
         }, {
-            'url': 'https://www.dropbox.com/sh/662glsejgzoj9sr/AAByil3FGH9KFNZ13e08eSa1a/Pregame%20Ceremony%20Program%20PA%2020140518.m4v',
+            'url': 'https://www.dropbox.com/s/nelirfsxnmcfbfh',
+            'only_matching': True,
+        }, {
+            'url': 'https://www.dropbox.com/sh/2mgpiuq7kv8nqdf/AABy-fW4dkydT4GmWi2mdOUDa?dl=0&preview=Drone+Shot.mp4',
+            'only_matching': True,
+        }, {
+            'url': 'https://www.dropbox.com/scl/fi/r2kd2skcy5ylbbta5y1pz/DJI_0003.MP4?dl=0&rlkey=wcdgqangn7t3lnmmv6li9mu9h',
+            'only_matching': True,
+        }, {
+            'url': 'https://www.dropbox.com/e/scl/fi/r2kd2skcy5ylbbta5y1pz/DJI_0003.MP4?dl=0&rlkey=wcdgqangn7t3lnmmv6li9mu9h',
             'only_matching': True,
         },
     ]
 
+    def _yield_decoded_parts(self, webpage):
+        for encoded in reversed(re.findall(r'registerStreamedPrefetch\s*\(\s*"[\w/+=]+"\s*,\s*"([\w/+=]+)"', webpage)):
+            yield base64.b64decode(encoded).decode('utf-8', 'ignore')
+
     def _real_extract(self, url):
         mobj = self._match_valid_url(url)
         video_id = mobj.group('id')
         webpage = self._download_webpage(url, video_id)
-        fn = compat_urllib_parse_unquote(url_basename(url))
+        fn = urllib.parse.unquote(url_basename(url))
         title = os.path.splitext(fn)[0]
+        content_id = None
 
-        password = self.get_param('videopassword')
-        if (self._og_search_title(webpage) == 'Dropbox - Password Required'
-                or 'Enter the password for this link' in webpage):
+        for part in self._yield_decoded_parts(webpage):
+            if '/sm/password' in part:
+                content_id = self._search_regex(r'content_id=([\w.+=/-]+)', part, 'content ID')
+                break
 
-            if password:
-                content_id = self._search_regex(r'content_id=(.*?)["\']', webpage, 'content_id')
-                payload = f'is_xhr=true&t={self._get_cookies("https://www.dropbox.com").get("t").value}&content_id={content_id}&password={password}&url={url}'
-                response = self._download_json(
-                    'https://www.dropbox.com/sm/auth', video_id, 'POSTing video password', data=payload.encode('UTF-8'),
-                    headers={'content-type': 'application/x-www-form-urlencoded; charset=UTF-8'})
-
-                if response.get('status') != 'authed':
-                    raise ExtractorError('Authentication failed!', expected=True)
-                webpage = self._download_webpage(url, video_id)
-            elif self._get_cookies('https://dropbox.com').get('sm_auth'):
-                webpage = self._download_webpage(url, video_id)
-            else:
+        if content_id:
+            password = self.get_param('videopassword')
+            if not password:
                 raise ExtractorError('Password protected video, use --video-password <password>', expected=True)
 
-        info_json = self._search_json(r'InitReact\.mountComponent\(.*?,', webpage, 'mountComponent', video_id,
-                                      contains_pattern=r'{.+?"preview".+?}', end_pattern=r'\)')['props']
-        transcode_url = traverse_obj(info_json, ((None, 'preview'), 'file', 'preview', 'content', 'transcode_url'), get_all=False)
-        formats, subtitles = self._extract_m3u8_formats_and_subtitles(transcode_url, video_id)
+            response = self._download_json(
+                'https://www.dropbox.com/sm/auth', video_id, 'POSTing video password',
+                data=urlencode_postdata({
+                    'is_xhr': 'true',
+                    't': self._get_cookies('https://www.dropbox.com')['t'].value,
+                    'content_id': content_id,
+                    'password': password,
+                    'url': update_url(url, scheme='', netloc=''),
+                }))
+            if response.get('status') != 'authed':
+                raise ExtractorError('Invalid password', expected=True)
+
+            webpage = self._download_webpage(url, video_id)
+
+        formats, subtitles = [], {}
+        has_anonymous_download = False
+        thumbnail = None
+        for part in self._yield_decoded_parts(webpage):
+            if not has_anonymous_download:
+                has_anonymous_download = self._search_regex(
+                    r'(anonymous:\tanonymous)', part, 'anonymous', default=False)
+            transcode_url = self._search_regex(
+                r'\n.?(https://[^\x03\x08\x12\n]+\.m3u8)', part, 'transcode url', default=None)
+            if not transcode_url:
+                continue
+            formats, subtitles = self._extract_m3u8_formats_and_subtitles(transcode_url, video_id, 'mp4')
+            thumbnail = self._search_regex(
+                r'(https://www\.dropbox\.com/temp_thumb_from_token/[\w/?&=]+)', part, 'thumbnail', default=None)
+            break
 
         # downloads enabled we can get the original file
-        if 'anonymous' in (try_get(info_json, lambda x: x['sharePermission']['canDownloadRoles']) or []):
-            video_url = re.sub(r'[?&]dl=0', '', url)
-            video_url += ('?' if '?' not in video_url else '&') + 'dl=1'
-            formats.append({'url': video_url, 'format_id': 'original', 'format_note': 'Original', 'quality': 1})
+        if has_anonymous_download:
+            formats.append({
+                'url': update_url_query(url, {'dl': '1'}),
+                'format_id': 'original',
+                'format_note': 'Original',
+                'quality': 1,
+            })
 
         return {
             'id': video_id,
             'title': title,
             'formats': formats,
-            'subtitles': subtitles
+            'subtitles': subtitles,
+            'thumbnail': thumbnail,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/dropout.py b/plugins/youtube_download/yt_dlp/extractor/dropout.py
index 80ae6c1..a0d8aac 100644
--- a/plugins/youtube_download/yt_dlp/extractor/dropout.py
+++ b/plugins/youtube_download/yt_dlp/extractor/dropout.py
@@ -43,9 +43,9 @@ class DropoutIE(InfoExtractor):
                 'duration': 1180,
                 'uploader_id': 'user80538407',
                 'uploader_url': 'https://vimeo.com/user80538407',
-                'uploader': 'OTT Videos'
+                'uploader': 'OTT Videos',
             },
-            'expected_warnings': ['Ignoring subtitle tracks found in the HLS manifest']
+            'expected_warnings': ['Ignoring subtitle tracks found in the HLS manifest'],
         },
         {
             'url': 'https://www.dropout.tv/dimension-20-fantasy-high/season:1/videos/episode-1',
@@ -66,9 +66,9 @@ class DropoutIE(InfoExtractor):
                 'duration': 6838,
                 'uploader_id': 'user80538407',
                 'uploader_url': 'https://vimeo.com/user80538407',
-                'uploader': 'OTT Videos'
+                'uploader': 'OTT Videos',
             },
-            'expected_warnings': ['Ignoring subtitle tracks found in the HLS manifest']
+            'expected_warnings': ['Ignoring subtitle tracks found in the HLS manifest'],
         },
         {
             'url': 'https://www.dropout.tv/videos/misfits-magic-holiday-special',
@@ -85,10 +85,10 @@ class DropoutIE(InfoExtractor):
                 'duration': 11698,
                 'uploader_id': 'user80538407',
                 'uploader_url': 'https://vimeo.com/user80538407',
-                'uploader': 'OTT Videos'
+                'uploader': 'OTT Videos',
             },
-            'expected_warnings': ['Ignoring subtitle tracks found in the HLS manifest']
-        }
+            'expected_warnings': ['Ignoring subtitle tracks found in the HLS manifest'],
+        },
     ]
 
     def _get_authenticity_token(self, display_id):
@@ -109,7 +109,7 @@ class DropoutIE(InfoExtractor):
                 'email': username,
                 'password': password,
                 'authenticity_token': self._get_authenticity_token(display_id),
-                'utf8': True
+                'utf8': True,
             }))
 
         user_has_subscription = self._search_regex(
@@ -135,7 +135,7 @@ class DropoutIE(InfoExtractor):
                     self.raise_login_required(method='any')
                 raise ExtractorError(login_err, expected=True)
 
-        embed_url = self._search_regex(r'embed_url:\s*["\'](.+?)["\']', webpage, 'embed url')
+        embed_url = self._html_search_regex(r'embed_url:\s*["\'](.+?)["\']', webpage, 'embed url')
         thumbnail = self._og_search_thumbnail(webpage)
         watch_info = get_element_by_id('watch-info', webpage) or ''
 
@@ -175,8 +175,8 @@ class DropoutSeasonIE(InfoExtractor):
             'playlist_count': 24,
             'info_dict': {
                 'id': 'dimension-20-fantasy-high-season-1',
-                'title': 'Dimension 20 Fantasy High - Season 1'
-            }
+                'title': 'Dimension 20 Fantasy High - Season 1',
+            },
         },
         {
             'url': 'https://www.dropout.tv/dimension-20-fantasy-high',
@@ -184,8 +184,8 @@ class DropoutSeasonIE(InfoExtractor):
             'playlist_count': 24,
             'info_dict': {
                 'id': 'dimension-20-fantasy-high-season-1',
-                'title': 'Dimension 20 Fantasy High - Season 1'
-            }
+                'title': 'Dimension 20 Fantasy High - Season 1',
+            },
         },
         {
             'url': 'https://www.dropout.tv/dimension-20-shriek-week',
@@ -193,8 +193,8 @@ class DropoutSeasonIE(InfoExtractor):
             'playlist_count': 4,
             'info_dict': {
                 'id': 'dimension-20-shriek-week-season-1',
-                'title': 'Dimension 20 Shriek Week - Season 1'
-            }
+                'title': 'Dimension 20 Shriek Week - Season 1',
+            },
         },
         {
             'url': 'https://www.dropout.tv/breaking-news-no-laugh-newsroom/season:3',
@@ -202,9 +202,9 @@ class DropoutSeasonIE(InfoExtractor):
             'playlist_count': 25,
             'info_dict': {
                 'id': 'breaking-news-no-laugh-newsroom-season-3',
-                'title': 'Breaking News No Laugh Newsroom - Season 3'
-            }
-        }
+                'title': 'Breaking News No Laugh Newsroom - Season 3',
+            },
+        },
     ]
 
     def _fetch_page(self, url, season_id, page):
diff --git a/plugins/youtube_download/yt_dlp/extractor/drtalks.py b/plugins/youtube_download/yt_dlp/extractor/drtalks.py
new file mode 100644
index 0000000..5ea7f75
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/drtalks.py
@@ -0,0 +1,51 @@
+from .brightcove import BrightcoveNewIE
+from .common import InfoExtractor
+from ..utils import url_or_none
+from ..utils.traversal import traverse_obj
+
+
+class DrTalksIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?drtalks\.com/videos/(?P<id>[\w-]+)'
+    _TESTS = [{
+        'url': 'https://drtalks.com/videos/six-pillars-of-resilience-tools-for-managing-stress-and-flourishing/',
+        'info_dict': {
+            'id': '6366193757112',
+            'ext': 'mp4',
+            'uploader_id': '6314452011001',
+            'tags': ['resilience'],
+            'description': 'md5:9c6805aee237ee6de8052461855b9dda',
+            'timestamp': 1734546659,
+            'thumbnail': 'https://drtalks.com/wp-content/uploads/2024/12/Episode-82-Eva-Selhub-DrTalks-Thumbs.jpg',
+            'title': 'Six Pillars of Resilience: Tools for Managing Stress and Flourishing',
+            'duration': 2800.682,
+            'upload_date': '20241218',
+        },
+    }, {
+        'url': 'https://drtalks.com/videos/the-pcos-puzzle-mastering-metabolic-health-with-marcelle-pick/',
+        'info_dict': {
+            'id': '6364699891112',
+            'ext': 'mp4',
+            'title': 'The PCOS Puzzle: Mastering Metabolic Health with Marcelle Pick',
+            'description': 'md5:e87cbe00ca50135d5702787fc4043aaa',
+            'thumbnail': 'https://drtalks.com/wp-content/uploads/2024/11/Episode-34-Marcelle-Pick-OBGYN-NP-DrTalks.jpg',
+            'duration': 3515.2,
+            'tags': ['pcos'],
+            'upload_date': '20241114',
+            'timestamp': 1731592119,
+            'uploader_id': '6314452011001',
+        },
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+        next_data = self._search_nextjs_data(webpage, video_id)['props']['pageProps']['data']['video']
+
+        return self.url_result(
+            next_data['videos']['brightcoveVideoLink'], BrightcoveNewIE, video_id,
+            url_transparent=True,
+            **traverse_obj(next_data, {
+                'title': ('title', {str}),
+                'description': ('videos', 'summury', {str}),
+                'thumbnail': ('featuredImage', 'node', 'sourceUrl', {url_or_none}),
+            }))
diff --git a/plugins/youtube_download/yt_dlp/extractor/drtuber.py b/plugins/youtube_download/yt_dlp/extractor/drtuber.py
index e5dab6a..6a1fe90 100644
--- a/plugins/youtube_download/yt_dlp/extractor/drtuber.py
+++ b/plugins/youtube_download/yt_dlp/extractor/drtuber.py
@@ -2,8 +2,8 @@ import re
 
 from .common import InfoExtractor
 from ..utils import (
-    int_or_none,
     NO_DEFAULT,
+    int_or_none,
     parse_duration,
     str_to_int,
 )
@@ -25,7 +25,7 @@ class DrTuberIE(InfoExtractor):
             'categories': ['Babe', 'Blonde', 'Erotic', 'Outdoor', 'Softcore', 'Solo'],
             'thumbnail': r're:https?://.*\.jpg$',
             'age_limit': 18,
-        }
+        },
     }, {
         'url': 'http://www.drtuber.com/embed/489939',
         'only_matching': True,
@@ -40,7 +40,7 @@ class DrTuberIE(InfoExtractor):
         display_id = mobj.group('display_id') or video_id
 
         webpage = self._download_webpage(
-            'http://www.drtuber.com/video/%s' % video_id, display_id)
+            f'http://www.drtuber.com/video/{video_id}', display_id)
 
         video_data = self._download_json(
             'http://www.drtuber.com/player_config_json/', video_id, query={
@@ -56,7 +56,7 @@ class DrTuberIE(InfoExtractor):
                 formats.append({
                     'format_id': format_id,
                     'quality': 2 if format_id == 'hq' else 1,
-                    'url': video_url
+                    'url': video_url,
                 })
 
         duration = int_or_none(video_data.get('duration')) or parse_duration(
@@ -76,8 +76,8 @@ class DrTuberIE(InfoExtractor):
 
         def extract_count(id_, name, default=NO_DEFAULT):
             return str_to_int(self._html_search_regex(
-                r'<span[^>]+(?:class|id)="%s"[^>]*>([\d,\.]+)</span>' % id_,
-                webpage, '%s count' % name, default=default, fatal=False))
+                rf'<span[^>]+(?:class|id)="{id_}"[^>]*>([\d,\.]+)</span>',
+                webpage, f'{name} count', default=default, fatal=False))
 
         like_count = extract_count('rate_likes', 'like')
         dislike_count = extract_count('rate_dislikes', 'dislike', default=None)
diff --git a/plugins/youtube_download/yt_dlp/extractor/drtv.py b/plugins/youtube_download/yt_dlp/extractor/drtv.py
index 6c381aa..ba86eb2 100644
--- a/plugins/youtube_download/yt_dlp/extractor/drtv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/drtv.py
@@ -1,21 +1,17 @@
-import binascii
-import hashlib
-import re
+import json
+import uuid
 
 from .common import InfoExtractor
-from ..aes import aes_cbc_decrypt_bytes, unpad_pkcs7
-from ..compat import compat_urllib_parse_unquote
 from ..utils import (
     ExtractorError,
-    float_or_none,
     int_or_none,
     mimetype2ext,
-    str_or_none,
-    traverse_obj,
-    unified_timestamp,
+    parse_iso8601,
+    try_call,
     update_url_query,
     url_or_none,
 )
+from ..utils.traversal import traverse_obj
 
 SERIES_API = 'https://production-cdn.dr-massive.com/api/page?device=web_browser&item_detail_expand=all&lang=da&max_list_prefetch=3&path=%s'
 
@@ -24,7 +20,7 @@ class DRTVIE(InfoExtractor):
     _VALID_URL = r'''(?x)
                     https?://
                         (?:
-                            (?:www\.)?dr\.dk/(?:tv/se|nyheder|(?P<radio>radio|lyd)(?:/ondemand)?)/(?:[^/]+/)*|
+                            (?:www\.)?dr\.dk/tv/se(?:/ondemand)?/(?:[^/?#]+/)*|
                             (?:www\.)?(?:dr\.dk|dr-massive\.com)/drtv/(?:se|episode|program)/
                         )
                         (?P<id>[\da-z_-]+)
@@ -53,22 +49,6 @@ class DRTVIE(InfoExtractor):
         },
         'expected_warnings': ['Unable to download f4m manifest'],
         'skip': 'this video has been removed',
-    }, {
-        # embed
-        'url': 'https://www.dr.dk/nyheder/indland/live-christianias-rydning-af-pusher-street-er-i-gang',
-        'info_dict': {
-            'id': 'urn:dr:mu:programcard:57c926176187a50a9c6e83c6',
-            'ext': 'mp4',
-            'title': 'christiania pusher street ryddes drdkrjpo',
-            'description': 'md5:2a71898b15057e9b97334f61d04e6eb5',
-            'timestamp': 1472800279,
-            'upload_date': '20160902',
-            'duration': 131.4,
-        },
-        'params': {
-            'skip_download': True,
-        },
-        'expected_warnings': ['Unable to download f4m manifest'],
     }, {
         # with SignLanguage formats
         'url': 'https://www.dr.dk/tv/se/historien-om-danmark/-/historien-om-danmark-stenalder',
@@ -87,33 +67,54 @@ class DRTVIE(InfoExtractor):
             'season': 'Historien om Danmark',
             'series': 'Historien om Danmark',
         },
-        'params': {
-            'skip_download': True,
-        },
+        'skip': 'this video has been removed',
     }, {
-        'url': 'https://www.dr.dk/lyd/p4kbh/regionale-nyheder-kh4/p4-nyheder-2019-06-26-17-30-9',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.dr.dk/drtv/se/bonderoeven_71769',
+        'url': 'https://www.dr.dk/drtv/se/frank-and-kastaniegaarden_71769',
         'info_dict': {
             'id': '00951930010',
             'ext': 'mp4',
-            'title': 'Bonderøven 2019 (1:8)',
-            'description': 'md5:b6dcfe9b6f0bea6703e9a0092739a5bd',
-            'timestamp': 1654856100,
-            'upload_date': '20220610',
-            'duration': 2576.6,
-            'season': 'Bonderøven 2019',
-            'season_id': 'urn:dr:mu:bundle:5c201667a11fa01ca4528ce5',
+            'title': 'Frank & Kastaniegaarden',
+            'description': 'md5:974e1780934cf3275ef10280204bccb0',
+            'release_timestamp': 1546545600,
+            'release_date': '20190103',
+            'duration': 2576,
+            'season': 'Frank & Kastaniegaarden',
+            'season_id': '67125',
             'release_year': 2019,
             'season_number': 2019,
             'series': 'Frank & Kastaniegaarden',
             'episode_number': 1,
-            'episode': 'Episode 1',
+            'episode': 'Frank & Kastaniegaarden',
+            'thumbnail': r're:https?://.+',
         },
         'params': {
             'skip_download': True,
         },
+    }, {
+        # Foreign and Regular subtitle track
+        'url': 'https://www.dr.dk/drtv/se/spise-med-price_-pasta-selv_397445',
+        'info_dict': {
+            'id': '00212301010',
+            'ext': 'mp4',
+            'episode_number': 1,
+            'title': 'Spise med Price: Pasta Selv',
+            'alt_title': '1. Pasta Selv',
+            'release_date': '20230807',
+            'description': 'md5:2da9060524fed707810d71080b3d0cd8',
+            'duration': 1750,
+            'season': 'Spise med Price',
+            'release_timestamp': 1691438400,
+            'season_id': '397440',
+            'episode': 'Spise med Price: Pasta Selv',
+            'thumbnail': r're:https?://.+',
+            'season_number': 15,
+            'series': 'Spise med Price',
+            'release_year': 2022,
+            'subtitles': 'mincount:2',
+        },
+        'params': {
+            'skip_download': 'm3u8',
+        },
     }, {
         'url': 'https://www.dr.dk/drtv/episode/bonderoeven_71769',
         'only_matching': True,
@@ -123,226 +124,126 @@ class DRTVIE(InfoExtractor):
     }, {
         'url': 'https://www.dr.dk/drtv/program/jagten_220924',
         'only_matching': True,
-    }, {
-        'url': 'https://www.dr.dk/lyd/p4aarhus/regionale-nyheder-ar4/regionale-nyheder-2022-05-05-12-30-3',
-        'info_dict': {
-            'id': 'urn:dr:mu:programcard:6265cb2571401424d0360113',
-            'title': "Regionale nyheder",
-            'ext': 'mp4',
-            'duration': 120.043,
-            'series': 'P4 Østjylland regionale nyheder',
-            'timestamp': 1651746600,
-            'season': 'Regionale nyheder',
-            'release_year': 0,
-            'season_id': 'urn:dr:mu:bundle:61c26889539f0201586b73c5',
-            'description': '',
-            'upload_date': '20220505',
-        },
-        'params': {
-            'skip_download': True,
-        },
-        'skip': 'this video has been removed',
-    }, {
-        'url': 'https://www.dr.dk/lyd/p4kbh/regionale-nyheder-kh4/regionale-nyheder-2023-03-14-10-30-9',
-        'info_dict': {
-            'ext': 'mp4',
-            'id': '14802310112',
-            'timestamp': 1678786200,
-            'duration': 120.043,
-            'season_id': 'urn:dr:mu:bundle:63a4f7c87140143504b6710f',
-            'series': 'P4 København regionale nyheder',
-            'upload_date': '20230314',
-            'release_year': 0,
-            'description': 'Hør seneste regionale nyheder fra P4 København.',
-            'season': 'Regionale nyheder',
-            'title': 'Regionale nyheder',
-        },
     }]
 
+    SUBTITLE_LANGS = {
+        'DanishLanguageSubtitles': 'da',
+        'ForeignLanguageSubtitles': 'da_foreign',
+        'CombinedLanguageSubtitles': 'da_combined',
+    }
+
+    _TOKEN = None
+
+    def _real_initialize(self):
+        if self._TOKEN:
+            return
+
+        token_response = self._download_json(
+            'https://isl.dr-massive.com/api/authorization/anonymous-sso', None,
+            note='Downloading anonymous token', headers={
+                'content-type': 'application/json',
+            }, query={
+                'device': 'phone_android',
+                'lang': 'da',
+                'supportFallbackToken': 'true',
+            }, data=json.dumps({
+                'deviceId': str(uuid.uuid4()),
+                'scopes': ['Catalog'],
+                'optout': True,
+            }).encode())
+
+        self._TOKEN = traverse_obj(
+            token_response, (lambda _, x: x['type'] == 'UserAccount', 'value', {str}), get_all=False)
+        if not self._TOKEN:
+            raise ExtractorError('Unable to get anonymous token')
+
     def _real_extract(self, url):
-        raw_video_id, is_radio_url = self._match_valid_url(url).group('id', 'radio')
+        url_slug = self._match_id(url)
+        webpage = self._download_webpage(url, url_slug)
 
-        webpage = self._download_webpage(url, raw_video_id)
-
-        if '>Programmet er ikke længere tilgængeligt' in webpage:
-            raise ExtractorError(
-                'Video %s is not available' % raw_video_id, expected=True)
-
-        video_id = self._search_regex(
-            (r'data-(?:material-identifier|episode-slug)="([^"]+)"',
-             r'data-resource="[^>"]+mu/programcard/expanded/([^"]+)"'),
-            webpage, 'video id', default=None)
-
-        if not video_id:
-            video_id = self._search_regex(
-                r'(urn(?:%3A|:)dr(?:%3A|:)mu(?:%3A|:)programcard(?:%3A|:)[\da-f]+)',
-                webpage, 'urn', default=None)
-            if video_id:
-                video_id = compat_urllib_parse_unquote(video_id)
-
-        _PROGRAMCARD_BASE = 'https://www.dr.dk/mu-online/api/1.4/programcard'
-        query = {'expanded': 'true'}
-
-        if video_id:
-            programcard_url = '%s/%s' % (_PROGRAMCARD_BASE, video_id)
+        json_data = self._search_json(
+            r'window\.__data\s*=', webpage, 'data', url_slug, fatal=False) or {}
+        item = traverse_obj(
+            json_data, ('cache', 'page', ..., (None, ('entries', 0)), 'item', {dict}), get_all=False)
+        if item:
+            item_id = item.get('id')
         else:
-            programcard_url = _PROGRAMCARD_BASE
-            if is_radio_url:
-                video_id = self._search_nextjs_data(
-                    webpage, raw_video_id)['props']['pageProps']['episode']['productionNumber']
-            else:
-                json_data = self._search_json(
-                    r'window\.__data\s*=', webpage, 'data', raw_video_id)
-                video_id = traverse_obj(json_data, (
-                    'cache', 'page', ..., (None, ('entries', 0)), 'item', 'customId',
-                    {lambda x: x.split(':')[-1]}), get_all=False)
-                if not video_id:
-                    raise ExtractorError('Unable to extract video id')
-            query['productionnumber'] = video_id
+            item_id = url_slug.rsplit('_', 1)[-1]
+            item = self._download_json(
+                f'https://production-cdn.dr-massive.com/api/items/{item_id}', item_id,
+                note='Attempting to download backup item data', query={
+                    'device': 'web_browser',
+                    'expand': 'all',
+                    'ff': 'idp,ldp,rpt',
+                    'geoLocation': 'dk',
+                    'isDeviceAbroad': 'false',
+                    'lang': 'da',
+                    'segments': 'drtv,optedout',
+                    'sub': 'Anonymous',
+                })
 
-        data = self._download_json(
-            programcard_url, video_id, 'Downloading video JSON', query=query)
-
-        supplementary_data = {}
-        if re.search(r'_\d+$', raw_video_id):
-            supplementary_data = self._download_json(
-                SERIES_API % f'/episode/{raw_video_id}', raw_video_id, fatal=False) or {}
-
-        title = str_or_none(data.get('Title')) or re.sub(
-            r'\s*\|\s*(?:TV\s*\|\s*DR|DRTV)$', '',
-            self._og_search_title(webpage))
-        description = self._og_search_description(
-            webpage, default=None) or data.get('Description')
-
-        timestamp = unified_timestamp(
-            data.get('PrimaryBroadcastStartTime') or data.get('SortDateTime'))
-
-        thumbnail = None
-        duration = None
-
-        restricted_to_denmark = False
+        video_id = try_call(lambda: item['customId'].rsplit(':', 1)[-1]) or item_id
+        stream_data = self._download_json(
+            f'https://production.dr-massive.com/api/account/items/{item_id}/videos', video_id,
+            note='Downloading stream data', query={
+                'delivery': 'stream',
+                'device': 'web_browser',
+                'ff': 'idp,ldp,rpt',
+                'lang': 'da',
+                'resolution': 'HD-1080',
+                'sub': 'Anonymous',
+            }, headers={'authorization': f'Bearer {self._TOKEN}'})
 
         formats = []
         subtitles = {}
+        for stream in traverse_obj(stream_data, (lambda _, x: x['url'])):
+            format_id = stream.get('format', 'na')
+            access_service = stream.get('accessService')
+            preference = None
+            subtitle_suffix = ''
+            if access_service in ('SpokenSubtitles', 'SignLanguage', 'VisuallyInterpreted'):
+                preference = -1
+                format_id += f'-{access_service}'
+                subtitle_suffix = f'-{access_service}'
+            elif access_service == 'StandardVideo':
+                preference = 1
+            fmts, subs = self._extract_m3u8_formats_and_subtitles(
+                stream.get('url'), video_id, ext='mp4', preference=preference, m3u8_id=format_id, fatal=False)
+            formats.extend(fmts)
 
-        assets = []
-        primary_asset = data.get('PrimaryAsset')
-        if isinstance(primary_asset, dict):
-            assets.append(primary_asset)
-        secondary_assets = data.get('SecondaryAssets')
-        if isinstance(secondary_assets, list):
-            for secondary_asset in secondary_assets:
-                if isinstance(secondary_asset, dict):
-                    assets.append(secondary_asset)
+            api_subtitles = traverse_obj(stream, ('subtitles', lambda _, v: url_or_none(v['link']), {dict}))
+            if not api_subtitles:
+                self._merge_subtitles(subs, target=subtitles)
 
-        def hex_to_bytes(hex):
-            return binascii.a2b_hex(hex.encode('ascii'))
+            for sub_track in api_subtitles:
+                lang = sub_track.get('language') or 'da'
+                subtitles.setdefault(self.SUBTITLE_LANGS.get(lang, lang) + subtitle_suffix, []).append({
+                    'url': sub_track['link'],
+                    'ext': mimetype2ext(sub_track.get('format')) or 'vtt',
+                })
 
-        def decrypt_uri(e):
-            n = int(e[2:10], 16)
-            a = e[10 + n:]
-            data = hex_to_bytes(e[10:10 + n])
-            key = hashlib.sha256(('%s:sRBzYNXBzkKgnjj8pGtkACch' % a).encode('utf-8')).digest()
-            iv = hex_to_bytes(a)
-            decrypted = unpad_pkcs7(aes_cbc_decrypt_bytes(data, key, iv))
-            return decrypted.decode('utf-8').split('?')[0]
-
-        for asset in assets:
-            kind = asset.get('Kind')
-            if kind == 'Image':
-                thumbnail = url_or_none(asset.get('Uri'))
-            elif kind in ('VideoResource', 'AudioResource'):
-                duration = float_or_none(asset.get('DurationInMilliseconds'), 1000)
-                restricted_to_denmark = asset.get('RestrictedToDenmark')
-                asset_target = asset.get('Target')
-                for link in asset.get('Links', []):
-                    uri = link.get('Uri')
-                    if not uri:
-                        encrypted_uri = link.get('EncryptedUri')
-                        if not encrypted_uri:
-                            continue
-                        try:
-                            uri = decrypt_uri(encrypted_uri)
-                        except Exception:
-                            self.report_warning(
-                                'Unable to decrypt EncryptedUri', video_id)
-                            continue
-                    uri = url_or_none(uri)
-                    if not uri:
-                        continue
-                    target = link.get('Target')
-                    format_id = target or ''
-                    if asset_target in ('SpokenSubtitles', 'SignLanguage', 'VisuallyInterpreted'):
-                        preference = -1
-                        format_id += '-%s' % asset_target
-                    elif asset_target == 'Default':
-                        preference = 1
-                    else:
-                        preference = None
-                    if target == 'HDS':
-                        f4m_formats = self._extract_f4m_formats(
-                            uri + '?hdcore=3.3.0&plugin=aasp-3.3.0.99.43',
-                            video_id, preference, f4m_id=format_id, fatal=False)
-                        if kind == 'AudioResource':
-                            for f in f4m_formats:
-                                f['vcodec'] = 'none'
-                        formats.extend(f4m_formats)
-                    elif target == 'HLS':
-                        fmts, subs = self._extract_m3u8_formats_and_subtitles(
-                            uri, video_id, 'mp4', entry_protocol='m3u8_native',
-                            quality=preference, m3u8_id=format_id, fatal=False)
-                        formats.extend(fmts)
-                        self._merge_subtitles(subs, target=subtitles)
-                    else:
-                        bitrate = link.get('Bitrate')
-                        if bitrate:
-                            format_id += '-%s' % bitrate
-                        formats.append({
-                            'url': uri,
-                            'format_id': format_id,
-                            'tbr': int_or_none(bitrate),
-                            'ext': link.get('FileFormat'),
-                            'vcodec': 'none' if kind == 'AudioResource' else None,
-                            'quality': preference,
-                        })
-            subtitles_list = asset.get('SubtitlesList') or asset.get('Subtitleslist')
-            if isinstance(subtitles_list, list):
-                LANGS = {
-                    'Danish': 'da',
-                }
-                for subs in subtitles_list:
-                    if not isinstance(subs, dict):
-                        continue
-                    sub_uri = url_or_none(subs.get('Uri'))
-                    if not sub_uri:
-                        continue
-                    lang = subs.get('Language') or 'da'
-                    subtitles.setdefault(LANGS.get(lang, lang), []).append({
-                        'url': sub_uri,
-                        'ext': mimetype2ext(subs.get('MimeType')) or 'vtt'
-                    })
-
-        if not formats and restricted_to_denmark:
-            self.raise_geo_restricted(
-                'Unfortunately, DR is not allowed to show this program outside Denmark.',
-                countries=self._GEO_COUNTRIES)
+        if not formats and traverse_obj(item, ('season', 'customFields', 'IsGeoRestricted')):
+            self.raise_geo_restricted(countries=self._GEO_COUNTRIES)
 
         return {
             'id': video_id,
-            'title': title,
-            'description': description,
-            'thumbnail': thumbnail,
-            'timestamp': timestamp,
-            'duration': duration,
             'formats': formats,
             'subtitles': subtitles,
-            'series': str_or_none(data.get('SeriesTitle')),
-            'season': str_or_none(data.get('SeasonTitle')),
-            'season_number': int_or_none(data.get('SeasonNumber')),
-            'season_id': str_or_none(data.get('SeasonUrn')),
-            'episode': traverse_obj(supplementary_data, ('entries', 0, 'item', 'contextualTitle')) or str_or_none(data.get('EpisodeTitle')),
-            'episode_number': traverse_obj(supplementary_data, ('entries', 0, 'item', 'episodeNumber')) or int_or_none(data.get('EpisodeNumber')),
-            'release_year': int_or_none(data.get('ProductionYear')),
+            **traverse_obj(item, {
+                'title': 'title',
+                'alt_title': 'contextualTitle',
+                'description': 'description',
+                'thumbnail': ('images', 'wallpaper'),
+                'release_timestamp': ('customFields', 'BroadcastTimeDK', {parse_iso8601}),
+                'duration': ('duration', {int_or_none}),
+                'series': ('season', 'show', 'title'),
+                'season': ('season', 'title'),
+                'season_number': ('season', 'seasonNumber', {int_or_none}),
+                'season_id': 'seasonId',
+                'episode': 'episodeName',
+                'episode_number': ('episodeNumber', {int_or_none}),
+                'release_year': ('releaseYear', {int_or_none}),
+            }),
         }
 
 
@@ -382,14 +283,14 @@ class DRTVLiveIE(InfoExtractor):
                     if not stream_path:
                         continue
                     stream_url = update_url_query(
-                        '%s/%s' % (server, stream_path), {'b': ''})
+                        f'{server}/{stream_path}', {'b': ''})
                     if link_type == 'HLS':
                         formats.extend(self._extract_m3u8_formats(
                             stream_url, channel_id, 'mp4',
                             m3u8_id=link_type, fatal=False, live=True))
                     elif link_type == 'HDS':
                         formats.extend(self._extract_f4m_formats(update_url_query(
-                            '%s/%s' % (server, stream_path), {'hdcore': '3.7.0'}),
+                            f'{server}/{stream_path}', {'hdcore': '3.7.0'}),
                             channel_id, f4m_id=link_type, fatal=False))
 
         return {
@@ -412,8 +313,10 @@ class DRTVSeasonIE(InfoExtractor):
             'display_id': 'frank-and-kastaniegaarden',
             'title': 'Frank & Kastaniegaarden',
             'series': 'Frank & Kastaniegaarden',
+            'season_number': 2008,
+            'alt_title': 'Season 2008',
         },
-        'playlist_mincount': 8
+        'playlist_mincount': 8,
     }, {
         'url': 'https://www.dr.dk/drtv/saeson/frank-and-kastaniegaarden_8761',
         'info_dict': {
@@ -421,8 +324,10 @@ class DRTVSeasonIE(InfoExtractor):
             'display_id': 'frank-and-kastaniegaarden',
             'title': 'Frank & Kastaniegaarden',
             'series': 'Frank & Kastaniegaarden',
+            'season_number': 2009,
+            'alt_title': 'Season 2009',
         },
-        'playlist_mincount': 19
+        'playlist_mincount': 19,
     }]
 
     def _real_extract(self, url):
@@ -434,6 +339,7 @@ class DRTVSeasonIE(InfoExtractor):
             'url': f'https://www.dr.dk/drtv{episode["path"]}',
             'ie_key': DRTVIE.ie_key(),
             'title': episode.get('title'),
+            'alt_title': episode.get('contextualTitle'),
             'episode': episode.get('episodeName'),
             'description': episode.get('shortDescription'),
             'series': traverse_obj(data, ('entries', 0, 'item', 'title')),
@@ -446,9 +352,10 @@ class DRTVSeasonIE(InfoExtractor):
             'id': season_id,
             'display_id': display_id,
             'title': traverse_obj(data, ('entries', 0, 'item', 'title')),
+            'alt_title': traverse_obj(data, ('entries', 0, 'item', 'contextualTitle')),
             'series': traverse_obj(data, ('entries', 0, 'item', 'title')),
             'entries': entries,
-            'season_number': traverse_obj(data, ('entries', 0, 'item', 'seasonNumber'))
+            'season_number': traverse_obj(data, ('entries', 0, 'item', 'seasonNumber')),
         }
 
 
@@ -463,8 +370,9 @@ class DRTVSeriesIE(InfoExtractor):
             'display_id': 'frank-and-kastaniegaarden',
             'title': 'Frank & Kastaniegaarden',
             'series': 'Frank & Kastaniegaarden',
+            'alt_title': '',
         },
-        'playlist_mincount': 15
+        'playlist_mincount': 15,
     }]
 
     def _real_extract(self, url):
@@ -476,8 +384,9 @@ class DRTVSeriesIE(InfoExtractor):
             'url': f'https://www.dr.dk/drtv{season.get("path")}',
             'ie_key': DRTVSeasonIE.ie_key(),
             'title': season.get('title'),
+            'alt_title': season.get('contextualTitle'),
             'series': traverse_obj(data, ('entries', 0, 'item', 'title')),
-            'season_number': traverse_obj(data, ('entries', 0, 'item', 'seasonNumber'))
+            'season_number': traverse_obj(data, ('entries', 0, 'item', 'seasonNumber')),
         } for season in traverse_obj(data, ('entries', 0, 'item', 'show', 'seasons', 'items'))]
 
         return {
@@ -485,6 +394,7 @@ class DRTVSeriesIE(InfoExtractor):
             'id': series_id,
             'display_id': display_id,
             'title': traverse_obj(data, ('entries', 0, 'item', 'title')),
+            'alt_title': traverse_obj(data, ('entries', 0, 'item', 'contextualTitle')),
             'series': traverse_obj(data, ('entries', 0, 'item', 'title')),
-            'entries': entries
+            'entries': entries,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/dtube.py b/plugins/youtube_download/yt_dlp/extractor/dtube.py
index 25a98f6..0d87820 100644
--- a/plugins/youtube_download/yt_dlp/extractor/dtube.py
+++ b/plugins/youtube_download/yt_dlp/extractor/dtube.py
@@ -1,5 +1,5 @@
 import json
-from socket import timeout
+import socket
 
 from .common import InfoExtractor
 from ..utils import (
@@ -9,6 +9,7 @@ from ..utils import (
 
 
 class DTubeIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?d\.tube/(?:#!/)?v/(?P<uploader_id>[0-9a-z.-]+)/(?P<id>[0-9a-z]{8})'
     _TEST = {
         'url': 'https://d.tube/#!/v/broncnutz/x380jtr1',
@@ -48,16 +49,16 @@ class DTubeIE(InfoExtractor):
 
         formats = []
         for q in ('240', '480', '720', '1080', ''):
-            video_url = canonical_url(content.get('video%shash' % q))
+            video_url = canonical_url(content.get(f'video{q}hash'))
             if not video_url:
                 continue
             format_id = (q + 'p') if q else 'Source'
             try:
-                self.to_screen('%s: Checking %s video format URL' % (video_id, format_id))
+                self.to_screen(f'{video_id}: Checking {format_id} video format URL')
                 self._downloader._opener.open(video_url, timeout=5).close()
-            except timeout:
+            except socket.timeout:
                 self.to_screen(
-                    '%s: %s URL is invalid, skipping' % (video_id, format_id))
+                    f'{video_id}: {format_id} URL is invalid, skipping')
                 continue
             formats.append({
                 'format_id': format_id,
diff --git a/plugins/youtube_download/yt_dlp/extractor/duboku.py b/plugins/youtube_download/yt_dlp/extractor/duboku.py
index fb0546c..68c3f05 100644
--- a/plugins/youtube_download/yt_dlp/extractor/duboku.py
+++ b/plugins/youtube_download/yt_dlp/extractor/duboku.py
@@ -1,11 +1,12 @@
+import base64
 import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import compat_urlparse
 from ..utils import (
+    ExtractorError,
     clean_html,
     extract_attributes,
-    ExtractorError,
     get_elements_by_class,
     int_or_none,
     js_to_json,
@@ -22,23 +23,23 @@ def _get_elements_by_tag_and_attrib(html, tag=None, attribute=None, value=None,
     if attribute is None:
         attribute = ''
     else:
-        attribute = r'\s+(?P<attribute>%s)' % re.escape(attribute)
+        attribute = rf'\s+(?P<attribute>{re.escape(attribute)})'
     if value is None:
         value = ''
     else:
         value = re.escape(value) if escape_value else value
-        value = '=[\'"]?(?P<value>%s)[\'"]?' % value
+        value = f'=[\'"]?(?P<value>{value})[\'"]?'
 
     retlist = []
-    for m in re.finditer(r'''(?xs)
-        <(?P<tag>%s)
+    for m in re.finditer(rf'''(?xs)
+        <(?P<tag>{tag})
          (?:\s+[a-zA-Z0-9:._-]+(?:=[a-zA-Z0-9:._-]*|="[^"]*"|='[^']*'|))*?
-         %s%s
+         {attribute}{value}
          (?:\s+[a-zA-Z0-9:._-]+(?:=[a-zA-Z0-9:._-]*|="[^"]*"|='[^']*'|))*?
         \s*>
         (?P<content>.*?)
         </\1>
-    ''' % (tag, attribute, value), html):
+    ''', html):
         retlist.append(m)
 
     return retlist
@@ -99,7 +100,7 @@ class DubokuIE(InfoExtractor):
         season_id = temp[1]
         episode_id = temp[2]
 
-        webpage_url = 'https://w.duboku.io/vodplay/%s.html' % video_id
+        webpage_url = f'https://w.duboku.io/vodplay/{video_id}.html'
         webpage_html = self._download_webpage(webpage_url, video_id)
 
         # extract video url
@@ -129,16 +130,20 @@ class DubokuIE(InfoExtractor):
         data_url = player_data.get('url')
         if not data_url:
             raise ExtractorError('Cannot find url in player_data')
-        data_from = player_data.get('from')
+        player_encrypt = player_data.get('encrypt')
+        if player_encrypt == 1:
+            data_url = urllib.parse.unquote(data_url)
+        elif player_encrypt == 2:
+            data_url = urllib.parse.unquote(base64.b64decode(data_url).decode('ascii'))
 
         # if it is an embedded iframe, maybe it's an external source
         headers = {'Referer': webpage_url}
-        if data_from == 'iframe':
+        if player_data.get('from') == 'iframe':
             # use _type url_transparent to retain the meaningful details
             # of the video.
             return {
                 '_type': 'url_transparent',
-                'url': smuggle_url(data_url, {'http_headers': headers}),
+                'url': smuggle_url(data_url, {'referer': webpage_url}),
                 'id': video_id,
                 'title': title,
                 'series': series_title,
@@ -159,7 +164,7 @@ class DubokuIE(InfoExtractor):
             'episode_number': int_or_none(episode_id),
             'episode_id': episode_id,
             'formats': formats,
-            'http_headers': headers
+            'http_headers': headers,
         }
 
 
@@ -187,11 +192,11 @@ class DubokuPlaylistIE(InfoExtractor):
     def _real_extract(self, url):
         mobj = self._match_valid_url(url)
         if mobj is None:
-            raise ExtractorError('Invalid URL: %s' % url)
+            raise ExtractorError(f'Invalid URL: {url}')
         series_id = mobj.group('id')
-        fragment = compat_urlparse.urlparse(url).fragment
+        fragment = urllib.parse.urlparse(url).fragment
 
-        webpage_url = 'https://w.duboku.io/voddetail/%s.html' % series_id
+        webpage_url = f'https://w.duboku.io/voddetail/{series_id}.html'
         webpage_html = self._download_webpage(webpage_url, series_id)
 
         # extract title
@@ -215,7 +220,7 @@ class DubokuPlaylistIE(InfoExtractor):
                     div.group('content'), 'a', 'href', value='[^\'"]+?', escape_value=False):
                 playlist.append({
                     'href': unescapeHTML(a.group('value')),
-                    'title': unescapeHTML(a.group('content'))
+                    'title': unescapeHTML(a.group('content')),
                 })
             playlists[playlist_id] = playlist
 
@@ -231,11 +236,11 @@ class DubokuPlaylistIE(InfoExtractor):
                 (playlist_id, playlist) = first
         if not playlist:
             raise ExtractorError(
-                'Cannot find %s' % fragment if fragment else 'Cannot extract playlist')
+                f'Cannot find {fragment}' if fragment else 'Cannot extract playlist')
 
         # return url results
         return self.playlist_result([
             self.url_result(
-                compat_urlparse.urljoin('https://w.duboku.io', x['href']),
+                urllib.parse.urljoin('https://w.duboku.io', x['href']),
                 ie=DubokuIE.ie_key(), video_title=x.get('title'))
             for x in playlist], series_id + '#' + playlist_id, title)
diff --git a/plugins/youtube_download/yt_dlp/extractor/dumpert.py b/plugins/youtube_download/yt_dlp/extractor/dumpert.py
index 0cf8426..1c2050c 100644
--- a/plugins/youtube_download/yt_dlp/extractor/dumpert.py
+++ b/plugins/youtube_download/yt_dlp/extractor/dumpert.py
@@ -8,9 +8,9 @@ from ..utils import (
 
 class DumpertIE(InfoExtractor):
     _VALID_URL = r'''(?x)
-        (?P<protocol>https?)://(?:(?:www|legacy)\.)?dumpert\.nl(?:
-            /(?:mediabase|embed|item)/|
-            (?:/toppers|/latest|/?)\?selectedId=
+        (?P<protocol>https?)://(?:(?:www|legacy)\.)?dumpert\.nl/(?:
+            (?:mediabase|embed|item)/|
+            [^#]*[?&]selectedId=
         )(?P<id>[0-9]+[/_][0-9a-zA-Z]+)'''
     _TESTS = [{
         'url': 'https://www.dumpert.nl/item/6646981_951bc60f',
@@ -24,7 +24,7 @@ class DumpertIE(InfoExtractor):
             'duration': 9,
             'view_count': int,
             'like_count': int,
-        }
+        },
     }, {
         'url': 'https://www.dumpert.nl/embed/6675421_dc440fe7',
         'only_matching': True,
@@ -46,7 +46,7 @@ class DumpertIE(InfoExtractor):
             'view_count': int,
             'like_count': int,
         },
-        'params': {'skip_download': 'm3u8'}
+        'params': {'skip_download': 'm3u8'},
     }, {
         'url': 'https://www.dumpert.nl/toppers?selectedId=100031688_b317a185',
         'only_matching': True,
@@ -56,6 +56,9 @@ class DumpertIE(InfoExtractor):
     }, {
         'url': 'https://www.dumpert.nl/?selectedId=100031688_b317a185',
         'only_matching': True,
+    }, {
+        'url': 'https://www.dumpert.nl/toppers/dag?selectedId=100086074_f5cef3ac',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/duoplay.py b/plugins/youtube_download/yt_dlp/extractor/duoplay.py
new file mode 100644
index 0000000..75650c3
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/duoplay.py
@@ -0,0 +1,138 @@
+from .common import InfoExtractor
+from ..utils import (
+    ExtractorError,
+    extract_attributes,
+    get_element_text_and_html_by_tag,
+    int_or_none,
+    join_nonempty,
+    parse_qs,
+    str_or_none,
+    try_call,
+    unified_timestamp,
+)
+from ..utils.traversal import traverse_obj, value
+
+
+class DuoplayIE(InfoExtractor):
+    _VALID_URL = r'https?://duoplay\.ee/(?P<id>\d+)(?:[/?#]|$)'
+    _TESTS = [{
+        'note': 'Siberi võmm S02E12',
+        'url': 'https://duoplay.ee/4312/siberi-vomm?ep=24',
+        'md5': '1ff59d535310ac9c5cf5f287d8f91b2d',
+        'info_dict': {
+            'id': '4312_24',
+            'ext': 'mp4',
+            'title': 'Operatsioon "Öö"',
+            'thumbnail': r're:https://.+\.jpg(?:\?c=\d+)?$',
+            'description': 'md5:8ef98f38569d6b8b78f3d350ccc6ade8',
+            'upload_date': '20170523',
+            'timestamp': 1495567800,
+            'series': 'Siberi võmm',
+            'series_id': '4312',
+            'season': 'Season 2',
+            'season_number': 2,
+            'episode': 'Operatsioon "Öö"',
+            'episode_number': 12,
+            'episode_id': '24',
+        },
+        'skip': 'No video found',
+    }, {
+        'note': 'Empty title',
+        'url': 'https://duoplay.ee/17/uhikarotid?ep=14',
+        'md5': 'cba9f5dabf2582b224d80ac44fb80e47',
+        'info_dict': {
+            'id': '17_14',
+            'ext': 'mp4',
+            'title': 'Episode 14',
+            'thumbnail': r're:https?://.+\.jpg',
+            'description': 'md5:4719b418e058c209def41d48b601276e',
+            'upload_date': '20100916',
+            'timestamp': 1284661800,
+            'series': 'Ühikarotid',
+            'series_id': '17',
+            'season': 'Season 2',
+            'season_number': 2,
+            'episode_id': '14',
+            'release_year': 2010,
+            'episode': 'Episode 14',
+            'episode_number': 14,
+        },
+    }, {
+        'note': 'Movie without expiry',
+        'url': 'https://duoplay.ee/5501/pilvede-all.-neljas-ode',
+        'md5': '7abf63d773a49ef7c39f2c127842b8fd',
+        'info_dict': {
+            'id': '5501',
+            'ext': 'mp4',
+            'title': 'Pilvede all. Neljas õde',
+            'thumbnail': r're:https://.+\.jpg(?:\?c=\d+)?$',
+            'description': 'md5:d86a70f8f31e82c369d4d4f4c79b1279',
+            'cast': 'count:9',
+            'upload_date': '20221214',
+            'timestamp': 1671054000,
+            'release_year': 2018,
+        },
+        'skip': 'No video found',
+    }, {
+        'note': 'Episode url without show name',
+        'url': 'https://duoplay.ee/9644?ep=185',
+        'md5': '63f324b4fe2dbd8194dca16a6d52184a',
+        'info_dict': {
+            'id': '9644_185',
+            'ext': 'mp4',
+            'title': 'Episode 185',
+            'thumbnail': r're:https?://.+\.jpg',
+            'description': 'md5:ed25ba4e9e5d54bc291a4a0cdd241467',
+            'upload_date': '20241120',
+            'timestamp': 1732077000,
+            'episode': 'Episode 63',
+            'episode_id': '185',
+            'episode_number': 63,
+            'season': 'Season 2',
+            'season_number': 2,
+            'series': 'Telehommik',
+            'series_id': '9644',
+        },
+    }]
+
+    def _real_extract(self, url):
+        telecast_id = self._match_id(url)
+        episode = traverse_obj(parse_qs(url), ('ep', 0, {int_or_none}, {str_or_none}))
+        video_id = join_nonempty(telecast_id, episode, delim='_')
+        webpage = self._download_webpage(url, video_id)
+        video_player = try_call(lambda: extract_attributes(
+            get_element_text_and_html_by_tag('video-player', webpage)[1]))
+        if not video_player or not video_player.get('manifest-url'):
+            raise ExtractorError('No video found', expected=True)
+
+        manifest_url = video_player['manifest-url']
+        session_token = self._download_json(
+            'https://sts.postimees.ee/session/register', video_id, 'Registering session',
+            'Unable to register session', headers={
+                'Accept': 'application/json',
+                'X-Original-URI': manifest_url,
+            })['session']
+
+        episode_attr = self._parse_json(video_player.get(':episode') or '', video_id, fatal=False) or {}
+
+        return {
+            'id': video_id,
+            'formats': self._extract_m3u8_formats(manifest_url, video_id, 'mp4', query={'s': session_token}),
+            **traverse_obj(episode_attr, {
+                'title': ('title', {str}),
+                'description': ('synopsis', {str}),
+                'thumbnail': ('images', 'original'),
+                'timestamp': ('airtime', {lambda x: unified_timestamp(x + ' +0200')}),
+                'cast': ('cast', filter, {lambda x: x.split(', ')}),
+                'release_year': ('year', {int_or_none}),
+            }),
+            **(traverse_obj(episode_attr, {
+                'title': (None, (('subtitle', {str}, filter), {value(f'Episode {episode}' if episode else None)})),
+                'series': ('title', {str}),
+                'series_id': ('telecast_id', {str_or_none}),
+                'season_number': ('season_id', {int_or_none}),
+                'episode': ('subtitle', {str}, filter),
+                'episode_number': ('episode_nr', {int_or_none}),
+                'episode_id': ('episode_id', {str_or_none}),
+            }, get_all=False) if episode_attr.get('category') != 'movies' else {}),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/dvtv.py b/plugins/youtube_download/yt_dlp/extractor/dvtv.py
index e671433..52d67d2 100644
--- a/plugins/youtube_download/yt_dlp/extractor/dvtv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/dvtv.py
@@ -2,15 +2,15 @@ import re
 
 from .common import InfoExtractor
 from ..utils import (
-    determine_ext,
     ExtractorError,
+    determine_ext,
     int_or_none,
     join_nonempty,
     js_to_json,
     mimetype2ext,
+    parse_iso8601,
     try_get,
     unescapeHTML,
-    parse_iso8601,
 )
 
 
@@ -28,7 +28,7 @@ class DVTVIE(InfoExtractor):
             'duration': 1484,
             'upload_date': '20141217',
             'timestamp': 1418792400,
-        }
+        },
     }, {
         'url': 'http://video.aktualne.cz/dvtv/dvtv-16-12-2014-utok-talibanu-boj-o-kliniku-uprchlici/r~973eb3bc854e11e498be002590604f2e/',
         'info_dict': {
@@ -44,7 +44,7 @@ class DVTVIE(InfoExtractor):
                 'description': 'md5:0916925dea8e30fe84222582280b47a0',
                 'timestamp': 1418760010,
                 'upload_date': '20141216',
-            }
+            },
         }, {
             'md5': '5f7652a08b05009c1292317b449ffea2',
             'info_dict': {
@@ -54,7 +54,7 @@ class DVTVIE(InfoExtractor):
                 'description': 'md5:ff2f9f6de73c73d7cef4f756c1c1af42',
                 'timestamp': 1418760010,
                 'upload_date': '20141216',
-            }
+            },
         }, {
             'md5': '498eb9dfa97169f409126c617e2a3d64',
             'info_dict': {
@@ -64,7 +64,7 @@ class DVTVIE(InfoExtractor):
                 'description': 'md5:889fe610a70fee5511dc3326a089188e',
                 'timestamp': 1418760010,
                 'upload_date': '20141216',
-            }
+            },
         }, {
             'md5': 'b8dc6b744844032dab6ba3781a7274b9',
             'info_dict': {
@@ -74,7 +74,7 @@ class DVTVIE(InfoExtractor):
                 'description': 'md5:544f86de6d20c4815bea11bf2ac3004f',
                 'timestamp': 1418760010,
                 'upload_date': '20141216',
-            }
+            },
         }],
     }, {
         'url': 'https://video.aktualne.cz/dvtv/zeman-si-jen-leci-mindraky-sobotku-nenavidi-a-babis-se-mu-te/r~960cdb3a365a11e7a83b0025900fea04/',
@@ -150,7 +150,7 @@ class DVTVIE(InfoExtractor):
             'thumbnail': data.get('image'),
             'duration': int_or_none(data.get('duration')),
             'timestamp': int_or_none(timestamp),
-            'formats': formats
+            'formats': formats,
         }
 
     def _real_extract(self, url):
@@ -162,7 +162,7 @@ class DVTVIE(InfoExtractor):
         items = re.findall(r'(?s)playlist\.push\(({.+?})\);', webpage)
         if items:
             return self.playlist_result(
-                [self._parse_video_metadata(i, video_id, timestamp) for i in items],
+                (self._parse_video_metadata(i, video_id, timestamp) for i in items),
                 video_id, self._html_search_meta('twitter:title', webpage))
 
         item = self._search_regex(
@@ -170,7 +170,7 @@ class DVTVIE(InfoExtractor):
             webpage, 'video', default=None)
         if item:
             # remove function calls (ex. htmldeentitize)
-            # TODO this should be fixed in a general way in the js_to_json
+            # TODO: this should be fixed in a general way in the js_to_json
             item = re.sub(r'\w+?\((.+)\)', r'\1', item)
             return self._parse_video_metadata(item, video_id, timestamp)
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/dw.py b/plugins/youtube_download/yt_dlp/extractor/dw.py
index 9c4a08e..320e29b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/dw.py
+++ b/plugins/youtube_download/yt_dlp/extractor/dw.py
@@ -1,13 +1,16 @@
+import urllib.parse
+
 from .common import InfoExtractor
 from ..utils import (
     int_or_none,
     unified_strdate,
     url_or_none,
 )
-from ..compat import compat_urlparse
 
 
 class DWIE(InfoExtractor):
+    _WORKING = False
+    _ENABLED = None  # XXX: pass through to GenericIE
     IE_NAME = 'dw'
     _VALID_URL = r'https?://(?:www\.)?dw\.com/(?:[^/]+/)+(?:av|e)-(?P<id>\d+)'
     _TESTS = [{
@@ -20,7 +23,7 @@ class DWIE(InfoExtractor):
             'title': 'Intelligent light',
             'description': 'md5:90e00d5881719f2a6a5827cb74985af1',
             'upload_date': '20160605',
-        }
+        },
     }, {
         # audio
         'url': 'http://www.dw.com/en/worldlink-my-business/av-19111941',
@@ -31,7 +34,7 @@ class DWIE(InfoExtractor):
             'title': 'WorldLink: My business',
             'description': 'md5:bc9ca6e4e063361e21c920c53af12405',
             'upload_date': '20160311',
-        }
+        },
     }, {
         # DW documentaries, only last for one or two weeks
         'url': 'http://www.dw.com/en/documentaries-welcome-to-the-90s-2016-05-21/e-19220158-9798',
@@ -58,7 +61,7 @@ class DWIE(InfoExtractor):
             formats = [{'url': hidden_inputs['file_name']}]
         else:
             formats = self._extract_smil_formats(
-                'http://www.dw.com/smil/v-%s' % media_id, media_id,
+                f'http://www.dw.com/smil/v-{media_id}', media_id,
                 transform_source=lambda s: s.replace(
                     'rtmp://tv-od.dw.de/flash/',
                     'http://tv-download.dw.de/dwtv_video/flv/'))
@@ -82,6 +85,8 @@ class DWIE(InfoExtractor):
 
 
 class DWArticleIE(InfoExtractor):
+    _WORKING = False
+    _ENABLED = None  # XXX: pass through to GenericIE
     IE_NAME = 'dw:article'
     _VALID_URL = r'https?://(?:www\.)?dw\.com/(?:[^/]+/)+a-(?P<id>\d+)'
     _TEST = {
@@ -93,7 +98,7 @@ class DWArticleIE(InfoExtractor):
             'title': 'The harsh life of refugees in Idomeni',
             'description': 'md5:196015cc7e48ebf474db9399420043c7',
             'upload_date': '20160310',
-        }
+        },
     }
 
     def _real_extract(self, url):
@@ -101,6 +106,6 @@ class DWArticleIE(InfoExtractor):
         webpage = self._download_webpage(url, article_id)
         hidden_inputs = self._hidden_inputs(webpage)
         media_id = hidden_inputs['media_id']
-        media_path = self._search_regex(r'href="([^"]+av-%s)"\s+class="overlayLink"' % media_id, webpage, 'media url')
-        media_url = compat_urlparse.urljoin(url, media_path)
+        media_path = self._search_regex(rf'href="([^"]+av-{media_id})"\s+class="overlayLink"', webpage, 'media url')
+        media_url = urllib.parse.urljoin(url, media_path)
         return self.url_result(media_url, 'DW', media_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/eagleplatform.py b/plugins/youtube_download/yt_dlp/extractor/eagleplatform.py
index 739d179..685f8c0 100644
--- a/plugins/youtube_download/yt_dlp/extractor/eagleplatform.py
+++ b/plugins/youtube_download/yt_dlp/extractor/eagleplatform.py
@@ -70,14 +70,14 @@ class EaglePlatformIE(InfoExtractor):
                     '''
         # "Basic usage" embedding (see http://dultonmedia.github.io/eplayer/)
         mobj = re.search(
-            r'''(?xs)
-                    %s
+            rf'''(?xs)
+                    {PLAYER_JS_RE}
                     <div[^>]+
                         class=(?P<qclass>["\'])eagleplayer(?P=qclass)[^>]+
                         data-id=["\'](?P<id>\d+)
-            ''' % PLAYER_JS_RE, webpage)
+            ''', webpage)
         if mobj is not None:
-            return [add_referer('eagleplatform:%(host)s:%(id)s' % mobj.groupdict())]
+            return [add_referer('eagleplatform:{host}:{id}'.format(**mobj.groupdict()))]
         # Generalization of "Javascript code usage", "Combined usage" and
         # "Usage without attaching to DOM" embeddings (see
         # http://dultonmedia.github.io/eplayer/)
@@ -96,9 +96,9 @@ class EaglePlatformIE(InfoExtractor):
                     \s*\)
                     .+?
                     </script>
-            ''' % PLAYER_JS_RE, webpage)
+            ''' % PLAYER_JS_RE, webpage)  # noqa: UP031
         if mobj is not None:
-            return [add_referer('eagleplatform:%(host)s:%(id)s' % mobj.groupdict())]
+            return [add_referer('eagleplatform:{host}:{id}'.format(**mobj.groupdict()))]
 
     @staticmethod
     def _handle_error(response):
@@ -108,7 +108,7 @@ class EaglePlatformIE(InfoExtractor):
 
     def _download_json(self, url_or_request, video_id, *args, **kwargs):
         try:
-            response = super(EaglePlatformIE, self)._download_json(
+            response = super()._download_json(
                 url_or_request, video_id, *args, **kwargs)
         except ExtractorError as ee:
             if isinstance(ee.cause, HTTPError):
@@ -137,7 +137,7 @@ class EaglePlatformIE(InfoExtractor):
             query['referrer'] = referrer
 
         player_data = self._download_json(
-            'http://%s/api/player_data' % host, video_id,
+            f'http://{host}/api/player_data', video_id,
             headers=headers, query=query)
 
         media = player_data['data']['playlist']['viewports'][0]['medialist'][0]
@@ -186,7 +186,7 @@ class EaglePlatformIE(InfoExtractor):
                     })
                 else:
                     f = {
-                        'format_id': 'http-%s' % format_id,
+                        'format_id': f'http-{format_id}',
                         'height': int_or_none(format_id),
                     }
                 f['url'] = format_url
@@ -212,4 +212,4 @@ class ClipYouEmbedIE(InfoExtractor):
         mobj = re.search(
             r'<iframe[^>]+src="https?://(?P<host>media\.clipyou\.ru)/index/player\?.*\brecord_id=(?P<id>\d+).*"', webpage)
         if mobj is not None:
-            yield smuggle_url('eagleplatform:%(host)s:%(id)s' % mobj.groupdict(), {'referrer': url})
+            yield smuggle_url('eagleplatform:{host}:{id}'.format(**mobj.groupdict()), {'referrer': url})
diff --git a/plugins/youtube_download/yt_dlp/extractor/ebaumsworld.py b/plugins/youtube_download/yt_dlp/extractor/ebaumsworld.py
index 0854d03..ac766b3 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ebaumsworld.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ebaumsworld.py
@@ -18,7 +18,7 @@ class EbaumsWorldIE(InfoExtractor):
     def _real_extract(self, url):
         video_id = self._match_id(url)
         config = self._download_xml(
-            'http://www.ebaumsworld.com/video/player/%s' % video_id, video_id)
+            f'http://www.ebaumsworld.com/video/player/{video_id}', video_id)
         video_url = config.find('file').text
 
         return {
diff --git a/plugins/youtube_download/yt_dlp/extractor/ebay.py b/plugins/youtube_download/yt_dlp/extractor/ebay.py
index d0eb9fc..f1d122f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ebay.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ebay.py
@@ -11,7 +11,7 @@ class EbayIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'WiFi internal antenna adhesive for wifi 2.4GHz wifi 5 wifi 6 wifi 6E full bands',
         },
-        'params': {'skip_download': 'm3u8'}
+        'params': {'skip_download': 'm3u8'},
     }]
 
     def _real_extract(self, url):
@@ -32,5 +32,5 @@ class EbayIE(InfoExtractor):
         return {
             'id': video_id,
             'title': remove_end(self._html_extract_title(webpage), ' | eBay'),
-            'formats': formats
+            'formats': formats,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/echomsk.py b/plugins/youtube_download/yt_dlp/extractor/echomsk.py
deleted file mode 100644
index 850eabb..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/echomsk.py
+++ /dev/null
@@ -1,43 +0,0 @@
-import re
-
-from .common import InfoExtractor
-
-
-class EchoMskIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?echo\.msk\.ru/sounds/(?P<id>\d+)'
-    _TEST = {
-        'url': 'http://www.echo.msk.ru/sounds/1464134.html',
-        'md5': '2e44b3b78daff5b458e4dbc37f191f7c',
-        'info_dict': {
-            'id': '1464134',
-            'ext': 'mp3',
-            'title': 'Особое мнение - 29 декабря 2014, 19:08',
-        },
-    }
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        webpage = self._download_webpage(url, video_id)
-
-        audio_url = self._search_regex(
-            r'<a rel="mp3" href="([^"]+)">', webpage, 'audio URL')
-
-        title = self._html_search_regex(
-            r'<a href="/programs/[^"]+" target="_blank">([^<]+)</a>',
-            webpage, 'title')
-
-        air_date = self._html_search_regex(
-            r'(?s)<div class="date">(.+?)</div>',
-            webpage, 'date', fatal=False, default=None)
-
-        if air_date:
-            air_date = re.sub(r'(\s)\1+', r'\1', air_date)
-            if air_date:
-                title = '%s - %s' % (title, air_date)
-
-        return {
-            'id': video_id,
-            'url': audio_url,
-            'title': title,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/egghead.py b/plugins/youtube_download/yt_dlp/extractor/egghead.py
index a4b2a12..62d2e54 100644
--- a/plugins/youtube_download/yt_dlp/extractor/egghead.py
+++ b/plugins/youtube_download/yt_dlp/extractor/egghead.py
@@ -1,5 +1,4 @@
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     determine_ext,
     int_or_none,
@@ -13,13 +12,13 @@ class EggheadBaseIE(InfoExtractor):
     def _call_api(self, path, video_id, resource, fatal=True):
         return self._download_json(
             'https://app.egghead.io/api/v1/' + path,
-            video_id, 'Downloading %s JSON' % resource, fatal=fatal)
+            video_id, f'Downloading {resource} JSON', fatal=fatal)
 
 
 class EggheadCourseIE(EggheadBaseIE):
     IE_DESC = 'egghead.io course'
     IE_NAME = 'egghead:course'
-    _VALID_URL = r'https://(?:app\.)?egghead\.io/(?:course|playlist)s/(?P<id>[^/?#&]+)'
+    _VALID_URL = r'https?://(?:app\.)?egghead\.io/(?:course|playlist)s/(?P<id>[^/?#&]+)'
     _TESTS = [{
         'url': 'https://egghead.io/courses/professor-frisby-introduces-composable-functional-javascript',
         'playlist_count': 29,
@@ -46,7 +45,7 @@ class EggheadCourseIE(EggheadBaseIE):
                 continue
             lesson_id = lesson.get('id')
             if lesson_id:
-                lesson_id = compat_str(lesson_id)
+                lesson_id = str(lesson_id)
             entries.append(self.url_result(
                 lesson_url, ie=EggheadLessonIE.ie_key(), video_id=lesson_id))
 
@@ -55,7 +54,7 @@ class EggheadCourseIE(EggheadBaseIE):
 
         playlist_id = course.get('id')
         if playlist_id:
-            playlist_id = compat_str(playlist_id)
+            playlist_id = str(playlist_id)
 
         return self.playlist_result(
             entries, playlist_id, course.get('title'),
@@ -65,7 +64,7 @@ class EggheadCourseIE(EggheadBaseIE):
 class EggheadLessonIE(EggheadBaseIE):
     IE_DESC = 'egghead.io lesson'
     IE_NAME = 'egghead:lesson'
-    _VALID_URL = r'https://(?:app\.)?egghead\.io/(?:api/v1/)?lessons/(?P<id>[^/?#&]+)'
+    _VALID_URL = r'https?://(?:app\.)?egghead\.io/(?:api/v1/)?lessons/(?P<id>[^/?#&]+)'
     _TESTS = [{
         'url': 'https://egghead.io/lessons/javascript-linear-data-flow-with-container-style-types-box',
         'info_dict': {
@@ -98,7 +97,7 @@ class EggheadLessonIE(EggheadBaseIE):
         lesson = self._call_api(
             'lessons/' + display_id, display_id, 'lesson')
 
-        lesson_id = compat_str(lesson['id'])
+        lesson_id = str(lesson['id'])
         title = lesson['title']
 
         formats = []
@@ -129,6 +128,6 @@ class EggheadLessonIE(EggheadBaseIE):
             'view_count': int_or_none(lesson.get('plays_count')),
             'tags': try_get(lesson, lambda x: x['tag_list'], list),
             'series': try_get(
-                lesson, lambda x: x['series']['title'], compat_str),
+                lesson, lambda x: x['series']['title'], str),
             'formats': formats,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/eggs.py b/plugins/youtube_download/yt_dlp/extractor/eggs.py
new file mode 100644
index 0000000..6e03244
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/eggs.py
@@ -0,0 +1,155 @@
+import secrets
+
+from .common import InfoExtractor
+from .youtube import YoutubeIE
+from ..utils import (
+    int_or_none,
+    parse_iso8601,
+    str_or_none,
+    url_or_none,
+)
+from ..utils.traversal import traverse_obj
+
+
+class EggsBaseIE(InfoExtractor):
+    _API_HEADERS = {
+        'Accept': '*/*',
+        'apVersion': '8.2.00',
+        'deviceName': 'Android',
+    }
+
+    def _real_initialize(self):
+        self._API_HEADERS['deviceId'] = secrets.token_hex(8)
+
+    def _call_api(self, endpoint, video_id):
+        return self._download_json(
+            f'https://app-front-api.eggs.mu/v1/{endpoint}', video_id,
+            headers=self._API_HEADERS)
+
+    def _extract_music_info(self, data):
+        if yt_url := traverse_obj(data, ('youtubeUrl', {url_or_none})):
+            return self.url_result(yt_url, ie=YoutubeIE)
+
+        artist_name = traverse_obj(data, ('artist', 'artistName', {str_or_none}))
+        music_id = traverse_obj(data, ('musicId', {str_or_none}))
+        webpage_url = None
+        if artist_name and music_id:
+            webpage_url = f'https://eggs.mu/artist/{artist_name}/song/{music_id}'
+
+        return {
+            'id': music_id,
+            'vcodec': 'none',
+            'webpage_url': webpage_url,
+            'extractor_key': EggsIE.ie_key(),
+            'extractor': EggsIE.IE_NAME,
+            **traverse_obj(data, {
+                'title': ('musicTitle', {str}),
+                'url': ('musicDataPath', {url_or_none}),
+                'uploader': ('artist', 'displayName', {str}),
+                'uploader_id': ('artist', 'artistId', {str_or_none}),
+                'thumbnail': ('imageDataPath', {url_or_none}),
+                'view_count': ('numberOfMusicPlays', {int_or_none}),
+                'like_count': ('numberOfLikes', {int_or_none}),
+                'comment_count': ('numberOfComments', {int_or_none}),
+                'composers': ('composer', {str}, all),
+                'tags': ('tags', ..., {str}),
+                'timestamp': ('releaseDate', {parse_iso8601}),
+                'artist': ('artist', 'displayName', {str}),
+            })}
+
+
+class EggsIE(EggsBaseIE):
+    IE_NAME = 'eggs:single'
+    _VALID_URL = r'https?://eggs\.mu/artist/[^/?#]+/song/(?P<id>[\da-f-]+)'
+
+    _TESTS = [{
+        'url': 'https://eggs.mu/artist/32_sunny_girl/song/0e95fd1d-4d61-4d5b-8b18-6092c551da90',
+        'info_dict': {
+            'id': '0e95fd1d-4d61-4d5b-8b18-6092c551da90',
+            'ext': 'm4a',
+            'title': 'シネマと信号',
+            'uploader': 'Sunny Girl',
+            'thumbnail': r're:https?://.*\.jpg(?:\?.*)?$',
+            'uploader_id': '1607',
+            'like_count': int,
+            'timestamp': 1731327327,
+            'composers': ['橘高連太郎'],
+            'view_count': int,
+            'comment_count': int,
+            'artists': ['Sunny Girl'],
+            'upload_date': '20241111',
+            'tags': ['SunnyGirl', 'シネマと信号'],
+        },
+    }, {
+        'url': 'https://eggs.mu/artist/KAMO_3pband/song/1d4bc45f-1af6-47a9-8b30-a70cae350b4f',
+        'info_dict': {
+            'id': '80cLKA2wnoA',
+            'ext': 'mp4',
+            'title': 'KAMO「いい女だから」Audio',
+            'uploader': 'KAMO',
+            'live_status': 'not_live',
+            'channel_id': 'UCsHLBw2__5Q9y55skXPotOg',
+            'channel_follower_count': int,
+            'description': 'md5:d260da711ecbec3e720293dc11401b87',
+            'availability': 'public',
+            'uploader_id': '@KAMO_band',
+            'upload_date': '20240925',
+            'thumbnail': 'https://i.ytimg.com/vi/80cLKA2wnoA/maxresdefault.jpg',
+            'comment_count': int,
+            'channel_url': 'https://www.youtube.com/channel/UCsHLBw2__5Q9y55skXPotOg',
+            'view_count': int,
+            'duration': 151,
+            'like_count': int,
+            'channel': 'KAMO',
+            'playable_in_embed': True,
+            'uploader_url': 'https://www.youtube.com/@KAMO_band',
+            'tags': [],
+            'timestamp': 1727271121,
+            'age_limit': 0,
+            'categories': ['People & Blogs'],
+        },
+        'add_ie': ['Youtube'],
+        'params': {'skip_download': 'Youtube'},
+    }]
+
+    def _real_extract(self, url):
+        song_id = self._match_id(url)
+        json_data = self._call_api(f'musics/{song_id}', song_id)
+        return self._extract_music_info(json_data)
+
+
+class EggsArtistIE(EggsBaseIE):
+    IE_NAME = 'eggs:artist'
+    _VALID_URL = r'https?://eggs\.mu/artist/(?P<id>\w+)/?(?:[?#&]|$)'
+
+    _TESTS = [{
+        'url': 'https://eggs.mu/artist/32_sunny_girl',
+        'info_dict': {
+            'id': '32_sunny_girl',
+            'thumbnail': 'https://image-pro.eggs.mu/profile/1607.jpeg?updated_at=2024-04-03T20%3A06%3A00%2B09%3A00',
+            'description': 'Muddy Mine / 東京高田馬場CLUB PHASE / Gt.Vo 橘高 連太郎 / Ba.Cho 小野 ゆうき / Dr 大森 りゅうひこ',
+            'title': 'Sunny Girl',
+        },
+        'playlist_mincount': 18,
+    }, {
+        'url': 'https://eggs.mu/artist/KAMO_3pband',
+        'info_dict': {
+            'id': 'KAMO_3pband',
+            'description': '川崎発３ピースバンド',
+            'thumbnail': 'https://image-pro.eggs.mu/profile/35217.jpeg?updated_at=2024-11-27T16%3A31%3A50%2B09%3A00',
+            'title': 'KAMO',
+        },
+        'playlist_mincount': 2,
+    }]
+
+    def _real_extract(self, url):
+        artist_id = self._match_id(url)
+        artist_data = self._call_api(f'artists/{artist_id}', artist_id)
+        song_data = self._call_api(f'artists/{artist_id}/musics', artist_id)
+        return self.playlist_result(
+            traverse_obj(song_data, ('data', ..., {dict}, {self._extract_music_info})),
+            playlist_id=artist_id, **traverse_obj(artist_data, {
+                'title': ('displayName', {str}),
+                'description': ('profile', {str}),
+                'thumbnail': ('imageDataPath', {url_or_none}),
+            }))
diff --git a/plugins/youtube_download/yt_dlp/extractor/ehow.py b/plugins/youtube_download/yt_dlp/extractor/ehow.py
deleted file mode 100644
index 74469ce..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/ehow.py
+++ /dev/null
@@ -1,36 +0,0 @@
-from .common import InfoExtractor
-from ..compat import compat_urllib_parse_unquote
-
-
-class EHowIE(InfoExtractor):
-    IE_NAME = 'eHow'
-    _VALID_URL = r'https?://(?:www\.)?ehow\.com/[^/_?]*_(?P<id>[0-9]+)'
-    _TEST = {
-        'url': 'http://www.ehow.com/video_12245069_hardwood-flooring-basics.html',
-        'md5': '9809b4e3f115ae2088440bcb4efbf371',
-        'info_dict': {
-            'id': '12245069',
-            'ext': 'flv',
-            'title': 'Hardwood Flooring Basics',
-            'description': 'Hardwood flooring may be time consuming, but its ultimately a pretty straightforward concept. Learn about hardwood flooring basics with help from a hardware flooring business owner in this free video...',
-            'uploader': 'Erick Nathan',
-        }
-    }
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-        video_url = self._search_regex(
-            r'(?:file|source)=(http[^\'"&]*)', webpage, 'video URL')
-        final_url = compat_urllib_parse_unquote(video_url)
-        uploader = self._html_search_meta('uploader', webpage)
-        title = self._og_search_title(webpage).replace(' | eHow', '')
-
-        return {
-            'id': video_id,
-            'url': final_url,
-            'title': title,
-            'thumbnail': self._og_search_thumbnail(webpage),
-            'description': self._og_search_description(webpage),
-            'uploader': uploader,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/eighttracks.py b/plugins/youtube_download/yt_dlp/extractor/eighttracks.py
index 3dd9ab1..3ac4c56 100644
--- a/plugins/youtube_download/yt_dlp/extractor/eighttracks.py
+++ b/plugins/youtube_download/yt_dlp/extractor/eighttracks.py
@@ -2,9 +2,6 @@ import json
 import random
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_str,
-)
 from ..utils import (
     ExtractorError,
 )
@@ -29,8 +26,8 @@ class EightTracksIE(InfoExtractor):
                     'id': '11885610',
                     'ext': 'm4a',
                     'title': "youtue-dl project<>\"' - youtube-dl test track 1 \"'/\\\u00e4\u21ad",
-                    'uploader_id': 'ytdl'
-                }
+                    'uploader_id': 'ytdl',
+                },
             },
             {
                 'md5': '4ab26f05c1f7291ea460a3920be8021f',
@@ -38,8 +35,8 @@ class EightTracksIE(InfoExtractor):
                     'id': '11885608',
                     'ext': 'm4a',
                     'title': "youtube-dl project - youtube-dl test track 2 \"'/\\\u00e4\u21ad",
-                    'uploader_id': 'ytdl'
-                }
+                    'uploader_id': 'ytdl',
+                },
             },
             {
                 'md5': 'd30b5b5f74217410f4689605c35d1fd7',
@@ -47,8 +44,8 @@ class EightTracksIE(InfoExtractor):
                     'id': '11885679',
                     'ext': 'm4a',
                     'title': "youtube-dl project as well - youtube-dl test track 3 \"'/\\\u00e4\u21ad",
-                    'uploader_id': 'ytdl'
-                }
+                    'uploader_id': 'ytdl',
+                },
             },
             {
                 'md5': '4eb0a669317cd725f6bbd336a29f923a',
@@ -56,8 +53,8 @@ class EightTracksIE(InfoExtractor):
                     'id': '11885680',
                     'ext': 'm4a',
                     'title': "youtube-dl project as well - youtube-dl test track 4 \"'/\\\u00e4\u21ad",
-                    'uploader_id': 'ytdl'
-                }
+                    'uploader_id': 'ytdl',
+                },
             },
             {
                 'md5': '1893e872e263a2705558d1d319ad19e8',
@@ -65,8 +62,8 @@ class EightTracksIE(InfoExtractor):
                     'id': '11885682',
                     'ext': 'm4a',
                     'title': "PH - youtube-dl test track 5 \"'/\\\u00e4\u21ad",
-                    'uploader_id': 'ytdl'
-                }
+                    'uploader_id': 'ytdl',
+                },
             },
             {
                 'md5': 'b673c46f47a216ab1741ae8836af5899',
@@ -74,8 +71,8 @@ class EightTracksIE(InfoExtractor):
                     'id': '11885683',
                     'ext': 'm4a',
                     'title': "PH - youtube-dl test track 6 \"'/\\\u00e4\u21ad",
-                    'uploader_id': 'ytdl'
-                }
+                    'uploader_id': 'ytdl',
+                },
             },
             {
                 'md5': '1d74534e95df54986da7f5abf7d842b7',
@@ -83,8 +80,8 @@ class EightTracksIE(InfoExtractor):
                     'id': '11885684',
                     'ext': 'm4a',
                     'title': "phihag - youtube-dl test track 7 \"'/\\\u00e4\u21ad",
-                    'uploader_id': 'ytdl'
-                }
+                    'uploader_id': 'ytdl',
+                },
             },
             {
                 'md5': 'f081f47af8f6ae782ed131d38b9cd1c0',
@@ -92,10 +89,10 @@ class EightTracksIE(InfoExtractor):
                     'id': '11885685',
                     'ext': 'm4a',
                     'title': "phihag - youtube-dl test track 8 \"'/\\\u00e4\u21ad",
-                    'uploader_id': 'ytdl'
-                }
-            }
-        ]
+                    'uploader_id': 'ytdl',
+                },
+            },
+        ],
     }
 
     def _real_extract(self, url):
@@ -105,7 +102,7 @@ class EightTracksIE(InfoExtractor):
 
         data = self._parse_json(
             self._search_regex(
-                r"(?s)PAGE\.mix\s*=\s*({.+?});\n", webpage, 'trax information'),
+                r'(?s)PAGE\.mix\s*=\s*({.+?});\n', webpage, 'trax information'),
             playlist_id)
 
         session = str(random.randint(0, 1000000000))
@@ -116,7 +113,7 @@ class EightTracksIE(InfoExtractor):
         # duration is sometimes negative, use predefined avg duration
         if avg_song_duration <= 0:
             avg_song_duration = 300
-        first_url = 'http://8tracks.com/sets/%s/play?player=sm&mix_id=%s&format=jsonh' % (session, mix_id)
+        first_url = f'http://8tracks.com/sets/{session}/play?player=sm&mix_id={mix_id}&format=jsonh'
         next_url = first_url
         entries = []
 
@@ -140,7 +137,7 @@ class EightTracksIE(InfoExtractor):
             api_data = json.loads(api_json)
             track_data = api_data['set']['track']
             info = {
-                'id': compat_str(track_data['id']),
+                'id': str(track_data['id']),
                 'url': track_data['track_file_stream_url'],
                 'title': track_data['performer'] + ' - ' + track_data['name'],
                 'raw_title': track_data['name'],
@@ -149,12 +146,12 @@ class EightTracksIE(InfoExtractor):
             }
             entries.append(info)
 
-            next_url = 'http://8tracks.com/sets/%s/next?player=sm&mix_id=%s&format=jsonh&track_id=%s' % (
+            next_url = 'http://8tracks.com/sets/{}/next?player=sm&mix_id={}&format=jsonh&track_id={}'.format(
                 session, mix_id, track_data['id'])
         return {
             '_type': 'playlist',
             'entries': entries,
-            'id': compat_str(mix_id),
+            'id': str(mix_id),
             'display_id': playlist_id,
             'title': data.get('name'),
             'description': data.get('description'),
diff --git a/plugins/youtube_download/yt_dlp/extractor/einthusan.py b/plugins/youtube_download/yt_dlp/extractor/einthusan.py
deleted file mode 100644
index 53bc253..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/einthusan.py
+++ /dev/null
@@ -1,105 +0,0 @@
-import json
-
-from .common import InfoExtractor
-from ..compat import (
-    compat_b64decode,
-    compat_str,
-    compat_urlparse,
-)
-from ..utils import (
-    extract_attributes,
-    ExtractorError,
-    get_elements_by_class,
-    urlencode_postdata,
-)
-
-
-class EinthusanIE(InfoExtractor):
-    _VALID_URL = r'https?://(?P<host>einthusan\.(?:tv|com|ca))/movie/watch/(?P<id>[^/?#&]+)'
-    _TESTS = [{
-        'url': 'https://einthusan.tv/movie/watch/9097/',
-        'md5': 'ff0f7f2065031b8a2cf13a933731c035',
-        'info_dict': {
-            'id': '9097',
-            'ext': 'mp4',
-            'title': 'Ae Dil Hai Mushkil',
-            'description': 'md5:33ef934c82a671a94652a9b4e54d931b',
-            'thumbnail': r're:^https?://.*\.jpg$',
-        }
-    }, {
-        'url': 'https://einthusan.tv/movie/watch/51MZ/?lang=hindi',
-        'only_matching': True,
-    }, {
-        'url': 'https://einthusan.com/movie/watch/9097/',
-        'only_matching': True,
-    }, {
-        'url': 'https://einthusan.ca/movie/watch/4E9n/?lang=hindi',
-        'only_matching': True,
-    }]
-
-    # reversed from jsoncrypto.prototype.decrypt() in einthusan-PGMovieWatcher.js
-    def _decrypt(self, encrypted_data, video_id):
-        return self._parse_json(compat_b64decode((
-            encrypted_data[:10] + encrypted_data[-1] + encrypted_data[12:-1]
-        )).decode('utf-8'), video_id)
-
-    def _real_extract(self, url):
-        mobj = self._match_valid_url(url)
-        host = mobj.group('host')
-        video_id = mobj.group('id')
-
-        webpage = self._download_webpage(url, video_id)
-
-        title = self._html_search_regex(r'<h3>([^<]+)</h3>', webpage, 'title')
-
-        player_params = extract_attributes(self._search_regex(
-            r'(<section[^>]+id="UIVideoPlayer"[^>]+>)', webpage, 'player parameters'))
-
-        page_id = self._html_search_regex(
-            '<html[^>]+data-pageid="([^"]+)"', webpage, 'page ID')
-        video_data = self._download_json(
-            'https://%s/ajax/movie/watch/%s/' % (host, video_id), video_id,
-            data=urlencode_postdata({
-                'xEvent': 'UIVideoPlayer.PingOutcome',
-                'xJson': json.dumps({
-                    'EJOutcomes': player_params['data-ejpingables'],
-                    'NativeHLS': False
-                }),
-                'arcVersion': 3,
-                'appVersion': 59,
-                'gorilla.csrf.Token': page_id,
-            }))['Data']
-
-        if isinstance(video_data, compat_str) and video_data.startswith('/ratelimited/'):
-            raise ExtractorError(
-                'Download rate reached. Please try again later.', expected=True)
-
-        ej_links = self._decrypt(video_data['EJLinks'], video_id)
-
-        formats = []
-
-        m3u8_url = ej_links.get('HLSLink')
-        if m3u8_url:
-            formats.extend(self._extract_m3u8_formats(
-                m3u8_url, video_id, ext='mp4', entry_protocol='m3u8_native'))
-
-        mp4_url = ej_links.get('MP4Link')
-        if mp4_url:
-            formats.append({
-                'url': mp4_url,
-            })
-
-        description = get_elements_by_class('synopsis', webpage)[0]
-        thumbnail = self._html_search_regex(
-            r'''<img[^>]+src=(["'])(?P<url>(?!\1).+?/moviecovers/(?!\1).+?)\1''',
-            webpage, 'thumbnail url', fatal=False, group='url')
-        if thumbnail is not None:
-            thumbnail = compat_urlparse.urljoin(url, thumbnail)
-
-        return {
-            'id': video_id,
-            'title': title,
-            'formats': formats,
-            'thumbnail': thumbnail,
-            'description': description,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/eitb.py b/plugins/youtube_download/yt_dlp/extractor/eitb.py
index 66afbb6..18b802e 100644
--- a/plugins/youtube_download/yt_dlp/extractor/eitb.py
+++ b/plugins/youtube_download/yt_dlp/extractor/eitb.py
@@ -1,6 +1,11 @@
 from .common import InfoExtractor
 from ..networking import Request
-from ..utils import float_or_none, int_or_none, parse_iso8601
+from ..utils import (
+    float_or_none,
+    int_or_none,
+    join_nonempty,
+    parse_iso8601,
+)
 
 
 class EitbIE(InfoExtractor):
@@ -26,7 +31,7 @@ class EitbIE(InfoExtractor):
         video_id = self._match_id(url)
 
         video = self._download_json(
-            'http://mam.eitb.eus/mam/REST/ServiceMultiweb/Video/MULTIWEBTV/%s/' % video_id,
+            f'http://mam.eitb.eus/mam/REST/ServiceMultiweb/Video/MULTIWEBTV/{video_id}/',
             video_id, 'Downloading video JSON')
 
         media = video['web_media'][0]
@@ -37,12 +42,9 @@ class EitbIE(InfoExtractor):
             if not video_url:
                 continue
             tbr = float_or_none(rendition.get('ENCODING_RATE'), 1000)
-            format_id = 'http'
-            if tbr:
-                format_id += '-%d' % int(tbr)
             formats.append({
                 'url': rendition['PMD_URL'],
-                'format_id': format_id,
+                'format_id': join_nonempty('http', int_or_none(tbr)),
                 'width': int_or_none(rendition.get('FRAME_WIDTH')),
                 'height': int_or_none(rendition.get('FRAME_HEIGHT')),
                 'tbr': tbr,
@@ -59,12 +61,12 @@ class EitbIE(InfoExtractor):
                 token = token_data.get('token')
                 if token:
                     formats.extend(self._extract_m3u8_formats(
-                        '%s?hdnts=%s' % (hls_url, token), video_id, m3u8_id='hls', fatal=False))
+                        f'{hls_url}?hdnts={token}', video_id, m3u8_id='hls', fatal=False))
 
         hds_url = media.get('HDS_SURL')
         if hds_url:
             formats.extend(self._extract_f4m_formats(
-                '%s?hdcore=3.7.0' % hds_url.replace('euskalsvod', 'euskalvod'),
+                '{}?hdcore=3.7.0'.format(hds_url.replace('euskalsvod', 'euskalvod')),
                 video_id, f4m_id='hds', fatal=False))
 
         return {
diff --git a/plugins/youtube_download/yt_dlp/extractor/elementorembed.py b/plugins/youtube_download/yt_dlp/extractor/elementorembed.py
new file mode 100644
index 0000000..638893f
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/elementorembed.py
@@ -0,0 +1,72 @@
+import re
+
+from .common import InfoExtractor
+from .vimeo import VimeoIE
+from .youtube import YoutubeIE
+from ..utils import unescapeHTML, url_or_none
+from ..utils.traversal import traverse_obj
+
+
+class ElementorEmbedIE(InfoExtractor):
+    _VALID_URL = False
+    _WEBPAGE_TESTS = [{
+        'url': 'https://capitaltv.cy/2023/12/14/υγεια-και-ζωη-14-12-2023-δρ-ξενια-κωσταντινιδο/',
+        'info_dict': {
+            'id': 'KgzuxwuQwM4',
+            'ext': 'mp4',
+            'title': 'ΥΓΕΙΑ ΚΑΙ ΖΩΗ 14 12 2023 ΔΡ  ΞΕΝΙΑ ΚΩΣΤΑΝΤΙΝΙΔΟΥ',
+            'thumbnail': 'https://i.ytimg.com/vi/KgzuxwuQwM4/maxresdefault.jpg',
+            'playable_in_embed': True,
+            'tags': 'count:16',
+            'like_count': int,
+            'channel': 'Capital TV Cyprus',
+            'channel_id': 'UCR8LwVKTLGEXt4ZAErpCMrg',
+            'availability': 'public',
+            'description': 'md5:7a3308a22881aea4612358c4ba121f77',
+            'duration': 2891,
+            'upload_date': '20231214',
+            'uploader_id': '@capitaltvcyprus6389',
+            'live_status': 'not_live',
+            'channel_url': 'https://www.youtube.com/channel/UCR8LwVKTLGEXt4ZAErpCMrg',
+            'uploader_url': 'https://www.youtube.com/@capitaltvcyprus6389',
+            'uploader': 'Capital TV Cyprus',
+            'age_limit': 0,
+            'categories': ['News & Politics'],
+            'view_count': int,
+            'channel_follower_count': int,
+        },
+    }, {
+        'url': 'https://elementor.com/academy/theme-builder-collection/?playlist=76011151&video=9e59909',
+        'info_dict': {
+            'id': '?playlist=76011151&video=9e59909',
+            'title': 'Theme Builder Collection - Academy',
+            'age_limit': 0,
+            'timestamp': 1702196984.0,
+            'upload_date': '20231210',
+            'description': 'md5:7f52c52715ee9e54fd7f82210511673d',
+            'thumbnail': 'https://elementor.com/academy/wp-content/uploads/2021/07/Theme-Builder-1.png',
+        },
+        'playlist_count': 11,
+        'params': {
+            'skip_download': True,
+        },
+    }]
+    _WIDGET_REGEX = r'<div[^>]+class="[^"]*elementor-widget-video(?:-playlist)?[^"]*"[^>]*data-settings="([^"]*)"'
+
+    def _extract_from_webpage(self, url, webpage):
+        for data_settings in re.findall(self._WIDGET_REGEX, webpage):
+            data = self._parse_json(data_settings, None, fatal=False, transform_source=unescapeHTML)
+            if youtube_url := traverse_obj(data, ('youtube_url', {url_or_none})):
+                yield self.url_result(youtube_url, ie=YoutubeIE)
+
+            for video in traverse_obj(data, ('tabs', lambda _, v: v['_id'], {dict})):
+                if youtube_url := traverse_obj(video, ('youtube_url', {url_or_none})):
+                    yield self.url_result(youtube_url, ie=YoutubeIE)
+                if vimeo_url := traverse_obj(video, ('vimeo_url', {url_or_none})):
+                    yield self.url_result(vimeo_url, ie=VimeoIE)
+                for direct_url in traverse_obj(video, (('hosted_url', 'external_url'), 'url', {url_or_none})):
+                    yield {
+                        'id': video['_id'],
+                        'url': direct_url,
+                        'title': video.get('title'),
+                    }
diff --git a/plugins/youtube_download/yt_dlp/extractor/elevensports.py b/plugins/youtube_download/yt_dlp/extractor/elevensports.py
deleted file mode 100644
index 99c52b3..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/elevensports.py
+++ /dev/null
@@ -1,59 +0,0 @@
-from .common import InfoExtractor
-from ..utils import (
-    parse_iso8601,
-    traverse_obj,
-    url_or_none,
-)
-
-
-class ElevenSportsIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?elevensports\.com/view/event/(?P<id>\w+)'
-    _TESTS = [{
-        'url': 'https://elevensports.com/view/event/clf46yr3kenn80jgrqsjmwefk',
-        'md5': 'c0958d9ff90e4503a75544358758921d',
-        'info_dict': {
-            'id': 'clf46yr3kenn80jgrqsjmwefk',
-            'title': 'Cleveland SC vs Lionsbridge FC',
-            'ext': 'mp4',
-            'description': 'md5:03b5238d6549f4ea1fddadf69b5e0b58',
-            'upload_date': '20230323',
-            'timestamp': 1679612400,
-            'thumbnail': r're:^https?://.*\.(?:jpg|png)',
-        },
-        'params': {'skip_download': 'm3u8'}
-    }, {
-        'url': 'https://elevensports.com/view/event/clhpyd53b06160jez74qhgkmf',
-        'md5': 'c0958d9ff90e4503a75544358758921d',
-        'info_dict': {
-            'id': 'clhpyd53b06160jez74qhgkmf',
-            'title': 'AJNLF vs ARRAF',
-            'ext': 'mp4',
-            'description': 'md5:c8c5e75c78f37c6d15cd6c475e43a8c1',
-            'upload_date': '20230521',
-            'timestamp': 1684684800,
-            'thumbnail': r're:^https?://.*\.(?:jpg|png)',
-        },
-        'params': {'skip_download': 'm3u8'}
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-        event_id = self._search_nextjs_data(webpage, video_id)['props']['pageProps']['event']['mclsEventId']
-        event_data = self._download_json(
-            f'https://mcls-api.mycujoo.tv/bff/events/v1beta1/{event_id}', video_id,
-            headers={'Authorization': 'Bearer FBVKACGN37JQC5SFA0OVK8KKSIOP153G'})
-        formats, subtitles = self._extract_m3u8_formats_and_subtitles(
-            event_data['streams'][0]['full_url'], video_id, 'mp4', m3u8_id='hls')
-
-        return {
-            'id': video_id,
-            'formats': formats,
-            'subtitles': subtitles,
-            **traverse_obj(event_data, {
-                'title': ('title', {str}),
-                'description': ('description', {str}),
-                'timestamp': ('start_time', {parse_iso8601}),
-                'thumbnail': ('thumbnail_url', {url_or_none}),
-            }),
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/ellentube.py b/plugins/youtube_download/yt_dlp/extractor/ellentube.py
deleted file mode 100644
index 6eb00f9..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/ellentube.py
+++ /dev/null
@@ -1,130 +0,0 @@
-from .common import InfoExtractor
-from ..utils import (
-    clean_html,
-    extract_attributes,
-    float_or_none,
-    int_or_none,
-    try_get,
-)
-
-
-class EllenTubeBaseIE(InfoExtractor):
-    def _extract_data_config(self, webpage, video_id):
-        details = self._search_regex(
-            r'(<[^>]+\bdata-component=(["\'])[Dd]etails.+?></div>)', webpage,
-            'details')
-        return self._parse_json(
-            extract_attributes(details)['data-config'], video_id)
-
-    def _extract_video(self, data, video_id):
-        title = data['title']
-
-        formats = []
-        duration = None
-        for entry in data.get('media'):
-            if entry.get('id') == 'm3u8':
-                formats, subtitles = self._extract_m3u8_formats_and_subtitles(
-                    entry['url'], video_id, 'mp4',
-                    entry_protocol='m3u8_native', m3u8_id='hls')
-                duration = int_or_none(entry.get('duration'))
-                break
-
-        def get_insight(kind):
-            return int_or_none(try_get(
-                data, lambda x: x['insight']['%ss' % kind]))
-
-        return {
-            'extractor_key': EllenTubeIE.ie_key(),
-            'id': video_id,
-            'title': title,
-            'description': data.get('description'),
-            'duration': duration,
-            'thumbnail': data.get('thumbnail'),
-            'timestamp': float_or_none(data.get('publishTime'), scale=1000),
-            'view_count': get_insight('view'),
-            'like_count': get_insight('like'),
-            'formats': formats,
-            'subtitles': subtitles,
-        }
-
-
-class EllenTubeIE(EllenTubeBaseIE):
-    _VALID_URL = r'''(?x)
-                        (?:
-                            ellentube:|
-                            https://api-prod\.ellentube\.com/ellenapi/api/item/
-                        )
-                        (?P<id>[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12})
-                    '''
-    _TESTS = [{
-        'url': 'https://api-prod.ellentube.com/ellenapi/api/item/0822171c-3829-43bf-b99f-d77358ae75e3',
-        'md5': '2fabc277131bddafdd120e0fc0f974c9',
-        'info_dict': {
-            'id': '0822171c-3829-43bf-b99f-d77358ae75e3',
-            'ext': 'mp4',
-            'title': 'Ellen Meets Las Vegas Survivors Jesus Campos and Stephen Schuck',
-            'description': 'md5:76e3355e2242a78ad9e3858e5616923f',
-            'thumbnail': r're:^https?://.+?',
-            'duration': 514,
-            'timestamp': 1508505120,
-            'upload_date': '20171020',
-            'view_count': int,
-            'like_count': int,
-        }
-    }, {
-        'url': 'ellentube:734a3353-f697-4e79-9ca9-bfc3002dc1e0',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        data = self._download_json(
-            'https://api-prod.ellentube.com/ellenapi/api/item/%s' % video_id,
-            video_id)
-        return self._extract_video(data, video_id)
-
-
-class EllenTubeVideoIE(EllenTubeBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?ellentube\.com/video/(?P<id>.+?)\.html'
-    _TEST = {
-        'url': 'https://www.ellentube.com/video/ellen-meets-las-vegas-survivors-jesus-campos-and-stephen-schuck.html',
-        'only_matching': True,
-    }
-
-    def _real_extract(self, url):
-        display_id = self._match_id(url)
-        webpage = self._download_webpage(url, display_id)
-        video_id = self._extract_data_config(webpage, display_id)['id']
-        return self.url_result(
-            'ellentube:%s' % video_id, ie=EllenTubeIE.ie_key(),
-            video_id=video_id)
-
-
-class EllenTubePlaylistIE(EllenTubeBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?ellentube\.com/(?:episode|studios)/(?P<id>.+?)\.html'
-    _TESTS = [{
-        'url': 'https://www.ellentube.com/episode/dax-shepard-jordan-fisher-haim.html',
-        'info_dict': {
-            'id': 'dax-shepard-jordan-fisher-haim',
-            'title': "Dax Shepard, 'DWTS' Team Jordan Fisher & Lindsay Arnold, HAIM",
-            'description': 'md5:bfc982194dabb3f4e325e43aa6b2e21c',
-        },
-        'playlist_count': 6,
-    }, {
-        'url': 'https://www.ellentube.com/studios/macey-goes-rving0.html',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        display_id = self._match_id(url)
-        webpage = self._download_webpage(url, display_id)
-        data = self._extract_data_config(webpage, display_id)['data']
-        feed = self._download_json(
-            'https://api-prod.ellentube.com/ellenapi/api/feed/?%s'
-            % data['filter'], display_id)
-        entries = [
-            self._extract_video(elem, elem['id'])
-            for elem in feed if elem.get('type') == 'VIDEO' and elem.get('id')]
-        return self.playlist_result(
-            entries, display_id, data.get('title'),
-            clean_html(data.get('description')))
diff --git a/plugins/youtube_download/yt_dlp/extractor/elpais.py b/plugins/youtube_download/yt_dlp/extractor/elpais.py
index 7c6c880..46fa29f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/elpais.py
+++ b/plugins/youtube_download/yt_dlp/extractor/elpais.py
@@ -15,7 +15,7 @@ class ElPaisIE(InfoExtractor):
             'title': 'Tiempo nuevo, recetas viejas',
             'description': 'De lunes a viernes, a partir de las ocho de la mañana, Iñaki Gabilondo nos cuenta su visión de la actualidad nacional e internacional.',
             'upload_date': '20140206',
-        }
+        },
     }, {
         'url': 'http://elcomidista.elpais.com/elcomidista/2016/02/24/articulo/1456340311_668921.html#?id_externo_nwl=newsletter_diaria20160303t',
         'md5': '3bd5b09509f3519d7d9e763179b013de',
@@ -25,7 +25,7 @@ class ElPaisIE(InfoExtractor):
             'title': 'Cómo hacer el mejor café con cafetera italiana',
             'description': 'Que sí, que las cápsulas son cómodas. Pero si le pides algo más a la vida, quizá deberías aprender a usar bien la cafetera italiana. No tienes más que ver este vídeo y seguir sus siete normas básicas.',
             'upload_date': '20160303',
-        }
+        },
     }, {
         'url': 'http://elpais.com/elpais/2017/01/26/ciencia/1485456786_417876.html',
         'md5': '9c79923a118a067e1a45789e1e0b0f9c',
diff --git a/plugins/youtube_download/yt_dlp/extractor/eltrecetv.py b/plugins/youtube_download/yt_dlp/extractor/eltrecetv.py
new file mode 100644
index 0000000..71cf921
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/eltrecetv.py
@@ -0,0 +1,62 @@
+from .common import InfoExtractor
+
+
+class ElTreceTVIE(InfoExtractor):
+    IE_DESC = 'El Trece TV (Argentina)'
+    _VALID_URL = r'https?://(?:www\.)?eltrecetv\.com\.ar/[\w-]+/capitulos/temporada-\d+/(?P<id>[\w-]+)'
+    _TESTS = [
+        {
+            'url': 'https://www.eltrecetv.com.ar/ahora-caigo/capitulos/temporada-2023/programa-del-061023/',
+            'md5': '71a66673dc63f9a5939d97bfe4b311ba',
+            'info_dict': {
+                'id': 'AHCA05102023145553329621094',
+                'ext': 'mp4',
+                'title': 'AHORA CAIGO - Programa 06/10/23',
+                'thumbnail': 'https://thumbs.vodgc.net/AHCA05102023145553329621094.JPG?649339',
+            },
+        },
+        {
+            'url': 'https://www.eltrecetv.com.ar/poco-correctos/capitulos/temporada-2023/programa-del-250923-invitada-dalia-gutmann/',
+            'only_matching': True,
+        },
+        {
+            'url': 'https://www.eltrecetv.com.ar/argentina-tierra-de-amor-y-venganza/capitulos/temporada-2023/atav-2-capitulo-121-del-250923/',
+            'only_matching': True,
+        },
+        {
+            'url': 'https://www.eltrecetv.com.ar/ahora-caigo/capitulos/temporada-2023/programa-del-250923/',
+            'only_matching': True,
+        },
+        {
+            'url': 'https://www.eltrecetv.com.ar/pasaplatos/capitulos/temporada-2023/pasaplatos-el-restaurante-del-250923/',
+            'only_matching': True,
+        },
+        {
+            'url': 'https://www.eltrecetv.com.ar/el-galpon/capitulos/temporada-2023/programa-del-160923-invitado-raul-lavie/',
+            'only_matching': True,
+        },
+    ]
+
+    def _real_extract(self, url):
+        slug = self._match_id(url)
+        webpage = self._download_webpage(url, slug)
+        config = self._search_json(
+            r'Fusion.globalContent\s*=', webpage, 'content', slug)['promo_items']['basic']['embed']['config']
+        video_url = config['m3u8']
+        video_id = self._search_regex(r'/(\w+)\.m3u8', video_url, 'video id', default=slug)
+
+        formats, subtitles = self._extract_m3u8_formats_and_subtitles(video_url, video_id, 'mp4', m3u8_id='hls')
+        formats.extend([{
+            'url': f['url'][:-23],
+            'format_id': f['format_id'].replace('hls', 'http'),
+            'width': f.get('width'),
+            'height': f.get('height'),
+        } for f in formats if f['url'].endswith('/tracks-v1a1/index.m3u8') and f.get('height') != 1080])
+
+        return {
+            'id': video_id,
+            'title': config.get('title'),
+            'thumbnail': config.get('thumbnail'),
+            'formats': formats,
+            'subtitles': subtitles,
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/embedly.py b/plugins/youtube_download/yt_dlp/extractor/embedly.py
index 458aaa0..a424b49 100644
--- a/plugins/youtube_download/yt_dlp/extractor/embedly.py
+++ b/plugins/youtube_download/yt_dlp/extractor/embedly.py
@@ -106,4 +106,4 @@ class EmbedlyIE(InfoExtractor):
             return self.url_result(src, YoutubeTabIE)
         return self.url_result(smuggle_url(
             urllib.parse.unquote(traverse_obj(qs, ('src', 0), ('url', 0))),
-            {'http_headers': {'Referer': url}}))
+            {'referer': url}))
diff --git a/plugins/youtube_download/yt_dlp/extractor/engadget.py b/plugins/youtube_download/yt_dlp/extractor/engadget.py
deleted file mode 100644
index e7c5d7b..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/engadget.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from .common import InfoExtractor
-
-
-class EngadgetIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?engadget\.com/video/(?P<id>[^/?#]+)'
-
-    _TESTS = [{
-        # video with vidible ID
-        'url': 'https://www.engadget.com/video/57a28462134aa15a39f0421a/',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        return self.url_result('aol-video:%s' % video_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/epicon.py b/plugins/youtube_download/yt_dlp/extractor/epicon.py
index 3bfcc54..696f3e1 100644
--- a/plugins/youtube_download/yt_dlp/extractor/epicon.py
+++ b/plugins/youtube_download/yt_dlp/extractor/epicon.py
@@ -14,7 +14,7 @@ class EpiconIE(InfoExtractor):
             'title': 'Air Battle of Srinagar',
             'description': 'md5:c4de2013af9bc05ae4392e4115d518d7',
             'thumbnail': r're:^https?://.*\.jpg$',
-        }
+        },
     }, {
         'url': 'https://www.epicon.in/movies/krit',
         'info_dict': {
@@ -23,7 +23,7 @@ class EpiconIE(InfoExtractor):
             'title': 'Krit',
             'description': 'md5:c12b35dad915d48ccff7f013c79bab4a',
             'thumbnail': r're:^https?://.*\.jpg$',
-        }
+        },
     }, {
         'url': 'https://www.epicon.in/tv-shows/paapnaashini-ganga/season-1/vardaan',
         'info_dict': {
@@ -32,7 +32,7 @@ class EpiconIE(InfoExtractor):
             'title': 'Paapnaashini Ganga - Season 1 - Ep 1 - VARDAAN',
             'description': 'md5:f517058c3d0402398eefa6242f4dd6ae',
             'thumbnail': r're:^https?://.*\.jpg$',
-        }
+        },
     }, {
         'url': 'https://www.epicon.in/movies/jayadev',
         'info_dict': {
@@ -41,16 +41,17 @@ class EpiconIE(InfoExtractor):
             'title': 'Jayadev',
             'description': 'md5:09e349eecd8e585a3b6466904f19df6c',
             'thumbnail': r're:^https?://.*\.jpg$',
-        }
+        },
     }]
 
     def _real_extract(self, url):
-        id = self._match_id(url)
-        webpage = self._download_webpage(url, id)
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
         cid = self._search_regex(r'class=\"mylist-icon\ iconclick\"\ id=\"(\d+)', webpage, 'cid')
         headers = {'content-type': 'application/x-www-form-urlencoded; charset=UTF-8'}
         data = f'cid={cid}&action=st&type=video'.encode()
-        data_json = self._parse_json(self._download_json('https://www.epicon.in/ajaxplayer/', id, headers=headers, data=data), id)
+        data_json = self._parse_json(
+            self._download_json('https://www.epicon.in/ajaxplayer/', video_id, headers=headers, data=data), video_id)
 
         if not data_json['success']:
             raise ExtractorError(data_json['message'], expected=True)
@@ -58,7 +59,7 @@ class EpiconIE(InfoExtractor):
         title = self._search_regex(r'setplaytitle=\"([^\"]+)', webpage, 'title')
         description = self._og_search_description(webpage) or None
         thumbnail = self._og_search_thumbnail(webpage) or None
-        formats = self._extract_m3u8_formats(data_json['url']['video_url'], id)
+        formats = self._extract_m3u8_formats(data_json['url']['video_url'], video_id)
 
         subtitles = {}
         for subtitle in data_json.get('subtitles', []):
@@ -70,7 +71,7 @@ class EpiconIE(InfoExtractor):
             })
 
         return {
-            'id': id,
+            'id': video_id,
             'formats': formats,
             'title': title,
             'description': description,
@@ -108,8 +109,8 @@ class EpiconSeriesIE(InfoExtractor):
     }]
 
     def _real_extract(self, url):
-        id = self._match_id(url)
-        webpage = self._download_webpage(url, id)
-        episodes = re.findall(r'ct-tray-url=\"(tv-shows/%s/[^\"]+)' % id, webpage)
-        entries = [self.url_result('https://www.epicon.in/%s' % episode, ie=EpiconIE.ie_key()) for episode in episodes]
-        return self.playlist_result(entries, playlist_id=id)
+        playlist_id = self._match_id(url)
+        webpage = self._download_webpage(url, playlist_id)
+        episodes = re.findall(rf'ct-tray-url=\"(tv-shows/{playlist_id}/[^\"]+)', webpage)
+        entries = [self.url_result(f'https://www.epicon.in/{episode}', EpiconIE) for episode in episodes]
+        return self.playlist_result(entries, playlist_id=playlist_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/epidemicsound.py b/plugins/youtube_download/yt_dlp/extractor/epidemicsound.py
new file mode 100644
index 0000000..75b0f05
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/epidemicsound.py
@@ -0,0 +1,124 @@
+from .common import InfoExtractor
+from ..utils import (
+    float_or_none,
+    int_or_none,
+    join_nonempty,
+    orderedSet,
+    parse_iso8601,
+    parse_qs,
+    parse_resolution,
+    str_or_none,
+    traverse_obj,
+    url_or_none,
+)
+
+
+class EpidemicSoundIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?epidemicsound\.com/(?:(?P<sfx>sound-effects/tracks)|track)/(?P<id>[0-9a-zA-Z-]+)'
+    _TESTS = [{
+        'url': 'https://www.epidemicsound.com/track/yFfQVRpSPz/',
+        'md5': 'd98ff2ddb49e8acab9716541cbc9dfac',
+        'info_dict': {
+            'id': '45014',
+            'display_id': 'yFfQVRpSPz',
+            'ext': 'mp3',
+            'title': 'Door Knock Door 1',
+            'alt_title': 'Door Knock Door 1',
+            'tags': ['foley', 'door', 'knock', 'glass', 'window', 'glass door knock'],
+            'categories': ['Misc. Door'],
+            'duration': 1,
+            'thumbnail': 'https://cdn.epidemicsound.com/curation-assets/commercial-release-cover-images/default-sfx/3000x3000.jpg',
+            'timestamp': 1415320353,
+            'upload_date': '20141107',
+        },
+    }, {
+        'url': 'https://www.epidemicsound.com/track/mj8GTTwsZd/',
+        'md5': 'c82b745890f9baf18dc2f8d568ee3830',
+        'info_dict': {
+            'id': '148700',
+            'display_id': 'mj8GTTwsZd',
+            'ext': 'mp3',
+            'title': 'Noplace',
+            'tags': ['liquid drum n bass', 'energetic'],
+            'categories': ['drum and bass'],
+            'duration': 237,
+            'timestamp': 1694426482,
+            'thumbnail': 'https://cdn.epidemicsound.com/curation-assets/commercial-release-cover-images/11138/3000x3000.jpg',
+            'upload_date': '20230911',
+            'release_timestamp': 1700535606,
+            'release_date': '20231121',
+        },
+    }, {
+        'url': 'https://www.epidemicsound.com/sound-effects/tracks/2f02f54b-9faa-4daf-abac-1cfe9e9cef69/',
+        'md5': '35d7cf05bd8b614a84f0495a05de9388',
+        'info_dict': {
+            'id': '208931',
+            'ext': 'mp3',
+            'upload_date': '20240603',
+            'timestamp': 1717436529,
+            'categories': ['appliance'],
+            'display_id': '6b2NXLURPr',
+            'duration': 1.0,
+            'title': 'Oven, Grill, Door Open 01',
+            'thumbnail': 'https://cdn.epidemicsound.com/curation-assets/commercial-release-cover-images/default-sfx/3000x3000.jpg',
+        },
+    }]
+
+    @staticmethod
+    def _epidemic_parse_thumbnail(url: str):
+        if not url_or_none(url):
+            return None
+
+        return {
+            'url': url,
+            **(traverse_obj(url, ({parse_qs}, {
+                'width': ('width', 0, {int_or_none}),
+                'height': ('height', 0, {int_or_none}),
+            })) or parse_resolution(url)),
+        }
+
+    @staticmethod
+    def _epidemic_fmt_or_none(f):
+        if not f.get('format'):
+            f['format'] = f.get('format_id')
+        elif not f.get('format_id'):
+            f['format_id'] = f['format']
+        if not f['url'] or not f['format']:
+            return None
+        if f.get('format_note'):
+            f['format_note'] = f'track ID {f["format_note"]}'
+        if f['format'] != 'full':
+            f['preference'] = -2
+        return f
+
+    def _real_extract(self, url):
+        video_id, is_sfx = self._match_valid_url(url).group('id', 'sfx')
+        json_data = self._download_json(join_nonempty(
+            'https://www.epidemicsound.com/json/track',
+            is_sfx and 'kosmos-id', video_id, delim='/'), video_id)
+
+        thumbnails = traverse_obj(json_data, [('imageUrl', 'cover')])
+        thumb_base_url = traverse_obj(json_data, ('coverArt', 'baseUrl', {url_or_none}))
+        if thumb_base_url:
+            thumbnails.extend(traverse_obj(json_data, (
+                'coverArt', 'sizes', ..., {thumb_base_url.__add__})))
+
+        return traverse_obj(json_data, {
+            'id': ('id', {str_or_none}),
+            'display_id': ('publicSlug', {str}),
+            'title': ('title', {str}),
+            'alt_title': ('oldTitle', {str}),
+            'duration': ('length', {float_or_none}),
+            'timestamp': ('added', {parse_iso8601}),
+            'release_timestamp': ('releaseDate', {parse_iso8601}),
+            'categories': ('genres', ..., 'tag', {str}),
+            'tags': ('metadataTags', ..., {str}),
+            'age_limit': ('isExplicit', {lambda b: 18 if b else None}),
+            'thumbnails': ({lambda _: thumbnails}, {orderedSet}, ..., {self._epidemic_parse_thumbnail}),
+            'formats': ('stems', {dict.items}, ..., {
+                'format': (0, {str_or_none}),
+                'format_note': (1, 's3TrackId', {str_or_none}),
+                'format_id': (1, 'stemType', {str}),
+                'url': (1, 'lqMp3Url', {url_or_none}),
+            }, {self._epidemic_fmt_or_none}),
+        })
diff --git a/plugins/youtube_download/yt_dlp/extractor/eplus.py b/plugins/youtube_download/yt_dlp/extractor/eplus.py
new file mode 100644
index 0000000..d2ad5b4
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/eplus.py
@@ -0,0 +1,205 @@
+import json
+
+from .common import InfoExtractor
+from ..utils import (
+    ExtractorError,
+    try_call,
+    unified_timestamp,
+    urlencode_postdata,
+)
+
+
+class EplusIbIE(InfoExtractor):
+    _NETRC_MACHINE = 'eplus'
+    IE_NAME = 'eplus'
+    IE_DESC = 'e+ (イープラス)'
+    _VALID_URL = [r'https?://live\.eplus\.jp/ex/player\?ib=(?P<id>(?:\w|%2B|%2F){86}%3D%3D)',
+                  r'https?://live\.eplus\.jp/(?P<id>sample|\d+)']
+    _TESTS = [{
+        'url': 'https://live.eplus.jp/ex/player?ib=41K6Wzbr3PlcMD%2FOKHFlC%2FcZCe2Eaw7FK%2BpJS1ooUHki8d0vGSy2mYqxillQBe1dSnOxU%2B8%2FzXKls4XPBSb3vw%3D%3D',
+        'info_dict': {
+            'id': '335699-0001-006',
+            'title': '少女☆歌劇 レヴュースタァライト -The LIVE 青嵐- BLUE GLITTER <定点映像配信>【Streaming+(配信)】',
+            'live_status': 'was_live',
+            'release_date': '20201221',
+            'release_timestamp': 1608544800,
+        },
+        'params': {
+            'skip_download': True,
+            'ignore_no_formats_error': True,
+        },
+        'expected_warnings': [
+            'This event may not be accessible',
+            'No video formats found',
+            'Requested format is not available',
+        ],
+    }, {
+        'url': 'https://live.eplus.jp/ex/player?ib=6QSsQdyRAwOFZrEHWlhRm7vocgV%2FO0YzBZ%2BaBEBg1XR%2FmbLn0R%2F048dUoAY038%2F%2F92MJ73BsoAtvUpbV6RLtDQ%3D%3D&show_id=2371511',
+        'info_dict': {
+            'id': '348021-0054-001',
+            'title': 'ラブライブ!スーパースター!! Liella! First LoveLive! Tour ～Starlines～【東京/DAY.1】',
+            'live_status': 'was_live',
+            'release_date': '20220115',
+            'release_timestamp': 1642233600,
+            'description': str,
+        },
+        'params': {
+            'skip_download': True,
+            'ignore_no_formats_error': True,
+        },
+        'expected_warnings': [
+            'Could not find the playlist URL. This event may not be accessible',
+            'No video formats found!',
+            'Requested format is not available',
+        ],
+    }, {
+        'url': 'https://live.eplus.jp/sample',
+        'info_dict': {
+            'id': 'stream1ng20210719-test-005',
+            'title': 'Online streaming test for DRM',
+            'live_status': 'was_live',
+            'release_date': '20210719',
+            'release_timestamp': 1626703200,
+        },
+        'params': {
+            'skip_download': True,
+            'ignore_no_formats_error': True,
+        },
+        'expected_warnings': [
+            'Could not find the playlist URL. This event may not be accessible',
+            'No video formats found!',
+            'Requested format is not available',
+            'This video is DRM protected',
+        ],
+    }, {
+        'url': 'https://live.eplus.jp/2053935',
+        'info_dict': {
+            'id': '331320-0001-001',
+            'title': '丘みどり2020配信LIVE Vol.2 ～秋麗～ 【Streaming+(配信チケット)】',
+            'live_status': 'was_live',
+            'release_date': '20200920',
+            'release_timestamp': 1600596000,
+        },
+        'params': {
+            'skip_download': True,
+            'ignore_no_formats_error': True,
+        },
+        'expected_warnings': [
+            'Could not find the playlist URL. This event may not be accessible',
+            'No video formats found!',
+            'Requested format is not available',
+        ],
+    }]
+
+    _USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36 Edg/119.0.0.0'
+
+    def _login(self, username, password, urlh):
+        if not self._get_cookies('https://live.eplus.jp/').get('ci_session'):
+            raise ExtractorError('Unable to get ci_session cookie')
+
+        cltft_token = urlh.headers.get('X-CLTFT-Token')
+        if not cltft_token:
+            raise ExtractorError('Unable to get X-CLTFT-Token')
+        self._set_cookie('live.eplus.jp', 'X-CLTFT-Token', cltft_token)
+
+        login_json = self._download_json(
+            'https://live.eplus.jp/member/api/v1/FTAuth/idpw', None,
+            note='Sending pre-login info', errnote='Unable to send pre-login info', headers={
+                'Content-Type': 'application/json; charset=UTF-8',
+                'Referer': urlh.url,
+                'X-Cltft-Token': cltft_token,
+                'Accept': '*/*',
+            }, data=json.dumps({
+                'loginId': username,
+                'loginPassword': password,
+            }).encode())
+        if not login_json.get('isSuccess'):
+            raise ExtractorError('Login failed: Invalid id or password', expected=True)
+
+        self._request_webpage(
+            urlh.url, None, note='Logging in', errnote='Unable to log in',
+            data=urlencode_postdata({
+                'loginId': username,
+                'loginPassword': password,
+                'Token.Default': cltft_token,
+                'op': 'nextPage',
+            }), headers={'Referer': urlh.url})
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage, urlh = self._download_webpage_handle(
+            url, video_id, headers={'User-Agent': self._USER_AGENT})
+        if urlh.url.startswith('https://live.eplus.jp/member/auth'):
+            username, password = self._get_login_info()
+            if not username:
+                self.raise_login_required()
+            self._login(username, password, urlh)
+            webpage = self._download_webpage(
+                url, video_id, headers={'User-Agent': self._USER_AGENT})
+
+        data_json = self._search_json(r'<script>\s*var app\s*=', webpage, 'data json', video_id)
+
+        if data_json.get('drm_mode') == 'ON':
+            self.report_drm(video_id)
+
+        if data_json.get('is_pass_ticket') == 'YES':
+            raise ExtractorError(
+                'This URL is for a pass ticket instead of a player page', expected=True)
+
+        delivery_status = data_json.get('delivery_status')
+        archive_mode = data_json.get('archive_mode')
+        release_timestamp = try_call(lambda: unified_timestamp(data_json['event_datetime']) - 32400)
+        release_timestamp_str = data_json.get('event_datetime_text')  # JST
+
+        self.write_debug(f'delivery_status = {delivery_status}, archive_mode = {archive_mode}')
+
+        if delivery_status == 'PREPARING':
+            live_status = 'is_upcoming'
+        elif delivery_status == 'STARTED':
+            live_status = 'is_live'
+        elif delivery_status == 'STOPPED':
+            if archive_mode != 'ON':
+                raise ExtractorError(
+                    'This event has ended and there is no archive for this event', expected=True)
+            live_status = 'post_live'
+        elif delivery_status == 'WAIT_CONFIRM_ARCHIVED':
+            live_status = 'post_live'
+        elif delivery_status == 'CONFIRMED_ARCHIVE':
+            live_status = 'was_live'
+        else:
+            self.report_warning(f'Unknown delivery_status {delivery_status}, treat it as a live')
+            live_status = 'is_live'
+
+        formats = []
+
+        m3u8_playlist_urls = self._search_json(
+            r'var\s+listChannels\s*=', webpage, 'hls URLs', video_id, contains_pattern=r'\[.+\]', default=[])
+        if not m3u8_playlist_urls:
+            if live_status == 'is_upcoming':
+                self.raise_no_formats(
+                    f'Could not find the playlist URL. This live event will begin at {release_timestamp_str} JST', expected=True)
+            else:
+                self.raise_no_formats(
+                    'Could not find the playlist URL. This event may not be accessible', expected=True)
+        elif live_status == 'is_upcoming':
+            self.raise_no_formats(f'This live event will begin at {release_timestamp_str} JST', expected=True)
+        elif live_status == 'post_live':
+            self.raise_no_formats('This event has ended, and the archive will be available shortly', expected=True)
+        else:
+            for m3u8_playlist_url in m3u8_playlist_urls:
+                formats.extend(self._extract_m3u8_formats(m3u8_playlist_url, video_id))
+            # FIXME: HTTP request headers need to be updated to continue download
+            warning = 'Due to technical limitations, the download will be interrupted after one hour'
+            if live_status == 'is_live':
+                self.report_warning(warning)
+            elif live_status == 'was_live':
+                self.report_warning(f'{warning}. You can restart to continue the download')
+
+        return {
+            'id': data_json['app_id'],
+            'title': data_json.get('app_name'),
+            'formats': formats,
+            'live_status': live_status,
+            'description': data_json.get('content'),
+            'release_timestamp': release_timestamp,
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/epoch.py b/plugins/youtube_download/yt_dlp/extractor/epoch.py
index 110e78c..9742f76 100644
--- a/plugins/youtube_download/yt_dlp/extractor/epoch.py
+++ b/plugins/youtube_download/yt_dlp/extractor/epoch.py
@@ -11,7 +11,7 @@ class EpochIE(InfoExtractor):
                 'id': 'a3dd732c-4750-4bc8-8156-69180668bda1',
                 'ext': 'mp4',
                 'title': '‘They Can Do Audio, Video, Physical Surveillance on You 24H/365D a Year’: Rex Lee on Intrusive Apps',
-            }
+            },
         },
         {
             'url': 'https://www.theepochtimes.com/the-communist-partys-cyberattacks-on-america-explained-rex-lee-talks-tech-hybrid-warfare_4342413.html',
@@ -19,7 +19,7 @@ class EpochIE(InfoExtractor):
                 'id': '276c7f46-3bbf-475d-9934-b9bbe827cf0a',
                 'ext': 'mp4',
                 'title': 'The Communist Party’s Cyberattacks on America Explained; Rex Lee Talks Tech Hybrid Warfare',
-            }
+            },
         },
         {
             'url': 'https://www.theepochtimes.com/kash-patel-a-6-year-saga-of-government-corruption-from-russiagate-to-mar-a-lago_4690250.html',
@@ -27,7 +27,7 @@ class EpochIE(InfoExtractor):
                 'id': 'aa9ceecd-a127-453d-a2de-7153d6fd69b6',
                 'ext': 'mp4',
                 'title': 'Kash Patel: A ‘6-Year-Saga’ of Government Corruption, From Russiagate to Mar-a-Lago',
-            }
+            },
         },
         {
             'url': 'https://www.theepochtimes.com/dick-morris-discusses-his-book-the-return-trumps-big-2024-comeback_4819205.html',
@@ -35,7 +35,7 @@ class EpochIE(InfoExtractor):
                 'id': '9489f994-2a20-4812-b233-ac0e5c345632',
                 'ext': 'mp4',
                 'title': 'Dick Morris Discusses His Book ‘The Return: Trump’s Big 2024 Comeback’',
-            }
+            },
         },
     ]
 
@@ -51,5 +51,5 @@ class EpochIE(InfoExtractor):
             'id': youmaker_video_id,
             'formats': formats,
             'subtitles': subtitles,
-            'title': self._html_extract_title(webpage)
+            'title': self._html_extract_title(webpage),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/eporner.py b/plugins/youtube_download/yt_dlp/extractor/eporner.py
index aee2dee..2d25c6b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/eporner.py
+++ b/plugins/youtube_download/yt_dlp/extractor/eporner.py
@@ -1,8 +1,10 @@
 from .common import InfoExtractor
 from ..utils import (
-    encode_base_n,
     ExtractorError,
+    encode_base_n,
+    get_elements_by_class,
     int_or_none,
+    join_nonempty,
     merge_dicts,
     parse_duration,
     str_to_int,
@@ -27,9 +29,6 @@ class EpornerIE(InfoExtractor):
             'view_count': int,
             'age_limit': 18,
         },
-        'params': {
-            'proxy': '127.0.0.1:8118'
-        }
     }, {
         # New (May 2016) URL layout
         'url': 'http://www.eporner.com/hd-porn/3YRUtzMcWn0/Star-Wars-XXX-Parody/',
@@ -54,7 +53,7 @@ class EpornerIE(InfoExtractor):
 
         video_id = self._match_id(urlh.url)
 
-        hash = self._search_regex(
+        vid_hash = self._search_regex(
             r'hash\s*[:=]\s*["\']([\da-f]{32})', webpage, 'hash')
 
         title = self._og_search_title(webpage, default=None) or self._html_search_regex(
@@ -62,13 +61,13 @@ class EpornerIE(InfoExtractor):
 
         # Reverse engineered from vjs.js
         def calc_hash(s):
-            return ''.join((encode_base_n(int(s[lb:lb + 8], 16), 36) for lb in range(0, 32, 8)))
+            return ''.join(encode_base_n(int(s[lb:lb + 8], 16), 36) for lb in range(0, 32, 8))
 
         video = self._download_json(
-            'http://www.eporner.com/xhr/video/%s' % video_id,
+            f'http://www.eporner.com/xhr/video/{video_id}',
             display_id, note='Downloading video JSON',
             query={
-                'hash': calc_hash(hash),
+                'hash': calc_hash(vid_hash),
                 'device': 'generic',
                 'domain': 'www.eporner.com',
                 'fallback': 'false',
@@ -76,11 +75,12 @@ class EpornerIE(InfoExtractor):
 
         if video.get('available') is False:
             raise ExtractorError(
-                '%s said: %s' % (self.IE_NAME, video['message']), expected=True)
+                '{} said: {}'.format(self.IE_NAME, video['message']), expected=True)
 
         sources = video['sources']
 
         formats = []
+        has_av1 = bool(get_elements_by_class('download-av1', webpage))
         for kind, formats_dict in sources.items():
             if not isinstance(formats_dict, dict):
                 continue
@@ -106,6 +106,14 @@ class EpornerIE(InfoExtractor):
                         'height': height,
                         'fps': fps,
                     })
+                    if has_av1:
+                        formats.append({
+                            'url': src.replace('.mp4', '-av1.mp4'),
+                            'format_id': join_nonempty('av1', format_id),
+                            'height': height,
+                            'fps': fps,
+                            'vcodec': 'av1',
+                        })
 
         json_ld = self._search_json_ld(webpage, display_id, default={})
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/erocast.py b/plugins/youtube_download/yt_dlp/extractor/erocast.py
new file mode 100644
index 0000000..bd22137
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/erocast.py
@@ -0,0 +1,63 @@
+from .common import InfoExtractor
+from ..utils import (
+    int_or_none,
+    parse_iso8601,
+    str_or_none,
+    traverse_obj,
+    url_or_none,
+)
+
+
+class ErocastIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?erocast\.me/track/(?P<id>[0-9]+)'
+    _TESTS = [{
+        'url': 'https://erocast.me/track/9787/f',
+        'md5': 'af63b91f5f231096aba54dd682abea3b',
+        'info_dict': {
+            'id': '9787',
+            'title': '[F4M] Your roommate, who is definitely not possessed by an alien, suddenly wants to fuck you',
+            'url': 'https://erocast.s3.us-east-2.wasabisys.com/1220419/track.m3u8',
+            'ext': 'm4a',
+            'age_limit': 18,
+            'release_timestamp': 1696178652,
+            'release_date': '20231001',
+            'modified_timestamp': int,
+            'modified_date': str,
+            'description': 'ExtraTerrestrial Tuesday!',
+            'uploader': 'clarissaisshy',
+            'uploader_id': '8113',
+            'uploader_url': 'https://erocast.me/clarissaisshy',
+            'thumbnail': 'https://erocast.s3.us-east-2.wasabisys.com/1220418/conversions/1696179247-lg.jpg',
+            'duration': 2307,
+            'view_count': int,
+            'comment_count': int,
+            'webpage_url': 'https://erocast.me/track/9787/f4m-your-roommate-who-is-definitely-not-possessed-by-an-alien-suddenly-wants-to-fuck-you',
+        },
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+        data = self._search_json(
+            rf'<script>\s*var song_data_{video_id}\s*=', webpage, 'data', video_id, end_pattern=r'</script>')
+
+        return {
+            'id': video_id,
+            'formats': self._extract_m3u8_formats(
+                data.get('file_url') or data['stream_url'], video_id, 'm4a', m3u8_id='hls'),
+            'age_limit': 18,
+            **traverse_obj(data, {
+                'title': ('title', {str}),
+                'description': ('description', {str}),
+                'release_timestamp': ('created_at', {parse_iso8601}),
+                'modified_timestamp': ('updated_at', {parse_iso8601}),
+                'uploader': ('user', 'name', {str}),
+                'uploader_id': ('user', 'id', {str_or_none}),
+                'uploader_url': ('user', 'permalink_url', {url_or_none}),
+                'thumbnail': ('artwork_url', {url_or_none}),
+                'duration': ('duration', {int_or_none}),
+                'view_count': ('plays', {int_or_none}),
+                'comment_count': ('comment_count', {int_or_none}),
+                'webpage_url': ('permalink_url', {url_or_none}),
+            }),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/eroprofile.py b/plugins/youtube_download/yt_dlp/extractor/eroprofile.py
index 2b61f3b..2067217 100644
--- a/plugins/youtube_download/yt_dlp/extractor/eroprofile.py
+++ b/plugins/youtube_download/yt_dlp/extractor/eroprofile.py
@@ -1,7 +1,7 @@
 import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import compat_urllib_parse_urlencode
 from ..utils import (
     ExtractorError,
     merge_dicts,
@@ -38,7 +38,7 @@ class EroProfileIE(InfoExtractor):
     }]
 
     def _perform_login(self, username, password):
-        query = compat_urllib_parse_urlencode({
+        query = urllib.parse.urlencode({
             'username': username,
             'password': password,
             'url': 'http://www.eroprofile.com/',
@@ -91,7 +91,7 @@ class EroProfileAlbumIE(InfoExtractor):
         'url': 'https://www.eroprofile.com/m/videos/album/BBW-2-893',
         'info_dict': {
             'id': 'BBW-2-893',
-            'title': 'BBW 2'
+            'title': 'BBW 2',
         },
         'playlist_mincount': 486,
     },
diff --git a/plugins/youtube_download/yt_dlp/extractor/err.py b/plugins/youtube_download/yt_dlp/extractor/err.py
new file mode 100644
index 0000000..d4139c6
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/err.py
@@ -0,0 +1,224 @@
+from .common import InfoExtractor
+from ..utils import (
+    clean_html,
+    int_or_none,
+    str_or_none,
+    url_or_none,
+)
+from ..utils.traversal import traverse_obj
+
+
+class ERRJupiterIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:jupiter(?:pluss)?|lasteekraan)\.err\.ee/(?P<id>\d+)'
+    _TESTS = [{
+        'note': 'Jupiter: Movie: siin-me-oleme',
+        'url': 'https://jupiter.err.ee/1211107/siin-me-oleme',
+        'md5': '9b45d1682a98853acaa1e1b0c791f425',
+        'info_dict': {
+            'id': '1211107',
+            'ext': 'mp4',
+            'title': 'Siin me oleme!',
+            'alt_title': '',
+            'description': 'md5:1825b795f5f7584241aeb59e5bbb4f70',
+            'release_date': '20231226',
+            'upload_date': '20201217',
+            'modified_date': '20201217',
+            'release_timestamp': 1703577600,
+            'timestamp': 1608210000,
+            'modified_timestamp': 1608220800,
+            'release_year': 1978,
+        },
+    }, {
+        'note': 'Jupiter: Series: Impulss',
+        'url': 'https://jupiter.err.ee/1609145945/impulss',
+        'md5': 'a378486df07ed1ba74e46cc861886243',
+        'info_dict': {
+            'id': '1609145945',
+            'ext': 'mp4',
+            'title': 'Impulss',
+            'alt_title': 'Loteriipilet hooldekodusse',
+            'description': 'md5:fa8a2ed0cdccb130211513443ee4d571',
+            'release_date': '20231107',
+            'upload_date': '20231026',
+            'modified_date': '20231118',
+            'release_timestamp': 1699380000,
+            'timestamp': 1698327601,
+            'modified_timestamp': 1700311802,
+            'series': 'Impulss',
+            'season': 'Season 1',
+            'season_number': 1,
+            'episode': 'Loteriipilet hooldekodusse',
+            'episode_number': 6,
+            'series_id': '1609108187',
+            'release_year': 2023,
+            'episode_id': '1609145945',
+        },
+    }, {
+        'note': 'Jupiter: Radio Show: mnemoturniir episode',
+        'url': 'https://jupiter.err.ee/1037919/mnemoturniir',
+        'md5': 'f1eb95fe66f9620ff84e81bbac37076a',
+        'info_dict': {
+            'id': '1037919',
+            'ext': 'm4a',
+            'title': 'Mnemoturniir',
+            'alt_title': '',
+            'description': 'md5:626db52394e7583c26ab74d6a34d9982',
+            'release_date': '20240121',
+            'upload_date': '20240108',
+            'modified_date': '20240121',
+            'release_timestamp': 1705827900,
+            'timestamp': 1704675602,
+            'modified_timestamp': 1705827601,
+            'series': 'Mnemoturniir',
+            'season': 'Season 0',
+            'season_number': 0,
+            'episode': 'Episode 0',
+            'episode_number': 0,
+            'series_id': '1037919',
+            'release_year': 2024,
+            'episode_id': '1609215101',
+        },
+    }, {
+        'note': 'Jupiter+: Clip: bolee-zelenyj-tallinn',
+        'url': 'https://jupiterpluss.err.ee/1609180445/bolee-zelenyj-tallinn',
+        'md5': '1b812270c4daf6ce51c06bfeaf33ed95',
+        'info_dict': {
+            'id': '1609180445',
+            'ext': 'mp4',
+            'title': 'Более зеленый Таллинн',
+            'alt_title': '',
+            'description': 'md5:fd34d9bf939c28c4a725b19a7f0d6320',
+            'release_date': '20231224',
+            'upload_date': '20231130',
+            'modified_date': '20231207',
+            'release_timestamp': 1703423400,
+            'timestamp': 1701338400,
+            'modified_timestamp': 1701967200,
+            'release_year': 2023,
+        },
+    }, {
+        'note': 'Jupiter+: Series: The Sniffer',
+        'url': 'https://jupiterpluss.err.ee/1608311387/njuhach',
+        'md5': '2abdeb7131ce551bce49e8d0cea08536',
+        'info_dict': {
+            'id': '1608311387',
+            'ext': 'mp4',
+            'title': 'Нюхач',
+            'alt_title': '',
+            'description': 'md5:8c5c7d8f32ec6e54cd498c9e59ca83bc',
+            'release_date': '20230601',
+            'upload_date': '20210818',
+            'modified_date': '20210903',
+            'release_timestamp': 1685633400,
+            'timestamp': 1629318000,
+            'modified_timestamp': 1630686000,
+            'release_year': 2013,
+            'episode': 'Episode 1',
+            'episode_id': '1608311390',
+            'episode_number': 1,
+            'season': 'Season 1',
+            'season_number': 1,
+            'series': 'Нюхач',
+            'series_id': '1608311387',
+        },
+    }, {
+        'note': 'Jupiter+: Podcast: lesnye-istorii-aisty',
+        'url': 'https://jupiterpluss.err.ee/1608990335/lesnye-istorii-aisty',
+        'md5': '8b46d7e4510b254a14b7a52211b5bf96',
+        'info_dict': {
+            'id': '1608990335',
+            'ext': 'm4a',
+            'title': 'Лесные истории | Аисты',
+            'alt_title': '',
+            'description': 'md5:065e721623e271e7a63e6540d409ca6b',
+            'release_date': '20230609',
+            'upload_date': '20230527',
+            'modified_date': '20230608',
+            'release_timestamp': 1686308700,
+            'timestamp': 1685145600,
+            'modified_timestamp': 1686252600,
+            'release_year': 2023,
+            'episode': 'Episode 0',
+            'episode_id': '1608990335',
+            'episode_number': 0,
+            'season': 'Season 0',
+            'season_number': 0,
+            'series': 'Лесные истории | Аисты',
+            'series_id': '1037497',
+        },
+    }, {
+        'note': 'Lasteekraan: Pätu',
+        'url': 'https://lasteekraan.err.ee/1092243/patu',
+        'md5': 'a67eb9b9bcb3d201718c15d1638edf77',
+        'info_dict': {
+            'id': '1092243',
+            'ext': 'mp4',
+            'title': 'Pätu',
+            'alt_title': '',
+            'description': 'md5:64a7b5a80afd7042d3f8ec48c77befd9',
+            'release_date': '20230614',
+            'upload_date': '20200520',
+            'modified_date': '20200520',
+            'release_timestamp': 1686745800,
+            'timestamp': 1589975640,
+            'modified_timestamp': 1589975640,
+            'release_year': 1990,
+            'episode': 'Episode 1',
+            'episode_id': '1092243',
+            'episode_number': 1,
+            'season': 'Season 1',
+            'season_number': 1,
+            'series': 'Pätu',
+            'series_id': '1092236',
+        },
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        data = self._download_json(
+            'https://services.err.ee/api/v2/vodContent/getContentPageData', video_id,
+            query={'contentId': video_id})['data']['mainContent']
+
+        media_data = traverse_obj(data, ('medias', ..., {dict}), get_all=False)
+        if traverse_obj(media_data, ('restrictions', 'drm', {bool})):
+            self.report_drm(video_id)
+
+        formats, subtitles = [], {}
+        for format_url in set(traverse_obj(media_data, ('src', ('hls', 'hls2', 'hlsNew'), {url_or_none}))):
+            fmts, subs = self._extract_m3u8_formats_and_subtitles(
+                format_url, video_id, 'mp4', m3u8_id='hls', fatal=False)
+            formats.extend(fmts)
+            self._merge_subtitles(subs, target=subtitles)
+        for format_url in set(traverse_obj(media_data, ('src', ('dash', 'dashNew'), {url_or_none}))):
+            fmts, subs = self._extract_mpd_formats_and_subtitles(
+                format_url, video_id, mpd_id='dash', fatal=False)
+            formats.extend(fmts)
+            self._merge_subtitles(subs, target=subtitles)
+        if format_url := traverse_obj(media_data, ('src', 'file', {url_or_none})):
+            formats.append({
+                'url': format_url,
+                'format_id': 'http',
+            })
+
+        return {
+            'id': video_id,
+            'formats': formats,
+            'subtitles': subtitles,
+            **traverse_obj(data, {
+                'title': ('heading', {str}),
+                'alt_title': ('subHeading', {str}),
+                'description': (('lead', 'body'), {clean_html}, filter),
+                'timestamp': ('created', {int_or_none}),
+                'modified_timestamp': ('updated', {int_or_none}),
+                'release_timestamp': (('scheduleStart', 'publicStart'), {int_or_none}),
+                'release_year': ('year', {int_or_none}),
+            }, get_all=False),
+            **(traverse_obj(data, {
+                'series': ('heading', {str}),
+                'series_id': ('rootContentId', {str_or_none}),
+                'episode': ('subHeading', {str}),
+                'season_number': ('season', {int_or_none}),
+                'episode_number': ('episode', {int_or_none}),
+                'episode_id': ('id', {str_or_none}),
+            }) if data.get('type') == 'episode' else {}),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/ertgr.py b/plugins/youtube_download/yt_dlp/extractor/ertgr.py
index 9ecdf5d..6f3f60f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ertgr.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ertgr.py
@@ -2,22 +2,22 @@ import json
 import re
 
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
+    ExtractorError,
     clean_html,
     determine_ext,
-    ExtractorError,
     dict_get,
     int_or_none,
     merge_dicts,
-    parse_qs,
     parse_age_limit,
     parse_iso8601,
+    parse_qs,
     str_or_none,
     try_get,
     url_or_none,
     variadic,
 )
+from ..utils.traversal import traverse_obj
 
 
 class ERTFlixBaseIE(InfoExtractor):
@@ -30,19 +30,19 @@ class ERTFlixBaseIE(InfoExtractor):
         headers = headers or {}
         if data:
             headers['Content-Type'] = headers_as_param['Content-Type'] = 'application/json;charset=utf-8'
-            data = json.dumps(merge_dicts(platform_codename, data)).encode('utf-8')
+            data = json.dumps(merge_dicts(platform_codename, data)).encode()
         query = merge_dicts(
             {} if data else platform_codename,
             {'$headers': json.dumps(headers_as_param)},
             params)
         response = self._download_json(
-            'https://api.app.ertflix.gr/v%s/%s' % (str(api_version), method),
+            f'https://api.app.ertflix.gr/v{api_version!s}/{method}',
             video_id, fatal=False, query=query, data=data, headers=headers)
         if try_get(response, lambda x: x['Result']['Success']) is True:
             return response
 
     def _call_api_get_tiles(self, video_id, *tile_ids):
-        requested_tile_ids = [video_id] + list(tile_ids)
+        requested_tile_ids = [video_id, *tile_ids]
         requested_tiles = [{'Id': tile_id} for tile_id in requested_tile_ids]
         tiles_response = self._call_api(
             video_id, method='Tile/GetTiles', api_version=2,
@@ -75,29 +75,28 @@ class ERTFlixCodenameIE(ERTFlixBaseIE):
 
     def _extract_formats_and_subs(self, video_id):
         media_info = self._call_api(video_id, codename=video_id)
-        formats, subs = [], {}
-        for media_file in try_get(media_info, lambda x: x['MediaFiles'], list) or []:
-            for media in try_get(media_file, lambda x: x['Formats'], list) or []:
-                fmt_url = url_or_none(try_get(media, lambda x: x['Url']))
-                if not fmt_url:
-                    continue
-                ext = determine_ext(fmt_url)
-                if ext == 'm3u8':
-                    formats_, subs_ = self._extract_m3u8_formats_and_subtitles(
-                        fmt_url, video_id, m3u8_id='hls', ext='mp4', fatal=False)
-                elif ext == 'mpd':
-                    formats_, subs_ = self._extract_mpd_formats_and_subtitles(
-                        fmt_url, video_id, mpd_id='dash', fatal=False)
-                else:
-                    formats.append({
-                        'url': fmt_url,
-                        'format_id': str_or_none(media.get('Id')),
-                    })
-                    continue
-                formats.extend(formats_)
-                self._merge_subtitles(subs_, target=subs)
+        formats, subtitles = [], {}
+        for media in traverse_obj(media_info, (
+                'MediaFiles', lambda _, v: v['RoleCodename'] == 'main',
+                'Formats', lambda _, v: url_or_none(v['Url']))):
+            fmt_url = media['Url']
+            ext = determine_ext(fmt_url)
+            if ext == 'm3u8':
+                fmts, subs = self._extract_m3u8_formats_and_subtitles(
+                    fmt_url, video_id, m3u8_id='hls', ext='mp4', fatal=False)
+            elif ext == 'mpd':
+                fmts, subs = self._extract_mpd_formats_and_subtitles(
+                    fmt_url, video_id, mpd_id='dash', fatal=False)
+            else:
+                formats.append({
+                    'url': fmt_url,
+                    'format_id': str_or_none(media.get('Id')),
+                })
+                continue
+            formats.extend(fmts)
+            self._merge_subtitles(subs, target=subtitles)
 
-        return formats, subs
+        return formats, subtitles
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
@@ -174,9 +173,9 @@ class ERTFlixIE(ERTFlixBaseIE):
     }]
 
     def _extract_episode(self, episode):
-        codename = try_get(episode, lambda x: x['Codename'], compat_str)
+        codename = try_get(episode, lambda x: x['Codename'], str)
         title = episode.get('Title')
-        description = clean_html(dict_get(episode, ('ShortDescription', 'TinyDescription', )))
+        description = clean_html(dict_get(episode, ('ShortDescription', 'TinyDescription')))
         if not codename or not title or not episode.get('HasPlayableStream', True):
             return
         thumbnail = next((
@@ -195,7 +194,7 @@ class ERTFlixIE(ERTFlixBaseIE):
             'timestamp': parse_iso8601(episode.get('PublishDate')),
             'duration': episode.get('DurationSeconds'),
             'age_limit': self._parse_age_rating(episode),
-            'url': 'ertflix:%s' % (codename, ),
+            'url': f'ertflix:{codename}',
         }
 
     @staticmethod
@@ -212,7 +211,7 @@ class ERTFlixIE(ERTFlixBaseIE):
         series_info = {
             'age_limit': self._parse_age_rating(series),
             'title': series.get('Title'),
-            'description': dict_get(series, ('ShortDescription', 'TinyDescription', )),
+            'description': dict_get(series, ('ShortDescription', 'TinyDescription')),
         }
         if season_numbers:
             season_titles = season_titles or []
@@ -281,7 +280,7 @@ class ERTWebtvEmbedIE(InfoExtractor):
             'id': 'trailers/E2251_TO_DIKTYO_E09_16-01_1900.mp4',
             'title': 'md5:914f06a73cd8b62fbcd6fb90c636e497',
             'ext': 'mp4',
-            'thumbnail': 'https://program.ert.gr/photos/2022/1/to_diktio_ep09_i_istoria_tou_diadiktiou_stin_Ellada_1021x576.jpg'
+            'thumbnail': 'https://program.ert.gr/photos/2022/1/to_diktio_ep09_i_istoria_tou_diadiktiou_stin_Ellada_1021x576.jpg',
         },
     }]
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/escapist.py b/plugins/youtube_download/yt_dlp/extractor/escapist.py
deleted file mode 100644
index 85a1cbf..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/escapist.py
+++ /dev/null
@@ -1,108 +0,0 @@
-from .common import InfoExtractor
-from ..utils import (
-    determine_ext,
-    clean_html,
-    int_or_none,
-    float_or_none,
-)
-
-
-def _decrypt_config(key, string):
-    a = ''
-    i = ''
-    r = ''
-
-    while len(a) < (len(string) / 2):
-        a += key
-
-    a = a[0:int(len(string) / 2)]
-
-    t = 0
-    while t < len(string):
-        i += chr(int(string[t] + string[t + 1], 16))
-        t += 2
-
-    icko = [s for s in i]
-
-    for t, c in enumerate(a):
-        r += chr(ord(c) ^ ord(icko[t]))
-
-    return r
-
-
-class EscapistIE(InfoExtractor):
-    _VALID_URL = r'https?://?(?:(?:www|v1)\.)?escapistmagazine\.com/videos/view/[^/]+/(?P<id>[0-9]+)'
-    _TESTS = [{
-        'url': 'http://www.escapistmagazine.com/videos/view/the-escapist-presents/6618-Breaking-Down-Baldurs-Gate',
-        'md5': 'ab3a706c681efca53f0a35f1415cf0d1',
-        'info_dict': {
-            'id': '6618',
-            'ext': 'mp4',
-            'description': "Baldur's Gate: Original, Modded or Enhanced Edition? I'll break down what you can expect from the new Baldur's Gate: Enhanced Edition.",
-            'title': "Breaking Down Baldur's Gate",
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'duration': 264,
-            'uploader': 'The Escapist',
-        }
-    }, {
-        'url': 'http://www.escapistmagazine.com/videos/view/zero-punctuation/10044-Evolve-One-vs-Multiplayer',
-        'md5': '9e8c437b0dbb0387d3bd3255ca77f6bf',
-        'info_dict': {
-            'id': '10044',
-            'ext': 'mp4',
-            'description': 'This week, Zero Punctuation reviews Evolve.',
-            'title': 'Evolve - One vs Multiplayer',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'duration': 304,
-            'uploader': 'The Escapist',
-        }
-    }, {
-        'url': 'http://escapistmagazine.com/videos/view/the-escapist-presents/6618',
-        'only_matching': True,
-    }, {
-        'url': 'https://v1.escapistmagazine.com/videos/view/the-escapist-presents/6618-Breaking-Down-Baldurs-Gate',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-
-        ims_video = self._parse_json(
-            self._search_regex(
-                r'imsVideo\.play\(({.+?})\);', webpage, 'imsVideo'),
-            video_id)
-        video_id = ims_video['videoID']
-        key = ims_video['hash']
-
-        config = self._download_webpage(
-            'http://www.escapistmagazine.com/videos/vidconfig.php',
-            video_id, 'Downloading video config', headers={
-                'Referer': url,
-            }, query={
-                'videoID': video_id,
-                'hash': key,
-            })
-
-        data = self._parse_json(_decrypt_config(key, config), video_id)
-
-        video_data = data['videoData']
-
-        title = clean_html(video_data['title'])
-
-        formats = [{
-            'url': video['src'],
-            'format_id': '%s-%sp' % (determine_ext(video['src']), video['res']),
-            'height': int_or_none(video.get('res')),
-        } for video in data['files']['videos']]
-
-        return {
-            'id': video_id,
-            'formats': formats,
-            'title': title,
-            'thumbnail': self._og_search_thumbnail(webpage) or data.get('poster'),
-            'description': self._og_search_description(webpage),
-            'duration': float_or_none(video_data.get('duration'), 1000),
-            'uploader': video_data.get('publisher'),
-            'series': video_data.get('show'),
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/espn.py b/plugins/youtube_download/yt_dlp/extractor/espn.py
index 7ed824c..552f9af 100644
--- a/plugins/youtube_download/yt_dlp/extractor/espn.py
+++ b/plugins/youtube_download/yt_dlp/extractor/espn.py
@@ -100,13 +100,13 @@ class ESPNIE(OnceIE):
     }, {
         'url': 'http://www.espn.com/watch/player?bucketId=257&id=19505875',
         'only_matching': True,
-    }, ]
+    }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
 
         clip = self._download_json(
-            'http://api-app.espn.com/v1/video/clips/%s' % video_id,
+            f'http://api-app.espn.com/v1/video/clips/{video_id}',
             video_id)['videos'][0]
 
         title = clip['headline']
@@ -115,16 +115,16 @@ class ESPNIE(OnceIE):
         formats = []
 
         def traverse_source(source, base_source_id=None):
-            for source_id, source in source.items():
-                if source_id == 'alert':
+            for src_id, src_item in source.items():
+                if src_id == 'alert':
                     continue
-                elif isinstance(source, str):
-                    extract_source(source, base_source_id)
-                elif isinstance(source, dict):
+                elif isinstance(src_item, str):
+                    extract_source(src_item, base_source_id)
+                elif isinstance(src_item, dict):
                     traverse_source(
-                        source,
-                        '%s-%s' % (base_source_id, source_id)
-                        if base_source_id else source_id)
+                        src_item,
+                        f'{base_source_id}-{src_id}'
+                        if base_source_id else src_id)
 
         def extract_source(source_url, source_id=None):
             if source_url in format_urls:
@@ -209,7 +209,7 @@ class ESPNArticleIE(InfoExtractor):
             webpage, 'video id', group='id')
 
         return self.url_result(
-            'http://espn.go.com/video/clip?id=%s' % video_id, ESPNIE.ie_key())
+            f'http://espn.go.com/video/clip?id={video_id}', ESPNIE.ie_key())
 
 
 class FiveThirtyEightIE(InfoExtractor):
@@ -251,7 +251,7 @@ class ESPNCricInfoIE(InfoExtractor):
             'upload_date': '20211113',
             'duration': 96,
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }, {
         'url': 'https://www.espncricinfo.com/cricket-videos/daryl-mitchell-mitchell-santner-is-one-of-the-best-white-ball-spinners-india-vs-new-zealand-1356225',
         'info_dict': {
@@ -266,12 +266,13 @@ class ESPNCricInfoIE(InfoExtractor):
     }]
 
     def _real_extract(self, url):
-        id = self._match_id(url)
-        data_json = self._download_json(f'https://hs-consumer-api.espncricinfo.com/v1/pages/video/video-details?videoId={id}', id)['video']
+        video_id = self._match_id(url)
+        data_json = self._download_json(
+            f'https://hs-consumer-api.espncricinfo.com/v1/pages/video/video-details?videoId={video_id}', video_id)['video']
         formats, subtitles = [], {}
         for item in data_json.get('playbacks') or []:
             if item.get('type') == 'HLS' and item.get('url'):
-                m3u8_frmts, m3u8_subs = self._extract_m3u8_formats_and_subtitles(item['url'], id)
+                m3u8_frmts, m3u8_subs = self._extract_m3u8_formats_and_subtitles(item['url'], video_id)
                 formats.extend(m3u8_frmts)
                 subtitles = self._merge_subtitles(subtitles, m3u8_subs)
             elif item.get('type') == 'AUDIO' and item.get('url'):
@@ -280,7 +281,7 @@ class ESPNCricInfoIE(InfoExtractor):
                     'vcodec': 'none',
                 })
         return {
-            'id': id,
+            'id': video_id,
             'title': data_json.get('title'),
             'description': data_json.get('summary'),
             'upload_date': unified_strdate(dict_get(data_json, ('publishedAt', 'recordedAt'))),
@@ -293,37 +294,37 @@ class ESPNCricInfoIE(InfoExtractor):
 class WatchESPNIE(AdobePassIE):
     _VALID_URL = r'https?://(?:www\.)?espn\.com/(?:watch|espnplus)/player/_/id/(?P<id>[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})'
     _TESTS = [{
-        'url': 'https://www.espn.com/watch/player/_/id/dbbc6b1d-c084-4b47-9878-5f13c56ce309',
+        'url': 'https://www.espn.com/watch/player/_/id/11ce417a-6ac9-42b6-8a15-46aeb9ad5710',
         'info_dict': {
-            'id': 'dbbc6b1d-c084-4b47-9878-5f13c56ce309',
+            'id': '11ce417a-6ac9-42b6-8a15-46aeb9ad5710',
             'ext': 'mp4',
-            'title': 'Huddersfield vs. Burnley',
-            'duration': 7500,
-            'thumbnail': 'https://artwork.api.espn.com/artwork/collections/media/dbbc6b1d-c084-4b47-9878-5f13c56ce309/default?width=640&apikey=1ngjw23osgcis1i1vbj96lmfqs',
+            'title': 'Abilene Chrstn vs. Texas Tech',
+            'duration': 14166,
+            'thumbnail': 'https://s.secure.espncdn.com/stitcher/artwork/collections/media/11ce417a-6ac9-42b6-8a15-46aeb9ad5710/16x9.jpg?timestamp=202407252343&showBadge=true&cb=12&package=ESPN_PLUS',
         },
         'params': {
             'skip_download': True,
         },
     }, {
-        'url': 'https://www.espn.com/watch/player/_/id/a049a56e-a7ce-477e-aef3-c7e48ef8221c',
+        'url': 'https://www.espn.com/watch/player/_/id/90a2c85d-75e0-4b1e-a878-8e428a3cb2f3',
         'info_dict': {
-            'id': 'a049a56e-a7ce-477e-aef3-c7e48ef8221c',
+            'id': '90a2c85d-75e0-4b1e-a878-8e428a3cb2f3',
             'ext': 'mp4',
-            'title': 'Dynamo Dresden vs. VfB Stuttgart (Round #1) (German Cup)',
-            'duration': 8335,
-            'thumbnail': 'https://s.secure.espncdn.com/stitcher/artwork/collections/media/bd1f3d12-0654-47d9-852e-71b85ea695c7/16x9.jpg?timestamp=202201112217&showBadge=true&cb=12&package=ESPN_PLUS',
+            'title': 'UC Davis vs. California',
+            'duration': 9547,
+            'thumbnail': 'https://artwork.api.espn.com/artwork/collections/media/90a2c85d-75e0-4b1e-a878-8e428a3cb2f3/default?width=640&apikey=1ngjw23osgcis1i1vbj96lmfqs',
         },
         'params': {
             'skip_download': True,
         },
     }, {
-        'url': 'https://www.espn.com/espnplus/player/_/id/317f5fd1-c78a-4ebe-824a-129e0d348421',
+        'url': 'https://www.espn.com/watch/player/_/id/c4313bbe-95b5-4bb8-b251-ac143ea0fc54',
         'info_dict': {
-            'id': '317f5fd1-c78a-4ebe-824a-129e0d348421',
+            'id': 'c4313bbe-95b5-4bb8-b251-ac143ea0fc54',
             'ext': 'mp4',
-            'title': 'The Wheel - Episode 10',
-            'duration': 3352,
-            'thumbnail': 'https://s.secure.espncdn.com/stitcher/artwork/collections/media/317f5fd1-c78a-4ebe-824a-129e0d348421/16x9.jpg?timestamp=202205031523&showBadge=true&cb=12&package=ESPN_PLUS',
+            'title': 'The College Football Show',
+            'duration': 3639,
+            'thumbnail': 'https://artwork.api.espn.com/artwork/collections/media/c4313bbe-95b5-4bb8-b251-ac143ea0fc54/default?width=640&apikey=1ngjw23osgcis1i1vbj96lmfqs',
         },
         'params': {
             'skip_download': True,
@@ -352,6 +353,13 @@ class WatchESPNIE(AdobePassIE):
             if not cookie:
                 self.raise_login_required(method='cookies')
 
+            jwt = self._search_regex(r'=([^|]+)\|', cookie.value, 'cookie jwt')
+            id_token = self._download_json(
+                'https://registerdisney.go.com/jgc/v6/client/ESPN-ONESITE.WEB-PROD/guest/refresh-auth',
+                None, 'Refreshing token', headers={'Content-Type': 'application/json'}, data=json.dumps({
+                    'refreshToken': json.loads(base64.urlsafe_b64decode(f'{jwt}==='))['refresh_token'],
+                }).encode())['data']['token']['id_token']
+
             assertion = self._call_bamgrid_api(
                 'devices', video_id,
                 headers={'Content-Type': 'application/json; charset=UTF-8'},
@@ -366,28 +374,28 @@ class WatchESPNIE(AdobePassIE):
                     'subject_token': assertion,
                     'subject_token_type': 'urn:bamtech:params:oauth:token-type:device',
                     'platform': 'android',
-                    'grant_type': 'urn:ietf:params:oauth:grant-type:token-exchange'
+                    'grant_type': 'urn:ietf:params:oauth:grant-type:token-exchange',
                 })['access_token']
 
             assertion = self._call_bamgrid_api(
-                'accounts/grant', video_id, payload={'id_token': cookie.value.split('|')[1]},
+                'accounts/grant', video_id, payload={'id_token': id_token},
                 headers={
                     'Authorization': token,
-                    'Content-Type': 'application/json; charset=UTF-8'
+                    'Content-Type': 'application/json; charset=UTF-8',
                 })['assertion']
             token = self._call_bamgrid_api(
                 'token', video_id, payload={
                     'subject_token': assertion,
                     'subject_token_type': 'urn:bamtech:params:oauth:token-type:account',
                     'platform': 'android',
-                    'grant_type': 'urn:ietf:params:oauth:grant-type:token-exchange'
+                    'grant_type': 'urn:ietf:params:oauth:grant-type:token-exchange',
                 })['access_token']
 
             playback = self._download_json(
                 video_data['videoHref'].format(scenario='browser~ssai'), video_id,
                 headers={
                     'Accept': 'application/vnd.media-service+json; version=5',
-                    'Authorization': token
+                    'Authorization': token,
                 })
             m3u8_url, headers = playback['stream']['complete'][0]['url'], {'authorization': token}
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/esri.py b/plugins/youtube_download/yt_dlp/extractor/esri.py
deleted file mode 100644
index 02e7efa..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/esri.py
+++ /dev/null
@@ -1,70 +0,0 @@
-import re
-
-from .common import InfoExtractor
-from ..compat import compat_urlparse
-from ..utils import (
-    int_or_none,
-    parse_filesize,
-    unified_strdate,
-)
-
-
-class EsriVideoIE(InfoExtractor):
-    _VALID_URL = r'https?://video\.esri\.com/watch/(?P<id>[0-9]+)'
-    _TEST = {
-        'url': 'https://video.esri.com/watch/1124/arcgis-online-_dash_-developing-applications',
-        'md5': 'd4aaf1408b221f1b38227a9bbaeb95bc',
-        'info_dict': {
-            'id': '1124',
-            'ext': 'mp4',
-            'title': 'ArcGIS Online - Developing Applications',
-            'description': 'Jeremy Bartley demonstrates how to develop applications with ArcGIS Online.',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'duration': 185,
-            'upload_date': '20120419',
-        }
-    }
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        webpage = self._download_webpage(url, video_id)
-
-        formats = []
-        for width, height, content in re.findall(
-                r'(?s)<li><strong>(\d+)x(\d+):</strong>(.+?)</li>', webpage):
-            for video_url, ext, filesize in re.findall(
-                    r'<a[^>]+href="([^"]+)">([^<]+)&nbsp;\(([^<]+)\)</a>', content):
-                formats.append({
-                    'url': compat_urlparse.urljoin(url, video_url),
-                    'ext': ext.lower(),
-                    'format_id': '%s-%s' % (ext.lower(), height),
-                    'width': int(width),
-                    'height': int(height),
-                    'filesize_approx': parse_filesize(filesize),
-                })
-
-        title = self._html_search_meta('title', webpage, 'title')
-        description = self._html_search_meta(
-            'description', webpage, 'description', fatal=False)
-
-        thumbnail = self._html_search_meta('thumbnail', webpage, 'thumbnail', fatal=False)
-        if thumbnail:
-            thumbnail = re.sub(r'_[st]\.jpg$', '_x.jpg', thumbnail)
-
-        duration = int_or_none(self._search_regex(
-            [r'var\s+videoSeconds\s*=\s*(\d+)', r"'duration'\s*:\s*(\d+)"],
-            webpage, 'duration', fatal=False))
-
-        upload_date = unified_strdate(self._html_search_meta(
-            'last-modified', webpage, 'upload date', fatal=False))
-
-        return {
-            'id': video_id,
-            'title': title,
-            'description': description,
-            'thumbnail': thumbnail,
-            'duration': duration,
-            'upload_date': upload_date,
-            'formats': formats
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/ettutv.py b/plugins/youtube_download/yt_dlp/extractor/ettutv.py
index 133b525..7367177 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ettutv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ettutv.py
@@ -56,5 +56,5 @@ class EttuTvIE(InfoExtractor):
                 'thumbnail': ('image', {url_or_none}),
                 'timestamp': ('date', {unified_timestamp}),
                 'is_live': ('isLivestream', {bool_or_none}),
-            })
+            }),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/europa.py b/plugins/youtube_download/yt_dlp/extractor/europa.py
index f3da95f..aa8baf2 100644
--- a/plugins/youtube_download/yt_dlp/extractor/europa.py
+++ b/plugins/youtube_download/yt_dlp/extractor/europa.py
@@ -8,11 +8,12 @@ from ..utils import (
     qualities,
     traverse_obj,
     unified_strdate,
-    xpath_text
+    xpath_text,
 )
 
 
 class EuropaIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://ec\.europa\.eu/avservices/(?:video/player|audio/audioDetails)\.cfm\?.*?\bref=(?P<id>[A-Za-z0-9-]+)'
     _TESTS = [{
         'url': 'http://ec.europa.eu/avservices/video/player.cfm?ref=I107758',
@@ -27,7 +28,7 @@ class EuropaIE(InfoExtractor):
             'duration': 34,
             'view_count': int,
             'formats': 'mincount:3',
-        }
+        },
     }, {
         'url': 'http://ec.europa.eu/avservices/video/player.cfm?sitelang=en&ref=I107786',
         'only_matching': True,
@@ -40,11 +41,11 @@ class EuropaIE(InfoExtractor):
         video_id = self._match_id(url)
 
         playlist = self._download_xml(
-            'http://ec.europa.eu/avservices/video/player/playlist.cfm?ID=%s' % video_id, video_id)
+            f'http://ec.europa.eu/avservices/video/player/playlist.cfm?ID={video_id}', video_id)
 
         def get_item(type_, preference):
             items = {}
-            for item in playlist.findall('./info/%s/item' % type_):
+            for item in playlist.findall(f'./info/{type_}/item'):
                 lang, label = xpath_text(item, 'lg', default=None), xpath_text(item, 'label', default=None)
                 if lang and label:
                     items[lang] = label.strip()
@@ -76,7 +77,7 @@ class EuropaIE(InfoExtractor):
                 'url': video_url,
                 'format_id': lang,
                 'format_note': xpath_text(file_, './lglabel'),
-                'language_preference': language_preference(lang)
+                'language_preference': language_preference(lang),
             })
 
         return {
@@ -87,19 +88,20 @@ class EuropaIE(InfoExtractor):
             'upload_date': upload_date,
             'duration': duration,
             'view_count': view_count,
-            'formats': formats
+            'formats': formats,
         }
 
 
 class EuroParlWebstreamIE(InfoExtractor):
     _VALID_URL = r'''(?x)
-        https?://multimedia\.europarl\.europa\.eu/[^/#?]+/
-        (?:(?!video)[^/#?]+/[\w-]+_)(?P<id>[\w-]+)
+        https?://multimedia\.europarl\.europa\.eu/
+        (?:\w+/)?webstreaming/(?:[\w-]+_)?(?P<id>[\w-]+)
     '''
     _TESTS = [{
         'url': 'https://multimedia.europarl.europa.eu/pl/webstreaming/plenary-session_20220914-0900-PLENARY',
         'info_dict': {
             'id': '62388b15-d85b-4add-99aa-ba12ccf64f0d',
+            'display_id': '20220914-0900-PLENARY',
             'ext': 'mp4',
             'title': 'Plenary session',
             'release_timestamp': 1663139069,
@@ -107,7 +109,7 @@ class EuroParlWebstreamIE(InfoExtractor):
         },
         'params': {
             'skip_download': True,
-        }
+        },
     }, {
         # live webstream
         'url': 'https://multimedia.europarl.europa.eu/en/webstreaming/euroscola_20221115-1000-SPECIAL-EUROSCOLA',
@@ -119,16 +121,17 @@ class EuroParlWebstreamIE(InfoExtractor):
             'release_date': '20221115',
             'live_status': 'is_live',
         },
-        'skip': 'not live anymore'
+        'skip': 'not live anymore',
     }, {
         'url': 'https://multimedia.europarl.europa.eu/en/webstreaming/committee-on-culture-and-education_20230301-1130-COMMITTEE-CULT',
         'info_dict': {
             'id': '7355662c-8eac-445e-4bb9-08db14b0ddd7',
+            'display_id': '20230301-1130-COMMITTEE-CULT',
             'ext': 'mp4',
             'release_date': '20230301',
             'title': 'Committee on Culture and Education',
             'release_timestamp': 1677666641,
-        }
+        },
     }, {
         # live stream
         'url': 'https://multimedia.europarl.europa.eu/en/webstreaming/committee-on-environment-public-health-and-food-safety_20230524-0900-COMMITTEE-ENVI',
@@ -140,7 +143,20 @@ class EuroParlWebstreamIE(InfoExtractor):
             'release_timestamp': 1684911541,
             'live_status': 'is_live',
         },
-        'skip': 'Not live anymore'
+        'skip': 'Not live anymore',
+    }, {
+        'url': 'https://multimedia.europarl.europa.eu/en/webstreaming/20240320-1345-SPECIAL-PRESSER',
+        'info_dict': {
+            'id': 'c1f11567-5b52-470a-f3e1-08dc3c216ace',
+            'display_id': '20240320-1345-SPECIAL-PRESSER',
+            'ext': 'mp4',
+            'release_date': '20240320',
+            'title': 'md5:7c6c814cac55dea5e2d87bf8d3db2234',
+            'release_timestamp': 1710939767,
+        },
+    }, {
+        'url': 'https://multimedia.europarl.europa.eu/webstreaming/briefing-for-media-on-2024-european-elections_20240429-1000-SPECIAL-OTHER',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
@@ -154,7 +170,7 @@ class EuroParlWebstreamIE(InfoExtractor):
             query={
                 'api-version': 1.0,
                 'tenantId': 'bae646ca-1fc8-4363-80ba-2c04f06b4968',
-                'externalReference': display_id
+                'externalReference': display_id,
             })
 
         formats, subtitles = [], {}
@@ -165,9 +181,10 @@ class EuroParlWebstreamIE(InfoExtractor):
 
         return {
             'id': json_info['id'],
+            'display_id': display_id,
             'title': traverse_obj(webpage_nextjs, (('mediaItem', 'title'), ('title', )), get_all=False),
             'formats': formats,
             'subtitles': subtitles,
             'release_timestamp': parse_iso8601(json_info.get('startDateTime')),
-            'is_live': traverse_obj(webpage_nextjs, ('mediaItem', 'mediaSubType')) == 'Live'
+            'is_live': traverse_obj(webpage_nextjs, ('mediaItem', 'mediaSubType')) == 'Live',
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/europeantour.py b/plugins/youtube_download/yt_dlp/extractor/europeantour.py
index 1995a74..a5503db 100644
--- a/plugins/youtube_download/yt_dlp/extractor/europeantour.py
+++ b/plugins/youtube_download/yt_dlp/extractor/europeantour.py
@@ -17,16 +17,16 @@ class EuropeanTourIE(InfoExtractor):
             'uploader_id': '5136026580001',
             'tags': ['prod-imported'],
             'thumbnail': 'md5:fdac52bc826548860edf8145ee74e71a',
-            'upload_date': '20211220'
+            'upload_date': '20211220',
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }]
 
     BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/%s/default_default/index.html?videoId=%s'
 
     def _real_extract(self, url):
-        id = self._match_id(url)
-        webpage = self._download_webpage(url, id)
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
         vid, aid = re.search(r'(?s)brightcove-player\s?video-id="([^"]+)".*"ACCOUNT_ID":"([^"]+)"', webpage).groups()
         if not aid:
             aid = '5136026580001'
diff --git a/plugins/youtube_download/yt_dlp/extractor/eurosport.py b/plugins/youtube_download/yt_dlp/extractor/eurosport.py
index 6c426bb..682546f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/eurosport.py
+++ b/plugins/youtube_download/yt_dlp/extractor/eurosport.py
@@ -3,7 +3,12 @@ from ..utils import traverse_obj
 
 
 class EurosportIE(InfoExtractor):
-    _VALID_URL = r'https?://www\.eurosport\.com/\w+/(?:[\w-]+/[\d-]+/)?[\w-]+_(?P<id>vid\d+)'
+    _VALID_URL = r'''(?x)
+        https?://(?:
+            (?:(?:www|espanol)\.)?eurosport\.(?:com(?:\.tr)?|de|dk|es|fr|hu|it|nl|no|ro)|
+            eurosport\.tvn24\.pl
+        )/[\w-]+/(?:[\w-]+/[\d-]+/)?[\w.-]+_(?P<id>vid\d+)
+    '''
     _TESTS = [{
         'url': 'https://www.eurosport.com/tennis/roland-garros/2022/highlights-rafael-nadal-brushes-aside-caper-ruud-to-win-record-extending-14th-french-open-title_vid1694147/video.shtml',
         'info_dict': {
@@ -16,7 +21,7 @@ class EurosportIE(InfoExtractor):
             'display_id': 'vid1694147',
             'timestamp': 1654446698,
             'upload_date': '20220605',
-        }
+        },
     }, {
         'url': 'https://www.eurosport.com/tennis/roland-garros/2022/watch-the-top-five-shots-from-men-s-final-as-rafael-nadal-beats-casper-ruud-to-seal-14th-french-open_vid1694283/video.shtml',
         'info_dict': {
@@ -29,7 +34,7 @@ class EurosportIE(InfoExtractor):
             'display_id': 'vid1694283',
             'timestamp': 1654456090,
             'upload_date': '20220605',
-        }
+        },
     }, {
         # geo-fence but can bypassed by xff
         'url': 'https://www.eurosport.com/cycling/tour-de-france-femmes/2022/incredible-ride-marlen-reusser-storms-to-stage-4-win-at-tour-de-france-femmes_vid1722221/video.shtml',
@@ -43,7 +48,7 @@ class EurosportIE(InfoExtractor):
             'thumbnail': 'https://imgresizer.eurosport.com/unsafe/1280x960/smart/filters:format(jpeg)/origin-imgresizer.eurosport.com/2022/07/27/3423347-69852108-2560-1440.jpg',
             'description': 'md5:32bbe3a773ac132c57fb1e8cca4b7c71',
             'upload_date': '20220727',
-        }
+        },
     }, {
         'url': 'https://www.eurosport.com/football/champions-league/2022-2023/pep-guardiola-emotionally-destroyed-after-manchester-city-win-over-bayern-munich-in-champions-league_vid1896254/video.shtml',
         'info_dict': {
@@ -56,7 +61,7 @@ class EurosportIE(InfoExtractor):
             'timestamp': 1681292028,
             'upload_date': '20230412',
             'display_id': 'vid1896254',
-        }
+        },
     }, {
         'url': 'https://www.eurosport.com/football/last-year-s-semi-final-pain-was-still-there-pep-guardiola-after-man-city-reach-cl-final_vid1914115/video.shtml',
         'info_dict': {
@@ -69,7 +74,43 @@ class EurosportIE(InfoExtractor):
             'thumbnail': 'https://imgresizer.eurosport.com/unsafe/1280x960/smart/filters:format(jpeg)/origin-imgresizer.eurosport.com/2023/05/18/3707254-75435008-2560-1440.jpg',
             'duration': 105.0,
             'upload_date': '20230518',
-        }
+        },
+    }, {
+        'url': 'https://www.eurosport.de/radsport/vuelta-a-espana/2024/vuelta-a-espana-2024-wout-van-aert-und-co.-verzweifeln-an-mcnulty-zeitfahr-krimi-in-lissabon_vid2219478/video.shtml',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.eurosport.dk/speedway/mikkel-michelsen-misser-finalen-i-cardiff-se-danskeren-i-semifinalen-her_vid2219363/video.shtml',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.eurosport.nl/mixed-martial-arts/ufc/2022/ufc-305-respect-tussen-adesanya-en-du-plessis_vid2219650/video.shtml',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.eurosport.es/ciclismo/la-vuelta-2024-carlos-rodriguez-olvida-la-crono-y-ya-espera-que-llegue-la-montana-no-me-encontre-nada-comodo_vid2219682/video.shtml',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.eurosport.fr/football/supercoupe-d-europe/2024-2025/kylian-mbappe-vinicius-junior-eduardo-camavinga-touche.-extraits-de-l-entrainement-du-real-madrid-en-video_vid2216993/video.shtml',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.eurosport.it/calcio/serie-a/2024-2025/samardzic-a-bergamo-per-le-visite-mediche-con-l-atalanta_vid2219680/video.shtml',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.eurosport.hu/kerekpar/vuelta-a-espana/2024/dramai-harc-a-masodpercekert-meglepetesgyoztes-a-vuelta-nyitoszakaszan_vid2219481/video.shtml',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.eurosport.no/golf/fedex-st-jude-championship/2024/ligger-pa-andreplass-sa-skjer-dette-drama_vid30000618/video.shtml',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.eurosport.no/golf/fedex-st-jude-championship/2024/ligger-pa-andreplass-sa-skjer-dette-drama_vid2219531/video.shtml',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.eurosport.ro/tenis/western-southern-open-2/2024/rezumatul-partidei-dintre-zverev-si-shelton-de-la-cincinnati_vid2219657/video.shtml',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.eurosport.com.tr/hentbol/olympic-games-paris-2024/2024/paris-2024-denmark-ile-germany-olimpiyatlarin-onemli-anlari_vid2215836/video.shtml',
+        'only_matching': True,
+    }, {
+        'url': 'https://eurosport.tvn24.pl/kolarstwo/tour-de-france-kobiet/2024/kasia-niewiadoma-przed-ostatnim-8.-etapem-tour-de-france-kobiet_vid2219765/video.shtml',
+        'only_matching': True,
     }]
 
     _TOKEN = None
@@ -77,6 +118,7 @@ class EurosportIE(InfoExtractor):
     # actually defined in https://netsport.eurosport.io/?variables={"databaseId":<databaseId>,"playoutType":"VDP"}&extensions={"persistedQuery":{"version":1 ..
     # but this method require to get sha256 hash
     _GEO_COUNTRIES = ['DE', 'NL', 'EU', 'IT', 'FR']  # Not complete list but it should work
+    _GEO_BYPASS = False
 
     def _real_initialize(self):
         if EurosportIE._TOKEN is None:
@@ -98,13 +140,13 @@ class EurosportIE(InfoExtractor):
         for stream_type in json_data['attributes']['streaming']:
             if stream_type == 'hls':
                 fmts, subs = self._extract_m3u8_formats_and_subtitles(
-                    traverse_obj(json_data, ('attributes', 'streaming', stream_type, 'url')), display_id, ext='mp4')
+                    traverse_obj(json_data, ('attributes', 'streaming', stream_type, 'url')), display_id, ext='mp4', fatal=False)
             elif stream_type == 'dash':
                 fmts, subs = self._extract_mpd_formats_and_subtitles(
-                    traverse_obj(json_data, ('attributes', 'streaming', stream_type, 'url')), display_id)
+                    traverse_obj(json_data, ('attributes', 'streaming', stream_type, 'url')), display_id, fatal=False)
             elif stream_type == 'mss':
                 fmts, subs = self._extract_ism_formats_and_subtitles(
-                    traverse_obj(json_data, ('attributes', 'streaming', stream_type, 'url')), display_id)
+                    traverse_obj(json_data, ('attributes', 'streaming', stream_type, 'url')), display_id, fatal=False)
 
             formats.extend(fmts)
             self._merge_subtitles(subs, target=subtitles)
diff --git a/plugins/youtube_download/yt_dlp/extractor/euscreen.py b/plugins/youtube_download/yt_dlp/extractor/euscreen.py
index 65a1dc7..f08938f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/euscreen.py
+++ b/plugins/youtube_download/yt_dlp/extractor/euscreen.py
@@ -1,8 +1,7 @@
 from .common import InfoExtractor
-
 from ..utils import (
-    parse_duration,
     js_to_json,
+    parse_duration,
 )
 
 
@@ -21,37 +20,37 @@ class EUScreenIE(InfoExtractor):
             'series': 'JA2 DERNIERE',
             'episode': '-',
             'uploader': 'INA /  France',
-            'thumbnail': 'http://images3.noterik.com/domain/euscreenxl/user/eu_ina/video/EUS_0EBCBF356BFC4E12A014023BA41BD98C/image.jpg'
+            'thumbnail': 'http://images3.noterik.com/domain/euscreenxl/user/eu_ina/video/EUS_0EBCBF356BFC4E12A014023BA41BD98C/image.jpg',
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }]
 
     _payload = b'<fsxml><screen><properties><screenId>-1</screenId></properties><capabilities id="1"><properties><platform>Win32</platform><appcodename>Mozilla</appcodename><appname>Netscape</appname><appversion>5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.71 Safari/537.36</appversion><useragent>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.71 Safari/537.36</useragent><cookiesenabled>true</cookiesenabled><screenwidth>784</screenwidth><screenheight>758</screenheight><orientation>undefined</orientation><smt_browserid>Sat, 07 Oct 2021 08:56:50 GMT</smt_browserid><smt_sessionid>1633769810758</smt_sessionid></properties></capabilities></screen></fsxml>'
 
     def _real_extract(self, url):
-        id = self._match_id(url)
+        video_id = self._match_id(url)
         args_for_js_request = self._download_webpage(
             'https://euscreen.eu/lou/LouServlet/domain/euscreenxl/html5application/euscreenxlitem',
-            id, data=self._payload, query={'actionlist': 'itempage', 'id': id})
+            video_id, data=self._payload, query={'actionlist': 'itempage', 'id': video_id})
         info_js = self._download_webpage(
             'https://euscreen.eu/lou/LouServlet/domain/euscreenxl/html5application/euscreenxlitem',
-            id, data=args_for_js_request.replace('screenid', 'screenId').encode())
+            video_id, data=args_for_js_request.replace('screenid', 'screenId').encode())
         video_json = self._parse_json(
             self._search_regex(r'setVideo\(({.+})\)\(\$end\$\)put', info_js, 'Video JSON'),
-            id, transform_source=js_to_json)
+            video_id, transform_source=js_to_json)
         meta_json = self._parse_json(
             self._search_regex(r'setData\(({.+})\)\(\$end\$\)', info_js, 'Metadata JSON'),
-            id, transform_source=js_to_json)
+            video_id, transform_source=js_to_json)
         formats = [{
             'url': source['src'],
         } for source in video_json.get('sources', [])]
 
         return {
-            'id': id,
+            'id': video_id,
             'title': meta_json.get('originalTitle'),
             'alt_title': meta_json.get('title'),
             'duration': parse_duration(meta_json.get('duration')),
-            'description': '%s\n%s' % (meta_json.get('summaryOriginal', ''), meta_json.get('summaryEnglish', '')),
+            'description': '{}\n{}'.format(meta_json.get('summaryOriginal', ''), meta_json.get('summaryEnglish', '')),
             'series': meta_json.get('series') or meta_json.get('seriesEnglish'),
             'episode': meta_json.get('episodeNumber'),
             'uploader': meta_json.get('provider'),
diff --git a/plugins/youtube_download/yt_dlp/extractor/expotv.py b/plugins/youtube_download/yt_dlp/extractor/expotv.py
deleted file mode 100644
index bda6e3c..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/expotv.py
+++ /dev/null
@@ -1,74 +0,0 @@
-from .common import InfoExtractor
-from ..utils import (
-    int_or_none,
-    unified_strdate,
-)
-
-
-class ExpoTVIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?expotv\.com/videos/[^?#]*/(?P<id>[0-9]+)($|[?#])'
-    _TEST = {
-        'url': 'http://www.expotv.com/videos/reviews/3/40/NYX-Butter-lipstick/667916',
-        'md5': 'fe1d728c3a813ff78f595bc8b7a707a8',
-        'info_dict': {
-            'id': '667916',
-            'ext': 'mp4',
-            'title': 'NYX Butter Lipstick Little Susie',
-            'description': 'Goes on like butter, but looks better!',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'uploader': 'Stephanie S.',
-            'upload_date': '20150520',
-            'view_count': int,
-        }
-    }
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        webpage = self._download_webpage(url, video_id)
-        player_key = self._search_regex(
-            r'<param name="playerKey" value="([^"]+)"', webpage, 'player key')
-        config = self._download_json(
-            'http://client.expotv.com/video/config/%s/%s' % (video_id, player_key),
-            video_id, 'Downloading video configuration')
-
-        formats = []
-        for fcfg in config['sources']:
-            media_url = fcfg.get('file')
-            if not media_url:
-                continue
-            if fcfg.get('type') == 'm3u8':
-                formats.extend(self._extract_m3u8_formats(
-                    media_url, video_id, 'mp4', entry_protocol='m3u8_native', m3u8_id='hls'))
-            else:
-                formats.append({
-                    'url': media_url,
-                    'height': int_or_none(fcfg.get('height')),
-                    'format_id': fcfg.get('label'),
-                    'ext': self._search_regex(
-                        r'filename=.*\.([a-z0-9_A-Z]+)&', media_url,
-                        'file extension', default=None) or fcfg.get('type'),
-                })
-
-        title = self._og_search_title(webpage)
-        description = self._og_search_description(webpage)
-        thumbnail = config.get('image')
-        view_count = int_or_none(self._search_regex(
-            r'<h5>Plays: ([0-9]+)</h5>', webpage, 'view counts'))
-        uploader = self._search_regex(
-            r'<div class="reviewer">\s*<img alt="([^"]+)"', webpage, 'uploader',
-            fatal=False)
-        upload_date = unified_strdate(self._search_regex(
-            r'<h5>Reviewed on ([0-9/.]+)</h5>', webpage, 'upload date',
-            fatal=False), day_first=False)
-
-        return {
-            'id': video_id,
-            'formats': formats,
-            'title': title,
-            'description': description,
-            'view_count': view_count,
-            'thumbnail': thumbnail,
-            'uploader': uploader,
-            'upload_date': upload_date,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/expressen.py b/plugins/youtube_download/yt_dlp/extractor/expressen.py
index 86967b6..33b8298 100644
--- a/plugins/youtube_download/yt_dlp/extractor/expressen.py
+++ b/plugins/youtube_download/yt_dlp/extractor/expressen.py
@@ -11,8 +11,8 @@ class ExpressenIE(InfoExtractor):
     _VALID_URL = r'''(?x)
                     https?://
                         (?:www\.)?(?:expressen|di)\.se/
-                        (?:(?:tvspelare/video|videoplayer/embed)/)?
-                        tv/(?:[^/]+/)*
+                        (?:(?:tvspelare/video|video-?player/embed)/)?
+                        (?:tv|nyheter)/(?:[^/?#]+/)*
                         (?P<id>[^/?#&]+)
                     '''
     _EMBED_REGEX = [r'<iframe[^>]+\bsrc=(["\'])(?P<url>(?:https?:)?//(?:www\.)?(?:expressen|di)\.se/(?:tvspelare/video|videoplayer/embed)/tv/.+?)\1']
@@ -42,6 +42,12 @@ class ExpressenIE(InfoExtractor):
     }, {
         'url': 'https://www.di.se/videoplayer/embed/tv/ditv/borsmorgon/implantica-rusar-70--under-borspremiaren-hor-styrelsemedlemmen/?embed=true&external=true&autoplay=true&startVolume=0&partnerId=di',
         'only_matching': True,
+    }, {
+        'url': 'https://www.expressen.se/video-player/embed/tv/nyheter/ekero-fodda-olof-gustafsson-forvaltar-knarkbaronen-pablo-escobars-namn',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.expressen.se/nyheter/efter-egna-telefonbluffen-escobar-stammer-klarna/',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
@@ -52,7 +58,7 @@ class ExpressenIE(InfoExtractor):
         def extract_data(name):
             return self._parse_json(
                 self._search_regex(
-                    r'data-%s=(["\'])(?P<value>(?:(?!\1).)+)\1' % name,
+                    rf'data-{name}=(["\'])(?P<value>(?:(?!\1).)+)\1',
                     webpage, 'info', group='value'),
                 display_id, transform_source=unescapeHTML)
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/extractors.py b/plugins/youtube_download/yt_dlp/extractor/extractors.py
index baa69d2..18a3737 100644
--- a/plugins/youtube_download/yt_dlp/extractor/extractors.py
+++ b/plugins/youtube_download/yt_dlp/extractor/extractors.py
@@ -1,28 +1,37 @@
-import contextlib
+import inspect
 import os
 
-from ..plugins import load_plugins
+from ..globals import LAZY_EXTRACTORS
+from ..globals import extractors as _extractors_context
 
-# NB: Must be before other imports so that plugins can be correctly injected
-_PLUGIN_CLASSES = load_plugins('extractor', 'IE')
+_CLASS_LOOKUP = None
+if os.environ.get('YTDLP_NO_LAZY_EXTRACTORS'):
+    LAZY_EXTRACTORS.value = False
+else:
+    try:
+        from .lazy_extractors import _CLASS_LOOKUP
+        LAZY_EXTRACTORS.value = True
+    except ImportError:
+        LAZY_EXTRACTORS.value = None
 
-_LAZY_LOADER = False
-if not os.environ.get('YTDLP_NO_LAZY_EXTRACTORS'):
-    with contextlib.suppress(ImportError):
-        from .lazy_extractors import *  # noqa: F403
-        from .lazy_extractors import _ALL_CLASSES
-        _LAZY_LOADER = True
+if not _CLASS_LOOKUP:
+    from . import _extractors
 
-if not _LAZY_LOADER:
-    from ._extractors import *  # noqa: F403
-    _ALL_CLASSES = [  # noqa: F811
-        klass
-        for name, klass in globals().items()
+    _CLASS_LOOKUP = {
+        name: value
+        for name, value in inspect.getmembers(_extractors)
         if name.endswith('IE') and name != 'GenericIE'
-    ]
-    _ALL_CLASSES.append(GenericIE)  # noqa: F405
+    }
+    _CLASS_LOOKUP['GenericIE'] = _extractors.GenericIE
 
-globals().update(_PLUGIN_CLASSES)
-_ALL_CLASSES[:0] = _PLUGIN_CLASSES.values()
+# We want to append to the main lookup
+_current = _extractors_context.value
+for name, ie in _CLASS_LOOKUP.items():
+    _current.setdefault(name, ie)
 
-from .common import _PLUGIN_OVERRIDES  # noqa: F401
+
+def __getattr__(name):
+    value = _CLASS_LOOKUP.get(name)
+    if not value:
+        raise AttributeError(f'module {__name__} has no attribute {name}')
+    return value
diff --git a/plugins/youtube_download/yt_dlp/extractor/extremetube.py b/plugins/youtube_download/yt_dlp/extractor/extremetube.py
deleted file mode 100644
index 2c19698..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/extremetube.py
+++ /dev/null
@@ -1,48 +0,0 @@
-from ..utils import str_to_int
-from .keezmovies import KeezMoviesIE
-
-
-class ExtremeTubeIE(KeezMoviesIE):  # XXX: Do not subclass from concrete IE
-    _VALID_URL = r'https?://(?:www\.)?extremetube\.com/(?:[^/]+/)?video/(?P<id>[^/#?&]+)'
-    _TESTS = [{
-        'url': 'http://www.extremetube.com/video/music-video-14-british-euro-brit-european-cumshots-swallow-652431',
-        'md5': '92feaafa4b58e82f261e5419f39c60cb',
-        'info_dict': {
-            'id': 'music-video-14-british-euro-brit-european-cumshots-swallow-652431',
-            'ext': 'mp4',
-            'title': 'Music Video 14 british euro brit european cumshots swallow',
-            'uploader': 'anonim',
-            'view_count': int,
-            'age_limit': 18,
-        }
-    }, {
-        'url': 'http://www.extremetube.com/gay/video/abcde-1234',
-        'only_matching': True,
-    }, {
-        'url': 'http://www.extremetube.com/video/latina-slut-fucked-by-fat-black-dick',
-        'only_matching': True,
-    }, {
-        'url': 'http://www.extremetube.com/video/652431',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        webpage, info = self._extract_info(url)
-
-        if not info['title']:
-            info['title'] = self._search_regex(
-                r'<h1[^>]+title="([^"]+)"[^>]*>', webpage, 'title')
-
-        uploader = self._html_search_regex(
-            r'Uploaded by:\s*</[^>]+>\s*<a[^>]+>(.+?)</a>',
-            webpage, 'uploader', fatal=False)
-        view_count = str_to_int(self._search_regex(
-            r'Views:\s*</[^>]+>\s*<[^>]+>([\d,\.]+)</',
-            webpage, 'view count', fatal=False))
-
-        info.update({
-            'uploader': uploader,
-            'view_count': view_count,
-        })
-
-        return info
diff --git a/plugins/youtube_download/yt_dlp/extractor/eyedotv.py b/plugins/youtube_download/yt_dlp/extractor/eyedotv.py
index d8b068e..b8c67ce 100644
--- a/plugins/youtube_download/yt_dlp/extractor/eyedotv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/eyedotv.py
@@ -1,8 +1,8 @@
 from .common import InfoExtractor
 from ..utils import (
-    xpath_text,
-    parse_duration,
     ExtractorError,
+    parse_duration,
+    xpath_text,
 )
 
 
@@ -18,13 +18,13 @@ class EyedoTVIE(InfoExtractor):
             'description': 'md5:4abe07293b2f73efc6e1c37028d58c98',
             'uploader': 'Afnic Live',
             'uploader_id': '8023',
-        }
+        },
     }
     _ROOT_URL = 'http://live.eyedo.net:1935/'
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        video_data = self._download_xml('http://eyedo.tv/api/live/GetLive/%s' % video_id, video_id)
+        video_data = self._download_xml(f'http://eyedo.tv/api/live/GetLive/{video_id}', video_id)
 
         def _add_ns(path):
             return self._xpath_ns(path, 'http://schemas.datacontract.org/2004/07/EyeDo.Core.Implementation.Web.ViewModels.Api')
@@ -33,7 +33,7 @@ class EyedoTVIE(InfoExtractor):
         state_live_code = xpath_text(video_data, _add_ns('StateLiveCode'), 'title', True)
         if state_live_code == 'avenir':
             raise ExtractorError(
-                '%s said: We\'re sorry, but this video is not yet available.' % self.IE_NAME,
+                f'{self.IE_NAME} said: We\'re sorry, but this video is not yet available.',
                 expected=True)
 
         is_live = state_live_code == 'live'
@@ -41,11 +41,11 @@ class EyedoTVIE(InfoExtractor):
         # http://eyedo.tv/Content/Html5/Scripts/html5view.js
         if is_live:
             if xpath_text(video_data, 'Cdn') == 'true':
-                m3u8_url = 'http://rrr.sz.xlcdn.com/?account=eyedo&file=A%s&type=live&service=wowza&protocol=http&output=playlist.m3u8' % video_id
+                m3u8_url = f'http://rrr.sz.xlcdn.com/?account=eyedo&file=A{video_id}&type=live&service=wowza&protocol=http&output=playlist.m3u8'
             else:
-                m3u8_url = self._ROOT_URL + 'w/%s/eyedo_720p/playlist.m3u8' % video_id
+                m3u8_url = self._ROOT_URL + f'w/{video_id}/eyedo_720p/playlist.m3u8'
         else:
-            m3u8_url = self._ROOT_URL + 'replay-w/%s/mp4:%s.mp4/playlist.m3u8' % (video_id, video_id)
+            m3u8_url = self._ROOT_URL + f'replay-w/{video_id}/mp4:{video_id}.mp4/playlist.m3u8'
 
         return {
             'id': video_id,
diff --git a/plugins/youtube_download/yt_dlp/extractor/facebook.py b/plugins/youtube_download/yt_dlp/extractor/facebook.py
index 4fd17b5..24ecb03 100644
--- a/plugins/youtube_download/yt_dlp/extractor/facebook.py
+++ b/plugins/youtube_download/yt_dlp/extractor/facebook.py
@@ -3,22 +3,19 @@ import re
 import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_etree_fromstring,
-    compat_str,
-    compat_urllib_parse_unquote,
-)
+from ..compat import compat_etree_fromstring
 from ..networking import Request
 from ..networking.exceptions import network_exceptions
 from ..utils import (
     ExtractorError,
     clean_html,
     determine_ext,
-    error_to_compat_str,
     float_or_none,
+    format_field,
     get_element_by_id,
     get_first,
     int_or_none,
+    join_nonempty,
     js_to_json,
     merge_dicts,
     parse_count,
@@ -42,6 +39,7 @@ class FacebookIE(InfoExtractor):
                         (?:[^#]*?\#!/)?
                         (?:
                             (?:
+                                permalink\.php|
                                 video/video\.php|
                                 photo\.php|
                                 video\.php|
@@ -51,12 +49,13 @@ class FacebookIE(InfoExtractor):
                             )\?(?:.*?)(?:v|video_id|story_fbid)=|
                             [^/]+/videos/(?:[^/]+/)?|
                             [^/]+/posts/|
-                            groups/[^/]+/permalink/|
+                            events/(?:[^/]+/)?|
+                            groups/[^/]+/(?:permalink|posts)/(?:[\da-f]+/)?|
                             watchparty/
                         )|
                     facebook:
                 )
-                (?P<id>[0-9]+)
+                (?P<id>pfbid[A-Za-z0-9]+|\d+)
                 '''
     _EMBED_REGEX = [
         r'<iframe[^>]+?src=(["\'])(?P<url>https?://www\.facebook\.com/(?:video/embed|plugins/video\.php).+?)\1',
@@ -74,6 +73,22 @@ class FacebookIE(InfoExtractor):
     _VIDEO_PAGE_TAHOE_TEMPLATE = 'https://www.facebook.com/video/tahoe/async/%s/?chain=true&isvideo=true&payloadtype=primary'
 
     _TESTS = [{
+        'url': 'https://www.facebook.com/radiokicksfm/videos/3676516585958356/',
+        'info_dict': {
+            'id': '3676516585958356',
+            'ext': 'mp4',
+            'title': 'dr Adam Przygoda',
+            'description': 'md5:34675bda53336b1d16400265c2bb9b3b',
+            'uploader': 'RADIO KICKS FM',
+            'upload_date': '20230818',
+            'timestamp': 1692346159,
+            'thumbnail': r're:^https?://.*',
+            'uploader_id': '100063551323670',
+            'duration': 3133.583,
+            'view_count': int,
+            'concurrent_view_count': 0,
+        },
+    }, {
         'url': 'https://www.facebook.com/video.php?v=637842556329505&fref=nf',
         'md5': '6a40d33c0eccbb1af76cf0485a052659',
         'info_dict': {
@@ -97,9 +112,10 @@ class FacebookIE(InfoExtractor):
             'upload_date': '20140506',
             'timestamp': 1399398998,
             'thumbnail': r're:^https?://.*',
-            'uploader_id': 'pfbid04scW44U4P9iTyLZAGy8y8W3pR3i2VugvHCimiRudUAVbN3MPp9eXBaYFcgVworZwl',
+            'uploader_id': 'pfbid05AzrFTXgY37tqwaSgbFTTEpCLBjjEJHkigogwGiRPtKEpAsJYJpzE94H1RxYXWEtl',
             'duration': 131.03,
             'concurrent_view_count': int,
+            'view_count': int,
         },
     }, {
         'note': 'Video with DASH manifest',
@@ -152,7 +168,7 @@ class FacebookIE(InfoExtractor):
         # have 1080P, but only up to 720p in swf params
         # data.video.story.attachments[].media
         'url': 'https://www.facebook.com/cnn/videos/10155529876156509/',
-        'md5': 'ca63897a90c9452efee5f8c40d080e25',
+        'md5': '1659aa21fb3dd1585874f668e81a72c8',
         'info_dict': {
             'id': '10155529876156509',
             'ext': 'mp4',
@@ -165,9 +181,10 @@ class FacebookIE(InfoExtractor):
             'view_count': int,
             'uploader_id': '100059479812265',
             'concurrent_view_count': int,
-            'duration': 44.478,
+            'duration': 44.181,
         },
     }, {
+        # FIXME: unable to extract uploader, no formats found
         # bigPipe.onPageletArrive ... onPageletArrive pagelet_group_mall
         # data.node.comet_sections.content.story.attachments[].style_type_renderer.attachment.media
         'url': 'https://www.facebook.com/yaroslav.korpan/videos/1417995061575415/',
@@ -179,7 +196,7 @@ class FacebookIE(InfoExtractor):
             'timestamp': 1486648217,
             'upload_date': '20170209',
             'uploader': 'Yaroslav Korpan',
-            'uploader_id': 'pfbid029y8j22EwH3ikeqgH3SEP9G3CAi9kmWKgXJJG9s5geV7mo3J2bvURqHCdgucRgAyhl',
+            'uploader_id': 'pfbid06AScABAWcW91qpiuGrLt99Ef9tvwHoXP6t8KeFYEqkSfreMtfa9nTveh8b2ZEVSWl',
             'concurrent_view_count': int,
             'thumbnail': r're:^https?://.*',
             'view_count': int,
@@ -189,7 +206,7 @@ class FacebookIE(InfoExtractor):
             'skip_download': True,
         },
     }, {
-        # FIXME
+        # FIXME: Cannot parse data error
         'url': 'https://www.facebook.com/LaGuiaDelVaron/posts/1072691702860471',
         'info_dict': {
             'id': '1072691702860471',
@@ -215,6 +232,56 @@ class FacebookIE(InfoExtractor):
             'uploader_id': '100013949973717',
         },
         'skip': 'Requires logging in',
+    }, {
+        # data.node.comet_sections.content.story.attachments[].throwbackStyles.attachment_target_renderer.attachment.target.attachments[].styles.attachment.media
+        'url': 'https://www.facebook.com/groups/1645456212344334/posts/3737828833107051/',
+        'info_dict': {
+            'id': '1569199726448814',
+            'ext': 'mp4',
+            'title': 'Pence MUST GO!',
+            'description': 'Vickie Gentry shared a memory.',
+            'timestamp': 1511548260,
+            'upload_date': '20171124',
+            'uploader': 'Vickie Gentry',
+            'uploader_id': 'pfbid0FkkycT95ySNNyfCw4Cho6u5G7WbbZEcxT496Hq8rtx1K3LcTCATpR3wnyYhmyGC5l',
+            'thumbnail': r're:^https?://.*',
+            'duration': 148.224,
+        },
+    }, {
+        # data.node.comet_sections.content.story.attachments[].styles.attachment.media
+        'url': 'https://www.facebook.com/attn/posts/pfbid0j1Czf2gGDVqeQ8KiMLFm3pWN8GxsQmeRrVhimWDzMuKQoR8r4b1knNsejELmUgyhl',
+        'info_dict': {
+            'id': '6968553779868435',
+            'ext': 'mp4',
+            'description': 'md5:2f2fcf93e97ac00244fe64521bbdb0cb',
+            'uploader': 'ATTN:',
+            'upload_date': '20231207',
+            'title': 'ATTN:',
+            'duration': 132.675,
+            'uploader_id': '100064451419378',
+            'view_count': int,
+            'thumbnail': r're:^https?://.*',
+            'timestamp': 1701975646,
+        },
+    }, {
+        # data.node.comet_sections.content.story.attachments[].styles.attachment.media
+        'url': 'https://www.facebook.com/permalink.php?story_fbid=pfbid0fqQuVEQyXRa9Dp4RcaTR14KHU3uULHV1EK7eckNXSH63JMuoALsAvVCJ97zAGitil&id=100068861234290',
+        'info_dict': {
+            'id': '270103405756416',
+            'ext': 'mp4',
+            'title': 'Lela Evans',
+            'description': 'Today Makkovik\'s own Pilot Mandy Smith made her inaugural landing on the airstrip in her hometown. What a proud moment as we all cheered and...',
+            'thumbnail': r're:^https?://.*',
+            'uploader': 'Lela Evans',
+            'uploader_id': 'pfbid0swT2y7t6TAsZVBvcyeYPdhTMefGaS26mzUwML3vd1ma6ndGZKxsyS4Ssu3jitZLXl',
+            'upload_date': '20231228',
+            'timestamp': 1703804085,
+            'duration': 394.347,
+            'view_count': int,
+        },
+    }, {
+        'url': 'https://www.facebook.com/story.php?story_fbid=pfbid0Fnzhm8UuzjBYpPMNFzaSpFE9UmLdU4fJN8qTANi1Dmtj5q7DNrL5NERXfsAzDEV7l&id=100073071055552',
+        'only_matching': True,
     }, {
         'url': 'https://www.facebook.com/video.php?v=10204634152394104',
         'only_matching': True,
@@ -257,7 +324,7 @@ class FacebookIE(InfoExtractor):
             'upload_date': '20180523',
             'uploader': 'ESL One Dota 2',
             'uploader_id': '100066514874195',
-            'duration': 4524.212,
+            'duration': 4524.001,
             'view_count': int,
             'thumbnail': r're:^https?://.*',
             'concurrent_view_count': int,
@@ -274,9 +341,9 @@ class FacebookIE(InfoExtractor):
             'title': 'Josef',
             'thumbnail': r're:^https?://.*',
             'concurrent_view_count': int,
-            'uploader_id': 'pfbid02gXHbDwxumkaKJQaTGUf3znYfYzTuidGEWawiramNx4YamSj2afwYSRkpcjtHtMRJl',
+            'uploader_id': 'pfbid02gpfwRM2XvdEJfsERupwQiNmBiDArc38RMRYZnap372q6Vs7MtFTVy72mmFWpJBTKl',
             'timestamp': 1549275572,
-            'duration': 3.413,
+            'duration': 3.283,
             'uploader': 'Josef Novak',
             'description': '',
             'upload_date': '20190204',
@@ -330,10 +397,26 @@ class FacebookIE(InfoExtractor):
         },
         'playlist_count': 1,
         'skip': 'Requires logging in',
+    }, {
+        # FIXME: Cannot parse data error
+        # data.event.cover_media_renderer.cover_video
+        'url': 'https://m.facebook.com/events/1509582499515440',
+        'info_dict': {
+            'id': '637246984455045',
+            'ext': 'mp4',
+            'title': 'ANALISI IN CAMPO OSCURO " Coaguli nel sangue dei vaccinati"',
+            'description': 'Other event by Comitato Liberi Pensatori on Tuesday, October 18 2022',
+            'thumbnail': r're:^https?://.*',
+            'uploader': 'Comitato Liberi Pensatori',
+            'uploader_id': '100065709540881',
+        },
+    }, {
+        'url': 'https://www.facebook.com/groups/1513990329015294/posts/d41d8cd9/2013209885760000/?app=fbl',
+        'only_matching': True,
     }]
     _SUPPORTED_PAGLETS_REGEX = r'(?:pagelet_group_mall|permalink_video_pagelet|hyperfeed_story_id_[0-9a-f]+)'
     _api_config = {
-        'graphURI': '/api/graphql/'
+        'graphURI': '/api/graphql/',
     }
 
     def _perform_login(self, username, password):
@@ -368,7 +451,7 @@ class FacebookIE(InfoExtractor):
                     r'(?s)<div[^>]+class=(["\']).*?login_error_box.*?\1[^>]*><div[^>]*>.*?</div><div[^>]*>(?P<error>.+?)</div>',
                     login_results, 'login error', default=None, group='error')
                 if error:
-                    raise ExtractorError('Unable to login: %s' % error, expected=True)
+                    raise ExtractorError(f'Unable to login: {error}', expected=True)
                 self.report_warning('unable to log in: bad username/password, or exceeded login rate limit (~3/min). Check credentials or wait.')
                 return
 
@@ -392,7 +475,7 @@ class FacebookIE(InfoExtractor):
             if re.search(r'id="checkpointSubmitButton"', check_response) is not None:
                 self.report_warning('Unable to confirm login, you have to login in your browser and authorize the login.')
         except network_exceptions as err:
-            self.report_warning('unable to log in: %s' % error_to_compat_str(err))
+            self.report_warning(f'unable to log in: {err}')
             return
 
     def _extract_from_url(self, url, video_id):
@@ -401,31 +484,32 @@ class FacebookIE(InfoExtractor):
 
         def extract_metadata(webpage):
             post_data = [self._parse_json(j, video_id, fatal=False) for j in re.findall(
-                r'handleWithCustomApplyEach\(\s*ScheduledApplyEach\s*,\s*(\{.+?\})\s*\);', webpage)]
+                r'data-sjs>({.*?ScheduledServerJS.*?})</script>', webpage)]
             post = traverse_obj(post_data, (
-                ..., 'require', ..., ..., ..., '__bbox', 'result', 'data'), expected_type=dict) or []
+                ..., 'require', ..., ..., ..., '__bbox', 'require', ..., ..., ..., '__bbox', 'result', 'data'), expected_type=dict) or []
             media = traverse_obj(post, (..., 'attachments', ..., lambda k, v: (
                 k == 'media' and str(v['id']) == video_id and v['__typename'] == 'Video')), expected_type=dict)
             title = get_first(media, ('title', 'text'))
             description = get_first(media, ('creation_story', 'comet_sections', 'message', 'story', 'message', 'text'))
-            uploader_data = (
-                get_first(media, ('owner', {dict}))
-                or get_first(post, (..., 'video', lambda k, v: k == 'owner' and v['name']))
-                or get_first(post, ('node', 'actors', ..., {dict})) or {})
-
             page_title = title or self._html_search_regex((
                 r'<h2\s+[^>]*class="uiHeaderTitle"[^>]*>(?P<content>[^<]*)</h2>',
                 r'(?s)<span class="fbPhotosPhotoCaption".*?id="fbPhotoPageCaption"><span class="hasCaption">(?P<content>.*?)</span>',
-                self._meta_regex('og:title'), self._meta_regex('twitter:title'), r'<title>(?P<content>.+?)</title>'
+                self._meta_regex('og:title'), self._meta_regex('twitter:title'), r'<title>(?P<content>.+?)</title>',
             ), webpage, 'title', default=None, group='content')
             description = description or self._html_search_meta(
                 ['description', 'og:description', 'twitter:description'],
                 webpage, 'description', default=None)
+            uploader_data = (
+                get_first(media, ('owner', {dict}))
+                or get_first(post, ('video', 'creation_story', 'attachments', ..., 'media', lambda k, v: k == 'owner' and v['name']))
+                or get_first(post, (..., 'video', lambda k, v: k == 'owner' and v['name']))
+                or get_first(post, ('node', 'actors', ..., {dict}))
+                or get_first(post, ('event', 'event_creator', {dict}))
+                or get_first(post, ('video', 'creation_story', 'short_form_video_context', 'video_owner', {dict})) or {})
             uploader = uploader_data.get('name') or (
                 clean_html(get_element_by_id('fbPhotoPageAuthorName', webpage))
                 or self._search_regex(
                     (r'ownerName\s*:\s*"([^"]+)"', *self._og_regexes('title')), webpage, 'uploader', fatal=False))
-
             timestamp = int_or_none(self._search_regex(
                 r'<abbr[^>]+data-utime=["\'](\d+)', webpage,
                 'timestamp', default=None))
@@ -443,10 +527,15 @@ class FacebookIE(InfoExtractor):
                 'timestamp': timestamp,
                 'thumbnail': thumbnail,
                 'view_count': parse_count(self._search_regex(
-                    (r'\bviewCount\s*:\s*["\']([\d,.]+)', r'video_view_count["\']\s*:\s*(\d+)',),
+                    (r'\bviewCount\s*:\s*["\']([\d,.]+)', r'video_view_count["\']\s*:\s*(\d+)'),
                     webpage, 'view count', default=None)),
                 'concurrent_view_count': get_first(post, (
                     ('video', (..., ..., 'attachments', ..., 'media')), 'liveViewerCount', {int_or_none})),
+                **traverse_obj(post, (lambda _, v: video_id in v['url'], 'feedback', {
+                    'like_count': ('likers', 'count', {int}),
+                    'comment_count': ('total_comment_count', {int}),
+                    'repost_count': ('share_count_reduced', {parse_count}),
+                }), get_all=False),
             }
 
             info_json_ld = self._search_json_ld(webpage, video_id, default={})
@@ -477,41 +566,51 @@ class FacebookIE(InfoExtractor):
                 return extract_video_data(try_get(
                     js_data, lambda x: x['jsmods']['instances'], list) or [])
 
-        def extract_dash_manifest(video, formats):
-            dash_manifest = video.get('dash_manifest')
+        def extract_dash_manifest(vid_data, formats, mpd_url=None):
+            dash_manifest = traverse_obj(
+                vid_data, 'dash_manifest', 'playlist', 'dash_manifest_xml_string', 'manifest_xml', expected_type=str)
             if dash_manifest:
                 formats.extend(self._parse_mpd_formats(
                     compat_etree_fromstring(urllib.parse.unquote_plus(dash_manifest)),
-                    mpd_url=video.get('dash_manifest_url')))
+                    mpd_url=url_or_none(vid_data.get('dash_manifest_url')) or mpd_url))
 
         def process_formats(info):
             # Downloads with browser's User-Agent are rate limited. Working around
             # with non-browser User-Agent.
             for f in info['formats']:
+                # Downloads with browser's User-Agent are rate limited. Working around
+                # with non-browser User-Agent.
                 f.setdefault('http_headers', {})['User-Agent'] = 'facebookexternalhit/1.1'
-            info['_format_sort_fields'] = ('res', 'quality')
+                # Formats larger than ~500MB will return error 403 unless chunk size is regulated
+                f.setdefault('downloader_options', {})['http_chunk_size'] = 250 << 20
+
+        def yield_all_relay_data(_filter):
+            for relay_data in re.findall(rf'data-sjs>({{.*?{_filter}.*?}})</script>', webpage):
+                yield self._parse_json(relay_data, video_id, fatal=False) or {}
 
         def extract_relay_data(_filter):
-            return self._parse_json(self._search_regex(
-                r'handleWithCustomApplyEach\([^,]+,\s*({.*?%s.*?})\);' % _filter,
-                webpage, 'replay data', default='{}'), video_id, fatal=False) or {}
+            return next(filter(None, yield_all_relay_data(_filter)), {})
 
-        def extract_relay_prefetched_data(_filter):
-            replay_data = extract_relay_data(_filter)
-            for require in (replay_data.get('require') or []):
-                if require[0] == 'RelayPrefetchedStreamCache':
-                    return try_get(require, lambda x: x[3][1]['__bbox']['result']['data'], dict) or {}
+        def extract_relay_prefetched_data(_filter, target_keys=None):
+            path = 'data'
+            if target_keys is not None:
+                path = lambda k, v: k == 'data' and any(target in v for target in variadic(target_keys))
+            return traverse_obj(yield_all_relay_data(_filter), (
+                ..., 'require', (None, (..., ..., ..., '__bbox', 'require')),
+                lambda _, v: any(key.startswith('RelayPrefetchedStreamCache') for key in v),
+                ..., ..., '__bbox', 'result', path, {dict}), get_all=False) or {}
 
         if not video_data:
             server_js_data = self._parse_json(self._search_regex([
                 r'bigPipe\.onPageletArrive\(({.+?})\)\s*;\s*}\s*\)\s*,\s*["\']onPageletArrive\s+' + self._SUPPORTED_PAGLETS_REGEX,
-                r'bigPipe\.onPageletArrive\(({.*?id\s*:\s*"%s".*?})\);' % self._SUPPORTED_PAGLETS_REGEX
+                rf'bigPipe\.onPageletArrive\(({{.*?id\s*:\s*"{self._SUPPORTED_PAGLETS_REGEX}".*?}})\);',
             ], webpage, 'js data', default='{}'), video_id, js_to_json, False)
             video_data = extract_from_jsmods_instances(server_js_data)
 
         if not video_data:
             data = extract_relay_prefetched_data(
-                r'"(?:dash_manifest|playable_url(?:_quality_hd)?)"\s*:\s*"[^"]+"')
+                r'"(?:dash_manifest|playable_url(?:_quality_hd)?)',
+                target_keys=('video', 'event', 'nodes', 'node', 'mediaset'))
             if data:
                 entries = []
 
@@ -523,22 +622,76 @@ class FacebookIE(InfoExtractor):
                         video = video['creation_story']
                         video['owner'] = traverse_obj(video, ('short_form_video_context', 'video_owner'))
                         video.update(reel_info)
+
                     formats = []
                     q = qualities(['sd', 'hd'])
+
+                    # Legacy formats extraction
+                    fmt_data = traverse_obj(video, ('videoDeliveryLegacyFields', {dict})) or video
                     for key, format_id in (('playable_url', 'sd'), ('playable_url_quality_hd', 'hd'),
-                                           ('playable_url_dash', '')):
-                        playable_url = video.get(key)
+                                           ('playable_url_dash', ''), ('browser_native_hd_url', 'hd'),
+                                           ('browser_native_sd_url', 'sd')):
+                        playable_url = fmt_data.get(key)
                         if not playable_url:
                             continue
                         if determine_ext(playable_url) == 'mpd':
-                            formats.extend(self._extract_mpd_formats(playable_url, video_id))
+                            formats.extend(self._extract_mpd_formats(playable_url, video_id, fatal=False))
                         else:
                             formats.append({
                                 'format_id': format_id,
-                                'quality': q(format_id),
+                                # sd, hd formats w/o resolution info should be deprioritized below DASH
+                                'quality': q(format_id) - 3,
                                 'url': playable_url,
                             })
-                    extract_dash_manifest(video, formats)
+                    extract_dash_manifest(fmt_data, formats)
+
+                    # New videoDeliveryResponse formats extraction
+                    fmt_data = traverse_obj(video, ('videoDeliveryResponseFragment', 'videoDeliveryResponseResult'))
+                    mpd_urls = traverse_obj(fmt_data, ('dash_manifest_urls', ..., 'manifest_url', {url_or_none}))
+                    dash_manifests = traverse_obj(fmt_data, ('dash_manifests', lambda _, v: v['manifest_xml']))
+                    for idx, dash_manifest in enumerate(dash_manifests):
+                        extract_dash_manifest(dash_manifest, formats, mpd_url=traverse_obj(mpd_urls, idx))
+                    if not dash_manifests:
+                        # Only extract from MPD URLs if the manifests are not already provided
+                        for mpd_url in mpd_urls:
+                            formats.extend(self._extract_mpd_formats(mpd_url, video_id, fatal=False))
+                    for prog_fmt in traverse_obj(fmt_data, ('progressive_urls', lambda _, v: v['progressive_url'])):
+                        format_id = traverse_obj(prog_fmt, ('metadata', 'quality', {str.lower}))
+                        formats.append({
+                            'format_id': format_id,
+                            # sd, hd formats w/o resolution info should be deprioritized below DASH
+                            'quality': q(format_id) - 3,
+                            'url': prog_fmt['progressive_url'],
+                        })
+                    for m3u8_url in traverse_obj(fmt_data, ('hls_playlist_urls', ..., 'hls_playlist_url', {url_or_none})):
+                        formats.extend(self._extract_m3u8_formats(m3u8_url, video_id, 'mp4', fatal=False, m3u8_id='hls'))
+
+                    if not formats:
+                        # Do not append false positive entry w/o any formats
+                        return
+
+                    automatic_captions, subtitles = {}, {}
+                    is_broadcast = traverse_obj(video, ('is_video_broadcast', {bool}))
+                    for caption in traverse_obj(video, (
+                        'video_available_captions_locales',
+                        {lambda x: sorted(x, key=lambda c: c['locale'])},
+                        lambda _, v: url_or_none(v['captions_url']),
+                    )):
+                        lang = caption.get('localized_language') or 'und'
+                        subs = {
+                            'url': caption['captions_url'],
+                            'name': format_field(caption, 'localized_country', f'{lang} (%s)', default=lang),
+                        }
+                        if caption.get('localized_creation_method') or is_broadcast:
+                            automatic_captions.setdefault(caption['locale'], []).append(subs)
+                        else:
+                            subtitles.setdefault(caption['locale'], []).append(subs)
+                    captions_url = traverse_obj(video, ('captions_url', {url_or_none}))
+                    if captions_url and not automatic_captions and not subtitles:
+                        locale = self._html_search_meta(
+                            ['og:locale', 'twitter:locale'], webpage, 'locale', default='en_US')
+                        (automatic_captions if is_broadcast else subtitles)[locale] = [{'url': captions_url}]
+
                     info = {
                         'id': v_id,
                         'formats': formats,
@@ -548,6 +701,8 @@ class FacebookIE(InfoExtractor):
                         'timestamp': traverse_obj(video, 'publish_time', 'creation_time', expected_type=int_or_none),
                         'duration': (float_or_none(video.get('playable_duration_in_ms'), 1000)
                                      or float_or_none(video.get('length_in_second'))),
+                        'automatic_captions': automatic_captions,
+                        'subtitles': subtitles,
                     }
                     process_formats(info)
                     description = try_get(video, lambda x: x['savable_description']['text'])
@@ -558,7 +713,7 @@ class FacebookIE(InfoExtractor):
                             'description': description,
                         })
                     else:
-                        info['title'] = description or 'Facebook video #%s' % v_id
+                        info['title'] = description or f'Facebook video #{v_id}'
                     entries.append(info)
 
                 def parse_attachment(attachment, key='media'):
@@ -569,9 +724,11 @@ class FacebookIE(InfoExtractor):
                 nodes = variadic(traverse_obj(data, 'nodes', 'node') or [])
                 attachments = traverse_obj(nodes, (
                     ..., 'comet_sections', 'content', 'story', (None, 'attached_story'), 'attachments',
-                    ..., ('styles', 'style_type_renderer'), 'attachment'), expected_type=dict) or []
+                    ..., ('styles', 'style_type_renderer', ('throwbackStyles', 'attachment_target_renderer')),
+                    'attachment', {dict}))
                 for attachment in attachments:
-                    ns = try_get(attachment, lambda x: x['all_subattachments']['nodes'], list) or []
+                    ns = traverse_obj(attachment, ('all_subattachments', 'nodes', ..., {dict}),
+                                      ('target', 'attachments', ..., 'styles', 'attachment', {dict}))
                     for n in ns:
                         parse_attachment(n)
                     parse_attachment(attachment)
@@ -580,11 +737,12 @@ class FacebookIE(InfoExtractor):
                 for edge in edges:
                     parse_attachment(edge, key='node')
 
-                video = data.get('video') or {}
+                video = traverse_obj(data, (
+                    'event', 'cover_media_renderer', 'cover_video'), 'video', expected_type=dict) or {}
                 if video:
                     attachments = try_get(video, [
                         lambda x: x['story']['attachments'],
-                        lambda x: x['creation_story']['attachments']
+                        lambda x: x['creation_story']['attachments'],
                     ], list) or []
                     for attachment in attachments:
                         parse_attachment(attachment)
@@ -594,18 +752,21 @@ class FacebookIE(InfoExtractor):
                 if len(entries) > 1:
                     return self.playlist_result(entries, video_id)
 
-                video_info = entries[0]
+                video_info = entries[0] if entries else {'id': video_id}
                 webpage_info = extract_metadata(webpage)
                 # honor precise duration in video info
                 if video_info.get('duration'):
                     webpage_info['duration'] = video_info['duration']
+                # preserve preferred_thumbnail in video info
+                if video_info.get('thumbnail'):
+                    webpage_info['thumbnail'] = video_info['thumbnail']
                 return merge_dicts(webpage_info, video_info)
 
         if not video_data:
             m_msg = re.search(r'class="[^"]*uiInterstitialContent[^"]*"><div>(.*?)</div>', webpage)
             if m_msg is not None:
                 raise ExtractorError(
-                    'The video is not available, Facebook said: "%s"' % m_msg.group(1),
+                    f'The video is not available, Facebook said: "{m_msg.group(1)}"',
                     expected=True)
             elif any(p in webpage for p in (
                     '>You must log in to continue',
@@ -642,7 +803,7 @@ class FacebookIE(InfoExtractor):
                 v_id = video.get('id')
                 if not v_id:
                     continue
-                v_id = compat_str(v_id)
+                v_id = str(v_id)
                 entries.append(self.url_result(
                     self._VIDEO_PAGE_TEMPLATE % v_id,
                     self.ie_key(), v_id, video.get('name')))
@@ -700,16 +861,18 @@ class FacebookIE(InfoExtractor):
                 continue
             for quality in ('sd', 'hd'):
                 for src_type in ('src', 'src_no_ratelimit'):
-                    src = f[0].get('%s_%s' % (quality, src_type))
+                    src = f[0].get(f'{quality}_{src_type}')
                     if src:
-                        preference = -10 if format_id == 'progressive' else -1
+                        # sd, hd formats w/o resolution info should be deprioritized below DASH
+                        # TODO: investigate if progressive or src formats still exist
+                        preference = -10 if format_id == 'progressive' else -3
                         if quality == 'hd':
-                            preference += 5
+                            preference += 1
                         formats.append({
-                            'format_id': '%s_%s_%s' % (format_id, quality, src_type),
+                            'format_id': f'{format_id}_{quality}_{src_type}',
                             'url': src,
                             'quality': preference,
-                            'height': 720 if quality == 'hd' else None
+                            'height': 720 if quality == 'hd' else None,
                         })
             extract_dash_manifest(f[0], formats)
             subtitles_src = f[0].get('subtitles_src')
@@ -759,7 +922,7 @@ class FacebookPluginsVideoIE(InfoExtractor):
 
     def _real_extract(self, url):
         return self.url_result(
-            compat_urllib_parse_unquote(self._match_id(url)),
+            urllib.parse.unquote(self._match_id(url)),
             FacebookIE.ie_key())
 
 
@@ -808,22 +971,161 @@ class FacebookReelIE(InfoExtractor):
 
     _TESTS = [{
         'url': 'https://www.facebook.com/reel/1195289147628387',
-        'md5': 'f13dd37f2633595982db5ed8765474d3',
+        'md5': 'a53256d10fc2105441fe0c4212ed8cea',
         'info_dict': {
             'id': '1195289147628387',
             'ext': 'mp4',
-            'title': 'md5:b05800b5b1ad56c0ca78bd3807b6a61e',
-            'description': 'md5:22f03309b216ac84720183961441d8db',
-            'uploader': 'md5:723e6cb3091241160f20b3c5dc282af1',
+            'title': r're:9\.6K views · 355 reactions .+ Let the “Slapathon” commence!! .+ LL COOL J · Mama Said Knock You Out$',
+            'description': r're:When your trying to help your partner .+ LL COOL J · Mama Said Knock You Out$',
+            'uploader': 'Beast Camp Training',
             'uploader_id': '100040874179269',
             'duration': 9.579,
             'timestamp': 1637502609,
             'upload_date': '20211121',
             'thumbnail': r're:^https?://.*',
-        }
+            'like_count': int,
+            'comment_count': int,
+            'repost_count': int,
+        },
     }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
         return self.url_result(
             f'https://m.facebook.com/watch/?v={video_id}&_rdr', FacebookIE, video_id)
+
+
+class FacebookAdsIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:[\w-]+\.)?facebook\.com/ads/library/?\?(?:[^#]+&)?id=(?P<id>\d+)'
+    IE_NAME = 'facebook:ads'
+
+    _TESTS = [{
+        'url': 'https://www.facebook.com/ads/library/?id=899206155126718',
+        'info_dict': {
+            'id': '899206155126718',
+            'ext': 'mp4',
+            'title': 'video by Kandao',
+            'description': 'md5:0822724069e3aca97cbed5dabbab282e',
+            'uploader': 'Kandao',
+            'uploader_id': '774114102743284',
+            'uploader_url': r're:^https?://.*',
+            'timestamp': 1702548330,
+            'thumbnail': r're:^https?://.*',
+            'upload_date': '20231214',
+            'like_count': int,
+        },
+    }, {
+        # key 'watermarked_video_sd_url' missing
+        'url': 'https://www.facebook.com/ads/library/?id=501152689226254',
+        'info_dict': {
+            'id': '501152689226254',
+            'ext': 'mp4',
+            'title': 'video by mat.nawrocki',
+            'description': 'md5:02a446ace7ff8c3c37a2892922492490',
+            'uploader': 'mat.nawrocki',
+            'uploader_id': '148586968341456',
+            'uploader_url': r're:^https?://.*',
+            'timestamp': 1723452305,
+            'thumbnail': r're:^https?://.*',
+            'upload_date': '20240812',
+            'like_count': int,
+        },
+    }, {
+        'url': 'https://www.facebook.com/ads/library/?id=893637265423481',
+        'info_dict': {
+            'id': '893637265423481',
+            'title': 'Jusqu\u2019\u00e0 -25% sur une s\u00e9lection de vins p\u00e9tillants italiens ',
+            'uploader': 'Eataly Paris Marais',
+            'uploader_id': '2086668958314152',
+            'uploader_url': r're:^https?://.*',
+            'timestamp': 1703571529,
+            'upload_date': '20231226',
+            'like_count': int,
+        },
+        'playlist_count': 3,
+    }, {
+        'url': 'https://es-la.facebook.com/ads/library/?id=901230958115569',
+        'only_matching': True,
+    }, {
+        'url': 'https://m.facebook.com/ads/library/?id=901230958115569',
+        'only_matching': True,
+    }]
+
+    _FORMATS_MAP = {
+        'watermarked_video_sd_url': ('sd-wmk', 'SD, watermarked'),
+        'video_sd_url': ('sd', None),
+        'watermarked_video_hd_url': ('hd-wmk', 'HD, watermarked'),
+        'video_hd_url': ('hd', None),
+    }
+
+    def _extract_formats(self, video_dict):
+        formats = []
+        for format_key, format_url in traverse_obj(video_dict, (
+            {dict.items}, lambda _, v: v[0] in self._FORMATS_MAP and url_or_none(v[1]),
+        )):
+            formats.append({
+                'format_id': self._FORMATS_MAP[format_key][0],
+                'format_note': self._FORMATS_MAP[format_key][1],
+                'url': format_url,
+                'ext': 'mp4',
+                'quality': qualities(tuple(self._FORMATS_MAP))(format_key),
+            })
+        return formats
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+
+        post_data = traverse_obj(
+            re.findall(r'data-sjs>({.*?ScheduledServerJS.*?})</script>', webpage), (..., {json.loads}))
+        data = get_first(post_data, (
+            'require', ..., ..., ..., '__bbox', 'require', ..., ..., ...,
+            'entryPointRoot', 'otherProps', 'deeplinkAdCard', 'snapshot', {dict}))
+        if not data:
+            raise ExtractorError('Unable to extract ad data')
+
+        title = data.get('title')
+        if not title or title == '{{product.name}}':
+            title = join_nonempty('display_format', 'page_name', delim=' by ', from_dict=data)
+        markup_id = traverse_obj(data, ('body', '__m', {str}))
+        markup = traverse_obj(post_data, (
+            ..., 'require', ..., ..., ..., '__bbox', 'markup', lambda _, v: v[0].startswith(markup_id),
+            ..., '__html', {clean_html}, {lambda x: not x.startswith('{{product.') and x}, any))
+
+        info_dict = merge_dicts({
+            'title': title,
+            'description': markup or None,
+        }, traverse_obj(data, {
+            'description': ('link_description', {lambda x: x if not x.startswith('{{product.') else None}),
+            'uploader': ('page_name', {str}),
+            'uploader_id': ('page_id', {str_or_none}),
+            'uploader_url': ('page_profile_uri', {url_or_none}),
+            'timestamp': ('creation_time', {int_or_none}),
+            'like_count': ('page_like_count', {int_or_none}),
+        }))
+
+        entries = []
+        for idx, entry in enumerate(traverse_obj(
+            data, (('videos', 'cards'), lambda _, v: any(url_or_none(v.get(f)) for f in self._FORMATS_MAP))), 1,
+        ):
+            entries.append({
+                'id': f'{video_id}_{idx}',
+                'title': entry.get('title') or title,
+                'description': traverse_obj(entry, 'body', 'link_description') or info_dict.get('description'),
+                'thumbnail': url_or_none(entry.get('video_preview_image_url')),
+                'formats': self._extract_formats(entry),
+            })
+
+        if len(entries) == 1:
+            info_dict.update(entries[0])
+
+        elif len(entries) > 1:
+            info_dict.update({
+                'title': entries[0]['title'],
+                'entries': entries,
+                '_type': 'playlist',
+            })
+
+        info_dict['id'] = video_id
+
+        return info_dict
diff --git a/plugins/youtube_download/yt_dlp/extractor/fancode.py b/plugins/youtube_download/yt_dlp/extractor/fancode.py
index 1b5db81..1b1ed39 100644
--- a/plugins/youtube_download/yt_dlp/extractor/fancode.py
+++ b/plugins/youtube_download/yt_dlp/extractor/fancode.py
@@ -1,15 +1,9 @@
 from .common import InfoExtractor
-
-from ..compat import compat_str
-from ..utils import (
-    parse_iso8601,
-    ExtractorError,
-    try_get,
-    mimetype2ext
-)
+from ..utils import ExtractorError, mimetype2ext, parse_iso8601, try_get
 
 
 class FancodeVodIE(InfoExtractor):
+    _WORKING = False
     IE_NAME = 'fancode:vod'
 
     _VALID_URL = r'https?://(?:www\.)?fancode\.com/video/(?P<id>[0-9]+)\b'
@@ -24,12 +18,12 @@ class FancodeVodIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'Match Preview: PBKS vs MI',
             'thumbnail': r're:^https?://.*\.jpg$',
-            "timestamp": 1619081590,
+            'timestamp': 1619081590,
             'view_count': int,
             'like_count': int,
             'upload_date': '20210422',
-            'uploader_id': '6008340455001'
-        }
+            'uploader_id': '6008340455001',
+        },
     }, {
         'url': 'https://fancode.com/video/15043',
         'only_matching': True,
@@ -58,14 +52,14 @@ class FancodeVodIE(InfoExtractor):
                 "refreshToken":"%s"
             },
             "operationName":"RefreshToken"
-        }''' % password
+        }''' % password  # noqa: UP031
 
-        token_json = self.download_gql('refresh token', data, "Getting the Access token")
+        token_json = self.download_gql('refresh token', data, 'Getting the Access token')
         self._ACCESS_TOKEN = try_get(token_json, lambda x: x['data']['refreshToken']['accessToken'])
         if self._ACCESS_TOKEN is None:
             self.report_warning('Failed to get Access token')
         else:
-            self.headers.update({'Authorization': 'Bearer %s' % self._ACCESS_TOKEN})
+            self.headers.update({'Authorization': f'Bearer {self._ACCESS_TOKEN}'})
 
     def _check_login_required(self, is_available, is_premium):
         msg = None
@@ -97,12 +91,12 @@ class FancodeVodIE(InfoExtractor):
                 }
             },
             "operationName":"Video"
-        }''' % video_id
+        }''' % video_id  # noqa: UP031
 
         metadata_json = self.download_gql(video_id, data, note='Downloading metadata')
 
         media = try_get(metadata_json, lambda x: x['data']['media'], dict) or {}
-        brightcove_video_id = try_get(media, lambda x: x['mediaSource']['brightcove'], compat_str)
+        brightcove_video_id = try_get(media, lambda x: x['mediaSource']['brightcove'], str)
 
         if brightcove_video_id is None:
             raise ExtractorError('Unable to extract brightcove Video ID')
@@ -126,6 +120,7 @@ class FancodeVodIE(InfoExtractor):
 
 
 class FancodeLiveIE(FancodeVodIE):  # XXX: Do not subclass from concrete IE
+    _WORKING = False
     IE_NAME = 'fancode:live'
 
     _VALID_URL = r'https?://(www\.)?fancode\.com/match/(?P<id>[0-9]+).+'
@@ -136,11 +131,11 @@ class FancodeLiveIE(FancodeVodIE):  # XXX: Do not subclass from concrete IE
             'id': '35328',
             'ext': 'mp4',
             'title': 'BUB vs BLB',
-            "timestamp": 1624863600,
+            'timestamp': 1624863600,
             'is_live': True,
             'upload_date': '20210628',
         },
-        'skip': 'Ended'
+        'skip': 'Ended',
     }, {
         'url': 'https://fancode.com/match/35328/',
         'only_matching': True,
@@ -151,7 +146,7 @@ class FancodeLiveIE(FancodeVodIE):  # XXX: Do not subclass from concrete IE
 
     def _real_extract(self, url):
 
-        id = self._match_id(url)
+        video_id = self._match_id(url)
         data = '''{
             "query":"query MatchResponse($id: Int\\u0021, $isLoggedIn: Boolean\\u0021) { match: matchWithScores(id: $id) { id matchDesc mediaId videoStreamId videoStreamUrl { ...VideoSource } liveStreams { videoStreamId videoStreamUrl { ...VideoSource } contentId } name startTime streamingStatus isPremium isUserEntitled @include(if: $isLoggedIn) status metaTags bgImage { src } sport { name slug } tour { id name } squads { name shortName } liveStreams { contentId } mediaId }}fragment VideoSource on VideoSource { title description posterUrl url deliveryType playerType}",
             "variables":{
@@ -159,21 +154,21 @@ class FancodeLiveIE(FancodeVodIE):  # XXX: Do not subclass from concrete IE
                 "isLoggedIn":true
             },
             "operationName":"MatchResponse"
-        }''' % id
+        }''' % video_id  # noqa: UP031
 
-        info_json = self.download_gql(id, data, "Info json")
+        info_json = self.download_gql(video_id, data, 'Info json')
 
         match_info = try_get(info_json, lambda x: x['data']['match'])
 
-        if match_info.get('streamingStatus') != "STARTED":
+        if match_info.get('streamingStatus') != 'STARTED':
             raise ExtractorError('The stream can\'t be accessed', expected=True)
         self._check_login_required(match_info.get('isUserEntitled'), True)  # all live streams are premium only
 
         return {
-            'id': id,
+            'id': video_id,
             'title': match_info.get('name'),
-            'formats': self._extract_akamai_formats(try_get(match_info, lambda x: x['videoStreamUrl']['url']), id),
+            'formats': self._extract_akamai_formats(try_get(match_info, lambda x: x['videoStreamUrl']['url']), video_id),
             'ext': mimetype2ext(try_get(match_info, lambda x: x['videoStreamUrl']['deliveryType'])),
             'is_live': True,
-            'release_timestamp': parse_iso8601(match_info.get('startTime'))
+            'release_timestamp': parse_iso8601(match_info.get('startTime')),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/fathom.py b/plugins/youtube_download/yt_dlp/extractor/fathom.py
new file mode 100644
index 0000000..1df7d96
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/fathom.py
@@ -0,0 +1,54 @@
+import json
+
+from .common import InfoExtractor
+from ..utils import (
+    extract_attributes,
+    float_or_none,
+    get_element_html_by_id,
+    parse_iso8601,
+)
+from ..utils.traversal import traverse_obj
+
+
+class FathomIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?fathom\.video/share/(?P<id>[^/?#&]+)'
+    _TESTS = [{
+        'url': 'https://fathom.video/share/G9mkjkspnohVVZ_L5nrsoPycyWcB8y7s',
+        'md5': '0decd5343b8f30ae268625e79a02b60f',
+        'info_dict': {
+            'id': '47200596',
+            'ext': 'mp4',
+            'title': 'eCom Inucbator - Coaching Session',
+            'duration': 8125.380507,
+            'timestamp': 1699048914,
+            'upload_date': '20231103',
+        },
+    }, {
+        'url': 'https://fathom.video/share/mEws3bybftHL2QLymxYEDeE21vtLxGVm',
+        'md5': '4f5cb382126c22d1aba8a939f9c49690',
+        'info_dict': {
+            'id': '46812957',
+            'ext': 'mp4',
+            'title': 'Jon, Lawrence, Neman chat about practice',
+            'duration': 3571.517847,
+            'timestamp': 1698933600,
+            'upload_date': '20231102',
+        },
+    }]
+
+    def _real_extract(self, url):
+        display_id = self._match_id(url)
+        webpage = self._download_webpage(url, display_id)
+        props = traverse_obj(
+            get_element_html_by_id('app', webpage), ({extract_attributes}, 'data-page', {json.loads}, 'props'))
+        video_id = str(props['call']['id'])
+
+        return {
+            'id': video_id,
+            'formats': self._extract_m3u8_formats(props['call']['video_url'], video_id, 'mp4'),
+            **traverse_obj(props, {
+                'title': ('head', 'title', {str}),
+                'duration': ('duration', {float_or_none}),
+                'timestamp': ('call', 'started_at', {parse_iso8601}),
+            }),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/faz.py b/plugins/youtube_download/yt_dlp/extractor/faz.py
index bca62ad..796bac3 100644
--- a/plugins/youtube_download/yt_dlp/extractor/faz.py
+++ b/plugins/youtube_download/yt_dlp/extractor/faz.py
@@ -3,9 +3,9 @@ import re
 from .common import InfoExtractor
 from ..compat import compat_etree_fromstring
 from ..utils import (
+    int_or_none,
     xpath_element,
     xpath_text,
-    int_or_none,
 )
 
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/fc2.py b/plugins/youtube_download/yt_dlp/extractor/fc2.py
index ba19b6c..f7b8831 100644
--- a/plugins/youtube_download/yt_dlp/extractor/fc2.py
+++ b/plugins/youtube_download/yt_dlp/extractor/fc2.py
@@ -1,12 +1,10 @@
 import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import compat_parse_qs
-from ..dependencies import websockets
 from ..networking import Request
 from ..utils import (
     ExtractorError,
-    WebSocketsWrapper,
     js_to_json,
     traverse_obj,
     update_url_query,
@@ -16,7 +14,7 @@ from ..utils import (
 
 
 class FC2IE(InfoExtractor):
-    _VALID_URL = r'^(?:https?://video\.fc2\.com/(?:[^/]+/)*content/|fc2:)(?P<id>[^/]+)'
+    _VALID_URL = r'(?:https?://video\.fc2\.com/(?:[^/]+/)*content/|fc2:)(?P<id>[^/]+)'
     IE_NAME = 'fc2'
     _NETRC_MACHINE = 'fc2'
     _TESTS = [{
@@ -94,7 +92,7 @@ class FC2IE(InfoExtractor):
             description = self._og_search_description(webpage, default=None)
 
         vidplaylist = self._download_json(
-            'https://video.fc2.com/api/v3/videoplaylist/%s?sh=1&fs=0' % video_id, video_id,
+            f'https://video.fc2.com/api/v3/videoplaylist/{video_id}?sh=1&fs=0', video_id,
             note='Downloading info page')
         vid_url = traverse_obj(vidplaylist, ('playlist', 'nq'))
         if not vid_url:
@@ -129,22 +127,22 @@ class FC2EmbedIE(InfoExtractor):
 
     def _real_extract(self, url):
         mobj = self._match_valid_url(url)
-        query = compat_parse_qs(mobj.group('query'))
+        query = urllib.parse.parse_qs(mobj.group('query'))
 
         video_id = query['i'][-1]
-        title = query.get('tl', ['FC2 video %s' % video_id])[0]
+        title = query.get('tl', [f'FC2 video {video_id}'])[0]
 
         sj = query.get('sj', [None])[0]
         thumbnail = None
         if sj:
             # See thumbnailImagePath() in ServerConst.as of flv2.swf
-            thumbnail = 'http://video%s-thumbnail.fc2.com/up/pic/%s.jpg' % (
+            thumbnail = 'http://video{}-thumbnail.fc2.com/up/pic/{}.jpg'.format(
                 sj, '/'.join((video_id[:6], video_id[6:8], video_id[-2], video_id[-1], video_id)))
 
         return {
             '_type': 'url_transparent',
             'ie_key': FC2IE.ie_key(),
-            'url': 'fc2:%s' % video_id,
+            'url': f'fc2:{video_id}',
             'title': title,
             'thumbnail': thumbnail,
         }
@@ -167,10 +165,8 @@ class FC2LiveIE(InfoExtractor):
     }]
 
     def _real_extract(self, url):
-        if not websockets:
-            raise ExtractorError('websockets library is not available. Please install it.', expected=True)
         video_id = self._match_id(url)
-        webpage = self._download_webpage('https://live.fc2.com/%s/' % video_id, video_id)
+        webpage = self._download_webpage(f'https://live.fc2.com/{video_id}/', video_id)
 
         self._set_cookie('live.fc2.com', 'js-player_size', '1')
 
@@ -179,7 +175,7 @@ class FC2LiveIE(InfoExtractor):
                 'channel': '1',
                 'profile': '1',
                 'user': '1',
-                'streamid': video_id
+                'streamid': video_id,
             }), note='Requesting member info')
 
         control_server = self._download_json(
@@ -199,13 +195,9 @@ class FC2LiveIE(InfoExtractor):
         ws_url = update_url_query(control_server['url'], {'control_token': control_server['control_token']})
         playlist_data = None
 
-        self.to_screen('%s: Fetching HLS playlist info via WebSocket' % video_id)
-        ws = WebSocketsWrapper(ws_url, {
-            'Cookie': str(self._get_cookies('https://live.fc2.com/'))[12:],
+        ws = self._request_webpage(Request(ws_url, headers={
             'Origin': 'https://live.fc2.com',
-            'Accept': '*/*',
-            'User-Agent': self.get_param('http_headers')['User-Agent'],
-        })
+        }), video_id, note='Fetching HLS playlist info via WebSocket')
 
         self.write_debug('Sending HLS server request')
 
@@ -232,7 +224,7 @@ class FC2LiveIE(InfoExtractor):
                 self.write_debug('Goodbye')
                 playlist_data = data
                 break
-            self.write_debug('Server said: %s%s' % (recv[:100], '...' if len(recv) > 100 else ''))
+            self.write_debug('Server said: {}{}'.format(recv[:100], '...' if len(recv) > 100 else ''))
 
         if not playlist_data:
             raise ExtractorError('Unable to fetch HLS playlist info via WebSocket')
diff --git a/plugins/youtube_download/yt_dlp/extractor/fczenit.py b/plugins/youtube_download/yt_dlp/extractor/fczenit.py
index 8175b6b..b2dbb92 100644
--- a/plugins/youtube_download/yt_dlp/extractor/fczenit.py
+++ b/plugins/youtube_download/yt_dlp/extractor/fczenit.py
@@ -1,7 +1,7 @@
 from .common import InfoExtractor
 from ..utils import (
-    int_or_none,
     float_or_none,
+    int_or_none,
 )
 
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/fifa.py b/plugins/youtube_download/yt_dlp/extractor/fifa.py
index 8b4db3a..ae837f6 100644
--- a/plugins/youtube_download/yt_dlp/extractor/fifa.py
+++ b/plugins/youtube_download/yt_dlp/extractor/fifa.py
@@ -1,5 +1,4 @@
 from .common import InfoExtractor
-
 from ..utils import (
     int_or_none,
     traverse_obj,
@@ -8,7 +7,7 @@ from ..utils import (
 
 
 class FifaIE(InfoExtractor):
-    _VALID_URL = r'https?://www.fifa.com/fifaplus/(?P<locale>\w{2})/watch/([^#?]+/)?(?P<id>\w+)'
+    _VALID_URL = r'https?://www\.fifa\.com/fifaplus/(?P<locale>\w{2})/watch/([^#?]+/)?(?P<id>\w+)'
     _TESTS = [{
         'url': 'https://www.fifa.com/fifaplus/en/watch/7on10qPcnyLajDDU3ntg6y',
         'info_dict': {
diff --git a/plugins/youtube_download/yt_dlp/extractor/filmmodu.py b/plugins/youtube_download/yt_dlp/extractor/filmmodu.py
deleted file mode 100644
index 9eb550e..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/filmmodu.py
+++ /dev/null
@@ -1,69 +0,0 @@
-from .common import InfoExtractor
-from ..utils import int_or_none
-
-
-class FilmmoduIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www.)?filmmodu.org/(?P<id>[^/]+-(?:turkce-dublaj-izle|altyazili-izle))'
-    _TESTS = [{
-        'url': 'https://www.filmmodu.org/f9-altyazili-izle',
-        'md5': 'aeefd955c2a508a5bdaa3bcec8eeb0d4',
-        'info_dict': {
-            'id': '10804',
-            'ext': 'mp4',
-            'title': 'F9',
-            'description': 'md5:2713f584a4d65afa2611e2948d0b953c',
-            'subtitles': {
-                'tr': [{
-                    'ext': 'vtt',
-                }],
-            },
-            'thumbnail': r're:https://s[0-9]+.filmmodu.org/uploads/movie/cover/10804/xXHZeb1yhJvnSHPzZDqee0zfMb6.jpg',
-        },
-    }, {
-        'url': 'https://www.filmmodu.org/the-godfather-turkce-dublaj-izle',
-        'md5': '109f2fcb9c941330eed133971c035c00',
-        'info_dict': {
-            'id': '3646',
-            'ext': 'mp4',
-            'title': 'Baba',
-            'description': 'md5:d43fd651937cd75cc650883ebd8d8461',
-            'thumbnail': r're:https://s[0-9]+.filmmodu.org/uploads/movie/cover/3646/6xKCYgH16UuwEGAyroLU6p8HLIn.jpg',
-        },
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-        title = self._og_search_title(webpage, fatal=True)
-        description = self._og_search_description(webpage)
-        thumbnail = self._og_search_thumbnail(webpage)
-        real_video_id = self._search_regex(r'var\s*videoId\s*=\s*\'([0-9]+)\'', webpage, 'video_id')
-        video_type = self._search_regex(r'var\s*videoType\s*=\s*\'([a-z]+)\'', webpage, 'video_type')
-        data = self._download_json('https://www.filmmodu.org/get-source', real_video_id, query={
-            'movie_id': real_video_id,
-            'type': video_type,
-        })
-        formats = [{
-            'url': source['src'],
-            'ext': 'mp4',
-            'format_id': source['label'],
-            'height': int_or_none(source.get('res')),
-            'protocol': 'm3u8_native',
-        } for source in data['sources']]
-
-        subtitles = {}
-
-        if data.get('subtitle'):
-            subtitles['tr'] = [{
-                'url': data['subtitle'],
-            }]
-
-        return {
-            'id': real_video_id,
-            'display_id': video_id,
-            'title': title,
-            'description': description,
-            'formats': formats,
-            'subtitles': subtitles,
-            'thumbnail': thumbnail,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/filmon.py b/plugins/youtube_download/yt_dlp/extractor/filmon.py
index 0cd18f4..af1de7a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/filmon.py
+++ b/plugins/youtube_download/yt_dlp/extractor/filmon.py
@@ -1,11 +1,10 @@
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..networking.exceptions import HTTPError
 from ..utils import (
+    ExtractorError,
+    int_or_none,
     qualities,
     strip_or_none,
-    int_or_none,
-    ExtractorError,
 )
 
 
@@ -35,12 +34,12 @@ class FilmOnIE(InfoExtractor):
 
         try:
             response = self._download_json(
-                'https://www.filmon.com/api/vod/movie?id=%s' % video_id,
+                f'https://www.filmon.com/api/vod/movie?id={video_id}',
                 video_id)['response']
         except ExtractorError as e:
             if isinstance(e.cause, HTTPError):
                 errmsg = self._parse_json(e.cause.response.read().decode(), video_id)['reason']
-                raise ExtractorError('%s said: %s' % (self.IE_NAME, errmsg), expected=True)
+                raise ExtractorError(f'{self.IE_NAME} said: {errmsg}', expected=True)
             raise
 
         title = response['title']
@@ -124,10 +123,10 @@ class FilmOnChannelIE(InfoExtractor):
         except ExtractorError as e:
             if isinstance(e.cause, HTTPError):
                 errmsg = self._parse_json(e.cause.response.read().decode(), channel_id)['message']
-                raise ExtractorError('%s said: %s' % (self.IE_NAME, errmsg), expected=True)
+                raise ExtractorError(f'{self.IE_NAME} said: {errmsg}', expected=True)
             raise
 
-        channel_id = compat_str(channel_data['id'])
+        channel_id = str(channel_data['id'])
         is_live = not channel_data.get('is_vod') and not channel_data.get('is_vox')
         title = channel_data['title']
 
@@ -155,7 +154,7 @@ class FilmOnChannelIE(InfoExtractor):
         for name, width, height in self._THUMBNAIL_RES:
             thumbnails.append({
                 'id': name,
-                'url': 'http://static.filmon.com/assets/channels/%s/%s.png' % (channel_id, name),
+                'url': f'http://static.filmon.com/assets/channels/{channel_id}/{name}.png',
                 'width': width,
                 'height': height,
             })
diff --git a/plugins/youtube_download/yt_dlp/extractor/filmweb.py b/plugins/youtube_download/yt_dlp/extractor/filmweb.py
index cfea1f2..6dde6c3 100644
--- a/plugins/youtube_download/yt_dlp/extractor/filmweb.py
+++ b/plugins/youtube_download/yt_dlp/extractor/filmweb.py
@@ -14,7 +14,7 @@ class FilmwebIE(InfoExtractor):
             'timestamp': 1458140101,
             'uploader_id': '12639966',
             'uploader': 'Live Roaldset',
-        }
+        },
     }
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/firsttv.py b/plugins/youtube_download/yt_dlp/extractor/firsttv.py
index f74bd13..ac7697b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/firsttv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/firsttv.py
@@ -1,8 +1,6 @@
+import urllib.parse
+
 from .common import InfoExtractor
-from ..compat import (
-    compat_str,
-    compat_urlparse,
-)
 from ..utils import (
     int_or_none,
     qualities,
@@ -14,7 +12,7 @@ from ..utils import (
 class FirstTVIE(InfoExtractor):
     IE_NAME = '1tv'
     IE_DESC = 'Первый канал'
-    _VALID_URL = r'https?://(?:www\.)?1tv\.ru/(?:[^/]+/)+(?P<id>[^/?#]+)'
+    _VALID_URL = r'https?://(?:www\.)?(?:sport)?1tv\.ru/(?:[^/?#]+/)+(?P<id>[^/?#]+)'
 
     _TESTS = [{
         # single format
@@ -54,18 +52,21 @@ class FirstTVIE(InfoExtractor):
     }, {
         'url': 'http://www.1tv.ru/shows/tochvtoch-supersezon/vystupleniya/evgeniy-dyatlov-vladimir-vysockiy-koni-priveredlivye-toch-v-toch-supersezon-fragment-vypuska-ot-06-11-2016',
         'only_matching': True,
+    }, {
+        'url': 'https://www.sport1tv.ru/sport/chempionat-rossii-po-figurnomu-kataniyu-2025',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
         display_id = self._match_id(url)
 
         webpage = self._download_webpage(url, display_id)
-        playlist_url = compat_urlparse.urljoin(url, self._search_regex(
+        playlist_url = urllib.parse.urljoin(url, self._search_regex(
             r'data-playlist-url=(["\'])(?P<url>(?:(?!\1).)+)\1',
             webpage, 'playlist url', group='url'))
 
-        parsed_url = compat_urlparse.urlparse(playlist_url)
-        qs = compat_urlparse.parse_qs(parsed_url.query)
+        parsed_url = urllib.parse.urlparse(playlist_url)
+        qs = urllib.parse.parse_qs(parsed_url.query)
         item_ids = qs.get('videos_ids[]') or qs.get('news_ids[]')
 
         items = self._download_json(playlist_url, display_id)
@@ -73,12 +74,12 @@ class FirstTVIE(InfoExtractor):
         if item_ids:
             items = [
                 item for item in items
-                if item.get('uid') and compat_str(item['uid']) in item_ids]
+                if item.get('uid') and str(item['uid']) in item_ids]
         else:
             items = [items[0]]
 
         entries = []
-        QUALITIES = ('ld', 'sd', 'hd', )
+        QUALITIES = ('ld', 'sd', 'hd')
 
         for item in items:
             title = item['title']
@@ -116,11 +117,10 @@ class FirstTVIE(InfoExtractor):
                 if len(formats) == 1:
                     m3u8_path = ','
                 else:
-                    tbrs = [compat_str(t) for t in sorted(f['tbr'] for f in formats)]
-                    m3u8_path = '_,%s,%s' % (','.join(tbrs), '.mp4')
+                    tbrs = [str(t) for t in sorted(f['tbr'] for f in formats)]
+                    m3u8_path = '_,{},{}'.format(','.join(tbrs), '.mp4')
                 formats.extend(self._extract_m3u8_formats(
-                    'http://balancer-vod.1tv.ru/%s%s.urlset/master.m3u8'
-                    % (path, m3u8_path),
+                    f'http://balancer-vod.1tv.ru/{path}{m3u8_path}.urlset/master.m3u8',
                     display_id, 'mp4',
                     entry_protocol='m3u8_native', m3u8_id='hls', fatal=False))
 
@@ -131,12 +131,12 @@ class FirstTVIE(InfoExtractor):
                 'ya:ovs:upload_date', webpage, 'upload date', default=None))
 
             entries.append({
-                'id': compat_str(item.get('id') or item['uid']),
+                'id': str(item.get('id') or item['uid']),
                 'thumbnail': thumbnail,
                 'title': title,
                 'upload_date': upload_date,
                 'duration': int_or_none(duration),
-                'formats': formats
+                'formats': formats,
             })
 
         title = self._html_search_regex(
diff --git a/plugins/youtube_download/yt_dlp/extractor/flextv.py b/plugins/youtube_download/yt_dlp/extractor/flextv.py
new file mode 100644
index 0000000..f3d3eff
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/flextv.py
@@ -0,0 +1,62 @@
+from .common import InfoExtractor
+from ..networking.exceptions import HTTPError
+from ..utils import (
+    ExtractorError,
+    UserNotLive,
+    parse_iso8601,
+    str_or_none,
+    traverse_obj,
+    url_or_none,
+)
+
+
+class FlexTVIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?flextv\.co\.kr/channels/(?P<id>\d+)/live'
+    _TESTS = [{
+        'url': 'https://www.flextv.co.kr/channels/231638/live',
+        'info_dict': {
+            'id': '231638',
+            'ext': 'mp4',
+            'title': r're:^214하나만\.\.\. ',
+            'thumbnail': r're:^https?://.+\.jpg',
+            'upload_date': r're:\d{8}',
+            'timestamp': int,
+            'live_status': 'is_live',
+            'channel': 'Hi별',
+            'channel_id': '244396',
+        },
+        'skip': 'The channel is offline',
+    }, {
+        'url': 'https://www.flextv.co.kr/channels/746/live',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        channel_id = self._match_id(url)
+
+        try:
+            stream_data = self._download_json(
+                f'https://api.flextv.co.kr/api/channels/{channel_id}/stream',
+                channel_id, query={'option': 'all'})
+        except ExtractorError as e:
+            if isinstance(e.cause, HTTPError) and e.cause.status == 400:
+                raise UserNotLive(video_id=channel_id)
+            raise
+
+        playlist_url = stream_data['sources'][0]['url']
+        formats, subtitles = self._extract_m3u8_formats_and_subtitles(
+            playlist_url, channel_id, 'mp4')
+
+        return {
+            'id': channel_id,
+            'formats': formats,
+            'subtitles': subtitles,
+            'is_live': True,
+            **traverse_obj(stream_data, {
+                'title': ('stream', 'title', {str}),
+                'timestamp': ('stream', 'createdAt', {parse_iso8601}),
+                'thumbnail': ('thumbUrl', {url_or_none}),
+                'channel': ('owner', 'name', {str}),
+                'channel_id': ('owner', 'id', {str_or_none}),
+            }),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/flickr.py b/plugins/youtube_download/yt_dlp/extractor/flickr.py
index 89a40d7..507bfe9 100644
--- a/plugins/youtube_download/yt_dlp/extractor/flickr.py
+++ b/plugins/youtube_download/yt_dlp/extractor/flickr.py
@@ -1,8 +1,6 @@
+import urllib.parse
+
 from .common import InfoExtractor
-from ..compat import (
-    compat_str,
-    compat_urllib_parse_urlencode,
-)
 from ..utils import (
     ExtractorError,
     format_field,
@@ -31,7 +29,7 @@ class FlickrIE(InfoExtractor):
             'view_count': int,
             'tags': list,
             'license': 'Attribution-ShareAlike',
-        }
+        },
     }
     _API_BASE_URL = 'https://api.flickr.com/services/rest?'
     # https://help.yahoo.com/kb/flickr/SLN25525.html
@@ -52,14 +50,14 @@ class FlickrIE(InfoExtractor):
     def _call_api(self, method, video_id, api_key, note, secret=None):
         query = {
             'photo_id': video_id,
-            'method': 'flickr.%s' % method,
+            'method': f'flickr.{method}',
             'api_key': api_key,
             'format': 'json',
             'nojsoncallback': 1,
         }
         if secret:
             query['secret'] = secret
-        data = self._download_json(self._API_BASE_URL + compat_urllib_parse_urlencode(query), video_id, note)
+        data = self._download_json(self._API_BASE_URL + urllib.parse.urlencode(query), video_id, note)
         if data['stat'] != 'ok':
             raise ExtractorError(data['message'])
         return data
@@ -83,7 +81,7 @@ class FlickrIE(InfoExtractor):
 
             formats = []
             for stream in streams['stream']:
-                stream_type = compat_str(stream.get('type'))
+                stream_type = str(stream.get('type'))
                 formats.append({
                     'format_id': stream_type,
                     'url': stream['_content'],
diff --git a/plugins/youtube_download/yt_dlp/extractor/floatplane.py b/plugins/youtube_download/yt_dlp/extractor/floatplane.py
new file mode 100644
index 0000000..b7ee160
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/floatplane.py
@@ -0,0 +1,333 @@
+import functools
+
+from .common import InfoExtractor
+from ..utils import (
+    ExtractorError,
+    OnDemandPagedList,
+    clean_html,
+    determine_ext,
+    format_field,
+    int_or_none,
+    join_nonempty,
+    parse_codecs,
+    parse_iso8601,
+    url_or_none,
+    urljoin,
+)
+from ..utils.traversal import traverse_obj
+
+
+class FloatplaneIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:(?:www|beta)\.)?floatplane\.com/post/(?P<id>\w+)'
+    _TESTS = [{
+        'url': 'https://www.floatplane.com/post/2Yf3UedF7C',
+        'info_dict': {
+            'id': 'yuleLogLTT',
+            'ext': 'mp4',
+            'display_id': '2Yf3UedF7C',
+            'title': '8K Yule Log Fireplace with Crackling Fire Sounds - 10 Hours',
+            'description': 'md5:adf2970e0de1c5e3df447818bb0309f6',
+            'thumbnail': r're:^https?://.*\.jpe?g$',
+            'duration': 36035,
+            'comment_count': int,
+            'like_count': int,
+            'dislike_count': int,
+            'release_date': '20191206',
+            'release_timestamp': 1575657000,
+            'uploader': 'LinusTechTips',
+            'uploader_id': '59f94c0bdd241b70349eb72b',
+            'uploader_url': 'https://www.floatplane.com/channel/linustechtips/home',
+            'channel': 'Linus Tech Tips',
+            'channel_id': '63fe42c309e691e4e36de93d',
+            'channel_url': 'https://www.floatplane.com/channel/linustechtips/home/main',
+            'availability': 'subscriber_only',
+        },
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        'url': 'https://www.floatplane.com/post/j2jqG3JmgJ',
+        'info_dict': {
+            'id': 'j2jqG3JmgJ',
+            'title': 'TJM: Does Anyone Care About Avatar: The Way of Water?',
+            'description': 'md5:00bf17dc5733e4031e99b7fd6489f274',
+            'thumbnail': r're:^https?://.*\.jpe?g$',
+            'comment_count': int,
+            'like_count': int,
+            'dislike_count': int,
+            'release_timestamp': 1671915900,
+            'release_date': '20221224',
+            'uploader': 'LinusTechTips',
+            'uploader_id': '59f94c0bdd241b70349eb72b',
+            'uploader_url': 'https://www.floatplane.com/channel/linustechtips/home',
+            'channel': "They're Just Movies",
+            'channel_id': '64135f82fc76ab7f9fbdc876',
+            'channel_url': 'https://www.floatplane.com/channel/linustechtips/home/tajm',
+            'availability': 'subscriber_only',
+        },
+        'playlist_count': 2,
+    }, {
+        'url': 'https://www.floatplane.com/post/3tK2tInhoN',
+        'info_dict': {
+            'id': '3tK2tInhoN',
+            'title': 'Extras - How Linus Communicates with Editors (Compensator 4)',
+            'description': 'md5:83cd40aae1ce124df33769600c80ca5b',
+            'thumbnail': r're:^https?://.*\.jpe?g$',
+            'comment_count': int,
+            'like_count': int,
+            'dislike_count': int,
+            'release_timestamp': 1700529120,
+            'release_date': '20231121',
+            'uploader': 'LinusTechTips',
+            'uploader_id': '59f94c0bdd241b70349eb72b',
+            'uploader_url': 'https://www.floatplane.com/channel/linustechtips/home',
+            'channel': 'FP Exclusives',
+            'channel_id': '6413623f5b12cca228a28e78',
+            'channel_url': 'https://www.floatplane.com/channel/linustechtips/home/fpexclusive',
+            'availability': 'subscriber_only',
+        },
+        'playlist_count': 2,
+    }, {
+        'url': 'https://beta.floatplane.com/post/d870PEFXS1',
+        'info_dict': {
+            'id': 'bg9SuYKEww',
+            'ext': 'mp4',
+            'display_id': 'd870PEFXS1',
+            'title': 'LCS Drama, TLOU 2 Remaster, Destiny 2 Player Count Drops, + More!',
+            'description': 'md5:80d612dcabf41b17487afcbe303ec57d',
+            'thumbnail': r're:^https?://.*\.jpe?g$',
+            'release_timestamp': 1700622000,
+            'release_date': '20231122',
+            'duration': 513,
+            'like_count': int,
+            'dislike_count': int,
+            'comment_count': int,
+            'uploader': 'LinusTechTips',
+            'uploader_id': '59f94c0bdd241b70349eb72b',
+            'uploader_url': 'https://www.floatplane.com/channel/linustechtips/home',
+            'channel': 'GameLinked',
+            'channel_id': '649dbade3540dbc3945eeda7',
+            'channel_url': 'https://www.floatplane.com/channel/linustechtips/home/gamelinked',
+            'availability': 'subscriber_only',
+        },
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        'url': 'https://www.floatplane.com/post/65B5PNoBtf',
+        'info_dict': {
+            'id': '65B5PNoBtf',
+            'description': 'I recorded the inbuilt demo mode for your 90\'s enjoyment, thanks for being Floaties!',
+            'display_id': '65B5PNoBtf',
+            'like_count': int,
+            'release_timestamp': 1701249480,
+            'uploader': 'The Trash Network',
+            'availability': 'subscriber_only',
+            'uploader_id': '61bc20c9a131fb692bf2a513',
+            'uploader_url': 'https://www.floatplane.com/channel/TheTrashNetwork/home',
+            'channel_url': 'https://www.floatplane.com/channel/TheTrashNetwork/home/thedrumthing',
+            'comment_count': int,
+            'title': 'The $50 electronic drum kit.',
+            'channel_id': '64424fe73cd58cbcf8d8e131',
+            'thumbnail': 'https://pbs.floatplane.com/blogPost_thumbnails/65B5PNoBtf/725555379422705_1701247052743.jpeg',
+            'dislike_count': int,
+            'channel': 'The Drum Thing',
+            'release_date': '20231129',
+        },
+        'playlist_count': 2,
+        'playlist': [{
+            'info_dict': {
+                'id': 'ISPJjexylS',
+                'ext': 'mp4',
+                'release_date': '20231129',
+                'release_timestamp': 1701249480,
+                'title': 'The $50 electronic drum kit. .mov',
+                'channel_id': '64424fe73cd58cbcf8d8e131',
+                'thumbnail': 'https://pbs.floatplane.com/video_thumbnails/ISPJjexylS/335202812134041_1701249383392.jpeg',
+                'availability': 'subscriber_only',
+                'uploader': 'The Trash Network',
+                'duration': 622,
+                'channel': 'The Drum Thing',
+                'uploader_id': '61bc20c9a131fb692bf2a513',
+                'channel_url': 'https://www.floatplane.com/channel/TheTrashNetwork/home/thedrumthing',
+                'uploader_url': 'https://www.floatplane.com/channel/TheTrashNetwork/home',
+            },
+        }, {
+            'info_dict': {
+                'id': 'qKfxu6fEpu',
+                'ext': 'aac',
+                'release_date': '20231129',
+                'release_timestamp': 1701249480,
+                'title': 'Roland TD-7 Demo.m4a',
+                'channel_id': '64424fe73cd58cbcf8d8e131',
+                'availability': 'subscriber_only',
+                'uploader': 'The Trash Network',
+                'duration': 114,
+                'channel': 'The Drum Thing',
+                'uploader_id': '61bc20c9a131fb692bf2a513',
+                'channel_url': 'https://www.floatplane.com/channel/TheTrashNetwork/home/thedrumthing',
+                'uploader_url': 'https://www.floatplane.com/channel/TheTrashNetwork/home',
+            },
+        }],
+        'skip': 'requires subscription: "The Trash Network"',
+        'params': {'skip_download': 'm3u8'},
+    }]
+
+    def _real_initialize(self):
+        if not self._get_cookies('https://www.floatplane.com').get('sails.sid'):
+            self.raise_login_required()
+
+    def _real_extract(self, url):
+        post_id = self._match_id(url)
+
+        post_data = self._download_json(
+            'https://www.floatplane.com/api/v3/content/post', post_id, query={'id': post_id},
+            note='Downloading post data', errnote='Unable to download post data')
+
+        if not any(traverse_obj(post_data, ('metadata', ('hasVideo', 'hasAudio')))):
+            raise ExtractorError('Post does not contain a video or audio track', expected=True)
+
+        uploader_url = format_field(
+            post_data, [('creator', 'urlname')], 'https://www.floatplane.com/channel/%s/home') or None
+
+        common_info = {
+            'uploader_url': uploader_url,
+            'channel_url': urljoin(f'{uploader_url}/', traverse_obj(post_data, ('channel', 'urlname'))),
+            'availability': self._availability(needs_subscription=True),
+            **traverse_obj(post_data, {
+                'uploader': ('creator', 'title', {str}),
+                'uploader_id': ('creator', 'id', {str}),
+                'channel': ('channel', 'title', {str}),
+                'channel_id': ('channel', 'id', {str}),
+                'release_timestamp': ('releaseDate', {parse_iso8601}),
+            }),
+        }
+
+        items = []
+        for media in traverse_obj(post_data, (('videoAttachments', 'audioAttachments'), ...)):
+            media_id = media['id']
+            media_typ = media.get('type') or 'video'
+
+            metadata = self._download_json(
+                f'https://www.floatplane.com/api/v3/content/{media_typ}', media_id, query={'id': media_id},
+                note=f'Downloading {media_typ} metadata')
+
+            stream = self._download_json(
+                'https://www.floatplane.com/api/v2/cdn/delivery', media_id, query={
+                    'type': 'vod' if media_typ == 'video' else 'aod',
+                    'guid': metadata['guid'],
+                }, note=f'Downloading {media_typ} stream data')
+
+            path_template = traverse_obj(stream, ('resource', 'uri', {str}))
+
+            def format_path(params):
+                path = path_template
+                for i, val in (params or {}).items():
+                    path = path.replace(f'{{qualityLevelParams.{i}}}', val)
+                return path
+
+            formats = []
+            for quality in traverse_obj(stream, ('resource', 'data', 'qualityLevels', ...)):
+                url = urljoin(stream['cdn'], format_path(traverse_obj(
+                    stream, ('resource', 'data', 'qualityLevelParams', quality['name'], {dict}))))
+                formats.append({
+                    **traverse_obj(quality, {
+                        'format_id': ('name', {str}),
+                        'format_note': ('label', {str}),
+                        'width': ('width', {int}),
+                        'height': ('height', {int}),
+                    }),
+                    **parse_codecs(quality.get('codecs')),
+                    'url': url,
+                    'ext': determine_ext(url.partition('/chunk.m3u8')[0], 'mp4'),
+                })
+
+            items.append({
+                **common_info,
+                'id': media_id,
+                **traverse_obj(metadata, {
+                    'title': ('title', {str}),
+                    'duration': ('duration', {int_or_none}),
+                    'thumbnail': ('thumbnail', 'path', {url_or_none}),
+                }),
+                'formats': formats,
+            })
+
+        post_info = {
+            **common_info,
+            'id': post_id,
+            'display_id': post_id,
+            **traverse_obj(post_data, {
+                'title': ('title', {str}),
+                'description': ('text', {clean_html}),
+                'like_count': ('likes', {int_or_none}),
+                'dislike_count': ('dislikes', {int_or_none}),
+                'comment_count': ('comments', {int_or_none}),
+                'thumbnail': ('thumbnail', 'path', {url_or_none}),
+            }),
+        }
+
+        if len(items) > 1:
+            return self.playlist_result(items, **post_info)
+
+        post_info.update(items[0])
+        return post_info
+
+
+class FloatplaneChannelIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:(?:www|beta)\.)?floatplane\.com/channel/(?P<id>[\w-]+)/home(?:/(?P<channel>[\w-]+))?'
+    _PAGE_SIZE = 20
+    _TESTS = [{
+        'url': 'https://www.floatplane.com/channel/linustechtips/home/ltxexpo',
+        'info_dict': {
+            'id': 'linustechtips/ltxexpo',
+            'title': 'LTX Expo',
+            'description': 'md5:9819002f9ebe7fd7c75a3a1d38a59149',
+        },
+        'playlist_mincount': 51,
+    }, {
+        'url': 'https://www.floatplane.com/channel/ShankMods/home',
+        'info_dict': {
+            'id': 'ShankMods',
+            'title': 'Shank Mods',
+            'description': 'md5:6dff1bb07cad8e5448e04daad9be1b30',
+        },
+        'playlist_mincount': 14,
+    }, {
+        'url': 'https://beta.floatplane.com/channel/bitwit_ultra/home',
+        'info_dict': {
+            'id': 'bitwit_ultra',
+            'title': 'Bitwit Ultra',
+            'description': 'md5:1452f280bb45962976d4789200f676dd',
+        },
+        'playlist_mincount': 200,
+    }]
+
+    def _fetch_page(self, display_id, creator_id, channel_id, page):
+        query = {
+            'id': creator_id,
+            'limit': self._PAGE_SIZE,
+            'fetchAfter': page * self._PAGE_SIZE,
+        }
+        if channel_id:
+            query['channel'] = channel_id
+        page_data = self._download_json(
+            'https://www.floatplane.com/api/v3/content/creator', display_id,
+            query=query, note=f'Downloading page {page + 1}')
+        for post in page_data or []:
+            yield self.url_result(
+                f'https://www.floatplane.com/post/{post["id"]}',
+                FloatplaneIE, id=post['id'], title=post.get('title'),
+                release_timestamp=parse_iso8601(post.get('releaseDate')))
+
+    def _real_extract(self, url):
+        creator, channel = self._match_valid_url(url).group('id', 'channel')
+        display_id = join_nonempty(creator, channel, delim='/')
+
+        creator_data = self._download_json(
+            'https://www.floatplane.com/api/v3/creator/named',
+            display_id, query={'creatorURL[0]': creator})[0]
+
+        channel_data = traverse_obj(
+            creator_data, ('channels', lambda _, v: v['urlname'] == channel), get_all=False) or {}
+
+        return self.playlist_result(OnDemandPagedList(functools.partial(
+            self._fetch_page, display_id, creator_data['id'], channel_data.get('id')), self._PAGE_SIZE),
+            display_id, title=channel_data.get('title') or creator_data.get('title'),
+            description=channel_data.get('about') or creator_data.get('about'))
diff --git a/plugins/youtube_download/yt_dlp/extractor/folketinget.py b/plugins/youtube_download/yt_dlp/extractor/folketinget.py
index 55a11e5..9509570 100644
--- a/plugins/youtube_download/yt_dlp/extractor/folketinget.py
+++ b/plugins/youtube_download/yt_dlp/extractor/folketinget.py
@@ -1,5 +1,6 @@
+import urllib.parse
+
 from .common import InfoExtractor
-from ..compat import compat_parse_qs
 from ..utils import (
     int_or_none,
     parse_duration,
@@ -42,7 +43,7 @@ class FolketingetIE(InfoExtractor):
             r'(?s)<div class="video-item-agenda"[^>]*>(.*?)<',
             webpage, 'description', fatal=False)
 
-        player_params = compat_parse_qs(self._search_regex(
+        player_params = urllib.parse.parse_qs(self._search_regex(
             r'<embed src="http://ft\.arkena\.tv/flash/ftplayer\.swf\?([^"]+)"',
             webpage, 'player params'))
         xml_url = player_params['xml'][0]
diff --git a/plugins/youtube_download/yt_dlp/extractor/footyroom.py b/plugins/youtube_download/yt_dlp/extractor/footyroom.py
index 4a1316b..797e894 100644
--- a/plugins/youtube_download/yt_dlp/extractor/footyroom.py
+++ b/plugins/youtube_download/yt_dlp/extractor/footyroom.py
@@ -19,7 +19,7 @@ class FootyRoomIE(InfoExtractor):
             'title': 'VIDEO Georgia 0 - 2 Germany',
         },
         'playlist_count': 1,
-        'add_ie': ['Playwire']
+        'add_ie': ['Playwire'],
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/fourtube.py b/plugins/youtube_download/yt_dlp/extractor/fourtube.py
index b6368b8..ba94b5b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/fourtube.py
+++ b/plugins/youtube_download/yt_dlp/extractor/fourtube.py
@@ -1,12 +1,8 @@
+import base64
 import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_b64decode,
-    compat_str,
-    compat_urllib_parse_unquote,
-    compat_urlparse,
-)
 from ..utils import (
     int_or_none,
     parse_duration,
@@ -21,21 +17,20 @@ from ..utils import (
 
 class FourTubeBaseIE(InfoExtractor):
     def _extract_formats(self, url, video_id, media_id, sources):
-        token_url = 'https://%s/%s/desktop/%s' % (
+        token_url = 'https://{}/{}/desktop/{}'.format(
             self._TKN_HOST, media_id, '+'.join(sources))
 
-        parsed_url = compat_urlparse.urlparse(url)
+        parsed_url = urllib.parse.urlparse(url)
         tokens = self._download_json(token_url, video_id, data=b'', headers={
-            'Origin': '%s://%s' % (parsed_url.scheme, parsed_url.hostname),
+            'Origin': f'{parsed_url.scheme}://{parsed_url.hostname}',
             'Referer': url,
         })
-        formats = [{
-            'url': tokens[format]['token'],
-            'format_id': format + 'p',
-            'resolution': format + 'p',
-            'quality': int(format),
-        } for format in sources]
-        return formats
+        return [{
+            'url': tokens[res]['token'],
+            'format_id': res + 'p',
+            'resolution': res + 'p',
+            'quality': int(res),
+        } for res in sources]
 
     def _real_extract(self, url):
         mobj = self._match_valid_url(url)
@@ -89,9 +84,9 @@ class FourTubeBaseIE(InfoExtractor):
             params_js = self._search_regex(
                 r'\$\.ajax\(url,\ opts\);\s*\}\s*\}\)\(([0-9,\[\] ]+)\)',
                 player_js, 'initialization parameters')
-            params = self._parse_json('[%s]' % params_js, video_id)
+            params = self._parse_json(f'[{params_js}]', video_id)
             media_id = params[0]
-            sources = ['%s' % p for p in params[2]]
+            sources = [f'{p}' for p in params[2]]
 
         formats = self._extract_formats(url, video_id, media_id, sources)
 
@@ -234,20 +229,20 @@ class PornTubeIE(FourTubeBaseIE):
             self._search_regex(
                 r'INITIALSTATE\s*=\s*(["\'])(?P<value>(?:(?!\1).)+)\1',
                 webpage, 'data', group='value'), video_id,
-            transform_source=lambda x: compat_urllib_parse_unquote(
-                compat_b64decode(x).decode('utf-8')))['page']['video']
+            transform_source=lambda x: urllib.parse.unquote(
+                base64.b64decode(x).decode('utf-8')))['page']['video']
 
         title = video['title']
         media_id = video['mediaId']
-        sources = [compat_str(e['height'])
+        sources = [str(e['height'])
                    for e in video['encodings'] if e.get('height')]
         formats = self._extract_formats(url, video_id, media_id, sources)
 
         thumbnail = url_or_none(video.get('masterThumb'))
-        uploader = try_get(video, lambda x: x['user']['username'], compat_str)
+        uploader = try_get(video, lambda x: x['user']['username'], str)
         uploader_id = str_or_none(try_get(
             video, lambda x: x['user']['id'], int))
-        channel = try_get(video, lambda x: x['channel']['name'], compat_str)
+        channel = try_get(video, lambda x: x['channel']['name'], str)
         channel_id = str_or_none(try_get(
             video, lambda x: x['channel']['id'], int))
         like_count = int_or_none(video.get('likes'))
diff --git a/plugins/youtube_download/yt_dlp/extractor/fourzerostudio.py b/plugins/youtube_download/yt_dlp/extractor/fourzerostudio.py
deleted file mode 100644
index c388a3a..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/fourzerostudio.py
+++ /dev/null
@@ -1,106 +0,0 @@
-from .common import InfoExtractor
-from ..utils import traverse_obj, unified_timestamp
-
-
-class FourZeroStudioArchiveIE(InfoExtractor):
-    _VALID_URL = r'https?://0000\.studio/(?P<uploader_id>[^/]+)/broadcasts/(?P<id>[^/]+)/archive'
-    IE_NAME = '0000studio:archive'
-    _TESTS = [{
-        'url': 'https://0000.studio/mumeijiten/broadcasts/1290f433-fce0-4909-a24a-5f7df09665dc/archive',
-        'info_dict': {
-            'id': '1290f433-fce0-4909-a24a-5f7df09665dc',
-            'title': 'noteで『canape』様へのファンレターを執筆します。（数秘術その2）',
-            'timestamp': 1653802534,
-            'release_timestamp': 1653796604,
-            'thumbnails': 'count:1',
-            'comments': 'count:7',
-            'uploader': '『中崎雄心』の執務室。',
-            'uploader_id': 'mumeijiten',
-        }
-    }]
-
-    def _real_extract(self, url):
-        video_id, uploader_id = self._match_valid_url(url).group('id', 'uploader_id')
-        webpage = self._download_webpage(url, video_id)
-        nuxt_data = self._search_nuxt_data(webpage, video_id, traverse=None)
-
-        pcb = traverse_obj(nuxt_data, ('ssrRefs', lambda _, v: v['__typename'] == 'PublicCreatorBroadcast'), get_all=False)
-        uploader_internal_id = traverse_obj(nuxt_data, (
-            'ssrRefs', lambda _, v: v['__typename'] == 'PublicUser', 'id'), get_all=False)
-
-        formats, subs = self._extract_m3u8_formats_and_subtitles(pcb['archiveUrl'], video_id, ext='mp4')
-
-        return {
-            'id': video_id,
-            'title': pcb.get('title'),
-            'age_limit': 18 if pcb.get('isAdult') else None,
-            'timestamp': unified_timestamp(pcb.get('finishTime')),
-            'release_timestamp': unified_timestamp(pcb.get('createdAt')),
-            'thumbnails': [{
-                'url': pcb['thumbnailUrl'],
-                'ext': 'png',
-            }] if pcb.get('thumbnailUrl') else None,
-            'formats': formats,
-            'subtitles': subs,
-            'comments': [{
-                'author': c.get('username'),
-                'author_id': c.get('postedUserId'),
-                'author_thumbnail': c.get('userThumbnailUrl'),
-                'id': c.get('id'),
-                'text': c.get('body'),
-                'timestamp': unified_timestamp(c.get('createdAt')),
-                'like_count': c.get('likeCount'),
-                'is_favorited': c.get('isLikedByOwner'),
-                'author_is_uploader': c.get('postedUserId') == uploader_internal_id,
-            } for c in traverse_obj(nuxt_data, (
-                'ssrRefs', ..., lambda _, v: v['__typename'] == 'PublicCreatorBroadcastComment')) or []],
-            'uploader_id': uploader_id,
-            'uploader': traverse_obj(nuxt_data, (
-                'ssrRefs', lambda _, v: v['__typename'] == 'PublicUser', 'username'), get_all=False),
-        }
-
-
-class FourZeroStudioClipIE(InfoExtractor):
-    _VALID_URL = r'https?://0000\.studio/(?P<uploader_id>[^/]+)/archive-clip/(?P<id>[^/]+)'
-    IE_NAME = '0000studio:clip'
-    _TESTS = [{
-        'url': 'https://0000.studio/soeji/archive-clip/e46b0278-24cd-40a8-92e1-b8fc2b21f34f',
-        'info_dict': {
-            'id': 'e46b0278-24cd-40a8-92e1-b8fc2b21f34f',
-            'title': 'わたベーさんからイラスト差し入れいただきました。ありがとうございました！',
-            'timestamp': 1652109105,
-            'like_count': 1,
-            'uploader': 'ソエジマケイタ',
-            'uploader_id': 'soeji',
-        }
-    }]
-
-    def _real_extract(self, url):
-        video_id, uploader_id = self._match_valid_url(url).group('id', 'uploader_id')
-        webpage = self._download_webpage(url, video_id)
-        nuxt_data = self._search_nuxt_data(webpage, video_id, traverse=None)
-
-        clip_info = traverse_obj(nuxt_data, ('ssrRefs', lambda _, v: v['__typename'] == 'PublicCreatorArchivedClip'), get_all=False)
-
-        info = next((
-            m for m in self._parse_html5_media_entries(url, webpage, video_id)
-            if 'mp4' in traverse_obj(m, ('formats', ..., 'ext'))
-        ), None)
-        if not info:
-            self.report_warning('Failed to find a desired media element. Falling back to using NUXT data.')
-            info = {
-                'formats': [{
-                    'ext': 'mp4',
-                    'url': url,
-                } for url in clip_info.get('mediaFiles') or [] if url],
-            }
-        return {
-            **info,
-            'id': video_id,
-            'title': clip_info.get('clipComment'),
-            'timestamp': unified_timestamp(clip_info.get('createdAt')),
-            'like_count': clip_info.get('likeCount'),
-            'uploader_id': uploader_id,
-            'uploader': traverse_obj(nuxt_data, (
-                'ssrRefs', lambda _, v: v['__typename'] == 'PublicUser', 'username'), get_all=False),
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/fox.py b/plugins/youtube_download/yt_dlp/extractor/fox.py
index e00e977..e3cf22d 100644
--- a/plugins/youtube_download/yt_dlp/extractor/fox.py
+++ b/plugins/youtube_download/yt_dlp/extractor/fox.py
@@ -1,11 +1,8 @@
 import json
+import urllib.parse
 import uuid
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_str,
-    compat_urllib_parse_unquote,
-)
 from ..networking.exceptions import HTTPError
 from ..utils import (
     ExtractorError,
@@ -59,7 +56,7 @@ class FOXIE(InfoExtractor):
     _HOME_PAGE_URL = 'https://www.fox.com/'
     _API_KEY = '6E9S4bmcoNnZwVLOHywOv8PJEdu76cM9'
     _access_token = None
-    _device_id = compat_str(uuid.uuid4())
+    _device_id = str(uuid.uuid4())
 
     def _call_api(self, path, video_id, data=None):
         headers = {
@@ -88,7 +85,7 @@ class FOXIE(InfoExtractor):
         if not self._access_token:
             mvpd_auth = self._get_cookies(self._HOME_PAGE_URL).get('mvpd-auth')
             if mvpd_auth:
-                self._access_token = (self._parse_json(compat_urllib_parse_unquote(
+                self._access_token = (self._parse_json(urllib.parse.unquote(
                     mvpd_auth.value), None, fatal=False) or {}).get('accessToken')
             if not self._access_token:
                 self._access_token = self._call_api(
@@ -100,7 +97,7 @@ class FOXIE(InfoExtractor):
         video_id = self._match_id(url)
 
         self._access_token = self._call_api(
-            'previewpassmvpd?device_id=%s&mvpd_id=TempPass_fbcfox_60min' % self._device_id,
+            f'previewpassmvpd?device_id={self._device_id}&mvpd_id=TempPass_fbcfox_60min',
             video_id)['accessToken']
 
         video = self._call_api('watch', video_id, data=json.dumps({
@@ -113,13 +110,13 @@ class FOXIE(InfoExtractor):
             'provider': {
                 'freewheel': {'did': self._device_id},
                 'vdms': {'rays': ''},
-                'dmp': {'kuid': '', 'seg': ''}
+                'dmp': {'kuid': '', 'seg': ''},
             },
             'playlist': '',
             'privacy': {'us': '1---'},
             'siteSection': '',
             'streamType': 'vod',
-            'streamId': video_id}).encode('utf-8'))
+            'streamId': video_id}).encode())
 
         title = video['name']
         release_url = video['url']
diff --git a/plugins/youtube_download/yt_dlp/extractor/foxgay.py b/plugins/youtube_download/yt_dlp/extractor/foxgay.py
deleted file mode 100644
index f4f29c6..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/foxgay.py
+++ /dev/null
@@ -1,58 +0,0 @@
-import itertools
-
-from .common import InfoExtractor
-from ..utils import (
-    get_element_by_id,
-    int_or_none,
-    remove_end,
-)
-
-
-class FoxgayIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?foxgay\.com/videos/(?:\S+-)?(?P<id>\d+)\.shtml'
-    _TEST = {
-        'url': 'http://foxgay.com/videos/fuck-turkish-style-2582.shtml',
-        'md5': '344558ccfea74d33b7adbce22e577f54',
-        'info_dict': {
-            'id': '2582',
-            'ext': 'mp4',
-            'title': 'Fuck Turkish-style',
-            'description': 'md5:6ae2d9486921891efe89231ace13ffdf',
-            'age_limit': 18,
-            'thumbnail': r're:https?://.*\.jpg$',
-        },
-    }
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-
-        title = remove_end(self._html_extract_title(webpage), ' - Foxgay.com')
-        description = get_element_by_id('inf_tit', webpage)
-
-        # The default user-agent with foxgay cookies leads to pages without videos
-        self.cookiejar.clear('.foxgay.com')
-        # Find the URL for the iFrame which contains the actual video.
-        iframe_url = self._html_search_regex(
-            r'<iframe[^>]+src=([\'"])(?P<url>[^\'"]+)\1', webpage,
-            'video frame', group='url')
-        iframe = self._download_webpage(
-            iframe_url, video_id, headers={'User-Agent': 'curl/7.50.1'},
-            note='Downloading video frame')
-        video_data = self._parse_json(self._search_regex(
-            r'video_data\s*=\s*([^;]+);', iframe, 'video data'), video_id)
-
-        formats = [{
-            'url': source,
-            'height': int_or_none(resolution),
-        } for source, resolution in zip(
-            video_data['sources'], video_data.get('resolutions', itertools.repeat(None)))]
-
-        return {
-            'id': video_id,
-            'title': title,
-            'formats': formats,
-            'description': description,
-            'thumbnail': video_data.get('act_vid', {}).get('thumb'),
-            'age_limit': 18,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/fptplay.py b/plugins/youtube_download/yt_dlp/extractor/fptplay.py
index 85613ba..db9b2e1 100644
--- a/plugins/youtube_download/yt_dlp/extractor/fptplay.py
+++ b/plugins/youtube_download/yt_dlp/extractor/fptplay.py
@@ -84,7 +84,7 @@ class FptplayIE(InfoExtractor):
             a = [0, 0, 0, 0]
             s = len(e)
             c = 0
-            for z in range(s, 0, -1):
+            for _ in range(s, 0, -1):
                 if n <= 3:
                     i[n] = e[c]
                 n += 1
diff --git a/plugins/youtube_download/yt_dlp/extractor/francaisfacile.py b/plugins/youtube_download/yt_dlp/extractor/francaisfacile.py
new file mode 100644
index 0000000..d3208c2
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/francaisfacile.py
@@ -0,0 +1,87 @@
+import urllib.parse
+
+from .common import InfoExtractor
+from ..networking.exceptions import HTTPError
+from ..utils import (
+    ExtractorError,
+    float_or_none,
+    url_or_none,
+)
+from ..utils.traversal import traverse_obj
+
+
+class FrancaisFacileIE(InfoExtractor):
+    _VALID_URL = r'https?://francaisfacile\.rfi\.fr/[a-z]{2}/(?:actualit%C3%A9|podcasts/[^/#?]+)/(?P<id>[^/#?]+)'
+    _TESTS = [{
+        'url': 'https://francaisfacile.rfi.fr/fr/actualit%C3%A9/20250305-r%C3%A9concilier-les-jeunes-avec-la-lecture-gr%C3%A2ce-aux-r%C3%A9seaux-sociaux',
+        'md5': '4f33674cb205744345cc835991100afa',
+        'info_dict': {
+            'id': 'WBMZ58952-FLE-FR-20250305',
+            'display_id': '20250305-réconcilier-les-jeunes-avec-la-lecture-grâce-aux-réseaux-sociaux',
+            'title': 'Réconcilier les jeunes avec la lecture grâce aux réseaux sociaux',
+            'url': 'https://aod-fle.akamaized.net/fle/sounds/fr/2025/03/05/6b6af52a-f9ba-11ef-a1f8-005056a97652.mp3',
+            'ext': 'mp3',
+            'description': 'md5:b903c63d8585bd59e8cc4d5f80c4272d',
+            'duration': 103.15,
+            'timestamp': 1741177984,
+            'upload_date': '20250305',
+        },
+    }, {
+        'url': 'https://francaisfacile.rfi.fr/fr/actualit%C3%A9/20250307-argentine-le-sac-d-un-alpiniste-retrouv%C3%A9-40-ans-apr%C3%A8s-sa-mort',
+        'md5': 'b8c3a63652d4ae8e8092dda5700c1cd9',
+        'info_dict': {
+            'id': 'WBMZ59102-FLE-FR-20250307',
+            'display_id': '20250307-argentine-le-sac-d-un-alpiniste-retrouvé-40-ans-après-sa-mort',
+            'title': 'Argentine: le sac d\'un alpiniste retrouvé 40 ans après sa mort',
+            'url': 'https://aod-fle.akamaized.net/fle/sounds/fr/2025/03/07/8edf4082-fb46-11ef-8a37-005056bf762b.mp3',
+            'ext': 'mp3',
+            'description': 'md5:7fd088fbdf4a943bb68cf82462160dca',
+            'duration': 117.74,
+            'timestamp': 1741352789,
+            'upload_date': '20250307',
+        },
+    }, {
+        'url': 'https://francaisfacile.rfi.fr/fr/podcasts/un-mot-une-histoire/20250317-le-mot-de-david-foenkinos-peut-%C3%AAtre',
+        'md5': 'db83c2cc2589b4c24571c6b6cf14f5f1',
+        'info_dict': {
+            'id': 'WBMZ59441-FLE-FR-20250317',
+            'display_id': '20250317-le-mot-de-david-foenkinos-peut-être',
+            'title': 'Le mot de David Foenkinos: «peut-être» - Un mot, une histoire',
+            'url': 'https://aod-fle.akamaized.net/fle/sounds/fr/2025/03/17/4ca6cbbe-0315-11f0-a85b-005056a97652.mp3',
+            'ext': 'mp3',
+            'description': 'md5:3fe35fae035803df696bfa7af2496e49',
+            'duration': 198.96,
+            'timestamp': 1742210897,
+            'upload_date': '20250317',
+        },
+    }]
+
+    def _real_extract(self, url):
+        display_id = urllib.parse.unquote(self._match_id(url))
+
+        try:  # yt-dlp's default user-agents are too old and blocked by the site
+            webpage = self._download_webpage(url, display_id, headers={
+                'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; rv:136.0) Gecko/20100101 Firefox/136.0',
+            })
+        except ExtractorError as e:
+            if not isinstance(e.cause, HTTPError) or e.cause.status != 403:
+                raise
+            # Retry with impersonation if hardcoded UA is insufficient
+            webpage = self._download_webpage(url, display_id, impersonate=True)
+
+        data = self._search_json(
+            r'<script[^>]+\bdata-media-id=[^>]+\btype="application/json"[^>]*>',
+            webpage, 'audio data', display_id)
+
+        return {
+            'id': data['mediaId'],
+            'display_id': display_id,
+            'vcodec': 'none',
+            'title': self._html_extract_title(webpage),
+            **self._search_json_ld(webpage, display_id, fatal=False),
+            **traverse_obj(data, {
+                'title': ('title', {str}),
+                'url': ('sources', ..., 'url', {url_or_none}, any),
+                'duration': ('sources', ..., 'duration', {float_or_none}, any),
+            }),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/francetv.py b/plugins/youtube_download/yt_dlp/extractor/francetv.py
index 0523172..5c9f8e3 100644
--- a/plugins/youtube_download/yt_dlp/extractor/francetv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/francetv.py
@@ -1,58 +1,68 @@
+import json
+import re
+import urllib.parse
+
 from .common import InfoExtractor
-from ..utils import (
-    determine_ext,
-    ExtractorError,
-    format_field,
-    parse_iso8601,
-    parse_qs,
-)
 from .dailymotion import DailymotionIE
+from ..networking import HEADRequest
+from ..utils import (
+    ExtractorError,
+    clean_html,
+    determine_ext,
+    extract_attributes,
+    filter_dict,
+    format_field,
+    int_or_none,
+    join_nonempty,
+    parse_iso8601,
+    smuggle_url,
+    unsmuggle_url,
+    url_or_none,
+)
+from ..utils.traversal import find_element, traverse_obj
 
 
 class FranceTVBaseInfoExtractor(InfoExtractor):
-    def _make_url_result(self, video_or_full_id, catalog=None):
-        full_id = 'francetv:%s' % video_or_full_id
-        if '@' not in video_or_full_id and catalog:
-            full_id += '@%s' % catalog
-        return self.url_result(
-            full_id, ie=FranceTVIE.ie_key(),
-            video_id=video_or_full_id.split('@')[0])
+    def _make_url_result(self, video_id, url=None):
+        video_id = video_id.split('@')[0]  # for compat with old @catalog IDs
+        full_id = f'francetv:{video_id}'
+        if url:
+            full_id = smuggle_url(full_id, {'hostname': urllib.parse.urlparse(url).hostname})
+        return self.url_result(full_id, FranceTVIE, video_id)
 
 
 class FranceTVIE(InfoExtractor):
-    _VALID_URL = r'''(?x)
-                    (?:
-                        https?://
-                            sivideo\.webservices\.francetelevisions\.fr/tools/getInfosOeuvre/v2/\?
-                            .*?\bidDiffusion=[^&]+|
-                        (?:
-                            https?://videos\.francetv\.fr/video/|
-                            francetv:
-                        )
-                        (?P<id>[^@]+)(?:@(?P<catalog>.+))?
-                    )
-                    '''
-    _EMBED_REGEX = [r'<iframe[^>]+?src=(["\'])(?P<url>(?:https?://)?embed\.francetv\.fr/\?ue=.+?)\1']
+    IE_NAME = 'francetv'
+    _VALID_URL = r'francetv:(?P<id>[^@#]+)'
+    _GEO_COUNTRIES = ['FR']
+    _GEO_BYPASS = False
 
     _TESTS = [{
-        # without catalog
-        'url': 'https://sivideo.webservices.francetelevisions.fr/tools/getInfosOeuvre/v2/?idDiffusion=162311093&callback=_jsonp_loader_callback_request_0',
-        'md5': 'c2248a8de38c4e65ea8fae7b5df2d84f',
+        # tokenized url is in dinfo['video']['token']
+        'url': 'francetv:ec217ecc-0733-48cf-ac06-af1347b849d1',
         'info_dict': {
-            'id': '162311093',
+            'id': 'ec217ecc-0733-48cf-ac06-af1347b849d1',
             'ext': 'mp4',
             'title': '13h15, le dimanche... - Les mystères de Jésus',
-            'description': 'md5:75efe8d4c0a8205e5904498ffe1e1a42',
             'timestamp': 1502623500,
+            'duration': 2580,
+            'thumbnail': r're:^https?://.*\.jpg$',
             'upload_date': '20170813',
         },
+        'params': {'skip_download': 'm3u8'},
     }, {
-        # with catalog
-        'url': 'https://sivideo.webservices.francetelevisions.fr/tools/getInfosOeuvre/v2/?idDiffusion=NI_1004933&catalogue=Zouzous&callback=_jsonp_loader_callback_request_4',
-        'only_matching': True,
-    }, {
-        'url': 'http://videos.francetv.fr/video/NI_657393@Regions',
-        'only_matching': True,
+        # tokenized url is in dinfo['video']['token']['akamai']
+        'url': 'francetv:c5bda21d-2c6f-4470-8849-3d8327adb2ba',
+        'info_dict': {
+            'id': 'c5bda21d-2c6f-4470-8849-3d8327adb2ba',
+            'ext': 'mp4',
+            'title': '13h15, le dimanche... - Les mystères de Jésus',
+            'timestamp': 1514118300,
+            'duration': 2880,
+            'thumbnail': r're:^https?://.*\.jpg$',
+            'upload_date': '20171224',
+        },
+        'params': {'skip_download': 'm3u8'},
     }, {
         'url': 'francetv:162311093',
         'only_matching': True,
@@ -74,32 +84,33 @@ class FranceTVIE(InfoExtractor):
         'only_matching': True,
     }]
 
-    def _extract_video(self, video_id, catalogue=None):
-        # Videos are identified by idDiffusion so catalogue part is optional.
-        # However when provided, some extra formats may be returned so we pass
-        # it if available.
+    def _extract_video(self, video_id, hostname=None):
         is_live = None
         videos = []
+        drm_formats = False
         title = None
         subtitle = None
+        episode_number = None
+        season_number = None
         image = None
         duration = None
         timestamp = None
         spritesheets = None
 
-        for device_type in ('desktop', 'mobile'):
+        # desktop+chrome returns dash; mobile+safari returns hls
+        for device_type, browser in [('desktop', 'chrome'), ('mobile', 'safari')]:
             dinfo = self._download_json(
-                'https://player.webservices.francetelevisions.fr/v1/videos/%s' % video_id,
-                video_id, 'Downloading %s video JSON' % device_type, query={
+                f'https://k7.ftven.fr/videos/{video_id}', video_id,
+                f'Downloading {device_type} {browser} video JSON', query=filter_dict({
                     'device_type': device_type,
-                    'browser': 'chrome',
-                }, fatal=False)
+                    'browser': browser,
+                    'domain': hostname,
+                }), fatal=False, expected_status=422)  # 422 json gives detailed error code/message
 
             if not dinfo:
                 continue
 
-            video = dinfo.get('video')
-            if video:
+            if video := traverse_obj(dinfo, ('video', {dict})):
                 videos.append(video)
                 if duration is None:
                     duration = video.get('duration')
@@ -107,12 +118,24 @@ class FranceTVIE(InfoExtractor):
                     is_live = video.get('is_live')
                 if spritesheets is None:
                     spritesheets = video.get('spritesheets')
+            elif code := traverse_obj(dinfo, ('code', {int})):
+                if code == 2009:
+                    self.raise_geo_restricted(countries=self._GEO_COUNTRIES)
+                elif code in (2015, 2017):
+                    # 2015: L'accès à cette vidéo est impossible. (DRM-only)
+                    # 2017: Cette vidéo n'est pas disponible depuis le site web mobile (b/c DRM)
+                    drm_formats = True
+                    continue
+                self.report_warning(
+                    f'{self.IE_NAME} said: {code} "{clean_html(dinfo.get("message"))}"')
+                continue
 
-            meta = dinfo.get('meta')
-            if meta:
+            if meta := traverse_obj(dinfo, ('meta', {dict})):
                 if title is None:
                     title = meta.get('title')
-                # XXX: what is meta['pre_title']?
+                # meta['pre_title'] contains season and episode number for series in format "S<ID> E<ID>"
+                season_number, episode_number = self._search_regex(
+                    r'S(\d+)\s*E(\d+)', meta.get('pre_title'), 'episode info', group=(1, 2), default=(None, None))
                 if subtitle is None:
                     subtitle = meta.get('additional_title')
                 if image is None:
@@ -120,43 +143,49 @@ class FranceTVIE(InfoExtractor):
                 if timestamp is None:
                     timestamp = parse_iso8601(meta.get('broadcasted_at'))
 
-        formats = []
-        subtitles = {}
-        for video in videos:
+        if not videos and drm_formats:
+            self.report_drm(video_id)
+
+        formats, subtitles, video_url = [], {}, None
+        for video in traverse_obj(videos, lambda _, v: url_or_none(v['url'])):
+            video_url = video['url']
             format_id = video.get('format')
 
-            video_url = None
-            if video.get('workflow') == 'token-akamai':
-                token_url = video.get('token')
-                if token_url:
-                    token_json = self._download_json(
-                        token_url, video_id,
-                        'Downloading signed %s manifest URL' % format_id)
-                    if token_json:
-                        video_url = token_json.get('url')
-            if not video_url:
-                video_url = video.get('url')
+            if token_url := traverse_obj(video, ('token', (None, 'akamai'), {url_or_none}, any)):
+                tokenized_url = traverse_obj(self._download_json(
+                    token_url, video_id, f'Downloading signed {format_id} manifest URL',
+                    fatal=False, query={
+                        'format': 'json',
+                        'url': video_url,
+                    }), ('url', {url_or_none}))
+                if tokenized_url:
+                    video_url = tokenized_url
 
             ext = determine_ext(video_url)
             if ext == 'f4m':
                 formats.extend(self._extract_f4m_formats(
-                    video_url, video_id, f4m_id=format_id, fatal=False))
+                    video_url, video_id, f4m_id=format_id or ext, fatal=False))
             elif ext == 'm3u8':
+                format_id = format_id or 'hls'
                 fmts, subs = self._extract_m3u8_formats_and_subtitles(
-                    video_url, video_id, 'mp4',
-                    entry_protocol='m3u8_native', m3u8_id=format_id,
-                    fatal=False)
+                    video_url, video_id, 'mp4', m3u8_id=format_id, fatal=False)
+                for f in traverse_obj(fmts, lambda _, v: v['vcodec'] == 'none' and v.get('tbr') is None):
+                    if mobj := re.match(rf'{format_id}-[Aa]udio-\w+-(?P<bitrate>\d+)', f['format_id']):
+                        f.update({
+                            'tbr': int_or_none(mobj.group('bitrate')),
+                            'acodec': 'mp4a',
+                        })
                 formats.extend(fmts)
                 self._merge_subtitles(subs, target=subtitles)
             elif ext == 'mpd':
                 fmts, subs = self._extract_mpd_formats_and_subtitles(
-                    video_url, video_id, mpd_id=format_id, fatal=False)
+                    video_url, video_id, mpd_id=format_id or 'dash', fatal=False)
                 formats.extend(fmts)
                 self._merge_subtitles(subs, target=subtitles)
             elif video_url.startswith('rtmp'):
                 formats.append({
                     'url': video_url,
-                    'format_id': 'rtmp-%s' % format_id,
+                    'format_id': join_nonempty('rtmp', format_id),
                     'ext': 'flv',
                 })
             else:
@@ -168,10 +197,17 @@ class FranceTVIE(InfoExtractor):
 
             # XXX: what is video['captions']?
 
+        if not formats and video_url:
+            urlh = self._request_webpage(
+                HEADRequest(video_url), video_id, 'Checking for geo-restriction',
+                fatal=False, expected_status=403)
+            if urlh and urlh.headers.get('x-errortype') == 'geo':
+                self.raise_geo_restricted(countries=self._GEO_COUNTRIES, metadata_available=True)
+
         for f in formats:
             if f.get('acodec') != 'none' and f.get('language') in ('qtz', 'qad'):
                 f['language_preference'] = -10
-                f['format_note'] = 'audio description%s' % format_field(f, 'format_note', ', %s')
+                f['format_note'] = 'audio description{}'.format(format_field(f, 'format_note', ', %s'))
 
         if spritesheets:
             formats.append({
@@ -185,59 +221,93 @@ class FranceTVIE(InfoExtractor):
                 'fragments': [{
                     'url': sheet,
                     # XXX: not entirely accurate; each spritesheet seems to be
-                    # a 10×10 grid of thumbnails corresponding to approximately
+                    # a 10x10 grid of thumbnails corresponding to approximately
                     # 2 seconds of the video; the last spritesheet may be shorter
                     'duration': 200,
-                } for sheet in spritesheets]
+                } for sheet in traverse_obj(spritesheets, (..., {url_or_none}))],
             })
 
-        if subtitle:
-            title += ' - %s' % subtitle
-        title = title.strip()
-
         return {
             'id': video_id,
-            'title': title,
+            'title': join_nonempty(title, subtitle, delim=' - ').strip(),
             'thumbnail': image,
             'duration': duration,
             'timestamp': timestamp,
             'is_live': is_live,
             'formats': formats,
             'subtitles': subtitles,
+            'episode': subtitle if episode_number else None,
+            'series': title if episode_number else None,
+            'episode_number': int_or_none(episode_number),
+            'season_number': int_or_none(season_number),
+            '_format_sort_fields': ('res', 'tbr', 'proto'),  # prioritize m3u8 over dash
         }
 
     def _real_extract(self, url):
-        mobj = self._match_valid_url(url)
-        video_id = mobj.group('id')
-        catalog = mobj.group('catalog')
+        url, smuggled_data = unsmuggle_url(url, {})
+        video_id = self._match_id(url)
+        hostname = smuggled_data.get('hostname') or 'www.france.tv'
 
-        if not video_id:
-            qs = parse_qs(url)
-            video_id = qs.get('idDiffusion', [None])[0]
-            catalog = qs.get('catalogue', [None])[0]
-            if not video_id:
-                raise ExtractorError('Invalid URL', expected=True)
-
-        return self._extract_video(video_id, catalog)
+        return self._extract_video(video_id, hostname=hostname)
 
 
 class FranceTVSiteIE(FranceTVBaseInfoExtractor):
+    IE_NAME = 'francetv:site'
     _VALID_URL = r'https?://(?:(?:www\.)?france\.tv|mobile\.france\.tv)/(?:[^/]+/)*(?P<id>[^/]+)\.html'
 
     _TESTS = [{
         'url': 'https://www.france.tv/france-2/13h15-le-dimanche/140921-les-mysteres-de-jesus.html',
         'info_dict': {
-            'id': 'ec217ecc-0733-48cf-ac06-af1347b849d1',
+            'id': 'ec217ecc-0733-48cf-ac06-af1347b849d1',  # old: c5bda21d-2c6f-4470-8849-3d8327adb2ba'
             'ext': 'mp4',
             'title': '13h15, le dimanche... - Les mystères de Jésus',
-            'description': 'md5:75efe8d4c0a8205e5904498ffe1e1a42',
             'timestamp': 1502623500,
+            'duration': 2580,
+            'thumbnail': r're:^https?://.*\.jpg$',
             'upload_date': '20170813',
         },
         'params': {
             'skip_download': True,
         },
         'add_ie': [FranceTVIE.ie_key()],
+    }, {
+        # geo-restricted
+        'url': 'https://www.france.tv/enfants/six-huit-ans/foot2rue/saison-1/3066387-duel-au-vieux-port.html',
+        'info_dict': {
+            'id': 'a9050959-eedd-4b4a-9b0d-de6eeaa73e44',
+            'ext': 'mp4',
+            'title': 'Foot2Rue - Duel au vieux port',
+            'episode': 'Duel au vieux port',
+            'series': 'Foot2Rue',
+            'episode_number': 1,
+            'season_number': 1,
+            'timestamp': 1642761360,
+            'upload_date': '20220121',
+            'season': 'Season 1',
+            'thumbnail': r're:^https?://.*\.jpg$',
+            'duration': 1441,
+        },
+        'skip': 'No longer available',
+    }, {
+        # geo-restricted livestream (workflow == 'token-akamai')
+        'url': 'https://www.france.tv/france-4/direct.html',
+        'info_dict': {
+            'id': '9a6a7670-dde9-4264-adbc-55b89558594b',
+            'ext': 'mp4',
+            'title': r're:France 4 en direct .+',
+            'live_status': 'is_live',
+        },
+        'skip': 'geo-restricted livestream',
+    }, {
+        # livestream (workflow == 'dai')
+        'url': 'https://www.france.tv/france-2/direct.html',
+        'info_dict': {
+            'id': '006194ea-117d-4bcf-94a9-153d999c59ae',
+            'ext': 'mp4',
+            'title': r're:France 2 en direct .+',
+            'live_status': 'is_live',
+        },
+        'params': {'skip_download': 'livestream'},
     }, {
         # france3
         'url': 'https://www.france.tv/france-3/des-chiffres-et-des-lettres/139063-emission-du-mardi-9-mai-2017.html',
@@ -254,10 +324,6 @@ class FranceTVSiteIE(FranceTVBaseInfoExtractor):
         # franceo
         'url': 'https://www.france.tv/france-o/archipels/132249-mon-ancetre-l-esclave.html',
         'only_matching': True,
-    }, {
-        # france2 live
-        'url': 'https://www.france.tv/france-2/direct.html',
-        'only_matching': True,
     }, {
         'url': 'https://www.france.tv/documentaires/histoire/136517-argentine-les-500-bebes-voles-de-la-dictature.html',
         'only_matching': True,
@@ -276,22 +342,35 @@ class FranceTVSiteIE(FranceTVBaseInfoExtractor):
         'only_matching': True,
     }]
 
+    # XXX: For parsing next.js v15+ data; see also yt_dlp.extractor.goplay
+    def _find_json(self, s):
+        return self._search_json(
+            r'\w+\s*:\s*', s, 'next js data', None, contains_pattern=r'\[(?s:.+)\]', default=None)
+
     def _real_extract(self, url):
         display_id = self._match_id(url)
-
         webpage = self._download_webpage(url, display_id)
 
-        catalogue = None
-        video_id = self._search_regex(
-            r'(?:data-main-video\s*=|videoId["\']?\s*[:=])\s*(["\'])(?P<id>(?:(?!\1).)+)\1',
-            webpage, 'video id', default=None, group='id')
+        nextjs_data = traverse_obj(
+            re.findall(r'<script[^>]*>\s*self\.__next_f\.push\(\s*(\[.+?\])\s*\);?\s*</script>', webpage),
+            (..., {json.loads}, ..., {self._find_json}, ..., 'children', ..., ..., 'children', ..., ..., 'children'))
+
+        if traverse_obj(nextjs_data, (..., ..., 'children', ..., 'isLive', {bool}, any)):
+            # For livestreams we need the id of the stream instead of the currently airing episode id
+            video_id = traverse_obj(nextjs_data, (
+                ..., ..., 'children', ..., 'children', ..., 'children', ..., 'children', ..., ...,
+                'children', ..., ..., 'children', ..., ..., 'children', (..., (..., ...)),
+                'options', 'id', {str}, any))
+        else:
+            video_id = traverse_obj(nextjs_data, (
+                ..., ..., ..., 'children',
+                lambda _, v: v['video']['url'] == urllib.parse.urlparse(url).path,
+                'video', ('playerReplayId', 'siId'), {str}, any))
 
         if not video_id:
-            video_id, catalogue = self._html_search_regex(
-                r'(?:href=|player\.setVideo\(\s*)"http://videos?\.francetv\.fr/video/([^@]+@[^"]+)"',
-                webpage, 'video ID').split('@')
+            raise ExtractorError('Unable to extract video ID')
 
-        return self._make_url_result(video_id, catalogue)
+        return self._make_url_result(video_id, url=url)
 
 
 class FranceTVInfoIE(FranceTVBaseInfoExtractor):
@@ -305,8 +384,9 @@ class FranceTVInfoIE(FranceTVBaseInfoExtractor):
             'ext': 'mp4',
             'title': 'Soir 3',
             'upload_date': '20190822',
-            'timestamp': 1566510900,
-            'description': 'md5:72d167097237701d6e8452ff03b83c00',
+            'timestamp': 1566510730,
+            'thumbnail': r're:^https?://.*\.jpe?g$',
+            'duration': 1637,
             'subtitles': {
                 'fr': 'mincount:2',
             },
@@ -321,8 +401,8 @@ class FranceTVInfoIE(FranceTVBaseInfoExtractor):
         'info_dict': {
             'id': '7d204c9e-a2d3-11eb-9e4c-000d3a23d482',
             'ext': 'mp4',
-            'title': 'Covid-19 : une situation catastrophique à New Dehli',
-            'thumbnail': str,
+            'title': 'Covid-19 : une situation catastrophique à New Dehli - Édition du mercredi 21 avril 2021',
+            'thumbnail': r're:^https?://.*\.jpe?g$',
             'duration': 76,
             'timestamp': 1619028518,
             'upload_date': '20210421',
@@ -348,11 +428,17 @@ class FranceTVInfoIE(FranceTVBaseInfoExtractor):
             'id': 'x4iiko0',
             'ext': 'mp4',
             'title': 'NDDL, référendum, Brexit : Cécile Duflot répond à Patrick Cohen',
-            'description': 'Au lendemain de la victoire du "oui" au référendum sur l\'aéroport de Notre-Dame-des-Landes, l\'ancienne ministre écologiste est l\'invitée de Patrick Cohen. Plus d\'info : https://www.franceinter.fr/emissions/le-7-9/le-7-9-27-juin-2016',
+            'description': 'md5:fdcb582c370756293a65cdfbc6ecd90e',
             'timestamp': 1467011958,
-            'upload_date': '20160627',
             'uploader': 'France Inter',
             'uploader_id': 'x2q2ez',
+            'upload_date': '20160627',
+            'view_count': int,
+            'tags': ['Politique', 'France Inter', '27 juin 2016', 'Linvité de 8h20', 'Cécile Duflot', 'Patrick Cohen'],
+            'age_limit': 0,
+            'duration': 640,
+            'like_count': int,
+            'thumbnail': r're:https://[^/?#]+/v/[^/?#]+/x1080',
         },
         'add_ie': ['Dailymotion'],
     }, {
@@ -375,11 +461,16 @@ class FranceTVInfoIE(FranceTVBaseInfoExtractor):
                 self.url_result(dailymotion_url, DailymotionIE.ie_key())
                 for dailymotion_url in dailymotion_urls])
 
-        video_id = self._search_regex(
-            (r'player\.load[^;]+src:\s*["\']([^"\']+)',
-             r'id-video=([^@]+@[^"]+)',
-             r'<a[^>]+href="(?:https?:)?//videos\.francetv\.fr/video/([^@]+@[^"]+)"',
-             r'(?:data-id|<figure[^<]+\bid)=["\']([\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12})'),
-            webpage, 'video id')
+        video_id = (
+            traverse_obj(webpage, (
+                {find_element(tag='button', attr='data-cy', value='francetv-player-wrapper', html=True)},
+                {extract_attributes}, 'id'))
+            or self._search_regex(
+                (r'player\.load[^;]+src:\s*["\']([^"\']+)',
+                 r'id-video=([^@]+@[^"]+)',
+                 r'<a[^>]+href="(?:https?:)?//videos\.francetv\.fr/video/([^@]+@[^"]+)"',
+                 r'(?:data-id|<figure[^<]+\bid)=["\']([\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12})'),
+                webpage, 'video id')
+        )
 
-        return self._make_url_result(video_id)
+        return self._make_url_result(video_id, url=url)
diff --git a/plugins/youtube_download/yt_dlp/extractor/freesound.py b/plugins/youtube_download/yt_dlp/extractor/freesound.py
index fcde044..b8b8fe8 100644
--- a/plugins/youtube_download/yt_dlp/extractor/freesound.py
+++ b/plugins/youtube_download/yt_dlp/extractor/freesound.py
@@ -23,7 +23,7 @@ class FreesoundIE(InfoExtractor):
             'uploader': 'miklovan',
             'upload_date': '20130715',
             'tags': list,
-        }
+        },
     }
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/freetv.py b/plugins/youtube_download/yt_dlp/extractor/freetv.py
index 757a10d..518a668 100644
--- a/plugins/youtube_download/yt_dlp/extractor/freetv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/freetv.py
@@ -23,7 +23,7 @@ class FreeTvMoviesIE(FreeTvBaseIE):
             'title': 'Atrápame Si Puedes',
             'description': 'md5:ca63bc00898aeb2f64ec87c6d3a5b982',
             'ext': 'mp4',
-        }
+        },
     }, {
         'url': 'https://www.freetv.com/peliculas/monstruoso/',
         'md5': '509c15c68de41cb708d1f92d071f20aa',
@@ -32,7 +32,7 @@ class FreeTvMoviesIE(FreeTvBaseIE):
             'title': 'Monstruoso',
             'description': 'md5:333fc19ee327b457b980e54a911ea4a3',
             'ext': 'mp4',
-        }
+        },
     }]
 
     def _extract_video(self, content_id, action='olyott_video_play'):
@@ -72,7 +72,7 @@ class FreeTvIE(FreeTvBaseIE):
         'info_dict': {
             'id': 'el-detective-l',
             'title': 'El Detective L',
-            'description': 'md5:f9f1143bc33e9856ecbfcbfb97a759be'
+            'description': 'md5:f9f1143bc33e9856ecbfcbfb97a759be',
         },
         'playlist_count': 24,
     }, {
@@ -80,7 +80,7 @@ class FreeTvIE(FreeTvBaseIE):
         'info_dict': {
             'id': 'esmeraldas',
             'title': 'Esmeraldas',
-            'description': 'md5:43d7ec45bd931d8268a4f5afaf4c77bf'
+            'description': 'md5:43d7ec45bd931d8268a4f5afaf4c77bf',
         },
         'playlist_count': 62,
     }, {
@@ -88,7 +88,7 @@ class FreeTvIE(FreeTvBaseIE):
         'info_dict': {
             'id': 'las-aventuras-de-leonardo',
             'title': 'Las Aventuras de Leonardo',
-            'description': 'md5:0c47130846c141120a382aca059288f6'
+            'description': 'md5:0c47130846c141120a382aca059288f6',
         },
         'playlist_count': 13,
     },
diff --git a/plugins/youtube_download/yt_dlp/extractor/frontendmasters.py b/plugins/youtube_download/yt_dlp/extractor/frontendmasters.py
index 3bae8ad..b5176aa 100644
--- a/plugins/youtube_download/yt_dlp/extractor/frontendmasters.py
+++ b/plugins/youtube_download/yt_dlp/extractor/frontendmasters.py
@@ -1,10 +1,7 @@
 import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_str,
-    compat_urlparse,
-)
 from ..utils import (
     ExtractorError,
     parse_duration,
@@ -22,7 +19,7 @@ class FrontendMastersBaseIE(InfoExtractor):
     _QUALITIES = {
         'low': {'width': 480, 'height': 360},
         'mid': {'width': 1280, 'height': 720},
-        'high': {'width': 1920, 'height': 1080}
+        'high': {'width': 1920, 'height': 1080},
     }
 
     def _perform_login(self, username, password):
@@ -33,7 +30,7 @@ class FrontendMastersBaseIE(InfoExtractor):
 
         login_form.update({
             'username': username,
-            'password': password
+            'password': password,
         })
 
         post_url = self._search_regex(
@@ -41,7 +38,7 @@ class FrontendMastersBaseIE(InfoExtractor):
             'post_url', default=self._LOGIN_URL, group='url')
 
         if not post_url.startswith('http'):
-            post_url = compat_urlparse.urljoin(self._LOGIN_URL, post_url)
+            post_url = urllib.parse.urljoin(self._LOGIN_URL, post_url)
 
         response = self._download_webpage(
             post_url, None, 'Logging in', data=urlencode_postdata(login_form),
@@ -56,14 +53,14 @@ class FrontendMastersBaseIE(InfoExtractor):
             r'class=(["\'])(?:(?!\1).)*\bMessageAlert\b(?:(?!\1).)*\1[^>]*>(?P<error>[^<]+)<',
             response, 'error message', default=None, group='error')
         if error:
-            raise ExtractorError('Unable to login: %s' % error, expected=True)
+            raise ExtractorError(f'Unable to login: {error}', expected=True)
         raise ExtractorError('Unable to log in')
 
 
 class FrontendMastersPageBaseIE(FrontendMastersBaseIE):
     def _download_course(self, course_name, url):
         return self._download_json(
-            '%s/courses/%s' % (self._API_BASE, course_name), course_name,
+            f'{self._API_BASE}/courses/{course_name}', course_name,
             'Downloading course JSON', headers={'Referer': url})
 
     @staticmethod
@@ -92,7 +89,7 @@ class FrontendMastersPageBaseIE(FrontendMastersBaseIE):
 
         duration = None
         timestamp = lesson.get('timestamp')
-        if isinstance(timestamp, compat_str):
+        if isinstance(timestamp, str):
             mobj = re.search(
                 r'(?P<start>\d{1,2}:\d{1,2}:\d{1,2})\s*-(?P<end>\s*\d{1,2}:\d{1,2}:\d{1,2})',
                 timestamp)
@@ -102,7 +99,7 @@ class FrontendMastersPageBaseIE(FrontendMastersBaseIE):
 
         return {
             '_type': 'url_transparent',
-            'url': 'frontendmasters:%s' % lesson_id,
+            'url': f'frontendmasters:{lesson_id}',
             'ie_key': FrontendMastersIE.ie_key(),
             'id': lesson_id,
             'display_id': display_id,
@@ -134,16 +131,16 @@ class FrontendMastersIE(FrontendMastersBaseIE):
     def _real_extract(self, url):
         lesson_id = self._match_id(url)
 
-        source_url = '%s/video/%s/source' % (self._API_BASE, lesson_id)
+        source_url = f'{self._API_BASE}/video/{lesson_id}/source'
 
         formats = []
         for ext in ('webm', 'mp4'):
             for quality in ('low', 'mid', 'high'):
                 resolution = self._QUALITIES[quality].copy()
-                format_id = '%s-%s' % (ext, quality)
+                format_id = f'{ext}-{quality}'
                 format_url = self._download_json(
                     source_url, lesson_id,
-                    'Downloading %s source JSON' % format_id, query={
+                    f'Downloading {format_id} source JSON', query={
                         'f': ext,
                         'r': resolution['height'],
                     }, headers={
@@ -163,15 +160,15 @@ class FrontendMastersIE(FrontendMastersBaseIE):
 
         subtitles = {
             'en': [{
-                'url': '%s/transcripts/%s.vtt' % (self._API_BASE, lesson_id),
-            }]
+                'url': f'{self._API_BASE}/transcripts/{lesson_id}.vtt',
+            }],
         }
 
         return {
             'id': lesson_id,
             'title': lesson_id,
             'formats': formats,
-            'subtitles': subtitles
+            'subtitles': subtitles,
         }
 
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/fujitv.py b/plugins/youtube_download/yt_dlp/extractor/fujitv.py
index 77e826e..a2d1a82 100644
--- a/plugins/youtube_download/yt_dlp/extractor/fujitv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/fujitv.py
@@ -34,7 +34,7 @@ class FujiTVFODPlus7IE(InfoExtractor):
             'series': 'ちびまる子ちゃん',
             'series_id': '5d40',
             'thumbnail': 'https://i.fod.fujitv.co.jp/img/program/5d40/episode/5d40810083_a.jpg'},
-        'skip': 'Video available only in one week'
+        'skip': 'Video available only in one week',
     }]
 
     def _real_extract(self, url):
@@ -43,7 +43,9 @@ class FujiTVFODPlus7IE(InfoExtractor):
         json_info = {}
         token = self._get_cookies(url).get('CT')
         if token:
-            json_info = self._download_json('https://fod-sp.fujitv.co.jp/apps/api/episode/detail/?ep_id=%s&is_premium=false' % video_id, video_id, headers={'x-authorization': f'Bearer {token.value}'}, fatal=False)
+            json_info = self._download_json(
+                f'https://fod-sp.fujitv.co.jp/apps/api/episode/detail/?ep_id={video_id}&is_premium=false',
+                video_id, headers={'x-authorization': f'Bearer {token.value}'}, fatal=False)
         else:
             self.report_warning(f'The token cookie is needed to extract video metadata. {self._login_hint("cookies")}')
         formats, subtitles = [], {}
@@ -67,5 +69,5 @@ class FujiTVFODPlus7IE(InfoExtractor):
             'formats': formats,
             'subtitles': subtitles,
             'thumbnail': f'{self._BASE_URL}img/program/{series_id}/episode/{video_id}_a.jpg',
-            '_format_sort_fields': ('tbr', )
+            '_format_sort_fields': ('tbr', ),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/funimation.py b/plugins/youtube_download/yt_dlp/extractor/funimation.py
deleted file mode 100644
index 41de85c..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/funimation.py
+++ /dev/null
@@ -1,349 +0,0 @@
-import random
-import re
-import string
-
-from .common import InfoExtractor
-from ..networking.exceptions import HTTPError
-from ..utils import (
-    ExtractorError,
-    determine_ext,
-    int_or_none,
-    join_nonempty,
-    js_to_json,
-    make_archive_id,
-    orderedSet,
-    qualities,
-    str_or_none,
-    traverse_obj,
-    try_get,
-    urlencode_postdata,
-)
-
-
-class FunimationBaseIE(InfoExtractor):
-    _NETRC_MACHINE = 'funimation'
-    _REGION = None
-    _TOKEN = None
-
-    def _get_region(self):
-        region_cookie = self._get_cookies('https://www.funimation.com').get('region')
-        region = region_cookie.value if region_cookie else self.get_param('geo_bypass_country')
-        return region or traverse_obj(
-            self._download_json(
-                'https://geo-service.prd.funimationsvc.com/geo/v1/region/check', None, fatal=False,
-                note='Checking geo-location', errnote='Unable to fetch geo-location information'),
-            'region') or 'US'
-
-    def _perform_login(self, username, password):
-        if self._TOKEN:
-            return
-        try:
-            data = self._download_json(
-                'https://prod-api-funimationnow.dadcdigital.com/api/auth/login/',
-                None, 'Logging in', data=urlencode_postdata({
-                    'username': username,
-                    'password': password,
-                }))
-            FunimationBaseIE._TOKEN = data['token']
-        except ExtractorError as e:
-            if isinstance(e.cause, HTTPError) and e.cause.status == 401:
-                error = self._parse_json(e.cause.response.read().decode(), None)['error']
-                raise ExtractorError(error, expected=True)
-            raise
-
-
-class FunimationPageIE(FunimationBaseIE):
-    IE_NAME = 'funimation:page'
-    _VALID_URL = r'https?://(?:www\.)?funimation(?:\.com|now\.uk)/(?:(?P<lang>[^/]+)/)?(?:shows|v)/(?P<show>[^/]+)/(?P<episode>[^/?#&]+)'
-
-    _TESTS = [{
-        'url': 'https://www.funimation.com/shows/attack-on-titan-junior-high/broadcast-dub-preview/',
-        'info_dict': {
-            'id': '210050',
-            'ext': 'mp4',
-            'title': 'Broadcast Dub Preview',
-            # Other metadata is tested in FunimationIE
-        },
-        'params': {
-            'skip_download': 'm3u8',
-        },
-        'add_ie': ['Funimation'],
-    }, {
-        # Not available in US
-        'url': 'https://www.funimation.com/shows/hacksign/role-play/',
-        'only_matching': True,
-    }, {
-        # with lang code
-        'url': 'https://www.funimation.com/en/shows/hacksign/role-play/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.funimationnow.uk/shows/puzzle-dragons-x/drop-impact/simulcast/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.funimation.com/v/a-certain-scientific-railgun/super-powered-level-5',
-        'only_matching': True,
-    }]
-
-    def _real_initialize(self):
-        if not self._REGION:
-            FunimationBaseIE._REGION = self._get_region()
-
-    def _real_extract(self, url):
-        locale, show, episode = self._match_valid_url(url).group('lang', 'show', 'episode')
-
-        video_id = traverse_obj(self._download_json(
-            f'https://title-api.prd.funimationsvc.com/v1/shows/{show}/episodes/{episode}',
-            f'{show}_{episode}', query={
-                'deviceType': 'web',
-                'region': self._REGION,
-                'locale': locale or 'en'
-            }), ('videoList', ..., 'id'), get_all=False)
-
-        return self.url_result(f'https://www.funimation.com/player/{video_id}', FunimationIE.ie_key(), video_id)
-
-
-class FunimationIE(FunimationBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?funimation\.com/player/(?P<id>\d+)'
-
-    _TESTS = [{
-        'url': 'https://www.funimation.com/player/210051',
-        'info_dict': {
-            'id': '210050',
-            'display_id': 'broadcast-dub-preview',
-            'ext': 'mp4',
-            'title': 'Broadcast Dub Preview',
-            'thumbnail': r're:https?://.*\.(?:jpg|png)',
-            'episode': 'Broadcast Dub Preview',
-            'episode_id': '210050',
-            'season': 'Extras',
-            'season_id': '166038',
-            'season_number': 99,
-            'series': 'Attack on Titan: Junior High',
-            'description': '',
-            'duration': 155,
-        },
-        'params': {
-            'skip_download': 'm3u8',
-        },
-    }, {
-        'note': 'player_id should be extracted with the relevent compat-opt',
-        'url': 'https://www.funimation.com/player/210051',
-        'info_dict': {
-            'id': '210051',
-            'display_id': 'broadcast-dub-preview',
-            'ext': 'mp4',
-            'title': 'Broadcast Dub Preview',
-            'thumbnail': r're:https?://.*\.(?:jpg|png)',
-            'episode': 'Broadcast Dub Preview',
-            'episode_id': '210050',
-            'season': 'Extras',
-            'season_id': '166038',
-            'season_number': 99,
-            'series': 'Attack on Titan: Junior High',
-            'description': '',
-            'duration': 155,
-        },
-        'params': {
-            'skip_download': 'm3u8',
-            'compat_opts': ['seperate-video-versions'],
-        },
-    }]
-
-    @staticmethod
-    def _get_experiences(episode):
-        for lang, lang_data in episode.get('languages', {}).items():
-            for video_data in lang_data.values():
-                for version, f in video_data.items():
-                    yield lang, version.title(), f
-
-    def _get_episode(self, webpage, experience_id=None, episode_id=None, fatal=True):
-        ''' Extract the episode, season and show objects given either episode/experience id '''
-        show = self._parse_json(
-            self._search_regex(
-                r'show\s*=\s*({.+?})\s*;', webpage, 'show data', fatal=fatal),
-            experience_id, transform_source=js_to_json, fatal=fatal) or []
-        for season in show.get('seasons', []):
-            for episode in season.get('episodes', []):
-                if episode_id is not None:
-                    if str(episode.get('episodePk')) == episode_id:
-                        return episode, season, show
-                    continue
-                for _, _, f in self._get_experiences(episode):
-                    if f.get('experienceId') == experience_id:
-                        return episode, season, show
-        if fatal:
-            raise ExtractorError('Unable to find episode information')
-        else:
-            self.report_warning('Unable to find episode information')
-        return {}, {}, {}
-
-    def _real_extract(self, url):
-        initial_experience_id = self._match_id(url)
-        webpage = self._download_webpage(
-            url, initial_experience_id, note=f'Downloading player webpage for {initial_experience_id}')
-        episode, season, show = self._get_episode(webpage, experience_id=int(initial_experience_id))
-        episode_id = str(episode['episodePk'])
-        display_id = episode.get('slug') or episode_id
-
-        formats, subtitles, thumbnails, duration = [], {}, [], 0
-        requested_languages, requested_versions = self._configuration_arg('language'), self._configuration_arg('version')
-        language_preference = qualities((requested_languages or [''])[::-1])
-        source_preference = qualities((requested_versions or ['uncut', 'simulcast'])[::-1])
-        only_initial_experience = 'seperate-video-versions' in self.get_param('compat_opts', [])
-
-        for lang, version, fmt in self._get_experiences(episode):
-            experience_id = str(fmt['experienceId'])
-            if (only_initial_experience and experience_id != initial_experience_id
-                    or requested_languages and lang.lower() not in requested_languages
-                    or requested_versions and version.lower() not in requested_versions):
-                continue
-            thumbnails.append({'url': fmt.get('poster')})
-            duration = max(duration, fmt.get('duration', 0))
-            format_name = '%s %s (%s)' % (version, lang, experience_id)
-            self.extract_subtitles(
-                subtitles, experience_id, display_id=display_id, format_name=format_name,
-                episode=episode if experience_id == initial_experience_id else episode_id)
-
-            headers = {}
-            if self._TOKEN:
-                headers['Authorization'] = 'Token %s' % self._TOKEN
-            page = self._download_json(
-                'https://www.funimation.com/api/showexperience/%s/' % experience_id,
-                display_id, headers=headers, expected_status=403, query={
-                    'pinst_id': ''.join(random.choices(string.digits + string.ascii_letters, k=8)),
-                }, note=f'Downloading {format_name} JSON')
-            sources = page.get('items') or []
-            if not sources:
-                error = try_get(page, lambda x: x['errors'][0], dict)
-                if error:
-                    self.report_warning('%s said: Error %s - %s' % (
-                        self.IE_NAME, error.get('code'), error.get('detail') or error.get('title')))
-                else:
-                    self.report_warning('No sources found for format')
-
-            current_formats = []
-            for source in sources:
-                source_url = source.get('src')
-                source_type = source.get('videoType') or determine_ext(source_url)
-                if source_type == 'm3u8':
-                    current_formats.extend(self._extract_m3u8_formats(
-                        source_url, display_id, 'mp4', m3u8_id='%s-%s' % (experience_id, 'hls'), fatal=False,
-                        note=f'Downloading {format_name} m3u8 information'))
-                else:
-                    current_formats.append({
-                        'format_id': '%s-%s' % (experience_id, source_type),
-                        'url': source_url,
-                    })
-                for f in current_formats:
-                    # TODO: Convert language to code
-                    f.update({
-                        'language': lang,
-                        'format_note': version,
-                        'source_preference': source_preference(version.lower()),
-                        'language_preference': language_preference(lang.lower()),
-                    })
-                formats.extend(current_formats)
-        if not formats and (requested_languages or requested_versions):
-            self.raise_no_formats(
-                'There are no video formats matching the requested languages/versions', expected=True, video_id=display_id)
-        self._remove_duplicate_formats(formats)
-
-        return {
-            'id': episode_id,
-            '_old_archive_ids': [make_archive_id(self, initial_experience_id)],
-            'display_id': display_id,
-            'duration': duration,
-            'title': episode['episodeTitle'],
-            'description': episode.get('episodeSummary'),
-            'episode': episode.get('episodeTitle'),
-            'episode_number': int_or_none(episode.get('episodeId')),
-            'episode_id': episode_id,
-            'season': season.get('seasonTitle'),
-            'season_number': int_or_none(season.get('seasonId')),
-            'season_id': str_or_none(season.get('seasonPk')),
-            'series': show.get('showTitle'),
-            'formats': formats,
-            'thumbnails': thumbnails,
-            'subtitles': subtitles,
-            '_format_sort_fields': ('lang', 'source'),
-        }
-
-    def _get_subtitles(self, subtitles, experience_id, episode, display_id, format_name):
-        if isinstance(episode, str):
-            webpage = self._download_webpage(
-                f'https://www.funimation.com/player/{experience_id}/', display_id,
-                fatal=False, note=f'Downloading player webpage for {format_name}')
-            episode, _, _ = self._get_episode(webpage, episode_id=episode, fatal=False)
-
-        for _, version, f in self._get_experiences(episode):
-            for source in f.get('sources'):
-                for text_track in source.get('textTracks'):
-                    if not text_track.get('src'):
-                        continue
-                    sub_type = text_track.get('type').upper()
-                    sub_type = sub_type if sub_type != 'FULL' else None
-                    current_sub = {
-                        'url': text_track['src'],
-                        'name': join_nonempty(version, text_track.get('label'), sub_type, delim=' ')
-                    }
-                    lang = join_nonempty(text_track.get('language', 'und'),
-                                         version if version != 'Simulcast' else None,
-                                         sub_type, delim='_')
-                    if current_sub not in subtitles.get(lang, []):
-                        subtitles.setdefault(lang, []).append(current_sub)
-        return subtitles
-
-
-class FunimationShowIE(FunimationBaseIE):
-    IE_NAME = 'funimation:show'
-    _VALID_URL = r'(?P<url>https?://(?:www\.)?funimation(?:\.com|now\.uk)/(?P<locale>[^/]+)?/?shows/(?P<id>[^/?#&]+))/?(?:[?#]|$)'
-
-    _TESTS = [{
-        'url': 'https://www.funimation.com/en/shows/sk8-the-infinity',
-        'info_dict': {
-            'id': 1315000,
-            'title': 'SK8 the Infinity'
-        },
-        'playlist_count': 13,
-        'params': {
-            'skip_download': True,
-        },
-    }, {
-        # without lang code
-        'url': 'https://www.funimation.com/shows/ouran-high-school-host-club/',
-        'info_dict': {
-            'id': 39643,
-            'title': 'Ouran High School Host Club'
-        },
-        'playlist_count': 26,
-        'params': {
-            'skip_download': True,
-        },
-    }]
-
-    def _real_initialize(self):
-        if not self._REGION:
-            FunimationBaseIE._REGION = self._get_region()
-
-    def _real_extract(self, url):
-        base_url, locale, display_id = self._match_valid_url(url).groups()
-
-        show_info = self._download_json(
-            'https://title-api.prd.funimationsvc.com/v2/shows/%s?region=%s&deviceType=web&locale=%s'
-            % (display_id, self._REGION, locale or 'en'), display_id)
-        items_info = self._download_json(
-            'https://prod-api-funimationnow.dadcdigital.com/api/funimation/episodes/?limit=99999&title_id=%s'
-            % show_info.get('id'), display_id)
-
-        vod_items = traverse_obj(items_info, ('items', ..., lambda k, _: re.match(r'(?i)mostRecent[AS]vod', k), 'item'))
-
-        return {
-            '_type': 'playlist',
-            'id': show_info['id'],
-            'title': show_info['name'],
-            'entries': orderedSet(
-                self.url_result(
-                    '%s/%s' % (base_url, vod_item.get('episodeSlug')), FunimationPageIE.ie_key(),
-                    vod_item.get('episodeId'), vod_item.get('episodeName'))
-                for vod_item in sorted(vod_items, key=lambda x: x.get('episodeOrder', -1))),
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/funk.py b/plugins/youtube_download/yt_dlp/extractor/funk.py
index 539d719..ef8ea72 100644
--- a/plugins/youtube_download/yt_dlp/extractor/funk.py
+++ b/plugins/youtube_download/yt_dlp/extractor/funk.py
@@ -1,44 +1,43 @@
 from .common import InfoExtractor
 from .nexx import NexxIE
-from ..utils import (
-    int_or_none,
-    str_or_none,
-)
 
 
 class FunkIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.|origin\.)?funk\.net/(?:channel|playlist)/[^/]+/(?P<display_id>[0-9a-z-]+)-(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:(?:www|origin|play)\.)?funk\.net/(?:channel|playlist)/[^/?#]+/(?P<display_id>[0-9a-z-]+)-(?P<id>\d+)'
     _TESTS = [{
         'url': 'https://www.funk.net/channel/ba-793/die-lustigsten-instrumente-aus-dem-internet-teil-2-1155821',
-        'md5': '8dd9d9ab59b4aa4173b3197f2ea48e81',
+        'md5': '8610449476156f338761a75391b0017d',
         'info_dict': {
             'id': '1155821',
             'ext': 'mp4',
             'title': 'Die LUSTIGSTEN INSTRUMENTE aus dem Internet - Teil 2',
-            'description': 'md5:a691d0413ef4835588c5b03ded670c1f',
+            'description': 'md5:2a03b67596eda0d1b5125c299f45e953',
             'timestamp': 1514507395,
             'upload_date': '20171229',
+            'duration': 426.0,
+            'cast': ['United Creators PMB GmbH'],
+            'thumbnail': 'https://assets.nexx.cloud/media/75/56/79/3YKUSJN1LACN0CRxL.jpg',
+            'display_id': 'die-lustigsten-instrumente-aus-dem-internet-teil-2',
+            'alt_title': 'Die LUSTIGSTEN INSTRUMENTE aus dem Internet Teil 2',
+            'season_number': 0,
+            'season': 'Season 0',
+            'episode_number': 0,
+            'episode': 'Episode 0',
         },
-
     }, {
         'url': 'https://www.funk.net/playlist/neuesteVideos/kameras-auf-dem-fusion-festival-1618699',
         'only_matching': True,
+    }, {
+        'url': 'https://play.funk.net/playlist/neuesteVideos/george-floyd-wenn-die-polizei-toetet-der-fall-2004391',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
         display_id, nexx_id = self._match_valid_url(url).groups()
-        video = self._download_json(
-            'https://www.funk.net/api/v4.0/videos/' + nexx_id, nexx_id)
         return {
             '_type': 'url_transparent',
-            'url': 'nexx:741:' + nexx_id,
+            'url': f'nexx:741:{nexx_id}',
             'ie_key': NexxIE.ie_key(),
             'id': nexx_id,
-            'title': video.get('title'),
-            'description': video.get('description'),
-            'duration': int_or_none(video.get('duration')),
-            'channel_id': str_or_none(video.get('channelId')),
             'display_id': display_id,
-            'tags': video.get('tags'),
-            'thumbnail': video.get('imageUrlLandscape'),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/funker530.py b/plugins/youtube_download/yt_dlp/extractor/funker530.py
index ba5ab7d..5d59e9c 100644
--- a/plugins/youtube_download/yt_dlp/extractor/funker530.py
+++ b/plugins/youtube_download/yt_dlp/extractor/funker530.py
@@ -25,7 +25,7 @@ class Funker530IE(InfoExtractor):
             'timestamp': 1686241321,
             'live_status': 'not_live',
             'description': 'md5:bea2e1f458095414e04b5ac189c2f980',
-        }
+        },
     }, {
         'url': 'https://funker530.com/video/my-friends-joined-the-russians-civdiv/',
         'md5': 'a42c2933391210662e93e867d7124b70',
@@ -54,12 +54,13 @@ class Funker530IE(InfoExtractor):
             'upload_date': '20230608',
             'playable_in_embed': True,
             'heatmap': 'count:100',
-        }
+        },
     }]
 
     def _real_extract(self, url):
         display_id = self._match_id(url)
         webpage = self._download_webpage(url, display_id)
+        info = {}
         rumble_url = list(RumbleEmbedIE._extract_embed_urls(url, webpage))
         if rumble_url:
             info = {'url': rumble_url[0], 'ie_key': RumbleEmbedIE.ie_key()}
@@ -75,5 +76,5 @@ class Funker530IE(InfoExtractor):
             '_type': 'url_transparent',
             'description': strip_or_none(self._search_regex(
                 r'(?s)(.+)About the Author', clean_html(get_element_by_class('video-desc-paragraph', webpage)),
-                'description', default=None))
+                'description', default=None)),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/fusion.py b/plugins/youtube_download/yt_dlp/extractor/fusion.py
deleted file mode 100644
index 689422f..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/fusion.py
+++ /dev/null
@@ -1,81 +0,0 @@
-from .common import InfoExtractor
-from ..utils import (
-    determine_ext,
-    int_or_none,
-    mimetype2ext,
-    parse_iso8601,
-)
-
-
-class FusionIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?fusion\.(?:net|tv)/(?:video/|show/.+?\bvideo=)(?P<id>\d+)'
-    _TESTS = [{
-        'url': 'http://fusion.tv/video/201781/u-s-and-panamanian-forces-work-together-to-stop-a-vessel-smuggling-drugs/',
-        'info_dict': {
-            'id': '3145868',
-            'ext': 'mp4',
-            'title': 'U.S. and Panamanian forces work together to stop a vessel smuggling drugs',
-            'description': 'md5:0cc84a9943c064c0f46b128b41b1b0d7',
-            'duration': 140.0,
-            'timestamp': 1442589635,
-            'uploader': 'UNIVISON',
-            'upload_date': '20150918',
-        },
-        'params': {
-            'skip_download': True,
-        },
-        'add_ie': ['Anvato'],
-    }, {
-        'url': 'http://fusion.tv/video/201781',
-        'only_matching': True,
-    }, {
-        'url': 'https://fusion.tv/show/food-exposed-with-nelufar-hedayat/?ancla=full-episodes&video=588644',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        video = self._download_json(
-            'https://platform.fusion.net/wp-json/fusiondotnet/v1/video/' + video_id, video_id)
-
-        info = {
-            'id': video_id,
-            'title': video['title'],
-            'description': video.get('excerpt'),
-            'timestamp': parse_iso8601(video.get('published')),
-            'series': video.get('show'),
-        }
-
-        formats = []
-        src = video.get('src') or {}
-        for f_id, f in src.items():
-            for q_id, q in f.items():
-                q_url = q.get('url')
-                if not q_url:
-                    continue
-                ext = determine_ext(q_url, mimetype2ext(q.get('type')))
-                if ext == 'smil':
-                    formats.extend(self._extract_smil_formats(q_url, video_id, fatal=False))
-                elif f_id == 'm3u8-variant' or (ext == 'm3u8' and q_id == 'Variant'):
-                    formats.extend(self._extract_m3u8_formats(
-                        q_url, video_id, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=False))
-                else:
-                    formats.append({
-                        'format_id': '-'.join([f_id, q_id]),
-                        'url': q_url,
-                        'width': int_or_none(q.get('width')),
-                        'height': int_or_none(q.get('height')),
-                        'tbr': int_or_none(self._search_regex(r'_(\d+)\.m(?:p4|3u8)', q_url, 'bitrate')),
-                        'ext': 'mp4' if ext == 'm3u8' else ext,
-                        'protocol': 'm3u8_native' if ext == 'm3u8' else 'https',
-                    })
-        if formats:
-            info['formats'] = formats
-        else:
-            info.update({
-                '_type': 'url',
-                'url': 'anvato:uni:' + video['video_ids']['anvato'],
-                'ie_key': 'Anvato',
-            })
-
-        return info
diff --git a/plugins/youtube_download/yt_dlp/extractor/fuyintv.py b/plugins/youtube_download/yt_dlp/extractor/fuyintv.py
index 197901d..f46839b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/fuyintv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/fuyintv.py
@@ -11,7 +11,7 @@ class FuyinTVIE(InfoExtractor):
             'ext': 'mp4',
             'title': '第1集',
             'description': 'md5:21a3d238dc8d49608e1308e85044b9c3',
-        }
+        },
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/gab.py b/plugins/youtube_download/yt_dlp/extractor/gab.py
index 5016e2f..024628e 100644
--- a/plugins/youtube_download/yt_dlp/extractor/gab.py
+++ b/plugins/youtube_download/yt_dlp/extractor/gab.py
@@ -7,7 +7,7 @@ from ..utils import (
     parse_codecs,
     parse_duration,
     str_to_int,
-    unified_timestamp
+    unified_timestamp,
 )
 
 
@@ -19,33 +19,32 @@ class GabTVIE(InfoExtractor):
             'id': '61217eacea5665de450d0488',
             'ext': 'mp4',
             'title': 'WHY WAS AMERICA IN AFGHANISTAN - AMERICA FIRST AGAINST AMERICAN OLIGARCHY',
-            'description': None,
             'uploader': 'Wurzelroot',
             'uploader_id': '608fb0a85738fd1974984f7d',
             'thumbnail': 'https://tv.gab.com/image/61217eacea5665de450d0488',
-        }
+        },
     }]
 
     def _real_extract(self, url):
-        id = self._match_id(url).split('-')[-1]
-        webpage = self._download_webpage(url, id)
+        video_id = self._match_id(url).split('-')[-1]
+        webpage = self._download_webpage(url, video_id)
         channel_id = self._search_regex(r'data-channel-id=\"(?P<channel_id>[^\"]+)', webpage, 'channel_id')
         channel_name = self._search_regex(r'data-channel-name=\"(?P<channel_id>[^\"]+)', webpage, 'channel_name')
         title = self._search_regex(r'data-episode-title=\"(?P<channel_id>[^\"]+)', webpage, 'title')
         view_key = self._search_regex(r'data-view-key=\"(?P<channel_id>[^\"]+)', webpage, 'view_key')
         description = clean_html(
             self._html_search_regex(self._meta_regex('description'), webpage, 'description', group='content')) or None
-        available_resolutions = re.findall(r'<a\ data-episode-id=\"%s\"\ data-resolution=\"(?P<resolution>[^\"]+)' % id,
-                                           webpage)
+        available_resolutions = re.findall(
+            rf'<a\ data-episode-id=\"{video_id}\"\ data-resolution=\"(?P<resolution>[^\"]+)', webpage)
 
         formats = []
         for resolution in available_resolutions:
             frmt = {
-                'url': f'https://tv.gab.com/media/{id}?viewKey={view_key}&r={resolution}',
+                'url': f'https://tv.gab.com/media/{video_id}?viewKey={view_key}&r={resolution}',
                 'format_id': resolution,
                 'vcodec': 'h264',
                 'acodec': 'aac',
-                'ext': 'mp4'
+                'ext': 'mp4',
             }
             if 'audio-' in resolution:
                 frmt['abr'] = str_to_int(resolution.replace('audio-', ''))
@@ -56,13 +55,13 @@ class GabTVIE(InfoExtractor):
             formats.append(frmt)
 
         return {
-            'id': id,
+            'id': video_id,
             'title': title,
             'formats': formats,
             'description': description,
             'uploader': channel_name,
             'uploader_id': channel_id,
-            'thumbnail': f'https://tv.gab.com/image/{id}',
+            'thumbnail': f'https://tv.gab.com/image/{video_id}',
         }
 
 
@@ -80,7 +79,7 @@ class GabIE(InfoExtractor):
             'description': 'md5:204055fafd5e1a519f5d6db953567ca3',
             'timestamp': 1635192289,
             'upload_date': '20211025',
-        }
+        },
     }, {
         'url': 'https://gab.com/TheLonelyProud/posts/107045884469287653',
         'md5': 'f9cefcfdff6418e392611a828d47839d',
@@ -92,7 +91,7 @@ class GabIE(InfoExtractor):
             'timestamp': 1633390571,
             'upload_date': '20211004',
             'uploader': 'TheLonelyProud',
-        }
+        },
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/gaia.py b/plugins/youtube_download/yt_dlp/extractor/gaia.py
index c84386f..048ea51 100644
--- a/plugins/youtube_download/yt_dlp/extractor/gaia.py
+++ b/plugins/youtube_download/yt_dlp/extractor/gaia.py
@@ -1,8 +1,6 @@
+import urllib.parse
+
 from .common import InfoExtractor
-from ..compat import (
-    compat_str,
-    compat_urllib_parse_unquote,
-)
 from ..utils import (
     ExtractorError,
     int_or_none,
@@ -52,7 +50,7 @@ class GaiaIE(InfoExtractor):
     def _real_initialize(self):
         auth = self._get_cookies('https://www.gaia.com/').get('auth')
         if auth:
-            auth = self._parse_json(compat_urllib_parse_unquote(auth.value), None, fatal=False)
+            auth = self._parse_json(urllib.parse.unquote(auth.value), None, fatal=False)
             self._jwt = auth.get('jwt')
 
     def _perform_login(self, username, password):
@@ -62,7 +60,7 @@ class GaiaIE(InfoExtractor):
             'https://auth.gaia.com/v1/login',
             None, data=urlencode_postdata({
                 'username': username,
-                'password': password
+                'password': password,
             }))
         if auth.get('success') is False:
             raise ExtractorError(', '.join(auth['messages']), expected=True)
@@ -77,7 +75,7 @@ class GaiaIE(InfoExtractor):
         node = self._download_json(
             'https://brooklyn.gaia.com/node/%d' % node_id, node_id)
         vdata = node[vtype]
-        media_id = compat_str(vdata['nid'])
+        media_id = str(vdata['nid'])
         title = node['title']
 
         headers = None
@@ -115,7 +113,7 @@ class GaiaIE(InfoExtractor):
             'like_count': int_or_none(try_get(fivestar, lambda x: x['up_count']['value'])),
             'dislike_count': int_or_none(try_get(fivestar, lambda x: x['down_count']['value'])),
             'comment_count': int_or_none(node.get('comment_count')),
-            'series': try_get(node, lambda x: x['series']['title'], compat_str),
+            'series': try_get(node, lambda x: x['series']['title'], str),
             'season_number': int_or_none(get_field_value('season')),
             'season_id': str_or_none(get_field_value('series_nid', 'nid')),
             'episode_number': int_or_none(get_field_value('episode')),
diff --git a/plugins/youtube_download/yt_dlp/extractor/gamedevtv.py b/plugins/youtube_download/yt_dlp/extractor/gamedevtv.py
new file mode 100644
index 0000000..06e8b73
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/gamedevtv.py
@@ -0,0 +1,141 @@
+import json
+
+from .common import InfoExtractor
+from ..networking.exceptions import HTTPError
+from ..utils import (
+    ExtractorError,
+    clean_html,
+    int_or_none,
+    join_nonempty,
+    parse_iso8601,
+    str_or_none,
+    url_or_none,
+)
+from ..utils.traversal import traverse_obj
+
+
+class GameDevTVDashboardIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?gamedev\.tv/dashboard/courses/(?P<course_id>\d+)(?:/(?P<lecture_id>\d+))?'
+    _NETRC_MACHINE = 'gamedevtv'
+    _TESTS = [{
+        'url': 'https://www.gamedev.tv/dashboard/courses/25',
+        'info_dict': {
+            'id': '25',
+            'title': 'Complete Blender Creator 3: Learn 3D Modelling for Beginners',
+            'tags': ['blender', 'course', 'all', 'box modelling', 'sculpting'],
+            'categories': ['Blender', '3D Art'],
+            'thumbnail': 'https://gamedev-files.b-cdn.net/courses/qisc9pmu1jdc.jpg',
+            'upload_date': '20220516',
+            'timestamp': 1652694420,
+            'modified_date': '20241027',
+            'modified_timestamp': 1730049658,
+        },
+        'playlist_count': 100,
+    }, {
+        'url': 'https://www.gamedev.tv/dashboard/courses/63/2279',
+        'info_dict': {
+            'id': 'df04f4d8-68a4-4756-a71b-9ca9446c3a01',
+            'ext': 'mp4',
+            'modified_timestamp': 1701695752,
+            'upload_date': '20230504',
+            'episode': 'MagicaVoxel Community Course Introduction',
+            'series_id': '63',
+            'title': 'MagicaVoxel Community Course Introduction',
+            'timestamp': 1683195397,
+            'modified_date': '20231204',
+            'categories': ['3D Art', 'MagicaVoxel'],
+            'season': 'MagicaVoxel Community Course',
+            'tags': ['MagicaVoxel', 'all', 'course'],
+            'series': 'MagicaVoxel 3D Art Mini Course',
+            'duration': 1405,
+            'episode_number': 1,
+            'season_number': 1,
+            'season_id': '219',
+            'description': 'md5:a378738c5bbec1c785d76c067652d650',
+            'display_id': '63-219-2279',
+            'alt_title': '1_CC_MVX MagicaVoxel Community Course Introduction.mp4',
+            'thumbnail': 'https://vz-23691c65-6fa.b-cdn.net/df04f4d8-68a4-4756-a71b-9ca9446c3a01/thumbnail.jpg',
+        },
+    }]
+    _API_HEADERS = {}
+
+    def _perform_login(self, username, password):
+        try:
+            response = self._download_json(
+                'https://api.gamedev.tv/api/students/login', None, 'Logging in',
+                headers={'Content-Type': 'application/json'},
+                data=json.dumps({
+                    'email': username,
+                    'password': password,
+                    'cart_items': [],
+                }).encode())
+        except ExtractorError as e:
+            if isinstance(e.cause, HTTPError) and e.cause.status == 401:
+                raise ExtractorError('Invalid username/password', expected=True)
+            raise
+
+        self._API_HEADERS['Authorization'] = f'{response["token_type"]} {response["access_token"]}'
+
+    def _real_initialize(self):
+        if not self._API_HEADERS.get('Authorization'):
+            self.raise_login_required(
+                'This content is only available with purchase', method='password')
+
+    def _entries(self, data, course_id, course_info, selected_lecture):
+        for section in traverse_obj(data, ('sections', ..., {dict})):
+            section_info = traverse_obj(section, {
+                'season_id': ('id', {str_or_none}),
+                'season': ('title', {str}),
+                'season_number': ('order', {int_or_none}),
+            })
+            for lecture in traverse_obj(section, ('lectures', lambda _, v: url_or_none(v['video']['playListUrl']))):
+                if selected_lecture and str(lecture.get('id')) != selected_lecture:
+                    continue
+                display_id = join_nonempty(course_id, section_info.get('season_id'), lecture.get('id'))
+                formats, subtitles = self._extract_m3u8_formats_and_subtitles(
+                    lecture['video']['playListUrl'], display_id, 'mp4', m3u8_id='hls')
+                yield {
+                    **course_info,
+                    **section_info,
+                    'id': display_id,  # fallback
+                    'display_id': display_id,
+                    'formats': formats,
+                    'subtitles': subtitles,
+                    'series': course_info.get('title'),
+                    'series_id': course_id,
+                    **traverse_obj(lecture, {
+                        'id': ('video', 'guid', {str}),
+                        'title': ('title', {str}),
+                        'alt_title': ('video', 'title', {str}),
+                        'description': ('description', {clean_html}),
+                        'episode': ('title', {str}),
+                        'episode_number': ('order', {int_or_none}),
+                        'duration': ('video', 'duration_in_sec', {int_or_none}),
+                        'timestamp': ('video', 'created_at', {parse_iso8601}),
+                        'modified_timestamp': ('video', 'updated_at', {parse_iso8601}),
+                        'thumbnail': ('video', 'thumbnailUrl', {url_or_none}),
+                    }),
+                }
+
+    def _real_extract(self, url):
+        course_id, lecture_id = self._match_valid_url(url).group('course_id', 'lecture_id')
+        data = self._download_json(
+            f'https://api.gamedev.tv/api/courses/my/{course_id}', course_id,
+            headers=self._API_HEADERS)['data']
+
+        course_info = traverse_obj(data, {
+            'title': ('title', {str}),
+            'tags': ('tags', ..., 'name', {str}),
+            'categories': ('categories', ..., 'title', {str}),
+            'timestamp': ('created_at', {parse_iso8601}),
+            'modified_timestamp': ('updated_at', {parse_iso8601}),
+            'thumbnail': ('image', {url_or_none}),
+        })
+
+        entries = self._entries(data, course_id, course_info, lecture_id)
+        if lecture_id:
+            lecture = next(entries, None)
+            if not lecture:
+                raise ExtractorError('Lecture not found')
+            return lecture
+        return self.playlist_result(entries, course_id, **course_info)
diff --git a/plugins/youtube_download/yt_dlp/extractor/gameinformer.py b/plugins/youtube_download/yt_dlp/extractor/gameinformer.py
deleted file mode 100644
index 2664edb..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/gameinformer.py
+++ /dev/null
@@ -1,46 +0,0 @@
-from .brightcove import BrightcoveNewIE
-from .common import InfoExtractor
-from ..utils import (
-    clean_html,
-    get_element_by_class,
-    get_element_by_id,
-)
-
-
-class GameInformerIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?gameinformer\.com/(?:[^/]+/)*(?P<id>[^.?&#]+)'
-    _TESTS = [{
-        # normal Brightcove embed code extracted with BrightcoveNewIE._extract_url
-        'url': 'http://www.gameinformer.com/b/features/archive/2015/09/26/replay-animal-crossing.aspx',
-        'md5': '292f26da1ab4beb4c9099f1304d2b071',
-        'info_dict': {
-            'id': '4515472681001',
-            'ext': 'mp4',
-            'title': 'Replay - Animal Crossing',
-            'description': 'md5:2e211891b215c85d061adc7a4dd2d930',
-            'timestamp': 1443457610,
-            'upload_date': '20150928',
-            'uploader_id': '694940074001',
-        },
-    }, {
-        # Brightcove id inside unique element with field--name-field-brightcove-video-id class
-        'url': 'https://www.gameinformer.com/video-feature/new-gameplay-today/2019/07/09/new-gameplay-today-streets-of-rogue',
-        'info_dict': {
-            'id': '6057111913001',
-            'ext': 'mp4',
-            'title': 'New Gameplay Today – Streets Of Rogue',
-            'timestamp': 1562699001,
-            'upload_date': '20190709',
-            'uploader_id': '694940074001',
-
-        },
-    }]
-    BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/694940074001/default_default/index.html?videoId=%s'
-
-    def _real_extract(self, url):
-        display_id = self._match_id(url)
-        webpage = self._download_webpage(
-            url, display_id, headers=self.geo_verification_headers())
-        brightcove_id = clean_html(get_element_by_class('field--name-field-brightcove-video-id', webpage) or get_element_by_id('video-source-content', webpage))
-        brightcove_url = self.BRIGHTCOVE_URL_TEMPLATE % brightcove_id if brightcove_id else BrightcoveNewIE._extract_url(self, webpage)
-        return self.url_result(brightcove_url, 'BrightcoveNew', brightcove_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/gamejolt.py b/plugins/youtube_download/yt_dlp/extractor/gamejolt.py
index 8ec046b..01386c1 100644
--- a/plugins/youtube_download/yt_dlp/extractor/gamejolt.py
+++ b/plugins/youtube_download/yt_dlp/extractor/gamejolt.py
@@ -1,16 +1,16 @@
 import itertools
 import json
 import math
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import compat_urllib_parse_unquote
 from ..utils import (
     determine_ext,
     format_field,
     int_or_none,
     str_or_none,
     traverse_obj,
-    try_get
+    try_get,
 )
 
 
@@ -45,7 +45,7 @@ class GameJoltBaseIE(InfoExtractor):
                 'comments/Fireside_Post/%s/%s?%s=%d' % (
                     post_num_id, sort_by,
                     'scroll_id' if is_scrolled else 'page', scroll_id if is_scrolled else page),
-                post_hash_id, note='Downloading comments list page %d' % page)
+                post_hash_id, note=f'Downloading comments list page {page}')
             if not comments_data.get('comments'):
                 break
             for comment in traverse_obj(comments_data, (('comments', 'childComments'), ...), expected_type=dict):
@@ -87,15 +87,15 @@ class GameJoltBaseIE(InfoExtractor):
             'uploader': user_data.get('display_name') or user_data.get('name'),
             'uploader_id': user_data.get('username'),
             'uploader_url': format_field(user_data, 'url', 'https://gamejolt.com%s'),
-            'categories': [try_get(category, lambda x: '%s - %s' % (x['community']['name'], x['channel'].get('display_title') or x['channel']['title']))
-                           for category in post_data.get('communities' or [])],
+            'categories': [try_get(category, lambda x: '{} - {}'.format(x['community']['name'], x['channel'].get('display_title') or x['channel']['title']))
+                           for category in post_data.get('communities') or []],
             'tags': traverse_obj(
                 lead_content, ('content', ..., 'content', ..., 'marks', ..., 'attrs', 'tag'), expected_type=str_or_none),
             'like_count': int_or_none(post_data.get('like_count')),
             'comment_count': int_or_none(post_data.get('comment_count'), default=0),
             'timestamp': int_or_none(post_data.get('added_on'), scale=1000),
             'release_timestamp': int_or_none(post_data.get('published_on'), scale=1000),
-            '__post_extractor': self.extract_comments(post_data.get('id'), post_id)
+            '__post_extractor': self.extract_comments(post_data.get('id'), post_id),
         }
 
         # TODO: Handle multiple videos/embeds?
@@ -152,7 +152,7 @@ class GameJoltBaseIE(InfoExtractor):
                     'height': media.get('height') if url_key == 'img_url' else None,
                     'filesize': media.get('filesize') if url_key == 'img_url' else None,
                     'acodec': 'none',
-                } for url_key in ('img_url', 'mediaserver_url', 'mediaserver_url_mp4', 'mediaserver_url_webm') if media.get(url_key)]
+                } for url_key in ('img_url', 'mediaserver_url', 'mediaserver_url_mp4', 'mediaserver_url_webm') if media.get(url_key)],
             })
         if gif_entries:
             return {
@@ -192,7 +192,7 @@ class GameJoltIE(GameJoltBaseIE):
             'like_count': int,
             'comment_count': int,
             'view_count': int,
-        }
+        },
     }, {
         # YouTube embed
         'url': 'https://gamejolt.com/p/hey-hey-if-there-s-anyone-who-s-looking-to-get-into-learning-a-n6g4jzpq',
@@ -220,7 +220,7 @@ class GameJoltIE(GameJoltBaseIE):
             'upload_date': '20211015',
             'view_count': int,
             'chapters': 'count:18',
-        }
+        },
     }, {
         # Article
         'url': 'https://gamejolt.com/p/i-fuckin-broke-chaos-d56h3eue',
@@ -243,7 +243,7 @@ class GameJoltIE(GameJoltBaseIE):
             'like_count': int,
             'comment_count': int,
             'view_count': int,
-        }
+        },
     }, {
         # Single GIF
         'url': 'https://gamejolt.com/p/hello-everyone-i-m-developing-a-pixel-art-style-mod-for-fnf-and-i-vs4gdrd8',
@@ -267,9 +267,9 @@ class GameJoltIE(GameJoltBaseIE):
                 'id': 'dszyjnwi',
                 'ext': 'webm',
                 'title': 'gif-presentacion-mejorado-dszyjnwi',
-                'n_entries': 1,
-            }
-        }]
+            },
+        }],
+        'playlist_count': 1,
     }, {
         # Multiple GIFs
         'url': 'https://gamejolt.com/p/gif-yhsqkumq',
@@ -310,7 +310,7 @@ class GameJoltPostListBaseIE(GameJoltBaseIE):
                 endpoint, list_id, note=f'{note} page {page_num}', errnote=errnote, data=json.dumps({
                     'scrollDirection': 'from',
                     'scrollId': scroll_id,
-                }).encode('utf-8')).get('items')
+                }).encode()).get('items')
 
 
 class GameJoltUserIE(GameJoltPostListBaseIE):
@@ -348,7 +348,7 @@ class GameJoltGameIE(GameJoltPostListBaseIE):
         'info_dict': {
             'id': '655124',
             'title': 'Friday Night Funkin\': Friday 4 Fun',
-            'description': 'md5:576a7dd87912a2dcf33c50d2bd3966d3'
+            'description': 'md5:576a7dd87912a2dcf33c50d2bd3966d3',
         },
         'params': {
             'ignore_no_formats_error': True,
@@ -374,7 +374,6 @@ class GameJoltGameSoundtrackIE(GameJoltBaseIE):
         'info_dict': {
             'id': '657899',
             'title': 'Friday Night Funkin\': Vs Oswald',
-            'n_entries': None,
         },
         'playlist': [{
             'info_dict': {
@@ -384,8 +383,7 @@ class GameJoltGameSoundtrackIE(GameJoltBaseIE):
                 'url': r're:^https://.+vs-oswald-menu-music\.mp3$',
                 'release_timestamp': 1635190816,
                 'release_date': '20211025',
-                'n_entries': 3,
-            }
+            },
         }, {
             'info_dict': {
                 'id': '184435',
@@ -394,8 +392,7 @@ class GameJoltGameSoundtrackIE(GameJoltBaseIE):
                 'url': r're:^https://.+rabbit-s-luck--full-version-\.mp3$',
                 'release_timestamp': 1635190841,
                 'release_date': '20211025',
-                'n_entries': 3,
-            }
+            },
         }, {
             'info_dict': {
                 'id': '185228',
@@ -404,9 +401,9 @@ class GameJoltGameSoundtrackIE(GameJoltBaseIE):
                 'url': r're:^https://.+last-straw\.mp3$',
                 'release_timestamp': 1635881104,
                 'release_date': '20211102',
-                'n_entries': 3,
-            }
-        }]
+            },
+        }],
+        'playlist_count': 3,
     }]
 
     def _real_extract(self, url):
@@ -430,7 +427,7 @@ class GameJoltCommunityIE(GameJoltPostListBaseIE):
         'info_dict': {
             'id': 'fnf/videos',
             'title': 'Friday Night Funkin\' - Videos',
-            'description': 'md5:6d8c06f27460f7d35c1554757ffe53c8'
+            'description': 'md5:6d8c06f27460f7d35c1554757ffe53c8',
         },
         'params': {
             'playlistend': 50,
@@ -443,7 +440,7 @@ class GameJoltCommunityIE(GameJoltPostListBaseIE):
         'info_dict': {
             'id': 'youtubers/featured',
             'title': 'Youtubers - featured',
-            'description': 'md5:53e5582c93dcc467ab597bfca4db17d4'
+            'description': 'md5:53e5582c93dcc467ab597bfca4db17d4',
         },
         'params': {
             'playlistend': 50,
@@ -531,7 +528,7 @@ class GameJoltSearchIE(GameJoltPostListBaseIE):
 
     def _real_extract(self, url):
         filter_mode, query = self._match_valid_url(url).group('filter', 'id')
-        display_query = compat_urllib_parse_unquote(query)
+        display_query = urllib.parse.unquote(query)
         return self.playlist_result(
             self._search_entries(query, filter_mode, display_query) if filter_mode else self._entries(
                 f'web/posts/fetch/search/{query}', display_query, initial_items=self._call_api(
diff --git a/plugins/youtube_download/yt_dlp/extractor/gamespot.py b/plugins/youtube_download/yt_dlp/extractor/gamespot.py
index 8dec252..cd3f965 100644
--- a/plugins/youtube_download/yt_dlp/extractor/gamespot.py
+++ b/plugins/youtube_download/yt_dlp/extractor/gamespot.py
@@ -1,5 +1,6 @@
+import urllib.parse
+
 from .once import OnceIE
-from ..compat import compat_urllib_parse_unquote
 
 
 class GameSpotIE(OnceIE):
@@ -40,7 +41,7 @@ class GameSpotIE(OnceIE):
         data_video = self._parse_json(self._html_search_regex(
             r'data-video=(["\'])({.*?})\1', webpage,
             'video data', group=2), page_id)
-        title = compat_urllib_parse_unquote(data_video['title'])
+        title = urllib.parse.unquote(data_video['title'])
         streams = data_video['videoStreams']
         formats = []
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/gamestar.py b/plugins/youtube_download/yt_dlp/extractor/gamestar.py
index e9966f5..8e3b8a5 100644
--- a/plugins/youtube_download/yt_dlp/extractor/gamestar.py
+++ b/plugins/youtube_download/yt_dlp/extractor/gamestar.py
@@ -19,7 +19,7 @@ class GameStarIE(InfoExtractor):
             'timestamp': 1406542380,
             'upload_date': '20140728',
             'duration': 17,
-        }
+        },
     }, {
         'url': 'http://www.gamepro.de/videos/top-10-indie-spiele-fuer-nintendo-switch-video-tolle-nindies-games-zum-download,95316.html',
         'only_matching': True,
@@ -42,7 +42,7 @@ class GameStarIE(InfoExtractor):
             webpage, 'JSON-LD', group='json_ld'), video_id)
         info_dict = self._json_ld(json_ld, video_id)
         info_dict['title'] = remove_end(
-            info_dict['title'], ' - Game%s' % site.title())
+            info_dict['title'], f' - Game{site.title()}')
 
         view_count = int_or_none(json_ld.get('interactionCount'))
         comment_count = int_or_none(self._html_search_regex(
@@ -54,7 +54,7 @@ class GameStarIE(InfoExtractor):
             'url': 'http://gamestar.de/_misc/videos/portal/getVideoUrl.cfm?premium=0&videoId=' + video_id,
             'ext': 'mp4',
             'view_count': view_count,
-            'comment_count': comment_count
+            'comment_count': comment_count,
         })
 
         return info_dict
diff --git a/plugins/youtube_download/yt_dlp/extractor/gaskrank.py b/plugins/youtube_download/yt_dlp/extractor/gaskrank.py
index e0bbdae..beb5a8a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/gaskrank.py
+++ b/plugins/youtube_download/yt_dlp/extractor/gaskrank.py
@@ -1,4 +1,5 @@
 import re
+
 from .common import InfoExtractor
 from ..utils import (
     float_or_none,
@@ -21,8 +22,7 @@ class GaskrankIE(InfoExtractor):
             'display_id': 'strike-einparken-durch-anfaenger-crash-mit-groesserem-flurschaden',
             'uploader_id': 'Bikefun',
             'upload_date': '20170110',
-            'uploader_url': None,
-        }
+        },
     }, {
         'url': 'http://www.gaskrank.tv/tv/racing/isle-of-man-tt-2011-michael-du-15920.htm',
         'md5': 'c33ee32c711bc6c8224bfcbe62b23095',
@@ -36,7 +36,7 @@ class GaskrankIE(InfoExtractor):
             'uploader_id': 'IOM',
             'upload_date': '20170523',
             'uploader_url': 'www.iomtt.com',
-        }
+        },
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/gazeta.py b/plugins/youtube_download/yt_dlp/extractor/gazeta.py
index c6868a6..b1b6ee7 100644
--- a/plugins/youtube_download/yt_dlp/extractor/gazeta.py
+++ b/plugins/youtube_download/yt_dlp/extractor/gazeta.py
@@ -2,6 +2,7 @@ from .common import InfoExtractor
 
 
 class GazetaIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'(?P<url>https?://(?:www\.)?gazeta\.ru/(?:[^/]+/)?video/(?:main/)*(?:\d{4}/\d{2}/\d{2}/)?(?P<id>[A-Za-z0-9-_.]+)\.s?html)'
     _TESTS = [{
         'url': 'http://www.gazeta.ru/video/main/zadaite_vopros_vladislavu_yurevichu.shtml',
@@ -32,7 +33,7 @@ class GazetaIE(InfoExtractor):
         mobj = self._match_valid_url(url)
 
         display_id = mobj.group('id')
-        embed_url = '%s?p=embed' % mobj.group('url')
+        embed_url = '{}?p=embed'.format(mobj.group('url'))
         embed_page = self._download_webpage(
             embed_url, display_id, 'Downloading embed page')
 
@@ -40,4 +41,4 @@ class GazetaIE(InfoExtractor):
             r'<div[^>]*?class="eagleplayer"[^>]*?data-id="([^"]+)"', embed_page, 'video id')
 
         return self.url_result(
-            'eagleplatform:gazeta.media.eagleplatform.com:%s' % video_id, 'EaglePlatform')
+            f'eagleplatform:gazeta.media.eagleplatform.com:{video_id}', 'EaglePlatform')
diff --git a/plugins/youtube_download/yt_dlp/extractor/gbnews.py b/plugins/youtube_download/yt_dlp/extractor/gbnews.py
new file mode 100644
index 0000000..d652566
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/gbnews.py
@@ -0,0 +1,113 @@
+from .common import InfoExtractor
+from ..utils import (
+    ExtractorError,
+    extract_attributes,
+    get_elements_html_by_class,
+    url_or_none,
+)
+from ..utils.traversal import traverse_obj
+
+
+class GBNewsIE(InfoExtractor):
+    IE_DESC = 'GB News clips, features and live streams'
+    _VALID_URL = r'https?://(?:www\.)?gbnews\.(?:uk|com)/(?:\w+/)?(?P<id>[^#?]+)'
+
+    _PLATFORM = 'safari'
+    _SSMP_URL = 'https://mm-v2.simplestream.com/ssmp/api.php'
+    _TESTS = [{
+        'url': 'https://www.gbnews.com/news/bbc-claudine-gay-harvard-university-antisemitism-row',
+        'info_dict': {
+            'id': '52264136',
+            'ext': 'mp4',
+            'thumbnail': r're:https?://www\.gbnews\.\w+/.+\.(?:jpe?g|png|webp)',
+            'display_id': 'bbc-claudine-gay-harvard-university-antisemitism-row',
+            'description': 'The post was criticised by former employers of the broadcaster',
+            'title': 'BBC deletes post after furious backlash over headline downplaying antisemitism',
+        },
+    }, {
+        'url': 'https://www.gbnews.com/royal/prince-harry-in-love-with-kate-meghan-markle-jealous-royal',
+        'info_dict': {
+            'id': '52328390',
+            'ext': 'mp4',
+            'thumbnail': r're:https?://www\.gbnews\.\w+/.+\.(?:jpe?g|png|webp)',
+            'display_id': 'prince-harry-in-love-with-kate-meghan-markle-jealous-royal',
+            'description': 'Ingrid Seward has published 17 books documenting the highs and lows of the Royal Family',
+            'title': 'Royal author claims Prince Harry was \'in love\' with Kate - Meghan was \'jealous\'',
+        },
+    }, {
+        'url': 'https://www.gbnews.uk/watchlive',
+        'info_dict': {
+            'id': '1069',
+            'ext': 'mp4',
+            'thumbnail': r're:https?://www\.gbnews\.\w+/.+\.(?:jpe?g|png|webp)',
+            'display_id': 'watchlive',
+            'live_status': 'is_live',
+            'title': r're:^GB News Live',
+        },
+        'params': {'skip_download': 'm3u8'},
+    }]
+    _SS_ENDPOINTS = None
+
+    def _get_ss_endpoint(self, data_id, data_env):
+        if not self._SS_ENDPOINTS:
+            self._SS_ENDPOINTS = {}
+
+        if not data_id:
+            data_id = 'GB003'
+        if not data_env:
+            data_env = 'production'
+        key = data_id, data_env
+        result = self._SS_ENDPOINTS.get(key)
+        if result:
+            return result
+
+        json_data = self._download_json(
+            self._SSMP_URL, None, 'Downloading Simplestream JSON metadata', query={
+                'id': data_id,
+                'env': data_env,
+            })
+        meta_url = traverse_obj(json_data, ('response', 'api_hostname', {url_or_none}))
+        if not meta_url:
+            raise ExtractorError('No API host found')
+
+        self._SS_ENDPOINTS[key] = meta_url
+        return meta_url
+
+    def _real_extract(self, url):
+        display_id = self._match_id(url).rpartition('/')[2]
+        webpage = self._download_webpage(url, display_id)
+
+        video_data = None
+        elements = get_elements_html_by_class('simplestream', webpage)
+        for html_tag in elements:
+            attributes = extract_attributes(html_tag)
+            if 'sidebar' not in (attributes.get('class') or ''):
+                video_data = attributes
+        if not video_data:
+            raise ExtractorError('Could not find video element', expected=True)
+
+        endpoint_url = self._get_ss_endpoint(video_data.get('data-id'), video_data.get('data-env'))
+
+        uvid = video_data['data-uvid']
+        video_type = video_data.get('data-type')
+        if not video_type or video_type == 'vod':
+            video_type = 'show'
+        stream_data = self._download_json(
+            f'{endpoint_url}/api/{video_type}/stream/{uvid}',
+            uvid, 'Downloading stream JSON', query={
+                'key': video_data.get('data-key'),
+                'platform': self._PLATFORM,
+            })
+        if traverse_obj(stream_data, 'drm'):
+            self.report_drm(uvid)
+
+        return {
+            'id': uvid,
+            'display_id': display_id,
+            'title': self._og_search_title(webpage, default=None),
+            'description': self._og_search_description(webpage, default=None),
+            'formats': self._extract_m3u8_formats(traverse_obj(stream_data, (
+                'response', 'stream', {url_or_none})), uvid, 'mp4'),
+            'thumbnail': self._og_search_thumbnail(webpage, default=None),
+            'is_live': video_type == 'live',
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/gdcvault.py b/plugins/youtube_download/yt_dlp/extractor/gdcvault.py
index 4265feb..5d45240 100644
--- a/plugins/youtube_download/yt_dlp/extractor/gdcvault.py
+++ b/plugins/youtube_download/yt_dlp/extractor/gdcvault.py
@@ -7,6 +7,7 @@ from ..utils import remove_start, smuggle_url, urlencode_postdata
 
 
 class GDCVaultIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?gdcvault\.com/play/(?P<id>\d+)(?:/(?P<name>[\w-]+))?'
     _NETRC_MACHINE = 'gdcvault'
     _TESTS = [
@@ -17,8 +18,8 @@ class GDCVaultIE(InfoExtractor):
                 'id': '201311826596_AWNY',
                 'display_id': 'Doki-Doki-Universe-Sweet-Simple',
                 'ext': 'mp4',
-                'title': 'Doki-Doki Universe: Sweet, Simple and Genuine (GDC Next 10)'
-            }
+                'title': 'Doki-Doki Universe: Sweet, Simple and Genuine (GDC Next 10)',
+            },
         },
         {
             'url': 'http://www.gdcvault.com/play/1015683/Embracing-the-Dark-Art-of',
@@ -26,11 +27,11 @@ class GDCVaultIE(InfoExtractor):
                 'id': '201203272_1330951438328RSXR',
                 'display_id': 'Embracing-the-Dark-Art-of',
                 'ext': 'flv',
-                'title': 'Embracing the Dark Art of Mathematical Modeling in AI'
+                'title': 'Embracing the Dark Art of Mathematical Modeling in AI',
             },
             'params': {
                 'skip_download': True,  # Requires rtmpdump
-            }
+            },
         },
         {
             'url': 'http://www.gdcvault.com/play/1015301/Thexder-Meets-Windows-95-or',
@@ -201,7 +202,7 @@ class GDCVaultIE(InfoExtractor):
                     'display_id': display_id,
                 })
                 return info
-            embed_url = '%s/xml/%s' % (xml_root, xml_name)
+            embed_url = f'{xml_root}/xml/{xml_name}'
             ie_key = 'DigitallySpeaking'
 
         return {
diff --git a/plugins/youtube_download/yt_dlp/extractor/gedidigital.py b/plugins/youtube_download/yt_dlp/extractor/gedidigital.py
index 1878d63..2ffa660 100644
--- a/plugins/youtube_download/yt_dlp/extractor/gedidigital.py
+++ b/plugins/youtube_download/yt_dlp/extractor/gedidigital.py
@@ -109,7 +109,7 @@ class GediDigitalIE(InfoExtractor):
         # add protocol if missing
         for i, e in enumerate(urls):
             if e.startswith('//'):
-                urls[i] = 'https:%s' % e
+                urls[i] = f'https:{e}'
         # clean iframes urls
         for i, e in enumerate(urls):
             urls[i] = urljoin(base_url(e), url_basename(e))
@@ -166,7 +166,7 @@ class GediDigitalIE(InfoExtractor):
                             'abr': abr,
                             'tbr': abr,
                             'acodec': ext,
-                            'vcodec': 'none'
+                            'vcodec': 'none',
                         })
                     else:
                         mobj = re.match(r'^video-rrtv-(\d+)(?:-(\d+))?$', n)
diff --git a/plugins/youtube_download/yt_dlp/extractor/generic.py b/plugins/youtube_download/yt_dlp/extractor/generic.py
index f5c59a0..721d04e 100644
--- a/plugins/youtube_download/yt_dlp/extractor/generic.py
+++ b/plugins/youtube_download/yt_dlp/extractor/generic.py
@@ -4,10 +4,13 @@ import types
 import urllib.parse
 import xml.etree.ElementTree
 
-from .common import InfoExtractor  # isort: split
+from .common import InfoExtractor
 from .commonprotocols import RtmpIE
 from .youtube import YoutubeIE
 from ..compat import compat_etree_fromstring
+from ..cookies import LenientSimpleCookie
+from ..networking.exceptions import HTTPError
+from ..networking.impersonate import ImpersonateTarget
 from ..utils import (
     KNOWN_EXTENSIONS,
     MEDIA_EXTENSIONS,
@@ -17,6 +20,7 @@ from ..utils import (
     determine_protocol,
     dict_get,
     extract_basic_auth,
+    filter_dict,
     format_field,
     int_or_none,
     is_html,
@@ -33,14 +37,17 @@ from ..utils import (
     unescapeHTML,
     unified_timestamp,
     unsmuggle_url,
+    update_url,
     update_url_query,
     url_or_none,
+    urlhandle_detect_ext,
     urljoin,
     variadic,
     xpath_attr,
     xpath_text,
     xpath_with_ns,
 )
+from ..utils._utils import _UnsafeExtensionError
 
 
 class GenericIE(InfoExtractor):
@@ -58,7 +65,9 @@ class GenericIE(InfoExtractor):
                 'ext': 'mp4',
                 'title': 'trailer',
                 'upload_date': '20100513',
-            }
+                'direct': True,
+                'timestamp': 1273772943.0,
+            },
         },
         # Direct link to media delivered compressed (until Accept-Encoding is *)
         {
@@ -71,7 +80,7 @@ class GenericIE(InfoExtractor):
                 'upload_date': '20140522',
             },
             'expected_warnings': [
-                'URL could be a direct video link, returning it as such.'
+                'URL could be a direct video link, returning it as such.',
             ],
             'skip': 'URL invalid',
         },
@@ -101,10 +110,12 @@ class GenericIE(InfoExtractor):
                 'ext': 'webm',
                 'title': '5_Lennart_Poettering_-_Systemd',
                 'upload_date': '20141120',
+                'direct': True,
+                'timestamp': 1416498816.0,
             },
             'expected_warnings': [
-                'URL could be a direct video link, returning it as such.'
-            ]
+                'URL could be a direct video link, returning it as such.',
+            ],
         },
         # RSS feed
         {
@@ -112,7 +123,7 @@ class GenericIE(InfoExtractor):
             'info_dict': {
                 'id': 'https://phihag.de/2014/youtube-dl/rss2.xml',
                 'title': 'Zero Punctuation',
-                'description': 're:.*groundbreaking video review series.*'
+                'description': 're:.*groundbreaking video review series.*',
             },
             'playlist_mincount': 11,
         },
@@ -133,6 +144,7 @@ class GenericIE(InfoExtractor):
                     'upload_date': '20201204',
                 },
             }],
+            'skip': 'Dead link',
         },
         # RSS feed with item with description and thumbnails
         {
@@ -145,12 +157,12 @@ class GenericIE(InfoExtractor):
             'playlist': [{
                 'info_dict': {
                     'ext': 'm4a',
-                    'id': 'c1c879525ce2cb640b344507e682c36d',
+                    'id': '818a5d38-01cd-152f-2231-ee479677fa82',
                     'title': 're:Hydrogen!',
                     'description': 're:.*In this episode we are going.*',
                     'timestamp': 1567977776,
                     'upload_date': '20190908',
-                    'duration': 459,
+                    'duration': 423,
                     'thumbnail': r're:^https?://.*\.jpg$',
                     'episode_number': 1,
                     'season_number': 1,
@@ -267,6 +279,7 @@ class GenericIE(InfoExtractor):
             'params': {
                 'skip_download': True,
             },
+            'skip': '404 Not Found',
         },
         # MPD from http://dash-mse-test.appspot.com/media.html
         {
@@ -278,6 +291,20 @@ class GenericIE(InfoExtractor):
                 'title': 'car-20120827-manifest',
                 'formats': 'mincount:9',
                 'upload_date': '20130904',
+                'timestamp': 1378272859.0,
+            },
+        },
+        # Live DASH MPD
+        {
+            'url': 'https://livesim2.dashif.org/livesim2/ato_10/testpic_2s/Manifest.mpd',
+            'info_dict': {
+                'id': 'Manifest',
+                'ext': 'mp4',
+                'title': r're:Manifest \d{4}-\d{2}-\d{2} \d{2}:\d{2}$',
+                'live_status': 'is_live',
+            },
+            'params': {
+                'skip_download': 'livestream',
             },
         },
         # m3u8 served with Content-Type: audio/x-mpegURL; charset=utf-8
@@ -318,14 +345,14 @@ class GenericIE(InfoExtractor):
                 'id': 'cmQHVoWB5FY',
                 'ext': 'mp4',
                 'upload_date': '20130224',
-                'uploader_id': 'TheVerge',
+                'uploader_id': '@TheVerge',
                 'description': r're:^Chris Ziegler takes a look at the\.*',
                 'uploader': 'The Verge',
                 'title': 'First Firefox OS phones side-by-side',
             },
             'params': {
                 'skip_download': False,
-            }
+            },
         },
         {
             # redirect in Refresh HTTP header
@@ -351,7 +378,7 @@ class GenericIE(InfoExtractor):
                 'ext': 'mp4',
                 'uploader': 'www.hodiho.fr',
                 'title': 'R\u00e9gis plante sa Jeep',
-            }
+            },
         },
         # bandcamp page with custom domain
         {
@@ -365,46 +392,6 @@ class GenericIE(InfoExtractor):
             },
             'skip': 'There is a limit of 200 free downloads / month for the test song',
         },
-        # ooyala video
-        {
-            'url': 'http://www.rollingstone.com/music/videos/norwegian-dj-cashmere-cat-goes-spartan-on-with-me-premiere-20131219',
-            'md5': '166dd577b433b4d4ebfee10b0824d8ff',
-            'info_dict': {
-                'id': 'BwY2RxaTrTkslxOfcan0UCf0YqyvWysJ',
-                'ext': 'mp4',
-                'title': '2cc213299525360.mov',  # that's what we get
-                'duration': 238.231,
-            },
-            'add_ie': ['Ooyala'],
-        },
-        {
-            # ooyala video embedded with http://player.ooyala.com/iframe.js
-            'url': 'http://www.macrumors.com/2015/07/24/steve-jobs-the-man-in-the-machine-first-trailer/',
-            'info_dict': {
-                'id': 'p0MGJndjoG5SOKqO_hZJuZFPB-Tr5VgB',
-                'ext': 'mp4',
-                'title': '"Steve Jobs: Man in the Machine" trailer',
-                'description': 'The first trailer for the Alex Gibney documentary "Steve Jobs: Man in the Machine."',
-                'duration': 135.427,
-            },
-            'params': {
-                'skip_download': True,
-            },
-            'skip': 'movie expired',
-        },
-        # ooyala video embedded with http://player.ooyala.com/static/v4/production/latest/core.min.js
-        {
-            'url': 'http://wnep.com/2017/07/22/steampunk-fest-comes-to-honesdale/',
-            'info_dict': {
-                'id': 'lwYWYxYzE6V5uJMjNGyKtwwiw9ZJD7t2',
-                'ext': 'mp4',
-                'title': 'Steampunk Fest Comes to Honesdale',
-                'duration': 43.276,
-            },
-            'params': {
-                'skip_download': True,
-            }
-        },
         # embed.ly video
         {
             'url': 'http://www.tested.com/science/weird/460206-tested-grinding-coffee-2000-frames-second/',
@@ -469,19 +456,19 @@ class GenericIE(InfoExtractor):
                     'id': '370908',
                     'title': 'Госзаказ. День 3',
                     'ext': 'mp4',
-                }
+                },
             }, {
                 'info_dict': {
                     'id': '370905',
                     'title': 'Госзаказ. День 2',
                     'ext': 'mp4',
-                }
+                },
             }, {
                 'info_dict': {
                     'id': '370902',
                     'title': 'Госзаказ. День 1',
                     'ext': 'mp4',
-                }
+                },
             }],
             'params': {
                 # m3u8 download
@@ -497,7 +484,8 @@ class GenericIE(InfoExtractor):
                 'title': 'Ужастики, русский трейлер (2015)',
                 'thumbnail': r're:^https?://.*\.jpg$',
                 'duration': 153,
-            }
+            },
+            'skip': 'Site dead',
         },
         # XHamster embed
         {
@@ -521,7 +509,7 @@ class GenericIE(InfoExtractor):
                 'title': 'Hidden miracles of the natural world',
                 'uploader': 'Louie Schwartzberg',
                 'description': 'md5:8145d19d320ff3e52f28401f4c4283b9',
-            }
+            },
         },
         # nowvideo embed hidden behind percent encoding
         {
@@ -546,7 +534,7 @@ class GenericIE(InfoExtractor):
                 'upload_date': '20140320',
             },
             'params': {
-                'skip_download': 'Requires rtmpdump'
+                'skip_download': 'Requires rtmpdump',
             },
             'skip': 'video gone',
         },
@@ -567,8 +555,8 @@ class GenericIE(InfoExtractor):
                 'skip_download': True,
             },
             'expected_warnings': [
-                'Forbidden'
-            ]
+                'Forbidden',
+            ],
         },
         # Condé Nast embed
         {
@@ -578,7 +566,7 @@ class GenericIE(InfoExtractor):
                 'id': '53501be369702d3275860000',
                 'ext': 'mp4',
                 'title': 'Honda’s  New Asimo Robot Is More Human Than Ever',
-            }
+            },
         },
         # Dailymotion embed
         {
@@ -625,7 +613,7 @@ class GenericIE(InfoExtractor):
             'add_ie': ['Youtube'],
             'params': {
                 'skip_download': True,
-            }
+            },
         },
         # MTVServices embed
         {
@@ -654,7 +642,7 @@ class GenericIE(InfoExtractor):
             },
             'params': {
                 'skip_download': True,
-            }
+            },
         },
         # Flowplayer
         {
@@ -666,7 +654,7 @@ class GenericIE(InfoExtractor):
                 'age_limit': 18,
                 'uploader': 'www.handjobhub.com',
                 'title': 'Busty Blonde Siri Tit Fuck While Wank at HandjobHub.com',
-            }
+            },
         },
         # MLB embed
         {
@@ -710,7 +698,7 @@ class GenericIE(InfoExtractor):
                 'uploader': 'Sophos Security',
                 'title': 'Chet Chat 171 - Oct 29, 2014',
                 'upload_date': '20141029',
-            }
+            },
         },
         # Soundcloud multiple embeds
         {
@@ -744,7 +732,7 @@ class GenericIE(InfoExtractor):
                 'ext': 'flv',
                 'upload_date': '20141112',
                 'title': 'Rosetta #CometLanding webcast HL 10',
-            }
+            },
         },
         # Another Livestream embed, without 'new.' in URL
         {
@@ -769,15 +757,17 @@ class GenericIE(InfoExtractor):
             'playlist_mincount': 1,
             'add_ie': ['Youtube'],
         },
-        # Cinchcast embed
+        # Libsyn embed
         {
             'url': 'http://undergroundwellness.com/podcasts/306-5-steps-to-permanent-gut-healing/',
             'info_dict': {
-                'id': '7141703',
+                'id': '3793998',
                 'ext': 'mp3',
                 'upload_date': '20141126',
-                'title': 'Jack Tips: 5 Steps to Permanent Gut Healing',
-            }
+                'title': 'Underground Wellness Radio - Jack Tips: 5 Steps to Permanent Gut Healing',
+                'thumbnail': 'https://assets.libsyn.com/secure/item/3793998/?height=90&width=90',
+                'duration': 3989.0,
+            },
         },
         # Cinerama player
         {
@@ -787,7 +777,7 @@ class GenericIE(InfoExtractor):
                 'ext': 'mp4',
                 'uploader': 'www.abc.net.au',
                 'title': 'Game of Thrones with dice - Dungeons and Dragons fantasy role-playing game gets new life - 19/01/2015',
-            }
+            },
         },
         # embedded viddler video
         {
@@ -904,7 +894,7 @@ class GenericIE(InfoExtractor):
             'info_dict': {
                 'id': 'aanslagen-kopenhagen',
                 'title': 'Aanslagen Kopenhagen',
-            }
+            },
         },
         # Zapiks embed
         {
@@ -913,7 +903,7 @@ class GenericIE(InfoExtractor):
                 'id': '118046',
                 'ext': 'mp4',
                 'title': 'EP3S5 - Bon Appétit - Baqueira Mi Corazon !',
-            }
+            },
         },
         # Kaltura embed (different embed code)
         {
@@ -952,11 +942,11 @@ class GenericIE(InfoExtractor):
             },
             'add_ie': ['Kaltura'],
             'expected_warnings': [
-                'Could not send HEAD request'
+                'Could not send HEAD request',
             ],
             'params': {
                 'skip_download': True,
-            }
+            },
         },
         {
             # Kaltura embedded, some fileExt broken (#11480)
@@ -1083,7 +1073,7 @@ class GenericIE(InfoExtractor):
             'info_dict': {
                 'id': '8RUoRhRi',
                 'ext': 'mp4',
-                'title': "Fox & Friends Says Protecting Atheists From Discrimination Is Anti-Christian!",
+                'title': 'Fox & Friends Says Protecting Atheists From Discrimination Is Anti-Christian!',
                 'description': 'md5:e1a46ad1650e3a5ec7196d432799127f',
                 'timestamp': 1428207000,
                 'upload_date': '20150405',
@@ -1159,7 +1149,7 @@ class GenericIE(InfoExtractor):
                 'uploader': 'clickhole',
                 'upload_date': '20150527',
                 'timestamp': 1432744860,
-            }
+            },
         },
         # SnagFilms embed
         {
@@ -1168,7 +1158,7 @@ class GenericIE(InfoExtractor):
                 'id': '74849a00-85a9-11e1-9660-123139220831',
                 'ext': 'mp4',
                 'title': '#whilewewatch',
-            }
+            },
         },
         # AdobeTVVideo embed
         {
@@ -1464,7 +1454,7 @@ class GenericIE(InfoExtractor):
                     'upload_date': '20211217',
                     'thumbnail': 'https://www.megatv.com/wp-content/uploads/2021/12/tsiodras-mitsotakis-1024x545.jpg',
                 },
-            }]
+            }],
         },
         {
             'url': 'https://www.ertnews.gr/video/manolis-goyalles-o-anthropos-piso-apo-ti-diadiktyaki-vasilopita/',
@@ -1558,16 +1548,6 @@ class GenericIE(InfoExtractor):
                 'title': 'Стас Намин: «Мы нарушили девственность Кремля»',
             },
         },
-        {
-            # vzaar embed
-            'url': 'http://help.vzaar.com/article/165-embedding-video',
-            'md5': '7e3919d9d2620b89e3e00bec7fe8c9d4',
-            'info_dict': {
-                'id': '8707641',
-                'ext': 'mp4',
-                'title': 'Building A Business Online: Principal Chairs Q & A',
-            },
-        },
         {
             # multiple HTML5 videos on one page
             'url': 'https://www.paragon-software.com/home/rk-free/keyscenarios.html',
@@ -1585,7 +1565,7 @@ class GenericIE(InfoExtractor):
                 'id': '0f64ce6',
                 'title': 'vl14062007715967',
                 'ext': 'mp4',
-            }
+            },
         },
         {
             'url': 'http://www.heidelberg-laureate-forum.org/blog/video/lecture-friday-september-23-2016-sir-c-antony-r-hoare/',
@@ -1597,7 +1577,7 @@ class GenericIE(InfoExtractor):
                 'description': 'md5:5a51db84a62def7b7054df2ade403c6c',
                 'timestamp': 1474354800,
                 'upload_date': '20160920',
-            }
+            },
         },
         {
             'url': 'http://www.kidzworld.com/article/30935-trolls-the-beat-goes-on-interview-skylar-astin-and-amanda-leighton',
@@ -1689,7 +1669,7 @@ class GenericIE(InfoExtractor):
             'info_dict': {
                 'id': '83645793',
                 'title': 'Lock up and get excited',
-                'ext': 'mp4'
+                'ext': 'mp4',
             },
             'skip': 'TODO: fix nested playlists processing in tests',
         },
@@ -1765,7 +1745,7 @@ class GenericIE(InfoExtractor):
                 'upload_date': '20220110',
                 'thumbnail': 'https://opentv-static.siliconweb.com/imgHandler/1920/70bc39fa-895b-4918-a364-c39d2135fc6d.jpg',
 
-            }
+            },
         },
         {
             # blogger embed
@@ -1935,8 +1915,8 @@ class GenericIE(InfoExtractor):
                 'timestamp': 1501941939.0,
                 'title': 'That small heart attack.',
                 'upload_date': '20170805',
-                'uploader': 'Antw87'
-            }
+                'uploader': 'Antw87',
+            },
         },
         {
             # 1080p Reddit-hosted video that will redirect and be processed by RedditIE
@@ -1948,8 +1928,8 @@ class GenericIE(InfoExtractor):
                 'title': "The game Didn't want me to Knife that Guy I guess",
                 'uploader': 'paraf1ve',
                 'timestamp': 1636788683.0,
-                'upload_date': '20211113'
-            }
+                'upload_date': '20211113',
+            },
         },
         {
             # MainStreaming player
@@ -1961,15 +1941,15 @@ class GenericIE(InfoExtractor):
                 'ext': 'mp4',
                 'live_status': 'not_live',
                 'thumbnail': r're:https?://[A-Za-z0-9-]*\.msvdn.net/image/\w+/poster',
-                'duration': 1512
-            }
+                'duration': 1512,
+            },
         },
         {
             # Multiple gfycat iframe embeds
             'url': 'https://www.gezip.net/bbs/board.php?bo_table=entertaine&wr_id=613422',
             'info_dict': {
                 'title': '재이, 윤, 세은 황금 드레스를 입고 빛난다',
-                'id': 'board'
+                'id': 'board',
             },
             'playlist_count': 8,
         },
@@ -1978,18 +1958,18 @@ class GenericIE(InfoExtractor):
             'url': 'https://www.gezip.net/bbs/board.php?bo_table=entertaine&wr_id=612199',
             'info_dict': {
                 'title': '옳게 된 크롭 니트 스테이씨 아이사',
-                'id': 'board'
+                'id': 'board',
             },
-            'playlist_count': 6
+            'playlist_count': 6,
         },
         {
             # Multiple gfycat embeds, with uppercase "IFR" in urls
             'url': 'https://kkzz.kr/?vid=2295',
             'info_dict': {
                 'title': '지방시 앰버서더 에스파 카리나 움짤',
-                'id': '?vid=2295'
+                'id': '?vid=2295',
             },
-            'playlist_count': 9
+            'playlist_count': 9,
         },
         {
             # Panopto embeds
@@ -2022,9 +2002,9 @@ class GenericIE(InfoExtractor):
             'url': 'https://www.hs.fi/kotimaa/art-2000008762560.html',
             'info_dict': {
                 'title': 'Koronavirus | Epidemiahuippu voi olla Suomessa ohi, mutta koronaviruksen poistamista yleisvaarallisten tautien joukosta harkitaan vasta syksyllä',
-                'id': 'art-2000008762560'
+                'id': 'art-2000008762560',
             },
-            'playlist_count': 3
+            'playlist_count': 3,
         },
         {
             # Ruutu embed in hs.fi with a single video
@@ -2053,7 +2033,7 @@ class GenericIE(InfoExtractor):
                 'thumbnail': 'https://www.filmarkivet.se/wp-content/uploads/parisdmoll2.jpg',
                 'timestamp': 1652833414,
                 'age_limit': 0,
-            }
+            },
         },
         {
             'url': 'https://www.mollymovieclub.com/p/interstellar?s=r#details',
@@ -2093,7 +2073,7 @@ class GenericIE(InfoExtractor):
                 'thumbnail': 'https://cdn.jwplayer.com/v2/media/YTmgRiNU/poster.jpg?width=720',
                 'duration': 5688.0,
                 'upload_date': '20210111',
-            }
+            },
         },
         {
             'note': 'JSON LD with multiple @type',
@@ -2109,7 +2089,7 @@ class GenericIE(InfoExtractor):
                 'upload_date': '20200411',
                 'age_limit': 0,
                 'duration': 111.0,
-            }
+            },
         },
         {
             'note': 'JSON LD with unexpected data type',
@@ -2124,7 +2104,7 @@ class GenericIE(InfoExtractor):
                 'thumbnail': r're:^https://media.autoweek.nl/m/.+\.jpg$',
                 'age_limit': 0,
                 'direct': True,
-            }
+            },
         },
         {
             'note': 'server returns data in brotli compression by default if `accept-encoding: *` is specified.',
@@ -2142,22 +2122,6 @@ class GenericIE(InfoExtractor):
                 'age_limit': 0,
             },
         },
-        {
-            'note': 'JW Player embed with unicode-escape sequences in URL',
-            'url': 'https://www.medici.tv/en/concerts/lahav-shani-mozart-mahler-israel-philharmonic-abu-dhabi-classics',
-            'info_dict': {
-                'id': 'm',
-                'ext': 'mp4',
-                'title': 'Lahav Shani conducts the Israel Philharmonic\'s first-ever concert in Abu Dhabi',
-                'description': 'Mahler\'s ',
-                'uploader': 'www.medici.tv',
-                'age_limit': 0,
-                'thumbnail': r're:^https?://.+\.jpg',
-            },
-            'params': {
-                'skip_download': True,
-            },
-        },
         {
             'url': 'https://shooshtime.com/videos/284002/just-out-of-the-shower-joi/',
             'md5': 'e2f0a4c329f7986280b7328e24036d60',
@@ -2202,7 +2166,7 @@ class GenericIE(InfoExtractor):
 
     def report_following_redirect(self, new_url):
         """Report information extraction."""
-        self._downloader.to_screen('[redirect] Following redirect to %s' % new_url)
+        self._downloader.to_screen(f'[redirect] Following redirect to {new_url}')
 
     def report_detected(self, name, num=1, note=None):
         if num > 1:
@@ -2221,7 +2185,15 @@ class GenericIE(InfoExtractor):
                 urllib.parse.urlparse(fragment_query).query or fragment_query
                 or urllib.parse.urlparse(manifest_url).query or None)
 
-        hex_or_none = lambda x: x if re.fullmatch(r'(0x)?[\da-f]+', x, re.IGNORECASE) else None
+        key_query = self._configuration_arg('key_query', [None], casesense=True)[0]
+        if key_query is not None:
+            info['extra_param_to_key_url'] = (
+                urllib.parse.urlparse(key_query).query or key_query
+                or urllib.parse.urlparse(manifest_url).query or None)
+
+        def hex_or_none(value):
+            return value if re.fullmatch(r'(0x)?[\da-f]+', value, re.IGNORECASE) else None
+
         info['hls_aes'] = traverse_obj(self._configuration_arg('hls_key', casesense=True), {
             'uri': (0, {url_or_none}), 'key': (0, {hex_or_none}), 'iv': (1, {hex_or_none}),
         }) or None
@@ -2242,10 +2214,21 @@ class GenericIE(InfoExtractor):
             if is_live is not None:
                 info['live_status'] = 'not_live' if is_live == 'false' else 'is_live'
                 return
-            headers = m3u8_format.get('http_headers') or info.get('http_headers')
-            duration = self._extract_m3u8_vod_duration(
-                m3u8_format['url'], info.get('id'), note='Checking m3u8 live status',
-                errnote='Failed to download m3u8 media playlist', headers=headers)
+            headers = m3u8_format.get('http_headers') or info.get('http_headers') or {}
+            display_id = info.get('id')
+            urlh = self._request_webpage(
+                m3u8_format['url'], display_id, 'Checking m3u8 live status', errnote=False,
+                headers={**headers, 'Accept-Encoding': 'identity'}, fatal=False)
+            if urlh is False:
+                return
+            first_bytes = urlh.read(512)
+            if not first_bytes.startswith(b'#EXTM3U'):
+                return
+            m3u8_doc = self._webpage_read_content(
+                urlh, urlh.url, display_id, prefix=first_bytes, fatal=False, errnote=False)
+            if not m3u8_doc:
+                return
+            duration = self._parse_m3u8_vod_duration(m3u8_doc, display_id)
             if not duration:
                 info['live_status'] = 'is_live'
             info['duration'] = info.get('duration') or duration
@@ -2298,29 +2281,29 @@ class GenericIE(InfoExtractor):
             return video_url  # not obfuscated
 
         parsed = urllib.parse.urlparse(video_url[len('function/0/'):])
-        license = cls._kvs_get_license_token(license_code)
+        license_token = cls._kvs_get_license_token(license_code)
         urlparts = parsed.path.split('/')
 
         HASH_LENGTH = 32
-        hash = urlparts[3][:HASH_LENGTH]
+        hash_ = urlparts[3][:HASH_LENGTH]
         indices = list(range(HASH_LENGTH))
 
         # Swap indices of hash according to the destination calculated from the license token
         accum = 0
         for src in reversed(range(HASH_LENGTH)):
-            accum += license[src]
+            accum += license_token[src]
             dest = (src + accum) % HASH_LENGTH
             indices[src], indices[dest] = indices[dest], indices[src]
 
-        urlparts[3] = ''.join(hash[index] for index in indices) + urlparts[3][HASH_LENGTH:]
+        urlparts[3] = ''.join(hash_[index] for index in indices) + urlparts[3][HASH_LENGTH:]
         return urllib.parse.urlunparse(parsed._replace(path='/'.join(urlparts)))
 
     @staticmethod
-    def _kvs_get_license_token(license):
-        license = license.replace('$', '')
-        license_values = [int(char) for char in license]
+    def _kvs_get_license_token(license_code):
+        license_code = license_code.replace('$', '')
+        license_values = [int(char) for char in license_code]
 
-        modlicense = license.replace('0', '1')
+        modlicense = license_code.replace('0', '1')
         center = len(modlicense) // 2
         fronthalf = int(modlicense[:center + 1])
         backhalf = int(modlicense[center:])
@@ -2370,7 +2353,7 @@ class GenericIE(InfoExtractor):
             'id': flashvars['video_id'],
             'display_id': display_id,
             'title': title,
-            'thumbnail': thumbnail,
+            'thumbnail': urljoin(url, thumbnail),
             'formats': formats,
         }
 
@@ -2385,25 +2368,24 @@ class GenericIE(InfoExtractor):
                 default_search = 'fixup_error'
 
             if default_search in ('auto', 'auto_warning', 'fixup_error'):
-                if re.match(r'^[^\s/]+\.[^\s/]+/', url):
+                if re.match(r'[^\s/]+\.[^\s/]+/', url):
                     self.report_warning('The url doesn\'t specify the protocol, trying with http')
                     return self.url_result('http://' + url)
                 elif default_search != 'fixup_error':
                     if default_search == 'auto_warning':
                         if re.match(r'^(?:url|URL)$', url):
                             raise ExtractorError(
-                                'Invalid URL:  %r . Call yt-dlp like this:  yt-dlp -v "https://www.youtube.com/watch?v=BaW_jenozKc"  ' % url,
+                                f'Invalid URL:  {url!r} . Call yt-dlp like this:  yt-dlp -v "https://www.youtube.com/watch?v=BaW_jenozKc"  ',
                                 expected=True)
                         else:
                             self.report_warning(
-                                'Falling back to youtube search for  %s . Set --default-search "auto" to suppress this warning.' % url)
+                                f'Falling back to youtube search for  {url} . Set --default-search "auto" to suppress this warning.')
                     return self.url_result('ytsearch:' + url)
 
             if default_search in ('error', 'fixup_error'):
                 raise ExtractorError(
-                    '%r is not a valid URL. '
-                    'Set --default-search "ytsearch" (or run  yt-dlp "ytsearch:%s" ) to search YouTube'
-                    % (url, url), expected=True)
+                    f'{url!r} is not a valid URL. '
+                    f'Set --default-search "ytsearch" (or run  yt-dlp "ytsearch:{url}" ) to search YouTube', expected=True)
             else:
                 if ':' not in default_search:
                     default_search += ':'
@@ -2419,6 +2401,11 @@ class GenericIE(InfoExtractor):
         else:
             video_id = self._generic_id(url)
 
+        # Do not impersonate by default; see https://github.com/yt-dlp/yt-dlp/issues/11335
+        impersonate = self._configuration_arg('impersonate', ['false'])
+        if 'false' in impersonate:
+            impersonate = None
+
         # Some webservers may serve compressed content of rather big size (e.g. gzipped flac)
         # making it impossible to download only chunk of the file (yet we need only 512kB to
         # test whether it's HTML or not). According to yt-dlp default Accept-Encoding
@@ -2427,12 +2414,30 @@ class GenericIE(InfoExtractor):
         # to accept raw bytes and being able to download only a chunk.
         # It may probably better to solve this by checking Content-Type for application/octet-stream
         # after a HEAD request, but not sure if we can rely on this.
-        full_response = self._request_webpage(url, video_id, headers={
-            'Accept-Encoding': 'identity',
-            **smuggled_data.get('http_headers', {})
-        })
+        try:
+            full_response = self._request_webpage(url, video_id, headers=filter_dict({
+                'Accept-Encoding': 'identity',
+                'Referer': smuggled_data.get('referer'),
+            }), impersonate=impersonate)
+        except ExtractorError as e:
+            if not (isinstance(e.cause, HTTPError) and e.cause.status == 403
+                    and e.cause.response.get_header('cf-mitigated') == 'challenge'
+                    and e.cause.response.extensions.get('impersonate') is None):
+                raise
+            cf_cookie_domain = traverse_obj(
+                LenientSimpleCookie(e.cause.response.get_header('set-cookie')),
+                ('__cf_bm', 'domain'))
+            if cf_cookie_domain:
+                self.write_debug(f'Clearing __cf_bm cookie for {cf_cookie_domain}')
+                self.cookiejar.clear(domain=cf_cookie_domain, path='/', name='__cf_bm')
+            msg = 'Got HTTP Error 403 caused by Cloudflare anti-bot challenge; '
+            if not self._downloader._impersonate_target_available(ImpersonateTarget()):
+                msg += ('see  https://github.com/yt-dlp/yt-dlp#impersonation  for '
+                        'how to install the required impersonation dependency, and ')
+            raise ExtractorError(
+                f'{msg}try again with  --extractor-args "generic:impersonate"', expected=True)
+
         new_url = full_response.url
-        url = urllib.parse.urlparse(url)._replace(scheme=urllib.parse.urlparse(new_url).scheme).geturl()
         if new_url != extract_basic_auth(url)[0]:
             self.report_following_redirect(new_url)
             if force_videoid:
@@ -2442,29 +2447,29 @@ class GenericIE(InfoExtractor):
         info_dict = {
             'id': video_id,
             'title': self._generic_title(url),
-            'timestamp': unified_timestamp(full_response.headers.get('Last-Modified'))
+            'timestamp': unified_timestamp(full_response.headers.get('Last-Modified')),
         }
 
         # Check for direct link to a video
         content_type = full_response.headers.get('Content-Type', '').lower()
-        m = re.match(r'^(?P<type>audio|video|application(?=/(?:ogg$|(?:vnd\.apple\.|x-)?mpegurl)))/(?P<format_id>[^;\s]+)', content_type)
+        m = re.match(r'(?P<type>audio|video|application(?=/(?:ogg$|(?:vnd\.apple\.|x-)?mpegurl)))/(?P<format_id>[^;\s]+)', content_type)
         if m:
             self.report_detected('direct video link')
-            headers = smuggled_data.get('http_headers', {})
+            headers = filter_dict({'Referer': smuggled_data.get('referer')})
             format_id = str(m.group('format_id'))
-            ext = determine_ext(url)
+            ext = determine_ext(url, default_ext=None) or urlhandle_detect_ext(full_response)
             subtitles = {}
             if format_id.endswith('mpegurl') or ext == 'm3u8':
                 formats, subtitles = self._extract_m3u8_formats_and_subtitles(url, video_id, 'mp4', headers=headers)
-            elif format_id.endswith('mpd') or format_id.endswith('dash+xml') or ext == 'mpd':
-                formats, subtitles = self._extract_mpd_formats_and_subtitles(url, video_id, headers=headers)
             elif format_id == 'f4m' or ext == 'f4m':
                 formats = self._extract_f4m_formats(url, video_id, headers=headers)
+            # Don't check for DASH/mpd here, do it later w/ first_bytes. Same number of requests either way
             else:
                 formats = [{
                     'format_id': format_id,
                     'url': url,
-                    'vcodec': 'none' if m.group('type') == 'audio' else None
+                    'ext': ext,
+                    'vcodec': 'none' if m.group('type') == 'audio' else None,
                 }]
                 info_dict['direct'] = True
             info_dict.update({
@@ -2493,9 +2498,13 @@ class GenericIE(InfoExtractor):
         if not is_html(first_bytes):
             self.report_warning(
                 'URL could be a direct video link, returning it as such.')
+            ext = determine_ext(url)
+            if ext not in _UnsafeExtensionError.ALLOWED_EXTENSIONS:
+                ext = 'unknown_video'
             info_dict.update({
                 'direct': True,
                 'url': url,
+                'ext': ext,
             })
             return info_dict
 
@@ -2512,7 +2521,7 @@ class GenericIE(InfoExtractor):
             try:
                 doc = compat_etree_fromstring(webpage)
             except xml.etree.ElementTree.ParseError:
-                doc = compat_etree_fromstring(webpage.encode('utf-8'))
+                doc = compat_etree_fromstring(webpage.encode())
             if doc.tag == 'rss':
                 self.report_detected('RSS feed')
                 return self._extract_rss(url, video_id, doc)
@@ -2529,13 +2538,15 @@ class GenericIE(InfoExtractor):
                 return self.playlist_result(
                     self._parse_xspf(
                         doc, video_id, xspf_url=url,
-                        xspf_base_url=full_response.url),
+                        xspf_base_url=new_url),
                     video_id)
             elif re.match(r'(?i)^(?:{[^}]+})?MPD$', doc.tag):
                 info_dict['formats'], info_dict['subtitles'] = self._parse_mpd_formats_and_subtitles(
                     doc,
-                    mpd_base_url=full_response.url.rpartition('/')[0],
+                    # Do not use yt_dlp.utils.base_url here since it will raise on file:// URLs
+                    mpd_base_url=update_url(new_url, query=None, fragment=None).rpartition('/')[0],
                     mpd_url=url)
+                info_dict['live_status'] = 'is_live' if doc.get('type') == 'dynamic' else None
                 self._extra_manifest_info(info_dict, url)
                 self.report_detected('DASH manifest')
                 return info_dict
@@ -2660,7 +2671,7 @@ class GenericIE(InfoExtractor):
                     })
             # https://docs.videojs.com/player#addRemoteTextTrack
             # https://html.spec.whatwg.org/multipage/media.html#htmltrackelement
-            for sub_match in re.finditer(rf'(?s){re.escape(varname)}' r'\.addRemoteTextTrack\(({.+?})\s*,\s*(?:true|false)\)', webpage):
+            for sub_match in re.finditer(rf'(?s){re.escape(varname)}' + r'\.addRemoteTextTrack\(({.+?})\s*,\s*(?:true|false)\)', webpage):
                 sub = self._parse_json(
                     sub_match.group(1), video_id, transform_source=js_to_json, fatal=False) or {}
                 sub_src = str_or_none(sub.get('src'))
@@ -2701,7 +2712,7 @@ class GenericIE(InfoExtractor):
                 'url': smuggle_url(json_ld['url'], {
                     'force_videoid': video_id,
                     'to_generic': True,
-                    'http_headers': {'Referer': url},
+                    'referer': url,
                 }),
             }, json_ld)]
 
@@ -2782,7 +2793,7 @@ class GenericIE(InfoExtractor):
             REDIRECT_REGEX = r'[0-9]{,2};\s*(?:URL|url)=\'?([^\'"]+)'
             found = re.search(
                 r'(?i)<meta\s+(?=(?:[a-z-]+="[^"]+"\s+)*http-equiv="refresh")'
-                r'(?:[a-z-]+="[^"]+"\s+)*?content="%s' % REDIRECT_REGEX,
+                rf'(?:[a-z-]+="[^"]+"\s+)*?content="{REDIRECT_REGEX}',
                 webpage)
             if not found:
                 # Look also in Refresh HTTP header
@@ -2826,7 +2837,7 @@ class GenericIE(InfoExtractor):
 
             video_id = os.path.splitext(video_id)[0]
             headers = {
-                'referer': actual_url
+                'referer': actual_url,
             }
 
             entry_info_dict = {
@@ -2883,5 +2894,5 @@ class GenericIE(InfoExtractor):
             for num, e in enumerate(entries, start=1):
                 # 'url' results don't have a title
                 if e.get('title') is not None:
-                    e['title'] = '%s (%d)' % (e['title'], num)
+                    e['title'] = '{} ({})'.format(e['title'], num)
         return entries
diff --git a/plugins/youtube_download/yt_dlp/extractor/genericembeds.py b/plugins/youtube_download/yt_dlp/extractor/genericembeds.py
index 9b4f14d..359d38b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/genericembeds.py
+++ b/plugins/youtube_download/yt_dlp/extractor/genericembeds.py
@@ -15,8 +15,8 @@ class HTML5MediaEmbedIE(InfoExtractor):
                 'title': 'HTML5 Media',
                 'description': 'md5:933b2d02ceffe7a7a0f3c8326d91cc2a',
             },
-            'playlist_count': 2
-        }
+            'playlist_count': 2,
+        },
     ]
 
     def _extract_from_webpage(self, url, webpage):
@@ -50,7 +50,7 @@ class QuotedHTMLIE(InfoExtractor):
             'description': 'md5:6816e1e5a65304bd7898e4c7eb1b26f7',
             'age_limit': 0,
         },
-        'playlist_count': 2
+        'playlist_count': 2,
     }, {
         # Generic iframe embed of TV24UAPlayerIE within data-html
         'url': 'https://24tv.ua/harkivyani-zgaduyut-misto-do-viyni-shhemlive-video_n1887584',
@@ -60,7 +60,7 @@ class QuotedHTMLIE(InfoExtractor):
             'title': 'Харків\'яни згадують місто до війни: щемливе відео',
             'thumbnail': r're:^https?://.*\.jpe?g',
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }, {
         # YouTube embeds on Squarespace (data-html): https://github.com/ytdl-org/youtube-dl/issues/21294
         'url': 'https://www.harvardballetcompany.org/past-productions',
@@ -70,7 +70,7 @@ class QuotedHTMLIE(InfoExtractor):
             'age_limit': 0,
             'description': 'Past Productions',
         },
-        'playlist_mincount': 26
+        'playlist_mincount': 26,
     }, {
         # Squarespace video embed, 2019-08-28, data-html
         'url': 'http://ootboxford.com',
diff --git a/plugins/youtube_download/yt_dlp/extractor/germanupa.py b/plugins/youtube_download/yt_dlp/extractor/germanupa.py
new file mode 100644
index 0000000..e40f016
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/germanupa.py
@@ -0,0 +1,91 @@
+from .common import InfoExtractor
+from .vimeo import VimeoIE
+from ..utils import (
+    parse_qs,
+    traverse_obj,
+    url_or_none,
+)
+
+
+class GermanupaIE(InfoExtractor):
+    IE_DESC = 'germanupa.de'
+    _VALID_URL = r'https?://germanupa\.de/mediathek/(?P<id>[\w-]+)'
+    _TESTS = [{
+        'url': 'https://germanupa.de/mediathek/4-figma-beratung-deine-sprechstunde-fuer-figma-fragen',
+        'info_dict': {
+            'id': '909179246',
+            'title': 'Tutorial: #4 Figma Beratung - Deine Sprechstunde für Figma-Fragen',
+            'ext': 'mp4',
+            'uploader': 'German UPA',
+            'uploader_id': 'germanupa',
+            'thumbnail': 'https://i.vimeocdn.com/video/1792564420-7415283ccef8bf8702dab8c6b7515555ceeb7a1c11371ffcc133b8e887dbf70e-d_1280',
+            'uploader_url': 'https://vimeo.com/germanupa',
+            'duration': 3987,
+        },
+        'expected_warnings': ['Failed to parse XML: not well-formed'],
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        'note': 'audio, uses GenericIE',
+        'url': 'https://germanupa.de/mediathek/live-vom-ux-festival-neuigkeiten-von-figma-jobmarkt-agenturszene-interview-zu-sustainable',
+        'info_dict': {
+            'id': '1867346676',
+            'title': 'Live vom UX Festival: Neuigkeiten von Figma, Jobmarkt, Agenturszene & Interview zu Sustainable UX',
+            'ext': 'opus',
+            'timestamp': 1720545088,
+            'upload_date': '20240709',
+            'duration': 3910.557,
+            'like_count': int,
+            'description': 'md5:db2aed5ff131e177a7b33901e9a8db05',
+            'uploader': 'German UPA',
+            'repost_count': int,
+            'genres': ['Science'],
+            'license': 'all-rights-reserved',
+            'uploader_url': 'https://soundcloud.com/user-80097677',
+            'uploader_id': '471579486',
+            'view_count': int,
+            'comment_count': int,
+            'thumbnail': 'https://i1.sndcdn.com/artworks-oCti2e9GhaZFWBqY-48ybGw-original.jpg',
+        },
+    }, {
+        'note': 'Nur für Mitglieder/Just for members',
+        'url': 'https://germanupa.de/mediathek/ux-festival-2024-usability-tests-und-ai',
+        'info_dict': {
+            'id': '986994430',
+            'title': 'UX Festival 2024 "Usability Tests und AI" von Lennart Weber',
+            'ext': 'mp4',
+            'release_date': '20240719',
+            'uploader_url': 'https://vimeo.com/germanupa',
+            'timestamp': 1721373980,
+            'license': 'by-sa',
+            'like_count': int,
+            'thumbnail': 'https://i.vimeocdn.com/video/1904187064-2a672630c30f9ad787bd390bff3f51d7506a3e8416763ba6dbf465732b165c5c-d_1280',
+            'duration': 2146,
+            'release_timestamp': 1721373980,
+            'uploader': 'German UPA',
+            'uploader_id': 'germanupa',
+            'upload_date': '20240719',
+            'comment_count': int,
+        },
+        'expected_warnings': ['Failed to parse XML: not well-formed'],
+        'skip': 'login required',
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+
+        param_url = traverse_obj(
+            self._search_regex(
+                r'<iframe[^>]+data-src\s*?=\s*?([\'"])(?P<url>https://germanupa\.de/media/oembed\?url=(?:(?!\1).)+)\1',
+                webpage, 'embedded video', default=None, group='url'),
+            ({parse_qs}, 'url', 0, {url_or_none}))
+
+        if not param_url:
+            if self._search_regex(
+                    r'<div[^>]+class\s*?=\s*?([\'"])(?:(?!\1).)*login-wrapper(?:(?!\1).)*\1',
+                    webpage, 'login wrapper', default=None):
+                self.raise_login_required('This video is only available for members')
+            return self.url_result(url, 'Generic')  # Fall back to generic to extract audio
+
+        real_url = param_url.replace('https://vimeo.com/', 'https://player.vimeo.com/video/')
+        return self.url_result(VimeoIE._smuggle_referrer(real_url, url), VimeoIE, video_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/getcourseru.py b/plugins/youtube_download/yt_dlp/extractor/getcourseru.py
new file mode 100644
index 0000000..2d923cf
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/getcourseru.py
@@ -0,0 +1,188 @@
+import re
+import time
+import urllib.parse
+
+from .common import InfoExtractor
+from ..utils import ExtractorError, int_or_none, url_or_none, urlencode_postdata
+from ..utils.traversal import traverse_obj
+
+
+class GetCourseRuPlayerIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:player02\.getcourse\.ru|cf-api-2\.vhcdn\.com)/sign-player/?\?(?:[^#]+&)?json=[^#&]+'
+    _EMBED_REGEX = [rf'<iframe[^>]+\bsrc=[\'"](?P<url>{_VALID_URL}[^\'"]*)']
+    _TESTS = [{
+        'url': 'http://player02.getcourse.ru/sign-player/?json=eyJ2aWRlb19oYXNoIjoiMTkwYmRmOTNmMWIyOTczNTMwOTg1M2E3YTE5ZTI0YjMiLCJ1c2VyX2lkIjozNTk1MjUxODMsInN1Yl9sb2dpbl91c2VyX2lkIjpudWxsLCJsZXNzb25faWQiOm51bGwsImlwIjoiNDYuMTQyLjE4Mi4yNDciLCJnY19ob3N0IjoiYWNhZGVteW1lbC5vbmxpbmUiLCJ0aW1lIjoxNzA1NDQ5NjQyLCJwYXlsb2FkIjoidV8zNTk1MjUxODMiLCJ1aV9sYW5ndWFnZSI6InJ1IiwiaXNfaGF2ZV9jdXN0b21fc3R5bGUiOnRydWV9&s=354ad2c993d95d5ac629e3133d6cefea&vh-static-feature=zigzag',
+        'info_dict': {
+            'id': '513573381',
+            'title': '190bdf93f1b29735309853a7a19e24b3',
+            'ext': 'mp4',
+            'thumbnail': 'https://preview-htz.kinescopecdn.net/preview/190bdf93f1b29735309853a7a19e24b3/preview.jpg?version=1702370546&host=vh-80',
+            'duration': 1693,
+        },
+        'skip': 'JWT expired',
+    }, {
+        'url': 'https://cf-api-2.vhcdn.com/sign-player/?json=example',
+        'info_dict': {
+            'id': '435735291',
+            'title': '8afd7c489952108e00f019590f3711f3',
+            'ext': 'mp4',
+            'thumbnail': 'https://preview-htz.vhcdn.com/preview/8afd7c489952108e00f019590f3711f3/preview.jpg?version=1682170973&host=vh-72',
+            'duration': 777,
+        },
+        'skip': 'JWT expired',
+    }]
+
+    def _real_extract(self, url):
+        webpage = self._download_webpage(url, None, 'Downloading player page')
+        window_configs = self._search_json(
+            r'window\.configs\s*=', webpage, 'config', None)
+        video_id = str(window_configs['gcFileId'])
+        formats, subtitles = self._extract_m3u8_formats_and_subtitles(
+            window_configs['masterPlaylistUrl'], video_id)
+
+        return {
+            **traverse_obj(window_configs, {
+                'title': ('videoHash', {str}),
+                'thumbnail': ('previewUrl', {url_or_none}),
+                'duration': ('videoDuration', {int_or_none}),
+            }),
+            'id': video_id,
+            'formats': formats,
+            'subtitles': subtitles,
+        }
+
+
+class GetCourseRuIE(InfoExtractor):
+    _NETRC_MACHINE = 'getcourseru'
+    _DOMAINS = [
+        'academymel.online',
+        'marafon.mani-beauty.com',
+        'on.psbook.ru',
+    ]
+    _BASE_URL_RE = rf'https?://(?:(?!player02\.)[^.]+\.getcourse\.(?:ru|io)|{"|".join(map(re.escape, _DOMAINS))})'
+    _VALID_URL = [
+        rf'{_BASE_URL_RE}/(?!pl/|teach/)(?P<id>[^?#]+)',
+        rf'{_BASE_URL_RE}/(?:pl/)?teach/control/lesson/view\?(?:[^#]+&)?id=(?P<id>\d+)',
+    ]
+    _TESTS = [{
+        'url': 'http://academymel.online/3video_1',
+        'info_dict': {
+            'id': '3059742',
+            'display_id': '3video_1',
+            'title': 'Промоуроки Академии МЕЛ',
+        },
+        'playlist_count': 1,
+        'playlist': [{
+            'info_dict': {
+                'id': '513573381',
+                'ext': 'mp4',
+                'title': 'Промоуроки Академии МЕЛ',
+                'thumbnail': 'https://preview-htz.kinescopecdn.net/preview/190bdf93f1b29735309853a7a19e24b3/preview.jpg?version=1702370546&host=vh-80',
+                'duration': 1693,
+            },
+        }],
+    }, {
+        'url': 'https://academymel.getcourse.ru/3video_1',
+        'info_dict': {
+            'id': '3059742',
+            'display_id': '3video_1',
+            'title': 'Промоуроки Академии МЕЛ',
+        },
+        'playlist_count': 1,
+        'playlist': [{
+            'info_dict': {
+                'id': '513573381',
+                'ext': 'mp4',
+                'title': 'Промоуроки Академии МЕЛ',
+                'thumbnail': 'https://preview-htz.kinescopecdn.net/preview/190bdf93f1b29735309853a7a19e24b3/preview.jpg?version=1702370546&host=vh-80',
+                'duration': 1693,
+            },
+        }],
+    }, {
+        'url': 'https://academymel.getcourse.ru/pl/teach/control/lesson/view?id=319141781&editMode=0',
+        'info_dict': {
+            'id': '319141781',
+            'title': '1. Разминка у стены',
+        },
+        'playlist_count': 1,
+        'playlist': [{
+            'info_dict': {
+                'id': '4919601',
+                'ext': 'mp4',
+                'title': '1. Разминка у стены',
+                'thumbnail': 'https://preview-htz.vhcdn.com/preview/5a521788e7dc25b4f70c3dff6512d90e/preview.jpg?version=1703223532&host=vh-81',
+                'duration': 704,
+            },
+        }],
+        'skip': 'paid lesson',
+    }, {
+        'url': 'https://manibeauty.getcourse.ru/pl/teach/control/lesson/view?id=272499894',
+        'info_dict': {
+            'id': '272499894',
+            'title': 'Мотивация к тренировкам',
+        },
+        'playlist_count': 1,
+        'playlist': [{
+            'info_dict': {
+                'id': '447479687',
+                'ext': 'mp4',
+                'title': 'Мотивация к тренировкам',
+                'thumbnail': 'https://preview-htz.vhcdn.com/preview/70ed5b9f489dd03b4aff55bfdff71a26/preview.jpg?version=1685115787&host=vh-71',
+                'duration': 30,
+            },
+        }],
+        'skip': 'paid lesson',
+    }, {
+        'url': 'https://gaismasmandalas.getcourse.io/ATLAUTSEVBUT',
+        'only_matching': True,
+    }]
+
+    _LOGIN_URL_PATH = '/cms/system/login'
+
+    def _login(self, hostname, username, password):
+        if self._get_cookies(f'https://{hostname}').get('PHPSESSID5'):
+            return
+        login_url = f'https://{hostname}{self._LOGIN_URL_PATH}'
+        webpage = self._download_webpage(login_url, None)
+
+        self._request_webpage(
+            login_url, None, 'Logging in', 'Failed to log in',
+            data=urlencode_postdata({
+                'action': 'processXdget',
+                'xdgetId': self._html_search_regex(
+                    r'<form[^>]+\bclass="[^"]*\bstate-login[^"]*"[^>]+\bdata-xdget-id="([^"]+)"',
+                    webpage, 'xdgetId'),
+                'params[action]': 'login',
+                'params[url]': login_url,
+                'params[object_type]': 'cms_page',
+                'params[object_id]': -1,
+                'params[email]': username,
+                'params[password]': password,
+                'requestTime': int(time.time()),
+                'requestSimpleSign': self._html_search_regex(
+                    r'window.requestSimpleSign\s*=\s*"([\da-f]+)"', webpage, 'simple sign'),
+            }))
+
+    def _real_extract(self, url):
+        hostname = urllib.parse.urlparse(url).hostname
+        username, password = self._get_login_info(netrc_machine=hostname)
+        if username:
+            self._login(hostname, username, password)
+
+        display_id = self._match_id(url)
+        webpage, urlh = self._download_webpage_handle(url, display_id)
+        if self._LOGIN_URL_PATH in urlh.url:
+            raise ExtractorError(
+                f'This video is only available for registered users. {self._login_hint("any", netrc=hostname)}',
+                expected=True)
+
+        playlist_id = self._search_regex(
+            r'window\.(?:lessonId|gcsObjectId)\s*=\s*(\d+)', webpage, 'playlist id', default=display_id)
+        title = self._og_search_title(webpage, default=None) or self._html_extract_title(webpage)
+
+        return self.playlist_from_matches(
+            re.findall(GetCourseRuPlayerIE._EMBED_REGEX[0], webpage),
+            playlist_id, title, display_id=display_id, ie=GetCourseRuPlayerIE, video_kwargs={
+                'url_transparent': True,
+                'title': title,
+            })
diff --git a/plugins/youtube_download/yt_dlp/extractor/gettr.py b/plugins/youtube_download/yt_dlp/extractor/gettr.py
index 7795dc5..2a9d5e7 100644
--- a/plugins/youtube_download/yt_dlp/extractor/gettr.py
+++ b/plugins/youtube_download/yt_dlp/extractor/gettr.py
@@ -1,7 +1,7 @@
 from .common import InfoExtractor
 from ..utils import (
-    bool_or_none,
     ExtractorError,
+    bool_or_none,
     dict_get,
     float_or_none,
     int_or_none,
@@ -38,7 +38,7 @@ class GettrIE(GettrBaseIE):
             'timestamp': 1632782451.058,
             'duration': 58.5585,
             'tags': ['hornofafrica', 'explorations'],
-        }
+        },
     }, {
         'url': 'https://gettr.com/post/p4iahp',
         'info_dict': {
@@ -53,7 +53,7 @@ class GettrIE(GettrBaseIE):
             'timestamp': 1626594455.017,
             'duration': 23,
             'tags': 'count:12',
-        }
+        },
     }, {
         # quote post
         'url': 'https://gettr.com/post/pxn5b743a9',
@@ -76,7 +76,7 @@ class GettrIE(GettrBaseIE):
     def _real_extract(self, url):
         post_id = self._match_id(url)
         webpage = self._download_webpage(url, post_id)
-        api_data = self._call_api('post/%s?incl="poststats|userinfo"' % post_id, post_id)
+        api_data = self._call_api(f'post/{post_id}?incl="poststats|userinfo"', post_id)
 
         post_data = api_data.get('data')
         user_data = try_get(api_data, lambda x: x['aux']['uinf'][post_data['uid']], dict) or {}
@@ -106,7 +106,7 @@ class GettrIE(GettrBaseIE):
             or self._search_regex(r'^(.+?) on GETTR', self._og_search_title(webpage, default=''), 'uploader', fatal=False))
 
         if uploader:
-            title = '%s - %s' % (uploader, title)
+            title = f'{uploader} - {title}'
 
         formats, subtitles = self._extract_m3u8_formats_and_subtitles(
             urljoin(self._MEDIA_BASE_URL, vid), post_id, 'mp4',
@@ -157,7 +157,7 @@ class GettrStreamingIE(GettrBaseIE):
             'title': 'Day 1: Opening Session of the Grand Jury Proceeding',
             'timestamp': 1644080997.164,
             'upload_date': '20220205',
-        }
+        },
     }, {
         'url': 'https://gettr.com/streaming/psfmeefcc1',
         'info_dict': {
@@ -172,12 +172,12 @@ class GettrStreamingIE(GettrBaseIE):
             'duration': 21872.507,
             'timestamp': 1643976662.858,
             'upload_date': '20220204',
-        }
+        },
     }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        video_info = self._call_api('live/join/%s' % video_id, video_id, data={})
+        video_info = self._call_api(f'live/join/{video_id}', video_id, data={})
 
         live_info = video_info['broadcast']
         live_url = url_or_none(live_info.get('url'))
diff --git a/plugins/youtube_download/yt_dlp/extractor/gfycat.py b/plugins/youtube_download/yt_dlp/extractor/gfycat.py
deleted file mode 100644
index edc2e56..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/gfycat.py
+++ /dev/null
@@ -1,145 +0,0 @@
-from .common import InfoExtractor
-from ..utils import (
-    int_or_none,
-    float_or_none,
-    qualities,
-    ExtractorError,
-)
-
-
-class GfycatIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:(?:www|giant|thumbs)\.)?gfycat\.com/(?i:ru/|ifr/|gifs/detail/)?(?P<id>[^-/?#\."\']+)'
-    _EMBED_REGEX = [rf'<(?:iframe|source)[^>]+\bsrc=["\'](?P<url>{_VALID_URL})']
-    _TESTS = [{
-        'url': 'http://gfycat.com/DeadlyDecisiveGermanpinscher',
-        'info_dict': {
-            'id': 'DeadlyDecisiveGermanpinscher',
-            'ext': 'mp4',
-            'title': 'Ghost in the Shell',
-            'timestamp': 1410656006,
-            'upload_date': '20140914',
-            'uploader': 'anonymous',
-            'duration': 10.4,
-            'view_count': int,
-            'like_count': int,
-            'categories': list,
-            'age_limit': 0,
-            'uploader_id': 'anonymous',
-            'description': '',
-        }
-    }, {
-        'url': 'http://gfycat.com/ifr/JauntyTimelyAmazontreeboa',
-        'info_dict': {
-            'id': 'JauntyTimelyAmazontreeboa',
-            'ext': 'mp4',
-            'title': 'JauntyTimelyAmazontreeboa',
-            'timestamp': 1411720126,
-            'upload_date': '20140926',
-            'uploader': 'anonymous',
-            'duration': 3.52,
-            'view_count': int,
-            'like_count': int,
-            'categories': list,
-            'age_limit': 0,
-            'uploader_id': 'anonymous',
-            'description': '',
-        }
-    }, {
-        'url': 'https://gfycat.com/alienatedsolidgreathornedowl',
-        'info_dict': {
-            'id': 'alienatedsolidgreathornedowl',
-            'ext': 'mp4',
-            'upload_date': '20211226',
-            'uploader_id': 'reactions',
-            'timestamp': 1640536930,
-            'like_count': int,
-            'description': '',
-            'title': 'Ingrid Michaelson, Zooey Deschanel - Merry Christmas Happy New Year',
-            'categories': list,
-            'age_limit': 0,
-            'duration': 2.9583333333333335,
-            'uploader': 'Reaction GIFs',
-            'view_count': int,
-        }
-    }, {
-        'url': 'https://gfycat.com/ru/RemarkableDrearyAmurstarfish',
-        'only_matching': True
-    }, {
-        'url': 'https://gfycat.com/gifs/detail/UnconsciousLankyIvorygull',
-        'only_matching': True
-    }, {
-        'url': 'https://gfycat.com/acceptablehappygoluckyharborporpoise-baseball',
-        'only_matching': True
-    }, {
-        'url': 'https://thumbs.gfycat.com/acceptablehappygoluckyharborporpoise-size_restricted.gif',
-        'only_matching': True
-    }, {
-        'url': 'https://giant.gfycat.com/acceptablehappygoluckyharborporpoise.mp4',
-        'only_matching': True
-    }, {
-        'url': 'http://gfycat.com/IFR/JauntyTimelyAmazontreeboa',
-        'only_matching': True
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        gfy = self._download_json(
-            'https://api.gfycat.com/v1/gfycats/%s' % video_id,
-            video_id, 'Downloading video info')
-        if 'error' in gfy:
-            raise ExtractorError('Gfycat said: ' + gfy['error'], expected=True)
-        gfy = gfy['gfyItem']
-
-        title = gfy.get('title') or gfy['gfyName']
-        description = gfy.get('description')
-        timestamp = int_or_none(gfy.get('createDate'))
-        uploader = gfy.get('userName') or gfy.get('username')
-        view_count = int_or_none(gfy.get('views'))
-        like_count = int_or_none(gfy.get('likes'))
-        dislike_count = int_or_none(gfy.get('dislikes'))
-        age_limit = 18 if gfy.get('nsfw') == '1' else 0
-
-        width = int_or_none(gfy.get('width'))
-        height = int_or_none(gfy.get('height'))
-        fps = int_or_none(gfy.get('frameRate'))
-        num_frames = int_or_none(gfy.get('numFrames'))
-
-        duration = float_or_none(num_frames, fps) if num_frames and fps else None
-
-        categories = gfy.get('tags') or gfy.get('extraLemmas') or []
-
-        FORMATS = ('gif', 'webm', 'mp4')
-        quality = qualities(FORMATS)
-
-        formats = []
-        for format_id in FORMATS:
-            video_url = gfy.get('%sUrl' % format_id)
-            if not video_url:
-                continue
-            filesize = int_or_none(gfy.get('%sSize' % format_id))
-            formats.append({
-                'url': video_url,
-                'format_id': format_id,
-                'width': width,
-                'height': height,
-                'fps': fps,
-                'filesize': filesize,
-                'quality': quality(format_id),
-            })
-
-        return {
-            'id': video_id,
-            'title': title,
-            'description': description,
-            'timestamp': timestamp,
-            'uploader': gfy.get('userDisplayName') or uploader,
-            'uploader_id': uploader,
-            'duration': duration,
-            'view_count': view_count,
-            'like_count': like_count,
-            'dislike_count': dislike_count,
-            'categories': categories,
-            'age_limit': age_limit,
-            'formats': formats,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/giantbomb.py b/plugins/youtube_download/yt_dlp/extractor/giantbomb.py
index 1125723..259d390 100644
--- a/plugins/youtube_download/yt_dlp/extractor/giantbomb.py
+++ b/plugins/youtube_download/yt_dlp/extractor/giantbomb.py
@@ -22,7 +22,7 @@ class GiantBombIE(InfoExtractor):
             'description': 'md5:0aa3aaf2772a41b91d44c63f30dfad24',
             'duration': 2399,
             'thumbnail': r're:^https?://.*\.jpg$',
-        }
+        },
     }, {
         'url': 'https://www.giantbomb.com/shows/ben-stranding/2970-20212',
         'only_matching': True,
diff --git a/plugins/youtube_download/yt_dlp/extractor/giga.py b/plugins/youtube_download/yt_dlp/extractor/giga.py
deleted file mode 100644
index b59c129..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/giga.py
+++ /dev/null
@@ -1,93 +0,0 @@
-import itertools
-
-from .common import InfoExtractor
-from ..compat import compat_str
-from ..utils import parse_duration, parse_iso8601, qualities, str_to_int
-
-
-class GigaIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?giga\.de/(?:[^/]+/)*(?P<id>[^/]+)'
-    _TESTS = [{
-        'url': 'http://www.giga.de/filme/anime-awesome/trailer/anime-awesome-chihiros-reise-ins-zauberland-das-beste-kommt-zum-schluss/',
-        'md5': '6bc5535e945e724640664632055a584f',
-        'info_dict': {
-            'id': '2622086',
-            'display_id': 'anime-awesome-chihiros-reise-ins-zauberland-das-beste-kommt-zum-schluss',
-            'ext': 'mp4',
-            'title': 'Anime Awesome: Chihiros Reise ins Zauberland – Das Beste kommt zum Schluss',
-            'description': 'md5:afdf5862241aded4718a30dff6a57baf',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'duration': 578,
-            'timestamp': 1414749706,
-            'upload_date': '20141031',
-            'uploader': 'Robin Schweiger',
-            'view_count': int,
-        },
-    }, {
-        'url': 'http://www.giga.de/games/channel/giga-top-montag/giga-topmontag-die-besten-serien-2014/',
-        'only_matching': True,
-    }, {
-        'url': 'http://www.giga.de/extra/netzkultur/videos/giga-games-tom-mats-robin-werden-eigene-wege-gehen-eine-ankuendigung/',
-        'only_matching': True,
-    }, {
-        'url': 'http://www.giga.de/tv/jonas-liest-spieletitel-eingedeutscht-episode-2/',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        display_id = self._match_id(url)
-
-        webpage = self._download_webpage(url, display_id)
-
-        video_id = self._search_regex(
-            [r'data-video-id="(\d+)"', r'/api/video/jwplayer/#v=(\d+)'],
-            webpage, 'video id')
-
-        playlist = self._download_json(
-            'http://www.giga.de/api/syndication/video/video_id/%s/playlist.json?content=syndication/key/368b5f151da4ae05ced7fa296bdff65a/'
-            % video_id, video_id)[0]
-
-        quality = qualities(['normal', 'hd720'])
-
-        formats = []
-        for format_id in itertools.count(0):
-            fmt = playlist.get(compat_str(format_id))
-            if not fmt:
-                break
-            formats.append({
-                'url': fmt['src'],
-                'format_id': '%s-%s' % (fmt['quality'], fmt['type'].split('/')[-1]),
-                'quality': quality(fmt['quality']),
-            })
-
-        title = self._html_search_meta(
-            'title', webpage, 'title', fatal=True)
-        description = self._html_search_meta(
-            'description', webpage, 'description')
-        thumbnail = self._og_search_thumbnail(webpage)
-
-        duration = parse_duration(self._search_regex(
-            r'(?s)(?:data-video-id="{0}"|data-video="[^"]*/api/video/jwplayer/#v={0}[^"]*")[^>]*>.+?<span class="duration">([^<]+)</span>'.format(video_id),
-            webpage, 'duration', fatal=False))
-
-        timestamp = parse_iso8601(self._search_regex(
-            r'datetime="([^"]+)"', webpage, 'upload date', fatal=False))
-        uploader = self._search_regex(
-            r'class="author">([^<]+)</a>', webpage, 'uploader', fatal=False)
-
-        view_count = str_to_int(self._search_regex(
-            r'<span class="views"><strong>([\d.,]+)</strong>',
-            webpage, 'view count', fatal=False))
-
-        return {
-            'id': video_id,
-            'display_id': display_id,
-            'title': title,
-            'description': description,
-            'thumbnail': thumbnail,
-            'duration': duration,
-            'timestamp': timestamp,
-            'uploader': uploader,
-            'view_count': view_count,
-            'formats': formats,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/gigya.py b/plugins/youtube_download/yt_dlp/extractor/gigya.py
deleted file mode 100644
index c5bc86b..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/gigya.py
+++ /dev/null
@@ -1,20 +0,0 @@
-from .common import InfoExtractor
-
-from ..utils import (
-    ExtractorError,
-    urlencode_postdata,
-)
-
-
-class GigyaBaseIE(InfoExtractor):
-    def _gigya_login(self, auth_data):
-        auth_info = self._download_json(
-            'https://accounts.eu1.gigya.com/accounts.login', None,
-            note='Logging in', errnote='Unable to log in',
-            data=urlencode_postdata(auth_data))
-
-        error_message = auth_info.get('errorDetails') or auth_info.get('errorMessage')
-        if error_message:
-            raise ExtractorError(
-                'Unable to login: %s' % error_message, expected=True)
-        return auth_info
diff --git a/plugins/youtube_download/yt_dlp/extractor/glide.py b/plugins/youtube_download/yt_dlp/extractor/glide.py
index d114f34..b4c8681 100644
--- a/plugins/youtube_download/yt_dlp/extractor/glide.py
+++ b/plugins/youtube_download/yt_dlp/extractor/glide.py
@@ -12,7 +12,7 @@ class GlideIE(InfoExtractor):
             'ext': 'mp4',
             'title': "Damon's Glide message",
             'thumbnail': r're:^https?://.*?\.cloudfront\.net/.*\.jpg$',
-        }
+        },
     }
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/globalplayer.py b/plugins/youtube_download/yt_dlp/extractor/globalplayer.py
index e0c0d58..3d4a930 100644
--- a/plugins/youtube_download/yt_dlp/extractor/globalplayer.py
+++ b/plugins/youtube_download/yt_dlp/extractor/globalplayer.py
@@ -37,7 +37,7 @@ class GlobalPlayerBaseIE(InfoExtractor):
                 'url': 'streamUrl',
                 'timestamp': (('pubDate', 'startDate'), {unified_timestamp}),
                 'title': 'title',
-            }, get_all=False)
+            }, get_all=False),
         }
 
 
@@ -111,7 +111,7 @@ class GlobalPlayerLivePlaylistIE(GlobalPlayerBaseIE):
             'live_status': 'is_live',
             'description': 'md5:e10f5e10b01a7f2c14ba815509fbb38d',
             'thumbnail': 'https://images.globalplayer.com/images/551379?width=450&signature=oMLPZIoi5_dBSHnTMREW0Xg76mA=',
-            'title': 're:^Classic FM Hall of Fame.+$'
+            'title': 're:^Classic FM Hall of Fame.+$',
         },
     }]
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/globo.py b/plugins/youtube_download/yt_dlp/extractor/globo.py
index df98f09..8932022 100644
--- a/plugins/youtube_download/yt_dlp/extractor/globo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/globo.py
@@ -1,35 +1,48 @@
-import base64
-import hashlib
 import json
-import random
 import re
+import uuid
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_str,
-)
-from ..networking import HEADRequest
 from ..utils import (
-    ExtractorError,
+    determine_ext,
+    filter_dict,
     float_or_none,
+    int_or_none,
     orderedSet,
     str_or_none,
     try_get,
+    url_or_none,
 )
+from ..utils.traversal import subs_list_to_dict, traverse_obj
 
 
 class GloboIE(InfoExtractor):
-    _VALID_URL = r'(?:globo:|https?://.+?\.globo\.com/(?:[^/]+/)*(?:v/(?:[^/]+/)?|videos/))(?P<id>\d{7,})'
+    _VALID_URL = r'(?:globo:|https?://[^/?#]+?\.globo\.com/(?:[^/?#]+/))(?P<id>\d{7,})'
     _NETRC_MACHINE = 'globo'
+    _VIDEO_VIEW = '''
+    query getVideoView($videoId: ID!) {
+        video(id: $videoId) {
+            duration
+            description
+            relatedEpisodeNumber
+            relatedSeasonNumber
+            headline
+            title {
+                originProgramId
+                headline
+            }
+        }
+    }
+    '''
     _TESTS = [{
-        'url': 'http://g1.globo.com/carros/autoesporte/videos/t/exclusivos-do-g1/v/mercedes-benz-gla-passa-por-teste-de-colisao-na-europa/3607726/',
+        'url': 'https://globoplay.globo.com/v/3607726/',
         'info_dict': {
             'id': '3607726',
             'ext': 'mp4',
             'title': 'Mercedes-Benz GLA passa por teste de colisão na Europa',
             'duration': 103.204,
-            'uploader': 'G1',
-            'uploader_id': '2015',
+            'uploader': 'G1 ao vivo',
+            'uploader_id': '4209',
         },
         'params': {
             'skip_download': True,
@@ -41,39 +54,46 @@ class GloboIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'Acidentes de trânsito estão entre as maiores causas de queda de energia em SP',
             'duration': 137.973,
-            'uploader': 'Rede Globo',
-            'uploader_id': '196',
+            'uploader': 'Bom Dia Brasil',
+            'uploader_id': '810',
         },
         'params': {
             'skip_download': True,
         },
-    }, {
-        'url': 'http://canalbrasil.globo.com/programas/sangue-latino/videos/3928201.html',
-        'only_matching': True,
-    }, {
-        'url': 'http://globosatplay.globo.com/globonews/v/4472924/',
-        'only_matching': True,
-    }, {
-        'url': 'http://globotv.globo.com/t/programa/v/clipe-sexo-e-as-negas-adeus/3836166/',
-        'only_matching': True,
-    }, {
-        'url': 'http://globotv.globo.com/canal-brasil/sangue-latino/t/todos-os-videos/v/ator-e-diretor-argentino-ricado-darin-fala-sobre-utopias-e-suas-perdas/3928201/',
-        'only_matching': True,
-    }, {
-        'url': 'http://canaloff.globo.com/programas/desejar-profundo/videos/4518560.html',
-        'only_matching': True,
     }, {
         'url': 'globo:3607726',
         'only_matching': True,
-    }, {
-        'url': 'https://globoplay.globo.com/v/10248083/',
+    },
+        {
+        'url': 'globo:8013907',  # needs subscription to globoplay
         'info_dict': {
-            'id': '10248083',
+            'id': '8013907',
             'ext': 'mp4',
-            'title': 'Melhores momentos: Equador 1 x 1 Brasil pelas Eliminatórias da Copa do Mundo 2022',
-            'duration': 530.964,
-            'uploader': 'SporTV',
-            'uploader_id': '698',
+            'title': 'Capítulo de 14/08/1989',
+            'episode': 'Episode 1',
+            'episode_number': 1,
+            'uploader': 'Tieta',
+            'uploader_id': '11895',
+            'duration': 2858.389,
+            'subtitles': 'count:1',
+        },
+        'params': {
+            'skip_download': True,
+        },
+    },
+        {
+        'url': 'globo:12824146',
+        'info_dict': {
+            'id': '12824146',
+            'ext': 'mp4',
+            'title': 'Acordo de damas',
+            'episode': 'Episode 1',
+            'episode_number': 1,
+            'uploader': 'Rensga Hits!',
+            'uploader_id': '20481',
+            'duration': 1953.994,
+            'season': 'Season 2',
+            'season_number': 2,
         },
         'params': {
             'skip_download': True,
@@ -83,98 +103,71 @@ class GloboIE(InfoExtractor):
     def _real_extract(self, url):
         video_id = self._match_id(url)
 
-        self._request_webpage(
-            HEADRequest('https://globo-ab.globo.com/v2/selected-alternatives?experiments=player-isolated-experiment-02&skipImpressions=true'),
-            video_id, 'Getting cookies')
-
-        video = self._download_json(
-            'http://api.globovideos.com/videos/%s/playlist' % video_id,
-            video_id)['videos'][0]
-        if not self.get_param('allow_unplayable_formats') and video.get('encrypted') is True:
-            self.report_drm(video_id)
-
-        title = video['title']
+        info = self._download_json(
+            'https://cloud-jarvis.globo.com/graphql', video_id,
+            query={
+                'operationName': 'getVideoView',
+                'variables': json.dumps({'videoId': video_id}),
+                'query': self._VIDEO_VIEW,
+            }, headers={
+                'content-type': 'application/json',
+                'x-platform-id': 'web',
+                'x-device-id': 'desktop',
+                'x-client-version': '2024.12-5',
+            })['data']['video']
 
         formats = []
-        security = self._download_json(
-            'https://playback.video.globo.com/v2/video-session', video_id, 'Downloading security hash for %s' % video_id,
-            headers={'content-type': 'application/json'}, data=json.dumps({
-                "player_type": "desktop",
-                "video_id": video_id,
-                "quality": "max",
-                "content_protection": "widevine",
-                "vsid": "581b986b-4c40-71f0-5a58-803e579d5fa2",
-                "tz": "-3.0:00"
-            }).encode())
+        video = self._download_json(
+            'https://playback.video.globo.com/v4/video-session', video_id,
+            f'Downloading resource info for {video_id}',
+            headers={'Content-Type': 'application/json'},
+            data=json.dumps(filter_dict({
+                'player_type': 'mirakulo_8k_hdr',
+                'video_id': video_id,
+                'quality': 'max',
+                'content_protection': 'widevine',
+                'vsid': f'{uuid.uuid4()}',
+                'consumption': 'streaming',
+                'capabilities': {'low_latency': True},
+                'tz': '-03:00',
+                'Authorization': try_get(self._get_cookies('https://globo.com'),
+                                         lambda x: f'Bearer {x["GLBID"].value}'),
+                'version': 1,
+            })).encode())
 
-        self._request_webpage(HEADRequest(security['sources'][0]['url_template']), video_id, 'Getting locksession cookie')
+        if traverse_obj(video, ('resource', 'drm_protection_enabled', {bool})):
+            self.report_drm(video_id)
 
-        security_hash = security['sources'][0]['token']
-        if not security_hash:
-            message = security.get('message')
-            if message:
-                raise ExtractorError(
-                    '%s returned error: %s' % (self.IE_NAME, message), expected=True)
+        main_source = video['sources'][0]
 
-        hash_code = security_hash[:2]
-        padding = '%010d' % random.randint(1, 10000000000)
-        if hash_code in ('04', '14'):
-            received_time = security_hash[3:13]
-            received_md5 = security_hash[24:]
-            hash_prefix = security_hash[:23]
-        elif hash_code in ('02', '12', '03', '13'):
-            received_time = security_hash[2:12]
-            received_md5 = security_hash[22:]
-            padding += '1'
-            hash_prefix = '05' + security_hash[:22]
+        # 4k streams are exclusively outputted in dash, so we need to filter these out
+        if determine_ext(main_source['url']) == 'mpd':
+            formats, subtitles = self._extract_mpd_formats_and_subtitles(main_source['url'], video_id, mpd_id='dash')
+        else:
+            formats, subtitles = self._extract_m3u8_formats_and_subtitles(
+                main_source['url'], video_id, 'mp4', m3u8_id='hls')
 
-        padded_sign_time = compat_str(int(received_time) + 86400) + padding
-        md5_data = (received_md5 + padded_sign_time + '0xAC10FD').encode()
-        signed_md5 = base64.urlsafe_b64encode(hashlib.md5(md5_data).digest()).decode().strip('=')
-        signed_hash = hash_prefix + padded_sign_time + signed_md5
-        source = security['sources'][0]['url_parts']
-        resource_url = source['scheme'] + '://' + source['domain'] + source['path']
-        signed_url = '%s?h=%s&k=html5&a=%s' % (resource_url, signed_hash, 'F' if video.get('subscriber_only') else 'A')
-
-        fmts, subtitles = self._extract_m3u8_formats_and_subtitles(
-            signed_url, video_id, 'mp4', entry_protocol='m3u8_native', m3u8_id='hls', fatal=False)
-        formats.extend(fmts)
-
-        for resource in video['resources']:
-            if resource.get('type') == 'subtitle':
-                subtitles.setdefault(resource.get('language') or 'por', []).append({
-                    'url': resource.get('url'),
-                })
-        subs = try_get(security, lambda x: x['source']['subtitles'], expected_type=dict) or {}
-        for sub_lang, sub_url in subs.items():
-            if sub_url:
-                subtitles.setdefault(sub_lang or 'por', []).append({
-                    'url': sub_url,
-                })
-        subs = try_get(security, lambda x: x['source']['subtitles_webvtt'], expected_type=dict) or {}
-        for sub_lang, sub_url in subs.items():
-            if sub_url:
-                subtitles.setdefault(sub_lang or 'por', []).append({
-                    'url': sub_url,
-                })
-
-        duration = float_or_none(video.get('duration'), 1000)
-        uploader = video.get('channel')
-        uploader_id = str_or_none(video.get('channel_id'))
+        self._merge_subtitles(traverse_obj(main_source, ('text', ..., ('caption', 'subtitle'), {
+            'url': ('srt', 'url', {url_or_none}),
+        }, all, {subs_list_to_dict(lang='pt-BR')})), target=subtitles)
 
         return {
             'id': video_id,
-            'title': title,
-            'duration': duration,
-            'uploader': uploader,
-            'uploader_id': uploader_id,
+            **traverse_obj(info, {
+                'title': ('headline', {str}),
+                'duration': ('duration', {float_or_none(scale=1000)}),
+                'uploader': ('title', 'headline', {str}),
+                'uploader_id': ('title', 'originProgramId', {str_or_none}),
+                'episode_number': ('relatedEpisodeNumber', {int_or_none}),
+                'season_number': ('relatedSeasonNumber', {int_or_none}),
+            }),
             'formats': formats,
             'subtitles': subtitles,
         }
 
 
 class GloboArticleIE(InfoExtractor):
-    _VALID_URL = r'https?://.+?\.globo\.com/(?:[^/]+/)*(?P<id>[^/.]+)(?:\.html)?'
+    _VALID_URL = r'https?://(?!globoplay).+?\.globo\.com/(?:[^/?#]+/)*(?P<id>[^/?#.]+)(?:\.html)?'
 
     _VIDEOID_REGEXES = [
         r'\bdata-video-id=["\'](\d{7,})["\']',
@@ -230,7 +223,7 @@ class GloboArticleIE(InfoExtractor):
 
     @classmethod
     def suitable(cls, url):
-        return False if GloboIE.suitable(url) else super(GloboArticleIE, cls).suitable(url)
+        return False if GloboIE.suitable(url) else super().suitable(url)
 
     def _real_extract(self, url):
         display_id = self._match_id(url)
@@ -239,7 +232,7 @@ class GloboArticleIE(InfoExtractor):
         for video_regex in self._VIDEOID_REGEXES:
             video_ids.extend(re.findall(video_regex, webpage))
         entries = [
-            self.url_result('globo:%s' % video_id, GloboIE.ie_key())
+            self.url_result(f'globo:{video_id}', GloboIE.ie_key())
             for video_id in orderedSet(video_ids)]
         title = self._og_search_title(webpage).strip()
         description = self._html_search_meta('description', webpage)
diff --git a/plugins/youtube_download/yt_dlp/extractor/glomex.py b/plugins/youtube_download/yt_dlp/extractor/glomex.py
index 22aac0d..35ffad5 100644
--- a/plugins/youtube_download/yt_dlp/extractor/glomex.py
+++ b/plugins/youtube_download/yt_dlp/extractor/glomex.py
@@ -3,9 +3,9 @@ import urllib.parse
 
 from .common import InfoExtractor
 from ..utils import (
+    ExtractorError,
     determine_ext,
     extract_attributes,
-    ExtractorError,
     int_or_none,
     parse_qs,
     smuggle_url,
@@ -49,15 +49,15 @@ class GlomexBaseIE(InfoExtractor):
         video_id_type = self._get_videoid_type(video_id)
         return self._download_json(
             self._API_URL,
-            video_id, 'Downloading %s JSON' % video_id_type,
-            'Unable to download %s JSON' % video_id_type,
+            video_id, f'Downloading {video_id_type} JSON',
+            f'Unable to download {video_id_type} JSON',
             query=query)
 
     def _download_and_extract_api_data(self, video_id, integration, current_url):
         api_data = self._download_api_data(video_id, integration, current_url)
         videos = api_data['videos']
         if not videos:
-            raise ExtractorError('no videos found for %s' % video_id)
+            raise ExtractorError(f'no videos found for {video_id}')
         videos = [self._extract_api_data(video, video_id) for video in videos]
         return videos[0] if len(videos) == 1 else self.playlist_result(videos, video_id)
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/gmanetwork.py b/plugins/youtube_download/yt_dlp/extractor/gmanetwork.py
index 62fff4e..ecef1e1 100644
--- a/plugins/youtube_download/yt_dlp/extractor/gmanetwork.py
+++ b/plugins/youtube_download/yt_dlp/extractor/gmanetwork.py
@@ -33,7 +33,7 @@ class GMANetworkVideoIE(InfoExtractor):
             'channel': 'YoüLOL',
             'availability': 'public',
             'release_date': '20220919',
-        }
+        },
     }, {
         'url': 'https://www.gmanetwork.com/fullepisodes/home/more_than_words/87059/more-than-words-full-episode-80/video?section=home',
         'info_dict': {
@@ -60,7 +60,7 @@ class GMANetworkVideoIE(InfoExtractor):
             'tags': 'count:29',
             'view_count': int,
             'uploader_url': 'http://www.youtube.com/user/GMANETWORK',
-        }
+        },
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/go.py b/plugins/youtube_download/yt_dlp/extractor/go.py
index b075a02..83c1979 100644
--- a/plugins/youtube_download/yt_dlp/extractor/go.py
+++ b/plugins/youtube_download/yt_dlp/extractor/go.py
@@ -1,18 +1,18 @@
 import re
 
 from .adobepass import AdobePassIE
-from ..compat import compat_str
 from ..utils import (
-    int_or_none,
-    determine_ext,
-    parse_age_limit,
-    remove_start,
-    remove_end,
-    try_get,
-    urlencode_postdata,
     ExtractorError,
-    unified_timestamp,
+    determine_ext,
+    int_or_none,
+    join_nonempty,
+    parse_age_limit,
+    remove_end,
+    remove_start,
     traverse_obj,
+    try_get,
+    unified_timestamp,
+    urlencode_postdata,
 )
 
 
@@ -50,14 +50,14 @@ class GoIE(AdobePassIE):
     _VALID_URL = r'''(?x)
                     https?://
                         (?P<sub_domain>
-                            (?:%s\.)?go|fxnow\.fxnetworks|
+                            (?:{}\.)?go|fxnow\.fxnetworks|
                             (?:www\.)?(?:abc|freeform|disneynow)
                         )\.com/
                         (?:
                             (?:[^/]+/)*(?P<id>[Vv][Dd][Kk][Aa]\w+)|
                             (?:[^/]+/)*(?P<display_id>[^/?\#]+)
                         )
-                    ''' % r'\.|'.join(list(_SITE_INFO.keys()))
+                    '''.format(r'\.|'.join(list(_SITE_INFO.keys())))
     _TESTS = [{
         'url': 'http://abc.go.com/shows/designated-survivor/video/most-recent/VDKA3807643',
         'info_dict': {
@@ -94,7 +94,7 @@ class GoIE(AdobePassIE):
             'series': 'Shadowhunters',
             'episode_number': 1,
             'timestamp': 1483387200,
-            'ext': 'mp4'
+            'ext': 'mp4',
         },
         'params': {
             'geo_bypass_ip_block': '3.244.239.0/24',
@@ -168,7 +168,7 @@ class GoIE(AdobePassIE):
     def _extract_videos(self, brand, video_id='-1', show_id='-1'):
         display_id = video_id if video_id != '-1' else show_id
         return self._download_json(
-            'http://api.contents.watchabc.go.com/vp2/ws/contents/3000/videos/%s/001/-1/%s/-1/%s/-1/-1.json' % (brand, show_id, video_id),
+            f'http://api.contents.watchabc.go.com/vp2/ws/contents/3000/videos/{brand}/001/-1/{show_id}/-1/{video_id}/-1/-1.json',
             display_id)['video']
 
     def _real_extract(self, url):
@@ -191,7 +191,7 @@ class GoIE(AdobePassIE):
                 video_id = try_get(
                     layout,
                     (lambda x: x['videoid'], lambda x: x['video']['id']),
-                    compat_str)
+                    str)
             if not video_id:
                 video_id = self._search_regex(
                     (
@@ -201,7 +201,7 @@ class GoIE(AdobePassIE):
                         # page.analytics.videoIdCode
                         r'\bvideoIdCode["\']\s*:\s*["\']((?:vdka|VDKA)\w+)',
                         # https://abc.com/shows/the-rookie/episode-guide/season-02/03-the-bet
-                        r'\b(?:video)?id["\']\s*:\s*["\'](VDKA\w+)'
+                        r'\b(?:video)?id["\']\s*:\s*["\'](VDKA\w+)',
                     ), webpage, 'video id', default=video_id)
             if not site_info:
                 brand = self._search_regex(
@@ -266,7 +266,7 @@ class GoIE(AdobePassIE):
                             self.raise_geo_restricted(
                                 error['message'], countries=['US'])
                     error_message = ', '.join([error['message'] for error in errors])
-                    raise ExtractorError('%s said: %s' % (self.IE_NAME, error_message), expected=True)
+                    raise ExtractorError(f'{self.IE_NAME} said: {error_message}', expected=True)
                 asset_url += '?' + entitlement['uplynkData']['sessionKey']
                 fmts, subs = self._extract_m3u8_formats_and_subtitles(
                     asset_url, video_id, 'mp4', m3u8_id=format_id or 'hls', fatal=False)
@@ -280,7 +280,7 @@ class GoIE(AdobePassIE):
                 }
                 if re.search(r'(?:/mp4/source/|_source\.mp4)', asset_url):
                     f.update({
-                        'format_id': ('%s-' % format_id if format_id else '') + 'SOURCE',
+                        'format_id': (f'{format_id}-' if format_id else '') + 'SOURCE',
                         'quality': 1,
                     })
                 else:
@@ -288,7 +288,7 @@ class GoIE(AdobePassIE):
                     if mobj:
                         height = int(mobj.group(2))
                         f.update({
-                            'format_id': ('%s-' % format_id if format_id else '') + '%dP' % height,
+                            'format_id': join_nonempty(format_id, f'{height}P'),
                             'width': int(mobj.group(1)),
                             'height': height,
                         })
diff --git a/plugins/youtube_download/yt_dlp/extractor/godresource.py b/plugins/youtube_download/yt_dlp/extractor/godresource.py
new file mode 100644
index 0000000..35cc30c
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/godresource.py
@@ -0,0 +1,79 @@
+from .common import InfoExtractor
+from ..utils import (
+    ExtractorError,
+    determine_ext,
+    str_or_none,
+    unified_timestamp,
+    url_or_none,
+)
+from ..utils.traversal import traverse_obj
+
+
+class GodResourceIE(InfoExtractor):
+    _VALID_URL = r'https?://new\.godresource\.com/video/(?P<id>\w+)'
+    _TESTS = [{
+        # hls stream
+        'url': 'https://new.godresource.com/video/A01mTKjyf6w',
+        'info_dict': {
+            'id': 'A01mTKjyf6w',
+            'ext': 'mp4',
+            'view_count': int,
+            'timestamp': 1710978666,
+            'channel_id': '5',
+            'thumbnail': 'https://cdn-02.godresource.com/e42968ac-9e8b-4231-ab86-f4f9d775841f/thumbnail.jpg',
+            'channel': 'Stedfast Baptist Church',
+            'upload_date': '20240320',
+            'title': 'GodResource video #A01mTKjyf6w',
+        },
+    }, {
+        # mp4 link
+        'url': 'https://new.godresource.com/video/01DXmBbQv_X',
+        'md5': '0e8f72aa89a106b9d5c011ba6f8717b7',
+        'info_dict': {
+            'id': '01DXmBbQv_X',
+            'ext': 'mp4',
+            'channel_id': '12',
+            'view_count': int,
+            'timestamp': 1687996800,
+            'thumbnail': 'https://cdn-02.godresource.com/sodomitedeception/thumbnail.jpg',
+            'channel': 'Documentaries',
+            'title': 'The Sodomite Deception',
+            'upload_date': '20230629',
+        },
+    }]
+
+    def _real_extract(self, url):
+        display_id = self._match_id(url)
+
+        api_data = self._download_json(
+            f'https://api.godresource.com/api/Streams/{display_id}', display_id)
+
+        video_url = api_data['streamUrl']
+        is_live = api_data.get('isLive') or False
+        if (ext := determine_ext(video_url)) == 'm3u8':
+            formats, subtitles = self._extract_m3u8_formats_and_subtitles(
+                video_url, display_id, live=is_live)
+        elif ext == 'mp4':
+            formats, subtitles = [{
+                'url': video_url,
+                'ext': ext,
+            }], {}
+        else:
+            raise ExtractorError(f'Unexpected video format {ext}')
+
+        return {
+            'id': display_id,
+            'formats': formats,
+            'subtitles': subtitles,
+            'title': '',
+            'is_live': is_live,
+            **traverse_obj(api_data, {
+                'title': ('title', {str}),
+                'thumbnail': ('thumbnail', {url_or_none}),
+                'view_count': ('views', {int}),
+                'channel': ('channelName', {str}),
+                'channel_id': ('channelId', {str_or_none}),
+                'timestamp': ('streamDateCreated', {unified_timestamp}),
+                'modified_timestamp': ('streamDataModified', {unified_timestamp}),
+            }),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/godtube.py b/plugins/youtube_download/yt_dlp/extractor/godtube.py
index 6975401..f4496ac 100644
--- a/plugins/youtube_download/yt_dlp/extractor/godtube.py
+++ b/plugins/youtube_download/yt_dlp/extractor/godtube.py
@@ -6,6 +6,7 @@ from ..utils import (
 
 
 class GodTubeIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?godtube\.com/watch/\?v=(?P<id>[\da-zA-Z]+)'
     _TESTS = [
         {
@@ -29,7 +30,7 @@ class GodTubeIE(InfoExtractor):
         video_id = mobj.group('id')
 
         config = self._download_xml(
-            'http://www.godtube.com/resource/mediaplayer/%s.xml' % video_id.lower(),
+            f'http://www.godtube.com/resource/mediaplayer/{video_id.lower()}.xml',
             video_id, 'Downloading player config XML')
 
         video_url = config.find('file').text
@@ -39,7 +40,7 @@ class GodTubeIE(InfoExtractor):
         thumbnail = config.find('image').text
 
         media = self._download_xml(
-            'http://www.godtube.com/media/xml/?v=%s' % video_id, video_id, 'Downloading media XML')
+            f'http://www.godtube.com/media/xml/?v={video_id}', video_id, 'Downloading media XML')
 
         title = media.find('title').text
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/gofile.py b/plugins/youtube_download/yt_dlp/extractor/gofile.py
index ddbce2e..a9777a5 100644
--- a/plugins/youtube_download/yt_dlp/extractor/gofile.py
+++ b/plugins/youtube_download/yt_dlp/extractor/gofile.py
@@ -1,10 +1,7 @@
 import hashlib
 
 from .common import InfoExtractor
-from ..utils import (
-    ExtractorError,
-    try_get
-)
+from ..utils import ExtractorError, try_get
 
 
 class GofileIE(InfoExtractor):
@@ -23,8 +20,8 @@ class GofileIE(InfoExtractor):
                 'title': 'nuuh',
                 'release_timestamp': 1638338704,
                 'release_date': '20211201',
-            }
-        }]
+            },
+        }],
     }, {
         'url': 'https://gofile.io/d/is8lKr',
         'info_dict': {
@@ -58,21 +55,18 @@ class GofileIE(InfoExtractor):
             return
 
         account_data = self._download_json(
-            'https://api.gofile.io/createAccount', None, note='Getting a new guest account')
+            'https://api.gofile.io/accounts', None, 'Getting a new guest account', data=b'{}')
         self._TOKEN = account_data['data']['token']
-        self._set_cookie('gofile.io', 'accountToken', self._TOKEN)
+        self._set_cookie('.gofile.io', 'accountToken', self._TOKEN)
 
     def _entries(self, file_id):
-        query_params = {
-            'contentId': file_id,
-            'token': self._TOKEN,
-            'websiteToken': 12345,
-        }
+        query_params = {'wt': '4fd6sg89d7s6'}  # From https://gofile.io/dist/js/alljs.js
         password = self.get_param('videopassword')
         if password:
-            query_params['password'] = hashlib.sha256(password.encode('utf-8')).hexdigest()
+            query_params['password'] = hashlib.sha256(password.encode()).hexdigest()
         files = self._download_json(
-            'https://api.gofile.io/getContent', file_id, note='Getting filelist', query=query_params)
+            f'https://api.gofile.io/contents/{file_id}', file_id, 'Getting filelist',
+            query=query_params, headers={'Authorization': f'Bearer {self._TOKEN}'})
 
         status = files['status']
         if status == 'error-passwordRequired':
@@ -82,7 +76,7 @@ class GofileIE(InfoExtractor):
             raise ExtractorError(f'{self.IE_NAME} said: status {status}', expected=True)
 
         found_files = False
-        for file in (try_get(files, lambda x: x['data']['contents'], dict) or {}).values():
+        for file in (try_get(files, lambda x: x['data']['children'], dict) or {}).values():
             file_type, file_format = file.get('mimetype').split('/', 1)
             if file_type not in ('video', 'audio') and file_format != 'vnd.mts':
                 continue
@@ -95,7 +89,7 @@ class GofileIE(InfoExtractor):
                     'title': file['name'].rsplit('.', 1)[0],
                     'url': file_url,
                     'filesize': file.get('size'),
-                    'release_timestamp': file.get('createTime')
+                    'release_timestamp': file.get('createTime'),
                 }
 
         if not found_files:
diff --git a/plugins/youtube_download/yt_dlp/extractor/golem.py b/plugins/youtube_download/yt_dlp/extractor/golem.py
index c33d950..964bf65 100644
--- a/plugins/youtube_download/yt_dlp/extractor/golem.py
+++ b/plugins/youtube_download/yt_dlp/extractor/golem.py
@@ -1,15 +1,13 @@
+import urllib.parse
+
 from .common import InfoExtractor
-from ..compat import (
-    compat_str,
-    compat_urlparse,
-)
 from ..utils import (
     determine_ext,
 )
 
 
 class GolemIE(InfoExtractor):
-    _VALID_URL = r'^https?://video\.golem\.de/.+?/(?P<id>.+?)/'
+    _VALID_URL = r'https?://video\.golem\.de/.+?/(?P<id>.+?)/'
     _TEST = {
         'url': 'http://video.golem.de/handy/14095/iphone-6-und-6-plus-test.html',
         'md5': 'c1a2c0a3c863319651c7c992c5ee29bf',
@@ -20,7 +18,7 @@ class GolemIE(InfoExtractor):
             'title': 'iPhone 6 und 6 Plus - Test',
             'duration': 300.44,
             'filesize': 65309548,
-        }
+        },
     }
 
     _PREFIX = 'http://video.golem.de'
@@ -29,7 +27,7 @@ class GolemIE(InfoExtractor):
         video_id = self._match_id(url)
 
         config = self._download_xml(
-            'https://video.golem.de/xml/{0}.xml'.format(video_id), video_id)
+            f'https://video.golem.de/xml/{video_id}.xml', video_id)
 
         info = {
             'id': video_id,
@@ -44,8 +42,8 @@ class GolemIE(InfoExtractor):
                 continue
 
             formats.append({
-                'format_id': compat_str(e.tag),
-                'url': compat_urlparse.urljoin(self._PREFIX, url),
+                'format_id': str(e.tag),
+                'url': urllib.parse.urljoin(self._PREFIX, url),
                 'height': self._int(e.get('height'), 'height'),
                 'width': self._int(e.get('width'), 'width'),
                 'filesize': self._int(e.findtext('filesize'), 'filesize'),
@@ -59,7 +57,7 @@ class GolemIE(InfoExtractor):
             if not url:
                 continue
             thumbnails.append({
-                'url': compat_urlparse.urljoin(self._PREFIX, url),
+                'url': urllib.parse.urljoin(self._PREFIX, url),
                 'width': self._int(e.get('width'), 'thumbnail width'),
                 'height': self._int(e.get('height'), 'thumbnail height'),
             })
diff --git a/plugins/youtube_download/yt_dlp/extractor/goodgame.py b/plugins/youtube_download/yt_dlp/extractor/goodgame.py
index c17ad56..6f61f18 100644
--- a/plugins/youtube_download/yt_dlp/extractor/goodgame.py
+++ b/plugins/youtube_download/yt_dlp/extractor/goodgame.py
@@ -1,40 +1,48 @@
 from .common import InfoExtractor
 from ..utils import (
-    clean_html,
     int_or_none,
     str_or_none,
     traverse_obj,
+    url_or_none,
 )
 
 
 class GoodGameIE(InfoExtractor):
     IE_NAME = 'goodgame:stream'
-    _VALID_URL = r'https?://goodgame\.ru/channel/(?P<id>\w+)'
+    _VALID_URL = r'https?://goodgame\.ru/(?!channel/)(?P<id>[\w.*-]+)'
     _TESTS = [{
-        'url': 'https://goodgame.ru/channel/Pomi/#autoplay',
+        'url': 'https://goodgame.ru/TGW#autoplay',
         'info_dict': {
-            'id': 'pomi',
+            'id': '7998',
             'ext': 'mp4',
-            'title': r're:Reynor vs Special \(1/2,bo3\) Wardi Spring EU \- playoff \(финальный день\) \d{4}-\d{2}-\d{2} \d{2}:\d{2}$',
-            'channel_id': '1644',
-            'channel': 'Pomi',
-            'channel_url': 'https://goodgame.ru/channel/Pomi/',
-            'description': 'md5:4a87b775ee7b2b57bdccebe285bbe171',
-            'thumbnail': r're:^https?://.*\.jpg$',
+            'channel_id': '7998',
+            'title': r're:шоуматч Happy \(NE\) vs Fortitude \(UD\), потом ладдер и дс \d{4}-\d{2}-\d{2} \d{2}:\d{2}$',
+            'channel_url': 'https://goodgame.ru/TGW',
+            'thumbnail': 'https://hls.goodgame.ru/previews/7998_240.jpg',
+            'uploader': 'TGW',
+            'channel': 'JosephStalin',
             'live_status': 'is_live',
-            'view_count': int,
+            'age_limit': 18,
+            'channel_follower_count': int,
+            'uploader_id': '2899',
+            'concurrent_view_count': int,
         },
         'params': {'skip_download': 'm3u8'},
-        'skip': 'May not be online',
+    }, {
+        'url': 'https://goodgame.ru/Mr.Gray',
+        'only_matching': True,
+    }, {
+        'url': 'https://goodgame.ru/HeDoPa3yMeHue*',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
         channel_name = self._match_id(url)
-        response = self._download_json(f'https://api2.goodgame.ru/v2/streams/{channel_name}', channel_name)
-        player_id = response['channel']['gg_player_src']
+        response = self._download_json(f'https://goodgame.ru/api/4/users/{channel_name}/stream', channel_name)
+        player_id = response['streamkey']
 
         formats, subtitles = [], {}
-        if response.get('status') == 'Live':
+        if response.get('status'):
             formats, subtitles = self._extract_m3u8_formats_and_subtitles(
                 f'https://hls.goodgame.ru/manifest/{player_id}_master.m3u8',
                 channel_name, 'mp4', live=True)
@@ -45,13 +53,17 @@ class GoodGameIE(InfoExtractor):
             'id': player_id,
             'formats': formats,
             'subtitles': subtitles,
-            'title': traverse_obj(response, ('channel', 'title')),
-            'channel': channel_name,
-            'channel_id': str_or_none(traverse_obj(response, ('channel', 'id'))),
-            'channel_url': response.get('url'),
-            'description': clean_html(traverse_obj(response, ('channel', 'description'))),
-            'thumbnail': traverse_obj(response, ('channel', 'thumb')),
             'is_live': bool(formats),
-            'view_count': int_or_none(response.get('viewers')),
-            'age_limit': 18 if traverse_obj(response, ('channel', 'adult')) else None,
+            **traverse_obj(response, {
+                'title': ('title', {str}),
+                'channel': ('channelkey', {str}),
+                'channel_id': ('id', {str_or_none}),
+                'channel_url': ('link', {url_or_none}),
+                'uploader': ('streamer', 'username', {str}),
+                'uploader_id': ('streamer', 'id', {str_or_none}),
+                'thumbnail': ('preview', {url_or_none}, {self._proto_relative_url}),
+                'concurrent_view_count': ('viewers', {int_or_none}),
+                'channel_follower_count': ('followers', {int_or_none}),
+                'age_limit': ('adult', {bool}, {lambda x: 18 if x else None}),
+            }),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/googledrive.py b/plugins/youtube_download/yt_dlp/extractor/googledrive.py
index 2fdec20..dfba2d3 100644
--- a/plugins/youtube_download/yt_dlp/extractor/googledrive.py
+++ b/plugins/youtube_download/yt_dlp/extractor/googledrive.py
@@ -1,9 +1,11 @@
 import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import compat_parse_qs
+from .youtube import YoutubeIE
 from ..utils import (
     ExtractorError,
+    bug_reports_message,
     determine_ext,
     extract_attributes,
     get_element_by_class,
@@ -19,9 +21,9 @@ class GoogleDriveIE(InfoExtractor):
     _VALID_URL = r'''(?x)
                         https?://
                             (?:
-                                (?:docs|drive)\.google\.com/
+                                (?:docs|drive|drive\.usercontent)\.google\.com/
                                 (?:
-                                    (?:uc|open)\?.*?id=|
+                                    (?:uc|open|download)\?.*?id=|
                                     file/d/
                                 )|
                                 video\.google\.com/get_player\?.*?docid=
@@ -37,7 +39,18 @@ class GoogleDriveIE(InfoExtractor):
             'title': 'Big Buck Bunny.mp4',
             'duration': 45,
             'thumbnail': 'https://drive.google.com/thumbnail?id=0ByeS4oOUV-49Zzh4R1J6R09zazQ',
-        }
+        },
+    }, {
+        # has itag 50 which is not in YoutubeIE._formats (royalty Free music from 1922)
+        'url': 'https://drive.google.com/uc?id=1IP0o8dHcQrIHGgVyp0Ofvx2cGfLzyO1x',
+        'md5': '322db8d63dd19788c04050a4bba67073',
+        'info_dict': {
+            'id': '1IP0o8dHcQrIHGgVyp0Ofvx2cGfLzyO1x',
+            'ext': 'mp3',
+            'title': 'My Buddy - Henry Burr - Gus Kahn - Walter Donaldson.mp3',
+            'duration': 184,
+            'thumbnail': 'https://drive.google.com/thumbnail?id=1IP0o8dHcQrIHGgVyp0Ofvx2cGfLzyO1x',
+        },
     }, {
         # video can't be watched anonymously due to view count limit reached,
         # but can be downloaded (see https://github.com/ytdl-org/youtube-dl/issues/14046)
@@ -53,24 +66,13 @@ class GoogleDriveIE(InfoExtractor):
     }, {
         'url': 'https://drive.google.com/uc?id=0B2fjwgkl1A_CX083Tkowdmt6d28',
         'only_matching': True,
+    }, {
+        'url': 'https://drive.usercontent.google.com/download?id=0ByeS4oOUV-49Zzh4R1J6R09zazQ',
+        'only_matching': True,
     }]
     _FORMATS_EXT = {
-        '5': 'flv',
-        '6': 'flv',
-        '13': '3gp',
-        '17': '3gp',
-        '18': 'mp4',
-        '22': 'mp4',
-        '34': 'flv',
-        '35': 'flv',
-        '36': '3gp',
-        '37': 'mp4',
-        '38': 'mp4',
-        '43': 'webm',
-        '44': 'webm',
-        '45': 'webm',
-        '46': 'webm',
-        '59': 'mp4',
+        **{k: v['ext'] for k, v in YoutubeIE._formats.items() if v.get('ext')},
+        '50': 'm4a',
     }
     _BASE_URL_CAPTIONS = 'https://drive.google.com/timedtext'
     _CAPTIONS_ENTRY_TAG = {
@@ -86,7 +88,7 @@ class GoogleDriveIE(InfoExtractor):
             r'<iframe[^>]+src="https?://(?:video\.google\.com/get_player\?.*?docid=|(?:docs|drive)\.google\.com/file/d/)(?P<id>[a-zA-Z0-9_-]{28,})',
             webpage)
         if mobj:
-            yield 'https://drive.google.com/file/d/%s' % mobj.group('id')
+            yield 'https://drive.google.com/file/d/{}'.format(mobj.group('id'))
 
     def _download_subtitles_xml(self, video_id, subtitles_id, hl):
         if self._captions_xml:
@@ -164,7 +166,7 @@ class GoogleDriveIE(InfoExtractor):
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        video_info = compat_parse_qs(self._download_webpage(
+        video_info = urllib.parse.parse_qs(self._download_webpage(
             'https://drive.google.com/get_video_info',
             video_id, 'Downloading video webpage', query={'docid': video_id}))
 
@@ -191,10 +193,13 @@ class GoogleDriveIE(InfoExtractor):
                 if len(fmt_stream_split) < 2:
                     continue
                 format_id, format_url = fmt_stream_split[:2]
+                ext = self._FORMATS_EXT.get(format_id)
+                if not ext:
+                    self.report_warning(f'Unknown format {format_id}{bug_reports_message()}')
                 f = {
                     'url': lowercase_escape(format_url),
                     'format_id': format_id,
-                    'ext': self._FORMATS_EXT[format_id],
+                    'ext': ext,
                 }
                 resolution = resolutions.get(format_id)
                 if resolution:
@@ -205,15 +210,16 @@ class GoogleDriveIE(InfoExtractor):
                 formats.append(f)
 
         source_url = update_url_query(
-            'https://drive.google.com/uc', {
+            'https://drive.usercontent.google.com/download', {
                 'id': video_id,
                 'export': 'download',
+                'confirm': 't',
             })
 
         def request_source_file(source_url, kind, data=None):
             return self._request_webpage(
-                source_url, video_id, note='Requesting %s file' % kind,
-                errnote='Unable to request %s file' % kind, fatal=False, data=data)
+                source_url, video_id, note=f'Requesting {kind} file',
+                errnote=f'Unable to request {kind} file', fatal=False, data=data)
         urlh = request_source_file(source_url, 'source')
         if urlh:
             def add_source_format(urlh):
@@ -264,7 +270,7 @@ class GoogleDriveIE(InfoExtractor):
         if ttsurl:
             # the video Id for subtitles will be the last value in the ttsurl
             # query string
-            subtitles_id = ttsurl.encode('utf-8').decode(
+            subtitles_id = ttsurl.encode().decode(
                 'unicode_escape').split('=')[-1]
 
         self.cookiejar.clear(domain='.google.com', path='/', name='NID')
@@ -288,7 +294,7 @@ class GoogleDriveFolderIE(InfoExtractor):
         'url': 'https://drive.google.com/drive/folders/1dQ4sx0-__Nvg65rxTSgQrl7VyW_FZ9QI',
         'info_dict': {
             'id': '1dQ4sx0-__Nvg65rxTSgQrl7VyW_FZ9QI',
-            'title': 'Forrest'
+            'title': 'Forrest',
         },
         'playlist_count': 3,
     }]
@@ -306,13 +312,13 @@ GET %s
     def _call_api(self, folder_id, key, data, **kwargs):
         response = self._download_webpage(
             'https://clients6.google.com/batch/drive/v2beta',
-            folder_id, data=data.encode('utf-8'),
+            folder_id, data=data.encode(),
             headers={
                 'Content-Type': 'text/plain;charset=UTF-8;',
                 'Origin': 'https://drive.google.com',
             }, query={
                 '$ct': f'multipart/mixed; boundary="{self._BOUNDARY}"',
-                'key': key
+                'key': key,
             }, **kwargs)
         return self._search_json('', response, 'api response', folder_id, **kwargs) or {}
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/googlepodcasts.py b/plugins/youtube_download/yt_dlp/extractor/googlepodcasts.py
index 8b2351b..8d1cc4f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/googlepodcasts.py
+++ b/plugins/youtube_download/yt_dlp/extractor/googlepodcasts.py
@@ -48,7 +48,7 @@ class GooglePodcastsIE(GooglePodcastsBaseIE):
             'timestamp': 1609606800,
             'duration': 2901,
             'series': "Wait Wait... Don't Tell Me!",
-        }
+        },
     }
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/goplay.py b/plugins/youtube_download/yt_dlp/extractor/goplay.py
index 960d7d7..c654c75 100644
--- a/plugins/youtube_download/yt_dlp/extractor/goplay.py
+++ b/plugins/youtube_download/yt_dlp/extractor/goplay.py
@@ -1,45 +1,67 @@
 import base64
 import binascii
-import datetime
+import datetime as dt
 import hashlib
 import hmac
 import json
 import os
+import re
+import urllib.parse
 
 from .common import InfoExtractor
 from ..utils import (
     ExtractorError,
+    int_or_none,
+    remove_end,
     traverse_obj,
-    unescapeHTML,
 )
 
 
 class GoPlayIE(InfoExtractor):
-    _VALID_URL = r'https?://(www\.)?goplay\.be/video/([^/]+/[^/]+/|)(?P<display_id>[^/#]+)'
+    _VALID_URL = r'https?://(www\.)?goplay\.be/video/([^/?#]+/[^/?#]+/|)(?P<id>[^/#]+)'
 
     _NETRC_MACHINE = 'goplay'
 
     _TESTS = [{
-        'url': 'https://www.goplay.be/video/de-container-cup/de-container-cup-s3/de-container-cup-s3-aflevering-2#autoplay',
+        'url': 'https://www.goplay.be/video/de-slimste-mens-ter-wereld/de-slimste-mens-ter-wereld-s22/de-slimste-mens-ter-wereld-s22-aflevering-1',
         'info_dict': {
-            'id': '9c4214b8-e55d-4e4b-a446-f015f6c6f811',
+            'id': '2baa4560-87a0-421b-bffc-359914e3c387',
             'ext': 'mp4',
-            'title': 'S3 - Aflevering 2',
-            'series': 'De Container Cup',
-            'season': 'Season 3',
-            'season_number': 3,
-            'episode': 'Episode 2',
-            'episode_number': 2,
+            'title': 'S22 - Aflevering 1',
+            'description': r're:In aflevering 1 nemen Daan Alferink, Tess Elst en Xander De Rycke .{66}',
+            'series': 'De Slimste Mens ter Wereld',
+            'episode': 'Episode 1',
+            'season_number': 22,
+            'episode_number': 1,
+            'season': 'Season 22',
         },
-        'skip': 'This video is only available for registered users'
+        'params': {'skip_download': True},
+        'skip': 'This video is only available for registered users',
     }, {
-        'url': 'https://www.goplay.be/video/a-family-for-thr-holidays-s1-aflevering-1#autoplay',
+        'url': 'https://www.goplay.be/video/1917',
         'info_dict': {
-            'id': '74e3ed07-748c-49e4-85a0-393a93337dbf',
+            'id': '40cac41d-8d29-4ef5-aa11-75047b9f0907',
             'ext': 'mp4',
-            'title': 'A Family for the Holidays',
+            'title': '1917',
+            'description': r're:Op het hoogtepunt van de Eerste Wereldoorlog krijgen twee jonge .{94}',
         },
-        'skip': 'This video is only available for registered users'
+        'params': {'skip_download': True},
+        'skip': 'This video is only available for registered users',
+    }, {
+        'url': 'https://www.goplay.be/video/de-mol/de-mol-s11/de-mol-s11-aflevering-1#autoplay',
+        'info_dict': {
+            'id': 'ecb79672-92b9-4cd9-a0d7-e2f0250681ee',
+            'ext': 'mp4',
+            'title': 'S11 - Aflevering 1',
+            'description': r're:Tien kandidaten beginnen aan hun verovering van Amerika en ontmoeten .{102}',
+            'episode': 'Episode 1',
+            'series': 'De Mol',
+            'season_number': 11,
+            'episode_number': 1,
+            'season': 'Season 11',
+        },
+        'params': {'skip_download': True},
+        'skip': 'This video is only available for registered users',
     }]
 
     _id_token = None
@@ -53,40 +75,80 @@ class GoPlayIE(InfoExtractor):
         if not self._id_token:
             raise self.raise_login_required(method='password')
 
-    def _real_extract(self, url):
-        url, display_id = self._match_valid_url(url).group(0, 'display_id')
-        webpage = self._download_webpage(url, display_id)
-        video_data_json = self._html_search_regex(r'<div\s+data-hero="([^"]+)"', webpage, 'video_data')
-        video_data = self._parse_json(unescapeHTML(video_data_json), display_id).get('data')
+    # XXX: For parsing next.js v15+ data; see also yt_dlp.extractor.francetv
+    def _find_json(self, s):
+        return self._search_json(
+            r'\w+\s*:\s*', s, 'next js data', None, contains_pattern=r'\[(?s:.+)\]', default=None)
 
-        movie = video_data.get('movie')
-        if movie:
-            video_id = movie['videoUuid']
-            info_dict = {
-                'title': movie.get('title')
-            }
-        else:
-            episode = traverse_obj(video_data, ('playlists', ..., 'episodes', lambda _, v: v['pageInfo']['url'] == url), get_all=False)
-            video_id = episode['videoUuid']
-            info_dict = {
-                'title': episode.get('episodeTitle'),
-                'series': traverse_obj(episode, ('program', 'title')),
-                'season_number': episode.get('seasonNumber'),
-                'episode_number': episode.get('episodeNumber'),
-            }
+    def _real_extract(self, url):
+        display_id = self._match_id(url)
+        webpage = self._download_webpage(url, display_id)
+
+        nextjs_data = traverse_obj(
+            re.findall(r'<script[^>]*>\s*self\.__next_f\.push\(\s*(\[.+?\])\s*\);?\s*</script>', webpage),
+            (..., {json.loads}, ..., {self._find_json}, ...))
+        meta = traverse_obj(nextjs_data, (
+            ..., ..., 'children', ..., ..., 'children',
+            lambda _, v: v['video']['path'] == urllib.parse.urlparse(url).path, 'video', any))
+
+        video_id = meta['uuid']
+        info_dict = traverse_obj(meta, {
+            'title': ('title', {str}),
+            'description': ('description', {str.strip}),
+        })
+
+        if traverse_obj(meta, ('program', 'subtype')) != 'movie':
+            for season_data in traverse_obj(nextjs_data, (..., 'children', ..., 'playlists', ...)):
+                episode_data = traverse_obj(
+                    season_data, ('videos', lambda _, v: v['videoId'] == video_id, any))
+                if not episode_data:
+                    continue
+
+                episode_title = traverse_obj(
+                    episode_data, 'contextualTitle', 'episodeTitle', expected_type=str)
+                info_dict.update({
+                    'title': episode_title or info_dict.get('title'),
+                    'series': remove_end(info_dict.get('title'), f' - {episode_title}'),
+                    'season_number': traverse_obj(season_data, ('season', {int_or_none})),
+                    'episode_number': traverse_obj(episode_data, ('episodeNumber', {int_or_none})),
+                })
+                break
 
         api = self._download_json(
             f'https://api.goplay.be/web/v1/videos/long-form/{video_id}',
-            video_id, headers={'Authorization': 'Bearer %s' % self._id_token})
+            video_id, headers={
+                'Authorization': f'Bearer {self._id_token}',
+                **self.geo_verification_headers(),
+            })
 
-        formats, subs = self._extract_m3u8_formats_and_subtitles(
-            api['manifestUrls']['hls'], video_id, ext='mp4', m3u8_id='HLS')
+        if 'manifestUrls' in api:
+            formats, subtitles = self._extract_m3u8_formats_and_subtitles(
+                api['manifestUrls']['hls'], video_id, ext='mp4', m3u8_id='HLS')
+
+        else:
+            if 'ssai' not in api:
+                raise ExtractorError('expecting Google SSAI stream')
+
+            ssai_content_source_id = api['ssai']['contentSourceID']
+            ssai_video_id = api['ssai']['videoID']
+
+            dai = self._download_json(
+                f'https://dai.google.com/ondemand/dash/content/{ssai_content_source_id}/vid/{ssai_video_id}/streams',
+                video_id, data=b'{"api-key":"null"}',
+                headers={'content-type': 'application/json'})
+
+            periods = self._extract_mpd_periods(dai['stream_manifest'], video_id)
+
+            # skip pre-roll and mid-roll ads
+            periods = [p for p in periods if '-ad-' not in p['id']]
+
+            formats, subtitles = self._merge_mpd_periods(periods)
 
         info_dict.update({
             'id': video_id,
             'formats': formats,
+            'subtitles': subtitles,
         })
-
         return info_dict
 
 
@@ -115,31 +177,32 @@ class AwsIdp:
         self.ie = ie
 
         self.pool_id = pool_id
-        if "_" not in self.pool_id:
-            raise ValueError("Invalid pool_id format. Should be <region>_<poolid>.")
+        if '_' not in self.pool_id:
+            raise ValueError('Invalid pool_id format. Should be <region>_<poolid>.')
 
         self.client_id = client_id
-        self.region = self.pool_id.split("_")[0]
-        self.url = "https://cognito-idp.%s.amazonaws.com/" % (self.region,)
+        self.region = self.pool_id.split('_')[0]
+        self.url = f'https://cognito-idp.{self.region}.amazonaws.com/'
 
         # Initialize the values
         # https://github.com/aws/amazon-cognito-identity-js/blob/master/src/AuthenticationHelper.js#L22
-        self.n_hex = 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1' + \
-                     '29024E088A67CC74020BBEA63B139B22514A08798E3404DD' + \
-                     'EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245' + \
-                     'E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' + \
-                     'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3D' + \
-                     'C2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F' + \
-                     '83655D23DCA3AD961C62F356208552BB9ED529077096966D' + \
-                     '670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B' + \
-                     'E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9' + \
-                     'DE2BCBF6955817183995497CEA956AE515D2261898FA0510' + \
-                     '15728E5A8AAAC42DAD33170D04507A33A85521ABDF1CBA64' + \
-                     'ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7' + \
-                     'ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6B' + \
-                     'F12FFA06D98A0864D87602733EC86A64521F2B18177B200C' + \
-                     'BBE117577A615D6C770988C0BAD946E208E24FA074E5AB31' + \
-                     '43DB5BFCE0FD108E4B82D120A93AD2CAFFFFFFFFFFFFFFFF'
+        self.n_hex = (
+            'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1'
+            '29024E088A67CC74020BBEA63B139B22514A08798E3404DD'
+            'EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245'
+            'E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED'
+            'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3D'
+            'C2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F'
+            '83655D23DCA3AD961C62F356208552BB9ED529077096966D'
+            '670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B'
+            'E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9'
+            'DE2BCBF6955817183995497CEA956AE515D2261898FA0510'
+            '15728E5A8AAAC42DAD33170D04507A33A85521ABDF1CBA64'
+            'ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7'
+            'ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6B'
+            'F12FFA06D98A0864D87602733EC86A64521F2B18177B200C'
+            'BBE117577A615D6C770988C0BAD946E208E24FA074E5AB31'
+            '43DB5BFCE0FD108E4B82D120A93AD2CAFFFFFFFFFFFFFFFF')
 
         # https://github.com/aws/amazon-cognito-identity-js/blob/master/src/AuthenticationHelper.js#L49
         self.g_hex = '2'
@@ -155,26 +218,26 @@ class AwsIdp:
         """ Authenticate with a username and password. """
         # Step 1: First initiate an authentication request
         auth_data_dict = self.__get_authentication_request(username)
-        auth_data = json.dumps(auth_data_dict).encode("utf-8")
+        auth_data = json.dumps(auth_data_dict).encode()
         auth_headers = {
-            "X-Amz-Target": "AWSCognitoIdentityProviderService.InitiateAuth",
-            "Accept-Encoding": "identity",
-            "Content-Type": "application/x-amz-json-1.1"
+            'X-Amz-Target': 'AWSCognitoIdentityProviderService.InitiateAuth',
+            'Accept-Encoding': 'identity',
+            'Content-Type': 'application/x-amz-json-1.1',
         }
         auth_response_json = self.ie._download_json(
             self.url, None, data=auth_data, headers=auth_headers,
             note='Authenticating username', errnote='Invalid username')
-        challenge_parameters = auth_response_json.get("ChallengeParameters")
+        challenge_parameters = auth_response_json.get('ChallengeParameters')
 
-        if auth_response_json.get("ChallengeName") != "PASSWORD_VERIFIER":
-            raise AuthenticationException(auth_response_json["message"])
+        if auth_response_json.get('ChallengeName') != 'PASSWORD_VERIFIER':
+            raise AuthenticationException(auth_response_json['message'])
 
         # Step 2: Respond to the Challenge with a valid ChallengeResponse
         challenge_request = self.__get_challenge_response_request(challenge_parameters, password)
-        challenge_data = json.dumps(challenge_request).encode("utf-8")
+        challenge_data = json.dumps(challenge_request).encode()
         challenge_headers = {
-            "X-Amz-Target": "AWSCognitoIdentityProviderService.RespondToAuthChallenge",
-            "Content-Type": "application/x-amz-json-1.1"
+            'X-Amz-Target': 'AWSCognitoIdentityProviderService.RespondToAuthChallenge',
+            'Content-Type': 'application/x-amz-json-1.1',
         }
         auth_response_json = self.ie._download_json(
             self.url, None, data=challenge_data, headers=challenge_headers,
@@ -184,7 +247,7 @@ class AwsIdp:
             raise InvalidLoginException(auth_response_json['message'])
         return (
             auth_response_json['AuthenticationResult']['IdToken'],
-            auth_response_json['AuthenticationResult']['RefreshToken']
+            auth_response_json['AuthenticationResult']['RefreshToken'],
         )
 
     def __get_authentication_request(self, username):
@@ -195,15 +258,14 @@ class AwsIdp:
         :return: A full Authorization request.
         :rtype: dict
         """
-        auth_request = {
-            "AuthParameters": {
-                "USERNAME": username,
-                "SRP_A": self.__long_to_hex(self.large_a_value)
+        return {
+            'AuthParameters': {
+                'USERNAME': username,
+                'SRP_A': self.__long_to_hex(self.large_a_value),
             },
-            "AuthFlow": "USER_SRP_AUTH",
-            "ClientId": self.client_id
+            'AuthFlow': 'USER_SRP_AUTH',
+            'ClientId': self.client_id,
         }
-        return auth_request
 
     def __get_challenge_response_request(self, challenge_parameters, password):
         """ Create a Challenge Response Request object.
@@ -214,11 +276,11 @@ class AwsIdp:
         :return: A valid and full request data object to use as a response for a challenge.
         :rtype: dict
         """
-        user_id = challenge_parameters["USERNAME"]
-        user_id_for_srp = challenge_parameters["USER_ID_FOR_SRP"]
-        srp_b = challenge_parameters["SRP_B"]
-        salt = challenge_parameters["SALT"]
-        secret_block = challenge_parameters["SECRET_BLOCK"]
+        user_id = challenge_parameters['USERNAME']
+        user_id_for_srp = challenge_parameters['USER_ID_FOR_SRP']
+        srp_b = challenge_parameters['SRP_B']
+        salt = challenge_parameters['SALT']
+        secret_block = challenge_parameters['SECRET_BLOCK']
 
         timestamp = self.__get_current_timestamp()
 
@@ -227,7 +289,7 @@ class AwsIdp:
             user_id_for_srp,
             password,
             self.__hex_to_long(srp_b),
-            salt
+            salt,
         )
         secret_block_bytes = base64.standard_b64decode(secret_block)
 
@@ -239,17 +301,16 @@ class AwsIdp:
             bytearray(timestamp, 'utf-8')
         hmac_obj = hmac.new(hkdf, msg, digestmod=hashlib.sha256)
         signature_string = base64.standard_b64encode(hmac_obj.digest()).decode('utf-8')
-        challenge_request = {
-            "ChallengeResponses": {
-                "USERNAME": user_id,
-                "TIMESTAMP": timestamp,
-                "PASSWORD_CLAIM_SECRET_BLOCK": secret_block,
-                "PASSWORD_CLAIM_SIGNATURE": signature_string
+        return {
+            'ChallengeResponses': {
+                'USERNAME': user_id,
+                'TIMESTAMP': timestamp,
+                'PASSWORD_CLAIM_SECRET_BLOCK': secret_block,
+                'PASSWORD_CLAIM_SIGNATURE': signature_string,
             },
-            "ChallengeName": "PASSWORD_VERIFIER",
-            "ClientId": self.client_id
+            'ChallengeName': 'PASSWORD_VERIFIER',
+            'ClientId': self.client_id,
         }
-        return challenge_request
 
     def __get_hkdf_key_for_password(self, username, password, server_b_value, salt):
         """ Calculates the final hkdf based on computed S value, and computed U value and the key.
@@ -266,18 +327,17 @@ class AwsIdp:
         u_value = self.__calculate_u(self.large_a_value, server_b_value)
         if u_value == 0:
             raise ValueError('U cannot be zero.')
-        username_password = '%s%s:%s' % (self.pool_id.split('_')[1], username, password)
-        username_password_hash = self.__hash_sha256(username_password.encode('utf-8'))
+        username_password = '{}{}:{}'.format(self.pool_id.split('_')[1], username, password)
+        username_password_hash = self.__hash_sha256(username_password.encode())
 
         x_value = self.__hex_to_long(self.__hex_hash(self.__pad_hex(salt) + username_password_hash))
         g_mod_pow_xn = pow(self.g, x_value, self.big_n)
         int_value2 = server_b_value - self.k * g_mod_pow_xn
         s_value = pow(int_value2, self.small_a_value + u_value * x_value, self.big_n)
-        hkdf = self.__compute_hkdf(
+        return self.__compute_hkdf(
             bytearray.fromhex(self.__pad_hex(s_value)),
-            bytearray.fromhex(self.__pad_hex(self.__long_to_hex(u_value)))
+            bytearray.fromhex(self.__pad_hex(self.__long_to_hex(u_value))),
         )
-        return hkdf
 
     def __compute_hkdf(self, ikm, salt):
         """ Standard hkdf algorithm
@@ -329,7 +389,7 @@ class AwsIdp:
 
     @staticmethod
     def __long_to_hex(long_num):
-        return '%x' % long_num
+        return f'{long_num:x}'
 
     @staticmethod
     def __hex_to_long(hex_string):
@@ -360,9 +420,9 @@ class AwsIdp:
         else:
             hash_str = long_int
         if len(hash_str) % 2 == 1:
-            hash_str = '0%s' % hash_str
+            hash_str = f'0{hash_str}'
         elif hash_str[0] in '89ABCDEFabcdef':
-            hash_str = '00%s' % hash_str
+            hash_str = f'00{hash_str}'
         return hash_str
 
     @staticmethod
@@ -383,12 +443,11 @@ class AwsIdp:
         months = [None, 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
         days = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
 
-        time_now = datetime.datetime.utcnow()
-        format_string = "{} {} {} %H:%M:%S UTC %Y".format(days[time_now.weekday()], months[time_now.month], time_now.day)
-        time_string = datetime.datetime.utcnow().strftime(format_string)
-        return time_string
+        time_now = dt.datetime.now(dt.timezone.utc)
+        format_string = f'{days[time_now.weekday()]} {months[time_now.month]} {time_now.day} %H:%M:%S UTC %Y'
+        return time_now.strftime(format_string)
 
     def __str__(self):
-        return "AWS IDP Client for:\nRegion: %s\nPoolId: %s\nAppId:  %s" % (
-            self.region, self.pool_id.split("_")[1], self.client_id
+        return 'AWS IDP Client for:\nRegion: {}\nPoolId: {}\nAppId:  {}'.format(
+            self.region, self.pool_id.split('_')[1], self.client_id,
         )
diff --git a/plugins/youtube_download/yt_dlp/extractor/gopro.py b/plugins/youtube_download/yt_dlp/extractor/gopro.py
index ae96537..9142566 100644
--- a/plugins/youtube_download/yt_dlp/extractor/gopro.py
+++ b/plugins/youtube_download/yt_dlp/extractor/gopro.py
@@ -23,7 +23,7 @@ class GoProIE(InfoExtractor):
             'upload_date': '20210919',
             'uploader_id': 'fireydive30018',
             'duration': 396062,
-        }
+        },
     }, {
         'url': 'https://gopro.com/v/KRm6Vgp2peg4e',
         'info_dict': {
@@ -36,7 +36,7 @@ class GoProIE(InfoExtractor):
             'uploader_id': 'dc9bcb8b-47d2-47c6-afbc-4c48f9a3769e',
             'duration': 45187,
             'track': 'The Sky Machine',
-        }
+        },
     }, {
         'url': 'https://gopro.com/v/kVrK9wlJvBMwn',
         'info_dict': {
@@ -50,19 +50,19 @@ class GoProIE(InfoExtractor):
             'duration': 313075,
             'track': 'Battery (Live)',
             'artist': 'Metallica',
-        }
+        },
     }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
 
-        metadata = self._parse_json(
-            self._html_search_regex(r'window\.__reflectData\s*=\s*([^;]+)', webpage, 'metadata'), video_id)
+        metadata = self._search_json(
+            r'window\.__reflectData\s*=', webpage, 'metadata', video_id)
 
         video_info = metadata['collectionMedia'][0]
         media_data = self._download_json(
-            'https://api.gopro.com/media/%s/download' % video_info['id'], video_id)
+            'https://api.gopro.com/media/{}/download'.format(video_info['id']), video_id)
 
         formats = []
         for fmt in try_get(media_data, lambda x: x['_embedded']['variations']) or []:
@@ -99,7 +99,7 @@ class GoProIE(InfoExtractor):
             'duration': int_or_none(
                 video_info.get('source_duration')),
             'artist': str_or_none(
-                video_info.get('music_track_artist')),
+                video_info.get('music_track_artist')) or None,
             'track': str_or_none(
-                video_info.get('music_track_name')),
+                video_info.get('music_track_name')) or None,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/goshgay.py b/plugins/youtube_download/yt_dlp/extractor/goshgay.py
index 9a1f32b..7bcac9b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/goshgay.py
+++ b/plugins/youtube_download/yt_dlp/extractor/goshgay.py
@@ -1,7 +1,6 @@
+import urllib.parse
+
 from .common import InfoExtractor
-from ..compat import (
-    compat_parse_qs,
-)
 from ..utils import (
     parse_duration,
 )
@@ -19,7 +18,7 @@ class GoshgayIE(InfoExtractor):
             'thumbnail': r're:^http://.*\.jpg$',
             'duration': 80,
             'age_limit': 18,
-        }
+        },
     }
 
     def _real_extract(self, url):
@@ -32,7 +31,7 @@ class GoshgayIE(InfoExtractor):
             r'<span class="duration">\s*-?\s*(.*?)</span>',
             webpage, 'duration', fatal=False))
 
-        flashvars = compat_parse_qs(self._html_search_regex(
+        flashvars = urllib.parse.parse_qs(self._html_search_regex(
             r'<embed.+?id="flash-player-embed".+?flashvars="([^"]+)"',
             webpage, 'flashvars'))
         thumbnail = flashvars.get('url_bigthumb', [None])[0]
diff --git a/plugins/youtube_download/yt_dlp/extractor/gotostage.py b/plugins/youtube_download/yt_dlp/extractor/gotostage.py
index 112293b..e47a8ea 100644
--- a/plugins/youtube_download/yt_dlp/extractor/gotostage.py
+++ b/plugins/youtube_download/yt_dlp/extractor/gotostage.py
@@ -1,12 +1,8 @@
-from .common import InfoExtractor
-from ..compat import compat_str
-from ..utils import (
-    try_get,
-    url_or_none
-)
-
 import json
 
+from .common import InfoExtractor
+from ..utils import try_get, url_or_none
+
 
 class GoToStageIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?gotostage\.com/channel/[a-z0-9]+/recording/(?P<id>[a-z0-9]+)/watch'
@@ -18,8 +14,8 @@ class GoToStageIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'What is GoToStage?',
             'thumbnail': r're:^https?://.*\.jpg$',
-            'duration': 93.924711
-        }
+            'duration': 93.924711,
+        },
     }, {
         'url': 'https://www.gotostage.com/channel/bacc3d3535b34bafacc3f4ef8d4df78a/recording/831e74cd3e0042be96defba627b6f676/watch?source=HOMEPAGE',
         'only_matching': True,
@@ -28,7 +24,7 @@ class GoToStageIE(InfoExtractor):
     def _real_extract(self, url):
         video_id = self._match_id(url)
         metadata = self._download_json(
-            'https://api.gotostage.com/contents?ids=%s' % video_id,
+            f'https://api.gotostage.com/contents?ids={video_id}',
             video_id,
             note='Downloading video metadata',
             errnote='Unable to download video metadata')[0]
@@ -39,7 +35,7 @@ class GoToStageIE(InfoExtractor):
             'productReferenceKey': metadata['productRefKey'],
             'firstName': 'foo',
             'lastName': 'bar',
-            'email': 'foobar@example.com'
+            'email': 'foobar@example.com',
         }
 
         registration_response = self._download_json(
@@ -52,7 +48,7 @@ class GoToStageIE(InfoExtractor):
             errnote='Unable to register user')
 
         content_response = self._download_json(
-            'https://api.gotostage.com/contents/%s/asset' % video_id,
+            f'https://api.gotostage.com/contents/{video_id}/asset',
             video_id,
             headers={'x-registrantkey': registration_response['registrationKey']},
             note='Get download url',
@@ -60,11 +56,11 @@ class GoToStageIE(InfoExtractor):
 
         return {
             'id': video_id,
-            'title': try_get(metadata, lambda x: x['title'], compat_str),
-            'url': try_get(content_response, lambda x: x['cdnLocation'], compat_str),
+            'title': try_get(metadata, lambda x: x['title'], str),
+            'url': try_get(content_response, lambda x: x['cdnLocation'], str),
             'ext': 'mp4',
             'thumbnail': url_or_none(try_get(metadata, lambda x: x['thumbnail']['location'])),
             'duration': try_get(metadata, lambda x: x['duration'], float),
-            'categories': [try_get(metadata, lambda x: x['category'], compat_str)],
-            'is_live': False
+            'categories': [try_get(metadata, lambda x: x['category'], str)],
+            'is_live': False,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/gputechconf.py b/plugins/youtube_download/yt_dlp/extractor/gputechconf.py
index 2d13bf4..f31791a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/gputechconf.py
+++ b/plugins/youtube_download/yt_dlp/extractor/gputechconf.py
@@ -11,7 +11,7 @@ class GPUTechConfIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'Coordinating More Than 3 Million CUDA Threads for Social Network Analysis',
             'duration': 1219,
-        }
+        },
     }
 
     def _real_extract(self, url):
@@ -27,6 +27,6 @@ class GPUTechConfIE(InfoExtractor):
         return {
             '_type': 'url_transparent',
             'id': video_id,
-            'url': '%sxml/%s.xml' % (root_path, xml_file_id),
+            'url': f'{root_path}xml/{xml_file_id}.xml',
             'ie_key': 'DigitallySpeaking',
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/graspop.py b/plugins/youtube_download/yt_dlp/extractor/graspop.py
new file mode 100644
index 0000000..09371f8
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/graspop.py
@@ -0,0 +1,32 @@
+from .common import InfoExtractor
+from ..utils import update_url, url_or_none
+from ..utils.traversal import traverse_obj
+
+
+class GraspopIE(InfoExtractor):
+    _VALID_URL = r'https?://vod\.graspop\.be/[a-z]{2}/(?P<id>\d+)/'
+    _TESTS = [{
+        'url': 'https://vod.graspop.be/fr/101556/thy-art-is-murder-concert/',
+        'info_dict': {
+            'id': '101556',
+            'ext': 'mp4',
+            'title': 'Thy Art Is Murder',
+            'thumbnail': r're:https://cdn-mds\.pickx\.be/festivals/v3/global/original/.+\.jpg',
+        },
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        metadata = self._download_json(
+            f'https://tv.proximus.be/MWC/videocenter/festivals/{video_id}/stream', video_id)
+
+        return {
+            'id': video_id,
+            'formats': self._extract_m3u8_formats(
+                # Downgrade manifest request to avoid incomplete certificate chain error
+                update_url(metadata['source']['assetUri'], scheme='http'), video_id, 'mp4'),
+            **traverse_obj(metadata, {
+                'title': ('name', {str}),
+                'thumbnail': ('source', 'poster', {url_or_none}),
+            }),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/gronkh.py b/plugins/youtube_download/yt_dlp/extractor/gronkh.py
index 1ae0a68..1668900 100644
--- a/plugins/youtube_download/yt_dlp/extractor/gronkh.py
+++ b/plugins/youtube_download/yt_dlp/extractor/gronkh.py
@@ -24,7 +24,7 @@ class GronkhIE(InfoExtractor):
             'chapters': 'count:3',
             'duration': 31463,
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }, {
         'url': 'https://gronkh.tv/stream/536',
         'info_dict': {
@@ -36,24 +36,24 @@ class GronkhIE(InfoExtractor):
             'upload_date': '20211001',
             'duration': 32058,
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }, {
         'url': 'https://gronkh.tv/watch/stream/546',
         'only_matching': True,
     }]
 
     def _real_extract(self, url):
-        id = self._match_id(url)
-        data_json = self._download_json(f'https://api.gronkh.tv/v1/video/info?episode={id}', id)
-        m3u8_url = self._download_json(f'https://api.gronkh.tv/v1/video/playlist?episode={id}', id)['playlist_url']
-        formats, subtitles = self._extract_m3u8_formats_and_subtitles(m3u8_url, id)
+        video_id = self._match_id(url)
+        data_json = self._download_json(f'https://api.gronkh.tv/v1/video/info?episode={video_id}', video_id)
+        m3u8_url = self._download_json(f'https://api.gronkh.tv/v1/video/playlist?episode={video_id}', video_id)['playlist_url']
+        formats, subtitles = self._extract_m3u8_formats_and_subtitles(m3u8_url, video_id)
         if data_json.get('vtt_url'):
             subtitles.setdefault('en', []).append({
                 'url': data_json['vtt_url'],
                 'ext': 'vtt',
             })
         return {
-            'id': id,
+            'id': video_id,
             'title': data_json.get('title'),
             'view_count': data_json.get('views'),
             'thumbnail': data_json.get('preview_url'),
diff --git a/plugins/youtube_download/yt_dlp/extractor/groupon.py b/plugins/youtube_download/yt_dlp/extractor/groupon.py
index 362d3ff..a05fab1 100644
--- a/plugins/youtube_download/yt_dlp/extractor/groupon.py
+++ b/plugins/youtube_download/yt_dlp/extractor/groupon.py
@@ -31,7 +31,6 @@ class GrouponIE(InfoExtractor):
     }
 
     _PROVIDERS = {
-        'ooyala': ('ooyala:%s', 'Ooyala'),
         'youtube': ('%s', 'Youtube'),
     }
 
@@ -51,8 +50,7 @@ class GrouponIE(InfoExtractor):
             url_pattern, ie_key = self._PROVIDERS.get(provider.lower())
             if not url_pattern:
                 self.report_warning(
-                    '%s: Unsupported video provider %s, skipping video' %
-                    (playlist_id, provider))
+                    f'{playlist_id}: Unsupported video provider {provider}, skipping video')
                 continue
             entries.append(self.url_result(url_pattern % video_id, ie_key))
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/harpodeon.py b/plugins/youtube_download/yt_dlp/extractor/harpodeon.py
index 0aa4733..aa3b2ca 100644
--- a/plugins/youtube_download/yt_dlp/extractor/harpodeon.py
+++ b/plugins/youtube_download/yt_dlp/extractor/harpodeon.py
@@ -1,5 +1,5 @@
 from .common import InfoExtractor
-from ..utils import unified_strdate
+from ..utils import int_or_none
 
 
 class HarpodeonIE(InfoExtractor):
@@ -14,8 +14,8 @@ class HarpodeonIE(InfoExtractor):
             'title': 'The Smoking Out of Bella Butts',
             'description': 'md5:47e16bdb41fc8a79c83ab83af11c8b77',
             'creator': 'Vitagraph Company of America',
-            'release_date': '19150101'
-        }
+            'release_year': 1915,
+        },
     }, {
         'url': 'https://www.harpodeon.com/preview/The_Smoking_Out_of_Bella_Butts/268068288',
         'md5': '6dfea5412845f690c7331be703f884db',
@@ -25,8 +25,8 @@ class HarpodeonIE(InfoExtractor):
             'title': 'The Smoking Out of Bella Butts',
             'description': 'md5:47e16bdb41fc8a79c83ab83af11c8b77',
             'creator': 'Vitagraph Company of America',
-            'release_date': '19150101'
-        }
+            'release_year': 1915,
+        },
     }, {
         'url': 'https://www.harpodeon.com/preview/Behind_the_Screen/421838710',
         'md5': '7979df9ca04637282cb7d172ab3a9c3b',
@@ -36,8 +36,8 @@ class HarpodeonIE(InfoExtractor):
             'title': 'Behind the Screen',
             'description': 'md5:008972a3dc51fba3965ee517d2ba9155',
             'creator': 'Lone Star Corporation',
-            'release_date': '19160101'
-        }
+            'release_year': 1916,
+        },
     }]
 
     def _real_extract(self, url):
@@ -66,5 +66,5 @@ class HarpodeonIE(InfoExtractor):
             'http_headers': {'Referer': url},
             'description': self._html_search_meta('description', webpage, fatal=False),
             'creator': creator,
-            'release_date': unified_strdate(f'{release_year}0101')
+            'release_year': int_or_none(release_year),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/hbo.py b/plugins/youtube_download/yt_dlp/extractor/hbo.py
index 530bdb7..34cff45 100644
--- a/plugins/youtube_download/yt_dlp/extractor/hbo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/hbo.py
@@ -2,11 +2,12 @@ import re
 
 from .common import InfoExtractor
 from ..utils import (
-    xpath_text,
-    xpath_element,
     int_or_none,
+    join_nonempty,
     parse_duration,
     urljoin,
+    xpath_element,
+    xpath_text,
 )
 
 
@@ -56,7 +57,7 @@ class HBOBaseIE(InfoExtractor):
         episode_title = title = xpath_text(video_data, 'title', fatal=True)
         series = xpath_text(video_data, 'program')
         if series:
-            title = '%s - %s' % (series, title)
+            title = f'{series} - {title}'
 
         formats = []
         for source in xpath_element(video_data, 'videos', 'sources', True):
@@ -69,7 +70,7 @@ class HBOBaseIE(InfoExtractor):
                 height = format_info.get('height')
                 fmt = {
                     'url': path,
-                    'format_id': 'http%s' % ('-%dp' % height if height else ''),
+                    'format_id': join_nonempty('http'. height and f'{height}p'),
                     'width': format_info.get('width'),
                     'height': height,
                 }
@@ -107,7 +108,7 @@ class HBOBaseIE(InfoExtractor):
                 else:
                     format_info = self._FORMATS_INFO.get(source.tag, {})
                     formats.append({
-                        'format_id': 'http-%s' % source.tag,
+                        'format_id': f'http-{source.tag}',
                         'url': video_url,
                         'width': format_info.get('width'),
                         'height': format_info.get('height'),
@@ -133,7 +134,7 @@ class HBOBaseIE(InfoExtractor):
             subtitles = {
                 'en': [{
                     'url': caption_url,
-                    'ext': 'ttml'
+                    'ext': 'ttml',
                 }],
             }
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/hearthisat.py b/plugins/youtube_download/yt_dlp/extractor/hearthisat.py
index d1a400d..eb0a779 100644
--- a/plugins/youtube_download/yt_dlp/extractor/hearthisat.py
+++ b/plugins/youtube_download/yt_dlp/extractor/hearthisat.py
@@ -1,19 +1,20 @@
 from .common import InfoExtractor
 from ..utils import (
-    determine_ext,
     KNOWN_EXTENSIONS,
+    determine_ext,
     str_to_int,
 )
 
 
 class HearThisAtIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?hearthis\.at/(?P<artist>[^/]+)/(?P<title>[A-Za-z0-9\-]+)/?$'
+    _VALID_URL = r'https?://(?:www\.)?hearthis\.at/(?P<artist>[^/?#]+)/(?P<title>[\w.-]+)'
     _PLAYLIST_URL = 'https://hearthis.at/playlist.php'
     _TESTS = [{
         'url': 'https://hearthis.at/moofi/dr-kreep',
         'md5': 'ab6ec33c8fed6556029337c7885eb4e0',
         'info_dict': {
             'id': '150939',
+            'display_id': 'moofi - dr-kreep',
             'ext': 'wav',
             'title': 'Moofi - Dr. Kreep',
             'thumbnail': r're:^https?://.*\.jpg$',
@@ -21,15 +22,16 @@ class HearThisAtIE(InfoExtractor):
             'description': 'md5:1adb0667b01499f9d27e97ddfd53852a',
             'upload_date': '20150118',
             'view_count': int,
-            'duration': 71,
-            'genre': 'Experimental',
-        }
+            'duration': 70,
+            'genres': ['Experimental'],
+        },
     }, {
         # 'download' link redirects to the original webpage
         'url': 'https://hearthis.at/twitchsf/dj-jim-hopkins-totally-bitchin-80s-dance-mix/',
         'md5': '5980ceb7c461605d30f1f039df160c6e',
         'info_dict': {
             'id': '811296',
+            'display_id': 'twitchsf - dj-jim-hopkins-totally-bitchin-80s-dance-mix',
             'ext': 'mp3',
             'title': 'TwitchSF - DJ Jim Hopkins -  Totally Bitchin\' 80\'s Dance Mix!',
             'description': 'md5:ef26815ca8f483272a87b137ff175be2',
@@ -38,7 +40,39 @@ class HearThisAtIE(InfoExtractor):
             'thumbnail': r're:^https?://.*\.jpg$',
             'view_count': int,
             'duration': 4360,
-            'genre': 'Dance',
+            'genres': ['Dance'],
+        },
+    }, {
+        'url': 'https://hearthis.at/tindalos/0001-tindalos-gnrique/eQd/',
+        'md5': 'cd08e51911f147f6da2d9678905b0bd9',
+        'info_dict': {
+            'id': '2685222',
+            'ext': 'mp3',
+            'duration': 86,
+            'view_count': int,
+            'timestamp': 1545471670,
+            'display_id': 'tindalos - 0001-tindalos-gnrique',
+            'thumbnail': r're:^https?://.*\.jpg$',
+            'genres': ['Other'],
+            'title': 'Tindalos - Tindalos - générique n°1',
+            'description': '',
+            'upload_date': '20181222',
+        },
+    }, {
+        'url': 'https://hearthis.at/sithi2/biochip-c-classics-set-wolle-xdp-tresor.core-special-tresor-globus-berlin-13.07.20011/',
+        'md5': 'b45ac60f0c8111eef6ddc10ec232e312',
+        'info_dict': {
+            'id': '7145959',
+            'ext': 'mp3',
+            'description': 'md5:d7ae36a453d78903f6b7ed6eb2fce1f2',
+            'duration': 8986,
+            'thumbnail': r're:^https?://.*\.jpg$',
+            'title': 'md5:62669ce5b1b67f45c6f846033f37d3b9',
+            'timestamp': 1588699409,
+            'display_id': 'sithi2 - biochip-c-classics-set-wolle-xdp-tresor.core-special-tresor-globus-berlin-13.07.20011',
+            'view_count': int,
+            'upload_date': '20200505',
+            'genres': ['Other'],
         },
     }]
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/heise.py b/plugins/youtube_download/yt_dlp/extractor/heise.py
index 27d737c..01b700b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/heise.py
+++ b/plugins/youtube_download/yt_dlp/extractor/heise.py
@@ -105,7 +105,7 @@ class HeiseIE(InfoExtractor):
             'description': 'md5:fa164d8c8707dff124a9626d39205f5d',
             'timestamp': 1414825200,
             'upload_date': '20141101',
-        }
+        },
     }, {
         'url': 'http://www.heise.de/ct/artikel/c-t-uplink-3-3-Owncloud-Tastaturen-Peilsender-Smartphone-2403911.html',
         'only_matching': True,
@@ -156,7 +156,7 @@ class HeiseIE(InfoExtractor):
             r'entry-id=(["\'])(?P<id>(?:(?!\1).)+)\1', webpage, 'kaltura id',
             default=None, group='id')
         if kaltura_id:
-            return _make_kaltura_result('kaltura:2238431:%s' % kaltura_id)
+            return _make_kaltura_result(f'kaltura:2238431:{kaltura_id}')
 
         yt_urls = tuple(YoutubeIE._extract_embed_urls(url, webpage))
         if yt_urls:
@@ -191,7 +191,7 @@ class HeiseIE(InfoExtractor):
             formats.append({
                 'url': video_url,
                 'format_note': label,
-                'format_id': '%s_%s' % (ext, label),
+                'format_id': f'{ext}_{label}',
                 'height': height,
             })
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/helsinki.py b/plugins/youtube_download/yt_dlp/extractor/helsinki.py
deleted file mode 100644
index e518cae..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/helsinki.py
+++ /dev/null
@@ -1,38 +0,0 @@
-from .common import InfoExtractor
-from ..utils import js_to_json
-
-
-class HelsinkiIE(InfoExtractor):
-    IE_DESC = 'helsinki.fi'
-    _VALID_URL = r'https?://video\.helsinki\.fi/Arkisto/flash\.php\?id=(?P<id>\d+)'
-    _TEST = {
-        'url': 'http://video.helsinki.fi/Arkisto/flash.php?id=20258',
-        'info_dict': {
-            'id': '20258',
-            'ext': 'mp4',
-            'title': 'Tietotekniikkafoorumi-iltapäivä',
-            'description': 'md5:f5c904224d43c133225130fe156a5ee0',
-        },
-        'params': {
-            'skip_download': True,  # RTMP
-        }
-    }
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-
-        params = self._parse_json(self._html_search_regex(
-            r'(?s)jwplayer\("player"\).setup\((\{.*?\})\);',
-            webpage, 'player code'), video_id, transform_source=js_to_json)
-        formats = [{
-            'url': s['file'],
-            'ext': 'mp4',
-        } for s in params['sources']]
-
-        return {
-            'id': video_id,
-            'title': self._og_search_title(webpage).replace('Video: ', ''),
-            'description': self._og_search_description(webpage),
-            'formats': formats,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/hidive.py b/plugins/youtube_download/yt_dlp/extractor/hidive.py
index df6868d..0cbe991 100644
--- a/plugins/youtube_download/yt_dlp/extractor/hidive.py
+++ b/plugins/youtube_download/yt_dlp/extractor/hidive.py
@@ -57,7 +57,7 @@ class HiDiveIE(InfoExtractor):
                 'profileId': profile_id,
                 'hash': self._search_regex(
                     r'\<button [^>]+?data-hash="(\w+)"', login_webpage, 'profile id hash'),
-                'returnUrl': '/dashboard'
+                'returnUrl': '/dashboard',
             }))
 
     def _call_api(self, video_id, title, key, data={}, **kwargs):
@@ -80,7 +80,7 @@ class HiDiveIE(InfoExtractor):
             self.raise_geo_restricted()
         if restriction and restriction != 'None':
             raise ExtractorError(
-                '%s said: %s' % (self.IE_NAME, restriction), expected=True)
+                f'{self.IE_NAME} said: {restriction}', expected=True)
 
         formats, parsed_urls = [], {None}
         for rendition_id, rendition in settings['renditions'].items():
@@ -115,5 +115,5 @@ class HiDiveIE(InfoExtractor):
                 self._search_regex(r's(\d+)', key, 'season number', default=None)),
             'episode_number': int_or_none(
                 self._search_regex(r'e(\d+)', key, 'episode number', default=None)),
-            'http_headers': {'Referer': url}
+            'http_headers': {'Referer': url},
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/historicfilms.py b/plugins/youtube_download/yt_dlp/extractor/historicfilms.py
index c428fee..714f651 100644
--- a/plugins/youtube_download/yt_dlp/extractor/historicfilms.py
+++ b/plugins/youtube_download/yt_dlp/extractor/historicfilms.py
@@ -33,7 +33,7 @@ class HistoricFilmsIE(InfoExtractor):
         duration = parse_duration(self._html_search_meta(
             'duration', webpage, 'duration'))
 
-        video_url = 'http://www.historicfilms.com/video/%s_%s_web.mov' % (tape_id, video_id)
+        video_url = f'http://www.historicfilms.com/video/{tape_id}_{video_id}_web.mov'
 
         return {
             'id': video_id,
diff --git a/plugins/youtube_download/yt_dlp/extractor/hitbox.py b/plugins/youtube_download/yt_dlp/extractor/hitbox.py
deleted file mode 100644
index f0c6898..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/hitbox.py
+++ /dev/null
@@ -1,209 +0,0 @@
-import re
-
-from .common import InfoExtractor
-from ..compat import compat_str
-from ..utils import (
-    clean_html,
-    determine_ext,
-    float_or_none,
-    int_or_none,
-    parse_iso8601,
-)
-
-
-class HitboxIE(InfoExtractor):
-    IE_NAME = 'hitbox'
-    _VALID_URL = r'https?://(?:www\.)?(?:hitbox|smashcast)\.tv/(?:[^/]+/)*videos?/(?P<id>[0-9]+)'
-    _TESTS = [{
-        'url': 'http://www.hitbox.tv/video/203213',
-        'info_dict': {
-            'id': '203213',
-            'title': 'hitbox @ gamescom, Sub Button Hype extended, Giveaway - hitbox News Update with Oxy',
-            'alt_title': 'hitboxlive - Aug 9th #6',
-            'description': '',
-            'ext': 'mp4',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'duration': 215.1666,
-            'resolution': 'HD 720p',
-            'uploader': 'hitboxlive',
-            'view_count': int,
-            'timestamp': 1407576133,
-            'upload_date': '20140809',
-            'categories': ['Live Show'],
-        },
-        'params': {
-            # m3u8 download
-            'skip_download': True,
-        },
-    }, {
-        'url': 'https://www.smashcast.tv/hitboxlive/videos/203213',
-        'only_matching': True,
-    }]
-
-    def _extract_metadata(self, url, video_id):
-        thumb_base = 'https://edge.sf.hitbox.tv'
-        metadata = self._download_json(
-            '%s/%s' % (url, video_id), video_id, 'Downloading metadata JSON')
-
-        date = 'media_live_since'
-        media_type = 'livestream'
-        if metadata.get('media_type') == 'video':
-            media_type = 'video'
-            date = 'media_date_added'
-
-        video_meta = metadata.get(media_type, [])[0]
-        title = video_meta.get('media_status')
-        alt_title = video_meta.get('media_title')
-        description = clean_html(
-            video_meta.get('media_description')
-            or video_meta.get('media_description_md'))
-        duration = float_or_none(video_meta.get('media_duration'))
-        uploader = video_meta.get('media_user_name')
-        views = int_or_none(video_meta.get('media_views'))
-        timestamp = parse_iso8601(video_meta.get(date), ' ')
-        categories = [video_meta.get('category_name')]
-        thumbs = [{
-            'url': thumb_base + video_meta.get('media_thumbnail'),
-            'width': 320,
-            'height': 180
-        }, {
-            'url': thumb_base + video_meta.get('media_thumbnail_large'),
-            'width': 768,
-            'height': 432
-        }]
-
-        return {
-            'id': video_id,
-            'title': title,
-            'alt_title': alt_title,
-            'description': description,
-            'ext': 'mp4',
-            'thumbnails': thumbs,
-            'duration': duration,
-            'uploader': uploader,
-            'view_count': views,
-            'timestamp': timestamp,
-            'categories': categories,
-        }
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        player_config = self._download_json(
-            'https://www.smashcast.tv/api/player/config/video/%s' % video_id,
-            video_id, 'Downloading video JSON')
-
-        formats = []
-        for video in player_config['clip']['bitrates']:
-            label = video.get('label')
-            if label == 'Auto':
-                continue
-            video_url = video.get('url')
-            if not video_url:
-                continue
-            bitrate = int_or_none(video.get('bitrate'))
-            if determine_ext(video_url) == 'm3u8':
-                if not video_url.startswith('http'):
-                    continue
-                formats.append({
-                    'url': video_url,
-                    'ext': 'mp4',
-                    'tbr': bitrate,
-                    'format_note': label,
-                    'protocol': 'm3u8_native',
-                })
-            else:
-                formats.append({
-                    'url': video_url,
-                    'tbr': bitrate,
-                    'format_note': label,
-                })
-
-        metadata = self._extract_metadata(
-            'https://www.smashcast.tv/api/media/video', video_id)
-        metadata['formats'] = formats
-
-        return metadata
-
-
-class HitboxLiveIE(HitboxIE):  # XXX: Do not subclass from concrete IE
-    IE_NAME = 'hitbox:live'
-    _VALID_URL = r'https?://(?:www\.)?(?:hitbox|smashcast)\.tv/(?P<id>[^/?#&]+)'
-    _TESTS = [{
-        'url': 'http://www.hitbox.tv/dimak',
-        'info_dict': {
-            'id': 'dimak',
-            'ext': 'mp4',
-            'description': 'md5:c9f80fa4410bc588d7faa40003fc7d0e',
-            'timestamp': int,
-            'upload_date': compat_str,
-            'title': compat_str,
-            'uploader': 'Dimak',
-        },
-        'params': {
-            # live
-            'skip_download': True,
-        },
-    }, {
-        'url': 'https://www.smashcast.tv/dimak',
-        'only_matching': True,
-    }]
-
-    @classmethod
-    def suitable(cls, url):
-        return False if HitboxIE.suitable(url) else super(HitboxLiveIE, cls).suitable(url)
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        player_config = self._download_json(
-            'https://www.smashcast.tv/api/player/config/live/%s' % video_id,
-            video_id)
-
-        formats = []
-        cdns = player_config.get('cdns')
-        servers = []
-        for cdn in cdns:
-            # Subscribe URLs are not playable
-            if cdn.get('rtmpSubscribe') is True:
-                continue
-            base_url = cdn.get('netConnectionUrl')
-            host = re.search(r'.+\.([^\.]+\.[^\./]+)/.+', base_url).group(1)
-            if base_url not in servers:
-                servers.append(base_url)
-                for stream in cdn.get('bitrates'):
-                    label = stream.get('label')
-                    if label == 'Auto':
-                        continue
-                    stream_url = stream.get('url')
-                    if not stream_url:
-                        continue
-                    bitrate = int_or_none(stream.get('bitrate'))
-                    if stream.get('provider') == 'hls' or determine_ext(stream_url) == 'm3u8':
-                        if not stream_url.startswith('http'):
-                            continue
-                        formats.append({
-                            'url': stream_url,
-                            'ext': 'mp4',
-                            'tbr': bitrate,
-                            'format_note': label,
-                            'rtmp_live': True,
-                        })
-                    else:
-                        formats.append({
-                            'url': '%s/%s' % (base_url, stream_url),
-                            'ext': 'mp4',
-                            'tbr': bitrate,
-                            'rtmp_live': True,
-                            'format_note': host,
-                            'page_url': url,
-                            'player_url': 'http://www.hitbox.tv/static/player/flowplayer/flowplayer.commercial-3.2.16.swf',
-                        })
-
-        metadata = self._extract_metadata(
-            'https://www.smashcast.tv/api/media/live', video_id)
-        metadata['formats'] = formats
-        metadata['is_live'] = True
-        metadata['title'] = metadata.get('title')
-
-        return metadata
diff --git a/plugins/youtube_download/yt_dlp/extractor/hitrecord.py b/plugins/youtube_download/yt_dlp/extractor/hitrecord.py
index 902af44..3c3d7f9 100644
--- a/plugins/youtube_download/yt_dlp/extractor/hitrecord.py
+++ b/plugins/youtube_download/yt_dlp/extractor/hitrecord.py
@@ -1,5 +1,4 @@
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     clean_html,
     float_or_none,
@@ -27,14 +26,14 @@ class HitRecordIE(InfoExtractor):
             'like_count': int,
             'comment_count': int,
             'tags': list,
-        }
+        },
     }
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
 
         video = self._download_json(
-            'https://hitrecord.org/api/web/records/%s' % video_id, video_id)
+            f'https://hitrecord.org/api/web/records/{video_id}', video_id)
 
         title = video['title']
         video_url = video['source_url']['mp4_url']
@@ -46,7 +45,7 @@ class HitRecordIE(InfoExtractor):
                 t['text']
                 for t in tags_list
                 if isinstance(t, dict) and t.get('text')
-                and isinstance(t['text'], compat_str)]
+                and isinstance(t['text'], str)]
 
         return {
             'id': video_id,
@@ -56,9 +55,9 @@ class HitRecordIE(InfoExtractor):
             'duration': float_or_none(video.get('duration'), 1000),
             'timestamp': int_or_none(video.get('created_at_i')),
             'uploader': try_get(
-                video, lambda x: x['user']['username'], compat_str),
+                video, lambda x: x['user']['username'], str),
             'uploader_id': try_get(
-                video, lambda x: compat_str(x['user']['id'])),
+                video, lambda x: str(x['user']['id'])),
             'view_count': int_or_none(video.get('total_views_count')),
             'like_count': int_or_none(video.get('hearts_count')),
             'comment_count': int_or_none(video.get('comments_count')),
diff --git a/plugins/youtube_download/yt_dlp/extractor/hketv.py b/plugins/youtube_download/yt_dlp/extractor/hketv.py
index e026996..3998abc 100644
--- a/plugins/youtube_download/yt_dlp/extractor/hketv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/hketv.py
@@ -1,8 +1,7 @@
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
-    clean_html,
     ExtractorError,
+    clean_html,
     int_or_none,
     merge_dicts,
     parse_count,
@@ -45,9 +44,6 @@ class HKETVIE(InfoExtractor):
             'duration': 907,
             'subtitles': {},
         },
-        'params': {
-            'geo_verification_proxy': '<HK proxy here>',
-        },
         'skip': 'Geo restricted to HK',
     }]
 
@@ -144,7 +140,7 @@ class HKETVIE(InfoExtractor):
             if not isinstance(track, dict):
                 continue
             track_kind = str_or_none(track.get('kind'))
-            if not track_kind or not isinstance(track_kind, compat_str):
+            if not track_kind or not isinstance(track_kind, str):
                 continue
             if track_kind.lower() not in ('captions', 'subtitles'):
                 continue
diff --git a/plugins/youtube_download/yt_dlp/extractor/hollywoodreporter.py b/plugins/youtube_download/yt_dlp/extractor/hollywoodreporter.py
index 1f7eb89..52db5e5 100644
--- a/plugins/youtube_download/yt_dlp/extractor/hollywoodreporter.py
+++ b/plugins/youtube_download/yt_dlp/extractor/hollywoodreporter.py
@@ -53,7 +53,7 @@ class HollywoodReporterPlaylistIE(InfoExtractor):
         'info_dict': {
             'id': '57822',
             'title': 'heat-vision-breakdown',
-        }
+        },
     }]
 
     def _fetch_page(self, slug, pl_id, page):
diff --git a/plugins/youtube_download/yt_dlp/extractor/holodex.py b/plugins/youtube_download/yt_dlp/extractor/holodex.py
index a2b73ec..00b045e 100644
--- a/plugins/youtube_download/yt_dlp/extractor/holodex.py
+++ b/plugins/youtube_download/yt_dlp/extractor/holodex.py
@@ -46,7 +46,7 @@ class HolodexIE(InfoExtractor):
         'url': 'https://holodex.net/watch/_m2mQyaofjI?foo=bar&playlist=69',
         'info_dict': {
             'id': '69',
-            'title': '拿著金斧頭的藍髮大姊姊'
+            'title': '拿著金斧頭的藍髮大姊姊',
         },
         'playlist_count': 3,
     }, {
diff --git a/plugins/youtube_download/yt_dlp/extractor/hotnewhiphop.py b/plugins/youtube_download/yt_dlp/extractor/hotnewhiphop.py
index 3007fbb..8573e89 100644
--- a/plugins/youtube_download/yt_dlp/extractor/hotnewhiphop.py
+++ b/plugins/youtube_download/yt_dlp/extractor/hotnewhiphop.py
@@ -1,10 +1,12 @@
+import base64
+
 from .common import InfoExtractor
-from ..compat import compat_b64decode
 from ..networking import HEADRequest, Request
 from ..utils import ExtractorError, urlencode_postdata
 
 
 class HotNewHipHopIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?hotnewhiphop\.com/.*\.(?P<id>.*)\.html'
     _TEST = {
         'url': 'http://www.hotnewhiphop.com/freddie-gibbs-lay-it-down-song.1435540.html',
@@ -12,8 +14,8 @@ class HotNewHipHopIE(InfoExtractor):
         'info_dict': {
             'id': '1435540',
             'ext': 'mp3',
-            'title': 'Freddie Gibbs - Lay It Down'
-        }
+            'title': 'Freddie Gibbs - Lay It Down',
+        },
     }
 
     def _real_extract(self, url):
@@ -41,7 +43,7 @@ class HotNewHipHopIE(InfoExtractor):
         if 'mediaKey' not in mkd:
             raise ExtractorError('Did not get a media key')
 
-        redirect_url = compat_b64decode(video_url_base64).decode('utf-8')
+        redirect_url = base64.b64decode(video_url_base64).decode('utf-8')
         redirect_req = HEADRequest(redirect_url)
         req = self._request_webpage(
             redirect_req, video_id,
diff --git a/plugins/youtube_download/yt_dlp/extractor/hotstar.py b/plugins/youtube_download/yt_dlp/extractor/hotstar.py
index cdd9379..e97740c 100644
--- a/plugins/youtube_download/yt_dlp/extractor/hotstar.py
+++ b/plugins/youtube_download/yt_dlp/extractor/hotstar.py
@@ -6,7 +6,6 @@ import time
 import uuid
 
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..networking.exceptions import HTTPError
 from ..utils import (
     ExtractorError,
@@ -32,7 +31,7 @@ class HotStarBaseIE(InfoExtractor):
     def _call_api_impl(self, path, video_id, query, st=None, cookies=None):
         st = int_or_none(st) or int(time.time())
         exp = st + 6000
-        auth = 'st=%d~exp=%d~acl=/*' % (st, exp)
+        auth = f'st={st}~exp={exp}~acl=/*'
         auth += '~hmac=' + hmac.new(self._AKAMAI_ENCRYPTION_KEY, auth.encode(), hashlib.sha256).hexdigest()
 
         if cookies and cookies.get('userUP'):
@@ -41,7 +40,7 @@ class HotStarBaseIE(InfoExtractor):
             token = self._download_json(
                 f'{self._API_URL}/um/v3/users',
                 video_id, note='Downloading token',
-                data=json.dumps({"device_ids": [{"id": compat_str(uuid.uuid4()), "type": "device_id"}]}).encode('utf-8'),
+                data=json.dumps({'device_ids': [{'id': str(uuid.uuid4()), 'type': 'device_id'}]}).encode(),
                 headers={
                     'hotstarauth': auth,
                     'x-hs-platform': 'PCTV',  # or 'web'
@@ -66,7 +65,7 @@ class HotStarBaseIE(InfoExtractor):
         return self._call_api_impl(
             f'{path}/content/{video_id}', video_id, st=st, cookies=cookies, query={
                 'desired-config': 'audio_channel:stereo|container:fmp4|dynamic_range:hdr|encryption:plain|ladder:tv|package:dash|resolution:fhd|subs-tag:HotstarVIP|video_codec:h265',
-                'device-id': cookies.get('device_id').value if cookies.get('device_id') else compat_str(uuid.uuid4()),
+                'device-id': cookies.get('device_id').value if cookies.get('device_id') else str(uuid.uuid4()),
                 'os-name': 'Windows',
                 'os-version': '10',
             })
@@ -115,14 +114,14 @@ class HotStarIE(HotStarBaseIE):
             'upload_date': '20190501',
             'duration': 1219,
             'channel': 'StarPlus',
-            'channel_id': 3,
+            'channel_id': '3',
             'series': 'Ek Bhram - Sarvagun Sampanna',
             'season': 'Chapter 1',
             'season_number': 1,
-            'season_id': 6771,
+            'season_id': '6771',
             'episode': 'Janhvi Targets Suman',
             'episode_number': 8,
-        }
+        },
     }, {
         'url': 'https://www.hotstar.com/in/shows/anupama/1260022017/anupama-anuj-share-a-moment/1000282843',
         'info_dict': {
@@ -135,12 +134,32 @@ class HotStarIE(HotStarBaseIE):
             'channel': 'StarPlus',
             'series': 'Anupama',
             'season_number': 1,
-            'season_id': 7399,
+            'season_id': '7399',
             'upload_date': '20230307',
             'episode': 'Anupama, Anuj Share a Moment',
             'episode_number': 853,
             'duration': 1272,
-            'channel_id': 3,
+            'channel_id': '3',
+        },
+        'skip': 'HTTP Error 504: Gateway Time-out',  # XXX: Investigate 504 errors on some episodes
+    }, {
+        'url': 'https://www.hotstar.com/in/shows/kana-kaanum-kaalangal/1260097087/back-to-school/1260097320',
+        'info_dict': {
+            'id': '1260097320',
+            'ext': 'mp4',
+            'title': 'Back To School',
+            'season': 'Chapter 1',
+            'description': 'md5:b0d6a4c8a650681491e7405496fc7e13',
+            'timestamp': 1650564000,
+            'channel': 'Hotstar Specials',
+            'series': 'Kana Kaanum Kaalangal',
+            'season_number': 1,
+            'season_id': '9441',
+            'upload_date': '20220421',
+            'episode': 'Back To School',
+            'episode_number': 1,
+            'duration': 1810,
+            'channel_id': '54',
         },
     }, {
         'url': 'https://www.hotstar.com/in/clips/e3-sairat-kahani-pyaar-ki/1000262286',
@@ -154,6 +173,19 @@ class HotStarIE(HotStarBaseIE):
             'timestamp': 1622943900,
             'duration': 5395,
         },
+    }, {
+        'url': 'https://www.hotstar.com/in/movies/premam/1000091195',
+        'info_dict': {
+            'id': '1000091195',
+            'ext': 'mp4',
+            'title': 'Premam',
+            'release_year': 2015,
+            'description': 'md5:d833c654e4187b5e34757eafb5b72d7f',
+            'timestamp': 1462149000,
+            'upload_date': '20160502',
+            'episode': 'Premam',
+            'duration': 8994,
+        },
     }, {
         'url': 'https://www.hotstar.com/movies/radha-gopalam/1000057157',
         'only_matching': True,
@@ -200,8 +232,10 @@ class HotStarIE(HotStarBaseIE):
         video_type = self._TYPE.get(video_type, video_type)
         cookies = self._get_cookies(url)  # Cookies before any request
 
-        video_data = self._call_api_v1(f'{video_type}/detail', video_id,
-                                       query={'tas': 10000, 'contentId': video_id})['body']['results']['item']
+        video_data = traverse_obj(
+            self._call_api_v1(
+                f'{video_type}/detail', video_id, fatal=False, query={'tas': 10000, 'contentId': video_id}),
+            ('body', 'results', 'item', {dict})) or {}
         if not self.get_param('allow_unplayable_formats') and video_data.get('drmProtected'):
             self.report_drm(video_id)
 
@@ -222,7 +256,6 @@ class HotStarIE(HotStarBaseIE):
                    for key, prefix in self._IGNORE_MAP.items()
                    for ignore in self._configuration_arg(key)):
                 continue
-            tag_dict = dict((t.split(':', 1) + [None])[:2] for t in tags.split(';'))
 
             format_url = url_or_none(playback_set.get('playbackUrl'))
             if not format_url:
@@ -251,6 +284,7 @@ class HotStarIE(HotStarBaseIE):
                     geo_restricted = True
                 continue
 
+            tag_dict = dict((*t.split(':', 1), None)[:2] for t in tags.split(';'))
             if tag_dict.get('encryption') not in ('plain', None):
                 for f in current_formats:
                     f['has_drm'] = True
@@ -286,14 +320,15 @@ class HotStarIE(HotStarBaseIE):
             'description': video_data.get('description'),
             'duration': int_or_none(video_data.get('duration')),
             'timestamp': int_or_none(traverse_obj(video_data, 'broadcastDate', 'startDate')),
+            'release_year': int_or_none(video_data.get('year')),
             'formats': formats,
             'subtitles': subs,
             'channel': video_data.get('channelName'),
-            'channel_id': video_data.get('channelId'),
+            'channel_id': str_or_none(video_data.get('channelId')),
             'series': video_data.get('showName'),
             'season': video_data.get('seasonName'),
             'season_number': int_or_none(video_data.get('seasonNo')),
-            'season_id': video_data.get('seasonId'),
+            'season_id': str_or_none(video_data.get('seasonId')),
             'episode': video_data.get('title'),
             'episode_number': int_or_none(video_data.get('episodeNo')),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/howcast.py b/plugins/youtube_download/yt_dlp/extractor/howcast.py
deleted file mode 100644
index 59cf80f..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/howcast.py
+++ /dev/null
@@ -1,41 +0,0 @@
-from .common import InfoExtractor
-from ..utils import parse_iso8601
-
-
-class HowcastIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?howcast\.com/videos/(?P<id>\d+)'
-    _TEST = {
-        'url': 'http://www.howcast.com/videos/390161-How-to-Tie-a-Square-Knot-Properly',
-        'md5': '7d45932269a288149483144f01b99789',
-        'info_dict': {
-            'id': '390161',
-            'ext': 'mp4',
-            'title': 'How to Tie a Square Knot Properly',
-            'description': 'md5:dbe792e5f6f1489027027bf2eba188a3',
-            'timestamp': 1276081287,
-            'upload_date': '20100609',
-            'duration': 56.823,
-        },
-        'params': {
-            'skip_download': True,
-        },
-        'add_ie': ['Ooyala'],
-    }
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        webpage = self._download_webpage(url, video_id)
-
-        embed_code = self._search_regex(
-            r'<iframe[^>]+src="[^"]+\bembed_code=([^\b]+)\b',
-            webpage, 'ooyala embed code')
-
-        return {
-            '_type': 'url_transparent',
-            'ie_key': 'Ooyala',
-            'url': 'ooyala:%s' % embed_code,
-            'id': video_id,
-            'timestamp': parse_iso8601(self._html_search_meta(
-                'article:published_time', webpage, 'timestamp')),
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/howstuffworks.py b/plugins/youtube_download/yt_dlp/extractor/howstuffworks.py
deleted file mode 100644
index 238fc0b..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/howstuffworks.py
+++ /dev/null
@@ -1,86 +0,0 @@
-from .common import InfoExtractor
-from ..utils import (
-    find_xpath_attr,
-    int_or_none,
-    js_to_json,
-    unescapeHTML,
-    determine_ext,
-)
-
-
-class HowStuffWorksIE(InfoExtractor):
-    _VALID_URL = r'https?://[\da-z-]+\.(?:howstuffworks|stuff(?:(?:youshould|theydontwantyouto)know|toblowyourmind|momnevertoldyou)|(?:brain|car)stuffshow|fwthinking|geniusstuff)\.com/(?:[^/]+/)*(?:\d+-)?(?P<id>.+?)-video\.htm'
-    _TESTS = [
-        {
-            'url': 'http://www.stufftoblowyourmind.com/videos/optical-illusions-video.htm',
-            'md5': '76646a5acc0c92bf7cd66751ca5db94d',
-            'info_dict': {
-                'id': '855410',
-                'ext': 'mp4',
-                'title': 'Your Trickster Brain: Optical Illusions -- Science on the Web',
-                'description': 'md5:e374ff9561f6833ad076a8cc0a5ab2fb',
-            },
-        },
-        {
-            'url': 'http://shows.howstuffworks.com/more-shows/why-does-balloon-stick-to-hair-video.htm',
-            'only_matching': True,
-        }
-    ]
-
-    def _real_extract(self, url):
-        display_id = self._match_id(url)
-        webpage = self._download_webpage(url, display_id)
-        clip_js = self._search_regex(
-            r'(?s)var clip = ({.*?});', webpage, 'clip info')
-        clip_info = self._parse_json(
-            clip_js, display_id, transform_source=js_to_json)
-
-        video_id = clip_info['content_id']
-        formats = []
-        m3u8_url = clip_info.get('m3u8')
-        if m3u8_url and determine_ext(m3u8_url) == 'm3u8':
-            formats.extend(self._extract_m3u8_formats(m3u8_url, video_id, 'mp4', format_id='hls', fatal=True))
-        flv_url = clip_info.get('flv_url')
-        if flv_url:
-            formats.append({
-                'url': flv_url,
-                'format_id': 'flv',
-            })
-        for video in clip_info.get('mp4', []):
-            formats.append({
-                'url': video['src'],
-                'format_id': 'mp4-%s' % video['bitrate'],
-                'vbr': int_or_none(video['bitrate'].rstrip('k')),
-            })
-
-        if not formats:
-            smil = self._download_xml(
-                'http://services.media.howstuffworks.com/videos/%s/smil-service.smil' % video_id,
-                video_id, 'Downloading video SMIL')
-
-            http_base = find_xpath_attr(
-                smil,
-                './{0}head/{0}meta'.format('{http://www.w3.org/2001/SMIL20/Language}'),
-                'name',
-                'httpBase').get('content')
-
-            URL_SUFFIX = '?v=2.11.3&fp=LNX 11,2,202,356&r=A&g=A'
-
-            for video in smil.findall(
-                    './{0}body/{0}switch/{0}video'.format('{http://www.w3.org/2001/SMIL20/Language}')):
-                vbr = int_or_none(video.attrib['system-bitrate'], scale=1000)
-                formats.append({
-                    'url': '%s/%s%s' % (http_base, video.attrib['src'], URL_SUFFIX),
-                    'format_id': '%dk' % vbr,
-                    'vbr': vbr,
-                })
-
-        return {
-            'id': '%s' % video_id,
-            'display_id': display_id,
-            'title': unescapeHTML(clip_info['clip_title']),
-            'description': unescapeHTML(clip_info.get('caption')),
-            'thumbnail': clip_info.get('video_still_url'),
-            'duration': int_or_none(clip_info.get('duration')),
-            'formats': formats,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/hrfensehen.py b/plugins/youtube_download/yt_dlp/extractor/hrfensehen.py
index 35e9f67..b5a7b14 100644
--- a/plugins/youtube_download/yt_dlp/extractor/hrfensehen.py
+++ b/plugins/youtube_download/yt_dlp/extractor/hrfensehen.py
@@ -13,7 +13,7 @@ from ..utils import (
 
 class HRFernsehenIE(InfoExtractor):
     IE_NAME = 'hrfernsehen'
-    _VALID_URL = r'^https?://www\.(?:hr-fernsehen|hessenschau)\.de/.*,video-(?P<id>[0-9]{6})\.html'
+    _VALID_URL = r'https?://www\.(?:hr-fernsehen|hessenschau)\.de/.*,video-(?P<id>[0-9]{6})\.html'
     _TESTS = [{
         'url': 'https://www.hessenschau.de/tv-sendung/hessenschau-vom-26082020,video-130546.html',
         'md5': '5c4e0ba94677c516a2f65a84110fc536',
@@ -24,17 +24,17 @@ class HRFernsehenIE(InfoExtractor):
                            'Sterbehilfe: Die Lage in Hessen / Miss Hessen leitet zwei eigene Unternehmen / '
                            'Pop-Up Museum zeigt Schwarze Unterhaltung und Black Music',
             'subtitles': {'de': [{
-                'url': 'https://hr-a.akamaihd.net/video/as/hessenschau/2020_08/hrLogo_200826200407_L385592_512x288-25p-500kbit.vtt'
+                'url': 'https://hr-a.akamaihd.net/video/as/hessenschau/2020_08/hrLogo_200826200407_L385592_512x288-25p-500kbit.vtt',
             }]},
             'timestamp': 1598400000,
             'upload_date': '20200826',
             'thumbnail': 'https://www.hessenschau.de/tv-sendung/hs_ganz-1554~_t-1598465545029_v-16to9.jpg',
             'title': 'hessenschau vom 26.08.2020',
-            'duration': 1654
-        }
+            'duration': 1654,
+        },
     }, {
         'url': 'https://www.hr-fernsehen.de/sendungen-a-z/mex/sendungen/fair-und-gut---was-hinter-aldis-eigenem-guetesiegel-steckt,video-130544.html',
-        'only_matching': True
+        'only_matching': True,
     }]
 
     _GEO_COUNTRIES = ['DE']
@@ -74,7 +74,7 @@ class HRFernsehenIE(InfoExtractor):
 
         subtitle = traverse_obj(loader_data, ('mediaCollection', 'subTitles', 0, 'sources', 0, 'url'))
 
-        info = {
+        return {
             'id': video_id,
             'title': title,
             'description': description,
@@ -86,5 +86,3 @@ class HRFernsehenIE(InfoExtractor):
                 loader_data, ('playerConfig', 'pluginData', 'trackingAti@all', 'richMedia', 'duration'))),
             'thumbnail': self._search_regex(r'thumbnailUrl\W*([^"]+)', webpage, 'thumbnail', default=None),
         }
-
-        return info
diff --git a/plugins/youtube_download/yt_dlp/extractor/hrti.py b/plugins/youtube_download/yt_dlp/extractor/hrti.py
index 57b76e4..84e3867 100644
--- a/plugins/youtube_download/yt_dlp/extractor/hrti.py
+++ b/plugins/youtube_download/yt_dlp/extractor/hrti.py
@@ -4,8 +4,8 @@ from .common import InfoExtractor
 from ..networking import Request
 from ..networking.exceptions import HTTPError
 from ..utils import (
-    clean_html,
     ExtractorError,
+    clean_html,
     int_or_none,
     parse_age_limit,
     try_get,
@@ -28,21 +28,21 @@ class HRTiBaseIE(InfoExtractor):
 
     def _initialize_pre_login(self):
         init_data = {
-            'application_publication_id': self._APP_PUBLICATION_ID
+            'application_publication_id': self._APP_PUBLICATION_ID,
         }
 
         uuid = self._download_json(
             self._API_URL, None, note='Downloading uuid',
             errnote='Unable to download uuid',
-            data=json.dumps(init_data).encode('utf-8'))['uuid']
+            data=json.dumps(init_data).encode())['uuid']
 
         app_data = {
             'uuid': uuid,
             'application_publication_id': self._APP_PUBLICATION_ID,
-            'application_version': self._APP_VERSION
+            'application_version': self._APP_VERSION,
         }
 
-        req = Request(self._API_URL, data=json.dumps(app_data).encode('utf-8'))
+        req = Request(self._API_URL, data=json.dumps(app_data).encode())
         req.get_method = lambda: 'PUT'
 
         resources = self._download_json(
@@ -71,17 +71,17 @@ class HRTiBaseIE(InfoExtractor):
         try:
             auth_info = self._download_json(
                 self._login_url, None, note='Logging in', errnote='Unable to log in',
-                data=json.dumps(auth_data).encode('utf-8'))
+                data=json.dumps(auth_data).encode())
         except ExtractorError as e:
             if isinstance(e.cause, HTTPError) and e.cause.status == 406:
-                auth_info = self._parse_json(e.cause.response.read().encode('utf-8'), None)
+                auth_info = self._parse_json(e.cause.response.read().encode(), None)
             else:
                 raise
 
         error_message = auth_info.get('error', {}).get('message')
         if error_message:
             raise ExtractorError(
-                '%s said: %s' % (self.IE_NAME, error_message),
+                f'{self.IE_NAME} said: {error_message}',
                 expected=True)
 
         self._token = auth_info['secure_streaming_token']
@@ -133,7 +133,7 @@ class HRTiIE(HRTiBaseIE):
         display_id = mobj.group('display_id') or video_id
 
         video = self._download_json(
-            '%s/video_id/%s/format/json' % (self._search_url, video_id),
+            f'{self._search_url}/video_id/{video_id}/format/json',
             display_id, 'Downloading video metadata JSON')['video'][0]
 
         title_info = video['title']
@@ -188,13 +188,13 @@ class HRTiPlaylistIE(HRTiBaseIE):
         display_id = mobj.group('display_id') or category_id
 
         response = self._download_json(
-            '%s/category_id/%s/format/json' % (self._search_url, category_id),
+            f'{self._search_url}/category_id/{category_id}/format/json',
             display_id, 'Downloading video metadata JSON')
 
         video_ids = try_get(
             response, lambda x: x['video_listings'][0]['alternatives'][0]['list'],
             list) or [video['id'] for video in response.get('videos', []) if video.get('id')]
 
-        entries = [self.url_result('hrti:%s' % video_id) for video_id in video_ids]
+        entries = [self.url_result(f'hrti:{video_id}') for video_id in video_ids]
 
         return self.playlist_result(entries, category_id, display_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/hse.py b/plugins/youtube_download/yt_dlp/extractor/hse.py
index 3cb21d2..c3c7bb3 100644
--- a/plugins/youtube_download/yt_dlp/extractor/hse.py
+++ b/plugins/youtube_download/yt_dlp/extractor/hse.py
@@ -6,7 +6,7 @@ from ..utils import (
 )
 
 
-class HSEShowBaseInfoExtractor(InfoExtractor):
+class HSEShowBaseIE(InfoExtractor):
     _GEO_COUNTRIES = ['DE']
 
     def _extract_redux_data(self, url, video_id):
@@ -28,7 +28,7 @@ class HSEShowBaseInfoExtractor(InfoExtractor):
         return formats, subtitles
 
 
-class HSEShowIE(HSEShowBaseInfoExtractor):
+class HSEShowIE(HSEShowBaseIE):
     _VALID_URL = r'https?://(?:www\.)?hse\.de/dpl/c/tv-shows/(?P<id>[0-9]+)'
     _TESTS = [{
         'url': 'https://www.hse.de/dpl/c/tv-shows/505350',
@@ -39,7 +39,7 @@ class HSEShowIE(HSEShowBaseInfoExtractor):
             'timestamp': 1638810000,
             'upload_date': '20211206',
             'channel': 'HSE24',
-            'uploader': 'Arina Pirayesh'
+            'uploader': 'Arina Pirayesh',
         },
         'params': {'skip_download': 'm3u8'},
     }]
@@ -64,7 +64,7 @@ class HSEShowIE(HSEShowBaseInfoExtractor):
         }
 
 
-class HSEProductIE(HSEShowBaseInfoExtractor):
+class HSEProductIE(HSEShowBaseIE):
     _VALID_URL = r'https?://(?:www\.)?hse\.de/dpl/p/product/(?P<id>[0-9]+)'
     _TESTS = [{
         'url': 'https://www.hse.de/dpl/p/product/408630',
@@ -72,7 +72,7 @@ class HSEProductIE(HSEShowBaseInfoExtractor):
             'id': '408630',
             'ext': 'mp4',
             'title': 'Hose im Ponte-Mix',
-            'uploader': 'Judith Williams'
+            'uploader': 'Judith Williams',
         },
         'params': {'skip_download': 'm3u8'},
     }]
diff --git a/plugins/youtube_download/yt_dlp/extractor/huajiao.py b/plugins/youtube_download/yt_dlp/extractor/huajiao.py
index c498fa3..093ce7d 100644
--- a/plugins/youtube_download/yt_dlp/extractor/huajiao.py
+++ b/plugins/youtube_download/yt_dlp/extractor/huajiao.py
@@ -22,7 +22,7 @@ class HuajiaoIE(InfoExtractor):
             'upload_date': '20161007',
             'uploader': 'Penny_余姿昀',
             'uploader_id': '75206005',
-        }
+        },
     }
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/huffpost.py b/plugins/youtube_download/yt_dlp/extractor/huffpost.py
index 69fdc34..156ddeb 100644
--- a/plugins/youtube_download/yt_dlp/extractor/huffpost.py
+++ b/plugins/youtube_download/yt_dlp/extractor/huffpost.py
@@ -40,7 +40,7 @@ class HuffPostIE(InfoExtractor):
     def _real_extract(self, url):
         video_id = self._match_id(url)
 
-        api_url = 'http://embed.live.huffingtonpost.com/api/segments/%s.json' % video_id
+        api_url = f'http://embed.live.huffingtonpost.com/api/segments/{video_id}.json'
         data = self._download_json(api_url, video_id)['data']
 
         video_title = data['title']
diff --git a/plugins/youtube_download/yt_dlp/extractor/hungama.py b/plugins/youtube_download/yt_dlp/extractor/hungama.py
index 2e99396..a687b12 100644
--- a/plugins/youtube_download/yt_dlp/extractor/hungama.py
+++ b/plugins/youtube_download/yt_dlp/extractor/hungama.py
@@ -1,19 +1,32 @@
-import re
-
 from .common import InfoExtractor
 from ..utils import (
     int_or_none,
+    remove_end,
+    traverse_obj,
     try_get,
+    unified_timestamp,
+    url_or_none,
     urlencode_postdata,
 )
 
 
-class HungamaIE(InfoExtractor):
+class HungamaBaseIE(InfoExtractor):
+    def _call_api(self, path, content_id, fatal=False):
+        return traverse_obj(self._download_json(
+            f'https://cpage.api.hungama.com/v2/page/content/{content_id}/{path}/detail',
+            content_id, fatal=fatal, query={
+                'device': 'web',
+                'platform': 'a',
+                'storeId': '1',
+            }), ('data', {dict})) or {}
+
+
+class HungamaIE(HungamaBaseIE):
     _VALID_URL = r'''(?x)
                     https?://
-                        (?:www\.)?hungama\.com/
+                        (?:www\.|un\.)?hungama\.com/
                         (?:
-                            (?:video|movie)/[^/]+/|
+                            (?:video|movie|short-film)/[^/]+/|
                             tv-show/(?:[^/]+/){2}\d+/episode/[^/]+/
                         )
                         (?P<id>\d+)
@@ -25,13 +38,28 @@ class HungamaIE(InfoExtractor):
             'id': '39349649',
             'ext': 'mp4',
             'title': 'Krishna Chants',
-            'description': 'Watch Krishna Chants video now. You can also watch other latest videos only at Hungama',
+            'description': ' ',
             'upload_date': '20180829',
             'duration': 264,
             'timestamp': 1535500800,
             'view_count': int,
-            'thumbnail': 'https://images.hungama.com/c/1/0dc/2ca/39349649/39349649_700x394.jpg',
-        }
+            'thumbnail': 'https://images1.hungama.com/tr:n-a_169_m/c/1/0dc/2ca/39349649/39349649_350x197.jpg?v=8',
+            'tags': 'count:6',
+        },
+    }, {
+        'url': 'https://un.hungama.com/short-film/adira/102524179/',
+        'md5': '2278463f5dc9db9054d0c02602d44666',
+        'info_dict': {
+            'id': '102524179',
+            'ext': 'mp4',
+            'title': 'Adira',
+            'description': 'md5:df20cd4d41eabb33634f06de1025a4b4',
+            'upload_date': '20230417',
+            'timestamp': 1681689600,
+            'view_count': int,
+            'thumbnail': 'https://images1.hungama.com/tr:n-a_23_m/c/1/197/ac9/102524179/102524179_350x525.jpg?v=1',
+            'tags': 'count:7',
+        },
     }, {
         'url': 'https://www.hungama.com/movie/kahaani-2/44129919/',
         'only_matching': True,
@@ -51,46 +79,64 @@ class HungamaIE(InfoExtractor):
                 'c': 'common',
                 'm': 'get_video_mdn_url',
             })
-
         formats = self._extract_m3u8_formats(video_json['stream_url'], video_id, ext='mp4', m3u8_id='hls')
-
-        json_ld = self._search_json_ld(
-            self._download_webpage(url, video_id, fatal=False) or '', video_id, fatal=False)
+        metadata = self._call_api('movie', video_id)
 
         return {
-            **json_ld,
+            **traverse_obj(metadata, ('head', 'data', {
+                'title': ('title', {str}),
+                'description': ('misc', 'description', {str}),
+                'duration': ('duration', {int}),  # duration in JSON is incorrect if string
+                'timestamp': ('releasedate', {unified_timestamp}),
+                'view_count': ('misc', 'playcount', {int_or_none}),
+                'thumbnail': ('image', {url_or_none}),
+                'tags': ('misc', 'keywords', ..., {str}),
+            })),
             'id': video_id,
             'formats': formats,
             'subtitles': {
                 'en': [{
                     'url': video_json['sub_title'],
                     'ext': 'vtt',
-                }]
+                }],
             } if video_json.get('sub_title') else None,
         }
 
 
 class HungamaSongIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?hungama\.com/song/[^/]+/(?P<id>\d+)'
-    _TEST = {
+    _VALID_URL = r'https?://(?:www\.|un\.)?hungama\.com/song/[^/]+/(?P<id>\d+)'
+    _TESTS = [{
         'url': 'https://www.hungama.com/song/kitni-haseen-zindagi/2931166/',
-        'md5': 'd4a6a05a394ad0453a9bea3ca00e6024',
+        'md5': '964f46828e8b250aa35e5fdcfdcac367',
         'info_dict': {
             'id': '2931166',
             'ext': 'mp3',
             'title': 'Lucky Ali - Kitni Haseen Zindagi',
             'track': 'Kitni Haseen Zindagi',
             'artist': 'Lucky Ali',
-            'album': None,
             'release_year': 2000,
-        }
-    }
+            'thumbnail': 'https://stat2.hungama.ind.in/assets/images/default_images/da-200x200.png',
+        },
+    }, {
+        'url': 'https://un.hungama.com/song/tum-kya-mile-from-rocky-aur-rani-kii-prem-kahaani/103553672',
+        'md5': '964f46828e8b250aa35e5fdcfdcac367',
+        'info_dict': {
+            'id': '103553672',
+            'ext': 'mp3',
+            'title': 'md5:5ebeb1e10771b634ce5f700ce68ae5f4',
+            'track': 'Tum Kya Mile (From "Rocky Aur Rani Kii Prem Kahaani")',
+            'artist': 'Pritam Chakraborty, Arijit Singh, Shreya Ghoshal, Amitabh Bhattacharya',
+            'album': 'Tum Kya Mile (From "Rocky Aur Rani Kii Prem Kahaani")',
+            'release_year': 2023,
+            'thumbnail': 'https://images.hungama.com/c/1/7c2/c7b/103553671/103553671_200x200.jpg',
+        },
+    }]
 
     def _real_extract(self, url):
         audio_id = self._match_id(url)
 
         data = self._download_json(
-            'https://www.hungama.com/audio-player-data/track/%s' % audio_id,
+            f'https://www.hungama.com/audio-player-data/track/{audio_id}',
             audio_id, query={'_country': 'IN'})[0]
         track = data['song_name']
         artist = data.get('singer_name')
@@ -107,7 +153,7 @@ class HungamaSongIE(InfoExtractor):
                 'acodec': media_type,
             })
 
-        title = '%s - %s' % (artist, track) if artist else track
+        title = f'{artist} - {track}' if artist else track
         thumbnail = data.get('img_src') or data.get('album_image')
 
         return {
@@ -122,8 +168,8 @@ class HungamaSongIE(InfoExtractor):
         }
 
 
-class HungamaAlbumPlaylistIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?hungama\.com/(?:playlists|album)/[^/]+/(?P<id>\d+)'
+class HungamaAlbumPlaylistIE(HungamaBaseIE):
+    _VALID_URL = r'https?://(?:www\.|un\.)?hungama\.com/(?P<path>playlists|album)/[^/]+/(?P<id>\d+)'
     _TESTS = [{
         'url': 'https://www.hungama.com/album/bhuj-the-pride-of-india/69481490/',
         'playlist_mincount': 7,
@@ -132,16 +178,24 @@ class HungamaAlbumPlaylistIE(InfoExtractor):
         },
     }, {
         'url': 'https://www.hungama.com/playlists/hindi-jan-to-june-2021/123063/',
-        'playlist_mincount': 50,
+        'playlist_mincount': 33,
         'info_dict': {
             'id': '123063',
         },
+    }, {
+        'url': 'https://un.hungama.com/album/what-jhumka-%3F-from-rocky-aur-rani-kii-prem-kahaani/103891805/',
+        'playlist_mincount': 1,
+        'info_dict': {
+            'id': '103891805',
+        },
     }]
 
     def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-        ptrn = r'<meta[^>]+?property=[\"\']?music:song:url[\"\']?[^>]+?content=[\"\']?([^\"\']+)'
-        items = re.findall(ptrn, webpage)
-        entries = [self.url_result(item, ie=HungamaSongIE.ie_key()) for item in items]
-        return self.playlist_result(entries, video_id)
+        playlist_id, path = self._match_valid_url(url).group('id', 'path')
+        data = self._call_api(remove_end(path, 's'), playlist_id, fatal=True)
+
+        def entries():
+            for song_url in traverse_obj(data, ('body', 'rows', ..., 'data', 'misc', 'share', {url_or_none})):
+                yield self.url_result(song_url, HungamaSongIE)
+
+        return self.playlist_result(entries(), playlist_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/huya.py b/plugins/youtube_download/yt_dlp/extractor/huya.py
index c4965f9..f79e032 100644
--- a/plugins/youtube_download/yt_dlp/extractor/huya.py
+++ b/plugins/youtube_download/yt_dlp/extractor/huya.py
@@ -1,23 +1,26 @@
+import base64
 import hashlib
 import random
 import re
+import urllib.parse
 
-from ..compat import compat_urlparse, compat_b64decode
-
+from .common import InfoExtractor
 from ..utils import (
     ExtractorError,
     int_or_none,
+    parse_duration,
     str_or_none,
     try_get,
     unescapeHTML,
+    unified_strdate,
     update_url_query,
+    url_or_none,
 )
-
-from .common import InfoExtractor
+from ..utils.traversal import traverse_obj
 
 
 class HuyaLiveIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.|m\.)?huya\.com/(?P<id>[^/#?&]+)(?:\D|$)'
+    _VALID_URL = r'https?://(?:www\.|m\.)?huya\.com/(?!(?:video/play/))(?P<id>[^/#?&]+)(?:\D|$)'
     IE_NAME = 'huya:live'
     IE_DESC = 'huya.com'
     TESTS = [{
@@ -25,6 +28,7 @@ class HuyaLiveIE(InfoExtractor):
         'info_dict': {
             'id': '572329',
             'title': str,
+            'ext': 'flv',
             'description': str,
             'is_live': True,
             'view_count': int,
@@ -34,7 +38,7 @@ class HuyaLiveIE(InfoExtractor):
         },
     }, {
         'url': 'https://www.huya.com/xiaoyugame',
-        'only_matching': True
+        'only_matching': True,
     }]
 
     _RESOLUTION = {
@@ -48,8 +52,8 @@ class HuyaLiveIE(InfoExtractor):
         },
         '流畅': {
             'width': 800,
-            'height': 480
-        }
+            'height': 480,
+        },
     }
 
     def _real_extract(self, url):
@@ -72,7 +76,7 @@ class HuyaLiveIE(InfoExtractor):
                 continue
             stream_name = stream_info.get('sStreamName')
             re_secret = not screen_type and live_source_type in (0, 8, 13)
-            params = dict(compat_urlparse.parse_qsl(unescapeHTML(stream_info['sFlvAntiCode'])))
+            params = dict(urllib.parse.parse_qsl(unescapeHTML(stream_info['sFlvAntiCode'])))
             fm, ss = '', ''
             if re_secret:
                 fm, ss = self.encrypt(params, stream_info, stream_name)
@@ -129,6 +133,79 @@ class HuyaLiveIE(InfoExtractor):
             'uuid': int_or_none(ct % 1e7 * 1e6 % 0xffffffff),
             't': '100',
         })
-        fm = compat_b64decode(params['fm']).decode().split('_', 1)[0]
+        fm = base64.b64decode(params['fm']).decode().split('_', 1)[0]
         ss = hashlib.md5('|'.join([params['seqid'], params['ctype'], params['t']]))
         return fm, ss
+
+
+class HuyaVideoIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?huya\.com/video/play/(?P<id>\d+)\.html'
+    IE_NAME = 'huya:video'
+    IE_DESC = '虎牙视频'
+
+    _TESTS = [{
+        'url': 'https://www.huya.com/video/play/1002412640.html',
+        'info_dict': {
+            'id': '1002412640',
+            'ext': 'mp4',
+            'title': '8月3日',
+            'thumbnail': r're:https?://.*\.jpg',
+            'duration': 14,
+            'uploader': '虎牙-ATS欧卡车队青木',
+            'uploader_id': '1564376151',
+            'upload_date': '20240803',
+            'view_count': int,
+            'comment_count': int,
+            'like_count': int,
+        },
+    },
+        {
+        'url': 'https://www.huya.com/video/play/556054543.html',
+        'info_dict': {
+            'id': '556054543',
+            'ext': 'mp4',
+            'title': '我不挑事 也不怕事',
+            'thumbnail': r're:https?://.*\.jpg',
+            'duration': 1864,
+            'uploader': '卡尔',
+            'uploader_id': '367138632',
+            'upload_date': '20210811',
+            'view_count': int,
+            'comment_count': int,
+            'like_count': int,
+        },
+    }]
+
+    def _real_extract(self, url: str):
+        video_id = self._match_id(url)
+        video_data = self._download_json(
+            'https://liveapi.huya.com/moment/getMomentContent', video_id,
+            query={'videoId': video_id})['data']['moment']['videoInfo']
+
+        formats = []
+        for definition in traverse_obj(video_data, ('definitions', lambda _, v: url_or_none(v['url']))):
+            formats.append({
+                'url': definition['url'],
+                **traverse_obj(definition, {
+                    'format_id': ('defName', {str}),
+                    'width': ('width', {int_or_none}),
+                    'height': ('height', {int_or_none}),
+                    'filesize': ('size', {int_or_none}),
+                }),
+            })
+
+        return {
+            'id': video_id,
+            'formats': formats,
+            **traverse_obj(video_data, {
+                'title': ('videoTitle', {str}),
+                'thumbnail': ('videoCover', {url_or_none}),
+                'duration': ('videoDuration', {parse_duration}),
+                'uploader': ('nickName', {str}),
+                'uploader_id': ('uid', {str_or_none}),
+                'upload_date': ('videoUploadTime', {unified_strdate}),
+                'view_count': ('videoPlayNum', {int_or_none}),
+                'comment_count': ('videoCommentNum', {int_or_none}),
+                'like_count': ('favorCount', {int_or_none}),
+            }),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/hypem.py b/plugins/youtube_download/yt_dlp/extractor/hypem.py
index 54db7b3..204a72e 100644
--- a/plugins/youtube_download/yt_dlp/extractor/hypem.py
+++ b/plugins/youtube_download/yt_dlp/extractor/hypem.py
@@ -14,7 +14,7 @@ class HypemIE(InfoExtractor):
             'uploader': 'BODYWORK',
             'timestamp': 1371810457,
             'upload_date': '20130621',
-        }
+        },
     }
 
     def _real_extract(self, url):
@@ -30,9 +30,9 @@ class HypemIE(InfoExtractor):
         title = track['song']
 
         final_url = self._download_json(
-            'http://hypem.com/serve/source/%s/%s' % (track_id, track['key']),
+            'http://hypem.com/serve/source/{}/{}'.format(track_id, track['key']),
             track_id, 'Downloading metadata', headers={
-                'Content-Type': 'application/json'
+                'Content-Type': 'application/json',
             })['url']
 
         return {
diff --git a/plugins/youtube_download/yt_dlp/extractor/hypergryph.py b/plugins/youtube_download/yt_dlp/extractor/hypergryph.py
index 9ca6cae..1fb2e9a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/hypergryph.py
+++ b/plugins/youtube_download/yt_dlp/extractor/hypergryph.py
@@ -9,10 +9,10 @@ class MonsterSirenHypergryphMusicIE(InfoExtractor):
         'info_dict': {
             'id': '514562',
             'ext': 'wav',
-            'artist': ['塞壬唱片-MSR'],
+            'artists': ['塞壬唱片-MSR'],
             'album': 'Flame Shadow',
             'title': 'Flame Shadow',
-        }
+        },
     }]
 
     def _real_extract(self, url):
@@ -27,6 +27,6 @@ class MonsterSirenHypergryphMusicIE(InfoExtractor):
             'url': traverse_obj(json_data, ('player', 'songDetail', 'sourceUrl')),
             'ext': 'wav',
             'vcodec': 'none',
-            'artist': traverse_obj(json_data, ('player', 'songDetail', 'artists')),
-            'album': traverse_obj(json_data, ('musicPlay', 'albumDetail', 'name'))
+            'artists': traverse_obj(json_data, ('player', 'songDetail', 'artists', ...)),
+            'album': traverse_obj(json_data, ('musicPlay', 'albumDetail', 'name')),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/hytale.py b/plugins/youtube_download/yt_dlp/extractor/hytale.py
index 0f4dcc3..6956c4e 100644
--- a/plugins/youtube_download/yt_dlp/extractor/hytale.py
+++ b/plugins/youtube_download/yt_dlp/extractor/hytale.py
@@ -1,7 +1,8 @@
 import re
 
+from .cloudflarestream import CloudflareStreamIE
 from .common import InfoExtractor
-from ..utils import traverse_obj
+from ..utils.traversal import traverse_obj
 
 
 class HytaleIE(InfoExtractor):
@@ -20,8 +21,8 @@ class HytaleIE(InfoExtractor):
                 'ext': 'mp4',
                 'title': 'Avatar Personalization',
                 'thumbnail': r're:https://videodelivery\.net/\w+/thumbnails/thumbnail\.jpg',
-            }
-        }]
+            },
+        }],
     }, {
         'url': 'https://www.hytale.com/news/2019/11/hytale-graphics-update',
         'info_dict': {
@@ -49,7 +50,7 @@ class HytaleIE(InfoExtractor):
         entries = [
             self.url_result(
                 f'https://cloudflarestream.com/{video_hash}/manifest/video.mpd?parentOrigin=https%3A%2F%2Fhytale.com',
-                title=self._titles.get(video_hash), url_transparent=True)
+                CloudflareStreamIE, title=self._titles.get(video_hash), url_transparent=True)
             for video_hash in re.findall(
                 r'<stream\s+class\s*=\s*"ql-video\s+cf-stream"\s+src\s*=\s*"([a-f0-9]{32})"',
                 webpage)
diff --git a/plugins/youtube_download/yt_dlp/extractor/icareus.py b/plugins/youtube_download/yt_dlp/extractor/icareus.py
index d081cf4..3d6e1f9 100644
--- a/plugins/youtube_download/yt_dlp/extractor/icareus.py
+++ b/plugins/youtube_download/yt_dlp/extractor/icareus.py
@@ -65,19 +65,19 @@ class IcareusIE(InfoExtractor):
         },
     }, {
         'url': 'https://asahitv.fi/fi/web/asahi/player/vod?assetId=89415818',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://hyvinvointitv.fi/fi/web/hyvinvointitv/player/vod?assetId=89149730',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://inez.fi/fi/web/inez-media/player/vod?assetId=71328822',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.permanto.fi/fi/web/alfatv/player/vod?assetId=135497515',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://videos.minifiddlers.org/web/international-minifiddlers/player/vod?assetId=1982759',
-        'only_matching': True
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
@@ -166,7 +166,7 @@ class IcareusIE(InfoExtractor):
             }
 
         thumbnails = info.get('thumbnails') or [{
-            'url': url_or_none(info.get('thumbnail') or assets.get('thumbnail'))
+            'url': url_or_none(info.get('thumbnail') or assets.get('thumbnail')),
         }]
 
         return merge_dicts({
diff --git a/plugins/youtube_download/yt_dlp/extractor/ichinanalive.py b/plugins/youtube_download/yt_dlp/extractor/ichinanalive.py
index 9d55ddc..475d335 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ichinanalive.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ichinanalive.py
@@ -1,6 +1,13 @@
+
 from .common import InfoExtractor
-from ..utils import ExtractorError, str_or_none, traverse_obj, unified_strdate
-from ..compat import compat_str
+from ..utils import (
+    ExtractorError,
+    int_or_none,
+    str_or_none,
+    traverse_obj,
+    unified_strdate,
+    url_or_none,
+)
 
 
 class IchinanaLiveIE(InfoExtractor):
@@ -27,21 +34,21 @@ class IchinanaLiveIE(InfoExtractor):
 
     @classmethod
     def suitable(cls, url):
-        return not IchinanaLiveClipIE.suitable(url) and super(IchinanaLiveIE, cls).suitable(url)
+        return not IchinanaLiveClipIE.suitable(url) and super().suitable(url)
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        url = 'https://17.live/live/%s' % video_id
+        url = f'https://17.live/live/{video_id}'
 
         enter = self._download_json(
-            'https://api-dsa.17app.co/api/v1/lives/%s/enter' % video_id, video_id,
+            f'https://api-dsa.17app.co/api/v1/lives/{video_id}/enter', video_id,
             headers={'Referer': url}, fatal=False, expected_status=420,
             data=b'\0')
         if enter and enter.get('message') == 'ended':
             raise ExtractorError('This live has ended.', expected=True)
 
         view_data = self._download_json(
-            'https://api-dsa.17app.co/api/v1/lives/%s' % video_id, video_id,
+            f'https://api-dsa.17app.co/api/v1/lives/{video_id}', video_id,
             headers={'Referer': url})
 
         uploader = traverse_obj(
@@ -52,7 +59,7 @@ class IchinanaLiveIE(InfoExtractor):
             raise ExtractorError('unable to extract live URL information')
         formats = []
         for (name, value) in video_urls[0].items():
-            if not isinstance(value, compat_str):
+            if not isinstance(value, str):
                 continue
             if not value.startswith('http'):
                 continue
@@ -106,10 +113,10 @@ class IchinanaLiveClipIE(InfoExtractor):
 
     def _real_extract(self, url):
         uploader_id, video_id = self._match_valid_url(url).groups()
-        url = 'https://17.live/profile/r/%s/clip/%s' % (uploader_id, video_id)
+        url = f'https://17.live/profile/r/{uploader_id}/clip/{video_id}'
 
         view_data = self._download_json(
-            'https://api-dsa.17app.co/api/v1/clips/%s' % video_id, video_id,
+            f'https://api-dsa.17app.co/api/v1/clips/{video_id}', video_id,
             headers={'Referer': url})
 
         uploader = traverse_obj(
@@ -158,3 +165,51 @@ class IchinanaLiveClipIE(InfoExtractor):
             'description': view_data.get('caption'),
             'upload_date': unified_strdate(str_or_none(view_data.get('createdAt'))),
         }
+
+
+class IchinanaLiveVODIE(InfoExtractor):
+    IE_NAME = '17live:vod'
+    _VALID_URL = r'https?://(?:www\.)?17\.live/ja/vod/[^/?#]+/(?P<id>[^/?#]+)'
+    _TESTS = [{
+        'url': 'https://17.live/ja/vod/27323042/2cf84520-e65e-4b22-891e-1d3a00b0f068',
+        'md5': '3299b930d7457b069639486998a89580',
+        'info_dict': {
+            'id': '2cf84520-e65e-4b22-891e-1d3a00b0f068',
+            'ext': 'mp4',
+            'title': 'md5:b5f8cbf497d54cc6a60eb3b480182f01',
+            'uploader': 'md5:29fb12122ab94b5a8495586e7c3085a5',
+            'uploader_id': '27323042',
+            'channel': '🌟オールナイトニッポン アーカイブ🌟',
+            'channel_id': '2b4f85f1-d61e-429d-a901-68d32bdd8645',
+            'like_count': int,
+            'view_count': int,
+            'thumbnail': r're:https?://.+/.+\.(?:jpe?g|png)',
+            'duration': 549,
+            'description': 'md5:116f326579700f00eaaf5581aae1192e',
+            'timestamp': 1741058645,
+            'upload_date': '20250304',
+        },
+    }, {
+        'url': 'https://17.live/ja/vod/27323042/0de11bac-9bea-40b8-9eab-0239a7d88079',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        json_data = self._download_json(f'https://wap-api.17app.co/api/v1/vods/{video_id}', video_id)
+
+        return traverse_obj(json_data, {
+            'id': ('vodID', {str}),
+            'title': ('title', {str}),
+            'formats': ('vodURL', {lambda x: self._extract_m3u8_formats(x, video_id)}),
+            'uploader': ('userInfo', 'displayName', {str}),
+            'uploader_id': ('userInfo', 'roomID', {int}, {str_or_none}),
+            'channel': ('userInfo', 'name', {str}),
+            'channel_id': ('userInfo', 'userID', {str}),
+            'like_count': ('likeCount', {int_or_none}),
+            'view_count': ('viewCount', {int_or_none}),
+            'thumbnail': ('imageURL', {url_or_none}),
+            'duration': ('duration', {int_or_none}),
+            'description': ('description', {str}),
+            'timestamp': ('createdAt', {int_or_none}),
+        })
diff --git a/plugins/youtube_download/yt_dlp/extractor/ign.py b/plugins/youtube_download/yt_dlp/extractor/ign.py
index 64875f8..771c185 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ign.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ign.py
@@ -2,12 +2,10 @@ import re
 import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import compat_parse_qs
 from ..networking.exceptions import HTTPError
 from ..utils import (
     ExtractorError,
     determine_ext,
-    error_to_compat_str,
     extract_attributes,
     int_or_none,
     merge_dicts,
@@ -22,7 +20,7 @@ from ..utils import (
 class IGNBaseIE(InfoExtractor):
     def _call_api(self, slug):
         return self._download_json(
-            'http://apis.ign.com/{0}/v3/{0}s/slug/{1}'.format(self._PAGE_TYPE, slug), slug)
+            f'http://apis.ign.com/{self._PAGE_TYPE}/v3/{self._PAGE_TYPE}s/slug/{slug}', slug)
 
     def _checked_call_api(self, slug):
         try:
@@ -106,8 +104,7 @@ class IGNIE(IGNBaseIE):
     _VIDEO_PATH_RE = r'/(?:\d{4}/\d{2}/\d{2}/)?(?P<id>.+?)'
     _PLAYLIST_PATH_RE = r'(?:/?\?(?P<filt>[^&#]+))?'
     _VALID_URL = (
-        r'https?://(?:.+?\.ign|www\.pcmag)\.com/videos(?:%s)'
-        % '|'.join((_VIDEO_PATH_RE + r'(?:[/?&#]|$)', _PLAYLIST_PATH_RE)))
+        r'https?://(?:.+?\.ign|www\.pcmag)\.com/videos(?:{})'.format('|'.join((_VIDEO_PATH_RE + r'(?:[/?&#]|$)', _PLAYLIST_PATH_RE))))
     IE_NAME = 'ign.com'
     _PAGE_TYPE = 'video'
 
@@ -152,10 +149,10 @@ class IGNIE(IGNBaseIE):
         grids = re.findall(
             r'''(?s)<section\b[^>]+\bclass\s*=\s*['"](?:[\w-]+\s+)*?content-feed-grid(?!\B|-)[^>]+>(.+?)</section[^>]*>''',
             webpage)
-        return filter(None,
-                      (urljoin(url, m.group('path')) for m in re.finditer(
-                          r'''<a\b[^>]+\bhref\s*=\s*('|")(?P<path>/videos%s)\1'''
-                          % cls._VIDEO_PATH_RE, grids[0] if grids else '')))
+        return filter(
+            None, (urljoin(url, m.group('path')) for m in re.finditer(
+                rf'''<a\b[^>]+\bhref\s*=\s*('|")(?P<path>/videos{cls._VIDEO_PATH_RE})\1''',
+                grids[0] if grids else '')))
 
     def _real_extract(self, url):
         display_id, filt = self._match_valid_url(url).group('id', 'filt')
@@ -197,10 +194,6 @@ class IGNVideoIE(IGNBaseIE):
             'thumbnail': 'https://sm.ign.com/ign_me/video/h/how-hitman/how-hitman-aims-to-be-different-than-every-other-s_8z14.jpg',
             'duration': 298,
             'tags': 'count:13',
-            'display_id': '112203',
-            'thumbnail': 'https://sm.ign.com/ign_me/video/h/how-hitman/how-hitman-aims-to-be-different-than-every-other-s_8z14.jpg',
-            'duration': 298,
-            'tags': 'count:13',
         },
         'expected_warnings': ['HTTP Error 400: Bad Request'],
     }, {
@@ -228,7 +221,7 @@ class IGNVideoIE(IGNBaseIE):
 
         webpage, urlh = self._download_webpage_handle(embed_url, video_id)
         new_url = urlh.url
-        ign_url = compat_parse_qs(
+        ign_url = urllib.parse.parse_qs(
             urllib.parse.urlparse(new_url).query).get('url', [None])[-1]
         if ign_url:
             return self.url_result(ign_url, IGNIE.ie_key())
@@ -332,7 +325,7 @@ class IGNArticleIE(IGNBaseIE):
                         'Content not found: expired?', cause=e.cause,
                         expected=True)
                 elif e.cause.status == 503:
-                    self.report_warning(error_to_compat_str(e.cause))
+                    self.report_warning(str(e.cause))
                     return
             raise
 
@@ -371,7 +364,7 @@ class IGNArticleIE(IGNBaseIE):
                     flashvars = self._search_regex(
                         r'''(<param\b[^>]+\bname\s*=\s*("|')flashvars\2[^>]*>)''',
                         m.group('params'), 'flashvars', default='')
-                    flashvars = compat_parse_qs(extract_attributes(flashvars).get('value') or '')
+                    flashvars = urllib.parse.parse_qs(extract_attributes(flashvars).get('value') or '')
                     v_url = url_or_none((flashvars.get('url') or [None])[-1])
                     if v_url:
                         yield self.url_result(v_url)
diff --git a/plugins/youtube_download/yt_dlp/extractor/iheart.py b/plugins/youtube_download/yt_dlp/extractor/iheart.py
index 2c6a5b6..21870ca 100644
--- a/plugins/youtube_download/yt_dlp/extractor/iheart.py
+++ b/plugins/youtube_download/yt_dlp/extractor/iheart.py
@@ -23,7 +23,7 @@ class IHeartRadioBaseIE(InfoExtractor):
 
 
 class IHeartRadioIE(IHeartRadioBaseIE):
-    IENAME = 'iheartradio'
+    IE_NAME = 'iheartradio'
     _VALID_URL = r'(?:https?://(?:www\.)?iheart\.com/podcast/[^/]+/episode/(?P<display_id>[^/?&#]+)-|iheartradio:)(?P<id>\d+)'
     _TEST = {
         'url': 'https://www.iheart.com/podcast/105-behind-the-bastards-29236323/episode/part-one-alexander-lukashenko-the-dictator-70346499/?embed=true',
@@ -35,7 +35,7 @@ class IHeartRadioIE(IHeartRadioBaseIE):
             'description': 'md5:96cc7297b3a5a9ebae28643801c96fae',
             'timestamp': 1597741200,
             'upload_date': '20200818',
-        }
+        },
     }
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/ilpost.py b/plugins/youtube_download/yt_dlp/extractor/ilpost.py
new file mode 100644
index 0000000..da203cf
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/ilpost.py
@@ -0,0 +1,68 @@
+
+from .common import InfoExtractor
+from ..utils import (
+    ExtractorError,
+    float_or_none,
+    int_or_none,
+    url_or_none,
+    urlencode_postdata,
+)
+from ..utils.traversal import traverse_obj
+
+
+class IlPostIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?ilpost\.it/episodes/(?P<id>[^/?#]+)'
+    _TESTS = [{
+        'url': 'https://www.ilpost.it/episodes/1-avis-akvasas-ka/',
+        'md5': '43649f002d85e1c2f319bb478d479c40',
+        'info_dict': {
+            'id': '2972047',
+            'ext': 'mp3',
+            'display_id': '1-avis-akvasas-ka',
+            'title': '1. Avis akvasas ka',
+            'url': 'https://www.ilpost.it/wp-content/uploads/2023/12/28/1703781217-l-invasione-pt1-v6.mp3',
+            'timestamp': 1703835014,
+            'upload_date': '20231229',
+            'duration': 2495.0,
+            'availability': 'public',
+            'series_id': '235598',
+            'description': '',
+        },
+    }]
+
+    def _real_extract(self, url):
+        display_id = self._match_id(url)
+        webpage = self._download_webpage(url, display_id)
+
+        endpoint_metadata = self._search_json(
+            r'var\s+ilpostpodcast\s*=', webpage, 'metadata', display_id)
+        episode_id = endpoint_metadata['post_id']
+        podcast_id = endpoint_metadata['podcast_id']
+        podcast_metadata = self._download_json(
+            endpoint_metadata['ajax_url'], display_id, data=urlencode_postdata({
+                'action': 'checkpodcast',
+                'cookie': endpoint_metadata['cookie'],
+                'post_id': episode_id,
+                'podcast_id': podcast_id,
+            }))
+
+        episode = traverse_obj(podcast_metadata, (
+            'data', 'postcastList', lambda _, v: str(v['id']) == episode_id, {dict}), get_all=False)
+        if not episode:
+            raise ExtractorError('Episode could not be extracted')
+
+        return {
+            'id': episode_id,
+            'display_id': display_id,
+            'series_id': podcast_id,
+            'vcodec': 'none',
+            **traverse_obj(episode, {
+                'title': ('title', {str}),
+                'description': ('description', {str}),
+                'url': ('podcast_raw_url', {url_or_none}),
+                'thumbnail': ('image', {url_or_none}),
+                'timestamp': ('timestamp', {int_or_none}),
+                'duration': ('milliseconds', {float_or_none(scale=1000)}),
+                'availability': ('free', {lambda v: 'public' if v else 'subscriber_only'}),
+            }),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/iltalehti.py b/plugins/youtube_download/yt_dlp/extractor/iltalehti.py
index 0e7e82c..37aa471 100644
--- a/plugins/youtube_download/yt_dlp/extractor/iltalehti.py
+++ b/plugins/youtube_download/yt_dlp/extractor/iltalehti.py
@@ -47,5 +47,5 @@ class IltalehtiIE(InfoExtractor):
             'state', 'articles', ..., 'items', (('main_media', 'properties'), ('body', ..., 'properties'))))
         video_ids = traverse_obj(props, (lambda _, v: v['provider'] == 'jwplayer', 'id'))
         return self.playlist_from_matches(
-            video_ids, article_id, ie='JWPlatform', getter=lambda id: f'jwplatform:{id}',
+            video_ids, article_id, ie='JWPlatform', getter=lambda video_id: f'jwplatform:{video_id}',
             title=traverse_obj(info, ('state', 'articles', ..., 'items', 'canonical_title'), get_all=False))
diff --git a/plugins/youtube_download/yt_dlp/extractor/imdb.py b/plugins/youtube_download/yt_dlp/extractor/imdb.py
index 557a3b7..a786ce3 100644
--- a/plugins/youtube_download/yt_dlp/extractor/imdb.py
+++ b/plugins/youtube_download/yt_dlp/extractor/imdb.py
@@ -28,7 +28,7 @@ class ImdbIE(InfoExtractor):
             'description': 'md5:87bd0bdc61e351f21f20d2d7441cb4e7',
             'duration': 152,
             'thumbnail': r're:^https?://.+\.jpg',
-        }
+        },
     }, {
         'url': 'https://www.imdb.com/video/vi3516832537',
         'info_dict': {
@@ -38,7 +38,7 @@ class ImdbIE(InfoExtractor):
             'description': 'md5:17fcc4fe11ec29b4399be9d4c5ef126c',
             'duration': 153,
             'thumbnail': r're:^https?://.+\.jpg',
-        }
+        },
     }, {
         'url': 'http://www.imdb.com/video/_/vi2524815897',
         'only_matching': True,
@@ -73,7 +73,7 @@ class ImdbIE(InfoExtractor):
                 'key': base64.b64encode(json.dumps({
                     'type': 'VIDEO_PLAYER',
                     'subType': 'FORCE_LEGACY',
-                    'id': 'vi%s' % video_id,
+                    'id': f'vi{video_id}',
                 }).encode()).decode(),
             }), lambda x: x[0]['videoLegacyEncodings'])
         quality = qualities(('SD', '480p', '720p', '1080p'))
@@ -132,7 +132,7 @@ class ImdbListIE(InfoExtractor):
         webpage = self._download_webpage(url, list_id)
         entries = [
             self.url_result('http://www.imdb.com' + m, 'Imdb')
-            for m in re.findall(r'href="(/list/ls%s/videoplayer/vi[^"]+)"' % list_id, webpage)]
+            for m in re.findall(rf'href="(/list/ls{list_id}/videoplayer/vi[^"]+)"', webpage)]
 
         list_title = self._html_search_regex(
             r'<h1[^>]+class="[^"]*header[^"]*"[^>]*>(.*?)</h1>',
diff --git a/plugins/youtube_download/yt_dlp/extractor/imggaming.py b/plugins/youtube_download/yt_dlp/extractor/imggaming.py
index a40aa21..3a7b5bd 100644
--- a/plugins/youtube_download/yt_dlp/extractor/imggaming.py
+++ b/plugins/youtube_download/yt_dlp/extractor/imggaming.py
@@ -73,7 +73,7 @@ class ImgGamingBaseIE(InfoExtractor):
                 if not video_id:
                     continue
                 entries.append(self.url_result(
-                    'https://%s/video/%s' % (domain, video_id),
+                    f'https://{domain}/video/{video_id}',
                     self.ie_key(), video_id))
             return self.playlist_result(
                 entries, media_id, playlist.get('title'),
diff --git a/plugins/youtube_download/yt_dlp/extractor/imgur.py b/plugins/youtube_download/yt_dlp/extractor/imgur.py
index bff6ed5..e2644e6 100644
--- a/plugins/youtube_download/yt_dlp/extractor/imgur.py
+++ b/plugins/youtube_download/yt_dlp/extractor/imgur.py
@@ -1,150 +1,428 @@
+import functools
 import re
 
 from .common import InfoExtractor
 from ..utils import (
+    ExtractorError,
+    determine_ext,
+    float_or_none,
     int_or_none,
     js_to_json,
     mimetype2ext,
-    ExtractorError,
+    parse_iso8601,
+    str_or_none,
+    strip_or_none,
+    traverse_obj,
+    url_or_none,
 )
 
 
-class ImgurIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:i\.)?imgur\.com/(?!(?:a|gallery|(?:t(?:opic)?|r)/[^/]+)/)(?P<id>[a-zA-Z0-9]+)'
+class ImgurBaseIE(InfoExtractor):
+    _CLIENT_ID = '546c25a59c58ad7'
+
+    @classmethod
+    def _imgur_result(cls, item_id):
+        return cls.url_result(f'https://imgur.com/{item_id}', ImgurIE, item_id)
+
+    def _call_api(self, endpoint, video_id, **kwargs):
+        return self._download_json(
+            f'https://api.imgur.com/post/v1/{endpoint}/{video_id}?client_id={self._CLIENT_ID}&include=media,account',
+            video_id, **kwargs)
+
+    @staticmethod
+    def get_description(s):
+        if 'Discover the magic of the internet at Imgur' in s:
+            return None
+        return s or None
+
+
+class ImgurIE(ImgurBaseIE):
+    _VALID_URL = r'https?://(?:i\.)?imgur\.com/(?!(?:a|gallery|t|topic|r)/)(?:[^/?#]+-)?(?P<id>[a-zA-Z0-9]+)'
 
     _TESTS = [{
-        'url': 'https://i.imgur.com/A61SaA1.gifv',
+        'url': 'https://imgur.com/A61SaA1',
         'info_dict': {
             'id': 'A61SaA1',
             'ext': 'mp4',
-            'title': 're:Imgur GIF$|MRW gifv is up and running without any bugs$',
+            'title': 'MRW gifv is up and running without any bugs',
+            'timestamp': 1416446068,
+            'upload_date': '20141120',
+            'dislike_count': int,
+            'comment_count': int,
+            'release_timestamp': 1416446068,
+            'release_date': '20141120',
+            'like_count': int,
+            'thumbnail': 'https://i.imgur.com/A61SaA1h.jpg',
         },
     }, {
-        'url': 'https://imgur.com/A61SaA1',
+        # Test with URL slug
+        'url': 'https://imgur.com/mrw-gifv-is-up-running-without-any-bugs-A61SaA1',
+        'info_dict': {
+            'id': 'A61SaA1',
+            'ext': 'mp4',
+            'title': 'MRW gifv is up and running without any bugs',
+            'timestamp': 1416446068,
+            'upload_date': '20141120',
+            'dislike_count': int,
+            'comment_count': int,
+            'release_timestamp': 1416446068,
+            'release_date': '20141120',
+            'like_count': int,
+            'thumbnail': 'https://i.imgur.com/A61SaA1h.jpg',
+        },
+    }, {
+        'url': 'https://i.imgur.com/A61SaA1.gifv',
         'only_matching': True,
     }, {
         'url': 'https://i.imgur.com/crGpqCV.mp4',
         'only_matching': True,
     }, {
-        # no title
         'url': 'https://i.imgur.com/jxBXAMC.gifv',
-        'only_matching': True,
+        'info_dict': {
+            'id': 'jxBXAMC',
+            'ext': 'mp4',
+            'title': 'Fahaka puffer feeding',
+            'timestamp': 1533835503,
+            'upload_date': '20180809',
+            'release_date': '20180809',
+            'like_count': int,
+            'duration': 30.0,
+            'comment_count': int,
+            'release_timestamp': 1533835503,
+            'thumbnail': 'https://i.imgur.com/jxBXAMCh.jpg',
+            'dislike_count': int,
+        },
+    }, {
+        # needs Accept header, ref: https://github.com/yt-dlp/yt-dlp/issues/9458
+        'url': 'https://imgur.com/zV03bd5',
+        'md5': '59df97884e8ba76143ff6b640a0e2904',
+        'info_dict': {
+            'id': 'zV03bd5',
+            'ext': 'mp4',
+            'title': 'Ive - Liz',
+            'timestamp': 1710491255,
+            'upload_date': '20240315',
+            'like_count': int,
+            'dislike_count': int,
+            'duration': 56.92,
+            'comment_count': int,
+            'release_timestamp': 1710491255,
+            'release_date': '20240315',
+            'thumbnail': 'https://i.imgur.com/zV03bd5h.jpg',
+        },
     }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
+        data = self._call_api('media', video_id)
+        if not traverse_obj(data, ('media', 0, (
+                ('type', {lambda t: t == 'video' or None}),
+                ('metadata', 'is_animated'))), get_all=False):
+            raise ExtractorError(f'{video_id} is not a video or animated image', expected=True)
         webpage = self._download_webpage(
-            'https://i.imgur.com/{id}.gifv'.format(id=video_id), video_id)
+            f'https://i.imgur.com/{video_id}.gifv', video_id, fatal=False) or ''
+        formats = []
 
-        width = int_or_none(self._og_search_property(
-            'video:width', webpage, default=None))
-        height = int_or_none(self._og_search_property(
-            'video:height', webpage, default=None))
+        media_fmt = traverse_obj(data, ('media', 0, {
+            'url': ('url', {url_or_none}),
+            'ext': ('ext', {str}),
+            'width': ('width', {int_or_none}),
+            'height': ('height', {int_or_none}),
+            'filesize': ('size', {int_or_none}),
+            'acodec': ('metadata', 'has_sound', {lambda b: None if b else 'none'}),
+        }))
+        media_url = media_fmt.get('url')
+        if media_url:
+            if not media_fmt.get('ext'):
+                media_fmt['ext'] = mimetype2ext(traverse_obj(
+                    data, ('media', 0, 'mime_type'))) or determine_ext(media_url)
+            if traverse_obj(data, ('media', 0, 'type')) == 'image':
+                media_fmt['acodec'] = 'none'
+                media_fmt.setdefault('preference', -10)
+            formats.append(media_fmt)
 
         video_elements = self._search_regex(
             r'(?s)<div class="video-elements">(.*?)</div>',
             webpage, 'video elements', default=None)
-        if not video_elements:
-            raise ExtractorError(
-                'No sources found for video %s. Maybe an image?' % video_id,
-                expected=True)
 
-        formats = []
-        for m in re.finditer(r'<source\s+src="(?P<src>[^"]+)"\s+type="(?P<type>[^"]+)"', video_elements):
-            formats.append({
-                'format_id': m.group('type').partition('/')[2],
-                'url': self._proto_relative_url(m.group('src')),
-                'ext': mimetype2ext(m.group('type')),
-                'width': width,
-                'height': height,
-                'http_headers': {
-                    'User-Agent': 'yt-dlp (like wget)',
-                },
-            })
+        if video_elements:
+            def og_get_size(media_type):
+                return {
+                    p: int_or_none(self._og_search_property(f'{media_type}:{p}', webpage, default=None))
+                    for p in ('width', 'height')
+                }
 
-        gif_json = self._search_regex(
-            r'(?s)var\s+videoItem\s*=\s*(\{.*?\})',
-            webpage, 'GIF code', fatal=False)
-        if gif_json:
-            gifd = self._parse_json(
-                gif_json, video_id, transform_source=js_to_json)
-            formats.append({
-                'format_id': 'gif',
-                'preference': -10,  # gifs are worse than videos
-                'width': width,
-                'height': height,
-                'ext': 'gif',
-                'acodec': 'none',
-                'vcodec': 'gif',
-                'container': 'gif',
-                'url': self._proto_relative_url(gifd['gifUrl']),
-                'filesize': gifd.get('size'),
-                'http_headers': {
-                    'User-Agent': 'yt-dlp (like wget)',
-                },
+            size = og_get_size('video')
+            if not any(size.values()):
+                size = og_get_size('image')
+
+            formats = traverse_obj(
+                re.finditer(r'<source\s+src="(?P<src>[^"]+)"\s+type="(?P<type>[^"]+)"', video_elements),
+                (..., {
+                    'format_id': ('type', {lambda s: s.partition('/')[2]}),
+                    'url': ('src', {self._proto_relative_url}),
+                    'ext': ('type', {mimetype2ext}),
+                }))
+            for f in formats:
+                f.update(size)
+
+            # We can get the original gif format from the webpage as well
+            gif_json = traverse_obj(self._search_json(
+                r'var\s+videoItem\s*=', webpage, 'GIF info', video_id,
+                transform_source=js_to_json, fatal=False), {
+                    'url': ('gifUrl', {self._proto_relative_url}),
+                    'filesize': ('size', {int_or_none}),
             })
+            if gif_json:
+                gif_json.update(size)
+                gif_json.update({
+                    'format_id': 'gif',
+                    'preference': -10,  # gifs < videos
+                    'ext': 'gif',
+                    'acodec': 'none',
+                    'vcodec': 'gif',
+                    'container': 'gif',
+                })
+                formats.append(gif_json)
+
+        search = functools.partial(self._html_search_meta, html=webpage, default=None)
+
+        twitter_fmt = {
+            'format_id': 'twitter',
+            'url': url_or_none(search('twitter:player:stream')),
+            'ext': mimetype2ext(search('twitter:player:stream:content_type')),
+            'width': int_or_none(search('twitter:width')),
+            'height': int_or_none(search('twitter:height')),
+        }
+        if twitter_fmt['url']:
+            formats.append(twitter_fmt)
+
+        if not formats:
+            self.raise_no_formats(
+                f'No sources found for video {video_id}. Maybe a plain image?', expected=True)
+        self._remove_duplicate_formats(formats)
 
         return {
+            'title': self._og_search_title(webpage, default=None),
+            'description': self.get_description(self._og_search_description(webpage, default='')),
+            **traverse_obj(data, {
+                'uploader_id': ('account_id', {lambda a: str(a) if int_or_none(a) else None}),
+                'uploader': ('account', 'username', {lambda x: strip_or_none(x) or None}),
+                'uploader_url': ('account', 'avatar_url', {url_or_none}),
+                'like_count': ('upvote_count', {int_or_none}),
+                'dislike_count': ('downvote_count', {int_or_none}),
+                'comment_count': ('comment_count', {int_or_none}),
+                'age_limit': ('is_mature', {lambda x: 18 if x else None}),
+                'timestamp': (('updated_at', 'created_at'), {parse_iso8601}),
+                'release_timestamp': ('created_at', {parse_iso8601}),
+            }, get_all=False),
+            **traverse_obj(data, ('media', 0, 'metadata', {
+                'title': ('title', {lambda x: strip_or_none(x) or None}),
+                'description': ('description', {self.get_description}),
+                'duration': ('duration', {float_or_none}),
+                'timestamp': (('updated_at', 'created_at'), {parse_iso8601}),
+                'release_timestamp': ('created_at', {parse_iso8601}),
+            }), get_all=False),
             'id': video_id,
             'formats': formats,
-            'title': self._og_search_title(webpage, default=video_id),
+            'thumbnails': [{
+                'url': thumbnail_url,
+                'http_headers': {'Accept': '*/*'},
+            }] if (thumbnail_url := search(['thumbnailUrl', 'twitter:image', 'og:image'])) else None,
+            'http_headers': {'Accept': '*/*'},
         }
 
 
-class ImgurGalleryIE(InfoExtractor):
-    IE_NAME = 'imgur:gallery'
-    _VALID_URL = r'https?://(?:i\.)?imgur\.com/(?:gallery|(?:t(?:opic)?|r)/[^/]+)/(?P<id>[a-zA-Z0-9]+)'
-
-    _TESTS = [{
-        'url': 'http://imgur.com/gallery/Q95ko',
-        'info_dict': {
-            'id': 'Q95ko',
-            'title': 'Adding faces make every GIF better',
-        },
-        'playlist_count': 25,
-    }, {
-        'url': 'http://imgur.com/topic/Aww/ll5Vk',
-        'only_matching': True,
-    }, {
-        'url': 'https://imgur.com/gallery/YcAQlkx',
-        'info_dict': {
-            'id': 'YcAQlkx',
-            'ext': 'mp4',
-            'title': 'Classic Steve Carell gif...cracks me up everytime....damn the repost downvotes....',
-        }
-    }, {
-        'url': 'http://imgur.com/topic/Funny/N8rOudd',
-        'only_matching': True,
-    }, {
-        'url': 'http://imgur.com/r/aww/VQcQPhM',
-        'only_matching': True,
-    }]
+class ImgurGalleryBaseIE(ImgurBaseIE):
+    _GALLERY = True
 
     def _real_extract(self, url):
         gallery_id = self._match_id(url)
 
-        data = self._download_json(
-            'https://imgur.com/gallery/%s.json' % gallery_id,
-            gallery_id)['data']['image']
+        data = self._call_api('albums', gallery_id, fatal=False, expected_status=404)
 
-        if data.get('is_album'):
-            entries = [
-                self.url_result('http://imgur.com/%s' % image['hash'], ImgurIE.ie_key(), image['hash'])
-                for image in data['album_images']['images'] if image.get('hash')]
-            return self.playlist_result(entries, gallery_id, data.get('title'), data.get('description'))
+        info = traverse_obj(data, {
+            'title': ('title', {lambda x: strip_or_none(x) or None}),
+            'description': ('description', {self.get_description}),
+        })
 
-        return self.url_result('http://imgur.com/%s' % gallery_id, ImgurIE.ie_key(), gallery_id)
+        if traverse_obj(data, 'is_album'):
+
+            items = traverse_obj(data, (
+                'media', lambda _, v: v.get('type') == 'video' or v['metadata']['is_animated'],
+                'id', {lambda x: str_or_none(x) or None}))
+
+            # if a gallery with exactly one video, apply album metadata to video
+            media_id = None
+            if self._GALLERY and len(items) == 1:
+                media_id = items[0]
+
+            if not media_id:
+                result = self.playlist_result(
+                    map(self._imgur_result, items), gallery_id)
+                result.update(info)
+                return result
+            gallery_id = media_id
+
+        result = self._imgur_result(gallery_id)
+        info['_type'] = 'url_transparent'
+        result.update(info)
+        return result
 
 
-class ImgurAlbumIE(ImgurGalleryIE):  # XXX: Do not subclass from concrete IE
-    IE_NAME = 'imgur:album'
-    _VALID_URL = r'https?://(?:i\.)?imgur\.com/a/(?P<id>[a-zA-Z0-9]+)'
+class ImgurGalleryIE(ImgurGalleryBaseIE):
+    IE_NAME = 'imgur:gallery'
+    _VALID_URL = r'https?://(?:i\.)?imgur\.com/(?:gallery|(?:t(?:opic)?|r)/[^/?#]+)/(?:[^/?#]+-)?(?P<id>[a-zA-Z0-9]+)'
 
     _TESTS = [{
-        'url': 'http://imgur.com/a/j6Orj',
+        # TODO: static images - replace with animated/video gallery
+        'url': 'http://imgur.com/topic/Aww/ll5Vk',
+        'only_matching': True,
+    }, {
+        'url': 'https://imgur.com/gallery/YcAQlkx',
+        'add_ies': ['Imgur'],
         'info_dict': {
-            'id': 'j6Orj',
-            'title': 'A Literary Analysis of "Star Wars: The Force Awakens"',
+            'id': 'YcAQlkx',
+            'ext': 'mp4',
+            'title': 'Classic Steve Carell gif...cracks me up everytime....damn the repost downvotes....',
+            'timestamp': 1358554297,
+            'upload_date': '20130119',
+            'uploader_id': '1648642',
+            'uploader': 'wittyusernamehere',
+            'release_timestamp': 1358554297,
+            'thumbnail': 'https://i.imgur.com/YcAQlkxh.jpg',
+            'release_date': '20130119',
+            'uploader_url': 'https://i.imgur.com/N5Flb2v_d.png?maxwidth=290&fidelity=grand',
+            'comment_count': int,
+            'dislike_count': int,
+            'like_count': int,
+        },
+    }, {
+        # Test with slug
+        'url': 'https://imgur.com/gallery/classic-steve-carell-gif-cracks-me-up-everytime-repost-downvotes-YcAQlkx',
+        'add_ies': ['Imgur'],
+        'info_dict': {
+            'id': 'YcAQlkx',
+            'ext': 'mp4',
+            'title': 'Classic Steve Carell gif...cracks me up everytime....damn the repost downvotes....',
+            'timestamp': 1358554297,
+            'upload_date': '20130119',
+            'uploader_id': '1648642',
+            'uploader': 'wittyusernamehere',
+            'release_timestamp': 1358554297,
+            'release_date': '20130119',
+            'thumbnail': 'https://i.imgur.com/YcAQlkxh.jpg',
+            'uploader_url': 'https://i.imgur.com/N5Flb2v_d.png?maxwidth=290&fidelity=grand',
+            'comment_count': int,
+            'dislike_count': int,
+            'like_count': int,
+        },
+    }, {
+        # TODO: static image - replace with animated/video gallery
+        'url': 'http://imgur.com/topic/Funny/N8rOudd',
+        'only_matching': True,
+    }, {
+        'url': 'http://imgur.com/r/aww/VQcQPhM',
+        'add_ies': ['Imgur'],
+        'info_dict': {
+            'id': 'VQcQPhM',
+            'ext': 'mp4',
+            'title': 'The boss is here',
+            'timestamp': 1476494751,
+            'upload_date': '20161015',
+            'uploader_id': '19138530',
+            'uploader': 'thematrixcam',
+            'comment_count': int,
+            'dislike_count': int,
+            'uploader_url': 'https://i.imgur.com/qCjr5Pi_d.png?maxwidth=290&fidelity=grand',
+            'release_timestamp': 1476494751,
+            'like_count': int,
+            'release_date': '20161015',
+            'thumbnail': 'https://i.imgur.com/VQcQPhMh.jpg',
+        },
+    },
+        # from https://github.com/ytdl-org/youtube-dl/pull/16674
+        {
+        'url': 'https://imgur.com/t/unmuted/6lAn9VQ',
+        'info_dict': {
+            'id': '6lAn9VQ',
+            'title': 'Penguins !',
+        },
+        'playlist_count': 3,
+    }, {
+        'url': 'https://imgur.com/t/unmuted/penguins-penguins-6lAn9VQ',
+        'info_dict': {
+            'id': '6lAn9VQ',
+            'title': 'Penguins !',
+        },
+        'playlist_count': 3,
+    }, {
+        'url': 'https://imgur.com/t/unmuted/kx2uD3C',
+        'add_ies': ['Imgur'],
+        'info_dict': {
+            'id': 'ZVMv45i',
+            'ext': 'mp4',
+            'title': 'Intruder',
+            'timestamp': 1528129683,
+            'upload_date': '20180604',
+            'release_timestamp': 1528129683,
+            'release_date': '20180604',
+            'like_count': int,
+            'dislike_count': int,
+            'comment_count': int,
+            'duration': 30.03,
+            'thumbnail': 'https://i.imgur.com/ZVMv45ih.jpg',
+        },
+    }, {
+        'url': 'https://imgur.com/t/unmuted/wXSK0YH',
+        'add_ies': ['Imgur'],
+        'info_dict': {
+            'id': 'JCAP4io',
+            'ext': 'mp4',
+            'title': 're:I got the blues$',
+            'description': 'Luka’s vocal stylings.\n\nFP edit: don’t encourage me. I’ll never stop posting Luka and friends.',
+            'timestamp': 1527809525,
+            'upload_date': '20180531',
+            'like_count': int,
+            'dislike_count': int,
+            'duration': 30.03,
+            'comment_count': int,
+            'release_timestamp': 1527809525,
+            'thumbnail': 'https://i.imgur.com/JCAP4ioh.jpg',
+            'release_date': '20180531',
         },
-        'playlist_count': 12,
+    }]
+
+
+class ImgurAlbumIE(ImgurGalleryBaseIE):
+    IE_NAME = 'imgur:album'
+    _VALID_URL = r'https?://(?:i\.)?imgur\.com/a/(?:[^/?#]+-)?(?P<id>[a-zA-Z0-9]+)'
+    _GALLERY = False
+    _TESTS = [{
+        # TODO: only static images - replace with animated/video gallery
+        'url': 'http://imgur.com/a/j6Orj',
+        'only_matching': True,
+    },
+        # from https://github.com/ytdl-org/youtube-dl/pull/21693
+        {
+        'url': 'https://imgur.com/a/iX265HX',
+        'info_dict': {
+            'id': 'iX265HX',
+            'title': 'enen-no-shouboutai',
+        },
+        'playlist_count': 2,
+    }, {
+        # Test with URL slug
+        'url': 'https://imgur.com/a/enen-no-shouboutai-iX265HX',
+        'info_dict': {
+            'id': 'iX265HX',
+            'title': 'enen-no-shouboutai',
+        },
+        'playlist_count': 2,
+    }, {
+        'url': 'https://imgur.com/a/8pih2Ed',
+        'info_dict': {
+            'id': '8pih2Ed',
+        },
+        'playlist_mincount': 1,
     }]
diff --git a/plugins/youtube_download/yt_dlp/extractor/ina.py b/plugins/youtube_download/yt_dlp/extractor/ina.py
index 857013d..ba82201 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ina.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ina.py
@@ -14,7 +14,7 @@ class InaIE(InfoExtractor):
             'description': 'md5:19f61e2b4844ed4bb2e3df9ab9f527ff',
             'upload_date': '20070712',
             'thumbnail': 'https://cdn-hub.ina.fr/notice/690x517/3c4/I12055569.jpeg',
-        }
+        },
     }, {
         'url': 'https://www.ina.fr/video/S806544_001/don-d-organes-des-avancees-mais-d-importants-besoins-video.html',
         'only_matching': True,
diff --git a/plugins/youtube_download/yt_dlp/extractor/inc.py b/plugins/youtube_download/yt_dlp/extractor/inc.py
index 9b3fe9a..f47b8e1 100644
--- a/plugins/youtube_download/yt_dlp/extractor/inc.py
+++ b/plugins/youtube_download/yt_dlp/extractor/inc.py
@@ -54,4 +54,4 @@ class IncIE(InfoExtractor):
             display_id)['vid_kaltura_id']
 
         return self.url_result(
-            'kaltura:%s:%s' % (partner_id, kaltura_id), KalturaIE.ie_key())
+            f'kaltura:{partner_id}:{kaltura_id}', KalturaIE.ie_key())
diff --git a/plugins/youtube_download/yt_dlp/extractor/indavideo.py b/plugins/youtube_download/yt_dlp/extractor/indavideo.py
index 4fa97d8..85e388e 100644
--- a/plugins/youtube_download/yt_dlp/extractor/indavideo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/indavideo.py
@@ -1,9 +1,9 @@
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     int_or_none,
     parse_age_limit,
     parse_iso8601,
+    time_seconds,
     update_url_query,
 )
 
@@ -11,15 +11,14 @@ from ..utils import (
 class IndavideoEmbedIE(InfoExtractor):
     _VALID_URL = r'https?://(?:(?:embed\.)?indavideo\.hu/player/video/|assets\.indavideo\.hu/swf/player\.swf\?.*\b(?:v(?:ID|id))=)(?P<id>[\da-f]+)'
     # Some example URLs covered by generic extractor:
-    #   http://indavideo.hu/video/Vicces_cica_1
-    #   http://index.indavideo.hu/video/2015_0728_beregszasz
-    #   http://auto.indavideo.hu/video/Sajat_utanfutoban_a_kis_tacsko
-    #   http://erotika.indavideo.hu/video/Amator_tini_punci
-    #   http://film.indavideo.hu/video/f_hrom_nagymamm_volt
-    #   http://palyazat.indavideo.hu/video/Embertelen_dal_Dodgem_egyuttes
-    _EMBED_REGEX = [r'<iframe[^>]+\bsrc=["\'](?P<url>(?:https?:)?//embed\.indavideo\.hu/player/video/[\da-f]+)']
+    #   https://indavideo.hu/video/Vicces_cica_1
+    #   https://index.indavideo.hu/video/Hod_Nemetorszagban
+    #   https://auto.indavideo.hu/video/Sajat_utanfutoban_a_kis_tacsko
+    #   https://film.indavideo.hu/video/f_farkaslesen
+    #   https://palyazat.indavideo.hu/video/Embertelen_dal_Dodgem_egyuttes
+    _EMBED_REGEX = [r'<iframe[^>]+\bsrc=["\'](?P<url>(?:https?:)//embed\.indavideo\.hu/player/video/[\da-f]+)']
     _TESTS = [{
-        'url': 'http://indavideo.hu/player/video/1bdc3c6d80/',
+        'url': 'https://indavideo.hu/player/video/1bdc3c6d80/',
         'md5': 'c8a507a1c7410685f83a06eaeeaafeab',
         'info_dict': {
             'id': '1837039',
@@ -36,21 +35,33 @@ class IndavideoEmbedIE(InfoExtractor):
             'tags': ['tánc', 'cica', 'cuki', 'cukiajanlo', 'newsroom'],
         },
     }, {
-        'url': 'http://embed.indavideo.hu/player/video/1bdc3c6d80?autostart=1&hide=1',
-        'only_matching': True,
-    }, {
-        'url': 'http://assets.indavideo.hu/swf/player.swf?v=fe25e500&vID=1bdc3c6d80&autostart=1&hide=1&i=1',
+        'url': 'https://embed.indavideo.hu/player/video/1bdc3c6d80?autostart=1&hide=1',
         'only_matching': True,
     }]
+    _WEBPAGE_TESTS = [{
+        'url': 'https://indavideo.hu/video/Vicces_cica_1',
+        'info_dict': {
+            'id': '1335611',
+            'ext': 'mp4',
+            'title': 'Vicces cica',
+            'description': 'Játszik a tablettel. :D',
+            'thumbnail': r're:^https?://.*\.jpg$',
+            'uploader': 'Jet_Pack',
+            'uploader_id': '491217',
+            'timestamp': 1390821212,
+            'upload_date': '20140127',
+            'duration': 7,
+            'age_limit': 0,
+            'tags': ['cica', 'Jet_Pack'],
+        },
+    }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
 
         video = self._download_json(
-            'https://amfphp.indavideo.hu/SYm0json.php/player.playerHandler.getVideoData/%s' % video_id,
-            video_id)['data']
-
-        title = video['title']
+            f'https://amfphp.indavideo.hu/SYm0json.php/player.playerHandler.getVideoData/{video_id}/',
+            video_id, query={'_': time_seconds()})['data']
 
         video_urls = []
 
@@ -60,33 +71,21 @@ class IndavideoEmbedIE(InfoExtractor):
         elif isinstance(video_files, dict):
             video_urls.extend(video_files.values())
 
-        video_file = video.get('video_file')
-        if video:
-            video_urls.append(video_file)
         video_urls = list(set(video_urls))
 
-        video_prefix = video_urls[0].rsplit('/', 1)[0]
-
-        for flv_file in video.get('flv_files', []):
-            flv_url = '%s/%s' % (video_prefix, flv_file)
-            if flv_url not in video_urls:
-                video_urls.append(flv_url)
-
-        filesh = video.get('filesh')
+        filesh = video.get('filesh') or {}
 
         formats = []
         for video_url in video_urls:
             height = int_or_none(self._search_regex(
                 r'\.(\d{3,4})\.mp4(?:\?|$)', video_url, 'height', default=None))
-            if filesh:
-                if not height:
-                    continue
-                token = filesh.get(compat_str(height))
-                if token is None:
-                    continue
-                video_url = update_url_query(video_url, {'token': token})
+            if not height and len(filesh) == 1:
+                height = int_or_none(next(iter(filesh.keys())))
+            token = filesh.get(str(height))
+            if token is None:
+                continue
             formats.append({
-                'url': video_url,
+                'url': update_url_query(video_url, {'token': token}),
                 'height': height,
             })
 
@@ -96,14 +95,14 @@ class IndavideoEmbedIE(InfoExtractor):
             timestamp = parse_iso8601(timestamp + ' +0200', ' ')
 
         thumbnails = [{
-            'url': self._proto_relative_url(thumbnail)
+            'url': self._proto_relative_url(thumbnail),
         } for thumbnail in video.get('thumbnails', [])]
 
         tags = [tag['title'] for tag in video.get('tags') or []]
 
         return {
             'id': video.get('id') or video_id,
-            'title': title,
+            'title': video.get('title'),
             'description': video.get('description'),
             'thumbnails': thumbnails,
             'uploader': video.get('user_name'),
diff --git a/plugins/youtube_download/yt_dlp/extractor/infoq.py b/plugins/youtube_download/yt_dlp/extractor/infoq.py
index 192bcfe..5274c93 100644
--- a/plugins/youtube_download/yt_dlp/extractor/infoq.py
+++ b/plugins/youtube_download/yt_dlp/extractor/infoq.py
@@ -1,15 +1,13 @@
-from ..compat import (
-    compat_b64decode,
-    compat_urllib_parse_unquote,
-    compat_urlparse,
-)
+import base64
+import urllib.parse
+
+from .bokecc import BokeCCBaseIE
 from ..utils import (
     ExtractorError,
     determine_ext,
-    update_url_query,
     traverse_obj,
+    update_url_query,
 )
-from .bokecc import BokeCCBaseIE
 
 
 class InfoQIE(BokeCCBaseIE):
@@ -59,7 +57,7 @@ class InfoQIE(BokeCCBaseIE):
         encoded_id = self._search_regex(
             r"jsclassref\s*=\s*'([^']*)'", webpage, 'encoded id', default=None)
 
-        real_id = compat_urllib_parse_unquote(compat_b64decode(encoded_id).decode('utf-8'))
+        real_id = urllib.parse.unquote(base64.b64decode(encoded_id).decode('utf-8'))
         playpath = 'mp4:' + real_id
 
         return [{
@@ -98,7 +96,7 @@ class InfoQIE(BokeCCBaseIE):
 
         # base URL is found in the Location header in the response returned by
         # GET https://www.infoq.com/mp3download.action?filename=... when logged in.
-        http_audio_url = compat_urlparse.urljoin('http://ress.infoq.com/downloads/mp3downloads/', http_audio_url)
+        http_audio_url = urllib.parse.urljoin('http://ress.infoq.com/downloads/mp3downloads/', http_audio_url)
         http_audio_url = update_url_query(http_audio_url, self._extract_cf_auth(webpage))
 
         # audio file seem to be missing some times even if there is a download link
diff --git a/plugins/youtube_download/yt_dlp/extractor/instagram.py b/plugins/youtube_download/yt_dlp/extractor/instagram.py
index bfc4b7b..98f70c2 100644
--- a/plugins/youtube_download/yt_dlp/extractor/instagram.py
+++ b/plugins/youtube_download/yt_dlp/extractor/instagram.py
@@ -2,89 +2,56 @@ import hashlib
 import itertools
 import json
 import re
-import time
 
 from .common import InfoExtractor
 from ..networking.exceptions import HTTPError
 from ..utils import (
     ExtractorError,
+    bug_reports_message,
     decode_base_n,
     encode_base_n,
+    filter_dict,
     float_or_none,
     format_field,
     get_element_by_attribute,
     int_or_none,
+    join_nonempty,
     lowercase_escape,
     str_or_none,
     str_to_int,
     traverse_obj,
     url_or_none,
-    urlencode_postdata,
 )
 
 _ENCODING_CHARS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_'
 
 
-def _pk_to_id(id):
+def _pk_to_id(media_id):
     """Source: https://stackoverflow.com/questions/24437823/getting-instagram-post-url-from-media-id"""
-    return encode_base_n(int(id.split('_')[0]), table=_ENCODING_CHARS)
+    pk = int(str(media_id).split('_')[0])
+    return encode_base_n(pk, table=_ENCODING_CHARS)
 
 
 def _id_to_pk(shortcode):
-    """Covert a shortcode to a numeric value"""
-    return decode_base_n(shortcode[:11], table=_ENCODING_CHARS)
+    """Convert a shortcode to a numeric value"""
+    if len(shortcode) > 28:
+        shortcode = shortcode[:-28]
+    return decode_base_n(shortcode, table=_ENCODING_CHARS)
 
 
 class InstagramBaseIE(InfoExtractor):
-    _NETRC_MACHINE = 'instagram'
-    _IS_LOGGED_IN = False
-
     _API_BASE_URL = 'https://i.instagram.com/api/v1'
     _LOGIN_URL = 'https://www.instagram.com/accounts/login'
-    _API_HEADERS = {
-        'X-IG-App-ID': '936619743392459',
-        'X-ASBD-ID': '198387',
-        'X-IG-WWW-Claim': '0',
-        'Origin': 'https://www.instagram.com',
-        'Accept': '*/*',
-        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36',
-    }
 
-    def _perform_login(self, username, password):
-        if self._IS_LOGGED_IN:
-            return
-
-        login_webpage = self._download_webpage(
-            self._LOGIN_URL, None, note='Downloading login webpage', errnote='Failed to download login webpage')
-
-        shared_data = self._parse_json(self._search_regex(
-            r'window\._sharedData\s*=\s*({.+?});', login_webpage, 'shared data', default='{}'), None)
-
-        login = self._download_json(
-            f'{self._LOGIN_URL}/ajax/', None, note='Logging in', headers={
-                **self._API_HEADERS,
-                'X-Requested-With': 'XMLHttpRequest',
-                'X-CSRFToken': shared_data['config']['csrf_token'],
-                'X-Instagram-AJAX': shared_data['rollout_hash'],
-                'Referer': 'https://www.instagram.com/',
-            }, data=urlencode_postdata({
-                'enc_password': f'#PWD_INSTAGRAM_BROWSER:0:{int(time.time())}:{password}',
-                'username': username,
-                'queryParams': '{}',
-                'optIntoOneTap': 'false',
-                'stopDeletionNonce': '',
-                'trustedDeviceRecords': '{}',
-            }))
-
-        if not login.get('authenticated'):
-            if login.get('message'):
-                raise ExtractorError(f'Unable to login: {login["message"]}')
-            elif login.get('user'):
-                raise ExtractorError('Unable to login: Sorry, your password was incorrect. Please double-check your password.', expected=True)
-            elif login.get('user') is False:
-                raise ExtractorError('Unable to login: The username you entered doesn\'t belong to an account. Please check your username and try again.', expected=True)
-            raise ExtractorError('Unable to login')
-        InstagramBaseIE._IS_LOGGED_IN = True
+    @property
+    def _api_headers(self):
+        return {
+            'X-IG-App-ID': self._configuration_arg('app_id', ['936619743392459'], ie_key=InstagramIE)[0],
+            'X-ASBD-ID': '198387',
+            'X-IG-WWW-Claim': '0',
+            'Origin': 'https://www.instagram.com',
+            'Accept': '*/*',
+        }
 
     def _get_count(self, media, kind, *keys):
         return traverse_obj(
@@ -112,7 +79,7 @@ class InstagramBaseIE(InfoExtractor):
                     'height': self._get_dimension('height', node),
                     'http_headers': {
                         'Referer': 'https://www.instagram.com/',
-                    }
+                    },
                 }
             elif not video_id:
                 continue
@@ -147,25 +114,25 @@ class InstagramBaseIE(InfoExtractor):
             return {}
 
         formats = [{
-            'format_id': format.get('id'),
-            'url': format.get('url'),
-            'width': format.get('width'),
-            'height': format.get('height'),
+            'format_id': fmt.get('id'),
+            'url': fmt.get('url'),
+            'width': fmt.get('width'),
+            'height': fmt.get('height'),
             'vcodec': vcodec,
-        } for format in videos_list or []]
+        } for fmt in videos_list or []]
         if dash_manifest_raw:
             formats.extend(self._parse_mpd_formats(self._parse_xml(dash_manifest_raw, media_id), mpd_id='dash'))
 
         thumbnails = [{
             'url': thumbnail.get('url'),
             'width': thumbnail.get('width'),
-            'height': thumbnail.get('height')
+            'height': thumbnail.get('height'),
         } for thumbnail in traverse_obj(product_media, ('image_versions2', 'candidates')) or []]
         return {
             'id': media_id,
             'duration': float_or_none(product_media.get('video_duration')),
             'formats': formats,
-            'thumbnails': thumbnails
+            'thumbnails': thumbnails,
         }
 
     def _extract_product(self, product_info):
@@ -187,7 +154,7 @@ class InstagramBaseIE(InfoExtractor):
             '__post_extractor': self.extract_comments(_pk_to_id(product_info.get('pk'))),
             'http_headers': {
                 'Referer': 'https://www.instagram.com/',
-            }
+            },
         }
         carousel_media = product_info.get('carousel_media')
         if carousel_media:
@@ -203,13 +170,13 @@ class InstagramBaseIE(InfoExtractor):
 
         return {
             **info_dict,
-            **self._extract_product_media(product_info)
+            **self._extract_product_media(product_info),
         }
 
     def _get_comments(self, video_id):
         comments_info = self._download_json(
             f'{self._API_BASE_URL}/media/{_id_to_pk(video_id)}/comments/?can_support_threading=true&permalink_enabled=false', video_id,
-            fatal=False, errnote='Comments extraction failed', note='Downloading comments info', headers=self._API_HEADERS) or {}
+            fatal=False, errnote='Comments extraction failed', note='Downloading comments info', headers=self._api_headers) or {}
 
         comment_data = traverse_obj(comments_info, ('edge_media_to_parent_comment', 'edges'), 'comments')
         for comment_dict in comment_data or []:
@@ -245,7 +212,7 @@ class InstagramIOSIE(InfoExtractor):
             'comment_count': int,
             'comments': list,
         },
-        'add_ie': ['Instagram']
+        'add_ie': ['Instagram'],
     }]
 
     def _real_extract(self, url):
@@ -254,7 +221,7 @@ class InstagramIOSIE(InfoExtractor):
 
 
 class InstagramIE(InstagramBaseIE):
-    _VALID_URL = r'(?P<url>https?://(?:www\.)?instagram\.com(?:/[^/]+)?/(?:p|tv|reel)/(?P<id>[^/?#&]+))'
+    _VALID_URL = r'(?P<url>https?://(?:www\.)?instagram\.com(?:/(?!share/)[^/?#]+)?/(?:p|tv|reels?(?!/audio/))/(?P<id>[^/?#&]+))'
     _EMBED_REGEX = [r'<iframe[^>]+src=(["\'])(?P<url>(?:https?:)?//(?:www\.)?instagram\.com/p/[^/]+/embed.*?)\1']
     _TESTS = [{
         'url': 'https://instagram.com/p/aye83DjauH/?foo=bar#abc',
@@ -378,6 +345,9 @@ class InstagramIE(InstagramBaseIE):
     }, {
         'url': 'https://www.instagram.com/marvelskies.fc/reel/CWqAgUZgCku/',
         'only_matching': True,
+    }, {
+        'url': 'https://www.instagram.com/reels/Cop84x6u7CP/',
+        'only_matching': True,
     }]
 
     @classmethod
@@ -399,14 +369,14 @@ class InstagramIE(InstagramBaseIE):
             info = traverse_obj(self._download_json(
                 f'{self._API_BASE_URL}/media/{_id_to_pk(video_id)}/info/', video_id,
                 fatal=False, errnote='Video info extraction failed',
-                note='Downloading video info', headers=self._API_HEADERS), ('items', 0))
+                note='Downloading video info', headers=self._api_headers), ('items', 0))
             if info:
                 media.update(info)
                 return self._extract_product(media)
 
         api_check = self._download_json(
             f'{self._API_BASE_URL}/web/get_ruling_for_content/?content_type=MEDIA&target_id={_id_to_pk(video_id)}',
-            video_id, headers=self._API_HEADERS, fatal=False, note='Setting up session', errnote=False) or {}
+            video_id, headers=self._api_headers, fatal=False, note='Setting up session', errnote=False) or {}
         csrf_token = self._get_cookies('https://www.instagram.com').get('csrftoken')
 
         if not csrf_token:
@@ -426,15 +396,14 @@ class InstagramIE(InstagramBaseIE):
         general_info = self._download_json(
             'https://www.instagram.com/graphql/query/', video_id, fatal=False, errnote=False,
             headers={
-                **self._API_HEADERS,
+                **self._api_headers,
                 'X-CSRFToken': csrf_token or '',
                 'X-Requested-With': 'XMLHttpRequest',
                 'Referer': url,
             }, query={
-                'query_hash': '9f8827793ef34641b2fb195d4d41151c',
+                'doc_id': '8845758582119845',
                 'variables': json.dumps(variables, separators=(',', ':')),
             })
-        media.update(traverse_obj(general_info, ('data', 'shortcode_media')) or {})
 
         if not general_info:
             self.report_warning('General metadata extraction failed (some metadata might be missing).', video_id)
@@ -449,7 +418,7 @@ class InstagramIE(InstagramBaseIE):
             else:
                 self.report_warning('Main webpage is locked behind the login page. Retrying with embed webpage (some metadata might be missing).')
                 webpage = self._download_webpage(
-                    f'{url}/embed/', video_id, note='Downloading embed webpage', fatal=False)
+                    f'{url}/embed/', video_id, note='Downloading embed webpage', fatal=False) or ''
                 additional_data = self._search_json(
                     r'window\.__additionalDataLoaded\s*\(\s*[^,]+,', webpage, 'additional data', video_id, fatal=False)
                 if not additional_data and not media:
@@ -463,6 +432,26 @@ class InstagramIE(InstagramBaseIE):
                 media.update(traverse_obj(
                     additional_data, ('graphql', 'shortcode_media'), 'shortcode_media', expected_type=dict) or {})
 
+        else:
+            xdt_shortcode_media = traverse_obj(general_info, ('data', 'xdt_shortcode_media', {dict})) or {}
+            if not xdt_shortcode_media:
+                error = join_nonempty('title', 'description', delim=': ', from_dict=api_check)
+                if 'Restricted Video' in error:
+                    self.raise_login_required(error)
+                elif error:
+                    raise ExtractorError(error, expected=True)
+                elif len(video_id) > 28:
+                    # It's a private post (video_id == shortcode + 28 extra characters)
+                    # Only raise after getting empty response; sometimes "long"-shortcode posts are public
+                    self.raise_login_required(
+                        'This content is only available for registered users who follow this account')
+                raise ExtractorError(
+                    'Instagram sent an empty media response. Check if this post is accessible in your '
+                    f'browser without being logged-in. If it is not, then u{self._login_hint()[1:]}. '
+                    'Otherwise, if the post is accessible in browser without being logged-in'
+                    f'{bug_reports_message(before=",")}', expected=True)
+            media.update(xdt_shortcode_media)
+
         username = traverse_obj(media, ('owner', 'username')) or self._search_regex(
             r'"owner"\s*:\s*{\s*"username"\s*:\s*"(.+?)"', webpage, 'username', fatal=False)
 
@@ -482,8 +471,7 @@ class InstagramIE(InstagramBaseIE):
                 return self.playlist_result(
                     self._extract_nodes(nodes, True), video_id,
                     format_field(username, None, 'Post by %s'), description)
-
-            video_url = self._og_search_video_url(webpage, secure=False)
+            raise ExtractorError('There is no video in this post', expected=True)
 
         formats = [{
             'url': video_url,
@@ -516,7 +504,7 @@ class InstagramIE(InstagramBaseIE):
         return {
             'id': video_id,
             'formats': formats,
-            'title': media.get('title') or 'Video by %s' % username,
+            'title': media.get('title') or f'Video by {username}',
             'description': description,
             'duration': float_or_none(media.get('video_duration')),
             'timestamp': traverse_obj(media, 'taken_at_timestamp', 'date', expected_type=int_or_none),
@@ -530,7 +518,7 @@ class InstagramIE(InstagramBaseIE):
             'thumbnails': thumbnails,
             'http_headers': {
                 'Referer': 'https://www.instagram.com/',
-            }
+            },
         }
 
 
@@ -563,10 +551,10 @@ class InstagramPlaylistBaseIE(InstagramBaseIE):
                 gis_tmpls = [self._gis_tmpl]
             else:
                 gis_tmpls = [
-                    '%s' % rhx_gis,
+                    f'{rhx_gis}',
                     '',
-                    '%s:%s' % (rhx_gis, csrf_token),
-                    '%s:%s:%s' % (rhx_gis, csrf_token, self.get_param('http_headers')['User-Agent']),
+                    f'{rhx_gis}:{csrf_token}',
+                    '{}:{}:{}'.format(rhx_gis, csrf_token, self.get_param('http_headers')['User-Agent']),
                 ]
 
             # try all of the ways to generate a GIS query, and not only use the
@@ -575,10 +563,10 @@ class InstagramPlaylistBaseIE(InstagramBaseIE):
                 try:
                     json_data = self._download_json(
                         'https://www.instagram.com/graphql/query/', uploader_id,
-                        'Downloading JSON page %d' % page_num, headers={
+                        f'Downloading JSON page {page_num}', headers={
                             'X-Requested-With': 'XMLHttpRequest',
                             'X-Instagram-GIS': hashlib.md5(
-                                ('%s:%s' % (gis_tmpl, variables)).encode('utf-8')).hexdigest(),
+                                (f'{gis_tmpl}:{variables}').encode()).hexdigest(),
                         }, query={
                             'query_hash': self._QUERY_HASH,
                             'variables': variables,
@@ -616,6 +604,7 @@ class InstagramPlaylistBaseIE(InstagramBaseIE):
 
 
 class InstagramUserIE(InstagramPlaylistBaseIE):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?instagram\.com/(?P<id>[^/]{2,})/?(?:$|[?#])'
     IE_DESC = 'Instagram user profile'
     IE_NAME = 'instagram:user'
@@ -630,10 +619,10 @@ class InstagramUserIE(InstagramPlaylistBaseIE):
             'extract_flat': True,
             'skip_download': True,
             'playlistend': 5,
-        }
+        },
     }]
 
-    _QUERY_HASH = '42323d64886122307be10013ad2dcc44',
+    _QUERY_HASH = ('42323d64886122307be10013ad2dcc44',)
 
     @staticmethod
     def _parse_timeline_from(data):
@@ -645,7 +634,7 @@ class InstagramUserIE(InstagramPlaylistBaseIE):
         # returns a dictionary of variables to add to the timeline query based
         # on the GraphQL of the original page
         return {
-            'id': data['entry_data']['ProfilePage'][0]['graphql']['user']['id']
+            'id': data['entry_data']['ProfilePage'][0]['graphql']['user']['id'],
         }
 
 
@@ -664,10 +653,10 @@ class InstagramTagIE(InstagramPlaylistBaseIE):
             'extract_flat': True,
             'skip_download': True,
             'playlistend': 50,
-        }
+        },
     }]
 
-    _QUERY_HASH = 'f92f56d47dc7a55b606908374b43a314',
+    _QUERY_HASH = ('f92f56d47dc7a55b606908374b43a314',)
 
     @staticmethod
     def _parse_timeline_from(data):
@@ -680,12 +669,12 @@ class InstagramTagIE(InstagramPlaylistBaseIE):
         # on the GraphQL of the original page
         return {
             'tag_name':
-                data['entry_data']['TagPage'][0]['graphql']['hashtag']['name']
+                data['entry_data']['TagPage'][0]['graphql']['hashtag']['name'],
         }
 
 
 class InstagramStoryIE(InstagramBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?instagram\.com/stories/(?P<user>[^/]+)/(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:www\.)?instagram\.com/stories/(?P<user>[^/?#]+)(?:/(?P<id>\d+))?'
     IE_NAME = 'instagram:story'
 
     _TESTS = [{
@@ -694,37 +683,57 @@ class InstagramStoryIE(InstagramBaseIE):
             'id': '18090946048123978',
             'title': 'Rare',
         },
-        'playlist_mincount': 50
+        'playlist_mincount': 50,
+    }, {
+        'url': 'https://www.instagram.com/stories/fruits_zipper/3570766765028588805/',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.instagram.com/stories/fruits_zipper',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
-        username, story_id = self._match_valid_url(url).groups()
-        story_info = self._download_webpage(url, story_id)
-        user_info = self._search_json(r'"user":', story_info, 'user info', story_id, fatal=False)
+        username, story_id = self._match_valid_url(url).group('user', 'id')
+        if username == 'highlights' and not story_id:  # story id is only mandatory for highlights
+            raise ExtractorError('Input URL is missing a highlight ID', expected=True)
+        display_id = story_id or username
+        story_info = self._download_webpage(url, display_id)
+        user_info = self._search_json(r'"user":', story_info, 'user info', display_id, fatal=False)
         if not user_info:
             self.raise_login_required('This content is unreachable')
-        user_id = user_info.get('id')
 
-        story_info_url = user_id if username != 'highlights' else f'highlight:{story_id}'
+        user_id = traverse_obj(user_info, 'pk', 'id', expected_type=str)
+        if username == 'highlights':
+            story_info_url = f'highlight:{story_id}'
+        else:
+            if not user_id:  # user id is only mandatory for non-highlights
+                raise ExtractorError('Unable to extract user id')
+            story_info_url = user_id
+
         videos = traverse_obj(self._download_json(
             f'{self._API_BASE_URL}/feed/reels_media/?reel_ids={story_info_url}',
-            story_id, errnote=False, fatal=False, headers=self._API_HEADERS), 'reels')
+            display_id, errnote=False, fatal=False, headers=self._api_headers), 'reels')
         if not videos:
             self.raise_login_required('You need to log in to access this content')
+        user_info = traverse_obj(videos, (user_id, 'user', {dict})) or {}
 
-        full_name = traverse_obj(videos, (f'highlight:{story_id}', 'user', 'full_name'), (str(user_id), 'user', 'full_name'))
+        full_name = traverse_obj(videos, (f'highlight:{story_id}', 'user', 'full_name'), (user_id, 'user', 'full_name'))
         story_title = traverse_obj(videos, (f'highlight:{story_id}', 'title'))
         if not story_title:
             story_title = f'Story by {username}'
 
-        highlights = traverse_obj(videos, (f'highlight:{story_id}', 'items'), (str(user_id), 'items'))
+        highlights = traverse_obj(videos, (f'highlight:{story_id}', 'items'), (user_id, 'items'))
         info_data = []
         for highlight in highlights:
+            highlight.setdefault('user', {}).update(user_info)
             highlight_data = self._extract_product(highlight)
             if highlight_data.get('formats'):
                 info_data.append({
-                    **highlight_data,
                     'uploader': full_name,
                     'uploader_id': user_id,
+                    **filter_dict(highlight_data),
                 })
+        if username != 'highlights' and story_id and not self._yes_playlist(username, story_id):
+            return traverse_obj(info_data, (lambda _, v: v['id'] == _pk_to_id(story_id), any))
+
         return self.playlist_result(info_data, playlist_id=story_id, playlist_title=story_title)
diff --git a/plugins/youtube_download/yt_dlp/extractor/internazionale.py b/plugins/youtube_download/yt_dlp/extractor/internazionale.py
index 1b1cb57..3c3ad7e 100644
--- a/plugins/youtube_download/yt_dlp/extractor/internazionale.py
+++ b/plugins/youtube_download/yt_dlp/extractor/internazionale.py
@@ -52,8 +52,8 @@ class InternazionaleIE(InfoExtractor):
             'video available aboard', default='1', group='value')
         video_available_abroad = video_available_abroad == '1'
 
-        video_base = 'https://video%s.internazionale.it/%s/%s.' % \
-            ('' if video_available_abroad else '-ita', video_path, video_id)
+        video_base = 'https://video{}.internazionale.it/{}/{}.'.format(
+            '' if video_available_abroad else '-ita', video_path, video_id)
 
         formats = self._extract_m3u8_formats(
             video_base + 'm3u8', display_id, 'mp4',
diff --git a/plugins/youtube_download/yt_dlp/extractor/iprima.py b/plugins/youtube_download/yt_dlp/extractor/iprima.py
index 6dec151..9b91a45 100644
--- a/plugins/youtube_download/yt_dlp/extractor/iprima.py
+++ b/plugins/youtube_download/yt_dlp/extractor/iprima.py
@@ -3,12 +3,12 @@ import time
 
 from .common import InfoExtractor
 from ..utils import (
+    ExtractorError,
     determine_ext,
     js_to_json,
-    urlencode_postdata,
-    ExtractorError,
     parse_qs,
-    traverse_obj
+    traverse_obj,
+    urlencode_postdata,
 )
 
 
@@ -25,9 +25,29 @@ class IPrimaIE(InfoExtractor):
             'id': 'p51388',
             'ext': 'mp4',
             'title': 'Partička (92)',
-            'description': 'md5:859d53beae4609e6dd7796413f1b6cac',
-            'upload_date': '20201103',
-            'timestamp': 1604437480,
+            'description': 'md5:57943f6a50d6188288c3a579d2fd5f01',
+            'episode': 'Partička (92)',
+            'season': 'Partička',
+            'series': 'Prima Partička',
+            'episode_number': 92,
+            'thumbnail': 'https://d31b9s05ygj54s.cloudfront.net/prima-plus/image/video-ef6cf9de-c980-4443-92e4-17fe8bccd45c-16x9.jpeg',
+        },
+        'params': {
+            'skip_download': True,  # m3u8 download
+        },
+    }, {
+        'url': 'https://zoom.iprima.cz/porady/krasy-kanarskych-ostrovu/tenerife-v-risi-ohne',
+        'info_dict': {
+            'id': 'p1412199',
+            'ext': 'mp4',
+            'episode_number': 3,
+            'episode': 'Tenerife: V říši ohně',
+            'description': 'md5:4b4a05c574b5eaef130e68d4811c3f2c',
+            'duration': 3111.0,
+            'thumbnail': 'https://d31b9s05ygj54s.cloudfront.net/prima-plus/image/video-f66dd7fb-c1a0-47d1-b3bc-7db328d566c5-16x9-1711636518.jpg/t_16x9_medium_1366_768',
+            'title': 'Tenerife: V říši ohně',
+            'timestamp': 1711825800,
+            'upload_date': '20240330',
         },
         'params': {
             'skip_download': True,  # m3u8 download
@@ -131,13 +151,21 @@ class IPrimaIE(InfoExtractor):
         video_id = self._search_regex((
             r'productId\s*=\s*([\'"])(?P<id>p\d+)\1',
             r'pproduct_id\s*=\s*([\'"])(?P<id>p\d+)\1',
+            r'let\s+videos\s*=\s*([\'"])(?P<id>p\d+)\1',
         ), webpage, 'real id', group='id', default=None)
 
         if not video_id:
-            nuxt_data = self._search_nuxt_data(webpage, video_id, traverse='data')
+            nuxt_data = self._search_nuxt_data(webpage, video_id, traverse='data', fatal=False)
             video_id = traverse_obj(
                 nuxt_data, (..., 'content', 'additionals', 'videoPlayId', {str}), get_all=False)
 
+        if not video_id:
+            nuxt_data = self._search_json(
+                r'<script[^>]+\bid=["\']__NUXT_DATA__["\'][^>]*>',
+                webpage, 'nuxt data', None, end_pattern=r'</script>', contains_pattern=r'\[(?s:.+)\]')
+
+            video_id = traverse_obj(nuxt_data, lambda _, v: re.fullmatch(r'p\d+', v), get_all=False)
+
         if not video_id:
             self.raise_no_formats('Unable to extract video ID from webpage')
 
@@ -169,7 +197,7 @@ class IPrimaIE(InfoExtractor):
         final_result = self._search_json_ld(webpage, video_id, default={})
         final_result.update({
             'id': video_id,
-            'title': title,
+            'title': final_result.get('title') or title,
             'thumbnail': self._html_search_meta(
                 ['thumbnail', 'og:image', 'twitter:image'],
                 webpage, 'thumbnail', default=None),
@@ -193,8 +221,8 @@ class IPrimaCNNIE(InfoExtractor):
             'title': 'md5:277c6b1ed0577e51b40ddd35602ff43e',
         },
         'params': {
-            'skip_download': 'm3u8'
-        }
+            'skip_download': 'm3u8',
+        },
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/iqiyi.py b/plugins/youtube_download/yt_dlp/extractor/iqiyi.py
index fa602ba..735b446 100644
--- a/plugins/youtube_download/yt_dlp/extractor/iqiyi.py
+++ b/plugins/youtube_download/yt_dlp/extractor/iqiyi.py
@@ -2,22 +2,18 @@ import hashlib
 import itertools
 import re
 import time
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_str,
-    compat_urllib_parse_urlencode,
-    compat_urllib_parse_unquote
-)
 from .openload import PhantomJSwrapper
 from ..utils import (
+    ExtractorError,
     clean_html,
     decode_packed_codes,
-    ExtractorError,
     float_or_none,
     format_field,
-    get_element_by_id,
     get_element_by_attribute,
+    get_element_by_id,
     int_or_none,
     js_to_json,
     ohdave_rsa_encrypt,
@@ -34,7 +30,7 @@ from ..utils import (
 
 
 def md5_text(text):
-    return hashlib.md5(text.encode('utf-8')).hexdigest()
+    return hashlib.md5(text.encode()).hexdigest()
 
 
 class IqiyiSDK:
@@ -45,17 +41,17 @@ class IqiyiSDK:
 
     @staticmethod
     def split_sum(data):
-        return compat_str(sum(map(lambda p: int(p, 16), list(data))))
+        return str(sum(int(p, 16) for p in data))
 
     @staticmethod
     def digit_sum(num):
         if isinstance(num, int):
-            num = compat_str(num)
-        return compat_str(sum(map(int, num)))
+            num = str(num)
+        return str(sum(map(int, num)))
 
     def even_odd(self):
-        even = self.digit_sum(compat_str(self.timestamp)[::2])
-        odd = self.digit_sum(compat_str(self.timestamp)[1::2])
+        even = self.digit_sum(str(self.timestamp)[::2])
+        odd = self.digit_sum(str(self.timestamp)[1::2])
         return even, odd
 
     def preprocess(self, chunksize):
@@ -69,7 +65,7 @@ class IqiyiSDK:
 
     def mod(self, modulus):
         chunks, ip = self.preprocess(32)
-        self.target = chunks[0] + ''.join(map(lambda p: compat_str(p % modulus), ip))
+        self.target = chunks[0] + ''.join(str(p % modulus) for p in ip)
 
     def split(self, chunksize):
         modulus_map = {
@@ -81,7 +77,7 @@ class IqiyiSDK:
         chunks, ip = self.preprocess(chunksize)
         ret = ''
         for i in range(len(chunks)):
-            ip_part = compat_str(ip[i] % modulus_map[chunksize]) if i < 4 else ''
+            ip_part = str(ip[i] % modulus_map[chunksize]) if i < 4 else ''
             if chunksize == 8:
                 ret += ip_part + chunks[i]
             else:
@@ -108,11 +104,11 @@ class IqiyiSDK:
         self.target = md5_text(self.target)
         d = time.localtime(self.timestamp)
         strings = {
-            'y': compat_str(d.tm_year),
+            'y': str(d.tm_year),
             'm': '%02d' % d.tm_mon,
             'd': '%02d' % d.tm_mday,
         }
-        self.target += ''.join(map(lambda c: strings[c], list(scheme)))
+        self.target += ''.join(strings[c] for c in scheme)
 
     def split_time_even_odd(self):
         even, odd = self.even_odd()
@@ -124,11 +120,11 @@ class IqiyiSDK:
 
     def split_ip_time_sum(self):
         chunks, ip = self.preprocess(32)
-        self.target = compat_str(sum(ip)) + chunks[0] + self.digit_sum(self.timestamp)
+        self.target = str(sum(ip)) + chunks[0] + self.digit_sum(self.timestamp)
 
     def split_time_ip_sum(self):
         chunks, ip = self.preprocess(32)
-        self.target = self.digit_sum(self.timestamp) + chunks[0] + compat_str(sum(ip))
+        self.target = self.digit_sum(self.timestamp) + chunks[0] + str(sum(ip))
 
 
 class IqiyiSDKInterpreter:
@@ -161,7 +157,7 @@ class IqiyiSDKInterpreter:
             elif function in other_functions:
                 other_functions[function]()
             else:
-                raise ExtractorError('Unknown function %s' % function)
+                raise ExtractorError(f'Unknown function {function}')
 
         return sdk.target
 
@@ -181,7 +177,7 @@ class IqiyiIE(InfoExtractor):
             'id': '9c1fb1b99d192b21c559e5a1a2cb3c73',
             'ext': 'mp4',
             'title': '美国德州空中惊现奇异云团 酷似UFO',
-        }
+        },
     }, {
         'url': 'http://www.iqiyi.com/v_19rrhnnclk.html',
         'md5': 'b7dc800a4004b1b57749d9abae0472da',
@@ -253,8 +249,9 @@ class IqiyiIE(InfoExtractor):
             note='Get token for logging', errnote='Unable to get token for logging')
         sdk = data['sdk']
         timestamp = int(time.time())
-        target = '/apis/reglogin/login.action?lang=zh_TW&area_code=null&email=%s&passwd=%s&agenttype=1&from=undefined&keeplogin=0&piccode=&fromurl=&_pos=1' % (
-            username, self._rsa_fun(password.encode('utf-8')))
+        target = (
+            f'/apis/reglogin/login.action?lang=zh_TW&area_code=null&email={username}'
+            f'&passwd={self._rsa_fun(password.encode())}&agenttype=1&from=undefined&keeplogin=0&piccode=&fromurl=&_pos=1')
 
         interp = IqiyiSDKInterpreter(sdk)
         sign = interp.run(target, data['ip'], timestamp)
@@ -268,7 +265,7 @@ class IqiyiIE(InfoExtractor):
             'bird_t': timestamp,
         }
         validation_result = self._download_json(
-            'http://kylin.iqiyi.com/validate?' + compat_urllib_parse_urlencode(validation_params), None,
+            'http://kylin.iqiyi.com/validate?' + urllib.parse.urlencode(validation_params), None,
             note='Validate credentials', errnote='Unable to validate credentials')
 
         MSG_MAP = {
@@ -280,7 +277,7 @@ class IqiyiIE(InfoExtractor):
         if code != 'A00000':
             msg = MSG_MAP.get(code)
             if not msg:
-                msg = 'error %s' % code
+                msg = f'error {code}'
                 if validation_result.get('msg'):
                     msg += ': ' + validation_result['msg']
             self.report_warning('unable to log in: ' + msg)
@@ -292,7 +289,7 @@ class IqiyiIE(InfoExtractor):
         tm = int(time.time() * 1000)
 
         key = 'd5fb4bd9d50c4be6948c97edd7254b0e'
-        sc = md5_text(compat_str(tm) + key + tvid)
+        sc = md5_text(str(tm) + key + tvid)
         params = {
             'tvid': tvid,
             'vid': video_id,
@@ -302,7 +299,7 @@ class IqiyiIE(InfoExtractor):
         }
 
         return self._download_json(
-            'http://cache.m.iqiyi.com/jp/tmts/%s/%s/' % (tvid, video_id),
+            f'http://cache.m.iqiyi.com/jp/tmts/{tvid}/{video_id}/',
             video_id, transform_source=lambda s: remove_start(s, 'var tvInfoJs='),
             query=params, headers=self.geo_verification_headers())
 
@@ -325,10 +322,10 @@ class IqiyiIE(InfoExtractor):
         # Start from 2 because links in the first page are already on webpage
         for page_num in itertools.count(2):
             pagelist_page = self._download_webpage(
-                'http://cache.video.qiyi.com/jp/avlist/%s/%d/%d/' % (album_id, page_num, PAGE_SIZE),
+                f'http://cache.video.qiyi.com/jp/avlist/{album_id}/{page_num}/{PAGE_SIZE}/',
                 album_id,
-                note='Download playlist page %d' % page_num,
-                errnote='Failed to download playlist page %d' % page_num)
+                note=f'Download playlist page {page_num}',
+                errnote=f'Failed to download playlist page {page_num}')
             pagelist = self._parse_json(
                 remove_start(pagelist_page, 'var tvInfoJs='), album_id)
             vlist = pagelist['data']['vlist']
@@ -371,7 +368,7 @@ class IqiyiIE(InfoExtractor):
             for stream in data['vidl']:
                 if 'm3utx' not in stream:
                     continue
-                vd = compat_str(stream['vd'])
+                vd = str(stream['vd'])
                 formats.append({
                     'url': stream['m3utx'],
                     'format_id': vd,
@@ -420,11 +417,11 @@ class IqIE(InfoExtractor):
         'params': {
             'format': '500',
         },
-        'expected_warnings': ['format is restricted']
+        'expected_warnings': ['format is restricted'],
     }, {
         # VIP-restricted video
         'url': 'https://www.iq.com/play/mermaid-in-the-fog-2021-gbdpx13bs4',
-        'only_matching': True
+        'only_matching': True,
     }]
     _BID_TAGS = {
         '100': '240P',
@@ -499,9 +496,10 @@ class IqIE(InfoExtractor):
                     'tm': tm,
                     'qdy': 'a',
                     'qds': 0,
-                    'k_ft1': 141287244169348,
-                    'k_ft4': 34359746564,
-                    'k_ft5': 1,
+                    'k_ft1': '143486267424900',
+                    'k_ft4': '1572868',
+                    'k_ft7': '4',
+                    'k_ft5': '1',
                     'bop': JSON.stringify({
                         'version': '10.0',
                         'dfp': dfp
@@ -529,14 +527,22 @@ class IqIE(InfoExtractor):
         webpack_js_url = self._proto_relative_url(self._search_regex(
             r'<script src="((?:https?:)?//stc\.iqiyipic\.com/_next/static/chunks/webpack-\w+\.js)"', webpage, 'webpack URL'))
         webpack_js = self._download_webpage(webpack_js_url, video_id, note='Downloading webpack JS', errnote='Unable to download webpack JS')
+
         webpack_map = self._search_json(
             r'["\']\s*\+\s*', webpack_js, 'JS locations', video_id,
             contains_pattern=r'{\s*(?:\d+\s*:\s*["\'][\da-f]+["\']\s*,?\s*)+}',
             end_pattern=r'\[\w+\]\+["\']\.js', transform_source=js_to_json)
 
+        replacement_map = self._search_json(
+            r'["\']\s*\+\(\s*', webpack_js, 'replacement map', video_id,
+            contains_pattern=r'{\s*(?:\d+\s*:\s*["\'][\w.-]+["\']\s*,?\s*)+}',
+            end_pattern=r'\[\w+\]\|\|\w+\)\+["\']\.', transform_source=js_to_json,
+            fatal=False) or {}
+
         for module_index in reversed(webpack_map):
+            real_module = replacement_map.get(module_index) or module_index
             module_js = self._download_webpage(
-                f'https://stc.iqiyipic.com/_next/static/chunks/{module_index}.{webpack_map[module_index]}.js',
+                f'https://stc.iqiyipic.com/_next/static/chunks/{real_module}.{webpack_map[module_index]}.js',
                 video_id, note=f'Downloading #{module_index} module JS', errnote='Unable to download module JS', fatal=False) or ''
             if 'vms request' in module_js:
                 self.cache.store('iq', 'player_js', module_js)
@@ -557,7 +563,7 @@ class IqIE(InfoExtractor):
             return
         self._BID_TAGS = {
             bid: traverse_obj(extracted_bid_tags, (bid, 'value'), expected_type=str, default=self._BID_TAGS.get(bid))
-            for bid in extracted_bid_tags.keys()
+            for bid in extracted_bid_tags
         }
 
     def _get_cookie(self, name, default=None):
@@ -575,7 +581,7 @@ class IqIE(InfoExtractor):
 
         uid = traverse_obj(
             self._parse_json(
-                self._get_cookie('I00002', '{}'), video_id, transform_source=compat_urllib_parse_unquote, fatal=False),
+                self._get_cookie('I00002', '{}'), video_id, transform_source=urllib.parse.unquote, fatal=False),
             ('data', 'uid'), default=0)
 
         if uid:
@@ -585,7 +591,7 @@ class IqIE(InfoExtractor):
                     'platformId': 3,
                     'modeCode': self._get_cookie('mod', 'intl'),
                     'langCode': self._get_cookie('lang', 'en_us'),
-                    'deviceId': self._get_cookie('QC005', '')
+                    'deviceId': self._get_cookie('QC005', ''),
                 }, fatal=False)
             ut_list = traverse_obj(vip_data, ('data', 'all_vip', ..., 'vipType'), expected_type=str_or_none)
         else:
@@ -616,7 +622,7 @@ class IqIE(InfoExtractor):
         preview_time = traverse_obj(
             initial_format_data, ('boss_ts', (None, 'data'), ('previewTime', 'rtime')), expected_type=float_or_none, get_all=False)
         if traverse_obj(initial_format_data, ('boss_ts', 'data', 'prv'), expected_type=int_or_none):
-            self.report_warning('This preview video is limited%s' % format_field(preview_time, None, ' to %s seconds'))
+            self.report_warning('This preview video is limited{}'.format(format_field(preview_time, None, ' to %s seconds')))
 
         # TODO: Extract audio-only formats
         for bid in set(traverse_obj(initial_format_data, ('program', 'video', ..., 'bid'), expected_type=str_or_none)):
@@ -667,7 +673,7 @@ class IqIE(InfoExtractor):
                 f.update({
                     'quality': qualities(list(self._BID_TAGS.keys()))(bid),
                     'format_note': self._BID_TAGS[bid],
-                    **parse_resolution(video_format.get('scrsz'))
+                    **parse_resolution(video_format.get('scrsz')),
                 })
             formats.extend(extracted_formats)
 
@@ -675,7 +681,7 @@ class IqIE(InfoExtractor):
             lang = self._LID_TAGS.get(str_or_none(sub_format.get('lid')), sub_format.get('_name'))
             subtitles.setdefault(lang, []).extend([{
                 'ext': format_ext,
-                'url': urljoin(initial_format_data.get('dstl', 'http://meta.video.iqiyi.com'), sub_format[format_key])
+                'url': urljoin(initial_format_data.get('dstl', 'http://meta.video.iqiyi.com'), sub_format[format_key]),
             } for format_key, format_ext in [('srt', 'srt'), ('webvtt', 'vtt')] if sub_format.get(format_key)])
 
         extra_metadata = page_data.get('albumInfo') if video_info.get('albumId') and page_data.get('albumInfo') else video_info
@@ -704,9 +710,9 @@ class IqAlbumIE(InfoExtractor):
         'info_dict': {
             'id': '1bk9icvr331',
             'title': 'One Piece',
-            'description': 'Subtitle available on Sunday 4PM（GMT+8）.'
+            'description': 'Subtitle available on Sunday 4PM（GMT+8）.',
         },
-        'playlist_mincount': 238
+        'playlist_mincount': 238,
     }, {
         # Movie/single video
         'url': 'https://www.iq.com/album/九龙城寨-2021-22yjnij099k',
@@ -723,7 +729,7 @@ class IqAlbumIE(InfoExtractor):
             'age_limit': 13,
             'average_rating': float,
         },
-        'expected_warnings': ['format is restricted']
+        'expected_warnings': ['format is restricted'],
     }]
 
     def _entries(self, album_id_num, page_ranges, album_id=None, mode_code='intl', lang_code='en_us'):
@@ -736,7 +742,7 @@ class IqAlbumIE(InfoExtractor):
                     'modeCode': mode_code,
                     'langCode': lang_code,
                     'endOrder': page_range['to'],
-                    'startOrder': page_range['from']
+                    'startOrder': page_range['from'],
                 })
             for video in page['data']['epg']:
                 yield self.url_result('https://www.iq.com/play/%s' % (video.get('playLocSuffix') or video['qipuIdStr']),
@@ -749,7 +755,7 @@ class IqAlbumIE(InfoExtractor):
         album_data = next_data['props']['initialState']['album']['videoAlbumInfo']
 
         if album_data.get('videoType') == 'singleVideo':
-            return self.url_result('https://www.iq.com/play/%s' % album_id, IqIE.ie_key())
+            return self.url_result(f'https://www.iq.com/play/{album_id}', IqIE.ie_key())
         return self.playlist_result(
             self._entries(album_data['albumId'], album_data['totalPageRange'], album_id,
                           traverse_obj(next_data, ('props', 'initialProps', 'pageProps', 'modeCode')),
diff --git a/plugins/youtube_download/yt_dlp/extractor/islamchannel.py b/plugins/youtube_download/yt_dlp/extractor/islamchannel.py
index 253a846..f70c3ad 100644
--- a/plugins/youtube_download/yt_dlp/extractor/islamchannel.py
+++ b/plugins/youtube_download/yt_dlp/extractor/islamchannel.py
@@ -14,7 +14,7 @@ class IslamChannelIE(InfoExtractor):
             'description': 'md5:5cc7ddecef064ea7afe52eb5e0e33b55',
             'thumbnail': r're:https?://.+',
             'ext': 'mp4',
-        }
+        },
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/israelnationalnews.py b/plugins/youtube_download/yt_dlp/extractor/israelnationalnews.py
index 35040f5..76e54d9 100644
--- a/plugins/youtube_download/yt_dlp/extractor/israelnationalnews.py
+++ b/plugins/youtube_download/yt_dlp/extractor/israelnationalnews.py
@@ -7,7 +7,7 @@ class IsraelNationalNewsIE(InfoExtractor):
     _TESTS = [{
         'url': 'https://www.israelnationalnews.com/news/354520',
         'info_dict': {
-            'id': '354520'
+            'id': '354520',
         },
         'playlist': [{
             'info_dict': {
@@ -34,8 +34,8 @@ class IsraelNationalNewsIE(InfoExtractor):
                 'channel_url': 'https://www.youtube.com/channel/UCJdKr0Bgd_5saZYqLCa9mng',
                 'upload_date': '20220606',
                 'uploader': 'The Rubin Report',
-            }
-        }]
+            },
+        }],
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/itprotv.py b/plugins/youtube_download/yt_dlp/extractor/itprotv.py
index 4ac1260..71001c4 100644
--- a/plugins/youtube_download/yt_dlp/extractor/itprotv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/itprotv.py
@@ -1,19 +1,18 @@
 import re
 
 from .common import InfoExtractor
-
 from ..utils import (
     int_or_none,
     str_or_none,
     traverse_obj,
-    urljoin
+    urljoin,
 )
 
 
 class ITProTVBaseIE(InfoExtractor):
     _ENDPOINTS = {
         'course': 'course?url={}&brand=00002560-0000-3fa9-0000-1d61000035f3',
-        'episode': 'brand/00002560-0000-3fa9-0000-1d61000035f3/episode?url={}'
+        'episode': 'brand/00002560-0000-3fa9-0000-1d61000035f3/episode?url={}',
     }
 
     def _call_api(self, ep, item_id, webpage):
@@ -31,7 +30,7 @@ class ITProTVBaseIE(InfoExtractor):
 
 
 class ITProTVIE(ITProTVBaseIE):
-    _VALID_URL = r'https://app.itpro.tv/course/(?P<course>[\w-]+)/(?P<id>[\w-]+)'
+    _VALID_URL = r'https?://app\.itpro\.tv/course/(?P<course>[\w-]+)/(?P<id>[\w-]+)'
     _TESTS = [{
         'url': 'https://app.itpro.tv/course/guided-tour/introductionitprotv',
         'md5': 'bca4a28c2667fd1a63052e71a94bb88c',
@@ -47,7 +46,7 @@ class ITProTVIE(ITProTVBaseIE):
             'availability': 'needs_auth',
             'chapter': 'ITProTV 101',
             'chapter_number': 1,
-            'chapter_id': '5dbb3de426b46c0010b5d1b6'
+            'chapter_id': '5dbb3de426b46c0010b5d1b6',
         },
     },
         {
@@ -65,7 +64,7 @@ class ITProTVIE(ITProTVBaseIE):
             'availability': 'needs_auth',
             'chapter': 'Job Development',
             'chapter_number': 2,
-            'chapter_id': '5f7c78d424330c000edf04d9'
+            'chapter_id': '5f7c78d424330c000edf04d9',
         },
     }]
 
@@ -96,13 +95,13 @@ class ITProTVIE(ITProTVBaseIE):
             'chapter_number': chapter_number,
             'chapter_id': str_or_none(chapter.get('id')),
             'subtitles': {
-                'en': [{'ext': 'vtt', 'data': episode['enCaptionData']}]
+                'en': [{'ext': 'vtt', 'data': episode['enCaptionData']}],
             } if episode.get('enCaptionData') else None,
         }
 
 
 class ITProTVCourseIE(ITProTVBaseIE):
-    _VALID_URL = r'https?://app.itpro.tv/course/(?P<id>[\w-]+)/?(?:$|[#?])'
+    _VALID_URL = r'https?://app\.itpro\.tv/course/(?P<id>[\w-]+)/?(?:$|[#?])'
     _TESTS = [
         {
             'url': 'https://app.itpro.tv/course/guided-tour',
@@ -111,16 +110,16 @@ class ITProTVCourseIE(ITProTVBaseIE):
                 'description': 'md5:b175c2c3061ce35a4dd33865b2c1da4e',
                 'title': 'ITProTV 101',
             },
-            'playlist_count': 6
+            'playlist_count': 6,
         },
         {
             'url': 'https://app.itpro.tv/course/beyond-tech',
             'info_dict': {
                 'id': 'beyond-tech',
                 'description': 'md5:44cd99855e7f81a15ce1269bd0621fed',
-                'title': 'Beyond Tech'
+                'title': 'Beyond Tech',
             },
-            'playlist_count': 15
+            'playlist_count': 15,
         },
     ]
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/itv.py b/plugins/youtube_download/yt_dlp/extractor/itv.py
index 9ac7be3..89e6f18 100644
--- a/plugins/youtube_download/yt_dlp/extractor/itv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/itv.py
@@ -1,23 +1,21 @@
 import json
 
-from .common import InfoExtractor
 from .brightcove import BrightcoveNewIE
-
-from ..compat import compat_str
+from .common import InfoExtractor
 from ..utils import (
+    JSON_LD_RE,
+    ExtractorError,
     base_url,
     clean_html,
     determine_ext,
     extract_attributes,
-    ExtractorError,
     get_element_by_class,
-    JSON_LD_RE,
     merge_dicts,
     parse_duration,
     smuggle_url,
     try_get,
-    url_or_none,
     url_basename,
+    url_or_none,
     urljoin,
 )
 
@@ -35,7 +33,7 @@ class ITVIE(InfoExtractor):
             'series': 'Plebs',
             'season_number': 1,
             'episode_number': 1,
-            'thumbnail': r're:https?://hubimages\.itv\.com/episode/2_1873_0002'
+            'thumbnail': r're:https?://hubimages\.itv\.com/episode/2_1873_0002',
         },
         'params': {
             # m3u8 download
@@ -51,7 +49,7 @@ class ITVIE(InfoExtractor):
             'series': 'The Jonathan Ross Show',
             'episode_number': 8,
             'season_number': 17,
-            'thumbnail': r're:https?://hubimages\.itv\.com/episode/2_1873_0002'
+            'thumbnail': r're:https?://hubimages\.itv\.com/episode/2_1873_0002',
         },
         'params': {
             # m3u8 download
@@ -84,7 +82,7 @@ class ITVIE(InfoExtractor):
                 'user': {
                     'itvUserId': '',
                     'entitlements': [],
-                    'token': ''
+                    'token': '',
                 },
                 'device': {
                     'manufacturer': 'Safari',
@@ -92,20 +90,20 @@ class ITVIE(InfoExtractor):
                     'os': {
                         'name': 'Windows NT',
                         'version': '6.1',
-                        'type': 'desktop'
-                    }
+                        'type': 'desktop',
+                    },
                 },
                 'client': {
                     'version': '4.1',
-                    'id': 'browser'
+                    'id': 'browser',
                 },
                 'variantAvailability': {
                     'featureset': {
                         'min': featureset,
-                        'max': featureset
+                        'max': featureset,
                     },
-                    'platformTag': platform_tag
-                }
+                    'platformTag': platform_tag,
+                },
             }).encode(), headers=headers, fatal=fatal)
 
     def _get_subtitles(self, video_id, variants, ios_playlist_url, headers, *args, **kwargs):
@@ -137,7 +135,7 @@ class ITVIE(InfoExtractor):
         params = extract_attributes(self._search_regex(
             r'(?s)(<[^>]+id="video"[^>]*>)', webpage, 'params'))
         variants = self._parse_json(
-            try_get(params, lambda x: x['data-video-variants'], compat_str) or '{}',
+            try_get(params, lambda x: x['data-video-variants'], str) or '{}',
             video_id, fatal=False)
         # Prefer last matching featureset
         # See: https://github.com/yt-dlp/yt-dlp/issues/986
@@ -186,7 +184,7 @@ class ITVIE(InfoExtractor):
                         break
 
         thumbnails = []
-        thumbnail_url = try_get(params, lambda x: x['data-video-posterframe'], compat_str)
+        thumbnail_url = try_get(params, lambda x: x['data-video-posterframe'], str)
         if thumbnail_url:
             thumbnails.extend([{
                 'url': thumbnail_url.format(width=1920, height=1080, quality=100, blur=0, bg='false'),
@@ -194,7 +192,7 @@ class ITVIE(InfoExtractor):
                 'height': 1080,
             }, {
                 'url': urljoin(base_url(thumbnail_url), url_basename(thumbnail_url)),
-                'preference': -2
+                'preference': -2,
             }])
 
         thumbnail_url = self._html_search_meta(['og:image', 'twitter:image'], webpage, default=None)
@@ -211,7 +209,7 @@ class ITVIE(InfoExtractor):
             'subtitles': self.extract_subtitles(video_id, variants, ios_playlist_url, headers),
             'duration': parse_duration(video_data.get('Duration')),
             'description': clean_html(get_element_by_class('episode-info__synopsis', webpage)),
-            'thumbnails': thumbnails
+            'thumbnails': thumbnails,
         }, info)
 
 
@@ -228,9 +226,9 @@ class ITVBTCCIE(InfoExtractor):
         'url': 'https://www.itv.com/news/2021-10-27/i-have-to-protect-the-country-says-rishi-sunak-as-uk-faces-interest-rate-hike',
         'info_dict': {
             'id': 'i-have-to-protect-the-country-says-rishi-sunak-as-uk-faces-interest-rate-hike',
-            'title': 'md5:6ef054dd9f069330db3dcc66cb772d32'
+            'title': 'md5:6ef054dd9f069330db3dcc66cb772d32',
         },
-        'playlist_count': 4
+        'playlist_count': 4,
     }]
     BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/%s/%s_default/index.html?videoId=%s'
 
@@ -255,7 +253,7 @@ class ITVBTCCIE(InfoExtractor):
                     # ITV does not like some GB IP ranges, so here are some
                     # IP blocks it accepts
                     'geo_ip_blocks': [
-                        '193.113.0.0/16', '54.36.162.0/23', '159.65.16.0/21'
+                        '193.113.0.0/16', '54.36.162.0/23', '159.65.16.0/21',
                     ],
                     'referrer': url,
                 }),
diff --git a/plugins/youtube_download/yt_dlp/extractor/ivi.py b/plugins/youtube_download/yt_dlp/extractor/ivi.py
index fa5ceec..57c276a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ivi.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ivi.py
@@ -82,10 +82,10 @@ class IviIE(InfoExtractor):
             'params': [
                 video_id, {
                     'site': 's%d',
-                    'referrer': 'http://www.ivi.ru/watch/%s' % video_id,
-                    'contentid': video_id
-                }
-            ]
+                    'referrer': f'http://www.ivi.ru/watch/{video_id}',
+                    'contentid': video_id,
+                },
+            ],
         })
 
         for site in (353, 183):
@@ -98,7 +98,7 @@ class IviIE(InfoExtractor):
                     self._LIGHT_URL, video_id,
                     'Downloading timestamp JSON', data=json.dumps({
                         'method': 'da.timestamp.get',
-                        'params': []
+                        'params': [],
                     }).encode(), fatal=False) or {}).get('result')
                 if not timestamp:
                     continue
@@ -158,7 +158,7 @@ class IviIE(InfoExtractor):
         compilation = result.get('compilation')
         episode = title if compilation else None
 
-        title = '%s - %s' % (compilation, title) if compilation is not None else title
+        title = f'{compilation} - {title}' if compilation is not None else title
 
         thumbnails = [{
             'url': preview['url'],
@@ -219,9 +219,9 @@ class IviCompilationIE(InfoExtractor):
     def _extract_entries(self, html, compilation_id):
         return [
             self.url_result(
-                'http://www.ivi.ru/watch/%s/%s' % (compilation_id, serie), IviIE.ie_key())
+                f'http://www.ivi.ru/watch/{compilation_id}/{serie}', IviIE.ie_key())
             for serie in re.findall(
-                r'<a\b[^>]+\bhref=["\']/watch/%s/(\d+)["\']' % compilation_id, html)]
+                rf'<a\b[^>]+\bhref=["\']/watch/{compilation_id}/(\d+)["\']', html)]
 
     def _real_extract(self, url):
         mobj = self._match_valid_url(url)
@@ -230,8 +230,8 @@ class IviCompilationIE(InfoExtractor):
 
         if season_id is not None:  # Season link
             season_page = self._download_webpage(
-                url, compilation_id, 'Downloading season %s web page' % season_id)
-            playlist_id = '%s/season%s' % (compilation_id, season_id)
+                url, compilation_id, f'Downloading season {season_id} web page')
+            playlist_id = f'{compilation_id}/season{season_id}'
             playlist_title = self._html_search_meta('title', season_page, 'title')
             entries = self._extract_entries(season_page, compilation_id)
         else:  # Compilation link
@@ -239,15 +239,15 @@ class IviCompilationIE(InfoExtractor):
             playlist_id = compilation_id
             playlist_title = self._html_search_meta('title', compilation_page, 'title')
             seasons = re.findall(
-                r'<a href="/watch/%s/season(\d+)' % compilation_id, compilation_page)
+                rf'<a href="/watch/{compilation_id}/season(\d+)', compilation_page)
             if not seasons:  # No seasons in this compilation
                 entries = self._extract_entries(compilation_page, compilation_id)
             else:
                 entries = []
                 for season_id in seasons:
                     season_page = self._download_webpage(
-                        'http://www.ivi.ru/watch/%s/season%s' % (compilation_id, season_id),
-                        compilation_id, 'Downloading season %s web page' % season_id)
+                        f'http://www.ivi.ru/watch/{compilation_id}/season{season_id}',
+                        compilation_id, f'Downloading season {season_id} web page')
                     entries.extend(self._extract_entries(season_page, compilation_id))
 
         return self.playlist_result(entries, playlist_id, playlist_title)
diff --git a/plugins/youtube_download/yt_dlp/extractor/ivideon.py b/plugins/youtube_download/yt_dlp/extractor/ivideon.py
index 7d1e554..eb860c7 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ivideon.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ivideon.py
@@ -1,8 +1,6 @@
+import urllib.parse
+
 from .common import InfoExtractor
-from ..compat import (
-    compat_urllib_parse_urlencode,
-    compat_urlparse,
-)
 from ..utils import qualities
 
 
@@ -21,7 +19,7 @@ class IvideonIE(InfoExtractor):
         },
         'params': {
             'skip_download': True,
-        }
+        },
     }, {
         'url': 'https://www.ivideon.com/tv/camera/100-c4ee4cb9ede885cf62dfbe93d7b53783/589824/?lang=ru',
         'only_matching': True,
@@ -36,8 +34,8 @@ class IvideonIE(InfoExtractor):
         mobj = self._match_valid_url(url)
         server_id, camera_id = mobj.group('id'), mobj.group('camera_id')
         camera_name, description = None, None
-        camera_url = compat_urlparse.urljoin(
-            url, '/tv/camera/%s/%s/' % (server_id, camera_id))
+        camera_url = urllib.parse.urljoin(
+            url, f'/tv/camera/{server_id}/{camera_id}/')
 
         webpage = self._download_webpage(camera_url, server_id, fatal=False)
         if webpage:
@@ -57,12 +55,12 @@ class IvideonIE(InfoExtractor):
         quality = qualities(self._QUALITIES)
 
         formats = [{
-            'url': 'https://streaming.ivideon.com/flv/live?%s' % compat_urllib_parse_urlencode({
+            'url': 'https://streaming.ivideon.com/flv/live?{}'.format(urllib.parse.urlencode({
                 'server': server_id,
                 'camera': camera_id,
                 'sessionId': 'demo',
                 'q': quality(format_id),
-            }),
+            })),
             'format_id': format_id,
             'ext': 'flv',
             'quality': quality(format_id),
diff --git a/plugins/youtube_download/yt_dlp/extractor/ivoox.py b/plugins/youtube_download/yt_dlp/extractor/ivoox.py
new file mode 100644
index 0000000..36e0249
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/ivoox.py
@@ -0,0 +1,78 @@
+from .common import InfoExtractor
+from ..utils import int_or_none, parse_iso8601, url_or_none, urljoin
+from ..utils.traversal import traverse_obj
+
+
+class IvooxIE(InfoExtractor):
+    _VALID_URL = (
+        r'https?://(?:www\.)?ivoox\.com/(?:\w{2}/)?[^/?#]+_rf_(?P<id>[0-9]+)_1\.html',
+        r'https?://go\.ivoox\.com/rf/(?P<id>[0-9]+)',
+    )
+    _TESTS = [{
+        'url': 'https://www.ivoox.com/dex-08x30-rostros-del-mal-los-asesinos-en-audios-mp3_rf_143594959_1.html',
+        'md5': '993f712de5b7d552459fc66aa3726885',
+        'info_dict': {
+            'id': '143594959',
+            'ext': 'mp3',
+            'timestamp': 1742731200,
+            'channel': 'DIAS EXTRAÑOS con Santiago Camacho',
+            'title': 'DEx 08x30 Rostros del mal: Los asesinos en serie que aterrorizaron España',
+            'description': 'md5:eae8b4b9740d0216d3871390b056bb08',
+            'uploader': 'Santiago Camacho',
+            'thumbnail': 'https://static-1.ivoox.com/audios/c/d/5/2/cd52f46783fe735000c33a803dce2554_XXL.jpg',
+            'upload_date': '20250323',
+            'episode': 'DEx 08x30 Rostros del mal: Los asesinos en serie que aterrorizaron España',
+            'duration': 11837,
+            'tags': ['españa', 'asesinos en serie', 'arropiero', 'historia criminal', 'mataviejas'],
+        },
+    }, {
+        'url': 'https://go.ivoox.com/rf/143594959',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.ivoox.com/en/campodelgas-28-03-2025-audios-mp3_rf_144036942_1.html',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        media_id = self._match_id(url)
+        webpage = self._download_webpage(url, media_id, fatal=False)
+
+        data = self._search_nuxt_data(
+            webpage, media_id, fatal=False, traverse=('data', 0, 'data', 'audio'))
+
+        direct_download = self._download_json(
+            f'https://vcore-web.ivoox.com/v1/public/audios/{media_id}/download-url', media_id, fatal=False,
+            note='Fetching direct download link', headers={'Referer': url})
+
+        download_paths = {
+            *traverse_obj(direct_download, ('data', 'downloadUrl', {str}, filter, all)),
+            *traverse_obj(data, (('downloadUrl', 'mediaUrl'), {str}, filter)),
+        }
+
+        formats = []
+        for path in download_paths:
+            formats.append({
+                'url': urljoin('https://ivoox.com', path),
+                'http_headers': {'Referer': url},
+            })
+
+        return {
+            'id': media_id,
+            'formats': formats,
+            'uploader': self._html_search_regex(r'data-prm-author="([^"]+)"', webpage, 'author', default=None),
+            'timestamp': parse_iso8601(
+                self._html_search_regex(r'data-prm-pubdate="([^"]+)"', webpage, 'timestamp', default=None)),
+            'channel': self._html_search_regex(r'data-prm-podname="([^"]+)"', webpage, 'channel', default=None),
+            'title': self._html_search_regex(r'data-prm-title="([^"]+)"', webpage, 'title', default=None),
+            'thumbnail': self._og_search_thumbnail(webpage, default=None),
+            'description': self._og_search_description(webpage, default=None),
+            **self._search_json_ld(webpage, media_id, default={}),
+            **traverse_obj(data, {
+                'title': ('title', {str}),
+                'description': ('description', {str}),
+                'thumbnail': ('image', {url_or_none}),
+                'timestamp': ('uploadDate', {parse_iso8601(delimiter=' ')}),
+                'duration': ('duration', {int_or_none}),
+                'tags': ('tags', ..., 'name', {str}),
+            }),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/iwara.py b/plugins/youtube_download/yt_dlp/extractor/iwara.py
index e23fdfd..5b5c367 100644
--- a/plugins/youtube_download/yt_dlp/extractor/iwara.py
+++ b/plugins/youtube_download/yt_dlp/extractor/iwara.py
@@ -1,9 +1,8 @@
 import functools
-import urllib.parse
-import urllib.error
 import hashlib
 import json
 import time
+import urllib.parse
 
 from .common import InfoExtractor
 from ..utils import (
@@ -41,7 +40,7 @@ class IwaraBaseIE(InfoExtractor):
                 'https://api.iwara.tv/user/login', None, note='Logging in',
                 headers={'Content-Type': 'application/json'}, data=json.dumps({
                     'email': username,
-                    'password': password
+                    'password': password,
                 }).encode(), expected_status=lambda x: True)
             user_token = traverse_obj(response, ('token', {str}))
             if not user_token:
@@ -65,7 +64,7 @@ class IwaraBaseIE(InfoExtractor):
                 'https://api.iwara.tv/user/token', None, note='Fetching media token',
                 data=b'', headers={
                     'Authorization': f'Bearer {IwaraBaseIE._USERTOKEN}',
-                    'Content-Type': 'application/json'
+                    'Content-Type': 'application/json',
                 })['accessToken']
 
         return {'Authorization': f'Bearer {IwaraBaseIE._MEDIATOKEN}'}
@@ -107,7 +106,7 @@ class IwaraIE(IwaraBaseIE):
             'uploader': 'Lyu ya',
             'uploader_id': 'user792540',
             'tags': [
-                'uncategorized'
+                'uncategorized',
             ],
             'like_count': int,
             'view_count': int,
@@ -129,7 +128,7 @@ class IwaraIE(IwaraBaseIE):
             'uploader': 'Fe_Kurosabi',
             'uploader_id': 'fekurosabi',
             'tags': [
-                'pee'
+                'pee',
             ],
             'like_count': int,
             'view_count': int,
diff --git a/plugins/youtube_download/yt_dlp/extractor/ixigua.py b/plugins/youtube_download/yt_dlp/extractor/ixigua.py
index 1f086d2..2868c2f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ixigua.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ixigua.py
@@ -29,7 +29,7 @@ class IxiguaIE(InfoExtractor):
             'thumbnail': r're:^https?://.+\.(avif|webp)',
             'timestamp': 1629088414,
             'duration': 1030,
-        }
+        },
     }]
 
     def _get_json_data(self, webpage, video_id):
diff --git a/plugins/youtube_download/yt_dlp/extractor/izlesene.py b/plugins/youtube_download/yt_dlp/extractor/izlesene.py
index 5cdf870..cf2a269 100644
--- a/plugins/youtube_download/yt_dlp/extractor/izlesene.py
+++ b/plugins/youtube_download/yt_dlp/extractor/izlesene.py
@@ -1,8 +1,6 @@
+import urllib.parse
+
 from .common import InfoExtractor
-from ..compat import (
-    compat_str,
-    compat_urllib_parse_unquote,
-)
 from ..utils import (
     determine_ext,
     float_or_none,
@@ -33,7 +31,7 @@ class IzleseneIE(InfoExtractor):
                 'upload_date': '20140702',
                 'duration': 95.395,
                 'age_limit': 0,
-            }
+            },
         },
         {
             'url': 'http://www.izlesene.com/video/tarkan-dortmund-2006-konseri/17997',
@@ -48,14 +46,14 @@ class IzleseneIE(InfoExtractor):
                 'upload_date': '20061112',
                 'duration': 253.666,
                 'age_limit': 0,
-            }
+            },
         },
     ]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
 
-        webpage = self._download_webpage('http://www.izlesene.com/video/%s' % video_id, video_id)
+        webpage = self._download_webpage(f'http://www.izlesene.com/video/{video_id}', video_id)
 
         video = self._parse_json(
             self._search_regex(
@@ -67,14 +65,14 @@ class IzleseneIE(InfoExtractor):
         formats = []
         for stream in video['media']['level']:
             source_url = stream.get('source')
-            if not source_url or not isinstance(source_url, compat_str):
+            if not source_url or not isinstance(source_url, str):
                 continue
             ext = determine_ext(url, 'mp4')
             quality = stream.get('value')
             height = int_or_none(quality)
             formats.append({
-                'format_id': '%sp' % quality if quality else 'sd',
-                'url': compat_urllib_parse_unquote(source_url),
+                'format_id': f'{quality}p' if quality else 'sd',
+                'url': urllib.parse.unquote(source_url),
                 'ext': ext,
                 'height': height,
             })
diff --git a/plugins/youtube_download/yt_dlp/extractor/jable.py b/plugins/youtube_download/yt_dlp/extractor/jable.py
deleted file mode 100644
index 84c3225..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/jable.py
+++ /dev/null
@@ -1,103 +0,0 @@
-import re
-
-from .common import InfoExtractor
-from ..utils import (
-    InAdvancePagedList,
-    int_or_none,
-    orderedSet,
-    unified_strdate,
-)
-
-
-class JableIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?jable.tv/videos/(?P<id>[\w-]+)'
-    _TESTS = [{
-        'url': 'https://jable.tv/videos/pppd-812/',
-        'md5': 'f1537283a9bc073c31ff86ca35d9b2a6',
-        'info_dict': {
-            'id': 'pppd-812',
-            'ext': 'mp4',
-            'title': 'PPPD-812 只要表現好巨乳女教師吉根柚莉愛就獎勵學生們在白虎穴內射出精液',
-            'description': 'md5:5b6d4199a854f62c5e56e26ccad19967',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'age_limit': 18,
-            'like_count': int,
-            'view_count': int,
-        },
-    }, {
-        'url': 'https://jable.tv/videos/apak-220/',
-        'md5': '71f9239d69ced58ab74a816908847cc1',
-        'info_dict': {
-            'id': 'apak-220',
-            'ext': 'mp4',
-            'title': 'md5:5c3861b7cf80112a6e2b70bccf170824',
-            'description': '',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'age_limit': 18,
-            'like_count': int,
-            'view_count': int,
-            'upload_date': '20220319',
-        },
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-        formats = self._extract_m3u8_formats(
-            self._search_regex(r'var\s+hlsUrl\s*=\s*\'([^\']+)', webpage, 'hls_url'), video_id, 'mp4', m3u8_id='hls')
-
-        return {
-            'id': video_id,
-            'title': self._og_search_title(webpage),
-            'description': self._og_search_description(webpage, default=''),
-            'thumbnail': self._og_search_thumbnail(webpage, default=None),
-            'formats': formats,
-            'age_limit': 18,
-            'upload_date': unified_strdate(self._search_regex(
-                r'class="inactive-color">\D+\s+(\d{4}-\d+-\d+)', webpage, 'upload_date', default=None)),
-            'view_count': int_or_none(self._search_regex(
-                r'#icon-eye"></use></svg>\n*<span class="mr-3">([\d ]+)',
-                webpage, 'view_count', default='').replace(' ', '')),
-            'like_count': int_or_none(self._search_regex(
-                r'#icon-heart"></use></svg><span class="count">(\d+)', webpage, 'link_count', default=None)),
-        }
-
-
-class JablePlaylistIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?jable.tv/(?:categories|models|tags)/(?P<id>[\w-]+)'
-    _TESTS = [{
-        'url': 'https://jable.tv/models/kaede-karen/',
-        'info_dict': {
-            'id': 'kaede-karen',
-            'title': '楓カレン',
-        },
-        'playlist_count': 34,
-    }, {
-        'url': 'https://jable.tv/categories/roleplay/',
-        'only_matching': True,
-    }, {
-        'url': 'https://jable.tv/tags/girl/',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        playlist_id = self._match_id(url)
-        webpage = self._download_webpage(url, playlist_id)
-
-        def page_func(page_num):
-            return [
-                self.url_result(player_url, JableIE)
-                for player_url in orderedSet(re.findall(
-                    r'href="(https://jable.tv/videos/[\w-]+/?)"',
-                    self._download_webpage(url, playlist_id, query={
-                        'mode': 'async',
-                        'from': page_num + 1,
-                        'function': 'get_block',
-                        'block_id': 'list_videos_common_videos_list',
-                    }, note=f'Downloading page {page_num + 1}')))]
-
-        return self.playlist_result(
-            InAdvancePagedList(page_func, int_or_none(self._search_regex(
-                r'from:(\d+)">[^<]+\s*&raquo;', webpage, 'last page number', default=1)), 24),
-            playlist_id, self._search_regex(
-                r'<h2 class="h3-md mb-1">([^<]+)', webpage, 'playlist title', default=None))
diff --git a/plugins/youtube_download/yt_dlp/extractor/jamendo.py b/plugins/youtube_download/yt_dlp/extractor/jamendo.py
index a2bbba3..bac0e86 100644
--- a/plugins/youtube_download/yt_dlp/extractor/jamendo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/jamendo.py
@@ -1,12 +1,13 @@
 import hashlib
 import random
 
-from ..compat import compat_str
 from .common import InfoExtractor
+from ..networking import HEADRequest
 from ..utils import (
     clean_html,
     int_or_none,
     try_get,
+    urlhandle_detect_ext,
 )
 
 
@@ -28,7 +29,7 @@ class JamendoIE(InfoExtractor):
             'ext': 'flac',
             # 'title': 'Maya Filipič - Stories from Emona I',
             'title': 'Stories from Emona I',
-            'artist': 'Maya Filipič',
+            'artists': ['Maya Filipič'],
             'album': 'Between two worlds',
             'track': 'Stories from Emona I',
             'duration': 210,
@@ -40,20 +41,20 @@ class JamendoIE(InfoExtractor):
             'like_count': int,
             'average_rating': int,
             'tags': ['piano', 'peaceful', 'newage', 'strings', 'upbeat'],
-        }
+        },
     }, {
         'url': 'https://licensing.jamendo.com/en/track/1496667/energetic-rock',
         'only_matching': True,
     }]
 
     def _call_api(self, resource, resource_id, fatal=True):
-        path = '/api/%ss' % resource
-        rand = compat_str(random.random())
+        path = f'/api/{resource}s'
+        rand = str(random.random())
         return self._download_json(
             'https://www.jamendo.com' + path, resource_id, fatal=fatal, query={
                 'id[]': resource_id,
             }, headers={
-                'X-Jam-Call': '$%s*%s~' % (hashlib.sha1((path + rand).encode()).hexdigest(), rand)
+                'X-Jam-Call': f'${hashlib.sha1((path + rand).encode()).hexdigest()}*{rand}~',
             })[0]
 
     def _real_extract(self, url):
@@ -72,12 +73,11 @@ class JamendoIE(InfoExtractor):
         # if artist_name:
         #     title = '%s - %s' % (artist_name, title)
         # album = get_model('album')
-        artist = self._call_api("artist", track.get('artistId'), fatal=False)
-        album = self._call_api("album", track.get('albumId'), fatal=False)
+        artist = self._call_api('artist', track.get('artistId'), fatal=False)
+        album = self._call_api('album', track.get('albumId'), fatal=False)
 
         formats = [{
-            'url': 'https://%s.jamendo.com/?trackid=%s&format=%s&from=app-97dab294'
-                   % (sub_domain, track_id, format_id),
+            'url': f'https://{sub_domain}.jamendo.com/?trackid={track_id}&format={format_id}&from=app-97dab294',
             'format_id': format_id,
             'ext': ext,
             'quality': quality,
@@ -95,9 +95,15 @@ class JamendoIE(InfoExtractor):
                 if not cover_url or cover_url in urls:
                     continue
                 urls.append(cover_url)
+                urlh = self._request_webpage(
+                    HEADRequest(cover_url), track_id, 'Checking thumbnail extension',
+                    errnote=False, fatal=False)
+                if not urlh:
+                    continue
                 size = int_or_none(cover_id.lstrip('size'))
                 thumbnails.append({
                     'id': cover_id,
+                    'ext': urlhandle_detect_ext(urlh, default='jpg'),
                     'url': cover_url,
                     'width': size,
                     'height': size,
@@ -111,7 +117,7 @@ class JamendoIE(InfoExtractor):
             tags.append(tag_name)
 
         stats = track.get('stats') or {}
-        license = track.get('licenseCC') or []
+        video_license = track.get('licenseCC') or []
 
         return {
             'id': track_id,
@@ -124,7 +130,7 @@ class JamendoIE(InfoExtractor):
             'track': track_name,
             'album': album.get('name'),
             'formats': formats,
-            'license': '-'.join(license) if license else None,
+            'license': '-'.join(video_license) if video_license else None,
             'timestamp': int_or_none(track.get('dateCreated')),
             'view_count': int_or_none(stats.get('listenedAll')),
             'like_count': int_or_none(stats.get('favorited')),
@@ -160,7 +166,7 @@ class JamendoAlbumIE(JamendoIE):  # XXX: Do not subclass from concrete IE
                 'average_rating': 4,
                 'tags': ['rock', 'drums', 'bass', 'world', 'punk', 'neutral'],
                 'like_count': int,
-            }
+            },
         }, {
             'md5': '1f358d7b2f98edfe90fd55dac0799d50',
             'info_dict': {
@@ -179,11 +185,11 @@ class JamendoAlbumIE(JamendoIE):  # XXX: Do not subclass from concrete IE
                 'average_rating': 4,
                 'license': 'by',
                 'like_count': int,
-            }
+            },
         }],
         'params': {
-            'playlistend': 2
-        }
+            'playlistend': 2,
+        },
     }]
 
     def _real_extract(self, url):
@@ -196,7 +202,7 @@ class JamendoAlbumIE(JamendoIE):  # XXX: Do not subclass from concrete IE
             track_id = track.get('id')
             if not track_id:
                 continue
-            track_id = compat_str(track_id)
+            track_id = str(track_id)
             entries.append({
                 '_type': 'url_transparent',
                 'url': 'https://www.jamendo.com/track/' + track_id,
@@ -207,4 +213,4 @@ class JamendoAlbumIE(JamendoIE):  # XXX: Do not subclass from concrete IE
 
         return self.playlist_result(
             entries, album_id, album_name,
-            clean_html(try_get(album, lambda x: x['description']['en'], compat_str)))
+            clean_html(try_get(album, lambda x: x['description']['en'], str)))
diff --git a/plugins/youtube_download/yt_dlp/extractor/japandiet.py b/plugins/youtube_download/yt_dlp/extractor/japandiet.py
index 6c65056..994da22 100644
--- a/plugins/youtube_download/yt_dlp/extractor/japandiet.py
+++ b/plugins/youtube_download/yt_dlp/extractor/japandiet.py
@@ -1,5 +1,6 @@
 import re
 
+from .common import InfoExtractor
 from ..utils import (
     ExtractorError,
     clean_html,
@@ -9,9 +10,8 @@ from ..utils import (
     smuggle_url,
     traverse_obj,
     try_call,
-    unsmuggle_url
+    unsmuggle_url,
 )
-from .common import InfoExtractor
 
 
 def _parse_japanese_date(text):
@@ -41,7 +41,7 @@ def _parse_japanese_duration(text):
     mobj = re.search(r'(?:(\d+)日間?)?(?:(\d+)時間?)?(?:(\d+)分)?(?:(\d+)秒)?', re.sub(r'[\s\u3000]+', '', text or ''))
     if not mobj:
         return
-    days, hours, mins, secs = [int_or_none(x, default=0) for x in mobj.groups()]
+    days, hours, mins, secs = (int_or_none(x, default=0) for x in mobj.groups())
     return secs + mins * 60 + hours * 60 * 60 + days * 24 * 60 * 60
 
 
@@ -142,10 +142,10 @@ class ShugiinItvVodIE(ShugiinItvBaseIE):
             'title': 'ウクライナ大統領国会演説（オンライン）',
             'release_date': '20220323',
             'chapters': 'count:4',
-        }
+        },
     }, {
         'url': 'https://www.shugiintv.go.jp/en/index.php?ex=VL&media_type=&deli_id=53846',
-        'only_matching': True
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
@@ -194,11 +194,14 @@ class ShugiinItvVodIE(ShugiinItvBaseIE):
 
 
 class SangiinInstructionIE(InfoExtractor):
-    _VALID_URL = r'^https?://www\.webtv\.sangiin\.go\.jp/webtv/index\.php'
+    _VALID_URL = r'https?://www\.webtv\.sangiin\.go\.jp/webtv/index\.php'
     IE_DESC = False  # this shouldn't be listed as a supported site
 
     def _real_extract(self, url):
-        raise ExtractorError('Copy the link from the botton below the video description or player, and use the link to download. If there are no button in the frame, get the URL of the frame showing the video.', expected=True)
+        raise ExtractorError(
+            'Copy the link from the button below the video description/player '
+            'and use that link to download. If there is no button in the frame, '
+            'get the URL of the frame showing the video.', expected=True)
 
 
 class SangiinIE(InfoExtractor):
@@ -232,7 +235,7 @@ class SangiinIE(InfoExtractor):
             'is_live': True,
         },
         'skip': 'this live is turned into archive after it ends',
-    }, ]
+    }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
diff --git a/plugins/youtube_download/yt_dlp/extractor/jeuxvideo.py b/plugins/youtube_download/yt_dlp/extractor/jeuxvideo.py
index 56ea15c..7938206 100644
--- a/plugins/youtube_download/yt_dlp/extractor/jeuxvideo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/jeuxvideo.py
@@ -2,6 +2,8 @@ from .common import InfoExtractor
 
 
 class JeuxVideoIE(InfoExtractor):
+    _WORKING = False
+    _ENABLED = None  # XXX: pass through to GenericIE
     _VALID_URL = r'https?://.*?\.jeuxvideo\.com/.*/(.*?)\.htm'
 
     _TESTS = [{
diff --git a/plugins/youtube_download/yt_dlp/extractor/jiocinema.py b/plugins/youtube_download/yt_dlp/extractor/jiocinema.py
new file mode 100644
index 0000000..94c8506
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/jiocinema.py
@@ -0,0 +1,408 @@
+import base64
+import itertools
+import json
+import random
+import re
+import string
+import time
+
+from .common import InfoExtractor
+from ..utils import (
+    ExtractorError,
+    float_or_none,
+    int_or_none,
+    jwt_decode_hs256,
+    parse_age_limit,
+    try_call,
+    url_or_none,
+)
+from ..utils.traversal import traverse_obj
+
+
+class JioCinemaBaseIE(InfoExtractor):
+    _NETRC_MACHINE = 'jiocinema'
+    _GEO_BYPASS = False
+    _ACCESS_TOKEN = None
+    _REFRESH_TOKEN = None
+    _GUEST_TOKEN = None
+    _USER_ID = None
+    _DEVICE_ID = None
+    _API_HEADERS = {'Origin': 'https://www.jiocinema.com', 'Referer': 'https://www.jiocinema.com/'}
+    _APP_NAME = {'appName': 'RJIL_JioCinema'}
+    _APP_VERSION = {'appVersion': '5.0.0'}
+    _API_SIGNATURES = 'o668nxgzwff'
+    _METADATA_API_BASE = 'https://content-jiovoot.voot.com/psapi'
+    _ACCESS_HINT = 'the `accessToken` from your browser local storage'
+    _LOGIN_HINT = (
+        'Log in with "-u phone -p <PHONE_NUMBER>" to authenticate with OTP, '
+        f'or use "-u token -p <ACCESS_TOKEN>" to log in with {_ACCESS_HINT}. '
+        'If you have previously logged in with yt-dlp and your session '
+        'has been cached, you can use "-u device -p <DEVICE_ID>"')
+
+    def _cache_token(self, token_type):
+        assert token_type in ('access', 'refresh', 'all')
+        if token_type in ('access', 'all'):
+            self.cache.store(
+                JioCinemaBaseIE._NETRC_MACHINE, f'{JioCinemaBaseIE._DEVICE_ID}-access', JioCinemaBaseIE._ACCESS_TOKEN)
+        if token_type in ('refresh', 'all'):
+            self.cache.store(
+                JioCinemaBaseIE._NETRC_MACHINE, f'{JioCinemaBaseIE._DEVICE_ID}-refresh', JioCinemaBaseIE._REFRESH_TOKEN)
+
+    def _call_api(self, url, video_id, note='Downloading API JSON', headers={}, data={}):
+        return self._download_json(
+            url, video_id, note, data=json.dumps(data, separators=(',', ':')).encode(), headers={
+                'Content-Type': 'application/json',
+                'Accept': 'application/json',
+                **self._API_HEADERS,
+                **headers,
+            }, expected_status=(400, 403, 474))
+
+    def _call_auth_api(self, service, endpoint, note, headers={}, data={}):
+        return self._call_api(
+            f'https://auth-jiocinema.voot.com/{service}service/apis/v4/{endpoint}',
+            None, note=note, headers=headers, data=data)
+
+    def _refresh_token(self):
+        if not JioCinemaBaseIE._REFRESH_TOKEN or not JioCinemaBaseIE._DEVICE_ID:
+            raise ExtractorError('User token has expired', expected=True)
+        response = self._call_auth_api(
+            'token', 'refreshtoken', 'Refreshing token',
+            headers={'accesstoken': self._ACCESS_TOKEN}, data={
+                **self._APP_NAME,
+                'deviceId': self._DEVICE_ID,
+                'refreshToken': self._REFRESH_TOKEN,
+                **self._APP_VERSION,
+            })
+        refresh_token = response.get('refreshTokenId')
+        if refresh_token and refresh_token != JioCinemaBaseIE._REFRESH_TOKEN:
+            JioCinemaBaseIE._REFRESH_TOKEN = refresh_token
+            self._cache_token('refresh')
+        JioCinemaBaseIE._ACCESS_TOKEN = response['authToken']
+        self._cache_token('access')
+
+    def _fetch_guest_token(self):
+        JioCinemaBaseIE._DEVICE_ID = ''.join(random.choices(string.digits, k=10))
+        guest_token = self._call_auth_api(
+            'token', 'guest', 'Downloading guest token', data={
+                **self._APP_NAME,
+                'deviceType': 'phone',
+                'os': 'ios',
+                'deviceId': self._DEVICE_ID,
+                'freshLaunch': False,
+                'adId': self._DEVICE_ID,
+                **self._APP_VERSION,
+            })
+        self._GUEST_TOKEN = guest_token['authToken']
+        self._USER_ID = guest_token['userId']
+
+    def _call_login_api(self, endpoint, guest_token, data, note):
+        return self._call_auth_api(
+            'user', f'loginotp/{endpoint}', note, headers={
+                **self.geo_verification_headers(),
+                'accesstoken': self._GUEST_TOKEN,
+                **self._APP_NAME,
+                **traverse_obj(guest_token, 'data', {
+                    'deviceType': ('deviceType', {str}),
+                    'os': ('os', {str}),
+                })}, data=data)
+
+    def _is_token_expired(self, token):
+        return (try_call(lambda: jwt_decode_hs256(token)['exp']) or 0) <= int(time.time() - 180)
+
+    def _perform_login(self, username, password):
+        if self._ACCESS_TOKEN and not self._is_token_expired(self._ACCESS_TOKEN):
+            return
+
+        UUID_RE = r'[\da-f]{8}-(?:[\da-f]{4}-){3}[\da-f]{12}'
+
+        if username.lower() == 'token':
+            if try_call(lambda: jwt_decode_hs256(password)):
+                JioCinemaBaseIE._ACCESS_TOKEN = password
+                refresh_hint = 'the `refreshToken` UUID from your browser local storage'
+                refresh_token = self._configuration_arg('refresh_token', [''], ie_key=JioCinemaIE)[0]
+                if not refresh_token:
+                    self.to_screen(
+                        'To extend the life of your login session, in addition to your access token, '
+                        'you can pass --extractor-args "jiocinema:refresh_token=REFRESH_TOKEN" '
+                        f'where REFRESH_TOKEN is {refresh_hint}')
+                elif re.fullmatch(UUID_RE, refresh_token):
+                    JioCinemaBaseIE._REFRESH_TOKEN = refresh_token
+                else:
+                    self.report_warning(f'Invalid refresh_token value. Use {refresh_hint}')
+            else:
+                raise ExtractorError(
+                    f'The password given could not be decoded as a token; use {self._ACCESS_HINT}', expected=True)
+
+        elif username.lower() == 'device' and re.fullmatch(rf'(?:{UUID_RE}|\d+)', password):
+            JioCinemaBaseIE._REFRESH_TOKEN = self.cache.load(JioCinemaBaseIE._NETRC_MACHINE, f'{password}-refresh')
+            JioCinemaBaseIE._ACCESS_TOKEN = self.cache.load(JioCinemaBaseIE._NETRC_MACHINE, f'{password}-access')
+            if not JioCinemaBaseIE._REFRESH_TOKEN or not JioCinemaBaseIE._ACCESS_TOKEN:
+                raise ExtractorError(f'Failed to load cached tokens for device ID "{password}"', expected=True)
+
+        elif username.lower() == 'phone' and re.fullmatch(r'\+?\d+', password):
+            self._fetch_guest_token()
+            guest_token = jwt_decode_hs256(self._GUEST_TOKEN)
+            initial_data = {
+                'number': base64.b64encode(password.encode()).decode(),
+                **self._APP_VERSION,
+            }
+            response = self._call_login_api('send', guest_token, initial_data, 'Requesting OTP')
+            if not traverse_obj(response, ('OTPInfo', {dict})):
+                raise ExtractorError('There was a problem with the phone number login attempt')
+
+            is_iphone = guest_token.get('os') == 'ios'
+            response = self._call_login_api('verify', guest_token, {
+                'deviceInfo': {
+                    'consumptionDeviceName': 'iPhone' if is_iphone else 'Android',
+                    'info': {
+                        'platform': {'name': 'iPhone OS' if is_iphone else 'Android'},
+                        'androidId': self._DEVICE_ID,
+                        'type': 'iOS' if is_iphone else 'Android',
+                    },
+                },
+                **initial_data,
+                'otp': self._get_tfa_info('the one-time password sent to your phone'),
+            }, 'Submitting OTP')
+            if traverse_obj(response, 'code') == 1043:
+                raise ExtractorError('Wrong OTP', expected=True)
+            JioCinemaBaseIE._REFRESH_TOKEN = response['refreshToken']
+            JioCinemaBaseIE._ACCESS_TOKEN = response['authToken']
+
+        else:
+            raise ExtractorError(self._LOGIN_HINT, expected=True)
+
+        user_token = jwt_decode_hs256(JioCinemaBaseIE._ACCESS_TOKEN)['data']
+        JioCinemaBaseIE._USER_ID = user_token['userId']
+        JioCinemaBaseIE._DEVICE_ID = user_token['deviceId']
+        if JioCinemaBaseIE._REFRESH_TOKEN and username != 'device':
+            self._cache_token('all')
+            if self.get_param('cachedir') is not False:
+                self.to_screen(
+                    f'NOTE: For subsequent logins you can use "-u device -p {JioCinemaBaseIE._DEVICE_ID}"')
+        elif not JioCinemaBaseIE._REFRESH_TOKEN:
+            JioCinemaBaseIE._REFRESH_TOKEN = self.cache.load(
+                JioCinemaBaseIE._NETRC_MACHINE, f'{JioCinemaBaseIE._DEVICE_ID}-refresh')
+            if JioCinemaBaseIE._REFRESH_TOKEN:
+                self._cache_token('access')
+        self.to_screen(f'Logging in as device ID "{JioCinemaBaseIE._DEVICE_ID}"')
+        if self._is_token_expired(JioCinemaBaseIE._ACCESS_TOKEN):
+            self._refresh_token()
+
+
+class JioCinemaIE(JioCinemaBaseIE):
+    IE_NAME = 'jiocinema'
+    _VALID_URL = r'https?://(?:www\.)?jiocinema\.com/?(?:movies?/[^/?#]+/|tv-shows/(?:[^/?#]+/){3})(?P<id>\d{3,})'
+    _TESTS = [{
+        'url': 'https://www.jiocinema.com/tv-shows/agnisakshi-ek-samjhauta/1/pradeep-to-stop-the-wedding/3759931',
+        'info_dict': {
+            'id': '3759931',
+            'ext': 'mp4',
+            'title': 'Pradeep to stop the wedding?',
+            'description': 'md5:75f72d1d1a66976633345a3de6d672b1',
+            'episode': 'Pradeep to stop the wedding?',
+            'episode_number': 89,
+            'season': 'Agnisakshi…Ek Samjhauta-S1',
+            'season_number': 1,
+            'series': 'Agnisakshi Ek Samjhauta',
+            'duration': 1238.0,
+            'thumbnail': r're:https?://.+\.jpg',
+            'age_limit': 13,
+            'season_id': '3698031',
+            'upload_date': '20230606',
+            'timestamp': 1686009600,
+            'release_date': '20230607',
+            'genres': ['Drama'],
+        },
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        'url': 'https://www.jiocinema.com/movies/bhediya/3754021/watch',
+        'info_dict': {
+            'id': '3754021',
+            'ext': 'mp4',
+            'title': 'Bhediya',
+            'description': 'md5:a6bf2900371ac2fc3f1447401a9f7bb0',
+            'episode': 'Bhediya',
+            'duration': 8500.0,
+            'thumbnail': r're:https?://.+\.jpg',
+            'age_limit': 13,
+            'upload_date': '20230525',
+            'timestamp': 1685026200,
+            'release_date': '20230524',
+            'genres': ['Comedy'],
+        },
+        'params': {'skip_download': 'm3u8'},
+    }]
+
+    def _extract_formats_and_subtitles(self, playback, video_id):
+        m3u8_url = traverse_obj(playback, (
+            'data', 'playbackUrls', lambda _, v: v['streamtype'] == 'hls', 'url', {url_or_none}, any))
+        if not m3u8_url:  # DRM-only content only serves dash urls
+            self.report_drm(video_id)
+        formats, subtitles = self._extract_m3u8_formats_and_subtitles(m3u8_url, video_id, m3u8_id='hls')
+        self._remove_duplicate_formats(formats)
+
+        return {
+            # '/_definst_/smil:vod/' m3u8 manifests claim to have 720p+ formats but max out at 480p
+            'formats': traverse_obj(formats, (
+                lambda _, v: '/_definst_/smil:vod/' not in v['url'] or v['height'] <= 480)),
+            'subtitles': subtitles,
+        }
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        if not self._ACCESS_TOKEN and self._is_token_expired(self._GUEST_TOKEN):
+            self._fetch_guest_token()
+        elif self._ACCESS_TOKEN and self._is_token_expired(self._ACCESS_TOKEN):
+            self._refresh_token()
+
+        playback = self._call_api(
+            f'https://apis-jiovoot.voot.com/playbackjv/v3/{video_id}', video_id,
+            'Downloading playback JSON', headers={
+                **self.geo_verification_headers(),
+                'accesstoken': self._ACCESS_TOKEN or self._GUEST_TOKEN,
+                **self._APP_NAME,
+                'deviceid': self._DEVICE_ID,
+                'uniqueid': self._USER_ID,
+                'x-apisignatures': self._API_SIGNATURES,
+                'x-platform': 'androidweb',
+                'x-platform-token': 'web',
+            }, data={
+                '4k': False,
+                'ageGroup': '18+',
+                'appVersion': '3.4.0',
+                'bitrateProfile': 'xhdpi',
+                'capability': {
+                    'drmCapability': {
+                        'aesSupport': 'yes',
+                        'fairPlayDrmSupport': 'none',
+                        'playreadyDrmSupport': 'none',
+                        'widevineDRMSupport': 'none',
+                    },
+                    'frameRateCapability': [{
+                        'frameRateSupport': '30fps',
+                        'videoQuality': '1440p',
+                    }],
+                },
+                'continueWatchingRequired': False,
+                'dolby': False,
+                'downloadRequest': False,
+                'hevc': False,
+                'kidsSafe': False,
+                'manufacturer': 'Windows',
+                'model': 'Windows',
+                'multiAudioRequired': True,
+                'osVersion': '10',
+                'parentalPinValid': True,
+                'x-apisignatures': self._API_SIGNATURES,
+            })
+
+        status_code = traverse_obj(playback, ('code', {int}))
+        if status_code == 474:
+            self.raise_geo_restricted(countries=['IN'])
+        elif status_code == 1008:
+            error_msg = 'This content is only available for premium users'
+            if self._ACCESS_TOKEN:
+                raise ExtractorError(error_msg, expected=True)
+            self.raise_login_required(f'{error_msg}. {self._LOGIN_HINT}', method=None)
+        elif status_code == 400:
+            raise ExtractorError('The requested content is not available', expected=True)
+        elif status_code is not None and status_code != 200:
+            raise ExtractorError(
+                f'JioCinema says: {traverse_obj(playback, ("message", {str})) or status_code}')
+
+        metadata = self._download_json(
+            f'{self._METADATA_API_BASE}/voot/v1/voot-web/content/query/asset-details',
+            video_id, fatal=False, query={
+                'ids': f'include:{video_id}',
+                'responseType': 'common',
+                'devicePlatformType': 'desktop',
+            })
+
+        return {
+            'id': video_id,
+            'http_headers': self._API_HEADERS,
+            **self._extract_formats_and_subtitles(playback, video_id),
+            **traverse_obj(playback, ('data', {
+                # fallback metadata
+                'title': ('name', {str}),
+                'description': ('fullSynopsis', {str}),
+                'series': ('show', 'name', {str}, filter),
+                'season': ('tournamentName', {str}, {lambda x: x if x != 'Season 0' else None}),
+                'season_number': ('episode', 'season', {int_or_none}, filter),
+                'episode': ('fullTitle', {str}),
+                'episode_number': ('episode', 'episodeNo', {int_or_none}, filter),
+                'age_limit': ('ageNemonic', {parse_age_limit}),
+                'duration': ('totalDuration', {float_or_none}),
+                'thumbnail': ('images', {url_or_none}),
+            })),
+            **traverse_obj(metadata, ('result', 0, {
+                'title': ('fullTitle', {str}),
+                'description': ('fullSynopsis', {str}),
+                'series': ('showName', {str}, filter),
+                'season': ('seasonName', {str}, filter),
+                'season_number': ('season', {int_or_none}),
+                'season_id': ('seasonId', {str}, filter),
+                'episode': ('fullTitle', {str}),
+                'episode_number': ('episode', {int_or_none}),
+                'timestamp': ('uploadTime', {int_or_none}),
+                'release_date': ('telecastDate', {str}),
+                'age_limit': ('ageNemonic', {parse_age_limit}),
+                'duration': ('duration', {float_or_none}),
+                'genres': ('genres', ..., {str}),
+                'thumbnail': ('seo', 'ogImage', {url_or_none}),
+            })),
+        }
+
+
+class JioCinemaSeriesIE(JioCinemaBaseIE):
+    IE_NAME = 'jiocinema:series'
+    _VALID_URL = r'https?://(?:www\.)?jiocinema\.com/tv-shows/(?P<slug>[\w-]+)/(?P<id>\d{3,})'
+    _TESTS = [{
+        'url': 'https://www.jiocinema.com/tv-shows/naagin/3499917',
+        'info_dict': {
+            'id': '3499917',
+            'title': 'naagin',
+        },
+        'playlist_mincount': 120,
+    }, {
+        'url': 'https://www.jiocinema.com/tv-shows/mtv-splitsvilla-x5/3499820',
+        'info_dict': {
+            'id': '3499820',
+            'title': 'mtv-splitsvilla-x5',
+        },
+        'playlist_mincount': 310,
+    }]
+
+    def _entries(self, series_id):
+        seasons = traverse_obj(self._download_json(
+            f'{self._METADATA_API_BASE}/voot/v1/voot-web/view/show/{series_id}', series_id,
+            'Downloading series metadata JSON', query={'responseType': 'common'}), (
+            'trays', lambda _, v: v['trayId'] == 'season-by-show-multifilter',
+            'trayTabs', lambda _, v: v['id']))
+
+        for season_num, season in enumerate(seasons, start=1):
+            season_id = season['id']
+            label = season.get('label') or season_num
+            for page_num in itertools.count(1):
+                episodes = traverse_obj(self._download_json(
+                    f'{self._METADATA_API_BASE}/voot/v1/voot-web/content/generic/series-wise-episode',
+                    season_id, f'Downloading season {label} page {page_num} JSON', query={
+                        'sort': 'episode:asc',
+                        'id': season_id,
+                        'responseType': 'common',
+                        'page': page_num,
+                    }), ('result', lambda _, v: v['id'] and url_or_none(v['slug'])))
+                if not episodes:
+                    break
+                for episode in episodes:
+                    yield self.url_result(
+                        episode['slug'], JioCinemaIE, **traverse_obj(episode, {
+                            'video_id': 'id',
+                            'video_title': ('fullTitle', {str}),
+                            'season_number': ('season', {int_or_none}),
+                            'episode_number': ('episode', {int_or_none}),
+                        }))
+
+    def _real_extract(self, url):
+        slug, series_id = self._match_valid_url(url).group('slug', 'id')
+        return self.playlist_result(self._entries(series_id), series_id, slug)
diff --git a/plugins/youtube_download/yt_dlp/extractor/jiosaavn.py b/plugins/youtube_download/yt_dlp/extractor/jiosaavn.py
new file mode 100644
index 0000000..030fe68
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/jiosaavn.py
@@ -0,0 +1,201 @@
+import functools
+import math
+import re
+
+from .common import InfoExtractor
+from ..utils import (
+    InAdvancePagedList,
+    clean_html,
+    int_or_none,
+    make_archive_id,
+    smuggle_url,
+    unsmuggle_url,
+    url_basename,
+    url_or_none,
+    urlencode_postdata,
+)
+from ..utils.traversal import traverse_obj
+
+
+class JioSaavnBaseIE(InfoExtractor):
+    _API_URL = 'https://www.jiosaavn.com/api.php'
+    _VALID_BITRATES = {'16', '32', '64', '128', '320'}
+
+    @functools.cached_property
+    def requested_bitrates(self):
+        requested_bitrates = self._configuration_arg('bitrate', ['128', '320'], ie_key='JioSaavn')
+        if invalid_bitrates := set(requested_bitrates) - self._VALID_BITRATES:
+            raise ValueError(
+                f'Invalid bitrate(s): {", ".join(invalid_bitrates)}. '
+                f'Valid bitrates are: {", ".join(sorted(self._VALID_BITRATES, key=int))}')
+        return requested_bitrates
+
+    def _extract_formats(self, song_data):
+        for bitrate in self.requested_bitrates:
+            media_data = self._download_json(
+                self._API_URL, song_data['id'],
+                f'Downloading format info for {bitrate}',
+                fatal=False, data=urlencode_postdata({
+                    '__call': 'song.generateAuthToken',
+                    '_format': 'json',
+                    'bitrate': bitrate,
+                    'url': song_data['encrypted_media_url'],
+                }))
+            if not traverse_obj(media_data, ('auth_url', {url_or_none})):
+                self.report_warning(f'Unable to extract format info for {bitrate}')
+                continue
+            ext = media_data.get('type')
+            yield {
+                'url': media_data['auth_url'],
+                'ext': 'm4a' if ext == 'mp4' else ext,
+                'format_id': bitrate,
+                'abr': int(bitrate),
+                'vcodec': 'none',
+            }
+
+    def _extract_song(self, song_data, url=None):
+        info = traverse_obj(song_data, {
+            'id': ('id', {str}),
+            'title': ('song', {clean_html}),
+            'album': ('album', {clean_html}),
+            'thumbnail': ('image', {url_or_none}, {lambda x: re.sub(r'-\d+x\d+\.', '-500x500.', x)}),
+            'duration': ('duration', {int_or_none}),
+            'view_count': ('play_count', {int_or_none}),
+            'release_year': ('year', {int_or_none}),
+            'artists': ('primary_artists', {lambda x: x.split(', ') if x else None}),
+            'webpage_url': ('perma_url', {url_or_none}),
+        })
+        if webpage_url := info.get('webpage_url') or url:
+            info['display_id'] = url_basename(webpage_url)
+            info['_old_archive_ids'] = [make_archive_id(JioSaavnSongIE, info['display_id'])]
+
+        return info
+
+    def _call_api(self, type_, token, note='API', params={}):
+        return self._download_json(
+            self._API_URL, token, f'Downloading {note} JSON', f'Unable to download {note} JSON',
+            query={
+                '__call': 'webapi.get',
+                '_format': 'json',
+                '_marker': '0',
+                'ctx': 'web6dot0',
+                'token': token,
+                'type': type_,
+                **params,
+            })
+
+    def _yield_songs(self, playlist_data):
+        for song_data in traverse_obj(playlist_data, ('songs', lambda _, v: v['id'] and v['perma_url'])):
+            song_info = self._extract_song(song_data)
+            url = smuggle_url(song_info['webpage_url'], {
+                'id': song_data['id'],
+                'encrypted_media_url': song_data['encrypted_media_url'],
+            })
+            yield self.url_result(url, JioSaavnSongIE, url_transparent=True, **song_info)
+
+
+class JioSaavnSongIE(JioSaavnBaseIE):
+    IE_NAME = 'jiosaavn:song'
+    _VALID_URL = r'https?://(?:www\.)?(?:jiosaavn\.com/song/[^/?#]+/|saavn\.com/s/song/(?:[^/?#]+/){3})(?P<id>[^/?#]+)'
+    _TESTS = [{
+        'url': 'https://www.jiosaavn.com/song/leja-re/OQsEfQFVUXk',
+        'md5': '3b84396d15ed9e083c3106f1fa589c04',
+        'info_dict': {
+            'id': 'IcoLuefJ',
+            'display_id': 'OQsEfQFVUXk',
+            'ext': 'm4a',
+            'title': 'Leja Re',
+            'album': 'Leja Re',
+            'thumbnail': r're:https?://c.saavncdn.com/258/Leja-Re-Hindi-2018-20181124024539-500x500.jpg',
+            'duration': 205,
+            'view_count': int,
+            'release_year': 2018,
+            'artists': ['Sandesh Shandilya', 'Dhvani Bhanushali', 'Tanishk Bagchi'],
+            '_old_archive_ids': ['jiosaavnsong OQsEfQFVUXk'],
+        },
+    }, {
+        'url': 'https://www.saavn.com/s/song/hindi/Saathiya/O-Humdum-Suniyo-Re/KAMiazoCblU',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        url, smuggled_data = unsmuggle_url(url)
+        song_data = traverse_obj(smuggled_data, ({
+            'id': ('id', {str}),
+            'encrypted_media_url': ('encrypted_media_url', {str}),
+        }))
+
+        if 'id' in song_data and 'encrypted_media_url' in song_data:
+            result = {'id': song_data['id']}
+        else:
+            # only extract metadata if this is not a url_transparent result
+            song_data = self._call_api('song', self._match_id(url))['songs'][0]
+            result = self._extract_song(song_data, url)
+
+        result['formats'] = list(self._extract_formats(song_data))
+        return result
+
+
+class JioSaavnAlbumIE(JioSaavnBaseIE):
+    IE_NAME = 'jiosaavn:album'
+    _VALID_URL = r'https?://(?:www\.)?(?:jio)?saavn\.com/album/[^/?#]+/(?P<id>[^/?#]+)'
+    _TESTS = [{
+        'url': 'https://www.jiosaavn.com/album/96/buIOjYZDrNA_',
+        'info_dict': {
+            'id': 'buIOjYZDrNA_',
+            'title': '96',
+        },
+        'playlist_count': 10,
+    }]
+
+    def _real_extract(self, url):
+        display_id = self._match_id(url)
+        album_data = self._call_api('album', display_id)
+
+        return self.playlist_result(
+            self._yield_songs(album_data), display_id, traverse_obj(album_data, ('title', {str})))
+
+
+class JioSaavnPlaylistIE(JioSaavnBaseIE):
+    IE_NAME = 'jiosaavn:playlist'
+    _VALID_URL = r'https?://(?:www\.)?(?:jio)?saavn\.com/(?:s/playlist/(?:[^/?#]+/){2}|featured/[^/?#]+/)(?P<id>[^/?#]+)'
+    _TESTS = [{
+        'url': 'https://www.jiosaavn.com/s/playlist/2279fbe391defa793ad7076929a2f5c9/mood-english/LlJ8ZWT1ibN5084vKHRj2Q__',
+        'info_dict': {
+            'id': 'LlJ8ZWT1ibN5084vKHRj2Q__',
+            'title': 'Mood English',
+        },
+        'playlist_mincount': 301,
+    }, {
+        'url': 'https://www.jiosaavn.com/s/playlist/2279fbe391defa793ad7076929a2f5c9/mood-hindi/DVR,pFUOwyXqIp77B1JF,A__',
+        'info_dict': {
+            'id': 'DVR,pFUOwyXqIp77B1JF,A__',
+            'title': 'Mood Hindi',
+        },
+        'playlist_mincount': 801,
+    }, {
+        'url': 'https://www.jiosaavn.com/featured/taaza-tunes/Me5RridRfDk_',
+        'info_dict': {
+            'id': 'Me5RridRfDk_',
+            'title': 'Taaza Tunes',
+        },
+        'playlist_mincount': 301,
+    }]
+    _PAGE_SIZE = 50
+
+    def _fetch_page(self, token, page):
+        return self._call_api(
+            'playlist', token, f'playlist page {page}', {'p': page, 'n': self._PAGE_SIZE})
+
+    def _entries(self, token, first_page_data, page):
+        page_data = first_page_data if not page else self._fetch_page(token, page + 1)
+        yield from self._yield_songs(page_data)
+
+    def _real_extract(self, url):
+        display_id = self._match_id(url)
+        playlist_data = self._fetch_page(display_id, 1)
+        total_pages = math.ceil(int(playlist_data['list_count']) / self._PAGE_SIZE)
+
+        return self.playlist_result(InAdvancePagedList(
+            functools.partial(self._entries, display_id, playlist_data),
+            total_pages, self._PAGE_SIZE), display_id, traverse_obj(playlist_data, ('listname', {str})))
diff --git a/plugins/youtube_download/yt_dlp/extractor/joj.py b/plugins/youtube_download/yt_dlp/extractor/joj.py
index ea46042..0c8e999 100644
--- a/plugins/youtube_download/yt_dlp/extractor/joj.py
+++ b/plugins/youtube_download/yt_dlp/extractor/joj.py
@@ -1,5 +1,4 @@
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     format_field,
     int_or_none,
@@ -25,7 +24,7 @@ class JojIE(InfoExtractor):
             'title': 'NOVÉ BÝVANIE',
             'thumbnail': r're:^https?://.*?$',
             'duration': 3118,
-        }
+        },
     }, {
         'url': 'https://media.joj.sk/embed/CSM0Na0l0p1',
         'info_dict': {
@@ -35,7 +34,7 @@ class JojIE(InfoExtractor):
             'title': 'Extrémne rodiny 2 - POKRAČOVANIE (2012/04/09 21:30:00)',
             'duration': 3937,
             'thumbnail': r're:^https?://.*?$',
-        }
+        },
     }, {
         'url': 'https://media.joj.sk/embed/9i1cxv',
         'only_matching': True,
@@ -51,7 +50,7 @@ class JojIE(InfoExtractor):
         video_id = self._match_id(url)
 
         webpage = self._download_webpage(
-            'https://media.joj.sk/embed/%s' % video_id, video_id)
+            f'https://media.joj.sk/embed/{video_id}', video_id)
 
         title = (self._search_json(r'videoTitle\s*:', webpage, 'title', video_id,
                                    contains_pattern=r'["\'].+["\']', default=None)
@@ -66,7 +65,7 @@ class JojIE(InfoExtractor):
 
         formats = []
         for format_url in try_get(bitrates, lambda x: x['mp4'], list) or []:
-            if isinstance(format_url, compat_str):
+            if isinstance(format_url, str):
                 height = self._search_regex(
                     r'(\d+)[pP]|(pal)\.', format_url, 'height', default=None)
                 if height == 'pal':
@@ -78,7 +77,7 @@ class JojIE(InfoExtractor):
                 })
         if not formats:
             playlist = self._download_xml(
-                'https://media.joj.sk/services/Video.php?clip=%s' % video_id,
+                f'https://media.joj.sk/services/Video.php?clip={video_id}',
                 video_id)
             for file_el in playlist.findall('./files/file'):
                 path = file_el.get('path')
@@ -86,8 +85,8 @@ class JojIE(InfoExtractor):
                     continue
                 format_id = file_el.get('id') or file_el.get('label')
                 formats.append({
-                    'url': 'http://n16.joj.sk/storage/%s' % path.replace(
-                        'dat/', '', 1),
+                    'url': 'http://n16.joj.sk/storage/{}'.format(path.replace(
+                        'dat/', '', 1)),
                     'format_id': format_id,
                     'height': int_or_none(self._search_regex(
                         r'(\d+)[pP]', format_id or path, 'height',
diff --git a/plugins/youtube_download/yt_dlp/extractor/joqrag.py b/plugins/youtube_download/yt_dlp/extractor/joqrag.py
new file mode 100644
index 0000000..7a91d4a
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/joqrag.py
@@ -0,0 +1,112 @@
+import datetime as dt
+import urllib.parse
+
+from .common import InfoExtractor
+from ..utils import (
+    clean_html,
+    datetime_from_str,
+    unified_timestamp,
+    urljoin,
+)
+
+
+class JoqrAgIE(InfoExtractor):
+    IE_DESC = '超!A&G+ 文化放送 (f.k.a. AGQR) Nippon Cultural Broadcasting, Inc. (JOQR)'
+    _VALID_URL = [r'https?://www\.uniqueradio\.jp/agplayer5/(?:player|inc-player-hls)\.php',
+                  r'https?://(?:www\.)?joqr\.co\.jp/ag/',
+                  r'https?://(?:www\.)?joqr\.co\.jp/qr/ag(?:daily|regular)program/?(?:$|[#?])']
+    _TESTS = [{
+        'url': 'https://www.uniqueradio.jp/agplayer5/player.php',
+        'info_dict': {
+            'id': 'live',
+            'title': str,
+            'channel': '超!A&G+',
+            'description': str,
+            'live_status': 'is_live',
+            'release_timestamp': int,
+        },
+        'params': {
+            'skip_download': True,
+            'ignore_no_formats_error': True,
+        },
+    }, {
+        'url': 'https://www.uniqueradio.jp/agplayer5/inc-player-hls.php',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.joqr.co.jp/ag/article/103760/',
+        'only_matching': True,
+    }, {
+        'url': 'http://www.joqr.co.jp/qr/agdailyprogram/',
+        'only_matching': True,
+    }, {
+        'url': 'http://www.joqr.co.jp/qr/agregularprogram/',
+        'only_matching': True,
+    }]
+
+    def _extract_metadata(self, variable, html):
+        return clean_html(urllib.parse.unquote_plus(self._search_regex(
+            rf'var\s+{variable}\s*=\s*(["\'])(?P<value>(?:(?!\1).)+)\1',
+            html, 'metadata', group='value', default=''))) or None
+
+    def _extract_start_timestamp(self, video_id, is_live):
+        def extract_start_time_from(date_str):
+            dt_ = datetime_from_str(date_str) + dt.timedelta(hours=9)
+            date = dt_.strftime('%Y%m%d')
+            start_time = self._search_regex(
+                r'<h3[^>]+\bclass="dailyProgram-itemHeaderTime"[^>]*>[\s\d:]+–\s*(\d{1,2}:\d{1,2})',
+                self._download_webpage(
+                    f'https://www.joqr.co.jp/qr/agdailyprogram/?date={date}', video_id,
+                    note=f'Downloading program list of {date}', fatal=False,
+                    errnote=f'Failed to download program list of {date}') or '',
+                'start time', default=None)
+            if start_time:
+                return unified_timestamp(f'{dt_.strftime("%Y/%m/%d")} {start_time} +09:00')
+            return None
+
+        start_timestamp = extract_start_time_from('today')
+        if not start_timestamp:
+            return None
+
+        if not is_live or start_timestamp < datetime_from_str('now').timestamp():
+            return start_timestamp
+        else:
+            return extract_start_time_from('yesterday')
+
+    def _real_extract(self, url):
+        video_id = 'live'
+
+        metadata = self._download_webpage(
+            'https://www.uniqueradio.jp/aandg', video_id,
+            note='Downloading metadata', errnote='Failed to download metadata')
+        title = self._extract_metadata('Program_name', metadata)
+
+        if not title or title == '放送休止':
+            formats = []
+            live_status = 'is_upcoming'
+            release_timestamp = self._extract_start_timestamp(video_id, False)
+            msg = 'This stream is not currently live'
+            if release_timestamp:
+                msg += (' and will start at '
+                        + dt.datetime.fromtimestamp(release_timestamp).strftime('%Y-%m-%d %H:%M:%S'))
+            self.raise_no_formats(msg, expected=True)
+        else:
+            m3u8_path = self._search_regex(
+                r'<source\s[^>]*\bsrc="([^"]+)"',
+                self._download_webpage(
+                    'https://www.uniqueradio.jp/agplayer5/inc-player-hls.php', video_id,
+                    note='Downloading player data', errnote='Failed to download player data'),
+                'm3u8 url')
+            formats = self._extract_m3u8_formats(
+                urljoin('https://www.uniqueradio.jp/', m3u8_path), video_id)
+            live_status = 'is_live'
+            release_timestamp = self._extract_start_timestamp(video_id, True)
+
+        return {
+            'id': video_id,
+            'title': title,
+            'channel': '超!A&G+',
+            'description': self._extract_metadata('Program_text', metadata),
+            'formats': formats,
+            'live_status': live_status,
+            'release_timestamp': release_timestamp,
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/jove.py b/plugins/youtube_download/yt_dlp/extractor/jove.py
index 245fe73..6b37ccf 100644
--- a/plugins/youtube_download/yt_dlp/extractor/jove.py
+++ b/plugins/youtube_download/yt_dlp/extractor/jove.py
@@ -1,8 +1,5 @@
 from .common import InfoExtractor
-from ..utils import (
-    ExtractorError,
-    unified_strdate
-)
+from ..utils import ExtractorError, unified_strdate
 
 
 class JoveIE(InfoExtractor):
@@ -19,7 +16,7 @@ class JoveIE(InfoExtractor):
                 'description': 'md5:015dd4509649c0908bc27f049e0262c6',
                 'thumbnail': r're:^https?://.*\.png$',
                 'upload_date': '20110523',
-            }
+            },
         },
         {
             'url': 'http://www.jove.com/video/51796/culturing-caenorhabditis-elegans-axenic-liquid-media-creation',
@@ -31,7 +28,7 @@ class JoveIE(InfoExtractor):
                 'description': 'md5:35ff029261900583970c4023b70f1dc9',
                 'thumbnail': r're:^https?://.*\.png$',
                 'upload_date': '20140802',
-            }
+            },
         },
 
     ]
diff --git a/plugins/youtube_download/yt_dlp/extractor/jstream.py b/plugins/youtube_download/yt_dlp/extractor/jstream.py
index 3e2e627..00ac7cc 100644
--- a/plugins/youtube_download/yt_dlp/extractor/jstream.py
+++ b/plugins/youtube_download/yt_dlp/extractor/jstream.py
@@ -1,6 +1,6 @@
 import base64
-import re
 import json
+import re
 
 from .common import InfoExtractor
 from ..utils import (
diff --git a/plugins/youtube_download/yt_dlp/extractor/jtbc.py b/plugins/youtube_download/yt_dlp/extractor/jtbc.py
new file mode 100644
index 0000000..573f749
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/jtbc.py
@@ -0,0 +1,156 @@
+import re
+
+from .common import InfoExtractor
+from ..utils import (
+    int_or_none,
+    parse_duration,
+    url_or_none,
+)
+from ..utils.traversal import traverse_obj
+
+
+class JTBCIE(InfoExtractor):
+    IE_DESC = 'jtbc.co.kr'
+    _VALID_URL = r'''(?x)
+        https?://(?:
+            vod\.jtbc\.co\.kr/player/(?:program|clip)
+            |tv\.jtbc\.co\.kr/(?:replay|trailer|clip)/pr\d+/pm\d+
+        )/(?P<id>(?:ep|vo)\d+)'''
+    _GEO_COUNTRIES = ['KR']
+
+    _TESTS = [{
+        'url': 'https://tv.jtbc.co.kr/replay/pr10011629/pm10067930/ep20216321/view',
+        'md5': 'e6ade71d8c8685bbfd6e6ce4167c6a6c',
+        'info_dict': {
+            'id': 'VO10721192',
+            'display_id': 'ep20216321',
+            'ext': 'mp4',
+            'title': '힘쎈여자 강남순 2회 다시보기',
+            'description': 'md5:043c1d9019100ce271dba09995dbd1e2',
+            'duration': 3770.0,
+            'release_date': '20231008',
+            'age_limit': 15,
+            'thumbnail': 'https://fs.jtbc.co.kr//joydata/CP00000001/prog/drama/stronggirlnamsoon/img/20231008_163541_522_1.jpg',
+            'series': '힘쎈여자 강남순',
+        },
+    }, {
+        'url': 'https://vod.jtbc.co.kr/player/program/ep20216733',
+        'md5': '217a6d190f115a75e4bda0ceaa4cd7f4',
+        'info_dict': {
+            'id': 'VO10721429',
+            'display_id': 'ep20216733',
+            'ext': 'mp4',
+            'title': '헬로 마이 닥터 친절한 진료실 149회 다시보기',
+            'description': 'md5:1d70788a982dd5de26874a92fcffddb8',
+            'duration': 2720.0,
+            'release_date': '20231009',
+            'age_limit': 15,
+            'thumbnail': 'https://fs.jtbc.co.kr//joydata/CP00000001/prog/culture/hellomydoctor/img/20231009_095002_528_1.jpg',
+            'series': '헬로 마이 닥터 친절한 진료실',
+        },
+    }, {
+        'url': 'https://vod.jtbc.co.kr/player/clip/vo10721270',
+        'md5': '05782e2dc22a9c548aebefe62ae4328a',
+        'info_dict': {
+            'id': 'VO10721270',
+            'display_id': 'vo10721270',
+            'ext': 'mp4',
+            'title': '뭉쳐야 찬다3 2회 예고편 - A매치로 향하는 마지막 관문💥',
+            'description': 'md5:d48b51a8655c84843b4ed8d0c39aae68',
+            'duration': 46.0,
+            'release_date': '20231015',
+            'age_limit': 15,
+            'thumbnail': 'https://fs.jtbc.co.kr//joydata/CP00000001/prog/enter/soccer3/img/20231008_210957_775_1.jpg',
+            'series': '뭉쳐야 찬다3',
+        },
+    }, {
+        'url': 'https://tv.jtbc.co.kr/trailer/pr10010392/pm10032526/vo10720912/view',
+        'md5': '367d480eb3ef54a9cd7a4b4d69c4b32d',
+        'info_dict': {
+            'id': 'VO10720912',
+            'display_id': 'vo10720912',
+            'ext': 'mp4',
+            'title': '아는 형님 404회 예고편 | 10월 14일(토) 저녁 8시 50분 방송!',
+            'description': 'md5:2743bb1079ceb85bb00060f2ad8f0280',
+            'duration': 148.0,
+            'release_date': '20231014',
+            'age_limit': 15,
+            'thumbnail': 'https://fs.jtbc.co.kr//joydata/CP00000001/prog/enter/jtbcbros/img/20231006_230023_802_1.jpg',
+            'series': '아는 형님',
+        },
+    }]
+
+    def _real_extract(self, url):
+        display_id = self._match_id(url)
+
+        if display_id.startswith('vo'):
+            video_id = display_id.upper()
+        else:
+            webpage = self._download_webpage(url, display_id)
+            video_id = self._search_regex(r'data-vod="(VO\d+)"', webpage, 'vod id')
+
+        playback_data = self._download_json(
+            f'https://api.jtbc.co.kr/vod/{video_id}', video_id, note='Downloading VOD playback data')
+
+        subtitles = {}
+        for sub in traverse_obj(playback_data, ('tracks', lambda _, v: v['file'])):
+            subtitles.setdefault(sub.get('label', 'und'), []).append({'url': sub['file']})
+
+        formats = []
+        for stream_url in traverse_obj(playback_data, ('sources', 'HLS', ..., 'file', {url_or_none})):
+            stream_url = re.sub(r'/playlist(?:_pd\d+)?\.m3u8', '/index.m3u8', stream_url)
+            formats.extend(self._extract_m3u8_formats(stream_url, video_id, fatal=False))
+
+        metadata = self._download_json(
+            'https://now-api.jtbc.co.kr/v1/vod/detail', video_id,
+            note='Downloading mobile details', fatal=False, query={'vodFileId': video_id})
+        return {
+            'id': video_id,
+            'display_id': display_id,
+            **traverse_obj(metadata, ('vodDetail', {
+                'title': 'vodTitleView',
+                'series': 'programTitle',
+                'age_limit': ('watchAge', {int_or_none}),
+                'release_date': ('broadcastDate', {lambda x: re.match(r'\d{8}', x.replace('.', ''))}, 0),
+                'description': 'episodeContents',
+                'thumbnail': ('imgFileUrl', {url_or_none}),
+            })),
+            'duration': parse_duration(playback_data.get('playTime')),
+            'formats': formats,
+            'subtitles': subtitles,
+        }
+
+
+class JTBCProgramIE(InfoExtractor):
+    IE_NAME = 'JTBC:program'
+    _VALID_URL = r'https?://(?:vod\.jtbc\.co\.kr/program|tv\.jtbc\.co\.kr/replay)/(?P<id>pr\d+)/(?:replay|pm\d+)/?(?:$|[?#])'
+
+    _TESTS = [{
+        'url': 'https://tv.jtbc.co.kr/replay/pr10010392/pm10032710',
+        'info_dict': {
+            '_type': 'playlist',
+            'id': 'pr10010392',
+        },
+        'playlist_count': 398,
+    }, {
+        'url': 'https://vod.jtbc.co.kr/program/pr10011491/replay',
+        'info_dict': {
+            '_type': 'playlist',
+            'id': 'pr10011491',
+        },
+        'playlist_count': 59,
+    }]
+
+    def _real_extract(self, url):
+        program_id = self._match_id(url)
+
+        vod_list = self._download_json(
+            'https://now-api.jtbc.co.kr/v1/vodClip/programHome/programReplayVodList', program_id,
+            note='Downloading program replay list', query={
+                'programId': program_id,
+                'rowCount': '10000',
+            })
+
+        entries = [self.url_result(f'https://vod.jtbc.co.kr/player/program/{video_id}', JTBCIE, video_id)
+                   for video_id in traverse_obj(vod_list, ('programReplayVodList', ..., 'episodeId'))]
+        return self.playlist_result(entries, program_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/jwplatform.py b/plugins/youtube_download/yt_dlp/extractor/jwplatform.py
index bc47aa6..7d5a931 100644
--- a/plugins/youtube_download/yt_dlp/extractor/jwplatform.py
+++ b/plugins/youtube_download/yt_dlp/extractor/jwplatform.py
@@ -18,7 +18,7 @@ class JWPlatformIE(InfoExtractor):
             'timestamp': 1227796140,
             'duration': 32.0,
             'thumbnail': 'https://cdn.jwplayer.com/v2/media/nPripu9l/poster.jpg?width=720',
-        }
+        },
     }, {
         'url': 'https://cdn.jwplayer.com/players/nPripu9l-ALJ3XQCI.js',
         'only_matching': True,
@@ -72,7 +72,7 @@ class JWPlatformIE(InfoExtractor):
             # <input value=URL> is used by hyland.com
             # if we find <iframe>, dont look for <input>
             ret = re.findall(
-                r'<%s[^>]+?%s=\\?["\']?((?:https?:)?//(?:content\.jwplatform|cdn\.jwplayer)\.com/players/[a-zA-Z0-9]{8})' % (tag, key),
+                rf'<{tag}[^>]+?{key}=\\?["\']?((?:https?:)?//(?:content\.jwplatform|cdn\.jwplayer)\.com/players/[a-zA-Z0-9]{{8}})',
                 webpage)
             if ret:
                 return ret
diff --git a/plugins/youtube_download/yt_dlp/extractor/kakao.py b/plugins/youtube_download/yt_dlp/extractor/kakao.py
index 43055e8..6f3459d 100644
--- a/plugins/youtube_download/yt_dlp/extractor/kakao.py
+++ b/plugins/youtube_download/yt_dlp/extractor/kakao.py
@@ -3,8 +3,8 @@ from ..networking.exceptions import HTTPError
 from ..utils import (
     ExtractorError,
     int_or_none,
-    strip_or_none,
     str_or_none,
+    strip_or_none,
     traverse_obj,
     unified_timestamp,
 )
@@ -33,7 +33,7 @@ class KakaoIE(InfoExtractor):
             'view_count': int,
             'duration': 1503,
             'comment_count': int,
-        }
+        },
     }, {
         'url': 'http://tv.kakao.com/channel/2653210/cliplink/300103180',
         'md5': 'a8917742069a4dd442516b86e7d66529',
@@ -52,7 +52,7 @@ class KakaoIE(InfoExtractor):
             'view_count': int,
             'duration': 184,
             'comment_count': int,
-        }
+        },
     }, {
         # geo restricted
         'url': 'https://tv.kakao.com/channel/3643855/cliplink/412069491',
@@ -76,7 +76,7 @@ class KakaoIE(InfoExtractor):
                 'description', 'channelId', 'createTime', 'duration', 'playCount',
                 'likeCount', 'commentCount', 'tagList', 'channel', 'name',
                 'clipChapterThumbnailList', 'thumbnailUrl', 'timeInSec', 'isDefault',
-                'videoOutputList', 'width', 'height', 'kbps', 'profile', 'label'])
+                'videoOutputList', 'width', 'height', 'kbps', 'profile', 'label']),
         }
 
         api_json = self._download_json(
@@ -99,7 +99,7 @@ class KakaoIE(InfoExtractor):
             try:
                 fmt_url_json = self._download_json(
                     cdn_api_base, video_id, query=query,
-                    note='Downloading video URL for profile %s' % profile_name)
+                    note=f'Downloading video URL for profile {profile_name}')
             except ExtractorError as e:
                 if isinstance(e.cause, HTTPError) and e.cause.status == 403:
                     resp = self._parse_json(e.cause.response.read().decode(), video_id)
@@ -126,7 +126,7 @@ class KakaoIE(InfoExtractor):
             thumbs.append({
                 'url': thumb.get('thumbnailUrl'),
                 'id': str(thumb.get('timeInSec')),
-                'preference': -1 if thumb.get('isDefault') else 0
+                'preference': -1 if thumb.get('isDefault') else 0,
             })
         top_thumbnail = clip.get('thumbnailUrl')
         if top_thumbnail:
diff --git a/plugins/youtube_download/yt_dlp/extractor/kaltura.py b/plugins/youtube_download/yt_dlp/extractor/kaltura.py
index 95e2dee..6d51e32 100644
--- a/plugins/youtube_download/yt_dlp/extractor/kaltura.py
+++ b/plugins/youtube_download/yt_dlp/extractor/kaltura.py
@@ -1,21 +1,19 @@
 import base64
+import contextlib
 import json
 import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_urlparse,
-    compat_parse_qs,
-)
 from ..utils import (
-    clean_html,
     ExtractorError,
+    clean_html,
     format_field,
     int_or_none,
-    unsmuggle_url,
+    remove_start,
     smuggle_url,
     traverse_obj,
-    remove_start
+    unsmuggle_url,
 )
 
 
@@ -24,7 +22,7 @@ class KalturaIE(InfoExtractor):
                 (?:
                     kaltura:(?P<partner_id>\w+):(?P<id>\w+)(?::(?P<player_type>\w+))?|
                     https?://
-                        (:?(?:www|cdnapi(?:sec)?)\.)?kaltura\.com(?::\d+)?/
+                        (?:(?:www|cdnapi(?:sec)?)\.)?kaltura\.com(?::\d+)?/
                         (?:
                             (?:
                                 # flash player
@@ -57,7 +55,7 @@ class KalturaIE(InfoExtractor):
                 'thumbnail': 're:^https?://.*/thumbnail/.*',
                 'timestamp': int,
             },
-            'skip': 'The access to this service is forbidden since the specified partner is blocked'
+            'skip': 'The access to this service is forbidden since the specified partner is blocked',
         },
         {
             'url': 'http://www.kaltura.com/index.php/kwidget/cache_st/1300318621/wid/_269692/uiconf_id/3873291/entry_id/1_1jc2y3e4',
@@ -124,14 +122,14 @@ class KalturaIE(InfoExtractor):
                 'view_count': int,
                 'upload_date': '20140815',
                 'thumbnail': 'http://cfvod.kaltura.com/p/691292/sp/69129200/thumbnail/entry_id/0_c076mna6/version/100022',
-            }
+            },
         },
         {
             # html5lib playlist URL using kwidget player
             'url': 'https://cdnapisec.kaltura.com/html5/html5lib/v2.89/mwEmbedFrame.php/p/2019031/uiconf_id/40436601?wid=1_4j3m32cv&iframeembed=true&playerId=kaltura_player_&flashvars[playlistAPI.kpl0Id]=1_jovey5nu&flashvars[ks]=&&flashvars[imageDefaultDuration]=30&flashvars[localizationCode]=en&flashvars[leadWithHTML5]=true&flashvars[forceMobileHTML5]=true&flashvars[nextPrevBtn.plugin]=true&flashvars[hotspots.plugin]=true&flashvars[sideBarContainer.plugin]=true&flashvars[sideBarContainer.position]=left&flashvars[sideBarContainer.clickToClose]=true&flashvars[chapters.plugin]=true&flashvars[chapters.layout]=vertical&flashvars[chapters.thumbnailRotator]=false&flashvars[streamSelector.plugin]=true&flashvars[EmbedPlayer.SpinnerTarget]=videoHolder&flashvars[dualScreen.plugin]=true&flashvars[playlistAPI.playlistUrl]=https://canvasgatechtest.kaf.kaltura.com/playlist/details/{playlistAPI.kpl0Id}/categoryid/126428551',
             'info_dict': {
                 'id': '1_jovey5nu',
-                'title': '00-00 Introduction'
+                'title': '00-00 Introduction',
             },
             'playlist': [
                 {
@@ -145,7 +143,7 @@ class KalturaIE(InfoExtractor):
                         'timestamp': 1533154447,
                         'upload_date': '20180801',
                         'uploader_id': 'djoyner3',
-                    }
+                    },
                 }, {
                     'info_dict': {
                         'id': '1_jfb7mdpn',
@@ -157,7 +155,7 @@ class KalturaIE(InfoExtractor):
                         'timestamp': 1533154489,
                         'upload_date': '20180801',
                         'uploader_id': 'djoyner3',
-                    }
+                    },
                 }, {
                     'info_dict': {
                         'id': '1_8xflxdp7',
@@ -169,7 +167,7 @@ class KalturaIE(InfoExtractor):
                         'timestamp': 1533154512,
                         'upload_date': '20180801',
                         'uploader_id': 'djoyner3',
-                    }
+                    },
                 }, {
                     'info_dict': {
                         'id': '1_3hqew8kn',
@@ -181,10 +179,10 @@ class KalturaIE(InfoExtractor):
                         'timestamp': 1533154536,
                         'upload_date': '20180801',
                         'uploader_id': 'djoyner3',
-                    }
-                }
-            ]
-        }
+                    },
+                },
+            ],
+        },
     ]
 
     @classmethod
@@ -192,14 +190,14 @@ class KalturaIE(InfoExtractor):
         # Embed codes: https://knowledge.kaltura.com/embedding-kaltura-media-players-your-site
         finditer = (
             list(re.finditer(
-                r"""(?xs)
+                r'''(?xs)
                     kWidget\.(?:thumb)?[Ee]mbed\(
                     \{.*?
                         (?P<q1>['"])wid(?P=q1)\s*:\s*
                         (?P<q2>['"])_?(?P<partner_id>(?:(?!(?P=q2)).)+)(?P=q2),.*?
                         (?P<q3>['"])entry_?[Ii]d(?P=q3)\s*:\s*
                         (?P<q4>['"])(?P<id>(?:(?!(?P=q4)).)+)(?P=q4)(?:,|\s*\})
-                """, webpage))
+                ''', webpage))
             or list(re.finditer(
                 r'''(?xs)
                     (?P<q1>["'])
@@ -230,34 +228,34 @@ class KalturaIE(InfoExtractor):
             for k, v in embed_info.items():
                 if v:
                     embed_info[k] = v.strip()
-            embed_url = 'kaltura:%(partner_id)s:%(id)s' % embed_info
+            embed_url = 'kaltura:{partner_id}:{id}'.format(**embed_info)
             escaped_pid = re.escape(embed_info['partner_id'])
             service_mobj = re.search(
-                r'<script[^>]+src=(["\'])(?P<id>(?:https?:)?//(?:(?!\1).)+)/p/%s/sp/%s00/embedIframeJs' % (escaped_pid, escaped_pid),
+                rf'<script[^>]+src=(["\'])(?P<id>(?:https?:)?//(?:(?!\1).)+)/p/{escaped_pid}/sp/{escaped_pid}00/embedIframeJs',
                 webpage)
             if service_mobj:
                 embed_url = smuggle_url(embed_url, {'service_url': service_mobj.group('id')})
             urls.append(embed_url)
         return urls
 
-    def _kaltura_api_call(self, video_id, actions, service_url=None, *args, **kwargs):
+    def _kaltura_api_call(self, video_id, actions, service_url=None, **kwargs):
         params = actions[0]
-        params.update({i: a for i, a in enumerate(actions[1:], start=1)})
+        params.update(dict(enumerate(actions[1:], start=1)))
 
         data = self._download_json(
             (service_url or self._SERVICE_URL) + self._SERVICE_BASE,
-            video_id, data=json.dumps(params).encode('utf-8'),
+            video_id, data=json.dumps(params).encode(),
             headers={
                 'Content-Type': 'application/json',
                 'Accept-Encoding': 'gzip, deflate, br',
-            }, *args, **kwargs)
+            }, **kwargs)
 
         for idx, status in enumerate(data):
             if not isinstance(status, dict):
                 continue
             if status.get('objectType') == 'KalturaAPIException':
                 raise ExtractorError(
-                    '%s said: %s (%d)' % (self.IE_NAME, status['message'], idx))
+                    '{} said: {} ({})'.format(self.IE_NAME, status['message'], idx))
 
         data[1] = traverse_obj(data, (1, 'objects', 0))
 
@@ -342,7 +340,7 @@ class KalturaIE(InfoExtractor):
                 'apiVersion': '3.1',
                 'clientTag': 'kwidget:v2.89',
                 'ignoreNull': 1,
-                'ks': '{1:result:ks}'
+                'ks': '{1:result:ks}',
             },
             # info
             {
@@ -397,10 +395,10 @@ class KalturaIE(InfoExtractor):
                 raise ExtractorError('Invalid URL', expected=True)
             params = {}
             if query:
-                params = compat_parse_qs(query)
+                params = urllib.parse.parse_qs(query)
             if path:
                 splitted_path = path.split('/')
-                params.update(dict((zip(splitted_path[::2], [[v] for v in splitted_path[1::2]]))))
+                params.update(dict(zip(splitted_path[::2], [[v] for v in splitted_path[1::2]])))
             if 'wid' in params:
                 partner_id = remove_start(params['wid'][0], '_')
             elif 'p' in params:
@@ -423,14 +421,11 @@ class KalturaIE(InfoExtractor):
                 # Unfortunately, data returned in kalturaIframePackageData lacks
                 # captions so we will try requesting the complete data using
                 # regular approach since we now know the entry_id
-                try:
+                # Even if this fails we already have everything extracted
+                # apart from captions and can process at least with this
+                with contextlib.suppress(ExtractorError):
                     _, info, flavor_assets, captions = self._get_video_info(
                         entry_id, partner_id, player_type=player_type)
-                except ExtractorError:
-                    # Regular scenario failed but we already have everything
-                    # extracted apart from captions and can process at least
-                    # with this
-                    pass
             elif 'uiconf_id' in params and 'flashvars[playlistAPI.kpl0Id]' in params:
                 playlist_id = params['flashvars[playlistAPI.kpl0Id]'][0]
                 webpage = self._download_webpage(url, playlist_id)
@@ -451,16 +446,16 @@ class KalturaIE(InfoExtractor):
         source_url = smuggled_data.get('source_url')
         if source_url:
             referrer = base64.b64encode(
-                '://'.join(compat_urlparse.urlparse(source_url)[:2])
-                .encode('utf-8')).decode('utf-8')
+                '://'.join(urllib.parse.urlparse(source_url)[:2])
+                .encode()).decode('utf-8')
         else:
             referrer = None
 
         def sign_url(unsigned_url):
             if ks:
-                unsigned_url += '/ks/%s' % ks
+                unsigned_url += f'/ks/{ks}'
             if referrer:
-                unsigned_url += '?referrer=%s' % referrer
+                unsigned_url += f'?referrer={referrer}'
             return unsigned_url
 
         data_url = info['dataUrl']
@@ -487,8 +482,8 @@ class KalturaIE(InfoExtractor):
                 else:
                     f['fileExt'] = 'mp4'
             video_url = sign_url(
-                '%s/flavorId/%s' % (data_url, f['id']))
-            format_id = '%(fileExt)s-%(bitrate)s' % f
+                '{}/flavorId/{}'.format(data_url, f['id']))
+            format_id = '{fileExt}-{bitrate}'.format(**f)
             # Source format may not be available (e.g. kaltura:513551:1_66x4rg7o)
             if f.get('isOriginal') is True and not self._is_valid_url(
                     video_url, entry_id, format_id):
@@ -527,7 +522,7 @@ class KalturaIE(InfoExtractor):
                     continue
                 caption_format = int_or_none(caption.get('format'))
                 subtitles.setdefault(caption.get('languageCode') or caption.get('language'), []).append({
-                    'url': '%s/api_v3/service/caption_captionasset/action/serve/captionAssetId/%s' % (self._SERVICE_URL, caption['id']),
+                    'url': '{}/api_v3/service/caption_captionasset/action/serve/captionAssetId/{}'.format(self._SERVICE_URL, caption['id']),
                     'ext': caption.get('fileExt') or self._CAPTION_TYPES.get(caption_format) or 'ttml',
                 })
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/kanal2.py b/plugins/youtube_download/yt_dlp/extractor/kanal2.py
deleted file mode 100644
index 3c0efe5..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/kanal2.py
+++ /dev/null
@@ -1,66 +0,0 @@
-from .common import InfoExtractor
-from ..utils import (
-    ExtractorError,
-    join_nonempty,
-    traverse_obj,
-    unified_timestamp,
-    update_url_query,
-)
-
-
-class Kanal2IE(InfoExtractor):
-    _VALID_URL = r'https?://kanal2\.postimees\.ee/[^?#]+\?([^#]+&)?id=(?P<id>\d+)'
-    _TESTS = [{
-        'note': 'Test standard url (#5575)',
-        'url': 'https://kanal2.postimees.ee/pluss/video/?id=40792',
-        'md5': '7ea7b16266ec1798743777df241883dd',
-        'info_dict': {
-            'id': '40792',
-            'ext': 'mp4',
-            'title': 'Aedniku aabits / Osa 53  (05.08.2016 20:00)',
-            'thumbnail': r're:https?://.*\.jpg$',
-            'description': 'md5:53cabf3c5d73150d594747f727431248',
-            'upload_date': '20160805',
-            'timestamp': 1470420000,
-        },
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        playlist = self._download_json(
-            f'https://kanal2.postimees.ee/player/playlist/{video_id}',
-            video_id, query={'type': 'episodes'},
-            headers={'X-Requested-With': 'XMLHttpRequest'})
-
-        return {
-            'id': video_id,
-            'title': join_nonempty(*traverse_obj(playlist, ('info', ('title', 'subtitle'))), delim=' / '),
-            'description': traverse_obj(playlist, ('info', 'description')),
-            'thumbnail': traverse_obj(playlist, ('data', 'image')),
-            'formats': self.get_formats(playlist, video_id),
-            'timestamp': unified_timestamp(self._search_regex(
-                r'\((\d{2}\.\d{2}\.\d{4}\s\d{2}:\d{2})\)$',
-                traverse_obj(playlist, ('info', 'subtitle')), 'timestamp', default='') + ' +0200'),
-        }
-
-    def get_formats(self, playlist, video_id):
-        path = traverse_obj(playlist, ('data', 'path'))
-        if not path:
-            raise ExtractorError('Path value not found in playlist JSON response')
-        session = self._download_json(
-            'https://sts.postimees.ee/session/register',
-            video_id, note='Creating session', errnote='Error creating session',
-            headers={
-                'X-Original-URI': path,
-                'Accept': 'application/json',
-            })
-        if session.get('reason') != 'OK' or not session.get('session'):
-            reason = session.get('reason', 'unknown error')
-            raise ExtractorError(f'Unable to obtain session: {reason}')
-
-        formats = []
-        for stream in traverse_obj(playlist, ('data', 'streams', ..., 'file')):
-            formats.extend(self._extract_m3u8_formats(
-                update_url_query(stream, {'s': session['session']}), video_id, 'mp4'))
-
-        return formats
diff --git a/plugins/youtube_download/yt_dlp/extractor/kankanews.py b/plugins/youtube_download/yt_dlp/extractor/kankanews.py
index 46e239b..a39ff78 100644
--- a/plugins/youtube_download/yt_dlp/extractor/kankanews.py
+++ b/plugins/youtube_download/yt_dlp/extractor/kankanews.py
@@ -1,13 +1,14 @@
-import time
+import hashlib
 import random
 import string
-import hashlib
+import time
 import urllib.parse
 
 from .common import InfoExtractor
 
 
 class KankaNewsIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?kankanews\.com/a/\d+\-\d+\-\d+/(?P<id>\d+)\.shtml'
     _TESTS = [{
         'url': 'https://www.kankanews.com/a/2022-11-08/00310276054.shtml?appid=1088227',
@@ -18,7 +19,7 @@ class KankaNewsIE(InfoExtractor):
             'ext': 'mp4',
             'title': '视频｜第23个中国记者节，我们在进博切蛋糕',
             'thumbnail': r're:^https?://.*\.jpg*',
-        }
+        },
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/karaoketv.py b/plugins/youtube_download/yt_dlp/extractor/karaoketv.py
index 381dc00..8168b1a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/karaoketv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/karaoketv.py
@@ -13,7 +13,7 @@ class KaraoketvIE(InfoExtractor):
         'params': {
             # rtmp download
             'skip_download': True,
-        }
+        },
     }
 
     def _real_extract(self, url):
@@ -45,7 +45,7 @@ class KaraoketvIE(InfoExtractor):
             servers = ('wowzail.video-cdn.com:80/vodcdn', )
 
         formats = [{
-            'url': 'rtmp://%s' % server if not server.startswith('rtmp') else server,
+            'url': f'rtmp://{server}' if not server.startswith('rtmp') else server,
             'play_path': play_path,
             'app': 'vodcdn',
             'page_url': video_cdn_url,
diff --git a/plugins/youtube_download/yt_dlp/extractor/karrierevideos.py b/plugins/youtube_download/yt_dlp/extractor/karrierevideos.py
deleted file mode 100644
index 28d4841..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/karrierevideos.py
+++ /dev/null
@@ -1,96 +0,0 @@
-from .common import InfoExtractor
-from ..compat import compat_urlparse
-from ..utils import (
-    fix_xml_ampersands,
-    float_or_none,
-    xpath_with_ns,
-    xpath_text,
-)
-
-
-class KarriereVideosIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?karrierevideos\.at(?:/[^/]+)+/(?P<id>[^/]+)'
-    _TESTS = [{
-        'url': 'http://www.karrierevideos.at/berufsvideos/mittlere-hoehere-schulen/altenpflegerin',
-        'info_dict': {
-            'id': '32c91',
-            'ext': 'flv',
-            'title': 'AltenpflegerIn',
-            'description': 'md5:dbadd1259fde2159a9b28667cb664ae2',
-            'thumbnail': r're:^http://.*\.png',
-        },
-        'params': {
-            # rtmp download
-            'skip_download': True,
-        }
-    }, {
-        # broken ampersands
-        'url': 'http://www.karrierevideos.at/orientierung/vaeterkarenz-und-neue-chancen-fuer-muetter-baby-was-nun',
-        'info_dict': {
-            'id': '5sniu',
-            'ext': 'flv',
-            'title': 'Väterkarenz und neue Chancen für Mütter - "Baby - was nun?"',
-            'description': 'md5:97092c6ad1fd7d38e9d6a5fdeb2bcc33',
-            'thumbnail': r're:^http://.*\.png',
-        },
-        'params': {
-            # rtmp download
-            'skip_download': True,
-        }
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        webpage = self._download_webpage(url, video_id)
-
-        title = (self._html_search_meta('title', webpage, default=None)
-                 or self._search_regex(r'<h1 class="title">([^<]+)</h1>', webpage, 'video title'))
-
-        video_id = self._search_regex(
-            r'/config/video/(.+?)\.xml', webpage, 'video id')
-        # Server returns malformed headers
-        # Force Accept-Encoding: * to prevent gzipped results
-        playlist = self._download_xml(
-            'http://www.karrierevideos.at/player-playlist.xml.php?p=%s' % video_id,
-            video_id, transform_source=fix_xml_ampersands,
-            headers={'Accept-Encoding': '*'})
-
-        NS_MAP = {
-            'jwplayer': 'http://developer.longtailvideo.com/trac/wiki/FlashFormats'
-        }
-
-        def ns(path):
-            return xpath_with_ns(path, NS_MAP)
-
-        item = playlist.find('./tracklist/item')
-        video_file = xpath_text(
-            item, ns('./jwplayer:file'), 'video url', fatal=True)
-        streamer = xpath_text(
-            item, ns('./jwplayer:streamer'), 'streamer', fatal=True)
-
-        uploader = xpath_text(
-            item, ns('./jwplayer:author'), 'uploader')
-        duration = float_or_none(
-            xpath_text(item, ns('./jwplayer:duration'), 'duration'))
-
-        description = self._html_search_regex(
-            r'(?s)<div class="leadtext">(.+?)</div>',
-            webpage, 'description')
-
-        thumbnail = self._html_search_meta(
-            'thumbnail', webpage, 'thumbnail')
-        if thumbnail:
-            thumbnail = compat_urlparse.urljoin(url, thumbnail)
-
-        return {
-            'id': video_id,
-            'url': streamer.replace('rtmpt', 'rtmp'),
-            'play_path': 'mp4:%s' % video_file,
-            'ext': 'flv',
-            'title': title,
-            'description': description,
-            'thumbnail': thumbnail,
-            'uploader': uploader,
-            'duration': duration,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/keezmovies.py b/plugins/youtube_download/yt_dlp/extractor/keezmovies.py
deleted file mode 100644
index b50da42..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/keezmovies.py
+++ /dev/null
@@ -1,125 +0,0 @@
-import re
-
-from .common import InfoExtractor
-from ..aes import aes_decrypt_text
-from ..compat import compat_urllib_parse_unquote
-from ..utils import (
-    determine_ext,
-    format_field,
-    int_or_none,
-    str_to_int,
-    strip_or_none,
-    url_or_none,
-)
-
-
-class KeezMoviesIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?keezmovies\.com/video/(?:(?P<display_id>[^/]+)-)?(?P<id>\d+)'
-    _TESTS = [{
-        'url': 'https://www.keezmovies.com/video/arab-wife-want-it-so-bad-i-see-she-thirsty-and-has-tiny-money-18070681',
-        'md5': '2ac69cdb882055f71d82db4311732a1a',
-        'info_dict': {
-            'id': '18070681',
-            'display_id': 'arab-wife-want-it-so-bad-i-see-she-thirsty-and-has-tiny-money',
-            'ext': 'mp4',
-            'title': 'Arab wife want it so bad I see she thirsty and has tiny money.',
-            'thumbnail': None,
-            'view_count': int,
-            'age_limit': 18,
-        }
-    }, {
-        'url': 'http://www.keezmovies.com/video/18070681',
-        'only_matching': True,
-    }]
-
-    def _extract_info(self, url, fatal=True):
-        mobj = self._match_valid_url(url)
-        video_id = mobj.group('id')
-        display_id = (mobj.group('display_id')
-                      if 'display_id' in mobj.groupdict()
-                      else None) or mobj.group('id')
-
-        webpage = self._download_webpage(
-            url, display_id, headers={'Cookie': 'age_verified=1'})
-
-        formats = []
-        format_urls = set()
-
-        title = None
-        thumbnail = None
-        duration = None
-        encrypted = False
-
-        def extract_format(format_url, height=None):
-            format_url = url_or_none(format_url)
-            if not format_url or not format_url.startswith(('http', '//')):
-                return
-            if format_url in format_urls:
-                return
-            format_urls.add(format_url)
-            tbr = int_or_none(self._search_regex(
-                r'[/_](\d+)[kK][/_]', format_url, 'tbr', default=None))
-            if not height:
-                height = int_or_none(self._search_regex(
-                    r'[/_](\d+)[pP][/_]', format_url, 'height', default=None))
-            if encrypted:
-                format_url = aes_decrypt_text(
-                    video_url, title, 32).decode('utf-8')
-            formats.append({
-                'url': format_url,
-                'format_id': format_field(height, None, '%dp'),
-                'height': height,
-                'tbr': tbr,
-            })
-
-        flashvars = self._parse_json(
-            self._search_regex(
-                r'flashvars\s*=\s*({.+?});', webpage,
-                'flashvars', default='{}'),
-            display_id, fatal=False)
-
-        if flashvars:
-            title = flashvars.get('video_title')
-            thumbnail = flashvars.get('image_url')
-            duration = int_or_none(flashvars.get('video_duration'))
-            encrypted = flashvars.get('encrypted') is True
-            for key, value in flashvars.items():
-                mobj = re.search(r'quality_(\d+)[pP]', key)
-                if mobj:
-                    extract_format(value, int(mobj.group(1)))
-            video_url = flashvars.get('video_url')
-            if video_url and determine_ext(video_url, None):
-                extract_format(video_url)
-
-        video_url = self._html_search_regex(
-            r'flashvars\.video_url\s*=\s*(["\'])(?P<url>http.+?)\1',
-            webpage, 'video url', default=None, group='url')
-        if video_url:
-            extract_format(compat_urllib_parse_unquote(video_url))
-
-        if not formats:
-            if 'title="This video is no longer available"' in webpage:
-                self.raise_no_formats(
-                    'Video %s is no longer available' % video_id, expected=True)
-
-        if not title:
-            title = self._html_search_regex(
-                r'<h1[^>]*>([^<]+)', webpage, 'title')
-
-        return webpage, {
-            'id': video_id,
-            'display_id': display_id,
-            'title': strip_or_none(title),
-            'thumbnail': thumbnail,
-            'duration': duration,
-            'age_limit': 18,
-            'formats': formats,
-        }
-
-    def _real_extract(self, url):
-        webpage, info = self._extract_info(url, fatal=False)
-        if not info['formats']:
-            return self.url_result(url, 'Generic')
-        info['view_count'] = str_to_int(self._search_regex(
-            r'<b>([\d,.]+)</b> Views?', webpage, 'view count', fatal=False))
-        return info
diff --git a/plugins/youtube_download/yt_dlp/extractor/kelbyone.py b/plugins/youtube_download/yt_dlp/extractor/kelbyone.py
index 2ca9ad4..0ac0c5e 100644
--- a/plugins/youtube_download/yt_dlp/extractor/kelbyone.py
+++ b/plugins/youtube_download/yt_dlp/extractor/kelbyone.py
@@ -3,6 +3,7 @@ from ..utils import int_or_none
 
 
 class KelbyOneIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://members\.kelbyone\.com/course/(?P<id>[^$&?#/]+)'
 
     _TESTS = [{
@@ -23,7 +24,7 @@ class KelbyOneIE(InfoExtractor):
                 'duration': 90,
                 'upload_date': '20201001',
             },
-        }]
+        }],
     }]
 
     def _entries(self, playlist):
diff --git a/plugins/youtube_download/yt_dlp/extractor/kenh14.py b/plugins/youtube_download/yt_dlp/extractor/kenh14.py
new file mode 100644
index 0000000..3c46020
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/kenh14.py
@@ -0,0 +1,160 @@
+from .common import InfoExtractor
+from ..utils import (
+    clean_html,
+    extract_attributes,
+    get_element_by_class,
+    get_element_html_by_attribute,
+    get_elements_html_by_class,
+    int_or_none,
+    parse_duration,
+    parse_iso8601,
+    remove_start,
+    strip_or_none,
+    unescapeHTML,
+    update_url,
+    url_or_none,
+)
+from ..utils.traversal import traverse_obj
+
+
+class Kenh14VideoIE(InfoExtractor):
+    _VALID_URL = r'https?://video\.kenh14\.vn/(?:video/)?[\w-]+-(?P<id>[0-9]+)\.chn'
+    _TESTS = [{
+        'url': 'https://video.kenh14.vn/video/mo-hop-iphone-14-pro-max-nguon-unbox-therapy-316173.chn',
+        'md5': '1ed67f9c3a1e74acf15db69590cf6210',
+        'info_dict': {
+            'id': '316173',
+            'ext': 'mp4',
+            'title': 'Video mở hộp iPhone 14 Pro Max (Nguồn: Unbox Therapy)',
+            'description': 'Video mở hộp iPhone 14 Pro MaxVideo mở hộp iPhone 14 Pro Max (Nguồn: Unbox Therapy)',
+            'thumbnail': r're:^https?://videothumbs\.mediacdn\.vn/.*\.jpg$',
+            'tags': [],
+            'uploader': 'Unbox Therapy',
+            'upload_date': '20220517',
+            'view_count': int,
+            'duration': 722.86,
+            'timestamp': 1652764468,
+        },
+    }, {
+        'url': 'https://video.kenh14.vn/video-316174.chn',
+        'md5': '2b41877d2afaf4a3f487ceda8e5c7cbd',
+        'info_dict': {
+            'id': '316174',
+            'ext': 'mp4',
+            'title': 'Khoảnh khắc VĐV nằm gục khóc sau chiến thắng: 7 năm trời Việt Nam mới có HCV kiếm chém nữ, chỉ có 8 tháng để khổ luyện trước khi lên sàn đấu',
+            'description': 'md5:de86aa22e143e2b277bce8ec9c6f17dc',
+            'thumbnail': r're:^https?://videothumbs\.mediacdn\.vn/.*\.jpg$',
+            'tags': [],
+            'upload_date': '20220517',
+            'view_count': int,
+            'duration': 70.04,
+            'timestamp': 1652766021,
+        },
+    }, {
+        'url': 'https://video.kenh14.vn/0-344740.chn',
+        'md5': 'b843495d5e728142c8870c09b46df2a9',
+        'info_dict': {
+            'id': '344740',
+            'ext': 'mov',
+            'title': 'Kỳ Duyên đầy căng thẳng trong buổi ra quân đi Miss Universe, nghi thức tuyên thuệ lần đầu xuất hiện gây nhiều tranh cãi',
+            'description': 'md5:2a2dbb4a7397169fb21ee68f09160497',
+            'thumbnail': r're:^https?://kenh14cdn\.com/.*\.jpg$',
+            'tags': ['kỳ duyên', 'Kỳ Duyên tuyên thuệ', 'miss universe'],
+            'uploader': 'Quang Vũ',
+            'upload_date': '20241024',
+            'view_count': int,
+            'duration': 198.88,
+            'timestamp': 1729741590,
+        },
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+
+        attrs = extract_attributes(get_element_html_by_attribute('type', 'VideoStream', webpage) or '')
+        direct_url = attrs['data-vid']
+
+        metadata = self._download_json(
+            'https://api.kinghub.vn/video/api/v1/detailVideoByGet?FileName={}'.format(
+                remove_start(direct_url, 'kenh14cdn.com/')), video_id, fatal=False)
+
+        formats = [{'url': f'https://{direct_url}', 'format_id': 'http', 'quality': 1}]
+        subtitles = {}
+        video_data = self._download_json(
+            f'https://{direct_url}.json', video_id, note='Downloading video data', fatal=False)
+        if hls_url := traverse_obj(video_data, ('hls', {url_or_none})):
+            fmts, subs = self._extract_m3u8_formats_and_subtitles(
+                hls_url, video_id, m3u8_id='hls', fatal=False)
+            formats.extend(fmts)
+            self._merge_subtitles(subs, target=subtitles)
+        if dash_url := traverse_obj(video_data, ('mpd', {url_or_none})):
+            fmts, subs = self._extract_mpd_formats_and_subtitles(
+                dash_url, video_id, mpd_id='dash', fatal=False)
+            formats.extend(fmts)
+            self._merge_subtitles(subs, target=subtitles)
+
+        return {
+            **traverse_obj(metadata, {
+                'duration': ('duration', {parse_duration}),
+                'uploader': ('author', {strip_or_none}),
+                'timestamp': ('uploadtime', {parse_iso8601(delimiter=' ')}),
+                'view_count': ('views', {int_or_none}),
+            }),
+            'id': video_id,
+            'title': (
+                traverse_obj(metadata, ('title', {strip_or_none}))
+                or clean_html(self._og_search_title(webpage))
+                or clean_html(get_element_by_class('vdbw-title', webpage))),
+            'formats': formats,
+            'subtitles': subtitles,
+            'description': (
+                clean_html(self._og_search_description(webpage))
+                or clean_html(get_element_by_class('vdbw-sapo', webpage))),
+            'thumbnail': (self._og_search_thumbnail(webpage) or attrs.get('data-thumb')),
+            'tags': traverse_obj(self._html_search_meta('keywords', webpage), (
+                {lambda x: x.split(';')}, ..., filter)),
+        }
+
+
+class Kenh14PlaylistIE(InfoExtractor):
+    _VALID_URL = r'https?://video\.kenh14\.vn/playlist/[\w-]+-(?P<id>[0-9]+)\.chn'
+    _TESTS = [{
+        'url': 'https://video.kenh14.vn/playlist/tran-tinh-naked-love-mua-2-71.chn',
+        'info_dict': {
+            'id': '71',
+            'title': 'Trần Tình (Naked love) mùa 2',
+            'description': 'md5:e9522339304956dea931722dd72eddb2',
+            'thumbnail': r're:^https?://kenh14cdn\.com/.*\.png$',
+        },
+        'playlist_count': 9,
+    }, {
+        'url': 'https://video.kenh14.vn/playlist/0-72.chn',
+        'info_dict': {
+            'id': '72',
+            'title': 'Lau Lại Đầu Từ',
+            'description': 'Cùng xem xưa và nay có gì khác biệt nhé!',
+            'thumbnail': r're:^https?://kenh14cdn\.com/.*\.png$',
+        },
+        'playlist_count': 6,
+    }]
+
+    def _real_extract(self, url):
+        playlist_id = self._match_id(url)
+        webpage = self._download_webpage(url, playlist_id)
+
+        category_detail = get_element_by_class('category-detail', webpage) or ''
+        embed_info = traverse_obj(
+            self._yield_json_ld(webpage, playlist_id),
+            (lambda _, v: v['name'] and v['alternateName'], any)) or {}
+
+        return self.playlist_from_matches(
+            get_elements_html_by_class('video-item', webpage), playlist_id,
+            (clean_html(get_element_by_class('name', category_detail)) or unescapeHTML(embed_info.get('name'))),
+            getter=lambda x: 'https://video.kenh14.vn/video/video-{}.chn'.format(extract_attributes(x)['data-id']),
+            ie=Kenh14VideoIE, playlist_description=(
+                clean_html(get_element_by_class('description', category_detail))
+                or unescapeHTML(embed_info.get('alternateName'))),
+            thumbnail=traverse_obj(
+                self._og_search_thumbnail(webpage),
+                ({url_or_none}, {update_url(query=None)})))
diff --git a/plugins/youtube_download/yt_dlp/extractor/khanacademy.py b/plugins/youtube_download/yt_dlp/extractor/khanacademy.py
index 5333036..42eef3c 100644
--- a/plugins/youtube_download/yt_dlp/extractor/khanacademy.py
+++ b/plugins/youtube_download/yt_dlp/extractor/khanacademy.py
@@ -3,43 +3,52 @@ import json
 from .common import InfoExtractor
 from ..utils import (
     int_or_none,
+    make_archive_id,
     parse_iso8601,
-    try_get,
+    str_or_none,
+    traverse_obj,
+    url_or_none,
+    urljoin,
 )
 
 
 class KhanAcademyBaseIE(InfoExtractor):
     _VALID_URL_TEMPL = r'https?://(?:www\.)?khanacademy\.org/(?P<id>(?:[^/]+/){%s}%s[^?#/&]+)'
 
+    _PUBLISHED_CONTENT_VERSION = 'dc34750f0572c80f5effe7134082fe351143c1e4'
+
     def _parse_video(self, video):
         return {
             '_type': 'url_transparent',
             'url': video['youtubeId'],
-            'id': video.get('slug'),
-            'title': video.get('title'),
-            'thumbnail': video.get('imageUrl') or video.get('thumbnailUrl'),
-            'duration': int_or_none(video.get('duration')),
-            'description': video.get('description'),
+            'id': video['youtubeId'],
             'ie_key': 'Youtube',
+            **traverse_obj(video, {
+                'display_id': ('id', {str_or_none}),
+                'title': ('translatedTitle', {str}),
+                'thumbnail': ('thumbnailUrls', ..., 'url', {url_or_none}),
+                'duration': ('duration', {int_or_none}),
+                'description': ('description', {str}),
+            }, get_all=False),
         }
 
     def _real_extract(self, url):
         display_id = self._match_id(url)
         content = self._download_json(
-            'https://www.khanacademy.org/api/internal/graphql/FetchContentData',
-            display_id, query={
+            'https://www.khanacademy.org/api/internal/graphql/ContentForPath', display_id,
+            query={
                 'fastly_cacheable': 'persist_until_publish',
-                'hash': '4134764944',
-                'lang': 'en',
+                'pcv': self._PUBLISHED_CONTENT_VERSION,
+                'hash': '3712657851',
                 'variables': json.dumps({
                     'path': display_id,
-                    'queryParams': 'lang=en',
-                    'isModal': False,
-                    'followRedirects': True,
                     'countryCode': 'US',
+                    'kaLocale': 'en',
+                    'clientPublishedContentVersion': self._PUBLISHED_CONTENT_VERSION,
                 }),
-            })['data']['contentJson']
-        return self._parse_component_props(self._parse_json(content, display_id)['componentProps'])
+                'lang': 'en',
+            })['data']['contentRoute']['listedPathData']
+        return self._parse_component_props(content, display_id)
 
 
 class KhanAcademyIE(KhanAcademyBaseIE):
@@ -47,64 +56,98 @@ class KhanAcademyIE(KhanAcademyBaseIE):
     _VALID_URL = KhanAcademyBaseIE._VALID_URL_TEMPL % ('4', 'v/')
     _TEST = {
         'url': 'https://www.khanacademy.org/computing/computer-science/cryptography/crypt/v/one-time-pad',
-        'md5': '9c84b7b06f9ebb80d22a5c8dedefb9a0',
+        'md5': '1d5c2e70fa6aa29c38eca419f12515ce',
         'info_dict': {
             'id': 'FlIG3TvQCBQ',
             'ext': 'mp4',
             'title': 'The one-time pad',
             'description': 'The perfect cipher',
+            'display_id': '716378217',
             'duration': 176,
-            'uploader': 'Brit Cruise',
-            'uploader_id': 'khanacademy',
+            'uploader': 'Khan Academy',
+            'uploader_id': '@khanacademy',
+            'uploader_url': 'https://www.youtube.com/@khanacademy',
             'upload_date': '20120411',
             'timestamp': 1334170113,
             'license': 'cc-by-nc-sa',
+            'live_status': 'not_live',
+            'channel': 'Khan Academy',
+            'channel_id': 'UC4a-Gbdw7vOaccHmFo40b9g',
+            'channel_url': 'https://www.youtube.com/channel/UC4a-Gbdw7vOaccHmFo40b9g',
+            'channel_is_verified': True,
+            'playable_in_embed': True,
+            'categories': ['Education'],
+            'creators': ['Brit Cruise'],
+            'tags': [],
+            'age_limit': 0,
+            'availability': 'public',
+            'comment_count': int,
+            'channel_follower_count': int,
+            'thumbnail': str,
+            'view_count': int,
+            'like_count': int,
+            'heatmap': list,
         },
         'add_ie': ['Youtube'],
     }
 
-    def _parse_component_props(self, component_props):
-        video = component_props['tutorialPageData']['contentModel']
-        info = self._parse_video(video)
-        author_names = video.get('authorNames')
-        info.update({
-            'uploader': ', '.join(author_names) if author_names else None,
-            'timestamp': parse_iso8601(video.get('dateAdded')),
-            'license': video.get('kaUserLicense'),
-        })
-        return info
+    def _parse_component_props(self, component_props, display_id):
+        video = component_props['content']
+        return {
+            **self._parse_video(video),
+            **traverse_obj(video, {
+                'creators': ('authorNames', ..., {str}),
+                'timestamp': ('dateAdded', {parse_iso8601}),
+                'license': ('kaUserLicense', {str}),
+            }),
+        }
 
 
 class KhanAcademyUnitIE(KhanAcademyBaseIE):
     IE_NAME = 'khanacademy:unit'
-    _VALID_URL = (KhanAcademyBaseIE._VALID_URL_TEMPL % ('2', '')) + '/?(?:[?#&]|$)'
-    _TEST = {
+    _VALID_URL = (KhanAcademyBaseIE._VALID_URL_TEMPL % ('1,2', '')) + '/?(?:[?#&]|$)'
+    _TESTS = [{
         'url': 'https://www.khanacademy.org/computing/computer-science/cryptography',
         'info_dict': {
-            'id': 'cryptography',
+            'id': 'x48c910b6',
             'title': 'Cryptography',
             'description': 'How have humans protected their secret messages through history? What has changed today?',
+            'display_id': 'computing/computer-science/cryptography',
+            '_old_archive_ids': ['khanacademyunit cryptography'],
         },
         'playlist_mincount': 31,
-    }
+    }, {
+        'url': 'https://www.khanacademy.org/computing/computer-science',
+        'info_dict': {
+            'id': 'x301707a0',
+            'title': 'Computer science theory',
+            'description': 'md5:4b472a4646e6cf6ec4ccb52c4062f8ba',
+            'display_id': 'computing/computer-science',
+            '_old_archive_ids': ['khanacademyunit computer-science'],
+        },
+        'playlist_mincount': 50,
+    }]
 
-    def _parse_component_props(self, component_props):
-        curation = component_props['curation']
+    def _parse_component_props(self, component_props, display_id):
+        course = component_props['course']
+        selected_unit = traverse_obj(course, (
+            'unitChildren', lambda _, v: v['relativeUrl'] == f'/{display_id}', any)) or course
 
-        entries = []
-        tutorials = try_get(curation, lambda x: x['tabs'][0]['modules'][0]['tutorials'], list) or []
-        for tutorial_number, tutorial in enumerate(tutorials, 1):
-            chapter_info = {
-                'chapter': tutorial.get('title'),
-                'chapter_number': tutorial_number,
-                'chapter_id': tutorial.get('id'),
-            }
-            for content_item in (tutorial.get('contentItems') or []):
-                if content_item.get('kind') == 'Video':
-                    info = self._parse_video(content_item)
-                    info.update(chapter_info)
-                    entries.append(info)
+        def build_entry(entry):
+            return self.url_result(urljoin(
+                'https://www.khanacademy.org', entry['canonicalUrl']),
+                KhanAcademyIE, title=entry.get('translatedTitle'))
+
+        entries = traverse_obj(selected_unit, (
+            (('unitChildren', ...), None), 'allOrderedChildren', ..., 'curatedChildren',
+            lambda _, v: v['contentKind'] == 'Video' and v['canonicalUrl'], {build_entry}))
 
         return self.playlist_result(
-            entries, curation.get('unit'), curation.get('title'),
-            curation.get('description'))
+            entries,
+            display_id=display_id,
+            **traverse_obj(selected_unit, {
+                'id': ('id', {str}),
+                'title': ('translatedTitle', {str}),
+                'description': ('translatedDescription', {str}),
+                '_old_archive_ids': ('slug', {str}, {lambda x: [make_archive_id(self, x)] if x else None}),
+            }))
diff --git a/plugins/youtube_download/yt_dlp/extractor/kick.py b/plugins/youtube_download/yt_dlp/extractor/kick.py
index d124372..1f001d4 100644
--- a/plugins/youtube_download/yt_dlp/extractor/kick.py
+++ b/plugins/youtube_download/yt_dlp/extractor/kick.py
@@ -1,9 +1,13 @@
+
 from .common import InfoExtractor
 from ..networking import HEADRequest
 from ..utils import (
     UserNotLive,
+    determine_ext,
     float_or_none,
+    int_or_none,
     merge_dicts,
+    parse_iso8601,
     str_or_none,
     traverse_obj,
     unified_timestamp,
@@ -13,7 +17,8 @@ from ..utils import (
 
 class KickBaseIE(InfoExtractor):
     def _real_initialize(self):
-        self._request_webpage(HEADRequest('https://kick.com/'), None, 'Setting up session', fatal=False)
+        self._request_webpage(
+            HEADRequest('https://kick.com/'), None, 'Setting up session', fatal=False, impersonate=True)
         xsrf_token = self._get_cookies('https://kick.com/').get('XSRF-TOKEN')
         if not xsrf_token:
             self.write_debug('kick.com did not set XSRF-TOKEN cookie')
@@ -24,103 +29,212 @@ class KickBaseIE(InfoExtractor):
 
     def _call_api(self, path, display_id, note='Downloading API JSON', headers={}, **kwargs):
         return self._download_json(
-            f'https://kick.com/api/v1/{path}', display_id, note=note,
-            headers=merge_dicts(headers, self._API_HEADERS), **kwargs)
+            f'https://kick.com/api/{path}', display_id, note=note,
+            headers=merge_dicts(headers, self._API_HEADERS), impersonate=True, **kwargs)
 
 
 class KickIE(KickBaseIE):
+    IE_NAME = 'kick:live'
     _VALID_URL = r'https?://(?:www\.)?kick\.com/(?!(?:video|categories|search|auth)(?:[/?#]|$))(?P<id>[\w-]+)'
     _TESTS = [{
-        'url': 'https://kick.com/yuppy',
+        'url': 'https://kick.com/buddha',
         'info_dict': {
-            'id': '6cde1-kickrp-joe-flemmingskick-info-heremust-knowmust-see21',
+            'id': '92722911-nopixel-40',
             'ext': 'mp4',
             'title': str,
             'description': str,
-            'channel': 'yuppy',
-            'channel_id': '33538',
-            'uploader': 'Yuppy',
-            'uploader_id': '33793',
-            'upload_date': str,
-            'live_status': 'is_live',
             'timestamp': int,
-            'thumbnail': r're:^https?://.*\.jpg',
+            'thumbnail': r're:https?://.+\.jpg',
             'categories': list,
+            'upload_date': str,
+            'channel': 'buddha',
+            'channel_id': '32807',
+            'uploader': 'Buddha',
+            'uploader_id': '33057',
+            'live_status': 'is_live',
+            'concurrent_view_count': int,
+            'release_timestamp': int,
+            'age_limit': 18,
+            'release_date': str,
         },
-        'skip': 'livestream',
+        'params': {'skip_download': 'livestream'},
+        # 'skip': 'livestream',
     }, {
-        'url': 'https://kick.com/kmack710',
+        'url': 'https://kick.com/xqc',
         'only_matching': True,
     }]
 
+    @classmethod
+    def suitable(cls, url):
+        return False if (KickVODIE.suitable(url) or KickClipIE.suitable(url)) else super().suitable(url)
+
     def _real_extract(self, url):
         channel = self._match_id(url)
-        response = self._call_api(f'channels/{channel}', channel)
+        response = self._call_api(f'v2/channels/{channel}', channel)
         if not traverse_obj(response, 'livestream', expected_type=dict):
             raise UserNotLive(video_id=channel)
 
         return {
-            'id': str(traverse_obj(
-                response, ('livestream', ('slug', 'id')), get_all=False, default=channel)),
-            'formats': self._extract_m3u8_formats(
-                response['playback_url'], channel, 'mp4', live=True),
-            'title': traverse_obj(
-                response, ('livestream', ('session_title', 'slug')), get_all=False, default=''),
-            'description': traverse_obj(response, ('user', 'bio')),
             'channel': channel,
-            'channel_id': str_or_none(traverse_obj(response, 'id', ('livestream', 'channel_id'))),
-            'uploader': traverse_obj(response, 'name', ('user', 'username')),
-            'uploader_id': str_or_none(traverse_obj(response, 'user_id', ('user', 'id'))),
             'is_live': True,
-            'timestamp': unified_timestamp(traverse_obj(response, ('livestream', 'created_at'))),
-            'thumbnail': traverse_obj(
-                response, ('livestream', 'thumbnail', 'url'), expected_type=url_or_none),
-            'categories': traverse_obj(response, ('recent_categories', ..., 'name')),
+            'formats': self._extract_m3u8_formats(response['playback_url'], channel, 'mp4', live=True),
+            **traverse_obj(response, {
+                'id': ('livestream', 'slug', {str}),
+                'title': ('livestream', 'session_title', {str}),
+                'description': ('user', 'bio', {str}),
+                'channel_id': (('id', ('livestream', 'channel_id')), {int}, {str_or_none}, any),
+                'uploader': (('name', ('user', 'username')), {str}, any),
+                'uploader_id': (('user_id', ('user', 'id')), {int}, {str_or_none}, any),
+                'timestamp': ('livestream', 'created_at', {unified_timestamp}),
+                'release_timestamp': ('livestream', 'start_time', {unified_timestamp}),
+                'thumbnail': ('livestream', 'thumbnail', 'url', {url_or_none}),
+                'categories': ('recent_categories', ..., 'name', {str}),
+                'concurrent_view_count': ('livestream', 'viewer_count', {int_or_none}),
+                'age_limit': ('livestream', 'is_mature', {bool}, {lambda x: 18 if x else 0}),
+            }),
         }
 
 
 class KickVODIE(KickBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?kick\.com/video/(?P<id>[\da-f]{8}-(?:[\da-f]{4}-){3}[\da-f]{12})'
+    IE_NAME = 'kick:vod'
+    _VALID_URL = r'https?://(?:www\.)?kick\.com/[\w-]+/videos/(?P<id>[\da-f]{8}-(?:[\da-f]{4}-){3}[\da-f]{12})'
     _TESTS = [{
-        'url': 'https://kick.com/video/54244b5e-050a-4df4-a013-b2433dafbe35',
-        'md5': '73691206a6a49db25c5aa1588e6538fc',
+        'url': 'https://kick.com/xqc/videos/8dd97a8d-e17f-48fb-8bc3-565f88dbc9ea',
+        'md5': '3870f94153e40e7121a6e46c068b70cb',
         'info_dict': {
-            'id': '54244b5e-050a-4df4-a013-b2433dafbe35',
+            'id': '8dd97a8d-e17f-48fb-8bc3-565f88dbc9ea',
             'ext': 'mp4',
-            'title': 'Making 710-carBoosting. Kinda No Pixel inspired.  !guilded  - !links',
-            'description': 'md5:a0d3546bf7955d0a8252ffe0fd6f518f',
-            'channel': 'kmack710',
-            'channel_id': '16278',
-            'uploader': 'Kmack710',
-            'uploader_id': '16412',
-            'upload_date': '20221206',
-            'timestamp': 1670318289,
-            'duration': 40104.0,
+            'title': '18+ #ad 🛑LIVE🛑CLICK🛑DRAMA🛑NEWS🛑STUFF🛑REACT🛑GET IN HHERE🛑BOP BOP🛑WEEEE WOOOO🛑',
+            'description': 'THE BEST AT ABSOLUTELY EVERYTHING. THE JUICER. LEADER OF THE JUICERS.',
+            'channel': 'xqc',
+            'channel_id': '668',
+            'uploader': 'xQc',
+            'uploader_id': '676',
+            'upload_date': '20240909',
+            'timestamp': 1725919141,
+            'duration': 10155.0,
             'thumbnail': r're:^https?://.*\.jpg',
-            'categories': ['Grand Theft Auto V'],
-        },
-        'params': {
-            'skip_download': 'm3u8',
+            'view_count': int,
+            'categories': ['Just Chatting'],
+            'age_limit': 0,
         },
+        'params': {'skip_download': 'm3u8'},
     }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        response = self._call_api(f'video/{video_id}', video_id)
+        response = self._call_api(f'v1/video/{video_id}', video_id)
 
         return {
             'id': video_id,
             'formats': self._extract_m3u8_formats(response['source'], video_id, 'mp4'),
-            'title': traverse_obj(
-                response, ('livestream', ('session_title', 'slug')), get_all=False, default=''),
-            'description': traverse_obj(response, ('livestream', 'channel', 'user', 'bio')),
-            'channel': traverse_obj(response, ('livestream', 'channel', 'slug')),
-            'channel_id': str_or_none(traverse_obj(response, ('livestream', 'channel', 'id'))),
-            'uploader': traverse_obj(response, ('livestream', 'channel', 'user', 'username')),
-            'uploader_id': str_or_none(traverse_obj(response, ('livestream', 'channel', 'user_id'))),
-            'timestamp': unified_timestamp(response.get('created_at')),
-            'duration': float_or_none(traverse_obj(response, ('livestream', 'duration')), scale=1000),
-            'thumbnail': traverse_obj(
-                response, ('livestream', 'thumbnail'), expected_type=url_or_none),
-            'categories': traverse_obj(response, ('livestream', 'categories', ..., 'name')),
+            **traverse_obj(response, {
+                'title': ('livestream', ('session_title', 'slug'), {str}, any),
+                'description': ('livestream', 'channel', 'user', 'bio', {str}),
+                'channel': ('livestream', 'channel', 'slug', {str}),
+                'channel_id': ('livestream', 'channel', 'id', {int}, {str_or_none}),
+                'uploader': ('livestream', 'channel', 'user', 'username', {str}),
+                'uploader_id': ('livestream', 'channel', 'user_id', {int}, {str_or_none}),
+                'timestamp': ('created_at', {parse_iso8601}),
+                'duration': ('livestream', 'duration', {float_or_none(scale=1000)}),
+                'thumbnail': ('livestream', 'thumbnail', {url_or_none}),
+                'categories': ('livestream', 'categories', ..., 'name', {str}),
+                'view_count': ('views', {int_or_none}),
+                'age_limit': ('livestream', 'is_mature', {bool}, {lambda x: 18 if x else 0}),
+            }),
+        }
+
+
+class KickClipIE(KickBaseIE):
+    IE_NAME = 'kick:clips'
+    _VALID_URL = r'https?://(?:www\.)?kick\.com/[\w-]+(?:/clips/|/?\?(?:[^#]+&)?clip=)(?P<id>clip_[\w-]+)'
+    _TESTS = [{
+        'url': 'https://kick.com/mxddy?clip=clip_01GYXVB5Y8PWAPWCWMSBCFB05X',
+        'info_dict': {
+            'id': 'clip_01GYXVB5Y8PWAPWCWMSBCFB05X',
+            'ext': 'mp4',
+            'title': 'Maddy detains Abd D:',
+            'channel': 'mxddy',
+            'channel_id': '133789',
+            'uploader': 'AbdCreates',
+            'uploader_id': '3309077',
+            'thumbnail': r're:^https?://.*\.jpeg',
+            'duration': 35,
+            'timestamp': 1682481453,
+            'upload_date': '20230426',
+            'view_count': int,
+            'like_count': int,
+            'categories': ['VALORANT'],
+            'age_limit': 18,
+        },
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        'url': 'https://kick.com/destiny?clip=clip_01H9SKET879NE7N9RJRRDS98J3',
+        'info_dict': {
+            'id': 'clip_01H9SKET879NE7N9RJRRDS98J3',
+            'title': 'W jews',
+            'ext': 'mp4',
+            'channel': 'destiny',
+            'channel_id': '1772249',
+            'uploader': 'punished_furry',
+            'uploader_id': '2027722',
+            'duration': 49.0,
+            'upload_date': '20230908',
+            'timestamp': 1694150180,
+            'thumbnail': 'https://clips.kick.com/clips/j3/clip_01H9SKET879NE7N9RJRRDS98J3/thumbnail.png',
+            'view_count': int,
+            'like_count': int,
+            'categories': ['Just Chatting'],
+            'age_limit': 0,
+        },
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        'url': 'https://kick.com/spreen/clips/clip_01J8RGZRKHXHXXKJEHGRM932A5',
+        'info_dict': {
+            'id': 'clip_01J8RGZRKHXHXXKJEHGRM932A5',
+            'ext': 'mp4',
+            'title': 'KLJASLDJKLJKASDLJKDAS',
+            'channel': 'spreen',
+            'channel_id': '5312671',
+            'uploader': 'AnormalBarraBaja',
+            'uploader_id': '26518262',
+            'duration': 43.0,
+            'upload_date': '20240927',
+            'timestamp': 1727399987,
+            'thumbnail': 'https://clips.kick.com/clips/f2/clip_01J8RGZRKHXHXXKJEHGRM932A5/thumbnail.webp',
+            'view_count': int,
+            'like_count': int,
+            'categories': ['Minecraft'],
+            'age_limit': 0,
+        },
+        'params': {'skip_download': 'm3u8'},
+    }]
+
+    def _real_extract(self, url):
+        clip_id = self._match_id(url)
+        clip = self._call_api(f'v2/clips/{clip_id}/play', clip_id)['clip']
+        clip_url = clip['clip_url']
+
+        if determine_ext(clip_url) == 'm3u8':
+            formats = self._extract_m3u8_formats(clip_url, clip_id, 'mp4')
+        else:
+            formats = [{'url': clip_url}]
+
+        return {
+            'id': clip_id,
+            'formats': formats,
+            **traverse_obj(clip, {
+                'title': ('title', {str}),
+                'channel': ('channel', 'slug', {str}),
+                'channel_id': ('channel', 'id', {int}, {str_or_none}),
+                'uploader': ('creator', 'username', {str}),
+                'uploader_id': ('creator', 'id', {int}, {str_or_none}),
+                'thumbnail': ('thumbnail_url', {url_or_none}),
+                'duration': ('duration', {float_or_none}),
+                'categories': ('category', 'name', {str}, all),
+                'timestamp': ('created_at', {parse_iso8601}),
+                'view_count': ('views', {int_or_none}),
+                'like_count': ('likes', {int_or_none}),
+                'age_limit': ('is_mature', {bool}, {lambda x: 18 if x else 0}),
+            }),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/kicker.py b/plugins/youtube_download/yt_dlp/extractor/kicker.py
index a2c7dd4..4ab6751 100644
--- a/plugins/youtube_download/yt_dlp/extractor/kicker.py
+++ b/plugins/youtube_download/yt_dlp/extractor/kicker.py
@@ -20,8 +20,8 @@ class KickerIE(InfoExtractor):
             'age_limit': 0,
             'thumbnail': r're:https://s\d+\.dmcdn\.net/v/T-x741YeYAx8aSZ0Z/x1080',
             'tags': ['published', 'category.InternationalSoccer'],
-            'upload_date': '20220608'
-        }
+            'upload_date': '20220608',
+        },
     }, {
         'url': 'https://www.kicker.de/ex-unioner-in-der-bezirksliga-felix-kroos-vereinschallenge-in-pankow-902825/video',
         'info_dict': {
@@ -39,7 +39,7 @@ class KickerIE(InfoExtractor):
             'uploader': 'kicker.de',
             'description': 'md5:0c2060c899a91c8bf40f578f78c5846f',
             'like_count': int,
-        }
+        },
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/kika.py b/plugins/youtube_download/yt_dlp/extractor/kika.py
new file mode 100644
index 0000000..e277564
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/kika.py
@@ -0,0 +1,168 @@
+import itertools
+
+from .common import InfoExtractor
+from ..utils import (
+    determine_ext,
+    int_or_none,
+    parse_duration,
+    parse_iso8601,
+    url_or_none,
+)
+from ..utils.traversal import traverse_obj
+
+
+class KikaIE(InfoExtractor):
+    IE_DESC = 'KiKA.de'
+    _VALID_URL = r'https?://(?:www\.)?kika\.de/[\w/-]+/videos/(?P<id>[a-z-]+\d+)'
+    _GEO_COUNTRIES = ['DE']
+
+    _TESTS = [{
+        'url': 'https://www.kika.de/logo/videos/logo-vom-samstag-einunddreissig-august-zweitausendvierundzwanzig-100',
+        'md5': 'fbfc8da483719ef06f396e5e5b938c69',
+        'info_dict': {
+            'id': 'logo-vom-samstag-einunddreissig-august-zweitausendvierundzwanzig-100',
+            'ext': 'mp4',
+            'upload_date': '20240831',
+            'timestamp': 1725126600,
+            'season_number': 2024,
+            'modified_date': '20240831',
+            'episode': 'Episode 476',
+            'episode_number': 476,
+            'season': 'Season 2024',
+            'duration': 634,
+            'title': 'logo! vom Samstag, 31. August 2024',
+            'modified_timestamp': 1725129983,
+        },
+    }, {
+        'url': 'https://www.kika.de/kaltstart/videos/video92498',
+        'md5': '710ece827e5055094afeb474beacb7aa',
+        'info_dict': {
+            'id': 'video92498',
+            'ext': 'mp4',
+            'title': '7. Wo ist Leo?',
+            'description': 'md5:fb48396a5b75068bcac1df74f1524920',
+            'duration': 436,
+            'timestamp': 1702926876,
+            'upload_date': '20231218',
+            'episode_number': 7,
+            'modified_date': '20240319',
+            'modified_timestamp': 1710880610,
+            'episode': 'Episode 7',
+            'season_number': 1,
+            'season': 'Season 1',
+        },
+    }, {
+        'url': 'https://www.kika.de/bernd-das-brot/astrobrot/videos/video90088',
+        'md5': 'ffd1b700d7de0a6616a1d08544c77294',
+        'info_dict': {
+            'id': 'video90088',
+            'ext': 'mp4',
+            'upload_date': '20221102',
+            'timestamp': 1667390580,
+            'duration': 197,
+            'modified_timestamp': 1711093771,
+            'episode_number': 8,
+            'title': 'Es ist nicht leicht, ein Astrobrot zu sein',
+            'modified_date': '20240322',
+            'description': 'md5:d3641deaf1b5515a160788b2be4159a9',
+            'season_number': 1,
+            'episode': 'Episode 8',
+            'season': 'Season 1',
+        },
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+
+        doc = self._download_json(f'https://www.kika.de/_next-api/proxy/v1/videos/{video_id}', video_id)
+        video_assets = self._download_json(doc['assets']['url'], video_id)
+
+        subtitles = {}
+        if ttml_resource := url_or_none(video_assets.get('videoSubtitle')):
+            subtitles['de'] = [{
+                'url': ttml_resource,
+                'ext': 'ttml',
+            }]
+        if webvtt_resource := url_or_none(video_assets.get('webvttUrl')):
+            subtitles.setdefault('de', []).append({
+                'url': webvtt_resource,
+                'ext': 'vtt',
+            })
+
+        return {
+            'id': video_id,
+            'formats': list(self._extract_formats(video_assets, video_id)),
+            'subtitles': subtitles,
+            **traverse_obj(doc, {
+                'title': ('title', {str}),
+                'description': ('description', {str}),
+                'timestamp': ('date', {parse_iso8601}),
+                'modified_timestamp': ('modificationDate', {parse_iso8601}),
+                'duration': ((
+                    ('durationInSeconds', {int_or_none}),
+                    ('duration', {parse_duration})), any),
+                'episode_number': ('episodeNumber', {int_or_none}),
+                'season_number': ('season', {int_or_none}),
+            }),
+        }
+
+    def _extract_formats(self, media_info, video_id):
+        for media in traverse_obj(media_info, ('assets', lambda _, v: url_or_none(v['url']))):
+            stream_url = media['url']
+            ext = determine_ext(stream_url)
+            if ext == 'm3u8':
+                yield from self._extract_m3u8_formats(
+                    stream_url, video_id, 'mp4', m3u8_id='hls', fatal=False)
+            else:
+                yield {
+                    'url': stream_url,
+                    'format_id': ext,
+                    **traverse_obj(media, {
+                        'width': ('frameWidth', {int_or_none}),
+                        'height': ('frameHeight', {int_or_none}),
+                        # NB: filesize is 0 if unknown, bitrate is -1 if unknown
+                        'filesize': ('fileSize', {int_or_none}, filter),
+                        'abr': ('bitrateAudio', {int_or_none}, {lambda x: None if x == -1 else x}),
+                        'vbr': ('bitrateVideo', {int_or_none}, {lambda x: None if x == -1 else x}),
+                    }),
+                }
+
+
+class KikaPlaylistIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?kika\.de/[\w-]+/(?P<id>[a-z-]+\d+)'
+
+    _TESTS = [{
+        'url': 'https://www.kika.de/logo/logo-die-welt-und-ich-562',
+        'info_dict': {
+            'id': 'logo-die-welt-und-ich-562',
+            'title': 'logo!',
+            'description': 'md5:7b9d7f65561b82fa512f2cfb553c397d',
+        },
+        'playlist_count': 100,
+    }]
+
+    def _entries(self, playlist_url, playlist_id):
+        for page in itertools.count(1):
+            data = self._download_json(playlist_url, playlist_id, note=f'Downloading page {page}')
+            for item in traverse_obj(data, ('content', lambda _, v: url_or_none(v['api']['url']))):
+                yield self.url_result(
+                    item['api']['url'], ie=KikaIE,
+                    **traverse_obj(item, {
+                        'id': ('id', {str}),
+                        'title': ('title', {str}),
+                        'duration': ('duration', {int_or_none}),
+                        'timestamp': ('date', {parse_iso8601}),
+                    }))
+
+            playlist_url = traverse_obj(data, ('links', 'next', {url_or_none}))
+            if not playlist_url:
+                break
+
+    def _real_extract(self, url):
+        playlist_id = self._match_id(url)
+        brand_data = self._download_json(
+            f'https://www.kika.de/_next-api/proxy/v1/brands/{playlist_id}', playlist_id)
+
+        return self.playlist_result(
+            self._entries(brand_data['videoSubchannel']['videosPageUrl'], playlist_id),
+            playlist_id, title=brand_data.get('title'), description=brand_data.get('description'))
diff --git a/plugins/youtube_download/yt_dlp/extractor/kinja.py b/plugins/youtube_download/yt_dlp/extractor/kinja.py
index df1386f..99c8a12 100644
--- a/plugins/youtube_download/yt_dlp/extractor/kinja.py
+++ b/plugins/youtube_download/yt_dlp/extractor/kinja.py
@@ -1,8 +1,6 @@
+import urllib.parse
+
 from .common import InfoExtractor
-from ..compat import (
-    compat_str,
-    compat_urllib_parse_unquote,
-)
 from ..utils import (
     int_or_none,
     parse_iso8601,
@@ -12,7 +10,7 @@ from ..utils import (
 
 
 class KinjaEmbedIE(InfoExtractor):
-    IENAME = 'kinja:embed'
+    IE_NAME = 'kinja:embed'
     _DOMAIN_REGEX = r'''(?:[^.]+\.)?
         (?:
             avclub|
@@ -32,7 +30,7 @@ class KinjaEmbedIE(InfoExtractor):
             ajax/inset|
             embed/video
         )/iframe\?.*?\bid='''
-    _VALID_URL = r'''(?x)https?://%s%s
+    _VALID_URL = rf'''(?x)https?://{_DOMAIN_REGEX}{_COMMON_REGEX}
         (?P<type>
             fb|
             imgur|
@@ -41,7 +39,6 @@ class KinjaEmbedIE(InfoExtractor):
             kinjavideo|
             mcp|
             megaphone|
-            ooyala|
             soundcloud(?:-playlist)?|
             tumblr-post|
             twitch-stream|
@@ -50,7 +47,7 @@ class KinjaEmbedIE(InfoExtractor):
             vimeo|
             vine|
             youtube-(?:list|video)
-        )-(?P<id>[^&]+)''' % (_DOMAIN_REGEX, _COMMON_REGEX)
+        )-(?P<id>[^&]+)'''
     _EMBED_REGEX = [rf'(?x)<iframe[^>]+?src=(?P<q>["\'])(?P<url>(?:(?:https?:)?//{_DOMAIN_REGEX})?{_COMMON_REGEX}(?:(?!\1).)+)\1']
     _TESTS = [{
         'url': 'https://kinja.com/ajax/inset/iframe?id=fb-10103303356633621',
@@ -61,9 +58,6 @@ class KinjaEmbedIE(InfoExtractor):
     }, {
         'url': 'https://kinja.com/ajax/inset/iframe?id=megaphone-PPY1300931075',
         'only_matching': True,
-    }, {
-        'url': 'https://kinja.com/ajax/inset/iframe?id=ooyala-xzMXhleDpopuT0u1ijt_qZj3Va-34pEX%2FZTIxYmJjZDM2NWYzZDViZGRiOWJjYzc5',
-        'only_matching': True,
     }, {
         'url': 'https://kinja.com/ajax/inset/iframe?id=soundcloud-128574047',
         'only_matching': True,
@@ -103,7 +97,6 @@ class KinjaEmbedIE(InfoExtractor):
         'jwplayer-video': _JWPLATFORM_PROVIDER,
         'jwp-video': _JWPLATFORM_PROVIDER,
         'megaphone': ('player.megaphone.fm/', 'Generic'),
-        'ooyala': ('player.ooyala.com/player.js?embedCode=', 'Ooyala'),
         'soundcloud': ('api.soundcloud.com/tracks/', 'Soundcloud'),
         'soundcloud-playlist': ('api.soundcloud.com/playlists/', 'SoundcloudPlaylist'),
         'tumblr-post': ('%s.tumblr.com/post/%s', 'Tumblr'),
@@ -121,7 +114,7 @@ class KinjaEmbedIE(InfoExtractor):
 
         provider = self._PROVIDER_MAP.get(video_type)
         if provider:
-            video_id = compat_urllib_parse_unquote(video_id)
+            video_id = urllib.parse.unquote(video_id)
             if video_type == 'tumblr-post':
                 video_id, blog = video_id.split('-', 1)
                 result_url = provider[0] % (blog, video_id)
@@ -129,8 +122,6 @@ class KinjaEmbedIE(InfoExtractor):
                 video_id, playlist_id = video_id.split('/')
                 result_url = provider[0] % (video_id, playlist_id)
             else:
-                if video_type == 'ooyala':
-                    video_id = video_id.split('/')[0]
                 result_url = provider[0] + video_id
             return self.url_result('http://' + result_url, provider[1])
 
@@ -152,7 +143,7 @@ class KinjaEmbedIE(InfoExtractor):
             poster = data.get('poster') or {}
             poster_id = poster.get('id')
             if poster_id:
-                thumbnail = 'https://i.kinja-img.com/gawker-media/image/upload/%s.%s' % (poster_id, poster.get('format') or 'jpg')
+                thumbnail = 'https://i.kinja-img.com/gawker-media/image/upload/{}.{}'.format(poster_id, poster.get('format') or 'jpg')
 
             return {
                 'id': video_id,
@@ -197,10 +188,10 @@ class KinjaEmbedIE(InfoExtractor):
             return {
                 'id': video_id,
                 'title': title,
-                'thumbnail': try_get(iptc, lambda x: x['cloudinaryLink']['link'], compat_str),
+                'thumbnail': try_get(iptc, lambda x: x['cloudinaryLink']['link'], str),
                 'uploader': fmg.get('network'),
                 'duration': int_or_none(iptc.get('fileDuration')),
                 'formats': formats,
-                'description': try_get(iptc, lambda x: x['description']['en'], compat_str),
+                'description': try_get(iptc, lambda x: x['description']['en'], str),
                 'timestamp': parse_iso8601(iptc.get('dateReleased')),
             }
diff --git a/plugins/youtube_download/yt_dlp/extractor/kommunetv.py b/plugins/youtube_download/yt_dlp/extractor/kommunetv.py
index e21e556..5ec33a9 100644
--- a/plugins/youtube_download/yt_dlp/extractor/kommunetv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/kommunetv.py
@@ -3,23 +3,23 @@ from ..utils import update_url
 
 
 class KommunetvIE(InfoExtractor):
-    _VALID_URL = r'https://(\w+).kommunetv.no/archive/(?P<id>\w+)'
+    _VALID_URL = r'https?://\w+\.kommunetv\.no/archive/(?P<id>\w+)'
     _TEST = {
         'url': 'https://oslo.kommunetv.no/archive/921',
         'md5': '5f102be308ee759be1e12b63d5da4bbc',
         'info_dict': {
             'id': '921',
             'title': 'Bystyremøte',
-            'ext': 'mp4'
-        }
+            'ext': 'mp4',
+        },
     }
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
         headers = {
-            'Accept': 'application/json'
+            'Accept': 'application/json',
         }
-        data = self._download_json('https://oslo.kommunetv.no/api/streams?streamType=1&id=%s' % video_id, video_id, headers=headers)
+        data = self._download_json(f'https://oslo.kommunetv.no/api/streams?streamType=1&id={video_id}', video_id, headers=headers)
         title = data['stream']['title']
         file = data['playlist'][0]['playlist'][0]['file']
         url = update_url(file, query=None, fragment=None)
@@ -27,5 +27,5 @@ class KommunetvIE(InfoExtractor):
         return {
             'id': video_id,
             'formats': formats,
-            'title': title
+            'title': title,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/kompas.py b/plugins/youtube_download/yt_dlp/extractor/kompas.py
index 8bad961..2ef076c 100644
--- a/plugins/youtube_download/yt_dlp/extractor/kompas.py
+++ b/plugins/youtube_download/yt_dlp/extractor/kompas.py
@@ -16,7 +16,7 @@ class KompasVideoIE(JixieBaseIE):
             'categories': ['news'],
             'thumbnail': 'https://video.jixie.media/1001/164474/164474_1280x720.jpg',
             'tags': 'count:9',
-        }
+        },
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/konserthusetplay.py b/plugins/youtube_download/yt_dlp/extractor/konserthusetplay.py
deleted file mode 100644
index 10767f1..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/konserthusetplay.py
+++ /dev/null
@@ -1,119 +0,0 @@
-from .common import InfoExtractor
-from ..utils import (
-    determine_ext,
-    float_or_none,
-    int_or_none,
-    url_or_none,
-)
-
-
-class KonserthusetPlayIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?(?:konserthusetplay|rspoplay)\.se/\?.*\bm=(?P<id>[^&]+)'
-    _TESTS = [{
-        'url': 'http://www.konserthusetplay.se/?m=CKDDnlCY-dhWAAqiMERd-A',
-        'md5': 'e3fd47bf44e864bd23c08e487abe1967',
-        'info_dict': {
-            'id': 'CKDDnlCY-dhWAAqiMERd-A',
-            'ext': 'mp4',
-            'title': 'Orkesterns instrument: Valthornen',
-            'description': 'md5:f10e1f0030202020396a4d712d2fa827',
-            'thumbnail': 're:^https?://.*$',
-            'duration': 398.76,
-        },
-    }, {
-        'url': 'http://rspoplay.se/?m=elWuEH34SMKvaO4wO_cHBw',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        webpage = self._download_webpage(url, video_id)
-
-        e = self._search_regex(
-            r'https?://csp\.picsearch\.com/rest\?.*\be=(.+?)[&"\']', webpage, 'e')
-
-        rest = self._download_json(
-            'http://csp.picsearch.com/rest?e=%s&containerId=mediaplayer&i=object' % e,
-            video_id, transform_source=lambda s: s[s.index('{'):s.rindex('}') + 1])
-
-        media = rest['media']
-        player_config = media['playerconfig']
-        playlist = player_config['playlist']
-
-        source = next(f for f in playlist if f.get('bitrates') or f.get('provider'))
-
-        FORMAT_ID_REGEX = r'_([^_]+)_h264m\.mp4'
-
-        formats = []
-
-        m3u8_url = source.get('url')
-        if m3u8_url and determine_ext(m3u8_url) == 'm3u8':
-            formats.extend(self._extract_m3u8_formats(
-                m3u8_url, video_id, 'mp4', entry_protocol='m3u8_native',
-                m3u8_id='hls', fatal=False))
-
-        fallback_url = source.get('fallbackUrl')
-        fallback_format_id = None
-        if fallback_url:
-            fallback_format_id = self._search_regex(
-                FORMAT_ID_REGEX, fallback_url, 'format id', default=None)
-
-        connection_url = (player_config.get('rtmp', {}).get(
-            'netConnectionUrl') or player_config.get(
-            'plugins', {}).get('bwcheck', {}).get('netConnectionUrl'))
-        if connection_url:
-            for f in source['bitrates']:
-                video_url = f.get('url')
-                if not video_url:
-                    continue
-                format_id = self._search_regex(
-                    FORMAT_ID_REGEX, video_url, 'format id', default=None)
-                f_common = {
-                    'vbr': int_or_none(f.get('bitrate')),
-                    'width': int_or_none(f.get('width')),
-                    'height': int_or_none(f.get('height')),
-                }
-                f = f_common.copy()
-                f.update({
-                    'url': connection_url,
-                    'play_path': video_url,
-                    'format_id': 'rtmp-%s' % format_id if format_id else 'rtmp',
-                    'ext': 'flv',
-                })
-                formats.append(f)
-                if format_id and format_id == fallback_format_id:
-                    f = f_common.copy()
-                    f.update({
-                        'url': fallback_url,
-                        'format_id': 'http-%s' % format_id if format_id else 'http',
-                    })
-                    formats.append(f)
-
-        if not formats and fallback_url:
-            formats.append({
-                'url': fallback_url,
-            })
-
-        title = player_config.get('title') or media['title']
-        description = player_config.get('mediaInfo', {}).get('description')
-        thumbnail = media.get('image')
-        duration = float_or_none(media.get('duration'), 1000)
-
-        subtitles = {}
-        captions = source.get('captionsAvailableLanguages')
-        if isinstance(captions, dict):
-            for lang, subtitle_url in captions.items():
-                subtitle_url = url_or_none(subtitle_url)
-                if lang != 'none' and subtitle_url:
-                    subtitles.setdefault(lang, []).append({'url': subtitle_url})
-
-        return {
-            'id': video_id,
-            'title': title,
-            'description': description,
-            'thumbnail': thumbnail,
-            'duration': duration,
-            'formats': formats,
-            'subtitles': subtitles,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/koo.py b/plugins/youtube_download/yt_dlp/extractor/koo.py
index 9cfec5e..6ec5b59 100644
--- a/plugins/youtube_download/yt_dlp/extractor/koo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/koo.py
@@ -6,6 +6,7 @@ from ..utils import (
 
 
 class KooIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?kooapp\.com/koo/[^/]+/(?P<id>[^/&#$?]+)'
     _TESTS = [{  # Test for video in the comments
         'url': 'https://www.kooapp.com/koo/ytdlpTestAccount/946c4189-bc2d-4524-b95b-43f641e2adde',
@@ -18,9 +19,9 @@ class KooIE(InfoExtractor):
             'uploader_id': 'ytdlpTestAccount',
             'uploader': 'yt-dlpTestAccount',
             'duration': 7000,
-            'upload_date': '20210921'
+            'upload_date': '20210921',
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }, {  # Test for koo with long title
         'url': 'https://www.kooapp.com/koo/laxman_kumarDBFEC/33decbf7-5e1e-4bb8-bfd7-04744a064361',
         'info_dict': {
@@ -32,9 +33,9 @@ class KooIE(InfoExtractor):
             'uploader_id': 'laxman_kumarDBFEC',
             'uploader': 'Laxman Kumar 🇮🇳',
             'duration': 46000,
-            'upload_date': '20210920'
+            'upload_date': '20210920',
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }, {  # Test for audio
         'url': 'https://www.kooapp.com/koo/ytdlpTestAccount/a2a9c88e-ce4b-4d2d-952f-d06361c5b602',
         'info_dict': {
@@ -46,9 +47,9 @@ class KooIE(InfoExtractor):
             'uploader_id': 'ytdlpTestAccount',
             'uploader': 'yt-dlpTestAccount',
             'duration': 214000,
-            'upload_date': '20210921'
+            'upload_date': '20210921',
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }, {  # Test for video
         'url': 'https://www.kooapp.com/koo/ytdlpTestAccount/a3e56c53-c1ed-4ac9-ac02-ed1630e6b1d1',
         'info_dict': {
@@ -60,9 +61,9 @@ class KooIE(InfoExtractor):
             'uploader_id': 'ytdlpTestAccount',
             'uploader': 'yt-dlpTestAccount',
             'duration': 14000,
-            'upload_date': '20210921'
+            'upload_date': '20210921',
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }, {  # Test for link
         'url': 'https://www.kooapp.com/koo/ytdlpTestAccount/01bf5b94-81a5-4d8e-a387-5f732022e15a',
         'skip': 'No video/audio found at the provided url.',
@@ -82,10 +83,11 @@ class KooIE(InfoExtractor):
     }]
 
     def _real_extract(self, url):
-        id = self._match_id(url)
-        data_json = self._download_json(f'https://www.kooapp.com/apiV1/ku/{id}?limit=20&offset=0&showSimilarKoos=true', id)['parentContent']
+        video_id = self._match_id(url)
+        data_json = self._download_json(
+            f'https://www.kooapp.com/apiV1/ku/{video_id}?limit=20&offset=0&showSimilarKoos=true', video_id)['parentContent']
         item_json = next(content['items'][0] for content in data_json
-                         if try_get(content, lambda x: x['items'][0]['id']) == id)
+                         if try_get(content, lambda x: x['items'][0]['id']) == video_id)
         media_json = item_json['mediaMap']
         formats = []
 
@@ -97,12 +99,12 @@ class KooIE(InfoExtractor):
                 'ext': 'mp4',
             })
         if video_m3u8_url:
-            formats.extend(self._extract_m3u8_formats(video_m3u8_url, id, fatal=False, ext='mp4'))
+            formats.extend(self._extract_m3u8_formats(video_m3u8_url, video_id, fatal=False, ext='mp4'))
         if not formats:
             self.raise_no_formats('No video/audio found at the provided url.', expected=True)
 
         return {
-            'id': id,
+            'id': video_id,
             'title': clean_html(item_json.get('title')),
             'description': f'{clean_html(item_json.get("title"))}\n\n{clean_html(item_json.get("enTransliteration"))}',
             'timestamp': item_json.get('createdAt'),
diff --git a/plugins/youtube_download/yt_dlp/extractor/krasview.py b/plugins/youtube_download/yt_dlp/extractor/krasview.py
index 4323aa4..0febf75 100644
--- a/plugins/youtube_download/yt_dlp/extractor/krasview.py
+++ b/plugins/youtube_download/yt_dlp/extractor/krasview.py
@@ -8,6 +8,7 @@ from ..utils import (
 
 
 class KrasViewIE(InfoExtractor):
+    _WORKING = False
     IE_DESC = 'Красвью'
     _VALID_URL = r'https?://krasview\.ru/(?:video|embed)/(?P<id>\d+)'
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/kth.py b/plugins/youtube_download/yt_dlp/extractor/kth.py
index e17c6db..76899fd 100644
--- a/plugins/youtube_download/yt_dlp/extractor/kth.py
+++ b/plugins/youtube_download/yt_dlp/extractor/kth.py
@@ -16,13 +16,12 @@ class KTHIE(InfoExtractor):
             'timestamp': 1647345358,
             'upload_date': '20220315',
             'uploader_id': 'md5:0ec23e33a89e795a4512930c8102509f',
-        }
+        },
     }
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        result = self.url_result(
-            smuggle_url('kaltura:308:%s' % video_id, {
+        return self.url_result(
+            smuggle_url(f'kaltura:308:{video_id}', {
                 'service_url': 'https://api.kaltura.nordu.net'}),
             'Kaltura')
-        return result
diff --git a/plugins/youtube_download/yt_dlp/extractor/ku6.py b/plugins/youtube_download/yt_dlp/extractor/ku6.py
index 31b4ea0..00e814c 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ku6.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ku6.py
@@ -10,7 +10,7 @@ class Ku6IE(InfoExtractor):
             'id': 'JG-8yS14xzBr4bCn1pu0xw',
             'ext': 'f4v',
             'title': 'techniques test',
-        }
+        },
     }
 
     def _real_extract(self, url):
@@ -19,12 +19,12 @@ class Ku6IE(InfoExtractor):
 
         title = self._html_search_regex(
             r'<h1 title=.*>(.*?)</h1>', webpage, 'title')
-        dataUrl = 'http://v.ku6.com/fetchVideo4Player/%s.html' % video_id
-        jsonData = self._download_json(dataUrl, video_id)
-        downloadUrl = jsonData['data']['f']
+        data_url = f'http://v.ku6.com/fetchVideo4Player/{video_id}.html'
+        json_data = self._download_json(data_url, video_id)
+        download_url = json_data['data']['f']
 
         return {
             'id': video_id,
             'title': title,
-            'url': downloadUrl
+            'url': download_url,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/kukululive.py b/plugins/youtube_download/yt_dlp/extractor/kukululive.py
new file mode 100644
index 0000000..86ab5d4
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/kukululive.py
@@ -0,0 +1,140 @@
+import urllib.parse
+
+from .common import InfoExtractor
+from ..utils import (
+    ExtractorError,
+    clean_html,
+    filter_dict,
+    get_element_by_id,
+    int_or_none,
+    join_nonempty,
+    js_to_json,
+    qualities,
+    url_or_none,
+    urljoin,
+)
+from ..utils.traversal import traverse_obj
+
+
+class KukuluLiveIE(InfoExtractor):
+    _VALID_URL = r'https?://live\.erinn\.biz/live\.php\?h(?P<id>\d+)'
+    _TESTS = [{
+        'url': 'https://live.erinn.biz/live.php?h675134569',
+        'md5': 'e380fa6a47fc703d91cea913ab44ec2e',
+        'info_dict': {
+            'id': '675134569',
+            'ext': 'mp4',
+            'title': 'プロセカ',
+            'description': 'テストも兼ねたプロセカ配信。',
+            'timestamp': 1702689148,
+            'upload_date': '20231216',
+            'thumbnail': r're:^https?://.*',
+        },
+    }, {
+        'url': 'https://live.erinn.biz/live.php?h102338092',
+        'md5': 'dcf5167a934b1c60333461e13a81a6e2',
+        'info_dict': {
+            'id': '102338092',
+            'ext': 'mp4',
+            'title': 'Among Usで遊びます！！',
+            'description': 'VTuberになりましたねんねこ㌨ですよろしくお願いします',
+            'timestamp': 1704603118,
+            'upload_date': '20240107',
+            'thumbnail': r're:^https?://.*',
+        },
+    }, {
+        'url': 'https://live.erinn.biz/live.php?h878049531',
+        'only_matching': True,
+    }]
+
+    def _get_quality_meta(self, video_id, desc, code, force_h264=None):
+        desc += ' (force_h264)' if force_h264 else ''
+        qs = self._download_webpage(
+            'https://live.erinn.biz/live.player.fplayer.php', video_id,
+            f'Downloading {desc} quality metadata', f'Unable to download {desc} quality metadata',
+            query=filter_dict({
+                'hash': video_id,
+                'action': f'get{code}liveByAjax',
+                'force_h264': force_h264,
+            }))
+        return urllib.parse.parse_qs(qs)
+
+    def _add_quality_formats(self, formats, quality_meta):
+        vcodec = traverse_obj(quality_meta, ('vcodec', 0, {str}))
+        quality = traverse_obj(quality_meta, ('now_quality', 0, {str}))
+        quality_priority = qualities(('low', 'h264', 'high'))(quality)
+        if traverse_obj(quality_meta, ('hlsaddr', 0, {url_or_none})):
+            formats.append({
+                'format_id': quality,
+                'url': quality_meta['hlsaddr'][0],
+                'ext': 'mp4',
+                'vcodec': vcodec,
+                'quality': quality_priority,
+            })
+        if traverse_obj(quality_meta, ('hlsaddr_audioonly', 0, {url_or_none})):
+            formats.append({
+                'format_id': join_nonempty(quality, 'audioonly'),
+                'url': quality_meta['hlsaddr_audioonly'][0],
+                'ext': 'm4a',
+                'vcodec': 'none',
+                'quality': quality_priority,
+            })
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        html = self._download_webpage(url, video_id)
+
+        if '>タイムシフトが見つかりませんでした。<' in html:
+            raise ExtractorError('This stream has expired', expected=True)
+
+        title = clean_html(
+            get_element_by_id('livetitle', html.replace('<SPAN', '<span').replace('SPAN>', 'span>')))
+        description = self._html_search_meta('Description', html)
+        thumbnail = self._html_search_meta(['og:image', 'twitter:image'], html)
+
+        if self._search_regex(r'(var\s+timeshift\s*=\s*false)', html, 'is livestream', default=False):
+            formats = []
+            for (desc, code) in [('high', 'Z'), ('low', 'ForceLow')]:
+                quality_meta = self._get_quality_meta(video_id, desc, code)
+                self._add_quality_formats(formats, quality_meta)
+                if desc == 'high' and traverse_obj(quality_meta, ('vcodec', 0)) == 'HEVC':
+                    self._add_quality_formats(
+                        formats, self._get_quality_meta(video_id, desc, code, force_h264='1'))
+
+            return {
+                'id': video_id,
+                'title': title,
+                'description': description,
+                'thumbnail': thumbnail,
+                'is_live': True,
+                'formats': formats,
+            }
+
+        # VOD extraction
+        player_html = self._download_webpage(
+            'https://live.erinn.biz/live.timeshift.fplayer.php', video_id,
+            'Downloading player html', 'Unable to download player html', query={'hash': video_id})
+
+        sources = traverse_obj(self._search_json(
+            r'var\s+fplayer_source\s*=', player_html, 'stream data', video_id,
+            contains_pattern=r'\[(?s:.+)\]', transform_source=js_to_json), lambda _, v: v['file'])
+
+        def entries(segments, playlist=True):
+            for i, segment in enumerate(segments, 1):
+                yield {
+                    'id': f'{video_id}_{i}' if playlist else video_id,
+                    'title': f'{title} (Part {i})' if playlist else title,
+                    'description': description,
+                    'timestamp': traverse_obj(segment, ('time_start', {int_or_none})),
+                    'thumbnail': thumbnail,
+                    'formats': [{
+                        'url': urljoin('https://live.erinn.biz', segment['file']),
+                        'ext': 'mp4',
+                        'protocol': 'm3u8_native',
+                    }],
+                }
+
+        if len(sources) == 1:
+            return next(entries(sources, playlist=False))
+
+        return self.playlist_result(entries(sources), video_id, title, description, multi_video=True)
diff --git a/plugins/youtube_download/yt_dlp/extractor/kusi.py b/plugins/youtube_download/yt_dlp/extractor/kusi.py
deleted file mode 100644
index a23ad89..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/kusi.py
+++ /dev/null
@@ -1,83 +0,0 @@
-import random
-import urllib.parse
-
-from .common import InfoExtractor
-from ..utils import (
-    float_or_none,
-    int_or_none,
-    timeconvert,
-    update_url_query,
-    xpath_text,
-)
-
-
-class KUSIIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?kusi\.com/(?P<path>story/.+|video\?clipId=(?P<clipId>\d+))'
-    _TESTS = [{
-        'url': 'http://www.kusi.com/story/32849881/turko-files-refused-to-help-it-aint-right',
-        'md5': '4e76ce8e53660ce9697d06c0ba6fc47d',
-        'info_dict': {
-            'id': '12689020',
-            'ext': 'mp4',
-            'title': "Turko Files: Refused to Help, It Ain't Right!",
-            'duration': 223.586,
-            'upload_date': '20160826',
-            'timestamp': 1472233118,
-            'thumbnail': r're:^https?://.*\.jpg$'
-        },
-    }, {
-        'url': 'http://kusi.com/video?clipId=12203019',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        mobj = self._match_valid_url(url)
-        clip_id = mobj.group('clipId')
-        video_id = clip_id or mobj.group('path')
-
-        webpage = self._download_webpage(url, video_id)
-
-        if clip_id is None:
-            video_id = clip_id = self._html_search_regex(
-                r'"clipId"\s*,\s*"(\d+)"', webpage, 'clip id')
-
-        affiliate_id = self._search_regex(
-            r'affiliateId\s*:\s*\'([^\']+)\'', webpage, 'affiliate id')
-
-        # See __Packages/worldnow/model/GalleryModel.as of WNGallery.swf
-        xml_url = update_url_query('http://www.kusi.com/build.asp', {
-            'buildtype': 'buildfeaturexmlrequest',
-            'featureType': 'Clip',
-            'featureid': clip_id,
-            'affiliateno': affiliate_id,
-            'clientgroupid': '1',
-            'rnd': int(round(random.random() * 1000000)),
-        })
-
-        doc = self._download_xml(xml_url, video_id)
-
-        video_title = xpath_text(doc, 'HEADLINE', fatal=True)
-        duration = float_or_none(xpath_text(doc, 'DURATION'), scale=1000)
-        description = xpath_text(doc, 'ABSTRACT')
-        thumbnail = xpath_text(doc, './THUMBNAILIMAGE/FILENAME')
-        creation_time = timeconvert(xpath_text(doc, 'rfc822creationdate'))
-
-        quality_options = doc.find('{http://search.yahoo.com/mrss/}group').findall('{http://search.yahoo.com/mrss/}content')
-        formats = []
-        for quality in quality_options:
-            formats.append({
-                'url': urllib.parse.unquote_plus(quality.attrib['url']),
-                'height': int_or_none(quality.attrib.get('height')),
-                'width': int_or_none(quality.attrib.get('width')),
-                'vbr': float_or_none(quality.attrib.get('bitratebits'), scale=1000),
-            })
-
-        return {
-            'id': video_id,
-            'title': video_title,
-            'description': description,
-            'duration': duration,
-            'formats': formats,
-            'thumbnail': thumbnail,
-            'timestamp': creation_time,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/kuwo.py b/plugins/youtube_download/yt_dlp/extractor/kuwo.py
index e8a061a..80b6b55 100644
--- a/plugins/youtube_download/yt_dlp/extractor/kuwo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/kuwo.py
@@ -1,12 +1,12 @@
 import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import compat_urlparse
 from ..utils import (
-    get_element_by_id,
-    clean_html,
     ExtractorError,
     InAdvancePagedList,
+    clean_html,
+    get_element_by_id,
     remove_start,
 )
 
@@ -18,7 +18,7 @@ class KuwoBaseIE(InfoExtractor):
         {'format': 'mp3-192', 'ext': 'mp3', 'br': '192kmp3', 'abr': 192, 'preference': 70},
         {'format': 'mp3-128', 'ext': 'mp3', 'br': '128kmp3', 'abr': 128, 'preference': 60},
         {'format': 'wma', 'ext': 'wma', 'preference': 20},
-        {'format': 'aac', 'ext': 'aac', 'abr': 48, 'preference': 10}
+        {'format': 'aac', 'ext': 'aac', 'abr': 48, 'preference': 10},
     ]
 
     def _get_formats(self, song_id, tolerate_ip_deny=False):
@@ -27,21 +27,21 @@ class KuwoBaseIE(InfoExtractor):
             query = {
                 'format': file_format['ext'],
                 'br': file_format.get('br', ''),
-                'rid': 'MUSIC_%s' % song_id,
+                'rid': f'MUSIC_{song_id}',
                 'type': 'convert_url',
-                'response': 'url'
+                'response': 'url',
             }
 
             song_url = self._download_webpage(
                 'http://antiserver.kuwo.cn/anti.s',
-                song_id, note='Download %s url info' % file_format['format'],
+                song_id, note='Download {} url info'.format(file_format['format']),
                 query=query, headers=self.geo_verification_headers(),
             )
 
             if song_url == 'IPDeny' and not tolerate_ip_deny:
                 raise ExtractorError('This song is blocked in this region', expected=True)
 
-            if song_url.startswith('http://') or song_url.startswith('https://'):
+            if song_url.startswith(('http://', 'https://')):
                 formats.append({
                     'url': song_url,
                     'format_id': file_format['format'],
@@ -54,6 +54,7 @@ class KuwoBaseIE(InfoExtractor):
 
 
 class KuwoIE(KuwoBaseIE):
+    _WORKING = False
     IE_NAME = 'kuwo:song'
     IE_DESC = '酷我音乐'
     _VALID_URL = r'https?://(?:www\.)?kuwo\.cn/yinyue/(?P<id>\d+)'
@@ -65,7 +66,7 @@ class KuwoIE(KuwoBaseIE):
             'title': '爱我别走',
             'creator': '张震岳',
             'upload_date': '20080122',
-            'description': 'md5:ed13f58e3c3bf3f7fd9fbc4e5a7aa75c'
+            'description': 'md5:ed13f58e3c3bf3f7fd9fbc4e5a7aa75c',
         },
         'skip': 'this song has been offline because of copyright issues',
     }, {
@@ -112,7 +113,7 @@ class KuwoIE(KuwoBaseIE):
         publish_time = None
         if album_id is not None:
             album_info_page = self._download_webpage(
-                'http://www.kuwo.cn/album/%s/' % album_id, song_id,
+                f'http://www.kuwo.cn/album/{album_id}/', song_id,
                 note='Download album detail info',
                 errnote='Unable to get album detail info')
 
@@ -133,6 +134,7 @@ class KuwoIE(KuwoBaseIE):
 
 
 class KuwoAlbumIE(InfoExtractor):
+    _WORKING = False
     IE_NAME = 'kuwo:album'
     IE_DESC = '酷我音乐 - 专辑'
     _VALID_URL = r'https?://(?:www\.)?kuwo\.cn/album/(?P<id>\d+?)/'
@@ -158,7 +160,7 @@ class KuwoAlbumIE(InfoExtractor):
             'album name')
         album_intro = remove_start(
             clean_html(get_element_by_id('intro', webpage)),
-            '%s简介：' % album_name)
+            f'{album_name}简介：')
 
         entries = [
             self.url_result(song_url, 'Kuwo') for song_url in re.findall(
@@ -169,6 +171,7 @@ class KuwoAlbumIE(InfoExtractor):
 
 
 class KuwoChartIE(InfoExtractor):
+    _WORKING = False
     IE_NAME = 'kuwo:chart'
     IE_DESC = '酷我音乐 - 排行榜'
     _VALID_URL = r'https?://yinyue\.kuwo\.cn/billboard_(?P<id>[^.]+).htm'
@@ -194,6 +197,7 @@ class KuwoChartIE(InfoExtractor):
 
 
 class KuwoSingerIE(InfoExtractor):
+    _WORKING = False
     IE_NAME = 'kuwo:singer'
     IE_DESC = '酷我音乐 - 歌手'
     _VALID_URL = r'https?://(?:www\.)?kuwo\.cn/mingxing/(?P<id>[^/]+)'
@@ -234,12 +238,12 @@ class KuwoSingerIE(InfoExtractor):
         def page_func(page_num):
             webpage = self._download_webpage(
                 'http://www.kuwo.cn/artist/contentMusicsAjax',
-                singer_id, note='Download song list page #%d' % (page_num + 1),
-                errnote='Unable to get song list page #%d' % (page_num + 1),
+                singer_id, note=f'Download song list page #{page_num + 1}',
+                errnote=f'Unable to get song list page #{page_num + 1}',
                 query={'artistId': artist_id, 'pn': page_num, 'rn': self.PAGE_SIZE})
 
             return [
-                self.url_result(compat_urlparse.urljoin(url, song_url), 'Kuwo')
+                self.url_result(urllib.parse.urljoin(url, song_url), 'Kuwo')
                 for song_url in re.findall(
                     r'<div[^>]+class="name"><a[^>]+href="(/yinyue/\d+)',
                     webpage)
@@ -251,6 +255,7 @@ class KuwoSingerIE(InfoExtractor):
 
 
 class KuwoCategoryIE(InfoExtractor):
+    _WORKING = False
     IE_NAME = 'kuwo:category'
     IE_DESC = '酷我音乐 - 分类'
     _VALID_URL = r'https?://yinyue\.kuwo\.cn/yy/cinfo_(?P<id>\d+?).htm'
@@ -275,7 +280,7 @@ class KuwoCategoryIE(InfoExtractor):
 
         category_desc = remove_start(
             get_element_by_id('intro', webpage).strip(),
-            '%s简介：' % category_name)
+            f'{category_name}简介：')
         if category_desc == '暂无':
             category_desc = None
 
@@ -283,13 +288,14 @@ class KuwoCategoryIE(InfoExtractor):
             r'var\s+jsonm\s*=\s*([^;]+);', webpage, 'category songs'), category_id)
 
         entries = [
-            self.url_result('http://www.kuwo.cn/yinyue/%s/' % song['musicrid'], 'Kuwo')
+            self.url_result('http://www.kuwo.cn/yinyue/{}/'.format(song['musicrid']), 'Kuwo')
             for song in jsonm['musiclist']
         ]
         return self.playlist_result(entries, category_id, category_name, category_desc)
 
 
 class KuwoMvIE(KuwoBaseIE):
+    _WORKING = False
     IE_NAME = 'kuwo:mv'
     IE_DESC = '酷我音乐 - MV'
     _VALID_URL = r'https?://(?:www\.)?kuwo\.cn/mv/(?P<id>\d+?)/'
@@ -308,16 +314,16 @@ class KuwoMvIE(KuwoBaseIE):
             'format': 'mv',
         },
     }
-    _FORMATS = KuwoBaseIE._FORMATS + [
+    _FORMATS = [
+        *KuwoBaseIE._FORMATS,
         {'format': 'mkv', 'ext': 'mkv', 'preference': 250},
-        {'format': 'mp4', 'ext': 'mp4', 'preference': 200},
-    ]
+        {'format': 'mp4', 'ext': 'mp4', 'preference': 200}]
 
     def _real_extract(self, url):
         song_id = self._match_id(url)
         webpage = self._download_webpage(
-            url, song_id, note='Download mv detail info: %s' % song_id,
-            errnote='Unable to get mv detail info: %s' % song_id)
+            url, song_id, note=f'Download mv detail info: {song_id}',
+            errnote=f'Unable to get mv detail info: {song_id}')
 
         mobj = re.search(
             r'<h1[^>]+title="(?P<song>[^"]+)">[^<]+<span[^>]+title="(?P<singer>[^"]+)"',
@@ -331,8 +337,8 @@ class KuwoMvIE(KuwoBaseIE):
         formats = self._get_formats(song_id, tolerate_ip_deny=True)
 
         mv_url = self._download_webpage(
-            'http://www.kuwo.cn/yy/st/mvurl?rid=MUSIC_%s' % song_id,
-            song_id, note='Download %s MV URL' % song_id)
+            f'http://www.kuwo.cn/yy/st/mvurl?rid=MUSIC_{song_id}',
+            song_id, note=f'Download {song_id} MV URL')
         formats.append({
             'url': mv_url,
             'format_id': 'mv',
diff --git a/plugins/youtube_download/yt_dlp/extractor/la7.py b/plugins/youtube_download/yt_dlp/extractor/la7.py
index a3cd12b..20a5235 100644
--- a/plugins/youtube_download/yt_dlp/extractor/la7.py
+++ b/plugins/youtube_download/yt_dlp/extractor/la7.py
@@ -93,7 +93,7 @@ class LA7IE(InfoExtractor):
             'description': self._og_search_description(webpage, default=None),
             'thumbnail': self._og_search_thumbnail(webpage, default=None),
             'formats': formats,
-            'upload_date': unified_strdate(self._search_regex(r'datetime="(.+?)"', webpage, 'upload_date', fatal=False))
+            'upload_date': unified_strdate(self._search_regex(r'datetime="(.+?)"', webpage, 'upload_date', fatal=False)),
         }
 
 
@@ -208,9 +208,9 @@ class LA7PodcastIE(LA7PodcastEpisodeIE):  # XXX: Do not subclass from concrete I
         'url': 'https://www.la7.it/propagandalive/podcast',
         'info_dict': {
             'id': 'propagandalive',
-            'title': "Propaganda Live",
+            'title': 'Propaganda Live',
         },
-        'playlist_count_min': 10,
+        'playlist_mincount': 10,
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/laola1tv.py b/plugins/youtube_download/yt_dlp/extractor/laola1tv.py
deleted file mode 100644
index 416dd7e..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/laola1tv.py
+++ /dev/null
@@ -1,261 +0,0 @@
-import json
-import re
-
-from .common import InfoExtractor
-from ..utils import (
-    ExtractorError,
-    unified_strdate,
-    urlencode_postdata,
-    xpath_element,
-    xpath_text,
-    update_url_query,
-    js_to_json,
-)
-
-
-class Laola1TvEmbedIE(InfoExtractor):
-    IE_NAME = 'laola1tv:embed'
-    _VALID_URL = r'https?://(?:www\.)?laola1\.tv/titanplayer\.php\?.*?\bvideoid=(?P<id>\d+)'
-    _TESTS = [{
-        # flashvars.premium = "false";
-        'url': 'https://www.laola1.tv/titanplayer.php?videoid=708065&type=V&lang=en&portal=int&customer=1024',
-        'info_dict': {
-            'id': '708065',
-            'ext': 'mp4',
-            'title': 'MA Long CHN - FAN Zhendong CHN',
-            'uploader': 'ITTF - International Table Tennis Federation',
-            'upload_date': '20161211',
-        },
-    }]
-
-    def _extract_token_url(self, stream_access_url, video_id, data):
-        return self._download_json(
-            self._proto_relative_url(stream_access_url, 'https:'), video_id,
-            headers={
-                'Content-Type': 'application/json',
-            }, data=json.dumps(data).encode())['data']['stream-access'][0]
-
-    def _extract_formats(self, token_url, video_id):
-        token_doc = self._download_xml(
-            token_url, video_id, 'Downloading token',
-            headers=self.geo_verification_headers())
-
-        token_attrib = xpath_element(token_doc, './/token').attrib
-
-        if token_attrib['status'] != '0':
-            raise ExtractorError(
-                'Token error: %s' % token_attrib['comment'], expected=True)
-
-        formats = self._extract_akamai_formats(
-            '%s?hdnea=%s' % (token_attrib['url'], token_attrib['auth']),
-            video_id)
-        return formats
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-        flash_vars = self._search_regex(
-            r'(?s)flashvars\s*=\s*({.+?});', webpage, 'flash vars')
-
-        def get_flashvar(x, *args, **kwargs):
-            flash_var = self._search_regex(
-                r'%s\s*:\s*"([^"]+)"' % x,
-                flash_vars, x, default=None)
-            if not flash_var:
-                flash_var = self._search_regex([
-                    r'flashvars\.%s\s*=\s*"([^"]+)"' % x,
-                    r'%s\s*=\s*"([^"]+)"' % x],
-                    webpage, x, *args, **kwargs)
-            return flash_var
-
-        hd_doc = self._download_xml(
-            'http://www.laola1.tv/server/hd_video.php', video_id, query={
-                'play': get_flashvar('streamid'),
-                'partner': get_flashvar('partnerid'),
-                'portal': get_flashvar('portalid'),
-                'lang': get_flashvar('sprache'),
-                'v5ident': '',
-            })
-
-        _v = lambda x, **k: xpath_text(hd_doc, './/video/' + x, **k)
-        title = _v('title', fatal=True)
-
-        token_url = None
-        premium = get_flashvar('premium', default=None)
-        if premium:
-            token_url = update_url_query(
-                _v('url', fatal=True), {
-                    'timestamp': get_flashvar('timestamp'),
-                    'auth': get_flashvar('auth'),
-                })
-        else:
-            data_abo = urlencode_postdata(
-                dict((i, v) for i, v in enumerate(_v('req_liga_abos').split(','))))
-            stream_access_url = update_url_query(
-                'https://club.laola1.tv/sp/laola1/api/v3/user/session/premium/player/stream-access', {
-                    'videoId': _v('id'),
-                    'target': self._search_regex(r'vs_target = (\d+);', webpage, 'vs target'),
-                    'label': _v('label'),
-                    'area': _v('area'),
-                })
-            token_url = self._extract_token_url(stream_access_url, video_id, data_abo)
-
-        formats = self._extract_formats(token_url, video_id)
-
-        categories_str = _v('meta_sports')
-        categories = categories_str.split(',') if categories_str else []
-        is_live = _v('islive') == 'true'
-
-        return {
-            'id': video_id,
-            'title': title,
-            'upload_date': unified_strdate(_v('time_date')),
-            'uploader': _v('meta_organisation'),
-            'categories': categories,
-            'is_live': is_live,
-            'formats': formats,
-        }
-
-
-class Laola1TvBaseIE(Laola1TvEmbedIE):  # XXX: Do not subclass from concrete IE
-    def _extract_video(self, url):
-        display_id = self._match_id(url)
-        webpage = self._download_webpage(url, display_id)
-
-        if 'Dieser Livestream ist bereits beendet.' in webpage:
-            raise ExtractorError('This live stream has already finished.', expected=True)
-
-        conf = self._parse_json(self._search_regex(
-            r'(?s)conf\s*=\s*({.+?});', webpage, 'conf'),
-            display_id,
-            transform_source=lambda s: js_to_json(re.sub(r'shareurl:.+,', '', s)))
-        video_id = conf['videoid']
-
-        config = self._download_json(conf['configUrl'], video_id, query={
-            'videoid': video_id,
-            'partnerid': conf['partnerid'],
-            'language': conf.get('language', ''),
-            'portal': conf.get('portalid', ''),
-        })
-        error = config.get('error')
-        if error:
-            raise ExtractorError('%s said: %s' % (self.IE_NAME, error), expected=True)
-
-        video_data = config['video']
-        title = video_data['title']
-        is_live = video_data.get('isLivestream') and video_data.get('isLive')
-        meta = video_data.get('metaInformation')
-        sports = meta.get('sports')
-        categories = sports.split(',') if sports else []
-
-        token_url = self._extract_token_url(
-            video_data['streamAccess'], video_id,
-            video_data['abo']['required'])
-
-        formats = self._extract_formats(token_url, video_id)
-
-        return {
-            'id': video_id,
-            'display_id': display_id,
-            'title': title,
-            'description': video_data.get('description'),
-            'thumbnail': video_data.get('image'),
-            'categories': categories,
-            'formats': formats,
-            'is_live': is_live,
-        }
-
-
-class Laola1TvIE(Laola1TvBaseIE):
-    IE_NAME = 'laola1tv'
-    _VALID_URL = r'https?://(?:www\.)?laola1\.tv/[a-z]+-[a-z]+/[^/]+/(?P<id>[^/?#&]+)'
-
-    _TESTS = [{
-        'url': 'http://www.laola1.tv/de-de/video/straubing-tigers-koelner-haie/227883.html',
-        'info_dict': {
-            'id': '227883',
-            'display_id': 'straubing-tigers-koelner-haie',
-            'ext': 'flv',
-            'title': 'Straubing Tigers - Kölner Haie',
-            'upload_date': '20140912',
-            'is_live': False,
-            'categories': ['Eishockey'],
-        },
-        'params': {
-            'skip_download': True,
-        },
-    }, {
-        'url': 'http://www.laola1.tv/de-de/video/straubing-tigers-koelner-haie',
-        'info_dict': {
-            'id': '464602',
-            'display_id': 'straubing-tigers-koelner-haie',
-            'ext': 'flv',
-            'title': 'Straubing Tigers - Kölner Haie',
-            'upload_date': '20160129',
-            'is_live': False,
-            'categories': ['Eishockey'],
-        },
-        'params': {
-            'skip_download': True,
-        },
-    }, {
-        'url': 'http://www.laola1.tv/de-de/livestream/2016-03-22-belogorie-belgorod-trentino-diatec-lde',
-        'info_dict': {
-            'id': '487850',
-            'display_id': '2016-03-22-belogorie-belgorod-trentino-diatec-lde',
-            'ext': 'flv',
-            'title': 'Belogorie BELGOROD - TRENTINO Diatec',
-            'upload_date': '20160322',
-            'uploader': 'CEV - Europäischer Volleyball Verband',
-            'is_live': True,
-            'categories': ['Volleyball'],
-        },
-        'params': {
-            'skip_download': True,
-        },
-        'skip': 'This live stream has already finished.',
-    }]
-
-    def _real_extract(self, url):
-        return self._extract_video(url)
-
-
-class EHFTVIE(Laola1TvBaseIE):
-    IE_NAME = 'ehftv'
-    _VALID_URL = r'https?://(?:www\.)?ehftv\.com/[a-z]+(?:-[a-z]+)?/[^/]+/(?P<id>[^/?#&]+)'
-
-    _TESTS = [{
-        'url': 'https://www.ehftv.com/int/video/paris-saint-germain-handball-pge-vive-kielce/1166761',
-        'info_dict': {
-            'id': '1166761',
-            'display_id': 'paris-saint-germain-handball-pge-vive-kielce',
-            'ext': 'mp4',
-            'title': 'Paris Saint-Germain Handball - PGE Vive Kielce',
-            'is_live': False,
-            'categories': ['Handball'],
-        },
-        'params': {
-            'skip_download': True,
-        },
-    }]
-
-    def _real_extract(self, url):
-        return self._extract_video(url)
-
-
-class ITTFIE(InfoExtractor):
-    _VALID_URL = r'https?://tv\.ittf\.com/video/[^/]+/(?P<id>\d+)'
-    _TEST = {
-        'url': 'https://tv.ittf.com/video/peng-wang-wei-matsudaira-kenta/951802',
-        'only_matching': True,
-    }
-
-    def _real_extract(self, url):
-        return self.url_result(
-            update_url_query('https://www.laola1.tv/titanplayer.php', {
-                'videoid': self._match_id(url),
-                'type': 'V',
-                'lang': 'en',
-                'portal': 'int',
-                'customer': 1024,
-            }), Laola1TvEmbedIE.ie_key())
diff --git a/plugins/youtube_download/yt_dlp/extractor/laracasts.py b/plugins/youtube_download/yt_dlp/extractor/laracasts.py
new file mode 100644
index 0000000..e532caf
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/laracasts.py
@@ -0,0 +1,114 @@
+import json
+
+from .common import InfoExtractor
+from .vimeo import VimeoIE
+from ..utils import (
+    clean_html,
+    extract_attributes,
+    get_element_html_by_id,
+    int_or_none,
+    parse_duration,
+    str_or_none,
+    unified_strdate,
+    url_or_none,
+    urljoin,
+)
+from ..utils.traversal import traverse_obj
+
+
+class LaracastsBaseIE(InfoExtractor):
+    def _get_prop_data(self, url, display_id):
+        webpage = self._download_webpage(url, display_id)
+        return traverse_obj(
+            get_element_html_by_id('app', webpage),
+            ({extract_attributes}, 'data-page', {json.loads}, 'props'))
+
+    def _parse_episode(self, episode):
+        if not traverse_obj(episode, 'vimeoId'):
+            self.raise_login_required('This video is only available for subscribers.')
+        return self.url_result(
+            VimeoIE._smuggle_referrer(
+                f'https://player.vimeo.com/video/{episode["vimeoId"]}', 'https://laracasts.com/'),
+            VimeoIE, url_transparent=True,
+            **traverse_obj(episode, {
+                'id': ('id', {int}, {str_or_none}),
+                'webpage_url': ('path', {urljoin('https://laracasts.com')}),
+                'title': ('title', {clean_html}),
+                'season_number': ('chapter', {int_or_none}),
+                'episode_number': ('position', {int_or_none}),
+                'description': ('body', {clean_html}),
+                'thumbnail': ('largeThumbnail', {url_or_none}),
+                'duration': ('length', {int_or_none}),
+                'upload_date': ('dateSegments', 'published', {unified_strdate}),
+            }))
+
+
+class LaracastsIE(LaracastsBaseIE):
+    IE_NAME = 'laracasts'
+    _VALID_URL = r'https?://(?:www\.)?laracasts\.com/series/(?P<id>[\w-]+/episodes/\d+)/?(?:[?#]|$)'
+    _TESTS = [{
+        'url': 'https://laracasts.com/series/30-days-to-learn-laravel-11/episodes/1',
+        'md5': 'c8f5e7b02ad0e438ef9280a08c8493dc',
+        'info_dict': {
+            'id': '922040563',
+            'title': 'Hello, Laravel',
+            'ext': 'mp4',
+            'duration': 519,
+            'upload_date': '20240312',
+            'thumbnail': 'https://laracasts.s3.amazonaws.com/videos/thumbnails/youtube/30-days-to-learn-laravel-11-1.png',
+            'description': 'md5:ddd658bb241975871d236555657e1dd1',
+            'season_number': 1,
+            'season': 'Season 1',
+            'episode_number': 1,
+            'episode': 'Episode 1',
+            'uploader': 'Laracasts',
+            'uploader_id': 'user20182673',
+            'uploader_url': 'https://vimeo.com/user20182673',
+        },
+        'expected_warnings': ['Failed to parse XML'],  # TODO: Remove when vimeo extractor is fixed
+    }]
+
+    def _real_extract(self, url):
+        display_id = self._match_id(url)
+        return self._parse_episode(self._get_prop_data(url, display_id)['lesson'])
+
+
+class LaracastsPlaylistIE(LaracastsBaseIE):
+    IE_NAME = 'laracasts:series'
+    _VALID_URL = r'https?://(?:www\.)?laracasts\.com/series/(?P<id>[\w-]+)/?(?:[?#]|$)'
+    _TESTS = [{
+        'url': 'https://laracasts.com/series/30-days-to-learn-laravel-11',
+        'info_dict': {
+            'title': '30 Days to Learn Laravel',
+            'id': '210',
+            'thumbnail': 'https://laracasts.s3.amazonaws.com/series/thumbnails/social-cards/30-days-to-learn-laravel-11.png?v=2',
+            'duration': 30600.0,
+            'modified_date': '20240511',
+            'description': 'md5:27c260a1668a450984e8f901579912dd',
+            'categories': ['Frameworks'],
+            'tags': ['Laravel'],
+            'display_id': '30-days-to-learn-laravel-11',
+        },
+        'playlist_count': 30,
+    }]
+
+    def _real_extract(self, url):
+        display_id = self._match_id(url)
+        series = self._get_prop_data(url, display_id)['series']
+
+        metadata = {
+            'display_id': display_id,
+            **traverse_obj(series, {
+                'title': ('title', {str}),
+                'id': ('id', {int}, {str_or_none}),
+                'description': ('body', {clean_html}),
+                'thumbnail': (('large_thumbnail', 'thumbnail'), {url_or_none}, any),
+                'duration': ('runTime', {parse_duration}),
+                'categories': ('taxonomy', 'name', {str}, all, filter),
+                'tags': ('topics', ..., 'name', {str}),
+                'modified_date': ('lastUpdated', {unified_strdate}),
+            }),
+        }
+
+        return self.playlist_result(traverse_obj(
+            series, ('chapters', ..., 'episodes', lambda _, v: v['vimeoId'], {self._parse_episode})), **metadata)
diff --git a/plugins/youtube_download/yt_dlp/extractor/laxarxames.py b/plugins/youtube_download/yt_dlp/extractor/laxarxames.py
new file mode 100644
index 0000000..f6d515b
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/laxarxames.py
@@ -0,0 +1,73 @@
+import json
+
+from .brightcove import BrightcoveNewIE
+from .common import InfoExtractor
+from ..utils import ExtractorError
+from ..utils.traversal import traverse_obj
+
+
+class LaXarxaMesIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?laxarxames\.cat/(?:[^/?#]+/)*?(player|movie-details)/(?P<id>\d+)'
+    _NETRC_MACHINE = 'laxarxames'
+    _TOKEN = None
+    _TESTS = [{
+        'url': 'https://www.laxarxames.cat/player/3459421',
+        'md5': '0966f46c34275934c19af78f3df6e2bc',
+        'info_dict': {
+            'id': '6339612436112',
+            'ext': 'mp4',
+            'title': 'Resum | UA Horta — UD Viladecans',
+            'timestamp': 1697905186,
+            'thumbnail': r're:https?://.*\.jpg',
+            'description': '',
+            'upload_date': '20231021',
+            'duration': 129.44,
+            'tags': ['ott', 'esports', '23-24', ' futbol', ' futbol-partits', 'elit', 'resum'],
+            'uploader_id': '5779379807001',
+        },
+        'skip': 'Requires login',
+    }]
+
+    def _perform_login(self, username, password):
+        if self._TOKEN:
+            return
+
+        login = self._download_json(
+            'https://api.laxarxames.cat/Authorization/SignIn', None, note='Logging in', headers={
+                'X-Tenantorigin': 'https://laxarxames.cat',
+                'Content-Type': 'application/json',
+            }, data=json.dumps({
+                'Username': username,
+                'Password': password,
+                'Device': {
+                    'PlatformCode': 'WEB',
+                    'Name': 'Mac OS ()',
+                },
+            }).encode(), expected_status=401)
+
+        self._TOKEN = traverse_obj(login, ('AuthorizationToken', 'Token', {str}))
+        if not self._TOKEN:
+            raise ExtractorError('Login failed', expected=True)
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        if not self._TOKEN:
+            self.raise_login_required()
+
+        media_play_info = self._download_json(
+            'https://api.laxarxames.cat/Media/GetMediaPlayInfo', video_id,
+            data=json.dumps({
+                'MediaId': int(video_id),
+                'StreamType': 'MAIN',
+            }).encode(), headers={
+                'Authorization': f'Bearer {self._TOKEN}',
+                'X-Tenantorigin': 'https://laxarxames.cat',
+                'Content-Type': 'application/json',
+            })
+
+        if not traverse_obj(media_play_info, ('ContentUrl', {str})):
+            self.raise_no_formats('No video found', expected=True)
+
+        return self.url_result(
+            f'https://players.brightcove.net/5779379807001/default_default/index.html?videoId={media_play_info["ContentUrl"]}',
+            BrightcoveNewIE, video_id, media_play_info.get('Title'))
diff --git a/plugins/youtube_download/yt_dlp/extractor/lbry.py b/plugins/youtube_download/yt_dlp/extractor/lbry.py
index 9a9f925..e6eef13 100644
--- a/plugins/youtube_download/yt_dlp/extractor/lbry.py
+++ b/plugins/youtube_download/yt_dlp/extractor/lbry.py
@@ -22,10 +22,12 @@ from ..utils import (
 
 
 class LBRYBaseIE(InfoExtractor):
-    _BASE_URL_REGEX = r'(?:https?://(?:www\.)?(?:lbry\.tv|odysee\.com)/|lbry://)'
+    _BASE_URL_REGEX = r'(?x)(?:https?://(?:www\.)?(?:lbry\.tv|odysee\.com)/|lbry://)'
     _CLAIM_ID_REGEX = r'[0-9a-f]{1,40}'
-    _OPT_CLAIM_ID = '[^:/?#&]+(?:[:#]%s)?' % _CLAIM_ID_REGEX
+    _OPT_CLAIM_ID = f'[^$@:/?#&]+(?:[:#]{_CLAIM_ID_REGEX})?'
     _SUPPORTED_STREAM_TYPES = ['video', 'audio']
+    _UNSUPPORTED_STREAM_TYPES = ['binary']
+    _PAGE_SIZE = 50
 
     def _call_api_proxy(self, method, display_id, params, resource):
         headers = {'Content-Type': 'application/json-rpc'}
@@ -34,7 +36,7 @@ class LBRYBaseIE(InfoExtractor):
             headers['x-lbry-auth-token'] = token
         response = self._download_json(
             'https://api.lbry.tv/api/v1/proxy',
-            display_id, 'Downloading %s JSON metadata' % resource,
+            display_id, f'Downloading {resource} JSON metadata',
             headers=headers,
             data=json.dumps({
                 'method': method,
@@ -53,7 +55,7 @@ class LBRYBaseIE(InfoExtractor):
     def _permanent_url(self, url, claim_name, claim_id):
         return urljoin(
             url.replace('lbry://', 'https://lbry.tv/'),
-            '/%s:%s' % (claim_name, claim_id))
+            f'/{claim_name}:{claim_id}')
 
     def _parse_stream(self, stream, url):
         stream_type = traverse_obj(stream, ('value', 'stream_type', {str}))
@@ -65,22 +67,83 @@ class LBRYBaseIE(InfoExtractor):
             'license': ('value', 'license', {str}),
             'timestamp': ('timestamp', {int_or_none}),
             'release_timestamp': ('value', 'release_time', {int_or_none}),
-            'tags': ('value', 'tags', ..., {lambda x: x or None}),
+            'tags': ('value', 'tags', ..., filter),
             'duration': ('value', stream_type, 'duration', {int_or_none}),
             'channel': ('signing_channel', 'value', 'title', {str}),
             'channel_id': ('signing_channel', 'claim_id', {str}),
+            'uploader_id': ('signing_channel', 'name', {str}),
         })
 
-        channel_name = traverse_obj(stream, ('signing_channel', 'name', {str}))
-        if channel_name and info.get('channel_id'):
-            info['channel_url'] = self._permanent_url(url, channel_name, info['channel_id'])
+        if info.get('uploader_id') and info.get('channel_id'):
+            info['channel_url'] = self._permanent_url(url, info['uploader_id'], info['channel_id'])
 
         return info
 
+    def _fetch_page(self, display_id, url, params, page):
+        page += 1
+        page_params = {
+            'no_totals': True,
+            'page': page,
+            'page_size': self._PAGE_SIZE,
+            **params,
+        }
+        result = self._call_api_proxy(
+            'claim_search', display_id, page_params, f'page {page}')
+        for item in traverse_obj(result, ('items', lambda _, v: v['name'] and v['claim_id'])):
+            yield {
+                **self._parse_stream(item, url),
+                '_type': 'url',
+                'id': item['claim_id'],
+                'url': self._permanent_url(url, item['name'], item['claim_id']),
+            }
+
+    def _playlist_entries(self, url, display_id, claim_param, metadata):
+        qs = parse_qs(url)
+        content = qs.get('content', [None])[0]
+        params = {
+            'fee_amount': qs.get('fee_amount', ['>=0'])[0],
+            'order_by': {
+                'new': ['release_time'],
+                'top': ['effective_amount'],
+                'trending': ['trending_group', 'trending_mixed'],
+            }[qs.get('order', ['new'])[0]],
+            'claim_type': 'stream',
+            'stream_types': [content] if content in ['audio', 'video'] else self._SUPPORTED_STREAM_TYPES,
+            **claim_param,
+        }
+        duration = qs.get('duration', [None])[0]
+        if duration:
+            params['duration'] = {
+                'long': '>=1200',
+                'short': '<=240',
+            }[duration]
+        language = qs.get('language', ['all'])[0]
+        if language != 'all':
+            languages = [language]
+            if language == 'en':
+                languages.append('none')
+            params['any_languages'] = languages
+
+        entries = OnDemandPagedList(
+            functools.partial(self._fetch_page, display_id, url, params),
+            self._PAGE_SIZE)
+
+        return self.playlist_result(
+            entries, display_id, **traverse_obj(metadata, ('value', {
+                'title': 'title',
+                'description': 'description',
+            })))
+
 
 class LBRYIE(LBRYBaseIE):
     IE_NAME = 'lbry'
-    _VALID_URL = LBRYBaseIE._BASE_URL_REGEX + r'(?P<id>\$/[^/]+/[^/]+/{1}|@{0}/{0}|(?!@){0})'.format(LBRYBaseIE._OPT_CLAIM_ID, LBRYBaseIE._CLAIM_ID_REGEX)
+    IE_DESC = 'odysee.com'
+    _VALID_URL = LBRYBaseIE._BASE_URL_REGEX + rf'''
+        (?:\$/(?:download|embed)/)?
+        (?P<id>
+            [^$@:/?#]+/{LBRYBaseIE._CLAIM_ID_REGEX}
+            |(?:@{LBRYBaseIE._OPT_CLAIM_ID}/)?{LBRYBaseIE._OPT_CLAIM_ID}
+        )'''
     _TESTS = [{
         # Video
         'url': 'https://lbry.tv/@Mantega:1/First-day-LBRY:1',
@@ -98,6 +161,7 @@ class LBRYIE(LBRYBaseIE):
             'height': 720,
             'thumbnail': 'https://spee.ch/7/67f2d809c263288c.png',
             'license': 'None',
+            'uploader_id': '@Mantega',
             'duration': 346,
             'channel': 'LBRY/Odysee rats united!!!',
             'channel_id': '1c8ad6a2ab4e889a71146ae4deeb23bb92dab627',
@@ -107,9 +171,9 @@ class LBRYIE(LBRYBaseIE):
                 'lbc',
                 'lbry',
                 'start',
-                'tutorial'
+                'tutorial',
             ],
-        }
+        },
     }, {
         # Audio
         'url': 'https://lbry.tv/@LBRYFoundation:0/Episode-1:e',
@@ -131,7 +195,8 @@ class LBRYIE(LBRYBaseIE):
             'vcodec': 'none',
             'thumbnail': 'https://spee.ch/d/0bc63b0e6bf1492d.png',
             'license': 'None',
-        }
+            'uploader_id': '@LBRYFoundation',
+        },
     }, {
         'url': 'https://odysee.com/@gardeningincanada:b/plants-i-will-never-grow-again.-the:e',
         'md5': 'c35fac796f62a14274b4dc2addb5d0ba',
@@ -149,10 +214,11 @@ class LBRYIE(LBRYBaseIE):
             'channel': 'Gardening In Canada',
             'channel_id': 'b8be0e93b423dad221abe29545fbe8ec36e806bc',
             'channel_url': 'https://odysee.com/@gardeningincanada:b8be0e93b423dad221abe29545fbe8ec36e806bc',
+            'uploader_id': '@gardeningincanada',
             'formats': 'mincount:3',
             'thumbnail': 'https://thumbnails.lbry.com/AgHSc_HzrrE',
             'license': 'Copyrighted (contact publisher)',
-        }
+        },
     }, {
         # HLS live stream (might expire)
         'url': 'https://odysee.com/@RT:fd/livestream_RT:d',
@@ -167,15 +233,15 @@ class LBRYIE(LBRYBaseIE):
             'release_timestamp': int,
             'release_date': str,
             'tags': list,
-            'duration': None,
             'channel': 'RT',
             'channel_id': 'fdd11cb3ab75f95efb7b3bc2d726aa13ac915b66',
             'channel_url': 'https://odysee.com/@RT:fdd11cb3ab75f95efb7b3bc2d726aa13ac915b66',
             'formats': 'mincount:1',
             'thumbnail': 'startswith:https://thumb',
             'license': 'None',
+            'uploader_id': '@RT',
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }, {
         # original quality format w/higher resolution than HLS formats
         'url': 'https://odysee.com/@wickedtruths:2/Biotechnological-Invasion-of-Skin-(April-2023):4',
@@ -184,12 +250,13 @@ class LBRYIE(LBRYBaseIE):
             'id': '41fbfe805eb73c8d3012c0c49faa0f563274f634',
             'ext': 'mp4',
             'title': 'Biotechnological Invasion of Skin (April 2023)',
-            'description': 'md5:709a2f4c07bd8891cda3a7cc2d6fcf5c',
+            'description': 'md5:fe28689db2cb7ba3436d819ac3ffc378',
             'channel': 'Wicked Truths',
             'channel_id': '23d2bbf856b0ceed5b1d7c5960bcc72da5a20cb0',
             'channel_url': 'https://odysee.com/@wickedtruths:23d2bbf856b0ceed5b1d7c5960bcc72da5a20cb0',
-            'timestamp': 1685790036,
-            'upload_date': '20230603',
+            'uploader_id': '@wickedtruths',
+            'timestamp': 1695114347,
+            'upload_date': '20230919',
             'release_timestamp': 1685617473,
             'release_date': '20230601',
             'duration': 1063,
@@ -229,10 +296,10 @@ class LBRYIE(LBRYBaseIE):
 
     def _real_extract(self, url):
         display_id = self._match_id(url)
-        if display_id.startswith('$/'):
-            display_id = display_id.split('/', 2)[-1].replace('/', ':')
-        else:
+        if display_id.startswith('@'):
             display_id = display_id.replace(':', '#')
+        else:
+            display_id = display_id.replace('/', ':')
         display_id = urllib.parse.unquote(display_id)
         uri = 'lbry://' + display_id
         result = self._resolve_url(uri, display_id, 'stream')
@@ -244,7 +311,13 @@ class LBRYIE(LBRYBaseIE):
         if stream_type in self._SUPPORTED_STREAM_TYPES:
             claim_id, is_live = result['claim_id'], False
             streaming_url = self._call_api_proxy(
-                'get', claim_id, {'uri': uri}, 'streaming url')['streaming_url']
+                'get', claim_id, {
+                    'uri': uri,
+                    **traverse_obj(parse_qs(url), {
+                        'signature': ('signature', 0),
+                        'signature_ts': ('signature_ts', 0),
+                    }),
+                }, 'streaming url')['streaming_url']
 
             # GET request to v3 API returns original video/audio file if available
             direct_url = re.sub(r'/api/v\d+/', '/api/v3/', streaming_url)
@@ -264,12 +337,15 @@ class LBRYIE(LBRYBaseIE):
                     'vcodec': 'none' if stream_type == 'audio' else None,
                 })
 
+            final_url = None
             # HEAD request returns redirect response to m3u8 URL if available
-            final_url = self._request_webpage(
+            urlh = self._request_webpage(
                 HEADRequest(streaming_url), display_id, headers=headers,
-                note='Downloading streaming redirect url info').url
+                note='Downloading streaming redirect url info', fatal=False)
+            if urlh:
+                final_url = urlh.url
 
-        elif result.get('value_type') == 'stream':
+        elif result.get('value_type') == 'stream' and stream_type not in self._UNSUPPORTED_STREAM_TYPES:
             claim_id, is_live = result['signing_channel']['claim_id'], True
             live_data = self._download_json(
                 'https://api.odysee.live/livestream/is_live', claim_id,
@@ -299,7 +375,8 @@ class LBRYIE(LBRYBaseIE):
 
 class LBRYChannelIE(LBRYBaseIE):
     IE_NAME = 'lbry:channel'
-    _VALID_URL = LBRYBaseIE._BASE_URL_REGEX + r'(?P<id>@%s)/?(?:[?&]|$)' % LBRYBaseIE._OPT_CLAIM_ID
+    IE_DESC = 'odysee.com channels'
+    _VALID_URL = LBRYBaseIE._BASE_URL_REGEX + rf'(?P<id>@{LBRYBaseIE._OPT_CLAIM_ID})/?(?:[?&]|$)'
     _TESTS = [{
         'url': 'https://lbry.tv/@LBRYFoundation:0',
         'info_dict': {
@@ -315,65 +392,51 @@ class LBRYChannelIE(LBRYBaseIE):
         'url': 'lbry://@lbry#3f',
         'only_matching': True,
     }]
-    _PAGE_SIZE = 50
-
-    def _fetch_page(self, claim_id, url, params, page):
-        page += 1
-        page_params = {
-            'channel_ids': [claim_id],
-            'claim_type': 'stream',
-            'no_totals': True,
-            'page': page,
-            'page_size': self._PAGE_SIZE,
-        }
-        page_params.update(params)
-        result = self._call_api_proxy(
-            'claim_search', claim_id, page_params, 'page %d' % page)
-        for item in (result.get('items') or []):
-            stream_claim_name = item.get('name')
-            stream_claim_id = item.get('claim_id')
-            if not (stream_claim_name and stream_claim_id):
-                continue
-
-            yield {
-                **self._parse_stream(item, url),
-                '_type': 'url',
-                'id': stream_claim_id,
-                'url': self._permanent_url(url, stream_claim_name, stream_claim_id),
-            }
 
     def _real_extract(self, url):
         display_id = self._match_id(url).replace(':', '#')
-        result = self._resolve_url(
-            'lbry://' + display_id, display_id, 'channel')
+        result = self._resolve_url(f'lbry://{display_id}', display_id, 'channel')
         claim_id = result['claim_id']
-        qs = parse_qs(url)
-        content = qs.get('content', [None])[0]
-        params = {
-            'fee_amount': qs.get('fee_amount', ['>=0'])[0],
-            'order_by': {
-                'new': ['release_time'],
-                'top': ['effective_amount'],
-                'trending': ['trending_group', 'trending_mixed'],
-            }[qs.get('order', ['new'])[0]],
-            'stream_types': [content] if content in ['audio', 'video'] else self._SUPPORTED_STREAM_TYPES,
-        }
-        duration = qs.get('duration', [None])[0]
-        if duration:
-            params['duration'] = {
-                'long': '>=1200',
-                'short': '<=240',
-            }[duration]
-        language = qs.get('language', ['all'])[0]
-        if language != 'all':
-            languages = [language]
-            if language == 'en':
-                languages.append('none')
-            params['any_languages'] = languages
-        entries = OnDemandPagedList(
-            functools.partial(self._fetch_page, claim_id, url, params),
-            self._PAGE_SIZE)
-        result_value = result.get('value') or {}
-        return self.playlist_result(
-            entries, claim_id, result_value.get('title'),
-            result_value.get('description'))
+
+        return self._playlist_entries(url, claim_id, {'channel_ids': [claim_id]}, result)
+
+
+class LBRYPlaylistIE(LBRYBaseIE):
+    IE_NAME = 'lbry:playlist'
+    IE_DESC = 'odysee.com playlists'
+    _VALID_URL = LBRYBaseIE._BASE_URL_REGEX + r'\$/(?:play)?list/(?P<id>[0-9a-f-]+)'
+    _TESTS = [{
+        'url': 'https://odysee.com/$/playlist/ffef782f27486f0ac138bde8777f72ebdd0548c2',
+        'info_dict': {
+            'id': 'ffef782f27486f0ac138bde8777f72ebdd0548c2',
+            'title': 'Théâtre Classique',
+            'description': 'Théâtre Classique',
+        },
+        'playlist_mincount': 4,
+    }, {
+        'url': 'https://odysee.com/$/list/9c6658b3dd21e4f2a0602d523a13150e2b48b770',
+        'info_dict': {
+            'id': '9c6658b3dd21e4f2a0602d523a13150e2b48b770',
+            'title': 'Social Media Exposed',
+            'description': 'md5:98af97317aacd5b85d595775ea37d80e',
+        },
+        'playlist_mincount': 34,
+    }, {
+        'url': 'https://odysee.com/$/playlist/938fb11d-215f-4d1c-ad64-723954df2184',
+        'info_dict': {
+            'id': '938fb11d-215f-4d1c-ad64-723954df2184',
+        },
+        'playlist_mincount': 1000,
+    }]
+
+    def _real_extract(self, url):
+        display_id = self._match_id(url)
+        result = traverse_obj(self._call_api_proxy('claim_search', display_id, {
+            'claim_ids': [display_id],
+            'no_totals': True,
+            'page': 1,
+            'page_size': self._PAGE_SIZE,
+        }, 'playlist'), ('items', 0))
+        claim_param = {'claim_ids': traverse_obj(result, ('value', 'claims', ..., {str}))}
+
+        return self._playlist_entries(url, display_id, claim_param, result)
diff --git a/plugins/youtube_download/yt_dlp/extractor/lci.py b/plugins/youtube_download/yt_dlp/extractor/lci.py
index e7d2f8a..708cb54 100644
--- a/plugins/youtube_download/yt_dlp/extractor/lci.py
+++ b/plugins/youtube_download/yt_dlp/extractor/lci.py
@@ -1,9 +1,25 @@
 from .common import InfoExtractor
+from .wat import WatIE
+from ..utils import ExtractorError, int_or_none
+from ..utils.traversal import traverse_obj
 
 
 class LCIIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?(?:lci|tf1info)\.fr/[^/]+/[\w-]+-(?P<id>\d+)\.html'
+    _VALID_URL = r'https?://(?:www\.)?(?:lci|tf1info)\.fr/(?:[^/?#]+/)+[\w-]+-(?P<id>\d+)\.html'
     _TESTS = [{
+        'url': 'https://www.tf1info.fr/replay-lci/videos/video-24h-pujadas-du-vendredi-24-mai-6708-2300831.html',
+        'info_dict': {
+            'id': '14113788',
+            'ext': 'mp4',
+            'title': '24H Pujadas du vendredi 24 mai 2024',
+            'thumbnail': 'https://photos.tf1.fr/1280/720/24h-pujadas-du-24-mai-2024-55bf2d-0@1x.jpg',
+            'upload_date': '20240524',
+            'duration': 6158,
+        },
+        'params': {
+            'skip_download': True,
+        },
+    }, {
         'url': 'https://www.tf1info.fr/politique/election-presidentielle-2022-second-tour-j-2-marine-le-pen-et-emmanuel-macron-en-interview-de-lci-vendredi-soir-2217486.html',
         'info_dict': {
             'id': '13875948',
@@ -24,5 +40,10 @@ class LCIIE(InfoExtractor):
     def _real_extract(self, url):
         video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
-        wat_id = self._search_regex(r'watId["\']?\s*:\s*["\']?(\d+)', webpage, 'wat id')
-        return self.url_result('wat:' + wat_id, 'Wat', wat_id)
+        next_data = self._search_nextjs_data(webpage, video_id)
+        wat_id = traverse_obj(next_data, (
+            'props', 'pageProps', 'page', 'tms', 'videos', {dict.keys}, ..., {int_or_none}, any))
+        if wat_id is None:
+            raise ExtractorError('Could not find wat_id')
+
+        return self.url_result(f'wat:{wat_id}', WatIE, str(wat_id))
diff --git a/plugins/youtube_download/yt_dlp/extractor/lcp.py b/plugins/youtube_download/yt_dlp/extractor/lcp.py
index 9846319..69148be 100644
--- a/plugins/youtube_download/yt_dlp/extractor/lcp.py
+++ b/plugins/youtube_download/yt_dlp/extractor/lcp.py
@@ -1,5 +1,5 @@
-from .common import InfoExtractor
 from .arkena import ArkenaIE
+from .common import InfoExtractor
 
 
 class LcpPlayIE(ArkenaIE):  # XXX: Do not subclass from concrete IE
@@ -66,7 +66,7 @@ class LcpIE(InfoExtractor):
         webpage = self._download_webpage(url, display_id)
 
         play_url = self._search_regex(
-            r'<iframe[^>]+src=(["\'])(?P<url>%s?(?:(?!\1).)*)\1' % LcpPlayIE._VALID_URL,
+            rf'<iframe[^>]+src=(["\'])(?P<url>{LcpPlayIE._VALID_URL}?(?:(?!\1).)*)\1',
             webpage, 'play iframe', default=None, group='url')
 
         if not play_url:
diff --git a/plugins/youtube_download/yt_dlp/extractor/learningonscreen.py b/plugins/youtube_download/yt_dlp/extractor/learningonscreen.py
new file mode 100644
index 0000000..f4b51e6
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/learningonscreen.py
@@ -0,0 +1,72 @@
+import functools
+import re
+
+from .common import InfoExtractor
+from ..utils import (
+    ExtractorError,
+    clean_html,
+    extract_attributes,
+    join_nonempty,
+    parse_duration,
+    unified_timestamp,
+)
+from ..utils.traversal import find_element, traverse_obj
+
+
+class LearningOnScreenIE(InfoExtractor):
+    _VALID_URL = r'https?://learningonscreen\.ac\.uk/ondemand/index\.php/prog/(?P<id>\w+)'
+    _TESTS = [{
+        'url': 'https://learningonscreen.ac.uk/ondemand/index.php/prog/005D81B2?bcast=22757013',
+        'info_dict': {
+            'id': '005D81B2',
+            'ext': 'mp4',
+            'title': 'Planet Earth',
+            'duration': 3600.0,
+            'timestamp': 1164567600.0,
+            'upload_date': '20061126',
+            'thumbnail': 'https://stream.learningonscreen.ac.uk/trilt-cover-images/005D81B2-Planet-Earth-2006-11-26T190000Z-BBC4.jpg',
+        },
+    }]
+
+    def _real_initialize(self):
+        if not self._get_cookies('https://learningonscreen.ac.uk/').get('PHPSESSID-BOB-LIVE'):
+            self.raise_login_required(method='session_cookies')
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+
+        details = traverse_obj(webpage, (
+            {find_element(id='programme-details', html=True)}, {
+                'title': ({find_element(tag='h2')}, {clean_html}),
+                'timestamp': (
+                    {find_element(cls='broadcast-date')},
+                    {functools.partial(re.match, r'([^<]+)')}, 1, {unified_timestamp}),
+                'duration': (
+                    {find_element(cls='prog-running-time')}, {clean_html}, {parse_duration}),
+            }))
+
+        title = details.pop('title', None) or traverse_obj(webpage, (
+            {find_element(id='add-to-existing-playlist', html=True)},
+            {extract_attributes}, 'data-record-title', {clean_html}))
+
+        entries = self._parse_html5_media_entries(
+            'https://stream.learningonscreen.ac.uk', webpage, video_id, m3u8_id='hls', mpd_id='dash',
+            _headers={'Origin': 'https://learningonscreen.ac.uk', 'Referer': 'https://learningonscreen.ac.uk/'})
+        if not entries:
+            raise ExtractorError('No video found')
+
+        if len(entries) > 1:
+            duration = details.pop('duration', None)
+            for idx, entry in enumerate(entries, start=1):
+                entry.update(details)
+                entry['id'] = join_nonempty(video_id, idx)
+                entry['title'] = join_nonempty(title, idx)
+            return self.playlist_result(entries, video_id, title, duration=duration)
+
+        return {
+            **entries[0],
+            **details,
+            'id': video_id,
+            'title': title,
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/lecture2go.py b/plugins/youtube_download/yt_dlp/extractor/lecture2go.py
index 3a9b30a..6157f3d 100644
--- a/plugins/youtube_download/yt_dlp/extractor/lecture2go.py
+++ b/plugins/youtube_download/yt_dlp/extractor/lecture2go.py
@@ -4,12 +4,13 @@ from .common import InfoExtractor
 from ..utils import (
     determine_ext,
     determine_protocol,
-    parse_duration,
     int_or_none,
+    parse_duration,
 )
 
 
 class Lecture2GoIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://lecture2go\.uni-hamburg\.de/veranstaltungen/-/v/(?P<id>\d+)'
     _TEST = {
         'url': 'https://lecture2go.uni-hamburg.de/veranstaltungen/-/v/17473',
@@ -24,7 +25,7 @@ class Lecture2GoIE(InfoExtractor):
         'params': {
             # m3u8 download
             'skip_download': True,
-        }
+        },
     }
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/lecturio.py b/plugins/youtube_download/yt_dlp/extractor/lecturio.py
index bb059d3..4cfb872 100644
--- a/plugins/youtube_download/yt_dlp/extractor/lecturio.py
+++ b/plugins/youtube_download/yt_dlp/extractor/lecturio.py
@@ -2,9 +2,9 @@ import re
 
 from .common import InfoExtractor
 from ..utils import (
+    ExtractorError,
     clean_html,
     determine_ext,
-    ExtractorError,
     float_or_none,
     int_or_none,
     str_or_none,
@@ -49,7 +49,7 @@ class LecturioBaseIE(InfoExtractor):
             r'(?s)<ul[^>]+class=["\']error_list[^>]+>(.+?)</ul>', response,
             'errors', default=None)
         if errors:
-            raise ExtractorError('Unable to login: %s' % errors, expected=True)
+            raise ExtractorError(f'Unable to login: {errors}', expected=True)
         raise ExtractorError('Unable to log in')
 
 
@@ -57,8 +57,8 @@ class LecturioIE(LecturioBaseIE):
     _VALID_URL = r'''(?x)
                     https://
                         (?:
-                            app\.lecturio\.com/([^/]+/(?P<nt>[^/?#&]+)\.lecture|(?:\#/)?lecture/c/\d+/(?P<id>\d+))|
-                            (?:www\.)?lecturio\.de/[^/]+/(?P<nt_de>[^/?#&]+)\.vortrag
+                            app\.lecturio\.com/([^/?#]+/(?P<nt>[^/?#&]+)\.lecture|(?:\#/)?lecture/c/\d+/(?P<id>\d+))|
+                            (?:www\.)?lecturio\.de/(?:[^/?#]+/)+(?P<nt_de>[^/?#&]+)\.vortrag
                         )
                     '''
     _TESTS = [{
@@ -73,6 +73,9 @@ class LecturioIE(LecturioBaseIE):
     }, {
         'url': 'https://www.lecturio.de/jura/oeffentliches-recht-staatsexamen.vortrag',
         'only_matching': True,
+    }, {
+        'url': 'https://www.lecturio.de/jura/oeffentliches-recht-at-1-staatsexamen/oeffentliches-recht-staatsexamen.vortrag',
+        'only_matching': True,
     }, {
         'url': 'https://app.lecturio.com/#/lecture/c/6434/39634',
         'only_matching': True,
@@ -127,7 +130,7 @@ class LecturioIE(LecturioBaseIE):
             f = {
                 'url': file_url,
                 'format_id': label,
-                'filesize': float_or_none(filesize, invscale=1000)
+                'filesize': float_or_none(filesize, invscale=1000),
             }
             if label:
                 mobj = re.match(r'(\d+)p\s*\(([^)]+)\)', label)
@@ -169,7 +172,7 @@ class LecturioIE(LecturioBaseIE):
 
 
 class LecturioCourseIE(LecturioBaseIE):
-    _VALID_URL = r'https://app\.lecturio\.com/(?:[^/]+/(?P<nt>[^/?#&]+)\.course|(?:#/)?course/c/(?P<id>\d+))'
+    _VALID_URL = r'https?://app\.lecturio\.com/(?:[^/]+/(?P<nt>[^/?#&]+)\.course|(?:#/)?course/c/(?P<id>\d+))'
     _TESTS = [{
         'url': 'https://app.lecturio.com/medical-courses/microbiology-introduction.course#/',
         'info_dict': {
@@ -197,7 +200,7 @@ class LecturioCourseIE(LecturioBaseIE):
             if lecture_url:
                 lecture_url = urljoin(url, lecture_url)
             else:
-                lecture_url = 'https://app.lecturio.com/#/lecture/c/%s/%s' % (course_id, lecture_id)
+                lecture_url = f'https://app.lecturio.com/#/lecture/c/{course_id}/{lecture_id}'
             entries.append(self.url_result(
                 lecture_url, ie=LecturioIE.ie_key(), video_id=lecture_id))
         return self.playlist_result(
@@ -206,7 +209,7 @@ class LecturioCourseIE(LecturioBaseIE):
 
 
 class LecturioDeCourseIE(LecturioBaseIE):
-    _VALID_URL = r'https://(?:www\.)?lecturio\.de/[^/]+/(?P<id>[^/?#&]+)\.kurs'
+    _VALID_URL = r'https?://(?:www\.)?lecturio\.de/[^/]+/(?P<id>[^/?#&]+)\.kurs'
     _TEST = {
         'url': 'https://www.lecturio.de/jura/grundrechte.kurs',
         'only_matching': True,
diff --git a/plugins/youtube_download/yt_dlp/extractor/leeco.py b/plugins/youtube_download/yt_dlp/extractor/leeco.py
index 85033b8..58baa3f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/leeco.py
+++ b/plugins/youtube_download/yt_dlp/extractor/leeco.py
@@ -1,19 +1,16 @@
-import datetime
+import base64
+import datetime as dt
 import hashlib
 import re
 import time
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_b64decode,
-    compat_ord,
-    compat_str,
-    compat_urllib_parse_urlencode,
-)
+from ..compat import compat_ord
 from ..utils import (
+    ExtractorError,
     determine_ext,
     encode_data_uri,
-    ExtractorError,
     int_or_none,
     orderedSet,
     parse_iso8601,
@@ -140,7 +137,7 @@ class LeIE(InfoExtractor):
         def get_flash_urls(media_url, format_id):
             nodes_data = self._download_json(
                 media_url, media_id,
-                'Download JSON metadata for format %s' % format_id,
+                f'Download JSON metadata for format {format_id}',
                 query={
                     'm3v': 1,
                     'format': 1,
@@ -150,7 +147,7 @@ class LeIE(InfoExtractor):
 
             req = self._request_webpage(
                 nodes_data['nodelist'][0]['location'], media_id,
-                note='Downloading m3u8 information for format %s' % format_id)
+                note=f'Downloading m3u8 information for format {format_id}')
 
             m3u8_data = self.decrypt_m3u8(req.read())
 
@@ -173,7 +170,7 @@ class LeIE(InfoExtractor):
                 f = {
                     'url': format_url,
                     'ext': determine_ext(format_data[1]),
-                    'format_id': '%s-%s' % (protocol, format_id),
+                    'format_id': f'{protocol}-{format_id}',
                     'protocol': 'm3u8_native' if protocol == 'hls' else 'http',
                     'quality': int_or_none(format_id),
                 }
@@ -185,7 +182,7 @@ class LeIE(InfoExtractor):
 
         publish_time = parse_iso8601(self._html_search_regex(
             r'发布时间&nbsp;([^<>]+) ', page, 'publish time', default=None),
-            delimiter=' ', timezone=datetime.timedelta(hours=8))
+            delimiter=' ', timezone=dt.timedelta(hours=8))
         description = self._html_search_meta('description', page, fatal=False)
 
         return {
@@ -207,18 +204,18 @@ class LePlaylistIE(InfoExtractor):
         'info_dict': {
             'id': '46177',
             'title': '美人天下',
-            'description': 'md5:395666ff41b44080396e59570dbac01c'
+            'description': 'md5:395666ff41b44080396e59570dbac01c',
         },
-        'playlist_count': 35
+        'playlist_count': 35,
     }, {
         'url': 'http://tv.le.com/izt/wuzetian/index.html',
         'info_dict': {
             'id': 'wuzetian',
             'title': '武媚娘传奇',
-            'description': 'md5:e12499475ab3d50219e5bba00b3cb248'
+            'description': 'md5:e12499475ab3d50219e5bba00b3cb248',
         },
         # This playlist contains some extra videos other than the drama itself
-        'playlist_mincount': 96
+        'playlist_mincount': 96,
     }, {
         'url': 'http://tv.le.com/pzt/lswjzzjc/index.shtml',
         # This series is moved to http://www.le.com/tv/10005297.html
@@ -233,7 +230,7 @@ class LePlaylistIE(InfoExtractor):
 
     @classmethod
     def suitable(cls, url):
-        return False if LeIE.suitable(url) else super(LePlaylistIE, cls).suitable(url)
+        return False if LeIE.suitable(url) else super().suitable(url)
 
     def _real_extract(self, url):
         playlist_id = self._match_id(url)
@@ -294,7 +291,7 @@ class LetvCloudIE(InfoExtractor):
             salt = 'fbeh5player12c43eccf2bec3300344'
             items = ['cf', 'ran', 'uu', 'bver', 'vu']
         input_data = ''.join([item + obj[item] for item in items]) + salt
-        obj['sign'] = hashlib.md5(input_data.encode('utf-8')).hexdigest()
+        obj['sign'] = hashlib.md5(input_data.encode()).hexdigest()
 
     def _get_formats(self, cf, uu, vu, media_id):
         def get_play_json(cf, timestamp):
@@ -305,12 +302,12 @@ class LetvCloudIE(InfoExtractor):
                 'format': 'json',
                 'uu': uu,
                 'vu': vu,
-                'ran': compat_str(timestamp),
+                'ran': str(timestamp),
             }
             self.sign_data(data)
             return self._download_json(
-                'http://api.letvcloud.com/gpc.php?' + compat_urllib_parse_urlencode(data),
-                media_id, 'Downloading playJson data for type %s' % cf)
+                'http://api.letvcloud.com/gpc.php?' + urllib.parse.urlencode(data),
+                media_id, f'Downloading playJson data for type {cf}')
 
         play_json = get_play_json(cf, time.time())
         # The server time may be different from local time
@@ -319,14 +316,14 @@ class LetvCloudIE(InfoExtractor):
 
         if not play_json.get('data'):
             if play_json.get('message'):
-                raise ExtractorError('Letv cloud said: %s' % play_json['message'], expected=True)
+                raise ExtractorError('Letv cloud said: {}'.format(play_json['message']), expected=True)
             elif play_json.get('code'):
                 raise ExtractorError('Letv cloud returned error %d' % play_json['code'], expected=True)
             else:
                 raise ExtractorError('Letv cloud returned an unknown error')
 
         def b64decode(s):
-            return compat_b64decode(s).decode('utf-8')
+            return base64.b64decode(s).decode('utf-8')
 
         formats = []
         for media in play_json['data']['video_info']['media'].values():
@@ -349,7 +346,7 @@ class LetvCloudIE(InfoExtractor):
         vu_mobj = re.search(r'vu=([\w]+)', url)
 
         if not uu_mobj or not vu_mobj:
-            raise ExtractorError('Invalid URL: %s' % url, expected=True)
+            raise ExtractorError(f'Invalid URL: {url}', expected=True)
 
         uu = uu_mobj.group(1)
         vu = vu_mobj.group(1)
@@ -359,6 +356,6 @@ class LetvCloudIE(InfoExtractor):
 
         return {
             'id': media_id,
-            'title': 'Video %s' % media_id,
+            'title': f'Video {media_id}',
             'formats': formats,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/lefigaro.py b/plugins/youtube_download/yt_dlp/extractor/lefigaro.py
index 9465095..a452d87 100644
--- a/plugins/youtube_download/yt_dlp/extractor/lefigaro.py
+++ b/plugins/youtube_download/yt_dlp/extractor/lefigaro.py
@@ -13,7 +13,7 @@ class LeFigaroVideoEmbedIE(InfoExtractor):
 
     _TESTS = [{
         'url': 'https://video.lefigaro.fr/embed/figaro/video/les-francais-ne-veulent-ils-plus-travailler-suivez-en-direct-le-club-le-figaro-idees/',
-        'md5': 'e94de44cd80818084352fcf8de1ce82c',
+        'md5': 'a0c3069b7e4c4526abf0053a7713f56f',
         'info_dict': {
             'id': 'g9j7Eovo',
             'title': 'Les Français ne veulent-ils plus travailler ? Retrouvez Le Club Le Figaro Idées',
@@ -26,7 +26,7 @@ class LeFigaroVideoEmbedIE(InfoExtractor):
         },
     }, {
         'url': 'https://video.lefigaro.fr/embed/figaro/video/intelligence-artificielle-faut-il-sen-mefier/',
-        'md5': '0b3f10332b812034b3a3eda1ef877c5f',
+        'md5': '319c662943dd777bab835cae1e2d73a5',
         'info_dict': {
             'id': 'LeAgybyc',
             'title': 'Intelligence artificielle : faut-il s’en méfier ?',
@@ -41,7 +41,7 @@ class LeFigaroVideoEmbedIE(InfoExtractor):
 
     _WEBPAGE_TESTS = [{
         'url': 'https://video.lefigaro.fr/figaro/video/suivez-en-direct-le-club-le-figaro-international-avec-philippe-gelie-9/',
-        'md5': '3972ddf2d5f8b98699f191687258e2f9',
+        'md5': '6289f9489efb969e38245f31721596fe',
         'info_dict': {
             'id': 'QChnbPYA',
             'title': 'Où en est le couple franco-allemand ? Retrouvez Le Club Le Figaro International',
@@ -55,7 +55,7 @@ class LeFigaroVideoEmbedIE(InfoExtractor):
         },
     }, {
         'url': 'https://video.lefigaro.fr/figaro/video/la-philosophe-nathalie-sarthou-lajus-est-linvitee-du-figaro-live/',
-        'md5': '3ac0a0769546ee6be41ab52caea5d9a9',
+        'md5': 'f6df814cae53e85937621599d2967520',
         'info_dict': {
             'id': 'QJzqoNbf',
             'title': 'La philosophe Nathalie Sarthou-Lajus est l’invitée du Figaro Live',
@@ -73,7 +73,8 @@ class LeFigaroVideoEmbedIE(InfoExtractor):
         display_id = self._match_id(url)
         webpage = self._download_webpage(url, display_id)
 
-        player_data = self._search_nextjs_data(webpage, display_id)['props']['pageProps']['pageData']['playerData']
+        player_data = self._search_nextjs_data(
+            webpage, display_id)['props']['pageProps']['initialProps']['pageData']['playerData']
 
         return self.url_result(
             f'jwplatform:{player_data["videoId"]}', title=player_data.get('title'),
diff --git a/plugins/youtube_download/yt_dlp/extractor/lego.py b/plugins/youtube_download/yt_dlp/extractor/lego.py
index 46fc7a9..5a98cc7 100644
--- a/plugins/youtube_download/yt_dlp/extractor/lego.py
+++ b/plugins/youtube_download/yt_dlp/extractor/lego.py
@@ -72,7 +72,7 @@ class LEGOIE(InfoExtractor):
                 # https://contentfeed.services.lego.com/api/v2/item/[VIDEO_ID]?culture=[LOCALE]&contentType=Video
                 'https://services.slingshot.lego.com/mediaplayer/v2',
                 video_id, query={
-                    'videoId': '%s_%s' % (uuid.UUID(video_id), locale),
+                    'videoId': f'{uuid.UUID(video_id)}_{locale}',
                 }, headers=self.geo_verification_headers())
         except ExtractorError as e:
             if isinstance(e.cause, HTTPError) and e.cause.status == 451:
@@ -111,7 +111,7 @@ class LEGOIE(InfoExtractor):
                         'abr': quality[0],
                         'height': quality[1],
                         'width': quality[2],
-                    }),
+                    })
                 formats.append(f)
 
         subtitles = {}
@@ -123,7 +123,7 @@ class LEGOIE(InfoExtractor):
             video_version = video.get('VideoVersion')
             if net_storage_path and invariant_id and video_file_id and video_version:
                 subtitles.setdefault(locale[:2], []).append({
-                    'url': 'https://lc-mediaplayerns-live-s.legocdn.com/public/%s/%s_%s_%s_%s_sub.srt' % (net_storage_path, invariant_id, video_file_id, locale, video_version),
+                    'url': f'https://lc-mediaplayerns-live-s.legocdn.com/public/{net_storage_path}/{invariant_id}_{video_file_id}_{locale}_{video_version}_sub.srt',
                 })
 
         return {
diff --git a/plugins/youtube_download/yt_dlp/extractor/lenta.py b/plugins/youtube_download/yt_dlp/extractor/lenta.py
index 10aac98..105ec37 100644
--- a/plugins/youtube_download/yt_dlp/extractor/lenta.py
+++ b/plugins/youtube_download/yt_dlp/extractor/lenta.py
@@ -2,6 +2,7 @@ from .common import InfoExtractor
 
 
 class LentaIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?lenta\.ru/[^/]+/\d+/\d+/\d+/(?P<id>[^/?#&]+)'
     _TESTS = [{
         'url': 'https://lenta.ru/news/2018/03/22/savshenko_go/',
@@ -44,7 +45,7 @@ class LentaIE(InfoExtractor):
             default=None)
         if video_id:
             return self.url_result(
-                'eagleplatform:lentaru.media.eagleplatform.com:%s' % video_id,
+                f'eagleplatform:lentaru.media.eagleplatform.com:{video_id}',
                 ie='EaglePlatform', video_id=video_id)
 
         return self.url_result(url, ie='Generic')
diff --git a/plugins/youtube_download/yt_dlp/extractor/libraryofcongress.py b/plugins/youtube_download/yt_dlp/extractor/libraryofcongress.py
index b76ca09..6185605 100644
--- a/plugins/youtube_download/yt_dlp/extractor/libraryofcongress.py
+++ b/plugins/youtube_download/yt_dlp/extractor/libraryofcongress.py
@@ -1,7 +1,6 @@
 import re
 
 from .common import InfoExtractor
-
 from ..utils import (
     determine_ext,
     float_or_none,
@@ -74,7 +73,7 @@ class LibraryOfCongressIE(InfoExtractor):
             webpage, 'media id', group='id')
 
         data = self._download_json(
-            'https://media.loc.gov/services/v1/media?id=%s&context=json' % media_id,
+            f'https://media.loc.gov/services/v1/media?id={media_id}&context=json',
             media_id)['mediaObject']
 
         derivative = data['derivatives'][0]
diff --git a/plugins/youtube_download/yt_dlp/extractor/libsyn.py b/plugins/youtube_download/yt_dlp/extractor/libsyn.py
index 29bbb03..4ca521a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/libsyn.py
+++ b/plugins/youtube_download/yt_dlp/extractor/libsyn.py
@@ -18,7 +18,7 @@ class LibsynIE(InfoExtractor):
         'info_dict': {
             'id': '6385796',
             'ext': 'mp3',
-            'title': "Champion Minded - Developing a Growth Mindset",
+            'title': 'Champion Minded - Developing a Growth Mindset',
             # description fetched using another request:
             # http://html5-player.libsyn.com/embed/getitemdetails?item_id=6385796
             # 'description': 'In this episode, Allistair talks about the importance of developing a growth mindset, not only in sports, but in life too.',
@@ -34,7 +34,7 @@ class LibsynIE(InfoExtractor):
             'title': 'Clients From Hell Podcast - How a Sex Toy Company Kickstarted my Freelance Career',
             'upload_date': '20150818',
             'thumbnail': 're:^https?://.*',
-        }
+        },
     }]
 
     def _real_extract(self, url):
@@ -56,7 +56,7 @@ class LibsynIE(InfoExtractor):
             r'<h3>([^<]+)</h3>', webpage, 'podcast title',
             default=None) or get_element_by_class('podcast-title', webpage)))
 
-        title = '%s - %s' % (podcast_title, episode_title) if podcast_title else episode_title
+        title = f'{podcast_title} - {episode_title}' if podcast_title else episode_title
 
         formats = []
         for k, format_id in (('media_url_libsyn', 'libsyn'), ('media_url', 'main'), ('download_link', 'download')):
diff --git a/plugins/youtube_download/yt_dlp/extractor/lifenews.py b/plugins/youtube_download/yt_dlp/extractor/lifenews.py
index 919cfcb..60d50b1 100644
--- a/plugins/youtube_download/yt_dlp/extractor/lifenews.py
+++ b/plugins/youtube_download/yt_dlp/extractor/lifenews.py
@@ -1,13 +1,10 @@
 import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_str,
-    compat_urlparse,
-)
 from ..utils import (
-    determine_ext,
     ExtractorError,
+    determine_ext,
     int_or_none,
     parse_iso8601,
     remove_end,
@@ -31,7 +28,7 @@ class LifeNewsIE(InfoExtractor):
             'timestamp': 1344154740,
             'upload_date': '20120805',
             'view_count': int,
-        }
+        },
     }, {
         # single video embedded via iframe
         'url': 'https://life.ru/t/новости/152125',
@@ -44,7 +41,7 @@ class LifeNewsIE(InfoExtractor):
             'timestamp': 1427961840,
             'upload_date': '20150402',
             'view_count': int,
-        }
+        },
     }, {
         # two videos embedded via iframe
         'url': 'https://life.ru/t/новости/153461',
@@ -100,7 +97,7 @@ class LifeNewsIE(InfoExtractor):
             webpage)
 
         if not video_urls and not iframe_links:
-            raise ExtractorError('No media links available for %s' % video_id)
+            raise ExtractorError(f'No media links available for {video_id}')
 
         title = remove_end(
             self._og_search_title(webpage),
@@ -125,14 +122,14 @@ class LifeNewsIE(InfoExtractor):
         def make_entry(video_id, video_url, index=None):
             cur_info = dict(common_info)
             cur_info.update({
-                'id': video_id if not index else '%s-video%s' % (video_id, index),
+                'id': video_id if not index else f'{video_id}-video{index}',
                 'url': video_url,
-                'title': title if not index else '%s (Видео %s)' % (title, index),
+                'title': title if not index else f'{title} (Видео {index})',
             })
             return cur_info
 
         def make_video_entry(video_id, video_url, index=None):
-            video_url = compat_urlparse.urljoin(url, video_url)
+            video_url = urllib.parse.urljoin(url, video_url)
             return make_entry(video_id, video_url, index)
 
         def make_iframe_entry(video_id, video_url, index=None):
@@ -174,7 +171,7 @@ class LifeEmbedIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'e50c2dec2867350528e2574c899b8291',
             'thumbnail': r're:http://.*\.jpg',
-        }
+        },
     }, {
         # with 1080p
         'url': 'https://embed.life.ru/video/e50c2dec2867350528e2574c899b8291',
@@ -207,17 +204,17 @@ class LifeEmbedIE(InfoExtractor):
             video_id).get('playlist', {})
         if playlist:
             master = playlist.get('master')
-            if isinstance(master, compat_str) and determine_ext(master) == 'm3u8':
-                extract_m3u8(compat_urlparse.urljoin(url, master))
+            if isinstance(master, str) and determine_ext(master) == 'm3u8':
+                extract_m3u8(urllib.parse.urljoin(url, master))
             original = playlist.get('original')
-            if isinstance(original, compat_str):
+            if isinstance(original, str):
                 extract_original(original)
             thumbnail = playlist.get('image')
 
         # Old rendition fallback
         if not formats:
             for video_url in re.findall(r'"file"\s*:\s*"([^"]+)', webpage):
-                video_url = compat_urlparse.urljoin(url, video_url)
+                video_url = urllib.parse.urljoin(url, video_url)
                 if determine_ext(video_url) == 'm3u8':
                     extract_m3u8(video_url)
                 else:
diff --git a/plugins/youtube_download/yt_dlp/extractor/likee.py b/plugins/youtube_download/yt_dlp/extractor/likee.py
index 74ee2be..f6a51c8 100644
--- a/plugins/youtube_download/yt_dlp/extractor/likee.py
+++ b/plugins/youtube_download/yt_dlp/extractor/likee.py
@@ -22,8 +22,6 @@ class LikeeIE(InfoExtractor):
             'description': 'md5:9a7ebe816f0e78722ee5ed76f75983b4',
             'thumbnail': r're:^https?://.+\.jpg',
             'uploader': 'Huỳnh Hồng Qu&acirc;n ',
-            'play_count': int,
-            'download_count': int,
             'artist': 'Huỳnh Hồng Qu&acirc;n ',
             'timestamp': 1651571320,
             'upload_date': '20220503',
@@ -44,11 +42,9 @@ class LikeeIE(InfoExtractor):
             'comment_count': int,
             'like_count': int,
             'uploader': 'Vương Phước Nhi',
-            'download_count': int,
             'timestamp': 1651506835,
             'upload_date': '20220502',
             'duration': 60024,
-            'play_count': int,
             'artist': 'Vương Phước Nhi',
             'uploader_id': '649222262',
             'view_count': int,
@@ -65,9 +61,7 @@ class LikeeIE(InfoExtractor):
             'duration': 9684,
             'uploader_id': 'fernanda_rivasg',
             'view_count': int,
-            'play_count': int,
             'artist': 'La Cami La✨',
-            'download_count': int,
             'like_count': int,
             'uploader': 'Fernanda Rivas🎶',
             'timestamp': 1614034308,
@@ -83,13 +77,11 @@ class LikeeIE(InfoExtractor):
             'thumbnail': r're:^https?://.+\.jpg',
             'comment_count': int,
             'duration': 18014,
-            'play_count': int,
             'view_count': int,
             'timestamp': 1611694774,
             'like_count': int,
             'uploader': 'Fernanda Rivas🎶',
             'uploader_id': 'fernanda_rivasg',
-            'download_count': int,
             'artist': 'ʟᴇʀɪᴋ_ᴜɴɪᴄᴏʀɴ♡︎',
             'upload_date': '20210126',
         },
@@ -128,8 +120,6 @@ class LikeeIE(InfoExtractor):
             'description': info.get('share_desc'),
             'view_count': int_or_none(info.get('video_count')),
             'like_count': int_or_none(info.get('likeCount')),
-            'play_count': int_or_none(info.get('play_count')),
-            'download_count': int_or_none(info.get('download_count')),
             'comment_count': int_or_none(info.get('comment_count')),
             'uploader': str_or_none(info.get('nick_name')),
             'uploader_id': str_or_none(info.get('likeeId')),
@@ -172,7 +162,7 @@ class LikeeUserIE(InfoExtractor):
                     'count': self._PAGE_SIZE,
                     'lastPostId': last_post_id,
                     'tabType': 0,
-                }).encode('utf-8'),
+                }).encode(),
                 headers={'content-type': 'application/json'},
                 note=f'Get user info with lastPostId #{last_post_id}')
             items = traverse_obj(user_videos, ('data', 'videoList'))
diff --git a/plugins/youtube_download/yt_dlp/extractor/limelight.py b/plugins/youtube_download/yt_dlp/extractor/limelight.py
index 4e50f10..763a014 100644
--- a/plugins/youtube_download/yt_dlp/extractor/limelight.py
+++ b/plugins/youtube_download/yt_dlp/extractor/limelight.py
@@ -3,13 +3,13 @@ import re
 from .common import InfoExtractor
 from ..networking.exceptions import HTTPError
 from ..utils import (
+    ExtractorError,
     determine_ext,
     float_or_none,
     int_or_none,
     smuggle_url,
     try_get,
     unsmuggle_url,
-    ExtractorError,
 )
 
 
@@ -32,8 +32,8 @@ class LimelightBaseIE(InfoExtractor):
                 r'LimelightPlayer\.doLoad(Media|Channel|ChannelList)\(["\'](?P<id>[a-z0-9]{32})',
                 webpage):
             entries.append(cls.url_result(
-                smuggle('limelight:%s:%s' % (lm[kind], video_id)),
-                'Limelight%s' % kind, video_id))
+                smuggle(f'limelight:{lm[kind]}:{video_id}'),
+                f'Limelight{kind}', video_id))
         for mobj in re.finditer(
                 # As per [1] class attribute should be exactly equal to
                 # LimelightEmbeddedPlayerFlash but numerous examples seen
@@ -48,14 +48,14 @@ class LimelightBaseIE(InfoExtractor):
                 ''', webpage):
             kind, video_id = mobj.group('kind'), mobj.group('id')
             entries.append(cls.url_result(
-                smuggle('limelight:%s:%s' % (kind, video_id)),
-                'Limelight%s' % kind.capitalize(), video_id))
+                smuggle(f'limelight:{kind}:{video_id}'),
+                f'Limelight{kind.capitalize()}', video_id))
         # http://support.3playmedia.com/hc/en-us/articles/115009517327-Limelight-Embedding-the-Audio-Description-Plugin-with-the-Limelight-Player-on-Your-Web-Page)
         for video_id in re.findall(
                 r'(?s)LimelightPlayerUtil\.embed\s*\(\s*{.*?\bmediaId["\']\s*:\s*["\'](?P<id>[a-z0-9]{32})',
                 webpage):
             entries.append(cls.url_result(
-                smuggle('limelight:media:%s' % video_id),
+                smuggle(f'limelight:media:{video_id}'),
                 LimelightMediaIE.ie_key(), video_id))
         return entries
 
@@ -66,7 +66,7 @@ class LimelightBaseIE(InfoExtractor):
         try:
             return self._download_json(
                 self._PLAYLIST_SERVICE_URL % (self._PLAYLIST_SERVICE_PATH, item_id, method),
-                item_id, 'Downloading PlaylistService %s JSON' % method,
+                item_id, f'Downloading PlaylistService {method} JSON',
                 fatal=fatal, headers=headers)
         except ExtractorError as e:
             if isinstance(e.cause, HTTPError) and e.cause.status == 403:
@@ -134,7 +134,7 @@ class LimelightBaseIE(InfoExtractor):
                     for cdn_host, http_host in CDN_HOSTS:
                         if cdn_host not in rtmp.group('host').lower():
                             continue
-                        http_url = 'http://%s/%s' % (http_host, rtmp.group('playpath')[4:])
+                        http_url = 'http://{}/{}'.format(http_host, rtmp.group('playpath')[4:])
                         urls.append(http_url)
                         if self._is_valid_url(http_url, video_id, http_format_id):
                             http_fmt = fmt.copy()
@@ -351,7 +351,7 @@ class LimelightChannelListIE(LimelightBaseIE):
             channel_list_id, 'getMobileChannelListById')
 
         entries = [
-            self.url_result('limelight:channel:%s' % channel['id'], 'LimelightChannel')
+            self.url_result('limelight:channel:{}'.format(channel['id']), 'LimelightChannel')
             for channel in channel_list['channelList']]
 
         return self.playlist_result(
diff --git a/plugins/youtube_download/yt_dlp/extractor/linkedin.py b/plugins/youtube_download/yt_dlp/extractor/linkedin.py
index 2bf2e9a..2974f40 100644
--- a/plugins/youtube_download/yt_dlp/extractor/linkedin.py
+++ b/plugins/youtube_download/yt_dlp/extractor/linkedin.py
@@ -1,21 +1,21 @@
-from itertools import zip_longest
+import itertools
+import json
 import re
 
 from .common import InfoExtractor
 from ..utils import (
-    clean_html,
-    extract_attributes,
     ExtractorError,
+    extract_attributes,
     float_or_none,
-    get_element_by_class,
     int_or_none,
-    srt_subtitles_timecode,
-    strip_or_none,
     mimetype2ext,
+    srt_subtitles_timecode,
     try_get,
+    url_or_none,
     urlencode_postdata,
     urljoin,
 )
+from ..utils.traversal import find_elements, require, traverse_obj
 
 
 class LinkedInBaseIE(InfoExtractor):
@@ -60,14 +60,14 @@ class LinkedInLearningBaseIE(LinkedInBaseIE):
         if video_slug:
             query.update({
                 'videoSlug': video_slug,
-                'resolution': '_%s' % resolution,
+                'resolution': f'_{resolution}',
             })
             sub = ' %dp' % resolution
         api_url = 'https://www.linkedin.com/learning-api/detailedCourses'
         if not self._get_cookies(api_url).get('JSESSIONID'):
             self.raise_login_required()
         return self._download_json(
-            api_url, video_slug, 'Downloading%s JSON metadata' % sub, headers={
+            api_url, video_slug, f'Downloading{sub} JSON metadata', headers={
                 'Csrf-Token': self._get_cookies(api_url)['JSESSIONID'].value,
             }, query=query)['elements'][0]
 
@@ -79,46 +79,70 @@ class LinkedInLearningBaseIE(LinkedInBaseIE):
                 return mobj.group(1)
 
     def _get_video_id(self, video_data, course_slug, video_slug):
-        return self._get_urn_id(video_data) or '%s/%s' % (course_slug, video_slug)
+        return self._get_urn_id(video_data) or f'{course_slug}/{video_slug}'
 
 
 class LinkedInIE(LinkedInBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?linkedin\.com/posts/.+?(?P<id>\d+)'
+    _VALID_URL = [
+        r'https?://(?:www\.)?linkedin\.com/posts/[^/?#]+-(?P<id>\d+)-\w{4}/?(?:[?#]|$)',
+        r'https?://(?:www\.)?linkedin\.com/feed/update/urn:li:activity:(?P<id>\d+)',
+    ]
     _TESTS = [{
         'url': 'https://www.linkedin.com/posts/mishalkhawaja_sendinblueviews-toronto-digitalmarketing-ugcPost-6850898786781339649-mM20',
         'info_dict': {
             'id': '6850898786781339649',
             'ext': 'mp4',
-            'title': 'Mishal K. on LinkedIn: #sendinblueviews #toronto #digitalmarketing',
-            'description': 'md5:be125430bab1c574f16aeb186a4d5b19',
-            'creator': 'Mishal K.'
+            'title': 'Mishal K. on LinkedIn: #sendinblueviews #toronto #digitalmarketing #nowhiring #sendinblue…',
+            'description': 'md5:2998a31f6f479376dd62831f53a80f71',
+            'uploader': 'Mishal K.',
+            'thumbnail': 're:^https?://media.licdn.com/dms/image/.*$',
+            'like_count': int,
         },
+    }, {
+        'url': 'https://www.linkedin.com/posts/the-mathworks_2_what-is-mathworks-cloud-center-activity-7151241570371948544-4Gu7',
+        'info_dict': {
+            'id': '7151241570371948544',
+            'ext': 'mp4',
+            'title': 'MathWorks on LinkedIn: What Is MathWorks Cloud Center?',
+            'description': 'md5:95f9d4eeb6337882fb47eefe13d7a40c',
+            'uploader': 'MathWorks',
+            'thumbnail': 're:^https?://media.licdn.com/dms/image/.*$',
+            'like_count': int,
+            'subtitles': 'mincount:1',
+        },
+    }, {
+        'url': 'https://www.linkedin.com/feed/update/urn:li:activity:7016901149999955968/?utm_source=share&utm_medium=member_desktop',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
 
-        title = self._html_extract_title(webpage)
-        description = clean_html(get_element_by_class('share-update-card__update-text', webpage))
-        like_count = int_or_none(get_element_by_class('social-counts-reactions__social-counts-numRections', webpage))
-        creator = strip_or_none(clean_html(get_element_by_class('comment__actor-name', webpage)))
-
-        sources = self._parse_json(extract_attributes(self._search_regex(r'(<video[^>]+>)', webpage, 'video'))['data-sources'], video_id)
+        video_attrs = extract_attributes(self._search_regex(r'(<video[^>]+>)', webpage, 'video'))
+        sources = self._parse_json(video_attrs['data-sources'], video_id)
         formats = [{
             'url': source['src'],
             'ext': mimetype2ext(source.get('type')),
             'tbr': float_or_none(source.get('data-bitrate'), scale=1000),
         } for source in sources]
+        subtitles = {'en': [{
+            'url': video_attrs['data-captions-url'],
+            'ext': 'vtt',
+        }]} if url_or_none(video_attrs.get('data-captions-url')) else {}
 
         return {
             'id': video_id,
             'formats': formats,
-            'title': title,
-            'like_count': like_count,
-            'creator': creator,
+            'title': self._og_search_title(webpage, default=None) or self._html_extract_title(webpage),
+            'like_count': int_or_none(self._search_regex(
+                r'\bdata-num-reactions="(\d+)"', webpage, 'reactions', default=None)),
+            'uploader': traverse_obj(
+                self._yield_json_ld(webpage, video_id),
+                (lambda _, v: v['@type'] == 'SocialMediaPosting', 'author', 'name', {str}), get_all=False),
             'thumbnail': self._og_search_thumbnail(webpage),
-            'description': description,
+            'description': self._og_search_description(webpage, default=None),
+            'subtitles': subtitles,
         }
 
 
@@ -139,12 +163,13 @@ class LinkedInLearningIE(LinkedInLearningBaseIE):
 
     def json2srt(self, transcript_lines, duration=None):
         srt_data = ''
-        for line, (line_dict, next_dict) in enumerate(zip_longest(transcript_lines, transcript_lines[1:])):
+        for line, (line_dict, next_dict) in enumerate(itertools.zip_longest(transcript_lines, transcript_lines[1:])):
             start_time, caption = line_dict['transcriptStartAt'] / 1000, line_dict['caption']
             end_time = next_dict['transcriptStartAt'] / 1000 if next_dict else duration or start_time + 1
-            srt_data += '%d\n%s --> %s\n%s\n\n' % (line + 1, srt_subtitles_timecode(start_time),
-                                                   srt_subtitles_timecode(end_time),
-                                                   caption)
+            srt_data += (
+                f'{line + 1}\n'
+                f'{srt_subtitles_timecode(start_time)} --> {srt_subtitles_timecode(end_time)}\n'
+                f'{caption}\n\n')
         return srt_data
 
     def _real_extract(self, url):
@@ -159,7 +184,7 @@ class LinkedInLearningIE(LinkedInLearningBaseIE):
             progressive_url = video_url_data.get('progressiveUrl')
             if progressive_url:
                 formats.append({
-                    'format_id': 'progressive-%dp' % height,
+                    'format_id': f'progressive-{height}p',
                     'url': progressive_url,
                     'ext': 'mp4',
                     'height': height,
@@ -191,7 +216,7 @@ class LinkedInLearningIE(LinkedInLearningBaseIE):
         if transcript_lines:
             subtitles['en'] = [{
                 'ext': 'srt',
-                'data': self.json2srt(transcript_lines, duration)
+                'data': self.json2srt(transcript_lines, duration),
             }]
 
         return {
@@ -205,7 +230,7 @@ class LinkedInLearningIE(LinkedInLearningBaseIE):
             # It seems like this would be correctly handled by default
             # However, unless someone can confirm this, the old
             # behaviour is being kept as-is
-            '_format_sort_fields': ('res', 'source_preference')
+            '_format_sort_fields': ('res', 'source_preference'),
         }
 
 
@@ -224,7 +249,7 @@ class LinkedInLearningCourseIE(LinkedInLearningBaseIE):
 
     @classmethod
     def suitable(cls, url):
-        return False if LinkedInLearningIE.suitable(url) else super(LinkedInLearningCourseIE, cls).suitable(url)
+        return False if LinkedInLearningIE.suitable(url) else super().suitable(url)
 
     def _real_extract(self, url):
         course_slug = self._match_id(url)
@@ -242,7 +267,7 @@ class LinkedInLearningCourseIE(LinkedInLearningBaseIE):
                     '_type': 'url_transparent',
                     'id': self._get_video_id(video, course_slug, video_slug),
                     'title': video.get('title'),
-                    'url': 'https://www.linkedin.com/learning/%s/%s' % (course_slug, video_slug),
+                    'url': f'https://www.linkedin.com/learning/{course_slug}/{video_slug}',
                     'chapter': chapter_title,
                     'chapter_number': chapter_number,
                     'chapter_id': chapter_id,
@@ -253,3 +278,110 @@ class LinkedInLearningCourseIE(LinkedInLearningBaseIE):
             entries, course_slug,
             course_data.get('title'),
             course_data.get('description'))
+
+
+class LinkedInEventsIE(LinkedInBaseIE):
+    IE_NAME = 'linkedin:events'
+    _VALID_URL = r'https?://(?:www\.)?linkedin\.com/events/(?P<id>[\w-]+)'
+    _TESTS = [{
+        'url': 'https://www.linkedin.com/events/7084656651378536448/comments/',
+        'info_dict': {
+            'id': '7084656651378536448',
+            'ext': 'mp4',
+            'title': '#37 Aprende a hacer una entrevista en inglés para tu próximo trabajo remoto',
+            'description': '¡Agarra para anotar que se viene tremendo evento!',
+            'duration': 1765,
+            'timestamp': 1689113772,
+            'upload_date': '20230711',
+            'release_timestamp': 1689174012,
+            'release_date': '20230712',
+            'live_status': 'was_live',
+        },
+    }, {
+        'url': 'https://www.linkedin.com/events/27-02energyfreedombyenergyclub7295762520814874625/comments/',
+        'info_dict': {
+            'id': '27-02energyfreedombyenergyclub7295762520814874625',
+            'ext': 'mp4',
+            'title': '27.02 Energy Freedom by Energy Club',
+            'description': 'md5:1292e6f31df998914c293787a02c3b91',
+            'duration': 6420,
+            'timestamp': 1739445333,
+            'upload_date': '20250213',
+            'release_timestamp': 1740657620,
+            'release_date': '20250227',
+            'live_status': 'was_live',
+        },
+    }]
+
+    def _real_initialize(self):
+        if not self._get_cookies('https://www.linkedin.com/').get('li_at'):
+            self.raise_login_required()
+
+    def _real_extract(self, url):
+        event_id = self._match_id(url)
+        webpage = self._download_webpage(url, event_id)
+
+        base_data = traverse_obj(webpage, (
+            {find_elements(tag='code', attr='style', value='display: none')}, ..., {json.loads}, 'included', ...))
+        meta_data = traverse_obj(base_data, (
+            lambda _, v: v['$type'] == 'com.linkedin.voyager.dash.events.ProfessionalEvent', any)) or {}
+
+        live_status = {
+            'PAST': 'was_live',
+            'ONGOING': 'is_live',
+            'FUTURE': 'is_upcoming',
+        }.get(meta_data.get('lifecycleState'))
+
+        if live_status == 'is_upcoming':
+            player_data = {}
+            if event_time := traverse_obj(meta_data, ('displayEventTime', {str})):
+                message = f'This live event is scheduled for {event_time}'
+            else:
+                message = 'This live event has not yet started'
+            self.raise_no_formats(message, expected=True, video_id=event_id)
+        else:
+            # TODO: Add support for audio-only live events
+            player_data = traverse_obj(base_data, (
+                lambda _, v: v['$type'] == 'com.linkedin.videocontent.VideoPlayMetadata',
+                any, {require('video player data')}))
+
+        formats, subtitles = [], {}
+        for prog_fmts in traverse_obj(player_data, ('progressiveStreams', ..., {dict})):
+            for fmt_url in traverse_obj(prog_fmts, ('streamingLocations', ..., 'url', {url_or_none})):
+                formats.append({
+                    'url': fmt_url,
+                    **traverse_obj(prog_fmts, {
+                        'width': ('width', {int_or_none}),
+                        'height': ('height', {int_or_none}),
+                        'tbr': ('bitRate', {int_or_none(scale=1000)}),
+                        'filesize': ('size', {int_or_none}),
+                        'ext': ('mediaType', {mimetype2ext}),
+                    }),
+                })
+
+        for m3u8_url in traverse_obj(player_data, (
+            'adaptiveStreams', lambda _, v: v['protocol'] == 'HLS', 'masterPlaylists', ..., 'url', {url_or_none},
+        )):
+            fmts, subs = self._extract_m3u8_formats_and_subtitles(
+                m3u8_url, event_id, 'mp4', m3u8_id='hls', fatal=False)
+            formats.extend(fmts)
+            self._merge_subtitles(subs, target=subtitles)
+
+        return {
+            'id': event_id,
+            'formats': formats,
+            'subtitles': subtitles,
+            'live_status': live_status,
+            **traverse_obj(meta_data, {
+                'title': ('name', {str}),
+                'description': ('description', 'text', {str}),
+                'timestamp': ('createdAt', {int_or_none(scale=1000)}),
+                # timeRange.start is available when the stream is_upcoming
+                'release_timestamp': ('timeRange', 'start', {int_or_none(scale=1000)}),
+            }),
+            **traverse_obj(player_data, {
+                'duration': ('duration', {int_or_none(scale=1000)}),
+                # liveStreamCreatedAt is only available when the stream is_live or was_live
+                'release_timestamp': ('liveStreamCreatedAt', {int_or_none(scale=1000)}),
+            }),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/linuxacademy.py b/plugins/youtube_download/yt_dlp/extractor/linuxacademy.py
deleted file mode 100644
index 0b16442..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/linuxacademy.py
+++ /dev/null
@@ -1,238 +0,0 @@
-import json
-import random
-
-from .common import InfoExtractor
-from ..compat import compat_b64decode, compat_str
-from ..networking.exceptions import HTTPError
-from ..utils import (
-    clean_html,
-    ExtractorError,
-    js_to_json,
-    parse_duration,
-    try_get,
-    unified_timestamp,
-    urlencode_postdata,
-    urljoin,
-)
-
-
-class LinuxAcademyIE(InfoExtractor):
-    _VALID_URL = r'''(?x)
-                    https?://
-                        (?:www\.)?linuxacademy\.com/cp/
-                        (?:
-                            courses/lesson/course/(?P<chapter_id>\d+)/lesson/(?P<lesson_id>\d+)|
-                            modules/view/id/(?P<course_id>\d+)
-                        )
-                    '''
-    _TESTS = [{
-        'url': 'https://linuxacademy.com/cp/courses/lesson/course/7971/lesson/2/module/675',
-        'info_dict': {
-            'id': '7971-2',
-            'ext': 'mp4',
-            'title': 'What Is Data Science',
-            'description': 'md5:c574a3c20607144fb36cb65bdde76c99',
-            'timestamp': int,  # The timestamp and upload date changes
-            'upload_date': r're:\d+',
-            'duration': 304,
-        },
-        'params': {
-            'skip_download': True,
-        },
-        'skip': 'Requires Linux Academy account credentials',
-    }, {
-        'url': 'https://linuxacademy.com/cp/courses/lesson/course/1498/lesson/2',
-        'only_matching': True,
-    }, {
-        'url': 'https://linuxacademy.com/cp/modules/view/id/154',
-        'info_dict': {
-            'id': '154',
-            'title': 'AWS Certified Cloud Practitioner',
-            'description': 'md5:a68a299ca9bb98d41cca5abc4d4ce22c',
-            'duration': 28835,
-        },
-        'playlist_count': 41,
-        'skip': 'Requires Linux Academy account credentials',
-    }, {
-        'url': 'https://linuxacademy.com/cp/modules/view/id/39',
-        'info_dict': {
-            'id': '39',
-            'title': 'Red Hat Certified Systems Administrator - RHCSA (EX200) Exam Prep  (legacy)',
-            'description': 'md5:0f1d3369e90c3fb14a79813b863c902f',
-            'duration': 89280,
-        },
-        'playlist_count': 73,
-        'skip': 'Requires Linux Academy account credentials',
-    }]
-
-    _AUTHORIZE_URL = 'https://login.linuxacademy.com/authorize'
-    _ORIGIN_URL = 'https://linuxacademy.com'
-    _CLIENT_ID = 'KaWxNn1C2Gc7n83W9OFeXltd8Utb5vvx'
-    _NETRC_MACHINE = 'linuxacademy'
-
-    def _perform_login(self, username, password):
-        def random_string():
-            return ''.join(random.choices(
-                '0123456789ABCDEFGHIJKLMNOPQRSTUVXYZabcdefghijklmnopqrstuvwxyz-._~', k=32))
-
-        webpage, urlh = self._download_webpage_handle(
-            self._AUTHORIZE_URL, None, 'Downloading authorize page', query={
-                'client_id': self._CLIENT_ID,
-                'response_type': 'token id_token',
-                'response_mode': 'web_message',
-                'redirect_uri': self._ORIGIN_URL,
-                'scope': 'openid email user_impersonation profile',
-                'audience': self._ORIGIN_URL,
-                'state': random_string(),
-                'nonce': random_string(),
-            })
-
-        login_data = self._parse_json(
-            self._search_regex(
-                r'atob\(\s*(["\'])(?P<value>(?:(?!\1).)+)\1', webpage,
-                'login info', group='value'), None,
-            transform_source=lambda x: compat_b64decode(x).decode('utf-8')
-        )['extraParams']
-
-        login_data.update({
-            'client_id': self._CLIENT_ID,
-            'redirect_uri': self._ORIGIN_URL,
-            'tenant': 'lacausers',
-            'connection': 'Username-Password-ACG-Proxy',
-            'username': username,
-            'password': password,
-            'sso': 'true',
-        })
-
-        login_state_url = urlh.url
-
-        try:
-            login_page = self._download_webpage(
-                'https://login.linuxacademy.com/usernamepassword/login', None,
-                'Downloading login page', data=json.dumps(login_data).encode(),
-                headers={
-                    'Content-Type': 'application/json',
-                    'Origin': 'https://login.linuxacademy.com',
-                    'Referer': login_state_url,
-                })
-        except ExtractorError as e:
-            if isinstance(e.cause, HTTPError) and e.cause.status == 401:
-                error = self._parse_json(e.cause.response.read(), None)
-                message = error.get('description') or error['code']
-                raise ExtractorError(
-                    '%s said: %s' % (self.IE_NAME, message), expected=True)
-            raise
-
-        callback_page, urlh = self._download_webpage_handle(
-            'https://login.linuxacademy.com/login/callback', None,
-            'Downloading callback page',
-            data=urlencode_postdata(self._hidden_inputs(login_page)),
-            headers={
-                'Content-Type': 'application/x-www-form-urlencoded',
-                'Origin': 'https://login.linuxacademy.com',
-                'Referer': login_state_url,
-            })
-
-        access_token = self._search_regex(
-            r'access_token=([^=&]+)', urlh.url,
-            'access token', default=None)
-        if not access_token:
-            access_token = self._parse_json(
-                self._search_regex(
-                    r'authorizationResponse\s*=\s*({.+?})\s*;', callback_page,
-                    'authorization response'), None,
-                transform_source=js_to_json)['response']['access_token']
-
-        self._download_webpage(
-            'https://linuxacademy.com/cp/login/tokenValidateLogin/token/%s'
-            % access_token, None, 'Downloading token validation page')
-
-    def _real_extract(self, url):
-        mobj = self._match_valid_url(url)
-        chapter_id, lecture_id, course_id = mobj.group('chapter_id', 'lesson_id', 'course_id')
-        item_id = course_id if course_id else '%s-%s' % (chapter_id, lecture_id)
-
-        webpage = self._download_webpage(url, item_id)
-
-        # course path
-        if course_id:
-            module = self._parse_json(
-                self._search_regex(
-                    r'window\.module\s*=\s*({(?:(?!};)[^"]|"([^"]|\\")*")+})\s*;', webpage, 'module'),
-                item_id)
-            entries = []
-            chapter_number = None
-            chapter = None
-            chapter_id = None
-            for item in module['items']:
-                if not isinstance(item, dict):
-                    continue
-
-                def type_field(key):
-                    return (try_get(item, lambda x: x['type'][key], compat_str) or '').lower()
-                type_fields = (type_field('name'), type_field('slug'))
-                # Move to next module section
-                if 'section' in type_fields:
-                    chapter = item.get('course_name')
-                    chapter_id = item.get('course_module')
-                    chapter_number = 1 if not chapter_number else chapter_number + 1
-                    continue
-                # Skip non-lessons
-                if 'lesson' not in type_fields:
-                    continue
-                lesson_url = urljoin(url, item.get('url'))
-                if not lesson_url:
-                    continue
-                title = item.get('title') or item.get('lesson_name')
-                description = item.get('md_desc') or clean_html(item.get('description')) or clean_html(item.get('text'))
-                entries.append({
-                    '_type': 'url_transparent',
-                    'url': lesson_url,
-                    'ie_key': LinuxAcademyIE.ie_key(),
-                    'title': title,
-                    'description': description,
-                    'timestamp': unified_timestamp(item.get('date')) or unified_timestamp(item.get('created_on')),
-                    'duration': parse_duration(item.get('duration')),
-                    'chapter': chapter,
-                    'chapter_id': chapter_id,
-                    'chapter_number': chapter_number,
-                })
-            return {
-                '_type': 'playlist',
-                'entries': entries,
-                'id': course_id,
-                'title': module.get('title'),
-                'description': module.get('md_desc') or clean_html(module.get('desc')),
-                'duration': parse_duration(module.get('duration')),
-            }
-
-        # single video path
-        m3u8_url = self._parse_json(
-            self._search_regex(
-                r'player\.playlist\s*=\s*(\[.+?\])\s*;', webpage, 'playlist'),
-            item_id)[0]['file']
-        formats = self._extract_m3u8_formats(
-            m3u8_url, item_id, 'mp4', entry_protocol='m3u8_native',
-            m3u8_id='hls')
-        info = {
-            'id': item_id,
-            'formats': formats,
-        }
-        lesson = self._parse_json(
-            self._search_regex(
-                (r'window\.lesson\s*=\s*({.+?})\s*;',
-                 r'player\.lesson\s*=\s*({.+?})\s*;'),
-                webpage, 'lesson', default='{}'), item_id, fatal=False)
-        if lesson:
-            info.update({
-                'title': lesson.get('lesson_name'),
-                'description': lesson.get('md_desc') or clean_html(lesson.get('desc')),
-                'timestamp': unified_timestamp(lesson.get('date')) or unified_timestamp(lesson.get('created_on')),
-                'duration': parse_duration(lesson.get('duration')),
-            })
-        if not info.get('title'):
-            info['title'] = self._search_regex(
-                (r'>Lecture\s*:\s*(?P<value>[^<]+)',
-                 r'lessonName\s*=\s*(["\'])(?P<value>(?:(?!\1).)+)\1'), webpage,
-                'title', group='value')
-        return info
diff --git a/plugins/youtube_download/yt_dlp/extractor/liputan6.py b/plugins/youtube_download/yt_dlp/extractor/liputan6.py
index c4477b9..a29234a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/liputan6.py
+++ b/plugins/youtube_download/yt_dlp/extractor/liputan6.py
@@ -25,8 +25,8 @@ class Liputan6IE(InfoExtractor):
             'tags': ['perawat indonesia', 'rumah sakit', 'Medan', 'viral hari ini', 'viral', 'enamplus'],
             'channel': 'Default Channel',
             'dislike_count': int,
-            'upload_date': '20220707'
-        }
+            'upload_date': '20220707',
+        },
     }, {
         'url': 'https://www.liputan6.com/tv/read/5007719/video-program-minyakita-minyak-goreng-kemasan-sederhana-seharga-rp-14-ribu',
         'info_dict': {
@@ -49,7 +49,7 @@ class Liputan6IE(InfoExtractor):
             'thumbnail': 'https://thumbor.prod.vidiocdn.com/AAIOjz-64hKojjdw5hr0oNNEeJg=/640x360/filters:quality(70)/vidio-web-prod-video/uploads/video/image/7082543/program-minyakita-minyak-goreng-kemasan-sederhana-seharga-rp14-ribu-_-liputan-6-7d9fbb.jpg',
             'channel': 'Liputan 6 Pagi',
             'view_count': int,
-        }
+        },
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/listennotes.py b/plugins/youtube_download/yt_dlp/extractor/listennotes.py
index 4ebc9be..9d68e18 100644
--- a/plugins/youtube_download/yt_dlp/extractor/listennotes.py
+++ b/plugins/youtube_download/yt_dlp/extractor/listennotes.py
@@ -6,12 +6,10 @@ from ..utils import (
     extract_attributes,
     get_element_by_class,
     get_element_html_by_id,
-    get_element_text_and_html_by_tag,
     parse_duration,
     strip_or_none,
-    traverse_obj,
-    try_call,
 )
+from ..utils.traversal import find_element, traverse_obj
 
 
 class ListenNotesIE(InfoExtractor):
@@ -22,16 +20,16 @@ class ListenNotesIE(InfoExtractor):
         'info_dict': {
             'id': 'KrDgvNb_u1n',
             'ext': 'mp3',
-            'title': 'md5:32236591a921adf17bbdbf0441b6c0e9',
-            'description': 'md5:c581ed197eeddcee55a67cdb547c8cbd',
-            'duration': 2148.0,
-            'channel': 'Thriving on Overload',
+            'title': r're:Tim O’Reilly on noticing things other people .{113}',
+            'description': r're:(?s)‘’We shape reality by what we notice and .{27459}',
+            'duration': 2215.0,
+            'channel': 'Amplifying Cognition',
             'channel_id': 'ed84wITivxF',
             'episode_id': 'e1312583fa7b4e24acfbb5131050be00',
-            'thumbnail': 'https://production.listennotes.com/podcasts/thriving-on-overload-ross-dawson-1wb_KospA3P-ed84wITivxF.300x300.jpg',
-            'channel_url': 'https://www.listennotes.com/podcasts/thriving-on-overload-ross-dawson-ed84wITivxF/',
+            'thumbnail': 'https://cdn-images-3.listennotes.com/podcasts/amplifying-cognition-ross-dawson-Iemft4Gdr0k-ed84wITivxF.300x300.jpg',
+            'channel_url': 'https://www.listennotes.com/podcasts/amplifying-cognition-ross-dawson-ed84wITivxF/',
             'cast': ['Tim O’Reilly', 'Cookie Monster', 'Lao Tzu', 'Wallace Steven', 'Eric Raymond', 'Christine Peterson', 'John Maynard Keyne', 'Ross Dawson'],
-        }
+        },
     }, {
         'url': 'https://www.listennotes.com/podcasts/ask-noah-show/episode-177-wireguard-with-lwEA3154JzG/',
         'md5': '62fb4ffe7fc525632a1138bf72a5ce53',
@@ -39,15 +37,15 @@ class ListenNotesIE(InfoExtractor):
             'id': 'lwEA3154JzG',
             'ext': 'mp3',
             'title': 'Episode 177: WireGuard with Jason Donenfeld',
-            'description': 'md5:24744f36456a3e95f83c1193a3458594',
+            'description': r're:(?s)Jason Donenfeld lead developer joins us this hour to discuss WireGuard, .{3169}',
             'duration': 3861.0,
             'channel': 'Ask Noah Show',
             'channel_id': '4DQTzdS5-j7',
             'episode_id': '8c8954b95e0b4859ad1eecec8bf6d3a4',
             'channel_url': 'https://www.listennotes.com/podcasts/ask-noah-show-noah-j-chelliah-4DQTzdS5-j7/',
-            'thumbnail': 'https://production.listennotes.com/podcasts/ask-noah-show-noah-j-chelliah-cfbRUw9Gs3F-4DQTzdS5-j7.300x300.jpg',
+            'thumbnail': 'https://cdn-images-3.listennotes.com/podcasts/ask-noah-show-noah-j-chelliah-gD7vG150cxf-4DQTzdS5-j7.300x300.jpg',
             'cast': ['noah showlink', 'noah show', 'noah dashboard', 'jason donenfeld'],
-        }
+        },
     }]
 
     def _clean_description(self, description):
@@ -70,7 +68,7 @@ class ListenNotesIE(InfoExtractor):
             'id': audio_id,
             'url': data['audio'],
             'title': (data.get('data-title')
-                      or try_call(lambda: get_element_text_and_html_by_tag('h1', webpage)[0])
+                      or traverse_obj(webpage, ({find_element(tag='h1')}, {clean_html}))
                       or self._html_search_meta(('og:title', 'title', 'twitter:title'), webpage, 'title')),
             'description': (self._clean_description(get_element_by_class('ln-text-p', webpage))
                             or strip_or_none(description)),
@@ -82,5 +80,5 @@ class ListenNotesIE(InfoExtractor):
                 'cast': ('nlp_entities', ..., 'name'),
                 'channel_url': 'channel_url',
                 'channel_id': 'channel_short_uuid',
-            })
+            }),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/litv.py b/plugins/youtube_download/yt_dlp/extractor/litv.py
index 19b298e..df9d141 100644
--- a/plugins/youtube_download/yt_dlp/extractor/litv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/litv.py
@@ -1,44 +1,48 @@
 import json
+import uuid
 
 from .common import InfoExtractor
 from ..utils import (
     ExtractorError,
     int_or_none,
+    join_nonempty,
     smuggle_url,
     traverse_obj,
+    try_call,
     unsmuggle_url,
+    urljoin,
 )
 
 
 class LiTVIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?litv\.tv/(?:vod|promo)/[^/]+/(?:content\.do)?\?.*?\b(?:content_)?id=(?P<id>[^&]+)'
-
-    _URL_TEMPLATE = 'https://www.litv.tv/vod/%s/content.do?id=%s'
-
+    _VALID_URL = r'https?://(?:www\.)?litv\.tv/(?:[^/?#]+/watch/|vod/[^/?#]+/content\.do\?content_id=)(?P<id>[\w-]+)'
+    _URL_TEMPLATE = 'https://www.litv.tv/%s/watch/%s'
+    _GEO_COUNTRIES = ['TW']
     _TESTS = [{
-        'url': 'https://www.litv.tv/vod/drama/content.do?brc_id=root&id=VOD00041610&isUHEnabled=true&autoPlay=1',
+        'url': 'https://www.litv.tv/drama/watch/VOD00041610',
         'info_dict': {
             'id': 'VOD00041606',
             'title': '花千骨',
         },
-        'playlist_count': 50,
+        'playlist_count': 51,  # 50 episodes + 1 trailer
     }, {
-        'url': 'https://www.litv.tv/vod/drama/content.do?brc_id=root&id=VOD00041610&isUHEnabled=true&autoPlay=1',
-        'md5': '969e343d9244778cb29acec608e53640',
+        'url': 'https://www.litv.tv/drama/watch/VOD00041610',
+        'md5': 'b90ff1e9f1d8f5cfcd0a44c3e2b34c7a',
         'info_dict': {
             'id': 'VOD00041610',
             'ext': 'mp4',
             'title': '花千骨第1集',
             'thumbnail': r're:https?://.*\.jpg$',
-            'description': 'md5:c7017aa144c87467c4fb2909c4b05d6f',
+            'description': '《花千骨》陸劇線上看。十六年前，平靜的村莊內，一名女嬰隨異相出生，途徑此地的蜀山掌門清虛道長算出此女命運非同一般，她體內散發的異香易招惹妖魔。一念慈悲下，他在村莊周邊設下結界阻擋妖魔入侵，讓其年滿十六後去蜀山，並賜名花千骨。',
+            'categories': ['奇幻', '愛情', '仙俠', '古裝'],
+            'episode': 'Episode 1',
             'episode_number': 1,
         },
         'params': {
             'noplaylist': True,
         },
-        'skip': 'Georestricted to Taiwan',
     }, {
-        'url': 'https://www.litv.tv/promo/miyuezhuan/?content_id=VOD00044841&',
+        'url': 'https://www.litv.tv/drama/watch/VOD00044841',
         'md5': '88322ea132f848d6e3e18b32a832b918',
         'info_dict': {
             'id': 'VOD00044841',
@@ -46,87 +50,68 @@ class LiTVIE(InfoExtractor):
             'title': '芈月傳第1集　霸星芈月降世楚國',
             'description': '楚威王二年，太史令唐昧夜觀星象，發現霸星即將現世。王后得知霸星的預言後，想盡辦法不讓孩子順利出生，幸得莒姬相護化解危機。沒想到眾人期待下出生的霸星卻是位公主，楚威王對此失望至極。楚王后命人將女嬰丟棄河中，居然奇蹟似的被少司命像攔下，楚威王認為此女非同凡響，為她取名芈月。',
         },
-        'skip': 'Georestricted to Taiwan',
+        'skip': 'No longer exists',
     }]
 
-    def _extract_playlist(self, season_list, video_id, program_info, prompt=True):
-        episode_title = program_info['title']
-        content_id = season_list['contentId']
-
+    def _extract_playlist(self, playlist_data, content_type):
         all_episodes = [
             self.url_result(smuggle_url(
-                self._URL_TEMPLATE % (program_info['contentType'], episode['contentId']),
+                self._URL_TEMPLATE % (content_type, episode['content_id']),
                 {'force_noplaylist': True}))  # To prevent infinite recursion
-            for episode in season_list['episode']]
+            for episode in traverse_obj(playlist_data, ('seasons', ..., 'episodes', lambda _, v: v['content_id']))]
 
-        return self.playlist_result(all_episodes, content_id, episode_title)
+        return self.playlist_result(all_episodes, playlist_data['content_id'], playlist_data.get('title'))
 
     def _real_extract(self, url):
         url, smuggled_data = unsmuggle_url(url, {})
-
         video_id = self._match_id(url)
-
         webpage = self._download_webpage(url, video_id)
+        vod_data = self._search_nextjs_data(webpage, video_id)['props']['pageProps']
 
-        program_info = self._parse_json(self._search_regex(
-            r'var\s+programInfo\s*=\s*([^;]+)', webpage, 'VOD data', default='{}'),
-            video_id)
+        program_info = traverse_obj(vod_data, ('programInformation', {dict})) or {}
+        playlist_data = traverse_obj(vod_data, ('seriesTree'))
+        if playlist_data and self._yes_playlist(program_info.get('series_id'), video_id, smuggled_data):
+            return self._extract_playlist(playlist_data, program_info.get('content_type'))
 
-        season_list = list(program_info.get('seasonList', {}).values())
-        playlist_id = traverse_obj(season_list, 0, 'contentId')
-        if self._yes_playlist(playlist_id, video_id, smuggled_data):
-            return self._extract_playlist(season_list[0], video_id, program_info)
+        asset_id = traverse_obj(program_info, ('assets', 0, 'asset_id', {str}))
+        if asset_id:  # This is a VOD
+            media_type = 'vod'
+        else:  # This is a live stream
+            asset_id = program_info['content_id']
+            media_type = program_info['content_type']
+        puid = try_call(lambda: self._get_cookies('https://www.litv.tv/')['PUID'].value)
+        if puid:
+            endpoint = 'get-urls'
+        else:
+            puid = str(uuid.uuid4())
+            endpoint = 'get-urls-no-auth'
+        video_data = self._download_json(
+            f'https://www.litv.tv/api/{endpoint}', video_id,
+            data=json.dumps({'AssetId': asset_id, 'MediaType': media_type, 'puid': puid}).encode(),
+            headers={'Content-Type': 'application/json'})
 
-        # In browsers `getMainUrl` request is always issued. Usually this
-        # endpoint gives the same result as the data embedded in the webpage.
-        # If georestricted, there are no embedded data, so an extra request is
-        # necessary to get the error code
-        if 'assetId' not in program_info:
-            program_info = self._download_json(
-                'https://www.litv.tv/vod/ajax/getProgramInfo', video_id,
-                query={'contentId': video_id},
-                headers={'Accept': 'application/json'})
-        video_data = self._parse_json(self._search_regex(
-            r'uiHlsUrl\s*=\s*testBackendData\(([^;]+)\);',
-            webpage, 'video data', default='{}'), video_id)
-        if not video_data:
-            payload = {
-                'assetId': program_info['assetId'],
-                'watchDevices': program_info['watchDevices'],
-                'contentType': program_info['contentType'],
-            }
-            video_data = self._download_json(
-                'https://www.litv.tv/vod/getMainUrl', video_id,
-                data=json.dumps(payload).encode('utf-8'),
-                headers={'Content-Type': 'application/json'})
-
-        if not video_data.get('fullpath'):
-            error_msg = video_data.get('errorMessage')
-            if error_msg == 'vod.error.outsideregionerror':
+        if error := traverse_obj(video_data, ('error', {dict})):
+            error_msg = traverse_obj(error, ('message', {str}))
+            if error_msg and 'OutsideRegionError' in error_msg:
                 self.raise_geo_restricted('This video is available in Taiwan only')
-            if error_msg:
-                raise ExtractorError('%s said: %s' % (self.IE_NAME, error_msg), expected=True)
-            raise ExtractorError('Unexpected result from %s' % self.IE_NAME)
+            elif error_msg:
+                raise ExtractorError(f'{self.IE_NAME} said: {error_msg}', expected=True)
+            raise ExtractorError(f'Unexpected error from {self.IE_NAME}')
 
         formats = self._extract_m3u8_formats(
-            video_data['fullpath'], video_id, ext='mp4',
-            entry_protocol='m3u8_native', m3u8_id='hls')
+            video_data['result']['AssetURLs'][0], video_id, ext='mp4', m3u8_id='hls')
         for a_format in formats:
             # LiTV HLS segments doesn't like compressions
             a_format.setdefault('http_headers', {})['Accept-Encoding'] = 'identity'
 
-        title = program_info['title'] + program_info.get('secondaryMark', '')
-        description = program_info.get('description')
-        thumbnail = program_info.get('imageFile')
-        categories = [item['name'] for item in program_info.get('category', [])]
-        episode = int_or_none(program_info.get('episode'))
-
         return {
             'id': video_id,
             'formats': formats,
-            'title': title,
-            'description': description,
-            'thumbnail': thumbnail,
-            'categories': categories,
-            'episode_number': episode,
+            'title': join_nonempty('title', 'secondary_mark', delim='', from_dict=program_info),
+            **traverse_obj(program_info, {
+                'description': ('description', {str}),
+                'thumbnail': ('picture', {urljoin('https://p-cdnstatic.svc.litv.tv/')}),
+                'categories': ('genres', ..., 'name', {str}),
+                'episode_number': ('episode', {int_or_none}),
+            }),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/livejournal.py b/plugins/youtube_download/yt_dlp/extractor/livejournal.py
index 96bd8b2..c61f9be 100644
--- a/plugins/youtube_download/yt_dlp/extractor/livejournal.py
+++ b/plugins/youtube_download/yt_dlp/extractor/livejournal.py
@@ -1,5 +1,4 @@
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import int_or_none
 
 
@@ -14,7 +13,7 @@ class LiveJournalIE(InfoExtractor):
             'title': 'Истребители против БПЛА',
             'upload_date': '20190624',
             'timestamp': 1561406715,
-        }
+        },
     }
 
     def _real_extract(self, url):
@@ -23,7 +22,7 @@ class LiveJournalIE(InfoExtractor):
         record = self._parse_json(self._search_regex(
             r'Site\.page\s*=\s*({.+?});', webpage,
             'page data'), video_id)['video']['record']
-        storage_id = compat_str(record['storageid'])
+        storage_id = str(record['storageid'])
         title = record.get('name')
         if title:
             # remove filename extension(.mp4, .mov, etc...)
diff --git a/plugins/youtube_download/yt_dlp/extractor/livestream.py b/plugins/youtube_download/yt_dlp/extractor/livestream.py
index a05a0fa..7f7947e 100644
--- a/plugins/youtube_download/yt_dlp/extractor/livestream.py
+++ b/plugins/youtube_download/yt_dlp/extractor/livestream.py
@@ -1,8 +1,8 @@
 import itertools
 import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import compat_str, compat_urlparse
 from ..utils import (
     determine_ext,
     find_xpath_attr,
@@ -41,13 +41,13 @@ class LivestreamIE(InfoExtractor):
             'like_count': int,
             'view_count': int,
             'comment_count': int,
-            'thumbnail': r're:^http://.*\.jpg$'
-        }
+            'thumbnail': r're:^http://.*\.jpg$',
+        },
     }, {
         'url': 'https://livestream.com/coheedandcambria/websterhall',
         'info_dict': {
             'id': '1585861',
-            'title': 'Live From Webster Hall'
+            'title': 'Live From Webster Hall',
         },
         'playlist_mincount': 1,
     }, {
@@ -69,8 +69,8 @@ class LivestreamIE(InfoExtractor):
             'timestamp': 1331042383,
             'thumbnail': 'http://img.new.livestream.com/videos/0000000000000372/cacbeed6-fb68-4b5e-ad9c-e148124e68a9_640x427.jpg',
             'duration': 15.332,
-            'ext': 'mp4'
-        }
+            'ext': 'mp4',
+        },
     }, {
         'url': 'https://new.livestream.com/accounts/362/events/3557232/videos/67864563/player?autoPlay=false&height=360&mute=false&width=640',
         'only_matching': True,
@@ -92,7 +92,7 @@ class LivestreamIE(InfoExtractor):
         for vn in video_nodes:
             tbr = int_or_none(vn.attrib.get('system-bitrate'), 1000)
             furl = (
-                update_url_query(compat_urlparse.urljoin(base, vn.attrib['src']), {
+                update_url_query(urllib.parse.urljoin(base, vn.attrib['src']), {
                     'v': '3.0.3',
                     'fp': 'WIN% 14,0,0,145',
                 }))
@@ -108,7 +108,7 @@ class LivestreamIE(InfoExtractor):
         return formats, {}
 
     def _extract_video_info(self, video_data):
-        video_id = compat_str(video_data['id'])
+        video_id = str(video_data['id'])
 
         FORMAT_KEYS = (
             ('sd', 'progressive_url'),
@@ -123,7 +123,7 @@ class LivestreamIE(InfoExtractor):
                 if ext == 'm3u8':
                     continue
                 bitrate = int_or_none(self._search_regex(
-                    r'(\d+)\.%s' % ext, video_url, 'bitrate', default=None))
+                    rf'(\d+)\.{ext}', video_url, 'bitrate', default=None))
                 formats.append({
                     'url': video_url,
                     'format_id': format_id,
@@ -169,7 +169,7 @@ class LivestreamIE(InfoExtractor):
         }
 
     def _extract_stream_info(self, stream_info):
-        broadcast_id = compat_str(stream_info['broadcast_id'])
+        broadcast_id = str(stream_info['broadcast_id'])
         is_live = stream_info.get('is_live')
 
         formats = []
@@ -199,8 +199,8 @@ class LivestreamIE(InfoExtractor):
         }
 
     def _generate_event_playlist(self, event_data):
-        event_id = compat_str(event_data['id'])
-        account_id = compat_str(event_data['owner_account_id'])
+        event_id = str(event_data['id'])
+        account_id = str(event_data['owner_account_id'])
         feed_root_url = self._API_URL_TEMPLATE % (account_id, event_id) + '/feed.json'
 
         stream_info = event_data.get('stream_info')
@@ -212,15 +212,14 @@ class LivestreamIE(InfoExtractor):
             if last_video is None:
                 info_url = feed_root_url
             else:
-                info_url = '{root}?&id={id}&newer=-1&type=video'.format(
-                    root=feed_root_url, id=last_video)
+                info_url = f'{feed_root_url}?&id={last_video}&newer=-1&type=video'
             videos_info = self._download_json(
                 info_url, event_id, f'Downloading page {i}')['data']
             videos_info = [v['data'] for v in videos_info if v['type'] == 'video']
             if not videos_info:
                 break
             for v in videos_info:
-                v_id = compat_str(v['id'])
+                v_id = str(v['id'])
                 yield self.url_result(
                     f'http://livestream.com/accounts/{account_id}/events/{event_id}/videos/{v_id}',
                     LivestreamIE, v_id, v.get('caption'))
@@ -278,7 +277,7 @@ class LivestreamOriginalIE(InfoExtractor):
     }]
 
     def _extract_video_info(self, user, video_id):
-        api_url = 'http://x%sx.api.channel.livestream.com/2.0/clipdetails?extendedInfo=true&id=%s' % (user, video_id)
+        api_url = f'http://x{user}x.api.channel.livestream.com/2.0/clipdetails?extendedInfo=true&id={video_id}'
         info = self._download_xml(api_url, video_id)
 
         item = info.find('channel').find('item')
@@ -335,7 +334,7 @@ class LivestreamOriginalIE(InfoExtractor):
 
         entries = [{
             '_type': 'url',
-            'url': compat_urlparse.urljoin(url, p),
+            'url': urllib.parse.urljoin(url, p),
         } for p in paths]
 
         return self.playlist_result(entries, folder_id)
@@ -349,10 +348,10 @@ class LivestreamOriginalIE(InfoExtractor):
             return self._extract_folder(url, content_id)
         else:
             # this url is used on mobile devices
-            stream_url = 'http://x%sx.api.channel.livestream.com/3.0/getstream.json' % user
+            stream_url = f'http://x{user}x.api.channel.livestream.com/3.0/getstream.json'
             info = {}
             if content_id:
-                stream_url += '?id=%s' % content_id
+                stream_url += f'?id={content_id}'
                 info = self._extract_video_info(user, content_id)
             else:
                 content_id = user
@@ -381,8 +380,7 @@ class LivestreamShortenerIE(InfoExtractor):
     _VALID_URL = r'https?://livestre\.am/(?P<id>.+)'
 
     def _real_extract(self, url):
-        mobj = self._match_valid_url(url)
-        id = mobj.group('id')
-        webpage = self._download_webpage(url, id)
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
 
         return self.url_result(self._og_search_url(webpage))
diff --git a/plugins/youtube_download/yt_dlp/extractor/livestreamfails.py b/plugins/youtube_download/yt_dlp/extractor/livestreamfails.py
index 0df6384..c18d05d 100644
--- a/plugins/youtube_download/yt_dlp/extractor/livestreamfails.py
+++ b/plugins/youtube_download/yt_dlp/extractor/livestreamfails.py
@@ -16,7 +16,7 @@ class LivestreamfailsIE(InfoExtractor):
             'thumbnail': r're:^https?://.+',
             'timestamp': 1656271785,
             'upload_date': '20220626',
-        }
+        },
     }, {
         'url': 'https://livestreamfails.com/post/139200',
         'only_matching': True,
@@ -33,5 +33,5 @@ class LivestreamfailsIE(InfoExtractor):
             'url': f'https://livestreamfails-video-prod.b-cdn.net/video/{api_response["videoId"]}',
             'title': api_response.get('label'),
             'creator': traverse_obj(api_response, ('streamer', 'label')),
-            'thumbnail': format_field(api_response, 'imageId', 'https://livestreamfails-image-prod.b-cdn.net/image/%s')
+            'thumbnail': format_field(api_response, 'imageId', 'https://livestreamfails-image-prod.b-cdn.net/image/%s'),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/lnk.py b/plugins/youtube_download/yt_dlp/extractor/lnk.py
new file mode 100644
index 0000000..593f734
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/lnk.py
@@ -0,0 +1,87 @@
+from .common import InfoExtractor
+from ..utils import (
+    format_field,
+    int_or_none,
+    unified_strdate,
+)
+
+
+class LnkIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?lnk\.lt/[^/]+/(?P<id>\d+)'
+
+    _TESTS = [{
+        'url': 'https://lnk.lt/zinios/79791',
+        'info_dict': {
+            'id': '79791',
+            'ext': 'mp4',
+            'title': 'LNK.lt: Viešintų gyventojai sukilo prieš radijo bangų siųstuvą',
+            'description': 'Svarbiausios naujienos trumpai, LNK žinios ir Info dienos pokalbiai.',
+            'view_count': int,
+            'duration': 233,
+            'upload_date': '20191123',
+            'thumbnail': r're:^https?://.*\.jpg$',
+            'episode_number': 13431,
+            'series': 'Naujausi žinių reportažai',
+            'episode': 'Episode 13431',
+        },
+        'params': {'skip_download': True},
+    }, {
+        'url': 'https://lnk.lt/istorijos-trumpai/152546',
+        'info_dict': {
+            'id': '152546',
+            'ext': 'mp4',
+            'title': 'Radžio koncertas gaisre ',
+            'description': 'md5:0666b5b85cb9fc7c1238dec96f71faba',
+            'view_count': int,
+            'duration': 54,
+            'upload_date': '20220105',
+            'thumbnail': r're:^https?://.*\.jpg$',
+            'episode_number': 1036,
+            'series': 'Istorijos trumpai',
+            'episode': 'Episode 1036',
+        },
+        'params': {'skip_download': True},
+    }, {
+        'url': 'https://lnk.lt/gyvunu-pasaulis/151549',
+        'info_dict': {
+            'id': '151549',
+            'ext': 'mp4',
+            'title': 'Gyvūnų pasaulis',
+            'description': '',
+            'view_count': int,
+            'duration': 1264,
+            'upload_date': '20220108',
+            'thumbnail': r're:^https?://.*\.jpg$',
+            'episode_number': 16,
+            'series': 'Gyvūnų pasaulis',
+            'episode': 'Episode 16',
+        },
+        'params': {'skip_download': True},
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        video_json = self._download_json(f'https://lnk.lt/api/video/video-config/{video_id}', video_id)['videoInfo']
+        formats, subtitles = [], {}
+        if video_json.get('videoUrl'):
+            fmts, subs = self._extract_m3u8_formats_and_subtitles(video_json['videoUrl'], video_id)
+            formats.extend(fmts)
+            subtitles = self._merge_subtitles(subtitles, subs)
+        if video_json.get('videoFairplayUrl') and not video_json.get('drm'):
+            fmts, subs = self._extract_m3u8_formats_and_subtitles(video_json['videoFairplayUrl'], video_id)
+            formats.extend(fmts)
+            subtitles = self._merge_subtitles(subtitles, subs)
+
+        return {
+            'id': video_id,
+            'title': video_json.get('title'),
+            'description': video_json.get('description'),
+            'view_count': video_json.get('viewsCount'),
+            'duration': video_json.get('duration'),
+            'upload_date': unified_strdate(video_json.get('airDate')),
+            'thumbnail': format_field(video_json, 'posterImage', 'https://lnk.lt/all-images/%s'),
+            'episode_number': int_or_none(video_json.get('episodeNumber')),
+            'series': video_json.get('programTitle'),
+            'formats': formats,
+            'subtitles': subtitles,
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/lnkgo.py b/plugins/youtube_download/yt_dlp/extractor/lnkgo.py
deleted file mode 100644
index 6282d2e..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/lnkgo.py
+++ /dev/null
@@ -1,163 +0,0 @@
-from .common import InfoExtractor
-from ..compat import compat_str
-from ..utils import (
-    clean_html,
-    format_field,
-    int_or_none,
-    parse_iso8601,
-    unified_strdate,
-)
-
-
-class LnkGoIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?lnk(?:go)?\.(?:alfa\.)?lt/(?:visi-video/[^/]+|video)/(?P<id>[A-Za-z0-9-]+)(?:/(?P<episode_id>\d+))?'
-    _TESTS = [{
-        'url': 'http://www.lnkgo.lt/visi-video/aktualai-pratesimas/ziurek-putka-trys-klausimai',
-        'info_dict': {
-            'id': '10809',
-            'ext': 'mp4',
-            'title': "Put'ka: Trys Klausimai",
-            'upload_date': '20161216',
-            'description': 'Seniai matytas Put’ka užduoda tris klausimėlius. Pabandykime surasti atsakymus.',
-            'age_limit': 18,
-            'duration': 117,
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'timestamp': 1481904000,
-        },
-        'params': {
-            'skip_download': True,  # HLS download
-        },
-    }, {
-        'url': 'http://lnkgo.alfa.lt/visi-video/aktualai-pratesimas/ziurek-nerdas-taiso-kompiuteri-2',
-        'info_dict': {
-            'id': '10467',
-            'ext': 'mp4',
-            'title': 'Nėrdas: Kompiuterio Valymas',
-            'upload_date': '20150113',
-            'description': 'md5:7352d113a242a808676ff17e69db6a69',
-            'age_limit': 18,
-            'duration': 346,
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'timestamp': 1421164800,
-        },
-        'params': {
-            'skip_download': True,  # HLS download
-        },
-    }, {
-        'url': 'https://lnk.lt/video/neigalieji-tv-bokste/37413',
-        'only_matching': True,
-    }]
-    _AGE_LIMITS = {
-        'N-7': 7,
-        'N-14': 14,
-        'S': 18,
-    }
-    _M3U8_TEMPL = 'https://vod.lnk.lt/lnk_vod/lnk/lnk/%s:%s/playlist.m3u8%s'
-
-    def _real_extract(self, url):
-        display_id, video_id = self._match_valid_url(url).groups()
-
-        video_info = self._download_json(
-            'https://lnk.lt/api/main/video-page/%s/%s/false' % (display_id, video_id or '0'),
-            display_id)['videoConfig']['videoInfo']
-
-        video_id = compat_str(video_info['id'])
-        title = video_info['title']
-        prefix = 'smil' if video_info.get('isQualityChangeAvailable') else 'mp4'
-        formats = self._extract_m3u8_formats(
-            self._M3U8_TEMPL % (prefix, video_info['videoUrl'], video_info.get('secureTokenParams') or ''),
-            video_id, 'mp4', 'm3u8_native')
-
-        return {
-            'id': video_id,
-            'display_id': display_id,
-            'title': title,
-            'formats': formats,
-            'thumbnail': format_field(video_info, 'posterImage', 'https://lnk.lt/all-images/%s'),
-            'duration': int_or_none(video_info.get('duration')),
-            'description': clean_html(video_info.get('htmlDescription')),
-            'age_limit': self._AGE_LIMITS.get(video_info.get('pgRating'), 0),
-            'timestamp': parse_iso8601(video_info.get('airDate')),
-            'view_count': int_or_none(video_info.get('viewsCount')),
-        }
-
-
-class LnkIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?lnk\.lt/[^/]+/(?P<id>\d+)'
-
-    _TESTS = [{
-        'url': 'https://lnk.lt/zinios/79791',
-        'info_dict': {
-            'id': '79791',
-            'ext': 'mp4',
-            'title': 'LNK.lt: Viešintų gyventojai sukilo prieš radijo bangų siųstuvą',
-            'description': 'Svarbiausios naujienos trumpai, LNK žinios ir Info dienos pokalbiai.',
-            'view_count': int,
-            'duration': 233,
-            'upload_date': '20191123',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'episode_number': 13431,
-            'series': 'Naujausi žinių reportažai',
-            'episode': 'Episode 13431'
-        },
-        'params': {'skip_download': True}
-    }, {
-        'url': 'https://lnk.lt/istorijos-trumpai/152546',
-        'info_dict': {
-            'id': '152546',
-            'ext': 'mp4',
-            'title': 'Radžio koncertas gaisre ',
-            'description': 'md5:0666b5b85cb9fc7c1238dec96f71faba',
-            'view_count': int,
-            'duration': 54,
-            'upload_date': '20220105',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'episode_number': 1036,
-            'series': 'Istorijos trumpai',
-            'episode': 'Episode 1036'
-        },
-        'params': {'skip_download': True}
-    }, {
-        'url': 'https://lnk.lt/gyvunu-pasaulis/151549',
-        'info_dict': {
-            'id': '151549',
-            'ext': 'mp4',
-            'title': 'Gyvūnų pasaulis',
-            'description': '',
-            'view_count': int,
-            'duration': 1264,
-            'upload_date': '20220108',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'episode_number': 16,
-            'series': 'Gyvūnų pasaulis',
-            'episode': 'Episode 16'
-        },
-        'params': {'skip_download': True}
-    }]
-
-    def _real_extract(self, url):
-        id = self._match_id(url)
-        video_json = self._download_json(f'https://lnk.lt/api/video/video-config/{id}', id)['videoInfo']
-        formats, subtitles = [], {}
-        if video_json.get('videoUrl'):
-            fmts, subs = self._extract_m3u8_formats_and_subtitles(video_json['videoUrl'], id)
-            formats.extend(fmts)
-            subtitles = self._merge_subtitles(subtitles, subs)
-        if video_json.get('videoFairplayUrl') and not video_json.get('drm'):
-            fmts, subs = self._extract_m3u8_formats_and_subtitles(video_json['videoFairplayUrl'], id)
-            formats.extend(fmts)
-            subtitles = self._merge_subtitles(subtitles, subs)
-
-        return {
-            'id': id,
-            'title': video_json.get('title'),
-            'description': video_json.get('description'),
-            'view_count': video_json.get('viewsCount'),
-            'duration': video_json.get('duration'),
-            'upload_date': unified_strdate(video_json.get('airDate')),
-            'thumbnail': format_field(video_json, 'posterImage', 'https://lnk.lt/all-images/%s'),
-            'episode_number': int_or_none(video_json.get('episodeNumber')),
-            'series': video_json.get('programTitle'),
-            'formats': formats,
-            'subtitles': subtitles,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/localnews8.py b/plugins/youtube_download/yt_dlp/extractor/localnews8.py
deleted file mode 100644
index 6f3f02c..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/localnews8.py
+++ /dev/null
@@ -1,42 +0,0 @@
-from .common import InfoExtractor
-
-
-class LocalNews8IE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?localnews8\.com/(?:[^/]+/)*(?P<display_id>[^/]+)/(?P<id>[0-9]+)'
-    _TEST = {
-        'url': 'http://www.localnews8.com/news/rexburg-business-turns-carbon-fiber-scraps-into-wedding-rings/35183304',
-        'md5': 'be4d48aea61aa2bde7be2ee47691ad20',
-        'info_dict': {
-            'id': '35183304',
-            'display_id': 'rexburg-business-turns-carbon-fiber-scraps-into-wedding-rings',
-            'ext': 'mp4',
-            'title': 'Rexburg business turns carbon fiber scraps into wedding ring',
-            'description': 'The process was first invented by Lamborghini and less than a dozen companies around the world use it.',
-            'duration': 153,
-            'timestamp': 1441844822,
-            'upload_date': '20150910',
-            'uploader_id': 'api',
-        }
-    }
-
-    def _real_extract(self, url):
-        mobj = self._match_valid_url(url)
-        video_id = mobj.group('id')
-        display_id = mobj.group('display_id')
-
-        webpage = self._download_webpage(url, display_id)
-
-        partner_id = self._search_regex(
-            r'partnerId\s*[:=]\s*(["\'])(?P<id>\d+)\1',
-            webpage, 'partner id', group='id')
-        kaltura_id = self._search_regex(
-            r'videoIdString\s*[:=]\s*(["\'])kaltura:(?P<id>[0-9a-z_]+)\1',
-            webpage, 'videl id', group='id')
-
-        return {
-            '_type': 'url_transparent',
-            'url': 'kaltura:%s:%s' % (partner_id, kaltura_id),
-            'ie_key': 'Kaltura',
-            'id': video_id,
-            'display_id': display_id,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/loco.py b/plugins/youtube_download/yt_dlp/extractor/loco.py
new file mode 100644
index 0000000..6c9a255
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/loco.py
@@ -0,0 +1,159 @@
+import json
+import random
+import time
+
+from .common import InfoExtractor
+from ..utils import int_or_none, jwt_decode_hs256, try_call, url_or_none
+from ..utils.traversal import require, traverse_obj
+
+
+class LocoIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?loco\.com/(?P<type>streamers|stream)/(?P<id>[^/?#]+)'
+    _TESTS = [{
+        'url': 'https://loco.com/streamers/teuzinfps',
+        'info_dict': {
+            'id': 'teuzinfps',
+            'ext': 'mp4',
+            'title': r're:MS BOLADAO, RESENHA & GAMEPLAY ALTO NIVEL',
+            'description': 'bom e novo',
+            'uploader_id': 'RLUVE3S9JU',
+            'channel': 'teuzinfps',
+            'channel_follower_count': int,
+            'comment_count': int,
+            'view_count': int,
+            'concurrent_view_count': int,
+            'like_count': int,
+            'thumbnail': 'https://static.ivory.getloconow.com/default_thumb/743701a9-98ca-41ae-9a8b-70bd5da070ad.jpg',
+            'tags': ['MMORPG', 'Gameplay'],
+            'series': 'Tibia',
+            'timestamp': int,
+            'modified_timestamp': int,
+            'live_status': 'is_live',
+            'upload_date': str,
+            'modified_date': str,
+        },
+        'params': {
+            'skip_download': 'Livestream',
+        },
+    }, {
+        'url': 'https://loco.com/stream/c64916eb-10fb-46a9-9a19-8c4b7ed064e7',
+        'md5': '45ebc8a47ee1c2240178757caf8881b5',
+        'info_dict': {
+            'id': 'c64916eb-10fb-46a9-9a19-8c4b7ed064e7',
+            'ext': 'mp4',
+            'title': 'PAULINHO LOKO NA LOCO!',
+            'description': 'live on na loco',
+            'uploader_id': '2MDO7Z1DPM',
+            'channel': 'paulinholokobr',
+            'channel_follower_count': int,
+            'comment_count': int,
+            'view_count': int,
+            'concurrent_view_count': int,
+            'like_count': int,
+            'duration': 14491,
+            'thumbnail': 'https://static.ivory.getloconow.com/default_thumb/59b5970b-23c1-4518-9e96-17ce341299fe.jpg',
+            'tags': ['Gameplay'],
+            'series': 'GTA 5',
+            'timestamp': 1740612872,
+            'modified_timestamp': 1740613037,
+            'upload_date': '20250226',
+            'modified_date': '20250226',
+        },
+    }, {
+        # Requires video authorization
+        'url': 'https://loco.com/stream/ac854641-ae0f-497c-a8ea-4195f6d8cc53',
+        'md5': '0513edf85c1e65c9521f555f665387d5',
+        'info_dict': {
+            'id': 'ac854641-ae0f-497c-a8ea-4195f6d8cc53',
+            'ext': 'mp4',
+            'title': 'DUAS CONTAS DESAFIANTE, RUSH TOP 1 NO BRASIL!',
+            'description': 'md5:aa77818edd6fe00dd4b6be75cba5f826',
+            'uploader_id': '7Y9JNAZC3Q',
+            'channel': 'ayellol',
+            'channel_follower_count': int,
+            'comment_count': int,
+            'view_count': int,
+            'concurrent_view_count': int,
+            'like_count': int,
+            'duration': 1229,
+            'thumbnail': 'https://static.ivory.getloconow.com/default_thumb/f5aa678b-6d04-45d9-a89a-859af0a8028f.jpg',
+            'tags': ['Gameplay', 'Carry'],
+            'series': 'League of Legends',
+            'timestamp': 1741182253,
+            'upload_date': '20250305',
+            'modified_timestamp': 1741182419,
+            'modified_date': '20250305',
+        },
+    }]
+
+    # From _app.js
+    _CLIENT_ID = 'TlwKp1zmF6eKFpcisn3FyR18WkhcPkZtzwPVEEC3'
+    _CLIENT_SECRET = 'Kp7tYlUN7LXvtcSpwYvIitgYcLparbtsQSe5AdyyCdiEJBP53Vt9J8eB4AsLdChIpcO2BM19RA3HsGtqDJFjWmwoonvMSG3ZQmnS8x1YIM8yl82xMXZGbE3NKiqmgBVU'
+
+    def _is_jwt_expired(self, token):
+        return jwt_decode_hs256(token)['exp'] - time.time() < 300
+
+    def _get_access_token(self, video_id):
+        access_token = try_call(lambda: self._get_cookies('https://loco.com')['access_token'].value)
+        if access_token and not self._is_jwt_expired(access_token):
+            return access_token
+        access_token = traverse_obj(self._download_json(
+            'https://api.getloconow.com/v3/user/device_profile/', video_id,
+            'Downloading access token', fatal=False, data=json.dumps({
+                'platform': 7,
+                'client_id': self._CLIENT_ID,
+                'client_secret': self._CLIENT_SECRET,
+                'model': 'Mozilla',
+                'os_name': 'Win32',
+                'os_ver': '5.0 (Windows)',
+                'app_ver': '5.0 (Windows)',
+            }).encode(), headers={
+                'Content-Type': 'application/json;charset=utf-8',
+                'DEVICE-ID': ''.join(random.choices('0123456789abcdef', k=32)) + 'live',
+                'X-APP-LANG': 'en',
+                'X-APP-LOCALE': 'en-US',
+                'X-CLIENT-ID': self._CLIENT_ID,
+                'X-CLIENT-SECRET': self._CLIENT_SECRET,
+                'X-PLATFORM': '7',
+            }), 'access_token')
+        if access_token and not self._is_jwt_expired(access_token):
+            self._set_cookie('.loco.com', 'access_token', access_token)
+            return access_token
+
+    def _real_extract(self, url):
+        video_type, video_id = self._match_valid_url(url).group('type', 'id')
+        webpage = self._download_webpage(url, video_id)
+        stream = traverse_obj(self._search_nextjs_data(webpage, video_id), (
+            'props', 'pageProps', ('liveStreamData', 'stream', 'liveStream'), {dict}, any, {require('stream info')}))
+
+        if access_token := self._get_access_token(video_id):
+            self._request_webpage(
+                'https://drm.loco.com/v1/streams/playback/', video_id,
+                'Downloading video authorization', fatal=False, headers={
+                    'authorization': access_token,
+                }, query={
+                    'stream_uid': stream['uid'],
+                })
+
+        return {
+            'formats': self._extract_m3u8_formats(stream['conf']['hls'], video_id),
+            'id': video_id,
+            'is_live': video_type == 'streamers',
+            **traverse_obj(stream, {
+                'title': ('title', {str}),
+                'series': ('game_name', {str}),
+                'uploader_id': ('user_uid', {str}),
+                'channel': ('alias', {str}),
+                'description': ('description', {str}),
+                'concurrent_view_count': ('viewersCurrent', {int_or_none}),
+                'view_count': ('total_views', {int_or_none}),
+                'thumbnail': ('thumbnail_url_small', {url_or_none}),
+                'like_count': ('likes', {int_or_none}),
+                'tags': ('tags', ..., {str}),
+                'timestamp': ('started_at', {int_or_none(scale=1000)}),
+                'modified_timestamp': ('updated_at', {int_or_none(scale=1000)}),
+                'comment_count': ('comments_count', {int_or_none}),
+                'channel_follower_count': ('followers_count', {int_or_none}),
+                'duration': ('duration', {int_or_none}),
+            }),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/loom.py b/plugins/youtube_download/yt_dlp/extractor/loom.py
new file mode 100644
index 0000000..b0878c3
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/loom.py
@@ -0,0 +1,466 @@
+import json
+import textwrap
+import urllib.parse
+import uuid
+
+from .common import InfoExtractor
+from ..utils import (
+    ExtractorError,
+    determine_ext,
+    filter_dict,
+    get_first,
+    int_or_none,
+    parse_iso8601,
+    update_url,
+    url_or_none,
+    variadic,
+)
+from ..utils.traversal import traverse_obj
+
+
+class LoomIE(InfoExtractor):
+    IE_NAME = 'loom'
+    _VALID_URL = r'https?://(?:www\.)?loom\.com/(?:share|embed)/(?P<id>[\da-f]{32})'
+    _EMBED_REGEX = [rf'<iframe[^>]+\bsrc=["\'](?P<url>{_VALID_URL})']
+    _TESTS = [{
+        # m3u8 raw-url, mp4 transcoded-url, cdn url == raw-url, json subs only
+        'url': 'https://www.loom.com/share/43d05f362f734614a2e81b4694a3a523',
+        'md5': 'bfc2d7e9c2e0eb4813212230794b6f42',
+        'info_dict': {
+            'id': '43d05f362f734614a2e81b4694a3a523',
+            'ext': 'mp4',
+            'title': 'A Ruler for Windows - 28 March 2022',
+            'uploader': 'wILLIAM PIP',
+            'upload_date': '20220328',
+            'timestamp': 1648454238,
+            'duration': 27,
+        },
+    }, {
+        # webm raw-url, mp4 transcoded-url, cdn url == transcoded-url, no subs
+        'url': 'https://www.loom.com/share/c43a642f815f4378b6f80a889bb73d8d',
+        'md5': '70f529317be8cf880fcc2c649a531900',
+        'info_dict': {
+            'id': 'c43a642f815f4378b6f80a889bb73d8d',
+            'ext': 'webm',
+            'title': 'Lilah Nielsen Intro Video',
+            'uploader': 'Lilah Nielsen',
+            'upload_date': '20200826',
+            'timestamp': 1598480716,
+            'duration': 20,
+        },
+    }, {
+        # m3u8 raw-url, mp4 transcoded-url, cdn url == raw-url, vtt sub and json subs
+        'url': 'https://www.loom.com/share/9458bcbf79784162aa62ffb8dd66201b',
+        'md5': '51737ec002969dd28344db4d60b9cbbb',
+        'info_dict': {
+            'id': '9458bcbf79784162aa62ffb8dd66201b',
+            'ext': 'mp4',
+            'title': 'Sharing screen with gpt-4',
+            'description': 'Sharing screen with GPT 4 vision model and asking questions to guide through blender.',
+            'uploader': 'Suneel Matham',
+            'chapters': 'count:3',
+            'upload_date': '20231109',
+            'timestamp': 1699518978,
+            'duration': 93,
+        },
+    }, {
+        # mpd raw-url, mp4 transcoded-url, cdn url == raw-url, no subs
+        'url': 'https://www.loom.com/share/24351eb8b317420289b158e4b7e96ff2',
+        'info_dict': {
+            'id': '24351eb8b317420289b158e4b7e96ff2',
+            'ext': 'webm',
+            'title': 'OMFG clown',
+            'description': 'md5:285c5ee9d62aa087b7e3271b08796815',
+            'uploader': 'MrPumkin B',
+            'upload_date': '20210924',
+            'timestamp': 1632519618,
+            'duration': 210,
+        },
+        'params': {'skip_download': 'dash'},
+    }, {
+        # password-protected
+        'url': 'https://www.loom.com/share/50e26e8aeb7940189dff5630f95ce1f4',
+        'md5': '5cc7655e7d55d281d203f8ffd14771f7',
+        'info_dict': {
+            'id': '50e26e8aeb7940189dff5630f95ce1f4',
+            'ext': 'mp4',
+            'title': 'iOS Mobile Upload',
+            'uploader': 'Simon Curran',
+            'upload_date': '20200520',
+            'timestamp': 1590000123,
+            'duration': 35,
+        },
+        'params': {'videopassword': 'seniorinfants2'},
+    }, {
+        # embed, transcoded-url endpoint sends empty JSON response, split video and audio HLS formats
+        'url': 'https://www.loom.com/embed/ddcf1c1ad21f451ea7468b1e33917e4e',
+        'md5': 'b321d261656848c184a94e3b93eae28d',
+        'info_dict': {
+            'id': 'ddcf1c1ad21f451ea7468b1e33917e4e',
+            'ext': 'mp4',
+            'title': 'CF Reset User\'s Password',
+            'uploader': 'Aimee Heintz',
+            'upload_date': '20220707',
+            'timestamp': 1657216459,
+            'duration': 181,
+        },
+        'params': {'format': 'bestvideo'},  # Test video-only fixup
+        'expected_warnings': ['Failed to parse JSON'],
+    }]
+    _WEBPAGE_TESTS = [{
+        'url': 'https://www.loom.com/community/e1229802a8694a09909e8ba0fbb6d073-pg',
+        'md5': 'ec838cd01b576cf0386f32e1ae424609',
+        'info_dict': {
+            'id': 'e1229802a8694a09909e8ba0fbb6d073',
+            'ext': 'mp4',
+            'title': 'Rexie Jane Cimafranca - Founder\'s Presentation',
+            'uploader': 'Rexie Cimafranca',
+            'upload_date': '20230213',
+            'duration': 247,
+            'timestamp': 1676274030,
+        },
+    }]
+
+    _GRAPHQL_VARIABLES = {
+        'GetVideoSource': {
+            'acceptableMimes': ['DASH', 'M3U8', 'MP4'],
+        },
+    }
+    _GRAPHQL_QUERIES = {
+        'GetVideoSSR': textwrap.dedent('''\
+            query GetVideoSSR($videoId: ID!, $password: String) {
+              getVideo(id: $videoId, password: $password) {
+                __typename
+                ... on PrivateVideo {
+                  id
+                  status
+                  message
+                  __typename
+                }
+                ... on VideoPasswordMissingOrIncorrect {
+                  id
+                  message
+                  __typename
+                }
+                ... on RegularUserVideo {
+                  id
+                  __typename
+                  createdAt
+                  description
+                  download_enabled
+                  folder_id
+                  is_protected
+                  needs_password
+                  owner {
+                    display_name
+                    __typename
+                  }
+                  privacy
+                  s3_id
+                  name
+                  video_properties {
+                    avgBitRate
+                    client
+                    camera_enabled
+                    client_version
+                    duration
+                    durationMs
+                    format
+                    height
+                    microphone_enabled
+                    os
+                    os_version
+                    recordingClient
+                    recording_type
+                    recording_version
+                    screen_type
+                    tab_audio
+                    trim_duration
+                    width
+                    __typename
+                  }
+                  playable_duration
+                  source_duration
+                  visibility
+                }
+              }
+            }\n'''),
+        'GetVideoSource': textwrap.dedent('''\
+            query GetVideoSource($videoId: ID!, $password: String, $acceptableMimes: [CloudfrontVideoAcceptableMime]) {
+              getVideo(id: $videoId, password: $password) {
+                ... on RegularUserVideo {
+                  id
+                  nullableRawCdnUrl(acceptableMimes: $acceptableMimes, password: $password) {
+                    url
+                    __typename
+                  }
+                  __typename
+                }
+                __typename
+              }
+            }\n'''),
+        'FetchVideoTranscript': textwrap.dedent('''\
+            query FetchVideoTranscript($videoId: ID!, $password: String) {
+              fetchVideoTranscript(videoId: $videoId, password: $password) {
+                ... on VideoTranscriptDetails {
+                  id
+                  video_id
+                  source_url
+                  captions_source_url
+                  __typename
+                }
+                ... on GenericError {
+                  message
+                  __typename
+                }
+                __typename
+              }
+            }\n'''),
+        'FetchChapters': textwrap.dedent('''\
+            query FetchChapters($videoId: ID!, $password: String) {
+              fetchVideoChapters(videoId: $videoId, password: $password) {
+                ... on VideoChapters {
+                  video_id
+                  content
+                  __typename
+                }
+                ... on EmptyChaptersPayload {
+                  content
+                  __typename
+                }
+                ... on InvalidRequestWarning {
+                  message
+                  __typename
+                }
+                ... on Error {
+                  message
+                  __typename
+                }
+                __typename
+              }
+            }\n'''),
+    }
+    _APOLLO_GRAPHQL_VERSION = '0a1856c'
+
+    def _call_graphql_api(self, operations, video_id, note=None, errnote=None):
+        password = self.get_param('videopassword')
+        return self._download_json(
+            'https://www.loom.com/graphql', video_id, note or 'Downloading GraphQL JSON',
+            errnote or 'Failed to download GraphQL JSON', headers={
+                'Accept': 'application/json',
+                'Content-Type': 'application/json',
+                'x-loom-request-source': f'loom_web_{self._APOLLO_GRAPHQL_VERSION}',
+                'apollographql-client-name': 'web',
+                'apollographql-client-version': self._APOLLO_GRAPHQL_VERSION,
+            }, data=json.dumps([{
+                'operationName': operation_name,
+                'variables': {
+                    'videoId': video_id,
+                    'password': password,
+                    **self._GRAPHQL_VARIABLES.get(operation_name, {}),
+                },
+                'query': self._GRAPHQL_QUERIES[operation_name],
+            } for operation_name in variadic(operations)], separators=(',', ':')).encode())
+
+    def _call_url_api(self, endpoint, video_id):
+        response = self._download_json(
+            f'https://www.loom.com/api/campaigns/sessions/{video_id}/{endpoint}', video_id,
+            f'Downloading {endpoint} JSON', f'Failed to download {endpoint} JSON', fatal=False,
+            headers={'Accept': 'application/json', 'Content-Type': 'application/json'},
+            data=json.dumps({
+                'anonID': str(uuid.uuid4()),
+                'deviceID': None,
+                'force_original': False,  # HTTP error 401 if True
+                'password': self.get_param('videopassword'),
+            }, separators=(',', ':')).encode())
+        return traverse_obj(response, ('url', {url_or_none}))
+
+    def _extract_formats(self, video_id, metadata, gql_data):
+        formats = []
+        video_properties = traverse_obj(metadata, ('video_properties', {
+            'width': ('width', {int_or_none}),
+            'height': ('height', {int_or_none}),
+            'acodec': ('microphone_enabled', {lambda x: 'none' if x is False else None}),
+        }))
+
+        def get_formats(format_url, format_id, quality):
+            if not format_url:
+                return
+            ext = determine_ext(format_url)
+            query = urllib.parse.urlparse(format_url).query
+
+            if ext == 'm3u8':
+                # Extract pre-merged HLS formats to avoid buggy parsing of metadata in split playlists
+                format_url = format_url.replace('-split.m3u8', '.m3u8')
+                m3u8_formats = self._extract_m3u8_formats(
+                    format_url, video_id, 'mp4', m3u8_id=f'hls-{format_id}', fatal=False, quality=quality)
+                # Sometimes only split video/audio formats are available, need to fixup video-only formats
+                is_not_premerged = 'none' in traverse_obj(m3u8_formats, (..., 'vcodec'))
+                for fmt in m3u8_formats:
+                    if is_not_premerged and fmt.get('vcodec') != 'none':
+                        fmt['acodec'] = 'none'
+                    yield {
+                        **fmt,
+                        'url': update_url(fmt['url'], query=query),
+                        'extra_param_to_segment_url': query,
+                    }
+
+            elif ext == 'mpd':
+                dash_formats = self._extract_mpd_formats(
+                    format_url, video_id, mpd_id=f'dash-{format_id}', fatal=False)
+                for fmt in dash_formats:
+                    yield {
+                        **fmt,
+                        'extra_param_to_segment_url': query,
+                        'quality': quality,
+                    }
+
+            else:
+                yield {
+                    'url': format_url,
+                    'ext': ext,
+                    'format_id': f'http-{format_id}',
+                    'quality': quality,
+                    **video_properties,
+                }
+
+        raw_url = self._call_url_api('raw-url', video_id)
+        formats.extend(get_formats(raw_url, 'raw', quality=1))  # original quality
+
+        transcoded_url = self._call_url_api('transcoded-url', video_id)
+        formats.extend(get_formats(transcoded_url, 'transcoded', quality=-1))  # transcoded quality
+
+        cdn_url = get_first(gql_data, ('data', 'getVideo', 'nullableRawCdnUrl', 'url', {url_or_none}))
+        # cdn_url is usually a dupe, but the raw-url/transcoded-url endpoints could return errors
+        valid_urls = [update_url(url, query=None) for url in (raw_url, transcoded_url) if url]
+        if cdn_url and update_url(cdn_url, query=None) not in valid_urls:
+            formats.extend(get_formats(cdn_url, 'cdn', quality=0))  # could be original or transcoded
+
+        return formats
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        metadata = get_first(
+            self._call_graphql_api('GetVideoSSR', video_id, 'Downloading GraphQL metadata JSON'),
+            ('data', 'getVideo', {dict})) or {}
+
+        if metadata.get('__typename') == 'VideoPasswordMissingOrIncorrect':
+            if not self.get_param('videopassword'):
+                raise ExtractorError(
+                    'This video is password-protected, use the --video-password option', expected=True)
+            raise ExtractorError('Invalid video password', expected=True)
+
+        gql_data = self._call_graphql_api(['FetchChapters', 'FetchVideoTranscript', 'GetVideoSource'], video_id)
+        duration = traverse_obj(metadata, ('video_properties', 'duration', {int_or_none}))
+
+        return {
+            'id': video_id,
+            'duration': duration,
+            'chapters': self._extract_chapters_from_description(
+                get_first(gql_data, ('data', 'fetchVideoChapters', 'content', {str})), duration) or None,
+            'formats': self._extract_formats(video_id, metadata, gql_data),
+            'subtitles': filter_dict({
+                'en': traverse_obj(gql_data, (
+                    ..., 'data', 'fetchVideoTranscript',
+                    ('source_url', 'captions_source_url'), {
+                        'url': {url_or_none},
+                    })) or None,
+            }),
+            **traverse_obj(metadata, {
+                'title': ('name', {str}),
+                'description': ('description', {str}),
+                'uploader': ('owner', 'display_name', {str}),
+                'timestamp': ('createdAt', {parse_iso8601}),
+            }),
+        }
+
+
+class LoomFolderIE(InfoExtractor):
+    IE_NAME = 'loom:folder'
+    _VALID_URL = r'https?://(?:www\.)?loom\.com/share/folder/(?P<id>[\da-f]{32})'
+    _TESTS = [{
+        # 2 subfolders, no videos in root
+        'url': 'https://www.loom.com/share/folder/997db4db046f43e5912f10dc5f817b5c',
+        'playlist_mincount': 16,
+        'info_dict': {
+            'id': '997db4db046f43e5912f10dc5f817b5c',
+            'title': 'Blending Lessons',
+        },
+    }, {
+        # only videos, no subfolders
+        'url': 'https://www.loom.com/share/folder/9a8a87f6b6f546d9a400c8e7575ff7f2',
+        'playlist_mincount': 12,
+        'info_dict': {
+            'id': '9a8a87f6b6f546d9a400c8e7575ff7f2',
+            'title': 'List A- a, i, o',
+        },
+    }, {
+        # videos in root and empty subfolder
+        'url': 'https://www.loom.com/share/folder/886e534218c24fd292e97e9563078cc4',
+        'playlist_mincount': 21,
+        'info_dict': {
+            'id': '886e534218c24fd292e97e9563078cc4',
+            'title': 'Medicare Agent Training videos',
+        },
+    }, {
+        # videos in root and videos in subfolders
+        'url': 'https://www.loom.com/share/folder/b72c4ecdf04745da9403926d80a40c38',
+        'playlist_mincount': 21,
+        'info_dict': {
+            'id': 'b72c4ecdf04745da9403926d80a40c38',
+            'title': 'Quick Altos Q & A Tutorials',
+        },
+    }, {
+        # recursive folder extraction
+        'url': 'https://www.loom.com/share/folder/8b458a94e0e4449b8df9ea7a68fafc4e',
+        'playlist_count': 23,
+        'info_dict': {
+            'id': '8b458a94e0e4449b8df9ea7a68fafc4e',
+            'title': 'Sezer Texting Guide',
+        },
+    }, {
+        # more than 50 videos in 1 folder
+        'url': 'https://www.loom.com/share/folder/e056a91d290d47ca9b00c9d1df56c463',
+        'playlist_mincount': 61,
+        'info_dict': {
+            'id': 'e056a91d290d47ca9b00c9d1df56c463',
+            'title': 'User Videos',
+        },
+    }, {
+        # many subfolders
+        'url': 'https://www.loom.com/share/folder/c2dde8cc67454f0e99031677279d8954',
+        'playlist_mincount': 75,
+        'info_dict': {
+            'id': 'c2dde8cc67454f0e99031677279d8954',
+            'title': 'Honors 1',
+        },
+    }, {
+        'url': 'https://www.loom.com/share/folder/bae17109a68146c7803454f2893c8cf8/Edpuzzle',
+        'only_matching': True,
+    }]
+
+    def _extract_folder_data(self, folder_id):
+        return self._download_json(
+            f'https://www.loom.com/v1/folders/{folder_id}', folder_id,
+            'Downloading folder info JSON', query={'limit': '10000'})
+
+    def _extract_folder_entries(self, folder_id, initial_folder_data=None):
+        folder_data = initial_folder_data or self._extract_folder_data(folder_id)
+
+        for video in traverse_obj(folder_data, ('videos', lambda _, v: v['id'])):
+            video_id = video['id']
+            yield self.url_result(
+                f'https://www.loom.com/share/{video_id}', LoomIE, video_id, video.get('name'))
+
+        # Recurse into subfolders
+        for subfolder_id in traverse_obj(folder_data, (
+                'folders', lambda _, v: v['id'] != folder_id, 'id', {str})):
+            yield from self._extract_folder_entries(subfolder_id)
+
+    def _real_extract(self, url):
+        playlist_id = self._match_id(url)
+        playlist_data = self._extract_folder_data(playlist_id)
+
+        return self.playlist_result(
+            self._extract_folder_entries(playlist_id, playlist_data), playlist_id,
+            traverse_obj(playlist_data, ('folder', 'name', {str.strip})))
diff --git a/plugins/youtube_download/yt_dlp/extractor/lovehomeporn.py b/plugins/youtube_download/yt_dlp/extractor/lovehomeporn.py
index ba5a13a..63b75a3 100644
--- a/plugins/youtube_download/yt_dlp/extractor/lovehomeporn.py
+++ b/plugins/youtube_download/yt_dlp/extractor/lovehomeporn.py
@@ -15,7 +15,7 @@ class LoveHomePornIE(NuevoBaseIE):
         },
         'params': {
             'skip_download': True,
-        }
+        },
     }
 
     def _real_extract(self, url):
@@ -24,10 +24,10 @@ class LoveHomePornIE(NuevoBaseIE):
         display_id = mobj.group('display_id')
 
         info = self._extract_nuevo(
-            'http://lovehomeporn.com/media/nuevo/config.php?key=%s' % video_id,
+            f'http://lovehomeporn.com/media/nuevo/config.php?key={video_id}',
             video_id)
         info.update({
             'display_id': display_id,
-            'age_limit': 18
+            'age_limit': 18,
         })
         return info
diff --git a/plugins/youtube_download/yt_dlp/extractor/lrt.py b/plugins/youtube_download/yt_dlp/extractor/lrt.py
index 80d4d1c..e50194f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/lrt.py
+++ b/plugins/youtube_download/yt_dlp/extractor/lrt.py
@@ -2,8 +2,11 @@ from .common import InfoExtractor
 from ..utils import (
     clean_html,
     merge_dicts,
+    str_or_none,
     traverse_obj,
+    unified_timestamp,
     url_or_none,
+    urljoin,
 )
 
 
@@ -22,8 +25,8 @@ class LRTStreamIE(LRTBaseIE):
             'id': 'lrt-opus',
             'live_status': 'is_live',
             'title': 're:^LRT Opus.+$',
-            'ext': 'mp4'
-        }
+            'ext': 'mp4',
+        },
     }]
 
     def _real_extract(self, url):
@@ -44,7 +47,7 @@ class LRTStreamIE(LRTBaseIE):
             'formats': formats,
             'subtitles': subtitles,
             'is_live': True,
-            'title': f'{self._og_search_title(webpage)} - {stream_title}'
+            'title': f'{self._og_search_title(webpage)} - {stream_title}',
         }
 
 
@@ -62,7 +65,7 @@ class LRTVODIE(LRTBaseIE):
             'timestamp': 1604079000,
             'upload_date': '20201030',
             'tags': ['LRT TELEVIZIJA', 'Beatos virtuvė', 'Beata Nicholson', 'Makaronai', 'Baklažanai', 'Vakarienė', 'Receptas'],
-            'thumbnail': 'https://www.lrt.lt/img/2020/10/30/764041-126478-1287x836.jpg'
+            'thumbnail': 'https://www.lrt.lt/img/2020/10/30/764041-126478-1287x836.jpg',
         },
     }, {
         # direct mp3 download
@@ -80,7 +83,7 @@ class LRTVODIE(LRTBaseIE):
     }]
 
     def _real_extract(self, url):
-        path, video_id = self._match_valid_url(url).groups()
+        path, video_id = self._match_valid_url(url).group('path', 'id')
         webpage = self._download_webpage(url, video_id)
 
         media_url = self._extract_js_var(webpage, 'main_url', path)
@@ -106,3 +109,42 @@ class LRTVODIE(LRTBaseIE):
         }
 
         return merge_dicts(clean_info, jw_data, json_ld_data)
+
+
+class LRTRadioIE(LRTBaseIE):
+    _VALID_URL = r'https?://(?:www\.)?lrt\.lt/radioteka/irasas/(?P<id>\d+)/(?P<path>[^?#/]+)'
+    _TESTS = [{
+        # m3u8 download
+        'url': 'https://www.lrt.lt/radioteka/irasas/2000359728/nemarios-eiles-apie-pragarus-ir-skaistyklas-su-aiste-kiltinaviciute',
+        'info_dict': {
+            'id': '2000359728',
+            'ext': 'm4a',
+            'title': 'Nemarios eilės: apie pragarus ir skaistyklas su Aiste Kiltinavičiūte',
+            'description': 'md5:5eee9a0e86a55bf547bd67596204625d',
+            'timestamp': 1726143120,
+            'upload_date': '20240912',
+            'tags': 'count:5',
+            'thumbnail': r're:https?://.+/.+\.jpe?g',
+            'categories': ['Daiktiniai įrodymai'],
+        },
+    }, {
+        'url': 'https://www.lrt.lt/radioteka/irasas/2000304654/vakaras-su-knyga-svetlana-aleksijevic-cernobylio-malda-v-dalis?season=%2Fmediateka%2Faudio%2Fvakaras-su-knyga%2F2023',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        video_id, path = self._match_valid_url(url).group('id', 'path')
+        media = self._download_json(
+            'https://www.lrt.lt/radioteka/api/media', video_id,
+            query={'url': f'/mediateka/irasas/{video_id}/{path}'})
+
+        return traverse_obj(media, {
+            'id': ('id', {int}, {str_or_none}),
+            'title': ('title', {str}),
+            'tags': ('tags', ..., 'name', {str}),
+            'categories': ('playlist_item', 'category', {str}, filter, all, filter),
+            'description': ('content', {clean_html}, {str}),
+            'timestamp': ('date', {lambda x: x.replace('.', '/')}, {unified_timestamp}),
+            'thumbnail': ('playlist_item', 'image', {urljoin('https://www.lrt.lt')}),
+            'formats': ('playlist_item', 'file', {lambda x: self._extract_m3u8_formats(x, video_id)}),
+        })
diff --git a/plugins/youtube_download/yt_dlp/extractor/lsm.py b/plugins/youtube_download/yt_dlp/extractor/lsm.py
new file mode 100644
index 0000000..56c06d7
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/lsm.py
@@ -0,0 +1,282 @@
+import re
+import urllib.parse
+
+from .common import InfoExtractor
+from ..utils import (
+    ExtractorError,
+    determine_ext,
+    int_or_none,
+    js_to_json,
+    parse_iso8601,
+    parse_qs,
+    str_or_none,
+    url_or_none,
+    urljoin,
+)
+from ..utils.traversal import traverse_obj
+
+
+class LSMLREmbedIE(InfoExtractor):
+    _VALID_URL = r'''(?x)
+        https?://(?:
+            (?:latvijasradio|lr1|lr2|klasika|lr4|naba|radioteatris)\.lsm|
+            pieci
+        )\.lv/[^/?#]+/(?:
+            pleijeris|embed
+        )/?\?(?:[^#]+&)?(?:show|id)=(?P<id>\d+)'''
+    _TESTS = [{
+        'url': 'https://latvijasradio.lsm.lv/lv/embed/?theme=black&size=16x9&showCaptions=0&id=183522',
+        'md5': '719b33875cd1429846eeeaeec6df2830',
+        'info_dict': {
+            'id': 'a342781',
+            'ext': 'mp3',
+            'duration': 1823,
+            'title': '#138 Nepilnīgā kompensējamo zāļu sistēma pat mēnešiem dzenā pacientus pa aptiekām',
+            'thumbnail': 'https://pic.latvijasradio.lv/public/assets/media/9/d/gallery_fd4675ac.jpg',
+        },
+    }, {
+        'url': 'https://radioteatris.lsm.lv/lv/embed/?id=&show=1270&theme=white&size=16x9',
+        'info_dict': {
+            'id': '1270',
+        },
+        'playlist_count': 3,
+        'playlist': [{
+            'md5': '2e61b6eceff00d14d57fdbbe6ab24cac',
+            'info_dict': {
+                'id': 'a297397',
+                'ext': 'mp3',
+                'title': 'Eriks Emanuels Šmits "Pilāta evaņģēlijs". 1. daļa',
+                'thumbnail': 'https://radioteatris.lsm.lv/public/assets/shows/62f131ae81e3c.jpg',
+                'duration': 3300,
+            },
+        }],
+    }, {
+        'url': 'https://radioteatris.lsm.lv/lv/embed/?id=&show=1269&theme=white&size=16x9',
+        'md5': '24810d4a961da2295d9860afdcaf4f5a',
+        'info_dict': {
+            'id': 'a230690',
+            'ext': 'mp3',
+            'title': 'Jens Ahlboms "Spārni". Radioizrāde ar Mārtiņa Freimaņa mūziku',
+            'thumbnail': 'https://radioteatris.lsm.lv/public/assets/shows/62f13023a457c.jpg',
+            'duration': 1788,
+        },
+    }, {
+        'url': 'https://lr1.lsm.lv/lv/embed/?id=166557&show=0&theme=white&size=16x9',
+        'info_dict': {
+            'id': '166557',
+        },
+        'playlist_count': 2,
+        'playlist': [{
+            'md5': '6a8b0927572f443f09c6e50a3ad65f2d',
+            'info_dict': {
+                'id': 'a303104',
+                'ext': 'mp3',
+                'thumbnail': 'https://pic.latvijasradio.lv/public/assets/media/c/5/gallery_a83ad2c2.jpg',
+                'title': 'Krustpunktā Lielā intervija: Valsts prezidents Egils Levits',
+                'duration': 3222,
+            },
+        }, {
+            'md5': '5d5e191e718b7644e5118b7b4e093a6d',
+            'info_dict': {
+                'id': 'v303104',
+                'ext': 'mp4',
+                'thumbnail': 'https://pic.latvijasradio.lv/public/assets/media/c/5/gallery_a83ad2c2.jpg',
+                'title': 'Krustpunktā Lielā intervija: Valsts prezidents Egils Levits - Video Version',
+                'duration': 3222,
+            },
+        }],
+    }, {
+        'url': 'https://lr1.lsm.lv/lv/embed/?id=183522&show=0&theme=white&size=16x9',
+        'only_matching': True,
+    }, {
+        'url': 'https://lr2.lsm.lv/lv/embed/?id=182126&show=0&theme=white&size=16x9',
+        'only_matching': True,
+    }, {
+        'url': 'https://klasika.lsm.lv/lv/embed/?id=110806&show=0&theme=white&size=16x9',
+        'only_matching': True,
+    }, {
+        'url': 'https://lr4.lsm.lv/lv/embed/?id=184282&show=0&theme=white&size=16x9',
+        'only_matching': True,
+    }, {
+        'url': 'https://pieci.lv/lv/embed/?id=168896&show=0&theme=white&size=16x9',
+        'only_matching': True,
+    }, {
+        'url': 'https://naba.lsm.lv/lv/embed/?id=182901&show=0&theme=white&size=16x9',
+        'only_matching': True,
+    }, {
+        'url': 'https://radioteatris.lsm.lv/lv/embed/?id=176439&show=0&theme=white&size=16x9',
+        'only_matching': True,
+    }, {
+        'url': 'https://lr1.lsm.lv/lv/pleijeris/?embed=0&id=48205&time=00%3A00&idx=0',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        query = parse_qs(url)
+        video_id = traverse_obj(query, (
+            ('show', 'id'), 0, {int_or_none}, filter, {str_or_none}), get_all=False)
+        webpage = self._download_webpage(url, video_id)
+
+        player_data, media_data = self._search_regex(
+            r'LR\.audio\.Player\s*\([^{]*(?P<player>\{.*?\}),(?P<media>\{.*\})\);',
+            webpage, 'player json', group=('player', 'media'))
+
+        player_json = self._parse_json(
+            player_data, video_id, transform_source=js_to_json, fatal=False) or {}
+        media_json = self._parse_json(media_data, video_id, transform_source=js_to_json)
+
+        entries = []
+        for item in traverse_obj(media_json, (('audio', 'video'), lambda _, v: v['id'])):
+            formats = []
+            for source_url in traverse_obj(item, ('sources', ..., 'file', {url_or_none})):
+                if determine_ext(source_url) == 'm3u8':
+                    formats.extend(self._extract_m3u8_formats(source_url, video_id, fatal=False))
+                else:
+                    formats.append({'url': source_url})
+
+            id_ = item['id']
+            title = item.get('title')
+            if id_.startswith('v') and not title:
+                title = traverse_obj(
+                    media_json, ('audio', lambda _, v: v['id'][1:] == id_[1:], 'title',
+                                 {lambda x: x and f'{x} - Video Version'}), get_all=False)
+
+            entries.append({
+                'formats': formats,
+                'thumbnail': urljoin(url, player_json.get('poster')),
+                'id': id_,
+                'title': title,
+                'duration': traverse_obj(item, ('duration', {int_or_none})),
+            })
+
+        if len(entries) == 1:
+            return entries[0]
+
+        return self.playlist_result(entries, video_id)
+
+
+class LSMLTVEmbedIE(InfoExtractor):
+    _VALID_URL = r'https?://ltv\.lsm\.lv/embed\?(?:[^#]+&)?c=(?P<id>[^#&]+)'
+    _TESTS = [{
+        'url': 'https://ltv.lsm.lv/embed?c=eyJpdiI6IjQzbHVUeHAyaDJiamFjcjdSUUFKdnc9PSIsInZhbHVlIjoiMHl3SnJNRmd2TmFIdnZwOGtGUUpzODFzUEZ4SVVsN2xoRjliSW9vckUyMWZIWG8vbWVzaFFkY0lhNmRjbjRpaCIsIm1hYyI6ImMzNjdhMzFhNTFhZmY1ZmE0NWI5YmFjZGI1YmJiNGEyNjgzNDM4MjUzMWEwM2FmMDMyZDMwYWM1MDFjZmM5MGIiLCJ0YWciOiIifQ==',
+        'md5': '64f72a360ca530d5ed89c77646c9eee5',
+        'info_dict': {
+            'id': '46k_d23-6000-105',
+            'ext': 'mp4',
+            'timestamp': 1700589151,
+            'duration': 1442,
+            'upload_date': '20231121',
+            'title': 'D23-6000-105_cetstud',
+            'thumbnail': 'https://store.cloudycdn.services/tmsp00060/assets/media/660858/placeholder1700589200.jpg',
+        },
+    }, {
+        'url': 'https://ltv.lsm.lv/embed?enablesdkjs=1&c=eyJpdiI6IncwVzZmUFk2MU12enVWK1I3SUcwQ1E9PSIsInZhbHVlIjoid3FhV29vamc3T2sxL1RaRmJ5Rm1GTXozU0o2dVczdUtLK0cwZEZJMDQ2a3ZIRG5DK2pneGlnbktBQy9uazVleHN6VXhxdWIweWNvcHRDSnlISlNYOHlVZ1lpcTUrcWZSTUZPQW14TVdkMW9aOUtRWVNDcFF4eWpHNGcrT0VZbUNFQStKQk91cGpndW9FVjJIa0lpbkh3PT0iLCJtYWMiOiIyZGI1NDJlMWRlM2QyMGNhOGEwYTM2MmNlN2JlOGRhY2QyYjdkMmEzN2RlOTEzYTVkNzI1ODlhZDlhZjU4MjQ2IiwidGFnIjoiIn0=',
+        'md5': 'a1711e190fe680fdb68fd8413b378e87',
+        'info_dict': {
+            'id': 'wUnFArIPDSY',
+            'ext': 'mp4',
+            'uploader': 'LTV_16plus',
+            'release_date': '20220514',
+            'channel_url': 'https://www.youtube.com/channel/UCNMrnafwXD2XKeeQOyfkFCw',
+            'view_count': int,
+            'availability': 'public',
+            'thumbnail': 'https://i.ytimg.com/vi/wUnFArIPDSY/maxresdefault.jpg',
+            'release_timestamp': 1652544074,
+            'title': 'EIROVĪZIJA SALĀTOS',
+            'live_status': 'was_live',
+            'uploader_id': '@LTV16plus',
+            'comment_count': int,
+            'channel_id': 'UCNMrnafwXD2XKeeQOyfkFCw',
+            'channel_follower_count': int,
+            'categories': ['Entertainment'],
+            'duration': 5269,
+            'upload_date': '20220514',
+            'age_limit': 0,
+            'channel': 'LTV_16plus',
+            'playable_in_embed': True,
+            'tags': [],
+            'uploader_url': 'https://www.youtube.com/@LTV16plus',
+            'like_count': int,
+            'description': 'md5:7ff0c42ba971e3c13e4b8a2ff03b70b5',
+        },
+    }]
+
+    def _real_extract(self, url):
+        video_id = urllib.parse.unquote(self._match_id(url))
+        webpage = self._download_webpage(url, video_id)
+        data = self._search_json(
+            r'window\.ltvEmbedPayload\s*=', webpage, 'embed json', video_id)
+        embed_type = traverse_obj(data, ('source', 'name', {str}))
+
+        if embed_type == 'telia':
+            ie_key = 'CloudyCDN'
+            embed_url = traverse_obj(data, ('source', 'embed_url', {url_or_none}))
+        elif embed_type == 'youtube':
+            ie_key = 'Youtube'
+            embed_url = traverse_obj(data, ('source', 'id', {str}))
+        else:
+            raise ExtractorError(f'Unsupported embed type {embed_type!r}')
+
+        return self.url_result(
+            embed_url, ie_key, video_id, **traverse_obj(data, {
+                'title': ('parentInfo', 'title'),
+                'duration': ('parentInfo', 'duration', {int_or_none}),
+                'thumbnail': ('source', 'poster', {url_or_none}),
+            }))
+
+
+class LSMReplayIE(InfoExtractor):
+    _VALID_URL = r'https?://replay\.lsm\.lv/[^/?#]+/(?:ieraksts|statja)/[^/?#]+/(?P<id>\d+)'
+    _TESTS = [{
+        'url': 'https://replay.lsm.lv/lv/ieraksts/ltv/311130/4-studija-zolitudes-tragedija-un-incupes-stacija',
+        'md5': '64f72a360ca530d5ed89c77646c9eee5',
+        'info_dict': {
+            'id': '46k_d23-6000-105',
+            'ext': 'mp4',
+            'timestamp': 1700586300,
+            'description': 'md5:0f1b14798cc39e1ae578bd0eb268f759',
+            'duration': 1442,
+            'upload_date': '20231121',
+            'title': '4. studija. Zolitūdes traģēdija un Inčupes stacija',
+            'thumbnail': 'https://ltv.lsm.lv/storage/media/8/7/large/5/1f9604e1.jpg',
+        },
+    }, {
+        'url': 'https://replay.lsm.lv/lv/ieraksts/lr/183522/138-nepilniga-kompensejamo-zalu-sistema-pat-menesiem-dzena-pacientus-pa-aptiekam',
+        'md5': '719b33875cd1429846eeeaeec6df2830',
+        'info_dict': {
+            'id': 'a342781',
+            'ext': 'mp3',
+            'duration': 1823,
+            'title': '#138 Nepilnīgā kompensējamo zāļu sistēma pat mēnešiem dzenā pacientus pa aptiekām',
+            'thumbnail': 'https://pic.latvijasradio.lv/public/assets/media/9/d/large_fd4675ac.jpg',
+            'upload_date': '20231102',
+            'timestamp': 1698921060,
+            'description': 'md5:7bac3b2dd41e44325032943251c357b1',
+        },
+    }, {
+        'url': 'https://replay.lsm.lv/ru/statja/ltv/311130/4-studija-zolitudes-tragedija-un-incupes-stacija',
+        'only_matching': True,
+    }]
+
+    def _fix_nuxt_data(self, webpage):
+        return re.sub(r'Object\.create\(null(?:,(\{.+\}))?\)', lambda m: m.group(1) or 'null', webpage)
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+
+        data = self._search_nuxt_data(
+            self._fix_nuxt_data(webpage), video_id, context_name='__REPLAY__')
+
+        return {
+            '_type': 'url_transparent',
+            'id': video_id,
+            **traverse_obj(data, {
+                'url': ('playback', 'service', 'url', {url_or_none}),
+                'title': ('mediaItem', 'title'),
+                'description': ('mediaItem', ('lead', 'body')),
+                'duration': ('mediaItem', 'duration', {int_or_none}),
+                'timestamp': ('mediaItem', 'aired_at', {parse_iso8601}),
+                'thumbnail': ('mediaItem', 'largeThumbnail', {url_or_none}),
+            }, get_all=False),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/lumni.py b/plugins/youtube_download/yt_dlp/extractor/lumni.py
index 5810da0..8c26f5b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/lumni.py
+++ b/plugins/youtube_download/yt_dlp/extractor/lumni.py
@@ -1,8 +1,7 @@
-from .common import InfoExtractor
-from .francetv import FranceTVIE
+from .francetv import FranceTVBaseInfoExtractor
 
 
-class LumniIE(InfoExtractor):
+class LumniIE(FranceTVBaseInfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?lumni\.fr/video/(?P<id>[\w-]+)'
     _TESTS = [{
         'url': 'https://www.lumni.fr/video/l-homme-et-son-environnement-dans-la-revolution-industrielle',
@@ -13,7 +12,7 @@ class LumniIE(InfoExtractor):
             'title': "L'homme et son environnement dans la révolution industrielle - L'ère de l'homme",
             'thumbnail': 'https://assets.webservices.francetelevisions.fr/v1/assets/images/a7/17/9f/a7179f5f-63a5-4e11-8d4d-012ab942d905.jpg',
             'duration': 230,
-        }
+        },
     }]
 
     def _real_extract(self, url):
@@ -21,4 +20,4 @@ class LumniIE(InfoExtractor):
         webpage = self._download_webpage(url, display_id)
         video_id = self._html_search_regex(
             r'<div[^>]+data-factoryid\s*=\s*["\']([^"\']+)', webpage, 'video id')
-        return self.url_result(f'francetv:{video_id}', FranceTVIE, video_id)
+        return self._make_url_result(video_id, url=url)
diff --git a/plugins/youtube_download/yt_dlp/extractor/lynda.py b/plugins/youtube_download/yt_dlp/extractor/lynda.py
index 768ce91..bfd4619 100644
--- a/plugins/youtube_download/yt_dlp/extractor/lynda.py
+++ b/plugins/youtube_download/yt_dlp/extractor/lynda.py
@@ -1,10 +1,7 @@
 import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_str,
-    compat_urlparse,
-)
 from ..utils import (
     ExtractorError,
     int_or_none,
@@ -21,11 +18,11 @@ class LyndaBaseIE(InfoExtractor):
 
     @staticmethod
     def _check_error(json_string, key_or_keys):
-        keys = [key_or_keys] if isinstance(key_or_keys, compat_str) else key_or_keys
+        keys = [key_or_keys] if isinstance(key_or_keys, str) else key_or_keys
         for key in keys:
             error = json_string.get(key)
             if error:
-                raise ExtractorError('Unable to login: %s' % error, expected=True)
+                raise ExtractorError(f'Unable to login: {error}', expected=True)
 
     def _perform_login_step(self, form_html, fallback_action_url, extra_form_data, note, referrer_url):
         action_url = self._search_regex(
@@ -33,7 +30,7 @@ class LyndaBaseIE(InfoExtractor):
             'post url', default=fallback_action_url, group='url')
 
         if not action_url.startswith('http'):
-            action_url = compat_urlparse.urljoin(self._SIGNIN_URL, action_url)
+            action_url = urllib.parse.urljoin(self._SIGNIN_URL, action_url)
 
         form_data = self._hidden_inputs(form_html)
         form_data.update(extra_form_data)
@@ -44,7 +41,7 @@ class LyndaBaseIE(InfoExtractor):
             headers={
                 'Referer': referrer_url,
                 'X-Requested-With': 'XMLHttpRequest',
-            }, expected_status=(418, 500, ))
+            }, expected_status=(418, 500))
 
         self._check_error(response, ('email', 'password', 'ErrorMessage'))
 
@@ -97,8 +94,8 @@ class LyndaIE(LyndaBaseIE):
             'id': '114408',
             'ext': 'mp4',
             'title': 'Using the exercise files',
-            'duration': 68
-        }
+            'duration': 68,
+        },
     }, {
         'url': 'https://www.lynda.com/player/embed/133770?tr=foo=1;bar=g;fizz=rt&fs=0',
         'only_matching': True,
@@ -116,7 +113,7 @@ class LyndaIE(LyndaBaseIE):
 
     def _raise_unavailable(self, video_id):
         self.raise_login_required(
-            'Video %s is only available for members' % video_id)
+            f'Video {video_id} is only available for members')
 
     def _real_extract(self, url):
         mobj = self._match_valid_url(url)
@@ -137,8 +134,7 @@ class LyndaIE(LyndaBaseIE):
             query['courseId'] = course_id
 
             play = self._download_json(
-                'https://www.lynda.com/ajax/course/%s/%s/play'
-                % (course_id, video_id), video_id, 'Downloading play JSON')
+                f'https://www.lynda.com/ajax/course/{course_id}/{video_id}/play', video_id, 'Downloading play JSON')
 
             if not play:
                 self._raise_unavailable(video_id)
@@ -154,7 +150,7 @@ class LyndaIE(LyndaBaseIE):
                         continue
                     formats.append({
                         'url': format_url,
-                        'format_id': '%s-%s' % (cdn, format_id) if cdn else format_id,
+                        'format_id': f'{cdn}-{format_id}' if cdn else format_id,
                         'height': int_or_none(format_id),
                     })
 
@@ -174,12 +170,12 @@ class LyndaIE(LyndaBaseIE):
 
         if 'Status' in video:
             raise ExtractorError(
-                'lynda returned error: %s' % video['Message'], expected=True)
+                'lynda returned error: {}'.format(video['Message']), expected=True)
 
         if video.get('HasAccess') is False:
             self._raise_unavailable(video_id)
 
-        video_id = compat_str(video.get('ID') or video_id)
+        video_id = str(video.get('ID') or video_id)
         duration = int_or_none(video.get('DurationInSeconds'))
         title = video['Title']
 
@@ -193,7 +189,7 @@ class LyndaIE(LyndaBaseIE):
                 'width': int_or_none(f.get('Width')),
                 'height': int_or_none(f.get('Height')),
                 'filesize': int_or_none(f.get('FileSize')),
-                'format_id': compat_str(f.get('Resolution')) if f.get('Resolution') else None,
+                'format_id': str(f.get('Resolution')) if f.get('Resolution') else None,
             } for f in fmts if f.get('Url')])
 
         prioritized_streams = video.get('PrioritizedStreams')
@@ -202,7 +198,7 @@ class LyndaIE(LyndaBaseIE):
                 formats.extend([{
                     'url': video_url,
                     'height': int_or_none(format_id),
-                    'format_id': '%s-%s' % (prioritized_stream_id, format_id),
+                    'format_id': f'{prioritized_stream_id}-{format_id}',
                 } for format_id, video_url in prioritized_stream.items()])
 
         self._check_formats(formats, video_id)
@@ -214,18 +210,16 @@ class LyndaIE(LyndaBaseIE):
             'title': title,
             'duration': duration,
             'subtitles': subtitles,
-            'formats': formats
+            'formats': formats,
         }
 
     def _fix_subtitles(self, subs):
         srt = ''
         seq_counter = 0
-        for pos in range(0, len(subs) - 1):
-            seq_current = subs[pos]
+        for seq_current, seq_next in zip(subs, subs[1:]):
             m_current = re.match(self._TIMECODE_REGEX, seq_current['Timecode'])
             if m_current is None:
                 continue
-            seq_next = subs[pos + 1]
             m_next = re.match(self._TIMECODE_REGEX, seq_next['Timecode'])
             if m_next is None:
                 continue
@@ -234,12 +228,12 @@ class LyndaIE(LyndaBaseIE):
             text = seq_current['Caption'].strip()
             if text:
                 seq_counter += 1
-                srt += '%s\r\n%s --> %s\r\n%s\r\n\r\n' % (seq_counter, appear_time, disappear_time, text)
+                srt += f'{seq_counter}\r\n{appear_time} --> {disappear_time}\r\n{text}\r\n\r\n'
         if srt:
             return srt
 
     def _get_subtitles(self, video_id):
-        url = 'https://www.lynda.com/ajax/player?videoId=%s&type=transcript' % video_id
+        url = f'https://www.lynda.com/ajax/player?videoId={video_id}&type=transcript'
         subs = self._download_webpage(
             url, video_id, 'Downloading subtitles JSON', fatal=False)
         if not subs or 'Status="NotFound"' in subs:
@@ -274,10 +268,10 @@ class LyndaCourseIE(LyndaBaseIE):
         course_path = mobj.group('coursepath')
         course_id = mobj.group('courseid')
 
-        item_template = 'https://www.lynda.com/%s/%%s-4.html' % course_path
+        item_template = f'https://www.lynda.com/{course_path}/%s-4.html'
 
         course = self._download_json(
-            'https://www.lynda.com/ajax/player?courseId=%s&type=course' % course_id,
+            f'https://www.lynda.com/ajax/player?courseId={course_id}&type=course',
             course_id, 'Downloading course JSON', fatal=False)
 
         if not course:
@@ -295,7 +289,7 @@ class LyndaCourseIE(LyndaBaseIE):
 
         if course.get('Status') == 'NotFound':
             raise ExtractorError(
-                'Course %s does not exist' % course_id, expected=True)
+                f'Course {course_id} does not exist', expected=True)
 
         unaccessible_videos = 0
         entries = []
@@ -316,13 +310,13 @@ class LyndaCourseIE(LyndaBaseIE):
                         'ie_key': LyndaIE.ie_key(),
                         'chapter': chapter.get('Title'),
                         'chapter_number': int_or_none(chapter.get('ChapterIndex')),
-                        'chapter_id': compat_str(chapter.get('ID')),
+                        'chapter_id': str(chapter.get('ID')),
                     })
 
         if unaccessible_videos > 0:
             self.report_warning(
-                '%s videos are only available for members (or paid members) and will not be downloaded. '
-                % unaccessible_videos + self._ACCOUNT_CREDENTIALS_HINT)
+                f'{unaccessible_videos} videos are only available for members (or paid members) '
+                f'and will not be downloaded. {self._ACCOUNT_CREDENTIALS_HINT}')
 
         course_title = course.get('Title')
         course_description = course.get('Description')
diff --git a/plugins/youtube_download/yt_dlp/extractor/m6.py b/plugins/youtube_download/yt_dlp/extractor/m6.py
deleted file mode 100644
index 9dcc601..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/m6.py
+++ /dev/null
@@ -1,22 +0,0 @@
-from .common import InfoExtractor
-
-
-class M6IE(InfoExtractor):
-    IE_NAME = 'm6'
-    _VALID_URL = r'https?://(?:www\.)?m6\.fr/[^/]+/videos/(?P<id>\d+)-[^\.]+\.html'
-
-    _TEST = {
-        'url': 'http://www.m6.fr/emission-les_reines_du_shopping/videos/11323908-emeline_est_la_reine_du_shopping_sur_le_theme_ma_fete_d_8217_anniversaire.html',
-        'md5': '242994a87de2c316891428e0176bcb77',
-        'info_dict': {
-            'id': '11323908',
-            'ext': 'mp4',
-            'title': 'Emeline est la Reine du Shopping sur le thème « Ma fête d’anniversaire ! »',
-            'description': 'md5:1212ae8fb4b7baa4dc3886c5676007c2',
-            'duration': 100,
-        }
-    }
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        return self.url_result('6play:%s' % video_id, 'SixPlay', video_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/maariv.py b/plugins/youtube_download/yt_dlp/extractor/maariv.py
new file mode 100644
index 0000000..425a8b3
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/maariv.py
@@ -0,0 +1,62 @@
+from .common import InfoExtractor
+from ..utils import (
+    int_or_none,
+    parse_resolution,
+    unified_timestamp,
+    url_or_none,
+)
+from ..utils.traversal import traverse_obj
+
+
+class MaarivIE(InfoExtractor):
+    IE_NAME = 'maariv.co.il'
+    _VALID_URL = r'https?://player\.maariv\.co\.il/public/player\.html\?(?:[^#]+&)?media=(?P<id>\d+)'
+    _EMBED_REGEX = [rf'<iframe[^>]+\bsrc=[\'"](?P<url>{_VALID_URL})']
+    _TESTS = [{
+        'url': 'https://player.maariv.co.il/public/player.html?player=maariv-desktop&media=3611585',
+        'info_dict': {
+            'id': '3611585',
+            'duration': 75,
+            'ext': 'mp4',
+            'upload_date': '20231009',
+            'title': 'מבצע חרבות ברזל',
+            'timestamp': 1696851301,
+        },
+    }]
+    _WEBPAGE_TESTS = [{
+        'url': 'https://www.maariv.co.il/news/law/Article-1044008',
+        'info_dict': {
+            'id': '3611585',
+            'duration': 75,
+            'ext': 'mp4',
+            'upload_date': '20231009',
+            'title': 'מבצע חרבות ברזל',
+            'timestamp': 1696851301,
+        },
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        data = self._download_json(
+            f'https://dal.walla.co.il/media/{video_id}?origin=player.maariv.co.il', video_id)['data']
+
+        formats = []
+        if hls_url := traverse_obj(data, ('video', 'url', {url_or_none})):
+            formats.extend(self._extract_m3u8_formats(hls_url, video_id, m3u8_id='hls', fatal=False))
+
+        for http_format in traverse_obj(data, ('video', 'stream_urls', ..., 'stream_url', {url_or_none})):
+            formats.append({
+                'url': http_format,
+                'format_id': 'http',
+                **parse_resolution(http_format),
+            })
+
+        return {
+            'id': video_id,
+            **traverse_obj(data, {
+                'title': 'title',
+                'duration': ('video', 'duration', {int_or_none}),
+                'timestamp': ('upload_date', {unified_timestamp}),
+            }),
+            'formats': formats,
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/magellantv.py b/plugins/youtube_download/yt_dlp/extractor/magellantv.py
index 0947a45..e7ae709 100644
--- a/plugins/youtube_download/yt_dlp/extractor/magellantv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/magellantv.py
@@ -1,31 +1,42 @@
 from .common import InfoExtractor
-from ..utils import parse_age_limit, parse_duration, traverse_obj
+from ..utils import parse_age_limit, parse_duration, url_or_none
+from ..utils.traversal import traverse_obj
 
 
 class MagellanTVIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?magellantv\.com/(?:watch|video)/(?P<id>[\w-]+)'
     _TESTS = [{
-        'url': 'https://www.magellantv.com/watch/my-dads-on-death-row?type=v',
+        'url': 'https://www.magellantv.com/watch/incas-the-new-story?type=v',
         'info_dict': {
-            'id': 'my-dads-on-death-row',
+            'id': 'incas-the-new-story',
             'ext': 'mp4',
-            'title': 'My Dad\'s On Death Row',
-            'description': 'md5:33ba23b9f0651fc4537ed19b1d5b0d7a',
-            'duration': 3780.0,
+            'title': 'Incas: The New Story',
+            'description': 'md5:936c7f6d711c02dfb9db22a067b586fe',
             'age_limit': 14,
-            'tags': ['Justice', 'Reality', 'United States', 'True Crime'],
+            'duration': 3060.0,
+            'tags': ['Ancient History', 'Archaeology', 'Anthropology'],
         },
         'params': {'skip_download': 'm3u8'},
     }, {
-        'url': 'https://www.magellantv.com/video/james-bulger-the-new-revelations',
+        'url': 'https://www.magellantv.com/video/tortured-to-death-murdering-the-nanny',
         'info_dict': {
-            'id': 'james-bulger-the-new-revelations',
+            'id': 'tortured-to-death-murdering-the-nanny',
             'ext': 'mp4',
-            'title': 'James Bulger: The New Revelations',
-            'description': 'md5:7b97922038bad1d0fe8d0470d8a189f2',
+            'title': 'Tortured to Death: Murdering the Nanny',
+            'description': 'md5:d87033594fa218af2b1a8b49f52511e5',
+            'age_limit': 14,
             'duration': 2640.0,
-            'age_limit': 0,
-            'tags': ['Investigation', 'True Crime', 'Justice', 'Europe'],
+            'tags': ['True Crime', 'Murder'],
+        },
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        'url': 'https://www.magellantv.com/watch/celebration-nation?type=s',
+        'info_dict': {
+            'id': 'celebration-nation',
+            'ext': 'mp4',
+            'tags': ['Art & Culture', 'Human Interest', 'Anthropology', 'China', 'History'],
+            'duration': 2640.0,
+            'title': 'Ancestors',
         },
         'params': {'skip_download': 'm3u8'},
     }]
@@ -33,8 +44,19 @@ class MagellanTVIE(InfoExtractor):
     def _real_extract(self, url):
         video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
-        data = self._search_nextjs_data(webpage, video_id)['props']['pageProps']['reactContext']['video']['detail']
-        formats, subtitles = self._extract_m3u8_formats_and_subtitles(data['jwpVideoUrl'], video_id)
+        context = self._search_nextjs_data(webpage, video_id)['props']['pageProps']['reactContext']
+        data = traverse_obj(context, ((('video', 'detail'), ('series', 'currentEpisode')), {dict}, any))
+
+        formats, subtitles = [], {}
+        for m3u8_url in set(traverse_obj(data, ((('manifests', ..., 'hls'), 'jwp_video_url'), {url_or_none}))):
+            fmts, subs = self._extract_m3u8_formats_and_subtitles(
+                m3u8_url, video_id, 'mp4', m3u8_id='hls', fatal=False)
+            formats.extend(fmts)
+            self._merge_subtitles(subs, target=subtitles)
+        if not formats and (error := traverse_obj(context, ('errorDetailPage', 'errorMessage', {str}))):
+            if 'available in your country' in error:
+                self.raise_geo_restricted(msg=error)
+            self.raise_no_formats(f'{self.IE_NAME} said: {error}', expected=True)
 
         return {
             'id': video_id,
diff --git a/plugins/youtube_download/yt_dlp/extractor/magentamusik.py b/plugins/youtube_download/yt_dlp/extractor/magentamusik.py
new file mode 100644
index 0000000..24c46a1
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/magentamusik.py
@@ -0,0 +1,62 @@
+from .common import InfoExtractor
+from ..utils import ExtractorError, int_or_none, join_nonempty, url_or_none
+from ..utils.traversal import traverse_obj
+
+
+class MagentaMusikIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?magentamusik\.de/(?P<id>[^/?#]+)'
+
+    _TESTS = [{
+        'url': 'https://www.magentamusik.de/marty-friedman-woa-2023-9208205928595409235',
+        'md5': 'd82dd4748f55fc91957094546aaf8584',
+        'info_dict': {
+            'id': '9208205928595409235',
+            'display_id': 'marty-friedman-woa-2023-9208205928595409235',
+            'ext': 'mp4',
+            'title': 'Marty Friedman: W:O:A 2023',
+            'alt_title': 'Konzert vom: 05.08.2023 13:00',
+            'duration': 2760,
+            'categories': ['Musikkonzert'],
+            'release_year': 2023,
+            'location': 'Deutschland',
+        },
+    }]
+
+    def _real_extract(self, url):
+        display_id = self._match_id(url)
+        webpage = self._download_webpage(url, display_id)
+        player_config = self._search_json(
+            r'data-js-element="o-video-player__config">', webpage, 'player config', display_id, fatal=False)
+        if not player_config:
+            raise ExtractorError('No video found', expected=True)
+
+        asset_id = player_config['assetId']
+        asset_details = self._download_json(
+            f'https://wcps.t-online.de/cvss/magentamusic/vodclient/v2/assetdetails/58938/{asset_id}',
+            display_id, note='Downloading asset details')
+
+        video_id = traverse_obj(
+            asset_details, ('content', 'partnerInformation', ..., 'reference', {str}), get_all=False)
+        if not video_id:
+            raise ExtractorError('Unable to extract video id')
+
+        vod_data = self._download_json(
+            f'https://wcps.t-online.de/cvss/magentamusic/vodclient/v2/player/58935/{video_id}/Main%20Movie', video_id)
+        smil_url = traverse_obj(
+            vod_data, ('content', 'feature', 'representations', ...,
+                       'contentPackages', ..., 'media', 'href', {url_or_none}), get_all=False)
+
+        return {
+            'id': video_id,
+            'display_id': display_id,
+            'formats': self._extract_smil_formats(smil_url, video_id),
+            **traverse_obj(vod_data, ('content', 'feature', 'metadata', {
+                'title': 'title',
+                'alt_title': 'originalTitle',
+                'description': 'longDescription',
+                'duration': ('runtimeInSeconds', {int_or_none}),
+                'location': ('countriesOfProduction', {list}, {lambda x: join_nonempty(*x, delim=', ')}),
+                'release_year': ('yearOfProduction', {int_or_none}),
+                'categories': ('mainGenre', {str}, all, filter),
+            })),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/magentamusik360.py b/plugins/youtube_download/yt_dlp/extractor/magentamusik360.py
deleted file mode 100644
index 5d0cb3b..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/magentamusik360.py
+++ /dev/null
@@ -1,58 +0,0 @@
-from .common import InfoExtractor
-
-
-class MagentaMusik360IE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?magenta-musik-360\.de/([a-z0-9-]+-(?P<id>[0-9]+)|festivals/.+)'
-    _TESTS = [{
-        'url': 'https://www.magenta-musik-360.de/within-temptation-wacken-2019-1-9208205928595185932',
-        'md5': '65b6f060b40d90276ec6fb9b992c1216',
-        'info_dict': {
-            'id': '9208205928595185932',
-            'ext': 'm3u8',
-            'title': 'WITHIN TEMPTATION',
-            'description': 'Robert Westerholt und Sharon Janny den Adel gründeten die Symphonic Metal-Band. Privat sind die Niederländer ein Paar und haben zwei Kinder. Die Single Ice Queen brachte ihnen Platin und Gold und verhalf 2002 zum internationalen Durchbruch. Charakteristisch für die Band war Anfangs der hohe Gesang von Frontfrau Sharon. Stilistisch fing die Band im Gothic Metal an. Mit neuem Sound, schnellen Gitarrenriffs und Gitarrensoli, avancierte Within Temptation zur erfolgreichen Rockband. Auch dieses Jahr wird die Band ihre Fangemeinde wieder mitreißen.',
-        }
-    }, {
-        'url': 'https://www.magenta-musik-360.de/festivals/wacken-world-wide-2020-body-count-feat-ice-t',
-        'md5': '81010d27d7cab3f7da0b0f681b983b7e',
-        'info_dict': {
-            'id': '9208205928595231363',
-            'ext': 'm3u8',
-            'title': 'Body Count feat. Ice-T',
-            'description': 'Body Count feat. Ice-T konnten bereits im vergangenen Jahr auf dem „Holy Ground“ in Wacken überzeugen. 2020 gehen die Crossover-Metaller aus einem Club in Los Angeles auf Sendung und bringen mit ihrer Mischung aus Metal und Hip-Hop Abwechslung und ordentlich Alarm zum WWW. Bereits seit 1990 stehen die beiden Gründer Ice-T (Gesang) und Ernie C (Gitarre) auf der Bühne. Sieben Studioalben hat die Gruppe bis jetzt veröffentlicht, darunter das Debüt „Body Count“ (1992) mit dem kontroversen Track „Cop Killer“.',
-        }
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        # _match_id casts to string, but since "None" is not a valid video_id for magenta
-        # there is no risk for confusion
-        if video_id == "None":
-            webpage = self._download_webpage(url, video_id)
-            video_id = self._html_search_regex(r'data-asset-id="([^"]+)"', webpage, 'video_id')
-        json = self._download_json("https://wcps.t-online.de/cvss/magentamusic/vodplayer/v3/player/58935/%s/Main%%20Movie" % video_id, video_id)
-        xml_url = json['content']['feature']['representations'][0]['contentPackages'][0]['media']['href']
-        metadata = json['content']['feature'].get('metadata')
-        title = None
-        description = None
-        duration = None
-        thumbnails = []
-        if metadata:
-            title = metadata.get('title')
-            description = metadata.get('fullDescription')
-            duration = metadata.get('runtimeInSeconds')
-            for img_key in ('teaserImageWide', 'smallCoverImage'):
-                if img_key in metadata:
-                    thumbnails.append({'url': metadata[img_key].get('href')})
-
-        xml = self._download_xml(xml_url, video_id)
-        final_url = xml[0][0][0].attrib['src']
-
-        return {
-            'id': video_id,
-            'title': title,
-            'description': description,
-            'url': final_url,
-            'duration': duration,
-            'thumbnails': thumbnails
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/mailru.py b/plugins/youtube_download/yt_dlp/extractor/mailru.py
index 0f0550c..0496a87 100644
--- a/plugins/youtube_download/yt_dlp/extractor/mailru.py
+++ b/plugins/youtube_download/yt_dlp/extractor/mailru.py
@@ -4,7 +4,6 @@ import re
 import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import compat_urllib_parse_unquote
 from ..utils import (
     int_or_none,
     parse_duration,
@@ -100,7 +99,7 @@ class MailRuIE(InfoExtractor):
         {
             'url': 'https://videoapi.my.mail.ru/videos/embed/mail/cloud-strife/Games/2009.html',
             'only_matching': True,
-        }
+        },
     ]
 
     def _real_extract(self, url):
@@ -109,7 +108,7 @@ class MailRuIE(InfoExtractor):
 
         video_id = None
         if meta_id:
-            meta_url = 'https://my.mail.ru/+/video/meta/%s' % meta_id
+            meta_url = f'https://my.mail.ru/+/video/meta/{meta_id}'
         else:
             video_id = mobj.group('idv1')
             if not video_id:
@@ -127,7 +126,7 @@ class MailRuIE(InfoExtractor):
         video_data = None
 
         # fix meta_url if missing the host address
-        if re.match(r'^\/\+\/', meta_url):
+        if re.match(r'\/\+\/', meta_url):
             meta_url = urljoin('https://my.mail.ru', meta_url)
 
         if meta_url:
@@ -138,7 +137,7 @@ class MailRuIE(InfoExtractor):
         # Fallback old approach
         if not video_data:
             video_data = self._download_json(
-                'http://api.video.mail.ru/videos/%s.json?new=1' % video_id,
+                f'http://api.video.mail.ru/videos/{video_id}.json?new=1',
                 video_id, 'Downloading video JSON')
 
         video_key = self._get_cookies('https://my.mail.ru').get('video_key')
@@ -169,7 +168,7 @@ class MailRuIE(InfoExtractor):
 
         acc_id = meta_data.get('accId')
         item_id = meta_data.get('itemId')
-        content_id = '%s_%s' % (acc_id, item_id) if acc_id and item_id else video_id
+        content_id = f'{acc_id}_{item_id}' if acc_id and item_id else video_id
 
         thumbnail = meta_data.get('poster')
         duration = int_or_none(meta_data.get('duration'))
@@ -192,7 +191,7 @@ class MailRuMusicSearchBaseIE(InfoExtractor):
     def _search(self, query, url, audio_id, limit=100, offset=0):
         search = self._download_json(
             'https://my.mail.ru/cgi-bin/my/ajax', audio_id,
-            'Downloading songs JSON page %d' % (offset // limit + 1),
+            f'Downloading songs JSON page {offset // limit + 1}',
             headers={
                 'Referer': url,
                 'X-Requested-With': 'XMLHttpRequest',
@@ -236,7 +235,7 @@ class MailRuMusicSearchBaseIE(InfoExtractor):
         artist = t.get('Author') or t.get('Author_Text_HTML')
 
         if track:
-            title = '%s - %s' % (artist, track) if artist else track
+            title = f'{artist} - {track}' if artist else track
         else:
             title = audio_id
 
@@ -307,7 +306,7 @@ class MailRuMusicSearchIE(MailRuMusicSearchBaseIE):
     }]
 
     def _real_extract(self, url):
-        query = compat_urllib_parse_unquote(self._match_id(url))
+        query = urllib.parse.unquote(self._match_id(url))
 
         entries = []
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/mainstreaming.py b/plugins/youtube_download/yt_dlp/extractor/mainstreaming.py
index fe5589d..fb93505 100644
--- a/plugins/youtube_download/yt_dlp/extractor/mainstreaming.py
+++ b/plugins/youtube_download/yt_dlp/extractor/mainstreaming.py
@@ -1,19 +1,18 @@
 import re
 
 from .common import InfoExtractor
-
 from ..utils import (
     int_or_none,
     js_to_json,
     parse_duration,
     traverse_obj,
     try_get,
-    urljoin
+    urljoin,
 )
 
 
 class MainStreamingIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:webtools-?)?(?P<host>[A-Za-z0-9-]*\.msvdn.net)/(?:embed|amp_embed|content)/(?P<id>\w+)'
+    _VALID_URL = r'https?://(?:webtools-?)?(?P<host>[A-Za-z0-9-]*\.msvdn\.net)/(?:embed|amp_embed|content)/(?P<id>\w+)'
     _EMBED_REGEX = [rf'<iframe[^>]+?src=["\']?(?P<url>{_VALID_URL})["\']?']
     IE_DESC = 'MainStreaming Player'
 
@@ -31,9 +30,9 @@ class MainStreamingIE(InfoExtractor):
             },
             'expected_warnings': [
                 'Ignoring alternative content ID: WDAF1KOWUpH3',
-                'MainStreaming said: Live event is OFFLINE'
+                'MainStreaming said: Live event is OFFLINE',
             ],
-            'skip': 'live stream offline'
+            'skip': 'live stream offline',
         }, {
             # playlist
             'url': 'https://webtools-e18da6642b684f8aa9ae449862783a56.msvdn.net/embed/WDAF1KOWUpH3',
@@ -41,7 +40,7 @@ class MainStreamingIE(InfoExtractor):
                 'id': 'WDAF1KOWUpH3',
                 'title': 'Playlist homepage',
             },
-            'playlist_mincount': 2
+            'playlist_mincount': 2,
         }, {
             # livestream
             'url': 'https://webtools-859c1818ed614cc5b0047439470927b0.msvdn.net/embed/tDoFkZD3T1Lw',
@@ -52,7 +51,7 @@ class MainStreamingIE(InfoExtractor):
                 'ext': 'mp4',
                 'thumbnail': r're:https?://[A-Za-z0-9-]*\.msvdn.net/image/\w+/poster',
             },
-            'skip': 'live stream'
+            'skip': 'live stream',
         }, {
             'url': 'https://webtools-f5842579ff984c1c98d63b8d789673eb.msvdn.net/embed/EUlZfGWkGpOd?autoPlay=false',
             'info_dict': {
@@ -62,8 +61,8 @@ class MainStreamingIE(InfoExtractor):
                 'ext': 'mp4',
                 'live_status': 'not_live',
                 'thumbnail': r're:https?://[A-Za-z0-9-]*\.msvdn.net/image/\w+/poster',
-                'duration': 1512
-            }
+                'duration': 1512,
+            },
         }, {
             # video without webtools- prefix
             'url': 'https://f5842579ff984c1c98d63b8d789673eb.msvdn.net/embed/MfuWmzL2lGkA?autoplay=false&T=1635860445',
@@ -74,8 +73,8 @@ class MainStreamingIE(InfoExtractor):
                 'ext': 'mp4',
                 'live_status': 'not_live',
                 'thumbnail': r're:https?://[A-Za-z0-9-]*\.msvdn.net/image/\w+/poster',
-                'duration': 789.04
-            }
+                'duration': 789.04,
+            },
         }, {
             # always-on livestream with DVR
             'url': 'https://webtools-f5842579ff984c1c98d63b8d789673eb.msvdn.net/embed/HVvPMzy',
@@ -93,14 +92,14 @@ class MainStreamingIE(InfoExtractor):
         }, {
             # no host
             'url': 'https://webtools.msvdn.net/embed/MfuWmzL2lGkA',
-            'only_matching': True
+            'only_matching': True,
         }, {
             'url': 'https://859c1818ed614cc5b0047439470927b0.msvdn.net/amp_embed/tDoFkZD3T1Lw',
-            'only_matching': True
+            'only_matching': True,
         }, {
             'url': 'https://859c1818ed614cc5b0047439470927b0.msvdn.net/content/tDoFkZD3T1Lw#',
-            'only_matching': True
-        }
+            'only_matching': True,
+        },
     ]
 
     def _playlist_entries(self, host, playlist_content):
@@ -112,7 +111,7 @@ class MainStreamingIE(InfoExtractor):
                 'id': content_id,
                 'duration': int_or_none(traverse_obj(entry, ('duration', 'totalSeconds'))),
                 'title': entry.get('title'),
-                'url': f'https://{host}/embed/{content_id}'
+                'url': f'https://{host}/embed/{content_id}',
             }
 
     @staticmethod
@@ -206,5 +205,5 @@ class MainStreamingIE(InfoExtractor):
             'duration': parse_duration(content_info.get('duration')),
             'tags': content_info.get('tags'),
             'subtitles': subtitles,
-            'thumbnail': urljoin(self._get_webtools_base_url(host), f'image/{video_id}/poster')
+            'thumbnail': urljoin(self._get_webtools_base_url(host), f'image/{video_id}/poster'),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/malltv.py b/plugins/youtube_download/yt_dlp/extractor/malltv.py
deleted file mode 100644
index e1031d8..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/malltv.py
+++ /dev/null
@@ -1,107 +0,0 @@
-from .common import InfoExtractor
-from ..utils import (
-    clean_html,
-    dict_get,
-    float_or_none,
-    int_or_none,
-    merge_dicts,
-    parse_duration,
-    try_get,
-)
-
-
-class MallTVIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:(?:www|sk)\.)?mall\.tv/(?:[^/]+/)*(?P<id>[^/?#&]+)'
-    _TESTS = [{
-        'url': 'https://www.mall.tv/18-miliard-pro-neziskovky-opravdu-jsou-sportovci-nebo-clovek-v-tisni-pijavice',
-        'md5': 'cd69ce29176f6533b65bff69ed9a5f2a',
-        'info_dict': {
-            'id': 't0zzt0',
-            'display_id': '18-miliard-pro-neziskovky-opravdu-jsou-sportovci-nebo-clovek-v-tisni-pijavice',
-            'ext': 'mp4',
-            'title': '18 miliard pro neziskovky. Opravdu jsou sportovci nebo Člověk v tísni pijavice?',
-            'description': 'md5:db7d5744a4bd4043d9d98324aa72ab35',
-            'duration': 216,
-            'timestamp': 1538870400,
-            'upload_date': '20181007',
-            'view_count': int,
-            'comment_count': int,
-            'thumbnail': 'https://cdn.vpplayer.tech/agmipnzv/encode/vjsnigfq/thumbnails/retina.jpg',
-            'average_rating': 9.060869565217391,
-            'dislike_count': int,
-            'like_count': int,
-        }
-    }, {
-        'url': 'https://www.mall.tv/kdo-to-plati/18-miliard-pro-neziskovky-opravdu-jsou-sportovci-nebo-clovek-v-tisni-pijavice',
-        'only_matching': True,
-    }, {
-        'url': 'https://sk.mall.tv/gejmhaus/reklamacia-nehreje-vyrobnik-tepla-alebo-spekacka',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.mall.tv/zivoty-slavnych/nadeje-vychodu-i-zapadu-jak-michail-gorbacov-zmenil-politickou-mapu-sveta-a-ziskal-za-to-nobelovu-cenu-miru',
-        'info_dict': {
-            'id': 'yx010y',
-            'ext': 'mp4',
-            'dislike_count': int,
-            'description': 'md5:aee02bee5a8d072c6a8207b91d1905a9',
-            'thumbnail': 'https://cdn.vpplayer.tech/agmipnzv/encode/vjsnjdeu/thumbnails/retina.jpg',
-            'comment_count': int,
-            'display_id': 'md5:0ec2afa94d2e2b7091c019cef2a43a9b',
-            'like_count': int,
-            'duration': 752,
-            'timestamp': 1646956800,
-            'title': 'md5:fe79385daaf16d74c12c1ec4a26687af',
-            'view_count': int,
-            'upload_date': '20220311',
-            'average_rating': 9.685714285714285,
-        }
-    }]
-
-    def _real_extract(self, url):
-        display_id = self._match_id(url)
-
-        webpage = self._download_webpage(
-            url, display_id, headers=self.geo_verification_headers())
-
-        video = self._parse_json(self._search_regex(
-            r'videoObject\s*=\s*JSON\.parse\(JSON\.stringify\(({.+?})\)\);',
-            webpage, 'video object'), display_id)
-
-        video_id = self._search_regex(
-            r'<input\s*id\s*=\s*player-id-name\s*[^>]+value\s*=\s*(\w+)', webpage, 'video id')
-
-        formats = self._extract_m3u8_formats(
-            video['VideoSource'], video_id, 'mp4', 'm3u8_native')
-
-        subtitles = {}
-        for s in (video.get('Subtitles') or {}):
-            s_url = s.get('Url')
-            if not s_url:
-                continue
-            subtitles.setdefault(s.get('Language') or 'cz', []).append({
-                'url': s_url,
-            })
-
-        entity_counts = video.get('EntityCounts') or {}
-
-        def get_count(k):
-            v = entity_counts.get(k + 's') or {}
-            return int_or_none(dict_get(v, ('Count', 'StrCount')))
-
-        info = self._search_json_ld(webpage, video_id, default={})
-
-        return merge_dicts({
-            'id': str(video_id),
-            'display_id': display_id,
-            'title': video.get('Title'),
-            'description': clean_html(video.get('Description')),
-            'thumbnail': video.get('ThumbnailUrl'),
-            'formats': formats,
-            'subtitles': subtitles,
-            'duration': int_or_none(video.get('DurationSeconds')) or parse_duration(video.get('Duration')),
-            'view_count': get_count('View'),
-            'like_count': get_count('Like'),
-            'dislike_count': get_count('Dislike'),
-            'average_rating': float_or_none(try_get(video, lambda x: x['EntityRating']['AvarageRate'])),
-            'comment_count': get_count('Comment'),
-        }, info)
diff --git a/plugins/youtube_download/yt_dlp/extractor/mangomolo.py b/plugins/youtube_download/yt_dlp/extractor/mangomolo.py
index efaf66f..2231f71 100644
--- a/plugins/youtube_download/yt_dlp/extractor/mangomolo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/mangomolo.py
@@ -1,8 +1,7 @@
+import base64
+import urllib.parse
+
 from .common import InfoExtractor
-from ..compat import (
-    compat_b64decode,
-    compat_urllib_parse_unquote,
-)
 from ..utils import classproperty, int_or_none
 
 
@@ -33,14 +32,14 @@ class MangomoloBaseIE(InfoExtractor):
     def _real_extract(self, url):
         page_id = self._get_real_id(self._match_id(url))
         webpage = self._download_webpage(
-            'https://player.mangomolo.com/v1/%s?%s' % (self._TYPE, url.split('?')[1]), page_id)
+            'https://player.mangomolo.com/v1/{}?{}'.format(self._TYPE, url.split('?')[1]), page_id)
         hidden_inputs = self._hidden_inputs(webpage)
         m3u8_entry_protocol = 'm3u8' if self._IS_LIVE else 'm3u8_native'
 
         format_url = self._html_search_regex(
             [
                 r'(?:file|src)\s*:\s*"(https?://[^"]+?/playlist\.m3u8)',
-                r'<a[^>]+href="(rtsp://[^"]+)"'
+                r'<a[^>]+href="(rtsp://[^"]+)"',
             ], webpage, 'format url')
         formats = self._extract_wowza_formats(
             format_url, page_id, m3u8_entry_protocol, ['smil'])
@@ -70,4 +69,4 @@ class MangomoloLiveIE(MangomoloBaseIE):
     _IS_LIVE = True
 
     def _get_real_id(self, page_id):
-        return compat_b64decode(compat_urllib_parse_unquote(page_id)).decode()
+        return base64.b64decode(urllib.parse.unquote(page_id)).decode()
diff --git a/plugins/youtube_download/yt_dlp/extractor/manoto.py b/plugins/youtube_download/yt_dlp/extractor/manoto.py
index 2792e6e..1dd0b15 100644
--- a/plugins/youtube_download/yt_dlp/extractor/manoto.py
+++ b/plugins/youtube_download/yt_dlp/extractor/manoto.py
@@ -1,10 +1,5 @@
 from .common import InfoExtractor
-from ..utils import (
-    clean_html,
-    int_or_none,
-    traverse_obj
-)
-
+from ..utils import clean_html, int_or_none, traverse_obj
 
 _API_URL = 'https://dak1vd5vmi7x6.cloudfront.net/api/v1/publicrole/{}/{}?id={}'
 
@@ -25,11 +20,11 @@ class ManotoTVIE(InfoExtractor):
             'title': 'کارول و جان',
             'description': 'md5:d0fff1f8ba5c6775d312a00165d1a97e',
             'thumbnail': r're:^https?://.*\.(jpeg|png|jpg)$',
-            'ext': 'mp4'
+            'ext': 'mp4',
         },
         'params': {
             'skip_download': 'm3u8',
-        }
+        },
     }, {
         'url': 'https://www.manototv.com/episode/12576',
         'info_dict': {
@@ -42,11 +37,11 @@ class ManotoTVIE(InfoExtractor):
             'title': 'سه ماه تعطیلی',
             'description': 'سه ماه تعطیلی فیلمی به کارگردانی و نویسندگی شاپور قریب ساختهٔ سال ۱۳۵۶ است.',
             'thumbnail': r're:^https?://.*\.(jpeg|png|jpg)$',
-            'ext': 'mp4'
+            'ext': 'mp4',
         },
         'params': {
             'skip_download': 'm3u8',
-        }
+        },
     }]
 
     def _real_extract(self, url):
@@ -98,7 +93,7 @@ class ManotoTVShowIE(InfoExtractor):
 
         entries = [
             self.url_result(
-                'https://www.manototv.com/episode/%s' % item['slideID'], ie=ManotoTVIE.ie_key(), video_id=item['slideID'])
+                'https://www.manototv.com/episode/{}'.format(item['slideID']), ie=ManotoTVIE.ie_key(), video_id=item['slideID'])
             for item in playlist]
         return self.playlist_result(entries, show_id, title, description)
 
@@ -116,7 +111,7 @@ class ManotoTVLiveIE(InfoExtractor):
         },
         'params': {
             'skip_download': 'm3u8',
-        }
+        },
     }
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/manyvids.py b/plugins/youtube_download/yt_dlp/extractor/manyvids.py
index 7417453..1356169 100644
--- a/plugins/youtube_download/yt_dlp/extractor/manyvids.py
+++ b/plugins/youtube_download/yt_dlp/extractor/manyvids.py
@@ -1,30 +1,38 @@
-import re
-
 from .common import InfoExtractor
 from ..utils import (
+    clean_html,
     determine_ext,
-    extract_attributes,
     int_or_none,
-    str_to_int,
+    join_nonempty,
+    parse_count,
+    parse_duration,
+    parse_iso8601,
     url_or_none,
-    urlencode_postdata,
 )
+from ..utils.traversal import traverse_obj
 
 
 class ManyVidsIE(InfoExtractor):
     _VALID_URL = r'(?i)https?://(?:www\.)?manyvids\.com/video/(?P<id>\d+)'
     _TESTS = [{
         # preview video
-        'url': 'https://www.manyvids.com/Video/133957/everthing-about-me/',
-        'md5': '03f11bb21c52dd12a05be21a5c7dcc97',
+        'url': 'https://www.manyvids.com/Video/530341/mv-tips-tricks',
+        'md5': '738dc723f7735ee9602f7ea352a6d058',
         'info_dict': {
-            'id': '133957',
+            'id': '530341-preview',
             'ext': 'mp4',
-            'title': 'everthing about me (Preview)',
-            'uploader': 'ellyxxix',
+            'title': 'MV Tips & Tricks (Preview)',
+            'description': r're:I will take you on a tour around .{1313}$',
+            'thumbnail': r're:https://cdn5\.manyvids\.com/php_uploads/video_images/DestinyDiaz/.+\.jpg',
+            'uploader': 'DestinyDiaz',
             'view_count': int,
             'like_count': int,
+            'release_timestamp': 1508419904,
+            'tags': ['AdultSchool', 'BBW', 'SFW', 'TeacherFetish'],
+            'release_date': '20171019',
+            'duration': 3167.0,
         },
+        'expected_warnings': ['Only extracting preview'],
     }, {
         # full video
         'url': 'https://www.manyvids.com/Video/935718/MY-FACE-REVEAL/',
@@ -33,129 +41,68 @@ class ManyVidsIE(InfoExtractor):
             'id': '935718',
             'ext': 'mp4',
             'title': 'MY FACE REVEAL',
-            'description': 'md5:ec5901d41808b3746fed90face161612',
+            'description': r're:Today is the day!! I am finally taking off my mask .{445}$',
+            'thumbnail': r're:https://ods\.manyvids\.com/1001061960/3aa5397f2a723ec4597e344df66ab845/screenshots/.+\.jpg',
             'uploader': 'Sarah Calanthe',
             'view_count': int,
             'like_count': int,
+            'release_date': '20181110',
+            'tags': ['EyeContact', 'Interviews', 'MaskFetish', 'MouthFetish', 'Redhead'],
+            'release_timestamp': 1541851200,
+            'duration': 224.0,
         },
     }]
+    _API_BASE = 'https://www.manyvids.com/bff/store/video'
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
+        video_data = self._download_json(f'{self._API_BASE}/{video_id}/private', video_id)['data']
+        formats, preview_only = [], True
 
-        real_url = 'https://www.manyvids.com/video/%s/gtm.js' % (video_id, )
-        try:
-            webpage = self._download_webpage(real_url, video_id)
-        except Exception:
-            # probably useless fallback
-            webpage = self._download_webpage(url, video_id)
-
-        info = self._search_regex(
-            r'''(<div\b[^>]*\bid\s*=\s*(['"])pageMetaDetails\2[^>]*>)''',
-            webpage, 'meta details', default='')
-        info = extract_attributes(info)
-
-        player = self._search_regex(
-            r'''(<div\b[^>]*\bid\s*=\s*(['"])rmpPlayerStream\2[^>]*>)''',
-            webpage, 'player details', default='')
-        player = extract_attributes(player)
-
-        video_urls_and_ids = (
-            (info.get('data-meta-video'), 'video'),
-            (player.get('data-video-transcoded'), 'transcoded'),
-            (player.get('data-video-filepath'), 'filepath'),
-            (self._og_search_video_url(webpage, secure=False, default=None), 'og_video'),
-        )
-
-        def txt_or_none(s, default=None):
-            return (s.strip() or default) if isinstance(s, str) else default
-
-        uploader = txt_or_none(info.get('data-meta-author'))
-
-        def mung_title(s):
-            if uploader:
-                s = re.sub(r'^\s*%s\s+[|-]' % (re.escape(uploader), ), '', s)
-            return txt_or_none(s)
-
-        title = (
-            mung_title(info.get('data-meta-title'))
-            or self._html_search_regex(
-                (r'<span[^>]+class=["\']item-title[^>]+>([^<]+)',
-                 r'<h2[^>]+class=["\']h2 m-0["\'][^>]*>([^<]+)'),
-                webpage, 'title', default=None)
-            or self._html_search_meta(
-                'twitter:title', webpage, 'title', fatal=True))
-
-        title = re.sub(r'\s*[|-]\s+ManyVids\s*$', '', title) or title
-
-        if any(p in webpage for p in ('preview_videos', '_preview.mp4')):
-            title += ' (Preview)'
-
-        mv_token = self._search_regex(
-            r'data-mvtoken=(["\'])(?P<value>(?:(?!\1).)+)\1', webpage,
-            'mv token', default=None, group='value')
-
-        if mv_token:
-            # Sets some cookies
-            self._download_webpage(
-                'https://www.manyvids.com/includes/ajax_repository/you_had_me_at_hello.php',
-                video_id, note='Setting format cookies', fatal=False,
-                data=urlencode_postdata({
-                    'mvtoken': mv_token,
-                    'vid': video_id,
-                }), headers={
-                    'Referer': url,
-                    'X-Requested-With': 'XMLHttpRequest'
-                })
-
-        formats = []
-        for v_url, fmt in video_urls_and_ids:
-            v_url = url_or_none(v_url)
-            if not v_url:
+        for format_id, path in [
+            ('preview', ['teaser', 'filepath']),
+            ('transcoded', ['transcodedFilepath']),
+            ('filepath', ['filepath']),
+        ]:
+            format_url = traverse_obj(video_data, (*path, {url_or_none}))
+            if not format_url:
                 continue
-            if determine_ext(v_url) == 'm3u8':
-                formats.extend(self._extract_m3u8_formats(
-                    v_url, video_id, 'mp4', entry_protocol='m3u8_native',
-                    m3u8_id='hls'))
+            if determine_ext(format_url) == 'm3u8':
+                formats.extend(self._extract_m3u8_formats(format_url, video_id, 'mp4', m3u8_id=format_id))
             else:
                 formats.append({
-                    'url': v_url,
-                    'format_id': fmt,
+                    'url': format_url,
+                    'format_id': format_id,
+                    'preference': -10 if format_id == 'preview' else None,
+                    'quality': 10 if format_id == 'filepath' else None,
+                    'height': int_or_none(
+                        self._search_regex(r'_(\d{2,3}[02468])_', format_url, 'height', default=None)),
                 })
+            if format_id != 'preview':
+                preview_only = False
 
-        self._remove_duplicate_formats(formats)
+        metadata = traverse_obj(
+            self._download_json(f'{self._API_BASE}/{video_id}', video_id, fatal=False), 'data')
+        title = traverse_obj(metadata, ('title', {clean_html}))
 
-        for f in formats:
-            if f.get('height') is None:
-                f['height'] = int_or_none(
-                    self._search_regex(r'_(\d{2,3}[02468])_', f['url'], 'video height', default=None))
-            if '/preview/' in f['url']:
-                f['format_id'] = '_'.join(filter(None, (f.get('format_id'), 'preview')))
-                f['preference'] = -10
-            if 'transcoded' in f['format_id']:
-                f['preference'] = f.get('preference', -1) - 1
-
-        def get_likes():
-            likes = self._search_regex(
-                r'''(<a\b[^>]*\bdata-id\s*=\s*(['"])%s\2[^>]*>)''' % (video_id, ),
-                webpage, 'likes', default='')
-            likes = extract_attributes(likes)
-            return int_or_none(likes.get('data-likes'))
-
-        def get_views():
-            return str_to_int(self._html_search_regex(
-                r'''(?s)<span\b[^>]*\bclass\s*=["']views-wrapper\b[^>]+>.+?<span\b[^>]+>\s*(\d[\d,.]*)\s*</span>''',
-                webpage, 'view count', default=None))
+        if preview_only:
+            title = join_nonempty(title, '(Preview)', delim=' ')
+            video_id += '-preview'
+            self.report_warning(
+                f'Only extracting preview. Video may be paid or subscription only. {self._login_hint()}')
 
         return {
             'id': video_id,
             'title': title,
             'formats': formats,
-            'description': txt_or_none(info.get('data-meta-description')),
-            'uploader': txt_or_none(info.get('data-meta-author')),
-            'thumbnail': (
-                url_or_none(info.get('data-meta-image'))
-                or url_or_none(player.get('data-video-screenshot'))),
-            'view_count': get_views(),
-            'like_count': get_likes(),
+            **traverse_obj(metadata, {
+                'description': ('description', {clean_html}),
+                'uploader': ('model', 'displayName', {clean_html}),
+                'thumbnail': (('screenshot', 'thumbnail'), {url_or_none}, any),
+                'view_count': ('views', {parse_count}),
+                'like_count': ('likes', {parse_count}),
+                'release_timestamp': ('launchDate', {parse_iso8601}),
+                'duration': ('videoDuration', {parse_duration}),
+                'tags': ('tagList', ..., 'label', {str}, filter, all, filter),
+            }),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/markiza.py b/plugins/youtube_download/yt_dlp/extractor/markiza.py
index 53ed791..088b60d 100644
--- a/plugins/youtube_download/yt_dlp/extractor/markiza.py
+++ b/plugins/youtube_download/yt_dlp/extractor/markiza.py
@@ -1,7 +1,6 @@
 import re
 
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     orderedSet,
     parse_duration,
@@ -10,6 +9,7 @@ from ..utils import (
 
 
 class MarkizaIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?videoarchiv\.markiza\.sk/(?:video/(?:[^/]+/)*|embed/)(?P<id>\d+)(?:[_/]|$)'
     _TESTS = [{
         'url': 'http://videoarchiv.markiza.sk/video/oteckovia/84723_oteckovia-109',
@@ -59,15 +59,16 @@ class MarkizaIE(InfoExtractor):
             info.update({
                 'id': video_id,
                 'title': try_get(
-                    data, lambda x: x['details']['name'], compat_str),
+                    data, lambda x: x['details']['name'], str),
             })
         else:
             info['duration'] = parse_duration(
-                try_get(data, lambda x: x['details']['duration'], compat_str))
+                try_get(data, lambda x: x['details']['duration'], str))
         return info
 
 
 class MarkizaPageIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?(?:(?:[^/]+\.)?markiza|tvnoviny)\.sk/(?:[^/]+/)*(?P<id>\d+)_'
     _TESTS = [{
         'url': 'http://www.markiza.sk/soubiz/zahranicny/1923705_oteckovia-maju-svoj-den-ti-slavni-nie-su-o-nic-menej-rozkosni',
@@ -102,7 +103,7 @@ class MarkizaPageIE(InfoExtractor):
 
     @classmethod
     def suitable(cls, url):
-        return False if MarkizaIE.suitable(url) else super(MarkizaPageIE, cls).suitable(url)
+        return False if MarkizaIE.suitable(url) else super().suitable(url)
 
     def _real_extract(self, url):
         playlist_id = self._match_id(url)
@@ -114,7 +115,7 @@ class MarkizaPageIE(InfoExtractor):
             url, playlist_id, expected_status=500)
 
         entries = [
-            self.url_result('http://videoarchiv.markiza.sk/video/%s' % video_id)
+            self.url_result(f'http://videoarchiv.markiza.sk/video/{video_id}')
             for video_id in orderedSet(re.findall(
                 r'(?:initPlayer_|data-entity=["\']|id=["\']player_)(\d+)',
                 webpage))]
diff --git a/plugins/youtube_download/yt_dlp/extractor/massengeschmacktv.py b/plugins/youtube_download/yt_dlp/extractor/massengeschmacktv.py
index 7dacb43..43c0873 100644
--- a/plugins/youtube_download/yt_dlp/extractor/massengeschmacktv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/massengeschmacktv.py
@@ -17,11 +17,12 @@ class MassengeschmackTVIE(InfoExtractor):
 
     _TEST = {
         'url': 'https://massengeschmack.tv/play/fktv202',
-        'md5': 'a9e054db9c2b5a08f0a0527cc201e8d3',
+        'md5': '9996f314994a49fefe5f39aa1b07ae21',
         'info_dict': {
             'id': 'fktv202',
             'ext': 'mp4',
-            'title': 'Fernsehkritik-TV - Folge 202',
+            'title': 'Fernsehkritik-TV #202',
+            'thumbnail': 'https://cache.massengeschmack.tv/img/mag/fktv202.jpg',
         },
     }
 
@@ -29,9 +30,6 @@ class MassengeschmackTVIE(InfoExtractor):
         episode = self._match_id(url)
 
         webpage = self._download_webpage(url, episode)
-        title = clean_html(self._html_search_regex(
-            '<h3>([^<]+)</h3>', webpage, 'title'))
-        thumbnail = self._search_regex(r'POSTER\s*=\s*"([^"]+)', webpage, 'thumbnail', fatal=False)
         sources = self._parse_json(self._search_regex(r'(?s)MEDIA\s*=\s*(\[.+?\]);', webpage, 'media'), episode, js_to_json)
 
         formats = []
@@ -67,7 +65,8 @@ class MassengeschmackTVIE(InfoExtractor):
 
         return {
             'id': episode,
-            'title': title,
+            'title': clean_html(self._html_search_regex(
+                r'<span[^>]+\bid=["\']clip-title["\'][^>]*>([^<]+)', webpage, 'title', fatal=False)),
             'formats': formats,
-            'thumbnail': thumbnail,
+            'thumbnail': self._search_regex(r'POSTER\s*=\s*"([^"]+)', webpage, 'thumbnail', fatal=False),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/masters.py b/plugins/youtube_download/yt_dlp/extractor/masters.py
index 716f1c9..4aa2c98 100644
--- a/plugins/youtube_download/yt_dlp/extractor/masters.py
+++ b/plugins/youtube_download/yt_dlp/extractor/masters.py
@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from .common import InfoExtractor
 from ..utils import (
     traverse_obj,
@@ -16,7 +15,7 @@ class MastersIE(InfoExtractor):
             'title': 'Sungjae Im: Thursday Interview 2022',
             'upload_date': '20220407',
             'thumbnail': r're:^https?://.*\.jpg$',
-        }
+        },
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/matchtv.py b/plugins/youtube_download/yt_dlp/extractor/matchtv.py
index a67fa9f..93799fe 100644
--- a/plugins/youtube_download/yt_dlp/extractor/matchtv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/matchtv.py
@@ -1,51 +1,35 @@
-import random
-
 from .common import InfoExtractor
-from ..utils import xpath_text
 
 
 class MatchTVIE(InfoExtractor):
-    _VALID_URL = r'https?://matchtv\.ru(?:/on-air|/?#live-player)'
+    _VALID_URL = [
+        r'https?://matchtv\.ru/on-air/?(?:$|[?#])',
+        r'https?://video\.matchtv\.ru/iframe/channel/106/?(?:$|[?#])',
+    ]
     _TESTS = [{
-        'url': 'http://matchtv.ru/#live-player',
+        'url': 'http://matchtv.ru/on-air/',
         'info_dict': {
             'id': 'matchtv-live',
-            'ext': 'flv',
+            'ext': 'mp4',
             'title': r're:^Матч ТВ - Прямой эфир \d{4}-\d{2}-\d{2} \d{2}:\d{2}$',
-            'is_live': True,
+            'live_status': 'is_live',
         },
         'params': {
             'skip_download': True,
         },
     }, {
-        'url': 'http://matchtv.ru/on-air/',
+        'url': 'https://video.matchtv.ru/iframe/channel/106',
         'only_matching': True,
     }]
 
     def _real_extract(self, url):
         video_id = 'matchtv-live'
-        video_url = self._download_json(
-            'http://player.matchtv.ntvplus.tv/player/smil', video_id,
-            query={
-                'ts': '',
-                'quality': 'SD',
-                'contentId': '561d2c0df7159b37178b4567',
-                'sign': '',
-                'includeHighlights': '0',
-                'userId': '',
-                'sessionId': random.randint(1, 1000000000),
-                'contentType': 'channel',
-                'timeShift': '0',
-                'platform': 'portal',
-            },
-            headers={
-                'Referer': 'http://player.matchtv.ntvplus.tv/embed-player/NTVEmbedPlayer.swf',
-            })['data']['videoUrl']
-        f4m_url = xpath_text(self._download_xml(video_url, video_id), './to')
-        formats = self._extract_f4m_formats(f4m_url, video_id)
+        webpage = self._download_webpage('https://video.matchtv.ru/iframe/channel/106', video_id)
+        video_url = self._html_search_regex(
+            r'data-config="config=(https?://[^?"]+)[?"]', webpage, 'video URL').replace('/feed/', '/media/') + '.m3u8'
         return {
             'id': video_id,
             'title': 'Матч ТВ - Прямой эфир',
             'is_live': True,
-            'formats': formats,
+            'formats': self._extract_m3u8_formats(video_url, video_id, 'mp4', live=True),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/mbn.py b/plugins/youtube_download/yt_dlp/extractor/mbn.py
new file mode 100644
index 0000000..4917c46
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/mbn.py
@@ -0,0 +1,89 @@
+import re
+
+from .common import InfoExtractor
+from ..utils import (
+    int_or_none,
+    unified_strdate,
+    url_or_none,
+)
+from ..utils.traversal import traverse_obj
+
+
+class MBNIE(InfoExtractor):
+    IE_DESC = 'mbn.co.kr (매일방송)'
+    _VALID_URL = r'https?://(?:www\.)?mbn\.co\.kr/vod/programContents/preview(?:list)?/\d+/\d+/(?P<id>\d+)'
+    _TESTS = [{
+        'url': 'https://mbn.co.kr/vod/programContents/previewlist/861/5433/1276155',
+        'md5': '85e1694e5b247c04d1386b7e3c90fd76',
+        'info_dict': {
+            'id': '1276155',
+            'ext': 'mp4',
+            'title': '결국 사로잡힌 권유리, 그녀를 목숨 걸고 구하려는 정일우!',
+            'duration': 3891,
+            'release_date': '20210703',
+            'thumbnail': 'http://img.vod.mbn.co.kr/mbnvod2img/861/2021/07/03/20210703230811_20_861_1276155_360_7_0.jpg',
+            'series': '보쌈 - 운명을 훔치다',
+            'episode': 'Episode 19',
+            'episode_number': 19,
+        },
+    }, {
+        'url': 'https://www.mbn.co.kr/vod/programContents/previewlist/835/5294/1084744',
+        'md5': 'fc65d3aac85e85e0b5056f4ef99cde4a',
+        'info_dict': {
+            'id': '1084744',
+            'ext': 'mp4',
+            'title': '김정은♥최원영, 제자리를 찾은 위험한 부부! ＂결혼은 투쟁이면서, 어려운 방식이야..＂',
+            'duration': 93,
+            'release_date': '20201124',
+            'thumbnail': 'http://img.vod.mbn.co.kr/mbnvod2img/835/2020/11/25/20201125000221_21_835_1084744_360_7_0.jpg',
+            'series': '나의 위험한 아내',
+        },
+    }, {
+        'url': 'https://www.mbn.co.kr/vod/programContents/preview/952/6088/1054797?next=1',
+        'md5': 'c711103c72aeac8323a5cf1751f10097',
+        'info_dict': {
+            'id': '1054797',
+            'ext': 'mp4',
+            'title': '[2차 티저] MBN 주말 미니시리즈 <완벽한 결혼의 정석> l 그녀에게 주어진 두 번째 인생',
+            'duration': 65,
+            'release_date': '20231028',
+            'thumbnail': 'http://img.vod.mbn.co.kr/vod2/952/2023/09/11/20230911130223_22_952_1054797_1080_7.jpg',
+            'series': '완벽한 결혼의 정석',
+        },
+    }]
+
+    def _real_extract(self, url):
+        content_id = self._match_id(url)
+        webpage = self._download_webpage(url, content_id)
+
+        content_cls_cd = self._search_regex(
+            r'"\?content_cls_cd=(\d+)&', webpage, 'content cls cd', fatal=False) or '20'
+        media_info = self._download_json(
+            'https://www.mbn.co.kr/player/mbnVodPlayer_2020.mbn', content_id,
+            note='Fetching playback data', query={
+                'content_cls_cd': content_cls_cd,
+                'content_id': content_id,
+                'relay_type': '1',
+            })
+
+        formats = []
+        for stream_url in traverse_obj(media_info, ('movie_list', ..., 'url', {url_or_none})):
+            stream_url = re.sub(r'/(?:chunk|play)list(?:_pd\d+)?\.m3u8', '/manifest.m3u8', stream_url)
+            final_url = url_or_none(self._download_webpage(
+                f'https://www.mbn.co.kr/player/mbnStreamAuth_new_vod.mbn?vod_url={stream_url}',
+                content_id, note='Fetching authenticated m3u8 url'))
+
+            formats.extend(self._extract_m3u8_formats(final_url, content_id, fatal=False))
+
+        return {
+            'id': content_id,
+            **traverse_obj(media_info, {
+                'title': ('movie_title', {str}),
+                'duration': ('play_sec', {int_or_none}),
+                'release_date': ('bcast_date', {lambda x: x.replace('.', '')}, {unified_strdate}),
+                'thumbnail': ('movie_start_Img', {url_or_none}),
+                'series': ('prog_nm', {str}),
+                'episode_number': ('ad_contentnumber', {int_or_none}),
+            }),
+            'formats': formats,
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/mdr.py b/plugins/youtube_download/yt_dlp/extractor/mdr.py
index 49f5b49..dfda3cc 100644
--- a/plugins/youtube_download/yt_dlp/extractor/mdr.py
+++ b/plugins/youtube_download/yt_dlp/extractor/mdr.py
@@ -1,5 +1,6 @@
+import urllib.parse
+
 from .common import InfoExtractor
-from ..compat import compat_urlparse
 from ..utils import (
     determine_ext,
     int_or_none,
@@ -12,8 +13,8 @@ from ..utils import (
 
 
 class MDRIE(InfoExtractor):
-    IE_DESC = 'MDR.DE and KiKA'
-    _VALID_URL = r'https?://(?:www\.)?(?:mdr|kika)\.de/(?:.*)/[a-z-]+-?(?P<id>\d+)(?:_.+?)?\.html'
+    IE_DESC = 'MDR.DE'
+    _VALID_URL = r'https?://(?:www\.)?mdr\.de/(?:.*)/[a-z-]+-?(?P<id>\d+)(?:_.+?)?\.html'
 
     _GEO_COUNTRIES = ['DE']
 
@@ -33,30 +34,6 @@ class MDRIE(InfoExtractor):
             'uploader': 'MITTELDEUTSCHER RUNDFUNK',
         },
         'skip': '404 not found',
-    }, {
-        'url': 'http://www.kika.de/baumhaus/videos/video19636.html',
-        'md5': '4930515e36b06c111213e80d1e4aad0e',
-        'info_dict': {
-            'id': '19636',
-            'ext': 'mp4',
-            'title': 'Baumhaus vom 30. Oktober 2015',
-            'duration': 134,
-            'uploader': 'KIKA',
-        },
-        'skip': '404 not found',
-    }, {
-        'url': 'http://www.kika.de/sendungen/einzelsendungen/weihnachtsprogramm/videos/video8182.html',
-        'md5': '5fe9c4dd7d71e3b238f04b8fdd588357',
-        'info_dict': {
-            'id': '8182',
-            'ext': 'mp4',
-            'title': 'Beutolomäus und der geheime Weihnachtswunsch',
-            'description': 'md5:b69d32d7b2c55cbe86945ab309d39bbd',
-            'timestamp': 1482541200,
-            'upload_date': '20161224',
-            'duration': 4628,
-            'uploader': 'KIKA',
-        },
     }, {
         # audio with alternative playerURL pattern
         'url': 'http://www.mdr.de/kultur/videos-und-audios/audio-radio/operation-mindfuck-robert-wilson100.html',
@@ -67,28 +44,7 @@ class MDRIE(InfoExtractor):
             'duration': 3239,
             'uploader': 'MITTELDEUTSCHER RUNDFUNK',
         },
-    }, {
-        # empty bitrateVideo and bitrateAudio
-        'url': 'https://www.kika.de/filme/sendung128372_zc-572e3f45_zs-1d9fb70e.html',
-        'info_dict': {
-            'id': '128372',
-            'ext': 'mp4',
-            'title': 'Der kleine Wichtel kehrt zurück',
-            'description': 'md5:f77fafdff90f7aa1e9dca14f662c052a',
-            'duration': 4876,
-            'timestamp': 1607823300,
-            'upload_date': '20201213',
-            'uploader': 'ZDF',
-        },
-        'params': {
-            'skip_download': True,
-        },
-    }, {
-        'url': 'http://www.kika.de/baumhaus/sendungen/video19636_zc-fea7f8a0_zs-4bf89c60.html',
-        'only_matching': True,
-    }, {
-        'url': 'http://www.kika.de/sendungen/einzelsendungen/weihnachtsprogramm/einzelsendung2534.html',
-        'only_matching': True,
+        'skip': '404 not found',
     }, {
         'url': 'http://www.mdr.de/mediathek/mdr-videos/a/video-1334.html',
         'only_matching': True,
@@ -104,7 +60,7 @@ class MDRIE(InfoExtractor):
             webpage, 'data url', group='url').replace(r'\/', '/')
 
         doc = self._download_xml(
-            compat_urlparse.urljoin(url, data_url), video_id)
+            urllib.parse.urljoin(url, data_url), video_id)
 
         title = xpath_text(doc, ['./title', './broadcast/broadcastName'], 'title', fatal=True)
 
@@ -118,7 +74,7 @@ class MDRIE(InfoExtractor):
                     'progressiveDownload',
                     'dynamicHttpStreamingRedirector',
                     'adaptiveHttpStreamingRedirector'):
-                url_el = asset.find('./%sUrl' % source)
+                url_el = asset.find(f'./{source}Url')
                 if url_el is None:
                     continue
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/medaltv.py b/plugins/youtube_download/yt_dlp/extractor/medaltv.py
index 9e57ee2..94c51ed 100644
--- a/plugins/youtube_download/yt_dlp/extractor/medaltv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/medaltv.py
@@ -1,14 +1,13 @@
 import re
 
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     ExtractorError,
-    format_field,
     float_or_none,
+    format_field,
     int_or_none,
     str_or_none,
-    traverse_obj
+    traverse_obj,
 )
 
 
@@ -16,7 +15,7 @@ class MedalTVIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?medal\.tv/games/[^/?#&]+/clips/(?P<id>[^/?#&]+)'
     _TESTS = [{
         'url': 'https://medal.tv/games/valorant/clips/jTBFnLKdLy15K',
-        'md5': '6930f8972914b6b9fdc2bb3918098ba0',
+        'md5': '03e4911fdcf7fce563090705c2e79267',
         'info_dict': {
             'id': 'jTBFnLKdLy15K',
             'ext': 'mp4',
@@ -31,10 +30,10 @@ class MedalTVIE(InfoExtractor):
             'view_count': int,
             'like_count': int,
             'duration': 13,
-        }
+        },
     }, {
-        'url': 'https://medal.tv/games/cod%20cold%20war/clips/2mA60jWAGQCBH',
-        'md5': '3d19d426fe0b2d91c26e412684e66a06',
+        'url': 'https://medal.tv/games/cod-cold-war/clips/2mA60jWAGQCBH',
+        'md5': 'fc7a3e4552ae8993c1c4006db46be447',
         'info_dict': {
             'id': '2mA60jWAGQCBH',
             'ext': 'mp4',
@@ -50,9 +49,9 @@ class MedalTVIE(InfoExtractor):
             'view_count': int,
             'like_count': int,
             'duration': 23,
-        }
+        },
     }, {
-        'url': 'https://medal.tv/games/cod%20cold%20war/clips/2um24TWdty0NA',
+        'url': 'https://medal.tv/games/cod-cold-war/clips/2um24TWdty0NA',
         'md5': 'b6dc76b78195fff0b4f8bf4a33ec2148',
         'info_dict': {
             'id': '2um24TWdty0NA',
@@ -69,7 +68,7 @@ class MedalTVIE(InfoExtractor):
             'view_count': int,
             'like_count': int,
             'duration': 9,
-        }
+        },
     }, {
         'url': 'https://medal.tv/games/valorant/clips/37rMeFpryCC-9',
         'only_matching': True,
@@ -81,7 +80,7 @@ class MedalTVIE(InfoExtractor):
     def _real_extract(self, url):
         video_id = self._match_id(url)
 
-        webpage = self._download_webpage(url, video_id)
+        webpage = self._download_webpage(url, video_id, query={'mobilebypass': 'true'})
 
         hydration_data = self._search_json(
             r'<script[^>]*>[^<]*\bhydrationData\s*=', webpage,
@@ -103,18 +102,17 @@ class MedalTVIE(InfoExtractor):
             item_id = item_id or '%dp' % height
             if item_id not in item_url:
                 return
-            width = int(round(aspect_ratio * height))
             container.append({
                 'url': item_url,
                 id_key: item_id,
-                'width': width,
-                'height': height
+                'width': round(aspect_ratio * height),
+                'height': height,
             })
 
         formats = []
         thumbnails = []
         for k, v in clip.items():
-            if not (v and isinstance(v, compat_str)):
+            if not (v and isinstance(v, str)):
                 continue
             mobj = re.match(r'(contentUrl|thumbnail)(?:(\d+)p)?$', k)
             if not mobj:
@@ -136,7 +134,7 @@ class MedalTVIE(InfoExtractor):
                     expected=True, video_id=video_id)
             else:
                 self.raise_no_formats(
-                    'An unknown error occurred ({0}).'.format(error),
+                    f'An unknown error occurred ({error}).',
                     video_id=video_id)
 
         # Necessary because the id of the author is not known in advance.
diff --git a/plugins/youtube_download/yt_dlp/extractor/mediaite.py b/plugins/youtube_download/yt_dlp/extractor/mediaite.py
index 0f9079b..b3fa6a1 100644
--- a/plugins/youtube_download/yt_dlp/extractor/mediaite.py
+++ b/plugins/youtube_download/yt_dlp/extractor/mediaite.py
@@ -2,7 +2,7 @@ from .common import InfoExtractor
 
 
 class MediaiteIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?mediaite.com(?!/category)(?:/[\w-]+){2}'
+    _VALID_URL = r'https?://(?:www\.)?mediaite\.com(?!/category)(?:/[\w-]+){2}'
     _TESTS = [{
         'url': 'https://www.mediaite.com/sports/bill-burr-roasts-nfl-for-promoting-black-lives-matter-while-scheduling-more-games-after-all-the-sht-they-know-about-cte/',
         'info_dict': {
@@ -15,7 +15,7 @@ class MediaiteIE(InfoExtractor):
             'timestamp': 1631630185,
             'upload_date': '20210914',
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }, {
         'url': 'https://www.mediaite.com/tv/joe-scarborough-goes-off-on-tax-breaks-for-super-wealthy-largest-income-redistribution-scam-in-american-history/',
         'info_dict': {
@@ -28,7 +28,7 @@ class MediaiteIE(InfoExtractor):
             'timestamp': 1631618057,
             'upload_date': '20210914',
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }, {
         'url': 'https://www.mediaite.com/politics/watch-rudy-giuliani-impersonates-queen-elizabeth-calls-mark-milley-an-asshle-in-bizarre-9-11-speech/',
         'info_dict': {
@@ -41,7 +41,7 @@ class MediaiteIE(InfoExtractor):
             'timestamp': 1631536476,
             'upload_date': '20210913',
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }, {
         'url': 'https://www.mediaite.com/podcasts/clarissa-ward-says-she-decided-to-become-a-journalist-on-9-11/',
         'info_dict': {
@@ -54,7 +54,7 @@ class MediaiteIE(InfoExtractor):
             'timestamp': 1631311188,
             'upload_date': '20210910',
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }, {
         'url': 'https://www.mediaite.com/opinion/mainstream-media-ignores-rose-mcgowans-bombshell-allegation-that-newsoms-wife-tried-to-silence-her-on-weinstein/',
         'info_dict': {
@@ -67,7 +67,7 @@ class MediaiteIE(InfoExtractor):
             'timestamp': 1631553328,
             'upload_date': '20210913',
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }, {
         'url': 'https://www.mediaite.com/news/watch-cnbcs-jim-cramer-says-nobody-wants-to-die-getting-infected-by-unvaccinated-coworker-even-for-22-an-hour/',
         'info_dict': {
@@ -80,11 +80,25 @@ class MediaiteIE(InfoExtractor):
             'timestamp': 1633014214,
             'upload_date': '20210930',
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
+    }, {
+        'url': 'https://www.mediaite.com/politics/i-cant-read-it-fast-enough-while-defending-trump-larry-kudlow-overwhelmed-by-volume-of-ex-presidents-legal-troubles/',
+        'info_dict': {
+            'id': 'E6EhDX5z',
+            'ext': 'mp4',
+            'title': 'Fox Business Network - 4:00 PM - 5:00 PM - 1:39:42 pm - 1:42:20 pm',
+            'description': '',
+            'thumbnail': 'https://cdn.jwplayer.com/v2/media/E6EhDX5z/poster.jpg?width=720',
+            'duration': 157,
+            'timestamp': 1691015535,
+            'upload_date': '20230802',
+        },
+        'params': {'skip_download': True},
     }]
 
     def _real_extract(self, url):
         webpage = self._download_webpage(url, None)
-        id = self._search_regex(r'data-video-id\s?=\s?\"([^\"]+)\"', webpage, 'id')
-        data_json = self._download_json(f'https://cdn.jwplayer.com/v2/media/{id}', id)
+        video_id = self._search_regex(
+            [r'"https://cdn\.jwplayer\.com/players/(\w+)', r'data-video-id\s*=\s*\"([^\"]+)\"'], webpage, 'id')
+        data_json = self._download_json(f'https://cdn.jwplayer.com/v2/media/{video_id}', video_id)
         return self._parse_jwplayer_data(data_json)
diff --git a/plugins/youtube_download/yt_dlp/extractor/mediaklikk.py b/plugins/youtube_download/yt_dlp/extractor/mediaklikk.py
index 4636508..197e91d 100644
--- a/plugins/youtube_download/yt_dlp/extractor/mediaklikk.py
+++ b/plugins/youtube_download/yt_dlp/extractor/mediaklikk.py
@@ -1,10 +1,11 @@
-from ..utils import (
-    unified_strdate
-)
+import urllib.parse
+
 from .common import InfoExtractor
-from ..compat import (
-    compat_urllib_parse_unquote,
-    compat_str
+from ..utils import (
+    ExtractorError,
+    traverse_obj,
+    unified_strdate,
+    url_or_none,
 )
 
 
@@ -15,53 +16,116 @@ class MediaKlikkIE(InfoExtractor):
                         (?P<id>[^/#?_]+)'''
 
     _TESTS = [{
-        # mediaklikk. date in html.
+        'url': 'https://mediaklikk.hu/filmajanlo/cikk/az-ajto/',
+        'info_dict': {
+            'id': '668177',
+            'title': 'Az ajtó',
+            'display_id': 'az-ajto',
+            'ext': 'mp4',
+            'thumbnail': 'https://cdn.cms.mtv.hu/wp-content/uploads/sites/4/2016/01/vlcsnap-2023-07-31-14h18m52s111.jpg',
+        },
+    }, {
+        # (old) mediaklikk. date in html.
         'url': 'https://mediaklikk.hu/video/hazajaro-delnyugat-bacska-a-duna-menten-palankatol-doroszloig/',
         'info_dict': {
             'id': '4754129',
             'title': 'Hazajáró, DÉLNYUGAT-BÁCSKA – A Duna mentén Palánkától Doroszlóig',
             'ext': 'mp4',
             'upload_date': '20210901',
-            'thumbnail': 'http://mediaklikk.hu/wp-content/uploads/sites/4/2014/02/hazajarouj_JO.jpg'
-        }
+            'thumbnail': 'http://mediaklikk.hu/wp-content/uploads/sites/4/2014/02/hazajarouj_JO.jpg',
+        },
+        'skip': 'Webpage redirects to 404 page',
     }, {
-        # m4sport
+        # mediaklikk. date in html.
+        'url': 'https://mediaklikk.hu/video/hazajaro-fabova-hegyseg-kishont-koronaja/',
+        'info_dict': {
+            'id': '6696133',
+            'title': 'Hazajáró, Fabova-hegység - Kishont koronája',
+            'display_id': 'hazajaro-fabova-hegyseg-kishont-koronaja',
+            'ext': 'mp4',
+            'upload_date': '20230903',
+            'thumbnail': 'https://mediaklikk.hu/wp-content/uploads/sites/4/2014/02/hazajarouj_JO.jpg',
+        },
+        'skip': 'Webpage redirects to 404 page',
+    }, {
+        # (old) m4sport
         'url': 'https://m4sport.hu/video/2021/08/30/gyemant-liga-parizs/',
         'info_dict': {
             'id': '4754999',
             'title': 'Gyémánt Liga, Párizs',
             'ext': 'mp4',
             'upload_date': '20210830',
-            'thumbnail': 'http://m4sport.hu/wp-content/uploads/sites/4/2021/08/vlcsnap-2021-08-30-18h21m20s10-1024x576.jpg'
-        }
+            'thumbnail': 'http://m4sport.hu/wp-content/uploads/sites/4/2021/08/vlcsnap-2021-08-30-18h21m20s10-1024x576.jpg',
+        },
+        'skip': 'Webpage redirects to 404 page',
+    }, {
+        # m4sport
+        'url': 'https://m4sport.hu/sportkozvetitesek/video/2023/09/08/atletika-gyemant-liga-brusszel/',
+        'info_dict': {
+            'id': '6711136',
+            'title': 'Atlétika – Gyémánt Liga, Brüsszel',
+            'display_id': 'atletika-gyemant-liga-brusszel',
+            'ext': 'mp4',
+            'upload_date': '20230908',
+            'thumbnail': 'https://m4sport.hu/wp-content/uploads/sites/4/2023/09/vlcsnap-2023-09-08-22h43m18s691.jpg',
+        },
+        'skip': 'Webpage redirects to 404 page',
     }, {
         # m4sport with *video/ url and no date
         'url': 'https://m4sport.hu/bl-video/real-madrid-chelsea-1-1/',
         'info_dict': {
             'id': '4492099',
             'title': 'Real Madrid - Chelsea 1-1',
+            'display_id': 'real-madrid-chelsea-1-1',
             'ext': 'mp4',
-            'thumbnail': 'http://m4sport.hu/wp-content/uploads/sites/4/2021/04/Sequence-01.Still001-1024x576.png'
-        }
+            'thumbnail': 'https://m4sport.hu/wp-content/uploads/sites/4/2021/04/Sequence-01.Still001-1024x576.png',
+        },
+        'skip': 'Webpage redirects to 404 page',
     }, {
-        # hirado
+        # (old) hirado
         'url': 'https://hirado.hu/videok/felteteleket-szabott-a-fovaros/',
         'info_dict': {
             'id': '4760120',
             'title': 'Feltételeket szabott a főváros',
             'ext': 'mp4',
-            'thumbnail': 'http://hirado.hu/wp-content/uploads/sites/4/2021/09/vlcsnap-2021-09-01-20h20m37s165.jpg'
-        }
+            'thumbnail': 'http://hirado.hu/wp-content/uploads/sites/4/2021/09/vlcsnap-2021-09-01-20h20m37s165.jpg',
+        },
+        'skip': 'Webpage redirects to video list page',
     }, {
-        # petofilive
+        # hirado
+        'url': 'https://hirado.hu/belfold/video/2023/09/11/marad-az-eves-elszamolas-a-napelemekre-beruhazo-csaladoknal',
+        'info_dict': {
+            'id': '6716068',
+            'title': 'Marad az éves elszámolás a napelemekre beruházó családoknál',
+            'display_id': 'marad-az-eves-elszamolas-a-napelemekre-beruhazo-csaladoknal',
+            'ext': 'mp4',
+            'upload_date': '20230911',
+            'thumbnail': 'https://hirado.hu/wp-content/uploads/sites/4/2023/09/vlcsnap-2023-09-11-09h16m09s882.jpg',
+        },
+        'skip': 'Webpage redirects to video list page',
+    }, {
+        # (old) petofilive
         'url': 'https://petofilive.hu/video/2021/06/07/tha-shudras-az-akusztikban/',
         'info_dict': {
             'id': '4571948',
             'title': 'Tha Shudras az Akusztikban',
             'ext': 'mp4',
             'upload_date': '20210607',
-            'thumbnail': 'http://petofilive.hu/wp-content/uploads/sites/4/2021/06/vlcsnap-2021-06-07-22h14m23s915-1024x576.jpg'
-        }
+            'thumbnail': 'http://petofilive.hu/wp-content/uploads/sites/4/2021/06/vlcsnap-2021-06-07-22h14m23s915-1024x576.jpg',
+        },
+        'skip': 'Webpage redirects to empty page',
+    }, {
+        # petofilive
+        'url': 'https://petofilive.hu/video/2023/09/09/futball-fesztival-a-margitszigeten/',
+        'info_dict': {
+            'id': '6713233',
+            'title': 'Futball Fesztivál a Margitszigeten',
+            'display_id': 'futball-fesztival-a-margitszigeten',
+            'ext': 'mp4',
+            'upload_date': '20230909',
+            'thumbnail': 'https://petofilive.hu/wp-content/uploads/sites/4/2023/09/Clipboard11-2.jpg',
+        },
+        'skip': 'Webpage redirects to video list page',
     }]
 
     def _real_extract(self, url):
@@ -71,30 +135,36 @@ class MediaKlikkIE(InfoExtractor):
 
         player_data_str = self._html_search_regex(
             r'mtva_player_manager\.player\(document.getElementById\(.*\),\s?(\{.*\}).*\);', webpage, 'player data')
-        player_data = self._parse_json(player_data_str, display_id, compat_urllib_parse_unquote)
-        video_id = compat_str(player_data['contentId'])
+        player_data = self._parse_json(player_data_str, display_id, urllib.parse.unquote)
+        video_id = str(player_data['contentId'])
         title = player_data.get('title') or self._og_search_title(webpage, fatal=False) or \
             self._html_search_regex(r'<h\d+\b[^>]+\bclass="article_title">([^<]+)<', webpage, 'title')
 
         upload_date = unified_strdate(
-            '%s-%s-%s' % (mobj.group('year'), mobj.group('month'), mobj.group('day')))
+            '{}-{}-{}'.format(mobj.group('year'), mobj.group('month'), mobj.group('day')))
         if not upload_date:
             upload_date = unified_strdate(self._html_search_regex(
                 r'<p+\b[^>]+\bclass="article_date">([^<]+)<', webpage, 'upload date', default=None))
 
         player_data['video'] = player_data.pop('token')
-        player_page = self._download_webpage('https://player.mediaklikk.hu/playernew/player.php', video_id, query=player_data)
-        playlist_url = self._proto_relative_url(compat_urllib_parse_unquote(
-            self._html_search_regex(r'\"file\":\s*\"(\\?/\\?/.*playlist\.m3u8)\"', player_page, 'playlist_url')).replace('\\/', '/'))
+        player_page = self._download_webpage(
+            'https://player.mediaklikk.hu/playernew/player.php', video_id,
+            query=player_data, headers={'Referer': url})
+        player_json = self._search_json(
+            r'\bpl\.setup\s*\(', player_page, 'player json', video_id, end_pattern=r'\);')
+        playlist_url = traverse_obj(
+            player_json, ('playlist', lambda _, v: v['type'] == 'hls', 'file', {url_or_none}), get_all=False)
+        if not playlist_url:
+            raise ExtractorError('Unable to extract playlist url')
 
-        formats = self._extract_wowza_formats(
-            playlist_url, video_id, skip_protocols=['f4m', 'smil', 'dash'])
+        formats, subtitles = self._extract_m3u8_formats_and_subtitles(playlist_url, video_id)
 
         return {
             'id': video_id,
             'title': title,
             'display_id': display_id,
             'formats': formats,
+            'subtitles': subtitles,
             'upload_date': upload_date,
-            'thumbnail': player_data.get('bgImage') or self._og_search_thumbnail(webpage)
+            'thumbnail': player_data.get('bgImage') or self._og_search_thumbnail(webpage),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/mediaset.py b/plugins/youtube_download/yt_dlp/extractor/mediaset.py
index e3b728d..8cb18e6 100644
--- a/plugins/youtube_download/yt_dlp/extractor/mediaset.py
+++ b/plugins/youtube_download/yt_dlp/extractor/mediaset.py
@@ -5,11 +5,11 @@ from .theplatform import ThePlatformBaseIE
 from ..utils import (
     ExtractorError,
     GeoRestrictedError,
-    int_or_none,
     OnDemandPagedList,
+    int_or_none,
     try_get,
-    urljoin,
     update_url_query,
+    urljoin,
 )
 
 
@@ -29,7 +29,7 @@ class MediasetIE(ThePlatformBaseIE):
                     '''
 
     _EMBED_REGEX = [
-        rf'<iframe[^>]+src=[\'"](?P<url>(?:https?:)?//(?:\w+\.)+mediaset\.it/player/(?:v\d+/)?index\.html\?\S*?programGuid={_GUID_RE})[\'"&]'
+        rf'<iframe[^>]+src=[\'"](?P<url>(?:https?:)?//(?:\w+\.)+mediaset\.it/player/(?:v\d+/)?index\.html\?\S*?programGuid={_GUID_RE})[\'"&]',
     ]
     _TESTS = [{
         # full episode
@@ -73,6 +73,7 @@ class MediasetIE(ThePlatformBaseIE):
             'season_number': 5,
             'episode_number': 5,
             'chapters': [{'start_time': 0.0, 'end_time': 3409.08}, {'start_time': 3409.08, 'end_time': 6565.008}],
+            'categories': ['Informazione'],
         },
     }, {
         # DRM
@@ -127,7 +128,8 @@ class MediasetIE(ThePlatformBaseIE):
         },
         'params': {
             'skip_download': True,
-        }
+        },
+        'skip': 'Dead link',
     }, {
         # WittyTV embed
         'url': 'https://www.wittytv.it/mauriziocostanzoshow/ultima-puntata-venerdi-25-novembre/',
@@ -148,17 +150,18 @@ class MediasetIE(ThePlatformBaseIE):
             'season_number': 12,
             'episode': 'Episode 8',
             'episode_number': 8,
+            'categories': ['Intrattenimento'],
         },
         'params': {
             'skip_download': True,
-        }
+        },
     }]
 
     def _parse_smil_formats_and_subtitles(
             self, smil, smil_url, video_id, namespace=None, f4m_params=None, transform_rtmp_url=None):
         for video in smil.findall(self._xpath_ns('.//video', namespace)):
             video.attrib['src'] = re.sub(r'(https?://vod05)t(-mediaset-it\.akamaized\.net/.+?.mpd)\?.+', r'\1\2', video.attrib['src'])
-        return super(MediasetIE, self)._parse_smil_formats_and_subtitles(
+        return super()._parse_smil_formats_and_subtitles(
             smil, smil_url, video_id, namespace, f4m_params, transform_rtmp_url)
 
     def _check_drm_formats(self, tp_formats, video_id):
diff --git a/plugins/youtube_download/yt_dlp/extractor/mediasite.py b/plugins/youtube_download/yt_dlp/extractor/mediasite.py
index 7ea78ab..ad7ab27 100644
--- a/plugins/youtube_download/yt_dlp/extractor/mediasite.py
+++ b/plugins/youtube_download/yt_dlp/extractor/mediasite.py
@@ -1,31 +1,28 @@
-import re
 import json
+import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_str,
-    compat_urlparse,
-)
 from ..utils import (
     ExtractorError,
     float_or_none,
     mimetype2ext,
+    smuggle_url,
     str_or_none,
     try_call,
     try_get,
-    smuggle_url,
     unsmuggle_url,
     url_or_none,
     urljoin,
 )
-
+from ..utils.traversal import traverse_obj
 
 _ID_RE = r'(?:[0-9a-f]{32,34}|[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12,14})'
 
 
 class MediasiteIE(InfoExtractor):
-    _VALID_URL = r'(?xi)https?://[^/]+/Mediasite/(?:Play|Showcase/[^/#?]+/Presentation)/(?P<id>%s)(?P<query>\?[^#]+|)' % _ID_RE
-    _EMBED_REGEX = [r'(?xi)<iframe\b[^>]+\bsrc=(["\'])(?P<url>(?:(?:https?:)?//[^/]+)?/Mediasite/Play/%s(?:\?.*?)?)\1' % _ID_RE]
+    _VALID_URL = rf'(?xi)https?://[^/]+/Mediasite/(?:Play|Showcase/[^/#?]+/Presentation)/(?P<id>{_ID_RE})(?P<query>\?[^#]+|)'
+    _EMBED_REGEX = [rf'(?xi)<iframe\b[^>]+\bsrc=(["\'])(?P<url>(?:(?:https?:)?//[^/]+)?/Mediasite/Play/{_ID_RE}(?:\?.*?)?)\1']
     _TESTS = [
         {
             'url': 'https://hitsmediaweb.h-its.org/mediasite/Play/2db6c271681e4f199af3c60d1f82869b1d',
@@ -87,7 +84,7 @@ class MediasiteIE(InfoExtractor):
                 'upload_date': '20120409',
                 'timestamp': 1333983600,
                 'duration': 7794,
-            }
+            },
         },
         {
             'url': 'https://collegerama.tudelft.nl/Mediasite/Showcase/livebroadcast/Presentation/ada7020854f743c49fbb45c9ec7dbb351d',
@@ -101,7 +98,7 @@ class MediasiteIE(InfoExtractor):
             # dashed id
             'url': 'https://hitsmediaweb.h-its.org/mediasite/Play/2db6c271-681e-4f19-9af3-c60d1f82869b1d',
             'only_matching': True,
-        }
+        },
     ]
 
     # look in Mediasite.Core.js (Mediasite.ContentStreamType[*])
@@ -118,16 +115,16 @@ class MediasiteIE(InfoExtractor):
         for embed_url in super()._extract_embed_urls(url, webpage):
             yield smuggle_url(embed_url, {'UrlReferrer': url})
 
-    def __extract_slides(self, *, stream_id, snum, Stream, duration, images):
-        slide_base_url = Stream['SlideBaseUrl']
+    def __extract_slides(self, *, stream_id, snum, stream, duration, images):
+        slide_base_url = stream['SlideBaseUrl']
 
-        fname_template = Stream['SlideImageFileNameTemplate']
+        fname_template = stream['SlideImageFileNameTemplate']
         if fname_template != 'slide_{0:D4}.jpg':
             self.report_warning('Unusual slide file name template; report a bug if slide downloading fails')
         fname_template = re.sub(r'\{0:D([0-9]+)\}', r'{0:0\1}', fname_template)
 
         fragments = []
-        for i, slide in enumerate(Stream['Slides']):
+        for i, slide in enumerate(stream['Slides']):
             if i == 0:
                 if slide['Time'] > 0:
                     default_slide = images.get('DefaultSlide')
@@ -142,18 +139,18 @@ class MediasiteIE(InfoExtractor):
                         })
 
             next_time = try_call(
-                lambda: Stream['Slides'][i + 1]['Time'],
+                lambda: stream['Slides'][i + 1]['Time'],
                 lambda: duration,
                 lambda: slide['Time'],
                 expected_type=(int, float))
 
             fragments.append({
                 'path': fname_template.format(slide.get('Number', i + 1)),
-                'duration': (next_time - slide['Time']) / 1000
+                'duration': (next_time - slide['Time']) / 1000,
             })
 
         return {
-            'format_id': '%s-%u.slides' % (stream_id, snum),
+            'format_id': f'{stream_id}-{snum}.slides',
             'ext': 'mhtml',
             'url': slide_base_url,
             'protocol': 'mhtml',
@@ -174,12 +171,12 @@ class MediasiteIE(InfoExtractor):
         redirect_url = urlh.url
 
         # XXX: might have also extracted UrlReferrer and QueryString from the html
-        service_path = compat_urlparse.urljoin(redirect_url, self._html_search_regex(
+        service_path = urllib.parse.urljoin(redirect_url, self._html_search_regex(
             r'<div[^>]+\bid=["\']ServicePath[^>]+>(.+?)</div>', webpage, resource_id,
             default='/Mediasite/PlayerService/PlayerService.svc/json'))
 
         player_options = self._download_json(
-            '%s/GetPlayerOptions' % service_path, resource_id,
+            f'{service_path}/GetPlayerOptions', resource_id,
             headers={
                 'Content-type': 'application/json; charset=utf-8',
                 'X-Requested-With': 'XMLHttpRequest',
@@ -190,25 +187,25 @@ class MediasiteIE(InfoExtractor):
                     'QueryString': query,
                     'UrlReferrer': data.get('UrlReferrer', ''),
                     'UseScreenReader': False,
-                }
-            }).encode('utf-8'))['d']
+                },
+            }).encode())['d']
 
         presentation = player_options['Presentation']
         title = presentation['Title']
 
         if presentation is None:
             raise ExtractorError(
-                'Mediasite says: %s' % player_options['PlayerPresentationStatusMessage'],
+                'Mediasite says: {}'.format(player_options['PlayerPresentationStatusMessage']),
                 expected=True)
 
         thumbnails = []
         formats = []
-        for snum, Stream in enumerate(presentation['Streams']):
-            stream_type = Stream.get('StreamType')
+        for snum, stream in enumerate(presentation['Streams']):
+            stream_type = stream.get('StreamType')
             if stream_type is None:
                 continue
 
-            video_urls = Stream.get('VideoUrls')
+            video_urls = stream.get('VideoUrls')
             if not isinstance(video_urls, list):
                 video_urls = []
 
@@ -216,36 +213,42 @@ class MediasiteIE(InfoExtractor):
                 stream_type, 'type%u' % stream_type)
 
             stream_formats = []
-            for unum, VideoUrl in enumerate(video_urls):
-                video_url = url_or_none(VideoUrl.get('Location'))
+            for unum, video in enumerate(video_urls):
+                video_url = url_or_none(video.get('Location'))
                 if not video_url:
                     continue
                 # XXX: if Stream.get('CanChangeScheme', False), switch scheme to HTTP/HTTPS
 
-                media_type = VideoUrl.get('MediaType')
+                media_type = video.get('MediaType')
+                ext = mimetype2ext(video.get('MimeType'))
                 if media_type == 'SS':
                     stream_formats.extend(self._extract_ism_formats(
                         video_url, resource_id,
-                        ism_id='%s-%u.%u' % (stream_id, snum, unum),
+                        ism_id=f'{stream_id}-{snum}.{unum}',
                         fatal=False))
                 elif media_type == 'Dash':
                     stream_formats.extend(self._extract_mpd_formats(
                         video_url, resource_id,
-                        mpd_id='%s-%u.%u' % (stream_id, snum, unum),
+                        mpd_id=f'{stream_id}-{snum}.{unum}',
+                        fatal=False))
+                elif ext in ('m3u', 'm3u8'):
+                    stream_formats.extend(self._extract_m3u8_formats(
+                        video_url, resource_id,
+                        m3u8_id=f'{stream_id}-{snum}.{unum}',
                         fatal=False))
                 else:
                     stream_formats.append({
-                        'format_id': '%s-%u.%u' % (stream_id, snum, unum),
+                        'format_id': f'{stream_id}-{snum}.{unum}',
                         'url': video_url,
-                        'ext': mimetype2ext(VideoUrl.get('MimeType')),
+                        'ext': ext,
                     })
 
-            if Stream.get('HasSlideContent', False):
-                images = player_options['PlayerLayoutOptions']['Images']
+            images = traverse_obj(player_options, ('PlayerLayoutOptions', 'Images', {dict}))
+            if stream.get('HasSlideContent') and images:
                 stream_formats.append(self.__extract_slides(
                     stream_id=stream_id,
                     snum=snum,
-                    Stream=Stream,
+                    stream=stream,
                     duration=presentation.get('Duration'),
                     images=images,
                 ))
@@ -255,10 +258,10 @@ class MediasiteIE(InfoExtractor):
                 for fmt in stream_formats:
                     fmt['quality'] = -10
 
-            thumbnail_url = Stream.get('ThumbnailUrl')
+            thumbnail_url = stream.get('ThumbnailUrl')
             if thumbnail_url:
                 thumbnails.append({
-                    'id': '%s-%u' % (stream_id, snum),
+                    'id': f'{stream_id}-{snum}',
                     'url': urljoin(redirect_url, thumbnail_url),
                     'preference': -1 if stream_type != 0 else 0,
                 })
@@ -279,15 +282,15 @@ class MediasiteIE(InfoExtractor):
 
 
 class MediasiteCatalogIE(InfoExtractor):
-    _VALID_URL = r'''(?xi)
+    _VALID_URL = rf'''(?xi)
                         (?P<url>https?://[^/]+/Mediasite)
                         /Catalog/Full/
-                        (?P<catalog_id>{0})
+                        (?P<catalog_id>{_ID_RE})
                         (?:
-                            /(?P<current_folder_id>{0})
-                            /(?P<root_dynamic_folder_id>{0})
+                            /(?P<current_folder_id>{_ID_RE})
+                            /(?P<root_dynamic_folder_id>{_ID_RE})
                         )?
-                    '''.format(_ID_RE)
+                    '''
     _TESTS = [{
         'url': 'http://events7.mediasite.com/Mediasite/Catalog/Full/631f9e48530d454381549f955d08c75e21',
         'info_dict': {
@@ -369,7 +372,7 @@ class MediasiteCatalogIE(InfoExtractor):
             headers[anti_forgery_header] = anti_forgery_token
 
         catalog = self._download_json(
-            '%s/Catalog/Data/GetPresentationsForFolder' % mediasite_url,
+            f'{mediasite_url}/Catalog/Data/GetPresentationsForFolder',
             catalog_id, data=json.dumps(data).encode(), headers=headers)
 
         entries = []
@@ -380,13 +383,13 @@ class MediasiteCatalogIE(InfoExtractor):
             if not video_id:
                 continue
             entries.append(self.url_result(
-                '%s/Play/%s' % (mediasite_url, video_id),
+                f'{mediasite_url}/Play/{video_id}',
                 ie=MediasiteIE.ie_key(), video_id=video_id))
 
         title = try_get(
-            catalog, lambda x: x['CurrentFolder']['Name'], compat_str)
+            catalog, lambda x: x['CurrentFolder']['Name'], str)
 
-        return self.playlist_result(entries, catalog_id, title,)
+        return self.playlist_result(entries, catalog_id, title)
 
 
 class MediasiteNamedCatalogIE(InfoExtractor):
@@ -404,8 +407,8 @@ class MediasiteNamedCatalogIE(InfoExtractor):
         webpage = self._download_webpage(url, catalog_name)
 
         catalog_id = self._search_regex(
-            r'CatalogId\s*:\s*["\'](%s)' % _ID_RE, webpage, 'catalog id')
+            rf'CatalogId\s*:\s*["\']({_ID_RE})', webpage, 'catalog id')
 
         return self.url_result(
-            '%s/Catalog/Full/%s' % (mediasite_url, catalog_id),
+            f'{mediasite_url}/Catalog/Full/{catalog_id}',
             ie=MediasiteCatalogIE.ie_key(), video_id=catalog_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/mediastream.py b/plugins/youtube_download/yt_dlp/extractor/mediastream.py
index cef769f..d2a22f9 100644
--- a/plugins/youtube_download/yt_dlp/extractor/mediastream.py
+++ b/plugins/youtube_download/yt_dlp/extractor/mediastream.py
@@ -3,8 +3,11 @@ import re
 from .common import InfoExtractor
 from ..utils import (
     clean_html,
+    filter_dict,
+    parse_qs,
     remove_end,
     traverse_obj,
+    update_url_query,
     urljoin,
 )
 
@@ -14,7 +17,7 @@ class MediaStreamBaseIE(InfoExtractor):
     _BASE_URL_RE = r'https?://mdstrm\.com/(?:embed|live-stream)'
 
     def _extract_mediastream_urls(self, webpage):
-        yield from traverse_obj(list(self._yield_json_ld(webpage, None)), (
+        yield from traverse_obj(list(self._yield_json_ld(webpage, None, default={})), (
             lambda _, v: v['@type'] == 'VideoObject', ('embedUrl', 'contentUrl'),
             {lambda x: x if re.match(rf'{self._BASE_URL_RE}/\w+', x) else None}))
 
@@ -106,15 +109,30 @@ class MediaStreamIE(MediaStreamBaseIE):
         video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
 
-        if 'Debido a tu ubicación no puedes ver el contenido' in webpage:
-            self.raise_geo_restricted()
+        for message in [
+            'Debido a tu ubicación no puedes ver el contenido',
+            'You are not allowed to watch this video: Geo Fencing Restriction',
+            'Este contenido no está disponible en tu zona geográfica.',
+            'El contenido sólo está disponible dentro de',
+        ]:
+            if message in webpage:
+                self.raise_geo_restricted()
 
         player_config = self._search_json(r'window\.MDSTRM\.OPTIONS\s*=', webpage, 'metadata', video_id)
 
         formats, subtitles = [], {}
         for video_format in player_config['src']:
             if video_format == 'hls':
-                fmts, subs = self._extract_m3u8_formats_and_subtitles(player_config['src'][video_format], video_id)
+                params = {
+                    'at': 'web-app',
+                    'access_token': traverse_obj(parse_qs(url), ('access_token', 0)),
+                }
+                for name, key in (('MDSTRMUID', 'uid'), ('MDSTRMSID', 'sid'), ('MDSTRMPID', 'pid'), ('VERSION', 'av')):
+                    params[key] = self._search_regex(
+                        rf'window\.{name}\s*=\s*["\']([^"\']+)["\'];', webpage, key, default=None)
+
+                fmts, subs = self._extract_m3u8_formats_and_subtitles(
+                    update_url_query(player_config['src'][video_format], filter_dict(params)), video_id)
                 formats.extend(fmts)
                 self._merge_subtitles(subs, target=subtitles)
             elif video_format == 'mpd':
diff --git a/plugins/youtube_download/yt_dlp/extractor/mediaworksnz.py b/plugins/youtube_download/yt_dlp/extractor/mediaworksnz.py
index 62e37d2..be67b63 100644
--- a/plugins/youtube_download/yt_dlp/extractor/mediaworksnz.py
+++ b/plugins/youtube_download/yt_dlp/extractor/mediaworksnz.py
@@ -24,8 +24,8 @@ class MediaWorksNZVODIE(InfoExtractor):
             'timestamp': 1604268608,
             'upload_date': '20201101',
             'thumbnail': r're:^https?://.*\.jpg$',
-            'channel': 'George FM'
-        }
+            'channel': 'George FM',
+        },
     }, {
         # has audio-only format
         'url': 'https://vodupload-api.mediaworks.nz/library/asset/published/VID02627',
@@ -40,7 +40,7 @@ class MediaWorksNZVODIE(InfoExtractor):
             'upload_date': '20220822',
             'timestamp': 1661152289,
         },
-        'params': {'format': 'ba[ext=mp3]'}
+        'params': {'format': 'ba[ext=mp3]'},
     }]
 
     _WEBPAGE_TESTS = [{
@@ -55,7 +55,7 @@ class MediaWorksNZVODIE(InfoExtractor):
             'thumbnail': r're:^https?://.*\.jpg$',
             'description': 'Socrates Walks Into A Bar Podcast Episode 1',
             'upload_date': '20220720',
-        }
+        },
     }]
 
     @classmethod
@@ -63,7 +63,7 @@ class MediaWorksNZVODIE(InfoExtractor):
         for mobj in re.finditer(
             rf'''(?x)<div\s+\bid=["']Player-Attributes-JWID[^>]+\b
             data-request-url=["']{cls._VALID_URL_BASE_RE}["'][^>]+\b
-            data-asset-id=["']{cls._VALID_URL_ID_RE}["']''', webpage
+            data-asset-id=["']{cls._VALID_URL_ID_RE}["']''', webpage,
         ):
             yield f'https://vodupload-api.mediaworks.nz/library/asset/published/{mobj.group("id")}'
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/medici.py b/plugins/youtube_download/yt_dlp/extractor/medici.py
index 328ccd2..b6235b6 100644
--- a/plugins/youtube_download/yt_dlp/extractor/medici.py
+++ b/plugins/youtube_download/yt_dlp/extractor/medici.py
@@ -1,67 +1,153 @@
+import urllib.parse
+
 from .common import InfoExtractor
 from ..utils import (
-    unified_strdate,
-    update_url_query,
-    urlencode_postdata,
+    filter_dict,
+    parse_iso8601,
+    traverse_obj,
+    try_call,
+    url_or_none,
 )
 
 
 class MediciIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?medici\.tv/#!/(?P<id>[^?#&]+)'
-    _TEST = {
-        'url': 'http://www.medici.tv/#!/daniel-harding-frans-helmerson-verbier-festival-music-camp',
-        'md5': '004c21bb0a57248085b6ff3fec72719d',
+    _VALID_URL = r'https?://(?:(?P<sub>www|edu)\.)?medici\.tv/[a-z]{2}/[\w.-]+/(?P<id>[^/?#&]+)'
+    _TESTS = [{
+        'url': 'https://www.medici.tv/en/operas/thomas-ades-the-exterminating-angel-calixto-bieito-opera-bastille-paris',
+        'md5': 'd483f74e7a7a9eac0dbe152ab189050d',
         'info_dict': {
-            'id': '3059',
-            'ext': 'flv',
-            'title': 'Daniel Harding conducts the Verbier Festival Music Camp \u2013 With Frans Helmerson',
-            'description': 'md5:322a1e952bafb725174fd8c1a8212f58',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'upload_date': '20170408',
+            'id': '8032',
+            'ext': 'mp4',
+            'title': 'Thomas Adès\'s The Exterminating Angel',
+            'description': 'md5:708ae6350dadc604225b4a6e32482bab',
+            'thumbnail': r're:https://.+/.+\.jpg',
+            'upload_date': '20240304',
+            'timestamp': 1709561766,
+            'display_id': 'thomas-ades-the-exterminating-angel-calixto-bieito-opera-bastille-paris',
         },
-    }
+        'expected_warnings': [r'preview'],
+    }, {
+        'url': 'https://edu.medici.tv/en/operas/wagner-lohengrin-paris-opera-kirill-serebrennikov-piotr-beczala-kwangchul-youn-johanni-van-oostrum',
+        'md5': '4ef3f4079a6e1c617584463a9eb84f99',
+        'info_dict': {
+            'id': '7900',
+            'ext': 'mp4',
+            'title': 'Wagner\'s Lohengrin',
+            'description': 'md5:a384a62937866101f86902f21752cd89',
+            'thumbnail': r're:https://.+/.+\.jpg',
+            'upload_date': '20231017',
+            'timestamp': 1697554771,
+            'display_id': 'wagner-lohengrin-paris-opera-kirill-serebrennikov-piotr-beczala-kwangchul-youn-johanni-van-oostrum',
+        },
+        'expected_warnings': [r'preview'],
+    }, {
+        'url': 'https://www.medici.tv/en/concerts/sergey-smbatyan-conducts-mansurian-chouchane-siranossian-mario-brunello',
+        'md5': '9dd757e53b22b2511e85ea9ea60e4815',
+        'info_dict': {
+            'id': '5712',
+            'ext': 'mp4',
+            'title': 'Sergey Smbatyan conducts Tigran Mansurian — With Chouchane Siranossian and Mario Brunello',
+            'thumbnail': r're:https://.+/.+\.jpg',
+            'description': 'md5:9411fe44c874bb10e9af288c65816e41',
+            'upload_date': '20200323',
+            'timestamp': 1584975600,
+            'display_id': 'sergey-smbatyan-conducts-mansurian-chouchane-siranossian-mario-brunello',
+        },
+        'expected_warnings': [r'preview'],
+    }, {
+        'url': 'https://www.medici.tv/en/ballets/carmen-ballet-choregraphie-de-jiri-bubenicek-teatro-dellopera-di-roma',
+        'md5': '40f5e76cb701a97a6d7ba23b62c49990',
+        'info_dict': {
+            'id': '7857',
+            'ext': 'mp4',
+            'title': 'Carmen by Jiří Bubeníček after Roland Petit, music by Bizet, de Falla, Castelnuovo-Tedesco, and Bonolis',
+            'thumbnail': r're:https://.+/.+\.jpg',
+            'description': 'md5:0f15a15611ed748020c769873e10a8bb',
+            'upload_date': '20240223',
+            'timestamp': 1708707600,
+            'display_id': 'carmen-ballet-choregraphie-de-jiri-bubenicek-teatro-dellopera-di-roma',
+        },
+        'expected_warnings': [r'preview'],
+    }, {
+        'url': 'https://www.medici.tv/en/documentaries/la-sonnambula-liege-2023-documentaire',
+        'md5': '87ff198018ce79a34757ab0dd6f21080',
+        'info_dict': {
+            'id': '7513',
+            'ext': 'mp4',
+            'title': 'La Sonnambula',
+            'thumbnail': r're:https://.+/.+\.jpg',
+            'description': 'md5:0caf9109a860fd50cd018df062a67f34',
+            'upload_date': '20231103',
+            'timestamp': 1699010830,
+            'display_id': 'la-sonnambula-liege-2023-documentaire',
+        },
+        'expected_warnings': [r'preview'],
+    }, {
+        'url': 'https://edu.medici.tv/en/masterclasses/yvonne-loriod-olivier-messiaen',
+        'md5': 'fb5dcec46d76ad20fbdbaabb01da191d',
+        'info_dict': {
+            'id': '3024',
+            'ext': 'mp4',
+            'title': 'Olivier Messiaen and Yvonne Loriod, pianists and teachers',
+            'thumbnail': r're:https://.+/.+\.jpg',
+            'description': 'md5:aab948e2f7690214b5c28896c83f1fc1',
+            'upload_date': '20150223',
+            'timestamp': 1424706608,
+            'display_id': 'yvonne-loriod-olivier-messiaen',
+        },
+        'skip': 'Requires authentication; preview starts in the middle',
+    }, {
+        'url': 'https://www.medici.tv/en/jazz/makaya-mccraven-la-rochelle',
+        'md5': '4cc279a8b06609782747c8f50beea2b3',
+        'info_dict': {
+            'id': '7922',
+            'ext': 'mp4',
+            'title': 'NEW: Makaya McCraven in La Rochelle',
+            'thumbnail': r're:https://.+/.+\.jpg',
+            'description': 'md5:b5a8aaeb6993d8ccb18bde8abb8aa8d2',
+            'upload_date': '20231228',
+            'timestamp': 1703754863,
+            'display_id': 'makaya-mccraven-la-rochelle',
+        },
+        'expected_warnings': [r'preview'],
+    }]
 
     def _real_extract(self, url):
-        video_id = self._match_id(url)
+        display_id, subdomain = self._match_valid_url(url).group('id', 'sub')
+        self._request_webpage(url, display_id, 'Requesting CSRF token cookie')
 
-        # Sets csrftoken cookie
-        self._download_webpage(url, video_id)
-
-        MEDICI_URL = 'http://www.medici.tv/'
+        subdomain = 'edu-' if subdomain == 'edu' else ''
+        origin = f'https://{urllib.parse.urlparse(url).hostname}'
 
         data = self._download_json(
-            MEDICI_URL, video_id,
-            data=urlencode_postdata({
-                'json': 'true',
-                'page': '/%s' % video_id,
-                'timezone_offset': -420,
-            }), headers={
-                'X-CSRFToken': self._get_cookies(url)['csrftoken'].value,
-                'X-Requested-With': 'XMLHttpRequest',
-                'Referer': MEDICI_URL,
-                'Content-Type': 'application/x-www-form-urlencoded',
-            })
+            f'https://api.medici.tv/{subdomain}satie/edito/movie-file/{display_id}/', display_id,
+            headers=filter_dict({
+                'Authorization': try_call(
+                    lambda: urllib.parse.unquote(self._get_cookies(url)['auth._token.mAuth'].value)),
+                'Device-Type': 'web',
+                'Origin': origin,
+                'Referer': f'{origin}/',
+                'Accept': 'application/json, text/plain, */*',
+            }))
 
-        video = data['video']['videos']['video1']
+        if not traverse_obj(data, ('video', 'is_full_video')) and traverse_obj(
+                data, ('video', 'is_limited_by_user_access')):
+            self.report_warning(
+                'The full video is for subscribers only. Only previews will be downloaded. If you '
+                'have used the --cookies-from-browser option, try using the --cookies option instead')
 
-        title = video.get('nom') or data['title']
-
-        video_id = video.get('id') or video_id
-        formats = self._extract_f4m_formats(
-            update_url_query(video['url_akamai'], {
-                'hdcore': '3.1.0',
-                'plugin=aasp': '3.1.0.43.124',
-            }), video_id, f4m_id='hds')
-
-        description = data.get('meta_description')
-        thumbnail = video.get('url_thumbnail') or data.get('main_image')
-        upload_date = unified_strdate(data['video'].get('date'))
+        formats, subtitles = self._extract_m3u8_formats_and_subtitles(
+            data['video']['video_url'], display_id, 'mp4')
 
         return {
-            'id': video_id,
-            'title': title,
-            'description': description,
-            'thumbnail': thumbnail,
-            'upload_date': upload_date,
+            'id': str(data['id']),
+            'display_id': display_id,
             'formats': formats,
+            'subtitles': subtitles,
+            **traverse_obj(data, {
+                'title': ('title', {str}),
+                'description': ('subtitle', {str}),
+                'thumbnail': ('picture', {url_or_none}),
+                'timestamp': ('date_publish', {parse_iso8601}),
+            }),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/megaphone.py b/plugins/youtube_download/yt_dlp/extractor/megaphone.py
index af80523..d249a84 100644
--- a/plugins/youtube_download/yt_dlp/extractor/megaphone.py
+++ b/plugins/youtube_download/yt_dlp/extractor/megaphone.py
@@ -5,18 +5,18 @@ from ..utils import js_to_json
 class MegaphoneIE(InfoExtractor):
     IE_NAME = 'megaphone.fm'
     IE_DESC = 'megaphone.fm embedded players'
-    _VALID_URL = r'https://player\.megaphone\.fm/(?P<id>[A-Z0-9]+)'
+    _VALID_URL = r'https?://player\.megaphone\.fm/(?P<id>[A-Z0-9]+)'
     _EMBED_REGEX = [rf'<iframe[^>]*?\ssrc=["\'](?P<url>{_VALID_URL})']
     _TEST = {
-        'url': 'https://player.megaphone.fm/GLT9749789991?"',
+        'url': 'https://player.megaphone.fm/GLT9749789991',
         'md5': '4816a0de523eb3e972dc0dda2c191f96',
         'info_dict': {
             'id': 'GLT9749789991',
             'ext': 'mp3',
             'title': '#97 What Kind Of Idiot Gets Phished?',
             'thumbnail': r're:^https://.*\.png.*$',
-            'duration': 1776.26375,
-            'author': 'Reply All',
+            'duration': 1998.36,
+            'creators': ['Reply All'],
         },
     }
 
@@ -40,7 +40,7 @@ class MegaphoneIE(InfoExtractor):
             'id': video_id,
             'thumbnail': thumbnail,
             'title': title,
-            'author': author,
+            'creators': [author] if author else None,
             'duration': episode_data['duration'],
             'formats': formats,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/meipai.py b/plugins/youtube_download/yt_dlp/extractor/meipai.py
index 1a6f3cd..e4c145c 100644
--- a/plugins/youtube_download/yt_dlp/extractor/meipai.py
+++ b/plugins/youtube_download/yt_dlp/extractor/meipai.py
@@ -25,7 +25,7 @@ class MeipaiIE(InfoExtractor):
             'view_count': 35511,
             'creator': '她她-TATA',
             'tags': ['葉子', '阿桑', '余姿昀', '超級女聲'],
-        }
+        },
     }, {
         # record of live streaming
         'url': 'http://www.meipai.com/media/585526361',
@@ -41,7 +41,7 @@ class MeipaiIE(InfoExtractor):
             'upload_date': '20160919',
             'view_count': 1215,
             'creator': '她她-TATA',
-        }
+        },
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/melonvod.py b/plugins/youtube_download/yt_dlp/extractor/melonvod.py
index 1d3fff8..05d9de8 100644
--- a/plugins/youtube_download/yt_dlp/extractor/melonvod.py
+++ b/plugins/youtube_download/yt_dlp/extractor/melonvod.py
@@ -20,7 +20,7 @@ class MelonVODIE(InfoExtractor):
         },
         'params': {
             'skip_download': 'm3u8 download',
-        }
+        },
     }
 
     def _real_extract(self, url):
@@ -64,5 +64,5 @@ class MelonVODIE(InfoExtractor):
             'thumbnail': thumbnail,
             'upload_date': upload_date,
             'duration': duration,
-            'formats': formats
+            'formats': formats,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/meta.py b/plugins/youtube_download/yt_dlp/extractor/meta.py
deleted file mode 100644
index 7c11e60..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/meta.py
+++ /dev/null
@@ -1,70 +0,0 @@
-from .common import InfoExtractor
-from .pladform import PladformIE
-from ..utils import (
-    unescapeHTML,
-    int_or_none,
-    ExtractorError,
-)
-
-
-class METAIE(InfoExtractor):
-    _VALID_URL = r'https?://video\.meta\.ua/(?:iframe/)?(?P<id>[0-9]+)'
-    _TESTS = [{
-        'url': 'http://video.meta.ua/5502115.video',
-        'md5': '71b6f3ee274bef16f1ab410f7f56b476',
-        'info_dict': {
-            'id': '5502115',
-            'ext': 'mp4',
-            'title': 'Sony Xperia Z camera test [HQ]',
-            'description': 'Xperia Z shoots video in FullHD HDR.',
-            'uploader_id': 'nomobile',
-            'uploader': 'CHЁZA.TV',
-            'upload_date': '20130211',
-        },
-        'add_ie': ['Youtube'],
-    }, {
-        'url': 'http://video.meta.ua/iframe/5502115',
-        'only_matching': True,
-    }, {
-        # pladform embed
-        'url': 'http://video.meta.ua/7121015.video',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-
-        st_html5 = self._search_regex(
-            r"st_html5\s*=\s*'#([^']+)'", webpage, 'uppod html5 st', default=None)
-
-        if st_html5:
-            # uppod st decryption algorithm is reverse engineered from function un(s) at uppod.js
-            json_str = ''
-            for i in range(0, len(st_html5), 3):
-                json_str += '&#x0%s;' % st_html5[i:i + 3]
-            uppod_data = self._parse_json(unescapeHTML(json_str), video_id)
-            error = uppod_data.get('customnotfound')
-            if error:
-                raise ExtractorError('%s said: %s' % (self.IE_NAME, error), expected=True)
-
-            video_url = uppod_data['file']
-            info = {
-                'id': video_id,
-                'url': video_url,
-                'title': uppod_data.get('comment') or self._og_search_title(webpage),
-                'description': self._og_search_description(webpage, default=None),
-                'thumbnail': uppod_data.get('poster') or self._og_search_thumbnail(webpage),
-                'duration': int_or_none(self._og_search_property(
-                    'video:duration', webpage, default=None)),
-            }
-            if 'youtube.com/' in video_url:
-                info.update({
-                    '_type': 'url_transparent',
-                    'ie_key': 'Youtube',
-                })
-            return info
-
-        pladform_url = PladformIE._extract_url(webpage)
-        if pladform_url:
-            return self.url_result(pladform_url)
diff --git a/plugins/youtube_download/yt_dlp/extractor/metacafe.py b/plugins/youtube_download/yt_dlp/extractor/metacafe.py
deleted file mode 100644
index d7f5def..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/metacafe.py
+++ /dev/null
@@ -1,281 +0,0 @@
-import json
-import re
-import urllib.parse
-
-from .common import InfoExtractor
-from ..compat import compat_parse_qs, compat_urllib_parse_unquote
-from ..utils import (
-    ExtractorError,
-    determine_ext,
-    get_element_by_attribute,
-    int_or_none,
-    mimetype2ext,
-)
-
-
-class MetacafeIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?metacafe\.com/watch/(?P<id>[^/]+)/(?P<display_id>[^/?#]+)'
-    _DISCLAIMER = 'http://www.metacafe.com/family_filter/'
-    _FILTER_POST = 'http://www.metacafe.com/f/index.php?inputType=filter&controllerGroup=user'
-    IE_NAME = 'metacafe'
-    _TESTS = [
-        # Youtube video
-        {
-            'add_ie': ['Youtube'],
-            'url': 'http://metacafe.com/watch/yt-_aUehQsCQtM/the_electric_company_short_i_pbs_kids_go/',
-            'info_dict': {
-                'id': '_aUehQsCQtM',
-                'ext': 'mp4',
-                'upload_date': '20090102',
-                'title': 'The Electric Company | "Short I" | PBS KIDS GO!',
-                'description': 'md5:2439a8ef6d5a70e380c22f5ad323e5a8',
-                'uploader': 'PBS',
-                'uploader_id': 'PBS'
-            }
-        },
-        # Normal metacafe video
-        {
-            'url': 'http://www.metacafe.com/watch/11121940/news_stuff_you_wont_do_with_your_playstation_4/',
-            'md5': '6e0bca200eaad2552e6915ed6fd4d9ad',
-            'info_dict': {
-                'id': '11121940',
-                'ext': 'mp4',
-                'title': 'News: Stuff You Won\'t Do with Your PlayStation 4',
-                'uploader': 'ign',
-                'description': 'Sony released a massive FAQ on the PlayStation Blog detailing the PS4\'s capabilities and limitations.',
-            },
-            'skip': 'Page is temporarily unavailable.',
-        },
-        # metacafe video with family filter
-        {
-            'url': 'http://www.metacafe.com/watch/2155630/adult_art_by_david_hart_156/',
-            'md5': 'b06082c5079bbdcde677a6291fbdf376',
-            'info_dict': {
-                'id': '2155630',
-                'ext': 'mp4',
-                'title': 'Adult Art By David Hart 156',
-                'uploader': '63346',
-                'description': 'md5:9afac8fc885252201ad14563694040fc',
-            },
-            'params': {
-                'skip_download': True,
-            },
-        },
-        # AnyClip video
-        {
-            'url': 'http://www.metacafe.com/watch/an-dVVXnuY7Jh77J/the_andromeda_strain_1971_stop_the_bomb_part_3/',
-            'info_dict': {
-                'id': 'an-dVVXnuY7Jh77J',
-                'ext': 'mp4',
-                'title': 'The Andromeda Strain (1971): Stop the Bomb Part 3',
-                'uploader': 'AnyClip',
-                'description': 'md5:cbef0460d31e3807f6feb4e7a5952e5b',
-            },
-        },
-        # age-restricted video
-        {
-            'url': 'http://www.metacafe.com/watch/5186653/bbc_internal_christmas_tape_79_uncensored_outtakes_etc/',
-            'md5': '98dde7c1a35d02178e8ab7560fe8bd09',
-            'info_dict': {
-                'id': '5186653',
-                'ext': 'mp4',
-                'title': 'BBC INTERNAL Christmas Tape \'79 - UNCENSORED Outtakes, Etc.',
-                'uploader': 'Dwayne Pipe',
-                'description': 'md5:950bf4c581e2c059911fa3ffbe377e4b',
-                'age_limit': 18,
-            },
-        },
-        # cbs video
-        {
-            'url': 'http://www.metacafe.com/watch/cb-8VD4r_Zws8VP/open_this_is_face_the_nation_february_9/',
-            'info_dict': {
-                'id': '8VD4r_Zws8VP',
-                'ext': 'flv',
-                'title': 'Open: This is Face the Nation, February 9',
-                'description': 'md5:8a9ceec26d1f7ed6eab610834cc1a476',
-                'duration': 96,
-                'uploader': 'CBSI-NEW',
-                'upload_date': '20140209',
-                'timestamp': 1391959800,
-            },
-            'params': {
-                # rtmp download
-                'skip_download': True,
-            },
-        },
-        # Movieclips.com video
-        {
-            'url': 'http://www.metacafe.com/watch/mv-Wy7ZU/my_week_with_marilyn_do_you_love_me/',
-            'info_dict': {
-                'id': 'mv-Wy7ZU',
-                'ext': 'mp4',
-                'title': 'My Week with Marilyn - Do You Love Me?',
-                'description': 'From the movie My Week with Marilyn - Colin (Eddie Redmayne) professes his love to Marilyn (Michelle Williams) and gets her to promise to return to set and finish the movie.',
-                'uploader': 'movie_trailers',
-                'duration': 176,
-            },
-            'params': {
-                'skip_download': 'requires rtmpdump',
-            }
-        }
-    ]
-
-    def report_disclaimer(self):
-        self.to_screen('Retrieving disclaimer')
-
-    def _real_extract(self, url):
-        # Extract id and simplified title from URL
-        video_id, display_id = self._match_valid_url(url).groups()
-
-        # the video may come from an external site
-        m_external = re.match(r'^(\w{2})-(.*)$', video_id)
-        if m_external is not None:
-            prefix, ext_id = m_external.groups()
-            # Check if video comes from YouTube
-            if prefix == 'yt':
-                return self.url_result('http://www.youtube.com/watch?v=%s' % ext_id, 'Youtube')
-            # CBS videos use theplatform.com
-            if prefix == 'cb':
-                return self.url_result('theplatform:%s' % ext_id, 'ThePlatform')
-
-        headers = {
-            # Disable family filter
-            'Cookie': 'user=%s; ' % urllib.parse.quote(json.dumps({'ffilter': False}))
-        }
-
-        # AnyClip videos require the flashversion cookie so that we get the link
-        # to the mp4 file
-        if video_id.startswith('an-'):
-            headers['Cookie'] += 'flashVersion=0; '
-
-        # Retrieve video webpage to extract further information
-        webpage = self._download_webpage(url, video_id, headers=headers)
-
-        error = get_element_by_attribute(
-            'class', 'notfound-page-title', webpage)
-        if error:
-            raise ExtractorError(error, expected=True)
-
-        video_title = self._html_search_meta(
-            ['og:title', 'twitter:title'], webpage, 'title', default=None) or self._search_regex(r'<h1>(.*?)</h1>', webpage, 'title')
-
-        # Extract URL, uploader and title from webpage
-        self.report_extraction(video_id)
-        video_url = None
-        mobj = re.search(r'(?m)&(?:media|video)URL=([^&]+)', webpage)
-        if mobj is not None:
-            mediaURL = compat_urllib_parse_unquote(mobj.group(1))
-            video_ext = determine_ext(mediaURL)
-
-            # Extract gdaKey if available
-            mobj = re.search(r'(?m)&gdaKey=(.*?)&', webpage)
-            if mobj is None:
-                video_url = mediaURL
-            else:
-                gdaKey = mobj.group(1)
-                video_url = '%s?__gda__=%s' % (mediaURL, gdaKey)
-        if video_url is None:
-            mobj = re.search(r'<video src="([^"]+)"', webpage)
-            if mobj:
-                video_url = mobj.group(1)
-                video_ext = 'mp4'
-        if video_url is None:
-            flashvars = self._search_regex(
-                r' name="flashvars" value="(.*?)"', webpage, 'flashvars',
-                default=None)
-            if flashvars:
-                vardict = compat_parse_qs(flashvars)
-                if 'mediaData' not in vardict:
-                    raise ExtractorError('Unable to extract media URL')
-                mobj = re.search(
-                    r'"mediaURL":"(?P<mediaURL>http.*?)",(.*?)"key":"(?P<key>.*?)"', vardict['mediaData'][0])
-                if mobj is None:
-                    raise ExtractorError('Unable to extract media URL')
-                mediaURL = mobj.group('mediaURL').replace('\\/', '/')
-                video_url = '%s?__gda__=%s' % (mediaURL, mobj.group('key'))
-                video_ext = determine_ext(video_url)
-        if video_url is None:
-            player_url = self._search_regex(
-                r"swfobject\.embedSWF\('([^']+)'",
-                webpage, 'config URL', default=None)
-            if player_url:
-                config_url = self._search_regex(
-                    r'config=(.+)$', player_url, 'config URL')
-                config_doc = self._download_xml(
-                    config_url, video_id,
-                    note='Downloading video config')
-                smil_url = config_doc.find('.//properties').attrib['smil_file']
-                smil_doc = self._download_xml(
-                    smil_url, video_id,
-                    note='Downloading SMIL document')
-                base_url = smil_doc.find('./head/meta').attrib['base']
-                video_url = []
-                for vn in smil_doc.findall('.//video'):
-                    br = int(vn.attrib['system-bitrate'])
-                    play_path = vn.attrib['src']
-                    video_url.append({
-                        'format_id': 'smil-%d' % br,
-                        'url': base_url,
-                        'play_path': play_path,
-                        'page_url': url,
-                        'player_url': player_url,
-                        'ext': play_path.partition(':')[0],
-                    })
-        if video_url is None:
-            flashvars = self._parse_json(self._search_regex(
-                r'flashvars\s*=\s*({.*});', webpage, 'flashvars',
-                default=None), video_id, fatal=False)
-            if flashvars:
-                video_url = []
-                for source in flashvars.get('sources'):
-                    source_url = source.get('src')
-                    if not source_url:
-                        continue
-                    ext = mimetype2ext(source.get('type')) or determine_ext(source_url)
-                    if ext == 'm3u8':
-                        video_url.extend(self._extract_m3u8_formats(
-                            source_url, video_id, 'mp4',
-                            'm3u8_native', m3u8_id='hls', fatal=False))
-                    else:
-                        video_url.append({
-                            'url': source_url,
-                            'ext': ext,
-                        })
-
-        if video_url is None:
-            raise ExtractorError('Unsupported video type')
-
-        description = self._html_search_meta(
-            ['og:description', 'twitter:description', 'description'],
-            webpage, 'title', fatal=False)
-        thumbnail = self._html_search_meta(
-            ['og:image', 'twitter:image'], webpage, 'title', fatal=False)
-        video_uploader = self._html_search_regex(
-            r'submitter=(.*?);|googletag\.pubads\(\)\.setTargeting\("(?:channel|submiter)","([^"]+)"\);',
-            webpage, 'uploader nickname', fatal=False)
-        duration = int_or_none(
-            self._html_search_meta('video:duration', webpage, default=None))
-        age_limit = (
-            18
-            if re.search(r'(?:"contentRating":|"rating",)"restricted"', webpage)
-            else 0)
-
-        if isinstance(video_url, list):
-            formats = video_url
-        else:
-            formats = [{
-                'url': video_url,
-                'ext': video_ext,
-            }]
-
-        return {
-            'id': video_id,
-            'display_id': display_id,
-            'description': description,
-            'uploader': video_uploader,
-            'title': video_title,
-            'thumbnail': thumbnail,
-            'age_limit': age_limit,
-            'formats': formats,
-            'duration': duration,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/metacritic.py b/plugins/youtube_download/yt_dlp/extractor/metacritic.py
index 1441054..41e20a5 100644
--- a/plugins/youtube_download/yt_dlp/extractor/metacritic.py
+++ b/plugins/youtube_download/yt_dlp/extractor/metacritic.py
@@ -40,9 +40,9 @@ class MetacriticIE(InfoExtractor):
 
         clip = next(c for c in info.findall('playList/clip') if c.find('id').text == video_id)
         formats = []
-        for videoFile in clip.findall('httpURI/videoFile'):
-            rate_str = videoFile.find('rate').text
-            video_url = videoFile.find('filePath').text
+        for video_file in clip.findall('httpURI/videoFile'):
+            rate_str = video_file.find('rate').text
+            video_url = video_file.find('filePath').text
             formats.append({
                 'url': video_url,
                 'ext': 'mp4',
diff --git a/plugins/youtube_download/yt_dlp/extractor/mgoon.py b/plugins/youtube_download/yt_dlp/extractor/mgoon.py
deleted file mode 100644
index 2388a71..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/mgoon.py
+++ /dev/null
@@ -1,81 +0,0 @@
-from .common import InfoExtractor
-from ..utils import (
-    ExtractorError,
-    qualities,
-    unified_strdate,
-)
-
-
-class MgoonIE(InfoExtractor):
-    _VALID_URL = r'''(?x)https?://(?:www\.)?
-    (?:(:?m\.)?mgoon\.com/(?:ch/(?:.+)/v|play/view)|
-        video\.mgoon\.com)/(?P<id>[0-9]+)'''
-    _API_URL = 'http://mpos.mgoon.com/player/video?id={0:}'
-    _TESTS = [
-        {
-            'url': 'http://m.mgoon.com/ch/hi6618/v/5582148',
-            'md5': 'dd46bb66ab35cf6d51cc812fd82da79d',
-            'info_dict': {
-                'id': '5582148',
-                'uploader_id': 'hi6618',
-                'duration': 240.419,
-                'upload_date': '20131220',
-                'ext': 'mp4',
-                'title': 'md5:543aa4c27a4931d371c3f433e8cebebc',
-                'thumbnail': r're:^https?://.*\.jpg$',
-            }
-        },
-        {
-            'url': 'http://www.mgoon.com/play/view/5582148',
-            'only_matching': True,
-        },
-        {
-            'url': 'http://video.mgoon.com/5582148',
-            'only_matching': True,
-        },
-    ]
-
-    def _real_extract(self, url):
-        mobj = self._match_valid_url(url)
-        video_id = mobj.group('id')
-
-        data = self._download_json(self._API_URL.format(video_id), video_id)
-
-        if data.get('errorInfo', {}).get('code') != 'NONE':
-            raise ExtractorError('%s encountered an error: %s' % (
-                self.IE_NAME, data['errorInfo']['message']), expected=True)
-
-        v_info = data['videoInfo']
-        title = v_info.get('v_title')
-        thumbnail = v_info.get('v_thumbnail')
-        duration = v_info.get('v_duration')
-        upload_date = unified_strdate(v_info.get('v_reg_date'))
-        uploader_id = data.get('userInfo', {}).get('u_alias')
-        if duration:
-            duration /= 1000.0
-
-        age_limit = None
-        if data.get('accessInfo', {}).get('code') == 'VIDEO_STATUS_ADULT':
-            age_limit = 18
-
-        formats = []
-        get_quality = qualities(['360p', '480p', '720p', '1080p'])
-        for fmt in data['videoFiles']:
-            formats.append({
-                'format_id': fmt['label'],
-                'quality': get_quality(fmt['label']),
-                'url': fmt['url'],
-                'ext': fmt['format'],
-
-            })
-
-        return {
-            'id': video_id,
-            'title': title,
-            'formats': formats,
-            'thumbnail': thumbnail,
-            'duration': duration,
-            'upload_date': upload_date,
-            'uploader_id': uploader_id,
-            'age_limit': age_limit,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/mgtv.py b/plugins/youtube_download/yt_dlp/extractor/mgtv.py
index 31ccf00..c793626 100644
--- a/plugins/youtube_download/yt_dlp/extractor/mgtv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/mgtv.py
@@ -16,7 +16,7 @@ from ..utils import (
 
 
 class MGTVIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:w(?:ww)?\.)?mgtv\.com/(v|b)/(?:[^/]+/)*(?P<id>\d+)\.html'
+    _VALID_URL = r'https?://(?:w(?:ww)?\.)?mgtv\.com/[bv]/(?:[^/]+/)*(?P<id>\d+)\.html'
     IE_DESC = '芒果TV'
     IE_NAME = 'MangoTV'
 
@@ -77,13 +77,13 @@ class MGTVIE(InfoExtractor):
     def _real_extract(self, url):
         video_id = self._match_id(url)
         tk2 = base64.urlsafe_b64encode(
-            f'did={str(uuid.uuid4())}|pno=1030|ver=0.3.0301|clit={int(time.time())}'.encode())[::-1]
+            f'did={uuid.uuid4()}|pno=1030|ver=0.3.0301|clit={int(time.time())}'.encode())[::-1]
         try:
             api_data = self._download_json(
                 'https://pcweb.api.mgtv.com/player/video', video_id, query={
                     'tk2': tk2,
                     'video_id': video_id,
-                    'type': 'pch5'
+                    'type': 'pch5',
                 }, headers=self.geo_verification_headers())['data']
         except ExtractorError as e:
             if isinstance(e.cause, HTTPError) and e.cause.status == 401:
@@ -160,6 +160,6 @@ class MGTVIE(InfoExtractor):
             subtitles.setdefault(locale.lower(), []).append({
                 'url': sub_url,
                 'name': sub.get('name'),
-                'ext': 'srt'
+                'ext': 'srt',
             })
         return subtitles
diff --git a/plugins/youtube_download/yt_dlp/extractor/miaopai.py b/plugins/youtube_download/yt_dlp/extractor/miaopai.py
deleted file mode 100644
index 329ce36..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/miaopai.py
+++ /dev/null
@@ -1,36 +0,0 @@
-from .common import InfoExtractor
-
-
-class MiaoPaiIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?miaopai\.com/show/(?P<id>[-A-Za-z0-9~_]+)'
-    _TEST = {
-        'url': 'http://www.miaopai.com/show/n~0hO7sfV1nBEw4Y29-Hqg__.htm',
-        'md5': '095ed3f1cd96b821add957bdc29f845b',
-        'info_dict': {
-            'id': 'n~0hO7sfV1nBEw4Y29-Hqg__',
-            'ext': 'mp4',
-            'title': '西游记音乐会的秒拍视频',
-            'thumbnail': 're:^https?://.*/n~0hO7sfV1nBEw4Y29-Hqg___m.jpg',
-        }
-    }
-
-    _USER_AGENT_IPAD = 'Mozilla/5.0 (iPad; CPU OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1'
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(
-            url, video_id, headers={'User-Agent': self._USER_AGENT_IPAD})
-
-        title = self._html_extract_title(webpage)
-        thumbnail = self._html_search_regex(
-            r'<div[^>]+class=(?P<q1>[\'"]).*\bvideo_img\b.*(?P=q1)[^>]+data-url=(?P<q2>[\'"])(?P<url>[^\'"]+)(?P=q2)',
-            webpage, 'thumbnail', fatal=False, group='url')
-        videos = self._parse_html5_media_entries(url, webpage, video_id)
-        info = videos[0]
-
-        info.update({
-            'id': video_id,
-            'title': title,
-            'thumbnail': thumbnail,
-        })
-        return info
diff --git a/plugins/youtube_download/yt_dlp/extractor/microsoftembed.py b/plugins/youtube_download/yt_dlp/extractor/microsoftembed.py
index f71ab3e..9d58fa0 100644
--- a/plugins/youtube_download/yt_dlp/extractor/microsoftembed.py
+++ b/plugins/youtube_download/yt_dlp/extractor/microsoftembed.py
@@ -1,5 +1,15 @@
+import re
+
 from .common import InfoExtractor
-from ..utils import int_or_none, traverse_obj, unified_timestamp
+from ..utils import (
+    int_or_none,
+    parse_iso8601,
+    parse_resolution,
+    traverse_obj,
+    unified_timestamp,
+    url_basename,
+    url_or_none,
+)
 
 
 class MicrosoftEmbedIE(InfoExtractor):
@@ -15,8 +25,9 @@ class MicrosoftEmbedIE(InfoExtractor):
             'thumbnail': 'http://img-prod-cms-rt-microsoft-com.akamaized.net/cms/api/am/imageFileData/RWL7Ju?ver=cae5',
             'age_limit': 0,
             'timestamp': 1631658316,
-            'upload_date': '20210914'
-        }
+            'upload_date': '20210914',
+        },
+        'expected_warnings': ['Failed to parse XML: syntax error: line 1, column 0'],
     }]
     _API_URL = 'https://prod-video-cms-rt-microsoft-com.akamaized.net/vhs/api/videos/'
 
@@ -27,11 +38,11 @@ class MicrosoftEmbedIE(InfoExtractor):
         formats = []
         for source_type, source in metadata['streams'].items():
             if source_type == 'smooth_Streaming':
-                formats.extend(self._extract_ism_formats(source['url'], video_id, 'mss'))
+                formats.extend(self._extract_ism_formats(source['url'], video_id, 'mss', fatal=False))
             elif source_type == 'apple_HTTP_Live_Streaming':
-                formats.extend(self._extract_m3u8_formats(source['url'], video_id, 'mp4'))
+                formats.extend(self._extract_m3u8_formats(source['url'], video_id, 'mp4', fatal=False))
             elif source_type == 'mPEG_DASH':
-                formats.extend(self._extract_mpd_formats(source['url'], video_id))
+                formats.extend(self._extract_mpd_formats(source['url'], video_id, fatal=False))
             else:
                 formats.append({
                     'format_id': source_type,
@@ -63,3 +74,285 @@ class MicrosoftEmbedIE(InfoExtractor):
             'subtitles': subtitles,
             'thumbnails': thumbnails,
         }
+
+
+class MicrosoftMediusBaseIE(InfoExtractor):
+    @staticmethod
+    def _sub_to_dict(subtitle_list):
+        subtitles = {}
+        for sub in subtitle_list:
+            subtitles.setdefault(sub.pop('tag', 'und'), []).append(sub)
+        return subtitles
+
+    def _extract_ism(self, ism_url, video_id, fatal=True):
+        formats = self._extract_ism_formats(ism_url, video_id, fatal=fatal)
+        for fmt in formats:
+            if fmt['language'] != 'eng' and 'English' not in fmt['format_id']:
+                fmt['language_preference'] = -10
+        return formats
+
+
+class MicrosoftMediusIE(MicrosoftMediusBaseIE):
+    _VALID_URL = r'https?://medius\.microsoft\.com/Embed/(?:Video\?id=|video-nc/|VideoDetails/)(?P<id>[\da-f-]+)'
+
+    _TESTS = [{
+        'url': 'https://medius.microsoft.com/Embed/video-nc/9640d86c-f513-4889-959e-5dace86e7d2b',
+        'info_dict': {
+            'id': '9640d86c-f513-4889-959e-5dace86e7d2b',
+            'ext': 'ismv',
+            'title': 'Rapidly code, test and ship from secure cloud developer environments',
+            'description': 'md5:33c8e4facadc438613476eea24165f71',
+            'thumbnail': r're:https://mediusimg\.event\.microsoft\.com/video-\d+/thumbnail\.jpg.*',
+            'subtitles': 'count:30',
+        },
+    }, {
+        'url': 'https://medius.microsoft.com/Embed/video-nc/81215af5-c813-4dcd-aede-94f4e1a7daa3',
+        'info_dict': {
+            'id': '81215af5-c813-4dcd-aede-94f4e1a7daa3',
+            'ext': 'ismv',
+            'title': 'Microsoft Build opening',
+            'description': 'md5:43455096141077a1f23144cab8cec1cb',
+            'thumbnail': r're:https://mediusimg\.event\.microsoft\.com/video-\d+/thumbnail\.jpg.*',
+            'subtitles': 'count:31',
+        },
+    }, {
+        'url': 'https://medius.microsoft.com/Embed/VideoDetails/78493569-9b3b-4a85-a409-ee76e789e25c',
+        'info_dict': {
+            'id': '78493569-9b3b-4a85-a409-ee76e789e25c',
+            'ext': 'ismv',
+            'title': ' Anomaly Detection & Root cause at Edge',
+            'description': 'md5:f8f1ad93d7918649bfb97fa081b03b83',
+            'thumbnail': r're:https://mediusdownload.event.microsoft.com/asset.*\.jpg.*',
+            'subtitles': 'count:17',
+        },
+    }, {
+        'url': 'https://medius.microsoft.com/Embed/Video?id=0dc69bda-079b-4070-a7db-a8da1a06a9c7',
+        'only_matching': True,
+    }, {
+        'url': 'https://medius.microsoft.com/Embed/video-nc/fe823a91-959c-465b-96d4-8f4db624f72c',
+        'only_matching': True,
+    }]
+
+    def _extract_subtitle(self, webpage, video_id):
+        captions = traverse_obj(
+            self._search_json(r'const\s+captionsConfiguration\s*=', webpage, 'captions', video_id, default=None),
+            ('languageList', lambda _, v: url_or_none(v['src']), {
+                'url': 'src',
+                'tag': ('srclang', {str}),
+                'name': ('kind', {str}),
+            })) or [{'url': url, 'tag': url_basename(url).split('.vtt')[0].split('_')[-1]}
+                    for url in re.findall(r'var\s+file\s+=\s+\{[^}]+\'(https://[^\']+\.vtt\?[^\']+)', webpage)]
+
+        return self._sub_to_dict(captions)
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(f'https://medius.microsoft.com/Embed/video-nc/{video_id}', video_id)
+
+        return {
+            'id': video_id,
+            'title': self._og_search_title(webpage),
+            'description': self._og_search_description(webpage),
+            'formats': self._extract_ism(
+                self._search_regex(r'StreamUrl\s*=\s*"([^"]+manifest)"', webpage, 'ism url'), video_id),
+            'thumbnail': self._og_search_thumbnail(webpage),
+            'subtitles': self._extract_subtitle(webpage, video_id),
+        }
+
+
+class MicrosoftLearnPlaylistIE(InfoExtractor):
+    _VALID_URL = r'https?://learn\.microsoft\.com/(?:[\w-]+/)?(?P<type>shows|events)/(?P<id>[\w-]+)/?(?:[?#]|$)'
+    _TESTS = [{
+        'url': 'https://learn.microsoft.com/en-us/shows/bash-for-beginners',
+        'info_dict': {
+            'id': 'bash-for-beginners',
+            'title': 'Bash for Beginners',
+            'description': 'md5:16a91c07222117d1e00912f0dbc02c2c',
+        },
+        'playlist_count': 20,
+    }, {
+        'url': 'https://learn.microsoft.com/en-us/events/build-2022',
+        'info_dict': {
+            'id': 'build-2022',
+            'title': 'Microsoft Build 2022 - Events',
+            'description': 'md5:c16b43848027df837b22c6fbac7648d3',
+        },
+        'playlist_count': 201,
+    }]
+
+    def _entries(self, url_base, video_id):
+        skip = 0
+        while True:
+            playlist_info = self._download_json(url_base, video_id, f'Downloading entries {skip}', query={
+                'locale': 'en-us',
+                '$skip': skip,
+            })
+            url_paths = traverse_obj(playlist_info, ('results', ..., 'url', {str}))
+            for url_path in url_paths:
+                yield self.url_result(f'https://learn.microsoft.com/en-us{url_path}')
+            skip += len(url_paths)
+            if skip >= playlist_info.get('count', 0) or not url_paths:
+                break
+
+    def _real_extract(self, url):
+        playlist_id, playlist_type = self._match_valid_url(url).group('id', 'type')
+        webpage = self._download_webpage(url, playlist_id)
+
+        metainfo = {
+            'title': self._og_search_title(webpage),
+            'description': self._og_search_description(webpage),
+        }
+        sub_type = 'episodes' if playlist_type == 'shows' else 'sessions'
+
+        url_base = f'https://learn.microsoft.com/api/contentbrowser/search/{playlist_type}/{playlist_id}/{sub_type}'
+        return self.playlist_result(self._entries(url_base, playlist_id), playlist_id, **metainfo)
+
+
+class MicrosoftLearnEpisodeIE(MicrosoftMediusBaseIE):
+    _VALID_URL = r'https?://learn\.microsoft\.com/(?:[\w-]+/)?shows/[\w-]+/(?P<id>[^?#/]+)'
+    _TESTS = [{
+        'url': 'https://learn.microsoft.com/en-us/shows/bash-for-beginners/what-is-the-difference-between-a-terminal-and-a-shell-2-of-20-bash-for-beginners/',
+        'info_dict': {
+            'id': 'd44e1a03-a0e5-45c2-9496-5c9fa08dc94c',
+            'ext': 'ismv',
+            'title': 'What is the Difference Between a Terminal and a Shell? (Part 2 of 20)',
+            'description': 'md5:7bbbfb593d21c2cf2babc3715ade6b88',
+            'timestamp': 1676339547,
+            'upload_date': '20230214',
+            'thumbnail': r're:https://learn\.microsoft\.com/video/media/.+\.png',
+            'subtitles': 'count:14',
+        },
+    }, {
+        'url': 'https://learn.microsoft.com/en-gb/shows/on-demand-instructor-led-training-series/az-900-module-1',
+        'info_dict': {
+            'id': '4fe10f7c-d83c-463b-ac0e-c30a8195e01b',
+            'ext': 'mp4',
+            'title': 'AZ-900 Cloud fundamentals (1 of 6)',
+            'description': 'md5:3c2212ce865e9142f402c766441bd5c9',
+            'thumbnail': r're:https://.+/.+\.jpg',
+            'timestamp': 1706605184,
+            'upload_date': '20240130',
+        },
+        'params': {'format': 'bv[protocol=https]'},
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+
+        entry_id = self._html_search_meta('entryId', webpage, 'entryId', fatal=True)
+        video_info = self._download_json(
+            f'https://learn.microsoft.com/api/video/public/v1/entries/{entry_id}', video_id)
+
+        formats = []
+        if ism_url := traverse_obj(video_info, ('publicVideo', 'adaptiveVideoUrl', {url_or_none})):
+            formats.extend(self._extract_ism(ism_url, video_id, fatal=False))
+        if hls_url := traverse_obj(video_info, ('publicVideo', 'adaptiveVideoHLSUrl', {url_or_none})):
+            formats.extend(self._extract_m3u8_formats(hls_url, video_id, 'mp4', m3u8_id='hls', fatal=False))
+        if mpd_url := traverse_obj(video_info, ('publicVideo', 'adaptiveVideoDashUrl', {url_or_none})):
+            formats.extend(self._extract_mpd_formats(mpd_url, video_id, mpd_id='dash', fatal=False))
+        for key in ('low', 'medium', 'high'):
+            if video_url := traverse_obj(video_info, ('publicVideo', f'{key}QualityVideoUrl', {url_or_none})):
+                formats.append({
+                    'url': video_url,
+                    'format_id': f'video-http-{key}',
+                    'acodec': 'none',
+                    **parse_resolution(video_url),
+                })
+        if audio_url := traverse_obj(video_info, ('publicVideo', 'audioUrl', {url_or_none})):
+            formats.append({
+                'url': audio_url,
+                'format_id': 'audio-http',
+                'vcodec': 'none',
+            })
+
+        return {
+            'id': entry_id,
+            'formats': formats,
+            'subtitles': self._sub_to_dict(traverse_obj(video_info, (
+                'publicVideo', 'captions', lambda _, v: url_or_none(v['url']), {
+                    'tag': ('language', {str}),
+                    'url': 'url',
+                }))),
+            'title': self._og_search_title(webpage),
+            'description': self._og_search_description(webpage),
+            **traverse_obj(video_info, {
+                'timestamp': ('createTime', {parse_iso8601}),
+                'thumbnails': ('publicVideo', 'thumbnailOtherSizes', ..., {'url': {url_or_none}}),
+            }),
+        }
+
+
+class MicrosoftLearnSessionIE(InfoExtractor):
+    _VALID_URL = r'https?://learn\.microsoft\.com/(?:[\w-]+/)?events/[\w-]+/(?P<id>[^?#/]+)'
+    _TESTS = [{
+        'url': 'https://learn.microsoft.com/en-us/events/build-2022/ts01-rapidly-code-test-ship-from-secure-cloud-developer-environments',
+        'info_dict': {
+            'id': '9640d86c-f513-4889-959e-5dace86e7d2b',
+            'ext': 'ismv',
+            'title': 'Rapidly code, test and ship from secure cloud developer environments - Events',
+            'description': 'md5:f26c1a85d41c1cffd27a0279254a25c3',
+            'timestamp': 1653408600,
+            'upload_date': '20220524',
+            'thumbnail': r're:https://mediusimg\.event\.microsoft\.com/video-\d+/thumbnail\.jpg.*',
+        },
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+
+        metainfo = {
+            'title': self._og_search_title(webpage),
+            'description': self._og_search_description(webpage),
+            'timestamp': parse_iso8601(self._html_search_meta('startDate', webpage, 'startDate')),
+        }
+
+        return self.url_result(
+            self._html_search_meta('externalVideoUrl', webpage, 'videoUrl', fatal=True),
+            url_transparent=True, ie=MicrosoftMediusIE, **metainfo)
+
+
+class MicrosoftBuildIE(InfoExtractor):
+    _VALID_URL = [
+        r'https?://build\.microsoft\.com/[\w-]+/sessions/(?P<id>[\da-f-]+)',
+        r'https?://build\.microsoft\.com/[\w-]+/(?P<id>sessions)/?(?:[?#]|$)',
+    ]
+
+    _TESTS = [{
+        'url': 'https://build.microsoft.com/en-US/sessions/b49feb31-afcd-4217-a538-d3ca1d171198?source=sessions',
+        'info_dict': {
+            'id': 'aee55fb5-fcf9-4b38-b764-a3527cb57554',
+            'ext': 'ismv',
+            'title': 'Microsoft Build opening keynote',
+            'description': 'md5:d38338f336ef4b6ef9ad2a7466a76655',
+            'timestamp': 1716307200,
+            'upload_date': '20240521',
+            'thumbnail': r're:https://mediusimg\.event\.microsoft\.com/video-\d+/thumbnail\.jpg.*',
+        },
+    }, {
+        'url': 'https://build.microsoft.com/en-US/sessions',
+        'info_dict': {
+            'id': 'sessions',
+        },
+        'playlist_mincount': 418,
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+
+        entries = [
+            self.url_result(
+                video_info['onDemand'], ie=MicrosoftMediusIE, url_transparent=True, **traverse_obj(video_info, {
+                    'id': ('sessionId', {str}),
+                    'title': ('title', {str}),
+                    'description': ('description', {str}),
+                    'timestamp': ('startDateTime', {parse_iso8601}),
+                }))
+            for video_info in self._download_json(
+                'https://api-v2.build.microsoft.com/api/session/all/en-US', video_id, 'Downloading video info')
+        ]
+        if video_id == 'sessions':
+            return self.playlist_result(entries, video_id)
+        else:
+            return traverse_obj(entries, (lambda _, v: v['id'] == video_id), get_all=False)
diff --git a/plugins/youtube_download/yt_dlp/extractor/microsoftstream.py b/plugins/youtube_download/yt_dlp/extractor/microsoftstream.py
index 9b50996..b138810 100644
--- a/plugins/youtube_download/yt_dlp/extractor/microsoftstream.py
+++ b/plugins/youtube_download/yt_dlp/extractor/microsoftstream.py
@@ -1,10 +1,10 @@
-from base64 import b64decode
+import base64
 
 from .common import InfoExtractor
 from ..utils import (
     merge_dicts,
-    parse_iso8601,
     parse_duration,
+    parse_iso8601,
     parse_resolution,
     try_get,
     url_basename,
@@ -37,11 +37,11 @@ class MicrosoftStreamIE(InfoExtractor):
             sub_dict = automatic_captions if track.get('autoGenerated') else subtitles
             sub_dict.setdefault(track['language'], []).append({
                 'ext': 'vtt',
-                'url': track.get('url')
+                'url': track.get('url'),
             })
         return {
             'subtitles': subtitles,
-            'automatic_captions': automatic_captions
+            'automatic_captions': automatic_captions,
         }
 
     def extract_all_subtitles(self, *args, **kwargs):
@@ -66,7 +66,7 @@ class MicrosoftStreamIE(InfoExtractor):
             f'{api_url}/videos/{video_id}', video_id,
             headers=headers, query={
                 '$expand': 'creator,tokens,status,liveEvent,extensions',
-                'api-version': '1.4-private'
+                'api-version': '1.4-private',
             })
         video_id = video_data.get('id') or video_id
         language = video_data.get('language')
@@ -81,7 +81,7 @@ class MicrosoftStreamIE(InfoExtractor):
                 'url': thumbnail_url,
             }
             thumb_name = url_basename(thumbnail_url)
-            thumb_name = str(b64decode(thumb_name + '=' * (-len(thumb_name) % 4)))
+            thumb_name = str(base64.b64decode(thumb_name + '=' * (-len(thumb_name) % 4)))
             thumb.update(parse_resolution(thumb_name))
             thumbnails.append(thumb)
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/microsoftvirtualacademy.py b/plugins/youtube_download/yt_dlp/extractor/microsoftvirtualacademy.py
deleted file mode 100644
index b759b18..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/microsoftvirtualacademy.py
+++ /dev/null
@@ -1,189 +0,0 @@
-import re
-
-from .common import InfoExtractor
-from ..utils import (
-    int_or_none,
-    parse_duration,
-    smuggle_url,
-    unsmuggle_url,
-    xpath_text,
-)
-
-
-class MicrosoftVirtualAcademyBaseIE(InfoExtractor):
-    def _extract_base_url(self, course_id, display_id):
-        return self._download_json(
-            'https://api-mlxprod.microsoft.com/services/products/anonymous/%s' % course_id,
-            display_id, 'Downloading course base URL')
-
-    def _extract_chapter_and_title(self, title):
-        if not title:
-            return None, None
-        m = re.search(r'(?P<chapter>\d+)\s*\|\s*(?P<title>.+)', title)
-        return (int(m.group('chapter')), m.group('title')) if m else (None, title)
-
-
-class MicrosoftVirtualAcademyIE(MicrosoftVirtualAcademyBaseIE):
-    IE_NAME = 'mva'
-    IE_DESC = 'Microsoft Virtual Academy videos'
-    _VALID_URL = r'(?:%s:|https?://(?:mva\.microsoft|(?:www\.)?microsoftvirtualacademy)\.com/[^/]+/training-courses/[^/?#&]+-)(?P<course_id>\d+)(?::|\?l=)(?P<id>[\da-zA-Z]+_\d+)' % IE_NAME
-
-    _TESTS = [{
-        'url': 'https://mva.microsoft.com/en-US/training-courses/microsoft-azure-fundamentals-virtual-machines-11788?l=gfVXISmEB_6804984382',
-        'md5': '7826c44fc31678b12ad8db11f6b5abb9',
-        'info_dict': {
-            'id': 'gfVXISmEB_6804984382',
-            'ext': 'mp4',
-            'title': 'Course Introduction',
-            'formats': 'mincount:3',
-            'subtitles': {
-                'en': [{
-                    'ext': 'ttml',
-                }],
-            },
-        }
-    }, {
-        'url': 'mva:11788:gfVXISmEB_6804984382',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        url, smuggled_data = unsmuggle_url(url, {})
-
-        mobj = self._match_valid_url(url)
-        course_id = mobj.group('course_id')
-        video_id = mobj.group('id')
-
-        base_url = smuggled_data.get('base_url') or self._extract_base_url(course_id, video_id)
-
-        settings = self._download_xml(
-            '%s/content/content_%s/videosettings.xml?v=1' % (base_url, video_id),
-            video_id, 'Downloading video settings XML')
-
-        _, title = self._extract_chapter_and_title(xpath_text(
-            settings, './/Title', 'title', fatal=True))
-
-        formats = []
-
-        for sources in settings.findall('.//MediaSources'):
-            sources_type = sources.get('videoType')
-            for source in sources.findall('./MediaSource'):
-                video_url = source.text
-                if not video_url or not video_url.startswith('http'):
-                    continue
-                if sources_type == 'smoothstreaming':
-                    formats.extend(self._extract_ism_formats(
-                        video_url, video_id, 'mss', fatal=False))
-                    continue
-                video_mode = source.get('videoMode')
-                height = int_or_none(self._search_regex(
-                    r'^(\d+)[pP]$', video_mode or '', 'height', default=None))
-                codec = source.get('codec')
-                acodec, vcodec = [None] * 2
-                if codec:
-                    codecs = codec.split(',')
-                    if len(codecs) == 2:
-                        acodec, vcodec = codecs
-                    elif len(codecs) == 1:
-                        vcodec = codecs[0]
-                formats.append({
-                    'url': video_url,
-                    'format_id': video_mode,
-                    'height': height,
-                    'acodec': acodec,
-                    'vcodec': vcodec,
-                })
-
-        subtitles = {}
-        for source in settings.findall('.//MarkerResourceSource'):
-            subtitle_url = source.text
-            if not subtitle_url:
-                continue
-            subtitles.setdefault('en', []).append({
-                'url': '%s/%s' % (base_url, subtitle_url),
-                'ext': source.get('type'),
-            })
-
-        return {
-            'id': video_id,
-            'title': title,
-            'subtitles': subtitles,
-            'formats': formats
-        }
-
-
-class MicrosoftVirtualAcademyCourseIE(MicrosoftVirtualAcademyBaseIE):
-    IE_NAME = 'mva:course'
-    IE_DESC = 'Microsoft Virtual Academy courses'
-    _VALID_URL = r'(?:%s:|https?://(?:mva\.microsoft|(?:www\.)?microsoftvirtualacademy)\.com/[^/]+/training-courses/(?P<display_id>[^/?#&]+)-)(?P<id>\d+)' % IE_NAME
-
-    _TESTS = [{
-        'url': 'https://mva.microsoft.com/en-US/training-courses/microsoft-azure-fundamentals-virtual-machines-11788',
-        'info_dict': {
-            'id': '11788',
-            'title': 'Microsoft Azure Fundamentals: Virtual Machines',
-        },
-        'playlist_count': 36,
-    }, {
-        # with emphasized chapters
-        'url': 'https://mva.microsoft.com/en-US/training-courses/developing-windows-10-games-with-construct-2-16335',
-        'info_dict': {
-            'id': '16335',
-            'title': 'Developing Windows 10 Games with Construct 2',
-        },
-        'playlist_count': 10,
-    }, {
-        'url': 'https://www.microsoftvirtualacademy.com/en-US/training-courses/microsoft-azure-fundamentals-virtual-machines-11788',
-        'only_matching': True,
-    }, {
-        'url': 'mva:course:11788',
-        'only_matching': True,
-    }]
-
-    @classmethod
-    def suitable(cls, url):
-        return False if MicrosoftVirtualAcademyIE.suitable(url) else super(
-            MicrosoftVirtualAcademyCourseIE, cls).suitable(url)
-
-    def _real_extract(self, url):
-        mobj = self._match_valid_url(url)
-        course_id = mobj.group('id')
-        display_id = mobj.group('display_id')
-
-        base_url = self._extract_base_url(course_id, display_id)
-
-        manifest = self._download_json(
-            '%s/imsmanifestlite.json' % base_url,
-            display_id, 'Downloading course manifest JSON')['manifest']
-
-        organization = manifest['organizations']['organization'][0]
-
-        entries = []
-        for chapter in organization['item']:
-            chapter_number, chapter_title = self._extract_chapter_and_title(chapter.get('title'))
-            chapter_id = chapter.get('@identifier')
-            for item in chapter.get('item', []):
-                item_id = item.get('@identifier')
-                if not item_id:
-                    continue
-                metadata = item.get('resource', {}).get('metadata') or {}
-                if metadata.get('learningresourcetype') != 'Video':
-                    continue
-                _, title = self._extract_chapter_and_title(item.get('title'))
-                duration = parse_duration(metadata.get('duration'))
-                description = metadata.get('description')
-                entries.append({
-                    '_type': 'url_transparent',
-                    'url': smuggle_url(
-                        'mva:%s:%s' % (course_id, item_id), {'base_url': base_url}),
-                    'title': title,
-                    'description': description,
-                    'duration': duration,
-                    'chapter': chapter_title,
-                    'chapter_number': chapter_number,
-                    'chapter_id': chapter_id,
-                })
-
-        title = organization.get('title') or manifest.get('metadata', {}).get('title')
-
-        return self.playlist_result(entries, course_id, title)
diff --git a/plugins/youtube_download/yt_dlp/extractor/mildom.py b/plugins/youtube_download/yt_dlp/extractor/mildom.py
deleted file mode 100644
index f64d575..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/mildom.py
+++ /dev/null
@@ -1,291 +0,0 @@
-import functools
-import json
-import uuid
-
-from .common import InfoExtractor
-from ..utils import (
-    determine_ext,
-    dict_get,
-    ExtractorError,
-    float_or_none,
-    OnDemandPagedList,
-    traverse_obj,
-)
-
-
-class MildomBaseIE(InfoExtractor):
-    _GUEST_ID = None
-
-    def _call_api(self, url, video_id, query=None, note='Downloading JSON metadata', body=None):
-        if not self._GUEST_ID:
-            self._GUEST_ID = f'pc-gp-{str(uuid.uuid4())}'
-
-        content = self._download_json(
-            url, video_id, note=note, data=json.dumps(body).encode() if body else None,
-            headers={'Content-Type': 'application/json'} if body else {},
-            query={
-                '__guest_id': self._GUEST_ID,
-                '__platform': 'web',
-                **(query or {}),
-            })
-
-        if content['code'] != 0:
-            raise ExtractorError(
-                f'Mildom says: {content["message"]} (code {content["code"]})',
-                expected=True)
-        return content['body']
-
-
-class MildomIE(MildomBaseIE):
-    IE_NAME = 'mildom'
-    IE_DESC = 'Record ongoing live by specific user in Mildom'
-    _VALID_URL = r'https?://(?:(?:www|m)\.)mildom\.com/(?P<id>\d+)'
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(f'https://www.mildom.com/{video_id}', video_id)
-
-        enterstudio = self._call_api(
-            'https://cloudac.mildom.com/nonolive/gappserv/live/enterstudio', video_id,
-            note='Downloading live metadata', query={'user_id': video_id})
-        result_video_id = enterstudio.get('log_id', video_id)
-
-        servers = self._call_api(
-            'https://cloudac.mildom.com/nonolive/gappserv/live/liveserver', result_video_id,
-            note='Downloading live server list', query={
-                'user_id': video_id,
-                'live_server_type': 'hls',
-            })
-
-        playback_token = self._call_api(
-            'https://cloudac.mildom.com/nonolive/gappserv/live/token', result_video_id,
-            note='Obtaining live playback token', body={'host_id': video_id, 'type': 'hls'})
-        playback_token = traverse_obj(playback_token, ('data', ..., 'token'), get_all=False)
-        if not playback_token:
-            raise ExtractorError('Failed to obtain live playback token')
-
-        formats = self._extract_m3u8_formats(
-            f'{servers["stream_server"]}/{video_id}_master.m3u8?{playback_token}',
-            result_video_id, 'mp4', headers={
-                'Referer': 'https://www.mildom.com/',
-                'Origin': 'https://www.mildom.com',
-            })
-
-        for fmt in formats:
-            fmt.setdefault('http_headers', {})['Referer'] = 'https://www.mildom.com/'
-
-        return {
-            'id': result_video_id,
-            'title': self._html_search_meta('twitter:description', webpage, default=None) or traverse_obj(enterstudio, 'anchor_intro'),
-            'description': traverse_obj(enterstudio, 'intro', 'live_intro', expected_type=str),
-            'timestamp': float_or_none(enterstudio.get('live_start_ms'), scale=1000),
-            'uploader': self._html_search_meta('twitter:title', webpage, default=None) or traverse_obj(enterstudio, 'loginname'),
-            'uploader_id': video_id,
-            'formats': formats,
-            'is_live': True,
-        }
-
-
-class MildomVodIE(MildomBaseIE):
-    IE_NAME = 'mildom:vod'
-    IE_DESC = 'VOD in Mildom'
-    _VALID_URL = r'https?://(?:(?:www|m)\.)mildom\.com/playback/(?P<user_id>\d+)/(?P<id>(?P=user_id)-[a-zA-Z0-9]+-?[0-9]*)'
-    _TESTS = [{
-        'url': 'https://www.mildom.com/playback/10882672/10882672-1597662269',
-        'info_dict': {
-            'id': '10882672-1597662269',
-            'ext': 'mp4',
-            'title': '始めてのミルダム配信じゃぃ！',
-            'thumbnail': r're:^https?://.*\.(png|jpg)$',
-            'upload_date': '20200817',
-            'duration': 4138.37,
-            'description': 'ゲームをしたくて！',
-            'timestamp': 1597662269.0,
-            'uploader_id': '10882672',
-            'uploader': 'kson組長(けいそん)',
-        },
-    }, {
-        'url': 'https://www.mildom.com/playback/10882672/10882672-1597758589870-477',
-        'info_dict': {
-            'id': '10882672-1597758589870-477',
-            'ext': 'mp4',
-            'title': '【kson】感染メイズ！麻酔銃で無双する',
-            'thumbnail': r're:^https?://.*\.(png|jpg)$',
-            'timestamp': 1597759093.0,
-            'uploader': 'kson組長(けいそん)',
-            'duration': 4302.58,
-            'uploader_id': '10882672',
-            'description': 'このステージ絶対乗り越えたい',
-            'upload_date': '20200818',
-        },
-    }, {
-        'url': 'https://www.mildom.com/playback/10882672/10882672-buha9td2lrn97fk2jme0',
-        'info_dict': {
-            'id': '10882672-buha9td2lrn97fk2jme0',
-            'ext': 'mp4',
-            'title': '【kson組長】CART RACER!!!',
-            'thumbnail': r're:^https?://.*\.(png|jpg)$',
-            'uploader_id': '10882672',
-            'uploader': 'kson組長(けいそん)',
-            'upload_date': '20201104',
-            'timestamp': 1604494797.0,
-            'duration': 4657.25,
-            'description': 'WTF',
-        },
-    }]
-
-    def _real_extract(self, url):
-        user_id, video_id = self._match_valid_url(url).group('user_id', 'id')
-        webpage = self._download_webpage(f'https://www.mildom.com/playback/{user_id}/{video_id}', video_id)
-
-        autoplay = self._call_api(
-            'https://cloudac.mildom.com/nonolive/videocontent/playback/getPlaybackDetail', video_id,
-            note='Downloading playback metadata', query={
-                'v_id': video_id,
-            })['playback']
-
-        formats = [{
-            'url': autoplay['audio_url'],
-            'format_id': 'audio',
-            'protocol': 'm3u8_native',
-            'vcodec': 'none',
-            'acodec': 'aac',
-            'ext': 'm4a'
-        }]
-        for fmt in autoplay['video_link']:
-            formats.append({
-                'format_id': 'video-%s' % fmt['name'],
-                'url': fmt['url'],
-                'protocol': 'm3u8_native',
-                'width': fmt['level'] * autoplay['video_width'] // autoplay['video_height'],
-                'height': fmt['level'],
-                'vcodec': 'h264',
-                'acodec': 'aac',
-                'ext': 'mp4'
-            })
-
-        return {
-            'id': video_id,
-            'title': self._html_search_meta(('og:description', 'description'), webpage, default=None) or autoplay.get('title'),
-            'description': traverse_obj(autoplay, 'video_intro'),
-            'timestamp': float_or_none(autoplay.get('publish_time'), scale=1000),
-            'duration': float_or_none(autoplay.get('video_length'), scale=1000),
-            'thumbnail': dict_get(autoplay, ('upload_pic', 'video_pic')),
-            'uploader': traverse_obj(autoplay, ('author_info', 'login_name')),
-            'uploader_id': user_id,
-            'formats': formats,
-        }
-
-
-class MildomClipIE(MildomBaseIE):
-    IE_NAME = 'mildom:clip'
-    IE_DESC = 'Clip in Mildom'
-    _VALID_URL = r'https?://(?:(?:www|m)\.)mildom\.com/clip/(?P<id>(?P<user_id>\d+)-[a-zA-Z0-9]+)'
-    _TESTS = [{
-        'url': 'https://www.mildom.com/clip/10042245-63921673e7b147ebb0806d42b5ba5ce9',
-        'info_dict': {
-            'id': '10042245-63921673e7b147ebb0806d42b5ba5ce9',
-            'title': '全然違ったよ',
-            'timestamp': 1619181890,
-            'duration': 59,
-            'thumbnail': r're:https?://.+',
-            'uploader': 'ざきんぽ',
-            'uploader_id': '10042245',
-        },
-    }, {
-        'url': 'https://www.mildom.com/clip/10111524-ebf4036e5aa8411c99fb3a1ae0902864',
-        'info_dict': {
-            'id': '10111524-ebf4036e5aa8411c99fb3a1ae0902864',
-            'title': 'かっこいい',
-            'timestamp': 1621094003,
-            'duration': 59,
-            'thumbnail': r're:https?://.+',
-            'uploader': '(ルーキー',
-            'uploader_id': '10111524',
-        },
-    }, {
-        'url': 'https://www.mildom.com/clip/10660174-2c539e6e277c4aaeb4b1fbe8d22cb902',
-        'info_dict': {
-            'id': '10660174-2c539e6e277c4aaeb4b1fbe8d22cb902',
-            'title': 'あ',
-            'timestamp': 1614769431,
-            'duration': 31,
-            'thumbnail': r're:https?://.+',
-            'uploader': 'ドルゴルスレンギーン＝ダグワドルジ',
-            'uploader_id': '10660174',
-        },
-    }]
-
-    def _real_extract(self, url):
-        user_id, video_id = self._match_valid_url(url).group('user_id', 'id')
-        webpage = self._download_webpage(f'https://www.mildom.com/clip/{video_id}', video_id)
-
-        clip_detail = self._call_api(
-            'https://cloudac-cf-jp.mildom.com/nonolive/videocontent/clip/detail', video_id,
-            note='Downloading playback metadata', query={
-                'clip_id': video_id,
-            })
-
-        return {
-            'id': video_id,
-            'title': self._html_search_meta(
-                ('og:description', 'description'), webpage, default=None) or clip_detail.get('title'),
-            'timestamp': float_or_none(clip_detail.get('create_time')),
-            'duration': float_or_none(clip_detail.get('length')),
-            'thumbnail': clip_detail.get('cover'),
-            'uploader': traverse_obj(clip_detail, ('user_info', 'loginname')),
-            'uploader_id': user_id,
-
-            'url': clip_detail['url'],
-            'ext': determine_ext(clip_detail.get('url'), 'mp4'),
-        }
-
-
-class MildomUserVodIE(MildomBaseIE):
-    IE_NAME = 'mildom:user:vod'
-    IE_DESC = 'Download all VODs from specific user in Mildom'
-    _VALID_URL = r'https?://(?:(?:www|m)\.)mildom\.com/profile/(?P<id>\d+)'
-    _TESTS = [{
-        'url': 'https://www.mildom.com/profile/10093333',
-        'info_dict': {
-            'id': '10093333',
-            'title': 'Uploads from ねこばたけ',
-        },
-        'playlist_mincount': 732,
-    }, {
-        'url': 'https://www.mildom.com/profile/10882672',
-        'info_dict': {
-            'id': '10882672',
-            'title': 'Uploads from kson組長(けいそん)',
-        },
-        'playlist_mincount': 201,
-    }]
-
-    def _fetch_page(self, user_id, page):
-        page += 1
-        reply = self._call_api(
-            'https://cloudac.mildom.com/nonolive/videocontent/profile/playbackList',
-            user_id, note=f'Downloading page {page}', query={
-                'user_id': user_id,
-                'page': page,
-                'limit': '30',
-            })
-        if not reply:
-            return
-        for x in reply:
-            v_id = x.get('v_id')
-            if not v_id:
-                continue
-            yield self.url_result(f'https://www.mildom.com/playback/{user_id}/{v_id}')
-
-    def _real_extract(self, url):
-        user_id = self._match_id(url)
-        self.to_screen('This will download all VODs belonging to user. To download ongoing live video, use "https://www.mildom.com/%s" instead' % user_id)
-
-        profile = self._call_api(
-            'https://cloudac.mildom.com/nonolive/gappserv/user/profileV2', user_id,
-            query={'user_id': user_id}, note='Downloading user profile')['user_info']
-
-        return self.playlist_result(
-            OnDemandPagedList(functools.partial(self._fetch_page, user_id), 30),
-            user_id, f'Uploads from {profile["loginname"]}')
diff --git a/plugins/youtube_download/yt_dlp/extractor/minds.py b/plugins/youtube_download/yt_dlp/extractor/minds.py
index 27a6e38..71c82f2 100644
--- a/plugins/youtube_download/yt_dlp/extractor/minds.py
+++ b/plugins/youtube_download/yt_dlp/extractor/minds.py
@@ -1,5 +1,4 @@
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     clean_html,
     format_field,
@@ -16,7 +15,7 @@ class MindsBaseIE(InfoExtractor):
         api_url = 'https://www.minds.com/api/' + path
         token = self._get_cookies(api_url).get('XSRF-TOKEN')
         return self._download_json(
-            api_url, video_id, 'Downloading %s JSON metadata' % resource, headers={
+            api_url, video_id, f'Downloading {resource} JSON metadata', headers={
                 'Referer': 'https://www.minds.com/',
                 'X-XSRF-TOKEN': token.value if token else '',
             }, query=query)
@@ -98,7 +97,7 @@ class MindsIE(MindsBaseIE):
         uploader_id = owner.get('username')
 
         tags = entity.get('tags')
-        if tags and isinstance(tags, compat_str):
+        if tags and isinstance(tags, str):
             tags = [tags]
 
         thumbnail = None
@@ -135,8 +134,8 @@ class MindsFeedBaseIE(MindsBaseIE):
         i = 1
         while True:
             data = self._call_api(
-                'v2/feeds/container/%s/videos' % feed_id,
-                feed_id, 'page %s' % i, query)
+                f'v2/feeds/container/{feed_id}/videos',
+                feed_id, f'page {i}', query)
             entities = data.get('entities') or []
             for entity in entities:
                 guid = entity.get('guid')
@@ -153,7 +152,7 @@ class MindsFeedBaseIE(MindsBaseIE):
     def _real_extract(self, url):
         feed_id = self._match_id(url)
         feed = self._call_api(
-            'v1/%s/%s' % (self._FEED_PATH, feed_id),
+            f'v1/{self._FEED_PATH}/{feed_id}',
             feed_id, self._FEED_TYPE)[self._FEED_TYPE]
 
         return self.playlist_result(
diff --git a/plugins/youtube_download/yt_dlp/extractor/ministrygrid.py b/plugins/youtube_download/yt_dlp/extractor/ministrygrid.py
deleted file mode 100644
index 053c672..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/ministrygrid.py
+++ /dev/null
@@ -1,55 +0,0 @@
-from .common import InfoExtractor
-from ..utils import (
-    ExtractorError,
-    smuggle_url,
-)
-
-
-class MinistryGridIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?ministrygrid\.com/([^/?#]*/)*(?P<id>[^/#?]+)/?(?:$|[?#])'
-
-    _TEST = {
-        'url': 'http://www.ministrygrid.com/training-viewer/-/training/t4g-2014-conference/the-gospel-by-numbers-4/the-gospel-by-numbers',
-        'md5': '844be0d2a1340422759c2a9101bab017',
-        'info_dict': {
-            'id': '3453494717001',
-            'ext': 'mp4',
-            'title': 'The Gospel by Numbers',
-            'thumbnail': r're:^https?://.*\.jpg',
-            'upload_date': '20140410',
-            'description': 'Coming soon from T4G 2014!',
-            'uploader_id': '2034960640001',
-            'timestamp': 1397145591,
-        },
-        'params': {
-            # m3u8 download
-            'skip_download': True,
-        },
-        'add_ie': ['TDSLifeway'],
-    }
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        webpage = self._download_webpage(url, video_id)
-        portlets = self._parse_json(self._search_regex(
-            r'Liferay\.Portlet\.list=(\[.+?\])', webpage, 'portlet list'),
-            video_id)
-        pl_id = self._search_regex(
-            r'getPlid:function\(\){return"(\d+)"}', webpage, 'p_l_id')
-
-        for i, portlet in enumerate(portlets):
-            portlet_url = 'http://www.ministrygrid.com/c/portal/render_portlet?p_l_id=%s&p_p_id=%s' % (pl_id, portlet)
-            portlet_code = self._download_webpage(
-                portlet_url, video_id,
-                note='Looking in portlet %s (%d/%d)' % (portlet, i + 1, len(portlets)),
-                fatal=False)
-            video_iframe_url = self._search_regex(
-                r'<iframe.*?src="([^"]+)"', portlet_code, 'video iframe',
-                default=None)
-            if video_iframe_url:
-                return self.url_result(
-                    smuggle_url(video_iframe_url, {'force_videoid': video_id}),
-                    video_id=video_id)
-
-        raise ExtractorError('Could not find video iframe in any portlets')
diff --git a/plugins/youtube_download/yt_dlp/extractor/minoto.py b/plugins/youtube_download/yt_dlp/extractor/minoto.py
index 8d18179..6983256 100644
--- a/plugins/youtube_download/yt_dlp/extractor/minoto.py
+++ b/plugins/youtube_download/yt_dlp/extractor/minoto.py
@@ -12,7 +12,7 @@ class MinotoIE(InfoExtractor):
         mobj = self._match_valid_url(url)
         player_id = mobj.group('player_id') or '1'
         video_id = mobj.group('id')
-        video_data = self._download_json('http://play.minoto-video.com/%s/%s.js' % (player_id, video_id), video_id)
+        video_data = self._download_json(f'http://play.minoto-video.com/{player_id}/{video_id}.js', video_id)
         video_metadata = video_data['video-metadata']
         formats = []
         for fmt in video_data['video-files']:
@@ -21,7 +21,7 @@ class MinotoIE(InfoExtractor):
                 continue
             container = fmt.get('container')
             if container == 'hls':
-                formats.extend(fmt_url, video_id, 'mp4', m3u8_id='hls', fatal=False)
+                formats.extend(self._extract_m3u8_formats(fmt_url, video_id, 'mp4', m3u8_id='hls', fatal=False))
             else:
                 fmt_profile = fmt.get('profile') or {}
                 formats.append({
diff --git a/plugins/youtube_download/yt_dlp/extractor/miomio.py b/plugins/youtube_download/yt_dlp/extractor/miomio.py
deleted file mode 100644
index 8df8cba..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/miomio.py
+++ /dev/null
@@ -1,134 +0,0 @@
-import random
-
-from .common import InfoExtractor
-from ..compat import compat_urlparse
-from ..networking import Request
-from ..utils import ExtractorError, int_or_none, xpath_text
-
-
-class MioMioIE(InfoExtractor):
-    IE_NAME = 'miomio.tv'
-    _VALID_URL = r'https?://(?:www\.)?miomio\.tv/watch/cc(?P<id>[0-9]+)'
-    _TESTS = [{
-        # "type=video" in flashvars
-        'url': 'http://www.miomio.tv/watch/cc88912/',
-        'info_dict': {
-            'id': '88912',
-            'ext': 'flv',
-            'title': '【SKY】字幕 铠武昭和VS平成 假面骑士大战FEAT战队 魔星字幕组 字幕',
-            'duration': 5923,
-        },
-        'skip': 'Unable to load videos',
-    }, {
-        'url': 'http://www.miomio.tv/watch/cc184024/',
-        'info_dict': {
-            'id': '43729',
-            'title': '《动漫同人插画绘制》',
-        },
-        'playlist_mincount': 86,
-        'skip': 'Unable to load videos',
-    }, {
-        'url': 'http://www.miomio.tv/watch/cc173113/',
-        'info_dict': {
-            'id': '173113',
-            'title': 'The New Macbook 2015 上手试玩与简评'
-        },
-        'playlist_mincount': 2,
-        'skip': 'Unable to load videos',
-    }, {
-        # new 'h5' player
-        'url': 'http://www.miomio.tv/watch/cc273997/',
-        'md5': '0b27a4b4495055d826813f8c3a6b2070',
-        'info_dict': {
-            'id': '273997',
-            'ext': 'mp4',
-            'title': 'マツコの知らない世界【劇的進化SP！ビニール傘＆冷凍食品2016】 1_2 - 16 05 31',
-        },
-        'skip': 'Unable to load videos',
-    }]
-
-    def _extract_mioplayer(self, webpage, video_id, title, http_headers):
-        xml_config = self._search_regex(
-            r'flashvars="type=(?:sina|video)&amp;(.+?)&amp;',
-            webpage, 'xml config')
-
-        # skipping the following page causes lags and eventually connection drop-outs
-        self._request_webpage(
-            'http://www.miomio.tv/mioplayer/mioplayerconfigfiles/xml.php?id=%s&r=%s' % (id, random.randint(100, 999)),
-            video_id)
-
-        vid_config_request = Request(
-            'http://www.miomio.tv/mioplayer/mioplayerconfigfiles/sina.php?{0}'.format(xml_config),
-            headers=http_headers)
-
-        # the following xml contains the actual configuration information on the video file(s)
-        vid_config = self._download_xml(vid_config_request, video_id)
-
-        if not int_or_none(xpath_text(vid_config, 'timelength')):
-            raise ExtractorError('Unable to load videos!', expected=True)
-
-        entries = []
-        for f in vid_config.findall('./durl'):
-            segment_url = xpath_text(f, 'url', 'video url')
-            if not segment_url:
-                continue
-            order = xpath_text(f, 'order', 'order')
-            segment_id = video_id
-            segment_title = title
-            if order:
-                segment_id += '-%s' % order
-                segment_title += ' part %s' % order
-            entries.append({
-                'id': segment_id,
-                'url': segment_url,
-                'title': segment_title,
-                'duration': int_or_none(xpath_text(f, 'length', 'duration'), 1000),
-                'http_headers': http_headers,
-            })
-
-        return entries
-
-    def _download_chinese_webpage(self, *args, **kwargs):
-        # Requests with English locales return garbage
-        headers = {
-            'Accept-Language': 'zh-TW,en-US;q=0.7,en;q=0.3',
-        }
-        kwargs.setdefault('headers', {}).update(headers)
-        return self._download_webpage(*args, **kwargs)
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_chinese_webpage(
-            url, video_id)
-
-        title = self._html_search_meta(
-            'description', webpage, 'title', fatal=True)
-
-        mioplayer_path = self._search_regex(
-            r'src="(/mioplayer(?:_h5)?/[^"]+)"', webpage, 'ref_path')
-
-        if '_h5' in mioplayer_path:
-            player_url = compat_urlparse.urljoin(url, mioplayer_path)
-            player_webpage = self._download_chinese_webpage(
-                player_url, video_id,
-                note='Downloading player webpage', headers={'Referer': url})
-            entries = self._parse_html5_media_entries(player_url, player_webpage, video_id)
-            http_headers = {'Referer': player_url}
-        else:
-            http_headers = {'Referer': 'http://www.miomio.tv%s' % mioplayer_path}
-            entries = self._extract_mioplayer(webpage, video_id, title, http_headers)
-
-        if len(entries) == 1:
-            segment = entries[0]
-            segment['id'] = video_id
-            segment['title'] = title
-            segment['http_headers'] = http_headers
-            return segment
-
-        return {
-            '_type': 'multi_video',
-            'id': video_id,
-            'entries': entries,
-            'title': title,
-            'http_headers': http_headers,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/mirrativ.py b/plugins/youtube_download/yt_dlp/extractor/mirrativ.py
index 0a8ee0c..4e24371 100644
--- a/plugins/youtube_download/yt_dlp/extractor/mirrativ.py
+++ b/plugins/youtube_download/yt_dlp/extractor/mirrativ.py
@@ -11,7 +11,7 @@ class MirrativBaseIE(InfoExtractor):
     def assert_error(self, response):
         error_message = traverse_obj(response, ('status', 'error'))
         if error_message:
-            raise ExtractorError('Mirrativ says: %s' % error_message, expected=True)
+            raise ExtractorError(f'Mirrativ says: {error_message}', expected=True)
 
 
 class MirrativIE(MirrativBaseIE):
@@ -42,7 +42,7 @@ class MirrativIE(MirrativBaseIE):
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        webpage = self._download_webpage('https://www.mirrativ.com/live/%s' % video_id, video_id)
+        webpage = self._download_webpage(f'https://www.mirrativ.com/live/{video_id}', video_id)
         live_response = self._download_json(f'https://www.mirrativ.com/api/live/live?live_id={video_id}', video_id)
         self.assert_error(live_response)
 
@@ -102,7 +102,7 @@ class MirrativUserIE(MirrativBaseIE):
                     # or the service will ban your IP address for a while
                     continue
                 live_id = live.get('live_id')
-                url = 'https://www.mirrativ.com/live/%s' % live_id
+                url = f'https://www.mirrativ.com/live/{live_id}'
                 yield self.url_result(url, video_id=live_id, video_title=live.get('title'))
             page = api_response.get('next_page')
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/mit.py b/plugins/youtube_download/yt_dlp/extractor/mit.py
index 38cc0c2..66c3b07 100644
--- a/plugins/youtube_download/yt_dlp/extractor/mit.py
+++ b/plugins/youtube_download/yt_dlp/extractor/mit.py
@@ -1,11 +1,11 @@
-import re
 import json
+import re
 
 from .common import InfoExtractor
 from .youtube import YoutubeIE
 from ..utils import (
-    clean_html,
     ExtractorError,
+    clean_html,
     get_element_by_id,
 )
 
@@ -28,7 +28,7 @@ class TechTVMITIE(InfoExtractor):
     def _real_extract(self, url):
         video_id = self._match_id(url)
         raw_page = self._download_webpage(
-            'http://techtv.mit.edu/videos/%s' % video_id, video_id)
+            f'http://techtv.mit.edu/videos/{video_id}', video_id)
         clean_page = re.compile(r'<!--.*?-->', re.S).sub('', raw_page)
 
         base_url = self._proto_relative_url(self._search_regex(
@@ -65,7 +65,7 @@ class TechTVMITIE(InfoExtractor):
 
 class OCWMITIE(InfoExtractor):
     IE_NAME = 'ocw.mit.edu'
-    _VALID_URL = r'^https?://ocw\.mit\.edu/courses/(?P<topic>[a-z0-9\-]+)'
+    _VALID_URL = r'https?://ocw\.mit\.edu/courses/(?P<topic>[a-z0-9\-]+)'
     _BASE_URL = 'http://ocw.mit.edu/'
 
     _TESTS = [
@@ -79,7 +79,7 @@ class OCWMITIE(InfoExtractor):
                 'upload_date': '20121109',
                 'uploader_id': 'MIT',
                 'uploader': 'MIT OpenCourseWare',
-            }
+            },
         },
         {
             'url': 'http://ocw.mit.edu/courses/mathematics/18-01sc-single-variable-calculus-fall-2010/1.-differentiation/part-a-definition-and-basic-rules/session-1-introduction-to-derivatives/',
@@ -91,8 +91,8 @@ class OCWMITIE(InfoExtractor):
                 'uploader_id': 'MIT',
                 'uploader': 'MIT OpenCourseWare',
                 'description': 'This section contains lecture video excerpts, lecture notes, an interactive mathlet with supporting documents, and problem solving videos.',
-            }
-        }
+            },
+        },
     ]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/mitele.py b/plugins/youtube_download/yt_dlp/extractor/mitele.py
index ea29986..55fa83b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/mitele.py
+++ b/plugins/youtube_download/yt_dlp/extractor/mitele.py
@@ -1,14 +1,15 @@
-from .telecinco import TelecincoIE
+from .telecinco import TelecincoBaseIE
+from ..networking.exceptions import HTTPError
 from ..utils import (
+    ExtractorError,
     int_or_none,
     parse_iso8601,
 )
 
 
-class MiTeleIE(TelecincoIE):  # XXX: Do not subclass from concrete IE
+class MiTeleIE(TelecincoBaseIE):
     IE_DESC = 'mitele.es'
     _VALID_URL = r'https?://(?:www\.)?mitele\.es/(?:[^/]+/)+(?P<id>[^/]+)/player'
-
     _TESTS = [{
         'url': 'http://www.mitele.es/programas-tv/diario-de/57b0dfb9c715da65618b4afa/player',
         'info_dict': {
@@ -27,6 +28,7 @@ class MiTeleIE(TelecincoIE):  # XXX: Do not subclass from concrete IE
             'timestamp': 1471209401,
             'upload_date': '20160814',
         },
+        'skip': 'HTTP Error 404 Not Found',
     }, {
         # no explicit title
         'url': 'http://www.mitele.es/programas-tv/cuarto-milenio/57b0de3dc915da14058b4876/player',
@@ -49,6 +51,26 @@ class MiTeleIE(TelecincoIE):  # XXX: Do not subclass from concrete IE
         'params': {
             'skip_download': True,
         },
+        'skip': 'HTTP Error 404 Not Found',
+    }, {
+        'url': 'https://www.mitele.es/programas-tv/horizonte/temporada-5/programa-171-40_013480051/player/',
+        'info_dict': {
+            'id': '7adbe22e-cd41-4787-afa4-36f3da7c2c6f',
+            'ext': 'mp4',
+            'title': 'Horizonte Temporada 5 Programa 171',
+            'description': 'md5:97f1fb712c5ac27e5693a8b3c5c0c6e3',
+            'episode': 'Las Zonas de Bajas Emisiones, a debate',
+            'episode_number': 171,
+            'season': 'Season 5',
+            'season_number': 5,
+            'series': 'Horizonte',
+            'duration': 7012,
+            'upload_date': '20240927',
+            'timestamp': 1727416450,
+            'thumbnail': 'https://album.mediaset.es/eimg/2024/09/27/horizonte-171_9f02.jpg',
+            'age_limit': 12,
+        },
+        'params': {'geo_bypass_country': 'ES'},
     }, {
         'url': 'http://www.mitele.es/series-online/la-que-se-avecina/57aac5c1c915da951a8b45ed/player',
         'only_matching': True,
@@ -59,10 +81,20 @@ class MiTeleIE(TelecincoIE):  # XXX: Do not subclass from concrete IE
 
     def _real_extract(self, url):
         display_id = self._match_id(url)
-        webpage = self._download_webpage(url, display_id)
-        pre_player = self._parse_json(self._search_regex(
-            r'window\.\$REACTBASE_STATE\.prePlayer_mtweb\s*=\s*({.+})',
-            webpage, 'Pre Player'), display_id)['prePlayer']
+
+        try:  # yt-dlp's default user-agents are too old and blocked by akamai
+            webpage = self._download_webpage(url, display_id, headers={
+                'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; rv:136.0) Gecko/20100101 Firefox/136.0',
+            })
+        except ExtractorError as e:
+            if not isinstance(e.cause, HTTPError) or e.cause.status != 403:
+                raise
+            # Retry with impersonation if hardcoded UA is insufficient to bypass akamai
+            webpage = self._download_webpage(url, display_id, impersonate=True)
+
+        pre_player = self._search_json(
+            r'window\.\$REACTBASE_STATE\.prePlayer_mtweb\s*=',
+            webpage, 'Pre Player', display_id)['prePlayer']
         title = pre_player['title']
         video_info = self._parse_content(pre_player['video'], url)
         content = pre_player.get('content') or {}
diff --git a/plugins/youtube_download/yt_dlp/extractor/mixch.py b/plugins/youtube_download/yt_dlp/extractor/mixch.py
index 4be6947..4bccc81 100644
--- a/plugins/youtube_download/yt_dlp/extractor/mixch.py
+++ b/plugins/youtube_download/yt_dlp/extractor/mixch.py
@@ -1,23 +1,34 @@
 from .common import InfoExtractor
-from ..utils import UserNotLive, traverse_obj
+from ..networking.exceptions import HTTPError
+from ..utils import (
+    ExtractorError,
+    UserNotLive,
+    int_or_none,
+    str_or_none,
+    url_or_none,
+)
+from ..utils.traversal import traverse_obj
 
 
 class MixchIE(InfoExtractor):
     IE_NAME = 'mixch'
-    _VALID_URL = r'https?://(?:www\.)?mixch\.tv/u/(?P<id>\d+)'
+    _VALID_URL = r'https?://mixch\.tv/u/(?P<id>\d+)'
 
     _TESTS = [{
-        'url': 'https://mixch.tv/u/16236849/live',
+        'url': 'https://mixch.tv/u/16943797/live',
         'skip': 'don\'t know if this live persists',
         'info_dict': {
-            'id': '16236849',
-            'title': '24配信シェア⭕️投票🙏💦',
-            'comment_count': 13145,
-            'view_count': 28348,
-            'timestamp': 1636189377,
-            'uploader': '🦥伊咲👶🏻#フレアワ',
-            'uploader_id': '16236849',
-        }
+            'id': '16943797',
+            'ext': 'mp4',
+            'title': '#EntView #カリナ #セブチ 2024-05-05 06:58',
+            'comment_count': int,
+            'view_count': int,
+            'timestamp': 1714726805,
+            'uploader': 'Ent.View K-news🎶💕',
+            'uploader_id': '16943797',
+            'live_status': 'is_live',
+            'upload_date': '20240503',
+        },
     }, {
         'url': 'https://mixch.tv/u/16137876/live',
         'only_matching': True,
@@ -25,57 +36,136 @@ class MixchIE(InfoExtractor):
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        webpage = self._download_webpage(f'https://mixch.tv/u/{video_id}/live', video_id)
-
-        initial_js_state = self._parse_json(self._search_regex(
-            r'(?m)^\s*window\.__INITIAL_JS_STATE__\s*=\s*(\{.+?\});\s*$', webpage, 'initial JS state'), video_id)
-        if not initial_js_state.get('liveInfo'):
+        data = self._download_json(f'https://mixch.tv/api-web/users/{video_id}/live', video_id)
+        if not traverse_obj(data, ('liveInfo', {dict})):
             raise UserNotLive(video_id=video_id)
 
         return {
             'id': video_id,
-            'title': traverse_obj(initial_js_state, ('liveInfo', 'title')),
-            'comment_count': traverse_obj(initial_js_state, ('liveInfo', 'comments')),
-            'view_count': traverse_obj(initial_js_state, ('liveInfo', 'visitor')),
-            'timestamp': traverse_obj(initial_js_state, ('liveInfo', 'created')),
-            'uploader': traverse_obj(initial_js_state, ('broadcasterInfo', 'name')),
             'uploader_id': video_id,
+            **traverse_obj(data, {
+                'title': ('liveInfo', 'title', {str}),
+                'comment_count': ('liveInfo', 'comments', {int_or_none}),
+                'view_count': ('liveInfo', 'visitor', {int_or_none}),
+                'timestamp': ('liveInfo', 'created', {int_or_none}),
+                'uploader': ('broadcasterInfo', 'name', {str}),
+            }),
             'formats': [{
                 'format_id': 'hls',
-                'url': (traverse_obj(initial_js_state, ('liveInfo', 'hls'))
-                        or f'https://d1hd0ww6piyb43.cloudfront.net/hls/torte_{video_id}.m3u8'),
+                'url': data['liveInfo']['hls'],
                 'ext': 'mp4',
                 'protocol': 'm3u8',
             }],
             'is_live': True,
+            '__post_extractor': self.extract_comments(video_id),
         }
 
+    def _get_comments(self, video_id):
+        yield from traverse_obj(self._download_json(
+            f'https://mixch.tv/api-web/lives/{video_id}/messages', video_id,
+            note='Downloading comments', errnote='Failed to download comments'), (..., {
+                'author': ('name', {str}),
+                'author_id': ('user_id', {str_or_none}),
+                'id': ('message_id', {str}, filter),
+                'text': ('body', {str}),
+                'timestamp': ('created', {int}),
+            }))
+
 
 class MixchArchiveIE(InfoExtractor):
     IE_NAME = 'mixch:archive'
-    _VALID_URL = r'https?://(?:www\.)?mixch\.tv/archive/(?P<id>\d+)'
+    _VALID_URL = r'https?://mixch\.tv/archive/(?P<id>\d+)'
 
     _TESTS = [{
         'url': 'https://mixch.tv/archive/421',
         'skip': 'paid video, no DRM. expires at Jan 23',
         'info_dict': {
             'id': '421',
+            'ext': 'mp4',
             'title': '96NEKO SHOW TIME',
-        }
+        },
+    }, {
+        'url': 'https://mixch.tv/archive/1213',
+        'skip': 'paid video, no DRM. expires at Dec 31, 2023',
+        'info_dict': {
+            'id': '1213',
+            'ext': 'mp4',
+            'title': '【特別トーク番組アーカイブス】Merm4id×燐舞曲 2nd LIVE「VERSUS」',
+            'release_date': '20231201',
+            'thumbnail': str,
+        },
+    }, {
+        'url': 'https://mixch.tv/archive/1214',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
 
-        html5_videos = self._parse_html5_media_entries(
-            url, webpage.replace('video-js', 'video'), video_id, 'hls')
-        if not html5_videos:
-            self.raise_login_required(method='cookies')
-        infodict = html5_videos[0]
-        infodict.update({
+        try:
+            info_json = self._download_json(
+                f'https://mixch.tv/api-web/archive/{video_id}', video_id)['archive']
+        except ExtractorError as e:
+            if isinstance(e.cause, HTTPError) and e.cause.status == 401:
+                self.raise_login_required()
+            raise
+
+        return {
             'id': video_id,
-            'title': self._html_search_regex(r'class="archive-title">(.+?)</', webpage, 'title')
-        })
+            'title': traverse_obj(info_json, ('title', {str})),
+            'formats': self._extract_m3u8_formats(info_json['archiveURL'], video_id),
+            'thumbnail': traverse_obj(info_json, ('thumbnailURL', {url_or_none})),
+        }
 
-        return infodict
+
+class MixchMovieIE(InfoExtractor):
+    IE_NAME = 'mixch:movie'
+    _VALID_URL = r'https?://mixch\.tv/m/(?P<id>\w+)'
+
+    _TESTS = [{
+        'url': 'https://mixch.tv/m/Ve8KNkJ5',
+        'info_dict': {
+            'id': 'Ve8KNkJ5',
+            'title': '夏☀️\nムービーへのポイントは本イベントに加算されないので配信にてお願い致します🙇🏻\u200d♀️\n#TGCCAMPUS #ミス東大 #ミス東大2024 ',
+            'ext': 'mp4',
+            'uploader': 'ミス東大No.5 松藤百香🍑💫',
+            'uploader_id': '12299174',
+            'channel_follower_count': int,
+            'view_count': int,
+            'like_count': int,
+            'comment_count': int,
+            'timestamp': 1724070828,
+            'uploader_url': 'https://mixch.tv/u/12299174',
+            'live_status': 'not_live',
+            'upload_date': '20240819',
+        },
+    }, {
+        'url': 'https://mixch.tv/m/61DzpIKE',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        data = self._download_json(
+            f'https://mixch.tv/api-web/movies/{video_id}', video_id)
+        return {
+            'id': video_id,
+            'formats': [{
+                'format_id': 'mp4',
+                'url': data['movie']['file'],
+                'ext': 'mp4',
+            }],
+            **traverse_obj(data, {
+                'title': ('movie', 'title', {str}),
+                'thumbnail': ('movie', 'thumbnailURL', {url_or_none}),
+                'uploader': ('ownerInfo', 'name', {str}),
+                'uploader_id': ('ownerInfo', 'id', {int}, {str_or_none}),
+                'channel_follower_count': ('ownerInfo', 'fan', {int_or_none}),
+                'view_count': ('ownerInfo', 'view', {int_or_none}),
+                'like_count': ('movie', 'favCount', {int_or_none}),
+                'comment_count': ('movie', 'commentCount', {int_or_none}),
+                'timestamp': ('movie', 'published', {int_or_none}),
+                'uploader_url': ('ownerInfo', 'id', {lambda x: x and f'https://mixch.tv/u/{x}'}, filter),
+            }),
+            'live_status': 'not_live',
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/mixcloud.py b/plugins/youtube_download/yt_dlp/extractor/mixcloud.py
index fb5a08c..852670f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/mixcloud.py
+++ b/plugins/youtube_download/yt_dlp/extractor/mixcloud.py
@@ -1,31 +1,30 @@
+import base64
 import itertools
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_b64decode,
-    compat_ord,
-    compat_str,
-    compat_urllib_parse_unquote,
-)
+from ..compat import compat_ord
 from ..utils import (
     ExtractorError,
     int_or_none,
     parse_iso8601,
     strip_or_none,
     try_get,
+    url_or_none,
 )
+from ..utils.traversal import traverse_obj
 
 
 class MixcloudBaseIE(InfoExtractor):
     def _call_api(self, object_type, object_fields, display_id, username, slug=None):
         lookup_key = object_type + 'Lookup'
         return self._download_json(
-            'https://www.mixcloud.com/graphql', display_id, query={
+            'https://app.mixcloud.com/graphql', display_id, query={
                 'query': '''{
   %s(lookup: {username: "%s"%s}) {
     %s
   }
-}''' % (lookup_key, username, ', slug: "%s"' % slug if slug else '', object_fields)
+}''' % (lookup_key, username, f', slug: "{slug}"' if slug else '', object_fields),  # noqa: UP031
             })['data'][lookup_key]
 
 
@@ -40,13 +39,22 @@ class MixcloudIE(MixcloudBaseIE):
             'ext': 'm4a',
             'title': 'Cryptkeeper',
             'description': 'After quite a long silence from myself, finally another Drum\'n\'Bass mix with my favourite current dance floor bangers.',
-            'uploader': 'Daniel Holbach',
+            'uploader': 'dholbach',
             'uploader_id': 'dholbach',
             'thumbnail': r're:https?://.*\.jpg',
             'view_count': int,
             'timestamp': 1321359578,
             'upload_date': '20111115',
+            'uploader_url': 'https://www.mixcloud.com/dholbach/',
+            'artist': 'Submorphics & Chino , Telekinesis, Porter Robinson, Enei, Breakage ft Jess Mills',
+            'duration': 3723,
+            'tags': ['liquid drum and bass', 'drum and bass'],
+            'comment_count': int,
+            'repost_count': int,
+            'like_count': int,
+            'artists': list,
         },
+        'params': {'skip_download': 'm3u8'},
     }, {
         'url': 'http://www.mixcloud.com/gillespeterson/caribou-7-inch-vinyl-mix-chat/',
         'info_dict': {
@@ -60,7 +68,14 @@ class MixcloudIE(MixcloudBaseIE):
             'view_count': int,
             'timestamp': 1422987057,
             'upload_date': '20150203',
+            'uploader_url': 'https://www.mixcloud.com/gillespeterson/',
+            'duration': 2992,
+            'tags': ['jazz', 'soul', 'world music', 'funk'],
+            'comment_count': int,
+            'repost_count': int,
+            'like_count': int,
         },
+        'params': {'skip_download': '404 playback error on site'},
     }, {
         'url': 'https://beta.mixcloud.com/RedLightRadio/nosedrip-15-red-light-radio-01-18-2016/',
         'only_matching': True,
@@ -76,8 +91,8 @@ class MixcloudIE(MixcloudBaseIE):
 
     def _real_extract(self, url):
         username, slug = self._match_valid_url(url).groups()
-        username, slug = compat_urllib_parse_unquote(username), compat_urllib_parse_unquote(slug)
-        track_id = '%s_%s' % (username, slug)
+        username, slug = urllib.parse.unquote(username), urllib.parse.unquote(slug)
+        track_id = f'{username}_{slug}'
 
         cloudcast = self._call_api('cloudcast', '''audioLength
     comments(first: 100) {
@@ -137,8 +152,6 @@ class MixcloudIE(MixcloudBaseIE):
         elif reason:
             raise ExtractorError('Track is restricted', expected=True)
 
-        title = cloudcast['name']
-
         stream_info = cloudcast['streamInfo']
         formats = []
 
@@ -147,7 +160,7 @@ class MixcloudIE(MixcloudBaseIE):
             if not format_url:
                 continue
             decrypted = self._decrypt_xor_cipher(
-                self._DECRYPTION_KEY, compat_b64decode(format_url))
+                self._DECRYPTION_KEY, base64.b64decode(format_url))
             if url_key == 'hlsUrl':
                 formats.extend(self._extract_m3u8_formats(
                     decrypted, track_id, 'mp4', entry_protocol='m3u8_native',
@@ -170,47 +183,39 @@ class MixcloudIE(MixcloudBaseIE):
             self.raise_login_required(metadata_available=True)
 
         comments = []
-        for edge in (try_get(cloudcast, lambda x: x['comments']['edges']) or []):
-            node = edge.get('node') or {}
+        for node in traverse_obj(cloudcast, ('comments', 'edges', ..., 'node', {dict})):
             text = strip_or_none(node.get('comment'))
             if not text:
                 continue
-            user = node.get('user') or {}
             comments.append({
-                'author': user.get('displayName'),
-                'author_id': user.get('username'),
                 'text': text,
-                'timestamp': parse_iso8601(node.get('created')),
+                **traverse_obj(node, {
+                    'author': ('user', 'displayName', {str}),
+                    'author_id': ('user', 'username', {str}),
+                    'timestamp': ('created', {parse_iso8601}),
+                }),
             })
 
-        tags = []
-        for t in cloudcast.get('tags'):
-            tag = try_get(t, lambda x: x['tag']['name'], compat_str)
-            if not tag:
-                tags.append(tag)
-
-        get_count = lambda x: int_or_none(try_get(cloudcast, lambda y: y[x]['totalCount']))
-
-        owner = cloudcast.get('owner') or {}
-
         return {
             'id': track_id,
-            'title': title,
             'formats': formats,
-            'description': cloudcast.get('description'),
-            'thumbnail': try_get(cloudcast, lambda x: x['picture']['url'], compat_str),
-            'uploader': owner.get('displayName'),
-            'timestamp': parse_iso8601(cloudcast.get('publishDate')),
-            'uploader_id': owner.get('username'),
-            'uploader_url': owner.get('url'),
-            'duration': int_or_none(cloudcast.get('audioLength')),
-            'view_count': int_or_none(cloudcast.get('plays')),
-            'like_count': get_count('favorites'),
-            'repost_count': get_count('reposts'),
-            'comment_count': get_count('comments'),
             'comments': comments,
-            'tags': tags,
-            'artist': ', '.join(cloudcast.get('featuringArtistList') or []) or None,
+            **traverse_obj(cloudcast, {
+                'title': ('name', {str}),
+                'description': ('description', {str}),
+                'thumbnail': ('picture', 'url', {url_or_none}),
+                'timestamp': ('publishDate', {parse_iso8601}),
+                'duration': ('audioLength', {int_or_none}),
+                'uploader': ('owner', 'displayName', {str}),
+                'uploader_id': ('owner', 'username', {str}),
+                'uploader_url': ('owner', 'url', {url_or_none}),
+                'view_count': ('plays', {int_or_none}),
+                'like_count': ('favorites', 'totalCount', {int_or_none}),
+                'repost_count': ('reposts', 'totalCount', {int_or_none}),
+                'comment_count': ('comments', 'totalCount', {int_or_none}),
+                'tags': ('tags', ..., 'tag', 'name', {str}, filter, all, filter),
+                'artists': ('featuringArtistList', ..., {str}, filter, all, filter),
+            }),
         }
 
 
@@ -223,12 +228,12 @@ class MixcloudPlaylistBaseIE(MixcloudBaseIE):
 
     def _real_extract(self, url):
         username, slug = self._match_valid_url(url).groups()
-        username = compat_urllib_parse_unquote(username)
+        username = urllib.parse.unquote(username)
         if not slug:
             slug = 'uploads'
         else:
-            slug = compat_urllib_parse_unquote(slug)
-        playlist_id = '%s_%s' % (username, slug)
+            slug = urllib.parse.unquote(slug)
+        playlist_id = f'{username}_{slug}'
 
         is_playlist_type = self._ROOT_TYPE == 'playlist'
         playlist_type = 'items' if is_playlist_type else slug
@@ -250,7 +255,7 @@ class MixcloudPlaylistBaseIE(MixcloudBaseIE):
         endCursor
         hasNextPage
       }
-    }''' % (self._TITLE_KEY, self._DESCRIPTION_KEY, playlist_type, list_filter, self._NODE_TEMPLATE),
+    }''' % (self._TITLE_KEY, self._DESCRIPTION_KEY, playlist_type, list_filter, self._NODE_TEMPLATE),  # noqa: UP031
                 playlist_id, username, slug if is_playlist_type else None)
 
             items = playlist.get(playlist_type) or {}
@@ -259,15 +264,15 @@ class MixcloudPlaylistBaseIE(MixcloudBaseIE):
                 cloudcast_url = cloudcast.get('url')
                 if not cloudcast_url:
                     continue
-                slug = try_get(cloudcast, lambda x: x['slug'], compat_str)
-                owner_username = try_get(cloudcast, lambda x: x['owner']['username'], compat_str)
-                video_id = '%s_%s' % (owner_username, slug) if slug and owner_username else None
+                item_slug = try_get(cloudcast, lambda x: x['slug'], str)
+                owner_username = try_get(cloudcast, lambda x: x['owner']['username'], str)
+                video_id = f'{owner_username}_{item_slug}' if item_slug and owner_username else None
                 entries.append(self.url_result(
                     cloudcast_url, MixcloudIE.ie_key(), video_id))
 
             page_info = items['pageInfo']
             has_next_page = page_info['hasNextPage']
-            list_filter = ', after: "%s"' % page_info['endCursor']
+            list_filter = ', after: "{}"'.format(page_info['endCursor'])
 
         return self.playlist_result(
             entries, playlist_id,
@@ -283,24 +288,24 @@ class MixcloudUserIE(MixcloudPlaylistBaseIE):
         'url': 'http://www.mixcloud.com/dholbach/',
         'info_dict': {
             'id': 'dholbach_uploads',
-            'title': 'Daniel Holbach (uploads)',
-            'description': 'md5:b60d776f0bab534c5dabe0a34e47a789',
+            'title': 'dholbach (uploads)',
+            'description': 'md5:a3f468a60ac8c3e1f8616380fc469b2b',
         },
         'playlist_mincount': 36,
     }, {
         'url': 'http://www.mixcloud.com/dholbach/uploads/',
         'info_dict': {
             'id': 'dholbach_uploads',
-            'title': 'Daniel Holbach (uploads)',
-            'description': 'md5:b60d776f0bab534c5dabe0a34e47a789',
+            'title': 'dholbach (uploads)',
+            'description': 'md5:a3f468a60ac8c3e1f8616380fc469b2b',
         },
         'playlist_mincount': 36,
     }, {
         'url': 'http://www.mixcloud.com/dholbach/favorites/',
         'info_dict': {
             'id': 'dholbach_favorites',
-            'title': 'Daniel Holbach (favorites)',
-            'description': 'md5:b60d776f0bab534c5dabe0a34e47a789',
+            'title': 'dholbach (favorites)',
+            'description': 'md5:a3f468a60ac8c3e1f8616380fc469b2b',
         },
         # 'params': {
         #     'playlist_items': '1-100',
@@ -323,9 +328,9 @@ class MixcloudUserIE(MixcloudPlaylistBaseIE):
         'info_dict': {
             'id': 'FirstEar_stream',
             'title': 'First Ear (stream)',
-            'description': 'Curators of good music\r\n\r\nfirstearmusic.com',
+            'description': 'we maraud for ears',
         },
-        'playlist_mincount': 271,
+        'playlist_mincount': 267,
     }]
 
     _TITLE_KEY = 'displayName'
@@ -336,7 +341,7 @@ class MixcloudUserIE(MixcloudPlaylistBaseIE):
           owner { username }'''
 
     def _get_playlist_title(self, title, slug):
-        return '%s (%s)' % (title, slug)
+        return f'{title} ({slug})'
 
 
 class MixcloudPlaylistIE(MixcloudPlaylistBaseIE):
@@ -349,7 +354,7 @@ class MixcloudPlaylistIE(MixcloudPlaylistBaseIE):
             'id': 'maxvibes_jazzcat-on-ness-radio',
             'title': 'Ness Radio sessions',
         },
-        'playlist_mincount': 59,
+        'playlist_mincount': 58,
     }]
     _TITLE_KEY = 'name'
     _DESCRIPTION_KEY = 'description'
diff --git a/plugins/youtube_download/yt_dlp/extractor/mlb.py b/plugins/youtube_download/yt_dlp/extractor/mlb.py
index 72057dc..562b93f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/mlb.py
+++ b/plugins/youtube_download/yt_dlp/extractor/mlb.py
@@ -1,17 +1,23 @@
+import json
 import re
-import urllib.parse
+import time
 import uuid
 
 from .common import InfoExtractor
+from ..networking.exceptions import HTTPError
 from ..utils import (
+    ExtractorError,
     determine_ext,
     int_or_none,
     join_nonempty,
+    jwt_decode_hs256,
     parse_duration,
     parse_iso8601,
-    traverse_obj,
     try_get,
+    url_or_none,
+    urlencode_postdata,
 )
+from ..utils.traversal import traverse_obj
 
 
 class MLBBaseIE(InfoExtractor):
@@ -203,7 +209,7 @@ class MLBIE(MLBBaseIE):
 
     def _download_video_data(self, display_id):
         return self._download_json(
-            'http://content.mlb.com/mlb/item/id/v1/%s/details/web-v1.json' % display_id,
+            f'http://content.mlb.com/mlb/item/id/v1/{display_id}/details/web-v1.json',
             display_id)
 
 
@@ -227,7 +233,7 @@ class MLBVideoIE(MLBBaseIE):
 
     @classmethod
     def suitable(cls, url):
-        return False if MLBIE.suitable(url) else super(MLBVideoIE, cls).suitable(url)
+        return False if MLBIE.suitable(url) else super().suitable(url)
 
     @staticmethod
     def _get_feed(video):
@@ -268,83 +274,232 @@ class MLBVideoIE(MLBBaseIE):
     timestamp
     title
   }
-}''' % display_id,
+}''' % display_id,  # noqa: UP031
             })['data']['mediaPlayback'][0]
 
 
 class MLBTVIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?mlb\.com/tv/g(?P<id>\d{6})'
     _NETRC_MACHINE = 'mlb'
-
     _TESTS = [{
         'url': 'https://www.mlb.com/tv/g661581/vee2eff5f-a7df-4c20-bdb4-7b926fa12638',
         'info_dict': {
             'id': '661581',
             'ext': 'mp4',
             'title': '2022-07-02 - St. Louis Cardinals @ Philadelphia Phillies',
+            'release_date': '20220702',
+            'release_timestamp': 1656792300,
         },
-        'params': {
-            'skip_download': True,
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        # makeup game: has multiple dates, need to avoid games with 'rescheduleDate'
+        'url': 'https://www.mlb.com/tv/g747039/vd22541c4-5a29-45f7-822b-635ec041cf5e',
+        'info_dict': {
+            'id': '747039',
+            'ext': 'mp4',
+            'title': '2024-07-29 - Toronto Blue Jays @ Baltimore Orioles',
+            'release_date': '20240729',
+            'release_timestamp': 1722280200,
         },
+        'params': {'skip_download': 'm3u8'},
     }]
+    _GRAPHQL_INIT_QUERY = '''\
+mutation initSession($device: InitSessionInput!, $clientType: ClientType!, $experience: ExperienceTypeInput) {
+    initSession(device: $device, clientType: $clientType, experience: $experience) {
+        deviceId
+        sessionId
+        entitlements {
+            code
+        }
+        location {
+            countryCode
+            regionName
+            zipCode
+            latitude
+            longitude
+        }
+        clientExperience
+        features
+    }
+  }'''
+    _GRAPHQL_PLAYBACK_QUERY = '''\
+mutation initPlaybackSession(
+        $adCapabilities: [AdExperienceType]
+        $mediaId: String!
+        $deviceId: String!
+        $sessionId: String!
+        $quality: PlaybackQuality
+    ) {
+        initPlaybackSession(
+            adCapabilities: $adCapabilities
+            mediaId: $mediaId
+            deviceId: $deviceId
+            sessionId: $sessionId
+            quality: $quality
+        ) {
+            playbackSessionId
+            playback {
+                url
+                token
+                expiration
+                cdn
+            }
+        }
+    }'''
+    _APP_VERSION = '7.8.2'
+    _device_id = None
+    _session_id = None
     _access_token = None
+    _token_expiry = 0
+
+    @property
+    def _api_headers(self):
+        if (self._token_expiry - 120) <= time.time():
+            self.write_debug('Access token has expired; re-logging in')
+            self._perform_login(*self._get_login_info())
+        return {'Authorization': f'Bearer {self._access_token}'}
 
     def _real_initialize(self):
         if not self._access_token:
             self.raise_login_required(
                 'All videos are only available to registered users', method='password')
 
+    def _set_device_id(self, username):
+        if self._device_id:
+            return
+        device_id_cache = self.cache.load(self._NETRC_MACHINE, 'device_ids', default={})
+        self._device_id = device_id_cache.get(username)
+        if self._device_id:
+            return
+        self._device_id = str(uuid.uuid4())
+        device_id_cache[username] = self._device_id
+        self.cache.store(self._NETRC_MACHINE, 'device_ids', device_id_cache)
+
     def _perform_login(self, username, password):
-        data = f'grant_type=password&username={urllib.parse.quote(username)}&password={urllib.parse.quote(password)}&scope=openid offline_access&client_id=0oa3e1nutA1HLzAKG356'
-        access_token = self._download_json(
-            'https://ids.mlb.com/oauth2/aus1m088yK07noBfh356/v1/token', None,
-            headers={
-                'User-Agent': 'okhttp/3.12.1',
-                'Content-Type': 'application/x-www-form-urlencoded'
-            }, data=data.encode())['access_token']
+        try:
+            self._access_token = self._download_json(
+                'https://ids.mlb.com/oauth2/aus1m088yK07noBfh356/v1/token', None,
+                'Logging in', 'Unable to log in', headers={
+                    'User-Agent': 'okhttp/3.12.1',
+                    'Content-Type': 'application/x-www-form-urlencoded',
+                }, data=urlencode_postdata({
+                    'grant_type': 'password',
+                    'username': username,
+                    'password': password,
+                    'scope': 'openid offline_access',
+                    'client_id': '0oa3e1nutA1HLzAKG356',
+                }))['access_token']
+        except ExtractorError as error:
+            if isinstance(error.cause, HTTPError) and error.cause.status == 400:
+                raise ExtractorError('Invalid username or password', expected=True)
+            raise
 
-        entitlement = self._download_webpage(
-            f'https://media-entitlement.mlb.com/api/v3/jwt?os=Android&appname=AtBat&did={str(uuid.uuid4())}', None,
-            headers={
-                'User-Agent': 'okhttp/3.12.1',
-                'Authorization': f'Bearer {access_token}'
-            })
+        self._token_expiry = traverse_obj(self._access_token, ({jwt_decode_hs256}, 'exp', {int})) or 0
+        self._set_device_id(username)
 
-        data = f'grant_type=urn:ietf:params:oauth:grant-type:token-exchange&subject_token={entitlement}&subject_token_type=urn:ietf:params:oauth:token-type:jwt&platform=android-tv'
-        self._access_token = self._download_json(
-            'https://us.edge.bamgrid.com/token', None,
+        self._session_id = self._call_api({
+            'operationName': 'initSession',
+            'query': self._GRAPHQL_INIT_QUERY,
+            'variables': {
+                'device': {
+                    'appVersion': self._APP_VERSION,
+                    'deviceFamily': 'desktop',
+                    'knownDeviceId': self._device_id,
+                    'languagePreference': 'ENGLISH',
+                    'manufacturer': '',
+                    'model': '',
+                    'os': '',
+                    'osVersion': '',
+                },
+                'clientType': 'WEB',
+            },
+        }, None, 'session ID')['data']['initSession']['sessionId']
+
+    def _call_api(self, data, video_id, description='GraphQL JSON', fatal=True):
+        return self._download_json(
+            'https://media-gateway.mlb.com/graphql', video_id,
+            f'Downloading {description}', f'Unable to download {description}', fatal=fatal,
             headers={
+                **self._api_headers,
                 'Accept': 'application/json',
-                'Authorization': 'Bearer bWxidHYmYW5kcm9pZCYxLjAuMA.6LZMbH2r--rbXcgEabaDdIslpo4RyZrlVfWZhsAgXIk',
-                'Content-Type': 'application/x-www-form-urlencoded'
-            }, data=data.encode())['access_token']
+                'Content-Type': 'application/json',
+                'x-client-name': 'WEB',
+                'x-client-version': self._APP_VERSION,
+            }, data=json.dumps(data, separators=(',', ':')).encode())
+
+    def _extract_formats_and_subtitles(self, broadcast, video_id):
+        feed = traverse_obj(broadcast, ('homeAway', {str.title}))
+        medium = traverse_obj(broadcast, ('type', {str}))
+        language = traverse_obj(broadcast, ('language', {str.lower}))
+        format_id = join_nonempty(feed, medium, language)
+
+        response = self._call_api({
+            'operationName': 'initPlaybackSession',
+            'query': self._GRAPHQL_PLAYBACK_QUERY,
+            'variables': {
+                'adCapabilities': ['GOOGLE_STANDALONE_AD_PODS'],
+                'deviceId': self._device_id,
+                'mediaId': broadcast['mediaId'],
+                'quality': 'PLACEHOLDER',
+                'sessionId': self._session_id,
+            },
+        }, video_id, f'{format_id} broadcast JSON', fatal=False)
+
+        playback = traverse_obj(response, ('data', 'initPlaybackSession', 'playback', {dict}))
+        m3u8_url = traverse_obj(playback, ('url', {url_or_none}))
+        token = traverse_obj(playback, ('token', {str}))
+
+        if not (m3u8_url and token):
+            errors = '; '.join(traverse_obj(response, ('errors', ..., 'message', {str})))
+            if errors:  # Only warn when 'blacked out' or 'not entitled'; radio formats may be available
+                self.report_warning(f'API returned errors for {format_id}: {errors}')
+            else:
+                self.report_warning(f'No formats available for {format_id} broadcast; skipping')
+            return [], {}
+
+        cdn_headers = {'x-cdn-token': token}
+        fmts, subs = self._extract_m3u8_formats_and_subtitles(
+            m3u8_url.replace(f'/{token}/', '/'), video_id, 'mp4',
+            m3u8_id=format_id, fatal=False, headers=cdn_headers)
+        for fmt in fmts:
+            fmt['http_headers'] = cdn_headers
+            fmt.setdefault('format_note', join_nonempty(feed, medium, delim=' '))
+            fmt.setdefault('language', language)
+            if fmt.get('vcodec') == 'none' and fmt['language'] == 'en':
+                fmt['source_preference'] = 10
+
+        return fmts, subs
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        airings = self._download_json(
-            f'https://search-api-mlbtv.mlb.com/svc/search/v2/graphql/persisted/query/core/Airings?variables=%7B%22partnerProgramIds%22%3A%5B%22{video_id}%22%5D%2C%22applyEsniMediaRightsLabels%22%3Atrue%7D',
-            video_id)['data']['Airings']
+        data = self._download_json(
+            'https://statsapi.mlb.com/api/v1/schedule', video_id, query={
+                'gamePk': video_id,
+                'hydrate': 'broadcasts(all),statusFlags',
+            })
+        metadata = traverse_obj(data, (
+            'dates', ..., 'games',
+            lambda _, v: str(v['gamePk']) == video_id and not v.get('rescheduleDate'), any))
+
+        broadcasts = traverse_obj(metadata, (
+            'broadcasts', lambda _, v: v['mediaId'] and v['mediaState']['mediaStateCode'] != 'MEDIA_OFF'))
 
         formats, subtitles = [], {}
-        for airing in airings:
-            m3u8_url = self._download_json(
-                airing['playbackUrls'][0]['href'].format(scenario='browser~csai'), video_id,
-                headers={
-                    'Authorization': self._access_token,
-                    'Accept': 'application/vnd.media-service+json; version=2'
-                })['stream']['complete']
-            f, s = self._extract_m3u8_formats_and_subtitles(
-                m3u8_url, video_id, 'mp4', m3u8_id=join_nonempty(airing.get('feedType'), airing.get('feedLanguage')))
-            formats.extend(f)
-            self._merge_subtitles(s, target=subtitles)
+        for broadcast in broadcasts:
+            fmts, subs = self._extract_formats_and_subtitles(broadcast, video_id)
+            formats.extend(fmts)
+            self._merge_subtitles(subs, target=subtitles)
 
         return {
             'id': video_id,
-            'title': traverse_obj(airings, (..., 'titles', 0, 'episodeName'), get_all=False),
-            'is_live': traverse_obj(airings, (..., 'mediaConfig', 'productType'), get_all=False) == 'LIVE',
+            'title': join_nonempty(
+                traverse_obj(metadata, ('officialDate', {str})),
+                traverse_obj(metadata, ('teams', ('away', 'home'), 'team', 'name', {str}, all, {' @ '.join})),
+                delim=' - '),
+            'is_live': traverse_obj(broadcasts, (..., 'mediaState', 'mediaStateCode', {str}, any)) == 'MEDIA_ON',
+            'release_timestamp': traverse_obj(metadata, ('gameDate', {parse_iso8601})),
             'formats': formats,
             'subtitles': subtitles,
-            'http_headers': {'Authorization': f'Bearer {self._access_token}'},
         }
 
 
@@ -355,11 +510,11 @@ class MLBArticleIE(InfoExtractor):
         'info_dict': {
             'id': '36db7394-343c-4ea3-b8ca-ead2e61bca9a',
             'title': 'Machado\'s grab draws hilarious irate reaction',
-            'modified_timestamp': 1650130737,
+            'modified_timestamp': 1675888370,
             'description': 'md5:a19d4eb0487b2cb304e9a176f6b67676',
-            'modified_date': '20220416',
+            'modified_date': '20230208',
         },
-        'playlist_count': 2,
+        'playlist_mincount': 2,
     }]
 
     def _real_extract(self, url):
@@ -367,15 +522,13 @@ class MLBArticleIE(InfoExtractor):
         webpage = self._download_webpage(url, display_id)
         apollo_cache_json = self._search_json(r'window\.initState\s*=', webpage, 'window.initState', display_id)['apolloCache']
 
-        content_data_id = traverse_obj(
-            apollo_cache_json, ('ROOT_QUERY', lambda k, _: k.startswith('getForgeContent'), 'id'), get_all=False)
-
-        content_real_info = apollo_cache_json[content_data_id]
+        content_real_info = traverse_obj(
+            apollo_cache_json, ('ROOT_QUERY', lambda k, _: k.startswith('getArticle')), get_all=False)
 
         return self.playlist_from_matches(
-            traverse_obj(content_real_info, ('parts', lambda _, v: v['typename'] == 'Video', 'id')),
-            getter=lambda x: f'https://www.mlb.com/video/{apollo_cache_json[x]["slug"]}',
-            ie=MLBVideoIE, playlist_id=content_real_info.get('_translationId'),
+            traverse_obj(content_real_info, ('parts', lambda _, v: v['__typename'] == 'Video' or v['type'] == 'video')),
+            getter=lambda x: f'https://www.mlb.com/video/{x["slug"]}',
+            ie=MLBVideoIE, playlist_id=content_real_info.get('translationId'),
             title=self._html_search_meta('og:title', webpage),
             description=content_real_info.get('summary'),
             modified_timestamp=parse_iso8601(content_real_info.get('lastUpdatedDate')))
diff --git a/plugins/youtube_download/yt_dlp/extractor/mlssoccer.py b/plugins/youtube_download/yt_dlp/extractor/mlssoccer.py
index 9383f13..a0b141a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/mlssoccer.py
+++ b/plugins/youtube_download/yt_dlp/extractor/mlssoccer.py
@@ -3,7 +3,7 @@ from .common import InfoExtractor
 
 class MLSSoccerIE(InfoExtractor):
     _VALID_DOMAINS = r'(?:(?:cfmontreal|intermiamicf|lagalaxy|lafc|houstondynamofc|dcunited|atlutd|mlssoccer|fcdallas|columbuscrew|coloradorapids|fccincinnati|chicagofirefc|austinfc|nashvillesc|whitecapsfc|sportingkc|soundersfc|sjearthquakes|rsl|timbers|philadelphiaunion|orlandocitysc|newyorkredbulls|nycfc)\.com|(?:torontofc)\.ca|(?:revolutionsoccer)\.net)'
-    _VALID_URL = r'https?://(?:www\.)?%s/video/#?(?P<id>[^/&$#?]+)' % _VALID_DOMAINS
+    _VALID_URL = rf'https?://(?:www\.)?{_VALID_DOMAINS}/video/#?(?P<id>[^/&$#?]+)'
 
     _TESTS = [{
         'url': 'https://www.mlssoccer.com/video/the-octagon-can-alphonso-davies-lead-canada-to-first-world-cup-since-1986#the-octagon-can-alphonso-davies-lead-canada-to-first-world-cup-since-1986',
@@ -19,96 +19,97 @@ class MLSSoccerIE(InfoExtractor):
             'tags': ['club/canada'],
             'is_live': False,
             'upload_date': '20211007',
-            'filesize_approx': 255193528.83200002
+            'filesize_approx': 255193528.83200002,
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }, {
         'url': 'https://www.whitecapsfc.com/video/highlights-san-jose-earthquakes-vs-vancouver-whitecaps-fc-october-23-2021#highlights-san-jose-earthquakes-vs-vancouver-whitecaps-fc-october-23-2021',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.torontofc.ca/video/highlights-toronto-fc-vs-cf-montreal-october-23-2021-x6733#highlights-toronto-fc-vs-cf-montreal-october-23-2021-x6733',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.sportingkc.com/video/post-match-press-conference-john-pulskamp-oct-27-2021#post-match-press-conference-john-pulskamp-oct-27-2021',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.soundersfc.com/video/highlights-seattle-sounders-fc-vs-sporting-kansas-city-october-23-2021',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.sjearthquakes.com/video/#highlights-austin-fc-vs-san-jose-earthquakes-june-19-2021',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.rsl.com/video/2021-u-of-u-health-mic-d-up-vs-colorado-10-16-21#2021-u-of-u-health-mic-d-up-vs-colorado-10-16-21',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.timbers.com/video/highlights-d-chara-asprilla-with-goals-in-portland-timbers-2-0-win-over-san-jose#highlights-d-chara-asprilla-with-goals-in-portland-timbers-2-0-win-over-san-jose',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.philadelphiaunion.com/video/highlights-torvphi',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.orlandocitysc.com/video/highlight-columbus-crew-vs-orlando-city-sc',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.newyorkredbulls.com/video/all-access-matchday-double-derby-week#all-access-matchday-double-derby-week',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.nycfc.com/video/highlights-nycfc-1-0-chicago-fire-fc#highlights-nycfc-1-0-chicago-fire-fc',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.revolutionsoccer.net/video/two-minute-highlights-revs-1-rapids-0-october-27-2021#two-minute-highlights-revs-1-rapids-0-october-27-2021',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.nashvillesc.com/video/goal-c-j-sapong-nashville-sc-92nd-minute',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.cfmontreal.com/video/faits-saillants-tor-v-mtl#faits-saillants-orl-v-mtl-x5645',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.intermiamicf.com/video/all-access-victory-vs-nashville-sc-by-ukg#all-access-victory-vs-nashville-sc-by-ukg',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.lagalaxy.com/video/#moment-of-the-month-presented-by-san-manuel-casino-rayan-raveloson-scores-his-se',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.lafc.com/video/breaking-down-lafc-s-final-6-matches-of-the-2021-mls-regular-season#breaking-down-lafc-s-final-6-matches-of-the-2021-mls-regular-season',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.houstondynamofc.com/video/postgame-press-conference-michael-nelson-presented-by-coushatta-casino-res-x9660#postgame-press-conference-michael-nelson-presented-by-coushatta-casino-res-x9660',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.dcunited.com/video/tony-alfaro-my-family-pushed-me-to-believe-everything-was-possible',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.fcdallas.com/video/highlights-fc-dallas-vs-minnesota-united-fc-october-02-2021#highlights-fc-dallas-vs-minnesota-united-fc-october-02-2021',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.columbuscrew.com/video/match-rewind-columbus-crew-vs-new-york-red-bulls-october-23-2021',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.coloradorapids.com/video/postgame-reaction-robin-fraser-october-27#postgame-reaction-robin-fraser-october-27',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.fccincinnati.com/video/#keeping-cincy-chill-presented-by-coors-lite',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.chicagofirefc.com/video/all-access-fire-score-dramatic-road-win-in-cincy#all-access-fire-score-dramatic-road-win-in-cincy',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.austinfc.com/video/highlights-colorado-rapids-vs-austin-fc-september-29-2021#highlights-colorado-rapids-vs-austin-fc-september-29-2021',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.atlutd.com/video/goal-josef-martinez-scores-in-the-73rd-minute#goal-josef-martinez-scores-in-the-73rd-minute',
-        'only_matching': True
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
-        id = self._match_id(url)
-        webpage = self._download_webpage(url, id)
-        data_json = self._parse_json(self._html_search_regex(r'data-options\=\"([^\"]+)\"', webpage, 'json'), id)['videoList'][0]
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+        data_json = self._parse_json(
+            self._html_search_regex(r'data-options\=\"([^\"]+)\"', webpage, 'json'), video_id)['videoList'][0]
         return {
-            'id': id,
+            'id': video_id,
             '_type': 'url',
-            'url': 'https://players.brightcove.net/%s/default_default/index.html?videoId=%s' % (data_json['accountId'], data_json['videoId']),
+            'url': 'https://players.brightcove.net/{}/default_default/index.html?videoId={}'.format(data_json['accountId'], data_json['videoId']),
             'ie_key': 'BrightcoveNew',
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/mnet.py b/plugins/youtube_download/yt_dlp/extractor/mnet.py
deleted file mode 100644
index 98bab2e..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/mnet.py
+++ /dev/null
@@ -1,85 +0,0 @@
-from .common import InfoExtractor
-from ..utils import (
-    int_or_none,
-    parse_duration,
-    parse_iso8601,
-)
-
-
-class MnetIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?mnet\.(?:com|interest\.me)/tv/vod/(?:.*?\bclip_id=)?(?P<id>[0-9]+)'
-    _TESTS = [{
-        'url': 'http://www.mnet.com/tv/vod/171008',
-        'info_dict': {
-            'id': '171008',
-            'title': 'SS_이해인@히든박스',
-            'description': 'md5:b9efa592c3918b615ba69fe9f8a05c55',
-            'duration': 88,
-            'upload_date': '20151231',
-            'timestamp': 1451564040,
-            'age_limit': 0,
-            'thumbnails': 'mincount:5',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'ext': 'flv',
-        },
-        'params': {
-            # rtmp download
-            'skip_download': True,
-        },
-    }, {
-        'url': 'http://mnet.interest.me/tv/vod/172790',
-        'only_matching': True,
-    }, {
-        'url': 'http://www.mnet.com/tv/vod/vod_view.asp?clip_id=172790&tabMenu=',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        # TODO: extract rtmp formats
-        # no stype -> rtmp url
-        # stype=H -> m3u8 url
-        # stype=M -> mpd url
-        info = self._download_json(
-            'http://content.api.mnet.com/player/vodConfig',
-            video_id, 'Downloading vod config JSON', query={
-                'id': video_id,
-                'ctype': 'CLIP',
-                'stype': 'H',
-            })['data']['info']
-
-        title = info['title']
-
-        cdn_data = self._download_json(
-            info['cdn'], video_id, 'Downloading vod cdn JSON')['data'][0]
-        m3u8_url = cdn_data['url']
-        token = cdn_data.get('token')
-        if token and token != '-':
-            m3u8_url += '?' + token
-        formats = self._extract_wowza_formats(
-            m3u8_url, video_id, skip_protocols=['rtmp', 'rtsp', 'f4m'])
-
-        description = info.get('ment')
-        duration = parse_duration(info.get('time'))
-        timestamp = parse_iso8601(info.get('date'), delimiter=' ')
-        age_limit = info.get('adult')
-        if age_limit is not None:
-            age_limit = 0 if age_limit == 'N' else 18
-        thumbnails = [{
-            'id': thumb_format,
-            'url': thumb['url'],
-            'width': int_or_none(thumb.get('width')),
-            'height': int_or_none(thumb.get('height')),
-        } for thumb_format, thumb in info.get('cover', {}).items() if thumb.get('url')]
-
-        return {
-            'id': video_id,
-            'title': title,
-            'description': description,
-            'duration': duration,
-            'timestamp': timestamp,
-            'age_limit': age_limit,
-            'thumbnails': thumbnails,
-            'formats': formats,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/mocha.py b/plugins/youtube_download/yt_dlp/extractor/mocha.py
index 5f72b81..c3f4055 100644
--- a/plugins/youtube_download/yt_dlp/extractor/mocha.py
+++ b/plugins/youtube_download/yt_dlp/extractor/mocha.py
@@ -3,7 +3,7 @@ from ..utils import int_or_none, traverse_obj
 
 
 class MochaVideoIE(InfoExtractor):
-    _VALID_URL = r'https?://video.mocha.com.vn/(?P<video_slug>[\w-]+)'
+    _VALID_URL = r'https?://video\.mocha\.com\.vn/(?P<video_slug>[\w-]+)'
     _TESTS = [{
         'url': 'http://video.mocha.com.vn/chuyen-meo-gia-su-tu-thong-diep-cuoc-song-v18694039',
         'info_dict': {
@@ -20,8 +20,8 @@ class MochaVideoIE(InfoExtractor):
             'timestamp': 1652254203,
             'upload_date': '20220511',
             'comment_count': int,
-            'categories': ['Kids']
-        }
+            'categories': ['Kids'],
+        },
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/moevideo.py b/plugins/youtube_download/yt_dlp/extractor/moevideo.py
deleted file mode 100644
index fda08ca..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/moevideo.py
+++ /dev/null
@@ -1,74 +0,0 @@
-from .common import InfoExtractor
-from ..utils import (
-    clean_html,
-    int_or_none,
-)
-
-
-class MoeVideoIE(InfoExtractor):
-    IE_DESC = 'LetitBit video services: moevideo.net, playreplay.net and videochart.net'
-    _VALID_URL = r'''(?x)
-        https?://(?P<host>(?:www\.)?
-        (?:(?:moevideo|playreplay|videochart)\.net|thesame\.tv))/
-        (?:video|framevideo|embed)/(?P<id>[0-9a-z]+\.[0-9A-Za-z]+)'''
-    _API_URL = 'http://api.letitbit.net/'
-    _API_KEY = 'tVL0gjqo5'
-    _TESTS = [
-        {
-            'url': 'http://moevideo.net/video/00297.0036103fe3d513ef27915216fd29',
-            'md5': '129f5ae1f6585d0e9bb4f38e774ffb3a',
-            'info_dict': {
-                'id': '00297.0036103fe3d513ef27915216fd29',
-                'ext': 'flv',
-                'title': 'Sink cut out machine',
-                'description': 'md5:f29ff97b663aefa760bf7ca63c8ca8a8',
-                'thumbnail': r're:^https?://.*\.jpg$',
-                'width': 540,
-                'height': 360,
-                'duration': 179,
-                'filesize': 17822500,
-            },
-            'skip': 'Video has been removed',
-        },
-        {
-            'url': 'http://playreplay.net/video/77107.7f325710a627383d40540d8e991a',
-            'md5': '74f0a014d5b661f0f0e2361300d1620e',
-            'info_dict': {
-                'id': '77107.7f325710a627383d40540d8e991a',
-                'ext': 'flv',
-                'title': 'Operacion Condor.',
-                'description': 'md5:7e68cb2fcda66833d5081c542491a9a3',
-                'thumbnail': r're:^https?://.*\.jpg$',
-                'width': 480,
-                'height': 296,
-                'duration': 6027,
-                'filesize': 588257923,
-            },
-            'skip': 'Video has been removed',
-        },
-    ]
-
-    def _real_extract(self, url):
-        host, video_id = self._match_valid_url(url).groups()
-
-        webpage = self._download_webpage(
-            'http://%s/video/%s' % (host, video_id),
-            video_id, 'Downloading webpage')
-
-        title = self._og_search_title(webpage)
-
-        embed_webpage = self._download_webpage(
-            'http://%s/embed/%s' % (host, video_id),
-            video_id, 'Downloading embed webpage')
-        video = self._parse_json(self._search_regex(
-            r'mvplayer\("#player"\s*,\s*({.+})',
-            embed_webpage, 'mvplayer'), video_id)['video']
-
-        return {
-            'id': video_id,
-            'title': title,
-            'thumbnail': video.get('poster') or self._og_search_thumbnail(webpage),
-            'description': clean_html(self._og_search_description(webpage)),
-            'duration': int_or_none(self._og_search_property('video:duration', webpage)),
-            'url': video['ourUrl'],
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/mofosex.py b/plugins/youtube_download/yt_dlp/extractor/mofosex.py
deleted file mode 100644
index 9cb6980..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/mofosex.py
+++ /dev/null
@@ -1,70 +0,0 @@
-from .common import InfoExtractor
-from ..utils import (
-    int_or_none,
-    str_to_int,
-    unified_strdate,
-)
-from .keezmovies import KeezMoviesIE
-
-
-class MofosexIE(KeezMoviesIE):  # XXX: Do not subclass from concrete IE
-    _VALID_URL = r'https?://(?:www\.)?mofosex\.com/videos/(?P<id>\d+)/(?P<display_id>[^/?#&.]+)\.html'
-    _TESTS = [{
-        'url': 'http://www.mofosex.com/videos/318131/amateur-teen-playing-and-masturbating-318131.html',
-        'md5': '558fcdafbb63a87c019218d6e49daf8a',
-        'info_dict': {
-            'id': '318131',
-            'display_id': 'amateur-teen-playing-and-masturbating-318131',
-            'ext': 'mp4',
-            'title': 'amateur teen playing and masturbating',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'upload_date': '20121114',
-            'view_count': int,
-            'like_count': int,
-            'dislike_count': int,
-            'age_limit': 18,
-        }
-    }, {
-        # This video is no longer available
-        'url': 'http://www.mofosex.com/videos/5018/japanese-teen-music-video.html',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        webpage, info = self._extract_info(url)
-
-        view_count = str_to_int(self._search_regex(
-            r'VIEWS:</span>\s*([\d,.]+)', webpage, 'view count', fatal=False))
-        like_count = int_or_none(self._search_regex(
-            r'id=["\']amountLikes["\'][^>]*>(\d+)', webpage,
-            'like count', fatal=False))
-        dislike_count = int_or_none(self._search_regex(
-            r'id=["\']amountDislikes["\'][^>]*>(\d+)', webpage,
-            'like count', fatal=False))
-        upload_date = unified_strdate(self._html_search_regex(
-            r'Added:</span>([^<]+)', webpage, 'upload date', fatal=False))
-
-        info.update({
-            'view_count': view_count,
-            'like_count': like_count,
-            'dislike_count': dislike_count,
-            'upload_date': upload_date,
-            'thumbnail': self._og_search_thumbnail(webpage),
-        })
-
-        return info
-
-
-class MofosexEmbedIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?mofosex\.com/embed/?\?.*?\bvideoid=(?P<id>\d+)'
-    _EMBED_REGEX = [r'<iframe[^>]+\bsrc=["\'](?P<url>(?:https?:)?//(?:www\.)?mofosex\.com/embed/?\?.*?\bvideoid=\d+)']
-    _TESTS = [{
-        'url': 'https://www.mofosex.com/embed/?videoid=318131&referrer=KM',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        return self.url_result(
-            'http://www.mofosex.com/videos/{0}/{0}.html'.format(video_id),
-            ie=MofosexIE.ie_key(), video_id=video_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/mojevideo.py b/plugins/youtube_download/yt_dlp/extractor/mojevideo.py
new file mode 100644
index 0000000..145e306
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/mojevideo.py
@@ -0,0 +1,121 @@
+from .common import InfoExtractor
+from ..utils import js_to_json, remove_end, update_url_query
+
+
+class MojevideoIE(InfoExtractor):
+    IE_DESC = 'mojevideo.sk'
+    _VALID_URL = r'https?://(?:www\.)?mojevideo\.sk/video/(?P<id>\w+)/(?P<display_id>[\w()]+?)\.html'
+
+    _TESTS = [{
+        'url': 'https://www.mojevideo.sk/video/3d17c/chlapci_dobetonovali_sme_mame_hotovo.html',
+        'md5': '384a4628bd2bbd261c5206cf77c38c17',
+        'info_dict': {
+            'id': '3d17c',
+            'ext': 'mp4',
+            'title': 'Chlapci dobetónovali sme, máme hotovo!',
+            'display_id': 'chlapci_dobetonovali_sme_mame_hotovo',
+            'description': 'md5:a0822126044050d304a9ef58c92ddb34',
+            'thumbnail': 'https://fs5.mojevideo.sk/imgfb/250236.jpg',
+            'duration': 21.0,
+            'upload_date': '20230919',
+            'timestamp': 1695129706,
+            'like_count': int,
+            'dislike_count': int,
+            'view_count': int,
+            'comment_count': int,
+        },
+    }, {
+        # 720p
+        'url': 'https://www.mojevideo.sk/video/14677/den_blbec.html',
+        'md5': '517c3e111c53a67d10b429c1f344ba2f',
+        'info_dict': {
+            'id': '14677',
+            'ext': 'mp4',
+            'title': 'Deň blbec?',
+            'display_id': 'den_blbec',
+            'description': 'I maličkosť vám môže zmeniť celý deň. Nikdy nezahadzujte žuvačky na zem!',
+            'thumbnail': 'https://fs5.mojevideo.sk/imgfb/83575.jpg',
+            'duration': 100.0,
+            'upload_date': '20120515',
+            'timestamp': 1337076481,
+            'like_count': int,
+            'dislike_count': int,
+            'view_count': int,
+            'comment_count': int,
+        },
+    }, {
+        # 1080p
+        'url': 'https://www.mojevideo.sk/video/2feb2/band_maid_onset_(instrumental)_live_zepp_tokyo_(full_hd).html',
+        'md5': '64599a23d3ac31cf2fe069e4353d8162',
+        'info_dict': {
+            'id': '2feb2',
+            'ext': 'mp4',
+            'title': 'BAND-MAID - onset (Instrumental) Live - Zepp Tokyo (Full HD)',
+            'display_id': 'band_maid_onset_(instrumental)_live_zepp_tokyo_(full_hd)',
+            'description': 'Výborná inštrumentálna skladba od skupiny BAND-MAID.',
+            'thumbnail': 'https://fs5.mojevideo.sk/imgfb/196274.jpg',
+            'duration': 240.0,
+            'upload_date': '20190708',
+            'timestamp': 1562576592,
+            'like_count': int,
+            'dislike_count': int,
+            'view_count': int,
+            'comment_count': int,
+        },
+    }, {
+        # 720p
+        'url': 'https://www.mojevideo.sk/video/358c8/dva_nissany_skyline_strielaju_v_londyne.html',
+        'only_matching': True,
+    }, {
+        # 720p
+        'url': 'https://www.mojevideo.sk/video/2455d/gopro_hero4_session_nova_sportova_vodotesna_kamera.html',
+        'only_matching': True,
+    }, {
+        # 1080p
+        'url': 'https://www.mojevideo.sk/video/352ee/amd_rx_6800_xt_vs_nvidia_rtx_3080_(test_v_9_hrach).html',
+        'only_matching': True,
+    }, {
+        # 1080p
+        'url': 'https://www.mojevideo.sk/video/2cbeb/trailer_z_avengers_infinity_war.html',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        video_id, display_id = self._match_valid_url(url).groups()
+        webpage = self._download_webpage(url, video_id)
+
+        video_id_dec = self._search_regex(
+            r'\bvId\s*=\s*(\d+)', webpage, 'video id', fatal=False) or str(int(video_id, 16))
+        video_exp = self._search_regex(r'\bvEx\s*=\s*["\'](\d+)', webpage, 'video expiry')
+        video_hashes = self._search_json(
+            r'\bvHash\s*=', webpage, 'video hashes', video_id,
+            contains_pattern=r'\[(?s:.+)\]', transform_source=js_to_json)
+
+        formats = []
+        for video_hash, (suffix, quality, format_note) in zip(video_hashes, [
+            ('', 1, 'normálna kvalita'),
+            ('_lq', 0, 'nízka kvalita'),
+            ('_hd', 2, 'HD-720p'),
+            ('_fhd', 3, 'FULL HD-1080p'),
+            ('_2k', 4, '2K-1440p'),
+        ]):
+            formats.append({
+                'format_id': f'mp4-{quality}',
+                'quality': quality,
+                'format_note': format_note,
+                'url': update_url_query(
+                    f'https://cache01.mojevideo.sk/securevideos69/{video_id_dec}{suffix}.mp4', {
+                        'md5': video_hash,
+                        'expires': video_exp,
+                    }),
+            })
+
+        return {
+            'id': video_id,
+            'display_id': display_id,
+            'formats': formats,
+            'title': (self._og_search_title(webpage, default=None)
+                      or remove_end(self._html_extract_title(webpage, 'title'), ' - Mojevideo')),
+            'description': self._og_search_description(webpage),
+            **self._search_json_ld(webpage, video_id, default={}),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/mojvideo.py b/plugins/youtube_download/yt_dlp/extractor/mojvideo.py
index d47ad07..6bc362a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/mojvideo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/mojvideo.py
@@ -17,7 +17,7 @@ class MojvideoIE(InfoExtractor):
             'title': 'V avtu pred mano rdečelaska - Alfi Nipič',
             'thumbnail': r're:^http://.*\.jpg$',
             'duration': 242,
-        }
+        },
     }
 
     def _real_extract(self, url):
@@ -27,12 +27,12 @@ class MojvideoIE(InfoExtractor):
 
         # XML is malformed
         playerapi = self._download_webpage(
-            'http://www.mojvideo.com/playerapi.php?v=%s&t=1' % video_id, display_id)
+            f'http://www.mojvideo.com/playerapi.php?v={video_id}&t=1', display_id)
 
         if '<error>true</error>' in playerapi:
             error_desc = self._html_search_regex(
                 r'<errordesc>([^<]*)</errordesc>', playerapi, 'error description', fatal=False)
-            raise ExtractorError('%s said: %s' % (self.IE_NAME, error_desc), expected=True)
+            raise ExtractorError(f'{self.IE_NAME} said: {error_desc}', expected=True)
 
         title = self._html_extract_title(playerapi)
         video_url = self._html_search_regex(
diff --git a/plugins/youtube_download/yt_dlp/extractor/monstercat.py b/plugins/youtube_download/yt_dlp/extractor/monstercat.py
new file mode 100644
index 0000000..f17b91f
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/monstercat.py
@@ -0,0 +1,74 @@
+import re
+
+from .common import InfoExtractor
+from ..utils import (
+    clean_html,
+    extract_attributes,
+    int_or_none,
+    strip_or_none,
+    unified_strdate,
+)
+from ..utils.traversal import find_element, traverse_obj
+
+
+class MonstercatIE(InfoExtractor):
+    _VALID_URL = r'https?://www\.monstercat\.com/release/(?P<id>\d+)'
+    _TESTS = [{
+        'url': 'https://www.monstercat.com/release/742779548009',
+        'playlist_count': 20,
+        'info_dict': {
+            'title': 'The Secret Language of Trees',
+            'id': '742779548009',
+            'thumbnail': 'https://www.monstercat.com/release/742779548009/cover',
+            'release_date': '20230711',
+            'album': 'The Secret Language of Trees',
+            'album_artists': ['BT'],
+        },
+    }]
+
+    def _extract_tracks(self, table, album_meta):
+        for td in re.findall(r'<tr[^<]*>((?:(?!</tr>)[\w\W])+)', table):  # regex by chatgpt due to lack of get_elements_by_tag
+            title = traverse_obj(td, (
+                {find_element(cls='d-inline-flex flex-column')},
+                {lambda x: x.partition(' <span')}, 0, {clean_html}))
+            ids = traverse_obj(td, (
+                {find_element(cls='btn-play cursor-pointer mr-small', html=True)}, {extract_attributes})) or {}
+            track_id = ids.get('data-track-id')
+            release_id = ids.get('data-release-id')
+
+            track_number = traverse_obj(td, ({find_element(cls='py-xsmall')}, {int_or_none}))
+            if not track_id or not release_id:
+                self.report_warning(f'Skipping track {track_number}, ID(s) not found')
+                self.write_debug(f'release_id={release_id!r} track_id={track_id!r}')
+                continue
+            yield {
+                **album_meta,
+                'title': title,
+                'track': title,
+                'track_number': track_number,
+                'artists': traverse_obj(td, ({find_element(cls='d-block fs-xxsmall')}, {clean_html}, all)),
+                'url': f'https://www.monstercat.com/api/release/{release_id}/track-stream/{track_id}',
+                'id': track_id,
+                'ext': 'mp3',
+            }
+
+    def _real_extract(self, url):
+        url_id = self._match_id(url)
+        html = self._download_webpage(url, url_id)
+        # NB: HTMLParser may choke on this html; use {find_element} or try_call(lambda: get_element...)
+        tracklist_table = traverse_obj(html, {find_element(cls='table table-small')}) or ''
+        title = traverse_obj(html, ({find_element(tag='h1')}, {clean_html}))
+
+        album_meta = {
+            'title': title,
+            'album': title,
+            'thumbnail': f'https://www.monstercat.com/release/{url_id}/cover',
+            'album_artists': traverse_obj(html, (
+                {find_element(cls='h-normal text-uppercase mb-desktop-medium mb-smallish')}, {clean_html}, all)),
+            'release_date': traverse_obj(html, (
+                {find_element(cls='font-italic mb-medium d-tablet-none d-phone-block')},
+                {lambda x: x.partition('Released ')}, 2, {strip_or_none}, {unified_strdate})),
+        }
+
+        return self.playlist_result(
+            self._extract_tracks(tracklist_table, album_meta), playlist_id=url_id, **album_meta)
diff --git a/plugins/youtube_download/yt_dlp/extractor/morningstar.py b/plugins/youtube_download/yt_dlp/extractor/morningstar.py
deleted file mode 100644
index e9fcfe3..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/morningstar.py
+++ /dev/null
@@ -1,45 +0,0 @@
-from .common import InfoExtractor
-
-
-class MorningstarIE(InfoExtractor):
-    IE_DESC = 'morningstar.com'
-    _VALID_URL = r'https?://(?:(?:www|news)\.)morningstar\.com/[cC]over/video[cC]enter\.aspx\?id=(?P<id>[0-9]+)'
-    _TESTS = [{
-        'url': 'http://www.morningstar.com/cover/videocenter.aspx?id=615869',
-        'md5': '6c0acface7a787aadc8391e4bbf7b0f5',
-        'info_dict': {
-            'id': '615869',
-            'ext': 'mp4',
-            'title': 'Get Ahead of the Curve on 2013 Taxes',
-            'description': "Vanguard's Joel Dickson on managing higher tax rates for high-income earners and fund capital-gain distributions in 2013.",
-            'thumbnail': r're:^https?://.*m(?:orning)?star\.com/.+thumb\.jpg$'
-        }
-    }, {
-        'url': 'http://news.morningstar.com/cover/videocenter.aspx?id=825556',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        mobj = self._match_valid_url(url)
-        video_id = mobj.group('id')
-
-        webpage = self._download_webpage(url, video_id)
-        title = self._html_search_regex(
-            r'<h1 id="titleLink">(.*?)</h1>', webpage, 'title')
-        video_url = self._html_search_regex(
-            r'<input type="hidden" id="hidVideoUrl" value="([^"]+)"',
-            webpage, 'video URL')
-        thumbnail = self._html_search_regex(
-            r'<input type="hidden" id="hidSnapshot" value="([^"]+)"',
-            webpage, 'thumbnail', fatal=False)
-        description = self._html_search_regex(
-            r'<div id="mstarDeck".*?>(.*?)</div>',
-            webpage, 'description', fatal=False)
-
-        return {
-            'id': video_id,
-            'title': title,
-            'url': video_url,
-            'thumbnail': thumbnail,
-            'description': description,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/motherless.py b/plugins/youtube_download/yt_dlp/extractor/motherless.py
index 769b52c..8655195 100644
--- a/plugins/youtube_download/yt_dlp/extractor/motherless.py
+++ b/plugins/youtube_download/yt_dlp/extractor/motherless.py
@@ -1,4 +1,4 @@
-import datetime
+import datetime as dt
 import re
 import urllib.parse
 
@@ -115,10 +115,10 @@ class MotherlessIE(InfoExtractor):
         if any(p in webpage for p in (
                 '<title>404 - MOTHERLESS.COM<',
                 ">The page you're looking for cannot be found.<")):
-            raise ExtractorError('Video %s does not exist' % video_id, expected=True)
+            raise ExtractorError(f'Video {video_id} does not exist', expected=True)
 
         if '>The content you are trying to view is for friends only.' in webpage:
-            raise ExtractorError('Video %s is for friends only' % video_id, expected=True)
+            raise ExtractorError(f'Video {video_id} is for friends only', expected=True)
 
         title = self._html_search_regex(
             (r'(?s)<div[^>]+\bclass=["\']media-meta-title[^>]+>(.+?)</div>',
@@ -127,7 +127,7 @@ class MotherlessIE(InfoExtractor):
             (r'setup\(\{\s*["\']file["\']\s*:\s*(["\'])(?P<url>(?:(?!\1).)+)\1',
              r'fileurl\s*=\s*(["\'])(?P<url>(?:(?!\1).)+)\1'),
             webpage, 'video URL', default=None, group='url')
-            or 'http://cdn4.videos.motherlessmedia.com/videos/%s.mp4?fs=opencloud' % video_id)
+            or f'http://cdn4.videos.motherlessmedia.com/videos/{video_id}.mp4?fs=opencloud')
         age_limit = self._rta_search(webpage)
         view_count = str_to_int(self._html_search_regex(
             (r'>([\d,.]+)\s+Views<', r'<strong>Views</strong>\s+([^<]+)<'),
@@ -151,7 +151,7 @@ class MotherlessIE(InfoExtractor):
                     'd': 'days',
                 }
                 kwargs = {_AGO_UNITS.get(uploaded_ago[-1]): delta}
-                upload_date = (datetime.datetime.utcnow() - datetime.timedelta(**kwargs)).strftime('%Y%m%d')
+                upload_date = (dt.datetime.now(dt.timezone.utc) - dt.timedelta(**kwargs)).strftime('%Y%m%d')
 
         comment_count = len(re.findall(r'''class\s*=\s*['"]media-comment-contents\b''', webpage))
         uploader_id = self._html_search_regex(
@@ -177,6 +177,7 @@ class MotherlessIE(InfoExtractor):
 
 
 class MotherlessPaginatedIE(InfoExtractor):
+    _EXTRA_QUERY = {}
     _PAGE_SIZE = 60
 
     def _correct_path(self, url, item_id):
@@ -199,7 +200,7 @@ class MotherlessPaginatedIE(InfoExtractor):
         def get_page(idx):
             page = idx + 1
             current_page = webpage if not idx else self._download_webpage(
-                real_url, item_id, note=f'Downloading page {page}', query={'page': page})
+                real_url, item_id, note=f'Downloading page {page}', query={'page': page, **self._EXTRA_QUERY})
             yield from self._extract_entries(current_page, real_url)
 
         return self.playlist_result(
@@ -213,7 +214,7 @@ class MotherlessGroupIE(MotherlessPaginatedIE):
         'url': 'http://motherless.com/gv/movie_scenes',
         'info_dict': {
             'id': 'movie_scenes',
-            'title': 'Movie Scenes',
+            'title': 'Movie Scenes - Videos - Hot and sexy scenes from "regular" movies... Beautiful actresses fully',
         },
         'playlist_mincount': 540,
     }, {
@@ -244,7 +245,7 @@ class MotherlessGalleryIE(MotherlessPaginatedIE):
             'id': '338999F',
             'title': 'Random',
         },
-        'playlist_mincount': 190,
+        'playlist_mincount': 171,
     }, {
         'url': 'https://motherless.com/GVABD6213',
         'info_dict': {
@@ -270,3 +271,27 @@ class MotherlessGalleryIE(MotherlessPaginatedIE):
 
     def _correct_path(self, url, item_id):
         return urllib.parse.urljoin(url, f'/GV{item_id}')
+
+
+class MotherlessUploaderIE(MotherlessPaginatedIE):
+    _VALID_URL = r'https?://(?:www\.)?motherless\.com/u/(?P<id>\w+)/?(?:$|[?#])'
+    _TESTS = [{
+        'url': 'https://motherless.com/u/Mrgo4hrs2023',
+        'info_dict': {
+            'id': 'Mrgo4hrs2023',
+            'title': "Mrgo4hrs2023's Uploads - Videos",
+        },
+        'playlist_mincount': 32,
+    }, {
+        'url': 'https://motherless.com/u/Happy_couple?t=v',
+        'info_dict': {
+            'id': 'Happy_couple',
+            'title': "Happy_couple's Uploads - Videos",
+        },
+        'playlist_mincount': 8,
+    }]
+
+    _EXTRA_QUERY = {'t': 'v'}
+
+    def _correct_path(self, url, item_id):
+        return urllib.parse.urljoin(url, f'/u/{item_id}?t=v')
diff --git a/plugins/youtube_download/yt_dlp/extractor/motorsport.py b/plugins/youtube_download/yt_dlp/extractor/motorsport.py
index efb087d..0178367 100644
--- a/plugins/youtube_download/yt_dlp/extractor/motorsport.py
+++ b/plugins/youtube_download/yt_dlp/extractor/motorsport.py
@@ -1,10 +1,10 @@
+import urllib.parse
+
 from .common import InfoExtractor
-from ..compat import (
-    compat_urlparse,
-)
 
 
 class MotorsportIE(InfoExtractor):
+    _WORKING = False
     IE_DESC = 'motorsport.com'
     _VALID_URL = r'https?://(?:www\.)?motorsport\.com/[^/?#]+/video/(?:[^/?#]+/)(?P<id>[^/]+)/?(?:$|[?#])'
     _TEST = {
@@ -18,7 +18,7 @@ class MotorsportIE(InfoExtractor):
             'uploader': 'mcomstaff',
             'uploader_id': 'UC334JIYKkVnyFoNCclfZtHQ',
             'upload_date': '20140903',
-            'thumbnail': r're:^https?://.+\.jpg$'
+            'thumbnail': r're:^https?://.+\.jpg$',
         },
         'add_ie': ['Youtube'],
         'params': {
@@ -39,7 +39,7 @@ class MotorsportIE(InfoExtractor):
             return self.url_result(iframe_path)
 
         iframe = self._download_webpage(
-            compat_urlparse.urljoin(url, iframe_path), display_id,
+            urllib.parse.urljoin(url, iframe_path), display_id,
             'Downloading iframe')
         youtube_id = self._search_regex(
             r'www.youtube.com/embed/(.{11})', iframe, 'youtube id')
@@ -47,5 +47,5 @@ class MotorsportIE(InfoExtractor):
         return {
             '_type': 'url_transparent',
             'display_id': display_id,
-            'url': 'https://youtube.com/watch?v=%s' % youtube_id,
+            'url': f'https://youtube.com/watch?v={youtube_id}',
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/movieclips.py b/plugins/youtube_download/yt_dlp/extractor/movieclips.py
deleted file mode 100644
index 4777f44..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/movieclips.py
+++ /dev/null
@@ -1,46 +0,0 @@
-from .common import InfoExtractor
-from ..utils import (
-    smuggle_url,
-    float_or_none,
-    parse_iso8601,
-    update_url_query,
-)
-
-
-class MovieClipsIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?movieclips\.com/videos/.+-(?P<id>\d+)(?:\?|$)'
-    _TEST = {
-        'url': 'http://www.movieclips.com/videos/warcraft-trailer-1-561180739597',
-        'md5': '42b5a0352d4933a7bd54f2104f481244',
-        'info_dict': {
-            'id': 'pKIGmG83AqD9',
-            'ext': 'mp4',
-            'title': 'Warcraft Trailer 1',
-            'description': 'Watch Trailer 1 from Warcraft (2016). Legendary’s WARCRAFT is a 3D epic adventure of world-colliding conflict based.',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'timestamp': 1446843055,
-            'upload_date': '20151106',
-            'uploader': 'Movieclips',
-        },
-        'add_ie': ['ThePlatform'],
-    }
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-        video = next(v for v in self._parse_json(self._search_regex(
-            r'var\s+__REACT_ENGINE__\s*=\s*({.+});',
-            webpage, 'react engine'), video_id)['playlist']['videos'] if v['id'] == video_id)
-
-        return {
-            '_type': 'url_transparent',
-            'ie_key': 'ThePlatform',
-            'url': smuggle_url(update_url_query(
-                video['contentUrl'], {'mbr': 'true'}), {'force_smil_url': True}),
-            'title': self._og_search_title(webpage),
-            'description': self._html_search_meta('description', webpage),
-            'duration': float_or_none(video.get('duration')),
-            'timestamp': parse_iso8601(video.get('dateCreated')),
-            'thumbnail': video.get('defaultImage'),
-            'uploader': video.get('provider'),
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/moviepilot.py b/plugins/youtube_download/yt_dlp/extractor/moviepilot.py
index 668c098..3b20232 100644
--- a/plugins/youtube_download/yt_dlp/extractor/moviepilot.py
+++ b/plugins/youtube_download/yt_dlp/extractor/moviepilot.py
@@ -1,10 +1,10 @@
-from .dailymotion import DailymotionIE
 from .common import InfoExtractor
+from .dailymotion import DailymotionIE
 
 
 class MoviepilotIE(InfoExtractor):
-    _IE_NAME = 'moviepilot'
-    _IE_DESC = 'Moviepilot trailer'
+    IE_NAME = 'moviepilot'
+    IE_DESC = 'Moviepilot trailer'
     _VALID_URL = r'https?://(?:www\.)?moviepilot\.de/movies/(?P<id>[^/]+)'
 
     _TESTS = [{
@@ -14,7 +14,7 @@ class MoviepilotIE(InfoExtractor):
             'display_id': 'interstellar-2',
             'ext': 'mp4',
             'title': 'Interstellar',
-            'thumbnail': r're:https://\w+\.dmcdn\.net/v/SaV-q1ZganMw4HVXg/x1080',
+            'thumbnail': r're:https://\w+\.dmcdn\.net/v/SaV-q1.*/x1080',
             'timestamp': 1605010596,
             'description': 'md5:0ae9cb452af52610c9ffc60f2fd0474c',
             'uploader': 'Moviepilot',
@@ -71,7 +71,7 @@ class MoviepilotIE(InfoExtractor):
             'age_limit': 0,
             'duration': 82,
             'upload_date': '20201109',
-            'thumbnail': r're:https://\w+\.dmcdn\.net/v/SaMes1Zg3lxLv9j5u/x1080',
+            'thumbnail': r're:https://\w+\.dmcdn\.net/v/SaMes1Z.*/x1080',
             'uploader': 'Moviepilot',
             'like_count': int,
             'view_count': int,
@@ -92,6 +92,6 @@ class MoviepilotIE(InfoExtractor):
             'ie_key': DailymotionIE.ie_key(),
             'display_id': video_id,
             'title': clip.get('title'),
-            'url': f'https://www.dailymotion.com/video/{clip["videoRemoteId"]}',
+            'url': f'https://www.dailymotion.com/video/{clip["video"]["remoteId"]}',
             'description': clip.get('summary'),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/moview.py b/plugins/youtube_download/yt_dlp/extractor/moview.py
index 678b2eb..560154e 100644
--- a/plugins/youtube_download/yt_dlp/extractor/moview.py
+++ b/plugins/youtube_download/yt_dlp/extractor/moview.py
@@ -16,7 +16,7 @@ class MoviewPlayIE(JixieBaseIE):
                 'title': 'Candy Monster',
                 'description': 'Mengapa Candy Monster ingin mengambil permen Chloe?',
                 'thumbnail': 'https://video.jixie.media/1034/146182/146182_1280x720.jpg',
-            }
+            },
         }, {
             # non-drm hls
             'url': 'https://www.moview.id/play/75/Paris-Van-Java-Episode-16',
@@ -29,8 +29,8 @@ class MoviewPlayIE(JixieBaseIE):
                 'thumbnail': 'https://video.jixie.media/1003/28210/28210_1280x720.jpg',
                 'description': 'md5:2a5e18d98eef9b39d7895029cac96c63',
                 'title': 'Paris Van Java Episode 16',
-            }
-        }
+            },
+        },
     ]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/moviezine.py b/plugins/youtube_download/yt_dlp/extractor/moviezine.py
index cffcdcf..331a562 100644
--- a/plugins/youtube_download/yt_dlp/extractor/moviezine.py
+++ b/plugins/youtube_download/yt_dlp/extractor/moviezine.py
@@ -20,7 +20,7 @@ class MoviezineIE(InfoExtractor):
         video_id = mobj.group('id')
 
         webpage = self._download_webpage(url, video_id)
-        jsplayer = self._download_webpage('http://www.moviezine.se/api/player.js?video=%s' % video_id, video_id, 'Downloading js api player')
+        jsplayer = self._download_webpage(f'http://www.moviezine.se/api/player.js?video={video_id}', video_id, 'Downloading js api player')
 
         formats = [{
             'format_id': 'sd',
diff --git a/plugins/youtube_download/yt_dlp/extractor/movingimage.py b/plugins/youtube_download/yt_dlp/extractor/movingimage.py
index cdd8ba4..7b1c797 100644
--- a/plugins/youtube_download/yt_dlp/extractor/movingimage.py
+++ b/plugins/youtube_download/yt_dlp/extractor/movingimage.py
@@ -1,7 +1,7 @@
 from .common import InfoExtractor
 from ..utils import (
-    unescapeHTML,
     parse_duration,
+    unescapeHTML,
 )
 
 
@@ -31,7 +31,7 @@ class MovingImageIE(InfoExtractor):
 
         def search_field(field_name, fatal=False):
             return self._search_regex(
-                r'<span\s+class="field_title">%s:</span>\s*<span\s+class="field_content">([^<]+)</span>' % field_name,
+                rf'<span\s+class="field_title">{field_name}:</span>\s*<span\s+class="field_content">([^<]+)</span>',
                 webpage, 'title', fatal=fatal)
 
         title = unescapeHTML(search_field('Title', fatal=True)).strip('()[]')
diff --git a/plugins/youtube_download/yt_dlp/extractor/msn.py b/plugins/youtube_download/yt_dlp/extractor/msn.py
index f91c53e..6ede7c5 100644
--- a/plugins/youtube_download/yt_dlp/extractor/msn.py
+++ b/plugins/youtube_download/yt_dlp/extractor/msn.py
@@ -1,167 +1,215 @@
-import re
-
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
-    determine_ext,
     ExtractorError,
+    clean_html,
+    determine_ext,
     int_or_none,
-    unescapeHTML,
+    parse_iso8601,
+    url_or_none,
 )
+from ..utils.traversal import traverse_obj
 
 
 class MSNIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:(?:www|preview)\.)?msn\.com/(?:[^/]+/)+(?P<display_id>[^/]+)/[a-z]{2}-(?P<id>[\da-zA-Z]+)'
+    _VALID_URL = r'https?://(?:(?:www|preview)\.)?msn\.com/(?P<locale>[a-z]{2}-[a-z]{2})/(?:[^/?#]+/)+(?P<display_id>[^/?#]+)/[a-z]{2}-(?P<id>[\da-zA-Z]+)'
     _TESTS = [{
-        'url': 'https://www.msn.com/en-in/money/video/7-ways-to-get-rid-of-chest-congestion/vi-BBPxU6d',
-        'md5': '087548191d273c5c55d05028f8d2cbcd',
+        'url': 'https://www.msn.com/en-gb/video/news/president-macron-interrupts-trump-over-ukraine-funding/vi-AA1zMcD7',
         'info_dict': {
-            'id': 'BBPxU6d',
-            'display_id': '7-ways-to-get-rid-of-chest-congestion',
+            'id': 'AA1zMcD7',
             'ext': 'mp4',
-            'title': 'Seven ways to get rid of chest congestion',
-            'description': '7 Ways to Get Rid of Chest Congestion',
-            'duration': 88,
-            'uploader': 'Health',
-            'uploader_id': 'BBPrMqa',
+            'display_id': 'president-macron-interrupts-trump-over-ukraine-funding',
+            'title': 'President Macron interrupts Trump over Ukraine funding',
+            'description': 'md5:5fd3857ac25849e7a56cb25fbe1a2a8b',
+            'uploader': 'k! News UK',
+            'uploader_id': 'BB1hz5Rj',
+            'duration': 59,
+            'thumbnail': 'https://img-s-msn-com.akamaized.net/tenant/amp/entityid/AA1zMagX.img',
+            'tags': 'count:14',
+            'timestamp': 1740510914,
+            'upload_date': '20250225',
+            'release_timestamp': 1740513600,
+            'release_date': '20250225',
+            'modified_timestamp': 1741413241,
+            'modified_date': '20250308',
         },
     }, {
-        # Article, multiple Dailymotion Embeds
-        'url': 'https://www.msn.com/en-in/money/sports/hottest-football-wags-greatest-footballers-turned-managers-and-more/ar-BBpc7Nl',
+        'url': 'https://www.msn.com/en-gb/video/watch/films-success-saved-adam-pearsons-acting-career/vi-AA1znZGE?ocid=hpmsn',
         'info_dict': {
-            'id': 'BBpc7Nl',
+            'id': 'AA1znZGE',
+            'ext': 'mp4',
+            'display_id': 'films-success-saved-adam-pearsons-acting-career',
+            'title': "Films' success saved Adam Pearson's acting career",
+            'description': 'md5:98c05f7bd9ab4f9c423400f62f2d3da5',
+            'uploader': 'Sky News',
+            'uploader_id': 'AA2eki',
+            'duration': 52,
+            'thumbnail': 'https://img-s-msn-com.akamaized.net/tenant/amp/entityid/AA1zo7nU.img',
+            'timestamp': 1739993965,
+            'upload_date': '20250219',
+            'release_timestamp': 1739977753,
+            'release_date': '20250219',
+            'modified_timestamp': 1742076259,
+            'modified_date': '20250315',
         },
-        'playlist_mincount': 4,
     }, {
-        'url': 'http://www.msn.com/en-ae/news/offbeat/meet-the-nine-year-old-self-made-millionaire/ar-BBt6ZKf',
-        'only_matching': True,
-    }, {
-        'url': 'http://www.msn.com/en-ae/video/watch/obama-a-lot-of-people-will-be-disappointed/vi-AAhxUMH',
-        'only_matching': True,
-    }, {
-        # geo restricted
-        'url': 'http://www.msn.com/en-ae/foodanddrink/joinourtable/the-first-fart-makes-you-laugh-the-last-fart-makes-you-cry/vp-AAhzIBU',
-        'only_matching': True,
-    }, {
-        'url': 'http://www.msn.com/en-ae/entertainment/bollywood/watch-how-salman-khan-reacted-when-asked-if-he-would-apologize-for-his-‘raped-woman’-comment/vi-AAhvzW6',
-        'only_matching': True,
-    }, {
-        # Vidible(AOL) Embed
-        'url': 'https://www.msn.com/en-us/money/other/jupiter-is-about-to-come-so-close-you-can-see-its-moons-with-binoculars/vi-AACqsHR',
-        'only_matching': True,
+        'url': 'https://www.msn.com/en-us/entertainment/news/rock-frontman-replacements-you-might-not-know-happened/vi-AA1yLVcD',
+        'info_dict': {
+            'id': 'AA1yLVcD',
+            'ext': 'mp4',
+            'display_id': 'rock-frontman-replacements-you-might-not-know-happened',
+            'title': 'Rock Frontman Replacements You Might Not Know Happened',
+            'description': 'md5:451a125496ff0c9f6816055bb1808da9',
+            'uploader': 'Grunge (Video)',
+            'uploader_id': 'BB1oveoV',
+            'duration': 596,
+            'thumbnail': 'https://img-s-msn-com.akamaized.net/tenant/amp/entityid/AA1yM4OJ.img',
+            'timestamp': 1739223456,
+            'upload_date': '20250210',
+            'release_timestamp': 1739219731,
+            'release_date': '20250210',
+            'modified_timestamp': 1741427272,
+            'modified_date': '20250308',
+        },
     }, {
         # Dailymotion Embed
-        'url': 'https://www.msn.com/es-ve/entretenimiento/watch/winston-salem-paire-refait-des-siennes-en-perdant-sa-raquette-au-service/vp-AAG704L',
-        'only_matching': True,
+        'url': 'https://www.msn.com/de-de/nachrichten/other/the-first-descendant-gameplay-trailer-zu-serena-der-neuen-gefl%C3%BCgelten-nachfahrin/vi-AA1B1d06',
+        'info_dict': {
+            'id': 'x9g6oli',
+            'ext': 'mp4',
+            'title': 'The First Descendant: Gameplay-Trailer zu Serena, der neuen geflügelten Nachfahrin',
+            'description': '',
+            'uploader': 'MeinMMO',
+            'uploader_id': 'x2mvqi4',
+            'view_count': int,
+            'like_count': int,
+            'age_limit': 0,
+            'duration': 60,
+            'thumbnail': 'https://s1.dmcdn.net/v/Y3fO61drj56vPB9SS/x1080',
+            'tags': ['MeinMMO', 'The First Descendant'],
+            'timestamp': 1742124877,
+            'upload_date': '20250316',
+        },
     }, {
-        # YouTube Embed
-        'url': 'https://www.msn.com/en-in/money/news/meet-vikram-%E2%80%94-chandrayaan-2s-lander/vi-AAGUr0v',
-        'only_matching': True,
+        # Youtube Embed
+        'url': 'https://www.msn.com/en-gb/video/webcontent/web-content/vi-AA1ybFaJ',
+        'info_dict': {
+            'id': 'kQSChWu95nE',
+            'ext': 'mp4',
+            'title': '7 Daily Habits to Nurture Your Personal Growth',
+            'description': 'md5:6f233c68341b74dee30c8c121924e827',
+            'uploader': 'TopThink',
+            'uploader_id': '@TopThink',
+            'uploader_url': 'https://www.youtube.com/@TopThink',
+            'channel': 'TopThink',
+            'channel_id': 'UCMlGmHokrQRp-RaNO7aq4Uw',
+            'channel_url': 'https://www.youtube.com/channel/UCMlGmHokrQRp-RaNO7aq4Uw',
+            'channel_is_verified': True,
+            'channel_follower_count': int,
+            'comment_count': int,
+            'view_count': int,
+            'like_count': int,
+            'age_limit': 0,
+            'duration': 705,
+            'thumbnail': 'https://i.ytimg.com/vi/kQSChWu95nE/maxresdefault.jpg',
+            'categories': ['Howto & Style'],
+            'tags': ['topthink', 'top think', 'personal growth'],
+            'timestamp': 1722711620,
+            'upload_date': '20240803',
+            'playable_in_embed': True,
+            'availability': 'public',
+            'live_status': 'not_live',
+        },
     }, {
-        # NBCSports Embed
-        'url': 'https://www.msn.com/en-us/money/football_nfl/week-13-preview-redskins-vs-panthers/vi-BBXsCDb',
-        'only_matching': True,
+        # Article with social embed
+        'url': 'https://www.msn.com/en-in/news/techandscience/watch-earth-sets-and-rises-behind-moon-in-breathtaking-blue-ghost-video/ar-AA1zKoAc',
+        'info_dict': {
+            'id': 'AA1zKoAc',
+            'title': 'Watch: Earth sets and rises behind Moon in breathtaking Blue Ghost video',
+            'description': 'md5:0ad51cfa77e42e7f0c46cf98a619dbbf',
+            'uploader': 'India Today',
+            'uploader_id': 'AAyFWG',
+            'tags': 'count:11',
+            'timestamp': 1740485034,
+            'upload_date': '20250225',
+            'release_timestamp': 1740484875,
+            'release_date': '20250225',
+            'modified_timestamp': 1740488561,
+            'modified_date': '20250225',
+        },
+        'playlist_count': 1,
     }]
 
     def _real_extract(self, url):
-        display_id, page_id = self._match_valid_url(url).groups()
+        locale, display_id, page_id = self._match_valid_url(url).group('locale', 'display_id', 'id')
 
-        webpage = self._download_webpage(url, display_id)
+        json_data = self._download_json(
+            f'https://assets.msn.com/content/view/v2/Detail/{locale}/{page_id}', page_id)
 
-        entries = []
-        for _, metadata in re.findall(r'data-metadata\s*=\s*(["\'])(?P<data>.+?)\1', webpage):
-            video = self._parse_json(unescapeHTML(metadata), display_id)
-
-            provider_id = video.get('providerId')
-            player_name = video.get('playerName')
-            if player_name and provider_id:
-                entry = None
-                if player_name == 'AOL':
-                    if provider_id.startswith('http'):
-                        provider_id = self._search_regex(
-                            r'https?://delivery\.vidible\.tv/video/redirect/([0-9a-f]{24})',
-                            provider_id, 'vidible id')
-                    entry = self.url_result(
-                        'aol-video:' + provider_id, 'Aol', provider_id)
-                elif player_name == 'Dailymotion':
-                    entry = self.url_result(
-                        'https://www.dailymotion.com/video/' + provider_id,
-                        'Dailymotion', provider_id)
-                elif player_name == 'YouTube':
-                    entry = self.url_result(
-                        provider_id, 'Youtube', provider_id)
-                elif player_name == 'NBCSports':
-                    entry = self.url_result(
-                        'http://vplayer.nbcsports.com/p/BxmELC/nbcsports_embed/select/media/' + provider_id,
-                        'NBCSportsVPlayer', provider_id)
-                if entry:
-                    entries.append(entry)
-                    continue
-
-            video_id = video['uuid']
-            title = video['title']
+        common_metadata = traverse_obj(json_data, {
+            'title': ('title', {str}),
+            'description': (('abstract', ('body', {clean_html})), {str}, filter, any),
+            'timestamp': ('createdDateTime', {parse_iso8601}),
+            'release_timestamp': ('publishedDateTime', {parse_iso8601}),
+            'modified_timestamp': ('updatedDateTime', {parse_iso8601}),
+            'thumbnail': ('thumbnail', 'image', 'url', {url_or_none}),
+            'duration': ('videoMetadata', 'playTime', {int_or_none}),
+            'tags': ('keywords', ..., {str}),
+            'uploader': ('provider', 'name', {str}),
+            'uploader_id': ('provider', 'id', {str}),
+        })
 
+        page_type = json_data['type']
+        source_url = traverse_obj(json_data, ('sourceHref', {url_or_none}))
+        if page_type == 'video':
+            if traverse_obj(json_data, ('thirdPartyVideoPlayer', 'enabled')) and source_url:
+                return self.url_result(source_url)
             formats = []
-            for file_ in video.get('videoFiles', []):
-                format_url = file_.get('url')
-                if not format_url:
-                    continue
-                if 'format=m3u8-aapl' in format_url:
-                    # m3u8_native should not be used here until
-                    # https://github.com/ytdl-org/youtube-dl/issues/9913 is fixed
-                    formats.extend(self._extract_m3u8_formats(
-                        format_url, display_id, 'mp4',
-                        m3u8_id='hls', fatal=False))
-                elif 'format=mpd-time-csf' in format_url:
-                    formats.extend(self._extract_mpd_formats(
-                        format_url, display_id, 'dash', fatal=False))
-                elif '.ism' in format_url:
-                    if format_url.endswith('.ism'):
-                        format_url += '/manifest'
-                    formats.extend(self._extract_ism_formats(
-                        format_url, display_id, 'mss', fatal=False))
-                else:
-                    format_id = file_.get('formatCode')
-                    formats.append({
-                        'url': format_url,
-                        'ext': 'mp4',
-                        'format_id': format_id,
-                        'width': int_or_none(file_.get('width')),
-                        'height': int_or_none(file_.get('height')),
-                        'vbr': int_or_none(self._search_regex(r'_(\d+)\.mp4', format_url, 'vbr', default=None)),
-                        'quality': 1 if format_id == '1001' else None,
-                    })
-
             subtitles = {}
-            for file_ in video.get('files', []):
-                format_url = file_.get('url')
-                format_code = file_.get('formatCode')
-                if not format_url or not format_code:
-                    continue
-                if compat_str(format_code) == '3100':
-                    subtitles.setdefault(file_.get('culture', 'en'), []).append({
-                        'ext': determine_ext(format_url, 'ttml'),
-                        'url': format_url,
-                    })
+            for file in traverse_obj(json_data, ('videoMetadata', 'externalVideoFiles', lambda _, v: url_or_none(v['url']))):
+                file_url = file['url']
+                ext = determine_ext(file_url)
+                if ext == 'm3u8':
+                    fmts, subs = self._extract_m3u8_formats_and_subtitles(
+                        file_url, page_id, 'mp4', m3u8_id='hls', fatal=False)
+                    formats.extend(fmts)
+                    self._merge_subtitles(subs, target=subtitles)
+                elif ext == 'mpd':
+                    fmts, subs = self._extract_mpd_formats_and_subtitles(
+                        file_url, page_id, mpd_id='dash', fatal=False)
+                    formats.extend(fmts)
+                    self._merge_subtitles(subs, target=subtitles)
+                else:
+                    formats.append(
+                        traverse_obj(file, {
+                            'url': 'url',
+                            'format_id': ('format', {str}),
+                            'filesize': ('fileSize', {int_or_none}),
+                            'height': ('height', {int_or_none}),
+                            'width': ('width', {int_or_none}),
+                        }))
+            for caption in traverse_obj(json_data, ('videoMetadata', 'closedCaptions', lambda _, v: url_or_none(v['href']))):
+                lang = caption.get('locale') or 'en-us'
+                subtitles.setdefault(lang, []).append({
+                    'url': caption['href'],
+                    'ext': 'ttml',
+                })
 
-            entries.append({
-                'id': video_id,
+            return {
+                'id': page_id,
                 'display_id': display_id,
-                'title': title,
-                'description': video.get('description'),
-                'thumbnail': video.get('headlineImage', {}).get('url'),
-                'duration': int_or_none(video.get('durationSecs')),
-                'uploader': video.get('sourceFriendly'),
-                'uploader_id': video.get('providerId'),
-                'creator': video.get('creator'),
-                'subtitles': subtitles,
                 'formats': formats,
-            })
+                'subtitles': subtitles,
+                **common_metadata,
+            }
+        elif page_type == 'webcontent':
+            if not source_url:
+                raise ExtractorError('Could not find source URL')
+            return self.url_result(source_url)
+        elif page_type == 'article':
+            entries = []
+            for embed_url in traverse_obj(json_data, ('socialEmbeds', ..., 'postUrl', {url_or_none})):
+                entries.append(self.url_result(embed_url))
 
-        if not entries:
-            error = unescapeHTML(self._search_regex(
-                r'data-error=(["\'])(?P<error>.+?)\1',
-                webpage, 'error', group='error'))
-            raise ExtractorError('%s said: %s' % (self.IE_NAME, error), expected=True)
+            return self.playlist_result(entries, page_id, **common_metadata)
 
-        return self.playlist_result(entries, page_id)
+        raise ExtractorError(f'Unsupported page type: {page_type}')
diff --git a/plugins/youtube_download/yt_dlp/extractor/mtv.py b/plugins/youtube_download/yt_dlp/extractor/mtv.py
index 0d700b9..34e015d 100644
--- a/plugins/youtube_download/yt_dlp/extractor/mtv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/mtv.py
@@ -1,7 +1,7 @@
 import re
+import xml.etree.ElementTree
 
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..networking import HEADRequest, Request
 from ..utils import (
     ExtractorError,
@@ -22,7 +22,7 @@ from ..utils import (
 
 
 def _media_xml_tag(tag):
-    return '{http://search.yahoo.com/mrss/}%s' % tag
+    return f'{{http://search.yahoo.com/mrss/}}{tag}'
 
 
 class MTVServicesInfoExtractor(InfoExtractor):
@@ -42,7 +42,7 @@ class MTVServicesInfoExtractor(InfoExtractor):
         return self._FEED_URL
 
     def _get_thumbnail_url(self, uri, itemdoc):
-        search_path = '%s/%s' % (_media_xml_tag('group'), _media_xml_tag('thumbnail'))
+        search_path = '{}/{}'.format(_media_xml_tag('group'), _media_xml_tag('thumbnail'))
         thumb_node = itemdoc.find(search_path)
         if thumb_node is None:
             return None
@@ -60,7 +60,7 @@ class MTVServicesInfoExtractor(InfoExtractor):
         response = self._request_webpage(req, mtvn_id, 'Resolving url')
         url = response.url
         # Transform the url to get the best quality:
-        url = re.sub(r'.+pxE=mp4', 'http://mtvnmobile.vo.llnwd.net/kip0/_pxn=0+_pxK=18639+_pxE=mp4', url, 1)
+        url = re.sub(r'.+pxE=mp4', 'http://mtvnmobile.vo.llnwd.net/kip0/_pxn=0+_pxK=18639+_pxE=mp4', url, count=1)
         return [{'url': url, 'ext': 'mp4'}]
 
     def _extract_video_formats(self, mdoc, mtvn_id, video_id):
@@ -86,7 +86,7 @@ class MTVServicesInfoExtractor(InfoExtractor):
                     rtmp_video_url = rendition.find('./src').text
                     if 'error_not_available.swf' in rtmp_video_url:
                         raise ExtractorError(
-                            '%s said: video is not available' % self.IE_NAME,
+                            f'{self.IE_NAME} said: video is not available',
                             expected=True)
                     if rtmp_video_url.endswith('siteunavail.png'):
                         continue
@@ -117,8 +117,8 @@ class MTVServicesInfoExtractor(InfoExtractor):
                 if ext == 'cea-608':
                     ext = 'scc'
                 subtitles.setdefault(lang, []).append({
-                    'url': compat_str(sub_src),
-                    'ext': ext
+                    'url': str(sub_src),
+                    'ext': ext,
                 })
         return subtitles
 
@@ -126,7 +126,7 @@ class MTVServicesInfoExtractor(InfoExtractor):
         uri = itemdoc.find('guid').text
         video_id = self._id_from_uri(uri)
         self.report_extraction(video_id)
-        content_el = itemdoc.find('%s/%s' % (_media_xml_tag('group'), _media_xml_tag('content')))
+        content_el = itemdoc.find('{}/{}'.format(_media_xml_tag('group'), _media_xml_tag('content')))
         mediagen_url = self._remove_template_parameter(content_el.attrib['url'])
         mediagen_url = mediagen_url.replace('device={device}', '')
         if 'acceptMethods' not in mediagen_url:
@@ -137,14 +137,14 @@ class MTVServicesInfoExtractor(InfoExtractor):
         mediagen_doc = self._download_xml(
             mediagen_url, video_id, 'Downloading video urls', fatal=False)
 
-        if mediagen_doc is False:
+        if not isinstance(mediagen_doc, xml.etree.ElementTree.Element):
             return None
 
         item = mediagen_doc.find('./video/item')
         if item is not None and item.get('type') == 'text':
-            message = '%s returned error: ' % self.IE_NAME
+            message = f'{self.IE_NAME} returned error: '
             if item.get('code') is not None:
-                message += '%s - ' % item.get('code')
+                message += '{} - '.format(item.get('code'))
             message += item.text
             raise ExtractorError(message, expected=True)
 
@@ -183,7 +183,7 @@ class MTVServicesInfoExtractor(InfoExtractor):
         episode = episode.text if episode is not None else None
         if season and episode:
             # episode number includes season, so remove it
-            episode = re.sub(r'^%s' % season, '', episode)
+            episode = re.sub(rf'^{season}', '', episode)
 
         # This a short id that's used in the webpage urls
         mtvn_id = None
@@ -254,7 +254,7 @@ class MTVServicesInfoExtractor(InfoExtractor):
 
         feed_url = try_get(
             triforce_feed, lambda x: x['manifest']['zones'][data_zone]['feed'],
-            compat_str)
+            str)
         if not feed_url:
             return
 
@@ -262,7 +262,7 @@ class MTVServicesInfoExtractor(InfoExtractor):
         if not feed:
             return
 
-        return try_get(feed, lambda x: x['result']['data']['id'], compat_str)
+        return try_get(feed, lambda x: x['result']['data']['id'], str)
 
     @staticmethod
     def _extract_child_with_type(parent, t):
@@ -319,8 +319,7 @@ class MTVServicesInfoExtractor(InfoExtractor):
         title = url_basename(url)
         webpage = self._download_webpage(url, title)
         mgid = self._extract_mgid(webpage)
-        videos_info = self._get_videos_info(mgid, url=url)
-        return videos_info
+        return self._get_videos_info(mgid, url=url)
 
 
 class MTVServicesEmbeddedIE(MTVServicesInfoExtractor):
@@ -345,7 +344,7 @@ class MTVServicesEmbeddedIE(MTVServicesInfoExtractor):
     def _get_feed_url(self, uri, url=None):
         video_id = self._id_from_uri(uri)
         config = self._download_json(
-            'http://media.mtvnservices.com/pmt/e1/access/index.html?uri=%s&configtype=edge' % uri, video_id)
+            f'http://media.mtvnservices.com/pmt/e1/access/index.html?uri={uri}&configtype=edge', video_id)
         return self._remove_template_parameter(config['feedWithQueryParams'])
 
     def _real_extract(self, url):
@@ -442,14 +441,15 @@ class MTVVideoIE(MTVServicesInfoExtractor):
                 r'(?s)isVevoVideo = true;.*?vevoVideoId = "(.*?)";', webpage)
             if m_vevo:
                 vevo_id = m_vevo.group(1)
-                self.to_screen('Vevo video detected: %s' % vevo_id)
-                return self.url_result('vevo:%s' % vevo_id, ie='Vevo')
+                self.to_screen(f'Vevo video detected: {vevo_id}')
+                return self.url_result(f'vevo:{vevo_id}', ie='Vevo')
 
             uri = self._html_search_regex(r'/uri/(.*?)\?', webpage, 'uri')
         return self._get_videos_info(uri)
 
 
 class MTVDEIE(MTVServicesInfoExtractor):
+    _WORKING = False
     IE_NAME = 'mtv.de'
     _VALID_URL = r'https?://(?:www\.)?mtv\.de/(?:musik/videoclips|folgen|news)/(?P<id>[0-9a-z]+)'
     _TESTS = [{
@@ -575,9 +575,9 @@ class MTVItaliaProgrammaIE(MTVItaliaIE):  # XXX: Do not subclass from concrete I
     def _get_entries(self, title, url):
         while True:
             pg = self._search_regex(r'/(\d+)$', url, 'entries', '1')
-            entries = self._download_json(url, title, 'page %s' % pg)
+            entries = self._download_json(url, title, f'page {pg}')
             url = try_get(
-                entries, lambda x: x['result']['nextPageURL'], compat_str)
+                entries, lambda x: x['result']['nextPageURL'], str)
             entries = try_get(
                 entries, (
                     lambda x: x['result']['data']['items'],
@@ -596,15 +596,15 @@ class MTVItaliaProgrammaIE(MTVItaliaIE):  # XXX: Do not subclass from concrete I
         info = self._download_json(info_url, video_id).get('manifest')
 
         redirect = try_get(
-            info, lambda x: x['newLocation']['url'], compat_str)
+            info, lambda x: x['newLocation']['url'], str)
         if redirect:
             return self.url_result(redirect)
 
         title = info.get('title')
         video_id = try_get(
-            info, lambda x: x['reporting']['itemId'], compat_str)
+            info, lambda x: x['reporting']['itemId'], str)
         parent_id = try_get(
-            info, lambda x: x['reporting']['parentId'], compat_str)
+            info, lambda x: x['reporting']['parentId'], str)
 
         playlist_url = current_url = None
         for z in (info.get('zones') or {}).values():
@@ -628,15 +628,15 @@ class MTVItaliaProgrammaIE(MTVItaliaIE):  # XXX: Do not subclass from concrete I
             info, (
                 lambda x: x['title'],
                 lambda x: x['headline']),
-            compat_str)
-        description = try_get(info, lambda x: x['content'], compat_str)
+            str)
+        description = try_get(info, lambda x: x['content'], str)
 
         if current_url:
             season = try_get(
                 self._download_json(playlist_url, video_id, 'Seasons info'),
                 lambda x: x['result']['data'], dict)
             current = try_get(
-                season, lambda x: x['currentSeason'], compat_str)
+                season, lambda x: x['currentSeason'], str)
             seasons = try_get(
                 season, lambda x: x['seasons'], list) or []
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/muenchentv.py b/plugins/youtube_download/yt_dlp/extractor/muenchentv.py
index 36a2d46..5d2dd39 100644
--- a/plugins/youtube_download/yt_dlp/extractor/muenchentv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/muenchentv.py
@@ -9,6 +9,7 @@ from ..utils import (
 
 
 class MuenchenTVIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?muenchen\.tv/livestream'
     IE_DESC = 'münchen.tv'
     _TEST = {
@@ -19,11 +20,11 @@ class MuenchenTVIE(InfoExtractor):
             'ext': 'mp4',
             'title': 're:^münchen.tv-Livestream [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
             'is_live': True,
-            'thumbnail': r're:^https?://.*\.jpg$'
+            'thumbnail': r're:^https?://.*\.jpg$',
         },
         'params': {
             'skip_download': True,
-        }
+        },
     }
 
     def _real_extract(self, url):
@@ -46,12 +47,12 @@ class MuenchenTVIE(InfoExtractor):
             ext = determine_ext(s['file'], None)
             label_str = s.get('label')
             if label_str is None:
-                label_str = '_%d' % format_num
+                label_str = f'_{format_num}'
 
             if ext is None:
                 format_id = label_str
             else:
-                format_id = '%s-%s' % (ext, label_str)
+                format_id = f'{ext}-{label_str}'
 
             formats.append({
                 'url': s['file'],
diff --git a/plugins/youtube_download/yt_dlp/extractor/murrtube.py b/plugins/youtube_download/yt_dlp/extractor/murrtube.py
index 6cdbbda..9067b87 100644
--- a/plugins/youtube_download/yt_dlp/extractor/murrtube.py
+++ b/plugins/youtube_download/yt_dlp/extractor/murrtube.py
@@ -5,9 +5,14 @@ from .common import InfoExtractor
 from ..utils import (
     ExtractorError,
     OnDemandPagedList,
-    determine_ext,
-    int_or_none,
-    try_get,
+    clean_html,
+    extract_attributes,
+    get_element_by_class,
+    get_element_html_by_id,
+    parse_count,
+    remove_end,
+    update_url,
+    urlencode_postdata,
 )
 
 
@@ -15,28 +20,88 @@ class MurrtubeIE(InfoExtractor):
     _VALID_URL = r'''(?x)
                         (?:
                             murrtube:|
-                            https?://murrtube\.net/videos/(?P<slug>[a-z0-9\-]+)\-
+                            https?://murrtube\.net/(?:v/|videos/(?P<slug>[a-z0-9-]+?)-)
                         )
-                        (?P<id>[a-f0-9]{8}\-[a-f0-9]{4}\-[a-f0-9]{4}\-[a-f0-9]{4}\-[a-f0-9]{12})
+                        (?P<id>[A-Z0-9]{4}|[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})
                     '''
-    _TEST = {
+    _TESTS = [{
         'url': 'https://murrtube.net/videos/inferno-x-skyler-148b6f2a-fdcc-4902-affe-9c0f41aaaca0',
-        'md5': '169f494812d9a90914b42978e73aa690',
+        'md5': '70380878a77e8565d4aea7f68b8bbb35',
         'info_dict': {
-            'id': '148b6f2a-fdcc-4902-affe-9c0f41aaaca0',
+            'id': 'ca885d8456b95de529b6723b158032e11115d',
             'ext': 'mp4',
             'title': 'Inferno X Skyler',
             'description': 'Humping a very good slutty sheppy (roomate)',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'duration': 284,
             'uploader': 'Inferno Wolf',
             'age_limit': 18,
+            'thumbnail': 'https://storage.murrtube.net/murrtube-production/ekbs3zcfvuynnqfx72nn2tkokvsd',
             'comment_count': int,
             'view_count': int,
             'like_count': int,
-            'tags': ['hump', 'breed', 'Fursuit', 'murrsuit', 'bareback'],
+        },
+    }, {
+        'url': 'https://murrtube.net/v/0J2Q',
+        'md5': '31262f6ac56f0ca75e5a54a0f3fefcb6',
+        'info_dict': {
+            'id': '8442998c52134968d9caa36e473e1a6bac6ca',
+            'ext': 'mp4',
+            'uploader': 'Hayel',
+            'title': 'Who\'s in charge now?',
+            'description': 'md5:795791e97e5b0f1805ea84573f02a997',
+            'age_limit': 18,
+            'thumbnail': 'https://storage.murrtube.net/murrtube-production/fb1ojjwiucufp34ya6hxu5vfqi5s',
+            'comment_count': int,
+            'view_count': int,
+            'like_count': int,
+        },
+    }]
+
+    def _extract_count(self, name, html):
+        return parse_count(self._search_regex(
+            rf'([\d,]+)\s+<span[^>]*>{name}</span>', html, name, default=None))
+
+    def _real_initialize(self):
+        homepage = self._download_webpage(
+            'https://murrtube.net', None, note='Getting session token')
+        self._request_webpage(
+            'https://murrtube.net/accept_age_check', None, 'Setting age cookie',
+            data=urlencode_postdata(self._hidden_inputs(homepage)))
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        if video_id.startswith('murrtube:'):
+            raise ExtractorError('Support for murrtube: prefix URLs is broken')
+        video_page = self._download_webpage(url, video_id)
+        video_attrs = extract_attributes(get_element_html_by_id('video', video_page))
+        playlist = update_url(video_attrs['data-url'], query=None)
+        video_id = self._search_regex(r'/([\da-f]+)/index.m3u8', playlist, 'video id')
+
+        return {
+            'id': video_id,
+            'title': remove_end(self._og_search_title(video_page), ' - Murrtube'),
+            'age_limit': 18,
+            'formats': self._extract_m3u8_formats(playlist, video_id, 'mp4'),
+            'description': self._og_search_description(video_page),
+            'thumbnail': update_url(self._og_search_thumbnail(video_page, default=''), query=None) or None,
+            'uploader': clean_html(get_element_by_class('pl-1 is-size-6 has-text-lighter', video_page)),
+            'view_count': self._extract_count('Views', video_page),
+            'like_count': self._extract_count('Likes', video_page),
+            'comment_count': self._extract_count('Comments', video_page),
         }
-    }
+
+
+class MurrtubeUserIE(InfoExtractor):
+    _WORKING = False
+    IE_DESC = 'Murrtube user profile'
+    _VALID_URL = r'https?://murrtube\.net/(?P<id>[^/]+)$'
+    _TESTS = [{
+        'url': 'https://murrtube.net/stormy',
+        'info_dict': {
+            'id': 'stormy',
+        },
+        'playlist_mincount': 27,
+    }]
+    _PAGE_SIZE = 10
 
     def _download_gql(self, video_id, op, note=None, fatal=True):
         result = self._download_json(
@@ -45,72 +110,6 @@ class MurrtubeIE(InfoExtractor):
             headers={'Content-Type': 'application/json'})
         return result['data']
 
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        data = self._download_gql(video_id, {
-            'operationName': 'Medium',
-            'variables': {
-                'id': video_id,
-            },
-            'query': '''\
-query Medium($id: ID!) {
-  medium(id: $id) {
-    title
-    description
-    key
-    duration
-    commentsCount
-    likesCount
-    viewsCount
-    thumbnailKey
-    tagList
-    user {
-      name
-      __typename
-    }
-    __typename
-  }
-}'''})
-        meta = data['medium']
-
-        storage_url = 'https://storage.murrtube.net/murrtube/'
-        format_url = storage_url + meta.get('key', '')
-        thumbnail = storage_url + meta.get('thumbnailKey', '')
-
-        if determine_ext(format_url) == 'm3u8':
-            formats = self._extract_m3u8_formats(
-                format_url, video_id, 'mp4', entry_protocol='m3u8_native', fatal=False)
-        else:
-            formats = [{'url': format_url}]
-
-        return {
-            'id': video_id,
-            'title': meta.get('title'),
-            'description': meta.get('description'),
-            'formats': formats,
-            'thumbnail': thumbnail,
-            'duration': int_or_none(meta.get('duration')),
-            'uploader': try_get(meta, lambda x: x['user']['name']),
-            'view_count': meta.get('viewsCount'),
-            'like_count': meta.get('likesCount'),
-            'comment_count': meta.get('commentsCount'),
-            'tags': meta.get('tagList'),
-            'age_limit': 18,
-        }
-
-
-class MurrtubeUserIE(MurrtubeIE):  # XXX: Do not subclass from concrete IE
-    IE_DESC = 'Murrtube user profile'
-    _VALID_URL = r'https?://murrtube\.net/(?P<id>[^/]+)$'
-    _TEST = {
-        'url': 'https://murrtube.net/stormy',
-        'info_dict': {
-            'id': 'stormy',
-        },
-        'playlist_mincount': 27,
-    }
-    _PAGE_SIZE = 10
-
     def _fetch_page(self, username, user_id, page):
         data = self._download_gql(username, {
             'operationName': 'Media',
@@ -127,14 +126,14 @@ query Media($q: String, $sort: String, $userId: ID, $offset: Int!, $limit: Int!)
     __typename
   }
 }'''},
-            'Downloading page {0}'.format(page + 1))
+            f'Downloading page {page + 1}')
         if data is None:
             raise ExtractorError(f'Failed to retrieve video list for page {page + 1}')
 
         media = data['media']
 
         for entry in media:
-            yield self.url_result('murrtube:{0}'.format(entry['id']), MurrtubeIE.ie_key())
+            yield self.url_result('murrtube:{}'.format(entry['id']), MurrtubeIE.ie_key())
 
     def _real_extract(self, url):
         username = self._match_id(url)
diff --git a/plugins/youtube_download/yt_dlp/extractor/musescore.py b/plugins/youtube_download/yt_dlp/extractor/musescore.py
index 289ae57..0ef2fa0 100644
--- a/plugins/youtube_download/yt_dlp/extractor/musescore.py
+++ b/plugins/youtube_download/yt_dlp/extractor/musescore.py
@@ -13,7 +13,7 @@ class MuseScoreIE(InfoExtractor):
             'thumbnail': r're:https?://(?:www\.)?musescore\.com/.*\.png[^$]+',
             'uploader': 'PapyPiano',
             'creator': 'Wolfgang Amadeus Mozart',
-        }
+        },
     }, {
         'url': 'https://musescore.com/user/36164500/scores/6837638',
         'info_dict': {
@@ -24,7 +24,7 @@ class MuseScoreIE(InfoExtractor):
             'thumbnail': r're:https?://(?:www\.)?musescore\.com/.*\.png[^$]+',
             'uploader': 'roxbelviolin',
             'creator': 'Guns N´Roses Arr. Roxbel Violin',
-        }
+        },
     }, {
         'url': 'https://musescore.com/classicman/fur-elise',
         'info_dict': {
@@ -35,7 +35,7 @@ class MuseScoreIE(InfoExtractor):
             'thumbnail': r're:https?://(?:www\.)?musescore\.com/.*\.png[^$]+',
             'uploader': 'ClassicMan',
             'creator': 'Ludwig van Beethoven (1770–1827)',
-        }
+        },
     }, {
         'url': 'https://musescore.com/minh_cuteee/scores/6555384',
         'only_matching': True,
@@ -44,8 +44,8 @@ class MuseScoreIE(InfoExtractor):
     def _real_extract(self, url):
         webpage = self._download_webpage(url, None)
         url = self._og_search_url(webpage) or url
-        id = self._match_id(url)
-        mp3_url = self._download_json(f'https://musescore.com/api/jmuse?id={id}&index=0&type=mp3&v2=1', id,
+        video_id = self._match_id(url)
+        mp3_url = self._download_json(f'https://musescore.com/api/jmuse?id={video_id}&index=0&type=mp3&v2=1', video_id,
                                       headers={'authorization': '63794e5461e4cfa046edfbdddfccc1ac16daffd2'})['info']['url']
         formats = [{
             'url': mp3_url,
@@ -54,7 +54,7 @@ class MuseScoreIE(InfoExtractor):
         }]
 
         return {
-            'id': id,
+            'id': video_id,
             'formats': formats,
             'title': self._og_search_title(webpage),
             'description': self._og_search_description(webpage),
diff --git a/plugins/youtube_download/yt_dlp/extractor/musicdex.py b/plugins/youtube_download/yt_dlp/extractor/musicdex.py
index 48f2970..5ca390e 100644
--- a/plugins/youtube_download/yt_dlp/extractor/musicdex.py
+++ b/plugins/youtube_download/yt_dlp/extractor/musicdex.py
@@ -8,20 +8,20 @@ from ..utils import (
 
 
 class MusicdexBaseIE(InfoExtractor):
-    def _return_info(self, track_json, album_json, id):
+    def _return_info(self, track_json, album_json, video_id):
         return {
-            'id': str(id),
+            'id': str(video_id),
             'title': track_json.get('name'),
             'track': track_json.get('name'),
             'description': track_json.get('description'),
             'track_number': track_json.get('number'),
             'url': format_field(track_json, 'url', 'https://www.musicdex.org/%s'),
             'duration': track_json.get('duration'),
-            'genre': [genre.get('name') for genre in track_json.get('genres') or []],
+            'genres': [genre.get('name') for genre in track_json.get('genres') or []],
             'like_count': track_json.get('likes_count'),
             'view_count': track_json.get('plays'),
-            'artist': [artist.get('name') for artist in track_json.get('artists') or []],
-            'album_artist': [artist.get('name') for artist in album_json.get('artists') or []],
+            'artists': [artist.get('name') for artist in track_json.get('artists') or []],
+            'album_artists': [artist.get('name') for artist in album_json.get('artists') or []],
             'thumbnail': format_field(album_json, 'image', 'https://www.musicdex.org/%s'),
             'album': album_json.get('name'),
             'release_year': try_get(album_json, lambda x: date_from_str(unified_strdate(x['release_date'])).year),
@@ -43,22 +43,23 @@ class MusicdexSongIE(MusicdexBaseIE):
             'track': 'dual existence',
             'track_number': 1,
             'duration': 266000,
-            'genre': ['Anime'],
+            'genres': ['Anime'],
             'like_count': int,
             'view_count': int,
-            'artist': ['fripSide'],
-            'album_artist': ['fripSide'],
+            'artists': ['fripSide'],
+            'album_artists': ['fripSide'],
             'thumbnail': 'https://www.musicdex.org/storage/album/9iDIam1DHTVqUG4UclFIEq1WAFGXfPW4y0TtZa91.png',
             'album': 'To Aru Kagaku no Railgun T OP2 Single - dual existence',
-            'release_year': 2020
+            'release_year': 2020,
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }]
 
     def _real_extract(self, url):
-        id = self._match_id(url)
-        data_json = self._download_json(f'https://www.musicdex.org/secure/tracks/{id}?defaultRelations=true', id)['track']
-        return self._return_info(data_json, data_json.get('album') or {}, id)
+        video_id = self._match_id(url)
+        data_json = self._download_json(
+            f'https://www.musicdex.org/secure/tracks/{video_id}?defaultRelations=true', video_id)['track']
+        return self._return_info(data_json, data_json.get('album') or {}, video_id)
 
 
 class MusicdexAlbumIE(MusicdexBaseIE):
@@ -69,9 +70,9 @@ class MusicdexAlbumIE(MusicdexBaseIE):
         'playlist_mincount': 28,
         'info_dict': {
             'id': '56',
-            'genre': ['OST'],
+            'genres': ['OST'],
             'view_count': int,
-            'artist': ['TENMON & Eiichiro Yanagi / minori'],
+            'artists': ['TENMON & Eiichiro Yanagi / minori'],
             'title': 'ef - a tale of memories Original Soundtrack 2 ~fortissimo~',
             'release_year': 2008,
             'thumbnail': 'https://www.musicdex.org/storage/album/2rSHkyYBYfB7sbvElpEyTMcUn6toY7AohOgJuDlE.jpg',
@@ -79,18 +80,20 @@ class MusicdexAlbumIE(MusicdexBaseIE):
     }]
 
     def _real_extract(self, url):
-        id = self._match_id(url)
-        data_json = self._download_json(f'https://www.musicdex.org/secure/albums/{id}?defaultRelations=true', id)['album']
-        entries = [self._return_info(track, data_json, track['id']) for track in data_json.get('tracks') or [] if track.get('id')]
+        playlist_id = self._match_id(url)
+        data_json = self._download_json(
+            f'https://www.musicdex.org/secure/albums/{playlist_id}?defaultRelations=true', playlist_id)['album']
+        entries = [self._return_info(track, data_json, track['id'])
+                   for track in data_json.get('tracks') or [] if track.get('id')]
 
         return {
             '_type': 'playlist',
-            'id': id,
+            'id': playlist_id,
             'title': data_json.get('name'),
             'description': data_json.get('description'),
-            'genre': [genre.get('name') for genre in data_json.get('genres') or []],
+            'genres': [genre.get('name') for genre in data_json.get('genres') or []],
             'view_count': data_json.get('plays'),
-            'artist': [artist.get('name') for artist in data_json.get('artists') or []],
+            'artists': [artist.get('name') for artist in data_json.get('artists') or []],
             'thumbnail': format_field(data_json, 'image', 'https://www.musicdex.org/%s'),
             'release_year': try_get(data_json, lambda x: date_from_str(unified_strdate(x['release_date'])).year),
             'entries': entries,
@@ -98,12 +101,11 @@ class MusicdexAlbumIE(MusicdexBaseIE):
 
 
 class MusicdexPageIE(MusicdexBaseIE):  # XXX: Conventionally, base classes should end with BaseIE/InfoExtractor
-    def _entries(self, id):
-        next_page_url = self._API_URL % id
+    def _entries(self, playlist_id):
+        next_page_url = self._API_URL % playlist_id
         while next_page_url:
-            data_json = self._download_json(next_page_url, id)['pagination']
-            for data in data_json.get('data') or []:
-                yield data
+            data_json = self._download_json(next_page_url, playlist_id)['pagination']
+            yield from data_json.get('data') or []
             next_page_url = data_json.get('next_page_url')
 
 
@@ -123,15 +125,15 @@ class MusicdexArtistIE(MusicdexPageIE):
     }]
 
     def _real_extract(self, url):
-        id = self._match_id(url)
-        data_json = self._download_json(f'https://www.musicdex.org/secure/artists/{id}', id)['artist']
+        playlist_id = self._match_id(url)
+        data_json = self._download_json(f'https://www.musicdex.org/secure/artists/{playlist_id}', playlist_id)['artist']
         entries = []
-        for album in self._entries(id):
+        for album in self._entries(playlist_id):
             entries.extend(self._return_info(track, album, track['id']) for track in album.get('tracks') or [] if track.get('id'))
 
         return {
             '_type': 'playlist',
-            'id': id,
+            'id': playlist_id,
             'title': data_json.get('name'),
             'view_count': data_json.get('plays'),
             'thumbnail': format_field(data_json, 'image_small', 'https://www.musicdex.org/%s'),
@@ -156,14 +158,14 @@ class MusicdexPlaylistIE(MusicdexPageIE):
     }]
 
     def _real_extract(self, url):
-        id = self._match_id(url)
-        data_json = self._download_json(f'https://www.musicdex.org/secure/playlists/{id}', id)['playlist']
+        playlist_id = self._match_id(url)
+        data_json = self._download_json(f'https://www.musicdex.org/secure/playlists/{playlist_id}', playlist_id)['playlist']
         entries = [self._return_info(track, track.get('album') or {}, track['id'])
-                   for track in self._entries(id) or [] if track.get('id')]
+                   for track in self._entries(playlist_id) or [] if track.get('id')]
 
         return {
             '_type': 'playlist',
-            'id': id,
+            'id': playlist_id,
             'title': data_json.get('name'),
             'description': data_json.get('description'),
             'view_count': data_json.get('plays'),
diff --git a/plugins/youtube_download/yt_dlp/extractor/mwave.py b/plugins/youtube_download/yt_dlp/extractor/mwave.py
deleted file mode 100644
index efbfd9d..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/mwave.py
+++ /dev/null
@@ -1,87 +0,0 @@
-from .common import InfoExtractor
-from ..compat import compat_str
-from ..utils import (
-    int_or_none,
-    parse_duration,
-)
-
-
-class MwaveIE(InfoExtractor):
-    _VALID_URL = r'https?://mwave\.interest\.me/(?:[^/]+/)?mnettv/videodetail\.m\?searchVideoDetailVO\.clip_id=(?P<id>[0-9]+)'
-    _URL_TEMPLATE = 'http://mwave.interest.me/mnettv/videodetail.m?searchVideoDetailVO.clip_id=%s'
-    _TESTS = [{
-        'url': 'http://mwave.interest.me/mnettv/videodetail.m?searchVideoDetailVO.clip_id=168859',
-        # md5 is unstable
-        'info_dict': {
-            'id': '168859',
-            'ext': 'flv',
-            'title': '[M COUNTDOWN] SISTAR - SHAKE IT',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'uploader': 'M COUNTDOWN',
-            'duration': 206,
-            'view_count': int,
-        }
-    }, {
-        'url': 'http://mwave.interest.me/en/mnettv/videodetail.m?searchVideoDetailVO.clip_id=176199',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        vod_info = self._download_json(
-            'http://mwave.interest.me/onair/vod_info.m?vodtype=CL&sectorid=&endinfo=Y&id=%s' % video_id,
-            video_id, 'Download vod JSON')
-
-        formats = []
-        for num, cdn_info in enumerate(vod_info['cdn']):
-            stream_url = cdn_info.get('url')
-            if not stream_url:
-                continue
-            stream_name = cdn_info.get('name') or compat_str(num)
-            f4m_stream = self._download_json(
-                stream_url, video_id,
-                'Download %s stream JSON' % stream_name)
-            f4m_url = f4m_stream.get('fileurl')
-            if not f4m_url:
-                continue
-            formats.extend(
-                self._extract_f4m_formats(f4m_url + '&hdcore=3.0.3', video_id, f4m_id=stream_name))
-
-        return {
-            'id': video_id,
-            'title': vod_info['title'],
-            'thumbnail': vod_info.get('cover'),
-            'uploader': vod_info.get('program_title'),
-            'duration': parse_duration(vod_info.get('time')),
-            'view_count': int_or_none(vod_info.get('hit')),
-            'formats': formats,
-        }
-
-
-class MwaveMeetGreetIE(InfoExtractor):
-    _VALID_URL = r'https?://mwave\.interest\.me/(?:[^/]+/)?meetgreet/view/(?P<id>\d+)'
-    _TESTS = [{
-        'url': 'http://mwave.interest.me/meetgreet/view/256',
-        'info_dict': {
-            'id': '173294',
-            'ext': 'flv',
-            'title': '[MEET&GREET] Park BoRam',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'uploader': 'Mwave',
-            'duration': 3634,
-            'view_count': int,
-        }
-    }, {
-        'url': 'http://mwave.interest.me/en/meetgreet/view/256',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-        clip_id = self._html_search_regex(
-            r'<iframe[^>]+src="/mnettv/ifr_clip\.m\?searchVideoDetailVO\.clip_id=(\d+)',
-            webpage, 'clip ID')
-        clip_url = MwaveIE._URL_TEMPLATE % clip_id
-        return self.url_result(clip_url, 'Mwave', clip_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/mx3.py b/plugins/youtube_download/yt_dlp/extractor/mx3.py
new file mode 100644
index 0000000..5c42f4d
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/mx3.py
@@ -0,0 +1,171 @@
+import re
+
+from .common import InfoExtractor
+from ..networking import HEADRequest
+from ..utils import (
+    get_element_by_class,
+    int_or_none,
+    try_call,
+    url_or_none,
+    urlhandle_detect_ext,
+)
+from ..utils.traversal import traverse_obj
+
+
+class Mx3BaseIE(InfoExtractor):
+    _VALID_URL_TMPL = r'https?://(?:www\.)?%s/t/(?P<id>\w+)'
+    _FORMATS = [{
+        'url': 'player_asset',
+        'format_id': 'default',
+        'quality': 0,
+    }, {
+        'url': 'player_asset?quality=hd',
+        'format_id': 'hd',
+        'quality': 1,
+    }, {
+        'url': 'download',
+        'format_id': 'download',
+        'quality': 2,
+    }, {
+        'url': 'player_asset?quality=source',
+        'format_id': 'source',
+        'quality': 2,
+    }]
+
+    def _extract_formats(self, track_id):
+        formats = []
+        for fmt in self._FORMATS:
+            format_url = f'https://{self._DOMAIN}/tracks/{track_id}/{fmt["url"]}'
+            urlh = self._request_webpage(
+                HEADRequest(format_url), track_id, fatal=False, expected_status=404,
+                note=f'Checking for format {fmt["format_id"]}')
+            if urlh and urlh.status == 200:
+                formats.append({
+                    **fmt,
+                    'url': format_url,
+                    'ext': urlhandle_detect_ext(urlh),
+                    'filesize': int_or_none(urlh.headers.get('Content-Length')),
+                })
+        return formats
+
+    def _real_extract(self, url):
+        track_id = self._match_id(url)
+        webpage = self._download_webpage(url, track_id)
+        more_info = get_element_by_class('single-more-info', webpage)
+        data = self._download_json(f'https://{self._DOMAIN}/t/{track_id}.json', track_id, fatal=False)
+
+        def get_info_field(name):
+            return self._html_search_regex(
+                rf'<dt[^>]*>\s*{name}\s*</dt>\s*<dd[^>]*>(.*?)</dd>',
+                more_info, name, default=None, flags=re.DOTALL)
+
+        return {
+            'id': track_id,
+            'formats': self._extract_formats(track_id),
+            'genre': self._html_search_regex(
+                r'<div\b[^>]+class="single-band-genre"[^>]*>([^<]+)</div>', webpage, 'genre', default=None),
+            'release_year': int_or_none(get_info_field('Year of creation')),
+            'description': get_info_field('Description'),
+            'tags': try_call(lambda: get_info_field('Tag').split(', '), list),
+            **traverse_obj(data, {
+                'title': ('title', {str}),
+                'artist': (('performer_name', 'artist'), {str}),
+                'album_artist': ('artist', {str}),
+                'composer': ('composer_name', {str}),
+                'thumbnail': (('picture_url_xlarge', 'picture_url'), {url_or_none}),
+            }, get_all=False),
+        }
+
+
+class Mx3IE(Mx3BaseIE):
+    _DOMAIN = 'mx3.ch'
+    _VALID_URL = Mx3BaseIE._VALID_URL_TMPL % re.escape(_DOMAIN)
+    _TESTS = [{
+        'url': 'https://mx3.ch/t/1Cru',
+        'md5': '7ba09e9826b4447d4e1ce9d69e0e295f',
+        'info_dict': {
+            'id': '1Cru',
+            'ext': 'wav',
+            'artist': 'Godina',
+            'album_artist': 'Tortue Tortue',
+            'composer': 'Olivier Godinat',
+            'genre': 'Rock',
+            'thumbnail': 'https://mx3.ch/pictures/mx3/file/0101/4643/square_xlarge/1-s-envoler-1.jpg?1630272813',
+            'title': "S'envoler",
+            'release_year': 2021,
+            'tags': [],
+        },
+    }, {
+        'url': 'https://mx3.ch/t/1LIY',
+        'md5': '48293cb908342547827f963a5a2e9118',
+        'info_dict': {
+            'id': '1LIY',
+            'ext': 'mov',
+            'artist': 'Tania Kimfumu',
+            'album_artist': 'The Broots',
+            'composer': 'Emmanuel Diserens',
+            'genre': 'Electro',
+            'thumbnail': 'https://mx3.ch/pictures/mx3/file/0110/0003/video_xlarge/frame_0000.png?1686963670',
+            'title': 'The Broots-Larytta remix "Begging For Help"',
+            'release_year': 2023,
+            'tags': ['the broots', 'cassata records', 'larytta'],
+            'description': '"Begging for Help" Larytta Remix Official Video\nRealized By Kali Donkilie in 2023',
+        },
+    }, {
+        'url': 'https://mx3.ch/t/1C6E',
+        'md5': '1afcd578493ddb8e5008e94bb6d97e25',
+        'info_dict': {
+            'id': '1C6E',
+            'ext': 'wav',
+            'artist': 'Alien Bubblegum',
+            'album_artist': 'Alien Bubblegum',
+            'composer': 'Alien Bubblegum',
+            'genre': 'Punk',
+            'thumbnail': 'https://mx3.ch/pictures/mx3/file/0101/1551/square_xlarge/pandora-s-box-cover-with-title.png?1627054733',
+            'title': 'Wide Awake',
+            'release_year': 2021,
+            'tags': ['alien bubblegum', 'bubblegum', 'alien', 'pop punk', 'poppunk'],
+        },
+    }]
+
+
+class Mx3NeoIE(Mx3BaseIE):
+    _DOMAIN = 'neo.mx3.ch'
+    _VALID_URL = Mx3BaseIE._VALID_URL_TMPL % re.escape(_DOMAIN)
+    _TESTS = [{
+        'url': 'https://neo.mx3.ch/t/1hpd',
+        'md5': '6d9986bbae5cac3296ec8813bf965eb2',
+        'info_dict': {
+            'id': '1hpd',
+            'ext': 'wav',
+            'artist': 'Baptiste Lopez',
+            'album_artist': 'Kammerorchester Basel',
+            'composer': 'Jannik Giger',
+            'genre': 'Composition, Orchestra',
+            'title': 'Troisième œil. Für Kammerorchester (2023)',
+            'thumbnail': 'https://neo.mx3.ch/pictures/neo/file/0000/0241/square_xlarge/kammerorchester-basel-group-photo-2_c_-lukasz-rajchert.jpg?1560341252',
+            'release_year': 2023,
+            'tags': [],
+        },
+    }]
+
+
+class Mx3VolksmusikIE(Mx3BaseIE):
+    _DOMAIN = 'volksmusik.mx3.ch'
+    _VALID_URL = Mx3BaseIE._VALID_URL_TMPL % re.escape(_DOMAIN)
+    _TESTS = [{
+        'url': 'https://volksmusik.mx3.ch/t/Zx',
+        'md5': 'dd967a7b0c1ef898f3e072cf9c2eae3c',
+        'info_dict': {
+            'id': 'Zx',
+            'ext': 'mp3',
+            'artist': 'Ländlerkapelle GrischArt',
+            'album_artist': 'Ländlerkapelle GrischArt',
+            'composer': 'Urs Glauser',
+            'genre': 'Instrumental, Graubünden',
+            'title': 'Chämilouf',
+            'thumbnail': 'https://volksmusik.mx3.ch/pictures/vxm/file/0000/3815/square_xlarge/grischart1.jpg?1450530120',
+            'release_year': 2012,
+            'tags': [],
+        },
+    }]
diff --git a/plugins/youtube_download/yt_dlp/extractor/mxplayer.py b/plugins/youtube_download/yt_dlp/extractor/mxplayer.py
index 1fdb08e..8d3e35a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/mxplayer.py
+++ b/plugins/youtube_download/yt_dlp/extractor/mxplayer.py
@@ -1,5 +1,4 @@
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     int_or_none,
     traverse_obj,
@@ -23,7 +22,7 @@ class MxplayerIE(InfoExtractor):
             'duration': 2451,
             'season': 'Season 1',
             'series': 'My Girlfriend Is An Alien (Hindi Dubbed)',
-            'episode': 'Episode 1'
+            'episode': 'Episode 1',
         },
         'params': {
             'format': 'bv',
@@ -56,13 +55,13 @@ class MxplayerIE(InfoExtractor):
             'duration': 2332,
             'season': 'Season 1',
             'series': 'Shaitaan',
-            'episode': 'Episode 1'
+            'episode': 'Episode 1',
         },
         'params': {
             'format': 'best',
             'skip_download': True,
         },
-        'skip': 'No longer available.'
+        'skip': 'No longer available.',
     }, {
         'url': 'https://www.mxplayer.in/show/watch-aashram/chapter-1/duh-swapna-online-d445579792b0135598ba1bc9088a84cb',
         'info_dict': {
@@ -76,7 +75,7 @@ class MxplayerIE(InfoExtractor):
             'duration': 2568,
             'season': 'Season 1',
             'series': 'Aashram',
-            'episode': 'Episode 3'
+            'episode': 'Episode 3',
         },
         'params': {
             'format': 'bv',
@@ -95,7 +94,7 @@ class MxplayerIE(InfoExtractor):
             'duration': 1305,
             'season': 'Season 1',
             'series': 'Dangerous',
-            'episode': 'Episode 1'
+            'episode': 'Episode 1',
         },
         'params': {
             'format': 'bv',
@@ -114,7 +113,7 @@ class MxplayerIE(InfoExtractor):
             'format': 'best',
             'skip_download': True,
         },
-        'skip': 'No longer available. Cannot be played on browser'
+        'skip': 'No longer available. Cannot be played on browser',
     }, {
         'url': 'https://www.mxplayer.in/movie/watch-kitne-door-kitne-paas-movie-online-a9e9c76c566205955f70d8b2cb88a6a2',
         'info_dict': {
@@ -206,11 +205,11 @@ class MxplayerShowIE(InfoExtractor):
         'info_dict': {
             'id': 'a8f44e3cc0814b5601d17772cedf5417',
             'title': 'Watch Chakravartin Ashoka Samrat Series Online',
-        }
+        },
     }]
 
-    _API_SHOW_URL = "https://api.mxplay.com/v1/web/detail/tab/tvshowseasons?type=tv_show&id={}&device-density=2&platform=com.mxplay.desktop&content-languages=hi,en"
-    _API_EPISODES_URL = "https://api.mxplay.com/v1/web/detail/tab/tvshowepisodes?type=season&id={}&device-density=1&platform=com.mxplay.desktop&content-languages=hi,en&{}"
+    _API_SHOW_URL = 'https://api.mxplay.com/v1/web/detail/tab/tvshowseasons?type=tv_show&id={}&device-density=2&platform=com.mxplay.desktop&content-languages=hi,en'
+    _API_EPISODES_URL = 'https://api.mxplay.com/v1/web/detail/tab/tvshowepisodes?type=season&id={}&device-density=1&platform=com.mxplay.desktop&content-languages=hi,en&{}'
 
     def _entries(self, show_id):
         show_json = self._download_json(
@@ -218,7 +217,7 @@ class MxplayerShowIE(InfoExtractor):
             video_id=show_id, headers={'Referer': 'https://mxplayer.in'})
         page_num = 0
         for season in show_json.get('items') or []:
-            season_id = try_get(season, lambda x: x['id'], compat_str)
+            season_id = try_get(season, lambda x: x['id'], str)
             next_url = ''
             while next_url is not None:
                 page_num += 1
@@ -226,11 +225,11 @@ class MxplayerShowIE(InfoExtractor):
                     self._API_EPISODES_URL.format(season_id, next_url),
                     video_id=season_id,
                     headers={'Referer': 'https://mxplayer.in'},
-                    note='Downloading JSON metadata page %d' % page_num)
+                    note=f'Downloading JSON metadata page {page_num}')
                 for episode in season_json.get('items') or []:
                     video_url = episode['webUrl']
                     yield self.url_result(
-                        'https://mxplayer.in%s' % video_url,
+                        f'https://mxplayer.in{video_url}',
                         ie=MxplayerIE.ie_key(), video_id=video_url.split('-')[-1])
                 next_url = season_json.get('next')
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/mychannels.py b/plugins/youtube_download/yt_dlp/extractor/mychannels.py
deleted file mode 100644
index 8a70c1f..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/mychannels.py
+++ /dev/null
@@ -1,35 +0,0 @@
-from .common import InfoExtractor
-
-
-class MyChannelsIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?mychannels\.com/.*(?P<id_type>video|production)_id=(?P<id>[0-9]+)'
-    _TEST = {
-        'url': 'https://mychannels.com/missholland/miss-holland?production_id=3416',
-        'md5': 'b8993daad4262dd68d89d651c0c52c45',
-        'info_dict': {
-            'id': 'wUUDZZep6vQD',
-            'ext': 'mp4',
-            'title': 'Miss Holland joins VOTE LEAVE',
-            'description': 'Miss Holland | #13 Not a potato',
-            'uploader': 'Miss Holland',
-        }
-    }
-
-    def _real_extract(self, url):
-        id_type, url_id = self._match_valid_url(url).groups()
-        webpage = self._download_webpage(url, url_id)
-        video_data = self._html_search_regex(r'<div([^>]+data-%s-id="%s"[^>]+)>' % (id_type, url_id), webpage, 'video data')
-
-        def extract_data_val(attr, fatal=False):
-            return self._html_search_regex(r'data-%s\s*=\s*"([^"]+)"' % attr, video_data, attr, fatal=fatal)
-        minoto_id = extract_data_val('minoto-id') or self._search_regex(r'/id/([a-zA-Z0-9]+)', extract_data_val('video-src', True), 'minoto id')
-
-        return {
-            '_type': 'url_transparent',
-            'url': 'minoto:%s' % minoto_id,
-            'id': url_id,
-            'title': extract_data_val('title', True),
-            'description': extract_data_val('description'),
-            'thumbnail': extract_data_val('image'),
-            'uploader': extract_data_val('channel'),
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/myspace.py b/plugins/youtube_download/yt_dlp/extractor/myspace.py
index 3451098..fa2ef14 100644
--- a/plugins/youtube_download/yt_dlp/extractor/myspace.py
+++ b/plugins/youtube_download/yt_dlp/extractor/myspace.py
@@ -95,17 +95,17 @@ class MySpaceIE(InfoExtractor):
         if is_song:
             # songs don't store any useful info in the 'context' variable
             song_data = self._search_regex(
-                r'''<button.*data-song-id=(["\'])%s\1.*''' % video_id,
+                rf'''<button.*data-song-id=(["\']){video_id}\1.*''',
                 webpage, 'song_data', default=None, group=0)
             if song_data is None:
                 # some songs in an album are not playable
                 self.report_warning(
-                    '%s: No downloadable song on this page' % video_id)
+                    f'{video_id}: No downloadable song on this page')
                 return
 
             def search_data(name):
                 return self._search_regex(
-                    r'''data-%s=([\'"])(?P<data>.*?)\1''' % name,
+                    rf'''data-{name}=([\'"])(?P<data>.*?)\1''',
                     song_data, name, default='', group='data')
             formats = formats_from_stream_urls(
                 search_data('stream-url'), search_data('hls-stream-url'),
@@ -114,10 +114,10 @@ class MySpaceIE(InfoExtractor):
                 vevo_id = search_data('vevo-id')
                 youtube_id = search_data('youtube-id')
                 if vevo_id:
-                    self.to_screen('Vevo video detected: %s' % vevo_id)
-                    return self.url_result('vevo:%s' % vevo_id, ie='Vevo')
+                    self.to_screen(f'Vevo video detected: {vevo_id}')
+                    return self.url_result(f'vevo:{vevo_id}', ie='Vevo')
                 elif youtube_id:
-                    self.to_screen('Youtube video detected: %s' % youtube_id)
+                    self.to_screen(f'Youtube video detected: {youtube_id}')
                     return self.url_result(youtube_id, ie='Youtube')
                 else:
                     raise ExtractorError(
@@ -181,7 +181,7 @@ class MySpaceAlbumIE(InfoExtractor):
         tracks_paths = re.findall(r'"music:song" content="(.*?)"', webpage)
         if not tracks_paths:
             raise ExtractorError(
-                '%s: No songs found, try using proxy' % display_id,
+                f'{display_id}: No songs found, try using proxy',
                 expected=True)
         entries = [
             self.url_result(t_path, ie=MySpaceIE.ie_key())
diff --git a/plugins/youtube_download/yt_dlp/extractor/myspass.py b/plugins/youtube_download/yt_dlp/extractor/myspass.py
index 28ac982..3e8d506 100644
--- a/plugins/youtube_download/yt_dlp/extractor/myspass.py
+++ b/plugins/youtube_download/yt_dlp/extractor/myspass.py
@@ -1,5 +1,4 @@
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     int_or_none,
     parse_duration,
@@ -75,7 +74,7 @@ class MySpassIE(InfoExtractor):
         for group in self._search_regex(r'/myspass2009/\d+/(\d+)/(\d+)/(\d+)/', video_url, 'myspass', group=(1, 2, 3), default=[]):
             group_int = int(group)
             if group_int > video_id_int:
-                video_url = video_url.replace(group, compat_str(group_int // video_id_int))
+                video_url = video_url.replace(group, str(group_int // video_id_int))
 
         return {
             'id': video_id,
diff --git a/plugins/youtube_download/yt_dlp/extractor/myvi.py b/plugins/youtube_download/yt_dlp/extractor/myvi.py
deleted file mode 100644
index df7200b..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/myvi.py
+++ /dev/null
@@ -1,100 +0,0 @@
-from .common import InfoExtractor
-from .vimple import SprutoBaseIE
-
-
-class MyviIE(SprutoBaseIE):
-    _VALID_URL = r'''(?x)
-                        (?:
-                            https?://
-                                (?:www\.)?
-                                myvi\.
-                                (?:
-                                    (?:ru/player|tv)/
-                                    (?:
-                                        (?:
-                                            embed/html|
-                                            flash|
-                                            api/Video/Get
-                                        )/|
-                                        content/preloader\.swf\?.*\bid=
-                                    )|
-                                    ru/watch/
-                                )|
-                            myvi:
-                        )
-                        (?P<id>[\da-zA-Z_-]+)
-                    '''
-    _EMBED_REGEX = [r'<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//myvi\.(?:ru/player|tv)/(?:embed/html|flash)/[^"]+)\1']
-    _TESTS = [{
-        'url': 'http://myvi.ru/player/embed/html/oOy4euHA6LVwNNAjhD9_Jq5Ha2Qf0rtVMVFMAZav8wObeRTZaCATzucDQIDph8hQU0',
-        'md5': '571bbdfba9f9ed229dc6d34cc0f335bf',
-        'info_dict': {
-            'id': 'f16b2bbd-cde8-481c-a981-7cd48605df43',
-            'ext': 'mp4',
-            'title': 'хозяин жизни',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'duration': 25,
-        },
-    }, {
-        'url': 'http://myvi.ru/player/content/preloader.swf?id=oOy4euHA6LVwNNAjhD9_Jq5Ha2Qf0rtVMVFMAZav8wOYf1WFpPfc_bWTKGVf_Zafr0',
-        'only_matching': True,
-    }, {
-        'url': 'http://myvi.ru/player/api/Video/Get/oOy4euHA6LVwNNAjhD9_Jq5Ha2Qf0rtVMVFMAZav8wObeRTZaCATzucDQIDph8hQU0',
-        'only_matching': True,
-    }, {
-        'url': 'http://myvi.tv/embed/html/oTGTNWdyz4Zwy_u1nraolwZ1odenTd9WkTnRfIL9y8VOgHYqOHApE575x4_xxS9Vn0?ap=0',
-        'only_matching': True,
-    }, {
-        'url': 'http://myvi.ru/player/flash/ocp2qZrHI-eZnHKQBK4cZV60hslH8LALnk0uBfKsB-Q4WnY26SeGoYPi8HWHxu0O30',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.myvi.ru/watch/YwbqszQynUaHPn_s82sx0Q2',
-        'only_matching': True,
-    }, {
-        'url': 'myvi:YwbqszQynUaHPn_s82sx0Q2',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        spruto = self._download_json(
-            'http://myvi.ru/player/api/Video/Get/%s?sig' % video_id, video_id)['sprutoData']
-
-        return self._extract_spruto(spruto, video_id)
-
-
-class MyviEmbedIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?myvi\.tv/(?:[^?]+\?.*?\bv=|embed/)(?P<id>[\da-z]+)'
-    _TESTS = [{
-        'url': 'https://www.myvi.tv/embed/ccdqic3wgkqwpb36x9sxg43t4r',
-        'info_dict': {
-            'id': 'b3ea0663-3234-469d-873e-7fecf36b31d1',
-            'ext': 'mp4',
-            'title': 'Твоя (original song).mp4',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'duration': 277,
-        },
-        'params': {
-            'skip_download': True,
-        },
-    }, {
-        'url': 'https://www.myvi.tv/idmi6o?v=ccdqic3wgkqwpb36x9sxg43t4r#watch',
-        'only_matching': True,
-    }]
-
-    @classmethod
-    def suitable(cls, url):
-        return False if MyviIE.suitable(url) else super(MyviEmbedIE, cls).suitable(url)
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        webpage = self._download_webpage(
-            'https://www.myvi.tv/embed/%s' % video_id, video_id)
-
-        myvi_id = self._search_regex(
-            r'CreatePlayer\s*\(\s*["\'].*?\bv=([\da-zA-Z_]+)',
-            webpage, 'video id')
-
-        return self.url_result('myvi:%s' % myvi_id, ie=MyviIE.ie_key())
diff --git a/plugins/youtube_download/yt_dlp/extractor/myvideoge.py b/plugins/youtube_download/yt_dlp/extractor/myvideoge.py
index 64cee48..3e0bb24 100644
--- a/plugins/youtube_download/yt_dlp/extractor/myvideoge.py
+++ b/plugins/youtube_download/yt_dlp/extractor/myvideoge.py
@@ -64,7 +64,7 @@ class MyVideoGeIE(InfoExtractor):
             # translate any ka month to an en one
             re.sub('|'.join(self._MONTH_NAMES_KA),
                    lambda m: MONTH_NAMES['en'][self._MONTH_NAMES_KA.index(m.group(0))],
-                   upload_date, re.I))
+                   upload_date, flags=re.I))
             if upload_date else None)
 
         return {
diff --git a/plugins/youtube_download/yt_dlp/extractor/myvidster.py b/plugins/youtube_download/yt_dlp/extractor/myvidster.py
index c91f294..e3b700d 100644
--- a/plugins/youtube_download/yt_dlp/extractor/myvidster.py
+++ b/plugins/youtube_download/yt_dlp/extractor/myvidster.py
@@ -2,7 +2,7 @@ from .common import InfoExtractor
 
 
 class MyVidsterIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?myvidster\.com/video/(?P<id>\d+)/'
+    _VALID_URL = r'https?://(?:www\.)?myvidster\.com/video/(?P<id>\d+)'
 
     _TEST = {
         'url': 'http://www.myvidster.com/video/32059805/Hot_chemistry_with_raw_love_making',
diff --git a/plugins/youtube_download/yt_dlp/extractor/mzaalo.py b/plugins/youtube_download/yt_dlp/extractor/mzaalo.py
index c6f420c..52e5ea8 100644
--- a/plugins/youtube_download/yt_dlp/extractor/mzaalo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/mzaalo.py
@@ -8,7 +8,7 @@ from ..utils import (
 
 
 class MzaaloIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?mzaalo\.com/play/(?P<type>movie|original|clip)/(?P<id>[a-fA-F0-9-]+)/[\w-]+'
+    _VALID_URL = r'(?i)https?://(?:www\.)?mzaalo\.com/(?:play|watch)/(?P<type>movie|original|clip)/(?P<id>[a-f0-9-]+)/[\w-]+'
     _TESTS = [{
         # Movies
         'url': 'https://www.mzaalo.com/play/movie/c0958d9f-f90e-4503-a755-44358758921d/Jamun',
@@ -24,7 +24,7 @@ class MzaaloIE(InfoExtractor):
             'categories': ['Drama'],
             'age_limit': 13,
         },
-        'params': {'skip_download': 'm3u8'}
+        'params': {'skip_download': 'm3u8'},
     }, {
         # Shows
         'url': 'https://www.mzaalo.com/play/original/93d42b2b-f373-4c2d-bca4-997412cb069d/Modi-Season-2-CM-TO-PM/Episode-1:Decision,-Not-Promises',
@@ -40,7 +40,7 @@ class MzaaloIE(InfoExtractor):
             'categories': ['Drama'],
             'age_limit': 13,
         },
-        'params': {'skip_download': 'm3u8'}
+        'params': {'skip_download': 'm3u8'},
     }, {
         # Streams/Clips
         'url': 'https://www.mzaalo.com/play/clip/83cdbcb5-400a-42f1-a1d2-459053cfbda5/Manto-Ki-Kahaaniya',
@@ -54,7 +54,10 @@ class MzaaloIE(InfoExtractor):
             'duration': 1937.0,
             'language': 'hin',
         },
-        'params': {'skip_download': 'm3u8'}
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        'url': 'https://mzaalo.com/watch/MOVIE/389c892d-0b65-4019-bf73-d4edcb1c014f/Chalo-Dilli',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/n1.py b/plugins/youtube_download/yt_dlp/extractor/n1.py
index 55345f3..e0e4916 100644
--- a/plugins/youtube_download/yt_dlp/extractor/n1.py
+++ b/plugins/youtube_download/yt_dlp/extractor/n1.py
@@ -2,9 +2,11 @@ import re
 
 from .common import InfoExtractor
 from ..utils import (
-    unified_timestamp,
     extract_attributes,
+    unified_timestamp,
+    url_or_none,
 )
+from ..utils.traversal import traverse_obj
 
 
 class N1InfoAssetIE(InfoExtractor):
@@ -16,7 +18,7 @@ class N1InfoAssetIE(InfoExtractor):
             'id': 'ljsottomazilirija3060921-n1info-si-worldwide',
             'ext': 'mp4',
             'title': 'ljsottomazilirija3060921-n1info-si-worldwide',
-        }
+        },
     }]
 
     def _real_extract(self, url):
@@ -33,11 +35,11 @@ class N1InfoAssetIE(InfoExtractor):
 
 class N1InfoIIE(InfoExtractor):
     IE_NAME = 'N1Info:article'
-    _VALID_URL = r'https?://(?:(?:(?:ba|rs|hr)\.)?n1info\.(?:com|si)|nova\.rs)/(?:[^/]+/){1,2}(?P<id>[^/]+)'
+    _VALID_URL = r'https?://(?:(?:\w+\.)?n1info\.\w+|nova\.rs)/(?:[^/?#]+/){1,2}(?P<id>[^/?#]+)'
     _TESTS = [{
-        # Youtube embedded
+        # YouTube embedded
         'url': 'https://rs.n1info.com/sport-klub/tenis/kako-je-djokovic-propustio-istorijsku-priliku-video/',
-        'md5': '01ddb6646d0fd9c4c7d990aa77fe1c5a',
+        'md5': '987ce6fd72acfecc453281e066b87973',
         'info_dict': {
             'id': 'L5Hd4hQVUpk',
             'ext': 'mp4',
@@ -45,8 +47,27 @@ class N1InfoIIE(InfoExtractor):
             'title': 'Ozmo i USO21, ep. 13: Novak Đoković – Danil Medvedev | Ključevi Poraza, Budućnost | SPORT KLUB TENIS',
             'description': 'md5:467f330af1effedd2e290f10dc31bb8e',
             'uploader': 'Sport Klub',
-            'uploader_id': 'sportklub',
-        }
+            'uploader_id': '@sportklub',
+            'uploader_url': 'https://www.youtube.com/@sportklub',
+            'channel': 'Sport Klub',
+            'channel_id': 'UChpzBje9Ro6CComXe3BgNaw',
+            'channel_url': 'https://www.youtube.com/channel/UChpzBje9Ro6CComXe3BgNaw',
+            'channel_is_verified': True,
+            'channel_follower_count': int,
+            'comment_count': int,
+            'view_count': int,
+            'like_count': int,
+            'age_limit': 0,
+            'duration': 1049,
+            'thumbnail': 'https://i.ytimg.com/vi/L5Hd4hQVUpk/maxresdefault.jpg',
+            'chapters': 'count:9',
+            'categories': ['Sports'],
+            'tags': 'count:10',
+            'timestamp': 1631522787,
+            'playable_in_embed': True,
+            'availability': 'public',
+            'live_status': 'not_live',
+        },
     }, {
         'url': 'https://rs.n1info.com/vesti/djilas-los-plan-za-metro-nece-resiti-nijedan-saobracajni-problem/',
         'info_dict': {
@@ -55,6 +76,7 @@ class N1InfoIIE(InfoExtractor):
             'title': 'Đilas: Predlog izgradnje metroa besmislen; SNS odbacuje navode',
             'upload_date': '20210924',
             'timestamp': 1632481347,
+            'thumbnail': 'http://n1info.rs/wp-content/themes/ucnewsportal-n1/dist/assets/images/placeholder-image-video.jpg',
         },
         'params': {
             'skip_download': True,
@@ -67,6 +89,7 @@ class N1InfoIIE(InfoExtractor):
             'title': 'Zadnji dnevi na kopališču Ilirija: “Ilirija ni umrla, ubili so jo”',
             'timestamp': 1632567630,
             'upload_date': '20210925',
+            'thumbnail': 'https://n1info.si/wp-content/uploads/2021/09/06/1630945843-tomaz3.png',
         },
         'params': {
             'skip_download': True,
@@ -81,6 +104,14 @@ class N1InfoIIE(InfoExtractor):
             'upload_date': '20210924',
             'timestamp': 1632448649.0,
             'uploader': 'YouLotWhatDontStop',
+            'display_id': 'pu9wbx',
+            'channel_id': 'serbia',
+            'comment_count': int,
+            'like_count': int,
+            'dislike_count': int,
+            'age_limit': 0,
+            'duration': 134,
+            'thumbnail': 'https://external-preview.redd.it/5nmmawSeGx60miQM3Iq-ueC9oyCLTLjjqX-qqY8uRsc.png?format=pjpg&auto=webp&s=2f973400b04d23f871b608b178e47fc01f9b8f1d',
         },
         'params': {
             'skip_download': True,
@@ -93,6 +124,27 @@ class N1InfoIIE(InfoExtractor):
             'title': 'Žaklina Tatalović Ani Brnabić: Pričate laži (VIDEO)',
             'upload_date': '20211102',
             'timestamp': 1635861677,
+            'thumbnail': 'https://nova.rs/wp-content/uploads/2021/11/02/1635860298-TNJG_Ana_Brnabic_i_Zaklina_Tatalovic_100_dana_Vlade_GP.jpg',
+        },
+    }, {
+        'url': 'https://n1info.rs/vesti/cuta-biti-u-kosovskoj-mitrovici-znaci-da-te-docekaju-eksplozivnim-napravama/',
+        'info_dict': {
+            'id': '1332368',
+            'ext': 'mp4',
+            'title': 'Ćuta: Biti u Kosovskoj Mitrovici znači da te dočekaju eksplozivnim napravama',
+            'upload_date': '20230620',
+            'timestamp': 1687290536,
+            'thumbnail': 'https://cdn.brid.tv/live/partners/26827/snapshot/1332368_th_6492013a8356f_1687290170.jpg',
+        },
+    }, {
+        'url': 'https://n1info.rs/vesti/vuciceva-turneja-po-srbiji-najavljuje-kontrarevoluciju-preti-svom-narodu-vredja-novinare/',
+        'info_dict': {
+            'id': '2025974',
+            'ext': 'mp4',
+            'title': 'Vučićeva turneja po Srbiji: Najavljuje kontrarevoluciju, preti svom narodu, vređa novinare',
+            'thumbnail': 'https://cdn-uc.brid.tv/live/partners/26827/snapshot/2025974_fhd_67c4a23280a81_1740939826.jpg',
+            'timestamp': 1740939936,
+            'upload_date': '20250302',
         },
     }, {
         'url': 'https://hr.n1info.com/vijesti/pravobraniteljica-o-ubojstvu-u-zagrebu-radi-se-o-doista-nezapamcenoj-situaciji/',
@@ -105,19 +157,35 @@ class N1InfoIIE(InfoExtractor):
 
         title = self._html_search_regex(r'<h1[^>]+>(.+?)</h1>', webpage, 'title')
         timestamp = unified_timestamp(self._html_search_meta('article:published_time', webpage))
-
-        videos = re.findall(r'(?m)(<video[^>]+>)', webpage)
+        plugin_data = re.findall(r'\$bp\("(?:Brid|TargetVideo)_\d+",\s(.+)\);', webpage)
         entries = []
-        for video in videos:
-            video_data = extract_attributes(video)
-            entries.append({
-                '_type': 'url_transparent',
-                'url': video_data.get('data-url'),
-                'id': video_data.get('id'),
-                'title': title,
-                'thumbnail': video_data.get('data-thumbnail'),
-                'timestamp': timestamp,
-                'ie_key': 'N1InfoAsset'})
+        if plugin_data:
+            site_id = self._html_search_regex(r'site:(\d+)', webpage, 'site id')
+            for video_data in plugin_data:
+                video_id = self._parse_json(video_data, title)['video']
+                entries.append({
+                    'id': video_id,
+                    'title': title,
+                    'timestamp': timestamp,
+                    'thumbnail': self._html_search_meta('thumbnailURL', webpage),
+                    'formats': self._extract_m3u8_formats(
+                        f'https://cdn-uc.brid.tv/live/partners/{site_id}/streaming/{video_id}/{video_id}.m3u8',
+                        video_id, fatal=False),
+                })
+        else:
+            # Old player still present in older articles
+            videos = re.findall(r'(?m)(<video[^>]+>)', webpage)
+            for video in videos:
+                video_data = extract_attributes(video)
+                entries.append({
+                    '_type': 'url_transparent',
+                    'url': video_data.get('data-url'),
+                    'id': video_data.get('id'),
+                    'title': title,
+                    'thumbnail': traverse_obj(video_data, (('data-thumbnail', 'data-default_thumbnail'), {url_or_none}, any)),
+                    'timestamp': timestamp,
+                    'ie_key': 'N1InfoAsset',
+                })
 
         embedded_videos = re.findall(r'(<iframe[^>]+>)', webpage)
         for embedded_video in embedded_videos:
@@ -126,7 +194,7 @@ class N1InfoIIE(InfoExtractor):
             if url.startswith('https://www.youtube.com'):
                 entries.append(self.url_result(url, ie='Youtube'))
             elif url.startswith('https://www.redditmedia.com'):
-                entries.append(self.url_result(url, ie='RedditR'))
+                entries.append(self.url_result(url, ie='Reddit'))
 
         return {
             '_type': 'playlist',
diff --git a/plugins/youtube_download/yt_dlp/extractor/nate.py b/plugins/youtube_download/yt_dlp/extractor/nate.py
index 5e74caa..bbc641f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/nate.py
+++ b/plugins/youtube_download/yt_dlp/extractor/nate.py
@@ -29,7 +29,7 @@ class NateIE(InfoExtractor):
             'uploader_id': '3606',
             'tags': 'count:59',
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }, {
         'url': 'https://tv.nate.com/clip/4300566',
         'info_dict': {
@@ -47,7 +47,7 @@ class NateIE(InfoExtractor):
             'uploader_id': '27987',
             'tags': 'count:20',
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }]
 
     _QUALITY = {
@@ -60,8 +60,8 @@ class NateIE(InfoExtractor):
     }
 
     def _real_extract(self, url):
-        id = self._match_id(url)
-        video_data = self._download_json(f'https://tv.nate.com/api/v1/clip/{id}', id)
+        video_id = self._match_id(url)
+        video_data = self._download_json(f'https://tv.nate.com/api/v1/clip/{video_id}', video_id)
         formats = [{
             'format_id': f_url[-2:],
             'url': f_url,
@@ -69,7 +69,7 @@ class NateIE(InfoExtractor):
             'quality': int_or_none(f_url[-2:]),
         } for f_url in video_data.get('smcUriList') or []]
         return {
-            'id': id,
+            'id': video_id,
             'title': video_data.get('clipTitle'),
             'description': video_data.get('synopsis'),
             'thumbnail': video_data.get('contentImg'),
@@ -102,19 +102,19 @@ class NateProgramIE(InfoExtractor):
         },
     }]
 
-    def _entries(self, id):
+    def _entries(self, playlist_id):
         for page_num in itertools.count(1):
-            program_data = self._download_json(f'https://tv.nate.com/api/v1/program/{id}/clip/ranking?size=20&page={page_num}',
-                                               id, note=f'Downloading page {page_num}')
+            program_data = self._download_json(
+                f'https://tv.nate.com/api/v1/program/{playlist_id}/clip/ranking?size=20&page={page_num}',
+                playlist_id, note=f'Downloading page {page_num}')
             for clip in program_data.get('content') or []:
                 clip_id = clip.get('clipSeq')
                 if clip_id:
                     yield self.url_result(
-                        'https://tv.nate.com/clip/%s' % clip_id,
-                        ie=NateIE.ie_key(), video_id=clip_id)
+                        f'https://tv.nate.com/clip/{clip_id}', NateIE, playlist_id)
             if program_data.get('last'):
                 break
 
     def _real_extract(self, url):
-        id = self._match_id(url)
-        return self.playlist_result(self._entries(id), playlist_id=id)
+        playlist_id = self._match_id(url)
+        return self.playlist_result(self._entries(playlist_id), playlist_id=playlist_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/nationalgeographic.py b/plugins/youtube_download/yt_dlp/extractor/nationalgeographic.py
index ad525c2..43f84a9 100644
--- a/plugins/youtube_download/yt_dlp/extractor/nationalgeographic.py
+++ b/plugins/youtube_download/yt_dlp/extractor/nationalgeographic.py
@@ -24,6 +24,7 @@ class NationalGeographicVideoIE(InfoExtractor):
                 'uploader': 'NAGS',
             },
             'add_ie': ['ThePlatform'],
+            'skip': 'Redirects to main page',
         },
         {
             'url': 'http://video.nationalgeographic.com/wild/when-sharks-attack/the-real-jaws',
@@ -38,6 +39,7 @@ class NationalGeographicVideoIE(InfoExtractor):
                 'uploader': 'NAGS',
             },
             'add_ie': ['ThePlatform'],
+            'skip': 'Redirects to main page',
         },
     ]
 
@@ -53,7 +55,7 @@ class NationalGeographicVideoIE(InfoExtractor):
             '_type': 'url_transparent',
             'ie_key': 'ThePlatform',
             'url': smuggle_url(
-                'http://link.theplatform.com/s/ngs/media/guid/2423130747/%s?mbr=true' % guid,
+                f'http://link.theplatform.com/s/ngs/media/guid/2423130747/{guid}?mbr=true',
                 {'force_smil_url': True}),
             'id': guid,
         }
@@ -75,6 +77,7 @@ class NationalGeographicTVIE(FOXIE):  # XXX: Do not subclass from concrete IE
         'params': {
             'skip_download': True,
         },
+        'skip': 'Content not available',
     }]
     _HOME_PAGE_URL = 'https://www.nationalgeographic.com/tv/'
     _API_KEY = '238bb0a0c2aba67922c48709ce0c06fd'
diff --git a/plugins/youtube_download/yt_dlp/extractor/naver.py b/plugins/youtube_download/yt_dlp/extractor/naver.py
index d79caf5..fa7b56c 100644
--- a/plugins/youtube_download/yt_dlp/extractor/naver.py
+++ b/plugins/youtube_download/yt_dlp/extractor/naver.py
@@ -1,27 +1,32 @@
+import base64
+import hashlib
+import hmac
 import itertools
+import json
 import re
-from urllib.parse import urlparse, parse_qs
+import time
+import urllib.parse
 
 from .common import InfoExtractor
 from ..utils import (
     ExtractorError,
-    clean_html,
     dict_get,
     int_or_none,
     join_nonempty,
     merge_dicts,
-    parse_duration,
+    parse_iso8601,
     traverse_obj,
     try_get,
     unified_timestamp,
     update_url_query,
+    url_or_none,
 )
 
 
 class NaverBaseIE(InfoExtractor):
     _CAPTION_EXT_RE = r'\.(?:ttml|vtt)'
 
-    @staticmethod  # NB: Used in VLiveWebArchiveIE, WeverseIE
+    @staticmethod  # NB: Used in WeverseIE
     def process_subtitles(vod_data, process_url):
         ret = {'subtitles': {}, 'automatic_captions': {}}
         for caption in traverse_obj(vod_data, ('captions', 'list', ...)):
@@ -31,7 +36,7 @@ class NaverBaseIE(InfoExtractor):
             type_ = 'automatic_captions' if caption.get('type') == 'auto' else 'subtitles'
             lang = caption.get('locale') or join_nonempty('language', 'country', from_dict=caption) or 'und'
             if caption.get('type') == 'fan':
-                lang += '_fan%d' % next(i for i in itertools.count(1) if f'{lang}_fan{i}' not in ret[type_])
+                lang += '_fan{}'.format(next(i for i in itertools.count(1) if f'{lang}_fan{i}' not in ret[type_]))
             ret[type_].setdefault(lang, []).extend({
                 'url': sub_url,
                 'name': join_nonempty('label', 'fanName', from_dict=caption, delim=' - '),
@@ -58,7 +63,7 @@ class NaverBaseIE(InfoExtractor):
                 encoding_option = stream.get('encodingOption', {})
                 bitrate = stream.get('bitrate', {})
                 formats.append({
-                    'format_id': '%s_%s' % (stream.get('type') or stream_type, dict_get(encoding_option, ('name', 'id'))),
+                    'format_id': '{}_{}'.format(stream.get('type') or stream_type, dict_get(encoding_option, ('name', 'id'))),
                     'url': stream_url,
                     'ext': 'mp4',
                     'width': int_or_none(encoding_option.get('width')),
@@ -67,6 +72,7 @@ class NaverBaseIE(InfoExtractor):
                     'abr': int_or_none(bitrate.get('audio')),
                     'filesize': int_or_none(stream.get('size')),
                     'protocol': 'm3u8_native' if stream_type == 'HLS' else None,
+                    'extra_param_to_segment_url': urllib.parse.urlencode(query, doseq=True) if stream_type == 'HLS' else None,
                 })
 
         extract_formats(get_list('video'), 'H264')
@@ -110,6 +116,18 @@ class NaverBaseIE(InfoExtractor):
             **self.process_subtitles(video_data, get_subs),
         }
 
+    def _call_api(self, path, video_id):
+        api_endpoint = f'https://apis.naver.com/now_web2/now_web_api/v1{path}'
+        key = b'nbxvs5nwNG9QKEWK0ADjYA4JZoujF4gHcIwvoCxFTPAeamq5eemvt5IWAYXxrbYM'
+        msgpad = int(time.time() * 1000)
+        md = base64.b64encode(hmac.HMAC(
+            key, f'{api_endpoint[:255]}{msgpad}'.encode(), digestmod=hashlib.sha1).digest()).decode()
+
+        return self._download_json(api_endpoint, video_id=video_id, headers=self.geo_verification_headers(), query={
+            'msgpad': msgpad,
+            'md': md,
+        })['result']
+
 
 class NaverIE(NaverBaseIE):
     _VALID_URL = r'https?://(?:m\.)?tv(?:cast)?\.naver\.com/(?:v|embed)/(?P<id>\d+)'
@@ -125,21 +143,52 @@ class NaverIE(NaverBaseIE):
             'upload_date': '20130903',
             'uploader': '메가스터디, 합격불변의 법칙',
             'uploader_id': 'megastudy',
+            'uploader_url': 'https://tv.naver.com/megastudy',
+            'view_count': int,
+            'like_count': int,
+            'comment_count': int,
+            'duration': 2118,
+            'thumbnail': r're:^https?://.*\.jpg',
         },
     }, {
         'url': 'http://tv.naver.com/v/395837',
-        'md5': '8a38e35354d26a17f73f4e90094febd3',
+        'md5': '7791205fa89dbed2f5e3eb16d287ff05',
         'info_dict': {
             'id': '395837',
             'ext': 'mp4',
             'title': '9년이 지나도 아픈 기억, 전효성의 아버지',
-            'description': 'md5:eb6aca9d457b922e43860a2a2b1984d3',
+            'description': 'md5:c76be23e21403a6473d8119678cdb5cb',
             'timestamp': 1432030253,
             'upload_date': '20150519',
-            'uploader': '4가지쇼 시즌2',
-            'uploader_id': 'wrappinguser29',
+            'uploader': '4가지쇼',
+            'uploader_id': '4show',
+            'uploader_url': 'https://tv.naver.com/4show',
+            'view_count': int,
+            'like_count': int,
+            'comment_count': int,
+            'duration': 277,
+            'thumbnail': r're:^https?://.*\.jpg',
         },
-        'skip': 'Georestricted',
+    }, {
+        'url': 'https://tv.naver.com/v/67838091',
+        'md5': '126ea384ab033bca59672c12cca7a6be',
+        'info_dict': {
+            'id': '67838091',
+            'ext': 'mp4',
+            'title': '[라인W 날씨] 내일 아침 서울 체감 -19도…호남·충남 대설',
+            'description': 'md5:fe026e25634c85845698aed4b59db5a7',
+            'timestamp': 1736347853,
+            'upload_date': '20250108',
+            'uploader': 'KBS뉴스',
+            'uploader_id': 'kbsnews',
+            'uploader_url': 'https://tv.naver.com/kbsnews',
+            'view_count': int,
+            'like_count': int,
+            'comment_count': int,
+            'duration': 69,
+            'thumbnail': r're:^https?://.*\.jpg',
+        },
+        'params': {'format': 'HLS_144P'},
     }, {
         'url': 'http://tvcast.naver.com/v/81652',
         'only_matching': True,
@@ -147,56 +196,63 @@ class NaverIE(NaverBaseIE):
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        content = self._download_json(
-            'https://tv.naver.com/api/json/v/' + video_id,
-            video_id, headers=self.geo_verification_headers())
-        player_info_json = content.get('playerInfoJson') or {}
-        current_clip = player_info_json.get('currentClip') or {}
+        data = self._call_api(f'/clips/{video_id}/play-info', video_id)
 
-        vid = current_clip.get('videoId')
-        in_key = current_clip.get('inKey')
+        vid = traverse_obj(data, ('clip', 'videoId', {str}))
+        in_key = traverse_obj(data, ('play', 'inKey', {str}))
 
         if not vid or not in_key:
-            player_auth = try_get(player_info_json, lambda x: x['playerOption']['auth'])
-            if player_auth == 'notCountry':
-                self.raise_geo_restricted(countries=['KR'])
-            elif player_auth == 'notLogin':
-                self.raise_login_required()
-            raise ExtractorError('couldn\'t extract vid and key')
+            raise ExtractorError('Unable to extract video info')
+
         info = self._extract_video_info(video_id, vid, in_key)
-        info.update({
-            'description': clean_html(current_clip.get('description')),
-            'timestamp': int_or_none(current_clip.get('firstExposureTime'), 1000),
-            'duration': parse_duration(current_clip.get('displayPlayTime')),
-            'like_count': int_or_none(current_clip.get('recommendPoint')),
-            'age_limit': 19 if current_clip.get('adult') else None,
-        })
+        info.update(traverse_obj(data, ('clip', {
+            'title': 'title',
+            'description': 'description',
+            'timestamp': ('firstExposureDatetime', {parse_iso8601}),
+            'duration': ('playTime', {int_or_none}),
+            'like_count': ('likeItCount', {int_or_none}),
+            'view_count': ('playCount', {int_or_none}),
+            'comment_count': ('commentCount', {int_or_none}),
+            'thumbnail': ('thumbnailImageUrl', {url_or_none}),
+            'uploader': 'channelName',
+            'uploader_id': 'channelId',
+            'uploader_url': ('channelUrl', {url_or_none}),
+            'age_limit': ('adultVideo', {lambda x: 19 if x else None}),
+        })))
         return info
 
 
-class NaverLiveIE(InfoExtractor):
+class NaverLiveIE(NaverBaseIE):
     IE_NAME = 'Naver:live'
     _VALID_URL = r'https?://(?:m\.)?tv(?:cast)?\.naver\.com/l/(?P<id>\d+)'
     _GEO_BYPASS = False
     _TESTS = [{
-        'url': 'https://tv.naver.com/l/52010',
+        'url': 'https://tv.naver.com/l/127062',
         'info_dict': {
-            'id': '52010',
+            'id': '127062',
             'ext': 'mp4',
-            'title': '[LIVE] 뉴스특보 : "수도권 거리두기, 2주간 2단계로 조정"',
-            'description': 'md5:df7f0c237a5ed5e786ce5c91efbeaab3',
-            'channel_id': 'NTV-ytnnews24-0',
-            'start_time': 1597026780000,
+            'live_status': 'is_live',
+            'channel': '뉴스는 YTN',
+            'channel_id': 'ytnnews24',
+            'title': 're:^대한민국 24시간 뉴스 채널 [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
+            'description': 'md5:f938b5956711beab6f882314ffadf4d5',
+            'start_time': 1677752280,
+            'thumbnail': r're:^https?://.*\.(jpg|jpeg|png)',
+            'like_count': int,
         },
     }, {
-        'url': 'https://tv.naver.com/l/51549',
+        'url': 'https://tv.naver.com/l/140535',
         'info_dict': {
-            'id': '51549',
+            'id': '140535',
             'ext': 'mp4',
-            'title': '연합뉴스TV - 코로나19 뉴스특보',
-            'description': 'md5:c655e82091bc21e413f549c0eaccc481',
-            'channel_id': 'NTV-yonhapnewstv-0',
-            'start_time': 1596406380000,
+            'live_status': 'is_live',
+            'channel': 'KBS뉴스',
+            'channel_id': 'kbsnews',
+            'start_time': 1696867320,
+            'title': 're:^언제 어디서나! KBS 뉴스 24 [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
+            'description': 'md5:6ad419c0bf2f332829bda3f79c295284',
+            'thumbnail': r're:^https?://.*\.(jpg|jpeg|png)',
+            'like_count': int,
         },
     }, {
         'url': 'https://tv.naver.com/l/54887',
@@ -205,56 +261,28 @@ class NaverLiveIE(InfoExtractor):
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        page = self._download_webpage(url, video_id, 'Downloading Page', 'Unable to download Page')
-        secure_url = self._search_regex(r'sApiF:\s+(?:"|\')([^"\']+)', page, 'secureurl')
-
-        info = self._extract_video_info(video_id, secure_url)
-        info.update({
-            'description': self._og_search_description(page)
-        })
-
-        return info
-
-    def _extract_video_info(self, video_id, url):
-        video_data = self._download_json(url, video_id, headers=self.geo_verification_headers())
-        meta = video_data.get('meta')
-        status = meta.get('status')
+        data = self._call_api(f'/live-end/normal/{video_id}/play-info?renewLastPlayDate=true', video_id)
 
+        status = traverse_obj(data, ('live', 'liveStatus'))
         if status == 'CLOSED':
             raise ExtractorError('Stream is offline.', expected=True)
         elif status != 'OPENED':
-            raise ExtractorError('Unknown status %s' % status)
-
-        title = meta.get('title')
-        stream_list = video_data.get('streams')
-
-        if stream_list is None:
-            raise ExtractorError('Could not get stream data.', expected=True)
-
-        formats = []
-        for quality in stream_list:
-            if not quality.get('url'):
-                continue
-
-            prop = quality.get('property')
-            if prop.get('abr'):  # This abr doesn't mean Average audio bitrate.
-                continue
-
-            formats.extend(self._extract_m3u8_formats(
-                quality.get('url'), video_id, 'mp4',
-                m3u8_id=quality.get('qualityId'), live=True
-            ))
+            raise ExtractorError(f'Unknown status {status!r}')
 
         return {
             'id': video_id,
-            'title': title,
-            'formats': formats,
-            'channel_id': meta.get('channelId'),
-            'channel_url': meta.get('channelUrl'),
-            'thumbnail': meta.get('imgUrl'),
-            'start_time': meta.get('startTime'),
-            'categories': [meta.get('categoryId')],
-            'is_live': True
+            'formats': self._extract_m3u8_formats(
+                traverse_obj(data, ('playbackBody', {json.loads}, 'media', 0, 'path')), video_id, live=True),
+            **traverse_obj(data, ('live', {
+                'title': 'title',
+                'channel': 'channelName',
+                'channel_id': 'channelId',
+                'description': 'description',
+                'like_count': (('likeCount', 'likeItCount'), {int_or_none}),
+                'thumbnail': ('thumbnailImageUrl', {url_or_none}),
+                'start_time': (('startTime', 'startDateTime', 'startYmdt'), {parse_iso8601}),
+            }), get_all=False),
+            'is_live': True,
         }
 
 
@@ -279,7 +307,7 @@ class NaverNowIE(NaverBaseIE):
         },
         'params': {
             'noplaylist': True,
-        }
+        },
     }, {
         'url': 'https://now.naver.com/s/now.4759?shareHightlight=26601461#highlight=',
         'md5': '9f6118e398aa0f22b2152f554ea7851b',
@@ -304,7 +332,7 @@ class NaverNowIE(NaverBaseIE):
             'id': '4759',
             'title': '아이키의 떰즈업',
         },
-        'playlist_mincount': 101
+        'playlist_mincount': 101,
     }, {
         'url': 'https://now.naver.com/s/now.4759?shareReplayId=26331132#replay',
         'info_dict': {
@@ -341,7 +369,7 @@ class NaverNowIE(NaverBaseIE):
             show_vod_info = self._download_json(
                 f'{self._API_URL}/vod-shows/now.{show_id}', show_id,
                 query={'page': page, 'page_size': page_size},
-                note=f'Downloading JSON vod list for show {show_id} - page {page}'
+                note=f'Downloading JSON vod list for show {show_id} - page {page}',
             )['response']['result']
             for v in show_vod_info.get('vod_list') or []:
                 yield self._extract_replay(show_id, v['id'])
@@ -381,7 +409,7 @@ class NaverNowIE(NaverBaseIE):
 
     def _real_extract(self, url):
         show_id = self._match_id(url)
-        qs = parse_qs(urlparse(url).query)
+        qs = urllib.parse.parse_qs(urllib.parse.urlparse(url).query)
 
         if not self._yes_playlist(show_id, qs.get('shareHightlight')):
             return self._extract_highlight(show_id, qs['shareHightlight'][0])
diff --git a/plugins/youtube_download/yt_dlp/extractor/nba.py b/plugins/youtube_download/yt_dlp/extractor/nba.py
index d8fc824..91ae1d1 100644
--- a/plugins/youtube_download/yt_dlp/extractor/nba.py
+++ b/plugins/youtube_download/yt_dlp/extractor/nba.py
@@ -1,15 +1,12 @@
 import functools
 import re
+import urllib.parse
 
 from .turner import TurnerBaseIE
-from ..compat import (
-    compat_str,
-    compat_urllib_parse_unquote,
-)
 from ..utils import (
+    OnDemandPagedList,
     int_or_none,
     merge_dicts,
-    OnDemandPagedList,
     parse_duration,
     parse_iso8601,
     parse_qs,
@@ -22,7 +19,7 @@ from ..utils import (
 class NBACVPBaseIE(TurnerBaseIE):
     def _extract_nba_cvp_info(self, path, video_id, fatal=False):
         return self._extract_cvp_info(
-            'http://secure.nba.com/%s' % path, video_id, {
+            f'http://secure.nba.com/{path}', video_id, {
                 'default': {
                     'media_src': 'http://nba.cdn.turner.com/nba/big',
                 },
@@ -97,7 +94,7 @@ class NBAWatchBaseIE(NBACVPBaseIE):
 
 
 class NBAWatchEmbedIE(NBAWatchBaseIE):
-    IENAME = 'nba:watch:embed'
+    IE_NAME = 'nba:watch:embed'
     _VALID_URL = NBAWatchBaseIE._VALID_URL_BASE + r'embed\?.*?\bid=(?P<id>\d+)'
     _TESTS = [{
         'url': 'http://watch.nba.com/embed?id=659395',
@@ -185,7 +182,7 @@ class NBAWatchCollectionIE(NBAWatchBaseIE):
         page += 1
         videos = self._download_json(
             'https://content-api-prod.nba.com/public/1/endeavor/video-list/collection/' + collection_id,
-            collection_id, 'Downloading page %d JSON metadata' % page, query={
+            collection_id, f'Downloading page {page} JSON metadata', query={
                 'count': self._PAGE_SIZE,
                 'page': page,
             })['results']['videos']
@@ -260,14 +257,14 @@ class NBABaseIE(NBACVPBaseIE):
 
     def _call_api(self, team, content_id, query, resource):
         return self._download_json(
-            'https://api.nba.net/2/%s/video,imported_video,wsc/' % team,
-            content_id, 'Download %s JSON metadata' % resource,
+            f'https://api.nba.net/2/{team}/video,imported_video,wsc/',
+            content_id, f'Download {resource} JSON metadata',
             query=query, headers={
                 'accessToken': 'internal|bb88df6b4c2244e78822812cecf1ee1b',
             })['response']['result']
 
     def _extract_video(self, video, team, extract_all=True):
-        video_id = compat_str(video['nid'])
+        video_id = str(video['nid'])
         team = video['brand']
 
         info = {
@@ -330,7 +327,7 @@ class NBABaseIE(NBACVPBaseIE):
     def _real_extract(self, url):
         team, display_id = self._match_valid_url(url).groups()
         if '/play#/' in url:
-            display_id = compat_urllib_parse_unquote(display_id)
+            display_id = urllib.parse.unquote(display_id)
         else:
             webpage = self._download_webpage(url, display_id)
             display_id = self._search_regex(
@@ -339,7 +336,7 @@ class NBABaseIE(NBACVPBaseIE):
 
 
 class NBAEmbedIE(NBABaseIE):
-    IENAME = 'nba:embed'
+    IE_NAME = 'nba:embed'
     _VALID_URL = r'https?://secure\.nba\.com/assets/amp/include/video/(?:topI|i)frame\.html\?.*?\bcontentId=(?P<id>[^?#&]+)'
     _TESTS = [{
         'url': 'https://secure.nba.com/assets/amp/include/video/topIframe.html?contentId=teams/bulls/2020/12/04/3478774/1607105587854-20201204_SCHEDULE_RELEASE_FINAL_DRUPAL-3478774&team=bulls&adFree=false&profile=71&videoPlayerName=TAMPCVP&baseUrl=&videoAdsection=nba.com_mobile_web_teamsites_chicagobulls&ampEnv=',
@@ -361,8 +358,8 @@ class NBAEmbedIE(NBABaseIE):
 
 
 class NBAIE(NBABaseIE):
-    IENAME = 'nba'
-    _VALID_URL = NBABaseIE._VALID_URL_BASE + '(?!%s)video/(?P<id>(?:[^/]+/)*[^/?#&]+)' % NBABaseIE._CHANNEL_PATH_REGEX
+    IE_NAME = 'nba'
+    _VALID_URL = NBABaseIE._VALID_URL_BASE + f'(?!{NBABaseIE._CHANNEL_PATH_REGEX})video/(?P<id>(?:[^/]+/)*[^/?#&]+)'
     _TESTS = [{
         'url': 'https://www.nba.com/bulls/video/teams/bulls/2020/12/04/3478774/1607105587854-20201204schedulereleasefinaldrupal-3478774',
         'info_dict': {
@@ -388,8 +385,8 @@ class NBAIE(NBABaseIE):
 
 
 class NBAChannelIE(NBABaseIE):
-    IENAME = 'nba:channel'
-    _VALID_URL = NBABaseIE._VALID_URL_BASE + '(?:%s)/(?P<id>[^/?#&]+)' % NBABaseIE._CHANNEL_PATH_REGEX
+    IE_NAME = 'nba:channel'
+    _VALID_URL = NBABaseIE._VALID_URL_BASE + f'(?:{NBABaseIE._CHANNEL_PATH_REGEX})/(?P<id>[^/?#&]+)'
     _TESTS = [{
         'url': 'https://www.nba.com/blazers/video/channel/summer_league',
         'info_dict': {
@@ -408,7 +405,7 @@ class NBAChannelIE(NBABaseIE):
             'channels': channel,
             'count': self._PAGE_SIZE,
             'offset': page * self._PAGE_SIZE,
-        }, 'page %d' % (page + 1))
+        }, f'page {page + 1}')
         for video in results:
             yield self._extract_video(video, team, False)
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/nbc.py b/plugins/youtube_download/yt_dlp/extractor/nbc.py
index b3c28ab..d9aded0 100644
--- a/plugins/youtube_download/yt_dlp/extractor/nbc.py
+++ b/plugins/youtube_download/yt_dlp/extractor/nbc.py
@@ -1,11 +1,12 @@
 import base64
 import json
 import re
+import urllib.parse
+import xml.etree.ElementTree
 
+from .adobepass import AdobePassIE
 from .common import InfoExtractor
 from .theplatform import ThePlatformIE, default_ns
-from .adobepass import AdobePassIE
-from ..compat import compat_urllib_parse_unquote
 from ..networking import HEADRequest
 from ..utils import (
     ExtractorError,
@@ -15,6 +16,7 @@ from ..utils import (
     determine_ext,
     float_or_none,
     int_or_none,
+    join_nonempty,
     mimetype2ext,
     parse_age_limit,
     parse_duration,
@@ -52,6 +54,8 @@ class NBCIE(ThePlatformIE):  # XXX: Do not subclass from concrete IE
                 'chapters': 'count:1',
                 'tags': 'count:4',
                 'thumbnail': r're:https?://.+\.jpg',
+                'categories': ['Series/The Tonight Show Starring Jimmy Fallon'],
+                'media_type': 'Full Episode',
             },
             'params': {
                 'skip_download': 'm3u8',
@@ -130,6 +134,8 @@ class NBCIE(ThePlatformIE):  # XXX: Do not subclass from concrete IE
                 'tags': 'count:10',
                 'age_limit': 0,
                 'thumbnail': r're:https?://.+\.jpg',
+                'categories': ['Series/Quantum Leap 2022'],
+                'media_type': 'Highlight',
             },
             'params': {
                 'skip_download': 'm3u8',
@@ -143,12 +149,12 @@ class NBCIE(ThePlatformIE):  # XXX: Do not subclass from concrete IE
             # Percent escaped url
             'url': 'https://www.nbc.com/up-all-night/video/day-after-valentine%27s-day/n2189',
             'only_matching': True,
-        }
+        },
     ]
 
     def _real_extract(self, url):
         permalink, video_id = self._match_valid_url(url).groups()
-        permalink = 'http' + compat_urllib_parse_unquote(permalink)
+        permalink = 'http' + urllib.parse.unquote(permalink)
         video_data = self._download_json(
             'https://friendship.nbc.co/v2/graphql', video_id, query={
                 'query': '''query bonanzaPage(
@@ -196,7 +202,7 @@ class NBCIE(ThePlatformIE):  # XXX: Do not subclass from concrete IE
             'switch': 'HLSServiceSecure',
         }
         video_id = video_data['mpxGuid']
-        tp_path = 'NnzsPC/media/guid/%s/%s' % (video_data.get('mpxAccountId') or '2410887629', video_id)
+        tp_path = 'NnzsPC/media/guid/{}/{}'.format(video_data.get('mpxAccountId') or '2410887629', video_id)
         tpm = self._download_theplatform_metadata(tp_path, video_id)
         title = tpm.get('title') or video_data.get('secondaryTitle')
         if video_data.get('locked'):
@@ -206,7 +212,7 @@ class NBCIE(ThePlatformIE):  # XXX: Do not subclass from concrete IE
             query['auth'] = self._extract_mvpd_auth(
                 url, video_id, 'nbcentertainment', resource)
         theplatform_url = smuggle_url(update_url_query(
-            'http://link.theplatform.com/s/NnzsPC/media/guid/%s/%s' % (video_data.get('mpxAccountId') or '2410887629', video_id),
+            'http://link.theplatform.com/s/NnzsPC/media/guid/{}/{}'.format(video_data.get('mpxAccountId') or '2410887629', video_id),
             query), {'force_smil_url': True})
 
         # Empty string or 0 can be valid values for these. So the check must be `is None`
@@ -248,7 +254,7 @@ class NBCIE(ThePlatformIE):  # XXX: Do not subclass from concrete IE
 class NBCSportsVPlayerIE(InfoExtractor):
     _VALID_URL_BASE = r'https?://(?:vplayer\.nbcsports\.com|(?:www\.)?nbcsports\.com/vplayer)/'
     _VALID_URL = _VALID_URL_BASE + r'(?:[^/]+/)+(?P<id>[0-9a-zA-Z_]+)'
-    _EMBED_REGEX = [r'(?:iframe[^>]+|var video|div[^>]+data-(?:mpx-)?)[sS]rc\s?=\s?"(?P<url>%s[^\"]+)' % _VALID_URL_BASE]
+    _EMBED_REGEX = [rf'(?:iframe[^>]+|var video|div[^>]+data-(?:mpx-)?)[sS]rc\s?=\s?"(?P<url>{_VALID_URL_BASE}[^\"]+)']
 
     _TESTS = [{
         'url': 'https://vplayer.nbcsports.com/p/BxmELC/nbcsports_embed/select/9CsDKds0kvHI',
@@ -262,8 +268,8 @@ class NBCSportsVPlayerIE(InfoExtractor):
             'uploader': 'NBCU-SPORTS',
             'duration': 72.818,
             'chapters': [],
-            'thumbnail': r're:^https?://.*\.jpg$'
-        }
+            'thumbnail': r're:^https?://.*\.jpg$',
+        },
     }, {
         'url': 'https://vplayer.nbcsports.com/p/BxmELC/nbcsports_embed/select/media/PEgOtlNcC_y2',
         'only_matching': True,
@@ -284,7 +290,7 @@ class NBCSportsIE(InfoExtractor):
 
     _TESTS = [{
         # iframe src
-        'url': 'http://www.nbcsports.com//college-basketball/ncaab/tom-izzo-michigan-st-has-so-much-respect-duke',
+        'url': 'https://www.nbcsports.com/watch/nfl/profootballtalk/pft-pm/unpacking-addisons-reckless-driving-citation',
         'info_dict': {
             'id': 'PHJSaFWbrTY9',
             'ext': 'mp4',
@@ -296,7 +302,7 @@ class NBCSportsIE(InfoExtractor):
             'chapters': [],
             'thumbnail': 'https://hdliveextra-a.akamaihd.net/HD/image_sports/NBCU_Sports_Group_-_nbcsports/253/303/izzodps.jpg',
             'duration': 528.395,
-        }
+        },
     }, {
         # data-mpx-src
         'url': 'https://www.nbcsports.com/philadelphia/philadelphia-phillies/bruce-bochy-hector-neris-hes-idiot',
@@ -334,7 +340,7 @@ class NBCSportsStreamIE(AdobePassIE):
     def _real_extract(self, url):
         video_id = self._match_id(url)
         live_source = self._download_json(
-            'http://stream.nbcsports.com/data/live_sources_%s.json' % video_id,
+            f'http://stream.nbcsports.com/data/live_sources_{video_id}.json',
             video_id)
         video_source = live_source['videoSources'][0]
         title = video_source['title']
@@ -379,7 +385,7 @@ class NBCNewsIE(ThePlatformIE):  # XXX: Do not subclass from concrete IE
     _TESTS = [
         {
             'url': 'http://www.nbcnews.com/watch/nbcnews-com/how-twitter-reacted-to-the-snowden-interview-269389891880',
-            'md5': 'cf4bc9e6ce0130f00f545d80ecedd4bf',
+            'md5': 'fb3dcd2d7b1dd9804305fa2fc95ab610',  # md5 tends to fluctuate
             'info_dict': {
                 'id': '269389891880',
                 'ext': 'mp4',
@@ -387,6 +393,8 @@ class NBCNewsIE(ThePlatformIE):  # XXX: Do not subclass from concrete IE
                 'description': 'md5:65a0bd5d76fe114f3c2727aa3a81fe64',
                 'timestamp': 1401363060,
                 'upload_date': '20140529',
+                'duration': 46.0,
+                'thumbnail': 'https://media-cldnry.s-nbcnews.com/image/upload/MSNBC/Components/Video/140529/p_tweet_snow_140529.jpg',
             },
         },
         {
@@ -402,7 +410,7 @@ class NBCNewsIE(ThePlatformIE):  # XXX: Do not subclass from concrete IE
         },
         {
             'url': 'http://www.nbcnews.com/nightly-news/video/nightly-news-with-brian-williams-full-broadcast-february-4-394064451844',
-            'md5': '8eb831eca25bfa7d25ddd83e85946548',
+            'md5': '40d0e48c68896359c80372306ece0fc3',
             'info_dict': {
                 'id': '394064451844',
                 'ext': 'mp4',
@@ -410,11 +418,13 @@ class NBCNewsIE(ThePlatformIE):  # XXX: Do not subclass from concrete IE
                 'description': 'md5:1c10c1eccbe84a26e5debb4381e2d3c5',
                 'timestamp': 1423104900,
                 'upload_date': '20150205',
+                'duration': 1236.0,
+                'thumbnail': 'https://media-cldnry.s-nbcnews.com/image/upload/MSNBC/Components/Video/__NEW/nn_netcast_150204.jpg',
             },
         },
         {
             'url': 'http://www.nbcnews.com/business/autos/volkswagen-11-million-vehicles-could-have-suspect-software-emissions-scandal-n431456',
-            'md5': '4a8c4cec9e1ded51060bdda36ff0a5c0',
+            'md5': 'ffb59bcf0733dc3c7f0ace907f5e3939',
             'info_dict': {
                 'id': 'n431456',
                 'ext': 'mp4',
@@ -422,11 +432,13 @@ class NBCNewsIE(ThePlatformIE):  # XXX: Do not subclass from concrete IE
                 'description': 'md5:d22d1281a24f22ea0880741bb4dd6301',
                 'upload_date': '20150922',
                 'timestamp': 1442917800,
+                'duration': 37.0,
+                'thumbnail': 'https://media-cldnry.s-nbcnews.com/image/upload/MSNBC/Components/Video/__NEW/x_lon_vwhorn_150922.jpg',
             },
         },
         {
             'url': 'http://www.today.com/video/see-the-aurora-borealis-from-space-in-stunning-new-nasa-video-669831235788',
-            'md5': '118d7ca3f0bea6534f119c68ef539f71',
+            'md5': '693d1fa21d23afcc9b04c66b227ed9ff',
             'info_dict': {
                 'id': '669831235788',
                 'ext': 'mp4',
@@ -434,6 +446,8 @@ class NBCNewsIE(ThePlatformIE):  # XXX: Do not subclass from concrete IE
                 'description': 'md5:74752b7358afb99939c5f8bb2d1d04b1',
                 'upload_date': '20160420',
                 'timestamp': 1461152093,
+                'duration': 69.0,
+                'thumbnail': 'https://media-cldnry.s-nbcnews.com/image/upload/MSNBC/Components/Video/201604/2016-04-20T11-35-09-133Z--1280x720.jpg',
             },
         },
         {
@@ -447,6 +461,7 @@ class NBCNewsIE(ThePlatformIE):  # XXX: Do not subclass from concrete IE
                 'thumbnail': r're:^https?://.*\.jpg$',
                 'timestamp': 1406937606,
                 'upload_date': '20140802',
+                'duration': 940.0,
             },
         },
         {
@@ -484,10 +499,8 @@ class NBCNewsIE(ThePlatformIE):  # XXX: Do not subclass from concrete IE
                     m3u8_id=format_id, fatal=False))
                 continue
             tbr = int_or_none(va.get('bitrate'), 1000)
-            if tbr:
-                format_id += '-%d' % tbr
             formats.append({
-                'format_id': format_id,
+                'format_id': join_nonempty(format_id, tbr),
                 'url': public_url,
                 'width': int_or_none(va.get('width')),
                 'height': int_or_none(va.get('height')),
@@ -535,6 +548,7 @@ class NBCOlympicsIE(InfoExtractor):
             'upload_date': '20160815',
             'uploader': 'NBCU-SPORTS',
         },
+        'skip': '404 Not Found',
     }
 
     def _real_extract(self, url):
@@ -553,7 +567,7 @@ class NBCOlympicsIE(InfoExtractor):
         except RegexNotFoundError:
             theplatform_url = self._search_regex(
                 r"([\"'])embedUrl\1: *([\"'])(?P<embedUrl>.+)\2",
-                webpage, 'embedding URL', group="embedUrl")
+                webpage, 'embedding URL', group='embedUrl')
 
         return {
             '_type': 'url_transparent',
@@ -578,6 +592,7 @@ class NBCOlympicsStreamIE(AdobePassIE):
             'params': {
                 'skip_download': 'm3u8',
             },
+            'skip': 'Livestream',
         }, {
             'note': 'Plain m3u8 source URL',
             'url': 'https://stream.nbcolympics.com/gymnastics-event-finals-mens-floor-pommel-horse-womens-vault-bars',
@@ -589,6 +604,7 @@ class NBCOlympicsStreamIE(AdobePassIE):
             'params': {
                 'skip_download': 'm3u8',
             },
+            'skip': 'Livestream',
         },
     ]
 
@@ -606,7 +622,7 @@ class NBCOlympicsStreamIE(AdobePassIE):
 
         source_url = self._download_json(
             f'https://api-leap.nbcsports.com/feeds/assets/{pid}?application=NBCOlympics&platform=desktop&format=nbc-player&env=staging',
-            pid, 'Downloading leap config'
+            pid, 'Downloading leap config',
         )['videoSources'][0]['cdnSources']['primary'][0]['sourceUrl']
 
         if event_config.get('cdnToken'):
@@ -720,7 +736,7 @@ class NBCStationsIE(InfoExtractor):
         webpage = self._download_webpage(url, video_id)
 
         nbc_data = self._search_json(
-            r'<script>\s*var\s+nbc\s*=', webpage, 'NBC JSON data', video_id)
+            r'(?:<script>\s*var\s+nbc\s*=|Object\.assign\(nbc,)', webpage, 'NBC JSON data', video_id)
         pdk_acct = nbc_data.get('pdkAcct') or 'Yh1nAC'
         fw_ssid = traverse_obj(nbc_data, ('video', 'fwSSID'))
 
@@ -791,8 +807,10 @@ class NBCStationsIE(InfoExtractor):
             smil = self._download_xml(
                 f'https://link.theplatform.com/s/{pdk_acct}/{player_id}', video_id,
                 note='Downloading SMIL data', query=query, fatal=is_live)
-        subtitles = self._parse_smil_subtitles(smil, default_ns) if smil else {}
-        for video in smil.findall(self._xpath_ns('.//video', default_ns)) if smil else []:
+            if not isinstance(smil, xml.etree.ElementTree.Element):
+                smil = None
+        subtitles = self._parse_smil_subtitles(smil, default_ns) if smil is not None else {}
+        for video in smil.findall(self._xpath_ns('.//video', default_ns)) if smil is not None else []:
             info['duration'] = float_or_none(remove_end(video.get('dur'), 'ms'), 1000)
             video_src_url = video.get('src')
             ext = mimetype2ext(video.get('type'), default=determine_ext(video_src_url))
diff --git a/plugins/youtube_download/yt_dlp/extractor/ndr.py b/plugins/youtube_download/yt_dlp/extractor/ndr.py
index 41ea362..5181c7f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ndr.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ndr.py
@@ -1,10 +1,10 @@
 import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import compat_urllib_parse_urlparse
 from ..utils import (
-    determine_ext,
     ExtractorError,
+    determine_ext,
     int_or_none,
     merge_dicts,
     parse_iso8601,
@@ -125,13 +125,13 @@ class NDRIE(NDRBaseIE):
         # some more work needed if we only found sophoraID
         if re.match(r'^[a-z]+\d+$', embed_url):
             # get the initial part of the url path,. eg /panorama/archiv/2022/
-            parsed_url = compat_urllib_parse_urlparse(url)
-            path = self._search_regex(r'(.+/)%s' % display_id, parsed_url.path or '', 'embed URL', default='')
+            parsed_url = urllib.parse.urlparse(url)
+            path = self._search_regex(rf'(.+/){display_id}', parsed_url.path or '', 'embed URL', default='')
             # find tell-tale image with the actual ID
-            ndr_id = self._search_regex(r'%s([a-z]+\d+)(?!\.)\b' % (path, ), webpage, 'embed URL', default=None)
+            ndr_id = self._search_regex(rf'{path}([a-z]+\d+)(?!\.)\b', webpage, 'embed URL', default=None)
             # or try to use special knowledge!
             NDR_INFO_URL_TPL = 'https://www.ndr.de/info/%s-player.html'
-            embed_url = 'ndr:%s' % (ndr_id, ) if ndr_id else NDR_INFO_URL_TPL % (embed_url, )
+            embed_url = f'ndr:{ndr_id}' if ndr_id else NDR_INFO_URL_TPL % (embed_url, )
         if not embed_url:
             raise ExtractorError('Unable to extract embedUrl')
 
@@ -141,7 +141,7 @@ class NDRIE(NDRBaseIE):
         timestamp = parse_iso8601(
             self._search_regex(
                 (r'<span[^>]+itemprop="(?:datePublished|uploadDate)"[^>]+content="(?P<cont>[^"]+)"',
-                 r'\bvar\s*pdt\s*=\s*(?P<q>["\'])(?P<cont>(?:(?!(?P=q)).)+)(?P=q)', ),
+                 r'\bvar\s*pdt\s*=\s*(?P<q>["\'])(?P<cont>(?:(?!(?P=q)).)+)(?P=q)'),
                 webpage, 'upload date', group='cont', default=None))
         info = self._search_json_ld(webpage, display_id, default={})
         return merge_dicts({
@@ -200,7 +200,7 @@ class NJoyIE(NDRBaseIE):
         # find tell-tale URL with the actual ID, or ...
         video_id = self._search_regex(
             (r'''\bsrc\s*=\s*["']?(?:/\w+)+/([a-z]+\d+)(?!\.)\b''',
-             r'<iframe[^>]+id="pp_([\da-z]+)"', ),
+             r'<iframe[^>]+id="pp_([\da-z]+)"'),
             webpage, 'NDR id', default=None)
 
         description = (
@@ -211,7 +211,7 @@ class NJoyIE(NDRBaseIE):
         return {
             '_type': 'url_transparent',
             'ie_key': 'NDREmbedBase',
-            'url': 'ndr:%s' % video_id,
+            'url': f'ndr:{video_id}',
             'display_id': display_id,
             'description': description,
             'title': display_id.replace('-', ' ').strip(),
@@ -234,7 +234,7 @@ class NDREmbedBaseIE(InfoExtractor):  # XXX: Conventionally, Concrete class name
         video_id = mobj.group('id') or mobj.group('id_s')
 
         ppjson = self._download_json(
-            'http://www.ndr.de/%s-ppjson.json' % video_id, video_id)
+            f'http://www.ndr.de/{video_id}-ppjson.json', video_id)
 
         playlist = ppjson['playlist']
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/ndtv.py b/plugins/youtube_download/yt_dlp/extractor/ndtv.py
index bfe52f7..c328bd4 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ndtv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ndtv.py
@@ -5,6 +5,7 @@ from ..utils import parse_duration, remove_end, unified_strdate, urljoin
 
 
 class NDTVIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:[^/]+\.)?ndtv\.com/(?:[^/]+/)*videos?/?(?:[^/]+/)*[^/?^&]+-(?P<id>\d+)'
 
     _TESTS = [
@@ -14,12 +15,12 @@ class NDTVIE(InfoExtractor):
             'info_dict': {
                 'id': '468818',
                 'ext': 'mp4',
-                'title': "प्राइम टाइम: सिस्टम बीमार, स्कूल बदहाल",
+                'title': 'प्राइम टाइम: सिस्टम बीमार, स्कूल बदहाल',
                 'description': 'md5:f410512f1b49672e5695dea16ef2731d',
                 'upload_date': '20170928',
                 'duration': 2218,
                 'thumbnail': r're:https?://.*\.jpg',
-            }
+            },
         },
         {
             # __filename is url
@@ -28,45 +29,45 @@ class NDTVIE(InfoExtractor):
             'info_dict': {
                 'id': '470304',
                 'ext': 'mp4',
-                'title': "Cracker-Free Diwali Wishes From Karan Johar, Kriti Sanon & Other Stars",
+                'title': 'Cracker-Free Diwali Wishes From Karan Johar, Kriti Sanon & Other Stars',
                 'description': 'md5:f115bba1adf2f6433fa7c1ade5feb465',
                 'upload_date': '20171019',
                 'duration': 137,
                 'thumbnail': r're:https?://.*\.jpg',
-            }
+            },
         },
         {
             'url': 'https://www.ndtv.com/video/news/news/delhi-s-air-quality-status-report-after-diwali-is-very-poor-470372',
-            'only_matching': True
+            'only_matching': True,
         },
         {
             'url': 'https://auto.ndtv.com/videos/the-cnb-daily-october-13-2017-469935',
-            'only_matching': True
+            'only_matching': True,
         },
         {
             'url': 'https://sports.ndtv.com/cricket/videos/2nd-t20i-rock-thrown-at-australia-cricket-team-bus-after-win-over-india-469764',
-            'only_matching': True
+            'only_matching': True,
         },
         {
             'url': 'http://gadgets.ndtv.com/videos/uncharted-the-lost-legacy-review-465568',
-            'only_matching': True
+            'only_matching': True,
         },
         {
             'url': 'http://profit.ndtv.com/videos/news/video-indian-economy-on-very-solid-track-international-monetary-fund-chief-470040',
-            'only_matching': True
+            'only_matching': True,
         },
         {
             'url': 'http://food.ndtv.com/video-basil-seeds-coconut-porridge-419083',
-            'only_matching': True
+            'only_matching': True,
         },
         {
             'url': 'https://doctor.ndtv.com/videos/top-health-stories-of-the-week-467396',
-            'only_matching': True
+            'only_matching': True,
         },
         {
             'url': 'https://swirlster.ndtv.com/video/how-to-make-friends-at-work-469324',
-            'only_matching': True
-        }
+            'only_matching': True,
+        },
     ]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/nebula.py b/plugins/youtube_download/yt_dlp/extractor/nebula.py
index 4f3e691..42ef25f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/nebula.py
+++ b/plugins/youtube_download/yt_dlp/extractor/nebula.py
@@ -1,233 +1,372 @@
 import itertools
 import json
 
+from .art19 import Art19IE
 from .common import InfoExtractor
 from ..networking.exceptions import HTTPError
-from ..utils import ExtractorError, make_archive_id, parse_iso8601, remove_start
+from ..utils import (
+    ExtractorError,
+    int_or_none,
+    make_archive_id,
+    parse_iso8601,
+    smuggle_url,
+    try_call,
+    unsmuggle_url,
+    update_url_query,
+    url_or_none,
+    urljoin,
+)
+from ..utils.traversal import traverse_obj
 
 _BASE_URL_RE = r'https?://(?:www\.|beta\.)?(?:watchnebula\.com|nebula\.app|nebula\.tv)'
 
 
 class NebulaBaseIE(InfoExtractor):
     _NETRC_MACHINE = 'watchnebula'
+    _token = _api_token = None
 
-    _nebula_api_token = None
-    _nebula_bearer_token = None
-
-    def _perform_nebula_auth(self, username, password):
-        if not username or not password:
-            self.raise_login_required(method='password')
-
-        data = json.dumps({'email': username, 'password': password}).encode('utf8')
-        response = self._download_json(
-            'https://api.watchnebula.com/api/v1/auth/login/',
-            data=data, fatal=False, video_id=None,
-            headers={
-                'content-type': 'application/json',
-                # Submitting the 'sessionid' cookie always causes a 403 on auth endpoint
-                'cookie': ''
-            },
-            note='Logging in to Nebula with supplied credentials',
-            errnote='Authentication failed or rejected')
-        if not response or not response.get('key'):
-            self.raise_login_required(method='password')
-
-        return response['key']
-
-    def _call_nebula_api(self, url, video_id=None, method='GET', auth_type='api', note=''):
-        assert method in ('GET', 'POST',)
-        assert auth_type in ('api', 'bearer',)
-
-        def inner_call():
-            authorization = f'Token {self._nebula_api_token}' if auth_type == 'api' else f'Bearer {self._nebula_bearer_token}'
-            return self._download_json(
-                url, video_id, note=note, headers={'Authorization': authorization},
-                data=b'' if method == 'POST' else None)
-
+    def _perform_login(self, username, password):
         try:
-            return inner_call()
-        except ExtractorError as exc:
-            # if 401 or 403, attempt credential re-auth and retry
-            if exc.cause and isinstance(exc.cause, HTTPError) and exc.cause.status in (401, 403):
-                self.to_screen(f'Reauthenticating to Nebula and retrying, because last {auth_type} call resulted in error {exc.cause.code}')
-                self._perform_login()
-                return inner_call()
-            else:
+            response = self._download_json(
+                'https://nebula.tv/auth/login/', None,
+                'Logging in to Nebula', 'Login failed',
+                data=json.dumps({'email': username, 'password': password}).encode(),
+                headers={'content-type': 'application/json'})
+        except ExtractorError as e:
+            if isinstance(e.cause, HTTPError) and e.cause.status == 400:
+                raise ExtractorError('Login failed: Invalid username or password', expected=True)
+            raise
+        self._api_token = traverse_obj(response, ('key', {str}))
+        if not self._api_token:
+            raise ExtractorError('Login failed: No token')
+
+    def _call_api(self, *args, **kwargs):
+        if self._token:
+            kwargs.setdefault('headers', {})['Authorization'] = f'Bearer {self._token}'
+        try:
+            return self._download_json(*args, **kwargs)
+        except ExtractorError as e:
+            if not isinstance(e.cause, HTTPError) or e.cause.status not in (401, 403):
+                raise
+            self.to_screen(
+                f'Reauthorizing with Nebula and retrying, because last API call resulted in error {e.cause.status}')
+            self._real_initialize()
+            if self._token:
+                kwargs.setdefault('headers', {})['Authorization'] = f'Bearer {self._token}'
+            return self._download_json(*args, **kwargs)
+
+    def _real_initialize(self):
+        if not self._api_token:
+            self._api_token = try_call(
+                lambda: self._get_cookies('https://nebula.tv')['nebula_auth.apiToken'].value)
+        self._token = self._download_json(
+            'https://users.api.nebula.app/api/v1/authorization/', None,
+            headers={'Authorization': f'Token {self._api_token}'} if self._api_token else None,
+            note='Authorizing to Nebula', data=b'')['token']
+
+    def _extract_formats(self, content_id, slug):
+        for retry in (False, True):
+            try:
+                fmts, subs = self._extract_m3u8_formats_and_subtitles(
+                    f'https://content.api.nebula.app/{content_id.split(":")[0]}s/{content_id}/manifest.m3u8',
+                    slug, 'mp4', query={
+                        'token': self._token,
+                        'app_version': '23.10.0',
+                        'platform': 'ios',
+                    })
+                return {'formats': fmts, 'subtitles': subs}
+            except ExtractorError as e:
+                if isinstance(e.cause, HTTPError) and e.cause.status == 401:
+                    self.raise_login_required()
+                if not retry and isinstance(e.cause, HTTPError) and e.cause.status == 403:
+                    self.to_screen('Reauthorizing with Nebula and retrying, because fetching video resulted in error')
+                    self._real_initialize()
+                    continue
                 raise
 
-    def _fetch_nebula_bearer_token(self):
-        """
-        Get a Bearer token for the Nebula API. This will be required to fetch video meta data.
-        """
-        response = self._call_nebula_api('https://api.watchnebula.com/api/v1/authorization/',
-                                         method='POST',
-                                         note='Authorizing to Nebula')
-        return response['token']
-
-    def _fetch_video_formats(self, slug):
-        stream_info = self._call_nebula_api(f'https://content.api.nebula.app/video/{slug}/stream/',
-                                            video_id=slug,
-                                            auth_type='bearer',
-                                            note='Fetching video stream info')
-        manifest_url = stream_info['manifest']
-        return self._extract_m3u8_formats_and_subtitles(manifest_url, slug, 'mp4')
-
-    def _build_video_info(self, episode):
-        fmts, subs = self._fetch_video_formats(episode['slug'])
-        channel_slug = episode['channel_slug']
-        channel_title = episode['channel_title']
-        zype_id = episode.get('zype_id')
+    def _extract_video_metadata(self, episode):
+        channel_url = traverse_obj(
+            episode, (('channel_slug', 'class_slug'), {urljoin('https://nebula.tv/')}), get_all=False)
         return {
-            'id': remove_start(episode['id'], 'video_episode:'),
-            'display_id': episode['slug'],
-            'formats': fmts,
-            'subtitles': subs,
-            'webpage_url': f'https://nebula.tv/{episode["slug"]}',
-            'title': episode['title'],
-            'description': episode['description'],
-            'timestamp': parse_iso8601(episode['published_at']),
-            'thumbnails': [{
-                # 'id': tn.get('name'),  # this appears to be null
-                'url': tn['original'],
-                'height': key,
-            } for key, tn in episode['assets']['thumbnail'].items()],
-            'duration': episode['duration'],
-            'channel': channel_title,
-            'channel_id': channel_slug,
-            'channel_url': f'https://nebula.tv/{channel_slug}',
-            'uploader': channel_title,
-            'uploader_id': channel_slug,
-            'uploader_url': f'https://nebula.tv/{channel_slug}',
-            'series': channel_title,
-            'creator': channel_title,
-            'extractor_key': NebulaIE.ie_key(),
-            'extractor': NebulaIE.IE_NAME,
-            '_old_archive_ids': [make_archive_id(NebulaIE, zype_id)] if zype_id else None,
+            'id': episode['id'].partition(':')[2],
+            **traverse_obj(episode, {
+                'display_id': 'slug',
+                'title': 'title',
+                'description': 'description',
+                'timestamp': ('published_at', {parse_iso8601}),
+                'duration': ('duration', {int_or_none}),
+                'channel_id': 'channel_slug',
+                'uploader_id': 'channel_slug',
+                'channel': 'channel_title',
+                'uploader': 'channel_title',
+                'series': 'channel_title',
+                'creator': 'channel_title',
+                'thumbnail': ('images', 'thumbnail', 'src', {url_or_none}),
+                'episode_number': ('order', {int_or_none}),
+                # Old code was wrongly setting extractor_key from NebulaSubscriptionsIE
+                '_old_archive_ids': ('zype_id', {lambda x: [
+                    make_archive_id(NebulaIE, x), make_archive_id(NebulaSubscriptionsIE, x)] if x else None}),
+            }),
+            'channel_url': channel_url,
+            'uploader_url': channel_url,
         }
 
-    def _perform_login(self, username=None, password=None):
-        self._nebula_api_token = self._perform_nebula_auth(username, password)
-        self._nebula_bearer_token = self._fetch_nebula_bearer_token()
-
 
 class NebulaIE(NebulaBaseIE):
-    _VALID_URL = rf'{_BASE_URL_RE}/videos/(?P<id>[-\w]+)'
-    _TESTS = [
-        {
-            'url': 'https://nebula.tv/videos/that-time-disney-remade-beauty-and-the-beast',
-            'md5': '14944cfee8c7beeea106320c47560efc',
-            'info_dict': {
-                'id': '84ed544d-4afd-4723-8cd5-2b95261f0abf',
-                'ext': 'mp4',
-                'title': 'That Time Disney Remade Beauty and the Beast',
-                'description': 'Note: this video was originally posted on YouTube with the sponsor read included. We weren’t able to remove it without reducing video quality, so it’s presented here in its original context.',
-                'upload_date': '20180731',
-                'timestamp': 1533009600,
-                'channel': 'Lindsay Ellis',
-                'channel_id': 'lindsayellis',
-                'uploader': 'Lindsay Ellis',
-                'uploader_id': 'lindsayellis',
-                'timestamp': 1533009600,
-                'uploader_url': 'https://nebula.tv/lindsayellis',
-                'series': 'Lindsay Ellis',
-                'display_id': 'that-time-disney-remade-beauty-and-the-beast',
-                'channel_url': 'https://nebula.tv/lindsayellis',
-                'creator': 'Lindsay Ellis',
-                'duration': 2212,
-                'thumbnail': r're:https://\w+\.cloudfront\.net/[\w-]+\.jpeg?.*',
-            },
+    IE_NAME = 'nebula:video'
+    _VALID_URL = rf'{_BASE_URL_RE}/videos/(?P<id>[\w-]+)'
+    _TESTS = [{
+        'url': 'https://nebula.tv/videos/that-time-disney-remade-beauty-and-the-beast',
+        'info_dict': {
+            'id': '84ed544d-4afd-4723-8cd5-2b95261f0abf',
+            'ext': 'mp4',
+            'title': 'That Time Disney Remade Beauty and the Beast',
+            'description': 'md5:2aae3c4cfc5ee09a1ecdff0909618cf4',
+            'upload_date': '20180731',
+            'timestamp': 1533009600,
+            'channel': 'Lindsay Ellis',
+            'channel_id': 'lindsayellis',
+            'uploader': 'Lindsay Ellis',
+            'uploader_id': 'lindsayellis',
+            'uploader_url': r're:https://nebula\.(tv|app)/lindsayellis',
+            'series': 'Lindsay Ellis',
+            'display_id': 'that-time-disney-remade-beauty-and-the-beast',
+            'channel_url': r're:https://nebula\.(tv|app)/lindsayellis',
+            'creator': 'Lindsay Ellis',
+            'duration': 2212,
+            'thumbnail': r're:https://\w+\.cloudfront\.net/[\w-]+',
+            '_old_archive_ids': ['nebula 5c271b40b13fd613090034fd', 'nebulasubscriptions 5c271b40b13fd613090034fd'],
         },
-        {
-            'url': 'https://nebula.tv/videos/the-logistics-of-d-day-landing-craft-how-the-allies-got-ashore',
-            'md5': 'd05739cf6c38c09322422f696b569c23',
-            'info_dict': {
-                'id': '7e623145-1b44-4ca3-aa0b-ed25a247ea34',
-                'ext': 'mp4',
-                'title': 'Landing Craft - How The Allies Got Ashore',
-                'description': r're:^In this episode we explore the unsung heroes of D-Day, the landing craft.',
-                'upload_date': '20200327',
-                'timestamp': 1585348140,
-                'channel': 'Real Engineering — The Logistics of D-Day',
-                'channel_id': 'd-day',
-                'uploader': 'Real Engineering — The Logistics of D-Day',
-                'uploader_id': 'd-day',
-                'series': 'Real Engineering — The Logistics of D-Day',
-                'display_id': 'the-logistics-of-d-day-landing-craft-how-the-allies-got-ashore',
-                'creator': 'Real Engineering — The Logistics of D-Day',
-                'duration': 841,
-                'channel_url': 'https://nebula.tv/d-day',
-                'uploader_url': 'https://nebula.tv/d-day',
-                'thumbnail': r're:https://\w+\.cloudfront\.net/[\w-]+\.jpeg?.*',
-            },
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        'url': 'https://nebula.tv/videos/the-logistics-of-d-day-landing-craft-how-the-allies-got-ashore',
+        'md5': 'd05739cf6c38c09322422f696b569c23',
+        'info_dict': {
+            'id': '7e623145-1b44-4ca3-aa0b-ed25a247ea34',
+            'ext': 'mp4',
+            'title': 'Landing Craft - How The Allies Got Ashore',
+            'description': r're:^In this episode we explore the unsung heroes of D-Day, the landing craft.',
+            'upload_date': '20200327',
+            'timestamp': 1585348140,
+            'channel': 'Real Engineering — The Logistics of D-Day',
+            'channel_id': 'd-day',
+            'uploader': 'Real Engineering — The Logistics of D-Day',
+            'uploader_id': 'd-day',
+            'series': 'Real Engineering — The Logistics of D-Day',
+            'display_id': 'the-logistics-of-d-day-landing-craft-how-the-allies-got-ashore',
+            'creator': 'Real Engineering — The Logistics of D-Day',
+            'duration': 841,
+            'channel_url': 'https://nebula.tv/d-day',
+            'uploader_url': 'https://nebula.tv/d-day',
+            'thumbnail': r're:https://\w+\.cloudfront\.net/[\w-]+',
+            '_old_archive_ids': ['nebula 5e7e78171aaf320001fbd6be', 'nebulasubscriptions 5e7e78171aaf320001fbd6be'],
         },
-        {
-            'url': 'https://nebula.tv/videos/money-episode-1-the-draw',
-            'md5': 'ebe28a7ad822b9ee172387d860487868',
-            'info_dict': {
-                'id': 'b96c5714-9e2b-4ec3-b3f1-20f6e89cc553',
-                'ext': 'mp4',
-                'title': 'Episode 1: The Draw',
-                'description': r'contains:There’s free money on offer… if the players can all work together.',
-                'upload_date': '20200323',
-                'timestamp': 1584980400,
-                'channel': 'Tom Scott Presents: Money',
-                'channel_id': 'tom-scott-presents-money',
-                'uploader': 'Tom Scott Presents: Money',
-                'uploader_id': 'tom-scott-presents-money',
-                'uploader_url': 'https://nebula.tv/tom-scott-presents-money',
-                'duration': 825,
-                'channel_url': 'https://nebula.tv/tom-scott-presents-money',
-                'series': 'Tom Scott Presents: Money',
-                'display_id': 'money-episode-1-the-draw',
-                'thumbnail': r're:https://\w+\.cloudfront\.net/[\w-]+\.jpeg?.*',
-                'creator': 'Tom Scott Presents: Money',
-            },
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        'url': 'https://nebula.tv/videos/money-episode-1-the-draw',
+        'md5': 'ebe28a7ad822b9ee172387d860487868',
+        'info_dict': {
+            'id': 'b96c5714-9e2b-4ec3-b3f1-20f6e89cc553',
+            'ext': 'mp4',
+            'title': 'Episode 1: The Draw',
+            'description': r'contains:There’s free money on offer… if the players can all work together.',
+            'upload_date': '20200323',
+            'timestamp': 1584980400,
+            'channel': 'Tom Scott Presents: Money',
+            'channel_id': 'tom-scott-presents-money',
+            'uploader': 'Tom Scott Presents: Money',
+            'uploader_id': 'tom-scott-presents-money',
+            'uploader_url': 'https://nebula.tv/tom-scott-presents-money',
+            'duration': 825,
+            'channel_url': 'https://nebula.tv/tom-scott-presents-money',
+            'series': 'Tom Scott Presents: Money',
+            'display_id': 'money-episode-1-the-draw',
+            'thumbnail': r're:https://\w+\.cloudfront\.net/[\w-]+',
+            'creator': 'Tom Scott Presents: Money',
+            '_old_archive_ids': ['nebula 5e779ebdd157bc0001d1c75a', 'nebulasubscriptions 5e779ebdd157bc0001d1c75a'],
         },
-        {
-            'url': 'https://watchnebula.com/videos/money-episode-1-the-draw',
-            'only_matching': True,
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        'url': 'https://watchnebula.com/videos/money-episode-1-the-draw',
+        'only_matching': True,
+    }, {
+        'url': 'https://nebula.tv/videos/tldrnewseu-did-the-us-really-blow-up-the-nordstream-pipelines',
+        'info_dict': {
+            'id': 'e389af9d-1dab-44f2-8788-ee24deb7ff0d',
+            'ext': 'mp4',
+            'display_id': 'tldrnewseu-did-the-us-really-blow-up-the-nordstream-pipelines',
+            'title': 'Did the US Really Blow Up the NordStream Pipelines?',
+            'description': 'md5:b4e2a14e3ff08f546a3209c75261e789',
+            'upload_date': '20230223',
+            'timestamp': 1677144070,
+            'channel': 'TLDR News EU',
+            'channel_id': 'tldrnewseu',
+            'uploader': 'TLDR News EU',
+            'uploader_id': 'tldrnewseu',
+            'uploader_url': r're:https://nebula\.(tv|app)/tldrnewseu',
+            'duration': 524,
+            'channel_url': r're:https://nebula\.(tv|app)/tldrnewseu',
+            'series': 'TLDR News EU',
+            'thumbnail': r're:https://\w+\.cloudfront\.net/[\w-]+',
+            'creator': 'TLDR News EU',
+            '_old_archive_ids': ['nebula 63f64c74366fcd00017c1513', 'nebulasubscriptions 63f64c74366fcd00017c1513'],
         },
-        {
-            'url': 'https://beta.nebula.tv/videos/money-episode-1-the-draw',
-            'only_matching': True,
-        },
-    ]
-
-    def _fetch_video_metadata(self, slug):
-        return self._call_nebula_api(f'https://content.api.nebula.app/video/{slug}/',
-                                     video_id=slug,
-                                     auth_type='bearer',
-                                     note='Fetching video meta data')
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        'url': 'https://beta.nebula.tv/videos/money-episode-1-the-draw',
+        'only_matching': True,
+    }]
 
     def _real_extract(self, url):
         slug = self._match_id(url)
-        video = self._fetch_video_metadata(slug)
-        return self._build_video_info(video)
+        url, smuggled_data = unsmuggle_url(url, {})
+        if smuggled_data.get('id'):
+            return {
+                'id': smuggled_data['id'],
+                'display_id': slug,
+                'title': '',
+                **self._extract_formats(smuggled_data['id'], slug),
+            }
+
+        metadata = self._call_api(
+            f'https://content.api.nebula.app/content/videos/{slug}',
+            slug, note='Fetching video metadata')
+        return {
+            **self._extract_video_metadata(metadata),
+            **self._extract_formats(metadata['id'], slug),
+        }
+
+
+class NebulaClassIE(NebulaBaseIE):
+    IE_NAME = 'nebula:media'
+    _VALID_URL = rf'{_BASE_URL_RE}/(?!(?:myshows|library|videos)/)(?P<id>[\w-]+)/(?P<ep>[\w-]+)/?(?:$|[?#])'
+    _TESTS = [{
+        'url': 'https://nebula.tv/copyright-for-fun-and-profit/14',
+        'info_dict': {
+            'id': 'd7432cdc-c608-474d-942c-f74345daed7b',
+            'ext': 'mp4',
+            'display_id': '14',
+            'channel_url': 'https://nebula.tv/copyright-for-fun-and-profit',
+            'episode_number': 14,
+            'thumbnail': 'https://dj423fildxgac.cloudfront.net/d533718d-9307-42d4-8fb0-e283285e99c9',
+            'uploader_url': 'https://nebula.tv/copyright-for-fun-and-profit',
+            'duration': 646,
+            'episode': 'Episode 14',
+            'title': 'Photos, Sculpture, and Video',
+        },
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        'url': 'https://nebula.tv/extremitiespodcast/pyramiden-the-high-arctic-soviet-ghost-town',
+        'info_dict': {
+            'ext': 'mp3',
+            'id': '018f65f0-0033-4021-8f87-2d132beb19aa',
+            'description': 'md5:05d2b23ab780c955e2511a2b9127acff',
+            'series_id': '335e8159-d663-491a-888f-1732285706ac',
+            'modified_timestamp': 1599091504,
+            'episode_id': '018f65f0-0033-4021-8f87-2d132beb19aa',
+            'series': 'Extremities',
+            'modified_date': '20200903',
+            'upload_date': '20200902',
+            'title': 'Pyramiden: The High-Arctic Soviet Ghost Town',
+            'release_timestamp': 1571237958,
+            'thumbnail': r're:^https?://content\.production\.cdn\.art19\.com.*\.jpeg$',
+            'duration': 1546.05714,
+            'timestamp': 1599085608,
+            'release_date': '20191016',
+        },
+    }, {
+        'url': 'https://nebula.tv/thelayover/the-layover-episode-1',
+        'info_dict': {
+            'ext': 'mp3',
+            'id': '9d74a762-00bb-45a8-9e8d-9ed47c04a1d0',
+            'episode_number': 1,
+            'thumbnail': r're:^https?://content\.production\.cdn\.art19\.com.*\.jpeg$',
+            'release_date': '20230304',
+            'modified_date': '20230403',
+            'series': 'The Layover',
+            'episode_id': '9d74a762-00bb-45a8-9e8d-9ed47c04a1d0',
+            'modified_timestamp': 1680554566,
+            'duration': 3130.46401,
+            'release_timestamp': 1677943800,
+            'title': 'The Layover — Episode 1',
+            'series_id': '874303a5-4900-4626-a4b6-2aacac34466a',
+            'upload_date': '20230303',
+            'episode': 'Episode 1',
+            'timestamp': 1677883672,
+            'description': 'md5:002cca89258e3bc7c268d5b8c24ba482',
+        },
+    }]
+
+    def _real_extract(self, url):
+        slug, episode = self._match_valid_url(url).group('id', 'ep')
+        url, smuggled_data = unsmuggle_url(url, {})
+        if smuggled_data.get('id'):
+            return {
+                'id': smuggled_data['id'],
+                'display_id': slug,
+                'title': '',
+                **self._extract_formats(smuggled_data['id'], slug),
+            }
+
+        metadata = self._call_api(
+            f'https://content.api.nebula.app/content/{slug}/{episode}/?include=lessons',
+            slug, note='Fetching class/podcast metadata')
+        content_type = metadata.get('type')
+        if content_type == 'lesson':
+            return {
+                **self._extract_video_metadata(metadata),
+                **self._extract_formats(metadata['id'], slug),
+            }
+        elif content_type == 'podcast_episode':
+            episode_url = metadata['episode_url']
+            if not episode_url and metadata.get('premium'):
+                self.raise_login_required()
+
+            if Art19IE.suitable(episode_url):
+                return self.url_result(episode_url, Art19IE)
+            return traverse_obj(metadata, {
+                'id': ('id', {str}),
+                'url': ('episode_url', {url_or_none}),
+                'title': ('title', {str}),
+                'description': ('description', {str}),
+                'timestamp': ('published_at', {parse_iso8601}),
+                'duration': ('duration', {int_or_none}),
+                'channel_id': ('channel_id', {str}),
+                'chnanel': ('channel_title', {str}),
+                'thumbnail': ('assets', 'regular', {url_or_none}),
+            })
+
+        raise ExtractorError(f'Unexpected content type {content_type!r}')
 
 
 class NebulaSubscriptionsIE(NebulaBaseIE):
     IE_NAME = 'nebula:subscriptions'
-    _VALID_URL = rf'{_BASE_URL_RE}/myshows'
-    _TESTS = [
-        {
-            'url': 'https://nebula.tv/myshows',
-            'playlist_mincount': 1,
-            'info_dict': {
-                'id': 'myshows',
-            },
+    _VALID_URL = rf'{_BASE_URL_RE}/(?P<id>myshows|library/latest-videos)/?(?:$|[?#])'
+    _TESTS = [{
+        'url': 'https://nebula.tv/myshows',
+        'playlist_mincount': 1,
+        'info_dict': {
+            'id': 'myshows',
         },
-    ]
+    }]
 
     def _generate_playlist_entries(self):
-        next_url = 'https://content.watchnebula.com/library/video/?page_size=100'
-        page_num = 1
-        while next_url:
-            channel = self._call_nebula_api(next_url, 'myshows', auth_type='bearer',
-                                            note=f'Retrieving subscriptions page {page_num}')
+        next_url = update_url_query('https://content.api.nebula.app/video_episodes/', {
+            'following': 'true',
+            'include': 'engagement',
+            'ordering': '-published_at',
+        })
+        for page_num in itertools.count(1):
+            channel = self._call_api(
+                next_url, 'myshows', note=f'Retrieving subscriptions page {page_num}')
             for episode in channel['results']:
-                yield self._build_video_info(episode)
-            next_url = channel['next']
-            page_num += 1
+                metadata = self._extract_video_metadata(episode)
+                yield self.url_result(smuggle_url(
+                    f'https://nebula.tv/videos/{metadata["display_id"]}',
+                    {'id': episode['id']}), NebulaIE, url_transparent=True, **metadata)
+            next_url = channel.get('next')
+            if not next_url:
+                return
 
     def _real_extract(self, url):
         return self.playlist_result(self._generate_playlist_entries(), 'myshows')
@@ -235,48 +374,95 @@ class NebulaSubscriptionsIE(NebulaBaseIE):
 
 class NebulaChannelIE(NebulaBaseIE):
     IE_NAME = 'nebula:channel'
-    _VALID_URL = rf'{_BASE_URL_RE}/(?!myshows|videos/)(?P<id>[-\w]+)'
-    _TESTS = [
-        {
-            'url': 'https://nebula.tv/tom-scott-presents-money',
-            'info_dict': {
-                'id': 'tom-scott-presents-money',
-                'title': 'Tom Scott Presents: Money',
-                'description': 'Tom Scott hosts a series all about trust, negotiation and money.',
-            },
-            'playlist_count': 5,
-        }, {
-            'url': 'https://nebula.tv/lindsayellis',
-            'info_dict': {
-                'id': 'lindsayellis',
-                'title': 'Lindsay Ellis',
-                'description': 'Enjoy these hottest of takes on Disney, Transformers, and Musicals.',
-            },
-            'playlist_mincount': 2,
+    _VALID_URL = rf'{_BASE_URL_RE}/(?!myshows|library|videos)(?P<id>[\w-]+)/?(?:$|[?#])'
+    _TESTS = [{
+        'url': 'https://nebula.tv/tom-scott-presents-money',
+        'info_dict': {
+            'id': 'tom-scott-presents-money',
+            'title': 'Tom Scott Presents: Money',
+            'description': 'Tom Scott hosts a series all about trust, negotiation and money.',
         },
-    ]
+        'playlist_count': 5,
+    }, {
+        'url': 'https://nebula.tv/lindsayellis',
+        'info_dict': {
+            'id': 'lindsayellis',
+            'title': 'Lindsay Ellis',
+            'description': 'Enjoy these hottest of takes on Disney, Transformers, and Musicals.',
+        },
+        'playlist_mincount': 2,
+    }, {
+        'url': 'https://nebula.tv/johnnyharris',
+        'info_dict': {
+            'id': 'johnnyharris',
+            'title': 'Johnny Harris',
+            'description': 'I make videos about maps and many other things.',
+        },
+        'playlist_mincount': 90,
+    }, {
+        'url': 'https://nebula.tv/copyright-for-fun-and-profit',
+        'info_dict': {
+            'id': 'copyright-for-fun-and-profit',
+            'title': 'Copyright for Fun and Profit',
+            'description': 'md5:6690248223eed044a9f11cd5a24f9742',
+        },
+        'playlist_count': 23,
+    }, {
+        'url': 'https://nebula.tv/trussissuespodcast',
+        'info_dict': {
+            'id': 'trussissuespodcast',
+            'title': 'The TLDR News Podcast',
+            'description': 'md5:a08c4483bc0b705881d3e0199e721385',
+        },
+        'playlist_mincount': 80,
+    }]
 
-    def _generate_playlist_entries(self, collection_id, channel):
-        episodes = channel['episodes']['results']
-        for page_num in itertools.count(2):
-            for episode in episodes:
-                yield self._build_video_info(episode)
-            next_url = channel['episodes']['next']
+    def _generate_playlist_entries(self, collection_id, collection_slug):
+        next_url = f'https://content.api.nebula.app/video_channels/{collection_id}/video_episodes/?ordering=-published_at'
+        for page_num in itertools.count(1):
+            episodes = self._call_api(next_url, collection_slug, note=f'Retrieving channel page {page_num}')
+            for episode in episodes['results']:
+                metadata = self._extract_video_metadata(episode)
+                yield self.url_result(smuggle_url(
+                    episode.get('share_url') or f'https://nebula.tv/videos/{metadata["display_id"]}',
+                    {'id': episode['id']}), NebulaIE, url_transparent=True, **metadata)
+            next_url = episodes.get('next')
+            if not next_url:
+                break
+
+    def _generate_class_entries(self, channel):
+        for lesson in channel['lessons']:
+            metadata = self._extract_video_metadata(lesson)
+            yield self.url_result(smuggle_url(
+                lesson.get('share_url') or f'https://nebula.tv/{metadata["class_slug"]}/{metadata["slug"]}',
+                {'id': lesson['id']}), NebulaClassIE, url_transparent=True, **metadata)
+
+    def _generate_podcast_entries(self, collection_id, collection_slug):
+        next_url = f'https://content.api.nebula.app/podcast_channels/{collection_id}/podcast_episodes/?ordering=-published_at&premium=true'
+        for page_num in itertools.count(1):
+            episodes = self._call_api(next_url, collection_slug, note=f'Retrieving podcast page {page_num}')
+
+            for episode in traverse_obj(episodes, ('results', lambda _, v: url_or_none(v['share_url']))):
+                yield self.url_result(episode['share_url'], NebulaClassIE)
+            next_url = episodes.get('next')
             if not next_url:
                 break
-            channel = self._call_nebula_api(next_url, collection_id, auth_type='bearer',
-                                            note=f'Retrieving channel page {page_num}')
-            episodes = channel['episodes']['results']
 
     def _real_extract(self, url):
-        collection_id = self._match_id(url)
-        channel_url = f'https://content.watchnebula.com/video/channels/{collection_id}/'
-        channel = self._call_nebula_api(channel_url, collection_id, auth_type='bearer', note='Retrieving channel')
-        channel_details = channel['details']
+        collection_slug = self._match_id(url)
+        channel = self._call_api(
+            f'https://content.api.nebula.app/content/{collection_slug}/?include=lessons',
+            collection_slug, note='Retrieving channel')
+
+        if channel.get('type') == 'class':
+            entries = self._generate_class_entries(channel)
+        elif channel.get('type') == 'podcast_channel':
+            entries = self._generate_podcast_entries(channel['id'], collection_slug)
+        else:
+            entries = self._generate_playlist_entries(channel['id'], collection_slug)
 
         return self.playlist_result(
-            entries=self._generate_playlist_entries(collection_id, channel),
-            playlist_id=collection_id,
-            playlist_title=channel_details['title'],
-            playlist_description=channel_details['description']
-        )
+            entries=entries,
+            playlist_id=collection_slug,
+            playlist_title=channel.get('title'),
+            playlist_description=channel.get('description'))
diff --git a/plugins/youtube_download/yt_dlp/extractor/nekohacker.py b/plugins/youtube_download/yt_dlp/extractor/nekohacker.py
index e10ffe9..7168a20 100644
--- a/plugins/youtube_download/yt_dlp/extractor/nekohacker.py
+++ b/plugins/youtube_download/yt_dlp/extractor/nekohacker.py
@@ -6,12 +6,10 @@ from ..utils import (
     determine_ext,
     extract_attributes,
     get_element_by_class,
-    get_element_text_and_html_by_tag,
     parse_duration,
-    traverse_obj,
-    try_call,
     url_or_none,
 )
+from ..utils.traversal import find_element, traverse_obj
 
 
 class NekoHackerIE(InfoExtractor):
@@ -35,11 +33,11 @@ class NekoHackerIE(InfoExtractor):
                     'acodec': 'mp3',
                     'release_date': '20221101',
                     'album': 'Nekoverse',
-                    'artist': 'Neko Hacker',
+                    'artists': ['Neko Hacker'],
                     'track': 'Spaceship',
                     'track_number': 1,
-                    'duration': 195.0
-                }
+                    'duration': 195.0,
+                },
             },
             {
                 'url': 'https://nekohacker.com/wp-content/uploads/2022/11/02-City-Runner.mp3',
@@ -53,11 +51,11 @@ class NekoHackerIE(InfoExtractor):
                     'acodec': 'mp3',
                     'release_date': '20221101',
                     'album': 'Nekoverse',
-                    'artist': 'Neko Hacker',
+                    'artists': ['Neko Hacker'],
                     'track': 'City Runner',
                     'track_number': 2,
-                    'duration': 148.0
-                }
+                    'duration': 148.0,
+                },
             },
             {
                 'url': 'https://nekohacker.com/wp-content/uploads/2022/11/03-Nature-Talk.mp3',
@@ -71,11 +69,11 @@ class NekoHackerIE(InfoExtractor):
                     'acodec': 'mp3',
                     'release_date': '20221101',
                     'album': 'Nekoverse',
-                    'artist': 'Neko Hacker',
+                    'artists': ['Neko Hacker'],
                     'track': 'Nature Talk',
                     'track_number': 3,
-                    'duration': 174.0
-                }
+                    'duration': 174.0,
+                },
             },
             {
                 'url': 'https://nekohacker.com/wp-content/uploads/2022/11/04-Crystal-World.mp3',
@@ -89,13 +87,13 @@ class NekoHackerIE(InfoExtractor):
                     'acodec': 'mp3',
                     'release_date': '20221101',
                     'album': 'Nekoverse',
-                    'artist': 'Neko Hacker',
+                    'artists': ['Neko Hacker'],
                     'track': 'Crystal World',
                     'track_number': 4,
-                    'duration': 199.0
-                }
-            }
-        ]
+                    'duration': 199.0,
+                },
+            },
+        ],
     }, {
         'url': 'https://nekohacker.com/susume/',
         'info_dict': {
@@ -115,11 +113,10 @@ class NekoHackerIE(InfoExtractor):
                     'acodec': 'mp3',
                     'release_date': '20210115',
                     'album': '進め！むじなカンパニー',
-                    'artist': 'Neko Hacker',
+                    'artists': ['Neko Hacker'],
                     'track': 'md5:1a5fcbc96ca3c3265b1c6f9f79f30fd0',
                     'track_number': 1,
-                    'duration': None
-                }
+                },
             },
             {
                 'url': 'https://nekohacker.com/wp-content/uploads/2021/01/むじな-de-なじむ-feat.-六科なじむ-CV_-日高里菜-.mp3',
@@ -133,11 +130,10 @@ class NekoHackerIE(InfoExtractor):
                     'acodec': 'mp3',
                     'release_date': '20210115',
                     'album': '進め！むじなカンパニー',
-                    'artist': 'Neko Hacker',
+                    'artists': ['Neko Hacker'],
                     'track': 'むじな de なじむ feat. 六科なじむ (CV: 日高里菜 )',
                     'track_number': 2,
-                    'duration': None
-                }
+                },
             },
             {
                 'url': 'https://nekohacker.com/wp-content/uploads/2021/01/進め！むじなカンパニー-instrumental.mp3',
@@ -151,11 +147,10 @@ class NekoHackerIE(InfoExtractor):
                     'acodec': 'mp3',
                     'release_date': '20210115',
                     'album': '進め！むじなカンパニー',
-                    'artist': 'Neko Hacker',
+                    'artists': ['Neko Hacker'],
                     'track': '進め！むじなカンパニー (instrumental)',
                     'track_number': 3,
-                    'duration': None
-                }
+                },
             },
             {
                 'url': 'https://nekohacker.com/wp-content/uploads/2021/01/むじな-de-なじむ-instrumental.mp3',
@@ -169,13 +164,12 @@ class NekoHackerIE(InfoExtractor):
                     'acodec': 'mp3',
                     'release_date': '20210115',
                     'album': '進め！むじなカンパニー',
-                    'artist': 'Neko Hacker',
+                    'artists': ['Neko Hacker'],
                     'track': 'むじな de なじむ (instrumental)',
                     'track_number': 4,
-                    'duration': None
-                }
-            }
-        ]
+                },
+            },
+        ],
     }]
 
     def _real_extract(self, url):
@@ -185,14 +179,17 @@ class NekoHackerIE(InfoExtractor):
         playlist = get_element_by_class('playlist', webpage)
 
         if not playlist:
-            iframe = try_call(lambda: get_element_text_and_html_by_tag('iframe', webpage)[1]) or ''
-            iframe_src = url_or_none(extract_attributes(iframe).get('src'))
+            iframe_src = traverse_obj(webpage, (
+                {find_element(tag='iframe', html=True)}, {extract_attributes}, 'src', {url_or_none}))
             if not iframe_src:
                 raise ExtractorError('No playlist or embed found in webpage')
             elif re.match(r'https?://(?:\w+\.)?spotify\.com/', iframe_src):
                 raise ExtractorError('Spotify embeds are not supported', expected=True)
             return self.url_result(url, 'Generic')
 
+        player_params = self._search_json(
+            r'var srp_player_params_[\da-f]+\s*=', webpage, 'player params', playlist_id, default={})
+
         entries = []
         for track_number, track in enumerate(re.findall(r'(<li[^>]+data-audiopath[^>]+>)', playlist), 1):
             entry = traverse_obj(extract_attributes(track), {
@@ -204,12 +201,12 @@ class NekoHackerIE(InfoExtractor):
                 'album': 'data-albumtitle',
                 'duration': ('data-tracktime', {parse_duration}),
                 'release_date': ('data-releasedate', {lambda x: re.match(r'\d{8}', x.replace('.', ''))}, 0),
-                'thumbnail': ('data-albumart', {url_or_none}),
             })
             entries.append({
                 **entry,
+                'thumbnail': url_or_none(player_params.get('artwork')),
                 'track_number': track_number,
-                'artist': 'Neko Hacker',
+                'artists': ['Neko Hacker'],
                 'vcodec': 'none',
                 'acodec': 'mp3' if entry['ext'] == 'mp3' else None,
             })
diff --git a/plugins/youtube_download/yt_dlp/extractor/nerdcubed.py b/plugins/youtube_download/yt_dlp/extractor/nerdcubed.py
index 7c801b5..5f5607a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/nerdcubed.py
+++ b/plugins/youtube_download/yt_dlp/extractor/nerdcubed.py
@@ -1,33 +1,38 @@
-import datetime
-
 from .common import InfoExtractor
+from .youtube import YoutubeIE
+from ..utils import parse_iso8601, url_or_none
+from ..utils.traversal import traverse_obj
 
 
 class NerdCubedFeedIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?nerdcubed\.co\.uk/feed\.json'
+    _VALID_URL = r'https?://(?:www\.)?nerdcubed\.co\.uk/?(?:$|[#?])'
     _TEST = {
-        'url': 'http://www.nerdcubed.co.uk/feed.json',
+        'url': 'http://www.nerdcubed.co.uk/',
         'info_dict': {
             'id': 'nerdcubed-feed',
             'title': 'nerdcubed.co.uk feed',
         },
-        'playlist_mincount': 1300,
+        'playlist_mincount': 5500,
     }
 
+    def _extract_video(self, feed_entry):
+        return self.url_result(
+            f'https://www.youtube.com/watch?v={feed_entry["id"]}', YoutubeIE,
+            **traverse_obj(feed_entry, {
+                'id': ('id', {str}),
+                'title': ('title', {str}),
+                'description': ('description', {str}),
+                'timestamp': ('publishedAt', {parse_iso8601}),
+                'channel': ('source', 'name', {str}),
+                'channel_id': ('source', 'id', {str}),
+                'channel_url': ('source', 'url', {str}),
+                'thumbnail': ('thumbnail', 'source', {url_or_none}),
+            }), url_transparent=True)
+
     def _real_extract(self, url):
-        feed = self._download_json(url, url, 'Downloading NerdCubed JSON feed')
+        video_id = 'nerdcubed-feed'
+        feed = self._download_json('https://www.nerdcubed.co.uk/_/cdn/videos.json', video_id)
 
-        entries = [{
-            '_type': 'url',
-            'title': feed_entry['title'],
-            'uploader': feed_entry['source']['name'] if feed_entry['source'] else None,
-            'upload_date': datetime.datetime.strptime(feed_entry['date'], '%Y-%m-%d').strftime('%Y%m%d'),
-            'url': 'http://www.youtube.com/watch?v=' + feed_entry['youtube_id'],
-        } for feed_entry in feed]
-
-        return {
-            '_type': 'playlist',
-            'title': 'nerdcubed.co.uk feed',
-            'id': 'nerdcubed-feed',
-            'entries': entries,
-        }
+        return self.playlist_result(
+            map(self._extract_video, traverse_obj(feed, ('videos', lambda _, v: v['id']))),
+            video_id, 'nerdcubed.co.uk feed')
diff --git a/plugins/youtube_download/yt_dlp/extractor/nest.py b/plugins/youtube_download/yt_dlp/extractor/nest.py
new file mode 100644
index 0000000..3f8316b
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/nest.py
@@ -0,0 +1,117 @@
+from .common import InfoExtractor
+from ..utils import ExtractorError, float_or_none, update_url_query, url_or_none
+from ..utils.traversal import traverse_obj
+
+
+class NestIE(InfoExtractor):
+    _VALID_URL = r'https?://video\.nest\.com/(?:embedded/)?live/(?P<id>\w+)'
+    _EMBED_REGEX = [rf'<iframe [^>]*\bsrc=[\'"](?P<url>{_VALID_URL})']
+    _TESTS = [{
+        'url': 'https://video.nest.com/embedded/live/4fvYdSo8AX?autoplay=0',
+        'info_dict': {
+            'id': '4fvYdSo8AX',
+            'ext': 'mp4',
+            'title': 'startswith:Outside ',
+            'alt_title': 'Outside',
+            'description': '<null>',
+            'location': 'Los Angeles',
+            'availability': 'public',
+            'thumbnail': r're:https?://',
+            'live_status': 'is_live',
+        },
+        'params': {
+            # m3u8 download
+            'skip_download': True,
+        },
+    }, {
+        'url': 'https://video.nest.com/live/4fvYdSo8AX',
+        'only_matching': True,
+    }]
+    _WEBPAGE_TESTS = [{
+        'url': 'https://www.pacificblue.biz/noyo-harbor-webcam/',
+        'info_dict': {
+            'id': '4fvYdSo8AX',
+            'ext': 'mp4',
+            'title': 'startswith:Outside ',
+            'alt_title': 'Outside',
+            'description': '<null>',
+            'location': 'Los Angeles',
+            'availability': 'public',
+            'thumbnail': r're:https?://',
+            'live_status': 'is_live',
+        },
+        'params': {
+            # m3u8 download
+            'skip_download': True,
+        },
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        item = self._download_json(
+            'https://video.nest.com/api/dropcam/cameras.get_by_public_token',
+            video_id, query={'token': video_id})['items'][0]
+        uuid = item.get('uuid')
+        stream_domain = item.get('live_stream_host')
+        if not stream_domain or not uuid:
+            raise ExtractorError('Unable to construct playlist URL')
+
+        thumb_domain = item.get('nexus_api_nest_domain_host')
+        return {
+            'id': video_id,
+            **traverse_obj(item, {
+                'description': ('description', {str}),
+                'title': (('title', 'name', 'where'), {str}, filter, any),
+                'alt_title': ('name', {str}),
+                'location': ((('timezone', {lambda x: x.split('/')[1].replace('_', ' ')}), 'where'), {str}, filter, any),
+            }),
+            'thumbnail': update_url_query(
+                f'https://{thumb_domain}/get_image',
+                {'uuid': uuid, 'public': video_id}) if thumb_domain else None,
+            'availability': self._availability(is_private=item.get('is_public') is False),
+            'formats': self._extract_m3u8_formats(
+                f'https://{stream_domain}/nexus_aac/{uuid}/playlist.m3u8',
+                video_id, 'mp4', live=True, query={'public': video_id}),
+            'is_live': True,
+        }
+
+
+class NestClipIE(InfoExtractor):
+    _VALID_URL = r'https?://video\.nest\.com/(?:embedded/)?clip/(?P<id>\w+)'
+    _EMBED_REGEX = [rf'<iframe [^>]*\bsrc=[\'"](?P<url>{_VALID_URL})']
+    _TESTS = [{
+        'url': 'https://video.nest.com/clip/f34c9dd237a44eca9a0001af685e3dff',
+        'info_dict': {
+            'id': 'f34c9dd237a44eca9a0001af685e3dff',
+            'ext': 'mp4',
+            'title': 'NestClip video #f34c9dd237a44eca9a0001af685e3dff',
+            'thumbnail': 'https://clips.dropcam.com/f34c9dd237a44eca9a0001af685e3dff.jpg',
+            'timestamp': 1735413474.468,
+            'upload_date': '20241228',
+        },
+    }, {
+        'url': 'https://video.nest.com/embedded/clip/34e0432adc3c46a98529443d8ad5aa76',
+        'info_dict': {
+            'id': '34e0432adc3c46a98529443d8ad5aa76',
+            'ext': 'mp4',
+            'title': 'Shootout at Veterans Boulevard at Fleur De Lis Drive',
+            'thumbnail': 'https://clips.dropcam.com/34e0432adc3c46a98529443d8ad5aa76.jpg',
+            'upload_date': '20230817',
+            'timestamp': 1692262897.191,
+        },
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        data = self._download_json(
+            'https://video.nest.com/api/dropcam/videos.get_by_filename', video_id,
+            query={'filename': f'{video_id}.mp4'})
+        return {
+            'id': video_id,
+            **traverse_obj(data, ('items', 0, {
+                'title': ('title', {str}),
+                'thumbnail': ('thumbnail_url', {url_or_none}),
+                'url': ('download_url', {url_or_none}),
+                'timestamp': ('start_time', {float_or_none}),
+            })),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/neteasemusic.py b/plugins/youtube_download/yt_dlp/extractor/neteasemusic.py
index 5b7307b..900b8b2 100644
--- a/plugins/youtube_download/yt_dlp/extractor/neteasemusic.py
+++ b/plugins/youtube_download/yt_dlp/extractor/neteasemusic.py
@@ -1,184 +1,211 @@
+import hashlib
 import itertools
 import json
+import random
 import re
 import time
-from base64 import b64encode
-from binascii import hexlify
-from datetime import datetime
-from hashlib import md5
-from random import randint
 
 from .common import InfoExtractor
 from ..aes import aes_ecb_encrypt, pkcs7_padding
-from ..compat import compat_urllib_parse_urlencode
-from ..networking import Request
 from ..utils import (
     ExtractorError,
-    bytes_to_intlist,
-    error_to_compat_str,
-    float_or_none,
     int_or_none,
-    intlist_to_bytes,
-    try_get,
+    join_nonempty,
+    str_or_none,
+    strftime_or_none,
+    traverse_obj,
+    unified_strdate,
+    url_or_none,
+    urljoin,
+    variadic,
 )
 
 
 class NetEaseMusicBaseIE(InfoExtractor):
-    _FORMATS = ['bMusic', 'mMusic', 'hMusic']
-    _NETEASE_SALT = '3go8&$8*3*3h0k(2)2'
+    # XXX: _extract_formats logic depends on the order of the levels in each tier
+    _LEVELS = (
+        'standard',  # free tier; 标准; 128kbps mp3 or aac
+        'higher',    # free tier; 192kbps mp3 or aac
+        'exhigh',    # free tier; 极高 (HQ); 320kbps mp3 or aac
+        'lossless',  # VIP  tier; 无损 (SQ); 48kHz/16bit flac
+        'hires',     # VIP  tier; 高解析度无损 (Hi-Res); 192kHz/24bit flac
+        'jyeffect',  # VIP  tier; 高清臻音 (Spatial Audio); 96kHz/24bit flac
+        'jymaster',  # SVIP tier; 超清母带 (Master); 192kHz/24bit flac
+        'sky',       # SVIP tier; 沉浸环绕声 (Surround Audio); flac
+    )
     _API_BASE = 'http://music.163.com/api/'
+    _GEO_BYPASS = False
 
-    @classmethod
-    def _encrypt(cls, dfsid):
-        salt_bytes = bytearray(cls._NETEASE_SALT.encode('utf-8'))
-        string_bytes = bytearray(str(dfsid).encode('ascii'))
-        salt_len = len(salt_bytes)
-        for i in range(len(string_bytes)):
-            string_bytes[i] = string_bytes[i] ^ salt_bytes[i % salt_len]
-        m = md5()
-        m.update(bytes(string_bytes))
-        result = b64encode(m.digest()).decode('ascii')
-        return result.replace('/', '_').replace('+', '-')
+    def _create_eapi_cipher(self, api_path, query_body, cookies):
+        request_text = json.dumps({**query_body, 'header': cookies}, separators=(',', ':'))
 
-    def make_player_api_request_data_and_headers(self, song_id, bitrate):
-        KEY = b'e82ckenh8dichen8'
-        URL = '/api/song/enhance/player/url'
-        now = int(time.time() * 1000)
-        rand = randint(0, 1000)
-        cookie = {
-            'osver': None,
-            'deviceId': None,
+        message = f'nobody{api_path}use{request_text}md5forencrypt'.encode('latin1')
+        msg_digest = hashlib.md5(message).hexdigest()
+
+        data = pkcs7_padding(list(str.encode(
+            f'{api_path}-36cd479b6b5-{request_text}-36cd479b6b5-{msg_digest}')))
+        encrypted = bytes(aes_ecb_encrypt(data, list(b'e82ckenh8dichen8')))
+        return f'params={encrypted.hex().upper()}'.encode()
+
+    def _download_eapi_json(self, path, video_id, query_body, headers={}, **kwargs):
+        cookies = {
+            'osver': 'undefined',
+            'deviceId': 'undefined',
             'appver': '8.0.0',
             'versioncode': '140',
-            'mobilename': None,
+            'mobilename': 'undefined',
             'buildver': '1623435496',
             'resolution': '1920x1080',
             '__csrf': '',
             'os': 'pc',
-            'channel': None,
-            'requestId': '{0}_{1:04}'.format(now, rand),
+            'channel': 'undefined',
+            'requestId': f'{int(time.time() * 1000)}_{random.randint(0, 1000):04}',
+            **traverse_obj(self._get_cookies(self._API_BASE), {
+                'MUSIC_U': ('MUSIC_U', {lambda i: i.value}),
+            }),
         }
-        request_text = json.dumps(
-            {'ids': '[{0}]'.format(song_id), 'br': bitrate, 'header': cookie},
-            separators=(',', ':'))
-        message = 'nobody{0}use{1}md5forencrypt'.format(
-            URL, request_text).encode('latin1')
-        msg_digest = md5(message).hexdigest()
+        return self._download_json(
+            urljoin('https://interface3.music.163.com/', f'/eapi{path}'), video_id,
+            data=self._create_eapi_cipher(f'/api{path}', query_body, cookies), headers={
+                'Referer': 'https://music.163.com',
+                'Cookie': '; '.join([f'{k}={v}' for k, v in cookies.items()]),
+                **headers,
+            }, **kwargs)
 
-        data = '{0}-36cd479b6b5-{1}-36cd479b6b5-{2}'.format(
-            URL, request_text, msg_digest)
-        data = pkcs7_padding(bytes_to_intlist(data))
-        encrypted = intlist_to_bytes(aes_ecb_encrypt(data, bytes_to_intlist(KEY)))
-        encrypted_params = hexlify(encrypted).decode('ascii').upper()
+    def _call_player_api(self, song_id, level):
+        return self._download_eapi_json(
+            '/song/enhance/player/url/v1', song_id,
+            {'ids': f'[{song_id}]', 'level': level, 'encodeType': 'flac'},
+            note=f'Downloading song URL info: level {level}')
 
-        cookie = '; '.join(
-            ['{0}={1}'.format(k, v if v is not None else 'undefined')
-             for [k, v] in cookie.items()])
-
-        headers = {
-            'User-Agent': self.extractor.get_param('http_headers')['User-Agent'],
-            'Content-Type': 'application/x-www-form-urlencoded',
-            'Referer': 'https://music.163.com',
-            'Cookie': cookie,
-        }
-        return ('params={0}'.format(encrypted_params), headers)
-
-    def _call_player_api(self, song_id, bitrate):
-        url = 'https://interface3.music.163.com/eapi/song/enhance/player/url'
-        data, headers = self.make_player_api_request_data_and_headers(song_id, bitrate)
-        try:
-            msg = 'empty result'
-            result = self._download_json(
-                url, song_id, data=data.encode('ascii'), headers=headers)
-            if result:
-                return result
-        except ExtractorError as e:
-            if type(e.cause) in (ValueError, TypeError):
-                # JSON load failure
-                raise
-        except Exception as e:
-            msg = error_to_compat_str(e)
-            self.report_warning('%s API call (%s) failed: %s' % (
-                song_id, bitrate, msg))
-        return {}
-
-    def extract_formats(self, info):
-        err = 0
+    def _extract_formats(self, info):
         formats = []
         song_id = info['id']
-        for song_format in self._FORMATS:
-            details = info.get(song_format)
-            if not details:
+        for level in self._LEVELS:
+            song = traverse_obj(
+                self._call_player_api(song_id, level), ('data', lambda _, v: url_or_none(v['url']), any))
+            if not song:
+                break  # Media is not available due to removal or geo-restriction
+            actual_level = song.get('level')
+            if actual_level and actual_level != level:
+                if level in ('lossless', 'jymaster'):
+                    break  # We've already extracted the highest level of the user's account tier
                 continue
-
-            bitrate = int_or_none(details.get('bitrate')) or 999000
-            data = self._call_player_api(song_id, bitrate)
-            for song in try_get(data, lambda x: x['data'], list) or []:
-                song_url = try_get(song, lambda x: x['url'])
-                if not song_url:
-                    continue
-                if self._is_valid_url(song_url, info['id'], 'song'):
-                    formats.append({
-                        'url': song_url,
-                        'ext': details.get('extension'),
-                        'abr': float_or_none(song.get('br'), scale=1000),
-                        'format_id': song_format,
-                        'filesize': int_or_none(song.get('size')),
-                        'asr': int_or_none(details.get('sr')),
-                    })
-                elif err == 0:
-                    err = try_get(song, lambda x: x['code'], int)
-
+            formats.append({
+                'url': song['url'],
+                'format_id': level,
+                'vcodec': 'none',
+                **traverse_obj(song, {
+                    'ext': ('type', {str}),
+                    'abr': ('br', {int_or_none(scale=1000)}),
+                    'filesize': ('size', {int_or_none}),
+                }),
+            })
+            if not actual_level:
+                break  # Only 1 level is available if API does not return a value (netease:program)
         if not formats:
-            msg = 'No media links found'
-            if err != 0 and (err < 200 or err >= 400):
-                raise ExtractorError(
-                    '%s (site code %d)' % (msg, err, ), expected=True)
-            else:
-                self.raise_geo_restricted(
-                    msg + ': probably this video is not available from your location due to geo restriction.',
-                    countries=['CN'])
-
+            self.raise_geo_restricted(
+                'No media links found; possibly due to geo restriction', countries=['CN'])
         return formats
 
-    @classmethod
-    def convert_milliseconds(cls, ms):
-        return int(round(ms / 1000.0))
+    def _query_api(self, endpoint, video_id, note):
+        result = self._download_json(
+            f'{self._API_BASE}{endpoint}', video_id, note, headers={'Referer': self._API_BASE})
+        code = traverse_obj(result, ('code', {int}))
+        message = traverse_obj(result, ('message', {str})) or ''
+        if code == -462:
+            self.raise_login_required(f'Login required to download: {message}')
+        elif code != 200:
+            raise ExtractorError(f'Failed to get meta info: {code} {message}')
+        return result
 
-    def query_api(self, endpoint, video_id, note):
-        req = Request('%s%s' % (self._API_BASE, endpoint))
-        req.headers['Referer'] = self._API_BASE
-        return self._download_json(req, video_id, note)
+    def _get_entries(self, songs_data, entry_keys=None, id_key='id', name_key='name'):
+        for song in traverse_obj(songs_data, (
+                *variadic(entry_keys, (str, bytes, dict, set)),
+                lambda _, v: int_or_none(v[id_key]) is not None)):
+            song_id = str(song[id_key])
+            yield self.url_result(
+                f'http://music.163.com/#/song?id={song_id}', NetEaseMusicIE,
+                song_id, traverse_obj(song, (name_key, {str})))
 
 
 class NetEaseMusicIE(NetEaseMusicBaseIE):
     IE_NAME = 'netease:song'
     IE_DESC = '网易云音乐'
-    _VALID_URL = r'https?://(y\.)?music\.163\.com/(?:[#m]/)?song\?.*?\bid=(?P<id>[0-9]+)'
+    _VALID_URL = r'https?://(?:y\.)?music\.163\.com/(?:[#m]/)?song\?.*?\bid=(?P<id>[0-9]+)'
     _TESTS = [{
+        'url': 'https://music.163.com/#/song?id=550136151',
+        'info_dict': {
+            'id': '550136151',
+            'ext': 'mp3',
+            'title': 'It\'s Ok (Live)',
+            'creators': 'count:10',
+            'timestamp': 1522944000,
+            'upload_date': '20180405',
+            'description': 'md5:9fd07059c2ccee3950dc8363429a3135',
+            'duration': 197,
+            'thumbnail': r're:^http.*\.jpg',
+            'album': '偶像练习生 表演曲目合集',
+            'average_rating': int,
+            'album_artists': ['偶像练习生'],
+        },
+    }, {
+        'url': 'http://music.163.com/song?id=17241424',
+        'info_dict': {
+            'id': '17241424',
+            'ext': 'mp3',
+            'title': 'Opus 28',
+            'upload_date': '20080211',
+            'timestamp': 1202745600,
+            'duration': 263,
+            'thumbnail': r're:^http.*\.jpg',
+            'album': 'Piano Solos Vol. 2',
+            'album_artist': 'Dustin O\'Halloran',
+            'average_rating': int,
+            'description': '[00:05.00]纯音乐，请欣赏\n',
+            'album_artists': ['Dustin O\'Halloran'],
+            'creators': ['Dustin O\'Halloran'],
+            'subtitles': {'lyrics': [{'ext': 'lrc'}]},
+        },
+    }, {
+        'url': 'https://y.music.163.com/m/song?app_version=8.8.45&id=95670&uct2=sKnvS4+0YStsWkqsPhFijw%3D%3D&dlt=0846',
+        'md5': 'b896be78d8d34bd7bb665b26710913ff',
+        'info_dict': {
+            'id': '95670',
+            'ext': 'mp3',
+            'title': '国际歌',
+            'upload_date': '19911130',
+            'timestamp': 691516800,
+            'description': 'md5:1ba2f911a2b0aa398479f595224f2141',
+            'subtitles': {'lyrics': [{'ext': 'lrc'}]},
+            'duration': 268,
+            'alt_title': '伴唱:现代人乐队 合唱:总政歌舞团',
+            'thumbnail': r're:^http.*\.jpg',
+            'average_rating': int,
+            'album': '红色摇滚',
+            'album_artist': '侯牧人',
+            'creators': ['马备'],
+            'album_artists': ['侯牧人'],
+        },
+    }, {
         'url': 'http://music.163.com/#/song?id=32102397',
         'md5': '3e909614ce09b1ccef4a3eb205441190',
         'info_dict': {
             'id': '32102397',
             'ext': 'mp3',
             'title': 'Bad Blood',
-            'creator': 'Taylor Swift / Kendrick Lamar',
+            'creators': ['Taylor Swift', 'Kendrick Lamar'],
             'upload_date': '20150516',
             'timestamp': 1431792000,
-            'description': 'md5:25fc5f27e47aad975aa6d36382c7833c',
-        },
-    }, {
-        'note': 'No lyrics.',
-        'url': 'http://music.163.com/song?id=17241424',
-        'info_dict': {
-            'id': '17241424',
-            'ext': 'mp3',
-            'title': 'Opus 28',
-            'creator': 'Dustin O\'Halloran',
-            'upload_date': '20080211',
-            'description': 'md5:f12945b0f6e0365e3b73c5032e1b0ff4',
-            'timestamp': 1202745600,
+            'description': 'md5:21535156efb73d6d1c355f95616e285a',
+            'subtitles': {'lyrics': [{'ext': 'lrc'}]},
+            'duration': 199,
+            'thumbnail': r're:^http.*\.jpg',
+            'album': 'Bad Blood',
+            'average_rating': int,
+            'album_artist': 'Taylor Swift',
         },
+        'skip': 'Blocked outside Mainland China',
     }, {
         'note': 'Has translated name.',
         'url': 'http://music.163.com/#/song?id=22735043',
@@ -186,123 +213,136 @@ class NetEaseMusicIE(NetEaseMusicBaseIE):
             'id': '22735043',
             'ext': 'mp3',
             'title': '소원을 말해봐 (Genie)',
-            'creator': '少女时代',
-            'description': 'md5:79d99cc560e4ca97e0c4d86800ee4184',
+            'creators': ['少女时代'],
             'upload_date': '20100127',
             'timestamp': 1264608000,
+            'description': 'md5:03d1ffebec3139aa4bafe302369269c5',
+            'subtitles': {'lyrics': [{'ext': 'lrc'}]},
+            'duration': 229,
             'alt_title': '说出愿望吧(Genie)',
+            'thumbnail': r're:^http.*\.jpg',
+            'average_rating': int,
+            'album': 'Oh!',
+            'album_artist': '少女时代',
         },
-    }, {
-        'url': 'https://y.music.163.com/m/song?app_version=8.8.45&id=95670&uct2=sKnvS4+0YStsWkqsPhFijw%3D%3D&dlt=0846',
-        'md5': '95826c73ea50b1c288b22180ec9e754d',
-        'info_dict': {
-            'id': '95670',
-            'ext': 'mp3',
-            'title': '国际歌',
-            'creator': '马备',
-            'upload_date': '19911130',
-            'timestamp': 691516800,
-            'description': 'md5:1ba2f911a2b0aa398479f595224f2141',
-        },
+        'skip': 'Blocked outside Mainland China',
     }]
 
     def _process_lyrics(self, lyrics_info):
-        original = lyrics_info.get('lrc', {}).get('lyric')
-        translated = lyrics_info.get('tlyric', {}).get('lyric')
+        original = traverse_obj(lyrics_info, ('lrc', 'lyric', {str}))
+        translated = traverse_obj(lyrics_info, ('tlyric', 'lyric', {str}))
+
+        if not original or original == '[99:00.00]纯音乐，请欣赏\n':
+            return None
 
         if not translated:
-            return original
+            return {
+                'lyrics': [{'data': original, 'ext': 'lrc'}],
+            }
 
         lyrics_expr = r'(\[[0-9]{2}:[0-9]{2}\.[0-9]{2,}\])([^\n]+)'
         original_ts_texts = re.findall(lyrics_expr, original)
-        translation_ts_dict = dict(
-            (time_stamp, text) for time_stamp, text in re.findall(lyrics_expr, translated)
-        )
-        lyrics = '\n'.join([
-            '%s%s / %s' % (time_stamp, text, translation_ts_dict.get(time_stamp, ''))
-            for time_stamp, text in original_ts_texts
-        ])
-        return lyrics
+        translation_ts_dict = dict(re.findall(lyrics_expr, translated))
+
+        merged = '\n'.join(
+            join_nonempty(f'{timestamp}{text}', translation_ts_dict.get(timestamp, ''), delim=' / ')
+            for timestamp, text in original_ts_texts)
+
+        return {
+            'lyrics_merged': [{'data': merged, 'ext': 'lrc'}],
+            'lyrics': [{'data': original, 'ext': 'lrc'}],
+            'lyrics_translated': [{'data': translated, 'ext': 'lrc'}],
+        }
 
     def _real_extract(self, url):
         song_id = self._match_id(url)
 
-        params = {
-            'id': song_id,
-            'ids': '[%s]' % song_id
-        }
-        info = self.query_api(
-            'song/detail?' + compat_urllib_parse_urlencode(params),
-            song_id, 'Downloading song info')['songs'][0]
+        info = self._query_api(
+            f'song/detail?id={song_id}&ids=%5B{song_id}%5D', song_id, 'Downloading song info')['songs'][0]
 
-        formats = self.extract_formats(info)
+        formats = self._extract_formats(info)
 
-        lyrics_info = self.query_api(
-            'song/lyric?id=%s&lv=-1&tv=-1' % song_id,
-            song_id, 'Downloading lyrics data')
-        lyrics = self._process_lyrics(lyrics_info)
-
-        alt_title = None
-        if info.get('transNames'):
-            alt_title = '/'.join(info.get('transNames'))
+        lyrics = self._process_lyrics(self._query_api(
+            f'song/lyric?id={song_id}&lv=-1&tv=-1', song_id, 'Downloading lyrics data'))
+        lyric_data = {
+            'description': traverse_obj(lyrics, (('lyrics_merged', 'lyrics'), 0, 'data'), get_all=False),
+            'subtitles': lyrics,
+        } if lyrics else {}
 
         return {
             'id': song_id,
-            'title': info['name'],
-            'alt_title': alt_title,
-            'creator': ' / '.join([artist['name'] for artist in info.get('artists', [])]),
-            'timestamp': self.convert_milliseconds(info.get('album', {}).get('publishTime')),
-            'thumbnail': info.get('album', {}).get('picUrl'),
-            'duration': self.convert_milliseconds(info.get('duration', 0)),
-            'description': lyrics,
             'formats': formats,
+            'alt_title': '/'.join(traverse_obj(info, (('transNames', 'alias'), ...))) or None,
+            'creators': traverse_obj(info, ('artists', ..., 'name')) or None,
+            'album_artists': traverse_obj(info, ('album', 'artists', ..., 'name')) or None,
+            **lyric_data,
+            **traverse_obj(info, {
+                'title': ('name', {str}),
+                'timestamp': ('album', 'publishTime', {int_or_none(scale=1000)}),
+                'thumbnail': ('album', 'picUrl', {url_or_none}),
+                'duration': ('duration', {int_or_none(scale=1000)}),
+                'album': ('album', 'name', {str}),
+                'average_rating': ('score', {int_or_none}),
+            }),
         }
 
 
 class NetEaseMusicAlbumIE(NetEaseMusicBaseIE):
     IE_NAME = 'netease:album'
     IE_DESC = '网易云音乐 - 专辑'
-    _VALID_URL = r'https?://music\.163\.com/(#/)?album\?id=(?P<id>[0-9]+)'
-    _TEST = {
+    _VALID_URL = r'https?://music\.163\.com/(?:#/)?album\?id=(?P<id>[0-9]+)'
+    _TESTS = [{
+        'url': 'https://music.163.com/#/album?id=133153666',
+        'info_dict': {
+            'id': '133153666',
+            'title': '桃几的翻唱',
+            'upload_date': '20210913',
+            'description': '桃几2021年翻唱合集',
+            'thumbnail': r're:^http.*\.jpg',
+        },
+        'playlist_mincount': 12,
+    }, {
         'url': 'http://music.163.com/#/album?id=220780',
         'info_dict': {
             'id': '220780',
-            'title': 'B\'day',
+            'title': 'B\'Day',
+            'upload_date': '20060904',
+            'description': 'md5:71a74e1d8f392d88cf1bbe48879ad0b0',
+            'thumbnail': r're:^http.*\.jpg',
         },
         'playlist_count': 23,
-        'skip': 'Blocked outside Mainland China',
-    }
+    }]
 
     def _real_extract(self, url):
         album_id = self._match_id(url)
+        webpage = self._download_webpage(f'https://music.163.com/album?id={album_id}', album_id)
 
-        info = self.query_api(
-            'album/%s?id=%s' % (album_id, album_id),
-            album_id, 'Downloading album data')['album']
-
-        name = info['name']
-        desc = info.get('description')
-        entries = [
-            self.url_result('http://music.163.com/#/song?id=%s' % song['id'],
-                            'NetEaseMusic', song['id'])
-            for song in info['songs']
-        ]
-        return self.playlist_result(entries, album_id, name, desc)
+        songs = self._search_json(
+            r'<textarea[^>]+\bid="song-list-pre-data"[^>]*>', webpage, 'metainfo', album_id,
+            end_pattern=r'</textarea>', contains_pattern=r'\[(?s:.+)\]')
+        metainfo = {
+            'title': self._og_search_property('title', webpage, 'title', fatal=False),
+            'description': self._html_search_regex(
+                (rf'<div[^>]+\bid="album-desc-{suffix}"[^>]*>(.*?)</div>' for suffix in ('more', 'dot')),
+                webpage, 'description', flags=re.S, fatal=False),
+            'thumbnail': self._og_search_property('image', webpage, 'thumbnail', fatal=False),
+            'upload_date': unified_strdate(self._html_search_meta('music:release_date', webpage, 'date', fatal=False)),
+        }
+        return self.playlist_result(self._get_entries(songs), album_id, **metainfo)
 
 
 class NetEaseMusicSingerIE(NetEaseMusicBaseIE):
     IE_NAME = 'netease:singer'
     IE_DESC = '网易云音乐 - 歌手'
-    _VALID_URL = r'https?://music\.163\.com/(#/)?artist\?id=(?P<id>[0-9]+)'
+    _VALID_URL = r'https?://music\.163\.com/(?:#/)?artist\?id=(?P<id>[0-9]+)'
     _TESTS = [{
         'note': 'Singer has aliases.',
         'url': 'http://music.163.com/#/artist?id=10559',
         'info_dict': {
             'id': '10559',
-            'title': '张惠妹 - aMEI;阿密特',
+            'title': '张惠妹 - aMEI;阿妹;阿密特',
         },
         'playlist_count': 50,
-        'skip': 'Blocked outside Mainland China',
     }, {
         'note': 'Singer has translated name.',
         'url': 'http://music.163.com/#/artist?id=124098',
@@ -311,238 +351,292 @@ class NetEaseMusicSingerIE(NetEaseMusicBaseIE):
             'title': '李昇基 - 이승기',
         },
         'playlist_count': 50,
-        'skip': 'Blocked outside Mainland China',
+    }, {
+        'note': 'Singer with both translated and alias',
+        'url': 'https://music.163.com/#/artist?id=159692',
+        'info_dict': {
+            'id': '159692',
+            'title': '初音ミク - 初音未来;Hatsune Miku',
+        },
+        'playlist_count': 50,
     }]
 
     def _real_extract(self, url):
         singer_id = self._match_id(url)
 
-        info = self.query_api(
-            'artist/%s?id=%s' % (singer_id, singer_id),
-            singer_id, 'Downloading singer data')
+        info = self._query_api(
+            f'artist/{singer_id}?id={singer_id}', singer_id, note='Downloading singer data')
 
-        name = info['artist']['name']
-        if info['artist']['trans']:
-            name = '%s - %s' % (name, info['artist']['trans'])
-        if info['artist']['alias']:
-            name = '%s - %s' % (name, ';'.join(info['artist']['alias']))
+        name = join_nonempty(
+            traverse_obj(info, ('artist', 'name', {str})),
+            join_nonempty(*traverse_obj(info, ('artist', ('trans', ('alias', ...)), {str})), delim=';'),
+            delim=' - ')
 
-        entries = [
-            self.url_result('http://music.163.com/#/song?id=%s' % song['id'],
-                            'NetEaseMusic', song['id'])
-            for song in info['hotSongs']
-        ]
-        return self.playlist_result(entries, singer_id, name)
+        return self.playlist_result(self._get_entries(info, 'hotSongs'), singer_id, name)
 
 
 class NetEaseMusicListIE(NetEaseMusicBaseIE):
     IE_NAME = 'netease:playlist'
     IE_DESC = '网易云音乐 - 歌单'
-    _VALID_URL = r'https?://music\.163\.com/(#/)?(playlist|discover/toplist)\?id=(?P<id>[0-9]+)'
+    _VALID_URL = r'https?://music\.163\.com/(?:#/)?(?:playlist|discover/toplist)\?id=(?P<id>[0-9]+)'
     _TESTS = [{
         'url': 'http://music.163.com/#/playlist?id=79177352',
         'info_dict': {
             'id': '79177352',
             'title': 'Billboard 2007 Top 100',
-            'description': 'md5:12fd0819cab2965b9583ace0f8b7b022'
+            'description': 'md5:12fd0819cab2965b9583ace0f8b7b022',
+            'tags': ['欧美'],
+            'uploader': '浑然破灭',
+            'uploader_id': '67549805',
+            'timestamp': int,
+            'upload_date': r're:\d{8}',
         },
-        'playlist_count': 99,
-        'skip': 'Blocked outside Mainland China',
+        'playlist_mincount': 95,
+    }, {
+        'note': 'Toplist/Charts sample',
+        'url': 'https://music.163.com/#/discover/toplist?id=60198',
+        'info_dict': {
+            'id': '60198',
+            'title': 're:美国Billboard榜 [0-9]{4}-[0-9]{2}-[0-9]{2}',
+            'description': '美国Billboard排行榜',
+            'tags': ['流行', '欧美', '榜单'],
+            'uploader': 'Billboard公告牌',
+            'uploader_id': '48171',
+            'timestamp': int,
+            'upload_date': r're:\d{8}',
+        },
+        'playlist_count': 100,
     }, {
         'note': 'Toplist/Charts sample',
         'url': 'http://music.163.com/#/discover/toplist?id=3733003',
         'info_dict': {
             'id': '3733003',
-            'title': 're:韩国Melon排行榜周榜 [0-9]{4}-[0-9]{2}-[0-9]{2}',
+            'title': 're:韩国Melon排行榜周榜(?: [0-9]{4}-[0-9]{2}-[0-9]{2})?',
             'description': 'md5:73ec782a612711cadc7872d9c1e134fc',
+            'upload_date': '20200109',
+            'uploader_id': '2937386',
+            'tags': ['韩语', '榜单'],
+            'uploader': 'Melon榜单',
+            'timestamp': 1578569373,
         },
         'playlist_count': 50,
-        'skip': 'Blocked outside Mainland China',
     }]
 
     def _real_extract(self, url):
         list_id = self._match_id(url)
 
-        info = self.query_api(
-            'playlist/detail?id=%s&lv=-1&tv=-1' % list_id,
-            list_id, 'Downloading playlist data')['result']
+        info = self._download_eapi_json(
+            '/v3/playlist/detail', list_id,
+            {'id': list_id, 't': '-1', 'n': '500', 's': '0'},
+            note='Downloading playlist info')
 
-        name = info['name']
-        desc = info.get('description')
+        metainfo = traverse_obj(info, ('playlist', {
+            'title': ('name', {str}),
+            'description': ('description', {str}),
+            'tags': ('tags', ..., {str}),
+            'uploader': ('creator', 'nickname', {str}),
+            'uploader_id': ('creator', 'userId', {str_or_none}),
+            'timestamp': ('updateTime', {int_or_none(scale=1000)}),
+        }))
+        if traverse_obj(info, ('playlist', 'specialType')) == 10:
+            metainfo['title'] = f'{metainfo.get("title")} {strftime_or_none(metainfo.get("timestamp"), "%Y-%m-%d")}'
 
-        if info.get('specialType') == 10:  # is a chart/toplist
-            datestamp = datetime.fromtimestamp(
-                self.convert_milliseconds(info['updateTime'])).strftime('%Y-%m-%d')
-            name = '%s %s' % (name, datestamp)
-
-        entries = [
-            self.url_result('http://music.163.com/#/song?id=%s' % song['id'],
-                            'NetEaseMusic', song['id'])
-            for song in info['tracks']
-        ]
-        return self.playlist_result(entries, list_id, name, desc)
+        return self.playlist_result(self._get_entries(info, ('playlist', 'tracks')), list_id, **metainfo)
 
 
 class NetEaseMusicMvIE(NetEaseMusicBaseIE):
     IE_NAME = 'netease:mv'
     IE_DESC = '网易云音乐 - MV'
-    _VALID_URL = r'https?://music\.163\.com/(#/)?mv\?id=(?P<id>[0-9]+)'
-    _TEST = {
+    _VALID_URL = r'https?://music\.163\.com/(?:#/)?mv\?id=(?P<id>[0-9]+)'
+    _TESTS = [{
+        'url': 'https://music.163.com/#/mv?id=10958064',
+        'info_dict': {
+            'id': '10958064',
+            'ext': 'mp4',
+            'title': '交换余生',
+            'description': 'md5:e845872cff28820642a2b02eda428fea',
+            'creators': ['林俊杰'],
+            'upload_date': '20200916',
+            'thumbnail': r're:http.*\.jpg',
+            'duration': 364,
+            'view_count': int,
+            'like_count': int,
+            'comment_count': int,
+        },
+    }, {
         'url': 'http://music.163.com/#/mv?id=415350',
         'info_dict': {
             'id': '415350',
             'ext': 'mp4',
             'title': '이럴거면 그러지말지',
             'description': '白雅言自作曲唱甜蜜爱情',
-            'creator': '白雅言',
+            'creators': ['白娥娟'],
             'upload_date': '20150520',
+            'thumbnail': r're:http.*\.jpg',
+            'duration': 216,
+            'view_count': int,
+            'like_count': int,
+            'comment_count': int,
         },
         'skip': 'Blocked outside Mainland China',
-    }
+    }, {
+        'note': 'This MV has multiple creators.',
+        'url': 'https://music.163.com/#/mv?id=22593543',
+        'info_dict': {
+            'id': '22593543',
+            'ext': 'mp4',
+            'title': '老北京杀器',
+            'creators': ['秃子2z', '辉子', 'Saber梁维嘉'],
+            'duration': 206,
+            'upload_date': '20240618',
+            'like_count': int,
+            'comment_count': int,
+            'thumbnail': r're:http.*\.jpg',
+            'view_count': int,
+        },
+    }]
 
     def _real_extract(self, url):
         mv_id = self._match_id(url)
 
-        info = self.query_api(
-            'mv/detail?id=%s&type=mp4' % mv_id,
-            mv_id, 'Downloading mv info')['data']
+        info = self._query_api(
+            f'mv/detail?id={mv_id}&type=mp4', mv_id, 'Downloading mv info')['data']
 
         formats = [
-            {'url': mv_url, 'ext': 'mp4', 'format_id': '%sp' % brs, 'height': int(brs)}
+            {'url': mv_url, 'ext': 'mp4', 'format_id': f'{brs}p', 'height': int_or_none(brs)}
             for brs, mv_url in info['brs'].items()
         ]
 
         return {
             'id': mv_id,
-            'title': info['name'],
-            'description': info.get('desc') or info.get('briefDesc'),
-            'creator': info['artistName'],
-            'upload_date': info['publishTime'].replace('-', ''),
             'formats': formats,
-            'thumbnail': info.get('cover'),
-            'duration': self.convert_milliseconds(info.get('duration', 0)),
+            'creators': traverse_obj(info, ('artists', ..., 'name')) or [info.get('artistName')],
+            **traverse_obj(info, {
+                'title': ('name', {str}),
+                'description': (('desc', 'briefDesc'), {str}, filter),
+                'upload_date': ('publishTime', {unified_strdate}),
+                'thumbnail': ('cover', {url_or_none}),
+                'duration': ('duration', {int_or_none(scale=1000)}),
+                'view_count': ('playCount', {int_or_none}),
+                'like_count': ('likeCount', {int_or_none}),
+                'comment_count': ('commentCount', {int_or_none}),
+            }, get_all=False),
         }
 
 
 class NetEaseMusicProgramIE(NetEaseMusicBaseIE):
     IE_NAME = 'netease:program'
     IE_DESC = '网易云音乐 - 电台节目'
-    _VALID_URL = r'https?://music\.163\.com/(#/?)program\?id=(?P<id>[0-9]+)'
+    _VALID_URL = r'https?://music\.163\.com/(?:#/)?program\?id=(?P<id>[0-9]+)'
     _TESTS = [{
         'url': 'http://music.163.com/#/program?id=10109055',
         'info_dict': {
-            'id': '10109055',
+            'id': '32593346',
             'ext': 'mp3',
             'title': '不丹足球背后的故事',
             'description': '喜马拉雅人的足球梦 ...',
-            'creator': '大话西藏',
-            'timestamp': 1434179342,
+            'creators': ['大话西藏'],
+            'timestamp': 1434179287,
             'upload_date': '20150613',
+            'thumbnail': r're:http.*\.jpg',
             'duration': 900,
         },
-        'skip': 'Blocked outside Mainland China',
     }, {
         'note': 'This program has accompanying songs.',
         'url': 'http://music.163.com/#/program?id=10141022',
         'info_dict': {
             'id': '10141022',
-            'title': '25岁，你是自在如风的少年<27°C>',
+            'title': '滚滚电台的有声节目',
             'description': 'md5:8d594db46cc3e6509107ede70a4aaa3b',
+            'creators': ['滚滚电台ORZ'],
+            'timestamp': 1434450733,
+            'upload_date': '20150616',
+            'thumbnail': r're:http.*\.jpg',
         },
         'playlist_count': 4,
-        'skip': 'Blocked outside Mainland China',
     }, {
         'note': 'This program has accompanying songs.',
         'url': 'http://music.163.com/#/program?id=10141022',
         'info_dict': {
-            'id': '10141022',
+            'id': '32647209',
             'ext': 'mp3',
-            'title': '25岁，你是自在如风的少年<27°C>',
+            'title': '滚滚电台的有声节目',
             'description': 'md5:8d594db46cc3e6509107ede70a4aaa3b',
-            'timestamp': 1434450841,
+            'creators': ['滚滚电台ORZ'],
+            'timestamp': 1434450733,
             'upload_date': '20150616',
+            'thumbnail': r're:http.*\.jpg',
+            'duration': 1104,
         },
         'params': {
-            'noplaylist': True
+            'noplaylist': True,
         },
-        'skip': 'Blocked outside Mainland China',
     }]
 
     def _real_extract(self, url):
         program_id = self._match_id(url)
 
-        info = self.query_api(
-            'dj/program/detail?id=%s' % program_id,
-            program_id, 'Downloading program info')['program']
+        info = self._query_api(
+            f'dj/program/detail?id={program_id}', program_id, note='Downloading program info')['program']
 
-        name = info['name']
-        description = info['description']
+        metainfo = traverse_obj(info, {
+            'title': ('name', {str}),
+            'description': ('description', {str}),
+            'creator': ('dj', 'brand', {str}),
+            'thumbnail': ('coverUrl', {url_or_none}),
+            'timestamp': ('createTime', {int_or_none(scale=1000)}),
+        })
 
-        if not self._yes_playlist(info['songs'] and program_id, info['mainSong']['id']):
-            formats = self.extract_formats(info['mainSong'])
+        if not self._yes_playlist(
+                info['songs'] and program_id, info['mainSong']['id'], playlist_label='program', video_label='song'):
+            formats = self._extract_formats(info['mainSong'])
 
             return {
-                'id': info['mainSong']['id'],
-                'title': name,
-                'description': description,
-                'creator': info['dj']['brand'],
-                'timestamp': self.convert_milliseconds(info['createTime']),
-                'thumbnail': info['coverUrl'],
-                'duration': self.convert_milliseconds(info.get('duration', 0)),
+                'id': str(info['mainSong']['id']),
                 'formats': formats,
+                'duration': traverse_obj(info, ('mainSong', 'duration', {int_or_none(scale=1000)})),
+                **metainfo,
             }
 
-        song_ids = [info['mainSong']['id']]
-        song_ids.extend([song['id'] for song in info['songs']])
-        entries = [
-            self.url_result('http://music.163.com/#/song?id=%s' % song_id,
-                            'NetEaseMusic', song_id)
-            for song_id in song_ids
-        ]
-        return self.playlist_result(entries, program_id, name, description)
+        songs = traverse_obj(info, (('mainSong', ('songs', ...)),))
+        return self.playlist_result(self._get_entries(songs), program_id, **metainfo)
 
 
 class NetEaseMusicDjRadioIE(NetEaseMusicBaseIE):
     IE_NAME = 'netease:djradio'
     IE_DESC = '网易云音乐 - 电台'
-    _VALID_URL = r'https?://music\.163\.com/(#/)?djradio\?id=(?P<id>[0-9]+)'
+    _VALID_URL = r'https?://music\.163\.com/(?:#/)?djradio\?id=(?P<id>[0-9]+)'
     _TEST = {
         'url': 'http://music.163.com/#/djradio?id=42',
         'info_dict': {
             'id': '42',
             'title': '声音蔓延',
-            'description': 'md5:766220985cbd16fdd552f64c578a6b15'
+            'description': 'md5:c7381ebd7989f9f367668a5aee7d5f08',
         },
         'playlist_mincount': 40,
-        'skip': 'Blocked outside Mainland China',
     }
     _PAGE_SIZE = 1000
 
     def _real_extract(self, url):
         dj_id = self._match_id(url)
 
-        name = None
-        desc = None
+        metainfo = {}
         entries = []
         for offset in itertools.count(start=0, step=self._PAGE_SIZE):
-            info = self.query_api(
-                'dj/program/byradio?asc=false&limit=%d&radioId=%s&offset=%d'
-                % (self._PAGE_SIZE, dj_id, offset),
-                dj_id, 'Downloading dj programs - %d' % offset)
+            info = self._query_api(
+                f'dj/program/byradio?asc=false&limit={self._PAGE_SIZE}&radioId={dj_id}&offset={offset}',
+                dj_id, note=f'Downloading dj programs - {offset}')
 
-            entries.extend([
-                self.url_result(
-                    'http://music.163.com/#/program?id=%s' % program['id'],
-                    'NetEaseMusicProgram', program['id'])
-                for program in info['programs']
-            ])
-
-            if name is None:
-                radio = info['programs'][0]['radio']
-                name = radio['name']
-                desc = radio['desc']
+            entries.extend(self.url_result(
+                f'http://music.163.com/#/program?id={program["id"]}', NetEaseMusicProgramIE,
+                program['id'], program.get('name')) for program in info['programs'])
+            if not metainfo:
+                metainfo = traverse_obj(info, ('programs', 0, 'radio', {
+                    'title': ('name', {str}),
+                    'description': ('desc', {str}),
+                }))
 
             if not info['more']:
                 break
 
-        return self.playlist_result(entries, dj_id, name, desc)
+        return self.playlist_result(entries, dj_id, **metainfo)
diff --git a/plugins/youtube_download/yt_dlp/extractor/netverse.py b/plugins/youtube_download/yt_dlp/extractor/netverse.py
index ef53e15..2ddec5c 100644
--- a/plugins/youtube_download/yt_dlp/extractor/netverse.py
+++ b/plugins/youtube_download/yt_dlp/extractor/netverse.py
@@ -63,7 +63,7 @@ class NetverseIE(NetverseBaseIE):
             'timestamp': 1626919804,
             'like_count': int,
             'uploader': 'Net Prime',
-        }
+        },
     }, {
         # series
         'url': 'https://www.netverse.id/watch/jadoo-seorang-model',
@@ -87,7 +87,7 @@ class NetverseIE(NetverseBaseIE):
             'uploader': 'Net Prime',
             'age_limit': 0,
         },
-        'skip': 'video get Geo-blocked for some country'
+        'skip': 'video get Geo-blocked for some country',
     }, {
         # non www host
         'url': 'https://netverse.id/watch/tetangga-baru',
@@ -135,7 +135,7 @@ class NetverseIE(NetverseBaseIE):
             'timestamp': 1645764984,
             'upload_date': '20220225',
         },
-        'skip': 'This video get Geo-blocked for some country'
+        'skip': 'This video get Geo-blocked for some country',
     }, {
         # video with comments
         'url': 'https://netverse.id/video/episode-1-season-2016-ok-food',
@@ -161,8 +161,8 @@ class NetverseIE(NetverseBaseIE):
             'comment_count': int,
         },
         'params': {
-            'getcomments': True
-        }
+            'getcomments': True,
+        },
     }, {
         # video with multiple page comment
         'url': 'https://netverse.id/video/match-island-eps-1-fix',
@@ -188,8 +188,8 @@ class NetverseIE(NetverseBaseIE):
             'comment_count': int,
         },
         'params': {
-            'getcomments': True
-        }
+            'getcomments': True,
+        },
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/netzkino.py b/plugins/youtube_download/yt_dlp/extractor/netzkino.py
index 9c314e2..c07b171 100644
--- a/plugins/youtube_download/yt_dlp/extractor/netzkino.py
+++ b/plugins/youtube_download/yt_dlp/extractor/netzkino.py
@@ -8,6 +8,7 @@ from ..utils import (
 
 
 class NetzkinoIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?netzkino\.de/\#!/[^/]+/(?P<id>[^/]+)'
 
     _TESTS = [{
@@ -25,7 +26,7 @@ class NetzkinoIE(InfoExtractor):
         },
         'params': {
             'skip_download': 'Download only works from Germany',
-        }
+        },
     }, {
         'url': 'https://www.netzkino.de/#!/filme/dr-jekyll-mrs-hyde-2',
         'md5': 'c7728b2dadd04ff6727814847a51ef03',
@@ -41,14 +42,14 @@ class NetzkinoIE(InfoExtractor):
         },
         'params': {
             'skip_download': 'Download only works from Germany',
-        }
+        },
     }]
 
     def _real_extract(self, url):
         mobj = self._match_valid_url(url)
         video_id = mobj.group('id')
 
-        api_url = 'https://api.netzkino.de.simplecache.net/capi-2.0a/movies/%s.json?d=www' % video_id
+        api_url = f'https://api.netzkino.de.simplecache.net/capi-2.0a/movies/{video_id}.json?d=www'
         info = self._download_json(api_url, video_id)
         custom_fields = info['custom_fields']
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/newgrounds.py b/plugins/youtube_download/yt_dlp/extractor/newgrounds.py
index 9e3286d..9f5a464 100644
--- a/plugins/youtube_download/yt_dlp/extractor/newgrounds.py
+++ b/plugins/youtube_download/yt_dlp/extractor/newgrounds.py
@@ -2,7 +2,10 @@ import functools
 import re
 
 from .common import InfoExtractor
+from ..networking.exceptions import HTTPError
 from ..utils import (
+    ExtractorError,
+    OnDemandPagedList,
     clean_html,
     extract_attributes,
     get_element_by_id,
@@ -10,12 +13,15 @@ from ..utils import (
     parse_count,
     parse_duration,
     unified_timestamp,
-    OnDemandPagedList,
-    try_get,
+    url_or_none,
+    urlencode_postdata,
+    urljoin,
 )
+from ..utils.traversal import traverse_obj
 
 
 class NewgroundsIE(InfoExtractor):
+    _NETRC_MACHINE = 'newgrounds'
     _VALID_URL = r'https?://(?:www\.)?newgrounds\.com/(?:audio/listen|portal/view)/(?P<id>\d+)(?:/format/flash)?'
     _TESTS = [{
         'url': 'https://www.newgrounds.com/audio/listen/549479',
@@ -25,11 +31,13 @@ class NewgroundsIE(InfoExtractor):
             'ext': 'mp3',
             'title': 'B7 - BusMode',
             'uploader': 'Burn7',
-            'timestamp': 1378878540,
+            'timestamp': 1378892945,
             'upload_date': '20130911',
             'duration': 143,
             'view_count': int,
             'description': 'md5:b8b3c2958875189f07d8e313462e8c4f',
+            'age_limit': 0,
+            'thumbnail': r're:^https://aicon\.ngfiles\.com/549/549479\.png',
         },
     }, {
         'url': 'https://www.newgrounds.com/portal/view/1',
@@ -39,11 +47,12 @@ class NewgroundsIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'Scrotum 1',
             'uploader': 'Brian-Beaton',
-            'timestamp': 955064100,
-            'upload_date': '20000406',
+            'timestamp': 955078533,
+            'upload_date': '20000407',
             'view_count': int,
             'description': 'Scrotum plays "catch."',
             'age_limit': 17,
+            'thumbnail': r're:^https://picon\.ngfiles\.com/0/flash_1_card\.png',
         },
     }, {
         # source format unavailable, additional mp4 formats
@@ -53,11 +62,12 @@ class NewgroundsIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'ZTV News Episode 8',
             'uploader': 'ZONE-SAMA',
-            'timestamp': 1487965140,
-            'upload_date': '20170224',
+            'timestamp': 1487983183,
+            'upload_date': '20170225',
             'view_count': int,
             'description': 'md5:aff9b330ec2e78ed93b1ad6d017accc6',
             'age_limit': 17,
+            'thumbnail': r're:^https://picon\.ngfiles\.com/689000/flash_689400_card\.png',
         },
         'params': {
             'skip_download': True,
@@ -70,12 +80,13 @@ class NewgroundsIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'Metal Gear Awesome',
             'uploader': 'Egoraptor',
-            'timestamp': 1140663240,
+            'timestamp': 1140681292,
             'upload_date': '20060223',
             'view_count': int,
             'description': 'md5:9246c181614e23754571995104da92e0',
             'age_limit': 13,
-        }
+            'thumbnail': r're:^https://picon\.ngfiles\.com/297000/flash_297383_card\.png',
+        },
     }, {
         'url': 'https://www.newgrounds.com/portal/view/297383/format/flash',
         'md5': '5d05585a9a0caca059f5abfbd3865524',
@@ -86,9 +97,25 @@ class NewgroundsIE(InfoExtractor):
             'description': 'Metal Gear Awesome',
             'uploader': 'Egoraptor',
             'upload_date': '20060223',
-            'timestamp': 1140663240,
+            'timestamp': 1140681292,
+            'view_count': int,
             'age_limit': 13,
-        }
+            'thumbnail': r're:^https://picon\.ngfiles\.com/297000/flash_297383_card\.png',
+        },
+    }, {
+        'url': 'https://www.newgrounds.com/portal/view/823109',
+        'info_dict': {
+            'id': '823109',
+            'ext': 'mp4',
+            'title': 'Rouge Futa Fleshlight Fuck',
+            'description': 'I made a fleshlight model and I wanted to use it in an animation. Based on a video by CDNaturally.',
+            'uploader': 'DefaultUser12',
+            'upload_date': '20211122',
+            'timestamp': 1637611540,
+            'view_count': int,
+            'age_limit': 18,
+            'thumbnail': r're:^https://picon\.ngfiles\.com/823000/flash_823109_card\.png',
+        },
     }]
     _AGE_LIMIT = {
         'e': 0,
@@ -96,42 +123,59 @@ class NewgroundsIE(InfoExtractor):
         'm': 17,
         'a': 18,
     }
+    _LOGIN_URL = 'https://www.newgrounds.com/passport'
+
+    def _perform_login(self, username, password):
+        login_webpage = self._download_webpage(self._LOGIN_URL, None, 'Downloading login page')
+        login_url = urljoin(self._LOGIN_URL, self._search_regex(
+            r'<form action="([^"]+)"', login_webpage, 'login endpoint', default=None))
+        result = self._download_json(login_url, None, 'Logging in', headers={
+            'Accept': 'application/json',
+            'Referer': self._LOGIN_URL,
+            'X-Requested-With': 'XMLHttpRequest',
+        }, data=urlencode_postdata({
+            **self._hidden_inputs(login_webpage),
+            'username': username,
+            'password': password,
+        }))
+        if errors := traverse_obj(result, ('errors', ..., {str})):
+            raise ExtractorError(', '.join(errors) or 'Unknown Error', expected=True)
 
     def _real_extract(self, url):
         media_id = self._match_id(url)
-        formats = []
-        uploader = None
-        webpage = self._download_webpage(url, media_id)
-
-        title = self._html_extract_title(webpage)
+        try:
+            webpage = self._download_webpage(url, media_id)
+        except ExtractorError as error:
+            if isinstance(error.cause, HTTPError) and error.cause.status == 401:
+                self.raise_login_required()
+            raise
 
         media_url_string = self._search_regex(
-            r'"url"\s*:\s*("[^"]+"),', webpage, 'media url', default=None)
-
+            r'embedController\(\[{"url"\s*:\s*("[^"]+"),', webpage, 'media url', default=None)
         if media_url_string:
-            media_url = self._parse_json(media_url_string, media_id)
+            uploader = None
             formats = [{
-                'url': media_url,
+                'url': self._parse_json(media_url_string, media_id),
                 'format_id': 'source',
                 'quality': 1,
             }]
+
         else:
-            json_video = self._download_json('https://www.newgrounds.com/portal/video/' + media_id, media_id, headers={
+            json_video = self._download_json(f'https://www.newgrounds.com/portal/video/{media_id}', media_id, headers={
                 'Accept': 'application/json',
                 'Referer': url,
-                'X-Requested-With': 'XMLHttpRequest'
+                'X-Requested-With': 'XMLHttpRequest',
             })
 
-            uploader = json_video.get('author')
-            media_formats = json_video.get('sources', [])
-            for media_format in media_formats:
-                media_sources = media_formats[media_format]
-                for source in media_sources:
-                    formats.append({
-                        'format_id': media_format,
-                        'quality': int_or_none(media_format[:-1]),
-                        'url': source.get('src')
-                    })
+            formats = []
+            uploader = traverse_obj(json_video, ('author', {str}))
+            for format_id, sources in traverse_obj(json_video, ('sources', {dict.items}, ...)):
+                quality = int_or_none(format_id[:-1])
+                formats.extend({
+                    'format_id': format_id,
+                    'quality': quality,
+                    'url': url,
+                } for url in traverse_obj(sources, (..., 'src', {url_or_none})))
 
         if not uploader:
             uploader = self._html_search_regex(
@@ -139,51 +183,35 @@ class NewgroundsIE(InfoExtractor):
                  r'(?:Author|Writer)\s*<a[^>]+>([^<]+)'), webpage, 'uploader',
                 fatal=False)
 
-        age_limit = self._html_search_regex(
-            r'<h2\s*class=["\']rated-([^"\'])["\'][^>]+>', webpage, 'age_limit', default='e')
-        age_limit = self._AGE_LIMIT.get(age_limit)
-
-        timestamp = unified_timestamp(self._html_search_regex(
-            (r'<dt>\s*Uploaded\s*</dt>\s*<dd>([^<]+</dd>\s*<dd>[^<]+)',
-             r'<dt>\s*Uploaded\s*</dt>\s*<dd>([^<]+)'), webpage, 'timestamp',
-            default=None))
-
-        duration = parse_duration(self._html_search_regex(
-            r'"duration"\s*:\s*["\']?(\d+)["\']?', webpage,
-            'duration', default=None))
-
-        description = clean_html(get_element_by_id('author_comments', webpage)) or self._og_search_description(webpage)
-
-        view_count = parse_count(self._html_search_regex(
-            r'(?s)<dt>\s*(?:Views|Listens)\s*</dt>\s*<dd>([\d\.,]+)</dd>', webpage,
-            'view count', default=None))
-
-        filesize = int_or_none(self._html_search_regex(
-            r'"filesize"\s*:\s*["\']?([\d]+)["\']?,', webpage, 'filesize',
-            default=None))
-
-        video_type_description = self._html_search_regex(
-            r'"description"\s*:\s*["\']?([^"\']+)["\']?,', webpage, 'filesize',
-            default=None)
-
         if len(formats) == 1:
-            formats[0]['filesize'] = filesize
+            formats[0]['filesize'] = int_or_none(self._html_search_regex(
+                r'"filesize"\s*:\s*["\']?([\d]+)["\']?,', webpage, 'filesize', default=None))
+
+            video_type_description = self._html_search_regex(
+                r'"description"\s*:\s*["\']?([^"\']+)["\']?,', webpage, 'media type', default=None)
+            if video_type_description == 'Audio File':
+                formats[0]['vcodec'] = 'none'
 
-        if video_type_description == 'Audio File':
-            formats[0]['vcodec'] = 'none'
         self._check_formats(formats, media_id)
-
         return {
             'id': media_id,
-            'title': title,
+            'title': self._html_extract_title(webpage),
             'uploader': uploader,
-            'timestamp': timestamp,
-            'duration': duration,
+            'timestamp': unified_timestamp(self._search_regex(
+                r'itemprop="(?:uploadDate|datePublished)"\s+content="([^"]+)"',
+                webpage, 'timestamp', default=None)),
+            'duration': parse_duration(self._html_search_regex(
+                r'"duration"\s*:\s*["\']?(\d+)["\']?', webpage, 'duration', default=None)),
             'formats': formats,
             'thumbnail': self._og_search_thumbnail(webpage),
-            'description': description,
-            'age_limit': age_limit,
-            'view_count': view_count,
+            'description': (
+                clean_html(get_element_by_id('author_comments', webpage))
+                or self._og_search_description(webpage)),
+            'age_limit': self._AGE_LIMIT.get(self._html_search_regex(
+                r'<h2\s+class=["\']rated-([etma])["\']', webpage, 'age_limit', default='e')),
+            'view_count': parse_count(self._html_search_regex(
+                r'(?s)<dt>\s*(?:Views|Listens)\s*</dt>\s*<dd>([\d\.,]+)</dd>',
+                webpage, 'view count', default=None)),
         }
 
 
@@ -263,19 +291,16 @@ class NewgroundsUserIE(InfoExtractor):
     def _fetch_page(self, channel_id, url, page):
         page += 1
         posts_info = self._download_json(
-            f'{url}/page/{page}', channel_id,
+            f'{url}?page={page}', channel_id,
             note=f'Downloading page {page}', headers={
                 'Accept': 'application/json, text/javascript, */*; q = 0.01',
                 'X-Requested-With': 'XMLHttpRequest',
             })
-        sequence = posts_info.get('sequence', [])
-        for year in sequence:
-            posts = try_get(posts_info, lambda x: x['years'][str(year)]['items'])
-            for post in posts:
-                path, media_id = self._search_regex(
-                    r'<a[^>]+\bhref=["\'][^"\']+((?:portal/view|audio/listen)/(\d+))[^>]+>',
-                    post, 'url', group=(1, 2))
-                yield self.url_result(f'https://www.newgrounds.com/{path}', NewgroundsIE.ie_key(), media_id)
+        for post in traverse_obj(posts_info, ('items', ..., ..., {str})):
+            path, media_id = self._search_regex(
+                r'<a[^>]+\bhref=["\'][^"\']+((?:portal/view|audio/listen)/(\d+))[^>]+>',
+                post, 'url', group=(1, 2))
+            yield self.url_result(f'https://www.newgrounds.com/{path}', NewgroundsIE.ie_key(), media_id)
 
     def _real_extract(self, url):
         channel_id = self._match_id(url)
diff --git a/plugins/youtube_download/yt_dlp/extractor/newspicks.py b/plugins/youtube_download/yt_dlp/extractor/newspicks.py
index b6334dc..4a1cb0a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/newspicks.py
+++ b/plugins/youtube_download/yt_dlp/extractor/newspicks.py
@@ -5,7 +5,7 @@ from ..utils import ExtractorError
 
 
 class NewsPicksIE(InfoExtractor):
-    _VALID_URL = r'https://newspicks\.com/movie-series/(?P<channel_id>\d+)\?movieId=(?P<id>\d+)'
+    _VALID_URL = r'https?://newspicks\.com/movie-series/(?P<channel_id>\d+)\?movieId=(?P<id>\d+)'
 
     _TESTS = [{
         'url': 'https://newspicks.com/movie-series/11?movieId=1813',
diff --git a/plugins/youtube_download/yt_dlp/extractor/newstube.py b/plugins/youtube_download/yt_dlp/extractor/newstube.py
deleted file mode 100644
index 820eb4b..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/newstube.py
+++ /dev/null
@@ -1,75 +0,0 @@
-import base64
-import hashlib
-
-from .common import InfoExtractor
-from ..aes import aes_cbc_decrypt_bytes, unpad_pkcs7
-from ..utils import (
-    int_or_none,
-    parse_codecs,
-    parse_duration,
-)
-
-
-class NewstubeIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?newstube\.ru/media/(?P<id>.+)'
-    _TEST = {
-        'url': 'http://www.newstube.ru/media/telekanal-cnn-peremestil-gorod-slavyansk-v-krym',
-        'md5': '9d10320ad473444352f72f746ccb8b8c',
-        'info_dict': {
-            'id': '728e0ef2-e187-4012-bac0-5a081fdcb1f6',
-            'ext': 'mp4',
-            'title': 'Телеканал CNN переместил город Славянск в Крым',
-            'description': 'md5:419a8c9f03442bc0b0a794d689360335',
-            'duration': 31.05,
-        },
-    }
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        page = self._download_webpage(url, video_id)
-        title = self._html_search_meta(['og:title', 'twitter:title'], page, fatal=True)
-
-        video_guid = self._html_search_regex(
-            r'<meta\s+property="og:video(?::(?:(?:secure_)?url|iframe))?"\s+content="https?://(?:www\.)?newstube\.ru/embed/(?P<guid>[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12})',
-            page, 'video GUID')
-
-        enc_data = base64.b64decode(self._download_webpage(
-            'https://www.newstube.ru/embed/api/player/getsources2',
-            video_guid, query={
-                'guid': video_guid,
-                'ff': 3,
-            }))
-        key = hashlib.pbkdf2_hmac(
-            'sha1', video_guid.replace('-', '').encode(), enc_data[:16], 1)[:16]
-        dec_data = unpad_pkcs7(aes_cbc_decrypt_bytes(enc_data[32:], key, enc_data[16:32]))
-        sources = self._parse_json(dec_data, video_guid)
-
-        formats = []
-        for source in sources:
-            source_url = source.get('Src')
-            if not source_url:
-                continue
-            height = int_or_none(source.get('Height'))
-            f = {
-                'format_id': 'http' + ('-%dp' % height if height else ''),
-                'url': source_url,
-                'width': int_or_none(source.get('Width')),
-                'height': height,
-            }
-            source_type = source.get('Type')
-            if source_type:
-                f.update(parse_codecs(self._search_regex(
-                    r'codecs="([^"]+)"', source_type, 'codecs', fatal=False)))
-            formats.append(f)
-
-        self._check_formats(formats, video_guid)
-
-        return {
-            'id': video_guid,
-            'title': title,
-            'description': self._html_search_meta(['description', 'og:description'], page),
-            'thumbnail': self._html_search_meta(['og:image:secure_url', 'og:image', 'twitter:image'], page),
-            'duration': parse_duration(self._html_search_meta('duration', page)),
-            'formats': formats,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/newsy.py b/plugins/youtube_download/yt_dlp/extractor/newsy.py
index a5a7b16..941cb93 100644
--- a/plugins/youtube_download/yt_dlp/extractor/newsy.py
+++ b/plugins/youtube_download/yt_dlp/extractor/newsy.py
@@ -19,9 +19,9 @@ class NewsyIE(InfoExtractor):
             'timestamp': 1621339200,
             'duration': 339630,
             'thumbnail': 'https://cdn.newsy.com/images/videos/x/1620927824_xyrrP4.jpg',
-            'upload_date': '20210518'
+            'upload_date': '20210518',
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/nextmedia.py b/plugins/youtube_download/yt_dlp/extractor/nextmedia.py
index 0e47a4d..81da3ff 100644
--- a/plugins/youtube_download/yt_dlp/extractor/nextmedia.py
+++ b/plugins/youtube_download/yt_dlp/extractor/nextmedia.py
@@ -1,5 +1,6 @@
+import urllib.parse
+
 from .common import InfoExtractor
-from ..compat import compat_urlparse
 from ..utils import (
     clean_html,
     get_element_by_class,
@@ -24,7 +25,7 @@ class NextMediaIE(InfoExtractor):
             'description': 'md5:28222b9912b6665a21011b034c70fcc7',
             'timestamp': 1415456273,
             'upload_date': '20141108',
-        }
+        },
     }]
 
     _URL_PATTERN = r'\{ url: \'(.+)\' \}'
@@ -39,7 +40,7 @@ class NextMediaIE(InfoExtractor):
             r'window\.location\.href\s*=\s*([\'"])(?P<url>(?!\1).+)\1',
             page, 'redirection URL', default=None, group='url')
         if redirection_url:
-            return self.url_result(compat_urlparse.urljoin(url, redirection_url))
+            return self.url_result(urllib.parse.urljoin(url, redirection_url))
 
         title = self._fetch_title(page)
         video_url = self._search_regex(self._URL_PATTERN, page, 'video url')
@@ -67,8 +68,8 @@ class NextMediaIE(InfoExtractor):
         return self._og_search_thumbnail(page)
 
     def _fetch_timestamp(self, page):
-        dateCreated = self._search_regex('"dateCreated":"([^"]+)"', page, 'created time')
-        return parse_iso8601(dateCreated)
+        date_created = self._search_regex('"dateCreated":"([^"]+)"', page, 'created time')
+        return parse_iso8601(date_created)
 
     def _fetch_upload_date(self, url):
         return self._search_regex(self._VALID_URL, url, 'upload date', group='date')
@@ -91,7 +92,7 @@ class NextMediaActionNewsIE(NextMediaIE):  # XXX: Do not subclass from concrete
             'description': 'md5:cd802fad1f40fd9ea178c1e2af02d659',
             'timestamp': 1421791200,
             'upload_date': '20150120',
-        }
+        },
     }]
 
     def _real_extract(self, url):
@@ -115,7 +116,7 @@ class AppleDailyIE(NextMediaIE):  # XXX: Do not subclass from concrete IE
             'thumbnail': r're:^https?://.*\.jpg$',
             'description': 'md5:2acd430e59956dc47cd7f67cb3c003f4',
             'upload_date': '20150128',
-        }
+        },
     }, {
         'url': 'http://www.appledaily.com.tw/realtimenews/article/strange/20150128/550549/%E4%B8%8D%E6%BB%BF%E8%A2%AB%E8%B8%A9%E8%85%B3%E3%80%80%E5%B1%B1%E6%9D%B1%E5%85%A9%E5%A4%A7%E5%AA%BD%E4%B8%80%E8%B7%AF%E6%89%93%E4%B8%8B%E8%BB%8A',
         'md5': '86b4e9132d158279c7883822d94ccc49',
@@ -126,7 +127,7 @@ class AppleDailyIE(NextMediaIE):  # XXX: Do not subclass from concrete IE
             'thumbnail': r're:^https?://.*\.jpg$',
             'description': 'md5:175b4260c1d7c085993474217e4ab1b4',
             'upload_date': '20150128',
-        }
+        },
     }, {
         'url': 'http://www.appledaily.com.tw/animation/realtimenews/new/20150128/5003671',
         'md5': '03df296d95dedc2d5886debbb80cb43f',
@@ -191,6 +192,8 @@ class AppleDailyIE(NextMediaIE):  # XXX: Do not subclass from concrete IE
 
 
 class NextTVIE(InfoExtractor):
+    _WORKING = False
+    _ENABLED = None  # XXX: pass through to GenericIE
     IE_DESC = '壹電視'
     _VALID_URL = r'https?://(?:www\.)?nexttv\.com\.tw/(?:[^/]+/)+(?P<id>\d+)'
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/nexx.py b/plugins/youtube_download/yt_dlp/extractor/nexx.py
index b4874c8..ee1bc28 100644
--- a/plugins/youtube_download/yt_dlp/extractor/nexx.py
+++ b/plugins/youtube_download/yt_dlp/extractor/nexx.py
@@ -4,7 +4,6 @@ import re
 import time
 
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     ExtractorError,
     int_or_none,
@@ -41,7 +40,7 @@ class NexxIE(InfoExtractor):
             'timestamp': 1384264416,
             'upload_date': '20131112',
         },
-        'skip': 'Spiegel nexx CDNs are now disabled'
+        'skip': 'Spiegel nexx CDNs are now disabled',
     }, {
         # episode with captions
         'url': 'https://api.nexx.cloud/v3.1/741/videos/byid/1701834',
@@ -92,7 +91,7 @@ class NexxIE(InfoExtractor):
             'timestamp': 1527874460,
             'upload_date': '20180601',
         },
-        'skip': 'Spiegel nexx CDNs are now disabled'
+        'skip': 'Spiegel nexx CDNs are now disabled',
     }, {
         'url': 'https://api.nexxcdn.com/v3/748/videos/byid/128907',
         'only_matching': True,
@@ -128,8 +127,7 @@ class NexxIE(InfoExtractor):
                     r'(?is)onPLAYReady.+?_play\.(?:init|(?:control\.)?addPlayer)\s*\(.+?\s*,\s*["\']?(\d+)',
                     webpage):
                 entries.append(
-                    'https://api.nexx.cloud/v3/%s/videos/byid/%s'
-                    % (domain_id, video_id))
+                    f'https://api.nexx.cloud/v3/{domain_id}/videos/byid/{video_id}')
 
         # TODO: support more embed formats
 
@@ -137,20 +135,20 @@ class NexxIE(InfoExtractor):
 
     def _handle_error(self, response):
         if traverse_obj(response, ('metadata', 'notice'), expected_type=str):
-            self.report_warning('%s said: %s' % (self.IE_NAME, response['metadata']['notice']))
+            self.report_warning('{} said: {}'.format(self.IE_NAME, response['metadata']['notice']))
         status = int_or_none(try_get(
             response, lambda x: x['metadata']['status']) or 200)
         if 200 <= status < 300:
             return
         raise ExtractorError(
-            '%s said: %s' % (self.IE_NAME, response['metadata']['errorhint']),
+            '{} said: {}'.format(self.IE_NAME, response['metadata']['errorhint']),
             expected=True)
 
     def _call_api(self, domain_id, path, video_id, data=None, headers={}):
         headers['Content-Type'] = 'application/x-www-form-urlencoded; charset=UTF-8'
         result = self._download_json(
-            'https://api.nexx.cloud/v3/%s/%s' % (domain_id, path), video_id,
-            'Downloading %s JSON' % path, data=urlencode_postdata(data),
+            f'https://api.nexx.cloud/v3/{domain_id}/{path}', video_id,
+            f'Downloading {path} JSON', data=urlencode_postdata(data),
             headers=headers)
         self._handle_error(result)
         return result['result']
@@ -160,20 +158,20 @@ class NexxIE(InfoExtractor):
         cdn = stream_data['cdnType']
         assert cdn == 'free'
 
-        hash = video['general']['hash']
+        video_hash = video['general']['hash']
 
-        ps = compat_str(stream_data['originalDomain'])
+        ps = str(stream_data['originalDomain'])
         if stream_data['applyFolderHierarchy'] == 1:
             s = ('%04d' % int(video_id))[::-1]
-            ps += '/%s/%s' % (s[0:2], s[2:4])
-        ps += '/%s/%s_' % (video_id, hash)
+            ps += f'/{s[0:2]}/{s[2:4]}'
+        ps += f'/{video_id}/{video_hash}_'
 
         t = 'http://%s' + ps
         fd = stream_data['azureFileDistribution'].split(',')
         cdn_provider = stream_data['cdnProvider']
 
         def p0(p):
-            return '_%s' % p if stream_data['applyAzureStructure'] == 1 else ''
+            return f'_{p}' if stream_data['applyAzureStructure'] == 1 else ''
 
         formats = []
         if cdn_provider == 'ak':
@@ -191,10 +189,10 @@ class NexxIE(InfoExtractor):
             for i in fd:
                 p = i.split(':')
                 tbr = int(p[0])
-                filename = '%s%s%s.mp4' % (h, p[1], p0(tbr))
+                filename = f'{h}{p[1]}{p0(tbr)}.mp4'
                 f = {
                     'url': http_base + '/' + filename,
-                    'format_id': '%s-http-%d' % (cdn, tbr),
+                    'format_id': f'{cdn}-http-{tbr}',
                     'tbr': tbr,
                 }
                 width_height = p[1].split('x')
@@ -204,7 +202,7 @@ class NexxIE(InfoExtractor):
                         'height': int_or_none(width_height[1]),
                     })
                 formats.append(f)
-                a = filename + ':%s' % (tbr * 1000)
+                a = filename + f':{tbr * 1000}'
                 t += a + ','
             t = t[:-1] + '&audiostream=' + a.split(':')[0]
         else:
@@ -213,10 +211,10 @@ class NexxIE(InfoExtractor):
         if cdn_provider == 'ce':
             formats.extend(self._extract_mpd_formats(
                 t % (stream_data['cdnPathDASH'], 'mpd'), video_id,
-                mpd_id='%s-dash' % cdn, fatal=False))
+                mpd_id=f'{cdn}-dash', fatal=False))
         formats.extend(self._extract_m3u8_formats(
             t % (stream_data['cdnPathHLS'], 'm3u8'), video_id, 'mp4',
-            entry_protocol='m3u8_native', m3u8_id='%s-hls' % cdn, fatal=False))
+            entry_protocol='m3u8_native', m3u8_id=f'{cdn}-hls', fatal=False))
 
         return formats
 
@@ -231,9 +229,9 @@ class NexxIE(InfoExtractor):
 
         def get_cdn_shield_base(shield_type=''):
             for secure in ('', 's'):
-                cdn_shield = stream_data.get('cdnShield%sHTTP%s' % (shield_type, secure.upper()))
+                cdn_shield = stream_data.get(f'cdnShield{shield_type}HTTP{secure.upper()}')
                 if cdn_shield:
-                    return 'http%s://%s' % (secure, cdn_shield)
+                    return f'http{secure}://{cdn_shield}'
             return f'http://sdn-global-{"prog" if shield_type.lower() == "prog" else "streaming"}-cache.3qsdn.com/' + (f's/{protection_key}/' if protection_key else '')
 
         stream_base = get_cdn_shield_base()
@@ -256,7 +254,7 @@ class NexxIE(InfoExtractor):
             tbr = int_or_none(ss[1], scale=1000)
             formats.append({
                 'url': f'{progressive_base}{q_acc}/uploads/{q_acc}-{ss[2]}.webm',
-                'format_id': f'{cdn}-{ss[0]}{"-%s" % tbr if tbr else ""}',
+                'format_id': f'{cdn}-{ss[0]}{f"-{tbr}" if tbr else ""}',
                 'tbr': tbr,
             })
 
@@ -270,7 +268,7 @@ class NexxIE(InfoExtractor):
             width, height = ss[1].split('x') if len(ss[1].split('x')) == 2 else (None, None)
             f = {
                 'url': f'{progressive_base}{q_acc}/files/{q_prefix}/{q_locator}/{ss[2]}.mp4',
-                'format_id': f'{cdn}-http-{"-%s" % tbr if tbr else ""}',
+                'format_id': f'{cdn}-http-{f"-{tbr}" if tbr else ""}',
                 'tbr': tbr,
                 'width': int_or_none(width),
                 'height': int_or_none(height),
@@ -288,38 +286,37 @@ class NexxIE(InfoExtractor):
 
         def get_cdn_shield_base(shield_type='', static=False):
             for secure in ('', 's'):
-                cdn_shield = stream_data.get('cdnShield%sHTTP%s' % (shield_type, secure.upper()))
+                cdn_shield = stream_data.get(f'cdnShield{shield_type}HTTP{secure.upper()}')
                 if cdn_shield:
-                    return 'http%s://%s' % (secure, cdn_shield)
+                    return f'http{secure}://{cdn_shield}'
+            if 'fb' in stream_data['azureAccount']:
+                prefix = 'df' if static else 'f'
             else:
-                if 'fb' in stream_data['azureAccount']:
-                    prefix = 'df' if static else 'f'
-                else:
-                    prefix = 'd' if static else 'p'
-                account = int(stream_data['azureAccount'].replace('nexxplayplus', '').replace('nexxplayfb', ''))
-                return 'http://nx-%s%02d.akamaized.net/' % (prefix, account)
+                prefix = 'd' if static else 'p'
+            account = int(stream_data['azureAccount'].replace('nexxplayplus', '').replace('nexxplayfb', ''))
+            return 'http://nx-%s%02d.akamaized.net/' % (prefix, account)
 
         language = video['general'].get('language_raw') or ''
 
         azure_stream_base = get_cdn_shield_base()
         is_ml = ',' in language
-        azure_manifest_url = '%s%s/%s_src%s.ism/Manifest' % (
+        azure_manifest_url = '{}{}/{}_src{}.ism/Manifest'.format(
             azure_stream_base, azure_locator, video_id, ('_manifest' if is_ml else '')) + '%s'
 
         protection_token = try_get(
-            video, lambda x: x['protectiondata']['token'], compat_str)
+            video, lambda x: x['protectiondata']['token'], str)
         if protection_token:
-            azure_manifest_url += '?hdnts=%s' % protection_token
+            azure_manifest_url += f'?hdnts={protection_token}'
 
         formats = self._extract_m3u8_formats(
             azure_manifest_url % '(format=m3u8-aapl)',
             video_id, 'mp4', 'm3u8_native',
-            m3u8_id='%s-hls' % cdn, fatal=False)
+            m3u8_id=f'{cdn}-hls', fatal=False)
         formats.extend(self._extract_mpd_formats(
             azure_manifest_url % '(format=mpd-time-csf)',
-            video_id, mpd_id='%s-dash' % cdn, fatal=False))
+            video_id, mpd_id=f'{cdn}-dash', fatal=False))
         formats.extend(self._extract_ism_formats(
-            azure_manifest_url % '', video_id, ism_id='%s-mss' % cdn, fatal=False))
+            azure_manifest_url % '', video_id, ism_id=f'{cdn}-mss', fatal=False))
 
         azure_progressive_base = get_cdn_shield_base('Prog', True)
         azure_file_distribution = stream_data.get('azureFileDistribution')
@@ -332,9 +329,8 @@ class NexxIE(InfoExtractor):
                         tbr = int_or_none(ss[0])
                         if tbr:
                             f = {
-                                'url': '%s%s/%s_src_%s_%d.mp4' % (
-                                    azure_progressive_base, azure_locator, video_id, ss[1], tbr),
-                                'format_id': '%s-http-%d' % (cdn, tbr),
+                                'url': f'{azure_progressive_base}{azure_locator}/{video_id}_src_{ss[1]}_{tbr}.mp4',
+                                'format_id': f'{cdn}-http-{tbr}',
                                 'tbr': tbr,
                             }
                             width_height = ss[1].split('x')
@@ -365,7 +361,7 @@ class NexxIE(InfoExtractor):
             return None
 
         response = self._download_json(
-            'https://arc.nexx.cloud/api/video/%s.json' % video_id,
+            f'https://arc.nexx.cloud/api/video/{video_id}.json',
             video_id, fatal=False)
         if response and isinstance(response, dict):
             result = response.get('result')
@@ -375,9 +371,7 @@ class NexxIE(InfoExtractor):
         # not all videos work via arc, e.g. nexx:741:1269984
         if not video:
             # Reverse engineered from JS code (see getDeviceID function)
-            device_id = '%d:%d:%d%d' % (
-                random.randint(1, 4), int(time.time()),
-                random.randint(1e4, 99999), random.randint(1, 9))
+            device_id = f'{random.randint(1, 4)}:{int(time.time())}:{random.randint(10000, 99999)}{random.randint(1, 9)}'
 
             result = self._call_api(domain_id, 'session/init', video_id, data={
                 'nxp_devh': device_id,
@@ -416,10 +410,10 @@ class NexxIE(InfoExtractor):
             # Reversed from JS code for _play.api.call function (search for
             # X-Request-Token)
             request_token = hashlib.md5(
-                ''.join((op, domain_id, secret)).encode('utf-8')).hexdigest()
+                ''.join((op, domain_id, secret)).encode()).hexdigest()
 
             result = self._call_api(
-                domain_id, 'videos/%s/%s' % (op, video_id), video_id, data={
+                domain_id, f'videos/{op}/{video_id}', video_id, data={
                     'additionalfields': 'language,channel,format,licenseby,slug,fileversion,episode,season',
                     'addInteractionOptions': '1',
                     'addStatusDetails': '1',
@@ -460,13 +454,13 @@ class NexxIE(InfoExtractor):
                     'data': '\n\n'.join(
                         f'{i + 1}\n{srt_subtitles_timecode(line["fromms"] / 1000)} --> {srt_subtitles_timecode(line["toms"] / 1000)}\n{line["caption"]}'
                         for i, line in enumerate(sub['data'])),
-                    'name': sub.get('language_long') or sub.get('title')
+                    'name': sub.get('language_long') or sub.get('title'),
                 })
             elif sub.get('url'):
                 subtitles.setdefault(sub.get('language', 'en'), []).append({
                     'url': sub['url'],
                     'ext': sub.get('format'),
-                    'name': sub.get('language_long') or sub.get('title')
+                    'name': sub.get('language_long') or sub.get('title'),
                 })
 
         return {
@@ -477,7 +471,7 @@ class NexxIE(InfoExtractor):
             'release_year': int_or_none(general.get('year')),
             'creator': general.get('studio') or general.get('studio_adref') or None,
             'thumbnail': try_get(
-                video, lambda x: x['imagedata']['thumb'], compat_str),
+                video, lambda x: x['imagedata']['thumb'], str),
             'duration': parse_duration(general.get('runtime')),
             'timestamp': int_or_none(general.get('uploaded')),
             'episode_number': traverse_obj(
diff --git a/plugins/youtube_download/yt_dlp/extractor/nfb.py b/plugins/youtube_download/yt_dlp/extractor/nfb.py
index 38e068a..968c972 100644
--- a/plugins/youtube_download/yt_dlp/extractor/nfb.py
+++ b/plugins/youtube_download/yt_dlp/extractor/nfb.py
@@ -1,10 +1,52 @@
 from .common import InfoExtractor
-from ..utils import int_or_none
+from ..utils import (
+    int_or_none,
+    join_nonempty,
+    merge_dicts,
+    parse_count,
+    url_or_none,
+)
+from ..utils.traversal import traverse_obj
 
 
-class NFBIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?nfb\.ca/film/(?P<id>[^/?#&]+)'
+class NFBBaseIE(InfoExtractor):
+    _VALID_URL_BASE = r'https?://(?:www\.)?(?P<site>nfb|onf)\.ca'
+    _GEO_COUNTRIES = ['CA']
+
+    def _extract_ep_data(self, webpage, video_id, fatal=False):
+        return self._search_json(
+            r'episodesData\s*:', webpage, 'episode data', video_id, fatal=fatal) or {}
+
+    def _extract_ep_info(self, data, video_id, slug=None):
+        info = traverse_obj(data, (lambda _, v: video_id in v['embed_url'], {
+            'description': ('description', {str}),
+            'thumbnail': ('thumbnail_url', {url_or_none}),
+            'uploader': ('data_layer', 'episodeMaker', {str}),
+            'release_year': ('data_layer', 'episodeYear', {int_or_none}),
+            'episode': ('data_layer', 'episodeTitle', {str}),
+            'season': ('data_layer', 'seasonTitle', {str}),
+            'season_number': ('data_layer', 'seasonTitle', {parse_count}),
+            'series': ('data_layer', 'seriesTitle', {str}),
+        }), get_all=False)
+
+        return {
+            **info,
+            'id': video_id,
+            'title': join_nonempty('series', 'episode', from_dict=info, delim=' - '),
+            'episode_number': int_or_none(self._search_regex(
+                r'[/-]e(?:pisode)?-?(\d+)(?:[/-]|$)', slug or video_id, 'episode number', default=None)),
+        }
+
+
+class NFBIE(NFBBaseIE):
+    IE_NAME = 'nfb'
+    IE_DESC = 'nfb.ca and onf.ca films and episodes'
+    _VALID_URL = [
+        rf'{NFBBaseIE._VALID_URL_BASE}/(?P<type>film)/(?P<id>[^/?#&]+)',
+        rf'{NFBBaseIE._VALID_URL_BASE}/(?P<type>series?)/(?P<id>[^/?#&]+/s(?:ea|ai)son\d+/episode\d+)',
+    ]
     _TESTS = [{
+        'note': 'NFB film',
         'url': 'https://www.nfb.ca/film/trafficopter/',
         'info_dict': {
             'id': 'trafficopter',
@@ -14,45 +56,238 @@ class NFBIE(InfoExtractor):
             'thumbnail': r're:^https?://.*\.jpg$',
             'uploader': 'Barrie Howells',
             'release_year': 1972,
+            'duration': 600.0,
         },
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        'note': 'ONF film',
+        'url': 'https://www.onf.ca/film/mal-du-siecle/',
+        'info_dict': {
+            'id': 'mal-du-siecle',
+            'ext': 'mp4',
+            'title': 'Le mal du siècle',
+            'description': 'md5:1abf774d77569ebe603419f2d344102b',
+            'thumbnail': r're:^https?://.*\.jpg$',
+            'uploader': 'Catherine Lepage',
+            'release_year': 2019,
+            'duration': 300.0,
+        },
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        'note': 'NFB episode with English title',
+        'url': 'https://www.nfb.ca/series/true-north-inside-the-rise-of-toronto-basketball/season1/episode9/',
+        'info_dict': {
+            'id': 'true-north-episode9-true-north-finale-making-it',
+            'ext': 'mp4',
+            'title': 'True North: Inside the Rise of Toronto Basketball - Finale: Making It',
+            'description': 'We catch up with each player in the midst of their journey as they reflect on their road ahead.',
+            'series': 'True North: Inside the Rise of Toronto Basketball',
+            'release_year': 2018,
+            'season': 'Season 1',
+            'season_number': 1,
+            'episode': 'Finale: Making It',
+            'episode_number': 9,
+            'uploader': 'Ryan Sidhoo',
+            'thumbnail': r're:^https?://.*\.jpg$',
+        },
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        'note': 'ONF episode with French title',
+        'url': 'https://www.onf.ca/serie/direction-nord-la-montee-du-basketball-a-toronto/saison1/episode9/',
+        'info_dict': {
+            'id': 'direction-nord-episode-9',
+            'ext': 'mp4',
+            'title': 'Direction nord – La montée du basketball à Toronto - Finale : Réussir',
+            'description': 'md5:349a57419b71432b97bf6083d92b029d',
+            'series': 'Direction nord – La montée du basketball à Toronto',
+            'release_year': 2018,
+            'season': 'Saison 1',
+            'season_number': 1,
+            'episode': 'Finale : Réussir',
+            'episode_number': 9,
+            'uploader': 'Ryan Sidhoo',
+            'thumbnail': r're:^https?://.*\.jpg$',
+        },
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        'note': 'NFB episode with French title (needs geo-bypass)',
+        'url': 'https://www.nfb.ca/series/etoile-du-nord/saison1/episode1/',
+        'info_dict': {
+            'id': 'etoile-du-nord-episode-1-lobservation',
+            'ext': 'mp4',
+            'title': 'Étoile du Nord - L\'observation',
+            'description': 'md5:161a4617260dee3de70f509b2c9dd21b',
+            'series': 'Étoile du Nord',
+            'release_year': 2023,
+            'season': 'Saison 1',
+            'season_number': 1,
+            'episode': 'L\'observation',
+            'episode_number': 1,
+            'uploader': 'Patrick Bossé',
+            'thumbnail': r're:^https?://.*\.jpg$',
+        },
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        'note': 'ONF episode with English title (needs geo-bypass)',
+        'url': 'https://www.onf.ca/serie/north-star/season1/episode1/',
+        'info_dict': {
+            'id': 'north-star-episode-1-observation',
+            'ext': 'mp4',
+            'title': 'North Star - Observation',
+            'description': 'md5:c727f370839d8a817392b9e3f23655c7',
+            'series': 'North Star',
+            'release_year': 2023,
+            'season': 'Season 1',
+            'season_number': 1,
+            'episode': 'Observation',
+            'episode_number': 1,
+            'uploader': 'Patrick Bossé',
+            'thumbnail': r're:^https?://.*\.jpg$',
+        },
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        'note': 'NFB episode with /film/ URL and English title (needs geo-bypass)',
+        'url': 'https://www.nfb.ca/film/north-star-episode-1-observation/',
+        'info_dict': {
+            'id': 'north-star-episode-1-observation',
+            'ext': 'mp4',
+            'title': 'North Star - Observation',
+            'description': 'md5:c727f370839d8a817392b9e3f23655c7',
+            'series': 'North Star',
+            'release_year': 2023,
+            'season': 'Season 1',
+            'season_number': 1,
+            'episode': 'Observation',
+            'episode_number': 1,
+            'uploader': 'Patrick Bossé',
+            'thumbnail': r're:^https?://.*\.jpg$',
+        },
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        'note': 'ONF episode with /film/ URL and French title (needs geo-bypass)',
+        'url': 'https://www.onf.ca/film/etoile-du-nord-episode-1-lobservation/',
+        'info_dict': {
+            'id': 'etoile-du-nord-episode-1-lobservation',
+            'ext': 'mp4',
+            'title': 'Étoile du Nord - L\'observation',
+            'description': 'md5:161a4617260dee3de70f509b2c9dd21b',
+            'series': 'Étoile du Nord',
+            'release_year': 2023,
+            'season': 'Saison 1',
+            'season_number': 1,
+            'episode': 'L\'observation',
+            'episode_number': 1,
+            'uploader': 'Patrick Bossé',
+            'thumbnail': r're:^https?://.*\.jpg$',
+        },
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        'note': 'Season 2 episode w/o episode num in id, extract from json ld',
+        'url': 'https://www.onf.ca/film/liste-des-choses-qui-existent-saison-2-ours',
+        'info_dict': {
+            'id': 'liste-des-choses-qui-existent-saison-2-ours',
+            'ext': 'mp4',
+            'title': 'La liste des choses qui existent - L\'ours en peluche',
+            'description': 'md5:d5e8d8fc5f3a7385a9cf0f509b37e28a',
+            'series': 'La liste des choses qui existent',
+            'release_year': 2022,
+            'season': 'Saison 2',
+            'season_number': 2,
+            'episode': 'L\'ours en peluche',
+            'episode_number': 12,
+            'uploader': 'Francis Papillon',
+            'thumbnail': r're:^https?://.*\.jpg$',
+        },
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        'note': 'NFB film /embed/player/ page',
+        'url': 'https://www.nfb.ca/film/afterlife/embed/player/',
+        'info_dict': {
+            'id': 'afterlife',
+            'ext': 'mp4',
+            'title': 'Afterlife',
+            'description': 'md5:84951394f594f1fb1e62d9c43242fdf5',
+            'release_year': 1978,
+            'duration': 420.0,
+            'uploader': 'Ishu Patel',
+            'thumbnail': r're:^https?://.*\.jpg$',
+        },
+        'params': {'skip_download': 'm3u8'},
     }]
 
     def _real_extract(self, url):
-        video_id = self._match_id(url)
+        site, type_, slug = self._match_valid_url(url).group('site', 'type', 'id')
+        # Need to construct the URL since we match /embed/player/ URLs as well
+        webpage, urlh = self._download_webpage_handle(f'https://www.{site}.ca/{type_}/{slug}/', slug)
+        # type_ can change from film to serie(s) after redirect; new slug may have episode number
+        type_, slug = self._match_valid_url(urlh.url).group('type', 'id')
 
-        webpage = self._download_webpage('https://www.nfb.ca/film/%s/' % video_id, video_id)
+        player_data = self._search_json(
+            r'window\.PLAYER_OPTIONS\[[^\]]+\]\s*=', webpage, 'player data', slug)
+        video_id = self._match_id(player_data['overlay']['url'])  # overlay url always has unique slug
 
-        iframe = self._html_search_regex(
-            r'<[^>]+\bid=["\']player-iframe["\'][^>]*src=["\']([^"\']+)',
-            webpage, 'iframe', default=None, fatal=True)
-        if iframe.startswith('/'):
-            iframe = f'https://www.nfb.ca{iframe}'
+        formats, subtitles = self._extract_m3u8_formats_and_subtitles(
+            player_data['source'], video_id, 'mp4', m3u8_id='hls')
 
-        player = self._download_webpage(iframe, video_id)
+        if dv_source := url_or_none(player_data.get('dvSource')):
+            fmts, subs = self._extract_m3u8_formats_and_subtitles(
+                dv_source, video_id, 'mp4', m3u8_id='dv', preference=-2, fatal=False)
+            for fmt in fmts:
+                fmt['format_note'] = 'described video'
+            formats.extend(fmts)
+            self._merge_subtitles(subs, target=subtitles)
 
-        source = self._html_search_regex(
-            r'source:\s*\'([^\']+)',
-            player, 'source', default=None, fatal=True)
-
-        formats, subtitles = self._extract_m3u8_formats_and_subtitles(source, video_id, ext='mp4')
-
-        return {
+        info = {
             'id': video_id,
             'title': self._html_search_regex(
-                r'<[^>]+\bid=["\']titleHeader["\'][^>]*>\s*<h1[^>]*>\s*([^<]+?)\s*</h1>',
+                r'["\']nfb_version_title["\']\s*:\s*["\']([^"\']+)',
                 webpage, 'title', default=None),
             'description': self._html_search_regex(
                 r'<[^>]+\bid=["\']tabSynopsis["\'][^>]*>\s*<p[^>]*>\s*([^<]+)',
                 webpage, 'description', default=None),
-            'thumbnail': self._html_search_regex(
-                r'poster:\s*\'([^\']+)',
-                player, 'thumbnail', default=None),
+            'thumbnail': url_or_none(player_data.get('poster')),
             'uploader': self._html_search_regex(
-                r'<[^>]+\bitemprop=["\']name["\'][^>]*>([^<]+)',
-                webpage, 'uploader', default=None),
+                r'<[^>]+\bitemprop=["\']director["\'][^>]*>([^<]+)', webpage, 'uploader', default=None),
             'release_year': int_or_none(self._html_search_regex(
-                r'<[^>]+\bitemprop=["\']datePublished["\'][^>]*>([^<]+)',
+                r'["\']nfb_version_year["\']\s*:\s*["\']([^"\']+)',
                 webpage, 'release_year', default=None)),
+        } if type_ == 'film' else self._extract_ep_info(self._extract_ep_data(webpage, video_id, slug), video_id)
+
+        return merge_dicts({
             'formats': formats,
             'subtitles': subtitles,
-        }
+        }, info, self._search_json_ld(webpage, video_id, default={}))
+
+
+class NFBSeriesIE(NFBBaseIE):
+    IE_NAME = 'nfb:series'
+    IE_DESC = 'nfb.ca and onf.ca series'
+    _VALID_URL = rf'{NFBBaseIE._VALID_URL_BASE}/(?P<type>series?)/(?P<id>[^/?#&]+)/?(?:[?#]|$)'
+    _TESTS = [{
+        'url': 'https://www.nfb.ca/series/true-north-inside-the-rise-of-toronto-basketball/',
+        'playlist_mincount': 9,
+        'info_dict': {
+            'id': 'true-north-inside-the-rise-of-toronto-basketball',
+        },
+    }, {
+        'url': 'https://www.onf.ca/serie/la-liste-des-choses-qui-existent-serie/',
+        'playlist_mincount': 26,
+        'info_dict': {
+            'id': 'la-liste-des-choses-qui-existent-serie',
+        },
+    }]
+
+    def _entries(self, episodes):
+        for episode in traverse_obj(episodes, lambda _, v: NFBIE.suitable(v['embed_url'])):
+            mobj = NFBIE._match_valid_url(episode['embed_url'])
+            yield self.url_result(
+                mobj[0], NFBIE, **self._extract_ep_info([episode], mobj.group('id')))
+
+    def _real_extract(self, url):
+        site, type_, series_id = self._match_valid_url(url).group('site', 'type', 'id')
+        season_path = 'saison' if type_ == 'serie' else 'season'
+        webpage = self._download_webpage(
+            f'https://www.{site}.ca/{type_}/{series_id}/{season_path}1/episode1', series_id)
+        episodes = self._extract_ep_data(webpage, series_id, fatal=True)
+
+        return self.playlist_result(self._entries(episodes), series_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/nfhsnetwork.py b/plugins/youtube_download/yt_dlp/extractor/nfhsnetwork.py
index febad8f..ec746ec 100644
--- a/plugins/youtube_download/yt_dlp/extractor/nfhsnetwork.py
+++ b/plugins/youtube_download/yt_dlp/extractor/nfhsnetwork.py
@@ -1,11 +1,5 @@
 from .common import InfoExtractor
-
-
-from ..utils import (
-    try_get,
-    unified_strdate,
-    unified_timestamp
-)
+from ..utils import try_get, unified_strdate, unified_timestamp
 
 
 class NFHSNetworkIE(InfoExtractor):
@@ -23,12 +17,12 @@ class NFHSNetworkIE(InfoExtractor):
             'uploader_url': 'https://www.nfhsnetwork.com/schools/rockford-high-school-rockford-mi',
             'location': 'Rockford, Michigan',
             'timestamp': 1616859000,
-            'upload_date': '20210327'
+            'upload_date': '20210327',
         },
         'params': {
             # m3u8 download
             'skip_download': True,
-        }
+        },
     }, {
         # Non-sport activity with description
         'url': 'https://www.nfhsnetwork.com/events/limon-high-school-limon-co/evt4a30e3726c',
@@ -42,12 +36,12 @@ class NFHSNetworkIE(InfoExtractor):
             'uploader_url': 'https://www.nfhsnetwork.com/schools/limon-high-school-limon-co',
             'location': 'Limon, Colorado',
             'timestamp': 1607893200,
-            'upload_date': '20201213'
+            'upload_date': '20201213',
         },
         'params': {
             # m3u8 download
             'skip_download': True,
-        }
+        },
     }, {
         # Postseason game
         'url': 'https://www.nfhsnetwork.com/events/nfhs-network-special-events/dd8de71d45',
@@ -60,12 +54,12 @@ class NFHSNetworkIE(InfoExtractor):
             'uploader_url': 'https://www.nfhsnetwork.com/affiliates/socal-sports-productions',
             'location': 'San Diego, California',
             'timestamp': 1451187000,
-            'upload_date': '20151226'
+            'upload_date': '20151226',
         },
         'params': {
             # m3u8 download
             'skip_download': True,
-        }
+        },
     }, {
         # Video with no broadcasts object
         'url': 'https://www.nfhsnetwork.com/events/wiaa-wi/9aa2f92f82',
@@ -79,13 +73,13 @@ class NFHSNetworkIE(InfoExtractor):
             'uploader_url': 'https://www.nfhsnetwork.com/associations/wiaa-wi',
             'location': 'Stevens Point, Wisconsin',
             'timestamp': 1421856000,
-            'upload_date': '20150121'
+            'upload_date': '20150121',
         },
         'params': {
             # m3u8 download
             'skip_download': True,
-        }
-    }
+        },
+    },
     ]
 
     def _real_extract(self, url):
@@ -97,17 +91,17 @@ class NFHSNetworkIE(InfoExtractor):
         publisher = data.get('publishers')[0]  # always exists
         broadcast = (publisher.get('broadcasts') or publisher.get('vods'))[0]  # some (older) videos don't have a broadcasts object
         uploader = publisher.get('formatted_name') or publisher.get('name')
-        uploaderID = publisher.get('publisher_key')
-        pubType = publisher.get('type')
-        uploaderPrefix = (
-            "schools" if pubType == "school"
-            else "associations" if "association" in pubType
-            else "affiliates" if (pubType == "publisher" or pubType == "affiliate")
-            else "schools")
-        uploaderPage = 'https://www.nfhsnetwork.com/%s/%s' % (uploaderPrefix, publisher.get('slug'))
-        location = '%s, %s' % (data.get('city'), data.get('state_name'))
+        uploader_id = publisher.get('publisher_key')
+        pub_type = publisher.get('type')
+        uploader_prefix = (
+            'schools' if pub_type == 'school'
+            else 'associations' if 'association' in pub_type
+            else 'affiliates' if (pub_type == 'publisher' or pub_type == 'affiliate')
+            else 'schools')
+        uploader_page = 'https://www.nfhsnetwork.com/{}/{}'.format(uploader_prefix, publisher.get('slug'))
+        location = '{}, {}'.format(data.get('city'), data.get('state_name'))
         description = broadcast.get('description')
-        isLive = broadcast.get('on_air') or broadcast.get('status') == 'on_air' or False
+        is_live = broadcast.get('on_air') or broadcast.get('status') == 'on_air' or False
 
         timestamp = unified_timestamp(data.get('local_start_time'))
         upload_date = unified_strdate(data.get('local_start_time'))
@@ -117,13 +111,13 @@ class NFHSNetworkIE(InfoExtractor):
             or self._html_search_regex(r'<h1 class="sr-hidden">(.*?)</h1>', webpage, 'title'))
         title = title.split('|')[0].strip()
 
-        video_type = 'broadcasts' if isLive else 'vods'
-        key = broadcast.get('key') if isLive else try_get(publisher, lambda x: x['vods'][0]['key'])
+        video_type = 'broadcasts' if is_live else 'vods'
+        key = broadcast.get('key') if is_live else try_get(publisher, lambda x: x['vods'][0]['key'])
         m3u8_url = self._download_json(
-            'https://cfunity.nfhsnetwork.com/v2/%s/%s/url' % (video_type, key),
+            f'https://cfunity.nfhsnetwork.com/v2/{video_type}/{key}/url',
             video_id).get('video_url')
 
-        formats = self._extract_m3u8_formats(m3u8_url, video_id, 'mp4', live=isLive)
+        formats = self._extract_m3u8_formats(m3u8_url, video_id, 'mp4', live=is_live)
 
         return {
             'id': video_id,
@@ -132,10 +126,10 @@ class NFHSNetworkIE(InfoExtractor):
             'description': description,
             'timestamp': timestamp,
             'uploader': uploader,
-            'uploader_id': uploaderID,
-            'uploader_url': uploaderPage,
+            'uploader_id': uploader_id,
+            'uploader_url': uploader_page,
             'location': location,
             'upload_date': upload_date,
-            'is_live': isLive,
+            'is_live': is_live,
             '_format_sort_fields': ('res', 'tbr'),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/nfl.py b/plugins/youtube_download/yt_dlp/extractor/nfl.py
index cc3f449..59213a4 100644
--- a/plugins/youtube_download/yt_dlp/extractor/nfl.py
+++ b/plugins/youtube_download/yt_dlp/extractor/nfl.py
@@ -11,9 +11,12 @@ from ..utils import (
     clean_html,
     determine_ext,
     get_element_by_class,
-    traverse_obj,
+    int_or_none,
+    make_archive_id,
+    url_or_none,
     urlencode_postdata,
 )
+from ..utils.traversal import traverse_obj
 
 
 class NFLBaseIE(InfoExtractor):
@@ -64,38 +67,133 @@ class NFLBaseIE(InfoExtractor):
     _VIDEO_CONFIG_REGEX = r'<script[^>]+id="[^"]*video-config-[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}[^"]*"[^>]*>\s*({.+});?\s*</script>'
     _ANVATO_PREFIX = 'anvato:GXvEgwyJeWem8KCYXfeoHWknwP48Mboj:'
 
+    _CLIENT_DATA = {
+        'clientKey': '4cFUW6DmwJpzT9L7LrG3qRAcABG5s04g',
+        'clientSecret': 'CZuvCL49d9OwfGsR',
+        'deviceId': str(uuid.uuid4()),
+        'deviceInfo': base64.b64encode(json.dumps({
+            'model': 'desktop',
+            'version': 'Chrome',
+            'osName': 'Windows',
+            'osVersion': '10.0',
+        }, separators=(',', ':')).encode()).decode(),
+        'networkType': 'other',
+        'peacockUUID': 'undefined',
+    }
+    _ACCOUNT_INFO = {}
+    _API_KEY = '3_Qa8TkWpIB8ESCBT8tY2TukbVKgO5F6BJVc7N1oComdwFzI7H2L9NOWdm11i_BY9f'
+
+    _TOKEN = None
+    _TOKEN_EXPIRY = 0
+
+    def _get_account_info(self):
+        cookies = self._get_cookies('https://auth-id.nfl.com/')
+        login_token = traverse_obj(cookies, (
+            (f'glt_{self._API_KEY}', lambda k, _: k.startswith('glt_')), {lambda x: x.value}), get_all=False)
+        if not login_token:
+            self.raise_login_required()
+        if 'ucid' not in cookies:
+            raise ExtractorError(
+                'Required cookies for the auth-id.nfl.com domain were not found among passed cookies. '
+                'If using --cookies, these cookies must be exported along with .nfl.com cookies, '
+                'or else try using --cookies-from-browser instead', expected=True)
+
+        account = self._download_json(
+            'https://auth-id.nfl.com/accounts.getAccountInfo', None,
+            note='Downloading account info', data=urlencode_postdata({
+                'include': 'profile,data',
+                'lang': 'en',
+                'APIKey': self._API_KEY,
+                'sdk': 'js_latest',
+                'login_token': login_token,
+                'authMode': 'cookie',
+                'pageURL': 'https://www.nfl.com/',
+                'sdkBuild': traverse_obj(cookies, (
+                    'gig_canary_ver', {lambda x: x.value.partition('-')[0]}), default='15170'),
+                'format': 'json',
+            }), headers={'Content-Type': 'application/x-www-form-urlencoded'})
+
+        self._ACCOUNT_INFO = traverse_obj(account, {
+            'signatureTimestamp': 'signatureTimestamp',
+            'uid': 'UID',
+            'uidSignature': 'UIDSignature',
+        })
+
+        if len(self._ACCOUNT_INFO) != 3:
+            raise ExtractorError('Failed to retrieve account info with provided cookies', expected=True)
+
+    def _get_auth_token(self):
+        if self._TOKEN and self._TOKEN_EXPIRY > int(time.time() + 30):
+            return
+
+        token = self._download_json(
+            'https://api.nfl.com/identity/v3/token%s' % (
+                '/refresh' if self._ACCOUNT_INFO.get('refreshToken') else ''),
+            None, headers={'Content-Type': 'application/json'}, note='Downloading access token',
+            data=json.dumps({**self._CLIENT_DATA, **self._ACCOUNT_INFO}, separators=(',', ':')).encode())
+
+        self._TOKEN = token['accessToken']
+        self._TOKEN_EXPIRY = token['expiresIn']
+        self._ACCOUNT_INFO['refreshToken'] = token['refreshToken']
+
+    def _extract_video(self, mcp_id, is_live=False):
+        self._get_auth_token()
+        data = self._download_json(
+            f'https://api.nfl.com/play/v1/asset/{mcp_id}', mcp_id, headers={
+                'Authorization': f'Bearer {self._TOKEN}',
+                'Accept': 'application/json',
+                'Content-Type': 'application/json',
+            }, data=json.dumps({'init': True, 'live': is_live}, separators=(',', ':')).encode())
+        formats, subtitles = self._extract_m3u8_formats_and_subtitles(
+            data['accessUrl'], mcp_id, 'mp4', m3u8_id='hls')
+
+        return {
+            'id': mcp_id,
+            'formats': formats,
+            'subtitles': subtitles,
+            'is_live': is_live,
+            '_old_archive_ids': [make_archive_id(AnvatoIE, mcp_id)],
+            **traverse_obj(data, ('metadata', {
+                'title': ('event', ('def_title', 'friendlyName'), {str}, any),
+                'description': ('event', 'def_description', {str}),
+                'duration': ('event', 'duration', {int_or_none}),
+                'thumbnails': ('thumbnails', ..., 'url', {'url': {url_or_none}}),
+            })),
+        }
+
     def _parse_video_config(self, video_config, display_id):
         video_config = self._parse_json(video_config, display_id)
+        is_live = traverse_obj(video_config, ('live', {bool})) or False
         item = video_config['playlist'][0]
-        mcp_id = item.get('mcpID')
-        if mcp_id:
-            info = self.url_result(f'{self._ANVATO_PREFIX}{mcp_id}', AnvatoIE, mcp_id)
+        if mcp_id := item.get('mcpID'):
+            return self._extract_video(mcp_id, is_live=is_live)
+
+        info = {'id': item.get('id') or item['entityId']}
+
+        item_url = item['url']
+        ext = determine_ext(item_url)
+        if ext == 'm3u8':
+            info['formats'] = self._extract_m3u8_formats(item_url, info['id'], 'mp4')
         else:
-            media_id = item.get('id') or item['entityId']
-            title = item.get('title')
-            item_url = item['url']
-            info = {'id': media_id}
-            ext = determine_ext(item_url)
-            if ext == 'm3u8':
-                info['formats'] = self._extract_m3u8_formats(item_url, media_id, 'mp4')
-            else:
-                info['url'] = item_url
-                if item.get('audio') is True:
-                    info['vcodec'] = 'none'
-            is_live = video_config.get('live') is True
-            thumbnails = None
-            image_url = item.get(item.get('imageSrc')) or item.get(item.get('posterImage'))
-            if image_url:
-                thumbnails = [{
-                    'url': image_url,
-                    'ext': determine_ext(image_url, 'jpg'),
-                }]
-            info.update({
-                'title': title,
-                'is_live': is_live,
-                'description': clean_html(item.get('description')),
-                'thumbnails': thumbnails,
-            })
+            info['url'] = item_url
+            if item.get('audio') is True:
+                info['vcodec'] = 'none'
+
+        thumbnails = None
+        if image_url := traverse_obj(item, 'imageSrc', 'posterImage', expected_type=url_or_none):
+            thumbnails = [{
+                'url': image_url,
+                'ext': determine_ext(image_url, 'jpg'),
+            }]
+
+        info.update({
+            **traverse_obj(item, {
+                'title': ('title', {str}),
+                'description': ('description', {clean_html}),
+            }),
+            'is_live': is_live,
+            'thumbnails': thumbnails,
+        })
         return info
 
 
@@ -109,24 +207,20 @@ class NFLIE(NFLBaseIE):
             'ext': 'mp4',
             'title': "Baker Mayfield's game-changing plays from 3-TD game Week 14",
             'description': 'md5:85e05a3cc163f8c344340f220521136d',
-            'upload_date': '20201215',
-            'timestamp': 1608009755,
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'uploader': 'NFL',
-            'tags': 'count:6',
+            'thumbnail': r're:https?://.+\.jpg',
             'duration': 157,
-            'categories': 'count:3',
-        }
+            '_old_archive_ids': ['anvato 899441'],
+        },
     }, {
         'url': 'https://www.chiefs.com/listen/patrick-mahomes-travis-kelce-react-to-win-over-dolphins-the-breakdown',
-        'md5': '6886b32c24b463038c760ceb55a34566',
+        'md5': '92a517f05bd3eb50fe50244bc621aec8',
         'info_dict': {
-            'id': 'd87e8790-3e14-11eb-8ceb-ff05c2867f99',
+            'id': '8b7c3625-a461-4751-8db4-85f536f2bbd0',
             'ext': 'mp3',
             'title': 'Patrick Mahomes, Travis Kelce React to Win Over Dolphins | The Breakdown',
             'description': 'md5:12ada8ee70e6762658c30e223e095075',
+            'thumbnail': 'https://static.clubs.nfl.com/image/private/t_editorial_landscape_12_desktop/v1571153441/chiefs/rfljejccnyhhkpkfq855',
         },
-        'skip': 'HTTP Error 404: Not Found',
     }, {
         'url': 'https://www.buffalobills.com/video/buffalo-bills-military-recognition-week-14',
         'only_matching': True,
@@ -157,18 +251,21 @@ class NFLArticleIE(NFLBaseIE):
     def _real_extract(self, url):
         display_id = self._match_id(url)
         webpage = self._download_webpage(url, display_id)
-        entries = []
-        for video_config in re.findall(self._VIDEO_CONFIG_REGEX, webpage):
-            entries.append(self._parse_video_config(video_config, display_id))
+
+        def entries():
+            for video_config in re.findall(self._VIDEO_CONFIG_REGEX, webpage):
+                yield self._parse_video_config(video_config, display_id)
+
         title = clean_html(get_element_by_class(
             'nfl-c-article__title', webpage)) or self._html_search_meta(
             ['og:title', 'twitter:title'], webpage)
-        return self.playlist_result(entries, display_id, title)
+
+        return self.playlist_result(entries(), display_id, title)
 
 
 class NFLPlusReplayIE(NFLBaseIE):
     IE_NAME = 'nfl.com:plus:replay'
-    _VALID_URL = r'https?://(?:www\.)?nfl.com/plus/games/[\w-]+/(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:www\.)?nfl\.com/plus/games/(?P<slug>[\w-]+)(?:/(?P<id>\d+))?'
     _TESTS = [{
         'url': 'https://www.nfl.com/plus/games/giants-at-vikings-2022-post-1/1572108',
         'info_dict': {
@@ -185,23 +282,94 @@ class NFLPlusReplayIE(NFLBaseIE):
             'thumbnail': r're:^https?://.*\.jpg',
         },
         'params': {'skip_download': 'm3u8'},
+    }, {
+        'note': 'Subscription required',
+        'url': 'https://www.nfl.com/plus/games/giants-at-vikings-2022-post-1',
+        'playlist_count': 4,
+        'info_dict': {
+            'id': 'giants-at-vikings-2022-post-1',
+        },
+    }, {
+        'note': 'Subscription required',
+        'url': 'https://www.nfl.com/plus/games/giants-at-patriots-2011-pre-4',
+        'playlist_count': 2,
+        'info_dict': {
+            'id': 'giants-at-patriots-2011-pre-4',
+        },
+    }, {
+        'note': 'Subscription required',
+        'url': 'https://www.nfl.com/plus/games/giants-at-patriots-2011-pre-4',
+        'info_dict': {
+            'id': '950701',
+            'ext': 'mp4',
+            'title': 'Giants @ Patriots',
+            'description': 'Giants at Patriots on September 01, 2011',
+            'uploader': 'NFL',
+            'upload_date': '20210724',
+            'timestamp': 1627085874,
+            'duration': 1532,
+            'categories': ['Game Highlights'],
+            'tags': ['play-by-play'],
+            'thumbnail': r're:^https?://.*\.jpg',
+        },
+        'params': {
+            'skip_download': 'm3u8',
+            'extractor_args': {'nflplusreplay': {'type': ['condensed_game']}},
+        },
     }]
 
+    _REPLAY_TYPES = {
+        'full_game': 'Full Game',
+        'full_game_spanish': 'Full Game - Spanish',
+        'condensed_game': 'Condensed Game',
+        'all_22': 'All-22',
+    }
+
+    def _real_initialize(self):
+        self._get_account_info()
+
     def _real_extract(self, url):
-        video_id = self._match_id(url)
-        return self.url_result(f'{self._ANVATO_PREFIX}{video_id}', AnvatoIE, video_id)
+        slug, video_id = self._match_valid_url(url).group('slug', 'id')
+        requested_types = self._configuration_arg('type', ['all'])
+        if 'all' in requested_types:
+            requested_types = list(self._REPLAY_TYPES.keys())
+        requested_types = traverse_obj(self._REPLAY_TYPES, (None, requested_types))
+
+        if not video_id:
+            self._get_auth_token()
+            headers = {'Authorization': f'Bearer {self._TOKEN}'}
+            game_id = self._download_json(
+                f'https://api.nfl.com/football/v2/games/externalId/slug/{slug}', slug,
+                'Downloading game ID', query={'withExternalIds': 'true'}, headers=headers)['id']
+            replays = self._download_json(
+                'https://api.nfl.com/content/v1/videos/replays', slug, 'Downloading replays JSON',
+                query={'gameId': game_id}, headers=headers)
+            if len(requested_types) == 1:
+                video_id = traverse_obj(replays, (
+                    'items', lambda _, v: v['subType'] == requested_types[0], 'mcpPlaybackId'), get_all=False)
+
+        if video_id:
+            return self._extract_video(video_id)
+
+        def entries():
+            for replay in traverse_obj(
+                replays, ('items', lambda _, v: v['mcpPlaybackId'] and v['subType'] in requested_types),
+            ):
+                yield self._extract_video(replay['mcpPlaybackId'])
+
+        return self.playlist_result(entries(), slug)
 
 
 class NFLPlusEpisodeIE(NFLBaseIE):
     IE_NAME = 'nfl.com:plus:episode'
-    _VALID_URL = r'https?://(?:www\.)?nfl.com/plus/episodes/(?P<id>[\w-]+)'
+    _VALID_URL = r'https?://(?:www\.)?nfl\.com/plus/episodes/(?P<id>[\w-]+)'
     _TESTS = [{
-        'note': 'premium content',
+        'note': 'Subscription required',
         'url': 'https://www.nfl.com/plus/episodes/kurt-s-qb-insider-conference-championships',
         'info_dict': {
             'id': '1576832',
             'ext': 'mp4',
-            'title': 'Kurt\'s QB Insider: Conference Championships',
+            'title': 'Conference Championships',
             'description': 'md5:944f7fab56f7a37430bf8473f5473857',
             'uploader': 'NFL',
             'upload_date': '20230127',
@@ -214,88 +382,15 @@ class NFLPlusEpisodeIE(NFLBaseIE):
         'params': {'skip_download': 'm3u8'},
     }]
 
-    _CLIENT_DATA = {
-        'clientKey': '4cFUW6DmwJpzT9L7LrG3qRAcABG5s04g',
-        'clientSecret': 'CZuvCL49d9OwfGsR',
-        'deviceId': str(uuid.uuid4()),
-        'deviceInfo': base64.b64encode(json.dumps({
-            'model': 'desktop',
-            'version': 'Chrome',
-            'osName': 'Windows',
-            'osVersion': '10.0',
-        }, separators=(',', ':')).encode()).decode(),
-        'networkType': 'other',
-        'nflClaimGroupsToAdd': [],
-        'nflClaimGroupsToRemove': [],
-    }
-    _ACCOUNT_INFO = {}
-    _API_KEY = None
-
-    _TOKEN = None
-    _TOKEN_EXPIRY = 0
-
-    def _get_account_info(self, url, video_id):
-        cookies = self._get_cookies('https://www.nfl.com/')
-        login_token = traverse_obj(cookies, (
-            (f'glt_{self._API_KEY}', f'gig_loginToken_{self._API_KEY}',
-             lambda k, _: k.startswith('glt_') or k.startswith('gig_loginToken_')),
-            {lambda x: x.value}), get_all=False)
-        if not login_token:
-            self.raise_login_required()
-
-        account = self._download_json(
-            'https://auth-id.nfl.com/accounts.getAccountInfo', video_id,
-            note='Downloading account info', data=urlencode_postdata({
-                'include': 'profile,data',
-                'lang': 'en',
-                'APIKey': self._API_KEY,
-                'sdk': 'js_latest',
-                'login_token': login_token,
-                'authMode': 'cookie',
-                'pageURL': url,
-                'sdkBuild': traverse_obj(cookies, (
-                    'gig_canary_ver', {lambda x: x.value.partition('-')[0]}), default='13642'),
-                'format': 'json',
-            }), headers={'Content-Type': 'application/x-www-form-urlencoded'})
-
-        self._ACCOUNT_INFO = traverse_obj(account, {
-            'signatureTimestamp': 'signatureTimestamp',
-            'uid': 'UID',
-            'uidSignature': 'UIDSignature',
-        })
-
-        if len(self._ACCOUNT_INFO) != 3:
-            raise ExtractorError('Failed to retrieve account info with provided cookies', expected=True)
-
-    def _get_auth_token(self, url, video_id):
-        if not self._ACCOUNT_INFO:
-            self._get_account_info(url, video_id)
-
-        token = self._download_json(
-            'https://api.nfl.com/identity/v3/token%s' % (
-                '/refresh' if self._ACCOUNT_INFO.get('refreshToken') else ''),
-            video_id, headers={'Content-Type': 'application/json'}, note='Downloading access token',
-            data=json.dumps({**self._CLIENT_DATA, **self._ACCOUNT_INFO}, separators=(',', ':')).encode())
-
-        self._TOKEN = token['accessToken']
-        self._TOKEN_EXPIRY = token['expiresIn']
-        self._ACCOUNT_INFO['refreshToken'] = token['refreshToken']
+    def _real_initialize(self):
+        self._get_account_info()
 
     def _real_extract(self, url):
         slug = self._match_id(url)
-
-        if not self._API_KEY:
-            webpage = self._download_webpage(url, slug, fatal=False) or ''
-            self._API_KEY = self._search_regex(
-                r'window\.gigyaApiKey=["\'](\w+)["\'];', webpage, 'API key',
-                default='3_Qa8TkWpIB8ESCBT8tY2TukbVKgO5F6BJVc7N1oComdwFzI7H2L9NOWdm11i_BY9f')
-
-        if not self._TOKEN or self._TOKEN_EXPIRY <= int(time.time()):
-            self._get_auth_token(url, slug)
-
+        self._get_auth_token()
         video_id = self._download_json(
             f'https://api.nfl.com/content/v1/videos/episodes/{slug}', slug, headers={
                 'Authorization': f'Bearer {self._TOKEN}',
             })['mcpPlaybackId']
 
-        return self.url_result(f'{self._ANVATO_PREFIX}{video_id}', AnvatoIE, video_id)
+        return self._extract_video(video_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/nhk.py b/plugins/youtube_download/yt_dlp/extractor/nhk.py
index fbd6a18..0bd6edf 100644
--- a/plugins/youtube_download/yt_dlp/extractor/nhk.py
+++ b/plugins/youtube_download/yt_dlp/extractor/nhk.py
@@ -3,10 +3,15 @@ import re
 from .common import InfoExtractor
 from ..utils import (
     ExtractorError,
+    clean_html,
+    filter_dict,
+    get_element_by_class,
     int_or_none,
     join_nonempty,
     parse_duration,
+    remove_end,
     traverse_obj,
+    try_call,
     unescapeHTML,
     unified_timestamp,
     url_or_none,
@@ -16,8 +21,7 @@ from ..utils import (
 
 class NhkBaseIE(InfoExtractor):
     _API_URL_TEMPLATE = 'https://nwapi.nhk.jp/nhkworld/%sod%slist/v7b/%s/%s/%s/all%s.json'
-    _BASE_URL_REGEX = r'https?://www3\.nhk\.or\.jp/nhkworld/(?P<lang>[a-z]{2})/ondemand'
-    _TYPE_REGEX = r'/(?P<type>video|audio)/'
+    _BASE_URL_REGEX = r'https?://www3\.nhk\.or\.jp/nhkworld/(?P<lang>[a-z]{2})/'
 
     def _call_api(self, m_id, lang, is_video, is_episode, is_clip):
         return self._download_json(
@@ -28,21 +32,71 @@ class NhkBaseIE(InfoExtractor):
                 m_id, lang, '/all' if is_video else ''),
             m_id, query={'apikey': 'EJfK8jdS57GqlupFgAfAAwr573q01y6k'})['data']['episodes'] or []
 
+    def _get_api_info(self, refresh=True):
+        if not refresh:
+            return self.cache.load('nhk', 'api_info')
+
+        self.cache.store('nhk', 'api_info', {})
+        movie_player_js = self._download_webpage(
+            'https://movie-a.nhk.or.jp/world/player/js/movie-player.js', None,
+            note='Downloading stream API information')
+        api_info = {
+            'url': self._search_regex(
+                r'prod:[^;]+\bapiUrl:\s*[\'"]([^\'"]+)[\'"]', movie_player_js, None, 'stream API url'),
+            'token': self._search_regex(
+                r'prod:[^;]+\btoken:\s*[\'"]([^\'"]+)[\'"]', movie_player_js, None, 'stream API token'),
+        }
+        self.cache.store('nhk', 'api_info', api_info)
+        return api_info
+
+    def _extract_stream_info(self, vod_id):
+        for refresh in (False, True):
+            api_info = self._get_api_info(refresh)
+            if not api_info:
+                continue
+
+            api_url = api_info.pop('url')
+            meta = traverse_obj(
+                self._download_json(
+                    api_url, vod_id, 'Downloading stream url info', fatal=False, query={
+                        **api_info,
+                        'type': 'json',
+                        'optional_id': vod_id,
+                        'active_flg': 1,
+                    }), ('meta', 0))
+            stream_url = traverse_obj(
+                meta, ('movie_url', ('mb_auto', 'auto_sp', 'auto_pc'), {url_or_none}), get_all=False)
+
+            if stream_url:
+                formats, subtitles = self._extract_m3u8_formats_and_subtitles(stream_url, vod_id)
+                return {
+                    **traverse_obj(meta, {
+                        'duration': ('duration', {int_or_none}),
+                        'timestamp': ('publication_date', {unified_timestamp}),
+                        'release_timestamp': ('insert_date', {unified_timestamp}),
+                        'modified_timestamp': ('update_date', {unified_timestamp}),
+                    }),
+                    'formats': formats,
+                    'subtitles': subtitles,
+                }
+        raise ExtractorError('Unable to extract stream url')
+
     def _extract_episode_info(self, url, episode=None):
         fetch_episode = episode is None
-        lang, m_type, episode_id = NhkVodIE._match_valid_url(url).groups()
-        if len(episode_id) == 7:
+        lang, m_type, episode_id = NhkVodIE._match_valid_url(url).group('lang', 'type', 'id')
+        is_video = m_type != 'audio'
+
+        if is_video:
             episode_id = episode_id[:4] + '-' + episode_id[4:]
 
-        is_video = m_type == 'video'
         if fetch_episode:
             episode = self._call_api(
                 episode_id, lang, is_video, True, episode_id[:4] == '9999')[0]
-        title = episode.get('sub_title_clean') or episode['sub_title']
 
         def get_clean_field(key):
-            return episode.get(key + '_clean') or episode.get(key)
+            return clean_html(episode.get(key + '_clean') or episode.get(key))
 
+        title = get_clean_field('sub_title')
         series = get_clean_field('title')
 
         thumbnails = []
@@ -51,33 +105,44 @@ class NhkBaseIE(InfoExtractor):
             if not img_path:
                 continue
             thumbnails.append({
-                'id': '%dp' % h,
+                'id': f'{h}p',
                 'height': h,
                 'width': w,
                 'url': 'https://www3.nhk.or.jp' + img_path,
             })
 
+        episode_name = title
+        if series and title:
+            title = f'{series} - {title}'
+        elif series and not title:
+            title = series
+            series = None
+            episode_name = None
+        else:  # title, no series
+            episode_name = None
+
         info = {
             'id': episode_id + '-' + lang,
-            'title': '%s - %s' % (series, title) if series and title else title,
+            'title': title,
             'description': get_clean_field('description'),
             'thumbnails': thumbnails,
             'series': series,
-            'episode': title,
+            'episode': episode_name,
         }
+
         if is_video:
             vod_id = episode['vod_id']
             info.update({
-                '_type': 'url_transparent',
-                'ie_key': 'Piksel',
-                'url': 'https://movie-s.nhk.or.jp/v/refid/nhkworld/prefid/' + vod_id,
+                **self._extract_stream_info(vod_id),
                 'id': vod_id,
             })
+
         else:
             if fetch_episode:
-                audio_path = episode['audio']['audio']
+                # From https://www3.nhk.or.jp/nhkworld/common/player/radio/inline/rod.html
+                audio_path = remove_end(episode['audio']['audio'], '.m4a')
                 info['formats'] = self._extract_m3u8_formats(
-                    'https://nhkworld-vh.akamaihd.net/i%s/master.m3u8' % audio_path,
+                    f'{urljoin("https://vod-stream.nhk.jp", audio_path)}/index.m3u8',
                     episode_id, 'm4a', entry_protocol='m3u8_native',
                     m3u8_id='hls', fatal=False)
                 for f in info['formats']:
@@ -92,48 +157,63 @@ class NhkBaseIE(InfoExtractor):
 
 
 class NhkVodIE(NhkBaseIE):
-    # the 7-character IDs can have alphabetic chars too: assume [a-z] rather than just [a-f], eg
-    _VALID_URL = r'%s%s(?P<id>[0-9a-z]{7}|[^/]+?-\d{8}-[0-9a-z]+)' % (NhkBaseIE._BASE_URL_REGEX, NhkBaseIE._TYPE_REGEX)
+    _VALID_URL = [
+        rf'{NhkBaseIE._BASE_URL_REGEX}shows/(?:(?P<type>video)/)?(?P<id>\d{{4}}[\da-z]\d+)/?(?:$|[?#])',
+        rf'{NhkBaseIE._BASE_URL_REGEX}(?:ondemand|shows)/(?P<type>audio)/(?P<id>[^/?#]+?-\d{{8}}-[\da-z]+)',
+        rf'{NhkBaseIE._BASE_URL_REGEX}ondemand/(?P<type>video)/(?P<id>\d{{4}}[\da-z]\d+)',  # deprecated
+    ]
     # Content available only for a limited period of time. Visit
     # https://www3.nhk.or.jp/nhkworld/en/ondemand/ for working samples.
     _TESTS = [{
-        'url': 'https://www3.nhk.or.jp/nhkworld/en/ondemand/video/2061601/',
+        'url': 'https://www3.nhk.or.jp/nhkworld/en/ondemand/video/2049126/',
         'info_dict': {
-            'id': 'yd8322ch',
+            'id': 'nw_vod_v_en_2049_126_20230413233000_01_1681398302',
             'ext': 'mp4',
-            'description': 'md5:109c8b05d67a62d0592f2b445d2cd898',
-            'title': 'GRAND SUMO Highlights - [Recap] May Tournament Day 1 (Opening Day)',
-            'upload_date': '20230514',
-            'timestamp': 1684083791,
-            'series': 'GRAND SUMO Highlights',
-            'episode': '[Recap] May Tournament Day 1 (Opening Day)',
-            'thumbnail': 'https://mz-edge.stream.co.jp/thumbs/aid/t1684084443/4028649.jpg?w=1920&h=1080',
+            'title': 'Japan Railway Journal - The Tohoku Shinkansen: Full Speed Ahead',
+            'description': 'md5:49f7c5b206e03868a2fdf0d0814b92f6',
+            'thumbnail': r're:https://.+/.+\.jpg',
+            'episode': 'The Tohoku Shinkansen: Full Speed Ahead',
+            'series': 'Japan Railway Journal',
+            'modified_timestamp': 1707217907,
+            'timestamp': 1681428600,
+            'release_timestamp': 1693883728,
+            'duration': 1679,
+            'upload_date': '20230413',
+            'modified_date': '20240206',
+            'release_date': '20230905',
         },
     }, {
         # video clip
         'url': 'https://www3.nhk.or.jp/nhkworld/en/ondemand/video/9999011/',
-        'md5': '7a90abcfe610ec22a6bfe15bd46b30ca',
+        'md5': '153c3016dfd252ba09726588149cf0e7',
         'info_dict': {
-            'id': 'a95j5iza',
+            'id': 'lpZXIwaDE6_Z-976CPsFdxyICyWUzlT5',
             'ext': 'mp4',
-            'title': "Dining with the Chef - Chef Saito's Family recipe: MENCHI-KATSU",
+            'title': 'Dining with the Chef - Chef Saito\'s Family recipe: MENCHI-KATSU',
             'description': 'md5:5aee4a9f9d81c26281862382103b0ea5',
-            'timestamp': 1565965194,
-            'upload_date': '20190816',
-            'thumbnail': 'https://mz-edge.stream.co.jp/thumbs/aid/t1567086278/3715195.jpg?w=1920&h=1080',
+            'thumbnail': r're:https://.+/.+\.jpg',
             'series': 'Dining with the Chef',
             'episode': 'Chef Saito\'s Family recipe: MENCHI-KATSU',
+            'duration': 148,
+            'upload_date': '20190816',
+            'release_date': '20230902',
+            'release_timestamp': 1693619292,
+            'modified_timestamp': 1707217907,
+            'modified_date': '20240206',
+            'timestamp': 1565997540,
         },
     }, {
-        # audio clip
-        'url': 'https://www3.nhk.or.jp/nhkworld/en/ondemand/audio/r_inventions-20201104-1/',
+        # radio
+        'url': 'https://www3.nhk.or.jp/nhkworld/en/ondemand/audio/livinginjapan-20231001-1/',
         'info_dict': {
-            'id': 'r_inventions-20201104-1-en',
+            'id': 'livinginjapan-20231001-1-en',
             'ext': 'm4a',
-            'title': "Japan's Top Inventions - Miniature Video Cameras",
-            'description': 'md5:07ea722bdbbb4936fdd360b6a480c25b',
+            'title': 'Living in Japan - Tips for Travelers to Japan / Ramen Vending Machines',
+            'series': 'Living in Japan',
+            'description': 'md5:0a0e2077d8f07a03071e990a6f51bfab',
+            'thumbnail': r're:https://.+/.+\.jpg',
+            'episode': 'Tips for Travelers to Japan / Ramen Vending Machines',
         },
-        'skip': '404 Not Found',
     }, {
         'url': 'https://www3.nhk.or.jp/nhkworld/en/ondemand/video/2015173/',
         'only_matching': True,
@@ -159,6 +239,119 @@ class NhkVodIE(NhkBaseIE):
             'timestamp': 1623722008,
         },
         'skip': '404 Not Found',
+    }, {
+        # japanese-language, longer id than english
+        'url': 'https://www3.nhk.or.jp/nhkworld/ja/ondemand/video/0020271111/',
+        'info_dict': {
+            'id': 'nw_ja_v_jvod_ohayou_20231008',
+            'ext': 'mp4',
+            'title': 'おはよう日本（7時台） - 10月8日放送',
+            'series': 'おはよう日本（7時台）',
+            'episode': '10月8日放送',
+            'thumbnail': r're:https://.+/.+\.jpg',
+            'description': 'md5:9c1d6cbeadb827b955b20e99ab920ff0',
+        },
+        'skip': 'expires 2023-10-15',
+    }, {
+        # a one-off (single-episode series). title from the api is just '<p></p>'
+        'url': 'https://www3.nhk.or.jp/nhkworld/en/ondemand/video/3004952/',
+        'info_dict': {
+            'id': 'nw_vod_v_en_3004_952_20230723091000_01_1690074552',
+            'ext': 'mp4',
+            'title': 'Barakan Discovers - AMAMI OSHIMA: Isson\'s Treasure Isla',
+            'description': 'md5:5db620c46a0698451cc59add8816b797',
+            'thumbnail': r're:https://.+/.+\.jpg',
+            'release_date': '20230905',
+            'timestamp': 1690103400,
+            'duration': 2939,
+            'release_timestamp': 1693898699,
+            'upload_date': '20230723',
+            'modified_timestamp': 1707217907,
+            'modified_date': '20240206',
+            'episode': 'AMAMI OSHIMA: Isson\'s Treasure Isla',
+            'series': 'Barakan Discovers',
+        },
+    }, {
+        # /ondemand/video/ url with alphabetical character in 5th position of id
+        'url': 'https://www3.nhk.or.jp/nhkworld/en/ondemand/video/9999a07/',
+        'info_dict': {
+            'id': 'nw_c_en_9999-a07',
+            'ext': 'mp4',
+            'episode': 'Mini-Dramas on SDGs: Ep 1 Close the Gender Gap [Director\'s Cut]',
+            'series': 'Mini-Dramas on SDGs',
+            'modified_date': '20240206',
+            'title': 'Mini-Dramas on SDGs - Mini-Dramas on SDGs: Ep 1 Close the Gender Gap [Director\'s Cut]',
+            'description': 'md5:3f9dcb4db22fceb675d90448a040d3f6',
+            'timestamp': 1621962360,
+            'duration': 189,
+            'release_date': '20230903',
+            'modified_timestamp': 1707217907,
+            'upload_date': '20210525',
+            'thumbnail': r're:https://.+/.+\.jpg',
+            'release_timestamp': 1693713487,
+        },
+    }, {
+        'url': 'https://www3.nhk.or.jp/nhkworld/en/ondemand/video/9999d17/',
+        'info_dict': {
+            'id': 'nw_c_en_9999-d17',
+            'ext': 'mp4',
+            'title': 'Flowers of snow blossom - The 72 Pentads of Yamato',
+            'description': 'Today’s focus: Snow',
+            'release_timestamp': 1693792402,
+            'release_date': '20230904',
+            'upload_date': '20220128',
+            'timestamp': 1643370960,
+            'thumbnail': r're:https://.+/.+\.jpg',
+            'duration': 136,
+            'series': '',
+            'modified_date': '20240206',
+            'modified_timestamp': 1707217907,
+        },
+    }, {
+        # new /shows/ url format
+        'url': 'https://www3.nhk.or.jp/nhkworld/en/shows/2032307/',
+        'info_dict': {
+            'id': 'nw_vod_v_en_2032_307_20240321113000_01_1710990282',
+            'ext': 'mp4',
+            'title': 'Japanology Plus - 20th Anniversary Special Part 1',
+            'description': 'md5:817d41fc8e54339ad2a916161ea24faf',
+            'episode': '20th Anniversary Special Part 1',
+            'series': 'Japanology Plus',
+            'thumbnail': r're:https://.+/.+\.jpg',
+            'duration': 1680,
+            'timestamp': 1711020600,
+            'upload_date': '20240321',
+            'release_timestamp': 1711022683,
+            'release_date': '20240321',
+            'modified_timestamp': 1711031012,
+            'modified_date': '20240321',
+        },
+    }, {
+        'url': 'https://www3.nhk.or.jp/nhkworld/en/shows/3020025/',
+        'info_dict': {
+            'id': 'nw_vod_v_en_3020_025_20230325144000_01_1679723944',
+            'ext': 'mp4',
+            'title': '100 Ideas to Save the World - Working Styles Evolve',
+            'description': 'md5:9e6c7778eaaf4f7b4af83569649f84d9',
+            'episode': 'Working Styles Evolve',
+            'series': '100 Ideas to Save the World',
+            'thumbnail': r're:https://.+/.+\.jpg',
+            'duration': 899,
+            'upload_date': '20230325',
+            'timestamp': 1679755200,
+            'release_date': '20230905',
+            'release_timestamp': 1693880540,
+            'modified_date': '20240206',
+            'modified_timestamp': 1707217907,
+        },
+    }, {
+        # new /shows/audio/ url format
+        'url': 'https://www3.nhk.or.jp/nhkworld/en/shows/audio/livinginjapan-20231001-1/',
+        'only_matching': True,
+    }, {
+        # valid url even if can't be found in wild; support needed for clip entries extraction
+        'url': 'https://www3.nhk.or.jp/nhkworld/en/shows/9999o80/',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
@@ -166,58 +359,91 @@ class NhkVodIE(NhkBaseIE):
 
 
 class NhkVodProgramIE(NhkBaseIE):
-    _VALID_URL = r'%s/program%s(?P<id>[0-9a-z]+)(?:.+?\btype=(?P<episode_type>clip|(?:radio|tv)Episode))?' % (NhkBaseIE._BASE_URL_REGEX, NhkBaseIE._TYPE_REGEX)
+    _VALID_URL = rf'''(?x)
+        {NhkBaseIE._BASE_URL_REGEX}(?:shows|tv)/
+        (?:(?P<type>audio)/programs/)?(?P<id>\w+)/?
+        (?:\?(?:[^#]+&)?type=(?P<episode_type>clip|(?:radio|tv)Episode))?'''
     _TESTS = [{
         # video program episodes
-        'url': 'https://www3.nhk.or.jp/nhkworld/en/ondemand/program/video/sumo',
+        'url': 'https://www3.nhk.or.jp/nhkworld/en/shows/sumo/',
         'info_dict': {
             'id': 'sumo',
             'title': 'GRAND SUMO Highlights',
+            'description': 'md5:fc20d02dc6ce85e4b72e0273aa52fdbf',
         },
-        'playlist_mincount': 12,
+        'playlist_mincount': 1,
     }, {
-        'url': 'https://www3.nhk.or.jp/nhkworld/en/ondemand/program/video/japanrailway',
+        'url': 'https://www3.nhk.or.jp/nhkworld/en/shows/japanrailway/',
         'info_dict': {
             'id': 'japanrailway',
             'title': 'Japan Railway Journal',
+            'description': 'md5:ea39d93af7d05835baadf10d1aae0e3f',
         },
         'playlist_mincount': 12,
     }, {
         # video program clips
-        'url': 'https://www3.nhk.or.jp/nhkworld/en/ondemand/program/video/japanrailway/?type=clip',
+        'url': 'https://www3.nhk.or.jp/nhkworld/en/shows/japanrailway/?type=clip',
         'info_dict': {
             'id': 'japanrailway',
             'title': 'Japan Railway Journal',
+            'description': 'md5:ea39d93af7d05835baadf10d1aae0e3f',
         },
-        'playlist_mincount': 5,
-    }, {
-        'url': 'https://www3.nhk.or.jp/nhkworld/en/ondemand/program/video/10yearshayaomiyazaki/',
-        'only_matching': True,
+        'playlist_mincount': 12,
     }, {
         # audio program
-        'url': 'https://www3.nhk.or.jp/nhkworld/en/ondemand/program/audio/listener/',
+        'url': 'https://www3.nhk.or.jp/nhkworld/en/shows/audio/programs/livinginjapan/',
+        'info_dict': {
+            'id': 'livinginjapan',
+            'title': 'Living in Japan',
+            'description': 'md5:665bb36ec2a12c5a7f598ee713fc2b54',
+        },
+        'playlist_mincount': 12,
+    }, {
+        # /tv/ program url
+        'url': 'https://www3.nhk.or.jp/nhkworld/en/tv/designtalksplus/',
+        'info_dict': {
+            'id': 'designtalksplus',
+            'title': 'DESIGN TALKS plus',
+            'description': 'md5:47b3b3a9f10d4ac7b33b53b70a7d2837',
+        },
+        'playlist_mincount': 20,
+    }, {
+        'url': 'https://www3.nhk.or.jp/nhkworld/en/shows/10yearshayaomiyazaki/',
         'only_matching': True,
     }]
 
+    @classmethod
+    def suitable(cls, url):
+        return False if NhkVodIE.suitable(url) else super().suitable(url)
+
+    def _extract_meta_from_class_elements(self, class_values, html):
+        for class_value in class_values:
+            if value := clean_html(get_element_by_class(class_value, html)):
+                return value
+
     def _real_extract(self, url):
-        lang, m_type, program_id, episode_type = self._match_valid_url(url).groups()
-
+        lang, m_type, program_id, episode_type = self._match_valid_url(url).group('lang', 'type', 'id', 'episode_type')
         episodes = self._call_api(
-            program_id, lang, m_type == 'video', False, episode_type == 'clip')
+            program_id, lang, m_type != 'audio', False, episode_type == 'clip')
 
-        entries = []
-        for episode in episodes:
-            episode_path = episode.get('url')
-            if not episode_path:
-                continue
-            entries.append(self._extract_episode_info(
-                urljoin(url, episode_path), episode))
+        def entries():
+            for episode in episodes:
+                if episode_path := episode.get('url'):
+                    yield self._extract_episode_info(urljoin(url, episode_path), episode)
 
-        program_title = None
-        if entries:
-            program_title = entries[0].get('series')
+        html = self._download_webpage(url, program_id)
+        program_title = self._extract_meta_from_class_elements([
+            'p-programDetail__title',  # /ondemand/program/
+            'pProgramHero__logoText',  # /shows/
+            'tAudioProgramMain__title',  # /shows/audio/programs/
+            'p-program-name'], html)  # /tv/
+        program_description = self._extract_meta_from_class_elements([
+            'p-programDetail__text',  # /ondemand/program/
+            'pProgramHero__description',  # /shows/
+            'tAudioProgramMain__info',  # /shows/audio/programs/
+            'p-program-description'], html)  # /tv/
 
-        return self.playlist_result(entries, program_id, program_title)
+        return self.playlist_result(entries(), program_id, program_title, program_description)
 
 
 class NhkForSchoolBangumiIE(InfoExtractor):
@@ -233,7 +459,7 @@ class NhkForSchoolBangumiIE(InfoExtractor):
             'upload_date': '20140402',
             'ext': 'mp4',
 
-            'chapters': 'count:12'
+            'chapters': 'count:12',
         },
         'params': {
             # m3u8 download
@@ -296,7 +522,8 @@ class NhkForSchoolSubjectIE(InfoExtractor):
         'eigo', 'tokkatsu',
         'tokushi', 'sonota',
     )
-    _VALID_URL = r'https?://www\.nhk\.or\.jp/school/(?P<id>%s)/?(?:[\?#].*)?$' % '|'.join(re.escape(s) for s in KNOWN_SUBJECTS)
+    _VALID_URL = r'https?://www\.nhk\.or\.jp/school/(?P<id>{})/?(?:[\?#].*)?$'.format(
+        '|'.join(re.escape(s) for s in KNOWN_SUBJECTS))
 
     _TESTS = [{
         'url': 'https://www.nhk.or.jp/school/sougou/',
@@ -326,9 +553,8 @@ class NhkForSchoolSubjectIE(InfoExtractor):
 
 
 class NhkForSchoolProgramListIE(InfoExtractor):
-    _VALID_URL = r'https?://www\.nhk\.or\.jp/school/(?P<id>(?:%s)/[a-zA-Z0-9_-]+)' % (
-        '|'.join(re.escape(s) for s in NhkForSchoolSubjectIE.KNOWN_SUBJECTS)
-    )
+    _VALID_URL = r'https?://www\.nhk\.or\.jp/school/(?P<id>(?:{})/[a-zA-Z0-9_-]+)'.format(
+        '|'.join(re.escape(s) for s in NhkForSchoolSubjectIE.KNOWN_SUBJECTS))
     _TESTS = [{
         'url': 'https://www.nhk.or.jp/school/sougou/q/',
         'info_dict': {
@@ -365,21 +591,22 @@ class NhkRadiruIE(InfoExtractor):
     IE_DESC = 'NHK らじる (Radiru/Rajiru)'
     _VALID_URL = r'https?://www\.nhk\.or\.jp/radio/(?:player/ondemand|ondemand/detail)\.html\?p=(?P<site>[\da-zA-Z]+)_(?P<corner>[\da-zA-Z]+)(?:_(?P<headline>[\da-zA-Z]+))?'
     _TESTS = [{
-        'url': 'https://www.nhk.or.jp/radio/player/ondemand.html?p=0449_01_3853544',
-        'skip': 'Episode expired on 2023-04-16',
+        'url': 'https://www.nhk.or.jp/radio/player/ondemand.html?p=0449_01_4003239',
+        'skip': 'Episode expired on 2024-06-09',
         'info_dict': {
-            'channel': 'NHK-FM',
-            'description': 'md5:94b08bdeadde81a97df4ec882acce3e9',
+            'title': 'ジャズ・トゥナイト　ジャズ「Ｎｉｇｈｔ　ａｎｄ　Ｄａｙ」特集',
+            'id': '0449_01_4003239',
             'ext': 'm4a',
-            'id': '0449_01_3853544',
+            'uploader': 'NHK FM 東京',
+            'description': 'md5:ad05f3c3f3f6e99b2e69f9b5e49551dc',
             'series': 'ジャズ・トゥナイト',
+            'channel': 'NHK FM 東京',
             'thumbnail': 'https://www.nhk.or.jp/prog/img/449/g449.jpg',
-            'timestamp': 1680969600,
-            'title': 'ジャズ・トゥナイト　ＮＥＷジャズ特集',
-            'upload_date': '20230408',
-            'release_timestamp': 1680962400,
-            'release_date': '20230408',
-            'was_live': True,
+            'upload_date': '20240601',
+            'series_id': '0449_01',
+            'release_date': '20240601',
+            'timestamp': 1717257600,
+            'release_timestamp': 1717250400,
         },
     }, {
         # playlist, airs every weekday so it should _hopefully_ be okay forever
@@ -388,46 +615,143 @@ class NhkRadiruIE(InfoExtractor):
             'id': '0458_01',
             'title': 'ベストオブクラシック',
             'description': '世界中の上質な演奏会をじっくり堪能する本格派クラシック番組。',
-            'channel': 'NHK-FM',
             'thumbnail': 'https://www.nhk.or.jp/prog/img/458/g458.jpg',
+            'series_id': '0458_01',
+            'uploader': 'NHK FM',
+            'channel': 'NHK FM',
+            'series': 'ベストオブクラシック',
         },
         'playlist_mincount': 3,
     }, {
         # one with letters in the id
-        'url': 'https://www.nhk.or.jp/radio/player/ondemand.html?p=F300_06_3738470',
-        'note': 'Expires on 2024-03-31',
+        'url': 'https://www.nhk.or.jp/radio/player/ondemand.html?p=F683_01_3910688',
+        'note': 'Expires on 2025-03-31',
         'info_dict': {
-            'id': 'F300_06_3738470',
+            'id': 'F683_01_3910688',
             'ext': 'm4a',
-            'title': '有島武郎「一房のぶどう」',
-            'description': '朗読：川野一宇（ラジオ深夜便アンカー）\r\n\r\n（2016年12月8日放送「ラジオ深夜便『アンカー朗読シリーズ』」より）',
-            'channel': 'NHKラジオ第1、NHK-FM',
-            'timestamp': 1635757200,
-            'thumbnail': 'https://www.nhk.or.jp/radioondemand/json/F300/img/corner/box_109_thumbnail.jpg',
-            'release_date': '20161207',
-            'series': 'らじる文庫 by ラジオ深夜便 ',
-            'release_timestamp': 1481126700,
-            'upload_date': '20211101',
-        }
+            'title': '夏目漱石「文鳥」第1回',
+            'series': '【らじる文庫】夏目漱石「文鳥」（全4回）',
+            'series_id': 'F683_01',
+            'description': '朗読：浅井理アナウンサー',
+            'thumbnail': 'https://www.nhk.or.jp/radioondemand/json/F683/img/roudoku_05_rod_640.jpg',
+            'upload_date': '20240106',
+            'release_date': '20240106',
+            'uploader': 'NHK R1',
+            'release_timestamp': 1704511800,
+            'channel': 'NHK R1',
+            'timestamp': 1704512700,
+        },
+        'expected_warnings': ['Unable to download JSON metadata',
+                              'Failed to get extended metadata. API returned Error 1: Invalid parameters'],
     }, {
         # news
-        'url': 'https://www.nhk.or.jp/radio/player/ondemand.html?p=F261_01_3855109',
-        'skip': 'Expires on 2023-04-17',
+        'url': 'https://www.nhk.or.jp/radio/player/ondemand.html?p=F261_01_4012173',
         'info_dict': {
-            'id': 'F261_01_3855109',
+            'id': 'F261_01_4012173',
             'ext': 'm4a',
             'channel': 'NHKラジオ第1',
-            'timestamp': 1681635900,
-            'release_date': '20230416',
+            'uploader': 'NHKラジオ第1',
             'series': 'NHKラジオニュース',
-            'title': '午後６時のNHKニュース',
+            'title': '午前０時のNHKニュース',
             'thumbnail': 'https://www.nhk.or.jp/radioondemand/json/F261/img/RADIONEWS_640.jpg',
-            'upload_date': '20230416',
-            'release_timestamp': 1681635600,
+            'release_timestamp': 1718290800,
+            'release_date': '20240613',
+            'timestamp': 1718291400,
+            'upload_date': '20240613',
         },
+    }, {
+        # fallback when extended metadata fails
+        'url': 'https://www.nhk.or.jp/radio/player/ondemand.html?p=2834_01_4009298',
+        'skip': 'Expires on 2024-06-07',
+        'info_dict': {
+            'id': '2834_01_4009298',
+            'title': 'まち☆キラ！開成町特集',
+            'ext': 'm4a',
+            'release_date': '20240531',
+            'upload_date': '20240531',
+            'series': 'はま☆キラ！',
+            'thumbnail': 'https://www.nhk.or.jp/prog/img/2834/g2834.jpg',
+            'channel': 'NHK R1,FM',
+            'description': '',
+            'timestamp': 1717123800,
+            'uploader': 'NHK R1,FM',
+            'release_timestamp': 1717120800,
+            'series_id': '2834_01',
+        },
+        'expected_warnings': ['Failed to get extended metadata. API returned empty list.'],
     }]
 
-    def _extract_episode_info(self, headline, programme_id, series_meta):
+    _API_URL_TMPL = None
+
+    def _extract_extended_metadata(self, episode_id, aa_vinfo):
+        service, _, area = traverse_obj(aa_vinfo, (2, {str}, {lambda x: (x or '').partition(',')}))
+        detail_url = try_call(
+            lambda: self._API_URL_TMPL.format(area=area, service=service, dateid=aa_vinfo[3]))
+        if not detail_url:
+            return {}
+
+        response = self._download_json(
+            detail_url, episode_id, 'Downloading extended metadata',
+            'Failed to download extended metadata', fatal=False, expected_status=400)
+        if not response:
+            return {}
+
+        if error := traverse_obj(response, ('error', {dict})):
+            self.report_warning(
+                'Failed to get extended metadata. API returned '
+                f'Error {join_nonempty("code", "message", from_dict=error, delim=": ")}')
+            return {}
+
+        full_meta = traverse_obj(response, ('list', service, 0, {dict}))
+        if not full_meta:
+            self.report_warning('Failed to get extended metadata. API returned empty list.')
+            return {}
+
+        station = ' '.join(traverse_obj(full_meta, (('service', 'area'), 'name', {str}))) or None
+        thumbnails = [{
+            'id': str(id_),
+            'preference': 1 if id_.startswith('thumbnail') else -2 if id_.startswith('logo') else -1,
+            **traverse_obj(thumb, {
+                'url': 'url',
+                'width': ('width', {int_or_none}),
+                'height': ('height', {int_or_none}),
+            }),
+        } for id_, thumb in traverse_obj(full_meta, ('images', {dict.items}, lambda _, v: v[1]['url']))]
+
+        return filter_dict({
+            'channel': station,
+            'uploader': station,
+            'description': join_nonempty(
+                'subtitle', 'content', 'act', 'music', delim='\n\n', from_dict=full_meta),
+            'thumbnails': thumbnails,
+            **traverse_obj(full_meta, {
+                'title': ('title', {str}),
+                'timestamp': ('end_time', {unified_timestamp}),
+                'release_timestamp': ('start_time', {unified_timestamp}),
+            }),
+        })
+
+    def _extract_episode_info(self, episode, programme_id, series_meta):
+        episode_id = f'{programme_id}_{episode["id"]}'
+        aa_vinfo = traverse_obj(episode, ('aa_contents_id', {lambda x: x.split(';')}))
+        extended_metadata = self._extract_extended_metadata(episode_id, aa_vinfo)
+        fallback_start_time, _, fallback_end_time = traverse_obj(
+            aa_vinfo, (4, {str}, {lambda x: (x or '').partition('_')}))
+
+        return {
+            **series_meta,
+            'id': episode_id,
+            'formats': self._extract_m3u8_formats(episode.get('stream_url'), episode_id, fatal=False),
+            'container': 'm4a_dash',  # force fixup, AAC-only HLS
+            'was_live': True,
+            'title': episode.get('program_title'),
+            'description': episode.get('program_sub_title'),  # fallback
+            'timestamp': unified_timestamp(fallback_end_time),
+            'release_timestamp': unified_timestamp(fallback_start_time),
+            **extended_metadata,
+        }
+
+    def _extract_news_info(self, headline, programme_id, series_meta):
         episode_id = f'{programme_id}_{headline["headline_id"]}'
         episode = traverse_obj(headline, ('file_list', 0, {dict}))
 
@@ -440,42 +764,76 @@ class NhkRadiruIE(InfoExtractor):
             'series': series_meta.get('title'),
             'thumbnail': url_or_none(headline.get('headline_image')) or series_meta.get('thumbnail'),
             **traverse_obj(episode, {
-                'title': 'file_title',
-                'description': 'file_title_sub',
+                'title': ('file_title', {str}),
+                'description': ('file_title_sub', {str}),
                 'timestamp': ('open_time', {unified_timestamp}),
                 'release_timestamp': ('aa_vinfo4', {lambda x: x.split('_')[0]}, {unified_timestamp}),
             }),
         }
 
+    def _real_initialize(self):
+        if self._API_URL_TMPL:
+            return
+        api_config = self._download_xml(
+            'https://www.nhk.or.jp/radio/config/config_web.xml', None, 'Downloading API config', fatal=False)
+        NhkRadiruIE._API_URL_TMPL = try_call(lambda: f'https:{api_config.find(".//url_program_detail").text}')
+
     def _real_extract(self, url):
         site_id, corner_id, headline_id = self._match_valid_url(url).group('site', 'corner', 'headline')
         programme_id = f'{site_id}_{corner_id}'
 
-        if site_id == 'F261':
-            json_url = 'https://www.nhk.or.jp/s-media/news/news-site/list/v1/all.json'
-        else:
-            json_url = f'https://www.nhk.or.jp/radioondemand/json/{site_id}/bangumi_{programme_id}.json'
+        if site_id == 'F261':  # XXX: News programmes use old API (for now?)
+            meta = self._download_json(
+                'https://www.nhk.or.jp/s-media/news/news-site/list/v1/all.json', programme_id)['main']
+            series_meta = traverse_obj(meta, {
+                'title': ('program_name', {str}),
+                'channel': ('media_name', {str}),
+                'uploader': ('media_name', {str}),
+                'thumbnail': (('thumbnail_c', 'thumbnail_p'), {url_or_none}),
+            }, get_all=False)
 
-        meta = self._download_json(json_url, programme_id)['main']
+            if headline_id:
+                headline = traverse_obj(
+                    meta, ('detail_list', lambda _, v: v['headline_id'] == headline_id, any))
+                if not headline:
+                    raise ExtractorError('Content not found; it has most likely expired', expected=True)
+                return self._extract_news_info(headline, programme_id, series_meta)
 
-        series_meta = traverse_obj(meta, {
-            'title': 'program_name',
-            'channel': 'media_name',
-            'thumbnail': (('thumbnail_c', 'thumbnail_p'), {url_or_none}),
-        }, get_all=False)
+            def news_entries():
+                for headline in traverse_obj(meta, ('detail_list', ..., {dict})):
+                    yield self._extract_news_info(headline, programme_id, series_meta)
+
+            return self.playlist_result(
+                news_entries(), programme_id, description=meta.get('site_detail'), **series_meta)
+
+        meta = self._download_json(
+            'https://www.nhk.or.jp/radio-api/app/v1/web/ondemand/series', programme_id, query={
+                'site_id': site_id,
+                'corner_site_id': corner_id,
+            })
+
+        fallback_station = join_nonempty('NHK', traverse_obj(meta, ('radio_broadcast', {str})), delim=' ')
+        series_meta = {
+            'series': join_nonempty('title', 'corner_name', delim=' ', from_dict=meta),
+            'series_id': programme_id,
+            'thumbnail': traverse_obj(meta, ('thumbnail_url', {url_or_none})),
+            'channel': fallback_station,
+            'uploader': fallback_station,
+        }
 
         if headline_id:
-            return self._extract_episode_info(
-                traverse_obj(meta, (
-                    'detail_list', lambda _, v: v['headline_id'] == headline_id), get_all=False),
-                programme_id, series_meta)
+            episode = traverse_obj(meta, ('episodes', lambda _, v: v['id'] == int(headline_id), any))
+            if not episode:
+                raise ExtractorError('Content not found; it has most likely expired', expected=True)
+            return self._extract_episode_info(episode, programme_id, series_meta)
 
         def entries():
-            for headline in traverse_obj(meta, ('detail_list', ..., {dict})):
-                yield self._extract_episode_info(headline, programme_id, series_meta)
+            for episode in traverse_obj(meta, ('episodes', ..., {dict})):
+                yield self._extract_episode_info(episode, programme_id, series_meta)
 
         return self.playlist_result(
-            entries(), programme_id, playlist_description=meta.get('site_detail'), **series_meta)
+            entries(), programme_id, title=series_meta.get('series'),
+            description=meta.get('series_description'), **series_meta)
 
 
 class NhkRadioNewsPageIE(InfoExtractor):
@@ -489,8 +847,9 @@ class NhkRadioNewsPageIE(InfoExtractor):
             'thumbnail': 'https://www.nhk.or.jp/radioondemand/json/F261/img/RADIONEWS_640.jpg',
             'description': 'md5:bf2c5b397e44bc7eb26de98d8f15d79d',
             'channel': 'NHKラジオ第1',
+            'uploader': 'NHKラジオ第1',
             'title': 'NHKラジオニュース',
-        }
+        },
     }]
 
     def _real_extract(self, url):
@@ -532,7 +891,7 @@ class NhkRadiruLiveIE(InfoExtractor):
             'ext': 'm4a',
             'thumbnail': 'https://www.nhk.or.jp/common/img/media/fm-200x200.png',
             'live_status': 'is_live',
-        }
+        },
     }]
 
     _NOA_STATION_IDS = {'r1': 'n1', 'r2': 'n2', 'fm': 'n3'}
@@ -546,16 +905,16 @@ class NhkRadiruLiveIE(InfoExtractor):
         data = config.find(f'.//data//area[.="{area}"]/..')
 
         if not data:
-            raise ExtractorError('Invalid area. Valid areas are: %s' % ', '.join(
-                [i.text for i in config.findall('.//data//area')]), expected=True)
+            raise ExtractorError('Invalid area. Valid areas are: {}'.format(', '.join(
+                [i.text for i in config.findall('.//data//area')])), expected=True)
 
         noa_info = self._download_json(
             f'https:{config.find(".//url_program_noa").text}'.format(area=data.find('areakey').text),
-            station, note=f'Downloading {area} station metadata')
+            station, note=f'Downloading {area} station metadata', fatal=False)
         present_info = traverse_obj(noa_info, ('nowonair_list', self._NOA_STATION_IDS.get(station), 'present'))
 
         return {
-            'title': ' '.join(traverse_obj(present_info, (('service', 'area',), 'name', {str}))),
+            'title': ' '.join(traverse_obj(present_info, (('service', 'area'), 'name', {str}))),
             'id': join_nonempty(station, area),
             'thumbnails': traverse_obj(present_info, ('service', 'images', ..., {
                 'url': 'url',
diff --git a/plugins/youtube_download/yt_dlp/extractor/nhl.py b/plugins/youtube_download/yt_dlp/extractor/nhl.py
index 2521c40..ca47a81 100644
--- a/plugins/youtube_download/yt_dlp/extractor/nhl.py
+++ b/plugins/youtube_download/yt_dlp/extractor/nhl.py
@@ -1,10 +1,10 @@
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     determine_ext,
     int_or_none,
-    parse_iso8601,
+    join_nonempty,
     parse_duration,
+    parse_iso8601,
 )
 
 
@@ -12,8 +12,8 @@ class NHLBaseIE(InfoExtractor):
     def _real_extract(self, url):
         site, tmp_id = self._match_valid_url(url).groups()
         video_data = self._download_json(
-            'https://%s/%s/%sid/v1/%s/details/web-v1.json'
-            % (self._CONTENT_DOMAIN, site[:3], 'item/' if site == 'mlb' else '', tmp_id), tmp_id)
+            'https://{}/{}/{}id/v1/{}/details/web-v1.json'.format(
+                self._CONTENT_DOMAIN, site[:3], 'item/' if site == 'mlb' else '', tmp_id), tmp_id)
         if video_data.get('type') != 'video':
             video_data = video_data['media']
             video = video_data.get('video')
@@ -24,7 +24,7 @@ class NHLBaseIE(InfoExtractor):
                 if videos:
                     video_data = videos[0]
 
-        video_id = compat_str(video_data['id'])
+        video_id = str(video_data['id'])
         title = video_data['title']
 
         formats = []
@@ -42,7 +42,7 @@ class NHLBaseIE(InfoExtractor):
             else:
                 height = int_or_none(playback.get('height'))
                 formats.append({
-                    'format_id': playback.get('name', 'http' + ('-%dp' % height if height else '')),
+                    'format_id': playback.get('name') or join_nonempty('http', height and f'{height}p'),
                     'url': playback_url,
                     'width': int_or_none(playback.get('width')),
                     'height': height,
diff --git a/plugins/youtube_download/yt_dlp/extractor/nick.py b/plugins/youtube_download/yt_dlp/extractor/nick.py
index de22cb8..653b10b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/nick.py
+++ b/plugins/youtube_download/yt_dlp/extractor/nick.py
@@ -22,7 +22,7 @@ class NickIE(MTVServicesInfoExtractor):
                     'title': 'SpongeBob SquarePants: "A Place for Pets/Lockdown for Love" S1',
                     'description': 'A Place for Pets/Lockdown for Love: When customers bring pets into the Krusty Krab, Mr. Krabs realizes pets are more profitable than owners. Plankton ruins another date with Karen, so she puts the Chum Bucket on lockdown until he proves his affection.',
 
-                }
+                },
             },
             {
                 'md5': '839a04f49900a1fcbf517020d94e0737',
@@ -32,7 +32,7 @@ class NickIE(MTVServicesInfoExtractor):
                     'title': 'SpongeBob SquarePants: "A Place for Pets/Lockdown for Love" S2',
                     'description': 'A Place for Pets/Lockdown for Love: When customers bring pets into the Krusty Krab, Mr. Krabs realizes pets are more profitable than owners. Plankton ruins another date with Karen, so she puts the Chum Bucket on lockdown until he proves his affection.',
 
-                }
+                },
             },
             {
                 'md5': 'f1145699f199770e2919ee8646955d46',
@@ -42,7 +42,7 @@ class NickIE(MTVServicesInfoExtractor):
                     'title': 'SpongeBob SquarePants: "A Place for Pets/Lockdown for Love" S3',
                     'description': 'A Place for Pets/Lockdown for Love: When customers bring pets into the Krusty Krab, Mr. Krabs realizes pets are more profitable than owners. Plankton ruins another date with Karen, so she puts the Chum Bucket on lockdown until he proves his affection.',
 
-                }
+                },
             },
             {
                 'md5': 'd463116875aee2585ee58de3b12caebd',
@@ -52,7 +52,7 @@ class NickIE(MTVServicesInfoExtractor):
                     'title': 'SpongeBob SquarePants: "A Place for Pets/Lockdown for Love" S4',
                     'description': 'A Place for Pets/Lockdown for Love: When customers bring pets into the Krusty Krab, Mr. Krabs realizes pets are more profitable than owners. Plankton ruins another date with Karen, so she puts the Chum Bucket on lockdown until he proves his affection.',
 
-                }
+                },
             },
         ],
     }, {
@@ -63,7 +63,7 @@ class NickIE(MTVServicesInfoExtractor):
             'description': 'md5:9d65a66df38e02254852794b2809d1cf',
             'title': 'Blue\'s Imagination Station',
         },
-        'skip': 'Not accessible?'
+        'skip': 'Not accessible?',
     }]
 
     def _get_feed_query(self, uri):
@@ -74,10 +74,10 @@ class NickIE(MTVServicesInfoExtractor):
 
     def _real_extract(self, url):
         domain, video_type, display_id = self._match_valid_url(url).groups()
-        if video_type.startswith("episodes"):
+        if video_type.startswith('episodes'):
             return super()._real_extract(url)
         video_data = self._download_json(
-            'http://%s/data/video.endLevel.json' % domain,
+            f'http://{domain}/data/video.endLevel.json',
             display_id, query={
                 'urlKey': display_id,
             })
@@ -184,30 +184,10 @@ class NickDeIE(MTVServicesInfoExtractor):
     def _get_feed_url(self, uri, url=None):
         video_id = self._id_from_uri(uri)
         config = self._download_json(
-            'http://media.mtvnservices.com/pmt/e1/access/index.html?uri=%s&configtype=edge&ref=%s' % (uri, url), video_id)
+            f'http://media.mtvnservices.com/pmt/e1/access/index.html?uri={uri}&configtype=edge&ref={url}', video_id)
         return self._remove_template_parameter(config['feedWithQueryParams'])
 
 
-class NickNightIE(NickDeIE):  # XXX: Do not subclass from concrete IE
-    IE_NAME = 'nicknight'
-    _VALID_URL = r'https?://(?:www\.)(?P<host>nicknight\.(?:de|at|tv))/(?:playlist|shows)/(?:[^/]+/)*(?P<id>[^/?#&]+)'
-    _TESTS = [{
-        'url': 'http://www.nicknight.at/shows/977-awkward/videos/85987-nimmer-beste-freunde',
-        'only_matching': True,
-    }, {
-        'url': 'http://www.nicknight.at/shows/977-awkward',
-        'only_matching': True,
-    }, {
-        'url': 'http://www.nicknight.at/shows/1900-faking-it',
-        'only_matching': True,
-    }]
-
-    def _extract_mrss_url(self, webpage, *args):
-        return self._search_regex(
-            r'mrss\s*:\s*(["\'])(?P<url>http.+?)\1', webpage,
-            'mrss url', group='url')
-
-
 class NickRuIE(MTVServicesInfoExtractor):
     IE_NAME = 'nickelodeonru'
     _VALID_URL = r'https?://(?:www\.)nickelodeon\.(?:ru|fr|es|pt|ro|hu|com\.tr)/[^/]+/(?:[^/]+/)*(?P<id>[^/?#&]+)'
@@ -241,4 +221,4 @@ class NickRuIE(MTVServicesInfoExtractor):
         video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
         mgid = self._extract_mgid(webpage, url)
-        return self.url_result('http://media.mtvnservices.com/embed/%s' % mgid)
+        return self.url_result(f'http://media.mtvnservices.com/embed/{mgid}')
diff --git a/plugins/youtube_download/yt_dlp/extractor/niconico.py b/plugins/youtube_download/yt_dlp/extractor/niconico.py
index fa2d709..52ba6c4 100644
--- a/plugins/youtube_download/yt_dlp/extractor/niconico.py
+++ b/plugins/youtube_download/yt_dlp/extractor/niconico.py
@@ -1,48 +1,104 @@
-import datetime
+import datetime as dt
 import functools
 import itertools
 import json
 import re
 import time
-
-from urllib.parse import urlparse
+import urllib.parse
 
 from .common import InfoExtractor, SearchInfoExtractor
-from ..dependencies import websockets
+from ..networking import Request
 from ..networking.exceptions import HTTPError
 from ..utils import (
     ExtractorError,
     OnDemandPagedList,
-    WebSocketsWrapper,
-    bug_reports_message,
     clean_html,
+    determine_ext,
     float_or_none,
     int_or_none,
-    join_nonempty,
     parse_duration,
-    parse_filesize,
     parse_iso8601,
+    parse_qs,
     parse_resolution,
     qualities,
     remove_start,
     str_or_none,
-    traverse_obj,
     try_get,
     unescapeHTML,
+    unified_timestamp,
     update_url_query,
+    url_basename,
     url_or_none,
     urlencode_postdata,
     urljoin,
 )
+from ..utils.traversal import find_element, traverse_obj
 
 
-class NiconicoIE(InfoExtractor):
+class NiconicoBaseIE(InfoExtractor):
+    _GEO_BYPASS = False
+    _GEO_COUNTRIES = ['JP']
+    _LOGIN_BASE = 'https://account.nicovideo.jp'
+    _NETRC_MACHINE = 'niconico'
+
+    @property
+    def is_logged_in(self):
+        return bool(self._get_cookies('https://www.nicovideo.jp').get('user_session'))
+
+    def _raise_login_error(self, message, expected=True):
+        raise ExtractorError(f'Unable to login: {message}', expected=expected)
+
+    def _perform_login(self, username, password):
+        if self.is_logged_in:
+            return
+
+        self._request_webpage(
+            f'{self._LOGIN_BASE}/login', None, 'Requesting session cookies')
+        webpage = self._download_webpage(
+            f'{self._LOGIN_BASE}/login/redirector', None,
+            'Logging in', 'Unable to log in', headers={
+                'Content-Type': 'application/x-www-form-urlencoded',
+                'Referer': f'{self._LOGIN_BASE}/login',
+            }, data=urlencode_postdata({
+                'mail_tel': username,
+                'password': password,
+            }))
+
+        if self.is_logged_in:
+            return
+        elif err_msg := traverse_obj(webpage, (
+            {find_element(cls='notice error')}, {find_element(cls='notice__text')}, {clean_html},
+        )):
+            self._raise_login_error(err_msg or 'Invalid username or password')
+        elif 'oneTimePw' in webpage:
+            post_url = self._search_regex(
+                r'<form[^>]+action=(["\'])(?P<url>.+?)\1', webpage, 'post url', group='url')
+            mfa, urlh = self._download_webpage_handle(
+                urljoin(self._LOGIN_BASE, post_url), None,
+                'Performing MFA', 'Unable to complete MFA', headers={
+                    'Content-Type': 'application/x-www-form-urlencoded',
+                }, data=urlencode_postdata({
+                    'otp': self._get_tfa_info('6 digit number shown on app'),
+                }))
+            if self.is_logged_in:
+                return
+            elif 'error-code' in parse_qs(urlh.url):
+                err_msg = traverse_obj(mfa, ({find_element(cls='pageMainMsg')}, {clean_html}))
+                self._raise_login_error(err_msg or 'MFA session expired')
+            elif 'formError' in mfa:
+                err_msg = traverse_obj(mfa, (
+                    {find_element(cls='formError')}, {find_element(tag='div')}, {clean_html}))
+                self._raise_login_error(err_msg or 'MFA challenge failed')
+
+        self._raise_login_error('Unexpected login error', expected=False)
+
+
+class NiconicoIE(NiconicoBaseIE):
     IE_NAME = 'niconico'
     IE_DESC = 'ニコニコ動画'
 
     _TESTS = [{
         'url': 'http://www.nicovideo.jp/watch/sm22312215',
-        'md5': 'd1a75c0823e2f629128c43e1212760f9',
         'info_dict': {
             'id': 'sm22312215',
             'ext': 'mp4',
@@ -56,25 +112,31 @@ class NiconicoIE(InfoExtractor):
             'duration': 33,
             'view_count': int,
             'comment_count': int,
+            'genres': ['未設定'],
+            'tags': [],
         },
-        'skip': 'Requires an account',
+        'params': {'skip_download': 'm3u8'},
     }, {
         # File downloaded with and without credentials are different, so omit
         # the md5 field
         'url': 'http://www.nicovideo.jp/watch/nm14296458',
         'info_dict': {
             'id': 'nm14296458',
-            'ext': 'swf',
-            'title': '【鏡音リン】Dance on media【オリジナル】take2!',
-            'description': 'md5:689f066d74610b3b22e0f1739add0f58',
+            'ext': 'mp4',
+            'title': '【Kagamine Rin】Dance on media【Original】take2!',
+            'description': 'md5:9368f2b1f4178de64f2602c2f3d6cbf5',
             'thumbnail': r're:https?://.*',
             'uploader': 'りょうた',
             'uploader_id': '18822557',
             'upload_date': '20110429',
             'timestamp': 1304065916,
-            'duration': 209,
+            'duration': 208.0,
+            'comment_count': int,
+            'view_count': int,
+            'genres': ['音楽・サウンド'],
+            'tags': ['Translation_Request', 'Kagamine_Rin', 'Rin_Original'],
         },
-        'skip': 'Requires an account',
+        'params': {'skip_download': 'm3u8'},
     }, {
         # 'video exists but is marked as "deleted"
         # md5 is unstable
@@ -108,60 +170,61 @@ class NiconicoIE(InfoExtractor):
     }, {
         # video not available via `getflv`; "old" HTML5 video
         'url': 'http://www.nicovideo.jp/watch/sm1151009',
-        'md5': '8fa81c364eb619d4085354eab075598a',
         'info_dict': {
             'id': 'sm1151009',
             'ext': 'mp4',
             'title': 'マスターシステム本体内蔵のスペハリのメインテーマ（ＰＳＧ版）',
-            'description': 'md5:6ee077e0581ff5019773e2e714cdd0b7',
+            'description': 'md5:f95a3d259172667b293530cc2e41ebda',
             'thumbnail': r're:https?://.*',
             'duration': 184,
-            'timestamp': 1190868283,
-            'upload_date': '20070927',
+            'timestamp': 1190835883,
+            'upload_date': '20070926',
             'uploader': 'denden2',
             'uploader_id': '1392194',
             'view_count': int,
             'comment_count': int,
+            'genres': ['ゲーム'],
+            'tags': [],
         },
-        'skip': 'Requires an account',
+        'params': {'skip_download': 'm3u8'},
     }, {
         # "New" HTML5 video
-        # md5 is unstable
         'url': 'http://www.nicovideo.jp/watch/sm31464864',
         'info_dict': {
             'id': 'sm31464864',
             'ext': 'mp4',
             'title': '新作TVアニメ「戦姫絶唱シンフォギアAXZ」PV 最高画質',
             'description': 'md5:e52974af9a96e739196b2c1ca72b5feb',
-            'timestamp': 1498514060,
+            'timestamp': 1498481660,
             'upload_date': '20170626',
-            'uploader': 'ゲスト',
+            'uploader': 'no-namamae',
             'uploader_id': '40826363',
             'thumbnail': r're:https?://.*',
             'duration': 198,
             'view_count': int,
             'comment_count': int,
+            'genres': ['アニメ'],
+            'tags': [],
         },
-        'skip': 'Requires an account',
+        'params': {'skip_download': 'm3u8'},
     }, {
         # Video without owner
         'url': 'http://www.nicovideo.jp/watch/sm18238488',
-        'md5': 'd265680a1f92bdcbbd2a507fc9e78a9e',
         'info_dict': {
             'id': 'sm18238488',
             'ext': 'mp4',
             'title': '【実写版】ミュータントタートルズ',
             'description': 'md5:15df8988e47a86f9e978af2064bf6d8e',
-            'timestamp': 1341160408,
+            'timestamp': 1341128008,
             'upload_date': '20120701',
-            'uploader': None,
-            'uploader_id': None,
             'thumbnail': r're:https?://.*',
             'duration': 5271,
             'view_count': int,
             'comment_count': int,
+            'genres': ['エンターテイメント'],
+            'tags': [],
         },
-        'skip': 'Requires an account',
+        'params': {'skip_download': 'm3u8'},
     }, {
         'url': 'http://sp.nicovideo.jp/watch/sm28964488?ss_pos=1&cp_in=wt_tg',
         'only_matching': True,
@@ -172,220 +235,53 @@ class NiconicoIE(InfoExtractor):
     }]
 
     _VALID_URL = r'https?://(?:(?:www\.|secure\.|sp\.)?nicovideo\.jp/watch|nico\.ms)/(?P<id>(?:[a-z]{2})?[0-9]+)'
-    _NETRC_MACHINE = 'niconico'
-    _COMMENT_API_ENDPOINTS = (
-        'https://nvcomment.nicovideo.jp/legacy/api.json',
-        'https://nmsg.nicovideo.jp/api.json',)
-    _API_HEADERS = {
-        'X-Frontend-ID': '6',
-        'X-Frontend-Version': '0',
-        'X-Niconico-Language': 'en-us',
-        'Referer': 'https://www.nicovideo.jp/',
-        'Origin': 'https://www.nicovideo.jp',
-    }
 
-    def _perform_login(self, username, password):
-        login_ok = True
-        login_form_strs = {
-            'mail_tel': username,
-            'password': password,
-        }
-        self._request_webpage(
-            'https://account.nicovideo.jp/login', None,
-            note='Acquiring Login session')
-        page = self._download_webpage(
-            'https://account.nicovideo.jp/login/redirector?show_button_twitter=1&site=niconico&show_button_facebook=1', None,
-            note='Logging in', errnote='Unable to log in',
-            data=urlencode_postdata(login_form_strs),
-            headers={
-                'Referer': 'https://account.nicovideo.jp/login',
-                'Content-Type': 'application/x-www-form-urlencoded',
-            })
-        if 'oneTimePw' in page:
-            post_url = self._search_regex(
-                r'<form[^>]+action=(["\'])(?P<url>.+?)\1', page, 'post url', group='url')
-            page = self._download_webpage(
-                urljoin('https://account.nicovideo.jp', post_url), None,
-                note='Performing MFA', errnote='Unable to complete MFA',
-                data=urlencode_postdata({
-                    'otp': self._get_tfa_info('6 digits code')
-                }), headers={
-                    'Content-Type': 'application/x-www-form-urlencoded',
-                })
-            if 'oneTimePw' in page or 'formError' in page:
-                err_msg = self._html_search_regex(
-                    r'formError["\']+>(.*?)</div>', page, 'form_error',
-                    default='There\'s an error but the message can\'t be parsed.',
-                    flags=re.DOTALL)
-                self.report_warning(f'Unable to log in: MFA challenge failed, "{err_msg}"')
-                return False
-        login_ok = 'class="notice error"' not in page
-        if not login_ok:
-            self.report_warning('Unable to log in: bad username or password')
-        return login_ok
+    def _yield_dms_formats(self, api_data, video_id):
+        fmt_filter = lambda _, v: v['isAvailable'] and v['id']
+        videos = traverse_obj(api_data, ('media', 'domand', 'videos', fmt_filter))
+        audios = traverse_obj(api_data, ('media', 'domand', 'audios', fmt_filter))
+        access_key = traverse_obj(api_data, ('media', 'domand', 'accessRightKey', {str}))
+        track_id = traverse_obj(api_data, ('client', 'watchTrackId', {str}))
+        if not all((videos, audios, access_key, track_id)):
+            return
 
-    def _get_heartbeat_info(self, info_dict):
-        video_id, video_src_id, audio_src_id = info_dict['url'].split(':')[1].split('/')
-        dmc_protocol = info_dict['expected_protocol']
-
-        api_data = (
-            info_dict.get('_api_data')
-            or self._parse_json(
-                self._html_search_regex(
-                    'data-api-data="([^"]+)"',
-                    self._download_webpage('https://www.nicovideo.jp/watch/' + video_id, video_id),
-                    'API data', default='{}'),
-                video_id))
-
-        session_api_data = try_get(api_data, lambda x: x['media']['delivery']['movie']['session'])
-        session_api_endpoint = try_get(session_api_data, lambda x: x['urls'][0])
-
-        def ping():
-            tracking_id = traverse_obj(api_data, ('media', 'delivery', 'trackingId'))
-            if tracking_id:
-                tracking_url = update_url_query('https://nvapi.nicovideo.jp/v1/2ab0cbaa/watch', {'t': tracking_id})
-                watch_request_response = self._download_json(
-                    tracking_url, video_id,
-                    note='Acquiring permission for downloading video', fatal=False,
-                    headers=self._API_HEADERS)
-                if traverse_obj(watch_request_response, ('meta', 'status')) != 200:
-                    self.report_warning('Failed to acquire permission for playing video. Video download may fail.')
-
-        yesno = lambda x: 'yes' if x else 'no'
-
-        if dmc_protocol == 'http':
-            protocol = 'http'
-            protocol_parameters = {
-                'http_output_download_parameters': {
-                    'use_ssl': yesno(session_api_data['urls'][0]['isSsl']),
-                    'use_well_known_port': yesno(session_api_data['urls'][0]['isWellKnownPort']),
-                }
-            }
-        elif dmc_protocol == 'hls':
-            protocol = 'm3u8'
-            segment_duration = try_get(self._configuration_arg('segment_duration'), lambda x: int(x[0])) or 6000
-            parsed_token = self._parse_json(session_api_data['token'], video_id)
-            encryption = traverse_obj(api_data, ('media', 'delivery', 'encryption'))
-            protocol_parameters = {
-                'hls_parameters': {
-                    'segment_duration': segment_duration,
-                    'transfer_preset': '',
-                    'use_ssl': yesno(session_api_data['urls'][0]['isSsl']),
-                    'use_well_known_port': yesno(session_api_data['urls'][0]['isWellKnownPort']),
-                }
-            }
-            if 'hls_encryption' in parsed_token and encryption:
-                protocol_parameters['hls_parameters']['encryption'] = {
-                    parsed_token['hls_encryption']: {
-                        'encrypted_key': encryption['encryptedKey'],
-                        'key_uri': encryption['keyUri'],
-                    }
-                }
-            else:
-                protocol = 'm3u8_native'
-        else:
-            raise ExtractorError(f'Unsupported DMC protocol: {dmc_protocol}')
-
-        session_response = self._download_json(
-            session_api_endpoint['url'], video_id,
-            query={'_format': 'json'},
-            headers={'Content-Type': 'application/json'},
-            note='Downloading JSON metadata for %s' % info_dict['format_id'],
+        dms_m3u8_url = self._download_json(
+            f'https://nvapi.nicovideo.jp/v1/watch/{video_id}/access-rights/hls', video_id,
             data=json.dumps({
-                'session': {
-                    'client_info': {
-                        'player_id': session_api_data.get('playerId'),
-                    },
-                    'content_auth': {
-                        'auth_type': try_get(session_api_data, lambda x: x['authTypes'][session_api_data['protocols'][0]]),
-                        'content_key_timeout': session_api_data.get('contentKeyTimeout'),
-                        'service_id': 'nicovideo',
-                        'service_user_id': session_api_data.get('serviceUserId')
-                    },
-                    'content_id': session_api_data.get('contentId'),
-                    'content_src_id_sets': [{
-                        'content_src_ids': [{
-                            'src_id_to_mux': {
-                                'audio_src_ids': [audio_src_id],
-                                'video_src_ids': [video_src_id],
-                            }
-                        }]
-                    }],
-                    'content_type': 'movie',
-                    'content_uri': '',
-                    'keep_method': {
-                        'heartbeat': {
-                            'lifetime': session_api_data.get('heartbeatLifetime')
-                        }
-                    },
-                    'priority': session_api_data['priority'],
-                    'protocol': {
-                        'name': 'http',
-                        'parameters': {
-                            'http_parameters': {
-                                'parameters': protocol_parameters
-                            }
-                        }
-                    },
-                    'recipe_id': session_api_data.get('recipeId'),
-                    'session_operation_auth': {
-                        'session_operation_auth_by_signature': {
-                            'signature': session_api_data.get('signature'),
-                            'token': session_api_data.get('token'),
-                        }
-                    },
-                    'timing_constraint': 'unlimited'
-                }
-            }).encode())
+                'outputs': list(itertools.product((v['id'] for v in videos), (a['id'] for a in audios))),
+            }).encode(), query={'actionTrackId': track_id}, headers={
+                'x-access-right-key': access_key,
+                'x-frontend-id': 6,
+                'x-frontend-version': 0,
+                'x-request-with': 'https://www.nicovideo.jp',
+            })['data']['contentUrl']
+        # Getting all audio formats results in duplicate video formats which we filter out later
+        dms_fmts = self._extract_m3u8_formats(dms_m3u8_url, video_id, 'mp4')
 
-        info_dict['url'] = session_response['data']['session']['content_uri']
-        info_dict['protocol'] = protocol
-
-        # get heartbeat info
-        heartbeat_info_dict = {
-            'url': session_api_endpoint['url'] + '/' + session_response['data']['session']['id'] + '?_format=json&_method=PUT',
-            'data': json.dumps(session_response['data']),
-            # interval, convert milliseconds to seconds, then halve to make a buffer.
-            'interval': float_or_none(session_api_data.get('heartbeatLifetime'), scale=3000),
-            'ping': ping
-        }
-
-        return info_dict, heartbeat_info_dict
-
-    def _extract_format_for_quality(self, video_id, audio_quality, video_quality, dmc_protocol):
-
-        if not audio_quality.get('isAvailable') or not video_quality.get('isAvailable'):
-            return None
-
-        def extract_video_quality(video_quality):
-            return parse_filesize('%sB' % self._search_regex(
-                r'\| ([0-9]*\.?[0-9]*[MK])', video_quality, 'vbr', default=''))
-
-        format_id = '-'.join(
-            [remove_start(s['id'], 'archive_') for s in (video_quality, audio_quality)] + [dmc_protocol])
-
-        vid_qual_label = traverse_obj(video_quality, ('metadata', 'label'))
-        vid_quality = traverse_obj(video_quality, ('metadata', 'bitrate'))
-
-        return {
-            'url': 'niconico_dmc:%s/%s/%s' % (video_id, video_quality['id'], audio_quality['id']),
-            'format_id': format_id,
-            'format_note': join_nonempty('DMC', vid_qual_label, dmc_protocol.upper(), delim=' '),
-            'ext': 'mp4',  # Session API are used in HTML5, which always serves mp4
-            'acodec': 'aac',
-            'vcodec': 'h264',
-            'abr': float_or_none(traverse_obj(audio_quality, ('metadata', 'bitrate')), 1000),
-            'vbr': float_or_none(vid_quality if vid_quality > 0 else extract_video_quality(vid_qual_label), 1000),
-            'height': traverse_obj(video_quality, ('metadata', 'resolution', 'height')),
-            'width': traverse_obj(video_quality, ('metadata', 'resolution', 'width')),
-            'quality': -2 if 'low' in video_quality['id'] else None,
-            'protocol': 'niconico_dmc',
-            'expected_protocol': dmc_protocol,  # XXX: This is not a documented field
-            'http_headers': {
-                'Origin': 'https://www.nicovideo.jp',
-                'Referer': 'https://www.nicovideo.jp/watch/' + video_id,
+        # m3u8 extraction does not provide audio bitrates, so extract from the API data and fix
+        for audio_fmt in traverse_obj(dms_fmts, lambda _, v: v['vcodec'] == 'none'):
+            yield {
+                **audio_fmt,
+                **traverse_obj(audios, (lambda _, v: audio_fmt['format_id'].startswith(v['id']), {
+                    'format_id': ('id', {str}),
+                    'abr': ('bitRate', {float_or_none(scale=1000)}),
+                    'asr': ('samplingRate', {int_or_none}),
+                    'quality': ('qualityLevel', {int_or_none}),
+                }), get_all=False),
+                'acodec': 'aac',
             }
-        }
+
+        # Sort before removing dupes to keep the format dicts with the lowest tbr
+        video_fmts = sorted((fmt for fmt in dms_fmts if fmt['vcodec'] != 'none'), key=lambda f: f['tbr'])
+        self._remove_duplicate_formats(video_fmts)
+        # Calculate the true vbr/tbr by subtracting the lowest abr
+        min_abr = min(traverse_obj(audios, (..., 'bitRate', {float_or_none})), default=0) / 1000
+        for video_fmt in video_fmts:
+            video_fmt['tbr'] -= min_abr
+            video_fmt['format_id'] = url_basename(video_fmt['url']).rpartition('.')[0]
+            video_fmt['quality'] = traverse_obj(videos, (
+                lambda _, v: v['id'] == video_fmt['format_id'], 'qualityLevel', {int_or_none}, any)) or -1
+            yield video_fmt
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
@@ -396,13 +292,15 @@ class NiconicoIE(InfoExtractor):
             if video_id.startswith('so'):
                 video_id = self._match_id(handle.url)
 
-            api_data = self._parse_json(self._html_search_regex(
-                'data-api-data="([^"]+)"', webpage,
-                'API data', default='{}'), video_id)
+            api_data = traverse_obj(
+                self._parse_json(self._html_search_meta('server-response', webpage) or '', video_id),
+                ('data', 'response', {dict}))
+            if not api_data:
+                raise ExtractorError('Server response data not found')
         except ExtractorError as e:
             try:
                 api_data = self._download_json(
-                    'https://www.nicovideo.jp/api/watch/v3/%s?_frontendId=6&_frontendVersion=0&actionTrackId=AAAAAAAAAA_%d' % (video_id, round(time.time() * 1000)), video_id,
+                    f'https://www.nicovideo.jp/api/watch/v3/{video_id}?_frontendId=6&_frontendVersion=0&actionTrackId=AAAAAAAAAA_{round(time.time() * 1000)}', video_id,
                     note='Downloading API JSON', errnote='Unable to fetch data')['data']
             except ExtractorError:
                 if not isinstance(e.cause, HTTPError):
@@ -413,19 +311,29 @@ class NiconicoIE(InfoExtractor):
                     webpage, 'error reason', default=None)
                 if not error_msg:
                     raise
-                raise ExtractorError(re.sub(r'\s+', ' ', error_msg), expected=True)
+                raise ExtractorError(clean_html(error_msg), expected=True)
 
-        formats = []
+        availability = self._availability(**(traverse_obj(api_data, ('payment', 'video', {
+            'needs_premium': ('isPremium', {bool}),
+            'needs_subscription': ('isAdmission', {bool}),
+        })) or {'needs_auth': True}))
 
-        def get_video_info(*items, get_first=True, **kwargs):
-            return traverse_obj(api_data, ('video', *items), get_all=not get_first, **kwargs)
-
-        quality_info = api_data['media']['delivery']['movie']
-        session_api_data = quality_info['session']
-        for (audio_quality, video_quality, protocol) in itertools.product(quality_info['audios'], quality_info['videos'], session_api_data['protocols']):
-            fmt = self._extract_format_for_quality(video_id, audio_quality, video_quality, protocol)
-            if fmt:
-                formats.append(fmt)
+        formats = list(self._yield_dms_formats(api_data, video_id))
+        if not formats:
+            fail_msg = clean_html(self._html_search_regex(
+                r'<p[^>]+\bclass="fail-message"[^>]*>(?P<msg>.+?)</p>',
+                webpage, 'fail message', default=None, group='msg'))
+            if fail_msg:
+                self.to_screen(f'Niconico said: {fail_msg}')
+            if fail_msg and 'された地域と同じ地域からのみ視聴できます。' in fail_msg:
+                availability = None
+                self.raise_geo_restricted(countries=self._GEO_COUNTRIES, metadata_available=True)
+            elif availability == 'premium_only':
+                self.raise_login_required('This video requires premium', metadata_available=True)
+            elif availability == 'subscriber_only':
+                self.raise_login_required('This video is for members only', metadata_available=True)
+            elif availability == 'needs_auth':
+                self.raise_login_required(metadata_available=False)
 
         # Start extracting information
         tags = None
@@ -444,11 +352,15 @@ class NiconicoIE(InfoExtractor):
 
         thumb_prefs = qualities(['url', 'middleUrl', 'largeUrl', 'player', 'ogp'])
 
+        def get_video_info(*items, get_first=True, **kwargs):
+            return traverse_obj(api_data, ('video', *items), get_all=not get_first, **kwargs)
+
         return {
             'id': video_id,
             '_api_data': api_data,
             'title': get_video_info(('originalTitle', 'title')) or self._og_search_title(webpage, default=None),
             'formats': formats,
+            'availability': availability,
             'thumbnails': [{
                 'id': key,
                 'url': url,
@@ -471,93 +383,19 @@ class NiconicoIE(InfoExtractor):
                 parse_duration(self._html_search_meta('video:duration', webpage, 'video duration', default=None))
                 or get_video_info('duration')),
             'webpage_url': url_or_none(url) or f'https://www.nicovideo.jp/watch/{video_id}',
-            'subtitles': self.extract_subtitles(video_id, api_data, session_api_data),
+            'subtitles': self.extract_subtitles(video_id, api_data),
         }
 
-    def _get_subtitles(self, video_id, api_data, session_api_data):
-        comment_user_key = traverse_obj(api_data, ('comment', 'keys', 'userKey'))
-        user_id_str = session_api_data.get('serviceUserId')
-
-        thread_ids = traverse_obj(api_data, ('comment', 'threads', lambda _, v: v['isActive']))
-        legacy_danmaku = self._extract_legacy_comments(video_id, thread_ids, user_id_str, comment_user_key) or []
-
-        new_comments = traverse_obj(api_data, ('comment', 'nvComment'))
-        new_danmaku = self._extract_new_comments(
-            new_comments.get('server'), video_id,
-            new_comments.get('params'), new_comments.get('threadKey'))
-
-        if not legacy_danmaku and not new_danmaku:
-            self.report_warning(f'Failed to get comments. {bug_reports_message()}')
+    def _get_subtitles(self, video_id, api_data):
+        comments_info = traverse_obj(api_data, ('comment', 'nvComment', {dict})) or {}
+        if not comments_info.get('server'):
             return
 
-        return {
-            'comments': [{
-                'ext': 'json',
-                'data': json.dumps(legacy_danmaku + new_danmaku),
-            }],
-        }
-
-    def _extract_legacy_comments(self, video_id, threads, user_id, user_key):
-        auth_data = {
-            'user_id': user_id,
-            'userkey': user_key,
-        } if user_id and user_key else {'user_id': ''}
-
-        api_url = traverse_obj(threads, (..., 'server'), get_all=False)
-
-        # Request Start
-        post_data = [{'ping': {'content': 'rs:0'}}]
-        for i, thread in enumerate(threads):
-            thread_id = thread['id']
-            thread_fork = thread['fork']
-            # Post Start (2N)
-            post_data.append({'ping': {'content': f'ps:{i * 2}'}})
-            post_data.append({'thread': {
-                'fork': thread_fork,
-                'language': 0,
-                'nicoru': 3,
-                'scores': 1,
-                'thread': thread_id,
-                'version': '20090904',
-                'with_global': 1,
-                **auth_data,
-            }})
-            # Post Final (2N)
-            post_data.append({'ping': {'content': f'pf:{i * 2}'}})
-
-            # Post Start (2N+1)
-            post_data.append({'ping': {'content': f'ps:{i * 2 + 1}'}})
-            post_data.append({'thread_leaves': {
-                # format is '<bottom of minute range>-<top of minute range>:<comments per minute>,<total last comments'
-                # unfortunately NND limits (deletes?) comment returns this way, so you're only able to grab the last 1000 per language
-                'content': '0-999999:999999,999999,nicoru:999999',
-                'fork': thread_fork,
-                'language': 0,
-                'nicoru': 3,
-                'scores': 1,
-                'thread': thread_id,
-                **auth_data,
-            }})
-            # Post Final (2N+1)
-            post_data.append({'ping': {'content': f'pf:{i * 2 + 1}'}})
-        # Request Final
-        post_data.append({'ping': {'content': 'rf:0'}})
-
-        return self._download_json(
-            f'{api_url}/api.json', video_id, data=json.dumps(post_data).encode(), fatal=False,
-            headers={
-                'Referer': f'https://www.nicovideo.jp/watch/{video_id}',
-                'Origin': 'https://www.nicovideo.jp',
-                'Content-Type': 'text/plain;charset=UTF-8',
-            },
-            note='Downloading comments', errnote=f'Failed to access endpoint {api_url}')
-
-    def _extract_new_comments(self, endpoint, video_id, params, thread_key):
-        comments = self._download_json(
-            f'{endpoint}/v1/threads', video_id, data=json.dumps({
+        danmaku = traverse_obj(self._download_json(
+            f'{comments_info["server"]}/v1/threads', video_id, data=json.dumps({
                 'additionals': {},
-                'params': params,
-                'threadKey': thread_key,
+                'params': comments_info.get('params'),
+                'threadKey': comments_info.get('threadKey'),
             }).encode(), fatal=False,
             headers={
                 'Referer': 'https://www.nicovideo.jp/',
@@ -567,8 +405,15 @@ class NiconicoIE(InfoExtractor):
                 'x-frontend-id': '6',
                 'x-frontend-version': '0',
             },
-            note='Downloading comments (new)', errnote='Failed to download comments (new)')
-        return traverse_obj(comments, ('data', 'threads', ..., 'comments', ...))
+            note='Downloading comments', errnote='Failed to download comments'),
+            ('data', 'threads', ..., 'comments', ...))
+
+        return {
+            'comments': [{
+                'ext': 'json',
+                'data': json.dumps(danmaku),
+            }],
+        }
 
 
 class NiconicoPlaylistBaseIE(InfoExtractor):
@@ -577,7 +422,7 @@ class NiconicoPlaylistBaseIE(InfoExtractor):
     _API_HEADERS = {
         'X-Frontend-ID': '6',
         'X-Frontend-Version': '0',
-        'X-Niconico-Language': 'en-us'
+        'X-Niconico-Language': 'en-us',
     }
 
     def _call_api(self, list_id, resource, query):
@@ -586,13 +431,13 @@ class NiconicoPlaylistBaseIE(InfoExtractor):
     @staticmethod
     def _parse_owner(item):
         return {
-            'uploader': traverse_obj(item, ('owner', 'name')),
-            'uploader_id': traverse_obj(item, ('owner', 'id')),
+            'uploader': traverse_obj(item, ('owner', ('name', ('user', 'nickname')), {str}, any)),
+            'uploader_id': traverse_obj(item, ('owner', 'id', {str})),
         }
 
     def _fetch_page(self, list_id, page):
         page += 1
-        resp = self._call_api(list_id, 'page %d' % page, {
+        resp = self._call_api(list_id, f'page {page}', {
             'page': page,
             'pageSize': self._PAGE_SIZE,
         })
@@ -660,7 +505,7 @@ class NiconicoPlaylistIE(NiconicoPlaylistBaseIE):
             mylist.get('name'), mylist.get('description'), **self._parse_owner(mylist))
 
 
-class NiconicoSeriesIE(InfoExtractor):
+class NiconicoSeriesIE(NiconicoPlaylistBaseIE):
     IE_NAME = 'niconico:series'
     _VALID_URL = r'https?://(?:(?:www\.|sp\.)?nicovideo\.jp(?:/user/\d+)?|nico\.ms)/series/(?P<id>\d+)'
 
@@ -669,6 +514,9 @@ class NiconicoSeriesIE(InfoExtractor):
         'info_dict': {
             'id': '110226',
             'title': 'ご立派ァ！のシリーズ',
+            'description': '楽しそうな外人の吹き替えをさせたら終身名誉ホモガキの右に出る人はいませんね…',
+            'uploader': 'アルファるふぁ',
+            'uploader_id': '44113208',
         },
         'playlist_mincount': 10,
     }, {
@@ -676,6 +524,9 @@ class NiconicoSeriesIE(InfoExtractor):
         'info_dict': {
             'id': '12312',
             'title': 'バトルスピリッツ　お勧めカード紹介(調整中)',
+            'description': '',
+            'uploader': '野鳥',
+            'uploader_id': '2275360',
         },
         'playlist_mincount': 103,
     }, {
@@ -683,19 +534,21 @@ class NiconicoSeriesIE(InfoExtractor):
         'only_matching': True,
     }]
 
+    def _call_api(self, list_id, resource, query):
+        return self._download_json(
+            f'https://nvapi.nicovideo.jp/v2/series/{list_id}', list_id,
+            f'Downloading {resource}', query=query,
+            headers=self._API_HEADERS)['data']
+
     def _real_extract(self, url):
         list_id = self._match_id(url)
-        webpage = self._download_webpage(url, list_id)
+        series = self._call_api(list_id, 'list', {
+            'pageSize': 1,
+        })['detail']
 
-        title = self._search_regex(
-            (r'<title>「(.+)（全',
-             r'<div class="TwitterShareButton"\s+data-text="(.+)\s+https:'),
-            webpage, 'title', fatal=False)
-        if title:
-            title = unescapeHTML(title)
-        json_data = next(self._yield_json_ld(webpage, None, fatal=False))
-        return self.playlist_from_matches(
-            traverse_obj(json_data, ('itemListElement', ..., 'url')), list_id, title, ie=NiconicoIE)
+        return self.playlist_result(
+            self._entries(list_id), list_id,
+            series.get('title'), series.get('description'), **self._parse_owner(series))
 
 
 class NiconicoHistoryIE(NiconicoPlaylistBaseIE):
@@ -780,14 +633,14 @@ class NicovideoSearchURLIE(NicovideoSearchBaseIE):
         'url': 'http://www.nicovideo.jp/search/sm9',
         'info_dict': {
             'id': 'sm9',
-            'title': 'sm9'
+            'title': 'sm9',
         },
         'playlist_mincount': 40,
     }, {
         'url': 'https://www.nicovideo.jp/search/sm9?sort=h&order=d&end=2020-12-31&start=2020-01-01',
         'info_dict': {
             'id': 'sm9',
-            'title': 'sm9'
+            'title': 'sm9',
         },
         'playlist_count': 31,
     }]
@@ -805,17 +658,17 @@ class NicovideoSearchDateIE(NicovideoSearchBaseIE, SearchInfoExtractor):
         'url': 'nicosearchdateall:a',
         'info_dict': {
             'id': 'a',
-            'title': 'a'
+            'title': 'a',
         },
         'playlist_mincount': 1610,
     }]
 
-    _START_DATE = datetime.date(2007, 1, 1)
+    _START_DATE = dt.date(2007, 1, 1)
     _RESULTS_PER_PAGE = 32
     _MAX_PAGES = 50
 
     def _entries(self, url, item_id, start_date=None, end_date=None):
-        start_date, end_date = start_date or self._START_DATE, end_date or datetime.datetime.now().date()
+        start_date, end_date = start_date or self._START_DATE, end_date or dt.datetime.now().date()
 
         # If the last page has a full page of videos, we need to break down the query interval further
         last_page_len = len(list(self._get_entries_for_date(
@@ -852,7 +705,7 @@ class NicovideoTagURLIE(NicovideoSearchBaseIE):
         'url': 'https://www.nicovideo.jp/tag/ドキュメンタリー淫夢',
         'info_dict': {
             'id': 'ドキュメンタリー淫夢',
-            'title': 'ドキュメンタリー淫夢'
+            'title': 'ドキュメンタリー淫夢',
         },
         'playlist_mincount': 400,
     }]
@@ -863,7 +716,7 @@ class NicovideoTagURLIE(NicovideoSearchBaseIE):
 
 
 class NiconicoUserIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?nicovideo\.jp/user/(?P<id>\d+)/?(?:$|[#?])'
+    _VALID_URL = r'https?://(?:www\.)?nicovideo\.jp/user/(?P<id>\d+)(?:/video)?/?(?:$|[#?])'
     _TEST = {
         'url': 'https://www.nicovideo.jp/user/419948',
         'info_dict': {
@@ -871,12 +724,12 @@ class NiconicoUserIE(InfoExtractor):
         },
         'playlist_mincount': 101,
     }
-    _API_URL = "https://nvapi.nicovideo.jp/v1/users/%s/videos?sortKey=registeredAt&sortOrder=desc&pageSize=%s&page=%s"
+    _API_URL = 'https://nvapi.nicovideo.jp/v2/users/%s/videos?sortKey=registeredAt&sortOrder=desc&pageSize=%s&page=%s'
     _PAGE_SIZE = 100
 
     _API_HEADERS = {
         'X-Frontend-ID': '6',
-        'X-Frontend-Version': '0'
+        'X-Frontend-Version': '0',
     }
 
     def _entries(self, list_id):
@@ -886,20 +739,21 @@ class NiconicoUserIE(InfoExtractor):
             json_parsed = self._download_json(
                 self._API_URL % (list_id, self._PAGE_SIZE, page_num + 1), list_id,
                 headers=self._API_HEADERS,
-                note='Downloading JSON metadata%s' % (' page %d' % page_num if page_num else ''))
+                note='Downloading JSON metadata%s' % (f' page {page_num}' if page_num else ''))
             if not page_num:
                 total_count = int_or_none(json_parsed['data'].get('totalCount'))
-            for entry in json_parsed["data"]["items"]:
+            for entry in json_parsed['data']['items']:
                 count += 1
-                yield self.url_result('https://www.nicovideo.jp/watch/%s' % entry['id'])
+                yield self.url_result(
+                    f'https://www.nicovideo.jp/watch/{entry["essential"]["id"]}', ie=NiconicoIE)
             page_num += 1
 
     def _real_extract(self, url):
         list_id = self._match_id(url)
-        return self.playlist_result(self._entries(list_id), list_id, ie=NiconicoIE.ie_key())
+        return self.playlist_result(self._entries(list_id), list_id)
 
 
-class NiconicoLiveIE(InfoExtractor):
+class NiconicoLiveIE(NiconicoBaseIE):
     IE_NAME = 'niconico:live'
     IE_DESC = 'ニコニコ生放送'
     _VALID_URL = r'https?://(?:sp\.)?live2?\.nicovideo\.jp/(?:watch|gate)/(?P<id>lv\d+)'
@@ -908,7 +762,7 @@ class NiconicoLiveIE(InfoExtractor):
         'url': 'https://live.nicovideo.jp/watch/lv339533123',
         'info_dict': {
             'id': 'lv339533123',
-            'title': '激辛ペヤング食べます‪( ;ᯅ; )‬（歌枠オーディション参加中）',
+            'title': '激辛ペヤング食べます\u202a( ;ᯅ; )\u202c（歌枠オーディション参加中）',
             'view_count': 1526,
             'comment_count': 1772,
             'description': '初めましてもかって言います❕\nのんびり自由に適当に暮らしてます',
@@ -934,8 +788,6 @@ class NiconicoLiveIE(InfoExtractor):
     _KNOWN_LATENCY = ('high', 'low')
 
     def _real_extract(self, url):
-        if not websockets:
-            raise ExtractorError('websockets library is not available. Please install it.', expected=True)
         video_id = self._match_id(url)
         webpage, urlh = self._download_webpage_handle(f'https://live.nicovideo.jp/watch/{video_id}', video_id)
 
@@ -949,18 +801,14 @@ class NiconicoLiveIE(InfoExtractor):
             'frontend_id': traverse_obj(embedded_data, ('site', 'frontendId')) or '9',
         })
 
-        hostname = remove_start(urlparse(urlh.url).hostname, 'sp.')
-        cookies = try_get(urlh.url, self._downloader._calc_cookies)
+        hostname = remove_start(urllib.parse.urlparse(urlh.url).hostname, 'sp.')
         latency = try_get(self._configuration_arg('latency'), lambda x: x[0])
         if latency not in self._KNOWN_LATENCY:
             latency = 'high'
 
-        ws = WebSocketsWrapper(ws_url, {
-            'Cookies': str_or_none(cookies) or '',
-            'Origin': f'https://{hostname}',
-            'Accept': '*/*',
-            'User-Agent': self.get_param('http_headers')['User-Agent'],
-        })
+        ws = self._request_webpage(
+            Request(ws_url, headers={'Origin': f'https://{hostname}'}),
+            video_id=video_id, note='Connecting to WebSocket server')
 
         self.write_debug('[debug] Sending HLS server request')
         ws.send(json.dumps({
@@ -970,14 +818,15 @@ class NiconicoLiveIE(InfoExtractor):
                     'quality': 'abr',
                     'protocol': 'hls+fmp4',
                     'latency': latency,
-                    'chasePlay': False
+                    'accessRightMethod': 'single_cookie',
+                    'chasePlay': False,
                 },
                 'room': {
                     'protocol': 'webSocket',
-                    'commentable': True
+                    'commentable': True,
                 },
                 'reconnect': False,
-            }
+            },
         }))
 
         while True:
@@ -990,6 +839,7 @@ class NiconicoLiveIE(InfoExtractor):
             if data.get('type') == 'stream':
                 m3u8_url = data['data']['uri']
                 qualities = data['data']['availableQualities']
+                cookies = data['data']['cookies']
                 break
             elif data.get('type') == 'disconnect':
                 self.write_debug(recv)
@@ -1001,7 +851,7 @@ class NiconicoLiveIE(InfoExtractor):
             elif self.get_param('verbose', False):
                 if len(recv) > 100:
                     recv = recv[:100] + '...'
-                self.write_debug('Server said: %s' % recv)
+                self.write_debug(f'Server said: {recv}')
 
         title = traverse_obj(embedded_data, ('program', 'title')) or self._html_search_meta(
             ('og:title', 'twitter:title'), webpage, 'live title', fatal=False)
@@ -1024,9 +874,15 @@ class NiconicoLiveIE(InfoExtractor):
                 thumbnails.append({
                     'id': f'{name}_{width}x{height}',
                     'url': img_url,
+                    'ext': traverse_obj(parse_qs(img_url), ('image', 0, {determine_ext(default_ext='jpg')})),
                     **res,
                 })
 
+        for cookie in cookies:
+            self._set_cookie(
+                cookie['domain'], cookie['name'], cookie['value'],
+                expire_time=unified_timestamp(cookie['expires']), path=cookie['path'], secure=cookie['secure'])
+
         formats = self._extract_m3u8_formats(m3u8_url, video_id, ext='mp4', live=True)
         for fmt, q in zip(formats, reversed(qualities[1:])):
             fmt.update({
@@ -1034,7 +890,6 @@ class NiconicoLiveIE(InfoExtractor):
                 'protocol': 'niconico_live',
                 'ws': ws,
                 'video_id': video_id,
-                'cookies': cookies,
                 'live_latency': latency,
                 'origin': hostname,
             })
diff --git a/plugins/youtube_download/yt_dlp/extractor/niconicochannelplus.py b/plugins/youtube_download/yt_dlp/extractor/niconicochannelplus.py
new file mode 100644
index 0000000..f39d000
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/niconicochannelplus.py
@@ -0,0 +1,426 @@
+import functools
+import json
+
+from .common import InfoExtractor
+from ..utils import (
+    ExtractorError,
+    OnDemandPagedList,
+    filter_dict,
+    int_or_none,
+    parse_qs,
+    str_or_none,
+    traverse_obj,
+    unified_timestamp,
+    url_or_none,
+)
+
+
+class NiconicoChannelPlusBaseIE(InfoExtractor):
+    _WEBPAGE_BASE_URL = 'https://nicochannel.jp'
+
+    def _call_api(self, path, item_id, **kwargs):
+        return self._download_json(
+            f'https://nfc-api.nicochannel.jp/fc/{path}', video_id=item_id, **kwargs)
+
+    def _find_fanclub_site_id(self, channel_name):
+        fanclub_list_json = self._call_api(
+            'content_providers/channels', item_id=f'channels/{channel_name}',
+            note='Fetching channel list', errnote='Unable to fetch channel list',
+        )['data']['content_providers']
+        fanclub_id = traverse_obj(fanclub_list_json, (
+            lambda _, v: v['domain'] == f'{self._WEBPAGE_BASE_URL}/{channel_name}', 'id'),
+            get_all=False)
+        if not fanclub_id:
+            raise ExtractorError(f'Channel {channel_name} does not exist', expected=True)
+        return fanclub_id
+
+    def _get_channel_base_info(self, fanclub_site_id):
+        return traverse_obj(self._call_api(
+            f'fanclub_sites/{fanclub_site_id}/page_base_info', item_id=f'fanclub_sites/{fanclub_site_id}',
+            note='Fetching channel base info', errnote='Unable to fetch channel base info', fatal=False,
+        ), ('data', 'fanclub_site', {dict})) or {}
+
+    def _get_channel_user_info(self, fanclub_site_id):
+        return traverse_obj(self._call_api(
+            f'fanclub_sites/{fanclub_site_id}/user_info', item_id=f'fanclub_sites/{fanclub_site_id}',
+            note='Fetching channel user info', errnote='Unable to fetch channel user info', fatal=False,
+            data=json.dumps('null').encode('ascii'),
+        ), ('data', 'fanclub_site', {dict})) or {}
+
+
+class NiconicoChannelPlusIE(NiconicoChannelPlusBaseIE):
+    IE_NAME = 'NiconicoChannelPlus'
+    IE_DESC = 'ニコニコチャンネルプラス'
+    _VALID_URL = r'https?://nicochannel\.jp/(?P<channel>[\w.-]+)/(?:video|live)/(?P<code>sm\w+)'
+    _TESTS = [{
+        'url': 'https://nicochannel.jp/kaorin/video/smsDd8EdFLcVZk9yyAhD6H7H',
+        'info_dict': {
+            'id': 'smsDd8EdFLcVZk9yyAhD6H7H',
+            'title': '前田佳織里はニコ生がしたい！',
+            'ext': 'mp4',
+            'channel': '前田佳織里の世界攻略計画',
+            'channel_id': 'kaorin',
+            'channel_url': 'https://nicochannel.jp/kaorin',
+            'live_status': 'not_live',
+            'thumbnail': 'https://nicochannel.jp/public_html/contents/video_pages/74/thumbnail_path',
+            'description': '２０２１年１１月に放送された\n「前田佳織里はニコ生がしたい！」アーカイブになります。',
+            'timestamp': 1641360276,
+            'duration': 4097,
+            'comment_count': int,
+            'view_count': int,
+            'tags': [],
+            'upload_date': '20220105',
+        },
+        'params': {
+            'skip_download': True,
+        },
+    }, {
+        # age limited video; test purpose channel.
+        'url': 'https://nicochannel.jp/testman/video/smDXbcrtyPNxLx9jc4BW69Ve',
+        'info_dict': {
+            'id': 'smDXbcrtyPNxLx9jc4BW69Ve',
+            'title': 'test oshiro',
+            'ext': 'mp4',
+            'channel': '本番チャンネルプラステストマン',
+            'channel_id': 'testman',
+            'channel_url': 'https://nicochannel.jp/testman',
+            'age_limit': 18,
+            'live_status': 'was_live',
+            'timestamp': 1666344616,
+            'duration': 86465,
+            'comment_count': int,
+            'view_count': int,
+            'tags': [],
+            'upload_date': '20221021',
+        },
+        'params': {
+            'skip_download': True,
+        },
+    }]
+
+    def _real_extract(self, url):
+        content_code, channel_id = self._match_valid_url(url).group('code', 'channel')
+        fanclub_site_id = self._find_fanclub_site_id(channel_id)
+
+        data_json = self._call_api(
+            f'video_pages/{content_code}', item_id=content_code, headers={'fc_use_device': 'null'},
+            note='Fetching video page info', errnote='Unable to fetch video page info',
+        )['data']['video_page']
+
+        live_status, session_id = self._get_live_status_and_session_id(content_code, data_json)
+
+        release_timestamp_str = data_json.get('live_scheduled_start_at')
+
+        formats = []
+
+        if live_status == 'is_upcoming':
+            if release_timestamp_str:
+                msg = f'This live event will begin at {release_timestamp_str} UTC'
+            else:
+                msg = 'This event has not started yet'
+            self.raise_no_formats(msg, expected=True, video_id=content_code)
+        else:
+            formats = self._extract_m3u8_formats(
+                # "authenticated_url" is a format string that contains "{session_id}".
+                m3u8_url=data_json['video_stream']['authenticated_url'].format(session_id=session_id),
+                video_id=content_code)
+
+        return {
+            'id': content_code,
+            'formats': formats,
+            '_format_sort_fields': ('tbr', 'vcodec', 'acodec'),
+            'channel': self._get_channel_base_info(fanclub_site_id).get('fanclub_site_name'),
+            'channel_id': channel_id,
+            'channel_url': f'{self._WEBPAGE_BASE_URL}/{channel_id}',
+            'age_limit': traverse_obj(self._get_channel_user_info(fanclub_site_id), ('content_provider', 'age_limit')),
+            'live_status': live_status,
+            'release_timestamp': unified_timestamp(release_timestamp_str),
+            **traverse_obj(data_json, {
+                'title': ('title', {str}),
+                'thumbnail': ('thumbnail_url', {url_or_none}),
+                'description': ('description', {str}),
+                'timestamp': ('released_at', {unified_timestamp}),
+                'duration': ('active_video_filename', 'length', {int_or_none}),
+                'comment_count': ('video_aggregate_info', 'number_of_comments', {int_or_none}),
+                'view_count': ('video_aggregate_info', 'total_views', {int_or_none}),
+                'tags': ('video_tags', ..., 'tag', {str}),
+            }),
+            '__post_extractor': self.extract_comments(
+                content_code=content_code,
+                comment_group_id=traverse_obj(data_json, ('video_comment_setting', 'comment_group_id'))),
+        }
+
+    def _get_comments(self, content_code, comment_group_id):
+        item_id = f'{content_code}/comments'
+
+        if not comment_group_id:
+            return None
+
+        comment_access_token = self._call_api(
+            f'video_pages/{content_code}/comments_user_token', item_id,
+            note='Getting comment token', errnote='Unable to get comment token',
+        )['data']['access_token']
+
+        comment_list = self._download_json(
+            'https://comm-api.sheeta.com/messages.history', video_id=item_id,
+            note='Fetching comments', errnote='Unable to fetch comments',
+            headers={'Content-Type': 'application/json'},
+            query={
+                'sort_direction': 'asc',
+                'limit': int_or_none(self._configuration_arg('max_comments', [''])[0]) or 120,
+            },
+            data=json.dumps({
+                'token': comment_access_token,
+                'group_id': comment_group_id,
+            }).encode('ascii'))
+
+        for comment in traverse_obj(comment_list, ...):
+            yield traverse_obj(comment, {
+                'author': ('nickname', {str}),
+                'author_id': ('sender_id', {str_or_none}),
+                'id': ('id', {str_or_none}),
+                'text': ('message', {str}),
+                'timestamp': (('updated_at', 'sent_at', 'created_at'), {unified_timestamp}),
+                'author_is_uploader': ('sender_id', {lambda x: x == '-1'}),
+            }, get_all=False)
+
+    def _get_live_status_and_session_id(self, content_code, data_json):
+        video_type = data_json.get('type')
+        live_finished_at = data_json.get('live_finished_at')
+
+        payload = {}
+        if video_type == 'vod':
+            if live_finished_at:
+                live_status = 'was_live'
+            else:
+                live_status = 'not_live'
+        elif video_type == 'live':
+            if not data_json.get('live_started_at'):
+                return 'is_upcoming', ''
+
+            if not live_finished_at:
+                live_status = 'is_live'
+            else:
+                live_status = 'was_live'
+                payload = {'broadcast_type': 'dvr'}
+
+                video_allow_dvr_flg = traverse_obj(data_json, ('video', 'allow_dvr_flg'))
+                video_convert_to_vod_flg = traverse_obj(data_json, ('video', 'convert_to_vod_flg'))
+
+                self.write_debug(f'allow_dvr_flg = {video_allow_dvr_flg}, convert_to_vod_flg = {video_convert_to_vod_flg}.')
+
+                if not (video_allow_dvr_flg and video_convert_to_vod_flg):
+                    raise ExtractorError(
+                        'Live was ended, there is no video for download.', video_id=content_code, expected=True)
+        else:
+            raise ExtractorError(f'Unknown type: {video_type}', video_id=content_code, expected=False)
+
+        self.write_debug(f'{content_code}: video_type={video_type}, live_status={live_status}')
+
+        session_id = self._call_api(
+            f'video_pages/{content_code}/session_ids', item_id=f'{content_code}/session',
+            data=json.dumps(payload).encode('ascii'), headers={
+                'Content-Type': 'application/json',
+                'fc_use_device': 'null',
+                'origin': 'https://nicochannel.jp',
+            },
+            note='Getting session id', errnote='Unable to get session id',
+        )['data']['session_id']
+
+        return live_status, session_id
+
+
+class NiconicoChannelPlusChannelBaseIE(NiconicoChannelPlusBaseIE):
+    _PAGE_SIZE = 12
+
+    def _fetch_paged_channel_video_list(self, path, query, channel_name, item_id, page):
+        response = self._call_api(
+            path, item_id, query={
+                **query,
+                'page': (page + 1),
+                'per_page': self._PAGE_SIZE,
+            },
+            headers={'fc_use_device': 'null'},
+            note=f'Getting channel info (page {page + 1})',
+            errnote=f'Unable to get channel info (page {page + 1})')
+
+        for content_code in traverse_obj(response, ('data', 'video_pages', 'list', ..., 'content_code')):
+            # "video/{content_code}" works for both VOD and live, but "live/{content_code}" doesn't work for VOD
+            yield self.url_result(
+                f'{self._WEBPAGE_BASE_URL}/{channel_name}/video/{content_code}', NiconicoChannelPlusIE)
+
+
+class NiconicoChannelPlusChannelVideosIE(NiconicoChannelPlusChannelBaseIE):
+    IE_NAME = 'NiconicoChannelPlus:channel:videos'
+    IE_DESC = 'ニコニコチャンネルプラス - チャンネル - 動画リスト. nicochannel.jp/channel/videos'
+    _VALID_URL = r'https?://nicochannel\.jp/(?P<id>[a-z\d\._-]+)/videos(?:\?.*)?'
+    _TESTS = [{
+        # query: None
+        'url': 'https://nicochannel.jp/testman/videos',
+        'info_dict': {
+            'id': 'testman-videos',
+            'title': '本番チャンネルプラステストマン-videos',
+        },
+        'playlist_mincount': 18,
+    }, {
+        # query: None
+        'url': 'https://nicochannel.jp/testtarou/videos',
+        'info_dict': {
+            'id': 'testtarou-videos',
+            'title': 'チャンネルプラステスト太郎-videos',
+        },
+        'playlist_mincount': 2,
+    }, {
+        # query: None
+        'url': 'https://nicochannel.jp/testjirou/videos',
+        'info_dict': {
+            'id': 'testjirou-videos',
+            'title': 'チャンネルプラステスト二郎-videos',
+        },
+        'playlist_mincount': 12,
+    }, {
+        # query: tag
+        'url': 'https://nicochannel.jp/testman/videos?tag=%E6%A4%9C%E8%A8%BC%E7%94%A8',
+        'info_dict': {
+            'id': 'testman-videos',
+            'title': '本番チャンネルプラステストマン-videos',
+        },
+        'playlist_mincount': 6,
+    }, {
+        # query: vodType
+        'url': 'https://nicochannel.jp/testman/videos?vodType=1',
+        'info_dict': {
+            'id': 'testman-videos',
+            'title': '本番チャンネルプラステストマン-videos',
+        },
+        'playlist_mincount': 18,
+    }, {
+        # query: sort
+        'url': 'https://nicochannel.jp/testman/videos?sort=-released_at',
+        'info_dict': {
+            'id': 'testman-videos',
+            'title': '本番チャンネルプラステストマン-videos',
+        },
+        'playlist_mincount': 18,
+    }, {
+        # query: tag, vodType
+        'url': 'https://nicochannel.jp/testman/videos?tag=%E6%A4%9C%E8%A8%BC%E7%94%A8&vodType=1',
+        'info_dict': {
+            'id': 'testman-videos',
+            'title': '本番チャンネルプラステストマン-videos',
+        },
+        'playlist_mincount': 6,
+    }, {
+        # query: tag, sort
+        'url': 'https://nicochannel.jp/testman/videos?tag=%E6%A4%9C%E8%A8%BC%E7%94%A8&sort=-released_at',
+        'info_dict': {
+            'id': 'testman-videos',
+            'title': '本番チャンネルプラステストマン-videos',
+        },
+        'playlist_mincount': 6,
+    }, {
+        # query: vodType, sort
+        'url': 'https://nicochannel.jp/testman/videos?vodType=1&sort=-released_at',
+        'info_dict': {
+            'id': 'testman-videos',
+            'title': '本番チャンネルプラステストマン-videos',
+        },
+        'playlist_mincount': 18,
+    }, {
+        # query: tag, vodType, sort
+        'url': 'https://nicochannel.jp/testman/videos?tag=%E6%A4%9C%E8%A8%BC%E7%94%A8&vodType=1&sort=-released_at',
+        'info_dict': {
+            'id': 'testman-videos',
+            'title': '本番チャンネルプラステストマン-videos',
+        },
+        'playlist_mincount': 6,
+    }]
+
+    def _real_extract(self, url):
+        """
+        API parameters:
+            sort:
+                -released_at         公開日が新しい順 (newest to oldest)
+                 released_at         公開日が古い順 (oldest to newest)
+                -number_of_vod_views 再生数が多い順 (most play count)
+                 number_of_vod_views コメントが多い順 (most comments)
+            vod_type (is "vodType" in "url"):
+                0 すべて (all)
+                1 会員限定 (members only)
+                2 一部無料 (partially free)
+                3 レンタル (rental)
+                4 生放送アーカイブ (live archives)
+                5 アップロード動画 (uploaded videos)
+        """
+
+        channel_id = self._match_id(url)
+        fanclub_site_id = self._find_fanclub_site_id(channel_id)
+        channel_name = self._get_channel_base_info(fanclub_site_id).get('fanclub_site_name')
+        qs = parse_qs(url)
+
+        return self.playlist_result(
+            OnDemandPagedList(
+                functools.partial(
+                    self._fetch_paged_channel_video_list, f'fanclub_sites/{fanclub_site_id}/video_pages',
+                    filter_dict({
+                        'tag': traverse_obj(qs, ('tag', 0)),
+                        'sort': traverse_obj(qs, ('sort', 0), default='-released_at'),
+                        'vod_type': traverse_obj(qs, ('vodType', 0), default='0'),
+                    }),
+                    channel_id, f'{channel_id}/videos'),
+                self._PAGE_SIZE),
+            playlist_id=f'{channel_id}-videos', playlist_title=f'{channel_name}-videos')
+
+
+class NiconicoChannelPlusChannelLivesIE(NiconicoChannelPlusChannelBaseIE):
+    IE_NAME = 'NiconicoChannelPlus:channel:lives'
+    IE_DESC = 'ニコニコチャンネルプラス - チャンネル - ライブリスト. nicochannel.jp/channel/lives'
+    _VALID_URL = r'https?://nicochannel\.jp/(?P<id>[a-z\d\._-]+)/lives'
+    _TESTS = [{
+        'url': 'https://nicochannel.jp/testman/lives',
+        'info_dict': {
+            'id': 'testman-lives',
+            'title': '本番チャンネルプラステストマン-lives',
+        },
+        'playlist_mincount': 18,
+    }, {
+        'url': 'https://nicochannel.jp/testtarou/lives',
+        'info_dict': {
+            'id': 'testtarou-lives',
+            'title': 'チャンネルプラステスト太郎-lives',
+        },
+        'playlist_mincount': 2,
+    }, {
+        'url': 'https://nicochannel.jp/testjirou/lives',
+        'info_dict': {
+            'id': 'testjirou-lives',
+            'title': 'チャンネルプラステスト二郎-lives',
+        },
+        'playlist_mincount': 6,
+    }]
+
+    def _real_extract(self, url):
+        """
+        API parameters:
+            live_type:
+                1 放送中 (on air)
+                2 放送予定 (scheduled live streams, oldest to newest)
+                3 過去の放送 - すべて (all ended live streams, newest to oldest)
+                4 過去の放送 - 生放送アーカイブ (all archives for live streams, oldest to newest)
+            We use "4" instead of "3" because some recently ended live streams could not be downloaded.
+        """
+
+        channel_id = self._match_id(url)
+        fanclub_site_id = self._find_fanclub_site_id(channel_id)
+        channel_name = self._get_channel_base_info(fanclub_site_id).get('fanclub_site_name')
+
+        return self.playlist_result(
+            OnDemandPagedList(
+                functools.partial(
+                    self._fetch_paged_channel_video_list, f'fanclub_sites/{fanclub_site_id}/live_pages',
+                    {
+                        'live_type': 4,
+                    },
+                    channel_id, f'{channel_id}/lives'),
+                self._PAGE_SIZE),
+            playlist_id=f'{channel_id}-lives', playlist_title=f'{channel_name}-lives')
diff --git a/plugins/youtube_download/yt_dlp/extractor/ninaprotocol.py b/plugins/youtube_download/yt_dlp/extractor/ninaprotocol.py
new file mode 100644
index 0000000..c8063fb
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/ninaprotocol.py
@@ -0,0 +1,225 @@
+from .common import InfoExtractor
+from ..utils import int_or_none, mimetype2ext, parse_iso8601, url_or_none
+from ..utils.traversal import traverse_obj
+
+
+class NinaProtocolIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?ninaprotocol\.com/releases/(?P<id>[^/#?]+)'
+    _TESTS = [{
+        'url': 'https://www.ninaprotocol.com/releases/3SvsMM3y4oTPZ5DXFJnLkCAqkxz34hjzFxqms1vu9XBJ',
+        'info_dict': {
+            'id': '3SvsMM3y4oTPZ5DXFJnLkCAqkxz34hjzFxqms1vu9XBJ',
+            'title': 'The Spatulas - March Chant',
+            'tags': ['punk', 'postpresentmedium', 'cambridge'],
+            'uploader_id': '2bGjgdKUddJoj2shYGqfNcUfoSoABP21RJoiwGMZDq3A',
+            'channel': 'ppm',
+            'description': 'md5:bb9f9d39d8f786449cd5d0ff7c5772db',
+            'album': 'The Spatulas - March Chant',
+            'thumbnail': 'https://www.arweave.net/VyZA6CBeUuqP174khvSrD44Eosi3MLVyWN42uaQKg50',
+            'timestamp': 1701417610,
+            'uploader': 'ppmrecs',
+            'channel_id': '4ceG4zsb7VVxBTGPtZMqDZWGHo3VUg2xRvzC2b17ymWP',
+            'display_id': 'the-spatulas-march-chant',
+            'upload_date': '20231201',
+            'album_artist': 'Post Present Medium ',
+        },
+        'playlist': [{
+            'info_dict': {
+                'id': '3SvsMM3y4oTPZ5DXFJnLkCAqkxz34hjzFxqms1vu9XBJ_1',
+                'title': 'March Chant In April',
+                'track': 'March Chant In April',
+                'ext': 'mp3',
+                'duration': 152,
+                'track_number': 1,
+                'uploader_id': '2bGjgdKUddJoj2shYGqfNcUfoSoABP21RJoiwGMZDq3A',
+                'uploader': 'ppmrecs',
+                'thumbnail': 'https://www.arweave.net/VyZA6CBeUuqP174khvSrD44Eosi3MLVyWN42uaQKg50',
+                'timestamp': 1701417610,
+                'channel': 'ppm',
+                'album': 'The Spatulas - March Chant',
+                'tags': ['punk', 'postpresentmedium', 'cambridge'],
+                'channel_id': '4ceG4zsb7VVxBTGPtZMqDZWGHo3VUg2xRvzC2b17ymWP',
+                'upload_date': '20231201',
+                'album_artist': 'Post Present Medium ',
+            },
+        }, {
+            'info_dict': {
+                'id': '3SvsMM3y4oTPZ5DXFJnLkCAqkxz34hjzFxqms1vu9XBJ_2',
+                'title': 'Rescue Mission',
+                'track': 'Rescue Mission',
+                'ext': 'mp3',
+                'duration': 212,
+                'track_number': 2,
+                'album_artist': 'Post Present Medium ',
+                'uploader': 'ppmrecs',
+                'tags': ['punk', 'postpresentmedium', 'cambridge'],
+                'thumbnail': 'https://www.arweave.net/VyZA6CBeUuqP174khvSrD44Eosi3MLVyWN42uaQKg50',
+                'channel': 'ppm',
+                'upload_date': '20231201',
+                'channel_id': '4ceG4zsb7VVxBTGPtZMqDZWGHo3VUg2xRvzC2b17ymWP',
+                'timestamp': 1701417610,
+                'album': 'The Spatulas - March Chant',
+                'uploader_id': '2bGjgdKUddJoj2shYGqfNcUfoSoABP21RJoiwGMZDq3A',
+            },
+        }, {
+            'info_dict': {
+                'id': '3SvsMM3y4oTPZ5DXFJnLkCAqkxz34hjzFxqms1vu9XBJ_3',
+                'title': 'Slinger Style',
+                'track': 'Slinger Style',
+                'ext': 'mp3',
+                'duration': 179,
+                'track_number': 3,
+                'timestamp': 1701417610,
+                'upload_date': '20231201',
+                'channel_id': '4ceG4zsb7VVxBTGPtZMqDZWGHo3VUg2xRvzC2b17ymWP',
+                'uploader_id': '2bGjgdKUddJoj2shYGqfNcUfoSoABP21RJoiwGMZDq3A',
+                'thumbnail': 'https://www.arweave.net/VyZA6CBeUuqP174khvSrD44Eosi3MLVyWN42uaQKg50',
+                'album_artist': 'Post Present Medium ',
+                'album': 'The Spatulas - March Chant',
+                'tags': ['punk', 'postpresentmedium', 'cambridge'],
+                'uploader': 'ppmrecs',
+                'channel': 'ppm',
+            },
+        }, {
+            'info_dict': {
+                'id': '3SvsMM3y4oTPZ5DXFJnLkCAqkxz34hjzFxqms1vu9XBJ_4',
+                'title': 'Psychic Signal',
+                'track': 'Psychic Signal',
+                'ext': 'mp3',
+                'duration': 220,
+                'track_number': 4,
+                'tags': ['punk', 'postpresentmedium', 'cambridge'],
+                'upload_date': '20231201',
+                'album': 'The Spatulas - March Chant',
+                'thumbnail': 'https://www.arweave.net/VyZA6CBeUuqP174khvSrD44Eosi3MLVyWN42uaQKg50',
+                'timestamp': 1701417610,
+                'album_artist': 'Post Present Medium ',
+                'channel_id': '4ceG4zsb7VVxBTGPtZMqDZWGHo3VUg2xRvzC2b17ymWP',
+                'channel': 'ppm',
+                'uploader_id': '2bGjgdKUddJoj2shYGqfNcUfoSoABP21RJoiwGMZDq3A',
+                'uploader': 'ppmrecs',
+            },
+        }, {
+            'info_dict': {
+                'id': '3SvsMM3y4oTPZ5DXFJnLkCAqkxz34hjzFxqms1vu9XBJ_5',
+                'title': 'Curvy Color',
+                'track': 'Curvy Color',
+                'ext': 'mp3',
+                'duration': 148,
+                'track_number': 5,
+                'timestamp': 1701417610,
+                'uploader_id': '2bGjgdKUddJoj2shYGqfNcUfoSoABP21RJoiwGMZDq3A',
+                'thumbnail': 'https://www.arweave.net/VyZA6CBeUuqP174khvSrD44Eosi3MLVyWN42uaQKg50',
+                'album': 'The Spatulas - March Chant',
+                'album_artist': 'Post Present Medium ',
+                'channel': 'ppm',
+                'tags': ['punk', 'postpresentmedium', 'cambridge'],
+                'uploader': 'ppmrecs',
+                'channel_id': '4ceG4zsb7VVxBTGPtZMqDZWGHo3VUg2xRvzC2b17ymWP',
+                'upload_date': '20231201',
+            },
+        }, {
+            'info_dict': {
+                'id': '3SvsMM3y4oTPZ5DXFJnLkCAqkxz34hjzFxqms1vu9XBJ_6',
+                'title': 'Caveman Star',
+                'track': 'Caveman Star',
+                'ext': 'mp3',
+                'duration': 121,
+                'track_number': 6,
+                'channel_id': '4ceG4zsb7VVxBTGPtZMqDZWGHo3VUg2xRvzC2b17ymWP',
+                'thumbnail': 'https://www.arweave.net/VyZA6CBeUuqP174khvSrD44Eosi3MLVyWN42uaQKg50',
+                'tags': ['punk', 'postpresentmedium', 'cambridge'],
+                'album_artist': 'Post Present Medium ',
+                'uploader': 'ppmrecs',
+                'timestamp': 1701417610,
+                'uploader_id': '2bGjgdKUddJoj2shYGqfNcUfoSoABP21RJoiwGMZDq3A',
+                'album': 'The Spatulas - March Chant',
+                'channel': 'ppm',
+                'upload_date': '20231201',
+            },
+        }],
+    }, {
+        'url': 'https://www.ninaprotocol.com/releases/f-g-s-american-shield',
+        'info_dict': {
+            'id': '76PZnJwaMgViQHYfA4NYJXds7CmW6vHQKAtQUxGene6J',
+            'description': 'md5:63f08d5db558b4b36e1896f317062721',
+            'title': 'F.G.S. - American Shield',
+            'uploader_id': 'Ej3rozs11wYqFk1Gs6oggGCkGLz8GzBhmJfnUxf6gPci',
+            'channel_id': '6JuksCZPXuP16wJ1BUfwuukJzh42C7guhLrFPPkVJfyE',
+            'channel': 'tinkscough',
+            'tags': [],
+            'album_artist': 'F.G.S.',
+            'album': 'F.G.S. - American Shield',
+            'thumbnail': 'https://www.arweave.net/YJpgImkXLT9SbpFb576KuZ5pm6bdvs452LMs3Rx6lm8',
+            'display_id': 'f-g-s-american-shield',
+            'uploader': 'flannerysilva',
+            'timestamp': 1702395858,
+            'upload_date': '20231212',
+        },
+        'playlist_count': 1,
+    }, {
+        'url': 'https://www.ninaprotocol.com/releases/time-to-figure-things-out',
+        'info_dict': {
+            'id': '6Zi1nC5hj6b13NkpxVYwRhFy6mYA7oLBbe9DMrgGDcYh',
+            'display_id': 'time-to-figure-things-out',
+            'description': 'md5:960202ed01c3134bb8958f1008527e35',
+            'timestamp': 1706283607,
+            'title': 'DJ STEPDAD - time to figure things out',
+            'album_artist': 'DJ STEPDAD',
+            'uploader': 'tddvsss',
+            'upload_date': '20240126',
+            'album': 'time to figure things out',
+            'uploader_id': 'AXQNRgTyYsySyAMFDwxzumuGjfmoXshorCesjpquwCBi',
+            'thumbnail': 'https://www.arweave.net/O4i8bcKVqJVZvNeHHFp6r8knpFGh9ZwEgbeYacr4nss',
+            'tags': [],
+        },
+        'playlist_count': 4,
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        release = self._download_json(
+            f'https://api.ninaprotocol.com/v1/releases/{video_id}', video_id)['release']
+
+        video_id = release.get('publicKey') or video_id
+
+        common_info = traverse_obj(release, {
+            'album': ('metadata', 'properties', 'title', {str}),
+            'album_artist': ((('hub', 'data'), 'publisherAccount'), 'displayName', {str}),
+            'timestamp': ('datetime', {parse_iso8601}),
+            'thumbnail': ('metadata', 'image', {url_or_none}),
+            'uploader': ('publisherAccount', 'handle', {str}),
+            'uploader_id': ('publisherAccount', 'publicKey', {str}),
+            'channel': ('hub', 'handle', {str}),
+            'channel_id': ('hub', 'publicKey', {str}),
+        }, get_all=False)
+        common_info['tags'] = traverse_obj(release, ('metadata', 'properties', 'tags', ..., {str}))
+
+        entries = []
+        for track_num, track in enumerate(traverse_obj(release, (
+                'metadata', 'properties', 'files', lambda _, v: url_or_none(v['uri']))), 1):
+            entries.append({
+                'id': f'{video_id}_{track_num}',
+                'url': track['uri'],
+                **traverse_obj(track, {
+                    'title': ('track_title', {str}),
+                    'track': ('track_title', {str}),
+                    'ext': ('type', {mimetype2ext}),
+                    'track_number': ('track', {int_or_none}),
+                    'duration': ('duration', {int_or_none}),
+                }),
+                'vcodec': 'none',
+                **common_info,
+            })
+
+        return {
+            '_type': 'playlist',
+            'id': video_id,
+            'entries': entries,
+            **traverse_obj(release, {
+                'display_id': ('slug', {str}),
+                'title': ('metadata', 'name', {str}),
+                'description': ('metadata', 'description', {str}),
+            }),
+            **common_info,
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/ninecninemedia.py b/plugins/youtube_download/yt_dlp/extractor/ninecninemedia.py
index 31df42f..93e2862 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ninecninemedia.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ninecninemedia.py
@@ -3,6 +3,7 @@ from ..utils import (
     float_or_none,
     int_or_none,
     parse_iso8601,
+    str_or_none,
     try_get,
 )
 
@@ -22,7 +23,7 @@ class NineCNineMediaIE(InfoExtractor):
         title = content['Name']
         content_package = content['ContentPackages'][0]
         package_id = content_package['Id']
-        content_package_url = api_base_url + 'contentpackages/%s/' % package_id
+        content_package_url = api_base_url + f'contentpackages/{package_id}/'
         content_package = self._download_json(
             content_package_url, content_id, query={
                 '$include': '[HasClosedCaptions]',
@@ -73,7 +74,7 @@ class NineCNineMediaIE(InfoExtractor):
             'episode_number': int_or_none(content.get('Episode')),
             'season': season.get('Name'),
             'season_number': int_or_none(season.get('Number')),
-            'season_id': season.get('Id'),
+            'season_id': str_or_none(season.get('Id')),
             'series': try_get(content, lambda x: x['Media']['Name']),
             'tags': tags,
             'categories': categories,
@@ -90,7 +91,7 @@ class NineCNineMediaIE(InfoExtractor):
                 }, {
                     'url': manifest_base_url + 'srt',
                     'ext': 'srt',
-                }]
+                }],
             }
 
         return info
@@ -109,22 +110,21 @@ class CPTwentyFourIE(InfoExtractor):
             'title': 'WATCH: Truck rips ATM from Mississauga business',
             'description': 'md5:cf7498480885f080a754389a2b2f7073',
             'timestamp': 1637618377,
-            'episode_number': None,
             'season': 'Season 0',
             'season_number': 0,
-            'season_id': 57974,
+            'season_id': '57974',
             'series': 'CTV News Toronto',
             'duration': 26.86,
             'thumbnail': 'http://images2.9c9media.com/image_asset/2014_11_5_2eb609a0-475b-0132-fbd6-34b52f6f1279_jpg_2000x1125.jpg',
             'upload_date': '20211122',
         },
-        'params': {'skip_download': True, 'format': 'bv'}
+        'params': {'skip_download': True, 'format': 'bv'},
     }]
 
     def _real_extract(self, url):
         display_id = self._match_id(url)
         webpage = self._download_webpage(url, display_id)
-        id, destination = self._search_regex(
+        video_id, destination = self._search_regex(
             r'getAuthStates\("(?P<id>[^"]+)",\s?"(?P<destination>[^"]+)"\);',
             webpage, 'video id and destination', group=('id', 'destination'))
-        return self.url_result(f'9c9media:{destination}:{id}', ie=NineCNineMediaIE.ie_key(), video_id=id)
+        return self.url_result(f'9c9media:{destination}:{video_id}', NineCNineMediaIE, video_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/ninegag.py b/plugins/youtube_download/yt_dlp/extractor/ninegag.py
index 865ad99..2979f3a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ninegag.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ninegag.py
@@ -29,7 +29,7 @@ class NineGagIE(InfoExtractor):
             'like_count': int,
             'dislike_count': int,
             'comment_count': int,
-        }
+        },
     }, {
         # HTML escaped title
         'url': 'https://9gag.com/gag/av5nvyb',
@@ -53,14 +53,14 @@ class NineGagIE(InfoExtractor):
             'uploader': 'Peter Klaus',
             'uploader_id': 'peterklaus12',
             'uploader_url': 'https://9gag.com/u/peterklaus12',
-        }
+        },
     }]
 
     def _real_extract(self, url):
         post_id = self._match_id(url)
         post = self._download_json(
             'https://9gag.com/v1/post', post_id, query={
-                'id': post_id
+                'id': post_id,
             })['data']['post']
 
         if post.get('type') != 'Animated':
diff --git a/plugins/youtube_download/yt_dlp/extractor/ninenews.py b/plugins/youtube_download/yt_dlp/extractor/ninenews.py
new file mode 100644
index 0000000..08d7fe4
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/ninenews.py
@@ -0,0 +1,72 @@
+from .brightcove import BrightcoveNewIE
+from .common import InfoExtractor
+from ..utils import ExtractorError
+from ..utils.traversal import traverse_obj
+
+
+class NineNewsIE(InfoExtractor):
+    IE_NAME = '9News'
+    _VALID_URL = r'https?://(?:www\.)?9news\.com\.au/(?:[\w-]+/){2,3}(?P<id>[\w-]+)/?(?:$|[?#])'
+    _TESTS = [{
+        'url': 'https://www.9news.com.au/videos/national/fair-trading-pulls-dozens-of-toys-from-shelves/clqgc7dvj000y0jnvfism0w5m',
+        'md5': 'd1a65b2e9d126e5feb9bc5cb96e62c80',
+        'info_dict': {
+            'id': '6343717246112',
+            'ext': 'mp4',
+            'title': 'Fair Trading pulls dozens of toys from shelves',
+            'description': 'Fair Trading Australia have been forced to pull dozens of toys from shelves over hazard fears.',
+            'thumbnail': 'md5:bdbe44294e2323b762d97acf8843f66c',
+            'duration': 93.44,
+            'timestamp': 1703231748,
+            'upload_date': '20231222',
+            'uploader_id': '664969388001',
+            'tags': ['networkclip', 'aunews_aunationalninenews', 'christmas presents', 'toys', 'fair trading', 'au_news'],
+        },
+    }, {
+        'url': 'https://www.9news.com.au/world/tape-reveals-donald-trump-pressured-michigan-officials-not-to-certify-2020-vote-a-new-report-says/0b8b880e-7d3c-41b9-b2bd-55bc7e492259',
+        'md5': 'a885c44d20898c3e70e9a53e8188cea1',
+        'info_dict': {
+            'id': '6343587450112',
+            'ext': 'mp4',
+            'title': 'Trump found ineligible to run for president by state court',
+            'description': 'md5:40e6e7db7a4ac6be0e960569a5af6066',
+            'thumbnail': 'md5:3e132c48c186039fd06c10787de9bff2',
+            'duration': 104.64,
+            'timestamp': 1703058034,
+            'upload_date': '20231220',
+            'uploader_id': '664969388001',
+            'tags': ['networkclip', 'aunews_aunationalninenews', 'ineligible', 'presidential candidate', 'donald trump', 'au_news'],
+        },
+    }, {
+        'url': 'https://www.9news.com.au/national/outrage-as-parents-banned-from-giving-gifts-to-kindergarten-teachers/e19b49d4-a1a4-4533-9089-6e10e2d9386a',
+        'info_dict': {
+            'id': '6343716797112',
+            'ext': 'mp4',
+            'title': 'Outrage as parents banned from giving gifts to kindergarten teachers',
+            'description': 'md5:7a8b0ed2f9e08875fd9a3e86e462bc46',
+            'thumbnail': 'md5:5ee4d66717bdd0dee9fc9a705ef041b8',
+            'duration': 91.307,
+            'timestamp': 1703229584,
+            'upload_date': '20231222',
+            'uploader_id': '664969388001',
+            'tags': ['networkclip', 'aunews_aunationalninenews', 'presents', 'teachers', 'kindergarten', 'au_news'],
+        },
+    }]
+
+    def _real_extract(self, url):
+        article_id = self._match_id(url)
+        webpage = self._download_webpage(url, article_id)
+        initial_state = self._search_json(
+            r'var\s+__INITIAL_STATE__\s*=', webpage, 'initial state', article_id)
+        video_id = traverse_obj(
+            initial_state, ('videoIndex', 'currentVideo', 'brightcoveId', {str}),
+            ('article', ..., 'media', lambda _, v: v['type'] == 'video', 'urn', {str}), get_all=False)
+        account = traverse_obj(initial_state, (
+            'videoIndex', 'config', (None, 'video'), 'account', {str}), get_all=False)
+
+        if not video_id or not account:
+            raise ExtractorError('Unable to get the required video data')
+
+        return self.url_result(
+            f'https://players.brightcove.net/{account}/default_default/index.html?videoId={video_id}',
+            BrightcoveNewIE, video_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/ninenow.py b/plugins/youtube_download/yt_dlp/extractor/ninenow.py
index c655b75..7b0cb77 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ninenow.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ninenow.py
@@ -1,35 +1,46 @@
+import json
+import re
+
+from .brightcove import BrightcoveNewIE
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
-    ExtractorError,
-    int_or_none,
     float_or_none,
-    smuggle_url,
+    int_or_none,
+    parse_iso8601,
+    parse_resolution,
     str_or_none,
-    try_get,
-    unified_strdate,
-    unified_timestamp,
+    url_or_none,
 )
+from ..utils.traversal import require, traverse_obj, value
 
 
 class NineNowIE(InfoExtractor):
     IE_NAME = '9now.com.au'
-    _VALID_URL = r'https?://(?:www\.)?9now\.com\.au/(?:[^/]+/){2}(?P<id>[^/?#]+)'
-    _GEO_COUNTRIES = ['AU']
+    _VALID_URL = r'https?://(?:www\.)?9now\.com\.au/(?:[^/?#]+/){2}(?P<id>(?P<type>clip|episode)-[^/?#]+)'
+    _GEO_BYPASS = False
     _TESTS = [{
         # clip
-        'url': 'https://www.9now.com.au/afl-footy-show/2016/clip-ciql02091000g0hp5oktrnytc',
-        'md5': '17cf47d63ec9323e562c9957a968b565',
+        'url': 'https://www.9now.com.au/today/season-2025/clip-cm8hw9h5z00080hquqa5hszq7',
         'info_dict': {
-            'id': '16801',
+            'id': '6370295582112',
             'ext': 'mp4',
-            'title': 'St. Kilda\'s Joey Montagna on the potential for a player\'s strike',
-            'description': 'Is a boycott of the NAB Cup "on the table"?',
+            'title': 'Would Karl Stefanovic be able to land a plane?',
+            'description': 'The Today host\'s skills are put to the test with the latest simulation tech.',
             'uploader_id': '4460760524001',
-            'upload_date': '20160713',
-            'timestamp': 1468421266,
+            'duration': 197.376,
+            'tags': ['flights', 'technology', 'Karl Stefanovic'],
+            'season': 'Season 2025',
+            'season_number': 2025,
+            'series': 'TODAY',
+            'timestamp': 1742507988,
+            'upload_date': '20250320',
+            'release_timestamp': 1742507983,
+            'release_date': '20250320',
+            'thumbnail': r're:https?://.+/1920x0/.+\.jpg',
+        },
+        'params': {
+            'skip_download': 'HLS/DASH fragments and mp4 URLs are geo-restricted; only available in AU',
         },
-        'skip': 'Only available in Australia',
     }, {
         # episode
         'url': 'https://www.9now.com.au/afl-footy-show/2016/episode-19',
@@ -42,7 +53,7 @@ class NineNowIE(InfoExtractor):
         # episode of series
         'url': 'https://www.9now.com.au/lego-masters/season-3/episode-3',
         'info_dict': {
-            'id': '6249614030001',
+            'id': '6308830406112',
             'title': 'Episode 3',
             'ext': 'mp4',
             'season_number': 3,
@@ -51,72 +62,87 @@ class NineNowIE(InfoExtractor):
             'uploader_id': '4460760524001',
             'timestamp': 1619002200,
             'upload_date': '20210421',
+            'duration': 3574.085,
+            'thumbnail': r're:https?://.+/1920x0/.+\.jpg',
+            'tags': ['episode'],
+            'series': 'Lego Masters',
+            'season': 'Season 3',
+            'episode': 'Episode 3',
+            'release_timestamp': 1619002200,
+            'release_date': '20210421',
         },
-        'expected_warnings': ['Ignoring subtitle tracks'],
         'params': {
-            'skip_download': True,
-        }
+            'skip_download': 'HLS/DASH fragments and mp4 URLs are geo-restricted; only available in AU',
+        },
+    }, {
+        'url': 'https://www.9now.com.au/married-at-first-sight/season-12/episode-1',
+        'info_dict': {
+            'id': '6367798770112',
+            'ext': 'mp4',
+            'title': 'Episode 1',
+            'description': r're:The cultural sensation of Married At First Sight returns with our first weddings! .{90}$',
+            'uploader_id': '4460760524001',
+            'duration': 5415.079,
+            'thumbnail': r're:https?://.+/1920x0/.+\.png',
+            'tags': ['episode'],
+            'season': 'Season 12',
+            'season_number': 12,
+            'episode': 'Episode 1',
+            'episode_number': 1,
+            'series': 'Married at First Sight',
+            'timestamp': 1737973800,
+            'upload_date': '20250127',
+            'release_timestamp': 1737973800,
+            'release_date': '20250127',
+        },
+        'params': {
+            'skip_download': 'HLS/DASH fragments and mp4 URLs are geo-restricted; only available in AU',
+        },
     }]
-    BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/4460760524001/default_default/index.html?videoId=%s'
+    BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/4460760524001/default_default/index.html?videoId={}'
+
+    # XXX: For parsing next.js v15+ data; see also yt_dlp.extractor.francetv and yt_dlp.extractor.goplay
+    def _find_json(self, s):
+        return self._search_json(
+            r'\w+\s*:\s*', s, 'next js data', None, contains_pattern=r'\[(?s:.+)\]', default=None)
 
     def _real_extract(self, url):
-        display_id = self._match_id(url)
+        display_id, video_type = self._match_valid_url(url).group('id', 'type')
         webpage = self._download_webpage(url, display_id)
-        page_data = self._parse_json(self._search_regex(
-            r'window\.__data\s*=\s*({.*?});', webpage,
-            'page data', default='{}'), display_id, fatal=False)
-        if not page_data:
-            page_data = self._parse_json(self._parse_json(self._search_regex(
-                r'window\.__data\s*=\s*JSON\.parse\s*\(\s*(".+?")\s*\)\s*;',
-                webpage, 'page data'), display_id), display_id)
 
-        for kind in ('episode', 'clip'):
-            current_key = page_data.get(kind, {}).get(
-                'current%sKey' % kind.capitalize())
-            if not current_key:
-                continue
-            cache = page_data.get(kind, {}).get('%sCache' % kind, {})
-            if not cache:
-                continue
-            common_data = {
-                'episode': (cache.get(current_key) or list(cache.values())[0])[kind],
-                'season': (cache.get(current_key) or list(cache.values())[0]).get('season', None)
-            }
-            break
-        else:
-            raise ExtractorError('Unable to find video data')
+        common_data = traverse_obj(
+            re.findall(r'<script[^>]*>\s*self\.__next_f\.push\(\s*(\[.+?\])\s*\);?\s*</script>', webpage),
+            (..., {json.loads}, ..., {self._find_json},
+             lambda _, v: v['payload'][video_type]['slug'] == display_id,
+             'payload', any, {require('video data')}))
 
-        if not self.get_param('allow_unplayable_formats') and try_get(common_data, lambda x: x['episode']['video']['drm'], bool):
+        if traverse_obj(common_data, (video_type, 'video', 'drm', {bool})):
             self.report_drm(display_id)
-        brightcove_id = try_get(
-            common_data, lambda x: x['episode']['video']['brightcoveId'], compat_str) or 'ref:%s' % common_data['episode']['video']['referenceId']
-        video_id = str_or_none(try_get(common_data, lambda x: x['episode']['video']['id'])) or brightcove_id
-
-        title = try_get(common_data, lambda x: x['episode']['name'], compat_str)
-        season_number = try_get(common_data, lambda x: x['season']['seasonNumber'], int)
-        episode_number = try_get(common_data, lambda x: x['episode']['episodeNumber'], int)
-        timestamp = unified_timestamp(try_get(common_data, lambda x: x['episode']['airDate'], compat_str))
-        release_date = unified_strdate(try_get(common_data, lambda x: x['episode']['availability'], compat_str))
-        thumbnails_data = try_get(common_data, lambda x: x['episode']['image']['sizes'], dict) or {}
-        thumbnails = [{
-            'id': thumbnail_id,
-            'url': thumbnail_url,
-            'width': int_or_none(thumbnail_id[1:]),
-        } for thumbnail_id, thumbnail_url in thumbnails_data.items()]
+        brightcove_id = traverse_obj(common_data, (
+            video_type, 'video', (
+                ('brightcoveId', {str}),
+                ('referenceId', {str}, {lambda x: f'ref:{x}' if x else None}),
+            ), any, {require('brightcove ID')}))
 
         return {
             '_type': 'url_transparent',
-            'url': smuggle_url(
-                self.BRIGHTCOVE_URL_TEMPLATE % brightcove_id,
-                {'geo_countries': self._GEO_COUNTRIES}),
-            'id': video_id,
-            'title': title,
-            'description': try_get(common_data, lambda x: x['episode']['description'], compat_str),
-            'duration': float_or_none(try_get(common_data, lambda x: x['episode']['video']['duration'], float), 1000),
-            'thumbnails': thumbnails,
-            'ie_key': 'BrightcoveNew',
-            'season_number': season_number,
-            'episode_number': episode_number,
-            'timestamp': timestamp,
-            'release_date': release_date,
+            'ie_key': BrightcoveNewIE.ie_key(),
+            'url': self.BRIGHTCOVE_URL_TEMPLATE.format(brightcove_id),
+            **traverse_obj(common_data, {
+                'id': (video_type, 'video', 'id', {int}, ({str_or_none}, {value(brightcove_id)}), any),
+                'title': (video_type, 'name', {str}),
+                'description': (video_type, 'description', {str}),
+                'duration': (video_type, 'video', 'duration', {float_or_none(scale=1000)}),
+                'tags': (video_type, 'tags', ..., 'name', {str}, all, filter),
+                'series': ('tvSeries', 'name', {str}),
+                'season_number': ('season', 'seasonNumber', {int_or_none}),
+                'episode_number': ('episode', 'episodeNumber', {int_or_none}),
+                'timestamp': ('episode', 'airDate', {parse_iso8601}),
+                'release_timestamp': (video_type, 'availability', {parse_iso8601}),
+                'thumbnails': (video_type, 'image', 'sizes', {dict.items}, lambda _, v: url_or_none(v[1]), {
+                    'id': 0,
+                    'url': 1,
+                    'width': (1, {parse_resolution}, 'width'),
+                }),
+            }),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/nintendo.py b/plugins/youtube_download/yt_dlp/extractor/nintendo.py
index ed839af..d8eb853 100644
--- a/plugins/youtube_download/yt_dlp/extractor/nintendo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/nintendo.py
@@ -1,57 +1,131 @@
-import re
+import json
+import urllib.parse
 
 from .common import InfoExtractor
-from .ooyala import OoyalaIE
+from ..utils import (
+    ExtractorError,
+    make_archive_id,
+    unified_timestamp,
+    urljoin,
+)
+from ..utils.traversal import traverse_obj
 
 
 class NintendoIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?nintendo\.com/(?:games/detail|nintendo-direct)/(?P<id>[^/?#&]+)'
+    _VALID_URL = r'https?://(?:www\.)?nintendo\.com/(?:(?P<locale>\w{2}(?:-\w{2})?)/)?nintendo-direct/(?P<slug>[^/?#]+)'
     _TESTS = [{
-        'url': 'https://www.nintendo.com/games/detail/duck-hunt-wii-u/',
-        'info_dict': {
-            'id': 'MzMmticjp0VPzO3CCj4rmFOuohEuEWoW',
-            'ext': 'flv',
-            'title': 'Duck Hunt Wii U VC NES - Trailer',
-            'duration': 60.326,
-        },
-        'params': {
-            'skip_download': True,
-        },
-        'add_ie': ['Ooyala'],
-    }, {
-        'url': 'http://www.nintendo.com/games/detail/tokyo-mirage-sessions-fe-wii-u',
-        'info_dict': {
-            'id': 'tokyo-mirage-sessions-fe-wii-u',
-            'title': 'Tokyo Mirage Sessions ♯FE',
-        },
-        'playlist_count': 4,
-    }, {
         'url': 'https://www.nintendo.com/nintendo-direct/09-04-2019/',
         'info_dict': {
-            'id': 'J2bXdmaTE6fe3dWJTPcc7m23FNbc_A1V',
             'ext': 'mp4',
-            'title': 'Switch_ROS_ND0904-H264.mov',
-            'duration': 2324.758,
+            'id': '2oPmiviVePUA1IqAZzjuVh',
+            'display_id': '09-04-2019',
+            'title': 'Nintendo Direct 9.4.2019',
+            'timestamp': 1567580400,
+            'description': 'md5:8aac2780361d8cb772b6d1de66d7d6f4',
+            'upload_date': '20190904',
+            'age_limit': 17,
+            '_old_archive_ids': ['nintendo J2bXdmaTE6fe3dWJTPcc7m23FNbc_A1V'],
         },
-        'params': {
-            'skip_download': True,
+    }, {
+        'url': 'https://www.nintendo.com/en-ca/nintendo-direct/08-31-2023/',
+        'info_dict': {
+            'ext': 'mp4',
+            'id': '2TB2w2rJhNYF84qQ9E57hU',
+            'display_id': '08-31-2023',
+            'title': 'Super Mario Bros. Wonder Direct 8.31.2023',
+            'timestamp': 1693465200,
+            'description': 'md5:3067c5b824bcfdae9090a7f38ab2d200',
+            'tags': ['Mild Fantasy Violence', 'In-Game Purchases'],
+            'upload_date': '20230831',
+            'age_limit': 6,
+        },
+    }, {
+        'url': 'https://www.nintendo.com/us/nintendo-direct/50-fact-extravaganza/',
+        'info_dict': {
+            'ext': 'mp4',
+            'id': 'j0BBGzfw0pQ',
+            'channel_follower_count': int,
+            'view_count': int,
+            'description': 'Learn new details about Super Smash Bros. for Wii U, which launches on November 21.',
+            'duration': 2123,
+            'availability': 'public',
+            'thumbnail': 'https://i.ytimg.com/vi_webp/j0BBGzfw0pQ/maxresdefault.webp',
+            'timestamp': 1414047600,
+            'channel_id': 'UCGIY_O-8vW4rfX98KlMkvRg',
+            'chapters': 'count:53',
+            'heatmap': 'count:100',
+            'upload_date': '20141023',
+            'uploader_id': '@NintendoAmerica',
+            'playable_in_embed': True,
+            'categories': ['Gaming'],
+            'display_id': '50-fact-extravaganza',
+            'channel': 'Nintendo of America',
+            'tags': ['Comic Mischief', 'Cartoon Violence', 'Mild Suggestive Themes'],
+            'like_count': int,
+            'channel_url': 'https://www.youtube.com/channel/UCGIY_O-8vW4rfX98KlMkvRg',
+            'age_limit': 10,
+            'uploader_url': 'https://www.youtube.com/@NintendoAmerica',
+            'comment_count': int,
+            'live_status': 'not_live',
+            'uploader': 'Nintendo of America',
+            'title': '50-FACT Extravaganza',
         },
-        'add_ie': ['Ooyala'],
     }]
 
+    def _create_asset_url(self, path):
+        return urljoin('https://assets.nintendo.com/', urllib.parse.quote(path))
+
     def _real_extract(self, url):
-        page_id = self._match_id(url)
+        locale, slug = self._match_valid_url(url).group('locale', 'slug')
 
-        webpage = self._download_webpage(url, page_id)
+        language, _, country = (locale or 'US').rpartition('-')
+        parsed_locale = f'{language.lower() or "en"}_{country.upper()}'
+        self.write_debug(f'Using locale {parsed_locale} (from {locale})', only_once=True)
 
-        entries = [
-            OoyalaIE._build_url_result(m.group('code'))
-            for m in re.finditer(
-                r'data-(?:video-id|directVideoId)=(["\'])(?P<code>(?:(?!\1).)+)\1', webpage)]
+        response = self._download_json('https://graph.nintendo.com/', slug, query={
+            'operationName': 'NintendoDirect',
+            'variables': json.dumps({
+                'locale': parsed_locale,
+                'slug': slug,
+            }, separators=(',', ':')),
+            'extensions': json.dumps({
+                'persistedQuery': {
+                    'version': 1,
+                    'sha256Hash': '969b16fe9f08b686fa37bc44d1fd913b6188e65794bb5e341c54fa683a8004cb',
+                },
+            }, separators=(',', ':')),
+        })
+        # API returns `{"data": {"direct": null}}` if no matching id
+        direct_info = traverse_obj(response, ('data', 'direct', {dict}))
+        if not direct_info:
+            raise ExtractorError(f'No Nintendo Direct with id {slug} exists', expected=True)
 
-        title = self._html_search_regex(
-            r'(?s)<(?:span|div)[^>]+class="(?:title|wrapper)"[^>]*>.*?<h1>(.+?)</h1>',
-            webpage, 'title', fatal=False)
+        errors = ', '.join(traverse_obj(response, ('errors', ..., 'message')))
+        if errors:
+            raise ExtractorError(f'GraphQL API error: {errors or "Unknown error"}')
 
-        return self.playlist_result(
-            entries, page_id, title)
+        result = traverse_obj(direct_info, {
+            'id': ('id', {str}),
+            'title': ('name', {str}),
+            'timestamp': ('startDate', {unified_timestamp}),
+            'description': ('description', 'text', {str}),
+            'age_limit': ('contentRating', 'order', {int}),
+            'tags': ('contentDescriptors', ..., 'label', {str}),
+            'thumbnail': ('thumbnail', {self._create_asset_url}),
+        })
+        result['display_id'] = slug
+
+        asset_id = traverse_obj(direct_info, ('video', 'publicId', {str}))
+        if not asset_id:
+            youtube_id = traverse_obj(direct_info, ('liveStream', {str}))
+            if not youtube_id:
+                self.raise_no_formats('Could not find any video formats', video_id=slug)
+
+            return self.url_result(youtube_id, **result, url_transparent=True)
+
+        if asset_id.startswith('Legacy Videos/'):
+            result['_old_archive_ids'] = [make_archive_id(self, asset_id[14:])]
+        result['formats'] = self._extract_m3u8_formats(
+            self._create_asset_url(f'/video/upload/sp_full_hd/v1/{asset_id}.m3u8'), slug)
+
+        return result
diff --git a/plugins/youtube_download/yt_dlp/extractor/nitter.py b/plugins/youtube_download/yt_dlp/extractor/nitter.py
index 5d1ca1f..7609b40 100644
--- a/plugins/youtube_download/yt_dlp/extractor/nitter.py
+++ b/plugins/youtube_download/yt_dlp/extractor/nitter.py
@@ -1,13 +1,14 @@
-from .common import InfoExtractor
-from ..compat import compat_urlparse
-from ..utils import (
-    parse_count,
-    unified_timestamp,
-    remove_end,
-    determine_ext,
-)
-import re
 import random
+import re
+import urllib.parse
+
+from .common import InfoExtractor
+from ..utils import (
+    determine_ext,
+    parse_count,
+    remove_end,
+    unified_timestamp,
+)
 
 
 class NitterIE(InfoExtractor):
@@ -264,13 +265,33 @@ class NitterIE(InfoExtractor):
                 'like_count': int,
                 'repost_count': int,
                 'comment_count': int,
-            }
-        }
+            },
+        }, {  # no OpenGraph title
+            'url': f'https://{current_instance}/LocalBateman/status/1678455464038735895#m',
+            'info_dict': {
+                'id': '1678455464038735895',
+                'ext': 'mp4',
+                'title': 'Your Typical Local Man - Local man, what did Romanians ever do to you?',
+                'description': 'Local man, what did Romanians ever do to you?',
+                'thumbnail': r're:^https?://.*\.jpg$',
+                'uploader': 'Your Typical Local Man',
+                'uploader_id': 'LocalBateman',
+                'uploader_url': f'https://{current_instance}/LocalBateman',
+                'upload_date': '20230710',
+                'timestamp': 1689009900,
+                'view_count': int,
+                'like_count': int,
+                'repost_count': int,
+                'comment_count': int,
+            },
+            'expected_warnings': ['Ignoring subtitle tracks found in the HLS manifest'],
+            'params': {'skip_download': 'm3u8'},
+        },
     ]
 
     def _real_extract(self, url):
         video_id, uploader_id = self._match_valid_url(url).group('id', 'uploader_id')
-        parsed_url = compat_urlparse.urlparse(url)
+        parsed_url = urllib.parse.urlparse(url)
         base_url = f'{parsed_url.scheme}://{parsed_url.netloc}'
 
         self._set_cookie(parsed_url.netloc, 'hlsPlayback', 'on')
@@ -280,7 +301,7 @@ class NitterIE(InfoExtractor):
         if main_tweet_start > 0:
             webpage = full_webpage[main_tweet_start:]
 
-        video_url = '%s%s' % (base_url, self._html_search_regex(
+        video_url = '{}{}'.format(base_url, self._html_search_regex(
             r'(?:<video[^>]+data-url|<source[^>]+src)="([^"]+)"', webpage, 'video url'))
         ext = determine_ext(video_url)
 
@@ -289,10 +310,10 @@ class NitterIE(InfoExtractor):
         else:
             formats = [{
                 'url': video_url,
-                'ext': ext
+                'ext': ext,
             }]
 
-        title = description = self._og_search_description(full_webpage) or self._html_search_regex(
+        title = description = self._og_search_description(full_webpage, default=None) or self._html_search_regex(
             r'<div class="tweet-content[^>]+>([^<]+)</div>', webpage, 'title', fatal=False)
 
         uploader_id = self._html_search_regex(
@@ -313,12 +334,12 @@ class NitterIE(InfoExtractor):
 
         thumbnail = (
             self._html_search_meta('og:image', full_webpage, 'thumbnail url')
-            or remove_end('%s%s' % (base_url, self._html_search_regex(
+            or remove_end('{}{}'.format(base_url, self._html_search_regex(
                 r'<video[^>]+poster="([^"]+)"', webpage, 'thumbnail url', fatal=False)), '%3Asmall'))
 
         thumbnails = [
-            {'id': id, 'url': f'{thumbnail}%3A{id}'}
-            for id in ('thumb', 'small', 'large', 'medium', 'orig')
+            {'id': id_, 'url': f'{thumbnail}%3A{id_}'}
+            for id_ in ('thumb', 'small', 'large', 'medium', 'orig')
         ]
 
         date = self._html_search_regex(
diff --git a/plugins/youtube_download/yt_dlp/extractor/njpwworld.py b/plugins/youtube_download/yt_dlp/extractor/njpwworld.py
deleted file mode 100644
index 6078381..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/njpwworld.py
+++ /dev/null
@@ -1,82 +0,0 @@
-import re
-
-from .common import InfoExtractor
-from ..compat import compat_urlparse
-from ..utils import (
-    get_element_by_class,
-    urlencode_postdata,
-)
-
-
-class NJPWWorldIE(InfoExtractor):
-    _VALID_URL = r'https?://(front\.)?njpwworld\.com/p/(?P<id>[a-z0-9_]+)'
-    IE_DESC = '新日本プロレスワールド'
-    _NETRC_MACHINE = 'njpwworld'
-
-    _TESTS = [{
-        'url': 'http://njpwworld.com/p/s_series_00155_1_9/',
-        'info_dict': {
-            'id': 's_series_00155_1_9',
-            'ext': 'mp4',
-            'title': '闘強導夢2000 2000年1月4日 東京ドーム 第9試合 ランディ・サベージ VS リック・スタイナー',
-            'tags': list,
-        },
-        'params': {
-            'skip_download': True,  # AES-encrypted m3u8
-        },
-        'skip': 'Requires login',
-    }, {
-        'url': 'https://front.njpwworld.com/p/s_series_00563_16_bs',
-        'info_dict': {
-            'id': 's_series_00563_16_bs',
-            'ext': 'mp4',
-            'title': 'WORLD TAG LEAGUE 2020 & BEST OF THE SUPER Jr.27 2020年12月6日 福岡・福岡国際センター バックステージコメント（字幕あり）',
-            'tags': ["福岡・福岡国際センター", "バックステージコメント", "2020", "20年代"],
-        },
-        'params': {
-            'skip_download': True,
-        },
-    }]
-
-    _LOGIN_URL = 'https://front.njpwworld.com/auth/login'
-
-    def _perform_login(self, username, password):
-        # Setup session (will set necessary cookies)
-        self._request_webpage(
-            'https://njpwworld.com/', None, note='Setting up session')
-
-        webpage, urlh = self._download_webpage_handle(
-            self._LOGIN_URL, None,
-            note='Logging in', errnote='Unable to login',
-            data=urlencode_postdata({'login_id': username, 'pw': password}),
-            headers={'Referer': 'https://front.njpwworld.com/auth'})
-        # /auth/login will return 302 for successful logins
-        if urlh.url == self._LOGIN_URL:
-            self.report_warning('unable to login')
-            return False
-
-        return True
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        webpage = self._download_webpage(url, video_id)
-
-        formats = []
-        for kind, vid in re.findall(r'if\s+\(\s*imageQualityType\s*==\s*\'([^\']+)\'\s*\)\s*{\s*video_id\s*=\s*"(\d+)"', webpage):
-            player_path = '/intent?id=%s&type=url' % vid
-            player_url = compat_urlparse.urljoin(url, player_path)
-            formats += self._extract_m3u8_formats(
-                player_url, video_id, 'mp4', 'm3u8_native', m3u8_id=kind, fatal=False, quality=int(kind == 'high'))
-
-        tag_block = get_element_by_class('tag-block', webpage)
-        tags = re.findall(
-            r'<a[^>]+class="tag-[^"]+"[^>]*>([^<]+)</a>', tag_block
-        ) if tag_block else None
-
-        return {
-            'id': video_id,
-            'title': get_element_by_class('article-title', webpage) or self._og_search_title(webpage),
-            'formats': formats,
-            'tags': tags,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/nobelprize.py b/plugins/youtube_download/yt_dlp/extractor/nobelprize.py
index 1aa9705..536ca27 100644
--- a/plugins/youtube_download/yt_dlp/extractor/nobelprize.py
+++ b/plugins/youtube_download/yt_dlp/extractor/nobelprize.py
@@ -1,15 +1,16 @@
 from .common import InfoExtractor
 from ..utils import (
-    js_to_json,
-    mimetype2ext,
     determine_ext,
-    update_url_query,
     get_element_by_attribute,
     int_or_none,
+    js_to_json,
+    mimetype2ext,
+    update_url_query,
 )
 
 
 class NobelPrizeIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?nobelprize\.org/mediaplayer.*?\bid=(?P<id>\d+)'
     _TEST = {
         'url': 'http://www.nobelprize.org/mediaplayer/?id=2636',
@@ -19,7 +20,7 @@ class NobelPrizeIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'Announcement of the 2016 Nobel Prize in Physics',
             'description': 'md5:05beba57f4f5a4bbd4cf2ef28fcff739',
-        }
+        },
     }
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/noice.py b/plugins/youtube_download/yt_dlp/extractor/noice.py
index e6e3433..f413055 100644
--- a/plugins/youtube_download/yt_dlp/extractor/noice.py
+++ b/plugins/youtube_download/yt_dlp/extractor/noice.py
@@ -35,7 +35,7 @@ class NoicePodcastIE(InfoExtractor):
             'comment_count': int,
             'dislike_count': int,
             'channel_follower_count': int,
-        }
+        },
     }, {
         'url': 'https://open.noice.id/content/222134e4-99f2-456f-b8a2-b8be404bf063',
         'info_dict': {
@@ -60,7 +60,7 @@ class NoicePodcastIE(InfoExtractor):
             'comment_count': int,
             'channel': 'Dear Jerome',
             'channel_follower_count': int,
-        }
+        },
     }]
 
     def _get_formats_and_subtitles(self, media_url, video_id):
@@ -112,5 +112,5 @@ class NoicePodcastIE(InfoExtractor):
                 'dislike_count': 'dislikes',
                 'comment_count': 'comments',
                 'channel_follower_count': 'followers',
-            }))
+            })),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/nonktube.py b/plugins/youtube_download/yt_dlp/extractor/nonktube.py
index f191be3..192e6bb 100644
--- a/plugins/youtube_download/yt_dlp/extractor/nonktube.py
+++ b/plugins/youtube_download/yt_dlp/extractor/nonktube.py
@@ -14,7 +14,7 @@ class NonkTubeIE(NuevoBaseIE):
         },
         'params': {
             'skip_download': True,
-        }
+        },
     }, {
         'url': 'https://www.nonktube.com/embed/118636',
         'only_matching': True,
diff --git a/plugins/youtube_download/yt_dlp/extractor/noodlemagazine.py b/plugins/youtube_download/yt_dlp/extractor/noodlemagazine.py
index e620895..4a73e47 100644
--- a/plugins/youtube_download/yt_dlp/extractor/noodlemagazine.py
+++ b/plugins/youtube_download/yt_dlp/extractor/noodlemagazine.py
@@ -1,9 +1,12 @@
 from .common import InfoExtractor
 from ..utils import (
-    parse_duration,
+    int_or_none,
     parse_count,
-    unified_strdate
+    parse_duration,
+    unified_strdate,
+    urljoin,
 )
+from ..utils.traversal import traverse_obj
 
 
 class NoodleMagazineIE(InfoExtractor):
@@ -22,8 +25,8 @@ class NoodleMagazineIE(InfoExtractor):
             'description': 'Aria alexander manojob',
             'tags': ['aria', 'alexander', 'manojob'],
             'upload_date': '20190218',
-            'age_limit': 18
-        }
+            'age_limit': 18,
+        },
     }
 
     def _real_extract(self, url):
@@ -37,26 +40,35 @@ class NoodleMagazineIE(InfoExtractor):
         like_count = parse_count(self._html_search_meta('ya:ovs:likes', webpage, default=None))
         upload_date = unified_strdate(self._html_search_meta('ya:ovs:upload_date', webpage, default=''))
 
-        key = self._html_search_regex(rf'/{video_id}\?(?:.*&)?m=([^&"\'\s,]+)', webpage, 'key')
-        playlist_info = self._download_json(f'https://adult.noodlemagazine.com/playlist/{video_id}?m={key}', video_id)
-        thumbnail = self._og_search_property('image', webpage, default=None) or playlist_info.get('image')
+        def build_url(url_or_path):
+            return urljoin('https://adult.noodlemagazine.com', url_or_path)
 
-        formats = [{
-            'url': source.get('file'),
-            'quality': source.get('label'),
-            'ext': source.get('type'),
-        } for source in playlist_info.get('sources')]
+        playlist_info = self._search_json(
+            r'window\.playlist\s*=', webpage, video_id, 'playlist info')
+
+        formats = []
+        for source in traverse_obj(playlist_info, ('sources', lambda _, v: v['file'])):
+            if source.get('type') == 'hls':
+                formats.extend(self._extract_m3u8_formats(
+                    build_url(source['file']), video_id, 'mp4', fatal=False, m3u8_id='hls'))
+            else:
+                formats.append(traverse_obj(source, {
+                    'url': ('file', {build_url}),
+                    'format_id': 'label',
+                    'height': ('label', {int_or_none}),
+                    'ext': 'type',
+                }))
 
         return {
             'id': video_id,
             'formats': formats,
             'title': title,
-            'thumbnail': thumbnail,
+            'thumbnail': self._og_search_property('image', webpage, default=None) or playlist_info.get('image'),
             'duration': duration,
             'description': description,
             'tags': tags,
             'view_count': view_count,
             'like_count': like_count,
             'upload_date': upload_date,
-            'age_limit': 18
+            'age_limit': 18,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/noovo.py b/plugins/youtube_download/yt_dlp/extractor/noovo.py
index acbb74c..772d4ed 100644
--- a/plugins/youtube_download/yt_dlp/extractor/noovo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/noovo.py
@@ -1,6 +1,5 @@
 from .brightcove import BrightcoveNewIE
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     int_or_none,
     js_to_json,
@@ -65,7 +64,7 @@ class NoovoIE(InfoExtractor):
 
         title = try_get(
             data, lambda x: x['video']['nom'],
-            compat_str) or self._html_search_meta(
+            str) or self._html_search_meta(
             'dcterms.Title', webpage, 'title', fatal=True)
 
         description = self._html_search_meta(
@@ -77,11 +76,11 @@ class NoovoIE(InfoExtractor):
             webpage, 'series', default=None)
 
         season_el = try_get(data, lambda x: x['emission']['saison'], dict) or {}
-        season = try_get(season_el, lambda x: x['nom'], compat_str)
+        season = try_get(season_el, lambda x: x['nom'], str)
         season_number = int_or_none(try_get(season_el, lambda x: x['numero']))
 
         episode_el = try_get(season_el, lambda x: x['episode'], dict) or {}
-        episode = try_get(episode_el, lambda x: x['nom'], compat_str)
+        episode = try_get(episode_el, lambda x: x['nom'], str)
         episode_number = int_or_none(try_get(episode_el, lambda x: x['numero']))
 
         return {
diff --git a/plugins/youtube_download/yt_dlp/extractor/normalboots.py b/plugins/youtube_download/yt_dlp/extractor/normalboots.py
deleted file mode 100644
index 07babcd..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/normalboots.py
+++ /dev/null
@@ -1,51 +0,0 @@
-from .common import InfoExtractor
-from .jwplatform import JWPlatformIE
-
-from ..utils import (
-    unified_strdate,
-)
-
-
-class NormalbootsIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?normalboots\.com/video/(?P<id>[0-9a-z-]*)/?$'
-    _TEST = {
-        'url': 'http://normalboots.com/video/home-alone-games-jontron/',
-        'info_dict': {
-            'id': 'home-alone-games-jontron',
-            'ext': 'mp4',
-            'title': 'Home Alone Games - JonTron - NormalBoots',
-            'description': 'Jon is late for Christmas. Typical. Thanks to: Paul Ritchey for Co-Writing/Filming: http://www.youtube.com/user/ContinueShow Michael Azzi for Christmas Intro Animation: http://michafrar.tumblr.com/ Jerrod Waters for Christmas Intro Music: http://www.youtube.com/user/xXJerryTerryXx Casey Ormond for ‘Tense Battle Theme’:\xa0http://www.youtube.com/Kiamet/',
-            'uploader': 'JonTron',
-            'upload_date': '20140125',
-        },
-        'params': {
-            # m3u8 download
-            'skip_download': True,
-        },
-        'add_ie': ['JWPlatform'],
-    }
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-
-        video_uploader = self._html_search_regex(
-            r'Posted\sby\s<a\shref="[A-Za-z0-9/]*">(?P<uploader>[A-Za-z]*)\s</a>',
-            webpage, 'uploader', fatal=False)
-        video_upload_date = unified_strdate(self._html_search_regex(
-            r'<span style="text-transform:uppercase; font-size:inherit;">[A-Za-z]+, (?P<date>.*)</span>',
-            webpage, 'date', fatal=False))
-
-        jwplatform_url = JWPlatformIE._extract_url(webpage)
-
-        return {
-            '_type': 'url_transparent',
-            'id': video_id,
-            'url': jwplatform_url,
-            'ie_key': JWPlatformIE.ie_key(),
-            'title': self._og_search_title(webpage),
-            'description': self._og_search_description(webpage),
-            'thumbnail': self._og_search_thumbnail(webpage),
-            'uploader': video_uploader,
-            'upload_date': video_upload_date,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/nosnl.py b/plugins/youtube_download/yt_dlp/extractor/nosnl.py
index cea54c9..13f908c 100644
--- a/plugins/youtube_download/yt_dlp/extractor/nosnl.py
+++ b/plugins/youtube_download/yt_dlp/extractor/nosnl.py
@@ -15,7 +15,7 @@ class NOSNLArticleIE(InfoExtractor):
                 'title': '\'We hebben een huis vol met scheuren\'',
                 'duration': 95.0,
                 'thumbnail': 'https://cdn.nos.nl/image/2022/08/12/887149/3840x2160a.jpg',
-            }
+            },
         }, {
             # more than 1 video
             'url': 'https://nos.nl/artikel/2440409-vannacht-sliepen-weer-enkele-honderden-asielzoekers-in-ter-apel-buiten',
@@ -64,7 +64,7 @@ class NOSNLArticleIE(InfoExtractor):
                 'categories': ['Buitenland'],
             },
             'playlist_mincount': 1,
-        }
+        },
     ]
 
     def _entries(self, nextjs_json, display_id):
@@ -82,7 +82,7 @@ class NOSNLArticleIE(InfoExtractor):
                     'thumbnails': [{
                         'url': traverse_obj(image, ('url', ...), get_all=False),
                         'width': image.get('width'),
-                        'height': image.get('height')
+                        'height': image.get('height'),
                     } for image in traverse_obj(item, ('imagesByRatio', ...))[0]],
                 }
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/nosvideo.py b/plugins/youtube_download/yt_dlp/extractor/nosvideo.py
deleted file mode 100644
index 7e9688c..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/nosvideo.py
+++ /dev/null
@@ -1,72 +0,0 @@
-import re
-
-from .common import InfoExtractor
-from ..networking import Request
-from ..utils import (
-    ExtractorError,
-    urlencode_postdata,
-    xpath_text,
-    xpath_with_ns,
-)
-
-_x = lambda p: xpath_with_ns(p, {'xspf': 'http://xspf.org/ns/0/'})
-
-
-class NosVideoIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?nosvideo\.com/' + \
-                 r'(?:embed/|\?v=)(?P<id>[A-Za-z0-9]{12})/?'
-    _PLAYLIST_URL = 'http://nosvideo.com/xml/{xml_id:s}.xml'
-    _FILE_DELETED_REGEX = r'<b>File Not Found</b>'
-    _TEST = {
-        'url': 'http://nosvideo.com/?v=mu8fle7g7rpq',
-        'md5': '6124ed47130d8be3eacae635b071e6b6',
-        'info_dict': {
-            'id': 'mu8fle7g7rpq',
-            'ext': 'mp4',
-            'title': 'big_buck_bunny_480p_surround-fix.avi.mp4',
-            'thumbnail': r're:^https?://.*\.jpg$',
-        }
-    }
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        fields = {
-            'id': video_id,
-            'op': 'download1',
-            'method_free': 'Continue to Video',
-        }
-        req = Request(url, urlencode_postdata(fields))
-        req.headers['Content-type'] = 'application/x-www-form-urlencoded'
-        webpage = self._download_webpage(req, video_id,
-                                         'Downloading download page')
-        if re.search(self._FILE_DELETED_REGEX, webpage) is not None:
-            raise ExtractorError('Video %s does not exist' % video_id,
-                                 expected=True)
-
-        xml_id = self._search_regex(r'php\|([^\|]+)\|', webpage, 'XML ID')
-        playlist_url = self._PLAYLIST_URL.format(xml_id=xml_id)
-        playlist = self._download_xml(playlist_url, video_id)
-
-        track = playlist.find(_x('.//xspf:track'))
-        if track is None:
-            raise ExtractorError(
-                'XML playlist is missing the \'track\' element',
-                expected=True)
-        title = xpath_text(track, _x('./xspf:title'), 'title')
-        url = xpath_text(track, _x('./xspf:file'), 'URL', fatal=True)
-        thumbnail = xpath_text(track, _x('./xspf:image'), 'thumbnail')
-        if title is not None:
-            title = title.strip()
-
-        formats = [{
-            'format_id': 'sd',
-            'url': url,
-        }]
-
-        return {
-            'id': video_id,
-            'title': title,
-            'thumbnail': thumbnail,
-            'formats': formats,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/nova.py b/plugins/youtube_download/yt_dlp/extractor/nova.py
index 8bd3fd4..e7b69e3 100644
--- a/plugins/youtube_download/yt_dlp/extractor/nova.py
+++ b/plugins/youtube_download/yt_dlp/extractor/nova.py
@@ -6,7 +6,6 @@ from ..utils import (
     determine_ext,
     int_or_none,
     js_to_json,
-    qualities,
     traverse_obj,
     unified_strdate,
     url_or_none,
@@ -14,7 +13,7 @@ from ..utils import (
 
 
 class NovaEmbedIE(InfoExtractor):
-    _VALID_URL = r'https?://media\.cms\.nova\.cz/embed/(?P<id>[^/?#&]+)'
+    _VALID_URL = r'https?://media(?:tn)?\.cms\.nova\.cz/embed/(?P<id>[^/?#&]+)'
     _TESTS = [{
         'url': 'https://media.cms.nova.cz/embed/8o0n0r?autoplay=1',
         'info_dict': {
@@ -38,6 +37,16 @@ class NovaEmbedIE(InfoExtractor):
             'duration': 114,
         },
         'params': {'skip_download': 'm3u8'},
+    }, {
+        'url': 'https://mediatn.cms.nova.cz/embed/EU5ELEsmOHt?autoplay=1',
+        'info_dict': {
+            'id': 'EU5ELEsmOHt',
+            'ext': 'mp4',
+            'title': 'Haptické křeslo, bionická ruka nebo roboti. Reportérka se podívala na Týden inovací',
+            'thumbnail': r're:^https?://.*\.jpg',
+            'duration': 1780,
+        },
+        'params': {'skip_download': 'm3u8'},
     }]
 
     def _real_extract(self, url):
@@ -49,77 +58,52 @@ class NovaEmbedIE(InfoExtractor):
         duration = None
         formats = []
 
-        player = self._parse_json(
-            self._search_regex(
-                (r'(?:(?:replacePlaceholders|processAdTagModifier).*?:\s*)?(?:replacePlaceholders|processAdTagModifier)\s*\(\s*(?P<json>{.*?})\s*\)(?:\s*\))?\s*,',
-                    r'Player\.init\s*\([^,]+,(?P<cndn>\s*\w+\s*\?)?\s*(?P<json>{(?(cndn).+?|.+)})\s*(?(cndn):|,\s*{.+?}\s*\)\s*;)'),
-                webpage, 'player', default='{}', group='json'), video_id, fatal=False)
-        if player:
-            for format_id, format_list in player['tracks'].items():
-                if not isinstance(format_list, list):
-                    format_list = [format_list]
-                for format_dict in format_list:
-                    if not isinstance(format_dict, dict):
-                        continue
-                    if (not self.get_param('allow_unplayable_formats')
-                            and traverse_obj(format_dict, ('drm', 'keySystem'))):
-                        has_drm = True
-                        continue
-                    format_url = url_or_none(format_dict.get('src'))
-                    format_type = format_dict.get('type')
-                    ext = determine_ext(format_url)
-                    if (format_type == 'application/x-mpegURL'
-                            or format_id == 'HLS' or ext == 'm3u8'):
-                        formats.extend(self._extract_m3u8_formats(
-                            format_url, video_id, 'mp4',
-                            entry_protocol='m3u8_native', m3u8_id='hls',
-                            fatal=False))
-                    elif (format_type == 'application/dash+xml'
-                          or format_id == 'DASH' or ext == 'mpd'):
-                        formats.extend(self._extract_mpd_formats(
-                            format_url, video_id, mpd_id='dash', fatal=False))
-                    else:
-                        formats.append({
-                            'url': format_url,
-                        })
-            duration = int_or_none(player.get('duration'))
-        else:
-            # Old path, not actual as of 08.04.2020
-            bitrates = self._parse_json(
-                self._search_regex(
-                    r'(?s)(?:src|bitrates)\s*=\s*({.+?})\s*;', webpage, 'formats'),
-                video_id, transform_source=js_to_json)
-
-            QUALITIES = ('lq', 'mq', 'hq', 'hd')
-            quality_key = qualities(QUALITIES)
-
-            for format_id, format_list in bitrates.items():
-                if not isinstance(format_list, list):
-                    format_list = [format_list]
-                for format_url in format_list:
-                    format_url = url_or_none(format_url)
-                    if not format_url:
-                        continue
-                    if format_id == 'hls':
-                        formats.extend(self._extract_m3u8_formats(
-                            format_url, video_id, ext='mp4',
-                            entry_protocol='m3u8_native', m3u8_id='hls',
-                            fatal=False))
-                        continue
-                    f = {
+        def process_format_list(format_list, format_id=''):
+            nonlocal formats, has_drm
+            if not isinstance(format_list, list):
+                format_list = [format_list]
+            for format_dict in format_list:
+                if not isinstance(format_dict, dict):
+                    continue
+                if (not self.get_param('allow_unplayable_formats')
+                        and traverse_obj(format_dict, ('drm', 'keySystem'))):
+                    has_drm = True
+                    continue
+                format_url = url_or_none(format_dict.get('src'))
+                format_type = format_dict.get('type')
+                ext = determine_ext(format_url)
+                if (format_type == 'application/x-mpegURL'
+                        or format_id == 'HLS' or ext == 'm3u8'):
+                    formats.extend(self._extract_m3u8_formats(
+                        format_url, video_id, 'mp4',
+                        entry_protocol='m3u8_native', m3u8_id='hls',
+                        fatal=False))
+                elif (format_type == 'application/dash+xml'
+                      or format_id == 'DASH' or ext == 'mpd'):
+                    formats.extend(self._extract_mpd_formats(
+                        format_url, video_id, mpd_id='dash', fatal=False))
+                else:
+                    formats.append({
                         'url': format_url,
-                    }
-                    f_id = format_id
-                    for quality in QUALITIES:
-                        if '%s.mp4' % quality in format_url:
-                            f_id += '-%s' % quality
-                            f.update({
-                                'quality': quality_key(quality),
-                                'format_note': quality.upper(),
-                            })
-                            break
-                    f['format_id'] = f_id
-                    formats.append(f)
+                    })
+
+        player = self._search_json(
+            r'player:', webpage, 'player', video_id, fatal=False, end_pattern=r';\s*</script>')
+        if player:
+            for src in traverse_obj(player, ('lib', 'source', 'sources', ...)):
+                process_format_list(src)
+            duration = traverse_obj(player, ('sourceInfo', 'duration', {int_or_none}))
+        if not formats and not has_drm:
+            # older code path, in use before August 2023
+            player = self._parse_json(
+                self._search_regex(
+                    (r'(?:(?:replacePlaceholders|processAdTagModifier).*?:\s*)?(?:replacePlaceholders|processAdTagModifier)\s*\(\s*(?P<json>{.*?})\s*\)(?:\s*\))?\s*,',
+                     r'Player\.init\s*\([^,]+,(?P<cndn>\s*\w+\s*\?)?\s*(?P<json>{(?(cndn).+?|.+)})\s*(?(cndn):|,\s*{.+?}\s*\)\s*;)'),
+                    webpage, 'player', group='json'), video_id)
+            if player:
+                for format_id, format_list in player['tracks'].items():
+                    process_format_list(format_list, format_id)
+                duration = int_or_none(player.get('duration'))
 
         if not formats and has_drm:
             self.report_drm(video_id)
@@ -151,15 +135,16 @@ class NovaIE(InfoExtractor):
     _VALID_URL = r'https?://(?:[^.]+\.)?(?P<site>tv(?:noviny)?|tn|novaplus|vymena|fanda|krasna|doma|prask)\.nova\.cz/(?:[^/]+/)+(?P<id>[^/]+?)(?:\.html|/|$)'
     _TESTS = [{
         'url': 'http://tn.nova.cz/clanek/tajemstvi-ukryte-v-podzemi-specialni-nemocnice-v-prazske-krci.html#player_13260',
-        'md5': '249baab7d0104e186e78b0899c7d5f28',
+        'md5': 'da8f3f1fcdaf9fb0f112a32a165760a3',
         'info_dict': {
-            'id': '1757139',
-            'display_id': 'tajemstvi-ukryte-v-podzemi-specialni-nemocnice-v-prazske-krci',
+            'id': '8OvQqEvV3MW',
+            'display_id': '8OvQqEvV3MW',
             'ext': 'mp4',
             'title': 'Podzemní nemocnice v pražské Krči',
             'description': 'md5:f0a42dd239c26f61c28f19e62d20ef53',
             'thumbnail': r're:^https?://.*\.(?:jpg)',
-        }
+            'duration': 151,
+        },
     }, {
         'url': 'http://fanda.nova.cz/clanek/fun-and-games/krvavy-epos-zaklinac-3-divoky-hon-vychazi-vyhrajte-ho-pro-sebe.html',
         'info_dict': {
@@ -226,16 +211,16 @@ class NovaIE(InfoExtractor):
 
         # novaplus
         embed_id = self._search_regex(
-            r'<iframe[^>]+\bsrc=["\'](?:https?:)?//media\.cms\.nova\.cz/embed/([^/?#&]+)',
+            r'<iframe[^>]+\bsrc=["\'](?:https?:)?//media(?:tn)?\.cms\.nova\.cz/embed/([^/?#&"\']+)',
             webpage, 'embed url', default=None)
         if embed_id:
             return {
                 '_type': 'url_transparent',
-                'url': 'https://media.cms.nova.cz/embed/%s' % embed_id,
+                'url': f'https://media.cms.nova.cz/embed/{embed_id}',
                 'ie_key': NovaEmbedIE.ie_key(),
                 'id': embed_id,
                 'description': description,
-                'upload_date': upload_date
+                'upload_date': upload_date,
             }
 
         video_id = self._search_regex(
diff --git a/plugins/youtube_download/yt_dlp/extractor/novaplay.py b/plugins/youtube_download/yt_dlp/extractor/novaplay.py
index 92d1d13..77d7ce1 100644
--- a/plugins/youtube_download/yt_dlp/extractor/novaplay.py
+++ b/plugins/youtube_download/yt_dlp/extractor/novaplay.py
@@ -3,7 +3,7 @@ from ..utils import int_or_none, parse_duration, parse_iso8601
 
 
 class NovaPlayIE(InfoExtractor):
-    _VALID_URL = r'https://play.nova\.bg/video/.*/(?P<id>\d+)'
+    _VALID_URL = r'https?://play\.nova\.bg/video/[^?#]+/(?P<id>\d+)'
     _TESTS = [
         {
             'url': 'https://play.nova.bg/video/ochakvaite/season-0/ochakvaite-2022-07-22-sybudi-se-sat/606627',
@@ -18,7 +18,6 @@ class NovaPlayIE(InfoExtractor):
                 'upload_date': '20220722',
                 'thumbnail': 'https://nbg-img.fite.tv/img/606627_460x260.jpg',
                 'description': '29 сек',
-                'view_count': False
             },
         },
         {
@@ -34,9 +33,8 @@ class NovaPlayIE(InfoExtractor):
                 'upload_date': '20220722',
                 'thumbnail': 'https://nbg-img.fite.tv/img/606609_460x260.jpg',
                 'description': '29 сек',
-                'view_count': False
             },
-        }
+        },
     ]
 
     _access_token = None
@@ -52,7 +50,7 @@ class NovaPlayIE(InfoExtractor):
             video_id, headers={
                 'x-flipps-user-agent': 'Flipps/75/9.7',
                 'x-flipps-version': '2022-05-17',
-                'Authorization': f'Bearer {self._access_token}'
+                'Authorization': f'Bearer {self._access_token}',
             })[0]['links']['play']['href']
         formats = self._extract_m3u8_formats(m3u8_url, video_id, 'mp4', m3u8_id='hls')
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/nowness.py b/plugins/youtube_download/yt_dlp/extractor/nowness.py
index a3c29f6..c001a82 100644
--- a/plugins/youtube_download/yt_dlp/extractor/nowness.py
+++ b/plugins/youtube_download/yt_dlp/extractor/nowness.py
@@ -3,7 +3,6 @@ from .brightcove import (
     BrightcoveNewIE,
 )
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..networking import Request
 from ..utils import ExtractorError
 
@@ -17,7 +16,7 @@ class NownessBaseIE(InfoExtractor):
                     source = media['source']
                     if source == 'brightcove':
                         player_code = self._download_webpage(
-                            'http://www.nowness.com/iframe?id=%s' % video_id, video_id,
+                            f'http://www.nowness.com/iframe?id={video_id}', video_id,
                             note='Downloading player JavaScript',
                             errnote='Unable to download player JavaScript')
                         bc_url = BrightcoveLegacyIE._extract_brightcove_url(player_code)
@@ -28,7 +27,7 @@ class NownessBaseIE(InfoExtractor):
                             return self.url_result(bc_url, BrightcoveNewIE.ie_key())
                         raise ExtractorError('Could not find player definition')
                     elif source == 'vimeo':
-                        return self.url_result('http://vimeo.com/%s' % video_id, 'Vimeo')
+                        return self.url_result(f'http://vimeo.com/{video_id}', 'Vimeo')
                     elif source == 'youtube':
                         return self.url_result(video_id, 'Youtube')
                     elif source == 'cinematique':
@@ -139,4 +138,4 @@ class NownessSeriesIE(NownessBaseIE):
             series_title = translations[0].get('title') or translations[0]['seoTitle']
             series_description = translations[0].get('seoDescription')
         return self.playlist_result(
-            entries, compat_str(series['id']), series_title, series_description)
+            entries, str(series['id']), series_title, series_description)
diff --git a/plugins/youtube_download/yt_dlp/extractor/noz.py b/plugins/youtube_download/yt_dlp/extractor/noz.py
index 59d259f..8476a85 100644
--- a/plugins/youtube_download/yt_dlp/extractor/noz.py
+++ b/plugins/youtube_download/yt_dlp/extractor/noz.py
@@ -1,14 +1,16 @@
+import urllib.parse
+
 from .common import InfoExtractor
 from ..utils import (
-    int_or_none,
     find_xpath_attr,
-    xpath_text,
+    int_or_none,
     update_url_query,
+    xpath_text,
 )
-from ..compat import compat_urllib_parse_unquote
 
 
 class NozIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?noz\.de/video/(?P<id>[0-9]+)/'
     _TESTS = [{
         'url': 'http://www.noz.de/video/25151/32-Deutschland-gewinnt-Badminton-Lnderspiel-in-Melle',
@@ -34,9 +36,9 @@ class NozIE(InfoExtractor):
 
         config_url_encoded = self._search_regex(
             r'so\.addVariable\("config_url","[^,]*,(.*?)"',
-            edge_content, 'config URL'
+            edge_content, 'config URL',
         )
-        config_url = compat_urllib_parse_unquote(config_url_encoded)
+        config_url = urllib.parse.unquote(config_url_encoded)
 
         doc = self._download_xml(config_url, 'video configuration')
         title = xpath_text(doc, './/title')
@@ -52,7 +54,7 @@ class NozIE(InfoExtractor):
                 formats.append({
                     'url': http_url,
                     'format_name': xpath_text(qnode, './name'),
-                    'format_id': '%s-%s' % ('http', xpath_text(qnode, './id')),
+                    'format_id': '{}-{}'.format('http', xpath_text(qnode, './id')),
                     'height': int_or_none(xpath_text(qnode, './height')),
                     'width': int_or_none(xpath_text(qnode, './width')),
                     'tbr': int_or_none(xpath_text(qnode, './bitrate'), scale=1000),
diff --git a/plugins/youtube_download/yt_dlp/extractor/npo.py b/plugins/youtube_download/yt_dlp/extractor/npo.py
index 40fee24..178fd98 100644
--- a/plugins/youtube_download/yt_dlp/extractor/npo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/npo.py
@@ -200,7 +200,7 @@ class NPOIE(InfoExtractor):
     def suitable(cls, url):
         return (False if any(ie.suitable(url)
                 for ie in (NPOLiveIE, NPORadioIE, NPORadioFragmentIE))
-                else super(NPOIE, cls).suitable(url))
+                else super().suitable(url))
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
@@ -228,7 +228,7 @@ class NPOIE(InfoExtractor):
                     'hasAdConsent': 0,
                 }), headers={
                     'x-xsrf-token': try_call(lambda: urllib.parse.unquote(
-                        self._get_cookies('https://www.npostart.nl')['XSRF-TOKEN'].value))
+                        self._get_cookies('https://www.npostart.nl')['XSRF-TOKEN'].value)),
                 })
 
         player_token = player['token']
@@ -238,14 +238,14 @@ class NPOIE(InfoExtractor):
         formats = []
         for profile in ('hls', 'dash-widevine', 'dash-playready', 'smooth'):
             streams = self._download_json(
-                'https://start-player.npo.nl/video/%s/streams' % video_id,
-                video_id, 'Downloading %s profile JSON' % profile, fatal=False,
+                f'https://start-player.npo.nl/video/{video_id}/streams',
+                video_id, f'Downloading {profile} profile JSON', fatal=False,
                 query={
                     'profile': profile,
                     'quality': 'npoplus',
                     'tokenId': player_token,
                     'streamType': 'broadcast',
-                })
+                }, data=b'')  # endpoint requires POST
             if not streams:
                 continue
             stream = streams.get('stream')
@@ -339,7 +339,7 @@ class NPOLiveIE(InfoExtractor):
         },
         'params': {
             'skip_download': True,
-        }
+        },
     }, {
         'url': 'http://www.npo.nl/live',
         'only_matching': True,
@@ -358,7 +358,7 @@ class NPOLiveIE(InfoExtractor):
 
         return {
             '_type': 'url_transparent',
-            'url': 'npo:%s' % live_id,
+            'url': f'npo:{live_id}',
             'ie_key': NPOIE.ie_key(),
             'id': live_id,
             'display_id': display_id,
@@ -379,16 +379,16 @@ class NPORadioIE(InfoExtractor):
         },
         'params': {
             'skip_download': True,
-        }
+        },
     }
 
     @classmethod
     def suitable(cls, url):
-        return False if NPORadioFragmentIE.suitable(url) else super(NPORadioIE, cls).suitable(url)
+        return False if NPORadioFragmentIE.suitable(url) else super().suitable(url)
 
     @staticmethod
     def _html_get_attribute_regex(attribute):
-        return r'{0}\s*=\s*\'([^\']+)\''.format(attribute)
+        return rf'{attribute}\s*=\s*\'([^\']+)\''
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
@@ -434,7 +434,7 @@ class NPORadioFragmentIE(InfoExtractor):
         webpage = self._download_webpage(url, audio_id)
 
         title = self._html_search_regex(
-            r'href="/radio/[^/]+/fragment/%s" title="([^"]+)"' % audio_id,
+            rf'href="/radio/[^/]+/fragment/{audio_id}" title="([^"]+)"',
             webpage, 'title')
 
         audio_url = self._search_regex(
@@ -456,8 +456,8 @@ class NPODataMidEmbedIE(InfoExtractor):  # XXX: Conventionally, base classes sho
         return {
             '_type': 'url_transparent',
             'ie_key': 'NPO',
-            'url': 'npo:%s' % video_id,
-            'display_id': display_id
+            'url': f'npo:{video_id}',
+            'display_id': display_id,
         }
 
 
@@ -472,12 +472,12 @@ class SchoolTVIE(NPODataMidEmbedIE):
             'display_id': 'ademhaling-de-hele-dag-haal-je-adem-maar-wat-gebeurt-er-dan-eigenlijk-in-je-lichaam',
             'title': 'Ademhaling: De hele dag haal je adem. Maar wat gebeurt er dan eigenlijk in je lichaam?',
             'ext': 'mp4',
-            'description': 'md5:abfa0ff690adb73fd0297fd033aaa631'
+            'description': 'md5:abfa0ff690adb73fd0297fd033aaa631',
         },
         'params': {
             # Skip because of m3u8 download
-            'skip_download': True
-        }
+            'skip_download': True,
+        },
     }
 
 
@@ -496,8 +496,8 @@ class HetKlokhuisIE(NPODataMidEmbedIE):
             'upload_date': '20170223',
         },
         'params': {
-            'skip_download': True
-        }
+            'skip_download': True,
+        },
     }
 
 
@@ -508,7 +508,7 @@ class NPOPlaylistBaseIE(NPOIE):  # XXX: Do not subclass from concrete IE
         webpage = self._download_webpage(url, playlist_id)
 
         entries = [
-            self.url_result('npo:%s' % video_id if not video_id.startswith('http') else video_id)
+            self.url_result(f'npo:{video_id}' if not video_id.startswith('http') else video_id)
             for video_id in orderedSet(re.findall(self._PLAYLIST_ENTRY_RE, webpage))
         ]
 
@@ -574,9 +574,9 @@ class VPROIE(NPOPlaylistBaseIE):
             },
             'params': {
                 # Skip because of m3u8 download
-                'skip_download': True
+                'skip_download': True,
             },
-        }
+        },
     ]
 
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/npr.py b/plugins/youtube_download/yt_dlp/extractor/npr.py
index 4b6855c..06103ff 100644
--- a/plugins/youtube_download/yt_dlp/extractor/npr.py
+++ b/plugins/youtube_download/yt_dlp/extractor/npr.py
@@ -8,14 +8,14 @@ class NprIE(InfoExtractor):
         'url': 'https://www.npr.org/sections/allsongs/2015/10/21/449974205/new-music-from-beach-house-chairlift-cmj-discoveries-and-more',
         'info_dict': {
             'id': '449974205',
-            'title': 'New Music From Beach House, Chairlift, CMJ Discoveries And More'
+            'title': 'New Music From Beach House, Chairlift, CMJ Discoveries And More',
         },
         'playlist_count': 7,
     }, {
         'url': 'https://www.npr.org/sections/deceptivecadence/2015/10/09/446928052/music-from-the-shadows-ancient-armenian-hymns-and-piano-jazz',
         'info_dict': {
             'id': '446928052',
-            'title': "Songs We Love: Tigran Hamasyan, 'Your Mercy is Boundless'"
+            'title': "Songs We Love: Tigran Hamasyan, 'Your Mercy is Boundless'",
         },
         'playlist': [{
             'md5': '12fa60cb2d3ed932f53609d4aeceabf1',
diff --git a/plugins/youtube_download/yt_dlp/extractor/nrk.py b/plugins/youtube_download/yt_dlp/extractor/nrk.py
index 384865a..1400f15 100644
--- a/plugins/youtube_download/yt_dlp/extractor/nrk.py
+++ b/plugins/youtube_download/yt_dlp/extractor/nrk.py
@@ -3,7 +3,6 @@ import random
 import re
 
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..networking.exceptions import HTTPError
 from ..utils import (
     ExtractorError,
@@ -13,6 +12,7 @@ from ..utils import (
     parse_iso8601,
     str_or_none,
     try_get,
+    update_url_query,
     url_or_none,
     urljoin,
 )
@@ -28,6 +28,12 @@ class NRKBaseIE(InfoExtractor):
         )/'''
 
     def _extract_nrk_formats(self, asset_url, video_id):
+        asset_url = update_url_query(asset_url, {
+            # Remove 'adap' to return all streams (known values are: small, large, small_h265, large_h265)
+            'adap': [],
+            # Disable subtitles since they are fetched separately
+            's': 0,
+        })
         if re.match(r'https?://[^/]+\.akamaihd\.net/i/', asset_url):
             return self._extract_akamai_formats(asset_url, video_id)
         asset_url = re.sub(r'(?:bw_(?:low|high)=\d+|no_audio_only)&?', '', asset_url)
@@ -53,13 +59,16 @@ class NRKBaseIE(InfoExtractor):
                 msg=MESSAGES.get('ProgramIsGeoBlocked'),
                 countries=self._GEO_COUNTRIES)
         message = data.get('endUserMessage') or MESSAGES.get(message_type, message_type)
-        raise ExtractorError('%s said: %s' % (self.IE_NAME, message), expected=True)
+        raise ExtractorError(f'{self.IE_NAME} said: {message}', expected=True)
 
     def _call_api(self, path, video_id, item=None, note=None, fatal=True, query=None):
         return self._download_json(
             urljoin('https://psapi.nrk.no/', path),
-            video_id, note or 'Downloading %s JSON' % item,
-            fatal=fatal, query=query)
+            video_id, note or f'Downloading {item} JSON',
+            fatal=fatal, query=query, headers={
+                # Needed for working stream URLs, see https://github.com/yt-dlp/yt-dlp/issues/12192
+                'Accept': 'application/vnd.nrk.psapi+json; version=9; player=tv-player; device=player-core',
+            })
 
 
 class NRKIE(NRKBaseIE):
@@ -78,14 +87,18 @@ class NRKIE(NRKBaseIE):
     _TESTS = [{
         # video
         'url': 'http://www.nrk.no/video/PS*150533',
-        'md5': 'f46be075326e23ad0e524edfcb06aeb6',
+        'md5': '2b88a652ad2e275591e61cf550887eec',
         'info_dict': {
             'id': '150533',
             'ext': 'mp4',
             'title': 'Dompap og andre fugler i Piip-Show',
             'description': 'md5:d9261ba34c43b61c812cb6b0269a5c8f',
             'duration': 262,
-        }
+            'upload_date': '20140325',
+            'thumbnail': r're:^https?://gfx\.nrk\.no/.*$',
+            'timestamp': 1395751833,
+            'alt_title': 'md5:d9261ba34c43b61c812cb6b0269a5c8f',
+        },
     }, {
         # audio
         'url': 'http://www.nrk.no/video/PS*154915',
@@ -96,7 +109,11 @@ class NRKIE(NRKBaseIE):
             'title': 'Slik høres internett ut når du er blind',
             'description': 'md5:a621f5cc1bd75c8d5104cb048c6b8568',
             'duration': 20,
-        }
+            'timestamp': 1398429565,
+            'alt_title': 'Cathrine Lie Wathne er blind, og bruker hurtigtaster for å navigere seg rundt på ulike nettsider.',
+            'thumbnail': 'https://gfx.nrk.no/urxQMSXF-WnbfjBH5ke2igLGyN27EdJVWZ6FOsEAclhA',
+            'upload_date': '20140425',
+        },
     }, {
         'url': 'nrk:ecc1b952-96dc-4a98-81b9-5296dc7a98d9',
         'only_matching': True,
@@ -153,10 +170,10 @@ class NRKIE(NRKBaseIE):
                     return self._call_api(f'playback/{item}/{video_id}', video_id, item, query=query)
                 raise
 
-        # known values for preferredCdn: akamai, iponly, minicdn and telenor
+        # known values for preferredCdn: akamai, globalconnect and telenor
         manifest = call_playback_api('manifest', {'preferredCdn': 'akamai'})
 
-        video_id = try_get(manifest, lambda x: x['id'], compat_str) or video_id
+        video_id = try_get(manifest, lambda x: x['id'], str) or video_id
 
         if manifest.get('playability') == 'nonPlayable':
             self._raise_error(manifest['nonPlayable'])
@@ -216,13 +233,13 @@ class NRKIE(NRKBaseIE):
             sub_key = str_or_none(sub.get('language')) or 'nb'
             sub_type = str_or_none(sub.get('type'))
             if sub_type:
-                sub_key += '-%s' % sub_type
+                sub_key += f'-{sub_type}'
             subtitles.setdefault(sub_key, []).append({
                 'url': sub_url,
             })
 
         legal_age = try_get(
-            data, lambda x: x['legalAge']['body']['rating']['code'], compat_str)
+            data, lambda x: x['legalAge']['body']['rating']['code'], str)
         # https://en.wikipedia.org/wiki/Norwegian_Media_Authority
         age_limit = None
         if legal_age:
@@ -243,13 +260,13 @@ class NRKIE(NRKBaseIE):
             'age_limit': age_limit,
             'formats': formats,
             'subtitles': subtitles,
-            'timestamp': parse_iso8601(try_get(manifest, lambda x: x['availability']['onDemand']['from'], str))
+            'timestamp': parse_iso8601(try_get(manifest, lambda x: x['availability']['onDemand']['from'], str)),
         }
 
         if is_series:
             series = season_id = season_number = episode = episode_number = None
             programs = self._call_api(
-                'programs/%s' % video_id, video_id, 'programs', fatal=False)
+                f'programs/{video_id}', video_id, 'programs', fatal=False)
             if programs and isinstance(programs, dict):
                 series = str_or_none(programs.get('seriesTitle'))
                 season_id = str_or_none(programs.get('seasonId'))
@@ -259,7 +276,7 @@ class NRKIE(NRKBaseIE):
             if not series:
                 series = title
             if alt_title:
-                title += ' - %s' % alt_title
+                title += f' - {alt_title}'
             if not season_number:
                 season_number = int_or_none(self._search_regex(
                     r'Sesong\s+(\d+)', description or '', 'season number',
@@ -289,7 +306,7 @@ class NRKIE(NRKBaseIE):
 class NRKTVIE(InfoExtractor):
     IE_DESC = 'NRK TV and NRK Radio'
     _EPISODE_RE = r'(?P<id>[a-zA-Z]{4}\d{8})'
-    _VALID_URL = r'https?://(?:tv|radio)\.nrk(?:super)?\.no/(?:[^/]+/)*%s' % _EPISODE_RE
+    _VALID_URL = rf'https?://(?:tv|radio)\.nrk(?:super)?\.no/(?:[^/]+/)*{_EPISODE_RE}'
     _TESTS = [{
         'url': 'https://tv.nrk.no/program/MDDP12000117',
         'md5': 'c4a5960f1b00b40d47db65c1064e0ab1',
@@ -306,8 +323,15 @@ class NRKTVIE(InfoExtractor):
                 }],
                 'nb-ttv': [{
                     'ext': 'vtt',
-                }]
+                }],
             },
+            'upload_date': '20170627',
+            'timestamp': 1498591822,
+            'thumbnail': 'https://gfx.nrk.no/myRSc4vuFlahB60P3n6swwRTQUZI1LqJZl9B7icZFgzA',
+            'alt_title': 'md5:46923a6e6510eefcce23d5ef2a58f2ce',
+        },
+        'params': {
+            'skip_download': True,
         },
     }, {
         'url': 'https://tv.nrk.no/serie/20-spoersmaal-tv/MUHH48000314/23-05-2014',
@@ -322,6 +346,13 @@ class NRKTVIE(InfoExtractor):
             'series': '20 spørsmål',
             'episode': '23. mai 2014',
             'age_limit': 0,
+            'timestamp': 1584593700,
+            'thumbnail': 'https://gfx.nrk.no/u7uCe79SEfPVGRAGVp2_uAZnNc4mfz_kjXg6Bgek8lMQ',
+            'season_id': '126936',
+            'upload_date': '20200319',
+            'season': 'Season 2014',
+            'season_number': 2014,
+            'episode_number': 3,
         },
     }, {
         'url': 'https://tv.nrk.no/program/mdfp15000514',
@@ -411,7 +442,7 @@ class NRKTVIE(InfoExtractor):
     def _real_extract(self, url):
         video_id = self._match_id(url)
         return self.url_result(
-            'nrk:%s' % video_id, ie=NRKIE.ie_key(), video_id=video_id)
+            f'nrk:{video_id}', ie=NRKIE.ie_key(), video_id=video_id)
 
 
 class NRKTVEpisodeIE(InfoExtractor):
@@ -461,14 +492,14 @@ class NRKTVEpisodeIE(InfoExtractor):
         info = self._search_json_ld(webpage, display_id, default={})
         nrk_id = info.get('@id') or self._html_search_meta(
             'nrk:program-id', webpage, default=None) or self._search_regex(
-            r'data-program-id=["\'](%s)' % NRKTVIE._EPISODE_RE, webpage,
+            rf'data-program-id=["\']({NRKTVIE._EPISODE_RE})', webpage,
             'nrk id')
         assert re.match(NRKTVIE._EPISODE_RE, nrk_id)
 
         info.update({
             '_type': 'url',
             'id': nrk_id,
-            'url': 'nrk:%s' % nrk_id,
+            'url': f'nrk:{nrk_id}',
             'ie_key': NRKIE.ie_key(),
             'season_number': int(season_number),
             'episode_number': int(episode_number),
@@ -483,13 +514,13 @@ class NRKTVSerieBaseIE(NRKBaseIE):
         entries = []
         for episode in entry_list:
             nrk_id = episode.get('prfId') or episode.get('episodeId')
-            if not nrk_id or not isinstance(nrk_id, compat_str):
+            if not nrk_id or not isinstance(nrk_id, str):
                 continue
             entries.append(self.url_result(
-                'nrk:%s' % nrk_id, ie=NRKIE.ie_key(), video_id=nrk_id))
+                f'nrk:{nrk_id}', ie=NRKIE.ie_key(), video_id=nrk_id))
         return entries
 
-    _ASSETS_KEYS = ('episodes', 'instalments',)
+    _ASSETS_KEYS = ('episodes', 'instalments')
 
     def _extract_assets_key(self, embedded):
         for asset_key in self._ASSETS_KEYS:
@@ -514,19 +545,18 @@ class NRKTVSerieBaseIE(NRKBaseIE):
                 (lambda x: x[assets_key]['_embedded'][assets_key],
                  lambda x: x[assets_key]),
                 list)
-            for e in self._extract_entries(entries):
-                yield e
+            yield from self._extract_entries(entries)
             # Find next URL
             next_url_path = try_get(
                 data,
                 (lambda x: x['_links']['next']['href'],
                  lambda x: x['_embedded'][assets_key]['_links']['next']['href']),
-                compat_str)
+                str)
             if not next_url_path:
                 break
             data = self._call_api(
                 next_url_path, display_id,
-                note='Downloading %s JSON page %d' % (assets_key, page_num),
+                note=f'Downloading {assets_key} JSON page {page_num}',
                 fatal=False)
             if not data:
                 break
@@ -593,7 +623,7 @@ class NRKTVSeasonIE(NRKTVSerieBaseIE):
     @classmethod
     def suitable(cls, url):
         return (False if NRKTVIE.suitable(url) or NRKTVEpisodeIE.suitable(url) or NRKRadioPodkastIE.suitable(url)
-                else super(NRKTVSeasonIE, cls).suitable(url))
+                else super().suitable(url))
 
     def _real_extract(self, url):
         mobj = self._match_valid_url(url)
@@ -601,14 +631,13 @@ class NRKTVSeasonIE(NRKTVSerieBaseIE):
         serie_kind = mobj.group('serie_kind')
         serie = mobj.group('serie')
         season_id = mobj.group('id') or mobj.group('id_2')
-        display_id = '%s/%s' % (serie, season_id)
+        display_id = f'{serie}/{season_id}'
 
         data = self._call_api(
-            '%s/catalog/%s/%s/seasons/%s'
-            % (domain, self._catalog_name(serie_kind), serie, season_id),
+            f'{domain}/catalog/{self._catalog_name(serie_kind)}/{serie}/seasons/{season_id}',
             display_id, 'season', query={'pageSize': 50})
 
-        title = try_get(data, lambda x: x['titles']['title'], compat_str) or display_id
+        title = try_get(data, lambda x: x['titles']['title'], str) or display_id
         return self.playlist_result(
             self._entries(data, display_id),
             display_id, title)
@@ -691,7 +720,7 @@ class NRKTVSeriesIE(NRKTVSerieBaseIE):
         return (
             False if any(ie.suitable(url)
                          for ie in (NRKTVIE, NRKTVEpisodeIE, NRKRadioPodkastIE, NRKTVSeasonIE))
-            else super(NRKTVSeriesIE, cls).suitable(url))
+            else super().suitable(url))
 
     def _real_extract(self, url):
         site, serie_kind, series_id = self._match_valid_url(url).groups()
@@ -700,8 +729,7 @@ class NRKTVSeriesIE(NRKTVSerieBaseIE):
 
         size_prefix = 'p' if is_radio else 'embeddedInstalmentsP'
         series = self._call_api(
-            '%s/catalog/%s/%s'
-            % (domain, self._catalog_name(serie_kind), series_id),
+            f'{domain}/catalog/{self._catalog_name(serie_kind)}/{series_id}',
             series_id, 'serie', query={size_prefix + 'ageSize': 50})
         titles = try_get(series, [
             lambda x: x['titles'],
@@ -719,8 +747,8 @@ class NRKTVSeriesIE(NRKTVSerieBaseIE):
                 season_url = urljoin(url, season.get('href'))
                 if not season_url:
                     season_name = season.get('name')
-                    if season_name and isinstance(season_name, compat_str):
-                        season_url = 'https://%s.nrk.no/serie/%s/sesong/%s' % (domain, series_id, season_name)
+                    if season_name and isinstance(season_name, str):
+                        season_url = f'https://{domain}.nrk.no/serie/{series_id}/sesong/{season_name}'
                 if season_url:
                     entries.append(self.url_result(
                         season_url, ie=NRKTVSeasonIE.ie_key(),
@@ -777,7 +805,7 @@ class NRKRadioPodkastIE(InfoExtractor):
     def _real_extract(self, url):
         video_id = self._match_id(url)
         return self.url_result(
-            'nrk:%s' % video_id, ie=NRKIE.ie_key(), video_id=video_id)
+            f'nrk:{video_id}', ie=NRKIE.ie_key(), video_id=video_id)
 
 
 class NRKPlaylistBaseIE(InfoExtractor):
@@ -790,7 +818,7 @@ class NRKPlaylistBaseIE(InfoExtractor):
         webpage = self._download_webpage(url, playlist_id)
 
         entries = [
-            self.url_result('nrk:%s' % video_id, NRKIE.ie_key())
+            self.url_result(f'nrk:{video_id}', NRKIE.ie_key())
             for video_id in re.findall(self._ITEM_RE, webpage)
         ]
 
@@ -831,7 +859,7 @@ class NRKPlaylistIE(NRKPlaylistBaseIE):
 
 class NRKTVEpisodesIE(NRKPlaylistBaseIE):
     _VALID_URL = r'https?://tv\.nrk\.no/program/[Ee]pisodes/[^/]+/(?P<id>\d+)'
-    _ITEM_RE = r'data-episode=["\']%s' % NRKTVIE._EPISODE_RE
+    _ITEM_RE = rf'data-episode=["\']{NRKTVIE._EPISODE_RE}'
     _TESTS = [{
         'url': 'https://tv.nrk.no/program/episodes/nytt-paa-nytt/69031',
         'info_dict': {
@@ -869,7 +897,7 @@ class NRKSkoleIE(InfoExtractor):
         video_id = self._match_id(url)
 
         nrk_id = self._download_json(
-            'https://nrkno-skole-prod.kube.nrk.no/skole/api/media/%s' % video_id,
+            f'https://nrkno-skole-prod.kube.nrk.no/skole/api/media/{video_id}',
             video_id)['psId']
 
-        return self.url_result('nrk:%s' % nrk_id)
+        return self.url_result(f'nrk:{nrk_id}')
diff --git a/plugins/youtube_download/yt_dlp/extractor/nrl.py b/plugins/youtube_download/yt_dlp/extractor/nrl.py
index 798d034..1e8cf0b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/nrl.py
+++ b/plugins/youtube_download/yt_dlp/extractor/nrl.py
@@ -2,6 +2,7 @@ from .common import InfoExtractor
 
 
 class NRLTVIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?nrl\.com/tv(/[^/]+)*/(?P<id>[^/?&#]+)'
     _TEST = {
         'url': 'https://www.nrl.com/tv/news/match-highlights-titans-v-knights-862805/',
diff --git a/plugins/youtube_download/yt_dlp/extractor/nts.py b/plugins/youtube_download/yt_dlp/extractor/nts.py
new file mode 100644
index 0000000..a801740
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/nts.py
@@ -0,0 +1,76 @@
+from .common import InfoExtractor
+from ..utils import parse_iso8601, url_or_none
+from ..utils.traversal import traverse_obj
+
+
+class NTSLiveIE(InfoExtractor):
+    IE_NAME = 'nts.live'
+    _VALID_URL = r'https?://(?:www\.)?nts\.live/shows/[^/?#]+/episodes/(?P<id>[^/?#]+)'
+    _TESTS = [
+        {
+            # embedded soundcloud
+            'url': 'https://www.nts.live/shows/yu-su/episodes/yu-su-2nd-april-2024',
+            'md5': 'b5444c04888c869d68758982de1a27d8',
+            'info_dict': {
+                'id': '1791563518',
+                'ext': 'opus',
+                'uploader_id': '995579326',
+                'title': 'Pender Street Steppers & YU SU',
+                'timestamp': 1712073600,
+                'upload_date': '20240402',
+                'thumbnail': 'https://i1.sndcdn.com/artworks-qKcNO0z0AQGGbv9s-GljJCw-original.jpg',
+                'license': 'all-rights-reserved',
+                'repost_count': int,
+                'uploader_url': 'https://soundcloud.com/user-643553014',
+                'uploader': 'NTS Latest',
+                'description': 'md5:cd00ac535a63caaad722483ae3ff802a',
+                'duration': 10784.157,
+                'genres': ['Deep House', 'House', 'Leftfield Disco', 'Jazz Fusion', 'Dream Pop'],
+                'modified_timestamp': 1712564687,
+                'modified_date': '20240408',
+            },
+        },
+        {
+            # embedded mixcloud
+            'url': 'https://www.nts.live/shows/absolute-fiction/episodes/absolute-fiction-23rd-july-2022',
+            'info_dict': {
+                'id': 'NTSRadio_absolute-fiction-23rd-july-2022',
+                'ext': 'webm',
+                'like_count': int,
+                'title': 'Absolute Fiction',
+                'comment_count': int,
+                'uploader_url': 'https://www.mixcloud.com/NTSRadio/',
+                'description': 'md5:ba49da971ae8d71ee45813c52c5e2a04',
+                'tags': [],
+                'duration': 3529,
+                'timestamp': 1658588400,
+                'repost_count': int,
+                'upload_date': '20220723',
+                'uploader_id': 'NTSRadio',
+                'thumbnail': 'https://thumbnailer.mixcloud.com/unsafe/1024x1024/extaudio/5/1/a/d/ae3e-1be9-4fd4-983e-9c3294226eac',
+                'uploader': 'Mixcloud NTS Radio',
+                'genres': ['Minimal Synth', 'Post Punk', 'Industrial '],
+                'modified_timestamp': 1658842165,
+                'modified_date': '20220726',
+            },
+            'params': {'skip_download': 'm3u8'},
+        },
+    ]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+
+        data = self._search_json(r'window\._REACT_STATE_\s*=', webpage, 'react state', video_id)
+
+        return {
+            '_type': 'url_transparent',
+            **traverse_obj(data, ('episode', {
+                'url': ('audio_sources', ..., 'url', {url_or_none}, any),
+                'title': ('name', {str}),
+                'description': ('description', {str}),
+                'genres': ('genres', ..., 'value', {str}),
+                'timestamp': ('broadcast', {parse_iso8601}),
+                'modified_timestamp': ('updated', {parse_iso8601}),
+            })),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/ntvde.py b/plugins/youtube_download/yt_dlp/extractor/ntvde.py
index 6d7ea3d..9f3a498 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ntvde.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ntvde.py
@@ -1,21 +1,21 @@
 import re
 
 from .common import InfoExtractor
-from ..compat import compat_urlparse
 from ..utils import (
     int_or_none,
     js_to_json,
-    parse_duration,
+    url_or_none,
 )
+from ..utils.traversal import traverse_obj
 
 
 class NTVDeIE(InfoExtractor):
     IE_NAME = 'n-tv.de'
-    _VALID_URL = r'https?://(?:www\.)?n-tv\.de/mediathek/videos/[^/?#]+/[^/?#]+-article(?P<id>.+)\.html'
+    _VALID_URL = r'https?://(?:www\.)?n-tv\.de/mediathek/(?:videos|magazine)/[^/?#]+/[^/?#]+-article(?P<id>[^/?#]+)\.html'
 
     _TESTS = [{
         'url': 'http://www.n-tv.de/mediathek/videos/panorama/Schnee-und-Glaette-fuehren-zu-zahlreichen-Unfaellen-und-Staus-article14438086.html',
-        'md5': '6ef2514d4b1e8e03ca24b49e2f167153',
+        'md5': '6bcf2a6638cb83f45d5561659a1cb498',
         'info_dict': {
             'id': '14438086',
             'ext': 'mp4',
@@ -23,51 +23,61 @@ class NTVDeIE(InfoExtractor):
             'title': 'Schnee und Glätte führen zu zahlreichen Unfällen und Staus',
             'alt_title': 'Winterchaos auf deutschen Straßen',
             'description': 'Schnee und Glätte sorgen deutschlandweit für einen chaotischen Start in die Woche: Auf den Straßen kommt es zu kilometerlangen Staus und Dutzenden Glätteunfällen. In Düsseldorf und München wirbelt der Schnee zudem den Flugplan durcheinander. Dutzende Flüge landen zu spät, einige fallen ganz aus.',
-            'duration': 4020,
+            'duration': 67,
             'timestamp': 1422892797,
             'upload_date': '20150202',
         },
+    }, {
+        'url': 'https://www.n-tv.de/mediathek/magazine/auslandsreport/Juedische-Siedler-wollten-Rache-die-wollten-nur-toeten-article24523089.html',
+        'md5': 'c5c6014c014ccc3359470e1d34472bfd',
+        'info_dict': {
+            'id': '24523089',
+            'ext': 'mp4',
+            'thumbnail': r're:^https?://.*\.jpg$',
+            'title': 'Jüdische Siedler "wollten Rache, die wollten nur töten"',
+            'alt_title': 'Israelische Gewalt fern von Gaza',
+            'description': 'Vier Tage nach dem Massaker der Hamas greifen jüdische Siedler das Haus einer palästinensischen Familie im Westjordanland an. Die Überlebenden berichten, sie waren unbewaffnet, die Angreifer seien nur auf "Rache und Töten" aus gewesen. Als die Toten beerdigt werden sollen, eröffnen die Siedler erneut das Feuer.',
+            'duration': 326,
+            'timestamp': 1699688294,
+            'upload_date': '20231111',
+        },
     }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
 
-        info = self._parse_json(self._search_regex(
-            r'(?s)ntv\.pageInfo\.article\s*=\s*(\{.*?\});', webpage, 'info'),
-            video_id, transform_source=js_to_json)
-        timestamp = int_or_none(info.get('publishedDateAsUnixTimeStamp'))
-        vdata = self._parse_json(self._search_regex(
-            r'(?s)\$\(\s*"\#player"\s*\)\s*\.data\(\s*"player",\s*(\{.*?\})\);',
-            webpage, 'player data'), video_id,
-            transform_source=lambda s: js_to_json(re.sub(r'advertising:\s*{[^}]+},', '', s)))
-        duration = parse_duration(vdata.get('duration'))
+        info = self._search_json(
+            r'article:', webpage, 'info', video_id, transform_source=js_to_json)
+
+        vdata = self._search_json(
+            r'\$\(\s*"#playerwrapper"\s*\)\s*\.data\(\s*"player",',
+            webpage, 'player data', video_id,
+            transform_source=lambda s: js_to_json(re.sub(r'ivw:[^},]+', '', s)))['setup']['source']
 
         formats = []
-        if vdata.get('video'):
+        if vdata.get('progressive'):
             formats.append({
-                'format_id': 'flash',
-                'url': 'rtmp://fms.n-tv.de/%s' % vdata['video'],
+                'format_id': 'http',
+                'url': vdata['progressive'],
             })
-        if vdata.get('videoMp4'):
-            formats.append({
-                'format_id': 'mobile',
-                'url': compat_urlparse.urljoin('http://video.n-tv.de', vdata['videoMp4']),
-                'tbr': 400,  # estimation
-            })
-        if vdata.get('videoM3u8'):
-            m3u8_url = compat_urlparse.urljoin('http://video.n-tv.de', vdata['videoM3u8'])
+        if vdata.get('hls'):
             formats.extend(self._extract_m3u8_formats(
-                m3u8_url, video_id, ext='mp4', entry_protocol='m3u8_native',
-                quality=1, m3u8_id='hls', fatal=False))
+                vdata['hls'], video_id, 'mp4', m3u8_id='hls', fatal=False))
+        if vdata.get('dash'):
+            formats.extend(self._extract_mpd_formats(vdata['dash'], video_id, fatal=False, mpd_id='dash'))
 
         return {
             'id': video_id,
-            'title': info['headline'],
-            'description': info.get('intro'),
-            'alt_title': info.get('kicker'),
-            'timestamp': timestamp,
-            'thumbnail': vdata.get('html5VideoPoster'),
-            'duration': duration,
+            **traverse_obj(info, {
+                'title': 'headline',
+                'description': 'intro',
+                'alt_title': 'kicker',
+                'timestamp': ('publishedDateAsUnixTimeStamp', {int_or_none}),
+            }),
+            **traverse_obj(vdata, {
+                'thumbnail': ('poster', {url_or_none}),
+                'duration': ('length', {int_or_none}),
+            }),
             'formats': formats,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/ntvru.py b/plugins/youtube_download/yt_dlp/extractor/ntvru.py
index 91b7724..1ab1be0 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ntvru.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ntvru.py
@@ -35,6 +35,7 @@ class NTVRuIE(InfoExtractor):
             'duration': 172,
             'view_count': int,
         },
+        'skip': '404 Not Found',
     }, {
         'url': 'http://www.ntv.ru/peredacha/segodnya/m23700/o232416',
         'md5': '82dbd49b38e3af1d00df16acbeab260c',
@@ -78,7 +79,8 @@ class NTVRuIE(InfoExtractor):
     }]
 
     _VIDEO_ID_REGEXES = [
-        r'<meta property="og:url" content="http://www\.ntv\.ru/video/(\d+)',
+        r'<meta property="og:url" content="https?://www\.ntv\.ru/video/(\d+)',
+        r'<meta property="og:video:(?:url|iframe)" content="https?://www\.ntv\.ru/embed/(\d+)',
         r'<video embed=[^>]+><id>(\d+)</id>',
         r'<video restriction[^>]+><key>(\d+)</key>',
     ]
@@ -100,7 +102,7 @@ class NTVRuIE(InfoExtractor):
                 self._VIDEO_ID_REGEXES, webpage, 'video id')
 
         player = self._download_xml(
-            'http://www.ntv.ru/vi%s/' % video_id,
+            f'http://www.ntv.ru/vi{video_id}/',
             video_id, 'Downloading video XML')
 
         title = strip_or_none(unescapeHTML(xpath_text(player, './data/title', 'title', fatal=True)))
@@ -109,7 +111,7 @@ class NTVRuIE(InfoExtractor):
 
         formats = []
         for format_id in ['', 'hi', 'webm']:
-            file_ = xpath_text(video, './%sfile' % format_id)
+            file_ = xpath_text(video, f'./{format_id}file')
             if not file_:
                 continue
             if file_.startswith('//'):
@@ -118,7 +120,7 @@ class NTVRuIE(InfoExtractor):
                 file_ = 'http://media.ntv.ru/vod/' + file_
             formats.append({
                 'url': file_,
-                'filesize': int_or_none(xpath_text(video, './%ssize' % format_id)),
+                'filesize': int_or_none(xpath_text(video, f'./{format_id}size')),
             })
         hls_manifest = xpath_text(video, './playback/hls')
         if hls_manifest:
diff --git a/plugins/youtube_download/yt_dlp/extractor/nubilesporn.py b/plugins/youtube_download/yt_dlp/extractor/nubilesporn.py
index d4f1d9d..47c7be6 100644
--- a/plugins/youtube_download/yt_dlp/extractor/nubilesporn.py
+++ b/plugins/youtube_download/yt_dlp/extractor/nubilesporn.py
@@ -10,16 +10,16 @@ from ..utils import (
     get_element_html_by_class,
     get_elements_by_class,
     int_or_none,
-    try_call,
     unified_timestamp,
     urlencode_postdata,
 )
+from ..utils.traversal import find_element, find_elements, traverse_obj
 
 
 class NubilesPornIE(InfoExtractor):
     _NETRC_MACHINE = 'nubiles-porn'
     _VALID_URL = r'''(?x)
-        https://members.nubiles-porn.com/video/watch/(?P<id>\d+)
+        https://members\.nubiles-porn\.com/video/watch/(?P<id>\d+)
         (?:/(?P<display_id>[\w\-]+-s(?P<season>\d+)e(?P<episode>\d+)))?
     '''
 
@@ -51,8 +51,8 @@ class NubilesPornIE(InfoExtractor):
             'season': 'Season 3',
             'season_number': 3,
             'episode': 'Episode 1',
-            'episode_number': 1
-        }
+            'episode_number': 1,
+        },
     }]
 
     def _perform_login(self, username, password):
@@ -70,9 +70,8 @@ class NubilesPornIE(InfoExtractor):
             url, get_element_by_class('watch-page-video-wrapper', page), video_id)[0]
 
         channel_id, channel_name = self._search_regex(
-            r'/video/website/(?P<id>\d+).+>(?P<name>\w+).com', get_element_html_by_class('site-link', page),
+            r'/video/website/(?P<id>\d+).+>(?P<name>\w+).com', get_element_html_by_class('site-link', page) or '',
             'channel', fatal=False, group=('id', 'name')) or (None, None)
-        channel_name = re.sub(r'([^A-Z]+)([A-Z]+)', r'\1 \2', channel_name)
 
         return {
             'id': video_id,
@@ -82,18 +81,18 @@ class NubilesPornIE(InfoExtractor):
             'thumbnail': media_entries.get('thumbnail'),
             'description': clean_html(get_element_html_by_class('content-pane-description', page)),
             'timestamp': unified_timestamp(get_element_by_class('date', page)),
-            'channel': channel_name,
+            'channel': re.sub(r'([^A-Z]+)([A-Z]+)', r'\1 \2', channel_name) if channel_name else None,
             'channel_id': channel_id,
             'channel_url': format_field(channel_id, None, 'https://members.nubiles-porn.com/video/website/%s'),
             'like_count': int_or_none(get_element_by_id('likecount', page)),
             'average_rating': float_or_none(get_element_by_class('score', page)),
             'age_limit': 18,
-            'categories': try_call(lambda: list(map(clean_html, get_elements_by_class('btn', get_element_by_class('categories', page))))),
-            'tags': try_call(lambda: list(map(clean_html, get_elements_by_class('btn', get_elements_by_class('tags', page)[1])))),
+            'categories': traverse_obj(page, ({find_element(cls='categories')}, {find_elements(cls='btn')}, ..., {clean_html})),
+            'tags': traverse_obj(page, ({find_elements(cls='tags')}, 1, {find_elements(cls='btn')}, ..., {clean_html})),
             'cast': get_elements_by_class('content-pane-performer', page),
             'availability': 'needs_auth',
             'series': channel_name,
             'series_id': channel_id,
             'season_number': int_or_none(url_match.group('season')),
-            'episode_number': int_or_none(url_match.group('episode'))
+            'episode_number': int_or_none(url_match.group('episode')),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/nuevo.py b/plugins/youtube_download/yt_dlp/extractor/nuevo.py
index ec54041..945fd0c 100644
--- a/plugins/youtube_download/yt_dlp/extractor/nuevo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/nuevo.py
@@ -1,9 +1,5 @@
 from .common import InfoExtractor
-
-from ..utils import (
-    float_or_none,
-    xpath_text
-)
+from ..utils import float_or_none, xpath_text
 
 
 class NuevoBaseIE(InfoExtractor):
@@ -32,5 +28,5 @@ class NuevoBaseIE(InfoExtractor):
             'title': title,
             'thumbnail': thumbnail,
             'duration': duration,
-            'formats': formats
+            'formats': formats,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/nuum.py b/plugins/youtube_download/yt_dlp/extractor/nuum.py
new file mode 100644
index 0000000..697fc6b
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/nuum.py
@@ -0,0 +1,201 @@
+import functools
+
+from .common import InfoExtractor
+from ..utils import (
+    ExtractorError,
+    OnDemandPagedList,
+    UserNotLive,
+    filter_dict,
+    int_or_none,
+    parse_iso8601,
+    str_or_none,
+    url_or_none,
+)
+from ..utils.traversal import traverse_obj
+
+
+class NuumBaseIE(InfoExtractor):
+    def _call_api(self, path, video_id, description, query={}):
+        response = self._download_json(
+            f'https://nuum.ru/api/v2/{path}', video_id, query=query,
+            note=f'Downloading {description} metadata',
+            errnote=f'Unable to download {description} metadata')
+        if error := response.get('error'):
+            raise ExtractorError(f'API returned error: {error!r}')
+        return response['result']
+
+    def _get_channel_info(self, channel_name):
+        return self._call_api(
+            'broadcasts/public', video_id=channel_name, description='channel',
+            query={
+                'with_extra': 'true',
+                'channel_name': channel_name,
+                'with_deleted': 'true',
+            })
+
+    def _parse_video_data(self, container, extract_formats=True):
+        stream = traverse_obj(container, ('media_container_streams', 0, {dict})) or {}
+        media = traverse_obj(stream, ('stream_media', 0, {dict})) or {}
+        media_url = traverse_obj(media, (
+            'media_meta', ('media_archive_url', 'media_url'), {url_or_none}), get_all=False)
+
+        video_id = str(container['media_container_id'])
+        is_live = media.get('media_status') == 'RUNNING'
+
+        formats, subtitles = None, None
+        headers = {'Referer': 'https://nuum.ru/'}
+        if extract_formats:
+            formats, subtitles = self._extract_m3u8_formats_and_subtitles(
+                media_url, video_id, 'mp4', live=is_live, headers=headers)
+
+        return filter_dict({
+            'id': video_id,
+            'is_live': is_live,
+            'formats': formats,
+            'subtitles': subtitles,
+            'http_headers': headers,
+            **traverse_obj(container, {
+                'title': ('media_container_name', {str}),
+                'description': ('media_container_description', {str}),
+                'timestamp': ('created_at', {parse_iso8601}),
+                'channel': ('media_container_channel', 'channel_name', {str}),
+                'channel_id': ('media_container_channel', 'channel_id', {str_or_none}),
+            }),
+            **traverse_obj(stream, {
+                'view_count': ('stream_total_viewers', {int_or_none}),
+                'concurrent_view_count': ('stream_current_viewers', {int_or_none}),
+            }),
+            **traverse_obj(media, {
+                'duration': ('media_duration', {int_or_none}),
+                'thumbnail': ('media_meta', ('media_preview_archive_url', 'media_preview_url'), {url_or_none}),
+            }, get_all=False),
+        })
+
+
+class NuumMediaIE(NuumBaseIE):
+    IE_NAME = 'nuum:media'
+    _VALID_URL = r'https?://nuum\.ru/(?:streams|videos|clips)/(?P<id>[\d]+)'
+    _TESTS = [{
+        'url': 'https://nuum.ru/streams/1592713-7-days-to-die',
+        'only_matching': True,
+    }, {
+        'url': 'https://nuum.ru/videos/1567547-toxi-hurtz',
+        'md5': 'ce28837a5bbffe6952d7bfd3d39811b0',
+        'info_dict': {
+            'id': '1567547',
+            'ext': 'mp4',
+            'title': 'Toxi$ - Hurtz',
+            'description': '',
+            'timestamp': 1702631651,
+            'upload_date': '20231215',
+            'thumbnail': r're:^https?://.+\.jpg',
+            'view_count': int,
+            'concurrent_view_count': int,
+            'channel_id': '6911',
+            'channel': 'toxis',
+            'duration': 116,
+        },
+    }, {
+        'url': 'https://nuum.ru/clips/1552564-pro-misu',
+        'md5': 'b248ae1565b1e55433188f11beeb0ca1',
+        'info_dict': {
+            'id': '1552564',
+            'ext': 'mp4',
+            'title': 'Про Мису 🙃',
+            'timestamp': 1701971828,
+            'upload_date': '20231207',
+            'thumbnail': r're:^https?://.+\.jpg',
+            'view_count': int,
+            'concurrent_view_count': int,
+            'channel_id': '3320',
+            'channel': 'Misalelik',
+            'duration': 41,
+        },
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        video_data = self._call_api(f'media-containers/{video_id}', video_id, 'media')
+
+        return self._parse_video_data(video_data)
+
+
+class NuumLiveIE(NuumBaseIE):
+    IE_NAME = 'nuum:live'
+    _VALID_URL = r'https?://nuum\.ru/channel/(?P<id>[^/#?]+)/?(?:$|[#?])'
+    _TESTS = [{
+        'url': 'https://nuum.ru/channel/mts_live',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        channel = self._match_id(url)
+        channel_info = self._get_channel_info(channel)
+        if traverse_obj(channel_info, ('channel', 'channel_is_live')) is False:
+            raise UserNotLive(video_id=channel)
+
+        info = self._parse_video_data(channel_info['media_container'])
+        return {
+            'webpage_url': f'https://nuum.ru/streams/{info["id"]}',
+            'extractor_key': NuumMediaIE.ie_key(),
+            'extractor': NuumMediaIE.IE_NAME,
+            **info,
+        }
+
+
+class NuumTabIE(NuumBaseIE):
+    IE_NAME = 'nuum:tab'
+    _VALID_URL = r'https?://nuum\.ru/channel/(?P<id>[^/#?]+)/(?P<type>streams|videos|clips)'
+    _TESTS = [{
+        'url': 'https://nuum.ru/channel/dankon_/clips',
+        'info_dict': {
+            'id': 'dankon__clips',
+            'title': 'Dankon_',
+        },
+        'playlist_mincount': 29,
+    }, {
+        'url': 'https://nuum.ru/channel/dankon_/videos',
+        'info_dict': {
+            'id': 'dankon__videos',
+            'title': 'Dankon_',
+        },
+        'playlist_mincount': 2,
+    }, {
+        'url': 'https://nuum.ru/channel/dankon_/streams',
+        'info_dict': {
+            'id': 'dankon__streams',
+            'title': 'Dankon_',
+        },
+        'playlist_mincount': 1,
+    }]
+
+    _PAGE_SIZE = 50
+
+    def _fetch_page(self, channel_id, tab_type, tab_id, page):
+        CONTAINER_TYPES = {
+            'clips': ['SHORT_VIDEO', 'REVIEW_VIDEO'],
+            'videos': ['LONG_VIDEO'],
+            'streams': ['SINGLE'],
+        }
+
+        media_containers = self._call_api(
+            'media-containers', video_id=tab_id, description=f'{tab_type} tab page {page + 1}',
+            query={
+                'limit': self._PAGE_SIZE,
+                'offset': page * self._PAGE_SIZE,
+                'channel_id': channel_id,
+                'media_container_status': 'STOPPED',
+                'media_container_type': CONTAINER_TYPES[tab_type],
+            })
+        for container in traverse_obj(media_containers, (..., {dict})):
+            metadata = self._parse_video_data(container, extract_formats=False)
+            yield self.url_result(f'https://nuum.ru/videos/{metadata["id"]}', NuumMediaIE, **metadata)
+
+    def _real_extract(self, url):
+        channel_name, tab_type = self._match_valid_url(url).group('id', 'type')
+        tab_id = f'{channel_name}_{tab_type}'
+        channel_data = self._get_channel_info(channel_name)['channel']
+
+        return self.playlist_result(OnDemandPagedList(functools.partial(
+            self._fetch_page, channel_data['channel_id'], tab_type, tab_id), self._PAGE_SIZE),
+            playlist_id=tab_id, playlist_title=channel_data.get('channel_name'))
diff --git a/plugins/youtube_download/yt_dlp/extractor/nuvid.py b/plugins/youtube_download/yt_dlp/extractor/nuvid.py
index 6ac351c..99a426b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/nuvid.py
+++ b/plugins/youtube_download/yt_dlp/extractor/nuvid.py
@@ -2,8 +2,8 @@ import re
 
 from .common import InfoExtractor
 from ..utils import (
-    parse_duration,
     int_or_none,
+    parse_duration,
     strip_or_none,
     traverse_obj,
     url_or_none,
@@ -22,7 +22,7 @@ class NuvidIE(InfoExtractor):
             'duration': 321.0,
             'age_limit': 18,
             'thumbnail': r're:https?://.+\.jpg',
-        }
+        },
     }, {
         'url': 'https://m.nuvid.com/video/6523263',
         'md5': 'ebd22ce8e47e1d9a4d0756a15c67da52',
@@ -34,7 +34,7 @@ class NuvidIE(InfoExtractor):
             'age_limit': 18,
             'thumbnail': r're:https?://.+\.jpg',
             'thumbnails': list,
-        }
+        },
     }, {
         'url': 'http://m.nuvid.com/video/6415801/',
         'md5': '638d5ececb138d5753593f751ae3f697',
@@ -45,7 +45,7 @@ class NuvidIE(InfoExtractor):
             'duration': 1882,
             'age_limit': 18,
             'thumbnail': r're:https?://.+\.jpg',
-        }
+        },
     }]
 
     def _real_extract(self, url):
@@ -64,7 +64,7 @@ class NuvidIE(InfoExtractor):
             })
 
         webpage = self._download_webpage(
-            'http://m.nuvid.com/video/%s' % (video_id, ),
+            f'http://m.nuvid.com/video/{video_id}',
             video_id, 'Downloading video page', fatal=False) or ''
 
         title = strip_or_none(video_data.get('title') or self._html_search_regex(
diff --git a/plugins/youtube_download/yt_dlp/extractor/nytimes.py b/plugins/youtube_download/yt_dlp/extractor/nytimes.py
index 2e21edb..a97add7 100644
--- a/plugins/youtube_download/yt_dlp/extractor/nytimes.py
+++ b/plugins/youtube_download/yt_dlp/extractor/nytimes.py
@@ -1,50 +1,93 @@
-import hmac
-import hashlib
-import base64
+import json
+import uuid
 
 from .common import InfoExtractor
 from ..utils import (
+    ExtractorError,
+    clean_html,
     determine_ext,
+    extract_attributes,
     float_or_none,
+    get_elements_html_by_class,
     int_or_none,
-    js_to_json,
+    merge_dicts,
     mimetype2ext,
     parse_iso8601,
+    remove_end,
     remove_start,
+    str_or_none,
+    traverse_obj,
+    url_or_none,
 )
 
 
 class NYTimesBaseIE(InfoExtractor):
-    _SECRET = b'pX(2MbU2);4N{7J8)>YwKRJ+/pQ3JkiU2Q^V>mFYv6g6gYvt6v'
+    _DNS_NAMESPACE = uuid.UUID('36dd619a-56dc-595b-9e09-37f4152c7b5d')
+    _TOKEN = 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuNIzKBOFB77aT/jN/FQ+/QVKWq5V1ka1AYmCR9hstz1pGNPH5ajOU9gAqta0T89iPnhjwla+3oec/Z3kGjxbpv6miQXufHFq3u2RC6HyU458cLat5kVPSOQCe3VVB5NRpOlRuwKHqn0txfxnwSSj8mqzstR997d3gKB//RO9zE16y3PoWlDQXkASngNJEWvL19iob/xwAkfEWCjyRILWFY0JYX3AvLMSbq7wsqOCE5srJpo7rRU32zsByhsp1D5W9OYqqwDmflsgCEQy2vqTsJjrJohuNg+urMXNNZ7Y3naMoqttsGDrWVxtPBafKMI8pM2ReNZBbGQsQXRzQNo7+QIDAQAB'
+    _GRAPHQL_API = 'https://samizdat-graphql.nytimes.com/graphql/v2'
+    _GRAPHQL_QUERY = '''query VideoQuery($id: String!) {
+  video(id: $id) {
+    ... on Video {
+      bylines {
+        renderedRepresentation
+      }
+      duration
+      firstPublished
+      promotionalHeadline
+      promotionalMedia {
+        ... on Image {
+          crops {
+            name
+            renditions {
+              name
+              width
+              height
+              url
+            }
+          }
+        }
+      }
+      renditions {
+        type
+        width
+        height
+        url
+        bitrate
+      }
+      summary
+    }
+  }
+}'''
 
-    def _extract_video_from_id(self, video_id):
-        # Authorization generation algorithm is reverse engineered from `signer` in
-        # http://graphics8.nytimes.com/video/vhs/vhs-2.x.min.js
-        path = '/svc/video/api/v3/video/' + video_id
-        hm = hmac.new(self._SECRET, (path + ':vhs').encode(), hashlib.sha512).hexdigest()
-        video_data = self._download_json('http://www.nytimes.com' + path, video_id, 'Downloading video JSON', headers={
-            'Authorization': 'NYTV ' + base64.b64encode(hm.encode()).decode(),
-            'X-NYTV': 'vhs',
-        }, fatal=False)
-        if not video_data:
-            video_data = self._download_json(
-                'http://www.nytimes.com/svc/video/api/v2/video/' + video_id,
-                video_id, 'Downloading video JSON')
+    def _call_api(self, media_id):
+        # reference: `id-to-uri.js`
+        video_uuid = uuid.uuid5(self._DNS_NAMESPACE, 'video')
+        media_uuid = uuid.uuid5(video_uuid, media_id)
 
-        title = video_data['headline']
+        return traverse_obj(self._download_json(
+            self._GRAPHQL_API, media_id, 'Downloading JSON from GraphQL API', data=json.dumps({
+                'query': self._GRAPHQL_QUERY,
+                'variables': {'id': f'nyt://video/{media_uuid}'},
+            }, separators=(',', ':')).encode(), headers={
+                'Content-Type': 'application/json',
+                'Nyt-App-Type': 'vhs',
+                'Nyt-App-Version': 'v3.52.21',
+                'Nyt-Token': self._TOKEN,
+                'Origin': 'https://nytimes.com',
+            }, fatal=False), ('data', 'video', {dict})) or {}
 
-        def get_file_size(file_size):
-            if isinstance(file_size, int):
-                return file_size
-            elif isinstance(file_size, dict):
-                return int(file_size.get('value', 0))
-            else:
-                return None
+    def _extract_thumbnails(self, thumbs):
+        return traverse_obj(thumbs, (lambda _, v: url_or_none(v['url']), {
+            'url': 'url',
+            'width': ('width', {int_or_none}),
+            'height': ('height', {int_or_none}),
+        }), default=None)
 
+    def _extract_formats_and_subtitles(self, video_id, content_media_json):
         urls = []
         formats = []
         subtitles = {}
-        for video in video_data.get('renditions', []):
+        for video in traverse_obj(content_media_json, ('renditions', ..., {dict})):
             video_url = video.get('url')
             format_id = video.get('type')
             if not video_url or format_id == 'thumbs' or video_url in urls:
@@ -56,11 +99,9 @@ class NYTimesBaseIE(InfoExtractor):
                     video_url, video_id, 'mp4', 'm3u8_native',
                     m3u8_id=format_id or 'hls', fatal=False)
                 formats.extend(m3u8_fmts)
-                subtitles = self._merge_subtitles(subtitles, m3u8_subs)
+                self._merge_subtitles(m3u8_subs, target=subtitles)
             elif ext == 'mpd':
-                continue
-            #     formats.extend(self._extract_mpd_formats(
-            #         video_url, video_id, format_id or 'dash', fatal=False))
+                continue  # all mpd urls give 404 errors
             else:
                 formats.append({
                     'url': video_url,
@@ -68,55 +109,50 @@ class NYTimesBaseIE(InfoExtractor):
                     'vcodec': video.get('videoencoding') or video.get('video_codec'),
                     'width': int_or_none(video.get('width')),
                     'height': int_or_none(video.get('height')),
-                    'filesize': get_file_size(video.get('file_size') or video.get('fileSize')),
+                    'filesize': traverse_obj(video, (
+                        ('file_size', 'fileSize'), (None, ('value')), {int_or_none}), get_all=False),
                     'tbr': int_or_none(video.get('bitrate'), 1000) or None,
                     'ext': ext,
                 })
 
-        thumbnails = []
-        for image in video_data.get('images', []):
-            image_url = image.get('url')
-            if not image_url:
-                continue
-            thumbnails.append({
-                'url': 'http://www.nytimes.com/' + image_url,
-                'width': int_or_none(image.get('width')),
-                'height': int_or_none(image.get('height')),
-            })
+        return formats, subtitles
 
-        publication_date = video_data.get('publication_date')
-        timestamp = parse_iso8601(publication_date[:-8]) if publication_date else None
+    def _extract_video(self, media_id):
+        data = self._call_api(media_id)
+        formats, subtitles = self._extract_formats_and_subtitles(media_id, data)
 
         return {
-            'id': video_id,
-            'title': title,
-            'description': video_data.get('summary'),
-            'timestamp': timestamp,
-            'uploader': video_data.get('byline'),
-            'duration': float_or_none(video_data.get('duration'), 1000),
+            'id': media_id,
+            'title': data.get('promotionalHeadline'),
+            'description': data.get('summary'),
+            'timestamp': parse_iso8601(data.get('firstPublished')),
+            'duration': float_or_none(data.get('duration'), scale=1000),
+            'creator': ', '.join(traverse_obj(data, (  # TODO: change to 'creators'
+                'bylines', ..., 'renderedRepresentation', {lambda x: remove_start(x, 'By ')}))),
             'formats': formats,
             'subtitles': subtitles,
-            'thumbnails': thumbnails,
+            'thumbnails': self._extract_thumbnails(
+                traverse_obj(data, ('promotionalMedia', 'crops', ..., 'renditions', ...))),
         }
 
 
 class NYTimesIE(NYTimesBaseIE):
     _VALID_URL = r'https?://(?:(?:www\.)?nytimes\.com/video/(?:[^/]+/)+?|graphics8\.nytimes\.com/bcvideo/\d+(?:\.\d+)?/iframe/embed\.html\?videoId=)(?P<id>\d+)'
     _EMBED_REGEX = [r'<iframe[^>]+src=(["\'])(?P<url>(?:https?:)?//graphics8\.nytimes\.com/bcvideo/[^/]+/iframe/embed\.html.+?)\1>']
-
     _TESTS = [{
         'url': 'http://www.nytimes.com/video/opinion/100000002847155/verbatim-what-is-a-photocopier.html?playlistId=100000001150263',
-        'md5': 'd665342765db043f7e225cff19df0f2d',
+        'md5': 'a553aa344014e3723d33893d89d4defc',
         'info_dict': {
             'id': '100000002847155',
-            'ext': 'mov',
+            'ext': 'mp4',
             'title': 'Verbatim: What Is a Photocopier?',
             'description': 'md5:93603dada88ddbda9395632fdc5da260',
-            'timestamp': 1398631707,
-            'upload_date': '20140427',
-            'uploader': 'Brett Weiner',
+            'timestamp': 1398646132,
+            'upload_date': '20140428',
+            'creator': 'Brett Weiner',
+            'thumbnail': r're:https?://\w+\.nyt.com/images/.+\.jpg',
             'duration': 419,
-        }
+        },
     }, {
         'url': 'http://www.nytimes.com/video/travel/100000003550828/36-hours-in-dubai.html',
         'only_matching': True,
@@ -125,138 +161,260 @@ class NYTimesIE(NYTimesBaseIE):
     def _real_extract(self, url):
         video_id = self._match_id(url)
 
-        return self._extract_video_from_id(video_id)
+        return self._extract_video(video_id)
 
 
 class NYTimesArticleIE(NYTimesBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?nytimes\.com/(.(?<!video))*?/(?:[^/]+/)*(?P<id>[^.]+)(?:\.html)?'
+    _VALID_URL = r'https?://(?:www\.)?nytimes\.com/\d{4}/\d{2}/\d{2}/(?!books|podcasts)[^/?#]+/(?:\w+/)?(?P<id>[^./?#]+)(?:\.html)?'
     _TESTS = [{
         'url': 'http://www.nytimes.com/2015/04/14/business/owner-of-gravity-payments-a-credit-card-processor-is-setting-a-new-minimum-wage-70000-a-year.html?_r=0',
-        'md5': 'e2076d58b4da18e6a001d53fd56db3c9',
+        'md5': '3eb5ddb1d6f86254fe4f233826778737',
         'info_dict': {
             'id': '100000003628438',
-            'ext': 'mov',
-            'title': 'New Minimum Wage: $70,000 a Year',
-            'description': 'Dan Price, C.E.O. of Gravity Payments, surprised his 120-person staff by announcing that he planned over the next three years to raise the salary of every employee to $70,000 a year.',
-            'timestamp': 1429033037,
+            'ext': 'mp4',
+            'title': 'One Company’s New Minimum Wage: $70,000 a Year',
+            'description': 'md5:89ba9ab67ca767bb92bf823d1f138433',
+            'timestamp': 1429047468,
             'upload_date': '20150414',
             'uploader': 'Matthew Williams',
-        }
+            'creator': 'Patricia Cohen',
+            'thumbnail': r're:https?://\w+\.nyt.com/images/.*\.jpg',
+            'duration': 119.0,
+        },
     }, {
-        'url': 'http://www.nytimes.com/2016/10/14/podcasts/revelations-from-the-final-weeks.html',
-        'md5': 'e0d52040cafb07662acf3c9132db3575',
+        # article with audio and no video
+        'url': 'https://www.nytimes.com/2023/09/29/health/mosquitoes-genetic-engineering.html',
+        'md5': '2365b3555c8aa7f4dd34ca735ad02e6a',
         'info_dict': {
-            'id': '100000004709062',
-            'title': 'The Run-Up: ‘He Was Like an Octopus’',
+            'id': '100000009110381',
             'ext': 'mp3',
-            'description': 'md5:fb5c6b93b12efc51649b4847fe066ee4',
-            'series': 'The Run-Up',
-            'episode': '‘He Was Like an Octopus’',
-            'episode_number': 20,
-            'duration': 2130,
-        }
+            'title': 'The Gamble: Can Genetically Modified Mosquitoes End Disease?',
+            'description': 'md5:9ff8b47acbaf7f3ca8c732f5c815be2e',
+            'timestamp': 1695960700,
+            'upload_date': '20230929',
+            'creator': 'Stephanie Nolen, Natalija Gormalova',
+            'thumbnail': r're:https?://\w+\.nyt.com/images/.*\.jpg',
+            'duration': 1322,
+        },
     }, {
-        'url': 'http://www.nytimes.com/2016/10/16/books/review/inside-the-new-york-times-book-review-the-rise-of-hitler.html',
+        'url': 'https://www.nytimes.com/2023/11/29/business/dealbook/kamala-harris-biden-voters.html',
+        'md5': '3eb5ddb1d6f86254fe4f233826778737',
         'info_dict': {
-            'id': '100000004709479',
-            'title': 'The Rise of Hitler',
-            'ext': 'mp3',
-            'description': 'md5:bce877fd9e3444990cb141875fab0028',
-            'creator': 'Pamela Paul',
-            'duration': 3475,
+            'id': '100000009202270',
+            'ext': 'mp4',
+            'title': 'Kamala Harris Defends Biden Policies, but Says ‘More Work’ Needed to Reach Voters',
+            'description': 'md5:de4212a7e19bb89e4fb14210ca915f1f',
+            'timestamp': 1701290997,
+            'upload_date': '20231129',
+            'uploader': 'By The New York Times',
+            'creator': 'Katie Rogers',
+            'thumbnail': r're:https?://\w+\.nyt.com/images/.*\.jpg',
+            'duration': 97.631,
         },
         'params': {
-            'skip_download': True,
+            'skip_download': 'm3u8',
         },
     }, {
-        'url': 'http://www.nytimes.com/news/minute/2014/03/17/times-minute-whats-next-in-crimea/?_php=true&_type=blogs&_php=true&_type=blogs&_r=1',
+        # multiple videos in the same article
+        'url': 'https://www.nytimes.com/2023/12/02/business/air-traffic-controllers-safety.html',
+        'info_dict': {
+            'id': 'air-traffic-controllers-safety',
+            'title': 'Drunk and Asleep on the Job: Air Traffic Controllers Pushed to the Brink',
+            'description': 'md5:549e5a5e935bf7d048be53ba3d2c863d',
+            'upload_date': '20231202',
+            'creator': 'Emily Steel, Sydney Ember',
+            'timestamp': 1701511264,
+        },
+        'playlist_count': 3,
+    }, {
+        'url': 'https://www.nytimes.com/2023/12/02/business/media/netflix-squid-game-challenge.html',
         'only_matching': True,
     }]
 
-    def _extract_podcast_from_json(self, json, page_id, webpage):
-        podcast_audio = self._parse_json(
-            json, page_id, transform_source=js_to_json)
+    def _extract_content_from_block(self, block):
+        details = traverse_obj(block, {
+            'id': ('sourceId', {str}),
+            'uploader': ('bylines', ..., 'renderedRepresentation', {str}),
+            'duration': (None, (('duration', {float_or_none(scale=1000)}), ('length', {int_or_none}))),
+            'timestamp': ('firstPublished', {parse_iso8601}),
+            'series': ('podcastSeries', {str}),
+        }, get_all=False)
 
-        audio_data = podcast_audio['data']
-        track = audio_data['track']
-
-        episode_title = track['title']
-        video_url = track['source']
-
-        description = track.get('description') or self._html_search_meta(
-            ['og:description', 'twitter:description'], webpage)
-
-        podcast_title = audio_data.get('podcast', {}).get('title')
-        title = ('%s: %s' % (podcast_title, episode_title)
-                 if podcast_title else episode_title)
-
-        episode = audio_data.get('podcast', {}).get('episode') or ''
-        episode_number = int_or_none(self._search_regex(
-            r'[Ee]pisode\s+(\d+)', episode, 'episode number', default=None))
+        formats, subtitles = self._extract_formats_and_subtitles(details.get('id'), block)
+        # audio articles will have an url and no formats
+        url = traverse_obj(block, ('fileUrl', {url_or_none}))
+        if not formats and url:
+            formats.append({'url': url, 'vcodec': 'none'})
 
         return {
-            'id': remove_start(podcast_audio.get('target'), 'FT') or page_id,
-            'url': video_url,
-            'title': title,
-            'description': description,
-            'creator': track.get('credit'),
-            'series': podcast_title,
-            'episode': episode_title,
-            'episode_number': episode_number,
-            'duration': int_or_none(track.get('duration')),
+            **details,
+            'thumbnails': self._extract_thumbnails(traverse_obj(
+                block, ('promotionalMedia', 'crops', ..., 'renditions', ...))),
+            'formats': formats,
+            'subtitles': subtitles,
         }
 
     def _real_extract(self, url):
         page_id = self._match_id(url)
-
         webpage = self._download_webpage(url, page_id)
+        art_json = self._search_json(
+            r'window\.__preloadedData\s*=', webpage, 'media details', page_id,
+            transform_source=lambda x: x.replace('undefined', 'null'))['initialData']['data']['article']
 
-        video_id = self._search_regex(
-            r'data-videoid=["\'](\d+)', webpage, 'video id',
-            default=None, fatal=False)
-        if video_id is not None:
-            return self._extract_video_from_id(video_id)
+        blocks = traverse_obj(art_json, (
+            'sprinkledBody', 'content', ..., ('ledeMedia', None),
+            lambda _, v: v['__typename'] in ('Video', 'Audio')))
+        if not blocks:
+            raise ExtractorError('Unable to extract any media blocks from webpage')
 
-        podcast_data = self._search_regex(
-            (r'NYTD\.FlexTypes\.push\s*\(\s*({.+?})\s*\)\s*;\s*</script',
-             r'NYTD\.FlexTypes\.push\s*\(\s*({.+})\s*\)\s*;'),
-            webpage, 'podcast data')
-        return self._extract_podcast_from_json(podcast_data, page_id, webpage)
+        common_info = {
+            'title': remove_end(self._html_extract_title(webpage), ' - The New York Times'),
+            'description': traverse_obj(art_json, (
+                'sprinkledBody', 'content', ..., 'summary', 'content', ..., 'text', {str}),
+                get_all=False) or self._html_search_meta(['og:description', 'twitter:description'], webpage),
+            'timestamp': traverse_obj(art_json, ('firstPublished', {parse_iso8601})),
+            'creator': ', '.join(
+                traverse_obj(art_json, ('bylines', ..., 'creators', ..., 'displayName'))),  # TODO: change to 'creators' (list)
+            'thumbnails': self._extract_thumbnails(traverse_obj(
+                art_json, ('promotionalMedia', 'assetCrops', ..., 'renditions', ...))),
+        }
+
+        entries = []
+        for block in blocks:
+            entries.append(merge_dicts(self._extract_content_from_block(block), common_info))
+
+        if len(entries) > 1:
+            return self.playlist_result(entries, page_id, **common_info)
+
+        return {
+            'id': page_id,
+            **entries[0],
+        }
 
 
 class NYTimesCookingIE(NYTimesBaseIE):
-    _VALID_URL = r'https?://cooking\.nytimes\.com/(?:guid|recip)es/(?P<id>\d+)'
+    IE_NAME = 'NYTimesCookingGuide'
+    _VALID_URL = r'https?://cooking\.nytimes\.com/guides/(?P<id>[\w-]+)'
     _TESTS = [{
-        'url': 'https://cooking.nytimes.com/recipes/1017817-cranberry-curd-tart',
-        'md5': 'dab81fa2eaeb3f9ed47498bdcfcdc1d3',
+        'url': 'https://cooking.nytimes.com/guides/13-how-to-cook-a-turkey',
         'info_dict': {
-            'id': '100000004756089',
-            'ext': 'mov',
-            'timestamp': 1479383008,
-            'uploader': 'By SHAW LASH, ADAM SAEWITZ and JAMES HERRON',
-            'title': 'Cranberry Tart',
-            'upload_date': '20161117',
-            'description': 'If you are a fan of lemon curd or the classic French tarte au citron, you will love this cranberry version.',
+            'id': '13-how-to-cook-a-turkey',
+            'title': 'How to Cook a Turkey',
+            'description': 'md5:726cfd3f9b161bdf5c279879e8050ca0',
+        },
+        'playlist_count': 2,
+    }, {
+        # single video example
+        'url': 'https://cooking.nytimes.com/guides/50-how-to-make-mac-and-cheese',
+        'md5': '64415805fe0b8640fce6b0b9def5989a',
+        'info_dict': {
+            'id': '100000005835845',
+            'ext': 'mp4',
+            'title': 'How to Make Mac and Cheese',
+            'description': 'md5:b8f2f33ec1fb7523b21367147c9594f1',
+            'timestamp': 1522950315,
+            'upload_date': '20180405',
+            'duration': 9.51,
+            'creator': 'Alison Roman',
+            'thumbnail': r're:https?://\w+\.nyt.com/images/.*\.jpg',
         },
     }, {
-        'url': 'https://cooking.nytimes.com/guides/13-how-to-cook-a-turkey',
-        'md5': '4b2e8c70530a89b8d905a2b572316eb8',
+        'url': 'https://cooking.nytimes.com/guides/20-how-to-frost-a-cake',
+        'md5': '64415805fe0b8640fce6b0b9def5989a',
         'info_dict': {
-            'id': '100000003951728',
-            'ext': 'mov',
-            'timestamp': 1445509539,
-            'description': 'Turkey guide',
-            'upload_date': '20151022',
-            'title': 'Turkey',
-        }
+            'id': '20-how-to-frost-a-cake',
+            'title': 'How to Frost a Cake',
+            'description': 'md5:a31fe3b98a8ce7b98aae097730c269cd',
+        },
+        'playlist_count': 8,
     }]
 
     def _real_extract(self, url):
         page_id = self._match_id(url)
-
         webpage = self._download_webpage(url, page_id)
+        title = self._html_search_meta(['og:title', 'twitter:title'], webpage)
+        description = self._html_search_meta(['og:description', 'twitter:description'], webpage)
 
-        video_id = self._search_regex(
-            r'data-video-id=["\'](\d+)', webpage, 'video id')
+        lead_video_id = self._search_regex(
+            r'data-video-player-id="(\d+)"></div>', webpage, 'lead video')
+        media_ids = traverse_obj(
+            get_elements_html_by_class('video-item', webpage), (..., {extract_attributes}, 'data-video-id'))
 
-        return self._extract_video_from_id(video_id)
+        if media_ids:
+            media_ids.append(lead_video_id)
+            return self.playlist_result(
+                map(self._extract_video, media_ids), page_id, title, description)
+
+        return {
+            **self._extract_video(lead_video_id),
+            'title': title,
+            'description': description,
+            'creator': self._search_regex(  # TODO: change to 'creators'
+                r'<span itemprop="author">([^<]+)</span></p>', webpage, 'author', default=None),
+        }
+
+
+class NYTimesCookingRecipeIE(InfoExtractor):
+    _VALID_URL = r'https?://cooking\.nytimes\.com/recipes/(?P<id>\d+)'
+    _TESTS = [{
+        'url': 'https://cooking.nytimes.com/recipes/1017817-cranberry-curd-tart',
+        'md5': '579e83bbe8e61e9de67f80edba8a78a8',
+        'info_dict': {
+            'id': '1017817',
+            'ext': 'mp4',
+            'title': 'Cranberry Curd Tart',
+            'description': 'md5:ad77a3fc321db636256d4343c5742152',
+            'timestamp': 1447804800,
+            'upload_date': '20151118',
+            'creator': 'David Tanis',
+            'thumbnail': r're:https?://\w+\.nyt.com/images/.*\.jpg',
+        },
+    }, {
+        'url': 'https://cooking.nytimes.com/recipes/1024781-neapolitan-checkerboard-cookies',
+        'md5': '58df35998241dcf0620e99e646331b42',
+        'info_dict': {
+            'id': '1024781',
+            'ext': 'mp4',
+            'title': 'Neapolitan Checkerboard Cookies',
+            'description': 'md5:ba12394c585ababea951cb6d2fcc6631',
+            'timestamp': 1701302400,
+            'upload_date': '20231130',
+            'creator': 'Sue Li',
+            'thumbnail': r're:https?://\w+\.nyt.com/images/.*\.jpg',
+        },
+    }, {
+        'url': 'https://cooking.nytimes.com/recipes/1019516-overnight-oats',
+        'md5': '2fe7965a3adc899913b8e25ada360823',
+        'info_dict': {
+            'id': '1019516',
+            'ext': 'mp4',
+            'timestamp': 1546387200,
+            'description': 'md5:8856ce10239161bd2596ac335b9f9bfb',
+            'upload_date': '20190102',
+            'title': 'Overnight Oats',
+            'creator': 'Genevieve Ko',
+            'thumbnail': r're:https?://\w+\.nyt.com/images/.*\.jpg',
+        },
+    }]
+
+    def _real_extract(self, url):
+        page_id = self._match_id(url)
+        webpage = self._download_webpage(url, page_id)
+        recipe_data = self._search_nextjs_data(webpage, page_id)['props']['pageProps']['recipe']
+
+        formats, subtitles = self._extract_m3u8_formats_and_subtitles(
+            recipe_data['videoSrc'], page_id, 'mp4', m3u8_id='hls')
+
+        return {
+            **traverse_obj(recipe_data, {
+                'id': ('id', {str_or_none}),
+                'title': ('title', {str}),
+                'description': ('topnote', {clean_html}),
+                'timestamp': ('publishedAt', {int_or_none}),
+                'creator': ('contentAttribution', 'cardByline', {str}),
+            }),
+            'formats': formats,
+            'subtitles': subtitles,
+            'thumbnails': [{'url': thumb_url} for thumb_url in traverse_obj(
+                recipe_data, ('image', 'crops', 'recipe', ..., {url_or_none}))],
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/nzherald.py b/plugins/youtube_download/yt_dlp/extractor/nzherald.py
index 062f9a8..7c09e9e 100644
--- a/plugins/youtube_download/yt_dlp/extractor/nzherald.py
+++ b/plugins/youtube_download/yt_dlp/extractor/nzherald.py
@@ -2,11 +2,7 @@ import json
 
 from .brightcove import BrightcoveNewIE
 from .common import InfoExtractor
-from ..compat import compat_str
-from ..utils import (
-    ExtractorError,
-    traverse_obj
-)
+from ..utils import ExtractorError, traverse_obj
 
 
 class NZHeraldIE(InfoExtractor):
@@ -27,7 +23,7 @@ class NZHeraldIE(InfoExtractor):
                 'tags': [],
                 'thumbnail': r're:https?://.*\.jpg$',
                 'description': 'md5:2f17713fcbfcfbe38bb9e7dfccbb0f2e',
-            }
+            },
         }, {
             # Webpage has brightcove embed player url
             'url': 'https://www.nzherald.co.nz/travel/pencarrow-coastal-trail/HDVTPJEPP46HJ2UEMK4EGD2DFI/',
@@ -42,7 +38,7 @@ class NZHeraldIE(InfoExtractor):
                 'thumbnail': r're:https?://.*\.jpg$',
                 'tags': ['travel', 'video'],
                 'duration': 43.627,
-            }
+            },
         }, {
             # two video embeds of the same video
             'url': 'https://www.nzherald.co.nz/nz/truck-driver-captured-cutting-off-motorist-on-state-highway-1-in-canterbury/FIHNJB7PLLPHWQPK4S7ZBDUC4I/',
@@ -53,7 +49,7 @@ class NZHeraldIE(InfoExtractor):
                 'timestamp': 1619730509,
                 'upload_date': '20210429',
                 'uploader_id': '1308227299001',
-                'description': 'md5:4cae7dfb7613ac4c73b9e73a75c6b5d7'
+                'description': 'md5:4cae7dfb7613ac4c73b9e73a75c6b5d7',
             },
             'skip': 'video removed',
         }, {
@@ -70,17 +66,17 @@ class NZHeraldIE(InfoExtractor):
                 'tags': ['video', 'nz herald focus', 'politics', 'politics videos'],
                 'thumbnail': r're:https?://.*\.jpg$',
                 'duration': 99.584,
-            }
+            },
         }, {
             'url': 'https://www.nzherald.co.nz/kahu/kaupapa-companies-my-taiao-supporting-maori-in-study-and-business/PQBO2J25WCG77VGRX7W7BVYEAI/',
-            'only_matching': True
+            'only_matching': True,
         }, {
             'url': 'https://nzherald.co.nz/the-country/video/focus-nzs-first-mass-covid-19-vaccination-event/N5I7IL3BRFLZSD33TLDLYJDGK4/',
-            'only_matching': True
+            'only_matching': True,
         }, {
             'url': 'https://www.nzherald.co.nz/the-vision-is-clear/news/tvic-damian-roper-planting-trees-an-addiction/AN2AAEPNRK5VLISDWQAJZB6ATQ',
-            'only_matching': True
-        }
+            'only_matching': True,
+        },
     ]
 
     BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/1308227299001/S1BXZn8t_default/index.html?videoId=%s'
@@ -89,7 +85,7 @@ class NZHeraldIE(InfoExtractor):
         """The initial webpage may include the brightcove player embed url"""
         bc_url = BrightcoveNewIE._extract_url(self, webpage)
         return bc_url or self._search_regex(
-            r'(?:embedUrl)\"\s*:\s*\"(?P<embed_url>%s)' % BrightcoveNewIE._VALID_URL,
+            rf'(?:embedUrl)\"\s*:\s*\"(?P<embed_url>{BrightcoveNewIE._VALID_URL})',
             webpage, 'embed url', default=None, group='embed_url')
 
     def _real_extract(self, url):
@@ -111,7 +107,7 @@ class NZHeraldIE(InfoExtractor):
             bc_video_id = traverse_obj(
                 video_metadata or fusion_metadata,  # fusion metadata is the video metadata for video-only pages
                 'brightcoveId', ('content_elements', ..., 'referent', 'id'),
-                get_all=False, expected_type=compat_str)
+                get_all=False, expected_type=str)
 
             if not bc_video_id:
                 if isinstance(video_metadata, dict) and len(video_metadata) == 0:
diff --git a/plugins/youtube_download/yt_dlp/extractor/nzonscreen.py b/plugins/youtube_download/yt_dlp/extractor/nzonscreen.py
index 6926bc5..7550398 100644
--- a/plugins/youtube_download/yt_dlp/extractor/nzonscreen.py
+++ b/plugins/youtube_download/yt_dlp/extractor/nzonscreen.py
@@ -10,7 +10,7 @@ from ..utils import (
 
 
 class NZOnScreenIE(InfoExtractor):
-    _VALID_URL = r'^https://www\.nzonscreen\.com/title/(?P<id>[^/?#]+)'
+    _VALID_URL = r'https?://www\.nzonscreen\.com/title/(?P<id>[^/?#]+)'
     _TESTS = [{
         'url': 'https://www.nzonscreen.com/title/shoop-shoop-diddy-wop-cumma-cumma-wang-dang-1982',
         'info_dict': {
@@ -89,5 +89,5 @@ class NZOnScreenIE(InfoExtractor):
             'http_headers': {
                 'Referer': 'https://www.nzonscreen.com/',
                 'Origin': 'https://www.nzonscreen.com/',
-            }
+            },
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/nzz.py b/plugins/youtube_download/yt_dlp/extractor/nzz.py
index ac3b731..047c4e1 100644
--- a/plugins/youtube_download/yt_dlp/extractor/nzz.py
+++ b/plugins/youtube_download/yt_dlp/extractor/nzz.py
@@ -1,9 +1,6 @@
 import re
 
 from .common import InfoExtractor
-from ..utils import (
-    extract_attributes,
-)
 
 
 class NZZIE(InfoExtractor):
@@ -22,19 +19,14 @@ class NZZIE(InfoExtractor):
         'playlist_count': 1,
     }]
 
+    def _entries(self, webpage, page_id):
+        for script in re.findall(r'(?s)<script[^>]* data-hid="jw-video-jw[^>]+>(.+?)</script>', webpage):
+            settings = self._search_json(r'var\s+settings\s*=[^{]*', script, 'settings', page_id, fatal=False)
+            if entry := self._parse_jwplayer_data(settings, page_id):
+                yield entry
+
     def _real_extract(self, url):
         page_id = self._match_id(url)
         webpage = self._download_webpage(url, page_id)
 
-        entries = []
-        for player_element in re.findall(
-                r'(<[^>]+class="kalturaPlayer[^"]*"[^>]*>)', webpage):
-            player_params = extract_attributes(player_element)
-            if player_params.get('data-type') not in ('kaltura_singleArticle',):
-                self.report_warning('Unsupported player type')
-                continue
-            entry_id = player_params['data-id']
-            entries.append(self.url_result(
-                'kaltura:1750922:' + entry_id, 'Kaltura', entry_id))
-
-        return self.playlist_result(entries, page_id)
+        return self.playlist_result(self._entries(webpage, page_id), page_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/odatv.py b/plugins/youtube_download/yt_dlp/extractor/odatv.py
deleted file mode 100644
index 24ab939..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/odatv.py
+++ /dev/null
@@ -1,47 +0,0 @@
-from .common import InfoExtractor
-from ..utils import (
-    ExtractorError,
-    NO_DEFAULT,
-    remove_start
-)
-
-
-class OdaTVIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?odatv\.com/(?:mob|vid)_video\.php\?.*\bid=(?P<id>[^&]+)'
-    _TESTS = [{
-        'url': 'http://odatv.com/vid_video.php?id=8E388',
-        'md5': 'dc61d052f205c9bf2da3545691485154',
-        'info_dict': {
-            'id': '8E388',
-            'ext': 'mp4',
-            'title': 'Artık Davutoğlu ile devam edemeyiz'
-        }
-    }, {
-        # mobile URL
-        'url': 'http://odatv.com/mob_video.php?id=8E388',
-        'only_matching': True,
-    }, {
-        # no video
-        'url': 'http://odatv.com/mob_video.php?id=8E900',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-
-        no_video = 'NO VIDEO!' in webpage
-
-        video_url = self._search_regex(
-            r'mp4\s*:\s*(["\'])(?P<url>http.+?)\1', webpage, 'video url',
-            default=None if no_video else NO_DEFAULT, group='url')
-
-        if no_video:
-            raise ExtractorError('Video %s does not exist' % video_id, expected=True)
-
-        return {
-            'id': video_id,
-            'url': video_url,
-            'title': remove_start(self._og_search_title(webpage), 'Video: '),
-            'thumbnail': self._og_search_thumbnail(webpage),
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/odkmedia.py b/plugins/youtube_download/yt_dlp/extractor/odkmedia.py
index b852160..766cb94 100644
--- a/plugins/youtube_download/yt_dlp/extractor/odkmedia.py
+++ b/plugins/youtube_download/yt_dlp/extractor/odkmedia.py
@@ -7,7 +7,7 @@ from ..utils import (
     GeoRestrictedError,
     float_or_none,
     traverse_obj,
-    try_call
+    try_call,
 )
 
 
@@ -24,7 +24,7 @@ class OnDemandChinaEpisodeIE(InfoExtractor):
             'thumbnail': 'https://d2y2efdi5wgkcl.cloudfront.net/fit-in/256x256/media-io/2020/9/11/image.d9816e81.jpg',
             'description': '疫情严峻，党政军民学、东西南北中协同应考',
             'tags': ['Social Humanities', 'Documentary', 'Medical', 'Social'],
-        }
+        },
     }]
 
     _QUERY = '''
@@ -101,5 +101,5 @@ class OnDemandChinaEpisodeIE(InfoExtractor):
                 or self._html_search_meta(['og:description', 'twitter:description', 'description'], webpage)),
             'formats': formats,
             'subtitles': subtitles,
-            'tags': try_call(lambda: self._html_search_meta('keywords', webpage).split(', '))
+            'tags': try_call(lambda: self._html_search_meta('keywords', webpage).split(', ')),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/odnoklassniki.py b/plugins/youtube_download/yt_dlp/extractor/odnoklassniki.py
index 1be45d8..d27d1c3 100644
--- a/plugins/youtube_download/yt_dlp/extractor/odnoklassniki.py
+++ b/plugins/youtube_download/yt_dlp/extractor/odnoklassniki.py
@@ -1,12 +1,7 @@
 import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_etree_fromstring,
-    compat_parse_qs,
-    compat_urllib_parse_unquote,
-    compat_urllib_parse_urlparse,
-)
+from ..compat import compat_etree_fromstring
 from ..networking import HEADRequest
 from ..utils import (
     ExtractorError,
@@ -257,8 +252,8 @@ class OdnoklassnikiIE(InfoExtractor):
                 raise e
 
     def _extract_desktop(self, url):
-        start_time = int_or_none(compat_parse_qs(
-            compat_urllib_parse_urlparse(url).query).get('fromTime', [None])[0])
+        start_time = int_or_none(urllib.parse.parse_qs(
+            urllib.parse.urlparse(url).query).get('fromTime', [None])[0])
 
         url, smuggled = unsmuggle_url(url, {})
         video_id, is_embed = self._match_valid_url(url).group('id', 'embed')
@@ -281,7 +276,7 @@ class OdnoklassnikiIE(InfoExtractor):
 
         player = self._parse_json(
             unescapeHTML(self._search_regex(
-                r'data-options=(?P<quote>["\'])(?P<player>{.+?%s.+?})(?P=quote)' % video_id,
+                rf'data-options=(?P<quote>["\'])(?P<player>{{.+?{video_id}.+?}})(?P=quote)',
                 webpage, 'player', group='player')),
             video_id)
 
@@ -300,7 +295,7 @@ class OdnoklassnikiIE(InfoExtractor):
             if st_location:
                 data['st.location'] = st_location
             metadata = self._download_json(
-                compat_urllib_parse_unquote(flashvars['metadataUrl']),
+                urllib.parse.unquote(flashvars['metadataUrl']),
                 video_id, 'Downloading metadata JSON',
                 data=urlencode_postdata(data))
 
@@ -434,7 +429,7 @@ class OdnoklassnikiIE(InfoExtractor):
         video_id = self._match_id(url)
 
         webpage = self._download_webpage(
-            'http://m.ok.ru/video/%s' % video_id, video_id,
+            f'http://m.ok.ru/video/{video_id}', video_id,
             note='Downloading mobile webpage')
 
         error = self._search_regex(
@@ -460,5 +455,5 @@ class OdnoklassnikiIE(InfoExtractor):
                 'format_id': 'mobile',
                 'url': redirect_url,
                 'ext': 'mp4',
-            }]
+            }],
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/oftv.py b/plugins/youtube_download/yt_dlp/extractor/oftv.py
index 3ae7278..415694c 100644
--- a/plugins/youtube_download/yt_dlp/extractor/oftv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/oftv.py
@@ -4,7 +4,7 @@ from ..utils import traverse_obj
 
 
 class OfTVIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?of.tv/video/(?P<id>\w+)'
+    _VALID_URL = r'https?://(?:www\.)?of\.tv/video/(?P<id>\w+)'
     _TESTS = [{
         'url': 'https://of.tv/video/627d7d95b353db0001dadd1a',
         'md5': 'cb9cd5db3bb9ee0d32bfd7e373d6ef0a',
@@ -20,8 +20,8 @@ class OfTVIE(InfoExtractor):
             'timestamp': 1652391300,
             'upload_date': '20220512',
             'view_count': 0,
-            'creator': 'This is Fire'
-        }
+            'creator': 'This is Fire',
+        },
     }]
 
     def _real_extract(self, url):
@@ -34,13 +34,13 @@ class OfTVIE(InfoExtractor):
 
 
 class OfTVPlaylistIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?of.tv/creators/(?P<id>[a-zA-Z0-9-]+)/.?'
+    _VALID_URL = r'https?://(?:www\.)?of\.tv/creators/(?P<id>[a-zA-Z0-9-]+)/?(?:$|[?#])'
     _TESTS = [{
         'url': 'https://of.tv/creators/this-is-fire/',
         'playlist_count': 8,
         'info_dict': {
-            'id': 'this-is-fire'
-        }
+            'id': 'this-is-fire',
+        },
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/oktoberfesttv.py b/plugins/youtube_download/yt_dlp/extractor/oktoberfesttv.py
index e0ac856..b4bcdc7 100644
--- a/plugins/youtube_download/yt_dlp/extractor/oktoberfesttv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/oktoberfesttv.py
@@ -15,7 +15,7 @@ class OktoberfestTVIE(InfoExtractor):
         },
         'params': {
             'skip_download': True,
-        }
+        },
     }
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/olympics.py b/plugins/youtube_download/yt_dlp/extractor/olympics.py
index 61d1f40..bbf83e5 100644
--- a/plugins/youtube_download/yt_dlp/extractor/olympics.py
+++ b/plugins/youtube_download/yt_dlp/extractor/olympics.py
@@ -1,12 +1,19 @@
 from .common import InfoExtractor
+from ..networking.exceptions import HTTPError
 from ..utils import (
+    ExtractorError,
     int_or_none,
-    try_get
+    parse_iso8601,
+    parse_qs,
+    try_get,
+    update_url,
+    url_or_none,
 )
+from ..utils.traversal import traverse_obj
 
 
 class OlympicsReplayIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?olympics\.com(?:/tokyo-2020)?/[a-z]{2}/(?:replay|video)/(?P<id>[^/#&?]+)'
+    _VALID_URL = r'https?://(?:www\.)?olympics\.com/[a-z]{2}/(?:paris-2024/)?(?:replay|videos?|original-series/episode)/(?P<id>[\w-]+)'
     _TESTS = [{
         'url': 'https://olympics.com/fr/video/men-s-109kg-group-a-weightlifting-tokyo-2020-replays',
         'info_dict': {
@@ -14,26 +21,105 @@ class OlympicsReplayIE(InfoExtractor):
             'ext': 'mp4',
             'title': '+109kg (H) Groupe A - Haltérophilie | Replay de Tokyo 2020',
             'upload_date': '20210801',
-            'timestamp': 1627783200,
+            'timestamp': 1627797600,
             'description': 'md5:c66af4a5bc7429dbcc43d15845ff03b3',
-            'uploader': 'International Olympic Committee',
-        },
-        'params': {
-            'skip_download': True,
+            'thumbnail': 'https://img.olympics.com/images/image/private/t_1-1_1280/primary/nua4o7zwyaznoaejpbk2',
+            'duration': 7017.0,
         },
     }, {
-        'url': 'https://olympics.com/tokyo-2020/en/replay/bd242924-4b22-49a5-a846-f1d4c809250d/mens-bronze-medal-match-hun-esp',
-        'only_matching': True,
+        'url': 'https://olympics.com/en/original-series/episode/b-boys-and-b-girls-take-the-spotlight-breaking-life-road-to-paris-2024',
+        'info_dict': {
+            'id': '32633650-c5ee-4280-8b94-fb6defb6a9b5',
+            'ext': 'mp4',
+            'title': 'B-girl Nicka - Breaking Life, Road to Paris 2024 | Episode 1',
+            'upload_date': '20240517',
+            'timestamp': 1715948200,
+            'description': 'md5:f63d728a41270ec628f6ac33ce471bb1',
+            'thumbnail': 'https://img.olympics.com/images/image/private/t_1-1_1280/primary/a3j96l7j6so3vyfijby1',
+            'duration': 1321.0,
+        },
+    }, {
+        'url': 'https://olympics.com/en/paris-2024/videos/men-s-preliminaries-gbr-esp-ned-rsa-hockey-olympic-games-paris-2024',
+        'info_dict': {
+            'id': '3d96db23-8eee-4b7c-8ef5-488a0361026c',
+            'ext': 'mp4',
+            'title': 'Men\'s Preliminaries GBR-ESP & NED-RSA | Hockey | Olympic Games Paris 2024',
+            'upload_date': '20240727',
+            'timestamp': 1722066600,
+        },
+        'skip': 'Geo-restricted to RU, BR, BT, NP, TM, BD, TL',
+    }, {
+        'url': 'https://olympics.com/en/paris-2024/videos/dnp-suni-lee-i-have-goals-and-i-have-expectations-for-myself-but-i-also-am-trying-to-give-myself-grace',
+        'info_dict': {
+            'id': 'a42f37ab-8a74-41d0-a7d9-af27b7b02a90',
+            'ext': 'mp4',
+            'title': 'md5:c7cfbc9918636a98e66400a812e4d407',
+            'upload_date': '20240729',
+            'timestamp': 1722288600,
+        },
     }]
+    _GEO_BYPASS = False
+
+    def _extract_from_nextjs_data(self, webpage, video_id):
+        data = traverse_obj(self._search_nextjs_data(webpage, video_id, default={}), (
+            'props', 'pageProps', 'page', 'items',
+            lambda _, v: v['name'] == 'videoPlaylist', 'data', 'currentVideo', {dict}, any))
+        if not data:
+            return None
+
+        geo_countries = traverse_obj(data, ('countries', ..., {str}))
+        if traverse_obj(data, ('geoRestrictedVideo', {bool})):
+            self.raise_geo_restricted(countries=geo_countries)
+
+        is_live = traverse_obj(data, ('streamingStatus', {str})) == 'LIVE'
+        m3u8_url = traverse_obj(data, ('videoUrl', {url_or_none})) or data['streamUrl']
+        tokenized_url = self._tokenize_url(m3u8_url, data['jwtToken'], is_live, video_id)
+
+        try:
+            formats, subtitles = self._extract_m3u8_formats_and_subtitles(
+                tokenized_url, video_id, 'mp4', m3u8_id='hls')
+        except ExtractorError as e:
+            if isinstance(e.cause, HTTPError) and 'georestricted' in e.cause.msg:
+                self.raise_geo_restricted(countries=geo_countries)
+            raise
+
+        return {
+            'formats': formats,
+            'subtitles': subtitles,
+            'is_live': is_live,
+            **traverse_obj(data, {
+                'id': ('videoID', {str}),
+                'title': ('title', {str}),
+                'timestamp': ('contentDate', {parse_iso8601}),
+            }),
+        }
+
+    def _tokenize_url(self, url, token, is_live, video_id):
+        return self._download_json(
+            'https://metering.olympics.com/tokengenerator', video_id,
+            'Downloading tokenized m3u8 url', query={
+                **parse_qs(url),
+                'url': update_url(url, query=None),
+                'service-id': 'live' if is_live else 'vod',
+                'user-auth': token,
+            })['data']['url']
+
+    def _legacy_tokenize_url(self, url, video_id):
+        return self._download_json(
+            'https://olympics.com/tokenGenerator', video_id,
+            'Downloading legacy tokenized m3u8 url', query={'url': url})
 
     def _real_extract(self, url):
-        id = self._match_id(url)
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+
+        if info := self._extract_from_nextjs_data(webpage, video_id):
+            return info
 
-        webpage = self._download_webpage(url, id)
         title = self._html_search_meta(('title', 'og:title', 'twitter:title'), webpage)
-        uuid = self._html_search_meta('episode_uid', webpage)
+        video_uuid = self._html_search_meta('episode_uid', webpage)
         m3u8_url = self._html_search_meta('video_url', webpage)
-        json_ld = self._search_json_ld(webpage, uuid)
+        json_ld = self._search_json_ld(webpage, video_uuid)
         thumbnails_list = json_ld.get('image')
         if not thumbnails_list:
             thumbnails_list = self._html_search_regex(
@@ -49,17 +135,17 @@ class OlympicsReplayIE(InfoExtractor):
             thumbnails.append({
                 'url': thumbnail,
                 'width': width,
-                'height': int_or_none(try_get(width, lambda x: x * height_a / width_a))
+                'height': int_or_none(try_get(width, lambda x: x * height_a / width_a)),
             })
-        m3u8_url = self._download_json(
-            f'https://olympics.com/tokenGenerator?url={m3u8_url}', uuid, note='Downloading m3u8 url')
-        formats, subtitles = self._extract_m3u8_formats_and_subtitles(m3u8_url, uuid, 'mp4', m3u8_id='hls')
+
+        formats, subtitles = self._extract_m3u8_formats_and_subtitles(
+            self._legacy_tokenize_url(m3u8_url, video_uuid), video_uuid, 'mp4', m3u8_id='hls')
 
         return {
-            'id': uuid,
+            'id': video_uuid,
             'title': title,
             'thumbnails': thumbnails,
             'formats': formats,
             'subtitles': subtitles,
-            **json_ld
+            **json_ld,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/on24.py b/plugins/youtube_download/yt_dlp/extractor/on24.py
index 9a4abc9..1dfc25a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/on24.py
+++ b/plugins/youtube_download/yt_dlp/extractor/on24.py
@@ -11,12 +11,15 @@ class On24IE(InfoExtractor):
     IE_NAME = 'on24'
     IE_DESC = 'ON24'
 
-    _VALID_URL = r'''(?x)
-                    https?://event\.on24\.com/(?:
-                        wcc/r/(?P<id_1>\d{7})/(?P<key_1>[0-9A-F]{32})|
-                        eventRegistration/(?:console/EventConsoleApollo|EventLobbyServlet\?target=lobby30)
-                            \.jsp\?(?:[^/#?]*&)?eventid=(?P<id_2>\d{7})[^/#?]*&key=(?P<key_2>[0-9A-F]{32})
-                    )'''
+    _ID_RE = r'(?P<id>\d{7})'
+    _KEY_RE = r'(?P<key>[0-9A-F]{32})'
+    _URL_BASE_RE = r'https?://event\.on24\.com'
+    _URL_QUERY_RE = rf'(?:[^#]*&)?eventid={_ID_RE}&(?:[^#]+&)?key={_KEY_RE}'
+    _VALID_URL = [
+        rf'{_URL_BASE_RE}/wcc/r/{_ID_RE}/{_KEY_RE}',
+        rf'{_URL_BASE_RE}/eventRegistration/console/(?:EventConsoleApollo\.jsp|apollox/mainEvent/?)\?{_URL_QUERY_RE}',
+        rf'{_URL_BASE_RE}/eventRegistration/EventLobbyServlet/?\?{_URL_QUERY_RE}',
+    ]
 
     _TESTS = [{
         'url': 'https://event.on24.com/eventRegistration/console/EventConsoleApollo.jsp?uimode=nextgeneration&eventid=2197467&sessionid=1&key=5DF57BE53237F36A43B478DD36277A84&contenttype=A&eventuserid=305999&playerwidth=1000&playerheight=650&caller=previewLobby&text_language_id=en&format=fhaudio&newConsole=false',
@@ -27,19 +30,23 @@ class On24IE(InfoExtractor):
             'upload_date': '20200219',
             'timestamp': 1582149600.0,
             'view_count': int,
-        }
+        },
     }, {
         'url': 'https://event.on24.com/wcc/r/2639291/82829018E813065A122363877975752E?mode=login&email=johnsmith@gmail.com',
         'only_matching': True,
     }, {
         'url': 'https://event.on24.com/eventRegistration/console/EventConsoleApollo.jsp?&eventid=2639291&sessionid=1&username=&partnerref=&format=fhvideo1&mobile=&flashsupportedmobiledevice=&helpcenter=&key=82829018E813065A122363877975752E&newConsole=true&nxChe=true&newTabCon=true&text_language_id=en&playerwidth=748&playerheight=526&eventuserid=338788762&contenttype=A&mediametricsessionid=384764716&mediametricid=3558192&usercd=369267058&mode=launch',
         'only_matching': True,
+    }, {
+        'url': 'https://event.on24.com/eventRegistration/EventLobbyServlet?target=reg20.jsp&eventid=3543176&key=BC0F6B968B67C34B50D461D40FDB3E18&groupId=3143628',
+        'only_matching': True,
+    }, {
+        'url': 'https://event.on24.com/eventRegistration/console/apollox/mainEvent?&eventid=4843671&sessionid=1&username=&partnerref=&format=fhvideo1&mobile=&flashsupportedmobiledevice=&helpcenter=&key=4EAC9B5C564CC98FF29E619B06A2F743&newConsole=true&nxChe=true&newTabCon=true&consoleEarEventConsole=false&consoleEarCloudApi=false&text_language_id=en&playerwidth=748&playerheight=526&referrer=https%3A%2F%2Fevent.on24.com%2Finterface%2Fregistration%2Fautoreg%2Findex.html%3Fsessionid%3D1%26eventid%3D4843671%26key%3D4EAC9B5C564CC98FF29E619B06A2F743%26email%3D000a3e42-7952-4dd6-8f8a-34c38ea3cf02%2540platform%26firstname%3Ds%26lastname%3Ds%26deletecookie%3Dtrue%26event_email%3DN%26marketing_email%3DN%26std1%3D0642572014177%26std2%3D0642572014179%26std3%3D550165f7-a44e-4725-9fe6-716f89908c2b%26std4%3D0&eventuserid=745776448&contenttype=A&mediametricsessionid=640613707&mediametricid=6810717&usercd=745776448&mode=launch',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
-        mobj = self._match_valid_url(url)
-        event_id = mobj.group('id_1') or mobj.group('id_2')
-        event_key = mobj.group('key_1') or mobj.group('key_2')
+        event_id, event_key = self._match_valid_url(url).group('id', 'key')
 
         event_data = self._download_json(
             'https://event.on24.com/apic/utilApp/EventConsoleCachedServlet',
@@ -47,7 +54,7 @@ class On24IE(InfoExtractor):
                 'eventId': event_id,
                 'displayProfile': 'player',
                 'key': event_key,
-                'contentType': 'A'
+                'contentType': 'A',
             })
         event_id = str(try_get(event_data, lambda x: x['presentationLogInfo']['eventid'])) or event_id
         language = event_data.get('localelanguagecode')
@@ -74,7 +81,7 @@ class On24IE(InfoExtractor):
                     'language': language,
                     'ext': 'wav',
                     'vcodec': 'none',
-                    'acodec': 'wav'
+                    'acodec': 'wav',
                 })
 
         return {
diff --git a/plugins/youtube_download/yt_dlp/extractor/ondemandkorea.py b/plugins/youtube_download/yt_dlp/extractor/ondemandkorea.py
index dd7d1d7..1921f3f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ondemandkorea.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ondemandkorea.py
@@ -1,87 +1,169 @@
+import functools
 import re
+import uuid
 
 from .common import InfoExtractor
 from ..utils import (
     ExtractorError,
-    js_to_json,
+    OnDemandPagedList,
+    float_or_none,
+    int_or_none,
+    join_nonempty,
+    parse_age_limit,
+    parse_qs,
+    str_or_none,
+    unified_strdate,
+    url_or_none,
 )
+from ..utils.traversal import traverse_obj
 
 
 class OnDemandKoreaIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?ondemandkorea\.com/(?P<id>[^/]+)\.html'
+    _VALID_URL = r'https?://(?:www\.)?ondemandkorea\.com/(?:en/)?player/vod/[a-z0-9-]+\?(?:[^#]+&)?contentId=(?P<id>\d+)'
     _GEO_COUNTRIES = ['US', 'CA']
+
     _TESTS = [{
-        'url': 'https://www.ondemandkorea.com/ask-us-anything-e351.html',
+        'url': 'https://www.ondemandkorea.com/player/vod/ask-us-anything?contentId=686471',
+        'md5': 'e2ff77255d989e3135bde0c5889fbce8',
         'info_dict': {
-            'id': 'ask-us-anything-e351',
+            'id': '686471',
             'ext': 'mp4',
-            'title': 'Ask Us Anything : Jung Sung-ho, Park Seul-gi, Kim Bo-min, Yang Seung-won - 09/24/2022',
-            'description': 'A talk show/game show with a school theme where celebrity guests appear as “transfer students.”',
-            'thumbnail': r're:^https?://.*\.jpg$',
+            'title': 'Ask Us Anything: Jung Sung-ho, Park Seul-gi, Kim Bo-min, Yang Seung-won',
+            'thumbnail': r're:^https?://.*\.(jpg|jpeg|png)',
+            'duration': 5486.955,
+            'release_date': '20220924',
+            'series': 'Ask Us Anything',
+            'series_id': '11790',
+            'episode_number': 351,
+            'episode': 'Jung Sung-ho, Park Seul-gi, Kim Bo-min, Yang Seung-won',
         },
-        'params': {
-            'skip_download': 'm3u8 download'
-        }
     }, {
-        'url': 'https://www.ondemandkorea.com/work-later-drink-now-e1.html',
+        'url': 'https://www.ondemandkorea.com/player/vod/breakup-probation-a-week?contentId=1595796',
+        'md5': '57266c720006962be7ff415b24775caa',
         'info_dict': {
-            'id': 'work-later-drink-now-e1',
+            'id': '1595796',
             'ext': 'mp4',
-            'title': 'Work Later, Drink Now : E01',
-            'description': 'Work Later, Drink First follows three women who find solace in a glass of liquor at the end of the day. So-hee, who gets comfort from a cup of soju af',
-            'thumbnail': r're:^https?://.*\.png$',
-            'subtitles': {
-                'English': 'mincount:1',
-            },
+            'title': 'Breakup Probation, A Week: E08',
+            'thumbnail': r're:^https?://.*\.(jpg|jpeg|png)',
+            'duration': 1586.0,
+            'release_date': '20231001',
+            'series': 'Breakup Probation, A Week',
+            'series_id': '22912',
+            'episode_number': 8,
+            'episode': 'E08',
         },
-        'params': {
-            'skip_download': 'm3u8 download'
-        }
+    }, {
+        'url': 'https://www.ondemandkorea.com/player/vod/the-outlaws?contentId=369531',
+        'md5': 'fa5523b87aa1f6d74fc622a97f2b47cd',
+        'info_dict': {
+            'id': '369531',
+            'ext': 'mp4',
+            'release_date': '20220519',
+            'duration': 7267.0,
+            'title': 'The Outlaws: Main Movie',
+            'thumbnail': r're:^https?://.*\.(jpg|jpeg|png)',
+            'age_limit': 18,
+        },
+    }, {
+        'url': 'https://www.ondemandkorea.com/en/player/vod/capture-the-moment-how-is-that-possible?contentId=1605006',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id, fatal=False)
 
-        if not webpage:
-            # Page sometimes returns captcha page with HTTP 403
-            raise ExtractorError(
-                'Unable to access page. You may have been blocked.',
-                expected=True)
+        data = self._download_json(
+            f'https://odkmedia.io/odx/api/v3/playback/{video_id}/', video_id, fatal=False,
+            headers={'service-name': 'odk'}, query={'did': str(uuid.uuid4())}, expected_status=(403, 404))
+        if not traverse_obj(data, ('result', {dict})):
+            msg = traverse_obj(data, ('messages', '__default'), 'title', expected_type=str)
+            raise ExtractorError(msg or 'Got empty response from playback API', expected=True)
 
-        if 'msg_block_01.png' in webpage:
-            self.raise_geo_restricted(
-                msg='This content is not available in your region',
-                countries=self._GEO_COUNTRIES)
+        data = data['result']
 
-        if 'This video is only available to ODK PLUS members.' in webpage:
-            raise ExtractorError(
-                'This video is only available to ODK PLUS members.',
-                expected=True)
+        def try_geo_bypass(url):
+            return traverse_obj(url, ({parse_qs}, 'stream_url', 0, {url_or_none})) or url
 
-        if 'ODK PREMIUM Members Only' in webpage:
-            raise ExtractorError(
-                'This video is only available to ODK PREMIUM members.',
-                expected=True)
+        formats = []
+        for m3u8_url in traverse_obj(data, (('sources', 'manifest'), ..., 'url', {url_or_none}, {try_geo_bypass})):
+            mod_url = re.sub(r'_720(p?)\.m3u8', r'_1080\1.m3u8', m3u8_url)
+            if mod_url != m3u8_url:
+                mod_format = self._extract_m3u8_formats(
+                    mod_url, video_id, note='Checking for higher quality format',
+                    errnote='No higher quality format found', fatal=False)
+                if mod_format:
+                    formats.extend(mod_format)
+                    continue
+            formats.extend(self._extract_m3u8_formats(m3u8_url, video_id, fatal=False))
 
-        title = self._search_regex(
-            r'class=["\']episode_title["\'][^>]*>([^<]+)',
-            webpage, 'episode_title', fatal=False) or self._og_search_title(webpage)
+        subtitles = {}
+        for track in traverse_obj(data, ('text_tracks', lambda _, v: url_or_none(v['url']))):
+            subtitles.setdefault(track.get('language', 'und'), []).append({
+                'url': track['url'],
+                'ext': track.get('codec'),
+                'name': track.get('label'),
+            })
 
-        jw_config = self._parse_json(
-            self._search_regex((
-                r'(?P<options>{\s*[\'"]tracks[\'"].*?})[)\];]+$',
-                r'playlist\s*=\s*\[(?P<options>.+)];?$',
-                r'odkPlayer\.init.*?(?P<options>{[^;]+}).*?;',
-            ), webpage, 'jw config', flags=re.MULTILINE | re.DOTALL, group='options'),
-            video_id, transform_source=js_to_json)
-        info = self._parse_jwplayer_data(
-            jw_config, video_id, require_title=False, m3u8_id='hls',
-            base_url=url)
+        def if_series(key=None):
+            return lambda obj: obj[key] if key and obj['kind'] == 'series' else None
 
-        info.update({
-            'title': title,
-            'description': self._og_search_description(webpage),
-            'thumbnail': self._og_search_thumbnail(webpage)
-        })
-        return info
+        return {
+            'id': video_id,
+            'title': join_nonempty(
+                ('episode', 'program', 'title'),
+                ('episode', 'title'), from_dict=data, delim=': '),
+            **traverse_obj(data, {
+                'thumbnail': ('episode', 'images', 'thumbnail', {url_or_none}),
+                'release_date': ('episode', 'release_date', {lambda x: x.replace('-', '')}, {unified_strdate}),
+                'duration': ('duration', {float_or_none(scale=1000)}),
+                'age_limit': ('age_rating', 'name', {lambda x: x.replace('R', '')}, {parse_age_limit}),
+                'series': ('episode', {if_series(key='program')}, 'title'),
+                'series_id': ('episode', {if_series(key='program')}, 'id', {str_or_none}),
+                'episode': ('episode', {if_series(key='title')}),
+                'episode_number': ('episode', {if_series(key='number')}, {int_or_none}),
+            }, get_all=False),
+            'formats': formats,
+            'subtitles': subtitles,
+        }
+
+
+class OnDemandKoreaProgramIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?ondemandkorea\.com/(?:en/)?player/vod/(?P<id>[a-z0-9-]+)(?:$|#)'
+    _GEO_COUNTRIES = ['US', 'CA']
+
+    _TESTS = [{
+        'url': 'https://www.ondemandkorea.com/player/vod/uskn-news',
+        'info_dict': {
+            'id': 'uskn-news',
+        },
+        'playlist_mincount': 755,
+    }, {
+        'url': 'https://www.ondemandkorea.com/en/player/vod/the-land',
+        'info_dict': {
+            'id': 'the-land',
+        },
+        'playlist_count': 52,
+    }]
+
+    _PAGE_SIZE = 100
+
+    def _fetch_page(self, display_id, page):
+        page += 1
+        page_data = self._download_json(
+            f'https://odkmedia.io/odx/api/v3/program/{display_id}/episodes/', display_id,
+            headers={'service-name': 'odk'}, query={
+                'page': page,
+                'page_size': self._PAGE_SIZE,
+            }, note=f'Downloading page {page}', expected_status=404)
+        for episode in traverse_obj(page_data, ('result', 'results', ...)):
+            yield self.url_result(
+                f'https://www.ondemandkorea.com/player/vod/{display_id}?contentId={episode["id"]}',
+                ie=OnDemandKoreaIE, video_title=episode.get('title'))
+
+    def _real_extract(self, url):
+        display_id = self._match_id(url)
+
+        entries = OnDemandPagedList(functools.partial(
+            self._fetch_page, display_id), self._PAGE_SIZE)
+
+        return self.playlist_result(entries, display_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/onefootball.py b/plugins/youtube_download/yt_dlp/extractor/onefootball.py
index 591d157..ee432e8 100644
--- a/plugins/youtube_download/yt_dlp/extractor/onefootball.py
+++ b/plugins/youtube_download/yt_dlp/extractor/onefootball.py
@@ -1,4 +1,6 @@
 from .common import InfoExtractor
+from .jwplatform import JWPlatformIE
+from ..utils import make_archive_id
 
 
 class OneFootballIE(InfoExtractor):
@@ -7,41 +9,43 @@ class OneFootballIE(InfoExtractor):
     _TESTS = [{
         'url': 'https://onefootball.com/en/video/highlights-fc-zuerich-3-3-fc-basel-34012334',
         'info_dict': {
-            'id': '34012334',
+            'id': 'Y2VtcWAT',
             'ext': 'mp4',
             'title': 'Highlights: FC Zürich 3-3 FC Basel',
             'description': 'md5:33d9855cb790702c4fe42a513700aba8',
-            'thumbnail': 'https://photobooth-api.onefootball.com/api/screenshot/https:%2F%2Fperegrine-api.onefootball.com%2Fv2%2Fphotobooth%2Fcms%2Fen%2F34012334',
-            'timestamp': 1635874604,
-            'upload_date': '20211102'
+            'thumbnail': 'https://cdn.jwplayer.com/v2/media/Y2VtcWAT/poster.jpg?width=720',
+            'timestamp': 1635874895,
+            'upload_date': '20211102',
+            'duration': 375.0,
+            'tags': ['Football', 'Soccer', 'OneFootball'],
+            '_old_archive_ids': ['onefootball 34012334'],
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
+        'expected_warnings': ['Failed to download m3u8 information'],
     }, {
         'url': 'https://onefootball.com/en/video/klopp-fumes-at-var-decisions-in-west-ham-defeat-34041020',
         'info_dict': {
-            'id': '34041020',
+            'id': 'leVJrMho',
             'ext': 'mp4',
             'title': 'Klopp fumes at VAR decisions in West Ham defeat',
             'description': 'md5:9c50371095a01ad3f63311c73d8f51a5',
-            'thumbnail': 'https://photobooth-api.onefootball.com/api/screenshot/https:%2F%2Fperegrine-api.onefootball.com%2Fv2%2Fphotobooth%2Fcms%2Fen%2F34041020',
-            'timestamp': 1636314103,
-            'upload_date': '20211107'
+            'thumbnail': 'https://cdn.jwplayer.com/v2/media/leVJrMho/poster.jpg?width=720',
+            'timestamp': 1636315232,
+            'upload_date': '20211107',
+            'duration': 93.0,
+            'tags': ['Football', 'Soccer', 'OneFootball'],
+            '_old_archive_ids': ['onefootball 34041020'],
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }]
 
     def _real_extract(self, url):
-        id = self._match_id(url)
-        webpage = self._download_webpage(url, id)
-        data_json = self._search_json_ld(webpage, id)
-        m3u8_url = self._html_search_regex(r'(https://cdn\.jwplayer\.com/manifests/.+\.m3u8)', webpage, 'm3u8_url')
-        formats, subtitles = self._extract_m3u8_formats_and_subtitles(m3u8_url, id)
-        return {
-            'id': id,
-            'title': data_json.get('title'),
-            'description': data_json.get('description'),
-            'thumbnail': data_json.get('thumbnail'),
-            'timestamp': data_json.get('timestamp'),
-            'formats': formats,
-            'subtitles': subtitles,
-        }
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+        data_json = self._search_json_ld(webpage, video_id, fatal=False)
+        data_json.pop('url', None)
+        m3u8_url = self._html_search_regex(r'(https://cdn\.jwplayer\.com/manifests/\w+\.m3u8)', webpage, 'm3u8_url')
+
+        return self.url_result(
+            m3u8_url, JWPlatformIE, video_id, _old_archive_ids=[make_archive_id(self, video_id)],
+            **data_json, url_transparent=True)
diff --git a/plugins/youtube_download/yt_dlp/extractor/onenewsnz.py b/plugins/youtube_download/yt_dlp/extractor/onenewsnz.py
index a46211e..c849da0 100644
--- a/plugins/youtube_download/yt_dlp/extractor/onenewsnz.py
+++ b/plugins/youtube_download/yt_dlp/extractor/onenewsnz.py
@@ -1,10 +1,6 @@
 from .brightcove import BrightcoveNewIE
 from .common import InfoExtractor
-
-from ..utils import (
-    ExtractorError,
-    traverse_obj
-)
+from ..utils import ExtractorError, traverse_obj
 
 
 class OneNewsNZIE(InfoExtractor):
@@ -30,8 +26,8 @@ class OneNewsNZIE(InfoExtractor):
                     'duration': 38.272,
                     'thumbnail': r're:^https?://.*\.jpg$',
                     'description': 'Greenpeace accused the Government of "greenwashing" instead of taking climate action.',
-                }
-            }]
+                },
+            }],
         }, {
             # YouTube video
             'url': 'https://www.1news.co.nz/2022/09/30/now-is-the-time-to-care-about-womens-rugby/',
@@ -63,8 +59,8 @@ class OneNewsNZIE(InfoExtractor):
                     'availability': 'public',
                     'playable_in_embed': True,
                     'live_status': 'not_live',
-                }
-            }]
+                },
+            }],
         }, {
             # 2 Brightcove videos
             'url': 'https://www.1news.co.nz/2022/09/29/raw-videos-capture-hurricane-ians-fury-as-it-slams-florida/',
@@ -93,7 +89,7 @@ class OneNewsNZIE(InfoExtractor):
                 brightcove_config = traverse_obj(item, ('embed', 'config'))
                 brightcove_url = self.BRIGHTCOVE_URL_TEMPLATE % (
                     traverse_obj(brightcove_config, 'brightcoveAccount') or '963482464001',
-                    traverse_obj(brightcove_config, 'brightcoveVideoId')
+                    traverse_obj(brightcove_config, 'brightcoveVideoId'),
                 )
                 entries.append(self.url_result(brightcove_url, BrightcoveNewIE))
             elif item_type == 'youtube':
diff --git a/plugins/youtube_download/yt_dlp/extractor/oneplace.py b/plugins/youtube_download/yt_dlp/extractor/oneplace.py
index 86337ad..12e6ef6 100644
--- a/plugins/youtube_download/yt_dlp/extractor/oneplace.py
+++ b/plugins/youtube_download/yt_dlp/extractor/oneplace.py
@@ -10,7 +10,7 @@ class OnePlacePodcastIE(InfoExtractor):
             'ext': 'mp3',
             'title': 'Living in the Last Days Part 2 | A Daily Walk with John Randall',
             'description': 'md5:fbb8f1cf21447ac54ecaa2887fc20c6e',
-        }
+        },
     }, {
         'url': 'https://www.oneplace.com/ministries/ankerberg-show/listen/ep-3-relying-on-the-constant-companionship-of-the-holy-spirit-part-2-922513.html',
         'info_dict': {
@@ -18,7 +18,7 @@ class OnePlacePodcastIE(InfoExtractor):
             'ext': 'mp3',
             'description': 'md5:8b810b4349aa40a5d033b4536fe428e1',
             'title': 'md5:ce10f7d8d5ddcf485ed8905ef109659d',
-        }
+        },
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/onet.py b/plugins/youtube_download/yt_dlp/extractor/onet.py
index 0d59e8c..05e4d69 100644
--- a/plugins/youtube_download/yt_dlp/extractor/onet.py
+++ b/plugins/youtube_download/yt_dlp/extractor/onet.py
@@ -2,13 +2,13 @@ import re
 
 from .common import InfoExtractor
 from ..utils import (
-    determine_ext,
+    NO_DEFAULT,
     ExtractorError,
+    determine_ext,
     float_or_none,
     get_element_by_class,
     int_or_none,
     js_to_json,
-    NO_DEFAULT,
     parse_iso8601,
     remove_start,
     strip_or_none,
@@ -39,7 +39,7 @@ class OnetBaseIE(InfoExtractor):
         error = response.get('error')
         if error:
             raise ExtractorError(
-                '%s said: %s' % (self.IE_NAME, error['message']), expected=True)
+                '{} said: {}'.format(self.IE_NAME, error['message']), expected=True)
 
         video = response['result'].get('0')
 
@@ -182,7 +182,7 @@ class OnetChannelIE(OnetBaseIE):
             return self._extract_from_id(video_id, webpage)
 
         matches = re.findall(
-            r'<a[^>]+href=[\'"](%s[a-z]+/[0-9a-z-]+/[0-9a-z]+)' % self._URL_BASE_RE,
+            rf'<a[^>]+href=[\'"]({self._URL_BASE_RE}[a-z]+/[0-9a-z-]+/[0-9a-z]+)',
             webpage)
         entries = [
             self.url_result(video_link, OnetIE.ie_key())
@@ -256,4 +256,4 @@ class OnetPlIE(InfoExtractor):
             mvp_id = self._search_mvp_id(webpage)
 
         return self.url_result(
-            'onetmvp:%s' % mvp_id, OnetMVPIE.ie_key(), video_id=mvp_id)
+            f'onetmvp:{mvp_id}', OnetMVPIE.ie_key(), video_id=mvp_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/onionstudios.py b/plugins/youtube_download/yt_dlp/extractor/onionstudios.py
index 5fa49e1..7e30b2d 100644
--- a/plugins/youtube_download/yt_dlp/extractor/onionstudios.py
+++ b/plugins/youtube_download/yt_dlp/extractor/onionstudios.py
@@ -1,5 +1,4 @@
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import js_to_json
 
 
@@ -34,7 +33,7 @@ class OnionStudiosIE(InfoExtractor):
         webpage = self._download_webpage(
             'http://onionstudios.com/embed/dc94dc2899fe644c0e7241fa04c1b732.js',
             video_id)
-        mcp_id = compat_str(self._parse_json(self._search_regex(
+        mcp_id = str(self._parse_json(self._search_regex(
             r'window\.mcpMapping\s*=\s*({.+?});', webpage,
             'MCP Mapping'), video_id, js_to_json)[video_id]['mcp_id'])
         return self.url_result(
diff --git a/plugins/youtube_download/yt_dlp/extractor/ooyala.py b/plugins/youtube_download/yt_dlp/extractor/ooyala.py
deleted file mode 100644
index 65afccd..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/ooyala.py
+++ /dev/null
@@ -1,230 +0,0 @@
-import base64
-import re
-
-from .common import InfoExtractor
-from ..compat import (
-    compat_b64decode,
-    compat_str,
-)
-from ..utils import (
-    determine_ext,
-    float_or_none,
-    int_or_none,
-    smuggle_url,
-    try_get,
-    unsmuggle_url,
-)
-
-
-class OoyalaBaseIE(InfoExtractor):
-    _PLAYER_BASE = 'http://player.ooyala.com/'
-    _CONTENT_TREE_BASE = _PLAYER_BASE + 'player_api/v1/content_tree/'
-    _AUTHORIZATION_URL_TEMPLATE = _PLAYER_BASE + 'sas/player_api/v2/authorization/embed_code/%s/%s'
-
-    def _extract(self, content_tree_url, video_id, domain=None, supportedformats=None, embed_token=None):
-        content_tree = self._download_json(content_tree_url, video_id)['content_tree']
-        metadata = content_tree[list(content_tree)[0]]
-        embed_code = metadata['embed_code']
-        pcode = metadata.get('asset_pcode') or embed_code
-        title = metadata['title']
-
-        auth_data = self._download_json(
-            self._AUTHORIZATION_URL_TEMPLATE % (pcode, embed_code),
-            video_id, headers=self.geo_verification_headers(), query={
-                'domain': domain or 'player.ooyala.com',
-                'supportedFormats': supportedformats or 'mp4,rtmp,m3u8,hds,dash,smooth',
-                'embedToken': embed_token,
-            })['authorization_data'][embed_code]
-
-        urls = []
-        formats = []
-        streams = auth_data.get('streams') or [{
-            'delivery_type': 'hls',
-            'url': {
-                'data': base64.b64encode(('http://player.ooyala.com/hls/player/all/%s.m3u8' % embed_code).encode()).decode(),
-            }
-        }]
-        for stream in streams:
-            url_data = try_get(stream, lambda x: x['url']['data'], compat_str)
-            if not url_data:
-                continue
-            s_url = compat_b64decode(url_data).decode('utf-8')
-            if not s_url or s_url in urls:
-                continue
-            urls.append(s_url)
-            ext = determine_ext(s_url, None)
-            delivery_type = stream.get('delivery_type')
-            if delivery_type == 'hls' or ext == 'm3u8':
-                formats.extend(self._extract_m3u8_formats(
-                    re.sub(r'/ip(?:ad|hone)/', '/all/', s_url), embed_code, 'mp4', 'm3u8_native',
-                    m3u8_id='hls', fatal=False))
-            elif delivery_type == 'hds' or ext == 'f4m':
-                formats.extend(self._extract_f4m_formats(
-                    s_url + '?hdcore=3.7.0', embed_code, f4m_id='hds', fatal=False))
-            elif delivery_type == 'dash' or ext == 'mpd':
-                formats.extend(self._extract_mpd_formats(
-                    s_url, embed_code, mpd_id='dash', fatal=False))
-            elif delivery_type == 'smooth':
-                self._extract_ism_formats(
-                    s_url, embed_code, ism_id='mss', fatal=False)
-            elif ext == 'smil':
-                formats.extend(self._extract_smil_formats(
-                    s_url, embed_code, fatal=False))
-            else:
-                formats.append({
-                    'url': s_url,
-                    'ext': ext or delivery_type,
-                    'vcodec': stream.get('video_codec'),
-                    'format_id': delivery_type,
-                    'width': int_or_none(stream.get('width')),
-                    'height': int_or_none(stream.get('height')),
-                    'abr': int_or_none(stream.get('audio_bitrate')),
-                    'vbr': int_or_none(stream.get('video_bitrate')),
-                    'fps': float_or_none(stream.get('framerate')),
-                })
-        if not formats and not auth_data.get('authorized'):
-            self.raise_no_formats('%s said: %s' % (
-                self.IE_NAME, auth_data['message']), expected=True)
-
-        subtitles = {}
-        for lang, sub in metadata.get('closed_captions_vtt', {}).get('captions', {}).items():
-            sub_url = sub.get('url')
-            if not sub_url:
-                continue
-            subtitles[lang] = [{
-                'url': sub_url,
-            }]
-
-        return {
-            'id': embed_code,
-            'title': title,
-            'description': metadata.get('description'),
-            'thumbnail': metadata.get('thumbnail_image') or metadata.get('promo_image'),
-            'duration': float_or_none(metadata.get('duration'), 1000),
-            'subtitles': subtitles,
-            'formats': formats,
-        }
-
-
-class OoyalaIE(OoyalaBaseIE):
-    _VALID_URL = r'(?:ooyala:|https?://.+?\.ooyala\.com/.*?(?:embedCode|ec)=)(?P<id>.+?)(&|$)'
-
-    _TESTS = [
-        {
-            # From http://it.slashdot.org/story/13/04/25/178216/recovering-data-from-broken-hard-drives-and-ssds-video
-            'url': 'http://player.ooyala.com/player.js?embedCode=pxczE2YjpfHfn1f3M-ykG_AmJRRn0PD8',
-            'info_dict': {
-                'id': 'pxczE2YjpfHfn1f3M-ykG_AmJRRn0PD8',
-                'ext': 'mp4',
-                'title': 'Explaining Data Recovery from Hard Drives and SSDs',
-                'description': 'How badly damaged does a drive have to be to defeat Russell and his crew? Apparently, smashed to bits.',
-                'duration': 853.386,
-            },
-            # The video in the original webpage now uses PlayWire
-            'skip': 'Ooyala said: movie expired',
-        }, {
-            # Only available for ipad
-            'url': 'http://player.ooyala.com/player.js?embedCode=x1b3lqZDq9y_7kMyC2Op5qo-p077tXD0',
-            'info_dict': {
-                'id': 'x1b3lqZDq9y_7kMyC2Op5qo-p077tXD0',
-                'ext': 'mp4',
-                'title': 'Simulation Overview - Levels of Simulation',
-                'duration': 194.948,
-            },
-        },
-        {
-            # Information available only through SAS api
-            # From http://community.plm.automation.siemens.com/t5/News-NX-Manufacturing/Tool-Path-Divide/ba-p/4187
-            'url': 'http://player.ooyala.com/player.js?embedCode=FiOG81ZTrvckcchQxmalf4aQj590qTEx',
-            'md5': 'a84001441b35ea492bc03736e59e7935',
-            'info_dict': {
-                'id': 'FiOG81ZTrvckcchQxmalf4aQj590qTEx',
-                'ext': 'mp4',
-                'title': 'Divide Tool Path.mp4',
-                'duration': 204.405,
-            }
-        },
-        {
-            # empty stream['url']['data']
-            'url': 'http://player.ooyala.com/player.js?embedCode=w2bnZtYjE6axZ_dw1Cd0hQtXd_ige2Is',
-            'only_matching': True,
-        }
-    ]
-
-    def _extract_from_webpage(self, url, webpage):
-        mobj = (re.search(r'player\.ooyala\.com/[^"?]+[?#][^"]*?(?:embedCode|ec)=(?P<ec>[^"&]+)', webpage)
-                or re.search(r'OO\.Player\.create\([\'"].*?[\'"],\s*[\'"](?P<ec>.{32})[\'"]', webpage)
-                or re.search(r'OO\.Player\.create\.apply\(\s*OO\.Player\s*,\s*op\(\s*\[\s*[\'"][^\'"]*[\'"]\s*,\s*[\'"](?P<ec>.{32})[\'"]', webpage)
-                or re.search(r'SBN\.VideoLinkset\.ooyala\([\'"](?P<ec>.{32})[\'"]\)', webpage)
-                or re.search(r'data-ooyala-video-id\s*=\s*[\'"](?P<ec>.{32})[\'"]', webpage))
-        if mobj is not None:
-            embed_token = self._search_regex(
-                r'embedToken[\'"]?\s*:\s*[\'"]([^\'"]+)',
-                webpage, 'ooyala embed token', default=None)
-            yield self._build_url_result(smuggle_url(
-                mobj.group('ec'), {
-                    'domain': url,
-                    'embed_token': embed_token,
-                }))
-            return
-
-        # Look for multiple Ooyala embeds on SBN network websites
-        mobj = re.search(r'SBN\.VideoLinkset\.entryGroup\((\[.*?\])', webpage)
-        if mobj is not None:
-            for v in self._parse_json(mobj.group(1), self._generic_id(url), fatal=False) or []:
-                yield self._build_url_result(smuggle_url(v['provider_video_id'], {'domain': url}))
-
-    @staticmethod
-    def _url_for_embed_code(embed_code):
-        return 'http://player.ooyala.com/player.js?embedCode=%s' % embed_code
-
-    @classmethod
-    def _build_url_result(cls, embed_code):
-        return cls.url_result(cls._url_for_embed_code(embed_code),
-                              ie=cls.ie_key())
-
-    def _real_extract(self, url):
-        url, smuggled_data = unsmuggle_url(url, {})
-        embed_code = self._match_id(url)
-        domain = smuggled_data.get('domain')
-        supportedformats = smuggled_data.get('supportedformats')
-        embed_token = smuggled_data.get('embed_token')
-        content_tree_url = self._CONTENT_TREE_BASE + 'embed_code/%s/%s' % (embed_code, embed_code)
-        return self._extract(content_tree_url, embed_code, domain, supportedformats, embed_token)
-
-
-class OoyalaExternalIE(OoyalaBaseIE):
-    _VALID_URL = r'''(?x)
-                    (?:
-                        ooyalaexternal:|
-                        https?://.+?\.ooyala\.com/.*?\bexternalId=
-                    )
-                    (?P<partner_id>[^:]+)
-                    :
-                    (?P<id>.+)
-                    (?:
-                        :|
-                        .*?&pcode=
-                    )
-                    (?P<pcode>.+?)
-                    (?:&|$)
-                    '''
-
-    _TEST = {
-        'url': 'https://player.ooyala.com/player.js?externalId=espn:10365079&pcode=1kNG061cgaoolOncv54OAO1ceO-I&adSetCode=91cDU6NuXTGKz3OdjOxFdAgJVtQcKJnI&callback=handleEvents&hasModuleParams=1&height=968&playerBrandingId=7af3bd04449c444c964f347f11873075&targetReplaceId=videoPlayer&width=1656&wmode=opaque&allowScriptAccess=always',
-        'info_dict': {
-            'id': 'FkYWtmazr6Ed8xmvILvKLWjd4QvYZpzG',
-            'ext': 'mp4',
-            'title': 'dm_140128_30for30Shorts___JudgingJewellv2',
-            'duration': 1302.0,
-        },
-        'params': {
-            # m3u8 download
-            'skip_download': True,
-        },
-    }
-
-    def _real_extract(self, url):
-        partner_id, video_id, pcode = self._match_valid_url(url).groups()
-        content_tree_url = self._CONTENT_TREE_BASE + 'external_id/%s/%s:%s' % (pcode, partner_id, video_id)
-        return self._extract(content_tree_url, video_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/opencast.py b/plugins/youtube_download/yt_dlp/extractor/opencast.py
index 1fafd9a..a4b0a19 100644
--- a/plugins/youtube_download/yt_dlp/extractor/opencast.py
+++ b/plugins/youtube_download/yt_dlp/extractor/opencast.py
@@ -2,8 +2,8 @@ import re
 
 from .common import InfoExtractor
 from ..utils import (
-    determine_ext,
     ExtractorError,
+    determine_ext,
     int_or_none,
     parse_iso8601,
     traverse_obj,
@@ -126,7 +126,7 @@ class OpencastIE(OpencastBaseIE):
                 'series': 'Kryptographie - WiSe 15/16',
                 'creator': 'Alexander May',
             },
-        }
+        },
     ]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/openload.py b/plugins/youtube_download/yt_dlp/extractor/openload.py
index 56b8330..2d56252 100644
--- a/plugins/youtube_download/yt_dlp/extractor/openload.py
+++ b/plugins/youtube_download/yt_dlp/extractor/openload.py
@@ -4,8 +4,8 @@ import json
 import os
 import subprocess
 import tempfile
+import urllib.parse
 
-from ..compat import compat_urlparse
 from ..utils import (
     ExtractorError,
     Popen,
@@ -121,7 +121,7 @@ class PhantomJSwrapper:
             if is_outdated_version(version, required_version):
                 self.extractor._downloader.report_warning(
                     'Your copy of PhantomJS is outdated, update it to version '
-                    '%s or newer if you encounter any errors.' % required_version)
+                    f'{required_version} or newer if you encounter any errors.')
 
         for name in self._TMP_FILE_NAMES:
             tmp = tempfile.NamedTemporaryFile(delete=False)
@@ -146,9 +146,9 @@ class PhantomJSwrapper:
             if 'path' not in cookie:
                 cookie['path'] = '/'
             if 'domain' not in cookie:
-                cookie['domain'] = compat_urlparse.urlparse(url).netloc
+                cookie['domain'] = urllib.parse.urlparse(url).netloc
         with open(self._TMP_FILES['cookies'].name, 'wb') as f:
-            f.write(json.dumps(cookies).encode('utf-8'))
+            f.write(json.dumps(cookies).encode())
 
     def _load_cookies(self):
         with open(self._TMP_FILES['cookies'].name, 'rb') as f:
@@ -201,7 +201,7 @@ class PhantomJSwrapper:
         if not html:
             html = self.extractor._download_webpage(url, video_id, note=note, headers=headers)
         with open(self._TMP_FILES['html'].name, 'wb') as f:
-            f.write(html.encode('utf-8'))
+            f.write(html.encode())
 
         self._save_cookies(url)
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/openrec.py b/plugins/youtube_download/yt_dlp/extractor/openrec.py
index 86dc9bb..4c19ab6 100644
--- a/plugins/youtube_download/yt_dlp/extractor/openrec.py
+++ b/plugins/youtube_download/yt_dlp/extractor/openrec.py
@@ -8,10 +8,11 @@ from ..utils import (
     unified_strdate,
     unified_timestamp,
 )
-from ..compat import compat_str
 
 
 class OpenRecBaseIE(InfoExtractor):
+    _M3U8_HEADERS = {'Referer': 'https://www.openrec.tv/'}
+
     def _extract_pagestore(self, webpage, video_id):
         return self._parse_json(
             self._search_regex(r'(?m)window\.pageStore\s*=\s*(\{.+?\});$', webpage, 'window.pageStore'), video_id)
@@ -21,7 +22,7 @@ class OpenRecBaseIE(InfoExtractor):
             if not m3u8_url:
                 continue
             yield from self._extract_m3u8_formats(
-                m3u8_url, video_id, ext='mp4', m3u8_id=name)
+                m3u8_url, video_id, ext='mp4', m3u8_id=name, headers=self._M3U8_HEADERS)
 
     def _extract_movie(self, webpage, video_id, name, is_live):
         window_stores = self._extract_pagestore(webpage, video_id)
@@ -60,12 +61,13 @@ class OpenRecBaseIE(InfoExtractor):
             'uploader_id': get_first(movie_stores, ('channel', 'user', 'id')),
             'timestamp': int_or_none(get_first(movie_stores, ['publishedAt', 'time']), scale=1000) or unified_timestamp(get_first(movie_stores, 'publishedAt')),
             'is_live': is_live,
+            'http_headers': self._M3U8_HEADERS,
         }
 
 
 class OpenRecIE(OpenRecBaseIE):
     IE_NAME = 'openrec'
-    _VALID_URL = r'https?://(?:www\.)?openrec\.tv/live/(?P<id>[^/]+)'
+    _VALID_URL = r'https?://(?:www\.)?openrec\.tv/live/(?P<id>[^/?#]+)'
     _TESTS = [{
         'url': 'https://www.openrec.tv/live/2p8v31qe4zy',
         'only_matching': True,
@@ -83,7 +85,7 @@ class OpenRecIE(OpenRecBaseIE):
 
 class OpenRecCaptureIE(OpenRecBaseIE):
     IE_NAME = 'openrec:capture'
-    _VALID_URL = r'https?://(?:www\.)?openrec\.tv/capture/(?P<id>[^/]+)'
+    _VALID_URL = r'https?://(?:www\.)?openrec\.tv/capture/(?P<id>[^/?#]+)'
     _TESTS = [{
         'url': 'https://www.openrec.tv/capture/l9nk2x4gn14',
         'only_matching': True,
@@ -110,23 +112,24 @@ class OpenRecCaptureIE(OpenRecBaseIE):
             raise ExtractorError('Cannot extract title')
 
         formats = self._extract_m3u8_formats(
-            capture_data.get('source'), video_id, ext='mp4')
+            capture_data.get('source'), video_id, ext='mp4', headers=self._M3U8_HEADERS)
 
         return {
             'id': video_id,
             'title': capture_data.get('title'),
             'thumbnail': capture_data.get('thumbnailUrl'),
             'formats': formats,
-            'timestamp': unified_timestamp(traverse_obj(movie_store, 'createdAt', expected_type=compat_str)),
-            'uploader': traverse_obj(movie_store, ('channel', 'name'), expected_type=compat_str),
-            'uploader_id': traverse_obj(movie_store, ('channel', 'id'), expected_type=compat_str),
+            'timestamp': unified_timestamp(traverse_obj(movie_store, 'createdAt', expected_type=str)),
+            'uploader': traverse_obj(movie_store, ('channel', 'name'), expected_type=str),
+            'uploader_id': traverse_obj(movie_store, ('channel', 'id'), expected_type=str),
             'upload_date': unified_strdate(capture_data.get('createdAt')),
+            'http_headers': self._M3U8_HEADERS,
         }
 
 
 class OpenRecMovieIE(OpenRecBaseIE):
     IE_NAME = 'openrec:movie'
-    _VALID_URL = r'https?://(?:www\.)?openrec\.tv/movie/(?P<id>[^/]+)'
+    _VALID_URL = r'https?://(?:www\.)?openrec\.tv/movie/(?P<id>[^/?#]+)'
     _TESTS = [{
         'url': 'https://www.openrec.tv/movie/nqz5xl5km8v',
         'info_dict': {
@@ -138,6 +141,9 @@ class OpenRecMovieIE(OpenRecBaseIE):
             'uploader_id': 'taiki_to_kazuhiro',
             'timestamp': 1638856800,
         },
+    }, {
+        'url': 'https://www.openrec.tv/movie/2p8vvex548y?playlist_id=98brq96vvsgn2nd',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/ora.py b/plugins/youtube_download/yt_dlp/extractor/ora.py
index d49909d..c6ba4b0 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ora.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ora.py
@@ -1,6 +1,7 @@
 import re
+import urllib.parse
+
 from .common import InfoExtractor
-from ..compat import compat_urlparse
 from ..utils import (
     get_element_by_attribute,
     qualities,
@@ -18,7 +19,7 @@ class OraTVIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'Vine & YouTube Stars Zach King & King Bach On Their Viral Videos!',
             'description': 'md5:ebbc5b1424dd5dba7be7538148287ac1',
-        }
+        },
     }, {
         'url': 'http://www.unsafespeech.com/video/2016/5/10/student-self-censorship-and-the-thought-police-on-university-campuses-0_6622bnkppw4d',
         'only_matching': True,
@@ -37,14 +38,14 @@ class OraTVIE(InfoExtractor):
                 m3u8_url, display_id, 'mp4', 'm3u8_native',
                 m3u8_id='hls', fatal=False)
             # similar to GameSpotIE
-            m3u8_path = compat_urlparse.urlparse(m3u8_url).path
+            m3u8_path = urllib.parse.urlparse(m3u8_url).path
             QUALITIES_RE = r'((,[a-z]+\d+)+,?)'
             available_qualities = self._search_regex(
                 QUALITIES_RE, m3u8_path, 'qualities').strip(',').split(',')
             http_path = m3u8_path[1:].split('/', 1)[1]
             http_template = re.sub(QUALITIES_RE, r'%s', http_path)
             http_template = http_template.replace('.csmil/master.m3u8', '')
-            http_template = compat_urlparse.urljoin(
+            http_template = urllib.parse.urljoin(
                 'http://videocdn-pmd.ora.tv/', http_template)
             preference = qualities(
                 ['mobile400', 'basic400', 'basic600', 'sd900', 'sd1200', 'sd1500', 'hd720', 'hd1080'])
diff --git a/plugins/youtube_download/yt_dlp/extractor/orf.py b/plugins/youtube_download/yt_dlp/extractor/orf.py
index cc3c003..12c4a21 100644
--- a/plugins/youtube_download/yt_dlp/extractor/orf.py
+++ b/plugins/youtube_download/yt_dlp/extractor/orf.py
@@ -1,201 +1,25 @@
-import functools
+import base64
 import re
 
 from .common import InfoExtractor
-from ..networking import HEADRequest
 from ..utils import (
     clean_html,
     determine_ext,
     float_or_none,
-    InAdvancePagedList,
     int_or_none,
-    join_nonempty,
-    orderedSet,
-    remove_end,
     make_archive_id,
-    smuggle_url,
+    mimetype2ext,
+    orderedSet,
+    parse_age_limit,
+    parse_iso8601,
+    remove_end,
+    str_or_none,
     strip_jsonp,
     try_call,
-    unescapeHTML,
     unified_strdate,
-    unsmuggle_url,
     url_or_none,
 )
-
-
-class ORFTVthekIE(InfoExtractor):
-    IE_NAME = 'orf:tvthek'
-    IE_DESC = 'ORF TVthek'
-    _VALID_URL = r'(?P<url>https?://tvthek\.orf\.at/(?:(?:[^/]+/){2}){1,2}(?P<id>\d+))(/[^/]+/(?P<vid>\d+))?(?:$|[?#])'
-
-    _TESTS = [{
-        'url': 'https://tvthek.orf.at/profile/ZIB-2/1211/ZIB-2/14121079',
-        'info_dict': {
-            'id': '14121079',
-        },
-        'playlist_count': 11,
-        'params': {'noplaylist': True}
-    }, {
-        'url': 'https://tvthek.orf.at/profile/ZIB-2/1211/ZIB-2/14121079/Umfrage-Welches-Tier-ist-Sebastian-Kurz/15083150',
-        'info_dict': {
-            'id': '14121079',
-        },
-        'playlist_count': 1,
-        'params': {'playlist_items': '5'}
-    }, {
-        'url': 'https://tvthek.orf.at/profile/ZIB-2/1211/ZIB-2/14121079/Umfrage-Welches-Tier-ist-Sebastian-Kurz/15083150',
-        'info_dict': {
-            'id': '14121079',
-            'playlist_count': 1
-        },
-        'playlist': [{
-            'info_dict': {
-                'id': '15083150',
-                'ext': 'mp4',
-                'description': 'md5:7be1c485425f5f255a5e4e4815e77d04',
-                'thumbnail': 'https://api-tvthek.orf.at/uploads/media/segments/0130/59/824271ea35cd8931a0fb08ab316a5b0a1562342c.jpeg',
-                'title': 'Umfrage: Welches Tier ist Sebastian Kurz?',
-            }
-        }],
-        'playlist_count': 1,
-        'params': {'noplaylist': True, 'skip_download': 'm3u8'}
-    }, {
-        'url': 'http://tvthek.orf.at/program/Aufgetischt/2745173/Aufgetischt-Mit-der-Steirischen-Tafelrunde/8891389',
-        'playlist': [{
-            'md5': '2942210346ed779588f428a92db88712',
-            'info_dict': {
-                'id': '8896777',
-                'ext': 'mp4',
-                'title': 'Aufgetischt: Mit der Steirischen Tafelrunde',
-                'description': 'md5:c1272f0245537812d4e36419c207b67d',
-                'duration': 2668,
-                'upload_date': '20141208',
-            },
-        }],
-        'skip': 'Blocked outside of Austria / Germany',
-    }, {
-        'url': 'http://tvthek.orf.at/topic/Im-Wandel-der-Zeit/8002126/Best-of-Ingrid-Thurnher/7982256',
-        'info_dict': {
-            'id': '7982259',
-            'ext': 'mp4',
-            'title': 'Best of Ingrid Thurnher',
-            'upload_date': '20140527',
-            'description': 'Viele Jahre war Ingrid Thurnher das "Gesicht" der ZIB 2. Vor ihrem Wechsel zur ZIB 2 im Jahr 1995 moderierte sie unter anderem "Land und Leute", "Österreich-Bild" und "Niederösterreich heute".',
-        },
-        'params': {
-            'skip_download': True,  # rtsp downloads
-        },
-        'skip': 'Blocked outside of Austria / Germany',
-    }, {
-        'url': 'http://tvthek.orf.at/topic/Fluechtlingskrise/10463081/Heimat-Fremde-Heimat/13879132/Senioren-betreuen-Migrantenkinder/13879141',
-        'only_matching': True,
-    }, {
-        'url': 'http://tvthek.orf.at/profile/Universum/35429',
-        'only_matching': True,
-    }]
-
-    def _pagefunc(self, url, data_jsb, n, *, image=None):
-        sd = data_jsb[n]
-        video_id, title = str(sd['id']), sd['title']
-        formats = []
-        for fd in sd['sources']:
-            src = url_or_none(fd.get('src'))
-            if not src:
-                continue
-            format_id = join_nonempty('delivery', 'quality', 'quality_string', from_dict=fd)
-            ext = determine_ext(src)
-            if ext == 'm3u8':
-                m3u8_formats = self._extract_m3u8_formats(
-                    src, video_id, 'mp4', m3u8_id=format_id, fatal=False, note=f'Downloading {format_id} m3u8 manifest')
-                if any('/geoprotection' in f['url'] for f in m3u8_formats):
-                    self.raise_geo_restricted()
-                formats.extend(m3u8_formats)
-            elif ext == 'f4m':
-                formats.extend(self._extract_f4m_formats(
-                    src, video_id, f4m_id=format_id, fatal=False))
-            elif ext == 'mpd':
-                formats.extend(self._extract_mpd_formats(
-                    src, video_id, mpd_id=format_id, fatal=False, note=f'Downloading {format_id} mpd manifest'))
-            else:
-                formats.append({
-                    'format_id': format_id,
-                    'url': src,
-                    'protocol': fd.get('protocol'),
-                })
-
-        # Check for geoblocking.
-        # There is a property is_geoprotection, but that's always false
-        geo_str = sd.get('geoprotection_string')
-        http_url = next(
-            (f['url'] for f in formats if re.match(r'^https?://.*\.mp4$', f['url'])),
-            None) if geo_str else None
-        if http_url:
-            self._request_webpage(
-                HEADRequest(http_url), video_id, fatal=False, note='Testing for geoblocking',
-                errnote=f'This video seems to be blocked outside of {geo_str}. You may want to try the streaming-* formats')
-
-        subtitles = {}
-        for sub in sd.get('subtitles', []):
-            sub_src = sub.get('src')
-            if not sub_src:
-                continue
-            subtitles.setdefault(sub.get('lang', 'de-AT'), []).append({
-                'url': sub_src,
-            })
-
-        upload_date = unified_strdate(sd.get('created_date'))
-
-        thumbnails = []
-        preview = sd.get('preview_image_url')
-        if preview:
-            thumbnails.append({
-                'id': 'preview',
-                'url': preview,
-                'preference': 0,
-            })
-        image = sd.get('image_full_url') or image
-        if image:
-            thumbnails.append({
-                'id': 'full',
-                'url': image,
-                'preference': 1,
-            })
-
-        yield {
-            'id': video_id,
-            'title': title,
-            'webpage_url': smuggle_url(f'{url}/part/{video_id}', {'force_noplaylist': True}),
-            'formats': formats,
-            'subtitles': subtitles,
-            'description': sd.get('description'),
-            'duration': int_or_none(sd.get('duration_in_seconds')),
-            'upload_date': upload_date,
-            'thumbnails': thumbnails,
-        }
-
-    def _real_extract(self, url):
-        url, smuggled_data = unsmuggle_url(url)
-        playlist_id, video_id, base_url = self._match_valid_url(url).group('id', 'vid', 'url')
-        webpage = self._download_webpage(url, playlist_id)
-
-        data_jsb = self._parse_json(
-            self._search_regex(
-                r'<div[^>]+class=(["\']).*?VideoPlaylist.*?\1[^>]+data-jsb=(["\'])(?P<json>.+?)\2',
-                webpage, 'playlist', group='json'),
-            playlist_id, transform_source=unescapeHTML)['playlist']['videos']
-
-        if not self._yes_playlist(playlist_id, video_id, smuggled_data):
-            data_jsb = [sd for sd in data_jsb if str(sd.get('id')) == video_id]
-
-        playlist_count = len(data_jsb)
-        image = self._og_search_thumbnail(webpage) if playlist_count == 1 else None
-
-        page_func = functools.partial(self._pagefunc, base_url, data_jsb, image=image)
-        return {
-            '_type': 'playlist',
-            'entries': InAdvancePagedList(page_func, playlist_count, 1),
-            'id': playlist_id,
-        }
+from ..utils.traversal import traverse_obj
 
 
 class ORFRadioIE(InfoExtractor):
@@ -240,8 +64,8 @@ class ORFRadioIE(InfoExtractor):
                 'duration': 18000,
                 'timestamp': 1659322789,
                 'description': 'md5:a3f6083399ef92b8cbe2d421b180835a',
-            }
-        }]
+            },
+        }],
     }, {
         'url': 'https://ooe.orf.at/player/20220801/OGMO',
         'info_dict': {
@@ -259,8 +83,8 @@ class ORFRadioIE(InfoExtractor):
                 'duration': 18000,
                 'timestamp': 1659322789,
                 'description': 'md5:a3f6083399ef92b8cbe2d421b180835a',
-            }
-        }]
+            },
+        }],
     }, {
         'url': 'http://fm4.orf.at/player/20170107/4CC',
         'only_matching': True,
@@ -302,7 +126,7 @@ class ORFRadioIE(InfoExtractor):
             'timestamp': 1483858796,
             'upload_date': '20170108',
         },
-        'skip': 'Shows from ORF radios are only available for 7 days.'
+        'skip': 'Shows from ORF radios are only available for 7 days.',
     }]
 
     def _entries(self, data, station):
@@ -334,6 +158,45 @@ class ORFRadioIE(InfoExtractor):
             self._entries(data, station or station2), show_id, data.get('title'), clean_html(data.get('subtitle')))
 
 
+class ORFPodcastIE(InfoExtractor):
+    IE_NAME = 'orf:podcast'
+    _STATION_RE = '|'.join(map(re.escape, (
+        'bgl', 'fm4', 'ktn', 'noe', 'oe1', 'oe3',
+        'ooe', 'sbg', 'stm', 'tir', 'tv', 'vbg', 'wie')))
+    _VALID_URL = rf'https?://sound\.orf\.at/podcast/(?P<station>{_STATION_RE})/(?P<show>[\w-]+)/(?P<id>[\w-]+)'
+    _TESTS = [{
+        'url': 'https://sound.orf.at/podcast/oe3/fruehstueck-bei-mir/nicolas-stockhammer-15102023',
+        'md5': '526a5700e03d271a1505386a8721ab9b',
+        'info_dict': {
+            'id': 'nicolas-stockhammer-15102023',
+            'ext': 'mp3',
+            'title': 'Nicolas Stockhammer (15.10.2023)',
+            'duration': 3396.0,
+            'series': 'Frühstück bei mir',
+        },
+        'skip': 'ORF podcasts are only available for a limited time',
+    }]
+
+    def _real_extract(self, url):
+        station, show, show_id = self._match_valid_url(url).group('station', 'show', 'id')
+        data = self._download_json(
+            f'https://audioapi.orf.at/radiothek/api/2.0/podcast/{station}/{show}/{show_id}', show_id)
+
+        return {
+            'id': show_id,
+            'ext': 'mp3',
+            'vcodec': 'none',
+            **traverse_obj(data, ('payload', {
+                'url': ('enclosures', 0, 'url'),
+                'ext': ('enclosures', 0, 'type', {mimetype2ext}),
+                'title': 'title',
+                'description': ('description', {clean_html}),
+                'duration': ('duration', {float_or_none(scale=1000)}),
+                'series': ('podcast', 'title'),
+            })),
+        }
+
+
 class ORFIPTVIE(InfoExtractor):
     IE_NAME = 'orf:iptv'
     IE_DESC = 'iptv.ORF.at'
@@ -357,13 +220,13 @@ class ORFIPTVIE(InfoExtractor):
         story_id = self._match_id(url)
 
         webpage = self._download_webpage(
-            'http://iptv.orf.at/stories/%s' % story_id, story_id)
+            f'http://iptv.orf.at/stories/{story_id}', story_id)
 
         video_id = self._search_regex(
             r'data-video(?:id)?="(\d+)"', webpage, 'video id')
 
         data = self._download_json(
-            'http://bits.orf.at/filehandler/static-api/json/current/data.json?file=%s' % video_id,
+            f'http://bits.orf.at/filehandler/static-api/json/current/data.json?file={video_id}',
             video_id)[0]
 
         duration = float_or_none(data['duration'], 1000)
@@ -462,7 +325,7 @@ class ORFFM4StoryIE(InfoExtractor):
         all_ids = orderedSet(re.findall(r'data-video(?:id)?="(\d+)"', webpage))
         for idx, video_id in enumerate(all_ids):
             data = self._download_json(
-                'http://bits.orf.at/filehandler/static-api/json/current/data.json?file=%s' % video_id,
+                f'http://bits.orf.at/filehandler/static-api/json/current/data.json?file={video_id}',
                 video_id)[0]
 
             duration = float_or_none(data['duration'], 1000)
@@ -524,3 +387,172 @@ class ORFFM4StoryIE(InfoExtractor):
             })
 
         return self.playlist_result(entries)
+
+
+class ORFONIE(InfoExtractor):
+    IE_NAME = 'orf:on'
+    _VALID_URL = r'https?://on\.orf\.at/video/(?P<id>\d+)(?:/(?P<segment>\d+))?'
+    _TESTS = [{
+        'url': 'https://on.orf.at/video/14210000/school-of-champions-48',
+        'info_dict': {
+            'id': '14210000',
+            'ext': 'mp4',
+            'duration': 2651.08,
+            'thumbnail': 'https://api-tvthek.orf.at/assets/segments/0167/98/thumb_16697671_segments_highlight_teaser.jpeg',
+            'title': 'School of Champions (4/8)',
+            'description': 'md5:d09ad279fc2e8502611e7648484b6afd',
+            'media_type': 'episode',
+            'timestamp': 1706558922,
+            'upload_date': '20240129',
+            'release_timestamp': 1706472362,
+            'release_date': '20240128',
+            'modified_timestamp': 1712756663,
+            'modified_date': '20240410',
+            '_old_archive_ids': ['orftvthek 14210000'],
+        },
+    }, {
+        'url': 'https://on.orf.at/video/3220355',
+        'md5': 'f94d98e667cf9a3851317efb4e136662',
+        'info_dict': {
+            'id': '3220355',
+            'ext': 'mp4',
+            'duration': 445.04,
+            'thumbnail': 'https://api-tvthek.orf.at/assets/segments/0002/60/thumb_159573_segments_highlight_teaser.png',
+            'title': '50 Jahre Burgenland: Der Festumzug',
+            'description': 'md5:1560bf855119544ee8c4fa5376a2a6b0',
+            'media_type': 'episode',
+            'timestamp': 52916400,
+            'upload_date': '19710905',
+            'release_timestamp': 52916400,
+            'release_date': '19710905',
+            'modified_timestamp': 1498536049,
+            'modified_date': '20170627',
+            '_old_archive_ids': ['orftvthek 3220355'],
+        },
+    }, {
+        # Video with multiple segments selecting the second segment
+        'url': 'https://on.orf.at/video/14226549/15639808/jugendbande-einbrueche-aus-langeweile',
+        'md5': '90f4ebff86b4580837b8a361d0232a9e',
+        'info_dict': {
+            'id': '15639808',
+            'ext': 'mp4',
+            'duration': 97.707,
+            'thumbnail': 'https://api-tvthek.orf.at/assets/segments/0175/43/thumb_17442704_segments_highlight_teaser.jpg',
+            'title': 'Jugendbande: Einbrüche aus Langeweile',
+            'description': 'md5:193df0bf0d91cf16830c211078097120',
+            'media_type': 'segment',
+            'timestamp': 1715792400,
+            'upload_date': '20240515',
+            'modified_timestamp': 1715794394,
+            'modified_date': '20240515',
+            '_old_archive_ids': ['orftvthek 15639808'],
+        },
+        'params': {'noplaylist': True},
+    }, {
+        # Video with multiple segments and no combined version
+        'url': 'https://on.orf.at/video/14227864/formel-1-grosser-preis-von-monaco-2024',
+        'info_dict': {
+            '_type': 'multi_video',
+            'id': '14227864',
+            'duration': 18410.52,
+            'thumbnail': 'https://api-tvthek.orf.at/assets/segments/0176/04/thumb_17503881_segments_highlight_teaser.jpg',
+            'title': 'Formel 1: Großer Preis von Monaco 2024',
+            'description': 'md5:aeeb010710ccf70ce28ccb4482243d4f',
+            'media_type': 'episode',
+            'timestamp': 1716721200,
+            'upload_date': '20240526',
+            'release_timestamp': 1716721802,
+            'release_date': '20240526',
+            'modified_timestamp': 1716967501,
+            'modified_date': '20240529',
+        },
+        'playlist_count': 42,
+    }, {
+        # Video with multiple segments, but with combined version
+        'url': 'https://on.orf.at/video/14228172',
+        'info_dict': {
+            'id': '14228172',
+            'ext': 'mp4',
+            'duration': 3294.878,
+            'thumbnail': 'https://api-tvthek.orf.at/assets/segments/0176/17/thumb_17516455_segments_highlight_teaser.jpg',
+            'title': 'Willkommen Österreich mit Stermann & Grissemann',
+            'description': 'md5:5de034d033a9c27f989343be3bbd4839',
+            'media_type': 'episode',
+            'timestamp': 1716926584,
+            'upload_date': '20240528',
+            'release_timestamp': 1716919202,
+            'release_date': '20240528',
+            'modified_timestamp': 1716968045,
+            'modified_date': '20240529',
+            '_old_archive_ids': ['orftvthek 14228172'],
+        },
+    }]
+
+    @staticmethod
+    def _parse_metadata(api_json):
+        return traverse_obj(api_json, {
+            'id': ('id', {int}, {str_or_none}),
+            'age_limit': ('age_classification', {parse_age_limit}),
+            'duration': ('exact_duration', {float_or_none(scale=1000)}),
+            'title': (('title', 'headline'), {str}),
+            'description': (('description', 'teaser_text'), {str}),
+            'media_type': ('video_type', {str}),
+            'thumbnail': ('_embedded', 'image', 'public_urls', 'highlight_teaser', 'url', {url_or_none}),
+            'timestamp': (('date', 'episode_date'), {parse_iso8601}),
+            'release_timestamp': ('release_date', {parse_iso8601}),
+            'modified_timestamp': ('updated_at', {parse_iso8601}),
+        }, get_all=False)
+
+    def _extract_video_info(self, video_id, api_json):
+        formats, subtitles = [], {}
+        for manifest_type in traverse_obj(api_json, ('sources', {dict.keys}, ...)):
+            for manifest_url in traverse_obj(api_json, ('sources', manifest_type, ..., 'src', {url_or_none})):
+                if manifest_type == 'hls':
+                    fmts, subs = self._extract_m3u8_formats_and_subtitles(
+                        manifest_url, video_id, fatal=False, m3u8_id='hls')
+                elif manifest_type == 'dash':
+                    fmts, subs = self._extract_mpd_formats_and_subtitles(
+                        manifest_url, video_id, fatal=False, mpd_id='dash')
+                else:
+                    continue
+                formats.extend(fmts)
+                self._merge_subtitles(subs, target=subtitles)
+
+        for sub_url in traverse_obj(api_json, (
+                '_embedded', 'subtitle',
+                ('xml_url', 'sami_url', 'stl_url', 'ttml_url', 'srt_url', 'vtt_url'), {url_or_none})):
+            self._merge_subtitles({'de': [{'url': sub_url}]}, target=subtitles)
+
+        return {
+            'id': video_id,
+            'formats': formats,
+            'subtitles': subtitles,
+            '_old_archive_ids': [make_archive_id('ORFTVthek', video_id)],
+            **self._parse_metadata(api_json),
+        }
+
+    def _real_extract(self, url):
+        video_id, segment_id = self._match_valid_url(url).group('id', 'segment')
+
+        encrypted_id = base64.b64encode(f'3dSlfek03nsLKdj4Jsd{video_id}'.encode()).decode()
+        api_json = self._download_json(
+            f'https://api-tvthek.orf.at/api/v4.3/public/episode/encrypted/{encrypted_id}', video_id)
+
+        if traverse_obj(api_json, 'is_drm_protected'):
+            self.report_drm(video_id)
+
+        segments = traverse_obj(api_json, ('_embedded', 'segments', lambda _, v: v['id']))
+        selected_segment = traverse_obj(segments, (lambda _, v: str(v['id']) == segment_id, any))
+
+        # selected_segment will be falsy if input URL did not include a valid segment_id
+        if selected_segment and not self._yes_playlist(video_id, segment_id, playlist_label='episode', video_label='segment'):
+            return self._extract_video_info(segment_id, selected_segment)
+
+        # Even some segmented videos have an unsegmented version available in API response root
+        if (self._configuration_arg('prefer_segments_playlist')
+                or not traverse_obj(api_json, ('sources', ..., ..., 'src', {url_or_none}))):
+            return self.playlist_result(
+                (self._extract_video_info(str(segment['id']), segment) for segment in segments),
+                video_id, **self._parse_metadata(api_json), multi_video=True)
+
+        return self._extract_video_info(video_id, api_json)
diff --git a/plugins/youtube_download/yt_dlp/extractor/outsidetv.py b/plugins/youtube_download/yt_dlp/extractor/outsidetv.py
index b1fcbd6..b9191c9 100644
--- a/plugins/youtube_download/yt_dlp/extractor/outsidetv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/outsidetv.py
@@ -13,7 +13,7 @@ class OutsideTVIE(InfoExtractor):
             'description': 'md5:41a12e94f3db3ca253b04bb1e8d8f4cd',
             'upload_date': '20181225',
             'timestamp': 1545742800,
-        }
+        },
     }, {
         'url': 'http://www.outsidetv.com/home/play/ZjQYboH6/1/10/Hdg0jukV/4',
         'only_matching': True,
diff --git a/plugins/youtube_download/yt_dlp/extractor/packtpub.py b/plugins/youtube_download/yt_dlp/extractor/packtpub.py
index 5620330..38ffd34 100644
--- a/plugins/youtube_download/yt_dlp/extractor/packtpub.py
+++ b/plugins/youtube_download/yt_dlp/extractor/packtpub.py
@@ -3,13 +3,12 @@ import json
 from .common import InfoExtractor
 from ..networking.exceptions import HTTPError
 from ..utils import (
-    clean_html,
     ExtractorError,
+    clean_html,
     # remove_end,
     str_or_none,
     strip_or_none,
     unified_timestamp,
-    # urljoin,
 )
 
 
@@ -64,7 +63,7 @@ class PacktPubIE(PacktPubBaseIE):
             headers['Authorization'] = 'Bearer ' + self._TOKEN
         try:
             video_url = self._download_json(
-                'https://services.packtpub.com/products-v1/products/%s/%s/%s' % (course_id, chapter_id, video_id), video_id,
+                f'https://services.packtpub.com/products-v1/products/{course_id}/{chapter_id}/{video_id}', video_id,
                 'Downloading JSON video', headers=headers)['data']
         except ExtractorError as e:
             if isinstance(e.cause, HTTPError) and e.cause.status == 400:
@@ -110,17 +109,16 @@ class PacktPubCourseIE(PacktPubBaseIE):
 
     @classmethod
     def suitable(cls, url):
-        return False if PacktPubIE.suitable(url) else super(
-            PacktPubCourseIE, cls).suitable(url)
+        return False if PacktPubIE.suitable(url) else super().suitable(url)
 
     def _real_extract(self, url):
         mobj = self._match_valid_url(url)
         url, course_id = mobj.group('url', 'id')
 
         course = self._download_json(
-            self._STATIC_PRODUCTS_BASE + '%s/toc' % course_id, course_id)
+            self._STATIC_PRODUCTS_BASE + f'{course_id}/toc', course_id)
         metadata = self._download_json(
-            self._STATIC_PRODUCTS_BASE + '%s/summary' % course_id,
+            self._STATIC_PRODUCTS_BASE + f'{course_id}/summary',
             course_id, fatal=False) or {}
 
         entries = []
diff --git a/plugins/youtube_download/yt_dlp/extractor/palcomp3.py b/plugins/youtube_download/yt_dlp/extractor/palcomp3.py
index 4b0801c..138a785 100644
--- a/plugins/youtube_download/yt_dlp/extractor/palcomp3.py
+++ b/plugins/youtube_download/yt_dlp/extractor/palcomp3.py
@@ -1,5 +1,4 @@
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     int_or_none,
     str_or_none,
@@ -30,7 +29,7 @@ class PalcoMP3BaseIE(InfoExtractor):
             })['data']
 
     def _parse_music(self, music):
-        music_id = compat_str(music['musicID'])
+        music_id = str(music['musicID'])
         title = music['title']
 
         formats = []
@@ -77,12 +76,12 @@ class PalcoMP3IE(PalcoMP3BaseIE):
             'title': 'Nossas Composições - CUIDA BEM DELA',
             'duration': 210,
             'view_count': int,
-        }
+        },
     }]
 
     @classmethod
     def suitable(cls, url):
-        return False if PalcoMP3VideoIE.suitable(url) else super(PalcoMP3IE, cls).suitable(url)
+        return False if PalcoMP3VideoIE.suitable(url) else super().suitable(url)
 
 
 class PalcoMP3ArtistIE(PalcoMP3BaseIE):
@@ -106,7 +105,7 @@ class PalcoMP3ArtistIE(PalcoMP3BaseIE):
 
     @classmethod
     def suitable(cls, url):
-        return False if PalcoMP3IE._match_valid_url(url) else super(PalcoMP3ArtistIE, cls).suitable(url)
+        return False if PalcoMP3IE._match_valid_url(url) else super().suitable(url)
 
     def _real_extract(self, url):
         artist_slug = self._match_id(url)
@@ -134,7 +133,7 @@ class PalcoMP3VideoIE(PalcoMP3BaseIE):
             'upload_date': '20161107',
             'uploader_id': 'maiaramaraisaoficial',
             'uploader': 'Maiara e Maraisa',
-        }
+        },
     }]
     _MUSIC_FIELDS = 'youtubeID'
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/pandoratv.py b/plugins/youtube_download/yt_dlp/extractor/pandoratv.py
deleted file mode 100644
index ccc78da..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/pandoratv.py
+++ /dev/null
@@ -1,128 +0,0 @@
-from .common import InfoExtractor
-from ..compat import (
-    compat_str,
-)
-from ..utils import (
-    ExtractorError,
-    float_or_none,
-    parse_duration,
-    parse_qs,
-    str_to_int,
-    urlencode_postdata,
-)
-
-
-class PandoraTVIE(InfoExtractor):
-    IE_NAME = 'pandora.tv'
-    IE_DESC = '판도라TV'
-    _VALID_URL = r'''(?x)
-                        https?://
-                            (?:
-                                (?:www\.)?pandora\.tv/view/(?P<user_id>[^/]+)/(?P<id>\d+)|  # new format
-                                (?:.+?\.)?channel\.pandora\.tv/channel/video\.ptv\?|        # old format
-                                m\.pandora\.tv/?\?                                          # mobile
-                            )
-                    '''
-    _TESTS = [{
-        'url': 'http://jp.channel.pandora.tv/channel/video.ptv?c1=&prgid=53294230&ch_userid=mikakim&ref=main&lot=cate_01_2',
-        'info_dict': {
-            'id': '53294230',
-            'ext': 'flv',
-            'title': '頭を撫でてくれる？',
-            'description': '頭を撫でてくれる？',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'duration': 39,
-            'upload_date': '20151218',
-            'uploader': 'カワイイ動物まとめ',
-            'uploader_id': 'mikakim',
-            'view_count': int,
-            'like_count': int,
-        }
-    }, {
-        'url': 'http://channel.pandora.tv/channel/video.ptv?ch_userid=gogoucc&prgid=54721744',
-        'info_dict': {
-            'id': '54721744',
-            'ext': 'flv',
-            'title': '[HD] JAPAN COUNTDOWN 170423',
-            'description': '[HD] JAPAN COUNTDOWN 170423',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'duration': 1704.9,
-            'upload_date': '20170423',
-            'uploader': 'GOGO_UCC',
-            'uploader_id': 'gogoucc',
-            'view_count': int,
-            'like_count': int,
-        },
-        'params': {
-            # Test metadata only
-            'skip_download': True,
-        },
-    }, {
-        'url': 'http://www.pandora.tv/view/mikakim/53294230#36797454_new',
-        'only_matching': True,
-    }, {
-        'url': 'http://m.pandora.tv/?c=view&ch_userid=mikakim&prgid=54600346',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        mobj = self._match_valid_url(url)
-        user_id = mobj.group('user_id')
-        video_id = mobj.group('id')
-
-        if not user_id or not video_id:
-            qs = parse_qs(url)
-            video_id = qs.get('prgid', [None])[0]
-            user_id = qs.get('ch_userid', [None])[0]
-            if any(not f for f in (video_id, user_id,)):
-                raise ExtractorError('Invalid URL', expected=True)
-
-        data = self._download_json(
-            'http://m.pandora.tv/?c=view&m=viewJsonApi&ch_userid=%s&prgid=%s'
-            % (user_id, video_id), video_id)
-
-        info = data['data']['rows']['vod_play_info']['result']
-
-        formats = []
-        for format_id, format_url in info.items():
-            if not format_url:
-                continue
-            height = self._search_regex(
-                r'^v(\d+)[Uu]rl$', format_id, 'height', default=None)
-            if not height:
-                continue
-
-            play_url = self._download_json(
-                'http://m.pandora.tv/?c=api&m=play_url', video_id,
-                data=urlencode_postdata({
-                    'prgid': video_id,
-                    'runtime': info.get('runtime'),
-                    'vod_url': format_url,
-                }),
-                headers={
-                    'Origin': url,
-                    'Content-Type': 'application/x-www-form-urlencoded',
-                })
-            format_url = play_url.get('url')
-            if not format_url:
-                continue
-
-            formats.append({
-                'format_id': '%sp' % height,
-                'url': format_url,
-                'height': int(height),
-            })
-
-        return {
-            'id': video_id,
-            'title': info['subject'],
-            'description': info.get('body'),
-            'thumbnail': info.get('thumbnail') or info.get('poster'),
-            'duration': float_or_none(info.get('runtime'), 1000) or parse_duration(info.get('time')),
-            'upload_date': info['fid'].split('/')[-1][:8] if isinstance(info.get('fid'), compat_str) else None,
-            'uploader': info.get('nickname'),
-            'uploader_id': info.get('upload_userid'),
-            'view_count': str_to_int(info.get('hit')),
-            'like_count': str_to_int(info.get('likecnt')),
-            'formats': formats,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/panopto.py b/plugins/youtube_download/yt_dlp/extractor/panopto.py
index 6e3c9f4..9f307a5 100644
--- a/plugins/youtube_download/yt_dlp/extractor/panopto.py
+++ b/plugins/youtube_download/yt_dlp/extractor/panopto.py
@@ -1,25 +1,22 @@
 import calendar
-import json
+import datetime as dt
 import functools
-from datetime import datetime
-from random import random
+import json
+import random
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_urllib_parse_urlparse,
-    compat_urlparse
-)
-
 from ..utils import (
-    bug_reports_message,
     ExtractorError,
+    OnDemandPagedList,
+    bug_reports_message,
     get_first,
     int_or_none,
-    OnDemandPagedList,
     parse_qs,
     srt_subtitles_timecode,
-    traverse_obj,
+    url_or_none,
 )
+from ..utils.traversal import traverse_obj
 
 
 class PanoptoBaseIE(InfoExtractor):
@@ -48,7 +45,7 @@ class PanoptoBaseIE(InfoExtractor):
         18: 'hu-HU',
         19: 'nb-NO',
         20: 'sv-SE',
-        21: 'it-IT'
+        21: 'it-IT',
     }
 
     def _call_api(self, base_url, path, video_id, data=None, fatal=True, **kwargs):
@@ -70,7 +67,7 @@ class PanoptoBaseIE(InfoExtractor):
 
     @staticmethod
     def _parse_fragment(url):
-        return {k: json.loads(v[0]) for k, v in compat_urlparse.parse_qs(compat_urllib_parse_urlparse(url).fragment).items()}
+        return {k: json.loads(v[0]) for k, v in urllib.parse.parse_qs(urllib.parse.urlparse(url).fragment).items()}
 
 
 class PanoptoIE(PanoptoBaseIE):
@@ -92,7 +89,7 @@ class PanoptoIE(PanoptoBaseIE):
                 'average_rating': int,
                 'uploader_id': '2db6b718-47a0-4b0b-9e17-ab0b00f42b1e',
                 'channel_id': 'e4c6a2fc-1214-4ca0-8fb7-aef2e29ff63a',
-                'channel': 'Showcase Videos'
+                'channel': 'Showcase Videos',
             },
         },
         {
@@ -135,7 +132,7 @@ class PanoptoIE(PanoptoBaseIE):
                 'uploader': 'Kathryn Kelly',
                 'channel_id': 'fb93bc3c-6750-4b80-a05b-a921013735d3',
                 'channel': 'Getting Started',
-            }
+            },
         },
         {
             # Does not allow normal Viewer.aspx. AUDIO livestream has no url, so should be skipped and only give one stream.
@@ -178,7 +175,7 @@ class PanoptoIE(PanoptoBaseIE):
                 'chapters': 'count:28',
                 'thumbnail': r're:https://demo\.hosted\.panopto\.com/.+',
             },
-            'params': {'format': 'mhtml', 'skip_download': True}
+            'params': {'format': 'mhtml', 'skip_download': True},
         },
         {
             'url': 'https://na-training-1.hosted.panopto.com/Panopto/Pages/Viewer.aspx?id=8285224a-9a2b-4957-84f2-acb0000c4ea9',
@@ -200,7 +197,7 @@ class PanoptoIE(PanoptoBaseIE):
                 'subtitles': {'en-US': [{'ext': 'srt', 'data': 'md5:a3f4d25963fdeace838f327097c13265'}],
                               'es-ES': [{'ext': 'srt', 'data': 'md5:57e9dad365fd0fbaf0468eac4949f189'}]},
             },
-            'params': {'writesubtitles': True, 'skip_download': True}
+            'params': {'writesubtitles': True, 'skip_download': True},
         }, {
             # On Panopto there are two subs: "Default" and en-US. en-US is blank and should be skipped.
             'url': 'https://na-training-1.hosted.panopto.com/Panopto/Pages/Viewer.aspx?id=940cbd41-f616-4a45-b13e-aaf1000c915b',
@@ -222,15 +219,15 @@ class PanoptoIE(PanoptoBaseIE):
                 'upload_date': '20191129',
 
             },
-            'params': {'writesubtitles': True, 'skip_download': True}
+            'params': {'writesubtitles': True, 'skip_download': True},
         },
         {
             'url': 'https://ucc.cloud.panopto.eu/Panopto/Pages/Viewer.aspx?id=0e8484a4-4ceb-4d98-a63f-ac0200b455cb',
-            'only_matching': True
+            'only_matching': True,
         },
         {
             'url': 'https://brown.hosted.panopto.com/Panopto/Pages/Embed.aspx?id=0b3ff73b-36a0-46c5-8455-aadf010a3638',
-            'only_matching': True
+            'only_matching': True,
         },
     ]
 
@@ -243,7 +240,7 @@ class PanoptoIE(PanoptoBaseIE):
         invocation_id = delivery_info.get('InvocationId')
         stream_id = traverse_obj(delivery_info, ('Delivery', 'Streams', ..., 'PublicID'), get_all=False, expected_type=str)
         if invocation_id and stream_id and duration:
-            timestamp_str = f'/Date({calendar.timegm(datetime.utcnow().timetuple())}000)/'
+            timestamp_str = f'/Date({calendar.timegm(dt.datetime.now(dt.timezone.utc).timetuple())}000)/'
             data = {
                 'streamRequests': [
                     {
@@ -258,7 +255,7 @@ class PanoptoIE(PanoptoBaseIE):
                         'StopReason': None,
                         'StreamID': stream_id,
                         'TimeStamp': timestamp_str,
-                        'UpdatesRejected': 0
+                        'UpdatesRejected': 0,
                     },
                 ]}
 
@@ -278,7 +275,7 @@ class PanoptoIE(PanoptoBaseIE):
             chapters.append({
                 'start_time': start,
                 'end_time': start + duration,
-                'title': caption
+                'title': caption,
             })
         return chapters
 
@@ -287,11 +284,11 @@ class PanoptoIE(PanoptoBaseIE):
         image_frags = {}
         for timestamp in timestamps or []:
             duration = timestamp.get('Duration')
-            obj_id, obj_sn = timestamp.get('ObjectIdentifier'), timestamp.get('ObjectSequenceNumber'),
+            obj_id, obj_sn = timestamp.get('ObjectIdentifier'), timestamp.get('ObjectSequenceNumber')
             if timestamp.get('EventTargetType') == 'PowerPoint' and obj_id is not None and obj_sn is not None:
                 image_frags.setdefault('slides', []).append({
                     'url': base_url + f'/Pages/Viewer/Image.aspx?id={obj_id}&number={obj_sn}',
-                    'duration': duration
+                    'duration': duration,
                 })
 
             obj_pid, session_id, abs_time = timestamp.get('ObjectPublicIdentifier'), timestamp.get('SessionID'), timestamp.get('AbsoluteTime')
@@ -308,7 +305,7 @@ class PanoptoIE(PanoptoBaseIE):
                 'acodec': 'none',
                 'vcodec': 'none',
                 'url': 'about:invalid',
-                'fragments': fragments
+                'fragments': fragments,
             }
 
     @staticmethod
@@ -333,8 +330,8 @@ class PanoptoIE(PanoptoBaseIE):
                     'deliveryId': video_id,
                     'getCaptions': True,
                     'language': str(lang),
-                    'responseType': 'json'
-                }
+                    'responseType': 'json',
+                },
             )
             if not isinstance(response, list):
                 continue
@@ -349,26 +346,21 @@ class PanoptoIE(PanoptoBaseIE):
         subtitles = {}
         for stream in streams or []:
             stream_formats = []
-            http_stream_url = stream.get('StreamHttpUrl')
-            stream_url = stream.get('StreamUrl')
-
-            if http_stream_url:
-                stream_formats.append({'url': http_stream_url})
-
-            if stream_url:
+            for stream_url in set(traverse_obj(stream, (('StreamHttpUrl', 'StreamUrl'), {url_or_none}))):
                 media_type = stream.get('ViewerMediaFileTypeName')
                 if media_type in ('hls', ):
-                    m3u8_formats, stream_subtitles = self._extract_m3u8_formats_and_subtitles(stream_url, video_id)
-                    stream_formats.extend(m3u8_formats)
-                    subtitles = self._merge_subtitles(subtitles, stream_subtitles)
+                    fmts, subs = self._extract_m3u8_formats_and_subtitles(stream_url, video_id, m3u8_id='hls', fatal=False)
+                    stream_formats.extend(fmts)
+                    self._merge_subtitles(subs, target=subtitles)
                 else:
                     stream_formats.append({
-                        'url': stream_url
+                        'url': stream_url,
+                        'ext': media_type,
                     })
             for fmt in stream_formats:
                 fmt.update({
                     'format_note': stream.get('Tag'),
-                    **fmt_kwargs
+                    **fmt_kwargs,
                 })
             formats.extend(stream_formats)
 
@@ -388,7 +380,7 @@ class PanoptoIE(PanoptoBaseIE):
                 'isKollectiveAgentInstalled': 'false',
                 'isEmbed': 'false',
                 'responseType': 'json',
-            }
+            },
         )
 
         delivery = delivery_info['Delivery']
@@ -415,7 +407,7 @@ class PanoptoIE(PanoptoBaseIE):
             'cast': traverse_obj(delivery, ('Contributors', ..., 'DisplayName'), expected_type=lambda x: x or None),
             'timestamp': session_start_time - 11640000000 if session_start_time else None,
             'duration': delivery.get('Duration'),
-            'thumbnail': base_url + f'/Services/FrameGrabber.svc/FrameRedirect?objectId={video_id}&mode=Delivery&random={random()}',
+            'thumbnail': base_url + f'/Services/FrameGrabber.svc/FrameRedirect?objectId={video_id}&mode=Delivery&random={random.random()}',
             'average_rating': delivery.get('AverageRating'),
             'chapters': self._extract_chapters(timestamps),
             'uploader': delivery.get('OwnerDisplayName') or None,
@@ -425,7 +417,7 @@ class PanoptoIE(PanoptoBaseIE):
             'channel_id': delivery.get('SessionGroupPublicID'),
             'channel': traverse_obj(delivery, 'SessionGroupLongName', 'SessionGroupShortName', get_all=False),
             'formats': formats,
-            'subtitles': subtitles
+            'subtitles': subtitles,
         }
 
 
@@ -439,7 +431,7 @@ class PanoptoPlaylistIE(PanoptoBaseIE):
                 'id': 'f3b39fcf-882f-4849-93d6-a9f401236d36',
                 'description': '',
             },
-            'playlist_mincount': 36
+            'playlist_mincount': 36,
         },
         {
             'url': 'https://utsa.hosted.panopto.com/Panopto/Pages/Viewer.aspx?pid=e2900555-3ad4-4bdb-854d-ad2401686190',
@@ -448,7 +440,7 @@ class PanoptoPlaylistIE(PanoptoBaseIE):
                 'id': 'e2900555-3ad4-4bdb-854d-ad2401686190',
                 'description': 'md5:f958bca50a1cbda15fdc1e20d32b3ecb',
             },
-            'playlist_mincount': 4
+            'playlist_mincount': 4,
         },
 
     ]
@@ -470,7 +462,7 @@ class PanoptoPlaylistIE(PanoptoBaseIE):
                 'description': item.get('Description'),
                 'duration': item.get('Duration'),
                 'channel': traverse_obj(item, ('Parent', 'Name')),
-                'channel_id': traverse_obj(item, ('Parent', 'Id'))
+                'channel_id': traverse_obj(item, ('Parent', 'Id')),
             }
 
     def _real_extract(self, url):
@@ -479,7 +471,7 @@ class PanoptoPlaylistIE(PanoptoBaseIE):
         video_id = get_first(parse_qs(url), 'id')
         if video_id:
             if self.get_param('noplaylist'):
-                self.to_screen('Downloading just video %s because of --no-playlist' % video_id)
+                self.to_screen(f'Downloading just video {video_id} because of --no-playlist')
                 return self.url_result(base_url + f'/Pages/Viewer.aspx?id={video_id}', ie_key=PanoptoIE.ie_key(), video_id=video_id)
             else:
                 self.to_screen(f'Downloading playlist {playlist_id}; add --no-playlist to just download video {video_id}')
@@ -499,28 +491,28 @@ class PanoptoListIE(PanoptoBaseIE):
             'url': 'https://demo.hosted.panopto.com/Panopto/Pages/Sessions/List.aspx#folderID=%22e4c6a2fc-1214-4ca0-8fb7-aef2e29ff63a%22',
             'info_dict': {
                 'id': 'e4c6a2fc-1214-4ca0-8fb7-aef2e29ff63a',
-                'title': 'Showcase Videos'
+                'title': 'Showcase Videos',
             },
-            'playlist_mincount': 140
+            'playlist_mincount': 140,
 
         },
         {
             'url': 'https://demo.hosted.panopto.com/Panopto/Pages/Sessions/List.aspx#view=2&maxResults=250',
             'info_dict': {
                 'id': 'panopto_list',
-                'title': 'panopto_list'
+                'title': 'panopto_list',
             },
-            'playlist_mincount': 300
+            'playlist_mincount': 300,
         },
         {
             # Folder that contains 8 folders and a playlist
             'url': 'https://howtovideos.hosted.panopto.com/Panopto/Pages/Sessions/List.aspx?noredirect=true#folderID=%224b9de7ae-0080-4158-8496-a9ba01692c2e%22',
             'info_dict': {
                 'id': '4b9de7ae-0080-4158-8496-a9ba01692c2e',
-                'title': 'Video Tutorials'
+                'title': 'Video Tutorials',
             },
-            'playlist_mincount': 9
-        }
+            'playlist_mincount': 9,
+        },
 
     ]
 
@@ -536,7 +528,7 @@ class PanoptoListIE(PanoptoBaseIE):
         }
 
         response = self._call_api(
-            base_url, '/Services/Data.svc/GetSessions', f'{display_id} page {page+1}',
+            base_url, '/Services/Data.svc/GetSessions', f'{display_id} page {page + 1}',
             data={'queryParameters': params}, fatal=False)
 
         for result in get_first(response, 'Results', default=[]):
@@ -563,7 +555,7 @@ class PanoptoListIE(PanoptoBaseIE):
             base_url, '/Services/Data.svc/GetFolderInfo', folder_id,
             data={'folderID': folder_id}, fatal=False)
         return {
-            'title': get_first(response, 'Name')
+            'title': get_first(response, 'Name'),
         }
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/paramountplus.py b/plugins/youtube_download/yt_dlp/extractor/paramountplus.py
index 7e472a6..317f53b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/paramountplus.py
+++ b/plugins/youtube_download/yt_dlp/extractor/paramountplus.py
@@ -1,7 +1,7 @@
 import itertools
 
-from .common import InfoExtractor
 from .cbs import CBSBaseIE
+from .common import InfoExtractor
 from ..utils import (
     ExtractorError,
     int_or_none,
@@ -170,19 +170,19 @@ class ParamountPlusSeriesIE(InfoExtractor):
         'playlist_mincount': 50,
         'info_dict': {
             'id': 'drake-josh',
-        }
+        },
     }, {
         'url': 'https://www.paramountplus.com/shows/hawaii_five_0/',
         'playlist_mincount': 240,
         'info_dict': {
             'id': 'hawaii_five_0',
-        }
+        },
     }, {
         'url': 'https://www.paramountplus.com/shows/spongebob-squarepants/',
         'playlist_mincount': 248,
         'info_dict': {
             'id': 'spongebob-squarepants',
-        }
+        },
     }]
 
     def _entries(self, show_name):
@@ -193,7 +193,7 @@ class ParamountPlusSeriesIE(InfoExtractor):
                 return
             for episode in show_json['result']['data']:
                 yield self.url_result(
-                    'https://www.paramountplus.com%s' % episode['url'],
+                    'https://www.paramountplus.com{}'.format(episode['url']),
                     ie=ParamountPlusIE.ie_key(), video_id=episode['content_id'])
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/parler.py b/plugins/youtube_download/yt_dlp/extractor/parler.py
index 2af805e..e5bb3be 100644
--- a/plugins/youtube_download/yt_dlp/extractor/parler.py
+++ b/plugins/youtube_download/yt_dlp/extractor/parler.py
@@ -1,5 +1,3 @@
-import functools
-
 from .common import InfoExtractor
 from .youtube import YoutubeIE
 from ..utils import (
@@ -14,7 +12,7 @@ from ..utils import (
 
 class ParlerIE(InfoExtractor):
     IE_DESC = 'Posts on parler.com'
-    _VALID_URL = r'https://parler\.com/feed/(?P<id>[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12})'
+    _VALID_URL = r'https?://parler\.com/feed/(?P<id>[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12})'
     _TESTS = [
         {
             'url': 'https://parler.com/feed/df79fdba-07cc-48fe-b085-3293897520d7',
@@ -83,9 +81,9 @@ class ParlerIE(InfoExtractor):
                 'timestamp': ('date_created', {unified_timestamp}),
                 'uploader': ('user', 'name', {strip_or_none}),
                 'uploader_id': ('user', 'username', {str}),
-                'uploader_url': ('user', 'username', {functools.partial(urljoin, 'https://parler.com/')}),
+                'uploader_url': ('user', 'username', {urljoin('https://parler.com/')}),
                 'view_count': ('views', {int_or_none}),
                 'comment_count': ('total_comments', {int_or_none}),
                 'repost_count': ('echos', {int_or_none}),
-            })
+            }),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/parlview.py b/plugins/youtube_download/yt_dlp/extractor/parlview.py
index 0b54791..b93b5ed 100644
--- a/plugins/youtube_download/yt_dlp/extractor/parlview.py
+++ b/plugins/youtube_download/yt_dlp/extractor/parlview.py
@@ -1,5 +1,4 @@
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     int_or_none,
     try_get,
@@ -8,7 +7,7 @@ from ..utils import (
 
 
 class ParlviewIE(InfoExtractor):
-
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?parlview\.aph\.gov\.au/(?:[^/]+)?\bvideoID=(?P<id>\d{6})'
     _TESTS = [{
         'url': 'https://parlview.aph.gov.au/mediaPlayer.php?videoID=542661',
@@ -24,7 +23,7 @@ class ParlviewIE(InfoExtractor):
         },
         'params': {
             'skip_download': True,
-        }
+        },
     }, {
         'url': 'https://parlview.aph.gov.au/mediaPlayer.php?videoID=539936',
         'only_matching': True,
@@ -36,13 +35,13 @@ class ParlviewIE(InfoExtractor):
         video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
         media = self._download_json(self._API_URL % video_id, video_id).get('media')
-        timestamp = try_get(media, lambda x: x['timeMap']['source']['timecode_offsets'][0], compat_str) or '/'
+        timestamp = try_get(media, lambda x: x['timeMap']['source']['timecode_offsets'][0], str) or '/'
 
         stream = try_get(media, lambda x: x['renditions'][0], dict)
         if not stream:
             self.raise_no_formats('No streams were detected')
         elif stream.get('streamType') != 'VOD':
-            self.raise_no_formats('Unknown type of stream was detected: "%s"' % str(stream.get('streamType')))
+            self.raise_no_formats('Unknown type of stream was detected: "{}"'.format(str(stream.get('streamType'))))
         formats = self._extract_m3u8_formats(stream['url'], video_id, 'mp4', 'm3u8_native')
 
         media_info = self._download_webpage(
diff --git a/plugins/youtube_download/yt_dlp/extractor/parti.py b/plugins/youtube_download/yt_dlp/extractor/parti.py
new file mode 100644
index 0000000..acadefc
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/parti.py
@@ -0,0 +1,101 @@
+from .common import InfoExtractor
+from ..utils import UserNotLive, int_or_none, parse_iso8601, url_or_none, urljoin
+from ..utils.traversal import traverse_obj
+
+
+class PartiBaseIE(InfoExtractor):
+    def _call_api(self, path, video_id, note=None):
+        return self._download_json(
+            f'https://api-backend.parti.com/parti_v2/profile/{path}', video_id, note)
+
+
+class PartiVideoIE(PartiBaseIE):
+    IE_NAME = 'parti:video'
+    _VALID_URL = r'https?://(?:www\.)?parti\.com/video/(?P<id>\d+)'
+    _TESTS = [{
+        'url': 'https://parti.com/video/66284',
+        'info_dict': {
+            'id': '66284',
+            'ext': 'mp4',
+            'title': 'NOW LIVE ',
+            'upload_date': '20250327',
+            'categories': ['Gaming'],
+            'thumbnail': 'https://assets.parti.com/351424_eb9e5250-2821-484a-9c5f-ca99aa666c87.png',
+            'channel': 'ItZTMGG',
+            'timestamp': 1743044379,
+        },
+        'params': {'skip_download': 'm3u8'},
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        data = self._call_api(f'get_livestream_channel_info/recent/{video_id}', video_id)
+
+        return {
+            'id': video_id,
+            'formats': self._extract_m3u8_formats(
+                urljoin('https://watch.parti.com', data['livestream_recording']), video_id, 'mp4'),
+            **traverse_obj(data, {
+                'title': ('event_title', {str}),
+                'channel': ('user_name', {str}),
+                'thumbnail': ('event_file', {url_or_none}),
+                'categories': ('category_name', {str}, filter, all),
+                'timestamp': ('event_start_ts', {int_or_none}),
+            }),
+        }
+
+
+class PartiLivestreamIE(PartiBaseIE):
+    IE_NAME = 'parti:livestream'
+    _VALID_URL = r'https?://(?:www\.)?parti\.com/creator/(?P<service>[\w]+)/(?P<id>[\w/-]+)'
+    _TESTS = [{
+        'url': 'https://parti.com/creator/parti/Capt_Robs_Adventures',
+        'info_dict': {
+            'id': 'Capt_Robs_Adventures',
+            'ext': 'mp4',
+            'title': r"re:I'm Live on Parti \d{4}-\d{2}-\d{2} \d{2}:\d{2}",
+            'view_count': int,
+            'thumbnail': r're:https://assets\.parti\.com/.+\.png',
+            'timestamp': 1743879776,
+            'upload_date': '20250405',
+            'live_status': 'is_live',
+        },
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        'url': 'https://parti.com/creator/discord/sazboxgaming/0',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        service, creator_slug = self._match_valid_url(url).group('service', 'id')
+
+        encoded_creator_slug = creator_slug.replace('/', '%23')
+        creator_id = self._call_api(
+            f'get_user_by_social_media/{service}/{encoded_creator_slug}',
+            creator_slug, note='Fetching user ID')
+
+        data = self._call_api(
+            f'get_livestream_channel_info/{creator_id}', creator_id,
+            note='Fetching user profile feed')['channel_info']
+
+        if not traverse_obj(data, ('channel', 'is_live', {bool})):
+            raise UserNotLive(video_id=creator_id)
+
+        channel_info = data['channel']
+
+        return {
+            'id': creator_slug,
+            'formats': self._extract_m3u8_formats(
+                channel_info['playback_url'], creator_slug, live=True, query={
+                    'token': channel_info['playback_auth_token'],
+                    'player_version': '1.17.0',
+                }),
+            'is_live': True,
+            **traverse_obj(data, {
+                'title': ('livestream_event_info', 'event_name', {str}),
+                'description': ('livestream_event_info', 'event_description', {str}),
+                'thumbnail': ('livestream_event_info', 'livestream_preview_file', {url_or_none}),
+                'timestamp': ('stream', 'start_time', {parse_iso8601}),
+                'view_count': ('stream', 'viewer_count', {int_or_none}),
+            }),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/patreon.py b/plugins/youtube_download/yt_dlp/extractor/patreon.py
index 9316789..7794cae 100644
--- a/plugins/youtube_download/yt_dlp/extractor/patreon.py
+++ b/plugins/youtube_download/yt_dlp/extractor/patreon.py
@@ -1,8 +1,10 @@
+import functools
 import itertools
+import urllib.parse
 
 from .common import InfoExtractor
+from .sproutvideo import VidsIoIE
 from .vimeo import VimeoIE
-from ..compat import compat_urllib_parse_unquote
 from ..networking.exceptions import HTTPError
 from ..utils import (
     KNOWN_EXTENSIONS,
@@ -12,29 +14,35 @@ from ..utils import (
     int_or_none,
     mimetype2ext,
     parse_iso8601,
+    smuggle_url,
     str_or_none,
-    traverse_obj,
-    try_get,
     url_or_none,
     urljoin,
 )
+from ..utils.traversal import traverse_obj, value
 
 
 class PatreonBaseIE(InfoExtractor):
-    USER_AGENT = 'Patreon/7.6.28 (Android; Android 11; Scale/2.10)'
+    @functools.cached_property
+    def patreon_user_agent(self):
+        # Patreon mobile UA is needed to avoid triggering Cloudflare anti-bot protection.
+        # Newer UA yields higher res m3u8 formats for locked posts, but gives 401 if not logged-in
+        if self._get_cookies('https://www.patreon.com/').get('session_id'):
+            return 'Patreon/72.2.28 (Android; Android 14; Scale/2.10)'
+        return 'Patreon/7.6.28 (Android; Android 11; Scale/2.10)'
 
     def _call_api(self, ep, item_id, query=None, headers=None, fatal=True, note=None):
         if headers is None:
             headers = {}
         if 'User-Agent' not in headers:
-            headers['User-Agent'] = self.USER_AGENT
+            headers['User-Agent'] = self.patreon_user_agent
         if query:
             query.update({'json-api-version': 1.0})
 
         try:
             return self._download_json(
                 f'https://www.patreon.com/api/{ep}',
-                item_id, note='Downloading API JSON' if not note else note,
+                item_id, note=note if note else 'Downloading API JSON',
                 query=query, fatal=fatal, headers=headers)
         except ExtractorError as e:
             if not isinstance(e.cause, HTTPError) or mimetype2ext(e.cause.response.headers.get('Content-Type')) != 'json':
@@ -47,6 +55,7 @@ class PatreonBaseIE(InfoExtractor):
 
 
 class PatreonIE(PatreonBaseIE):
+    IE_NAME = 'patreon'
     _VALID_URL = r'https?://(?:www\.)?patreon\.com/(?:creation\?hid=|posts/(?:[\w-]+-)?)(?P<id>\d+)'
     _TESTS = [{
         'url': 'http://www.patreon.com/creation?hid=743933',
@@ -54,6 +63,7 @@ class PatreonIE(PatreonBaseIE):
         'info_dict': {
             'id': '743933',
             'ext': 'mp3',
+            'alt_title': 'cd166.mp3',
             'title': 'Episode 166: David Smalley of Dogma Debate',
             'description': 'md5:34d207dd29aa90e24f1b3f58841b81c7',
             'uploader': 'Cognitive Dissonance Podcast',
@@ -92,7 +102,7 @@ class PatreonIE(PatreonBaseIE):
             'thumbnail': 're:^https?://.*$',
             'upload_date': '20150211',
             'description': 'md5:8af6425f50bd46fbf29f3db0fc3a8364',
-            'uploader_id': 'TraciJHines',
+            'uploader_id': '@TraciHinesMusic',
             'categories': ['Entertainment'],
             'duration': 282,
             'view_count': int,
@@ -106,13 +116,16 @@ class PatreonIE(PatreonBaseIE):
             'availability': 'public',
             'channel_follower_count': int,
             'playable_in_embed': True,
-            'uploader_url': 'http://www.youtube.com/user/TraciJHines',
+            'uploader_url': 'https://www.youtube.com/@TraciHinesMusic',
             'comment_count': int,
+            'channel_is_verified': True,
+            'chapters': 'count:4',
+            'timestamp': 1423689666,
         },
         'params': {
             'noplaylist': True,
             'skip_download': True,
-        }
+        },
     }, {
         'url': 'https://www.patreon.com/posts/episode-166-of-743933',
         'only_matching': True,
@@ -132,7 +145,7 @@ class PatreonIE(PatreonBaseIE):
             'description': 'md5:557a409bd79d3898689419094934ba79',
             'uploader_id': '14936315',
         },
-        'skip': 'Patron-only content'
+        'skip': 'Patron-only content',
     }, {
         # m3u8 video (https://github.com/yt-dlp/yt-dlp/issues/2277)
         'url': 'https://www.patreon.com/posts/video-sketchbook-32452882',
@@ -153,7 +166,7 @@ class PatreonIE(PatreonBaseIE):
             'channel_id': '1641751',
             'channel_url': 'https://www.patreon.com/loish',
             'channel_follower_count': int,
-        }
+        },
     }, {
         # bad videos under media (if media is included). Real one is under post_file
         'url': 'https://www.patreon.com/posts/premium-access-70282931',
@@ -176,13 +189,99 @@ class PatreonIE(PatreonBaseIE):
             'uploader_url': 'https://www.patreon.com/thenormies',
         },
         'skip': 'Patron-only content',
+    }, {
+        # dead vimeo and embed URLs, need to extract post_file
+        'url': 'https://www.patreon.com/posts/hunter-x-hunter-34007913',
+        'info_dict': {
+            'id': '34007913',
+            'ext': 'mp4',
+            'title': 'Hunter x Hunter | Kurapika DESTROYS Uvogin!!!',
+            'like_count': int,
+            'uploader': 'YaBoyRoshi',
+            'timestamp': 1581636833,
+            'channel_url': 'https://www.patreon.com/yaboyroshi',
+            'thumbnail': r're:^https?://.*$',
+            'tags': ['Hunter x Hunter'],
+            'uploader_id': '14264111',
+            'comment_count': int,
+            'channel_follower_count': int,
+            'description': 'Kurapika is a walking cheat code!',
+            'upload_date': '20200213',
+            'channel_id': '2147162',
+            'uploader_url': 'https://www.patreon.com/yaboyroshi',
+        },
+    }, {
+        # NSFW vimeo embed URL
+        'url': 'https://www.patreon.com/posts/4k-spiderman-4k-96414599',
+        'info_dict': {
+            'id': '902250943',
+            'ext': 'mp4',
+            'title': '❤️(4K) Spiderman Girl Yeonhwa’s Gift ❤️(4K) 스파이더맨걸 연화의 선물',
+            'description': '❤️(4K) Spiderman Girl Yeonhwa’s Gift \n❤️(4K) 스파이더맨걸 연화의 선물',
+            'uploader': 'Npickyeonhwa',
+            'uploader_id': '90574422',
+            'uploader_url': 'https://www.patreon.com/Yeonhwa726',
+            'channel_id': '10237902',
+            'channel_url': 'https://www.patreon.com/Yeonhwa726',
+            'duration': 70,
+            'timestamp': 1705150153,
+            'upload_date': '20240113',
+            'comment_count': int,
+            'like_count': int,
+            'thumbnail': r're:^https?://.+',
+        },
+        'params': {'skip_download': 'm3u8'},
+        'expected_warnings': ['Failed to parse XML: not well-formed'],
+    }, {
+        # multiple attachments/embeds
+        'url': 'https://www.patreon.com/posts/holy-wars-solos-100601977',
+        'playlist_count': 3,
+        'info_dict': {
+            'id': '100601977',
+            'title': '"Holy Wars" (Megadeth) Solos Transcription & Lesson/Analysis',
+            'description': 'md5:d099ab976edfce6de2a65c2b169a88d3',
+            'uploader': 'Bradley Hall',
+            'uploader_id': '24401883',
+            'uploader_url': 'https://www.patreon.com/bradleyhallguitar',
+            'channel_id': '3193932',
+            'channel_url': 'https://www.patreon.com/bradleyhallguitar',
+            'channel_follower_count': int,
+            'timestamp': 1710777855,
+            'upload_date': '20240318',
+            'like_count': int,
+            'comment_count': int,
+            'thumbnail': r're:^https?://.+',
+        },
+        'skip': 'Patron-only content',
+    }, {
+        # Contains a comment reply in the 'included' section
+        'url': 'https://www.patreon.com/posts/114721679',
+        'info_dict': {
+            'id': '114721679',
+            'ext': 'mp4',
+            'upload_date': '20241025',
+            'uploader': 'Japanalysis',
+            'like_count': int,
+            'thumbnail': r're:^https?://.+',
+            'comment_count': int,
+            'title': 'Karasawa Part 2',
+            'description': 'Part 2 of this video https://www.youtube.com/watch?v=Azms2-VTASk',
+            'uploader_url': 'https://www.patreon.com/japanalysis',
+            'uploader_id': '80504268',
+            'channel_url': 'https://www.patreon.com/japanalysis',
+            'channel_follower_count': int,
+            'timestamp': 1729897015,
+            'channel_id': '9346307',
+        },
+        'params': {'getcomments': True},
     }]
+    _RETURN_TYPE = 'video'
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
         post = self._call_api(
             f'posts/{video_id}', video_id, query={
-                'fields[media]': 'download_url,mimetype,size_bytes',
+                'fields[media]': 'download_url,mimetype,size_bytes,file_name',
                 'fields[post]': 'comment_count,content,embed,image,like_count,post_file,published_at,title,current_user_can_view',
                 'fields[user]': 'full_name,url',
                 'fields[post_tag]': 'value',
@@ -191,102 +290,120 @@ class PatreonIE(PatreonBaseIE):
                 'include': 'audio,user,user_defined_tags,campaign,attachments_media',
             })
         attributes = post['data']['attributes']
-        title = attributes['title'].strip()
-        image = attributes.get('image') or {}
-        info = {
-            'id': video_id,
-            'title': title,
-            'description': clean_html(attributes.get('content')),
-            'thumbnail': image.get('large_url') or image.get('url'),
-            'timestamp': parse_iso8601(attributes.get('published_at')),
-            'like_count': int_or_none(attributes.get('like_count')),
-            'comment_count': int_or_none(attributes.get('comment_count')),
-        }
-        can_view_post = traverse_obj(attributes, 'current_user_can_view')
-        if can_view_post and info['comment_count']:
-            info['__post_extractor'] = self.extract_comments(video_id)
+        info = traverse_obj(attributes, {
+            'title': ('title', {str.strip}),
+            'description': ('content', {clean_html}),
+            'thumbnail': ('image', ('large_url', 'url'), {url_or_none}, any),
+            'timestamp': ('published_at', {parse_iso8601}),
+            'like_count': ('like_count', {int_or_none}),
+            'comment_count': ('comment_count', {int_or_none}),
+        })
 
-        for i in post.get('included', []):
-            i_type = i.get('type')
-            if i_type == 'media':
-                media_attributes = i.get('attributes') or {}
-                download_url = media_attributes.get('download_url')
+        entries = []
+        idx = 0
+        for include in traverse_obj(post, ('included', lambda _, v: v['type'])):
+            include_type = include['type']
+            if include_type == 'media':
+                media_attributes = traverse_obj(include, ('attributes', {dict})) or {}
+                download_url = url_or_none(media_attributes.get('download_url'))
                 ext = mimetype2ext(media_attributes.get('mimetype'))
 
                 # if size_bytes is None, this media file is likely unavailable
                 # See: https://github.com/yt-dlp/yt-dlp/issues/4608
                 size_bytes = int_or_none(media_attributes.get('size_bytes'))
                 if download_url and ext in KNOWN_EXTENSIONS and size_bytes is not None:
-                    # XXX: what happens if there are multiple attachments?
-                    return {
-                        **info,
+                    idx += 1
+                    entries.append({
+                        'id': f'{video_id}-{idx}',
                         'ext': ext,
                         'filesize': size_bytes,
                         'url': download_url,
-                    }
-            elif i_type == 'user':
-                user_attributes = i.get('attributes')
-                if user_attributes:
-                    info.update({
-                        'uploader': user_attributes.get('full_name'),
-                        'uploader_id': str_or_none(i.get('id')),
-                        'uploader_url': user_attributes.get('url'),
+                        'alt_title': traverse_obj(media_attributes, ('file_name', {str})),
                     })
 
-            elif i_type == 'post_tag':
-                info.setdefault('tags', []).append(traverse_obj(i, ('attributes', 'value')))
+            elif include_type == 'user':
+                info.update(traverse_obj(include, {
+                    'uploader': ('attributes', 'full_name', {str}),
+                    'uploader_id': ('id', {str_or_none}),
+                    'uploader_url': ('attributes', 'url', {url_or_none}),
+                }))
 
-            elif i_type == 'campaign':
-                info.update({
-                    'channel': traverse_obj(i, ('attributes', 'title')),
-                    'channel_id': str_or_none(i.get('id')),
-                    'channel_url': traverse_obj(i, ('attributes', 'url')),
-                    'channel_follower_count': int_or_none(traverse_obj(i, ('attributes', 'patron_count'))),
-                })
+            elif include_type == 'post_tag':
+                if post_tag := traverse_obj(include, ('attributes', 'value', {str})):
+                    info.setdefault('tags', []).append(post_tag)
+
+            elif include_type == 'campaign':
+                info.update(traverse_obj(include, {
+                    'channel': ('attributes', 'title', {str}),
+                    'channel_id': ('id', {str_or_none}),
+                    'channel_url': ('attributes', 'url', {url_or_none}),
+                    'channel_follower_count': ('attributes', 'patron_count', {int_or_none}),
+                }))
+
+        # all-lowercase 'referer' so we can smuggle it to Generic, SproutVideo, Vimeo
+        headers = {'referer': 'https://patreon.com/'}
 
         # handle Vimeo embeds
-        if try_get(attributes, lambda x: x['embed']['provider']) == 'Vimeo':
-            embed_html = try_get(attributes, lambda x: x['embed']['html'])
-            v_url = url_or_none(compat_urllib_parse_unquote(
-                self._search_regex(r'(https(?:%3A%2F%2F|://)player\.vimeo\.com.+app_id(?:=|%3D)+\d+)', embed_html, 'vimeo url', fatal=False)))
-            if v_url:
-                return {
-                    **info,
-                    '_type': 'url_transparent',
-                    'url': VimeoIE._smuggle_referrer(v_url, 'https://patreon.com'),
-                    'ie_key': 'Vimeo',
-                }
+        if traverse_obj(attributes, ('embed', 'provider')) == 'Vimeo':
+            v_url = urllib.parse.unquote(self._html_search_regex(
+                r'(https(?:%3A%2F%2F|://)player\.vimeo\.com.+app_id(?:=|%3D)+\d+)',
+                traverse_obj(attributes, ('embed', 'html', {str})), 'vimeo url', fatal=False) or '')
+            if url_or_none(v_url) and self._request_webpage(
+                    v_url, video_id, 'Checking Vimeo embed URL', headers=headers,
+                    fatal=False, errnote=False, expected_status=429):  # 429 is TLS fingerprint rejection
+                entries.append(self.url_result(
+                    VimeoIE._smuggle_referrer(v_url, 'https://patreon.com/'),
+                    VimeoIE, url_transparent=True))
 
-        embed_url = try_get(attributes, lambda x: x['embed']['url'])
-        if embed_url:
-            return {
-                **info,
-                '_type': 'url',
-                'url': embed_url,
-            }
+        embed_url = traverse_obj(attributes, ('embed', 'url', {url_or_none}))
+        if embed_url and (urlh := self._request_webpage(
+                embed_url, video_id, 'Checking embed URL', headers=headers,
+                fatal=False, errnote=False, expected_status=403)):
+            # Vimeo's Cloudflare anti-bot protection will return HTTP status 200 for 404, so we need
+            # to check for "Sorry, we couldn&amp;rsquo;t find that page" in the meta description tag
+            meta_description = clean_html(self._html_search_meta(
+                'description', self._webpage_read_content(urlh, embed_url, video_id, fatal=False), default=None))
+            # Password-protected vids.io embeds return 403 errors w/o --video-password or session cookie
+            if ((urlh.status != 403 and meta_description != 'Sorry, we couldn’t find that page')
+                    or VidsIoIE.suitable(embed_url)):
+                entries.append(self.url_result(smuggle_url(embed_url, headers)))
 
-        post_file = traverse_obj(attributes, 'post_file')
+        post_file = traverse_obj(attributes, ('post_file', {dict}))
         if post_file:
             name = post_file.get('name')
             ext = determine_ext(name)
             if ext in KNOWN_EXTENSIONS:
-                return {
-                    **info,
+                entries.append({
+                    'id': video_id,
                     'ext': ext,
                     'url': post_file['url'],
-                }
-            elif name == 'video':
+                })
+            elif name == 'video' or determine_ext(post_file.get('url')) == 'm3u8':
                 formats, subtitles = self._extract_m3u8_formats_and_subtitles(post_file['url'], video_id)
-                return {
-                    **info,
+                entries.append({
+                    'id': video_id,
                     'formats': formats,
                     'subtitles': subtitles,
-                }
+                })
 
-        if can_view_post is False:
+        can_view_post = traverse_obj(attributes, 'current_user_can_view')
+        comments = None
+        if can_view_post and info.get('comment_count'):
+            comments = self.extract_comments(video_id)
+
+        if not entries and can_view_post is False:
             self.raise_no_formats('You do not have access to this post', video_id=video_id, expected=True)
-        else:
+        elif not entries:
             self.raise_no_formats('No supported media found in this post', video_id=video_id, expected=True)
+        elif len(entries) == 1:
+            info.update(entries[0])
+        else:
+            for entry in entries:
+                entry.update(info)
+            return self.playlist_result(entries, video_id, **info, __post_extractor=comments)
+
+        info['id'] = video_id
+        info['__post_extractor'] = comments
         return info
 
     def _get_comments(self, post_id):
@@ -307,29 +424,27 @@ class PatreonIE(PatreonBaseIE):
 
             params.update({'page[cursor]': cursor} if cursor else {})
             response = self._call_api(
-                f'posts/{post_id}/comments', post_id, query=params, note='Downloading comments page %d' % page)
+                f'posts/{post_id}/comments', post_id, query=params, note=f'Downloading comments page {page}')
 
             cursor = None
-            for comment in traverse_obj(response, (('data', ('included', lambda _, v: v['type'] == 'comment')), ...)):
+            for comment in traverse_obj(response, (('data', 'included'), lambda _, v: v['type'] == 'comment' and v['id'])):
                 count += 1
-                comment_id = comment.get('id')
-                attributes = comment.get('attributes') or {}
-                if comment_id is None:
-                    continue
                 author_id = traverse_obj(comment, ('relationships', 'commenter', 'data', 'id'))
-                author_info = traverse_obj(
-                    response, ('included', lambda _, v: v['id'] == author_id and v['type'] == 'user', 'attributes'),
-                    get_all=False, expected_type=dict, default={})
 
                 yield {
-                    'id': comment_id,
-                    'text': attributes.get('body'),
-                    'timestamp': parse_iso8601(attributes.get('created')),
-                    'parent': traverse_obj(comment, ('relationships', 'parent', 'data', 'id'), default='root'),
-                    'author_is_uploader': attributes.get('is_by_creator'),
+                    **traverse_obj(comment, {
+                        'id': ('id', {str_or_none}),
+                        'text': ('attributes', 'body', {str}),
+                        'timestamp': ('attributes', 'created', {parse_iso8601}),
+                        'parent': ('relationships', 'parent', 'data', ('id', {value('root')}), {str}, any),
+                        'author_is_uploader': ('attributes', 'is_by_creator', {bool}),
+                    }),
+                    **traverse_obj(response, (
+                        'included', lambda _, v: v['id'] == author_id and v['type'] == 'user', 'attributes', {
+                            'author': ('full_name', {str}),
+                            'author_thumbnail': ('image_url', {url_or_none}),
+                        }), get_all=False),
                     'author_id': author_id,
-                    'author': author_info.get('full_name'),
-                    'author_thumbnail': author_info.get('image_url'),
                 }
 
             if count < traverse_obj(response, ('meta', 'count')):
@@ -340,15 +455,19 @@ class PatreonIE(PatreonBaseIE):
 
 
 class PatreonCampaignIE(PatreonBaseIE):
-
-    _VALID_URL = r'https?://(?:www\.)?patreon\.com/(?!rss)(?:(?:m/(?P<campaign_id>\d+))|(?P<vanity>[-\w]+))'
+    IE_NAME = 'patreon:campaign'
+    _VALID_URL = r'''(?x)
+        https?://(?:www\.)?patreon\.com/(?:
+            (?:m|api/campaigns)/(?P<campaign_id>\d+)|
+            (?:c/)?(?P<vanity>(?!creation[?/]|posts/|rss[?/])[\w-]+)
+        )(?:/posts)?/?(?:$|[?#])'''
     _TESTS = [{
         'url': 'https://www.patreon.com/dissonancepod/',
         'info_dict': {
             'title': 'Cognitive Dissonance Podcast',
             'channel_url': 'https://www.patreon.com/dissonancepod',
             'id': '80642',
-            'description': 'md5:eb2fa8b83da7ab887adeac34da6b7af7',
+            'description': r're:(?s).*We produce a weekly news podcast focusing on stories that deal with skepticism and religion.*',
             'channel_id': '80642',
             'channel': 'Cognitive Dissonance Podcast',
             'age_limit': 0,
@@ -363,31 +482,66 @@ class PatreonCampaignIE(PatreonBaseIE):
         'url': 'https://www.patreon.com/m/4767637/posts',
         'info_dict': {
             'title': 'Not Just Bikes',
-            'channel_follower_count': int,
             'id': '4767637',
             'channel_id': '4767637',
             'channel_url': 'https://www.patreon.com/notjustbikes',
-            'description': 'md5:595c6e7dca76ae615b1d38c298a287a1',
+            'description': r're:(?s).*Not Just Bikes started as a way to explain why we chose to live in the Netherlands.*',
             'age_limit': 0,
             'channel': 'Not Just Bikes',
             'uploader_url': 'https://www.patreon.com/notjustbikes',
-            'uploader': 'Not Just Bikes',
+            'uploader': 'Jason',
             'uploader_id': '37306634',
             'thumbnail': r're:^https?://.*$',
         },
-        'playlist_mincount': 71
+        'playlist_mincount': 71,
+    }, {
+        'url': 'https://www.patreon.com/api/campaigns/4243769/posts',
+        'info_dict': {
+            'title': 'Second Thought',
+            'channel_follower_count': int,
+            'id': '4243769',
+            'channel_id': '4243769',
+            'channel_url': 'https://www.patreon.com/secondthought',
+            'description': r're:(?s).*Second Thought is an educational YouTube channel.*',
+            'age_limit': 0,
+            'channel': 'Second Thought',
+            'uploader_url': 'https://www.patreon.com/secondthought',
+            'uploader': 'JT Chapman',
+            'uploader_id': '32718287',
+            'thumbnail': r're:^https?://.*$',
+        },
+        'playlist_mincount': 201,
+    }, {
+        'url': 'https://www.patreon.com/c/OgSog',
+        'info_dict': {
+            'id': '8504388',
+            'title': 'OGSoG',
+            'description': r're:(?s)Hello and welcome to our Patreon page. We are Mari, Lasercorn, .+',
+            'channel': 'OGSoG',
+            'channel_id': '8504388',
+            'channel_url': 'https://www.patreon.com/OgSog',
+            'uploader_url': 'https://www.patreon.com/OgSog',
+            'uploader_id': '72323575',
+            'uploader': 'David Moss',
+            'thumbnail': r're:https?://.+/.+',
+            'channel_follower_count': int,
+            'age_limit': 0,
+        },
+        'playlist_mincount': 331,
+    }, {
+        'url': 'https://www.patreon.com/c/OgSog/posts',
+        'only_matching': True,
     }, {
         'url': 'https://www.patreon.com/dissonancepod/posts',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.patreon.com/m/5932659',
-        'only_matching': True
+        'only_matching': True,
+    }, {
+        'url': 'https://www.patreon.com/api/campaigns/4243769',
+        'only_matching': True,
     }]
 
-    @classmethod
-    def suitable(cls, url):
-        return False if PatreonIE.suitable(url) else super(PatreonCampaignIE, cls).suitable(url)
-
     def _entries(self, campaign_id):
         cursor = None
         params = {
@@ -401,7 +555,7 @@ class PatreonCampaignIE(PatreonBaseIE):
         for page in itertools.count(1):
 
             params.update({'page[cursor]': cursor} if cursor else {})
-            posts_json = self._call_api('posts', campaign_id, query=params, note='Downloading posts page %d' % page)
+            posts_json = self._call_api('posts', campaign_id, query=params, note=f'Downloading posts page {page}')
 
             cursor = traverse_obj(posts_json, ('meta', 'pagination', 'cursors', 'next'))
             for post_url in traverse_obj(posts_json, ('data', ..., 'attributes', 'patreon_url')):
@@ -414,14 +568,15 @@ class PatreonCampaignIE(PatreonBaseIE):
 
         campaign_id, vanity = self._match_valid_url(url).group('campaign_id', 'vanity')
         if campaign_id is None:
-            webpage = self._download_webpage(url, vanity, headers={'User-Agent': self.USER_AGENT})
-            campaign_id = self._search_regex(r'https://www.patreon.com/api/campaigns/(\d+)/?', webpage, 'Campaign ID')
+            webpage = self._download_webpage(url, vanity, headers={'User-Agent': self.patreon_user_agent})
+            campaign_id = self._search_nextjs_data(
+                webpage, vanity)['props']['pageProps']['bootstrapEnvelope']['pageBootstrap']['campaign']['data']['id']
 
         params = {
             'json-api-use-default-includes': 'false',
             'fields[user]': 'full_name,url',
             'fields[campaign]': 'name,summary,url,patron_count,creation_count,is_nsfw,avatar_photo_url',
-            'include': 'creator'
+            'include': 'creator',
         }
 
         campaign_response = self._call_api(
diff --git a/plugins/youtube_download/yt_dlp/extractor/pbs.py b/plugins/youtube_download/yt_dlp/extractor/pbs.py
index 2bb2ea9..53b1994 100644
--- a/plugins/youtube_download/yt_dlp/extractor/pbs.py
+++ b/plugins/youtube_download/yt_dlp/extractor/pbs.py
@@ -1,12 +1,12 @@
 import re
 
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
+    US_RATINGS,
     ExtractorError,
     determine_ext,
-    int_or_none,
     float_or_none,
+    int_or_none,
     js_to_json,
     orderedSet,
     strip_jsonp,
@@ -14,7 +14,6 @@ from ..utils import (
     traverse_obj,
     unified_strdate,
     url_or_none,
-    US_RATINGS,
 )
 
 
@@ -48,7 +47,7 @@ class PBSIE(InfoExtractor):
         (r'video\.kpbs\.org', 'KPBS San Diego (KPBS)'),  # http://www.kpbs.org/
         (r'video\.kqed\.org', 'KQED (KQED)'),  # http://www.kqed.org
         (r'vids\.kvie\.org', 'KVIE Public Television (KVIE)'),  # http://www.kvie.org
-        (r'video\.pbssocal\.org', 'PBS SoCal/KOCE (KOCE)'),  # http://www.pbssocal.org/
+        (r'(?:video\.|www\.)pbssocal\.org', 'PBS SoCal/KOCE (KOCE)'),  # http://www.pbssocal.org/
         (r'video\.valleypbs\.org', 'ValleyPBS (KVPT)'),  # http://www.valleypbs.org/
         (r'video\.cptv\.org', 'CONNECTICUT PUBLIC TELEVISION (WEDH)'),  # http://cptv.org
         (r'watch\.knpb\.org', 'KNPB Channel 5 (KNPB)'),  # http://www.knpb.org/
@@ -62,7 +61,7 @@ class PBSIE(InfoExtractor):
         (r'video\.wyomingpbs\.org', 'Wyoming PBS (KCWC)'),  # http://www.wyomingpbs.org
         (r'video\.cpt12\.org', 'Colorado Public Television / KBDI 12 (KBDI)'),  # http://www.cpt12.org/
         (r'video\.kbyueleven\.org', 'KBYU-TV (KBYU)'),  # http://www.kbyutv.org/
-        (r'video\.thirteen\.org', 'Thirteen/WNET New York (WNET)'),  # http://www.thirteen.org
+        (r'(?:video\.|www\.)thirteen\.org', 'Thirteen/WNET New York (WNET)'),  # http://www.thirteen.org
         (r'video\.wgbh\.org', 'WGBH/Channel 2 (WGBH)'),  # http://wgbh.org
         (r'video\.wgby\.org', 'WGBY (WGBY)'),  # http://www.wgby.org
         (r'watch\.njtvonline\.org', 'NJTV Public Media NJ (WNJT)'),  # http://www.njtvonline.org/
@@ -182,18 +181,19 @@ class PBSIE(InfoExtractor):
     )
 
     IE_NAME = 'pbs'
-    IE_DESC = 'Public Broadcasting Service (PBS) and member stations: %s' % ', '.join(list(zip(*_STATIONS))[1])
+    IE_DESC = 'Public Broadcasting Service (PBS) and member stations: {}'.format(', '.join(list(zip(*_STATIONS))[1]))
 
     _VALID_URL = r'''(?x)https?://
         (?:
-           # Direct video URL
-           (?:%s)/(?:(?:vir|port)alplayer|video)/(?P<id>[0-9]+)(?:[?/]|$) |
-           # Article with embedded player (or direct video)
-           (?:www\.)?pbs\.org/(?:[^/]+/){1,5}(?P<presumptive_id>[^/]+?)(?:\.html)?/?(?:$|[?\#]) |
-           # Player
-           (?:video|player)\.pbs\.org/(?:widget/)?partnerplayer/(?P<player_id>[^/]+)
+            # Player
+            (?:video|player)\.pbs\.org/(?:widget/)?partnerplayer/(?P<player_id>[^/?#]+) |
+            # Direct video URL, or article with embedded player
+            (?:{})/(?:
+              (?:(?:vir|port)alplayer|video)/(?P<id>[0-9]+)(?:[?/#]|$) |
+              (?:[^/?#]+/){{1,5}}(?P<presumptive_id>[^/?#]+?)(?:\.html)?/?(?:$|[?#])
+            )
         )
-    ''' % '|'.join(list(zip(*_STATIONS))[0])
+    '''.format('|'.join(next(zip(*_STATIONS))))
 
     _GEO_COUNTRIES = ['US']
 
@@ -208,16 +208,40 @@ class PBSIE(InfoExtractor):
                 'description': 'md5:31b664af3c65fd07fa460d306b837d00',
                 'duration': 3190,
             },
+            'skip': 'dead URL',
+        },
+        {
+            'url': 'https://www.thirteen.org/programs/the-woodwrights-shop/carving-away-with-mary-may-tioglz/',
+            'info_dict': {
+                'id': '3004803331',
+                'ext': 'mp4',
+                'title': "The Woodwright's Shop - Carving Away with Mary May",
+                'description': 'md5:7cbaaaa8b9bcc78bd8f0e31911644e28',
+                'duration': 1606,
+                'display_id': 'carving-away-with-mary-may-tioglz',
+                'chapters': [],
+                'thumbnail': 'https://image.pbs.org/video-assets/NcnTxNl-asset-mezzanine-16x9-K0Keoyv.jpg',
+            },
         },
         {
             'url': 'http://www.pbs.org/wgbh/pages/frontline/losing-iraq/',
-            'md5': '6f722cb3c3982186d34b0f13374499c7',
+            'md5': '372b12b670070de39438b946474df92f',
             'info_dict': {
                 'id': '2365297690',
                 'ext': 'mp4',
                 'title': 'FRONTLINE - Losing Iraq',
                 'description': 'md5:5979a4d069b157f622d02bff62fbe654',
                 'duration': 5050,
+                'chapters': [
+                    {'start_time': 0.0, 'end_time': 1234.0, 'title': 'After Saddam, Chaos'},
+                    {'start_time': 1233.0, 'end_time': 1719.0, 'title': 'The Insurgency Takes Root'},
+                    {'start_time': 1718.0, 'end_time': 2461.0, 'title': 'A Light Footprint'},
+                    {'start_time': 2460.0, 'end_time': 3589.0, 'title': 'The Surge '},
+                    {'start_time': 3588.0, 'end_time': 4355.0, 'title': 'The Withdrawal '},
+                    {'start_time': 4354.0, 'end_time': 5051.0, 'title': 'ISIS on the March '},
+                ],
+                'display_id': 'losing-iraq',
+                'thumbnail': 'https://image.pbs.org/video-assets/pbs/frontline/138098/images/mezzanine_401.jpg',
             },
         },
         {
@@ -404,6 +428,19 @@ class PBSIE(InfoExtractor):
             },
             'expected_warnings': ['HTTP Error 403: Forbidden'],
         },
+        {
+            'url': 'https://www.pbssocal.org/shows/newshour/clip/capehart-johnson-1715984001',
+            'info_dict': {
+                'id': '3091549094',
+                'ext': 'mp4',
+                'title': 'PBS NewsHour - Capehart and Johnson on the unusual Biden-Trump debate plans',
+                'description': 'Capehart and Johnson on how the Biden-Trump debates could shape the campaign season',
+                'display_id': 'capehart-johnson-1715984001',
+                'duration': 593,
+                'thumbnail': 'https://image.pbs.org/video-assets/mF3oSVn-asset-mezzanine-16x9-QeXjXPy.jpg',
+                'chapters': [],
+            },
+        },
         {
             'url': 'http://player.pbs.org/widget/partnerplayer/2365297708/?start=0&end=0&chapterbar=false&endscreen=false&topbar=true',
             'only_matching': True,
@@ -415,7 +452,7 @@ class PBSIE(InfoExtractor):
         {
             'url': 'https://player.pbs.org/portalplayer/3004638221/?uid=',
             'only_matching': True,
-        }
+        },
     ]
     _ERRORS = {
         101: 'We\'re sorry, but this video is not yet available.',
@@ -464,10 +501,12 @@ class PBSIE(InfoExtractor):
                 r"div\s*:\s*'videoembed'\s*,\s*mediaid\s*:\s*'(\d+)'",  # frontline video embed
                 r'class="coveplayerid">([^<]+)<',                       # coveplayer
                 r'<section[^>]+data-coveid="(\d+)"',                    # coveplayer from http://www.pbs.org/wgbh/frontline/film/real-csi/
+                r'\sclass="passportcoveplayer"[^>]*\sdata-media="(\d+)',  # https://www.thirteen.org/programs/the-woodwrights-shop/who-wrote-the-book-of-sloyd-fggvvq/
                 r'<input type="hidden" id="pbs_video_id_[0-9]+" value="([0-9]+)"/>',  # jwplayer
                 r"(?s)window\.PBS\.playerConfig\s*=\s*{.*?id\s*:\s*'([0-9]+)',",
                 r'<div[^>]+\bdata-cove-id=["\'](\d+)"',  # http://www.pbs.org/wgbh/roadshow/watch/episode/2105-indianapolis-hour-2/
                 r'<iframe[^>]+\bsrc=["\'](?:https?:)?//video\.pbs\.org/widget/partnerplayer/(\d+)',  # https://www.pbs.org/wgbh/masterpiece/episodes/victoria-s2-e1/
+                r'\bhttps?://player\.pbs\.org/[\w-]+player/(\d+)',      # last pattern to avoid false positives
             ]
 
             media_id = self._search_regex(
@@ -518,7 +557,7 @@ class PBSIE(InfoExtractor):
             if not video_id:
                 video_info = self._extract_video_data(
                     player_page, 'video data', display_id)
-                video_id = compat_str(
+                video_id = str(
                     video_info.get('id') or video_info['contentID'])
         else:
             video_id = mobj.group('id')
@@ -539,7 +578,7 @@ class PBSIE(InfoExtractor):
 
         if isinstance(video_id, list):
             entries = [self.url_result(
-                'http://video.pbs.org/video/%s' % vid_id, 'PBS', vid_id)
+                f'http://video.pbs.org/video/{vid_id}', 'PBS', vid_id)
                 for vid_id in video_id]
             return self.playlist_result(entries, display_id)
 
@@ -568,11 +607,11 @@ class PBSIE(InfoExtractor):
         # Player pages may also serve different qualities
         for page in ('widget/partnerplayer', 'portalplayer'):
             player = self._download_webpage(
-                'http://player.pbs.org/%s/%s' % (page, video_id),
-                display_id, 'Downloading %s page' % page, fatal=False)
+                f'http://player.pbs.org/{page}/{video_id}',
+                display_id, f'Downloading {page} page', fatal=False)
             if player:
                 video_info = self._extract_video_data(
-                    player, '%s video data' % page, display_id, fatal=False)
+                    player, f'{page} video data', display_id, fatal=False)
                 if video_info:
                     extract_redirect_urls(video_info)
                     if not info:
@@ -603,7 +642,7 @@ class PBSIE(InfoExtractor):
             redirect_id = redirect.get('eeid')
 
             redirect_info = self._download_json(
-                '%s?format=json' % redirect['url'], display_id,
+                '{}?format=json'.format(redirect['url']), display_id,
                 'Downloading %s video url info' % (redirect_id or num),
                 headers=self.geo_verification_headers())
 
@@ -614,7 +653,7 @@ class PBSIE(InfoExtractor):
                     self.raise_geo_restricted(
                         msg=message, countries=self._GEO_COUNTRIES)
                 raise ExtractorError(
-                    '%s said: %s' % (self.IE_NAME, message), expected=True)
+                    f'{self.IE_NAME} said: {message}', expected=True)
 
             format_url = redirect_info.get('url')
             if not format_url:
@@ -649,7 +688,7 @@ class PBSIE(InfoExtractor):
                 f_url = re.sub(r'\d+k|baseline', bitrate + 'k', http_url)
                 # This may produce invalid links sometimes (e.g.
                 # http://www.pbs.org/wgbh/frontline/film/suicide-plan)
-                if not self._is_valid_url(f_url, display_id, 'http-%sk video' % bitrate):
+                if not self._is_valid_url(f_url, display_id, f'http-{bitrate}k video'):
                     continue
                 f = m3u8_format.copy()
                 f.update({
@@ -671,7 +710,7 @@ class PBSIE(InfoExtractor):
         captions = info.get('cc') or {}
         for caption_url in captions.values():
             subtitles.setdefault('en', []).append({
-                'url': caption_url
+                'url': caption_url,
             })
         subtitles = self._merge_subtitles(subtitles, hls_subs)
 
@@ -715,7 +754,7 @@ class PBSKidsIE(InfoExtractor):
                 'description': 'md5:d006b2211633685d8ebc8d03b6d5611e',
                 'categories': ['Episode'],
                 'upload_date': '20190718',
-            }
+            },
         },
         {
             'url': 'https://pbskids.org/video/plum-landing/2365205059',
@@ -730,8 +769,8 @@ class PBSKidsIE(InfoExtractor):
                 'description': 'md5:657e5fc4356a84ead1c061eb280ff05d',
                 'categories': ['Episode'],
                 'upload_date': '20140302',
-            }
-        }
+            },
+        },
     ]
 
     def _real_extract(self, url):
@@ -753,5 +792,5 @@ class PBSKidsIE(InfoExtractor):
                 'series': ('video_obj', 'program_title', {str}),
                 'title': ('video_obj', 'title', {str}),
                 'upload_date': ('video_obj', 'air_date', {unified_strdate}),
-            })
+            }),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/pearvideo.py b/plugins/youtube_download/yt_dlp/extractor/pearvideo.py
index e27e5a7..4bea04b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/pearvideo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/pearvideo.py
@@ -3,8 +3,8 @@ import re
 from .common import InfoExtractor
 from ..utils import (
     qualities,
-    unified_timestamp,
     traverse_obj,
+    unified_timestamp,
 )
 
 
@@ -19,7 +19,7 @@ class PearVideoIE(InfoExtractor):
             'description': 'md5:01d576b747de71be0ee85eb7cac25f9d',
             'timestamp': 1494275280,
             'upload_date': '20170508',
-        }
+        },
     }
 
     def _real_extract(self, url):
@@ -43,7 +43,7 @@ class PearVideoIE(InfoExtractor):
                 query={'contId': video_id}, headers={'Referer': url})
             formats = [{
                 'format_id': k,
-                'url': v.replace(info['systemTime'], f'cont-{video_id}') if k == 'srcUrl' else v
+                'url': v.replace(info['systemTime'], f'cont-{video_id}') if k == 'srcUrl' else v,
             } for k, v in traverse_obj(info, ('videoInfo', 'videos'), default={}).items() if v]
 
         title = self._search_regex(
diff --git a/plugins/youtube_download/yt_dlp/extractor/peekvids.py b/plugins/youtube_download/yt_dlp/extractor/peekvids.py
index d1fc058..939c26d 100644
--- a/plugins/youtube_download/yt_dlp/extractor/peekvids.py
+++ b/plugins/youtube_download/yt_dlp/extractor/peekvids.py
@@ -146,7 +146,6 @@ class PlayVidsIE(PeekVidsBaseIE):
             'uploader': 'Brazzers',
             'age_limit': 18,
             'view_count': int,
-            'age_limit': 18,
             'categories': list,
             'tags': list,
         },
@@ -158,7 +157,6 @@ class PlayVidsIE(PeekVidsBaseIE):
             'display_id': '47iUho33toY',
             'ext': 'mp4',
             'title': 'KATEE OWEN STRIPTIASE IN SEXY RED LINGERIE',
-            'description': None,
             'timestamp': 1507052209,
             'upload_date': '20171003',
             'thumbnail': r're:^https?://.*\.jpg$',
@@ -177,7 +175,6 @@ class PlayVidsIE(PeekVidsBaseIE):
             'display_id': 'z3_7iwWCmqt',
             'ext': 'mp4',
             'title': 'SEXY TEEN FILIPINA STRIPTEASE - Beautiful Pinay Bargirl Strips and Dances',
-            'description': None,
             'timestamp': 1607470323,
             'upload_date': '20201208',
             'thumbnail': r're:^https?://.*\.jpg$',
diff --git a/plugins/youtube_download/yt_dlp/extractor/peertube.py b/plugins/youtube_download/yt_dlp/extractor/peertube.py
index 68e1573..2b69c7e 100644
--- a/plugins/youtube_download/yt_dlp/extractor/peertube.py
+++ b/plugins/youtube_download/yt_dlp/extractor/peertube.py
@@ -2,8 +2,8 @@ import functools
 import re
 
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
+    OnDemandPagedList,
     format_field,
     int_or_none,
     parse_resolution,
@@ -12,643 +12,908 @@ from ..utils import (
     unified_timestamp,
     url_or_none,
     urljoin,
-    OnDemandPagedList,
 )
 
 
 class PeerTubeIE(InfoExtractor):
     _INSTANCES_RE = r'''(?:
                             # Taken from https://instances.joinpeertube.org/instances
-                            40two\.tube|
-                            a\.metube\.ch|
-                            advtv\.ml|
-                            algorithmic\.tv|
-                            alimulama\.com|
-                            arcana\.fun|
-                            archive\.vidicon\.org|
-                            artefac-paris\.tv|
-                            auf1\.eu|
+                            0ch\.tv|
+                            3dctube\.3dcandy\.social|
+                            all\.electric\.kitchen|
+                            alterscope\.fr|
+                            anarchy\.tube|
+                            apathy\.tv|
+                            apertatube\.net|
+                            archive\.nocopyrightintended\.tv|
+                            archive\.reclaim\.tv|
+                            area51\.media|
+                            astrotube-ufe\.obspm\.fr|
+                            astrotube\.obspm\.fr|
+                            audio\.freediverse\.com|
+                            azxtube\.youssefc\.tn|
+                            bark\.video|
                             battlepenguin\.video|
-                            beertube\.epgn\.ch|
-                            befree\.nohost\.me|
+                            bava\.tv|
+                            bee-tube\.fr|
+                            beetoons\.tv|
+                            biblion\.refchat\.net|
+                            biblioteca\.theowlclub\.net|
                             bideoak\.argia\.eus|
-                            birkeundnymphe\.de|
+                            bideoteka\.eus|
+                            birdtu\.be|
                             bitcointv\.com|
-                            cattube\.org|
-                            clap\.nerv-project\.eu|
-                            climatejustice\.video|
+                            bonn\.video|
+                            breeze\.tube|
+                            brioco\.live|
+                            brocosoup\.fr|
+                            canal\.facil\.services|
+                            canard\.tube|
+                            cdn01\.tilvids\.com|
+                            celluloid-media\.huma-num\.fr|
+                            chicago1\.peertube\.support|
+                            cliptube\.org|
+                            cloudtube\.ise\.fraunhofer\.de|
                             comf\.tube|
+                            comics\.peertube\.biz|
+                            commons\.tube|
+                            communitymedia\.video|
                             conspiracydistillery\.com|
+                            crank\.recoil\.org|
+                            dalek\.zone|
+                            dalliance\.network|
+                            dangly\.parts|
                             darkvapor\.nohost\.me|
                             daschauher\.aksel\.rocks|
                             digitalcourage\.video|
-                            dreiecksnebel\.alex-detsch\.de|
-                            eduvid\.org|
+                            displayeurope\.video|
+                            ds106\.tv|
+                            dud-video\.inf\.tu-dresden\.de|
+                            dud175\.inf\.tu-dresden\.de|
+                            dytube\.com|
+                            ebildungslabor\.video|
                             evangelisch\.video|
-                            exo\.tube|
                             fair\.tube|
+                            fedi\.video|
+                            fedimovie\.com|
                             fediverse\.tv|
                             film\.k-prod\.fr|
-                            flim\.txmn\.tk|
+                            flipboard\.video|
+                            foss\.video|
+                            fossfarmers\.company|
                             fotogramas\.politicaconciencia\.org|
-                            ftsi\.ru|
-                            gary\.vger\.cloud|
-                            graeber\.video|
+                            freediverse\.com|
+                            freesoto-u2151\.vm\.elestio\.app|
+                            freesoto\.tv|
+                            garr\.tv|
                             greatview\.video|
                             grypstube\.uni-greifswald\.de|
-                            highvoltage\.tv|
-                            hpstube\.fr|
-                            htp\.live|
-                            hyperreal\.tube|
+                            habratube\.site|
+                            ilbjach\.ru|
+                            infothema\.net|
+                            itvplus\.iiens\.net|
+                            johnydeep\.net|
                             juggling\.digital|
+                            jupiter\.tube|
+                            kadras\.live|
                             kino\.kompot\.si|
                             kino\.schuerz\.at|
                             kinowolnosc\.pl|
                             kirche\.peertube-host\.de|
+                            kiwi\.froggirl\.club|
                             kodcast\.com|
                             kolektiva\.media|
-                            kraut\.zone|
+                            kpop\.22x22\.ru|
                             kumi\.tube|
+                            la2\.peertube\.support|
+                            la3\.peertube\.support|
+                            la4\.peertube\.support|
                             lastbreach\.tv|
-                            lepetitmayennais\.fr\.nf|
-                            lexx\.impa\.me|
-                            libertynode\.tv|
-                            libra\.syntazia\.org|
-                            libremedia\.video|
+                            lawsplaining\.peertube\.biz|
+                            leopard\.tube|
+                            live\.codinglab\.ch|
                             live\.libratoi\.org|
-                            live\.nanao\.moe|
-                            live\.toobnix\.org|
-                            livegram\.net|
-                            lolitube\.freedomchan\.moe|
+                            live\.oldskool\.fi|
+                            live\.solari\.com|
                             lucarne\.balsamine\.be|
-                            maindreieck-tv\.de|
-                            mani\.tube|
-                            manicphase\.me|
+                            luxtube\.lu|
+                            makertube\.net|
+                            media\.econoalchemist\.com|
+                            media\.exo\.cat|
                             media\.fsfe\.org|
                             media\.gzevd\.de|
-                            media\.inno3\.cricket|
-                            media\.kaitaia\.life|
+                            media\.interior\.edu\.uy|
                             media\.krashboyz\.org|
-                            media\.over-world\.org|
-                            media\.skewed\.de|
+                            media\.mzhd\.de|
+                            media\.smz-ma\.de|
+                            media\.theplattform\.net|
                             media\.undeadnetwork\.de|
+                            medias\.debrouillonet\.org|
                             medias\.pingbase\.net|
+                            mediatube\.fermalo\.fr|
                             melsungen\.peertube-host\.de|
-                            mirametube\.fr|
-                            mojotube\.net|
-                            monplaisirtube\.ddns\.net|
+                            merci-la-police\.fr|
+                            mindlyvideos\.com|
+                            mirror\.peertube\.metalbanana\.net|
+                            mirrored\.rocks|
+                            mix\.video|
                             mountaintown\.video|
-                            my\.bunny\.cafe|
-                            myfreetube\.de|
+                            movies\.metricsmaster\.eu|
+                            mtube\.mooo\.com|
                             mytube\.kn-cloud\.de|
+                            mytube\.le5emeaxe\.fr|
                             mytube\.madzel\.de|
-                            myworkoutarenapeertube\.cf|
+                            nadajemy\.com|
                             nanawel-peertube\.dyndns\.org|
-                            nastub\.cz|
-                            offenes\.tv|
-                            orgdup\.media|
-                            ovaltube\.codinglab\.ch|
+                            neat\.tube|
+                            nethack\.tv|
+                            nicecrew\.tv|
+                            nightshift\.minnix\.dev|
+                            nolog\.media|
+                            nyltube\.nylarea\.com|
+                            ocfedtest\.hosted\.spacebear\.ee|
+                            openmedia\.edunova\.it|
                             p2ptv\.ru|
                             p\.eertu\.be|
                             p\.lu|
+                            pastafriday\.club|
+                            patriottube\.sonsofliberty\.red|
+                            pcbu\.nl|
                             peer\.azurs\.fr|
-                            peertube1\.zeteo\.me|
+                            peer\.d0g4\.me|
+                            peer\.lukeog\.com|
+                            peer\.madiator\.cloud|
+                            peer\.raise-uav\.com|
+                            peershare\.togart\.de|
+                            peertube-blablalinux\.be|
+                            peertube-demo\.learning-hub\.fr|
+                            peertube-docker\.cpy\.re|
+                            peertube-eu\.howlround\.com|
+                            peertube-u5014\.vm\.elestio\.app|
+                            peertube-us\.howlround\.com|
                             peertube\.020\.pl|
                             peertube\.0x5e\.eu|
+                            peertube\.1984\.cz|
+                            peertube\.2i2l\.net|
+                            peertube\.adjutor\.xyz|
+                            peertube\.adresse\.data\.gouv\.fr|
                             peertube\.alpharius\.io|
                             peertube\.am-networks\.fr|
                             peertube\.anduin\.net|
-                            peertube\.anzui\.dev|
-                            peertube\.arbleizez\.bzh|
+                            peertube\.anti-logic\.com|
+                            peertube\.arch-linux\.cz|
                             peertube\.art3mis\.de|
-                            peertube\.atilla\.org|
+                            peertube\.artsrn\.ualberta\.ca|
+                            peertube\.askan\.info|
+                            peertube\.astral0pitek\.synology\.me|
                             peertube\.atsuchan\.page|
-                            peertube\.aukfood\.net|
-                            peertube\.aventer\.biz|
+                            peertube\.automat\.click|
                             peertube\.b38\.rural-it\.org|
-                            peertube\.beeldengeluid\.nl|
                             peertube\.be|
+                            peertube\.beeldengeluid\.nl|
                             peertube\.bgzashtita\.es|
-                            peertube\.bitsandlinux\.com|
+                            peertube\.bike|
+                            peertube\.bildung-ekhn\.de|
                             peertube\.biz|
-                            peertube\.boba\.best|
                             peertube\.br0\.fr|
                             peertube\.bridaahost\.ynh\.fr|
                             peertube\.bubbletea\.dev|
                             peertube\.bubuit\.net|
                             peertube\.cabaal\.net|
-                            peertube\.cats-home\.net|
-                            peertube\.chemnitz\.freifunk\.net|
-                            peertube\.chevro\.fr|
-                            peertube\.chrisspiegl\.com|
+                            peertube\.chatinbit\.com|
+                            peertube\.chaunchy\.com|
+                            peertube\.chir\.rs|
+                            peertube\.christianpacaud\.com|
                             peertube\.chtisurel\.net|
+                            peertube\.chuggybumba\.com|
                             peertube\.cipherbliss\.com|
+                            peertube\.cirkau\.art|
+                            peertube\.cloud\.nerdraum\.de|
                             peertube\.cloud\.sans\.pub|
+                            peertube\.coko\.foundation|
+                            peertube\.communecter\.org|
+                            peertube\.concordia\.social|
+                            peertube\.corrigan\.xyz|
                             peertube\.cpge-brizeux\.fr|
                             peertube\.ctseuro\.com|
                             peertube\.cuatrolibertades\.org|
-                            peertube\.cybercirujas\.club|
-                            peertube\.cythin\.com|
+                            peertube\.cube4fun\.net|
+                            peertube\.dair-institute\.org|
                             peertube\.davigge\.com|
                             peertube\.dc\.pini\.fr|
+                            peertube\.deadtom\.me|
                             peertube\.debian\.social|
+                            peertube\.delta0189\.xyz|
                             peertube\.demonix\.fr|
                             peertube\.designersethiques\.org|
                             peertube\.desmu\.fr|
-                            peertube\.devloprog\.org|
                             peertube\.devol\.it|
-                            peertube\.dtmf\.ca|
-                            peertube\.ecologie\.bzh|
+                            peertube\.dk|
+                            peertube\.doesstuff\.social|
+                            peertube\.eb8\.org|
+                            peertube\.education-forum\.com|
+                            peertube\.elforcer\.ru|
+                            peertube\.em\.id\.lv|
+                            peertube\.ethibox\.fr|
                             peertube\.eu\.org|
                             peertube\.european-pirates\.eu|
+                            peertube\.eus|
                             peertube\.euskarabildua\.eus|
+                            peertube\.expi\.studio|
+                            peertube\.familie-berner\.de|
+                            peertube\.familleboisteau\.fr|
+                            peertube\.fedihost\.website|
                             peertube\.fenarinarsa\.com|
-                            peertube\.fomin\.site|
-                            peertube\.forsud\.be|
-                            peertube\.francoispelletier\.org|
-                            peertube\.freenet\.ru|
-                            peertube\.freetalklive\.com|
+                            peertube\.festnoz\.de|
+                            peertube\.forteza\.fr|
+                            peertube\.freestorm\.online|
                             peertube\.functional\.cafe|
-                            peertube\.gardeludwig\.fr|
+                            peertube\.gaminglinux\.fr|
                             peertube\.gargantia\.fr|
-                            peertube\.gcfamily\.fr|
+                            peertube\.geekgalaxy\.fr|
+                            peertube\.gemlog\.ca|
                             peertube\.genma\.fr|
                             peertube\.get-racing\.de|
+                            peertube\.ghis94\.ovh|
                             peertube\.gidikroon\.eu|
-                            peertube\.gruezishop\.ch|
-                            peertube\.habets\.house|
-                            peertube\.hackerfraternity\.org|
+                            peertube\.giftedmc\.com|
+                            peertube\.grosist\.fr|
+                            peertube\.gruntwerk\.org|
+                            peertube\.gsugambit\.com|
+                            peertube\.hackerfoo\.com|
+                            peertube\.hellsite\.net|
+                            peertube\.helvetet\.eu|
+                            peertube\.histoirescrepues\.fr|
+                            peertube\.home\.x0r\.fr|
+                            peertube\.hyperfreedom\.org|
                             peertube\.ichigo\.everydayimshuflin\.com|
-                            peertube\.ignifi\.me|
+                            peertube\.ifwo\.eu|
+                            peertube\.in\.ua|
                             peertube\.inapurna\.org|
                             peertube\.informaction\.info|
                             peertube\.interhop\.org|
-                            peertube\.iselfhost\.com|
                             peertube\.it|
+                            peertube\.it-arts\.net|
                             peertube\.jensdiemer\.de|
-                            peertube\.joffreyverd\.fr|
+                            peertube\.johntheserg\.al|
+                            peertube\.kaleidos\.net|
                             peertube\.kalua\.im|
-                            peertube\.kathryl\.fr|
+                            peertube\.kcore\.org|
                             peertube\.keazilla\.net|
                             peertube\.klaewyss\.fr|
-                            peertube\.kodcast\.com|
+                            peertube\.kleph\.eu|
+                            peertube\.kodein\.be|
+                            peertube\.kooperatywa\.tech|
+                            peertube\.kriom\.net|
                             peertube\.kx\.studio|
+                            peertube\.kyriog\.eu|
+                            peertube\.la-famille-muller\.fr|
+                            peertube\.labeuropereunion\.eu|
                             peertube\.lagvoid\.com|
-                            peertube\.lavallee\.tech|
-                            peertube\.le5emeaxe\.fr|
-                            peertube\.lestutosdeprocessus\.fr|
-                            peertube\.librenet\.co\.za|
+                            peertube\.lhc\.net\.br|
+                            peertube\.libresolutions\.network|
+                            peertube\.libretic\.fr|
+                            peertube\.librosphere\.fr|
                             peertube\.logilab\.fr|
+                            peertube\.lon\.tv|
                             peertube\.louisematic\.site|
                             peertube\.luckow\.org|
                             peertube\.luga\.at|
                             peertube\.lyceeconnecte\.fr|
-                            peertube\.manalejandro\.com|
+                            peertube\.madixam\.xyz|
+                            peertube\.magicstone\.dev|
+                            peertube\.marienschule\.de|
                             peertube\.marud\.fr|
-                            peertube\.mattone\.net|
                             peertube\.maxweiss\.io|
+                            peertube\.miguelcr\.me|
+                            peertube\.mikemestnik\.net|
+                            peertube\.mobilsicher\.de|
                             peertube\.monlycee\.net|
                             peertube\.mxinfo\.fr|
-                            peertube\.myrasp\.eu|
-                            peertube\.nebelcloud\.de|
+                            peertube\.naln1\.ca|
                             peertube\.netzbegruenung\.de|
-                            peertube\.newsocial\.tech|
                             peertube\.nicolastissot\.fr|
+                            peertube\.nogafam\.fr|
+                            peertube\.normalgamingcommunity\.cz|
                             peertube\.nz|
                             peertube\.offerman\.com|
+                            peertube\.ohioskates\.com|
+                            peertube\.onionstorm\.net|
                             peertube\.opencloud\.lu|
-                            peertube\.orthus\.link|
-                            peertube\.patapouf\.xyz|
-                            peertube\.pi2\.dev|
-                            peertube\.plataformess\.org|
-                            peertube\.pl|
-                            peertube\.portaesgnos\.org|
+                            peertube\.otakufarms\.com|
+                            peertube\.paladyn\.org|
+                            peertube\.pix-n-chill\.fr|
                             peertube\.r2\.enst\.fr|
                             peertube\.r5c3\.fr|
-                            peertube\.radres\.xyz|
-                            peertube\.red|
-                            peertube\.robonomics\.network|
-                            peertube\.rtnkv\.cloud|
-                            peertube\.runfox\.tk|
+                            peertube\.redpill-insight\.com|
+                            peertube\.researchinstitute\.at|
+                            peertube\.revelin\.fr|
+                            peertube\.rlp\.schule|
+                            peertube\.rokugan\.fr|
+                            peertube\.rougevertbleu\.tv|
+                            peertube\.roundpond\.net|
+                            peertube\.rural-it\.org|
                             peertube\.satoshishop\.de|
-                            peertube\.scic-tetris\.org|
+                            peertube\.scyldings\.com|
                             peertube\.securitymadein\.lu|
+                            peertube\.semperpax\.com|
                             peertube\.semweb\.pro|
-                            peertube\.social\.my-wan\.de|
-                            peertube\.soykaf\.org|
-                            peertube\.stefofficiel\.me|
+                            peertube\.sensin\.eu|
+                            peertube\.sidh\.bzh|
+                            peertube\.skorpil\.cz|
+                            peertube\.smertrios\.com|
+                            peertube\.sqweeb\.net|
+                            peertube\.stattzeitung\.org|
                             peertube\.stream|
                             peertube\.su|
                             peertube\.swrs\.net|
                             peertube\.takeko\.cyou|
-                            peertube\.tangentfox\.com|
                             peertube\.taxinachtegel\.de|
-                            peertube\.thenewoil\.xyz|
+                            peertube\.teftera\.com|
+                            peertube\.teutronic-services\.de|
                             peertube\.ti-fr\.com|
                             peertube\.tiennot\.net|
-                            peertube\.troback\.com|
+                            peertube\.tmp\.rcp\.tf|
                             peertube\.tspu\.edu\.ru|
-                            peertube\.tux\.ovh|
                             peertube\.tv|
                             peertube\.tweb\.tv|
-                            peertube\.ucy\.de|
                             peertube\.underworld\.fr|
-                            peertube\.us\.to|
-                            peertube\.ventresmous\.fr|
+                            peertube\.vapronva\.pw|
+                            peertube\.veen\.world|
+                            peertube\.vesdia\.eu|
+                            peertube\.virtual-assembly\.org|
+                            peertube\.viviers-fibre\.net|
                             peertube\.vlaki\.cz|
-                            peertube\.w\.utnw\.de|
-                            peertube\.westring\.digital|
+                            peertube\.wiesbaden\.social|
+                            peertube\.wivodaim\.net|
+                            peertube\.wtf|
+                            peertube\.wtfayla\.net|
+                            peertube\.xrcb\.cat|
                             peertube\.xwiki\.com|
+                            peertube\.zd\.do|
+                            peertube\.zetamc\.net|
+                            peertube\.zmuuf\.org|
                             peertube\.zoz-serv\.org|
+                            peertube\.zwindler\.fr|
                             peervideo\.ru|
                             periscope\.numenaute\.org|
-                            perron-tube\.de|
+                            pete\.warpnine\.de|
                             petitlutinartube\.fr|
                             phijkchu\.com|
-                            pierre\.tube|
+                            phoenixproject\.group|
                             piraten\.space|
-                            play\.rosano\.ca|
+                            pirtube\.calut\.fr|
+                            pityu\.flaki\.hu|
+                            play\.mittdata\.se|
                             player\.ojamajo\.moe|
-                            plextube\.nl|
-                            pocketnetpeertube1\.nohost\.me|
-                            pocketnetpeertube3\.nohost\.me|
-                            pocketnetpeertube4\.nohost\.me|
-                            pocketnetpeertube5\.nohost\.me|
-                            pocketnetpeertube6\.nohost\.me|
-                            pt\.24-7\.ro|
-                            pt\.apathy\.top|
+                            podlibre\.video|
+                            portal\.digilab\.nfa\.cz|
+                            private\.fedimovie\.com|
+                            pt01\.lehrerfortbildung-bw\.de|
                             pt\.diaspodon\.fr|
-                            pt\.fedi\.tech|
-                            pt\.maciej\.website|
+                            pt\.freedomwolf\.cc|
+                            pt\.gordons\.gen\.nz|
+                            pt\.ilyamikcoder\.com|
+                            pt\.irnok\.net|
+                            pt\.mezzo\.moe|
+                            pt\.na4\.eu|
+                            pt\.netcraft\.ch|
+                            pt\.rwx\.ch|
+                            pt\.sfunk1x\.com|
+                            pt\.thishorsie\.rocks|
+                            pt\.vern\.cc|
                             ptb\.lunarviews\.net|
-                            ptmir1\.inter21\.net|
-                            ptmir2\.inter21\.net|
-                            ptmir3\.inter21\.net|
-                            ptmir4\.inter21\.net|
-                            ptmir5\.inter21\.net|
-                            ptube\.horsentiers\.fr|
-                            ptube\.xmanifesto\.club|
-                            queermotion\.org|
-                            re-wizja\.re-medium\.com|
-                            regarder\.sans\.pub|
-                            ruraletv\.ovh|
-                            s1\.gegenstimme\.tv|
-                            s2\.veezee\.tube|
+                            ptube\.de|
+                            ptube\.ranranhome\.info|
+                            puffy\.tube|
+                            puppet\.zone|
+                            qtube\.qlyoung\.net|
+                            quantube\.win|
+                            rankett\.net|
+                            replay\.jres\.org|
+                            review\.peertube\.biz|
                             sdmtube\.fr|
-                            sender-fm\.veezee\.tube|
-                            serv1\.wiki-tube\.de|
+                            secure\.direct-live\.net|
+                            secure\.scanovid\.com|
+                            seka\.pona\.la|
                             serv3\.wiki-tube\.de|
-                            sickstream\.net|
-                            sleepy\.tube|
+                            skeptube\.fr|
+                            social\.fedimovie\.com|
+                            socpeertube\.ru|
                             sovran\.video|
+                            special\.videovortex\.tv|
                             spectra\.video|
+                            stl1988\.peertube-host\.de|
+                            stream\.biovisata\.lt|
+                            stream\.conesphere\.cloud|
                             stream\.elven\.pw|
+                            stream\.jurnalfm\.md|
                             stream\.k-prod\.fr|
-                            stream\.shahab\.nohost\.me|
-                            streamsource\.video|
+                            stream\.litera\.tools|
+                            stream\.nuemedia\.se|
+                            stream\.rlp-media\.de|
+                            stream\.vrse\.be|
                             studios\.racer159\.com|
-                            testtube\.florimond\.eu|
+                            styxhexenhammer666\.com|
+                            syrteplay\.obspm\.fr|
+                            t\.0x0\.st|
+                            tbh\.co-shaoghal\.net|
+                            test-fab\.ynh\.fr|
+                            testube\.distrilab\.fr|
                             tgi\.hosted\.spacebear\.ee|
-                            thaitube\.in\.th|
-                            the\.jokertv\.eu|
                             theater\.ethernia\.net|
                             thecool\.tube|
+                            thevideoverse\.com|
                             tilvids\.com|
-                            toob\.bub\.org|
-                            tpaw\.video|
-                            truetube\.media|
-                            tuba\.lhub\.pl|
-                            tube-aix-marseille\.beta\.education\.fr|
-                            tube-amiens\.beta\.education\.fr|
-                            tube-besancon\.beta\.education\.fr|
-                            tube-bordeaux\.beta\.education\.fr|
-                            tube-clermont-ferrand\.beta\.education\.fr|
-                            tube-corse\.beta\.education\.fr|
-                            tube-creteil\.beta\.education\.fr|
-                            tube-dijon\.beta\.education\.fr|
-                            tube-education\.beta\.education\.fr|
-                            tube-grenoble\.beta\.education\.fr|
-                            tube-lille\.beta\.education\.fr|
-                            tube-limoges\.beta\.education\.fr|
-                            tube-montpellier\.beta\.education\.fr|
-                            tube-nancy\.beta\.education\.fr|
-                            tube-nantes\.beta\.education\.fr|
-                            tube-nice\.beta\.education\.fr|
-                            tube-normandie\.beta\.education\.fr|
-                            tube-orleans-tours\.beta\.education\.fr|
-                            tube-outremer\.beta\.education\.fr|
-                            tube-paris\.beta\.education\.fr|
-                            tube-poitiers\.beta\.education\.fr|
-                            tube-reims\.beta\.education\.fr|
-                            tube-rennes\.beta\.education\.fr|
-                            tube-strasbourg\.beta\.education\.fr|
-                            tube-toulouse\.beta\.education\.fr|
-                            tube-versailles\.beta\.education\.fr|
-                            tube1\.it\.tuwien\.ac\.at|
+                            tinkerbetter\.tube|
+                            tinsley\.video|
+                            trailers\.ddigest\.com|
+                            tube-action-educative\.apps\.education\.fr|
+                            tube-arts-lettres-sciences-humaines\.apps\.education\.fr|
+                            tube-cycle-2\.apps\.education\.fr|
+                            tube-cycle-3\.apps\.education\.fr|
+                            tube-education-physique-et-sportive\.apps\.education\.fr|
+                            tube-enseignement-professionnel\.apps\.education\.fr|
+                            tube-institutionnel\.apps\.education\.fr|
+                            tube-langues-vivantes\.apps\.education\.fr|
+                            tube-maternelle\.apps\.education\.fr|
+                            tube-numerique-educatif\.apps\.education\.fr|
+                            tube-sciences-technologies\.apps\.education\.fr|
+                            tube-test\.apps\.education\.fr|
+                            tube1\.perron-service\.de|
+                            tube\.9minuti\.it|
                             tube\.abolivier\.bzh|
-                            tube\.ac-amiens\.fr|
-                            tube\.aerztefueraufklaerung\.de|
-                            tube\.alexx\.ml|
+                            tube\.alado\.space|
                             tube\.amic37\.fr|
-                            tube\.anufrij\.de|
-                            tube\.apolut\.net|
-                            tube\.arkhalabs\.io|
+                            tube\.area404\.cloud|
                             tube\.arthack\.nz|
-                            tube\.as211696\.net|
-                            tube\.avensio\.de|
+                            tube\.asulia\.fr|
+                            tube\.awkward\.company|
                             tube\.azbyka\.ru|
                             tube\.azkware\.net|
-                            tube\.bachaner\.fr|
-                            tube\.bmesh\.org|
-                            tube\.borked\.host|
+                            tube\.bartrip\.me\.uk|
+                            tube\.belowtoxic\.media|
+                            tube\.bingle\.plus|
+                            tube\.bit-friends\.de|
                             tube\.bstly\.de|
-                            tube\.chaoszone\.tv|
-                            tube\.chatelet\.ovh|
-                            tube\.cloud-libre\.eu|
+                            tube\.chosto\.me|
                             tube\.cms\.garden|
-                            tube\.cowfee\.moe|
-                            tube\.cryptography\.dog|
-                            tube\.darknight-coffee\.org|
-                            tube\.dev\.lhub\.pl|
+                            tube\.communia\.org|
+                            tube\.cyberia\.club|
+                            tube\.cybershock\.life|
+                            tube\.dembased\.xyz|
+                            tube\.dev\.displ\.eu|
+                            tube\.digitalesozialearbeit\.de|
                             tube\.distrilab\.fr|
+                            tube\.doortofreedom\.org|
                             tube\.dsocialize\.net|
+                            tube\.e-jeremy\.com|
                             tube\.ebin\.club|
+                            tube\.elemac\.fr|
+                            tube\.erzbistum-hamburg\.de|
+                            tube\.exozy\.me|
                             tube\.fdn\.fr|
-                            tube\.florimond\.eu|
-                            tube\.foxarmy\.ml|
-                            tube\.foxden\.party|
-                            tube\.frischesicht\.de|
+                            tube\.fedi\.quebec|
+                            tube\.fediverse\.at|
+                            tube\.felinn\.org|
+                            tube\.flokinet\.is|
+                            tube\.foad\.me\.uk|
+                            tube\.freepeople\.fr|
+                            tube\.friloux\.me|
+                            tube\.froth\.zone|
+                            tube\.fulda\.social|
                             tube\.futuretic\.fr|
-                            tube\.gnous\.eu|
+                            tube\.g1zm0\.de|
+                            tube\.g4rf\.net|
+                            tube\.gaiac\.io|
+                            tube\.geekyboo\.net|
+                            tube\.genb\.de|
+                            tube\.ghk-academy\.info|
+                            tube\.gi-it\.de|
                             tube\.grap\.coop|
                             tube\.graz\.social|
                             tube\.grin\.hu|
-                            tube\.hackerscop\.org|
-                            tube\.hordearii\.fr|
+                            tube\.hokai\.lol|
+                            tube\.int5\.net|
+                            tube\.interhacker\.space|
+                            tube\.invisible\.ch|
+                            tube\.io18\.top|
+                            tube\.itsg\.host|
                             tube\.jeena\.net|
-                            tube\.kai-stuht\.com|
+                            tube\.kh-berlin\.de|
                             tube\.kockatoo\.org|
                             tube\.kotur\.org|
+                            tube\.koweb\.fr|
+                            tube\.la-dina\.net|
+                            tube\.lab\.nrw|
                             tube\.lacaveatonton\.ovh|
+                            tube\.laurent-malys\.fr|
+                            tube\.leetdreams\.ch|
                             tube\.linkse\.media|
                             tube\.lokad\.com|
                             tube\.lucie-philou\.com|
-                            tube\.melonbread\.xyz|
-                            tube\.mfraters\.net|
-                            tube\.motuhake\.xyz|
-                            tube\.mrbesen\.de|
-                            tube\.nah\.re|
-                            tube\.nchoco\.net|
+                            tube\.media-techport\.de|
+                            tube\.morozoff\.pro|
+                            tube\.neshweb\.net|
+                            tube\.nestor\.coop|
+                            tube\.network\.europa\.eu|
+                            tube\.nicfab\.eu|
+                            tube\.nieuwwestbrabant\.nl|
+                            tube\.nogafa\.org|
                             tube\.novg\.net|
                             tube\.nox-rhea\.org|
                             tube\.nuagelibre\.fr|
+                            tube\.numerique\.gouv\.fr|
+                            tube\.nuxnik\.com|
                             tube\.nx12\.net|
                             tube\.octaplex\.net|
-                            tube\.odat\.xyz|
                             tube\.oisux\.org|
+                            tube\.okcinfo\.news|
+                            tube\.onlinekirche\.net|
                             tube\.opportunis\.me|
+                            tube\.oraclefilms\.com|
                             tube\.org\.il|
-                            tube\.ortion\.xyz|
-                            tube\.others\.social|
+                            tube\.pacapime\.ovh|
+                            tube\.parinux\.org|
+                            tube\.pastwind\.top|
                             tube\.picasoft\.net|
-                            tube\.plomlompom\.com|
+                            tube\.pilgerweg-21\.de|
                             tube\.pmj\.rocks|
+                            tube\.pol\.social|
+                            tube\.ponsonaille\.fr|
                             tube\.portes-imaginaire\.org|
+                            tube\.public\.apolut\.net|
+                            tube\.pustule\.org|
                             tube\.pyngu\.com|
+                            tube\.querdenken-711\.de|
                             tube\.rebellion\.global|
+                            tube\.reseau-canope\.fr|
                             tube\.rhythms-of-resistance\.org|
-                            tube\.rita\.moe|
+                            tube\.risedsky\.ovh|
+                            tube\.rooty\.fr|
                             tube\.rsi\.cnr\.it|
-                            tube\.s1gm4\.eu|
-                            tube\.saumon\.io|
+                            tube\.ryne\.moe|
                             tube\.schleuss\.online|
                             tube\.schule\.social|
-                            tube\.seditio\.fr|
+                            tube\.sekretaerbaer\.net|
                             tube\.shanti\.cafe|
                             tube\.shela\.nu|
                             tube\.skrep\.in|
+                            tube\.sleeping\.town|
                             tube\.sp-codes\.de|
-                            tube\.sp4ke\.com|
-                            tube\.superseriousbusiness\.org|
+                            tube\.spdns\.org|
+                            tube\.systerserver\.net|
                             tube\.systest\.eu|
                             tube\.tappret\.fr|
-                            tube\.tardis\.world|
-                            tube\.toontoet\.nl|
+                            tube\.techeasy\.org|
+                            tube\.thierrytalbert\.fr|
+                            tube\.tinfoil-hat\.net|
+                            tube\.toldi\.eu|
                             tube\.tpshd\.de|
+                            tube\.trax\.im|
                             tube\.troopers\.agency|
+                            tube\.ttk\.is|
+                            tube\.tuxfriend\.fr|
                             tube\.tylerdavis\.xyz|
+                            tube\.ullihome\.de|
+                            tube\.ulne\.be|
                             tube\.undernet\.uy|
-                            tube\.vigilian-consulting\.nl|
-                            tube\.vraphim\.com|
-                            tube\.wehost\.lgbt|
-                            tube\.wien\.rocks|
+                            tube\.vrpnet\.org|
                             tube\.wolfe\.casa|
                             tube\.xd0\.de|
+                            tube\.xn--baw-joa\.social|
                             tube\.xy-space\.de|
                             tube\.yapbreak\.fr|
                             tubedu\.org|
-                            tubes\.jodh\.us|
-                            tuktube\.com|
-                            turkum\.me|
+                            tubulus\.openlatin\.org|
+                            turtleisland\.video|
                             tututu\.tube|
-                            tuvideo\.encanarias\.info|
-                            tv1\.cocu\.cc|
-                            tv1\.gomntu\.space|
-                            tv2\.cocu\.cc|
+                            tv\.adast\.dk|
                             tv\.adn\.life|
+                            tv\.arns\.lt|
                             tv\.atmx\.ca|
-                            tv\.bitma\.st|
-                            tv\.generallyrubbish\.net\.au|
+                            tv\.based\.quest|
+                            tv\.farewellutopia\.com|
+                            tv\.filmfreedom\.net|
+                            tv\.gravitons\.org|
+                            tv\.io\.seg\.br|
                             tv\.lumbung\.space|
-                            tv\.mattchristiansenmedia\.com|
-                            tv\.netwhood\.online|
-                            tv\.neue\.city|
-                            tv\.piejacker\.net|
                             tv\.pirateradio\.social|
+                            tv\.pirati\.cz|
+                            tv\.santic-zombie\.ru|
                             tv\.undersco\.re|
+                            tv\.zonepl\.net|
                             tvox\.ru|
                             twctube\.twc-zone\.eu|
-                            unfilter\.tube|
+                            twobeek\.com|
+                            urbanists\.video|
+                            v\.9tail\.net|
                             v\.basspistol\.org|
+                            v\.j4\.lc|
                             v\.kisombrella\.top|
-                            v\.lastorder\.xyz|
+                            v\.koa\.im|
+                            v\.kyaru\.xyz|
                             v\.lor\.sh|
-                            v\.phreedom\.club|
-                            v\.sil\.sh|
-                            v\.szy\.io|
-                            v\.xxxapex\.com|
-                            veezee\.tube|
-                            vid\.dascoyote\.xyz|
-                            vid\.garwood\.io|
-                            vid\.ncrypt\.at|
-                            vid\.pravdastalina\.info|
-                            vid\.qorg11\.net|
-                            vid\.rajeshtaylor\.com|
-                            vid\.samtripoli\.com|
-                            vid\.werefox\.dev|
+                            v\.mkp\.ca|
+                            v\.posm\.gay|
+                            v\.slaycer\.top|
+                            veedeo\.org|
+                            vhs\.absturztau\.be|
+                            vid\.cthos\.dev|
+                            vid\.kinuseka\.us|
+                            vid\.mkp\.ca|
+                            vid\.nocogabriel\.fr|
+                            vid\.norbipeti\.eu|
+                            vid\.northbound\.online|
+                            vid\.ohboii\.de|
+                            vid\.plantplotting\.co\.uk|
+                            vid\.pretok\.tv|
+                            vid\.prometheus\.systems|
+                            vid\.soafen\.love|
+                            vid\.twhtv\.club|
                             vid\.wildeboer\.net|
                             video-cave-v2\.de|
+                            video-liberty\.com|
                             video\.076\.ne\.jp|
                             video\.1146\.nohost\.me|
-                            video\.altertek\.org|
+                            video\.9wd\.eu|
+                            video\.abraum\.de|
+                            video\.ados\.accoord\.fr|
+                            video\.amiga-ng\.org|
                             video\.anartist\.org|
-                            video\.apps\.thedoodleproject\.net|
-                            video\.artist\.cx|
                             video\.asgardius\.company|
-                            video\.balsillie\.net|
+                            video\.audiovisuel-participatif\.org|
                             video\.bards\.online|
-                            video\.binarydad\.com|
+                            video\.barkoczy\.social|
+                            video\.benetou\.fr|
+                            video\.beyondwatts\.social|
+                            video\.bgeneric\.net|
+                            video\.bilecik\.edu\.tr|
                             video\.blast-info\.fr|
+                            video\.bmu\.cloud|
                             video\.catgirl\.biz|
+                            video\.causa-arcana\.com|
+                            video\.chasmcity\.net|
+                            video\.chbmeyer\.de|
                             video\.cigliola\.com|
-                            video\.cm-en-transition\.fr|
+                            video\.citizen4\.eu|
+                            video\.clumsy\.computer|
+                            video\.cnnumerique\.fr|
+                            video\.cnr\.it|
                             video\.cnt\.social|
                             video\.coales\.co|
-                            video\.codingfield\.com|
-                            video\.comptoir\.net|
                             video\.comune\.trento\.it|
-                            video\.cpn\.so|
+                            video\.coyp\.us|
                             video\.csc49\.fr|
-                            video\.cybre\.town|
-                            video\.demokratischer-sommer\.de|
-                            video\.discord-insoumis\.fr|
-                            video\.dolphincastle\.com|
+                            video\.davduf\.net|
+                            video\.davejansen\.com|
+                            video\.dlearning\.nl|
+                            video\.dnfi\.no|
                             video\.dresden\.network|
-                            video\.ecole-89\.com|
-                            video\.elgrillolibertario\.org|
+                            video\.drgnz\.club|
+                            video\.dudenas\.lt|
+                            video\.eientei\.org|
+                            video\.ellijaymakerspace\.org|
                             video\.emergeheart\.info|
                             video\.eradicatinglove\.xyz|
-                            video\.ethantheenigma\.me|
-                            video\.exodus-privacy\.eu\.org|
-                            video\.fbxl\.net|
+                            video\.everythingbagel\.me|
+                            video\.extremelycorporate\.ca|
+                            video\.fabiomanganiello\.com|
+                            video\.fedi\.bzh|
                             video\.fhtagn\.org|
-                            video\.greenmycity\.eu|
-                            video\.guerredeclasse\.fr|
+                            video\.firehawk-systems\.com|
+                            video\.fox-romka\.ru|
+                            video\.fuss\.bz\.it|
+                            video\.glassbeadcollective\.org|
+                            video\.graine-pdl\.org|
                             video\.gyt\.is|
-                            video\.hackers\.town|
+                            video\.hainry\.fr|
                             video\.hardlimit\.com|
-                            video\.hooli\.co|
+                            video\.hostux\.net|
                             video\.igem\.org|
+                            video\.infojournal\.fr|
                             video\.internet-czas-dzialac\.pl|
+                            video\.interru\.io|
+                            video\.ipng\.ch|
+                            video\.ironsysadmin\.com|
                             video\.islameye\.com|
-                            video\.kicik\.fr|
+                            video\.jacen\.moe|
+                            video\.jadin\.me|
+                            video\.jeffmcbride\.net|
+                            video\.jigmedatse\.com|
                             video\.kuba-orlik\.name|
-                            video\.kyushojitsu\.ca|
+                            video\.lacalligramme\.fr|
+                            video\.lanceurs-alerte\.fr|
+                            video\.laotra\.red|
+                            video\.lapineige\.fr|
+                            video\.laraffinerie\.re|
                             video\.lavolte\.net|
-                            video\.lespoesiesdheloise\.fr|
                             video\.liberta\.vip|
-                            video\.liege\.bike|
+                            video\.libreti\.net|
+                            video\.licentia\.net|
                             video\.linc\.systems|
                             video\.linux\.it|
                             video\.linuxtrent\.it|
-                            video\.lokal\.social|
+                            video\.liveitlive\.show|
                             video\.lono\.space|
-                            video\.lunasqu\.ee|
+                            video\.lrose\.de|
+                            video\.lunago\.net|
                             video\.lundi\.am|
+                            video\.lycee-experimental\.org|
+                            video\.maechler\.cloud|
                             video\.marcorennmaus\.de|
                             video\.mass-trespass\.uk|
+                            video\.matomocamp\.org|
+                            video\.medienzentrum-harburg\.de|
+                            video\.mentality\.rip|
+                            video\.metaversum\.wtf|
+                            video\.midreality\.com|
+                            video\.mttv\.it|
                             video\.mugoreve\.fr|
-                            video\.mundodesconocido\.com|
+                            video\.mxtthxw\.art|
                             video\.mycrowd\.ca|
+                            video\.niboe\.info|
                             video\.nogafam\.es|
-                            video\.odayacres\.farm|
+                            video\.nstr\.no|
+                            video\.occm\.cc|
+                            video\.off-investigation\.fr|
+                            video\.olos311\.org|
+                            video\.ordinobsolete\.fr|
+                            video\.osvoj\.ru|
+                            video\.ourcommon\.cloud|
                             video\.ozgurkon\.org|
-                            video\.p1ng0ut\.social|
-                            video\.p3x\.de|
                             video\.pcf\.fr|
-                            video\.pony\.gallery|
-                            video\.potate\.space|
-                            video\.pourpenser\.pro|
-                            video\.progressiv\.dev|
+                            video\.pcgaldo\.com|
+                            video\.phyrone\.de|
+                            video\.poul\.org|
+                            video\.publicspaces\.net|
+                            video\.pullopen\.xyz|
+                            video\.r3s\.nrw|
+                            video\.rainevixen\.com|
                             video\.resolutions\.it|
-                            video\.rw501\.de|
-                            video\.screamer\.wiki|
-                            video\.sdm-tools\.net|
+                            video\.retroedge\.tech|
+                            video\.rhizome\.org|
+                            video\.rlp-media\.de|
+                            video\.rs-einrich\.de|
+                            video\.rubdos\.be|
+                            video\.sadmin\.io|
                             video\.sftblw\.moe|
                             video\.shitposter\.club|
-                            video\.skyn3t\.in|
+                            video\.simplex-software\.ru|
+                            video\.slipfox\.xyz|
+                            video\.snug\.moe|
+                            video\.software-fuer-engagierte\.de|
                             video\.soi\.ch|
-                            video\.stuartbrand\.co\.uk|
+                            video\.sonet\.ws|
+                            video\.surazal\.net|
+                            video\.taskcards\.eu|
+                            video\.team-lcbs\.eu|
+                            video\.techforgood\.social|
+                            video\.telemillevaches\.net|
+                            video\.thepolarbear\.co\.uk|
                             video\.thinkof\.name|
-                            video\.toot\.pt|
+                            video\.tii\.space|
+                            video\.tkz\.es|
+                            video\.trankil\.info|
                             video\.triplea\.fr|
+                            video\.tum\.social|
                             video\.turbo\.chat|
+                            video\.uriopss-pdl\.fr|
+                            video\.ustim\.ru|
+                            video\.ut0pia\.org|
                             video\.vaku\.org\.ua|
+                            video\.vegafjord\.me|
                             video\.veloma\.org|
                             video\.violoncello\.ch|
-                            video\.wilkie\.how|
-                            video\.wsf2021\.info|
-                            videorelay\.co|
+                            video\.voidconspiracy\.band|
+                            video\.wakkeren\.nl|
+                            video\.windfluechter\.org|
+                            video\.ziez\.eu|
                             videos-passages\.huma-num\.fr|
-                            videos\.3d-wolf\.com|
+                            videos\.aadtp\.be|
                             videos\.ahp-numerique\.fr|
-                            videos\.alexandrebadalo\.pt|
+                            videos\.alamaisondulibre\.org|
                             videos\.archigny\.net|
+                            videos\.aroaduntraveled\.com|
+                            videos\.b4tech\.org|
                             videos\.benjaminbrady\.ie|
-                            videos\.buceoluegoexisto\.com|
-                            videos\.capas\.se|
-                            videos\.casually\.cat|
+                            videos\.bik\.opencloud\.lu|
                             videos\.cloudron\.io|
+                            videos\.codingotaku\.com|
                             videos\.coletivos\.org|
+                            videos\.collate\.social|
                             videos\.danksquad\.org|
-                            videos\.denshi\.live|
-                            videos\.fromouter\.space|
+                            videos\.digitaldragons\.eu|
+                            videos\.dromeadhere\.fr|
+                            videos\.explain-it\.org|
+                            videos\.factsonthegroundshow\.com|
+                            videos\.foilen\.com|
                             videos\.fsci\.in|
+                            videos\.gamercast\.net|
+                            videos\.gianmarco\.gg|
                             videos\.globenet\.org|
+                            videos\.grafo\.zone|
                             videos\.hauspie\.fr|
                             videos\.hush\.is|
+                            videos\.hyphalfusion\.network|
+                            videos\.icum\.to|
+                            videos\.im\.allmendenetz\.de|
+                            videos\.jacksonchen666\.com|
                             videos\.john-livingston\.fr|
-                            videos\.jordanwarne\.xyz|
-                            videos\.lavoixdessansvoix\.org|
+                            videos\.knazarov\.com|
+                            videos\.kuoushi\.com|
+                            videos\.laliguepaysdelaloire\.org|
+                            videos\.lemouvementassociatif-pdl\.org|
                             videos\.leslionsfloorball\.fr|
-                            videos\.lucero\.top|
-                            videos\.martyn\.berlin|
+                            videos\.librescrum\.org|
                             videos\.mastodont\.cat|
-                            videos\.monstro1\.com|
-                            videos\.npo\.city|
-                            videos\.optoutpod\.com|
-                            videos\.petch\.rocks|
-                            videos\.pzelawski\.xyz|
+                            videos\.metus\.ca|
+                            videos\.miolo\.org|
+                            videos\.offroad\.town|
+                            videos\.openmandriva\.org|
+                            videos\.parleur\.net|
+                            videos\.pcorp\.us|
+                            videos\.pop\.eu\.com|
                             videos\.rampin\.org|
+                            videos\.rauten\.co\.za|
+                            videos\.ritimo\.org|
+                            videos\.sarcasmstardust\.com|
                             videos\.scanlines\.xyz|
                             videos\.shmalls\.pw|
-                            videos\.sibear\.fr|
                             videos\.stadtfabrikanten\.org|
-                            videos\.tankernn\.eu|
+                            videos\.supertuxkart\.net|
                             videos\.testimonia\.org|
-                            videos\.thisishowidontdisappear\.com|
-                            videos\.traumaheilung\.net|
+                            videos\.thinkerview\.com|
+                            videos\.torrenezzi10\.xyz|
                             videos\.trom\.tf|
-                            videos\.wakkerewereld\.nu|
-                            videos\.weblib\.re|
+                            videos\.utsukta\.org|
+                            videos\.viorsan\.com|
+                            videos\.wherelinux\.xyz|
+                            videos\.wikilibriste\.fr|
                             videos\.yesil\.club|
+                            videos\.yeswiki\.net|
+                            videotube\.duckdns\.org|
+                            vids\.capypara\.de|
                             vids\.roshless\.me|
+                            vids\.stary\.pc\.pl|
                             vids\.tekdmn\.me|
-                            vidz\.dou\.bet|
-                            vod\.lumikko\.dev|
-                            vs\.uniter\.network|
+                            vidz\.julien\.ovh|
+                            views\.southfox\.me|
+                            virtual-girls-are\.definitely-for\.me|
+                            viste\.pt|
+                            vnchich\.com|
+                            vnop\.org|
+                            vod\.newellijay\.tv|
+                            voluntarytube\.com|
+                            vtr\.chikichiki\.tube|
                             vulgarisation-informatique\.fr|
-                            watch\.breadtube\.tv|
-                            watch\.deranalyst\.ch|
+                            watch\.easya\.solutions|
+                            watch\.goodluckgabe\.life|
                             watch\.ignorance\.eu|
-                            watch\.krazy\.party|
+                            watch\.jimmydore\.com|
                             watch\.libertaria\.space|
-                            watch\.rt4mn\.org|
-                            watch\.softinio\.com|
+                            watch\.nuked\.social|
+                            watch\.ocaml\.org|
+                            watch\.thelema\.social|
                             watch\.tubelab\.video|
                             web-fellow\.de|
                             webtv\.vandoeuvre\.net|
-                            wechill\.space|
+                            wetubevid\.online|
                             wikileaks\.video|
                             wiwi\.video|
-                            worldofvids\.com|
-                            wwtube\.net|
-                            www4\.mir\.inter21\.net|
-                            www\.birkeundnymphe\.de|
-                            www\.captain-german\.com|
-                            www\.wiki-tube\.de|
+                            wow\.such\.disappointment\.fail|
+                            www\.jvideos\.net|
+                            www\.kotikoff\.net|
+                            www\.makertube\.net|
+                            www\.mypeer\.tube|
+                            www\.nadajemy\.com|
+                            www\.neptube\.io|
+                            www\.rocaguinarda\.tv|
+                            www\.vnshow\.net|
                             xxivproduction\.video|
-                            xxx\.noho\.st|
+                            yt\.orokoro\.ru|
+                            ytube\.retronerd\.at|
+                            zumvideo\.de|
 
                             # from youtube-dl
                             peertube\.rainbowswingers\.net|
@@ -1050,13 +1315,13 @@ class PeerTubeIE(InfoExtractor):
                         )'''
     _UUID_RE = r'[\da-zA-Z]{22}|[\da-fA-F]{8}-[\da-fA-F]{4}-[\da-fA-F]{4}-[\da-fA-F]{4}-[\da-fA-F]{12}'
     _API_BASE = 'https://%s/api/v1/videos/%s/%s'
-    _VALID_URL = r'''(?x)
+    _VALID_URL = rf'''(?x)
                     (?:
                         peertube:(?P<host>[^:]+):|
-                        https?://(?P<host_2>%s)/(?:videos/(?:watch|embed)|api/v\d/videos|w)/
+                        https?://(?P<host_2>{_INSTANCES_RE})/(?:videos/(?:watch|embed)|api/v\d/videos|w)/
                     )
-                    (?P<id>%s)
-                    ''' % (_INSTANCES_RE, _UUID_RE)
+                    (?P<id>{_UUID_RE})
+                    '''
     _EMBED_REGEX = [r'''(?x)<iframe[^>]+\bsrc=["\'](?P<url>(?:https?:)?//{_INSTANCES_RE}/videos/embed/{cls._UUID_RE})''']
     _TESTS = [{
         'url': 'https://framatube.org/videos/watch/9c9de5e8-0a1e-484a-b099-e80766180a6d',
@@ -1083,7 +1348,7 @@ class PeerTubeIE(InfoExtractor):
             'dislike_count': int,
             'tags': ['framasoft', 'peertube'],
             'categories': ['Science & Technology'],
-        }
+        },
     }, {
         'url': 'https://peertube2.cpy.re/w/122d093a-1ede-43bd-bd34-59d2931ffc5e',
         'info_dict': {
@@ -1094,7 +1359,7 @@ class PeerTubeIE(InfoExtractor):
             'timestamp': 1589276219,
             'upload_date': '20200512',
             'uploader': 'chocobozzz',
-        }
+        },
     }, {
         'url': 'https://peertube2.cpy.re/w/3fbif9S3WmtTP8gGsC5HBd',
         'info_dict': {
@@ -1128,7 +1393,7 @@ class PeerTubeIE(InfoExtractor):
             'timestamp': 1587401293,
             'upload_date': '20200420',
             'uploader': 'Drew DeVault',
-        }
+        },
     }, {
         'url': 'https://peertube.debian.social/videos/watch/0b04f13d-1e18-4f1d-814e-4979aa7c9c44',
         'only_matching': True,
@@ -1150,14 +1415,13 @@ class PeerTubeIE(InfoExtractor):
     @staticmethod
     def _extract_peertube_url(webpage, source_url):
         mobj = re.match(
-            r'https?://(?P<host>[^/]+)/(?:videos/(?:watch|embed)|w)/(?P<id>%s)'
-            % PeerTubeIE._UUID_RE, source_url)
+            rf'https?://(?P<host>[^/]+)/(?:videos/(?:watch|embed)|w)/(?P<id>{PeerTubeIE._UUID_RE})', source_url)
         if mobj and any(p in webpage for p in (
                 'meta property="og:platform" content="PeerTube"',
                 '<title>PeerTube<',
                 'There will be other non JS-based clients to access PeerTube',
                 '>We are sorry but it seems that PeerTube is not compatible with your web browser.<')):
-            return 'peertube:%s:%s' % mobj.group('host', 'id')
+            return 'peertube:{}:{}'.format(*mobj.group('host', 'id'))
 
     @classmethod
     def _extract_embed_urls(cls, url, webpage):
@@ -1185,8 +1449,8 @@ class PeerTubeIE(InfoExtractor):
             return
         subtitles = {}
         for e in data:
-            language_id = try_get(e, lambda x: x['language']['id'], compat_str)
-            caption_url = urljoin('https://%s' % host, e.get('captionPath'))
+            language_id = try_get(e, lambda x: x['language']['id'], str)
+            caption_url = urljoin(f'https://{host}', e.get('captionPath'))
             if not caption_url:
                 continue
             subtitles.setdefault(language_id or 'en', []).append({
@@ -1204,11 +1468,15 @@ class PeerTubeIE(InfoExtractor):
 
         title = video['name']
 
-        formats = []
+        formats, is_live = [], False
         files = video.get('files') or []
         for playlist in (video.get('streamingPlaylists') or []):
             if not isinstance(playlist, dict):
                 continue
+            if playlist_url := url_or_none(playlist.get('playlistUrl')):
+                is_live = True
+                formats.extend(self._extract_m3u8_formats(
+                    playlist_url, video_id, fatal=False, live=True))
             playlist_files = playlist.get('files')
             if not (playlist_files and isinstance(playlist_files, list)):
                 continue
@@ -1221,7 +1489,7 @@ class PeerTubeIE(InfoExtractor):
                 continue
             file_size = int_or_none(file_.get('size'))
             format_id = try_get(
-                file_, lambda x: x['resolution']['label'], compat_str)
+                file_, lambda x: x['resolution']['label'], str)
             f = parse_resolution(format_id)
             f.update({
                 'url': file_url,
@@ -1232,6 +1500,7 @@ class PeerTubeIE(InfoExtractor):
                 f['vcodec'] = 'none'
             else:
                 f['fps'] = int_or_none(file_.get('fps'))
+            is_live = False
             formats.append(f)
 
         description = video.get('description')
@@ -1255,7 +1524,7 @@ class PeerTubeIE(InfoExtractor):
         def channel_data(field, type_):
             return data('channel', field, type_)
 
-        category = data('category', 'label', compat_str)
+        category = data('category', 'label', str)
         categories = [category] if category else None
 
         nsfw = video.get('nsfw')
@@ -1264,7 +1533,7 @@ class PeerTubeIE(InfoExtractor):
         else:
             age_limit = None
 
-        webpage_url = 'https://%s/videos/watch/%s' % (host, video_id)
+        webpage_url = f'https://{host}/videos/watch/{video_id}'
 
         return {
             'id': video_id,
@@ -1272,14 +1541,14 @@ class PeerTubeIE(InfoExtractor):
             'description': description,
             'thumbnail': urljoin(webpage_url, video.get('thumbnailPath')),
             'timestamp': unified_timestamp(video.get('publishedAt')),
-            'uploader': account_data('displayName', compat_str),
+            'uploader': account_data('displayName', str),
             'uploader_id': str_or_none(account_data('id', int)),
-            'uploader_url': url_or_none(account_data('url', compat_str)),
-            'channel': channel_data('displayName', compat_str),
+            'uploader_url': url_or_none(account_data('url', str)),
+            'channel': channel_data('displayName', str),
             'channel_id': str_or_none(channel_data('id', int)),
-            'channel_url': url_or_none(channel_data('url', compat_str)),
-            'language': data('language', 'id', compat_str),
-            'license': data('licence', 'label', compat_str),
+            'channel_url': url_or_none(channel_data('url', str)),
+            'language': data('language', 'id', str),
+            'license': data('licence', 'label', str),
             'duration': int_or_none(video.get('duration')),
             'view_count': int_or_none(video.get('views')),
             'like_count': int_or_none(video.get('likes')),
@@ -1289,6 +1558,7 @@ class PeerTubeIE(InfoExtractor):
             'categories': categories,
             'formats': formats,
             'subtitles': subtitles,
+            'is_live': is_live,
             'webpage_url': webpage_url,
         }
 
@@ -1301,28 +1571,10 @@ class PeerTubePlaylistIE(InfoExtractor):
         'w/p': 'video-playlists',
     }
     _VALID_URL = r'''(?x)
-                        https?://(?P<host>%s)/(?P<type>(?:%s))/
+                        https?://(?P<host>{})/(?P<type>(?:{}))/
                     (?P<id>[^/]+)
-                    ''' % (PeerTubeIE._INSTANCES_RE, '|'.join(_TYPES.keys()))
+                    '''.format(PeerTubeIE._INSTANCES_RE, '|'.join(_TYPES.keys()))
     _TESTS = [{
-        'url': 'https://peertube.tux.ovh/w/p/3af94cba-95e8-4b74-b37a-807ab6d82526',
-        'info_dict': {
-            'id': '3af94cba-95e8-4b74-b37a-807ab6d82526',
-            'description': 'playlist',
-            'timestamp': 1611171863,
-            'title': 'playlist',
-        },
-        'playlist_mincount': 6,
-    }, {
-        'url': 'https://peertube.tux.ovh/w/p/wkyqcQBnsvFxtUB2pkYc1e',
-        'info_dict': {
-            'id': 'wkyqcQBnsvFxtUB2pkYc1e',
-            'description': 'Cette liste de vidéos contient uniquement les jeux qui peuvent être terminés en une seule vidéo.',
-            'title': 'Let\'s Play',
-            'timestamp': 1604147331,
-        },
-        'playlist_mincount': 6,
-    }, {
         'url': 'https://peertube.debian.social/w/p/hFdJoTuyhNJVa1cDWd1d12',
         'info_dict': {
             'id': 'hFdJoTuyhNJVa1cDWd1d12',
@@ -1363,21 +1615,21 @@ class PeerTubePlaylistIE(InfoExtractor):
         return self._download_json(
             self._API_BASE % (host, base, name, path), name, **kwargs)
 
-    def fetch_page(self, host, id, type, page):
+    def fetch_page(self, host, playlist_id, playlist_type, page):
         page += 1
         video_data = self.call_api(
-            host, id,
+            host, playlist_id,
             f'/videos?sort=-createdAt&start={self._PAGE_SIZE * (page - 1)}&count={self._PAGE_SIZE}&nsfw=both',
-            type, note=f'Downloading page {page}').get('data', [])
+            playlist_type, note=f'Downloading page {page}').get('data', [])
         for video in video_data:
-            shortUUID = video.get('shortUUID') or try_get(video, lambda x: x['video']['shortUUID'])
+            short_uuid = video.get('shortUUID') or try_get(video, lambda x: x['video']['shortUUID'])
             video_title = video.get('name') or try_get(video, lambda x: x['video']['name'])
             yield self.url_result(
-                f'https://{host}/w/{shortUUID}', PeerTubeIE.ie_key(),
-                video_id=shortUUID, video_title=video_title)
+                f'https://{host}/w/{short_uuid}', PeerTubeIE.ie_key(),
+                video_id=short_uuid, video_title=video_title)
 
-    def _extract_playlist(self, host, type, id):
-        info = self.call_api(host, id, '', type, note='Downloading playlist information', fatal=False)
+    def _extract_playlist(self, host, playlist_type, playlist_id):
+        info = self.call_api(host, playlist_id, '', playlist_type, note='Downloading playlist information', fatal=False)
 
         playlist_title = info.get('displayName')
         playlist_description = info.get('description')
@@ -1387,13 +1639,12 @@ class PeerTubePlaylistIE(InfoExtractor):
         thumbnail = format_field(info, 'thumbnailPath', f'https://{host}%s')
 
         entries = OnDemandPagedList(functools.partial(
-            self.fetch_page, host, id, type), self._PAGE_SIZE)
+            self.fetch_page, host, playlist_id, playlist_type), self._PAGE_SIZE)
 
         return self.playlist_result(
-            entries, id, playlist_title, playlist_description,
+            entries, playlist_id, playlist_title, playlist_description,
             timestamp=playlist_timestamp, channel=channel, channel_id=channel_id, thumbnail=thumbnail)
 
     def _real_extract(self, url):
-        type, host, id = self._match_valid_url(url).group('type', 'host', 'id')
-        type = self._TYPES[type]
-        return self._extract_playlist(host, type, id)
+        playlist_type, host, playlist_id = self._match_valid_url(url).group('type', 'host', 'id')
+        return self._extract_playlist(host, self._TYPES[playlist_type], playlist_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/peertv.py b/plugins/youtube_download/yt_dlp/extractor/peertv.py
index a709e21..726d5e1 100644
--- a/plugins/youtube_download/yt_dlp/extractor/peertv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/peertv.py
@@ -48,5 +48,5 @@ class PeerTVIE(InfoExtractor):
             'title': self._html_search_regex(r'<h1>(.+?)</h1>', webpage, 'title').replace('\xa0', ' '),
             'formats': formats,
             'description': self._html_search_meta(('og:description', 'description'), webpage),
-            'thumbnail': self._html_search_meta(('og:image', 'image'), webpage)
+            'thumbnail': self._html_search_meta(('og:image', 'image'), webpage),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/peloton.py b/plugins/youtube_download/yt_dlp/extractor/peloton.py
index 7864299..5999d4a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/peloton.py
+++ b/plugins/youtube_download/yt_dlp/extractor/peloton.py
@@ -36,12 +36,12 @@ class PelotonIE(InfoExtractor):
             'chapters': 'count:1',
             'subtitles': {'en': [{
                 'url': r're:^https?://.+',
-                'ext': 'vtt'
+                'ext': 'vtt',
             }]},
         }, 'params': {
             'skip_download': 'm3u8',
         },
-        '_skip': 'Account needed'
+        'skip': 'Account needed',
     }, {
         'url': 'https://members.onepeloton.com/classes/player/26603d53d6bb4de1b340514864a6a6a8',
         'info_dict': {
@@ -57,11 +57,11 @@ class PelotonIE(InfoExtractor):
             'duration': 1802,
             'categories': ['Running'],
             'is_live': False,
-            'chapters': 'count:3'
+            'chapters': 'count:3',
         }, 'params': {
             'skip_download': 'm3u8',
         },
-        '_skip': 'Account needed'
+        'skip': 'Account needed',
     }]
 
     _MANIFEST_URL_TEMPLATE = '%s?hdnea=%s'
@@ -79,7 +79,7 @@ class PelotonIE(InfoExtractor):
                 data=json.dumps({
                     'username_or_email': username,
                     'password': password,
-                    'with_pubsub': False
+                    'with_pubsub': False,
                 }).encode(),
                 headers={'Content-Type': 'application/json', 'User-Agent': 'web'})
         except ExtractorError as e:
@@ -115,7 +115,7 @@ class PelotonIE(InfoExtractor):
             else:
                 raise
 
-        metadata = self._download_json('https://api.onepeloton.com/api/ride/%s/details?stream_source=multichannel' % video_id, video_id)
+        metadata = self._download_json(f'https://api.onepeloton.com/api/ride/{video_id}/details?stream_source=multichannel', video_id)
         ride_data = metadata.get('ride')
         if not ride_data:
             raise ExtractorError('Missing stream metadata')
@@ -133,7 +133,7 @@ class PelotonIE(InfoExtractor):
             subtitles = {}
         else:
             if ride_data.get('vod_stream_url'):
-                url = 'https://members.onepeloton.com/.netlify/functions/m3u8-proxy?displayLanguage=en&acceptedSubtitles=%s&url=%s?hdnea=%s' % (
+                url = 'https://members.onepeloton.com/.netlify/functions/m3u8-proxy?displayLanguage=en&acceptedSubtitles={}&url={}?hdnea={}'.format(
                     ','.join([re.sub('^([a-z]+)-([A-Z]+)$', r'\1', caption) for caption in ride_data['captions']]),
                     ride_data['vod_stream_url'],
                     urllib.parse.quote(urllib.parse.quote(token)))
@@ -147,14 +147,14 @@ class PelotonIE(InfoExtractor):
         if metadata.get('instructor_cues'):
             subtitles['cues'] = [{
                 'data': json.dumps(metadata.get('instructor_cues')),
-                'ext': 'json'
+                'ext': 'json',
             }]
 
         category = ride_data.get('fitness_discipline_display_name')
         chapters = [{
             'start_time': segment.get('start_time_offset'),
             'end_time': segment.get('start_time_offset') + segment.get('length'),
-            'title': segment.get('name')
+            'title': segment.get('name'),
         } for segment in traverse_obj(metadata, ('segments', 'segment_list'))]
 
         return {
@@ -171,7 +171,7 @@ class PelotonIE(InfoExtractor):
             'categories': [category] if category else None,
             'tags': traverse_obj(ride_data, ('equipment_tags', ..., 'name')),
             'is_live': is_live,
-            'chapters': chapters
+            'chapters': chapters,
         }
 
 
@@ -194,12 +194,12 @@ class PelotonLiveIE(InfoExtractor):
             'duration': 2014,
             'categories': ['Cycling'],
             'is_live': False,
-            'chapters': 'count:3'
+            'chapters': 'count:3',
         },
         'params': {
             'skip_download': 'm3u8',
         },
-        '_skip': 'Account needed'
+        'skip': 'Account needed',
     }
 
     def _real_extract(self, url):
@@ -208,7 +208,7 @@ class PelotonLiveIE(InfoExtractor):
 
         if peloton.get('ride_id'):
             if not peloton.get('is_live') or peloton.get('is_encore') or peloton.get('status') != 'PRE_START':
-                return self.url_result('https://members.onepeloton.com/classes/player/%s' % peloton['ride_id'])
+                return self.url_result('https://members.onepeloton.com/classes/player/{}'.format(peloton['ride_id']))
             else:
                 raise ExtractorError('Ride has not started', expected=True)
         else:
diff --git a/plugins/youtube_download/yt_dlp/extractor/people.py b/plugins/youtube_download/yt_dlp/extractor/people.py
deleted file mode 100644
index c5143c3..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/people.py
+++ /dev/null
@@ -1,29 +0,0 @@
-from .common import InfoExtractor
-
-
-class PeopleIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?people\.com/people/videos/0,,(?P<id>\d+),00\.html'
-
-    _TEST = {
-        'url': 'http://www.people.com/people/videos/0,,20995451,00.html',
-        'info_dict': {
-            'id': 'ref:20995451',
-            'ext': 'mp4',
-            'title': 'Astronaut Love Triangle Victim Speaks Out: “The Crime in 2007 Hasn’t Defined Us”',
-            'description': 'Colleen Shipman speaks to PEOPLE for the first time about life after the attack',
-            'thumbnail': r're:^https?://.*\.jpg',
-            'duration': 246.318,
-            'timestamp': 1458720585,
-            'upload_date': '20160323',
-            'uploader_id': '416418724',
-        },
-        'params': {
-            'skip_download': True,
-        },
-        'add_ie': ['BrightcoveNew'],
-    }
-
-    def _real_extract(self, url):
-        return self.url_result(
-            'http://players.brightcove.net/416418724/default_default/index.html?videoId=ref:%s'
-            % self._match_id(url), 'BrightcoveNew')
diff --git a/plugins/youtube_download/yt_dlp/extractor/performgroup.py b/plugins/youtube_download/yt_dlp/extractor/performgroup.py
index f4d7f22..df726c9 100644
--- a/plugins/youtube_download/yt_dlp/extractor/performgroup.py
+++ b/plugins/youtube_download/yt_dlp/extractor/performgroup.py
@@ -1,5 +1,5 @@
 from .common import InfoExtractor
-from ..utils import int_or_none
+from ..utils import int_or_none, join_nonempty
 
 
 class PerformGroupIE(InfoExtractor):
@@ -15,12 +15,12 @@ class PerformGroupIE(InfoExtractor):
             'description': 'md5:7cd3b459c82725b021e046ab10bf1c5b',
             'timestamp': 1511533477,
             'upload_date': '20171124',
-        }
+        },
     }]
 
     def _call_api(self, service, auth_token, content_id, referer_url):
         return self._download_json(
-            'http://ep3.performfeeds.com/ep%s/%s/%s/' % (service, auth_token, content_id),
+            f'http://ep3.performfeeds.com/ep{service}/{auth_token}/{content_id}/',
             content_id, headers={
                 'Referer': referer_url,
                 'Origin': 'http://player.performgroup.com',
@@ -50,11 +50,8 @@ class PerformGroupIE(InfoExtractor):
             if not c_url:
                 continue
             tbr = int_or_none(c.get('bitrate'), 1000)
-            format_id = 'http'
-            if tbr:
-                format_id += '-%d' % tbr
             formats.append({
-                'format_id': format_id,
+                'format_id': join_nonempty('http', tbr),
                 'url': c_url,
                 'tbr': tbr,
                 'width': int_or_none(c.get('width')),
diff --git a/plugins/youtube_download/yt_dlp/extractor/periscope.py b/plugins/youtube_download/yt_dlp/extractor/periscope.py
index 84bcf15..e3b33c4 100644
--- a/plugins/youtube_download/yt_dlp/extractor/periscope.py
+++ b/plugins/youtube_download/yt_dlp/extractor/periscope.py
@@ -4,38 +4,43 @@ from ..utils import (
     parse_iso8601,
     unescapeHTML,
 )
+from ..utils.traversal import traverse_obj
 
 
 class PeriscopeBaseIE(InfoExtractor):
     _M3U8_HEADERS = {
-        'Referer': 'https://www.periscope.tv/'
+        'Referer': 'https://www.periscope.tv/',
     }
 
     def _call_api(self, method, query, item_id):
         return self._download_json(
-            'https://api.periscope.tv/api/v2/%s' % method,
+            f'https://api.periscope.tv/api/v2/{method}',
             item_id, query=query)
 
     def _parse_broadcast_data(self, broadcast, video_id):
         title = broadcast.get('status') or 'Periscope Broadcast'
         uploader = broadcast.get('user_display_name') or broadcast.get('username')
-        title = '%s - %s' % (uploader, title) if uploader else title
-        is_live = broadcast.get('state').lower() == 'running'
-
+        title = f'{uploader} - {title}' if uploader else title
         thumbnails = [{
             'url': broadcast[image],
-        } for image in ('image_url', 'image_url_small') if broadcast.get(image)]
+        } for image in ('image_url', 'image_url_medium', 'image_url_small') if broadcast.get(image)]
 
         return {
             'id': broadcast.get('id') or video_id,
             'title': title,
-            'timestamp': parse_iso8601(broadcast.get('created_at')),
+            'timestamp': parse_iso8601(broadcast.get('created_at')) or int_or_none(
+                broadcast.get('created_at_ms'), scale=1000),
+            'release_timestamp': int_or_none(broadcast.get('scheduled_start_ms'), scale=1000),
             'uploader': uploader,
             'uploader_id': broadcast.get('user_id') or broadcast.get('username'),
             'thumbnails': thumbnails,
             'view_count': int_or_none(broadcast.get('total_watched')),
+            'concurrent_view_count': int_or_none(broadcast.get('total_watching')),
             'tags': broadcast.get('tags'),
-            'is_live': is_live,
+            'live_status': {
+                'running': 'is_live',
+                'not_started': 'is_upcoming',
+            }.get(traverse_obj(broadcast, ('state', {str.lower}))) or 'was_live',
         }
 
     @staticmethod
@@ -160,7 +165,7 @@ class PeriscopeUserIE(PeriscopeBaseIE):
                 webpage, 'data store', default='{}', group='data')),
             user_name)
 
-        user = list(data_store['UserCache']['users'].values())[0]['user']
+        user = next(iter(data_store['UserCache']['users'].values()))['user']
         user_id = user['id']
         session_id = data_store['SessionToken']['public']['broadcastHistory']['token']['session_id']
 
@@ -177,7 +182,7 @@ class PeriscopeUserIE(PeriscopeBaseIE):
 
         entries = [
             self.url_result(
-                'https://www.periscope.tv/%s/%s' % (user_name, broadcast_id))
+                f'https://www.periscope.tv/{user_name}/{broadcast_id}')
             for broadcast_id in broadcast_ids]
 
         return self.playlist_result(entries, user_id, title, description)
diff --git a/plugins/youtube_download/yt_dlp/extractor/philharmoniedeparis.py b/plugins/youtube_download/yt_dlp/extractor/philharmoniedeparis.py
index e8494a0..310ea0f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/philharmoniedeparis.py
+++ b/plugins/youtube_download/yt_dlp/extractor/philharmoniedeparis.py
@@ -1,5 +1,4 @@
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import try_get
 
 
@@ -48,7 +47,7 @@ class PhilharmonieDeParisIE(InfoExtractor):
         video_id = self._match_id(url)
 
         config = self._download_json(
-            'https://otoplayer.philharmoniedeparis.fr/fr/config/%s.json' % video_id, video_id, query={
+            f'https://otoplayer.philharmoniedeparis.fr/fr/config/{video_id}.json', video_id, query={
                 'id': video_id,
                 'lang': 'fr-FR',
             })
@@ -66,7 +65,7 @@ class PhilharmonieDeParisIE(InfoExtractor):
             formats = []
             for format_id in ('mobile', 'desktop'):
                 format_url = try_get(
-                    files, lambda x: x[format_id]['file'], compat_str)
+                    files, lambda x: x[format_id]['file'], str)
                 if not format_url or format_url in format_urls:
                     continue
                 format_urls.add(format_url)
@@ -91,7 +90,7 @@ class PhilharmonieDeParisIE(InfoExtractor):
             entry = extract_entry(chapter)
             if entry is None:
                 continue
-            entry['id'] = '%s-%d' % (video_id, num)
+            entry['id'] = f'{video_id}-{num}'
             entries.append(entry)
 
         return self.playlist_result(entries, video_id, config.get('title'))
diff --git a/plugins/youtube_download/yt_dlp/extractor/phoenix.py b/plugins/youtube_download/yt_dlp/extractor/phoenix.py
index 5fa133a..9df34f8 100644
--- a/plugins/youtube_download/yt_dlp/extractor/phoenix.py
+++ b/plugins/youtube_download/yt_dlp/extractor/phoenix.py
@@ -1,51 +1,31 @@
-import re
-
 from .youtube import YoutubeIE
 from .zdf import ZDFBaseIE
-from ..compat import compat_str
 from ..utils import (
     int_or_none,
     merge_dicts,
     try_get,
     unified_timestamp,
-    urljoin,
 )
 
 
 class PhoenixIE(ZDFBaseIE):
     IE_NAME = 'phoenix.de'
-    _VALID_URL = r'https?://(?:www\.)?phoenix\.de/(?:[^/]+/)*[^/?#&]*-a-(?P<id>\d+)\.html'
+    _VALID_URL = r'https?://(?:www\.)?phoenix\.de/(?:[^/?#]+/)*[^/?#&]*-a-(?P<id>\d+)\.html'
     _TESTS = [{
-        # Same as https://www.zdf.de/politik/phoenix-sendungen/wohin-fuehrt-der-protest-in-der-pandemie-100.html
-        'url': 'https://www.phoenix.de/sendungen/ereignisse/corona-nachgehakt/wohin-fuehrt-der-protest-in-der-pandemie-a-2050630.html',
-        'md5': '34ec321e7eb34231fd88616c65c92db0',
+        'url': 'https://www.phoenix.de/sendungen/dokumentationen/spitzbergen-a-893349.html',
+        'md5': 'a79e86d9774d0b3f2102aff988a0bd32',
         'info_dict': {
-            'id': '210222_phx_nachgehakt_corona_protest',
+            'id': '221215_phx_spitzbergen',
             'ext': 'mp4',
-            'title': 'Wohin führt der Protest in der Pandemie?',
-            'description': 'md5:7d643fe7f565e53a24aac036b2122fbd',
-            'duration': 1691,
-            'timestamp': 1613902500,
-            'upload_date': '20210221',
+            'title': 'Spitzbergen',
+            'description': 'Film von Tilmann Bünz',
+            'duration': 728.0,
+            'timestamp': 1555600500,
+            'upload_date': '20190418',
             'uploader': 'Phoenix',
-            'series': 'corona nachgehakt',
-            'episode': 'Wohin führt der Protest in der Pandemie?',
-        },
-    }, {
-        # Youtube embed
-        'url': 'https://www.phoenix.de/sendungen/gespraeche/phoenix-streitgut-brennglas-corona-a-1965505.html',
-        'info_dict': {
-            'id': 'hMQtqFYjomk',
-            'ext': 'mp4',
-            'title': 'phoenix streitgut: Brennglas Corona - Wie gerecht ist unsere Gesellschaft?',
-            'description': 'md5:ac7a02e2eb3cb17600bc372e4ab28fdd',
-            'duration': 3509,
-            'upload_date': '20201219',
-            'uploader': 'phoenix',
-            'uploader_id': 'phoenix',
-        },
-        'params': {
-            'skip_download': True,
+            'thumbnail': 'https://www.phoenix.de/sixcms/media.php/21/Bergspitzen1.png',
+            'series': 'Dokumentationen',
+            'episode': 'Spitzbergen',
         },
     }, {
         'url': 'https://www.phoenix.de/entwicklungen-in-russland-a-2044720.html',
@@ -64,7 +44,7 @@ class PhoenixIE(ZDFBaseIE):
         article_id = self._match_id(url)
 
         article = self._download_json(
-            'https://www.phoenix.de/response/id/%s' % article_id, article_id,
+            f'https://www.phoenix.de/response/id/{article_id}', article_id,
             'Downloading article JSON')
 
         video = article['absaetze'][0]
@@ -76,7 +56,7 @@ class PhoenixIE(ZDFBaseIE):
                 video_id, ie=YoutubeIE.ie_key(), video_id=video_id,
                 video_title=title)
 
-        video_id = compat_str(video.get('basename') or video.get('content'))
+        video_id = str(video.get('basename') or video.get('content'))
 
         details = self._download_json(
             'https://www.phoenix.de/php/mediaplayer/data/beitrags_details.php',
@@ -91,31 +71,19 @@ class PhoenixIE(ZDFBaseIE):
         content_id = details['tracking']['nielsen']['content']['assetid']
 
         info = self._extract_ptmd(
-            'https://tmd.phoenix.de/tmd/2/ngplayer_2_3/vod/ptmd/phoenix/%s' % content_id,
-            content_id, None, url)
+            f'https://tmd.phoenix.de/tmd/2/android_native_6/vod/ptmd/phoenix/{content_id}',
+            content_id)
 
         duration = int_or_none(try_get(
             details, lambda x: x['tracking']['nielsen']['content']['length']))
         timestamp = unified_timestamp(details.get('editorialDate'))
         series = try_get(
             details, lambda x: x['tracking']['nielsen']['content']['program'],
-            compat_str)
+            str)
         episode = title if details.get('contentType') == 'episode' else None
 
-        thumbnails = []
         teaser_images = try_get(details, lambda x: x['teaserImageRef']['layouts'], dict) or {}
-        for thumbnail_key, thumbnail_url in teaser_images.items():
-            thumbnail_url = urljoin(url, thumbnail_url)
-            if not thumbnail_url:
-                continue
-            thumbnail = {
-                'url': thumbnail_url,
-            }
-            m = re.match('^([0-9]+)x([0-9]+)$', thumbnail_key)
-            if m:
-                thumbnail['width'] = int(m.group(1))
-                thumbnail['height'] = int(m.group(2))
-            thumbnails.append(thumbnail)
+        thumbnails = self._extract_thumbnails(teaser_images)
 
         return merge_dicts(info, {
             'id': content_id,
diff --git a/plugins/youtube_download/yt_dlp/extractor/photobucket.py b/plugins/youtube_download/yt_dlp/extractor/photobucket.py
index 71e9a48..a7e5bc0 100644
--- a/plugins/youtube_download/yt_dlp/extractor/photobucket.py
+++ b/plugins/youtube_download/yt_dlp/extractor/photobucket.py
@@ -1,7 +1,7 @@
 import json
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import compat_urllib_parse_unquote
 
 
 class PhotobucketIE(InfoExtractor):
@@ -16,7 +16,7 @@ class PhotobucketIE(InfoExtractor):
             'upload_date': '20130504',
             'uploader': 'rachaneronas',
             'title': 'Tired of Link Building? Try BacklinkMyDomain.com!',
-        }
+        },
     }
 
     def _real_extract(self, url):
@@ -31,7 +31,7 @@ class PhotobucketIE(InfoExtractor):
         info_json = self._search_regex(r'Pb\.Data\.Shared\.put\(Pb\.Data\.Shared\.MEDIA, (.*?)\);',
                                        webpage, 'info json')
         info = json.loads(info_json)
-        url = compat_urllib_parse_unquote(self._html_search_regex(r'file=(.+\.mp4)', info['linkcodes']['html'], 'url'))
+        url = urllib.parse.unquote(self._html_search_regex(r'file=(.+\.mp4)', info['linkcodes']['html'], 'url'))
         return {
             'id': video_id,
             'url': url,
diff --git a/plugins/youtube_download/yt_dlp/extractor/pialive.py b/plugins/youtube_download/yt_dlp/extractor/pialive.py
new file mode 100644
index 0000000..7469135
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/pialive.py
@@ -0,0 +1,122 @@
+from .common import InfoExtractor
+from ..utils import (
+    ExtractorError,
+    clean_html,
+    extract_attributes,
+    get_element_by_class,
+    get_element_html_by_class,
+    multipart_encode,
+    str_or_none,
+    unified_timestamp,
+    url_or_none,
+)
+from ..utils.traversal import traverse_obj
+
+
+class PiaLiveIE(InfoExtractor):
+    _VALID_URL = r'https?://player\.pia-live\.jp/stream/(?P<id>[\w-]+)'
+    _PLAYER_ROOT_URL = 'https://player.pia-live.jp/'
+    _PIA_LIVE_API_URL = 'https://api.pia-live.jp'
+    _API_KEY = 'kfds)FKFps-dms9e'
+    _TESTS = [{
+        'url': 'https://player.pia-live.jp/stream/4JagFBEIM14s_hK9aXHKf3k3F3bY5eoHFQxu68TC6krUDqGOwN4d61dCWQYOd6CTxl4hjya9dsfEZGsM4uGOUdax60lEI4twsXGXf7crmz8Gk__GhupTrWxA7RFRVt76',
+        'info_dict': {
+            'id': '88f3109a-f503-4d0f-a9f7-9f39ac745d84',
+            'display_id': '2431867_001',
+            'title': 'こながめでたい日２０２４の視聴ページ | PIA LIVE STREAM(ぴあライブストリーム)',
+            'live_status': 'was_live',
+            'comment_count': int,
+        },
+        'params': {
+            'getcomments': True,
+            'skip_download': True,
+            'ignore_no_formats_error': True,
+        },
+        'skip': 'The video is no longer available',
+    }, {
+        'url': 'https://player.pia-live.jp/stream/4JagFBEIM14s_hK9aXHKf3k3F3bY5eoHFQxu68TC6krJdu0GVBVbVy01IwpJ6J3qBEm3d9TCTt1d0eWpsZGj7DrOjVOmS7GAWGwyscMgiThopJvzgWC4H5b-7XQjAfRZ',
+        'info_dict': {
+            'id': '9ce8b8ba-f6d1-4d1f-83a0-18c3148ded93',
+            'display_id': '2431867_002',
+            'title': 'こながめでたい日２０２４の視聴ページ | PIA LIVE STREAM(ぴあライブストリーム)',
+            'live_status': 'was_live',
+            'comment_count': int,
+        },
+        'params': {
+            'getcomments': True,
+            'skip_download': True,
+            'ignore_no_formats_error': True,
+        },
+        'skip': 'The video is no longer available',
+    }]
+
+    def _extract_var(self, variable, html):
+        return self._search_regex(
+            rf'(?:var|const|let)\s+{variable}\s*=\s*(["\'])(?P<value>(?:(?!\1).)+)\1',
+            html, f'variable {variable}', group='value')
+
+    def _real_extract(self, url):
+        video_key = self._match_id(url)
+        webpage = self._download_webpage(url, video_key)
+
+        program_code = self._extract_var('programCode', webpage)
+        article_code = self._extract_var('articleCode', webpage)
+        title = self._html_extract_title(webpage)
+
+        if get_element_html_by_class('play-end', webpage):
+            raise ExtractorError('The video is no longer available', expected=True, video_id=program_code)
+
+        if start_info := clean_html(get_element_by_class('play-waiting__date', webpage)):
+            date, time = self._search_regex(
+                r'(?P<date>\d{4}/\d{1,2}/\d{1,2})\([月火水木金土日]\)(?P<time>\d{2}:\d{2})',
+                start_info, 'start_info', fatal=False, group=('date', 'time'))
+            if date and time:
+                release_timestamp_str = f'{date} {time} +09:00'
+                release_timestamp = unified_timestamp(release_timestamp_str)
+                self.raise_no_formats(f'The video will be available after {release_timestamp_str}', expected=True)
+                return {
+                    'id': program_code,
+                    'title': title,
+                    'live_status': 'is_upcoming',
+                    'release_timestamp': release_timestamp,
+                }
+
+        payload, content_type = multipart_encode({
+            'play_url': video_key,
+            'api_key': self._API_KEY,
+        })
+        api_data_and_headers = {
+            'data': payload,
+            'headers': {'Content-Type': content_type, 'Referer': self._PLAYER_ROOT_URL},
+        }
+
+        player_tag_list = self._download_json(
+            f'{self._PIA_LIVE_API_URL}/perf/player-tag-list/{program_code}', program_code,
+            'Fetching player tag list', 'Unable to fetch player tag list', **api_data_and_headers)
+
+        return self.url_result(
+            extract_attributes(player_tag_list['data']['movie_one_tag'])['src'],
+            url_transparent=True, title=title, display_id=program_code,
+            __post_extractor=self.extract_comments(program_code, article_code, api_data_and_headers))
+
+    def _get_comments(self, program_code, article_code, api_data_and_headers):
+        chat_room_url = traverse_obj(self._download_json(
+            f'{self._PIA_LIVE_API_URL}/perf/chat-tag-list/{program_code}/{article_code}', program_code,
+            'Fetching chat info', 'Unable to fetch chat info', fatal=False, **api_data_and_headers),
+            ('data', 'chat_one_tag', {extract_attributes}, 'src', {url_or_none}))
+        if not chat_room_url:
+            return
+        comment_page = self._download_webpage(
+            chat_room_url, program_code, 'Fetching comment page', 'Unable to fetch comment page',
+            fatal=False, headers={'Referer': self._PLAYER_ROOT_URL})
+        if not comment_page:
+            return
+        yield from traverse_obj(self._search_json(
+            r'var\s+_history\s*=', comment_page, 'comment list',
+            program_code, contains_pattern=r'\[(?s:.+)\]', fatal=False), (..., {
+                'timestamp': (0, {int}),
+                'author_is_uploader': (1, {lambda x: x == 2}),
+                'author': (2, {str}),
+                'text': (3, {str}),
+                'id': (4, {str_or_none}),
+            }))
diff --git a/plugins/youtube_download/yt_dlp/extractor/piapro.py b/plugins/youtube_download/yt_dlp/extractor/piapro.py
index 5f39e06..72e3748 100644
--- a/plugins/youtube_download/yt_dlp/extractor/piapro.py
+++ b/plugins/youtube_download/yt_dlp/extractor/piapro.py
@@ -1,7 +1,10 @@
+import urllib.parse
+
 from .common import InfoExtractor
-from ..compat import compat_urlparse
 from ..utils import (
     ExtractorError,
+    clean_html,
+    get_element_by_class,
     parse_duration,
     parse_filesize,
     str_to_int,
@@ -12,7 +15,7 @@ from ..utils import (
 
 class PiaproIE(InfoExtractor):
     _NETRC_MACHINE = 'piapro'
-    _VALID_URL = r'https?://piapro\.jp/(?:t|content)/(?P<id>\w+)/?'
+    _VALID_URL = r'https?://piapro\.jp/(?:t|content)/(?P<id>[\w-]+)/?'
     _TESTS = [{
         'url': 'https://piapro.jp/t/NXYR',
         'md5': 'f7c0f760913fb1d44a1c45a4af793909',
@@ -28,7 +31,7 @@ class PiaproIE(InfoExtractor):
             'thumbnail': r're:^https?://.*\.(?:png|jpg)$',
             'upload_date': '20090901',
             'view_count': int,
-        }
+        },
     }, {
         'note': 'There are break lines in description, mandating (?s) flag',
         'url': 'https://piapro.jp/t/9cSd',
@@ -45,10 +48,13 @@ class PiaproIE(InfoExtractor):
             'view_count': int,
             'thumbnail': r're:^https?://.*\.(?:png|jpg)$',
             'uploader_id': 'cyankino',
-        }
+        },
     }, {
         'url': 'https://piapro.jp/content/hcw0z3a169wtemz6',
-        'only_matching': True
+        'only_matching': True,
+    }, {
+        'url': 'https://piapro.jp/t/-SO-',
+        'only_matching': True,
     }]
 
     _login_status = False
@@ -59,7 +65,7 @@ class PiaproIE(InfoExtractor):
             '_username': username,
             '_password': password,
             '_remember_me': 'on',
-            'login': 'ログイン'
+            'login': 'ログイン',
         }
         self._request_webpage('https://piapro.jp/login/', None)
         urlh = self._request_webpage(
@@ -69,7 +75,7 @@ class PiaproIE(InfoExtractor):
         if urlh is False:
             login_ok = False
         else:
-            parts = compat_urlparse.urlparse(urlh.url)
+            parts = urllib.parse.urlparse(urlh.url)
             if parts.path != '/':
                 login_ok = False
         if not login_ok:
@@ -85,34 +91,22 @@ class PiaproIE(InfoExtractor):
         if category_id not in ('1', '2', '21', '22', '23', '24', '25'):
             raise ExtractorError('The URL does not contain audio.', expected=True)
 
-        str_duration, str_filesize = self._search_regex(
-            r'サイズ：</span>(.+?)/\(([0-9,]+?[KMG]?B)）', webpage, 'duration and size',
-            group=(1, 2), default=(None, None))
-        str_viewcount = self._search_regex(r'閲覧数：</span>([0-9,]+)\s+', webpage, 'view count', fatal=False)
-
-        uploader_id, uploader = self._search_regex(
-            r'<a\s+class="cd_user-name"\s+href="/(.*)">([^<]+)さん<', webpage, 'uploader',
-            group=(1, 2), default=(None, None))
-        content_id = self._search_regex(r'contentId\:\'(.+)\'', webpage, 'content ID')
-        create_date = self._search_regex(r'createDate\:\'(.+)\'', webpage, 'timestamp')
-
-        player_webpage = self._download_webpage(
-            f'https://piapro.jp/html5_player_popup/?id={content_id}&cdate={create_date}',
-            video_id, note='Downloading player webpage')
+        def extract_info(name, description):
+            return self._search_regex(rf'{name}[：:]\s*([\d\s,:/]+)\s*</p>', webpage, description, default=None)
 
         return {
             'id': video_id,
-            'title': self._html_search_regex(r'<h1\s+class="cd_works-title">(.+?)</h1>', webpage, 'title', fatal=False),
-            'description': self._html_search_regex(r'(?s)<p\s+class="cd_dtl_cap">(.+?)</p>\s*<div', webpage, 'description', fatal=False),
-            'uploader': uploader,
-            'uploader_id': uploader_id,
-            'timestamp': unified_timestamp(create_date, False),
-            'duration': parse_duration(str_duration),
-            'view_count': str_to_int(str_viewcount),
+            'title': clean_html(get_element_by_class('contents_title', webpage)),
+            'description': clean_html(get_element_by_class('contents_description', webpage)),
+            'uploader': clean_html(get_element_by_class('contents_creator_txt', webpage)),
+            'uploader_id': self._search_regex(
+                r'<a\s+href="/([^"]+)"', get_element_by_class('contents_creator', webpage), 'uploader id', default=None),
+            'timestamp': unified_timestamp(extract_info('投稿日', 'timestamp'), False),
+            'duration': parse_duration(extract_info('長さ', 'duration')),
+            'view_count': str_to_int(extract_info('閲覧数', 'view count')),
             'thumbnail': self._html_search_meta('twitter:image', webpage),
-
-            'filesize_approx': parse_filesize(str_filesize.replace(',', '')),
-            'url': self._search_regex(r'mp3:\s*\'(.*?)\'\}', player_webpage, 'url'),
+            'filesize_approx': parse_filesize((extract_info('サイズ', 'size') or '').replace(',', '')),
+            'url': self._search_regex(r'\"url\":\s*\"(.*?)\"', webpage, 'url'),
             'ext': 'mp3',
             'vcodec': 'none',
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/picarto.py b/plugins/youtube_download/yt_dlp/extractor/picarto.py
index d415ba2..72e89c3 100644
--- a/plugins/youtube_download/yt_dlp/extractor/picarto.py
+++ b/plugins/youtube_download/yt_dlp/extractor/picarto.py
@@ -5,6 +5,7 @@ from ..utils import (
     ExtractorError,
     str_or_none,
     traverse_obj,
+    update_url,
 )
 
 
@@ -17,14 +18,14 @@ class PicartoIE(InfoExtractor):
             'ext': 'mp4',
             'title': 're:^Setz [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
             'timestamp': int,
-            'is_live': True
+            'is_live': True,
         },
         'skip': 'Stream is offline',
     }
 
     @classmethod
     def suitable(cls, url):
-        return False if PicartoVodIE.suitable(url) else super(PicartoIE, cls).suitable(url)
+        return False if PicartoVodIE.suitable(url) else super().suitable(url)
 
     def _real_extract(self, url):
         channel_id = self._match_id(url)
@@ -42,16 +43,17 @@ class PicartoIE(InfoExtractor):
   getLoadBalancerUrl(channel_name: "%s") {
     url
   }
-}''' % (channel_id, channel_id),
-            })['data']
+}''' % (channel_id, channel_id),  # noqa: UP031
+            }, headers={'Accept': '*/*', 'Content-Type': 'application/json'})['data']
         metadata = data['channel']
 
         if metadata.get('online') == 0:
             raise ExtractorError('Stream is offline', expected=True)
         title = metadata['title']
 
-        cdn_data = self._download_json(
-            data['getLoadBalancerUrl']['url'] + '/stream/json_' + metadata['stream_name'] + '.js',
+        cdn_data = self._download_json(''.join((
+            update_url(data['getLoadBalancerUrl']['url'], scheme='https'),
+            '/stream/json_', metadata['stream_name'], '.js')),
             channel_id, 'Downloading load balancing info')
 
         formats = []
@@ -80,7 +82,7 @@ class PicartoIE(InfoExtractor):
             'is_live': True,
             'channel': channel_id,
             'channel_id': metadata.get('id'),
-            'channel_url': 'https://picarto.tv/%s' % channel_id,
+            'channel_url': f'https://picarto.tv/{channel_id}',
             'age_limit': age_limit,
             'formats': formats,
         }
@@ -95,20 +97,20 @@ class PicartoVodIE(InfoExtractor):
             'id': 'ArtofZod_2017.12.12.00.13.23.flv',
             'ext': 'mp4',
             'title': 'ArtofZod_2017.12.12.00.13.23.flv',
-            'thumbnail': r're:^https?://.*\.jpg'
+            'thumbnail': r're:^https?://.*\.jpg',
         },
         'skip': 'The VOD does not exist',
     }, {
-        'url': 'https://picarto.tv/ArtofZod/videos/772650',
-        'md5': '00067a0889f1f6869cc512e3e79c521b',
+        'url': 'https://picarto.tv/ArtofZod/videos/771008',
+        'md5': 'abef5322f2700d967720c4c6754b2a34',
         'info_dict': {
-            'id': '772650',
+            'id': '771008',
             'ext': 'mp4',
             'title': 'Art of Zod - Drawing and Painting',
             'thumbnail': r're:^https?://.*\.jpg',
             'channel': 'ArtofZod',
             'age_limit': 18,
-        }
+        },
     }, {
         'url': 'https://picarto.tv/videopopout/Plague',
         'only_matching': True,
@@ -130,8 +132,8 @@ class PicartoVodIE(InfoExtractor):
       name
     }}
   }}
-}}'''
-            })['data']['video']
+}}''',
+            }, headers={'Accept': '*/*', 'Content-Type': 'application/json'})['data']['video']
 
         file_name = data['file_name']
         netloc = urllib.parse.urlparse(data['video_recording_image_url']).netloc
diff --git a/plugins/youtube_download/yt_dlp/extractor/piksel.py b/plugins/youtube_download/yt_dlp/extractor/piksel.py
index 97a9bf5..ceb6562 100644
--- a/plugins/youtube_download/yt_dlp/extractor/piksel.py
+++ b/plugins/youtube_download/yt_dlp/extractor/piksel.py
@@ -2,8 +2,8 @@ import re
 
 from .common import InfoExtractor
 from ..utils import (
-    dict_get,
     ExtractorError,
+    dict_get,
     int_or_none,
     join_nonempty,
     parse_iso8601,
@@ -25,29 +25,31 @@ class PikselIE(InfoExtractor):
                     )|
                 (?:api|player)\.multicastmedia|
                 (?:api-ovp|player)\.piksel
-            )\.com|
+            )\.(?:com|tech)|
             (?:
                 mz-edge\.stream\.co|
                 movie-s\.nhk\.or
             )\.jp|
             vidego\.baltimorecity\.gov
         )/v/(?:refid/(?P<refid>[^/]+)/prefid/)?(?P<id>[\w-]+)'''
-    _EMBED_REGEX = [r'<iframe[^>]+src=["\'](?P<url>(?:https?:)?//player\.piksel\.com/v/[a-z0-9]+)']
+    _EMBED_REGEX = [r'<iframe[^>]+src=["\'](?P<url>(?:https?:)?//player\.piksel\.(?:com|tech)/v/[a-z0-9]+)']
     _TESTS = [
         {
-            'url': 'http://player.piksel.com/v/ums2867l',
+            'url': 'http://player.piksel.tech/v/ums2867l',
             'md5': '34e34c8d89dc2559976a6079db531e85',
             'info_dict': {
                 'id': 'ums2867l',
                 'ext': 'mp4',
                 'title': 'GX-005 with Caption',
                 'timestamp': 1481335659,
-                'upload_date': '20161210'
-            }
+                'upload_date': '20161210',
+                'description': '',
+                'thumbnail': 'https://thumbs.piksel.tech/thumbs/aid/t1488331553/3238987.jpg?w=640&h=480',
+            },
         },
         {
             # Original source: http://www.uscourts.gov/cameras-courts/state-washington-vs-donald-j-trump-et-al
-            'url': 'https://player.piksel.com/v/v80kqp41',
+            'url': 'https://player.piksel.tech/v/v80kqp41',
             'md5': '753ddcd8cc8e4fa2dda4b7be0e77744d',
             'info_dict': {
                 'id': 'v80kqp41',
@@ -55,17 +57,18 @@ class PikselIE(InfoExtractor):
                 'title': 'WAW- State of Washington vs. Donald J. Trump, et al',
                 'description': 'State of Washington vs. Donald J. Trump, et al, Case Number 17-CV-00141-JLR, TRO Hearing, Civil Rights Case, 02/3/2017, 1:00 PM (PST), Seattle Federal Courthouse, Seattle, WA, Judge James L. Robart presiding.',
                 'timestamp': 1486171129,
-                'upload_date': '20170204'
-            }
+                'upload_date': '20170204',
+                'thumbnail': 'https://thumbs.piksel.tech/thumbs/aid/t1495569155/3279887.jpg?w=640&h=360',
+            },
         },
         {
             # https://www3.nhk.or.jp/nhkworld/en/ondemand/video/2019240/
             'url': 'http://player.piksel.com/v/refid/nhkworld/prefid/nw_vod_v_en_2019_240_20190823233000_02_1566873477',
             'only_matching': True,
-        }
+        },
     ]
 
-    def _call_api(self, app_token, resource, display_id, query, host='https://player.piksel.com', fatal=True):
+    def _call_api(self, app_token, resource, display_id, query, host='https://player.piksel.tech', fatal=True):
         url = urljoin(host, f'/ws/ws_{resource}/api/{app_token}/mode/json/apiv/5')
         response = traverse_obj(
             self._download_json(url, display_id, query=query, fatal=fatal), ('response', {dict})) or {}
@@ -81,7 +84,7 @@ class PikselIE(InfoExtractor):
         webpage = self._download_webpage(url, display_id)
         app_token = self._search_regex([
             r'clientAPI\s*:\s*"([^"]+)"',
-            r'data-de-api-key\s*=\s*"([^"]+)"'
+            r'data-de-api-key\s*=\s*"([^"]+)"',
         ], webpage, 'app token')
         query = {'refid': ref_id, 'prefid': display_id} if ref_id else {'v': display_id}
         program = self._call_api(
@@ -146,7 +149,7 @@ class PikselIE(InfoExtractor):
 
         smil_url = dict_get(video_data, ['httpSmil', 'hdSmil', 'rtmpSmil'])
         if smil_url:
-            transform_source = None
+            transform_source = lambda x: x.replace('src="/', 'src="')
             if ref_id == 'nhkworld':
                 # TODO: figure out if this is something to be fixed in urljoin,
                 # _parse_smil_formats or keep it here
diff --git a/plugins/youtube_download/yt_dlp/extractor/pinkbike.py b/plugins/youtube_download/yt_dlp/extractor/pinkbike.py
index e4e1caa..0cd9632 100644
--- a/plugins/youtube_download/yt_dlp/extractor/pinkbike.py
+++ b/plugins/youtube_download/yt_dlp/extractor/pinkbike.py
@@ -27,7 +27,7 @@ class PinkbikeIE(InfoExtractor):
             'location': 'Victoria, British Columbia, Canada',
             'view_count': int,
             'comment_count': int,
-        }
+        },
     }, {
         'url': 'http://es.pinkbike.org/i/kvid/kvid-y5.swf?id=406629',
         'only_matching': True,
@@ -37,7 +37,7 @@ class PinkbikeIE(InfoExtractor):
         video_id = self._match_id(url)
 
         webpage = self._download_webpage(
-            'http://www.pinkbike.com/video/%s' % video_id, video_id)
+            f'http://www.pinkbike.com/video/{video_id}', video_id)
 
         formats = []
         for _, format_id, src in re.findall(
@@ -72,7 +72,7 @@ class PinkbikeIE(InfoExtractor):
 
         def extract_count(webpage, label):
             return str_to_int(self._search_regex(
-                r'<span[^>]+class="stat-num"[^>]*>([\d,.]+)</span>\s*<span[^>]+class="stat-label"[^>]*>%s' % label,
+                rf'<span[^>]+class="stat-num"[^>]*>([\d,.]+)</span>\s*<span[^>]+class="stat-label"[^>]*>{label}',
                 webpage, label, fatal=False))
 
         view_count = extract_count(webpage, 'Views')
@@ -89,5 +89,5 @@ class PinkbikeIE(InfoExtractor):
             'location': location,
             'view_count': view_count,
             'comment_count': comment_count,
-            'formats': formats
+            'formats': formats,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/pinterest.py b/plugins/youtube_download/yt_dlp/extractor/pinterest.py
index 8361fbb..b2fe749 100644
--- a/plugins/youtube_download/yt_dlp/extractor/pinterest.py
+++ b/plugins/youtube_download/yt_dlp/extractor/pinterest.py
@@ -22,17 +22,17 @@ class PinterestBaseIE(InfoExtractor):
 
     def _call_api(self, resource, video_id, options):
         return self._download_json(
-            'https://www.pinterest.com/resource/%sResource/get/' % resource,
-            video_id, 'Download %s JSON metadata' % resource, query={
-                'data': json.dumps({'options': options})
-            })['resource_response']
+            f'https://www.pinterest.com/resource/{resource}Resource/get/',
+            video_id, f'Download {resource} JSON metadata',
+            query={'data': json.dumps({'options': options})},
+            headers={'X-Pinterest-PWS-Handler': 'www/[username].js'})['resource_response']
 
     def _extract_video(self, data, extract_formats=True):
         video_id = data['id']
         thumbnails = []
         images = data.get('images')
         if isinstance(images, dict):
-            for thumbnail_id, thumbnail in images.items():
+            for thumbnail in images.values():
                 if not isinstance(thumbnail, dict):
                     continue
                 thumbnail_url = url_or_none(thumbnail.get('url'))
@@ -109,7 +109,7 @@ class PinterestBaseIE(InfoExtractor):
 
 
 class PinterestIE(PinterestBaseIE):
-    _VALID_URL = r'%s/pin/(?P<id>\d+)' % PinterestBaseIE._VALID_URL_BASE
+    _VALID_URL = rf'{PinterestBaseIE._VALID_URL_BASE}/pin/(?:[\w-]+--)?(?P<id>\d+)'
     _TESTS = [{
         # formats found in data['videos']
         'url': 'https://www.pinterest.com/pin/664281013778109217/',
@@ -174,6 +174,25 @@ class PinterestIE(PinterestBaseIE):
     }, {
         'url': 'https://co.pinterest.com/pin/824721750502199491/',
         'only_matching': True,
+    },
+        {
+        'url': 'https://pinterest.com/pin/dive-into-serenity-blue-lagoon-pedi-nails-for-a-tranquil-and-refreshing-spa-experience-video-in-2024--2885187256207927',
+        'info_dict': {
+            'id': '2885187256207927',
+            'ext': 'mp4',
+            'title': 'Dive into Serenity: Blue Lagoon Pedi Nails for a Tranquil and Refreshing Spa Experience! 💙💅',
+            'description': 'md5:5da41c767d2317e42e49b663b0b2150f',
+            'uploader': 'Glamour Artistry |Everyday Outfits, Luxury Fashion & Nail Designs',
+            'uploader_id': '1142999717836434688',
+            'upload_date': '20240702',
+            'timestamp': 1719939156,
+            'duration': 7.967,
+            'comment_count': int,
+            'repost_count': int,
+            'categories': 'count:9',
+            'tags': ['#BlueLagoonPediNails', '#SpaExperience'],
+            'thumbnail': r're:^https?://.*\.(?:jpg|png)$',
+        },
     }]
 
     def _real_extract(self, url):
@@ -187,7 +206,7 @@ class PinterestIE(PinterestBaseIE):
 
 
 class PinterestCollectionIE(PinterestBaseIE):
-    _VALID_URL = r'%s/(?P<username>[^/]+)/(?P<id>[^/?#&]+)' % PinterestBaseIE._VALID_URL_BASE
+    _VALID_URL = rf'{PinterestBaseIE._VALID_URL_BASE}/(?P<username>[^/]+)/(?P<id>[^/?#&]+)'
     _TESTS = [{
         'url': 'https://www.pinterest.ca/mashal0407/cool-diys/',
         'info_dict': {
@@ -207,15 +226,14 @@ class PinterestCollectionIE(PinterestBaseIE):
 
     @classmethod
     def suitable(cls, url):
-        return False if PinterestIE.suitable(url) else super(
-            PinterestCollectionIE, cls).suitable(url)
+        return False if PinterestIE.suitable(url) else super().suitable(url)
 
     def _real_extract(self, url):
         username, slug = self._match_valid_url(url).groups()
         board = self._call_api(
             'Board', slug, {
                 'slug': slug,
-                'username': username
+                'username': username,
             })['data']
         board_id = board['id']
         options = {
diff --git a/plugins/youtube_download/yt_dlp/extractor/piramidetv.py b/plugins/youtube_download/yt_dlp/extractor/piramidetv.py
new file mode 100644
index 0000000..29afa9b
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/piramidetv.py
@@ -0,0 +1,99 @@
+from .common import InfoExtractor
+from ..utils import parse_iso8601, smuggle_url, unsmuggle_url, url_or_none
+from ..utils.traversal import traverse_obj
+
+
+class PiramideTVIE(InfoExtractor):
+    _VALID_URL = r'https?://piramide\.tv/video/(?P<id>[\w-]+)'
+    _TESTS = [{
+        'url': 'https://piramide.tv/video/wWtBAORdJUTh',
+        'info_dict': {
+            'id': 'wWtBAORdJUTh',
+            'ext': 'mp4',
+            'title': 'md5:79f9c8183ea6a35c836923142cf0abcc',
+            'description': '',
+            'thumbnail': 'https://cdn.jwplayer.com/v2/media/W86PgQDn/thumbnails/B9gpIxkH.jpg',
+            'channel': 'León Picarón',
+            'channel_id': 'leonpicaron',
+            'timestamp': 1696460362,
+            'upload_date': '20231004',
+        },
+    }, {
+        'url': 'https://piramide.tv/video/wcYn6li79NgN',
+        'info_dict': {
+            'id': 'wcYn6li79NgN',
+            'ext': 'mp4',
+            'title': 'ACEPTO TENER UN BEBE CON MI NOVIA\u2026? | Parte 1',
+            'description': '',
+            'channel': 'ARTA GAME',
+            'channel_id': 'arta_game',
+            'thumbnail': 'https://cdn.jwplayer.com/v2/media/cnEdGp5X/thumbnails/rHAaWfP7.jpg',
+            'timestamp': 1703434976,
+            'upload_date': '20231224',
+        },
+    }]
+
+    def _extract_video(self, video_id):
+        video_data = self._download_json(
+            f'https://hermes.piramide.tv/video/data/{video_id}', video_id, fatal=False)
+        formats, subtitles = self._extract_m3u8_formats_and_subtitles(
+            f'https://cdn.piramide.tv/video/{video_id}/manifest.m3u8', video_id, fatal=False)
+        next_video = traverse_obj(video_data, ('video', 'next_video', 'id', {str}))
+        return next_video, {
+            'id': video_id,
+            'formats': formats,
+            'subtitles': subtitles,
+            **traverse_obj(video_data, ('video', {
+                'id': ('id', {str}),
+                'title': ('title', {str}),
+                'description': ('description', {str}),
+                'thumbnail': ('media', 'thumbnail', {url_or_none}),
+                'channel': ('channel', 'name', {str}),
+                'channel_id': ('channel', 'id', {str}),
+                'timestamp': ('date', {parse_iso8601}),
+            })),
+        }
+
+    def _entries(self, video_id):
+        visited = set()
+        while True:
+            visited.add(video_id)
+            next_video, info = self._extract_video(video_id)
+            yield info
+            if not next_video or next_video in visited:
+                break
+            video_id = next_video
+
+    def _real_extract(self, url):
+        url, smuggled_data = unsmuggle_url(url, {})
+        video_id = self._match_id(url)
+        if self._yes_playlist(video_id, video_id, smuggled_data):
+            return self.playlist_result(self._entries(video_id), video_id)
+        return self._extract_video(video_id)[1]
+
+
+class PiramideTVChannelIE(InfoExtractor):
+    _VALID_URL = r'https?://piramide\.tv/channel/(?P<id>[\w-]+)'
+    _TESTS = [{
+        'url': 'https://piramide.tv/channel/thekalo',
+        'playlist_mincount': 10,
+        'info_dict': {
+            'id': 'thekalo',
+        },
+    }]
+
+    def _entries(self, channel_name):
+        videos = self._download_json(
+            f'https://hermes.piramide.tv/channel/list/{channel_name}/date/100000', channel_name)
+        for video in traverse_obj(videos, ('videos', lambda _, v: v['id'])):
+            yield self.url_result(smuggle_url(
+                f'https://piramide.tv/video/{video["id"]}', {'force_noplaylist': True}),
+                **traverse_obj(video, {
+                    'id': ('id', {str}),
+                    'title': ('title', {str}),
+                    'description': ('description', {str}),
+                }))
+
+    def _real_extract(self, url):
+        channel_name = self._match_id(url)
+        return self.playlist_result(self._entries(channel_name), channel_name)
diff --git a/plugins/youtube_download/yt_dlp/extractor/pixivsketch.py b/plugins/youtube_download/yt_dlp/extractor/pixivsketch.py
index 850c6f2..50b7af5 100644
--- a/plugins/youtube_download/yt_dlp/extractor/pixivsketch.py
+++ b/plugins/youtube_download/yt_dlp/extractor/pixivsketch.py
@@ -1,4 +1,5 @@
 from .common import InfoExtractor
+from ..networking.exceptions import HTTPError
 from ..utils import (
     ExtractorError,
     traverse_obj,
@@ -81,7 +82,7 @@ class PixivSketchIE(PixivSketchBaseIE):
             'channel_id': str(traverse_obj(data, ('user', 'pixiv_user_id'), ('owner', 'user', 'pixiv_user_id'))),
             'age_limit': 18 if data.get('is_r18') else 15 if data.get('is_r15') else 0,
             'timestamp': unified_timestamp(data.get('created_at')),
-            'is_live': True
+            'is_live': True,
         }
 
 
@@ -101,7 +102,7 @@ class PixivSketchUserIE(PixivSketchBaseIE):
 
     @classmethod
     def suitable(cls, url):
-        return super(PixivSketchUserIE, cls).suitable(url) and not PixivSketchIE.suitable(url)
+        return super().suitable(url) and not PixivSketchIE.suitable(url)
 
     def _real_extract(self, url):
         user_id = self._match_id(url)
@@ -110,8 +111,8 @@ class PixivSketchUserIE(PixivSketchBaseIE):
         if not traverse_obj(data, 'is_broadcasting'):
             try:
                 self._call_api(user_id, 'users/current.json', url, 'Investigating reason for request failure')
-            except ExtractorError as ex:
-                if ex.cause and ex.cause.code == 401:
+            except ExtractorError as e:
+                if isinstance(e.cause, HTTPError) and e.cause.status == 401:
                     self.raise_login_required(f'Please log in, or use direct link like https://sketch.pixiv.net/@{user_id}/1234567890', method='cookies')
             raise ExtractorError('This user is offline', expected=True)
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/pladform.py b/plugins/youtube_download/yt_dlp/extractor/pladform.py
index 0050068..f4355d0 100644
--- a/plugins/youtube_download/yt_dlp/extractor/pladform.py
+++ b/plugins/youtube_download/yt_dlp/extractor/pladform.py
@@ -1,11 +1,11 @@
 from .common import InfoExtractor
 from ..utils import (
-    determine_ext,
     ExtractorError,
+    determine_ext,
     int_or_none,
     parse_qs,
-    xpath_text,
     qualities,
+    xpath_text,
 )
 
 
@@ -35,12 +35,11 @@ class PladformIE(InfoExtractor):
             'thumbnail': str,
             'view_count': int,
             'description': str,
-            'category': list,
             'uploader_id': '12082',
             'uploader': 'Comedy Club',
             'duration': 367,
         },
-        'expected_warnings': ['HTTP Error 404: Not Found']
+        'expected_warnings': ['HTTP Error 404: Not Found'],
     }, {
         'url': 'https://out.pladform.ru/player?pl=64471&videoid=3777899&vk_puid15=0&vk_puid34=0',
         'md5': '53362fac3a27352da20fa2803cc5cd6f',
@@ -74,14 +73,14 @@ class PladformIE(InfoExtractor):
 
         def fail(text):
             raise ExtractorError(
-                '%s returned error: %s' % (self.IE_NAME, text),
+                f'{self.IE_NAME} returned error: {text}',
                 expected=True)
 
         if not video:
-            targetUrl = self._request_webpage(url, video_id, note='Resolving final URL').url
-            if targetUrl == url:
+            target_url = self._request_webpage(url, video_id, note='Resolving final URL').url
+            if target_url == url:
                 raise ExtractorError('Can\'t parse page')
-            return self.url_result(targetUrl)
+            return self.url_result(target_url)
 
         if video.tag == 'error':
             fail(video.text)
@@ -112,7 +111,7 @@ class PladformIE(InfoExtractor):
                 fail(error)
 
         webpage = self._download_webpage(
-            'http://video.pladform.ru/catalog/video/videoid/%s' % video_id,
+            f'http://video.pladform.ru/catalog/video/videoid/{video_id}',
             video_id)
 
         title = self._og_search_title(webpage, fatal=False) or xpath_text(
diff --git a/plugins/youtube_download/yt_dlp/extractor/planetmarathi.py b/plugins/youtube_download/yt_dlp/extractor/planetmarathi.py
index 25753fe..9486183 100644
--- a/plugins/youtube_download/yt_dlp/extractor/planetmarathi.py
+++ b/plugins/youtube_download/yt_dlp/extractor/planetmarathi.py
@@ -20,12 +20,11 @@ class PlanetMarathiIE(InfoExtractor):
                 'title': 'ek unad divas',
                 'alt_title': 'चित्रपट',
                 'description': 'md5:41c7ed6b041c2fea9820a3f3125bd881',
-                'season_number': None,
                 'episode_number': 1,
                 'duration': 5539,
                 'upload_date': '20210829',
             },
-        }]  # Trailer skipped
+        }],  # Trailer skipped
     }, {
         'url': 'https://www.planetmarathi.com/titles/baap-beep-baap-season-1',
         'playlist_mincount': 10,
@@ -44,18 +43,19 @@ class PlanetMarathiIE(InfoExtractor):
                 'duration': 29,
                 'upload_date': '20210829',
             },
-        }]  # Trailers, Episodes, other Character profiles skipped
+        }],  # Trailers, Episodes, other Character profiles skipped
     }]
 
     def _real_extract(self, url):
-        id = self._match_id(url)
+        playlist_id = self._match_id(url)
         entries = []
-        json_data = self._download_json(f'https://www.planetmarathi.com/api/v1/titles/{id}/assets', id)['assets']
+        json_data = self._download_json(
+            f'https://www.planetmarathi.com/api/v1/titles/{playlist_id}/assets', playlist_id)['assets']
         for asset in json_data:
             asset_title = asset['mediaAssetName']['en']
             if asset_title == 'Movie':
-                asset_title = id.replace('-', ' ')
-            asset_id = f'{asset["sk"]}_{id}'.replace('#', '-')
+                asset_title = playlist_id.replace('-', ' ')
+            asset_id = f'{asset["sk"]}_{playlist_id}'.replace('#', '-')
             formats, subtitles = self._extract_m3u8_formats_and_subtitles(asset['mediaAssetURL'], asset_id)
             entries.append({
                 'id': asset_id,
@@ -69,4 +69,4 @@ class PlanetMarathiIE(InfoExtractor):
                 'formats': formats,
                 'subtitles': subtitles,
             })
-        return self.playlist_result(entries, playlist_id=id)
+        return self.playlist_result(entries, playlist_id=playlist_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/platzi.py b/plugins/youtube_download/yt_dlp/extractor/platzi.py
index 166b98c..e29f4c2 100644
--- a/plugins/youtube_download/yt_dlp/extractor/platzi.py
+++ b/plugins/youtube_download/yt_dlp/extractor/platzi.py
@@ -1,11 +1,9 @@
+import base64
+
 from .common import InfoExtractor
-from ..compat import (
-    compat_b64decode,
-    compat_str,
-)
 from ..utils import (
-    clean_html,
     ExtractorError,
+    clean_html,
     int_or_none,
     str_or_none,
     try_get,
@@ -48,10 +46,10 @@ class PlatziBaseIE(InfoExtractor):
             None)
 
         for kind in ('error', 'password', 'nonFields'):
-            error = str_or_none(login.get('%sError' % kind))
+            error = str_or_none(login.get(f'{kind}Error'))
             if error:
                 raise ExtractorError(
-                    'Unable to login: %s' % error, expected=True)
+                    f'Unable to login: {error}', expected=True)
         raise ExtractorError('Unable to log in')
 
 
@@ -120,16 +118,16 @@ class PlatziIE(PlatziBaseIE):
                     formats.extend(self._extract_m3u8_formats(
                         format_url, lecture_id, 'mp4',
                         entry_protocol='m3u8_native', m3u8_id=format_id,
-                        note='Downloading %s m3u8 information' % server_id,
+                        note=f'Downloading {server_id} m3u8 information',
                         fatal=False))
                 elif format_id == 'dash':
                     formats.extend(self._extract_mpd_formats(
                         format_url, lecture_id, mpd_id=format_id,
-                        note='Downloading %s MPD manifest' % server_id,
+                        note=f'Downloading {server_id} MPD manifest',
                         fatal=False))
 
         content = str_or_none(desc.get('content'))
-        description = (clean_html(compat_b64decode(content).decode('utf-8'))
+        description = (clean_html(base64.b64decode(content).decode('utf-8'))
                        if content else None)
         duration = int_or_none(material.get('duration'), invscale=60)
 
@@ -168,7 +166,7 @@ class PlatziCourseIE(PlatziBaseIE):
 
     @classmethod
     def suitable(cls, url):
-        return False if PlatziIE.suitable(url) else super(PlatziCourseIE, cls).suitable(url)
+        return False if PlatziIE.suitable(url) else super().suitable(url)
 
     def _real_extract(self, url):
         course_name = self._match_id(url)
@@ -207,7 +205,7 @@ class PlatziCourseIE(PlatziBaseIE):
                     'chapter_id': chapter_id,
                 })
 
-        course_id = compat_str(try_get(props, lambda x: x['course']['id']))
-        course_title = try_get(props, lambda x: x['course']['name'], compat_str)
+        course_id = str(try_get(props, lambda x: x['course']['id']))
+        course_title = try_get(props, lambda x: x['course']['name'], str)
 
         return self.playlist_result(entries, course_id, course_title)
diff --git a/plugins/youtube_download/yt_dlp/extractor/playfm.py b/plugins/youtube_download/yt_dlp/extractor/playfm.py
deleted file mode 100644
index e895ba4..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/playfm.py
+++ /dev/null
@@ -1,70 +0,0 @@
-from .common import InfoExtractor
-from ..compat import compat_str
-from ..utils import (
-    ExtractorError,
-    int_or_none,
-    parse_iso8601,
-)
-
-
-class PlayFMIE(InfoExtractor):
-    IE_NAME = 'play.fm'
-    _VALID_URL = r'https?://(?:www\.)?play\.fm/(?P<slug>(?:[^/]+/)+(?P<id>[^/]+))/?(?:$|[?#])'
-
-    _TEST = {
-        'url': 'https://www.play.fm/dan-drastic/sven-tasnadi-leipzig-electronic-music-batofar-paris-fr-2014-07-12',
-        'md5': 'c505f8307825a245d0c7ad1850001f22',
-        'info_dict': {
-            'id': '71276',
-            'ext': 'mp3',
-            'title': 'Sven Tasnadi - LEIPZIG ELECTRONIC MUSIC @ Batofar (Paris,FR) - 2014-07-12',
-            'description': '',
-            'duration': 5627,
-            'timestamp': 1406033781,
-            'upload_date': '20140722',
-            'uploader': 'Dan Drastic',
-            'uploader_id': '71170',
-            'view_count': int,
-            'comment_count': int,
-        },
-    }
-
-    def _real_extract(self, url):
-        mobj = self._match_valid_url(url)
-        video_id = mobj.group('id')
-        slug = mobj.group('slug')
-
-        recordings = self._download_json(
-            'http://v2api.play.fm/recordings/slug/%s' % slug, video_id)
-
-        error = recordings.get('error')
-        if isinstance(error, dict):
-            raise ExtractorError(
-                '%s returned error: %s' % (self.IE_NAME, error.get('message')),
-                expected=True)
-
-        audio_url = recordings['audio']
-        video_id = compat_str(recordings.get('id') or video_id)
-        title = recordings['title']
-        description = recordings.get('description')
-        duration = int_or_none(recordings.get('recordingDuration'))
-        timestamp = parse_iso8601(recordings.get('created_at'))
-        uploader = recordings.get('page', {}).get('title')
-        uploader_id = compat_str(recordings.get('page', {}).get('id'))
-        view_count = int_or_none(recordings.get('playCount'))
-        comment_count = int_or_none(recordings.get('commentCount'))
-        categories = [tag['name'] for tag in recordings.get('tags', []) if tag.get('name')]
-
-        return {
-            'id': video_id,
-            'url': audio_url,
-            'title': title,
-            'description': description,
-            'duration': duration,
-            'timestamp': timestamp,
-            'uploader': uploader,
-            'uploader_id': uploader_id,
-            'view_count': view_count,
-            'comment_count': comment_count,
-            'categories': categories,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/plays.py b/plugins/youtube_download/yt_dlp/extractor/plays.py
deleted file mode 100644
index 9371f7b..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/plays.py
+++ /dev/null
@@ -1,49 +0,0 @@
-import re
-
-from .common import InfoExtractor
-from ..utils import int_or_none
-
-
-class PlaysTVIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?plays\.tv/(?:video|embeds)/(?P<id>[0-9a-f]{18})'
-    _TESTS = [{
-        'url': 'https://plays.tv/video/56af17f56c95335490/when-you-outplay-the-azir-wall',
-        'md5': 'dfeac1198506652b5257a62762cec7bc',
-        'info_dict': {
-            'id': '56af17f56c95335490',
-            'ext': 'mp4',
-            'title': 'Bjergsen - When you outplay the Azir wall',
-            'description': 'Posted by Bjergsen',
-        }
-    }, {
-        'url': 'https://plays.tv/embeds/56af17f56c95335490',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(
-            'https://plays.tv/video/%s' % video_id, video_id)
-
-        info = self._search_json_ld(webpage, video_id,)
-
-        mpd_url, sources = re.search(
-            r'(?s)<video[^>]+data-mpd="([^"]+)"[^>]*>(.+?)</video>',
-            webpage).groups()
-        formats = self._extract_mpd_formats(
-            self._proto_relative_url(mpd_url), video_id, mpd_id='DASH')
-        for format_id, height, format_url in re.findall(r'<source\s+res="((\d+)h?)"\s+src="([^"]+)"', sources):
-            formats.append({
-                'url': self._proto_relative_url(format_url),
-                'format_id': 'http-' + format_id,
-                'height': int_or_none(height),
-            })
-
-        info.update({
-            'id': video_id,
-            'description': self._og_search_description(webpage),
-            'thumbnail': info.get('thumbnail') or self._og_search_thumbnail(webpage),
-            'formats': formats,
-        })
-
-        return info
diff --git a/plugins/youtube_download/yt_dlp/extractor/playstuff.py b/plugins/youtube_download/yt_dlp/extractor/playstuff.py
deleted file mode 100644
index b424ba1..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/playstuff.py
+++ /dev/null
@@ -1,63 +0,0 @@
-from .common import InfoExtractor
-from ..compat import compat_str
-from ..utils import (
-    smuggle_url,
-    try_get,
-)
-
-
-class PlayStuffIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?play\.stuff\.co\.nz/details/(?P<id>[^/?#&]+)'
-    _TESTS = [{
-        'url': 'https://play.stuff.co.nz/details/608778ac1de1c4001a3fa09a',
-        'md5': 'c82d3669e5247c64bc382577843e5bd0',
-        'info_dict': {
-            'id': '6250584958001',
-            'ext': 'mp4',
-            'title': 'Episode 1: Rotorua/Mt Maunganui/Tauranga',
-            'description': 'md5:c154bafb9f0dd02d01fd4100fb1c1913',
-            'uploader_id': '6005208634001',
-            'timestamp': 1619491027,
-            'upload_date': '20210427',
-        },
-        'add_ie': ['BrightcoveNew'],
-    }, {
-        # geo restricted, bypassable
-        'url': 'https://play.stuff.co.nz/details/_6155660351001',
-        'only_matching': True,
-    }]
-    BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/%s/%s_default/index.html?videoId=%s'
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        webpage = self._download_webpage(url, video_id)
-
-        state = self._parse_json(
-            self._search_regex(
-                r'__INITIAL_STATE__\s*=\s*({.+?})\s*;', webpage, 'state'),
-            video_id)
-
-        account_id = try_get(
-            state, lambda x: x['configurations']['accountId'],
-            compat_str) or '6005208634001'
-        player_id = try_get(
-            state, lambda x: x['configurations']['playerId'],
-            compat_str) or 'default'
-
-        entries = []
-        for item_id, video in state['items'].items():
-            if not isinstance(video, dict):
-                continue
-            asset_id = try_get(
-                video, lambda x: x['content']['attributes']['assetId'],
-                compat_str)
-            if not asset_id:
-                continue
-            entries.append(self.url_result(
-                smuggle_url(
-                    self.BRIGHTCOVE_URL_TEMPLATE % (account_id, player_id, asset_id),
-                    {'geo_countries': ['NZ']}),
-                'BrightcoveNew', video_id))
-
-        return self.playlist_result(entries, video_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/playsuisse.py b/plugins/youtube_download/yt_dlp/extractor/playsuisse.py
index 76288c7..59231d8 100644
--- a/plugins/youtube_download/yt_dlp/extractor/playsuisse.py
+++ b/plugins/youtube_download/yt_dlp/extractor/playsuisse.py
@@ -1,10 +1,21 @@
+import base64
+import hashlib
 import json
+import uuid
 
 from .common import InfoExtractor
-from ..utils import int_or_none, traverse_obj
+from ..utils import (
+    ExtractorError,
+    int_or_none,
+    parse_qs,
+    traverse_obj,
+    update_url_query,
+    urlencode_postdata,
+)
 
 
 class PlaySuisseIE(InfoExtractor):
+    _NETRC_MACHINE = 'playsuisse'
     _VALID_URL = r'https?://(?:www\.)?playsuisse\.ch/(?:watch|detail)/(?:[^#]*[?&]episodeId=)?(?P<id>[0-9]+)'
     _TESTS = [
         {
@@ -28,7 +39,7 @@ class PlaySuisseIE(InfoExtractor):
                 'episode': 'Knochen',
                 'episode_number': 1,
                 'thumbnail': 're:https://playsuisse-img.akamaized.net/',
-            }
+            },
         }, {
             # film
             'url': 'https://www.playsuisse.ch/watch/808675',
@@ -40,7 +51,7 @@ class PlaySuisseIE(InfoExtractor):
                 'description': 'md5:9f61265c7e6dcc3e046137a792b275fd',
                 'duration': 5280,
                 'thumbnail': 're:https://playsuisse-img.akamaized.net/',
-            }
+            },
         }, {
             # series (treated as a playlist)
             'url': 'https://www.playsuisse.ch/detail/1115687',
@@ -62,7 +73,7 @@ class PlaySuisseIE(InfoExtractor):
                     'series': 'They all came out to Montreux',
                     'thumbnail': 're:https://playsuisse-img.akamaized.net/',
                     'title': 'Folge 1',
-                    'ext': 'mp4'
+                    'ext': 'mp4',
                 },
             }, {
                 'info_dict': {
@@ -76,7 +87,7 @@ class PlaySuisseIE(InfoExtractor):
                     'series': 'They all came out to Montreux',
                     'thumbnail': 're:https://playsuisse-img.akamaized.net/',
                     'title': 'Folge 2',
-                    'ext': 'mp4'
+                    'ext': 'mp4',
                 },
             }, {
                 'info_dict': {
@@ -90,10 +101,10 @@ class PlaySuisseIE(InfoExtractor):
                     'series': 'They all came out to Montreux',
                     'thumbnail': 're:https://playsuisse-img.akamaized.net/',
                     'title': 'Folge 3',
-                    'ext': 'mp4'
-                }
+                    'ext': 'mp4',
+                },
             }],
-        }
+        },
     ]
 
     _GRAPHQL_QUERY = '''
@@ -134,22 +145,94 @@ class PlaySuisseIE(InfoExtractor):
             id
             url
         }'''
+    _CLIENT_ID = '1e33f1bf-8bf3-45e4-bbd9-c9ad934b5fca'
+    _LOGIN_BASE = 'https://account.srgssr.ch'
+    _ID_TOKEN = None
+
+    def _perform_login(self, username, password):
+        code_verifier = uuid.uuid4().hex + uuid.uuid4().hex + uuid.uuid4().hex
+        code_challenge = base64.urlsafe_b64encode(
+            hashlib.sha256(code_verifier.encode()).digest()).decode().rstrip('=')
+
+        request_id = parse_qs(self._request_webpage(
+            f'{self._LOGIN_BASE}/authz-srv/authz', None, 'Requesting session ID', query={
+                'client_id': self._CLIENT_ID,
+                'redirect_uri': 'https://www.playsuisse.ch/auth',
+                'scope': 'email profile openid offline_access',
+                'response_type': 'code',
+                'code_challenge': code_challenge,
+                'code_challenge_method': 'S256',
+                'view_type': 'login',
+            }).url)['requestId'][0]
+
+        try:
+            exchange_id = self._download_json(
+                f'{self._LOGIN_BASE}/verification-srv/v2/authenticate/initiate/password', None,
+                'Submitting username', headers={'content-type': 'application/json'}, data=json.dumps({
+                    'usage_type': 'INITIAL_AUTHENTICATION',
+                    'request_id': request_id,
+                    'medium_id': 'PASSWORD',
+                    'type': 'password',
+                    'identifier': username,
+                }).encode())['data']['exchange_id']['exchange_id']
+        except ExtractorError:
+            raise ExtractorError('Invalid username', expected=True)
+
+        try:
+            login_data = self._download_json(
+                f'{self._LOGIN_BASE}/verification-srv/v2/authenticate/authenticate/password', None,
+                'Submitting password', headers={'content-type': 'application/json'}, data=json.dumps({
+                    'requestId': request_id,
+                    'exchange_id': exchange_id,
+                    'type': 'password',
+                    'password': password,
+                }).encode())['data']
+        except ExtractorError:
+            raise ExtractorError('Invalid password', expected=True)
+
+        authorization_code = parse_qs(self._request_webpage(
+            f'{self._LOGIN_BASE}/login-srv/verification/login', None, 'Logging in',
+            data=urlencode_postdata({
+                'requestId': request_id,
+                'exchange_id': login_data['exchange_id']['exchange_id'],
+                'verificationType': 'password',
+                'sub': login_data['sub'],
+                'status_id': login_data['status_id'],
+                'rememberMe': True,
+                'lat': '',
+                'lon': '',
+            })).url)['code'][0]
+
+        self._ID_TOKEN = self._download_json(
+            f'{self._LOGIN_BASE}/proxy/token', None, 'Downloading token', data=b'', query={
+                'client_id': self._CLIENT_ID,
+                'redirect_uri': 'https://www.playsuisse.ch/auth',
+                'code': authorization_code,
+                'code_verifier': code_verifier,
+                'grant_type': 'authorization_code',
+            })['id_token']
+
+        if not self._ID_TOKEN:
+            raise ExtractorError('Login failed')
 
     def _get_media_data(self, media_id):
         # NOTE In the web app, the "locale" header is used to switch between languages,
         # However this doesn't seem to take effect when passing the header here.
         response = self._download_json(
-            'https://4bbepzm4ef.execute-api.eu-central-1.amazonaws.com/prod/graphql',
+            'https://www.playsuisse.ch/api/graphql',
             media_id, data=json.dumps({
                 'operationName': 'AssetWatch',
                 'query': self._GRAPHQL_QUERY,
-                'variables': {'assetId': media_id}
-            }).encode('utf-8'),
+                'variables': {'assetId': media_id},
+            }).encode(),
             headers={'Content-Type': 'application/json', 'locale': 'de'})
 
         return response['data']['assetV2']
 
     def _real_extract(self, url):
+        if not self._ID_TOKEN:
+            self.raise_login_required(method='password')
+
         media_id = self._match_id(url)
         media_data = self._get_media_data(media_id)
         info = self._extract_single(media_data)
@@ -168,7 +251,8 @@ class PlaySuisseIE(InfoExtractor):
             if not media.get('url') or media.get('type') != 'HLS':
                 continue
             f, subs = self._extract_m3u8_formats_and_subtitles(
-                media['url'], media_data['id'], 'mp4', m3u8_id='HLS', fatal=False)
+                update_url_query(media['url'], {'id_token': self._ID_TOKEN}),
+                media_data['id'], 'mp4', m3u8_id='HLS', fatal=False)
             formats.extend(f)
             self._merge_subtitles(subs, target=subtitles)
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/playtvak.py b/plugins/youtube_download/yt_dlp/extractor/playtvak.py
index c418f88..12e2fa2 100644
--- a/plugins/youtube_download/yt_dlp/extractor/playtvak.py
+++ b/plugins/youtube_download/yt_dlp/extractor/playtvak.py
@@ -1,8 +1,6 @@
+import urllib.parse
+
 from .common import InfoExtractor
-from ..compat import (
-    compat_urlparse,
-    compat_urllib_parse_urlencode,
-)
 from ..utils import (
     ExtractorError,
     int_or_none,
@@ -27,7 +25,7 @@ class PlaytvakIE(InfoExtractor):
             'timestamp': 1438732860,
             'upload_date': '20150805',
             'is_live': False,
-        }
+        },
     }, {  # live video test
         'url': 'http://slowtv.playtvak.cz/planespotting-0pr-/planespotting.aspx?c=A150624_164934_planespotting_cat',
         'info_dict': {
@@ -64,7 +62,7 @@ class PlaytvakIE(InfoExtractor):
             'timestamp': 1438969140,
             'upload_date': '20150807',
             'is_live': False,
-        }
+        },
     }, {  # lidovky.cz
         'url': 'http://www.lidovky.cz/dalsi-demonstrace-v-praze-o-migraci-duq-/video.aspx?c=A150808_214044_ln-video_ELE',
         'md5': 'c7209ac4ba9d234d4ad5bab7485bcee8',
@@ -77,7 +75,7 @@ class PlaytvakIE(InfoExtractor):
             'timestamp': 1439052180,
             'upload_date': '20150808',
             'is_live': False,
-        }
+        },
     }, {  # metro.cz
         'url': 'http://www.metro.cz/video-pod-billboardem-se-na-vltavske-roztocil-kolotoc-deti-vozil-jen-par-hodin-1hx-/metro-extra.aspx?c=A141111_173251_metro-extra_row',
         'md5': '84fc1deedcac37b7d4a6ccae7c716668',
@@ -90,7 +88,7 @@ class PlaytvakIE(InfoExtractor):
             'timestamp': 1415725500,
             'upload_date': '20141111',
             'is_live': False,
-        }
+        },
     }, {
         'url': 'http://www.playtvak.cz/embed.aspx?idvideo=V150729_141549_play-porad_kuko',
         'only_matching': True,
@@ -104,16 +102,16 @@ class PlaytvakIE(InfoExtractor):
         info_url = self._html_search_regex(
             r'Misc\.video(?:FLV)?\(\s*{\s*data\s*:\s*"([^"]+)"', webpage, 'info url')
 
-        parsed_url = compat_urlparse.urlparse(info_url)
+        parsed_url = urllib.parse.urlparse(info_url)
 
-        qs = compat_urlparse.parse_qs(parsed_url.query)
+        qs = urllib.parse.parse_qs(parsed_url.query)
         qs.update({
             'reklama': ['0'],
             'type': ['js'],
         })
 
-        info_url = compat_urlparse.urlunparse(
-            parsed_url._replace(query=compat_urllib_parse_urlencode(qs, True)))
+        info_url = urllib.parse.urlunparse(
+            parsed_url._replace(query=urllib.parse.urlencode(qs, True)))
 
         json_info = self._download_json(
             info_url, video_id,
@@ -136,7 +134,7 @@ class PlaytvakIE(InfoExtractor):
                 continue
 
             format_ = fmt['format']
-            format_id = '%s_%s' % (format_, fmt['quality'])
+            format_id = '{}_{}'.format(format_, fmt['quality'])
             preference = None
 
             if format_ in ('mp4', 'webm'):
diff --git a/plugins/youtube_download/yt_dlp/extractor/playvid.py b/plugins/youtube_download/yt_dlp/extractor/playvid.py
deleted file mode 100644
index 1e0989d..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/playvid.py
+++ /dev/null
@@ -1,90 +0,0 @@
-import re
-import urllib.parse
-
-from .common import InfoExtractor
-from ..compat import compat_urllib_parse_unquote
-from ..utils import ExtractorError, clean_html
-
-
-class PlayvidIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?playvid\.com/watch(\?v=|/)(?P<id>.+?)(?:#|$)'
-    _TESTS = [{
-        'url': 'http://www.playvid.com/watch/RnmBNgtrrJu',
-        'md5': 'ffa2f6b2119af359f544388d8c01eb6c',
-        'info_dict': {
-            'id': 'RnmBNgtrrJu',
-            'ext': 'mp4',
-            'title': 'md5:9256d01c6317e3f703848b5906880dc8',
-            'duration': 82,
-            'age_limit': 18,
-        },
-        'skip': 'Video removed due to ToS',
-    }, {
-        'url': 'http://www.playvid.com/watch/hwb0GpNkzgH',
-        'md5': '39d49df503ad7b8f23a4432cbf046477',
-        'info_dict': {
-            'id': 'hwb0GpNkzgH',
-            'ext': 'mp4',
-            'title': 'Ellen Euro Cutie Blond Takes a Sexy Survey Get Facial in The Park',
-            'age_limit': 18,
-            'thumbnail': r're:^https?://.*\.jpg$',
-        },
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-
-        m_error = re.search(
-            r'<div class="block-error">\s*<div class="heading">\s*<div>(?P<msg>.+?)</div>\s*</div>', webpage)
-        if m_error:
-            raise ExtractorError(clean_html(m_error.group('msg')), expected=True)
-
-        video_title = None
-        duration = None
-        video_thumbnail = None
-        formats = []
-
-        # most of the information is stored in the flashvars
-        flashvars = self._html_search_regex(
-            r'flashvars="(.+?)"', webpage, 'flashvars')
-
-        infos = compat_urllib_parse_unquote(flashvars).split(r'&')
-        for info in infos:
-            videovars_match = re.match(r'^video_vars\[(.+?)\]=(.+?)$', info)
-            if videovars_match:
-                key = videovars_match.group(1)
-                val = videovars_match.group(2)
-
-                if key == 'title':
-                    video_title = urllib.parse.unquote_plus(val)
-                if key == 'duration':
-                    try:
-                        duration = int(val)
-                    except ValueError:
-                        pass
-                if key == 'big_thumb':
-                    video_thumbnail = val
-
-                videourl_match = re.match(
-                    r'^video_urls\]\[(?P<resolution>[0-9]+)p', key)
-                if videourl_match:
-                    height = int(videourl_match.group('resolution'))
-                    formats.append({
-                        'height': height,
-                        'url': val,
-                    })
-
-        # Extract title - should be in the flashvars; if not, look elsewhere
-        if video_title is None:
-            video_title = self._html_extract_title(webpage)
-
-        return {
-            'id': video_id,
-            'formats': formats,
-            'title': video_title,
-            'thumbnail': video_thumbnail,
-            'duration': duration,
-            'description': None,
-            'age_limit': 18
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/playwire.py b/plugins/youtube_download/yt_dlp/extractor/playwire.py
index 1057bff..8539a4b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/playwire.py
+++ b/plugins/youtube_download/yt_dlp/extractor/playwire.py
@@ -48,7 +48,7 @@ class PlaywireIE(InfoExtractor):
         publisher_id, video_id = mobj.group('publisher_id'), mobj.group('id')
 
         player = self._download_json(
-            'http://config.playwire.com/%s/videos/v2/%s/zeus.json' % (publisher_id, video_id),
+            f'http://config.playwire.com/{publisher_id}/videos/v2/{video_id}/zeus.json',
             video_id)
 
         title = player['settings']['title']
diff --git a/plugins/youtube_download/yt_dlp/extractor/pluralsight.py b/plugins/youtube_download/yt_dlp/extractor/pluralsight.py
index 809b656..d3f03f7 100644
--- a/plugins/youtube_download/yt_dlp/extractor/pluralsight.py
+++ b/plugins/youtube_download/yt_dlp/extractor/pluralsight.py
@@ -3,15 +3,12 @@ import json
 import os
 import random
 import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_str,
-    compat_urlparse,
-)
 from ..utils import (
-    dict_get,
     ExtractorError,
+    dict_get,
     float_or_none,
     int_or_none,
     parse_duration,
@@ -27,7 +24,7 @@ from ..utils import (
 class PluralsightBaseIE(InfoExtractor):
     _API_BASE = 'https://app.pluralsight.com'
 
-    _GRAPHQL_EP = '%s/player/api/graphql' % _API_BASE
+    _GRAPHQL_EP = f'{_API_BASE}/player/api/graphql'
     _GRAPHQL_HEADERS = {
         'Content-Type': 'application/json;charset=UTF-8',
     }
@@ -95,8 +92,8 @@ query BootstrapPlayer {
         response = self._download_json(
             self._GRAPHQL_EP, display_id, data=json.dumps({
                 'query': self._GRAPHQL_COURSE_TMPL % course_id,
-                'variables': {}
-            }).encode('utf-8'), headers=self._GRAPHQL_HEADERS)
+                'variables': {},
+            }).encode(), headers=self._GRAPHQL_HEADERS)
 
         course = try_get(
             response, lambda x: x['data']['rpc']['bootstrapPlayer']['course'],
@@ -105,7 +102,7 @@ query BootstrapPlayer {
             return course
 
         raise ExtractorError(
-            '%s said: %s' % (self.IE_NAME, response['error']['message']),
+            '{} said: {}'.format(self.IE_NAME, response['error']['message']),
             expected=True)
 
 
@@ -176,7 +173,7 @@ query viewClip {
             'post url', default=self._LOGIN_URL, group='url')
 
         if not post_url.startswith('http'):
-            post_url = compat_urlparse.urljoin(self._LOGIN_URL, post_url)
+            post_url = urllib.parse.urljoin(self._LOGIN_URL, post_url)
 
         response = self._download_webpage(
             post_url, None, 'Logging in',
@@ -187,7 +184,7 @@ query viewClip {
             r'<span[^>]+class="field-validation-error"[^>]*>([^<]+)</span>',
             response, 'error message', default=None)
         if error:
-            raise ExtractorError('Unable to login: %s' % error, expected=True)
+            raise ExtractorError(f'Unable to login: {error}', expected=True)
 
         if all(not re.search(p, response) for p in (
                 r'__INITIAL_STATE__', r'["\']currentUser["\']',
@@ -196,13 +193,12 @@ query viewClip {
             BLOCKED = 'Your account has been blocked due to suspicious activity'
             if BLOCKED in response:
                 raise ExtractorError(
-                    'Unable to login: %s' % BLOCKED, expected=True)
+                    f'Unable to login: {BLOCKED}', expected=True)
             MUST_AGREE = 'To continue using Pluralsight, you must agree to'
             if any(p in response for p in (MUST_AGREE, '>Disagree<', '>Agree<')):
                 raise ExtractorError(
-                    'Unable to login: %s some documents. Go to pluralsight.com, '
-                    'log in and agree with what Pluralsight requires.'
-                    % MUST_AGREE, expected=True)
+                    f'Unable to login: {MUST_AGREE} some documents. Go to pluralsight.com, '
+                    'log in and agree with what Pluralsight requires.', expected=True)
 
             raise ExtractorError('Unable to log in')
 
@@ -210,8 +206,7 @@ query viewClip {
         captions = None
         if clip_id:
             captions = self._download_json(
-                '%s/transcript/api/v1/caption/json/%s/%s'
-                % (self._API_BASE, clip_id, lang), video_id,
+                f'{self._API_BASE}/transcript/api/v1/caption/json/{clip_id}/{lang}', video_id,
                 'Downloading captions JSON', 'Unable to download captions JSON',
                 fatal=False)
         if not captions:
@@ -222,9 +217,9 @@ query viewClip {
                 'm': name,
             }
             captions = self._download_json(
-                '%s/player/retrieve-captions' % self._API_BASE, video_id,
+                f'{self._API_BASE}/player/retrieve-captions', video_id,
                 'Downloading captions JSON', 'Unable to download captions JSON',
-                fatal=False, data=json.dumps(captions_post).encode('utf-8'),
+                fatal=False, data=json.dumps(captions_post).encode(),
                 headers={'Content-Type': 'application/json;charset=utf-8'})
         if captions:
             return {
@@ -234,7 +229,7 @@ query viewClip {
                 }, {
                     'ext': 'srt',
                     'data': self._convert_subtitles(duration, captions),
-                }]
+                }],
             }
 
     @staticmethod
@@ -255,10 +250,8 @@ query viewClip {
                 continue
             srt += os.linesep.join(
                 (
-                    '%d' % num,
-                    '%s --> %s' % (
-                        srt_subtitles_timecode(start),
-                        srt_subtitles_timecode(end)),
+                    f'{num}',
+                    f'{srt_subtitles_timecode(start)} --> {srt_subtitles_timecode(end)}',
                     text,
                     os.linesep,
                 ))
@@ -272,10 +265,10 @@ query viewClip {
         clip_idx = qs.get('clip', [None])[0]
         course_name = qs.get('course', [None])[0]
 
-        if any(not f for f in (author, name, clip_idx, course_name,)):
+        if any(not f for f in (author, name, clip_idx, course_name)):
             raise ExtractorError('Invalid URL', expected=True)
 
-        display_id = '%s-%s' % (name, clip_idx)
+        display_id = f'{name}-{clip_idx}'
 
         course = self._download_course(course_name, url, display_id)
 
@@ -291,7 +284,7 @@ query viewClip {
                         clip_index = clip_.get('index')
                     if clip_index is None:
                         continue
-                    if compat_str(clip_index) == clip_idx:
+                    if str(clip_index) == clip_idx:
                         clip = clip_
                         break
 
@@ -308,14 +301,14 @@ query viewClip {
             'high-widescreen': {'width': 1280, 'height': 720},
         }
 
-        QUALITIES_PREFERENCE = ('low', 'medium', 'high', 'high-widescreen',)
+        QUALITIES_PREFERENCE = ('low', 'medium', 'high', 'high-widescreen')
         quality_key = qualities(QUALITIES_PREFERENCE)
 
         AllowedQuality = collections.namedtuple('AllowedQuality', ['ext', 'qualities'])
 
         ALLOWED_QUALITIES = (
-            AllowedQuality('webm', ['high', ]),
-            AllowedQuality('mp4', ['low', 'medium', 'high', ]),
+            AllowedQuality('webm', ['high']),
+            AllowedQuality('mp4', ['low', 'medium', 'high']),
         )
 
         # Some courses also offer widescreen resolution for high quality (see
@@ -359,23 +352,23 @@ query viewClip {
                     'mediaType': ext,
                     'quality': '%dx%d' % (f['width'], f['height']),
                 }
-                format_id = '%s-%s' % (ext, quality)
+                format_id = f'{ext}-{quality}'
 
                 try:
                     viewclip = self._download_json(
                         self._GRAPHQL_EP, display_id,
-                        'Downloading %s viewclip graphql' % format_id,
+                        f'Downloading {format_id} viewclip graphql',
                         data=json.dumps({
                             'query': self.GRAPHQL_VIEWCLIP_TMPL % clip_post,
-                            'variables': {}
-                        }).encode('utf-8'),
+                            'variables': {},
+                        }).encode(),
                         headers=self._GRAPHQL_HEADERS)['data']['viewClip']
                 except ExtractorError:
                     # Still works but most likely will go soon
                     viewclip = self._download_json(
-                        '%s/video/clips/viewclip' % self._API_BASE, display_id,
-                        'Downloading %s viewclip JSON' % format_id, fatal=False,
-                        data=json.dumps(clip_post).encode('utf-8'),
+                        f'{self._API_BASE}/video/clips/viewclip', display_id,
+                        f'Downloading {format_id} viewclip JSON', fatal=False,
+                        data=json.dumps(clip_post).encode(),
                         headers={'Content-Type': 'application/json;charset=utf-8'})
 
                 # Pluralsight tracks multiple sequential calls to ViewClip API and start
@@ -404,7 +397,7 @@ query viewClip {
                     clip_f.update({
                         'url': clip_url,
                         'ext': ext,
-                        'format_id': '%s-%s' % (format_id, cdn) if cdn else format_id,
+                        'format_id': f'{format_id}-{cdn}' if cdn else format_id,
                         'quality': quality_key(quality),
                         'source_preference': int_or_none(clip_url_data.get('rank')),
                     })
@@ -472,7 +465,7 @@ class PluralsightCourseIE(PluralsightBaseIE):
                 if clip_index is None:
                     continue
                 clip_url = update_url_query(
-                    '%s/player' % self._API_BASE, query={
+                    f'{self._API_BASE}/player', query={
                         'mode': 'live',
                         'course': course_name,
                         'author': author,
diff --git a/plugins/youtube_download/yt_dlp/extractor/plutotv.py b/plugins/youtube_download/yt_dlp/extractor/plutotv.py
index caffeb2..234ee98 100644
--- a/plugins/youtube_download/yt_dlp/extractor/plutotv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/plutotv.py
@@ -1,11 +1,8 @@
 import re
+import urllib.parse
 import uuid
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_str,
-    compat_urlparse,
-)
 from ..utils import (
     ExtractorError,
     float_or_none,
@@ -16,6 +13,7 @@ from ..utils import (
 
 
 class PlutoTVIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'''(?x)
         https?://(?:www\.)?pluto\.tv(?:/[^/]+)?/on-demand
         /(?P<video_type>movies|series)
@@ -30,14 +28,14 @@ class PlutoTVIE(InfoExtractor):
     _INFO_QUERY_PARAMS = {
         'appName': 'web',
         'appVersion': 'na',
-        'clientID': compat_str(uuid.uuid1()),
+        'clientID': str(uuid.uuid1()),
         'clientModelNumber': 'na',
         'serverSideAds': 'false',
         'deviceMake': 'unknown',
         'deviceModel': 'web',
         'deviceType': 'web',
         'deviceVersion': 'unknown',
-        'sid': compat_str(uuid.uuid1()),
+        'sid': str(uuid.uuid1()),
     }
     _TESTS = [
         {
@@ -53,21 +51,21 @@ class PlutoTVIE(InfoExtractor):
                 'season_number': 2,
                 'episode_number': 3,
                 'duration': 3600,
-            }
+            },
         }, {
             'url': 'https://pluto.tv/on-demand/series/i-love-money/season/1/',
             'playlist_count': 11,
             'info_dict': {
                 'id': '5de6c582e9379ae4912dedbd',
                 'title': 'I Love Money - Season 1',
-            }
+            },
         }, {
             'url': 'https://pluto.tv/on-demand/series/i-love-money/',
             'playlist_count': 26,
             'info_dict': {
                 'id': '5de6c582e9379ae4912dedbd',
                 'title': 'I Love Money',
-            }
+            },
         }, {
             'url': 'https://pluto.tv/on-demand/movies/arrival-2015-1-1',
             'md5': '3cead001d317a018bf856a896dee1762',
@@ -77,7 +75,7 @@ class PlutoTVIE(InfoExtractor):
                 'title': 'Arrival',
                 'description': 'When mysterious spacecraft touch down across the globe, an elite team - led by expert translator Louise Banks (Academy Award® nominee Amy Adams) – races against time to decipher their intent.',
                 'duration': 9000,
-            }
+            },
         }, {
             'url': 'https://pluto.tv/en/on-demand/series/manhunters-fugitive-task-force/seasons/1/episode/third-times-the-charm-1-1',
             'only_matching': True,
@@ -94,8 +92,8 @@ class PlutoTVIE(InfoExtractor):
                 'title': 'Attack of the Killer Tomatoes',
                 'description': 'A group of scientists band together to save the world from mutated tomatoes that KILL! (1978)',
                 'duration': 5700,
-            }
-        }
+            },
+        },
     ]
 
     def _to_ad_free_formats(self, video_id, formats, subtitles):
@@ -111,14 +109,14 @@ class PlutoTVIE(InfoExtractor):
                 re.MULTILINE)
             if first_segment_url:
                 m3u8_urls.add(
-                    compat_urlparse.urljoin(first_segment_url.group(1), '0-end/master.m3u8'))
+                    urllib.parse.urljoin(first_segment_url.group(1), '0-end/master.m3u8'))
                 continue
             first_segment_url = re.search(
                 r'^(https?://.*/).+\-0+[0-1]0\.ts$', res,
                 re.MULTILINE)
             if first_segment_url:
                 m3u8_urls.add(
-                    compat_urlparse.urljoin(first_segment_url.group(1), 'master.m3u8'))
+                    urllib.parse.urljoin(first_segment_url.group(1), 'master.m3u8'))
                 continue
 
         for m3u8_url in m3u8_urls:
diff --git a/plugins/youtube_download/yt_dlp/extractor/plvideo.py b/plugins/youtube_download/yt_dlp/extractor/plvideo.py
new file mode 100644
index 0000000..27009ca
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/plvideo.py
@@ -0,0 +1,130 @@
+from .common import InfoExtractor
+from ..utils import (
+    float_or_none,
+    int_or_none,
+    parse_iso8601,
+    parse_resolution,
+    url_or_none,
+)
+from ..utils.traversal import traverse_obj
+
+
+class PlVideoIE(InfoExtractor):
+    IE_DESC = 'Платформа'
+    _VALID_URL = r'https?://(?:www\.)?plvideo\.ru/(?:watch\?(?:[^#]+&)?v=|shorts/)(?P<id>[\w-]+)'
+    _TESTS = [{
+        'url': 'https://plvideo.ru/watch?v=Y5JzUzkcQTMK',
+        'md5': 'fe8e18aca892b3b31f3bf492169f8a26',
+        'info_dict': {
+            'id': 'Y5JzUzkcQTMK',
+            'ext': 'mp4',
+            'thumbnail': 'https://img.plvideo.ru/images/fp-2024-images/v/cover/37/dd/37dd00a4c96c77436ab737e85947abd7/original663a4a3bb713e5.33151959.jpg',
+            'title': 'Presidente de Cuba llega a Moscú en una visita de trabajo',
+            'channel': 'RT en Español',
+            'channel_id': 'ZH4EKqunVDvo',
+            'media_type': 'video',
+            'comment_count': int,
+            'tags': ['rusia', 'cuba', 'russia', 'miguel díaz-canel'],
+            'description': 'md5:a1a395d900d77a86542a91ee0826c115',
+            'release_timestamp': 1715096124,
+            'channel_is_verified': True,
+            'like_count': int,
+            'timestamp': 1715095911,
+            'duration': 44320,
+            'view_count': int,
+            'dislike_count': int,
+            'upload_date': '20240507',
+            'modified_date': '20240701',
+            'channel_follower_count': int,
+            'modified_timestamp': 1719824073,
+        },
+    }, {
+        'url': 'https://plvideo.ru/shorts/S3Uo9c-VLwFX',
+        'md5': '7d8fa2279406c69d2fd2a6fc548a9805',
+        'info_dict': {
+            'id': 'S3Uo9c-VLwFX',
+            'ext': 'mp4',
+            'channel': 'Romaatom',
+            'tags': 'count:22',
+            'dislike_count': int,
+            'upload_date': '20241130',
+            'description': 'md5:452e6de219bf2f32bb95806c51c3b364',
+            'duration': 58433,
+            'modified_date': '20241130',
+            'thumbnail': 'https://img.plvideo.ru/images/fp-2024-11-cover/S3Uo9c-VLwFX/f9318999-a941-482b-b700-2102a7049366.jpg',
+            'media_type': 'shorts',
+            'like_count': int,
+            'modified_timestamp': 1732961458,
+            'channel_is_verified': True,
+            'channel_id': 'erJyyTIbmUd1',
+            'timestamp': 1732961355,
+            'comment_count': int,
+            'title': 'Белоусов отменил приказы о кадровом резерве на гражданской службе',
+            'channel_follower_count': int,
+            'view_count': int,
+            'release_timestamp': 1732961458,
+        },
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+
+        video_data = self._download_json(
+            f'https://api.g1.plvideo.ru/v1/videos/{video_id}?Aud=18', video_id)
+
+        is_live = False
+        formats = []
+        subtitles = {}
+        automatic_captions = {}
+        for quality, data in traverse_obj(video_data, ('item', 'profiles', {dict.items}, lambda _, v: url_or_none(v[1]['hls']))):
+            formats.append({
+                'format_id': quality,
+                'ext': 'mp4',
+                'protocol': 'm3u8_native',
+                **traverse_obj(data, {
+                    'url': 'hls',
+                    'fps': ('fps', {float_or_none}),
+                    'aspect_ratio': ('aspectRatio', {float_or_none}),
+                }),
+                **parse_resolution(quality),
+            })
+        if livestream_url := traverse_obj(video_data, ('item', 'livestream', 'url', {url_or_none})):
+            is_live = True
+            formats.extend(self._extract_m3u8_formats(livestream_url, video_id, 'mp4', live=True))
+        for lang, url in traverse_obj(video_data, ('item', 'subtitles', {dict.items}, lambda _, v: url_or_none(v[1]))):
+            if lang.endswith('-auto'):
+                automatic_captions.setdefault(lang[:-5], []).append({
+                    'url': url,
+                })
+            else:
+                subtitles.setdefault(lang, []).append({
+                    'url': url,
+                })
+
+        return {
+            'id': video_id,
+            'formats': formats,
+            'subtitles': subtitles,
+            'automatic_captions': automatic_captions,
+            'is_live': is_live,
+            **traverse_obj(video_data, ('item', {
+                'id': ('id', {str}),
+                'title': ('title', {str}),
+                'description': ('description', {str}),
+                'thumbnail': ('cover', 'paths', 'original', 'src', {url_or_none}),
+                'duration': ('uploadFile', 'videoDuration', {int_or_none}),
+                'channel': ('channel', 'name', {str}),
+                'channel_id': ('channel', 'id', {str}),
+                'channel_follower_count': ('channel', 'stats', 'subscribers', {int_or_none}),
+                'channel_is_verified': ('channel', 'verified', {bool}),
+                'tags': ('tags', ..., {str}),
+                'timestamp': ('createdAt', {parse_iso8601}),
+                'release_timestamp': ('publishedAt', {parse_iso8601}),
+                'modified_timestamp': ('updatedAt', {parse_iso8601}),
+                'view_count': ('stats', 'viewTotalCount', {int_or_none}),
+                'like_count': ('stats', 'likeCount', {int_or_none}),
+                'dislike_count': ('stats', 'dislikeCount', {int_or_none}),
+                'comment_count': ('stats', 'commentCount', {int_or_none}),
+                'media_type': ('type', {str}),
+            })),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/podbayfm.py b/plugins/youtube_download/yt_dlp/extractor/podbayfm.py
index 2a26fd2..0141eca 100644
--- a/plugins/youtube_download/yt_dlp/extractor/podbayfm.py
+++ b/plugins/youtube_download/yt_dlp/extractor/podbayfm.py
@@ -1,28 +1,40 @@
 from .common import InfoExtractor
-from ..utils import OnDemandPagedList, int_or_none, jwt_decode_hs256, try_call
+from ..utils import (
+    OnDemandPagedList,
+    clean_html,
+    int_or_none,
+    jwt_decode_hs256,
+    url_or_none,
+)
+from ..utils.traversal import traverse_obj
 
 
-def result_from_props(props, episode_id=None):
+def result_from_props(props):
     return {
-        'id': props.get('podcast_id') or episode_id,
-        'title': props.get('title'),
-        'url': props['mediaURL'],
+        **traverse_obj(props, {
+            'id': ('_id', {str}),
+            'title': ('title', {str}),
+            'url': ('mediaURL', {url_or_none}),
+            'description': ('description', {clean_html}),
+            'thumbnail': ('image', {jwt_decode_hs256}, 'url', {url_or_none}),
+            'timestamp': ('timestamp', {int_or_none}),
+            'duration': ('duration', {int_or_none}),
+        }),
         'ext': 'mp3',
-        'thumbnail': try_call(lambda: jwt_decode_hs256(props['image'])['url']),
-        'timestamp': props.get('timestamp'),
-        'duration': int_or_none(props.get('duration')),
+        'vcodec': 'none',
     }
 
 
 class PodbayFMIE(InfoExtractor):
-    _VALID_URL = r'https?://podbay\.fm/p/[^/]*/e/(?P<id>[^/]*)/?(?:[\?#].*)?$'
+    _VALID_URL = r'https?://podbay\.fm/p/[^/?#]+/e/(?P<id>\d+)'
     _TESTS = [{
         'url': 'https://podbay.fm/p/behind-the-bastards/e/1647338400',
-        'md5': '98b41285dcf7989d105a4ed0404054cf',
+        'md5': '895ac8505de349515f5ee8a4a3195c93',
         'info_dict': {
-            'id': '1647338400',
+            'id': '62306451f4a48e58d0c4d6a8',
             'title': 'Part One: Kissinger',
             'ext': 'mp3',
+            'description': r're:^We begin our epic six part series on Henry Kissinger.+',
             'thumbnail': r're:^https?://.*\.jpg',
             'timestamp': 1647338400,
             'duration': 5001,
@@ -34,24 +46,25 @@ class PodbayFMIE(InfoExtractor):
         episode_id = self._match_id(url)
         webpage = self._download_webpage(url, episode_id)
         data = self._search_nextjs_data(webpage, episode_id)
-        return result_from_props(data['props']['pageProps']['episode'], episode_id)
+        return result_from_props(data['props']['pageProps']['episode'])
 
 
 class PodbayFMChannelIE(InfoExtractor):
-    _VALID_URL = r'https?://podbay\.fm/p/(?P<id>[^/]*)/?(?:[\?#].*)?$'
+    _VALID_URL = r'https?://podbay\.fm/p/(?P<id>[^/?#]+)/?(?:$|[?#])'
     _TESTS = [{
         'url': 'https://podbay.fm/p/behind-the-bastards',
         'info_dict': {
             'id': 'behind-the-bastards',
             'title': 'Behind the Bastards',
         },
+        'playlist_mincount': 21,
     }]
     _PAGE_SIZE = 10
 
     def _fetch_page(self, channel_id, pagenum):
         return self._download_json(
             f'https://podbay.fm/api/podcast?reverse=true&page={pagenum}&slug={channel_id}',
-            channel_id)['podcast']
+            f'Downloading channel JSON page {pagenum + 1}', channel_id)['podcast']
 
     @staticmethod
     def _results_from_page(channel_id, page):
diff --git a/plugins/youtube_download/yt_dlp/extractor/podchaser.py b/plugins/youtube_download/yt_dlp/extractor/podchaser.py
index 290c488..4570f0f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/podchaser.py
+++ b/plugins/youtube_download/yt_dlp/extractor/podchaser.py
@@ -29,8 +29,8 @@ class PodchaserIE(InfoExtractor):
             'duration': 3708,
             'timestamp': 1636531259,
             'upload_date': '20211110',
-            'rating': 4.0
-        }
+            'average_rating': 4.0,
+        },
     }, {
         'url': 'https://www.podchaser.com/podcasts/the-bone-zone-28853',
         'info_dict': {
@@ -38,15 +38,15 @@ class PodchaserIE(InfoExtractor):
             'title': 'The Bone Zone',
             'description': 'Podcast by The Bone Zone',
         },
-        'playlist_count': 275
+        'playlist_count': 275,
     }, {
         'url': 'https://www.podchaser.com/podcasts/sean-carrolls-mindscape-scienc-699349/episodes',
         'info_dict': {
             'id': '699349',
             'title': 'Sean Carroll\'s Mindscape: Science, Society, Philosophy, Culture, Arts, and Ideas',
-            'description': 'md5:2cbd8f4749891a84dc8235342e0b5ff1'
+            'description': 'md5:2cbd8f4749891a84dc8235342e0b5ff1',
         },
-        'playlist_mincount': 225
+        'playlist_mincount': 225,
     }]
 
     @staticmethod
@@ -59,7 +59,7 @@ class PodchaserIE(InfoExtractor):
             'thumbnail': episode.get('image_url'),
             'duration': str_to_int(episode.get('length')),
             'timestamp': unified_timestamp(episode.get('air_date')),
-            'rating': float_or_none(episode.get('rating')),
+            'average_rating': float_or_none(episode.get('rating')),
             'categories': list(set(traverse_obj(podcast, (('summary', None), 'categories', ..., 'text')))),
             'tags': traverse_obj(podcast, ('tags', ..., 'text')),
             'series': podcast.get('title'),
@@ -77,9 +77,9 @@ class PodchaserIE(InfoExtractor):
                 'count': self._PAGE_SIZE,
                 'sort_order': 'SORT_ORDER_RECENT',
                 'filters': {
-                    'podcast_id': podcast_id
+                    'podcast_id': podcast_id,
                 },
-                'options': {}
+                'options': {},
             }).encode())
 
         for episode in json_response['entities']:
diff --git a/plugins/youtube_download/yt_dlp/extractor/podomatic.py b/plugins/youtube_download/yt_dlp/extractor/podomatic.py
index 985bfae..b5af824 100644
--- a/plugins/youtube_download/yt_dlp/extractor/podomatic.py
+++ b/plugins/youtube_download/yt_dlp/extractor/podomatic.py
@@ -5,6 +5,7 @@ from ..utils import int_or_none
 
 
 class PodomaticIE(InfoExtractor):
+    _WORKING = False
     IE_NAME = 'podomatic'
     _VALID_URL = r'''(?x)
                     (?P<proto>https?)://
@@ -25,7 +26,7 @@ class PodomaticIE(InfoExtractor):
             'uploader_id': 'scienceteachingtips',
             'title': '64.  When the Moon Hits Your Eye',
             'duration': 446,
-        }
+        },
     }, {
         'url': 'http://ostbahnhof.podomatic.com/entry/2013-11-15T16_31_21-08_00',
         'md5': 'd2cf443931b6148e27638650e2638297',
@@ -36,7 +37,7 @@ class PodomaticIE(InfoExtractor):
             'uploader_id': 'ostbahnhof',
             'title': 'Einunddreizig',
             'duration': 3799,
-        }
+        },
     }, {
         'url': 'https://www.podomatic.com/podcasts/scienceteachingtips/episodes/2009-01-02T16_03_35-08_00',
         'only_matching': True,
@@ -47,16 +48,15 @@ class PodomaticIE(InfoExtractor):
         video_id = mobj.group('id')
         channel = mobj.group('channel') or mobj.group('channel_2')
 
-        json_url = (('%s://%s.podomatic.com/entry/embed_params/%s'
-                     + '?permalink=true&rtmp=0') %
-                    (mobj.group('proto'), channel, video_id))
+        json_url = ('{}://{}.podomatic.com/entry/embed_params/{}?permalink=true&rtmp=0'.format(
+            mobj.group('proto'), channel, video_id))
         data_json = self._download_webpage(
             json_url, video_id, 'Downloading video info')
         data = json.loads(data_json)
 
         video_url = data['downloadLink']
         if not video_url:
-            video_url = '%s/%s' % (data['streamer'].replace('rtmp', 'http'), data['mediaLocation'])
+            video_url = '{}/{}'.format(data['streamer'].replace('rtmp', 'http'), data['mediaLocation'])
         uploader = data['podcast']
         title = data['title']
         thumbnail = data['imageLocation']
diff --git a/plugins/youtube_download/yt_dlp/extractor/pokemon.py b/plugins/youtube_download/yt_dlp/extractor/pokemon.py
deleted file mode 100644
index 0911893..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/pokemon.py
+++ /dev/null
@@ -1,136 +0,0 @@
-from .common import InfoExtractor
-from ..utils import (
-    ExtractorError,
-    extract_attributes,
-    int_or_none,
-    js_to_json,
-    merge_dicts,
-)
-
-
-class PokemonIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?pokemon\.com/[a-z]{2}(?:.*?play=(?P<id>[a-z0-9]{32})|/(?:[^/]+/)+(?P<display_id>[^/?#&]+))'
-    _TESTS = [{
-        'url': 'https://www.pokemon.com/us/pokemon-episodes/20_30-the-ol-raise-and-switch/',
-        'md5': '2fe8eaec69768b25ef898cda9c43062e',
-        'info_dict': {
-            'id': 'afe22e30f01c41f49d4f1d9eab5cd9a4',
-            'ext': 'mp4',
-            'title': 'The Ol’ Raise and Switch!',
-            'description': 'md5:7db77f7107f98ba88401d3adc80ff7af',
-        },
-        'add_id': ['LimelightMedia'],
-    }, {
-        # no data-video-title
-        'url': 'https://www.pokemon.com/fr/episodes-pokemon/films-pokemon/pokemon-lascension-de-darkrai-2008',
-        'info_dict': {
-            'id': 'dfbaf830d7e54e179837c50c0c6cc0e1',
-            'ext': 'mp4',
-            'title': "Pokémon : L'ascension de Darkrai",
-            'description': 'md5:d1dbc9e206070c3e14a06ff557659fb5',
-        },
-        'add_id': ['LimelightMedia'],
-        'params': {
-            'skip_download': True,
-        },
-    }, {
-        'url': 'http://www.pokemon.com/uk/pokemon-episodes/?play=2e8b5c761f1d4a9286165d7748c1ece2',
-        'only_matching': True,
-    }, {
-        'url': 'http://www.pokemon.com/fr/episodes-pokemon/18_09-un-hiver-inattendu/',
-        'only_matching': True,
-    }, {
-        'url': 'http://www.pokemon.com/de/pokemon-folgen/01_20-bye-bye-smettbo/',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id, display_id = self._match_valid_url(url).groups()
-        webpage = self._download_webpage(url, video_id or display_id)
-        video_data = extract_attributes(self._search_regex(
-            r'(<[^>]+data-video-id="%s"[^>]*>)' % (video_id if video_id else '[a-z0-9]{32}'),
-            webpage, 'video data element'))
-        video_id = video_data['data-video-id']
-        title = video_data.get('data-video-title') or self._html_search_meta(
-            'pkm-title', webpage, ' title', default=None) or self._search_regex(
-            r'<h1[^>]+\bclass=["\']us-title[^>]+>([^<]+)', webpage, 'title')
-        return {
-            '_type': 'url_transparent',
-            'id': video_id,
-            'url': 'limelight:media:%s' % video_id,
-            'title': title,
-            'description': video_data.get('data-video-summary'),
-            'thumbnail': video_data.get('data-video-poster'),
-            'series': 'Pokémon',
-            'season_number': int_or_none(video_data.get('data-video-season')),
-            'episode': title,
-            'episode_number': int_or_none(video_data.get('data-video-episode')),
-            'ie_key': 'LimelightMedia',
-        }
-
-
-class PokemonWatchIE(InfoExtractor):
-    _VALID_URL = r'https?://watch\.pokemon\.com/[a-z]{2}-[a-z]{2}/(?:#/)?player(?:\.html)?\?id=(?P<id>[a-z0-9]{32})'
-    _API_URL = 'https://www.pokemon.com/api/pokemontv/v2/channels/{0:}'
-    _TESTS = [{
-        'url': 'https://watch.pokemon.com/en-us/player.html?id=8309a40969894a8e8d5bc1311e9c5667',
-        'md5': '62833938a31e61ab49ada92f524c42ff',
-        'info_dict': {
-            'id': '8309a40969894a8e8d5bc1311e9c5667',
-            'ext': 'mp4',
-            'title': 'Lillier and the Staff!',
-            'description': 'md5:338841b8c21b283d24bdc9b568849f04',
-        }
-    }, {
-        'url': 'https://watch.pokemon.com/en-us/#/player?id=3fe7752ba09141f0b0f7756d1981c6b2',
-        'only_matching': True
-    }, {
-        'url': 'https://watch.pokemon.com/de-de/player.html?id=b3c402e111a4459eb47e12160ab0ba07',
-        'only_matching': True
-    }]
-
-    def _extract_media(self, channel_array, video_id):
-        for channel in channel_array:
-            for media in channel.get('media'):
-                if media.get('id') == video_id:
-                    return media
-        return None
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        info = {
-            '_type': 'url',
-            'id': video_id,
-            'url': 'limelight:media:%s' % video_id,
-            'ie_key': 'LimelightMedia',
-        }
-
-        # API call can be avoided entirely if we are listing formats
-        if self.get_param('listformats', False):
-            return info
-
-        webpage = self._download_webpage(url, video_id)
-        build_vars = self._parse_json(self._search_regex(
-            r'(?s)buildVars\s*=\s*({.*?})', webpage, 'build vars'),
-            video_id, transform_source=js_to_json)
-        region = build_vars.get('region')
-        channel_array = self._download_json(self._API_URL.format(region), video_id)
-        video_data = self._extract_media(channel_array, video_id)
-
-        if video_data is None:
-            raise ExtractorError(
-                'Video %s does not exist' % video_id, expected=True)
-
-        info['_type'] = 'url_transparent'
-        images = video_data.get('images')
-
-        return merge_dicts(info, {
-            'title': video_data.get('title'),
-            'description': video_data.get('description'),
-            'thumbnail': images.get('medium') or images.get('small'),
-            'series': 'Pokémon',
-            'season_number': int_or_none(video_data.get('season')),
-            'episode': video_data.get('title'),
-            'episode_number': int_or_none(video_data.get('episode')),
-        })
diff --git a/plugins/youtube_download/yt_dlp/extractor/pokergo.py b/plugins/youtube_download/yt_dlp/extractor/pokergo.py
index 5c7baad..72cbce0 100644
--- a/plugins/youtube_download/yt_dlp/extractor/pokergo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/pokergo.py
@@ -5,6 +5,7 @@ from ..utils import (
     ExtractorError,
     try_get,
 )
+from ..utils.traversal import traverse_obj
 
 
 class PokerGoBaseIE(InfoExtractor):
@@ -49,26 +50,27 @@ class PokerGoIE(PokerGoBaseIE):
             'episode': 'Episode 2',
             'display_id': '2a70ec4e-4a80-414b-97ec-725d9b72a7dc',
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }]
 
     def _real_extract(self, url):
-        id = self._match_id(url)
-        data_json = self._download_json(f'https://api.pokergo.com/v2/properties/{self._PROPERTY_ID}/videos/{id}', id,
-                                        headers={'authorization': f'Bearer {self._AUTH_TOKEN}'})['data']
+        video_id = self._match_id(url)
+        data_json = self._download_json(
+            f'https://api.pokergo.com/v2/properties/{self._PROPERTY_ID}/videos/{video_id}', video_id,
+            headers={'authorization': f'Bearer {self._AUTH_TOKEN}'})['data']
         v_id = data_json['source']
 
         thumbnails = [{
             'url': image['url'],
             'id': image.get('label'),
             'width': image.get('width'),
-            'height': image.get('height')
+            'height': image.get('height'),
         } for image in data_json.get('images') or [] if image.get('url')]
-        series_json = next(dct for dct in data_json.get('show_tags') or [] if dct.get('video_id') == id) or {}
+        series_json = traverse_obj(data_json, ('show_tags', lambda _, v: v['video_id'] == video_id, any)) or {}
 
         return {
             '_type': 'url_transparent',
-            'display_id': id,
+            'display_id': video_id,
             'title': data_json.get('title'),
             'description': data_json.get('description'),
             'duration': data_json.get('duration'),
@@ -76,7 +78,7 @@ class PokerGoIE(PokerGoBaseIE):
             'season_number': series_json.get('season'),
             'episode_number': series_json.get('episode_number'),
             'series': try_get(series_json, lambda x: x['tag']['name']),
-            'url': f'https://cdn.jwplayer.com/v2/media/{v_id}'
+            'url': f'https://cdn.jwplayer.com/v2/media/{v_id}',
         }
 
 
@@ -91,9 +93,10 @@ class PokerGoCollectionIE(PokerGoBaseIE):
         },
     }]
 
-    def _entries(self, id):
-        data_json = self._download_json(f'https://api.pokergo.com/v2/properties/{self._PROPERTY_ID}/collections/{id}?include=entities',
-                                        id, headers={'authorization': f'Bearer {self._AUTH_TOKEN}'})['data']
+    def _entries(self, playlist_id):
+        data_json = self._download_json(
+            f'https://api.pokergo.com/v2/properties/{self._PROPERTY_ID}/collections/{playlist_id}?include=entities',
+            playlist_id, headers={'authorization': f'Bearer {self._AUTH_TOKEN}'})['data']
         for video in data_json.get('collection_video') or []:
             video_id = video.get('id')
             if video_id:
@@ -102,5 +105,5 @@ class PokerGoCollectionIE(PokerGoBaseIE):
                     ie=PokerGoIE.ie_key(), video_id=video_id)
 
     def _real_extract(self, url):
-        id = self._match_id(url)
-        return self.playlist_result(self._entries(id), playlist_id=id)
+        playlist_id = self._match_id(url)
+        return self.playlist_result(self._entries(playlist_id), playlist_id=playlist_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/polsatgo.py b/plugins/youtube_download/yt_dlp/extractor/polsatgo.py
index 1524a1f..d4a0d6a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/polsatgo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/polsatgo.py
@@ -1,12 +1,12 @@
-from uuid import uuid4
 import json
+import uuid
 
 from .common import InfoExtractor
 from ..utils import (
+    ExtractorError,
     int_or_none,
     try_get,
     url_or_none,
-    ExtractorError,
 )
 
 
@@ -33,7 +33,7 @@ class PolsatGoIE(InfoExtractor):
                 continue
             yield {
                 'url': url,
-                'height': int_or_none(try_get(source, lambda x: x['quality'][:-1]))
+                'height': int_or_none(try_get(source, lambda x: x['quality'][:-1])),
             }
 
     def _real_extract(self, url):
@@ -47,11 +47,11 @@ class PolsatGoIE(InfoExtractor):
             'id': video_id,
             'title': media['displayInfo']['title'],
             'formats': formats,
-            'age_limit': int_or_none(media['displayInfo']['ageGroup'])
+            'age_limit': int_or_none(media['displayInfo']['ageGroup']),
         }
 
     def _call_api(self, endpoint, media_id, method, params):
-        rand_uuid = str(uuid4())
+        rand_uuid = str(uuid.uuid4())
         res = self._download_json(
             f'https://b2c-mobile.redefine.pl/rpc/{endpoint}/', media_id,
             note=f'Downloading {method} JSON metadata',
@@ -77,7 +77,7 @@ class PolsatGoIE(InfoExtractor):
                     'clientId': rand_uuid,
                     'cpid': 1,
                 },
-            }).encode('utf-8'),
+            }).encode(),
             headers={'Content-type': 'application/json'})
         if not res.get('result'):
             if res['error']['code'] == 13404:
diff --git a/plugins/youtube_download/yt_dlp/extractor/polskieradio.py b/plugins/youtube_download/yt_dlp/extractor/polskieradio.py
index 5bf92b9..9d0496b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/polskieradio.py
+++ b/plugins/youtube_download/yt_dlp/extractor/polskieradio.py
@@ -5,7 +5,6 @@ import re
 import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     ExtractorError,
     InAdvancePagedList,
@@ -23,7 +22,7 @@ from ..utils import (
 )
 
 
-class PolskieRadioBaseExtractor(InfoExtractor):
+class PolskieRadioBaseIE(InfoExtractor):
     def _extract_webpage_player_entries(self, webpage, playlist_id, base_data):
         media_urls = set()
 
@@ -37,7 +36,7 @@ class PolskieRadioBaseExtractor(InfoExtractor):
             media_urls.add(media_url)
             entry = base_data.copy()
             entry.update({
-                'id': compat_str(media['id']),
+                'id': str(media['id']),
                 'url': media_url,
                 'duration': int_or_none(media.get('length')),
                 'vcodec': 'none' if media.get('provider') == 'audio' else None,
@@ -48,7 +47,7 @@ class PolskieRadioBaseExtractor(InfoExtractor):
             yield entry
 
 
-class PolskieRadioLegacyIE(PolskieRadioBaseExtractor):
+class PolskieRadioLegacyIE(PolskieRadioBaseIE):
     # legacy sites
     IE_NAME = 'polskieradio:legacy'
     _VALID_URL = r'https?://(?:www\.)?polskieradio(?:24)?\.pl/\d+/\d+/[Aa]rtykul/(?P<id>\d+)'
@@ -68,7 +67,7 @@ class PolskieRadioLegacyIE(PolskieRadioBaseExtractor):
                 'timestamp': 1592654400,
                 'upload_date': '20200620',
                 'duration': 1430,
-                'thumbnail': r're:^https?://static\.prsa\.pl/images/.*\.jpg$'
+                'thumbnail': r're:^https?://static\.prsa\.pl/images/.*\.jpg$',
             },
         }],
     }, {
@@ -128,7 +127,7 @@ class PolskieRadioLegacyIE(PolskieRadioBaseExtractor):
         return self.playlist_result(entries, playlist_id, title, description)
 
 
-class PolskieRadioIE(PolskieRadioBaseExtractor):
+class PolskieRadioIE(PolskieRadioBaseIE):
     # new next.js sites
     _VALID_URL = r'https?://(?:[^/]+\.)?(?:polskieradio(?:24)?|radiokierowcow)\.pl/artykul/(?P<id>\d+)'
     _TESTS = [{
@@ -262,14 +261,14 @@ class PolskieRadioAuditionIE(InfoExtractor):
             query=query, headers={'x-api-key': '9bf6c5a2-a7d0-4980-9ed7-a3f7291f2a81'})
 
     def _entries(self, playlist_id, has_episodes, has_articles):
-        for i in itertools.count(1) if has_episodes else []:
+        for i in itertools.count(0) if has_episodes else []:
             page = self._call_lp3(
                 'AudioArticle/GetListByCategoryId', {
                     'categoryId': playlist_id,
                     'PageSize': 10,
                     'skip': i,
                     'format': 400,
-                }, playlist_id, f'Downloading episode list page {i}')
+                }, playlist_id, f'Downloading episode list page {i + 1}')
             if not traverse_obj(page, 'data'):
                 break
             for episode in page['data']:
@@ -281,14 +280,14 @@ class PolskieRadioAuditionIE(InfoExtractor):
                     'timestamp': parse_iso8601(episode.get('datePublic')),
                 }
 
-        for i in itertools.count(1) if has_articles else []:
+        for i in itertools.count(0) if has_articles else []:
             page = self._call_lp3(
                 'Article/GetListByCategoryId', {
                     'categoryId': playlist_id,
                     'PageSize': 9,
                     'skip': i,
                     'format': 400,
-                }, playlist_id, f'Downloading article list page {i}')
+                }, playlist_id, f'Downloading article list page {i + 1}')
             if not traverse_obj(page, 'data'):
                 break
             for article in page['data']:
@@ -328,14 +327,14 @@ class PolskieRadioCategoryIE(InfoExtractor):
             'id': '4143',
             'title': 'Kierunek Kraków',
         },
-        'playlist_mincount': 61
+        'playlist_mincount': 61,
     }, {
         'url': 'http://www.polskieradio.pl/10,czworka/214,muzyka',
         'info_dict': {
             'id': '214',
             'title': 'Muzyka',
         },
-        'playlist_mincount': 61
+        'playlist_mincount': 61,
     }, {
         # billennium tabs
         'url': 'https://www.polskieradio.pl/8/2385',
@@ -400,7 +399,7 @@ class PolskieRadioCategoryIE(InfoExtractor):
                 params = self._search_json(
                     r'<div[^>]+class=["\']next["\'][^>]*>\s*<a[^>]+onclick=["\']TB_LoadTab\(',
                     pagination, 'next page params', category_id, default=None, close_objects=1,
-                    contains_pattern='.+', transform_source=lambda x: '[%s' % js_to_json(unescapeHTML(x)))
+                    contains_pattern='.+', transform_source=lambda x: f'[{js_to_json(unescapeHTML(x))}')
                 if not params:
                     break
                 tab_content = self._download_json(
@@ -409,7 +408,7 @@ class PolskieRadioCategoryIE(InfoExtractor):
                     data=json.dumps(dict(zip((
                         'boxInstanceId', 'tabId', 'categoryType', 'sectionId', 'categoryId', 'pagerMode',
                         'subjectIds', 'tagIndexId', 'queryString', 'name', 'openArticlesInParentTemplate',
-                        'idSectionFromUrl', 'maxDocumentAge', 'showCategoryForArticle', 'pageNumber'
+                        'idSectionFromUrl', 'maxDocumentAge', 'showCategoryForArticle', 'pageNumber',
                     ), params))).encode())['d']
                 content, pagination = tab_content['Content'], tab_content.get('PagerContent')
             elif is_post_back:
@@ -511,7 +510,7 @@ class PolskieRadioPlayerIE(InfoExtractor):
                 })
 
         return {
-            'id': compat_str(channel['id']),
+            'id': str(channel['id']),
             'formats': formats,
             'title': channel.get('name') or channel.get('streamName'),
             'display_id': channel_url,
@@ -520,7 +519,7 @@ class PolskieRadioPlayerIE(InfoExtractor):
         }
 
 
-class PolskieRadioPodcastBaseExtractor(InfoExtractor):
+class PolskieRadioPodcastBaseIE(InfoExtractor):
     _API_BASE = 'https://apipodcasts.polskieradio.pl/api'
 
     def _parse_episode(self, data):
@@ -540,7 +539,7 @@ class PolskieRadioPodcastBaseExtractor(InfoExtractor):
         }
 
 
-class PolskieRadioPodcastListIE(PolskieRadioPodcastBaseExtractor):
+class PolskieRadioPodcastListIE(PolskieRadioPodcastBaseIE):
     IE_NAME = 'polskieradio:podcast:list'
     _VALID_URL = r'https?://podcasty\.polskieradio\.pl/podcast/(?P<id>\d+)'
     _TESTS = [{
@@ -579,7 +578,7 @@ class PolskieRadioPodcastListIE(PolskieRadioPodcastBaseExtractor):
         }
 
 
-class PolskieRadioPodcastIE(PolskieRadioPodcastBaseExtractor):
+class PolskieRadioPodcastIE(PolskieRadioPodcastBaseIE):
     IE_NAME = 'polskieradio:podcast'
     _VALID_URL = r'https?://podcasty\.polskieradio\.pl/track/(?P<id>[a-f\d]{8}(?:-[a-f\d]{4}){4}[a-f\d]{8})'
     _TESTS = [{
@@ -603,7 +602,7 @@ class PolskieRadioPodcastIE(PolskieRadioPodcastBaseExtractor):
             podcast_id, 'Downloading podcast metadata',
             data=json.dumps({
                 'guids': [podcast_id],
-            }).encode('utf-8'),
+            }).encode(),
             headers={
                 'Content-Type': 'application/json',
             })
diff --git a/plugins/youtube_download/yt_dlp/extractor/popcorntimes.py b/plugins/youtube_download/yt_dlp/extractor/popcorntimes.py
index ddc5ec8..cfece86 100644
--- a/plugins/youtube_download/yt_dlp/extractor/popcorntimes.py
+++ b/plugins/youtube_download/yt_dlp/extractor/popcorntimes.py
@@ -1,5 +1,6 @@
+import base64
+
 from .common import InfoExtractor
-from ..compat import compat_b64decode
 from ..utils import int_or_none
 
 
@@ -49,7 +50,7 @@ class PopcorntimesIE(InfoExtractor):
                     c_ord -= 26
             loc_b64 += chr(c_ord)
 
-        video_url = compat_b64decode(loc_b64).decode('utf-8')
+        video_url = base64.b64decode(loc_b64).decode('utf-8')
 
         description = self._html_search_regex(
             r'(?s)<div[^>]+class=["\']pt-movie-desc[^>]+>(.+?)</div>', webpage,
diff --git a/plugins/youtube_download/yt_dlp/extractor/popcorntv.py b/plugins/youtube_download/yt_dlp/extractor/popcorntv.py
index 7798462..2897bb4 100644
--- a/plugins/youtube_download/yt_dlp/extractor/popcorntv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/popcorntv.py
@@ -37,7 +37,7 @@ class PopcornTVIE(InfoExtractor):
         m3u8_url = extract_attributes(
             self._search_regex(
                 r'(<link[^>]+itemprop=["\'](?:content|embed)Url[^>]*>)',
-                webpage, 'content'
+                webpage, 'content',
             ))['href']
 
         formats = self._extract_m3u8_formats(
diff --git a/plugins/youtube_download/yt_dlp/extractor/porn91.py b/plugins/youtube_download/yt_dlp/extractor/porn91.py
deleted file mode 100644
index 7d16a16..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/porn91.py
+++ /dev/null
@@ -1,95 +0,0 @@
-import urllib.parse
-from .common import InfoExtractor
-from ..utils import (
-    determine_ext,
-    int_or_none,
-    parse_duration,
-    remove_end,
-    unified_strdate,
-    ExtractorError,
-)
-
-
-class Porn91IE(InfoExtractor):
-    IE_NAME = '91porn'
-    _VALID_URL = r'(?:https?://)(?:www\.|)91porn\.com/view_video.php\?([^#]+&)?viewkey=(?P<id>\w+)'
-
-    _TESTS = [{
-        'url': 'http://91porn.com/view_video.php?viewkey=7e42283b4f5ab36da134',
-        'md5': 'd869db281402e0ef4ddef3c38b866f86',
-        'info_dict': {
-            'id': '7e42283b4f5ab36da134',
-            'title': '18岁大一漂亮学妹，水嫩性感，再爽一次！',
-            'description': 'md5:1ff241f579b07ae936a54e810ad2e891',
-            'ext': 'mp4',
-            'duration': 431,
-            'upload_date': '20150520',
-            'comment_count': int,
-            'view_count': int,
-            'age_limit': 18,
-        }
-    }, {
-        'url': 'https://91porn.com/view_video.php?viewkey=7ef0cf3d362c699ab91c',
-        'md5': 'f8fd50540468a6d795378cd778b40226',
-        'info_dict': {
-            'id': '7ef0cf3d362c699ab91c',
-            'title': '真实空乘，冲上云霄第二部',
-            'description': 'md5:618bf9652cafcc66cd277bd96789baea',
-            'ext': 'mp4',
-            'duration': 248,
-            'upload_date': '20221119',
-            'comment_count': int,
-            'view_count': int,
-            'age_limit': 18,
-        }
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        self._set_cookie('91porn.com', 'language', 'cn_CN')
-
-        webpage = self._download_webpage(
-            'http://91porn.com/view_video.php?viewkey=%s' % video_id, video_id)
-
-        if '视频不存在,可能已经被删除或者被举报为不良内容!' in webpage:
-            raise ExtractorError('91 Porn says: Video does not exist', expected=True)
-
-        daily_limit = self._search_regex(
-            r'作为游客，你每天只可观看([\d]+)个视频', webpage, 'exceeded daily limit', default=None, fatal=False)
-        if daily_limit:
-            raise ExtractorError(f'91 Porn says: Daily limit {daily_limit} videos exceeded', expected=True)
-
-        video_link_url = self._search_regex(
-            r'document\.write\(\s*strencode2\s*\(\s*((?:"[^"]+")|(?:\'[^\']+\'))', webpage, 'video link')
-        video_link_url = self._search_regex(
-            r'src=["\']([^"\']+)["\']', urllib.parse.unquote(video_link_url), 'unquoted video link')
-
-        formats, subtitles = self._get_formats_and_subtitle(video_link_url, video_id)
-
-        return {
-            'id': video_id,
-            'title': remove_end(self._html_extract_title(webpage).replace('\n', ''), 'Chinese homemade video').strip(),
-            'formats': formats,
-            'subtitles': subtitles,
-            'upload_date': unified_strdate(self._search_regex(
-                r'<span\s+class=["\']title-yakov["\']>(\d{4}-\d{2}-\d{2})</span>', webpage, 'upload_date', fatal=False)),
-            'description': self._html_search_regex(
-                r'<span\s+class=["\']more title["\']>\s*([^<]+)', webpage, 'description', fatal=False),
-            'duration': parse_duration(self._search_regex(
-                r'时长:\s*<span[^>]*>\s*(\d+(?::\d+){1,2})', webpage, 'duration', fatal=False)),
-            'comment_count': int_or_none(self._search_regex(
-                r'留言:\s*<span[^>]*>\s*(\d+)\s*</span>', webpage, 'comment count', fatal=False)),
-            'view_count': int_or_none(self._search_regex(
-                r'热度:\s*<span[^>]*>\s*(\d+)\s*</span>', webpage, 'view count', fatal=False)),
-            'age_limit': 18,
-        }
-
-    def _get_formats_and_subtitle(self, video_link_url, video_id):
-        ext = determine_ext(video_link_url)
-        if ext == 'm3u8':
-            formats, subtitles = self._extract_m3u8_formats_and_subtitles(video_link_url, video_id, ext='mp4')
-        else:
-            formats = [{'url': video_link_url, 'ext': ext}]
-            subtitles = {}
-
-        return formats, subtitles
diff --git a/plugins/youtube_download/yt_dlp/extractor/pornbox.py b/plugins/youtube_download/yt_dlp/extractor/pornbox.py
new file mode 100644
index 0000000..0996e4d
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/pornbox.py
@@ -0,0 +1,113 @@
+
+from .common import InfoExtractor
+from ..utils import (
+    int_or_none,
+    parse_duration,
+    parse_iso8601,
+    qualities,
+    str_or_none,
+    traverse_obj,
+    url_or_none,
+)
+
+
+class PornboxIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?pornbox\.com/application/watch-page/(?P<id>[0-9]+)'
+    _TESTS = [{
+        'url': 'https://pornbox.com/application/watch-page/212108',
+        'md5': '3ff6b6e206f263be4c5e987a3162ac6e',
+        'info_dict': {
+            'id': '212108',
+            'ext': 'mp4',
+            'title': 'md5:ececc5c6e6c9dd35d290c45fed05fd49',
+            'uploader': 'Lily Strong',
+            'timestamp': 1665871200,
+            'upload_date': '20221015',
+            'age_limit': 18,
+            'availability': 'needs_auth',
+            'duration': 1505,
+            'cast': ['Lily Strong', 'John Strong'],
+            'tags': 'count:11',
+            'description': 'md5:589c7f33e183aa8aa939537300efb859',
+            'thumbnail': r're:^https?://cdn-image\.gtflixtv\.com.*\.jpg.*$',
+        },
+    }, {
+        'url': 'https://pornbox.com/application/watch-page/216045',
+        'info_dict': {
+            'id': '216045',
+            'title': 'md5:3e48528e73a9a2b12f7a2772ed0b26a2',
+            'description': 'md5:3e631dcaac029f15ed434e402d1b06c7',
+            'uploader': 'VK Studio',
+            'timestamp': 1618264800,
+            'upload_date': '20210412',
+            'age_limit': 18,
+            'availability': 'premium_only',
+            'duration': 2710,
+            'cast': 'count:3',
+            'tags': 'count:29',
+            'thumbnail': r're:^https?://cdn-image\.gtflixtv\.com.*\.jpg.*$',
+            'subtitles': 'count:6',
+        },
+        'params': {
+            'skip_download': True,
+            'ignore_no_formats_error': True,
+        },
+        'expected_warnings': [
+            'You are either not logged in or do not have access to this scene',
+            'No video formats found', 'Requested format is not available'],
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+
+        public_data = self._download_json(f'https://pornbox.com/contents/{video_id}', video_id)
+
+        subtitles = {country_code: [{
+            'url': f'https://pornbox.com/contents/{video_id}/subtitles/{country_code}',
+            'ext': 'srt',
+        }] for country_code in traverse_obj(public_data, ('subtitles', ..., {str}))}
+
+        is_free_scene = traverse_obj(
+            public_data, ('price', 'is_available_for_free', {bool}), default=False)
+
+        metadata = {
+            'id': video_id,
+            **traverse_obj(public_data, {
+                'title': ('scene_name', {str.strip}),
+                'description': ('small_description', {str.strip}),
+                'uploader': 'studio',
+                'duration': ('runtime', {parse_duration}),
+                'cast': (('models', 'male_models'), ..., 'model_name'),
+                'thumbnail': ('player_poster', {url_or_none}),
+                'tags': ('niches', ..., 'niche'),
+            }),
+            'age_limit': 18,
+            'timestamp': parse_iso8601(traverse_obj(
+                public_data, ('studios', 'release_date'), 'publish_date')),
+            'availability': self._availability(needs_auth=True, needs_premium=not is_free_scene),
+            'subtitles': subtitles,
+        }
+
+        if not public_data.get('is_purchased') or not is_free_scene:
+            self.raise_login_required(
+                'You are either not logged in or do not have access to this scene', metadata_available=True)
+            return metadata
+
+        media_id = traverse_obj(public_data, (
+            'medias', lambda _, v: v['title'] == 'Full video', 'media_id', {int}), get_all=False)
+        if not media_id:
+            self.raise_no_formats('Could not find stream id', video_id=video_id)
+
+        stream_data = self._download_json(
+            f'https://pornbox.com/media/{media_id}/stream', video_id=video_id, note='Getting manifest urls')
+
+        get_quality = qualities(['web', 'vga', 'hd', '1080p', '4k', '8k'])
+        metadata['formats'] = traverse_obj(stream_data, ('qualities', lambda _, v: v['src'], {
+            'url': 'src',
+            'vbr': ('bitrate', {int_or_none(scale=1000)}),
+            'format_id': ('quality', {str_or_none}),
+            'quality': ('quality', {get_quality}),
+            'width': ('size', {lambda x: int(x[:-1])}),
+        }))
+
+        return metadata
diff --git a/plugins/youtube_download/yt_dlp/extractor/porncom.py b/plugins/youtube_download/yt_dlp/extractor/porncom.py
deleted file mode 100644
index c8ef240..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/porncom.py
+++ /dev/null
@@ -1,99 +0,0 @@
-import re
-
-from .common import InfoExtractor
-from ..compat import compat_urlparse
-from ..utils import (
-    int_or_none,
-    js_to_json,
-    parse_filesize,
-    str_to_int,
-)
-
-
-class PornComIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:[a-zA-Z]+\.)?porn\.com/videos/(?:(?P<display_id>[^/]+)-)?(?P<id>\d+)'
-    _TESTS = [{
-        'url': 'http://www.porn.com/videos/teen-grabs-a-dildo-and-fucks-her-pussy-live-on-1hottie-i-rec-2603339',
-        'md5': '3f30ce76267533cd12ba999263156de7',
-        'info_dict': {
-            'id': '2603339',
-            'display_id': 'teen-grabs-a-dildo-and-fucks-her-pussy-live-on-1hottie-i-rec',
-            'ext': 'mp4',
-            'title': 'Teen grabs a dildo and fucks her pussy live on 1hottie, I rec',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'duration': 551,
-            'view_count': int,
-            'age_limit': 18,
-            'categories': list,
-            'tags': list,
-        },
-    }, {
-        'url': 'http://se.porn.com/videos/marsha-may-rides-seth-on-top-of-his-thick-cock-2658067',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        mobj = self._match_valid_url(url)
-        video_id = mobj.group('id')
-        display_id = mobj.group('display_id') or video_id
-
-        webpage = self._download_webpage(url, display_id)
-
-        config = self._parse_json(
-            self._search_regex(
-                (r'=\s*({.+?})\s*;\s*v1ar\b',
-                 r'=\s*({.+?})\s*,\s*[\da-zA-Z_]+\s*='),
-                webpage, 'config', default='{}'),
-            display_id, transform_source=js_to_json, fatal=False)
-
-        if config:
-            title = config['title']
-            formats = [{
-                'url': stream['url'],
-                'format_id': stream.get('id'),
-                'height': int_or_none(self._search_regex(
-                    r'^(\d+)[pP]', stream.get('id') or '', 'height', default=None))
-            } for stream in config['streams'] if stream.get('url')]
-            thumbnail = (compat_urlparse.urljoin(
-                config['thumbCDN'], config['poster'])
-                if config.get('thumbCDN') and config.get('poster') else None)
-            duration = int_or_none(config.get('length'))
-        else:
-            title = self._search_regex(
-                (r'<title>([^<]+)</title>', r'<h1[^>]*>([^<]+)</h1>'),
-                webpage, 'title')
-            formats = [{
-                'url': compat_urlparse.urljoin(url, format_url),
-                'format_id': '%sp' % height,
-                'height': int(height),
-                'filesize_approx': parse_filesize(filesize),
-            } for format_url, height, filesize in re.findall(
-                r'<a[^>]+href="(/download/[^"]+)">[^<]*?(\d+)p<span[^>]*>(\d+\s*[a-zA-Z]+)<',
-                webpage)]
-            thumbnail = None
-            duration = None
-
-        view_count = str_to_int(self._search_regex(
-            (r'Views:\s*</span>\s*<span>\s*([\d,.]+)',
-             r'class=["\']views["\'][^>]*><p>([\d,.]+)'), webpage,
-            'view count', fatal=False))
-
-        def extract_list(kind):
-            s = self._search_regex(
-                (r'(?s)%s:\s*</span>\s*<span>(.+?)</span>' % kind.capitalize(),
-                 r'(?s)<p[^>]*>%s:(.+?)</p>' % kind.capitalize()),
-                webpage, kind, fatal=False)
-            return re.findall(r'<a[^>]+>([^<]+)</a>', s or '')
-
-        return {
-            'id': video_id,
-            'display_id': display_id,
-            'title': title,
-            'thumbnail': thumbnail,
-            'duration': duration,
-            'view_count': view_count,
-            'formats': formats,
-            'age_limit': 18,
-            'categories': extract_list('categories'),
-            'tags': extract_list('tags'),
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/pornez.py b/plugins/youtube_download/yt_dlp/extractor/pornez.py
deleted file mode 100644
index bc45f86..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/pornez.py
+++ /dev/null
@@ -1,60 +0,0 @@
-from .common import InfoExtractor
-from ..utils import (
-    clean_html,
-    int_or_none,
-    get_element_by_class,
-    urljoin,
-)
-
-
-class PornezIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?pornez\.net/(?:video(?P<id>\w+)|watch)/'
-    _TESTS = [{
-        'url': 'https://pornez.net/video344819/mistresst-funny_penis_names-wmv/',
-        'info_dict': {
-            'id': '344819',
-            'ext': 'mp4',
-            'title': 'mistresst funny_penis_names wmv',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'age_limit': 18,
-        },
-        'params': {'skip_download': 'm3u8'},
-    }, {
-        'url': 'https://pornez.net/watch/leana+lovings+stiff+for+stepdaughter/',
-        'info_dict': {
-            'id': '156161',
-            'ext': 'mp4',
-            'title': 'Watch leana lovings stiff for stepdaughter porn video.',
-            'age_limit': 18,
-        },
-        'params': {'skip_download': 'm3u8'},
-    }, {
-        'url': 'https://pornez.net/videovzs27fj/tutor4k-e14-blue-wave-1080p-nbq-tutor4k-e14-blue-wave/',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-        if not video_id:
-            video_id = self._search_regex(
-                r'<link[^>]+\bhref=["\']https?://pornez.net/\?p=(\w+)["\']', webpage, 'id')
-
-        iframe_src = self._html_search_regex(r'<iframe[^>]+src="([^"]+)"', webpage, 'iframe')
-        iframe = self._download_webpage(urljoin('https://pornez.net', iframe_src), video_id)
-
-        entries = self._parse_html5_media_entries(iframe_src, iframe, video_id)[0]
-        for fmt in entries['formats']:
-            height = self._search_regex(r'_(\d+)\.m3u8', fmt['url'], 'height')
-            fmt['format_id'] = '%sp' % height
-            fmt['height'] = int_or_none(height)
-
-        entries.update({
-            'id': video_id,
-            'title': (clean_html(get_element_by_class('video-title', webpage))
-                      or self._html_search_meta(
-                      ['twitter:title', 'og:title', 'description'], webpage, 'title', default=None)),
-            'thumbnail': self._html_search_meta(['thumbnailUrl'], webpage, 'thumb', default=None),
-            'age_limit': 18,
-        })
-        return entries
diff --git a/plugins/youtube_download/yt_dlp/extractor/pornflip.py b/plugins/youtube_download/yt_dlp/extractor/pornflip.py
index 51a9cf3..bc684fd 100644
--- a/plugins/youtube_download/yt_dlp/extractor/pornflip.py
+++ b/plugins/youtube_download/yt_dlp/extractor/pornflip.py
@@ -1,9 +1,5 @@
 from .common import InfoExtractor
-from ..utils import (
-    int_or_none,
-    parse_duration,
-    parse_iso8601
-)
+from ..utils import int_or_none, parse_duration, parse_iso8601
 
 
 class PornFlipIE(InfoExtractor):
@@ -47,7 +43,7 @@ class PornFlipIE(InfoExtractor):
     def _real_extract(self, url):
         video_id = self._match_id(url)
         webpage = self._download_webpage(
-            'https://{}/sv/{}'.format(self._HOST, video_id), video_id, headers={'host': self._HOST})
+            f'https://{self._HOST}/sv/{video_id}', video_id, headers={'host': self._HOST})
         description = self._html_search_regex(r'&p\[summary\]=(.*?)\s*&p', webpage, 'description', fatal=False)
         duration = self._search_regex(r'"duration":\s+"([^"]+)",', webpage, 'duration', fatal=False)
         view_count = self._search_regex(r'"interactionCount":\s+"([^"]+)"', webpage, 'view_count', fatal=False)
diff --git a/plugins/youtube_download/yt_dlp/extractor/pornhd.py b/plugins/youtube_download/yt_dlp/extractor/pornhd.py
deleted file mode 100644
index c8a1ec8..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/pornhd.py
+++ /dev/null
@@ -1,116 +0,0 @@
-from .common import InfoExtractor
-from ..utils import (
-    determine_ext,
-    ExtractorError,
-    int_or_none,
-    js_to_json,
-    merge_dicts,
-    urljoin,
-)
-
-
-class PornHdIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?pornhd\.com/(?:[a-z]{2,4}/)?videos/(?P<id>\d+)(?:/(?P<display_id>.+))?'
-    _TESTS = [{
-        'url': 'http://www.pornhd.com/videos/9864/selfie-restroom-masturbation-fun-with-chubby-cutie-hd-porn-video',
-        'md5': '87f1540746c1d32ec7a2305c12b96b25',
-        'info_dict': {
-            'id': '9864',
-            'display_id': 'selfie-restroom-masturbation-fun-with-chubby-cutie-hd-porn-video',
-            'ext': 'mp4',
-            'title': 'Restroom selfie masturbation',
-            'description': 'md5:3748420395e03e31ac96857a8f125b2b',
-            'thumbnail': r're:^https?://.*\.jpg',
-            'view_count': int,
-            'like_count': int,
-            'age_limit': 18,
-        },
-        'skip': 'HTTP Error 404: Not Found',
-    }, {
-        'url': 'http://www.pornhd.com/videos/1962/sierra-day-gets-his-cum-all-over-herself-hd-porn-video',
-        'md5': '1b7b3a40b9d65a8e5b25f7ab9ee6d6de',
-        'info_dict': {
-            'id': '1962',
-            'display_id': 'sierra-day-gets-his-cum-all-over-herself-hd-porn-video',
-            'ext': 'mp4',
-            'title': 'md5:98c6f8b2d9c229d0f0fde47f61a1a759',
-            'description': 'md5:8ff0523848ac2b8f9b065ba781ccf294',
-            'thumbnail': r're:^https?://.*\.jpg',
-            'view_count': int,
-            'like_count': int,
-            'age_limit': 18,
-        },
-    }]
-
-    def _real_extract(self, url):
-        mobj = self._match_valid_url(url)
-        video_id = mobj.group('id')
-        display_id = mobj.group('display_id')
-
-        webpage = self._download_webpage(url, display_id or video_id)
-
-        title = self._html_search_regex(
-            [r'<span[^>]+class=["\']video-name["\'][^>]*>([^<]+)',
-             r'<title>(.+?) - .*?[Pp]ornHD.*?</title>'], webpage, 'title')
-
-        sources = self._parse_json(js_to_json(self._search_regex(
-            r"(?s)sources'?\s*[:=]\s*(\{.+?\})",
-            webpage, 'sources', default='{}')), video_id)
-
-        info = {}
-        if not sources:
-            entries = self._parse_html5_media_entries(url, webpage, video_id)
-            if entries:
-                info = entries[0]
-
-        if not sources and not info:
-            message = self._html_search_regex(
-                r'(?s)<(div|p)[^>]+class="no-video"[^>]*>(?P<value>.+?)</\1',
-                webpage, 'error message', group='value')
-            raise ExtractorError('%s said: %s' % (self.IE_NAME, message), expected=True)
-
-        formats = []
-        for format_id, video_url in sources.items():
-            video_url = urljoin(url, video_url)
-            if not video_url:
-                continue
-            height = int_or_none(self._search_regex(
-                r'^(\d+)[pP]', format_id, 'height', default=None))
-            formats.append({
-                'url': video_url,
-                'ext': determine_ext(video_url, 'mp4'),
-                'format_id': format_id,
-                'height': height,
-            })
-        if formats:
-            info['formats'] = formats
-
-        description = self._html_search_regex(
-            (r'(?s)<section[^>]+class=["\']video-description[^>]+>(?P<value>.+?)</section>',
-             r'<(div|p)[^>]+class="description"[^>]*>(?P<value>[^<]+)</\1'),
-            webpage, 'description', fatal=False,
-            group='value') or self._html_search_meta(
-            'description', webpage, default=None) or self._og_search_description(webpage)
-        view_count = int_or_none(self._html_search_regex(
-            r'(\d+) views\s*<', webpage, 'view count', fatal=False))
-        thumbnail = self._search_regex(
-            r"poster'?\s*:\s*([\"'])(?P<url>(?:(?!\1).)+)\1", webpage,
-            'thumbnail', default=None, group='url')
-
-        like_count = int_or_none(self._search_regex(
-            (r'(\d+)</span>\s*likes',
-             r'(\d+)\s*</11[^>]+>(?:&nbsp;|\s)*\blikes',
-             r'class=["\']save-count["\'][^>]*>\s*(\d+)'),
-            webpage, 'like count', fatal=False))
-
-        return merge_dicts(info, {
-            'id': video_id,
-            'display_id': display_id,
-            'title': title,
-            'description': description,
-            'thumbnail': thumbnail,
-            'view_count': view_count,
-            'like_count': like_count,
-            'formats': formats,
-            'age_limit': 18,
-        })
diff --git a/plugins/youtube_download/yt_dlp/extractor/pornhub.py b/plugins/youtube_download/yt_dlp/extractor/pornhub.py
index 999d038..e1e9777 100644
--- a/plugins/youtube_download/yt_dlp/extractor/pornhub.py
+++ b/plugins/youtube_download/yt_dlp/extractor/pornhub.py
@@ -6,7 +6,6 @@ import re
 
 from .common import InfoExtractor
 from .openload import PhantomJSwrapper
-from ..compat import compat_str
 from ..networking import Request
 from ..networking.exceptions import HTTPError
 from ..utils import (
@@ -81,14 +80,14 @@ class PornHubBaseIE(InfoExtractor):
         if username is None:
             return
 
-        login_url = 'https://www.%s/%slogin' % (host, 'premium/' if 'premium' in host else '')
+        login_url = 'https://www.{}/{}login'.format(host, 'premium/' if 'premium' in host else '')
         login_page = self._download_webpage(
-            login_url, None, 'Downloading %s login page' % site)
+            login_url, None, f'Downloading {site} login page')
 
         def is_logged(webpage):
             return any(re.search(p, webpage) for p in (
-                r'class=["\']signOut',
-                r'>Sign\s+[Oo]ut\s*<'))
+                r'id="profileMenuDropdown"',
+                r'class="ph-icon-logout"'))
 
         if is_logged(login_page):
             self._logged_in = True
@@ -97,13 +96,13 @@ class PornHubBaseIE(InfoExtractor):
         login_form = self._hidden_inputs(login_page)
 
         login_form.update({
-            'username': username,
+            'email': username,
             'password': password,
         })
 
         response = self._download_json(
-            'https://www.%s/front/authenticate' % host, None,
-            'Logging in to %s' % site,
+            f'https://www.{host}/front/authenticate', None,
+            f'Logging in to {site}',
             data=urlencode_postdata(login_form),
             headers={
                 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
@@ -118,23 +117,23 @@ class PornHubBaseIE(InfoExtractor):
         message = response.get('message')
         if message is not None:
             raise ExtractorError(
-                'Unable to login: %s' % message, expected=True)
+                f'Unable to login: {message}', expected=True)
 
         raise ExtractorError('Unable to log in')
 
 
 class PornHubIE(PornHubBaseIE):
     IE_DESC = 'PornHub and Thumbzilla'
-    _VALID_URL = r'''(?x)
+    _VALID_URL = rf'''(?x)
                     https?://
                         (?:
                             (?:[^/]+\.)?
-                            %s
+                            {PornHubBaseIE._PORNHUB_HOST_RE}
                             /(?:(?:view_video\.php|video/show)\?viewkey=|embed/)|
                             (?:www\.)?thumbzilla\.com/video/
                         )
                         (?P<id>[\da-z]+)
-                    ''' % PornHubBaseIE._PORNHUB_HOST_RE
+                    '''
     _EMBED_REGEX = [r'<iframe[^>]+?src=["\'](?P<url>(?:https?:)?//(?:www\.)?pornhub(?:premium)?\.(?:com|net|org)/embed/[\da-z]+)']
     _TESTS = [{
         'url': 'http://www.pornhub.com/view_video.php?viewkey=648719015',
@@ -196,8 +195,8 @@ class PornHubIE(PornHubBaseIE):
             'categories': list,
             'subtitles': {
                 'en': [{
-                    "ext": 'srt'
-                }]
+                    'ext': 'srt',
+                }],
             },
         },
         'params': {
@@ -266,7 +265,7 @@ class PornHubIE(PornHubBaseIE):
     }]
 
     def _extract_count(self, pattern, webpage, name):
-        return str_to_int(self._search_regex(pattern, webpage, '%s count' % name, default=None))
+        return str_to_int(self._search_regex(pattern, webpage, f'{name} count', default=None))
 
     def _real_extract(self, url):
         mobj = self._match_valid_url(url)
@@ -279,8 +278,8 @@ class PornHubIE(PornHubBaseIE):
         def dl_webpage(platform):
             self._set_cookie(host, 'platform', platform)
             return self._download_webpage(
-                'https://www.%s/view_video.php?viewkey=%s' % (host, video_id),
-                video_id, 'Downloading %s webpage' % platform)
+                f'https://www.{host}/view_video.php?viewkey={video_id}',
+                video_id, f'Downloading {platform} webpage')
 
         webpage = dl_webpage('pc')
 
@@ -291,7 +290,7 @@ class PornHubIE(PornHubBaseIE):
         if error_msg:
             error_msg = re.sub(r'\s+', ' ', error_msg)
             raise ExtractorError(
-                'PornHub said: %s' % error_msg,
+                f'PornHub said: {error_msg}',
                 expected=True, video_id=video_id)
 
         if any(re.search(p, webpage) for p in (
@@ -332,7 +331,7 @@ class PornHubIE(PornHubBaseIE):
                     if not isinstance(definition, dict):
                         continue
                     video_url = definition.get('videoUrl')
-                    if not video_url or not isinstance(video_url, compat_str):
+                    if not video_url or not isinstance(video_url, str):
                         continue
                     if video_url in video_urls_set:
                         continue
@@ -392,7 +391,7 @@ class PornHubIE(PornHubBaseIE):
         if not video_urls:
             FORMAT_PREFIXES = ('media', 'quality', 'qualityItems')
             js_vars = extract_js_vars(
-                webpage, r'(var\s+(?:%s)_.+)' % '|'.join(FORMAT_PREFIXES),
+                webpage, r'(var\s+(?:{})_.+)'.format('|'.join(FORMAT_PREFIXES)),
                 default=None)
             if js_vars:
                 for key, format_url in js_vars.items():
@@ -403,7 +402,7 @@ class PornHubIE(PornHubBaseIE):
             if not video_urls and re.search(
                     r'<[^>]+\bid=["\']lockedPlayer', webpage):
                 raise ExtractorError(
-                    'Video %s is locked' % video_id, expected=True)
+                    f'Video {video_id} is locked', expected=True)
 
         if not video_urls:
             js_vars = extract_js_vars(
@@ -470,8 +469,8 @@ class PornHubIE(PornHubBaseIE):
 
         def extract_vote_count(kind, name):
             return self._extract_count(
-                (r'<span[^>]+\bclass="votes%s"[^>]*>([\d,\.]+)</span>' % kind,
-                 r'<span[^>]+\bclass=["\']votes%s["\'][^>]*\bdata-rating=["\'](\d+)' % kind),
+                (rf'<span[^>]+\bclass="votes{kind}"[^>]*>([\d,\.]+)</span>',
+                 rf'<span[^>]+\bclass=["\']votes{kind}["\'][^>]*\bdata-rating=["\'](\d+)'),
                 webpage, name)
 
         view_count = self._extract_count(
@@ -483,8 +482,8 @@ class PornHubIE(PornHubBaseIE):
 
         def extract_list(meta_key):
             div = self._search_regex(
-                r'(?s)<div[^>]+\bclass=["\'].*?\b%sWrapper[^>]*>(.+?)</div>'
-                % meta_key, webpage, meta_key, default=None)
+                rf'(?s)<div[^>]+\bclass=["\'].*?\b{meta_key}Wrapper[^>]*>(.+?)</div>',
+                webpage, meta_key, default=None)
             if div:
                 return [clean_html(x).strip() for x in re.findall(r'(?s)<a[^>]+\bhref=[^>]+>.+?</a>', div)]
 
@@ -528,7 +527,7 @@ class PornHubPlaylistBaseIE(PornHubBaseIE):
 
         return [
             self.url_result(
-                'http://www.%s/%s' % (host, video_url),
+                f'http://www.{host}/{video_url}',
                 PornHubIE.ie_key(), video_title=title)
             for video_url, title in orderedSet(re.findall(
                 r'href="/?(view_video\.php\?.*\bviewkey=[\da-z]+[^"]*)"[^>]*\s+title="([^"]+)"',
@@ -537,7 +536,7 @@ class PornHubPlaylistBaseIE(PornHubBaseIE):
 
 
 class PornHubUserIE(PornHubPlaylistBaseIE):
-    _VALID_URL = r'(?P<url>https?://(?:[^/]+\.)?%s/(?:(?:user|channel)s|model|pornstar)/(?P<id>[^/?#&]+))(?:[?#&]|/(?!videos)|$)' % PornHubBaseIE._PORNHUB_HOST_RE
+    _VALID_URL = rf'(?P<url>https?://(?:[^/]+\.)?{PornHubBaseIE._PORNHUB_HOST_RE}/(?:(?:user|channel)s|model|pornstar)/(?P<id>[^/?#&]+))(?:[?#&]|/(?!videos)|$)'
     _TESTS = [{
         'url': 'https://www.pornhub.com/model/zoe_ph',
         'playlist_mincount': 118,
@@ -574,7 +573,7 @@ class PornHubUserIE(PornHubPlaylistBaseIE):
     def _real_extract(self, url):
         mobj = self._match_valid_url(url)
         user_id = mobj.group('id')
-        videos_url = '%s/videos' % mobj.group('url')
+        videos_url = '{}/videos'.format(mobj.group('url'))
         self._set_age_cookies(mobj.group('host'))
         page = self._extract_page(url)
         if page:
@@ -599,7 +598,7 @@ class PornHubPagedPlaylistBaseIE(PornHubPlaylistBaseIE):
         VIDEOS = '/videos'
 
         def download_page(base_url, num, fallback=False):
-            note = 'Downloading page %d%s' % (num, ' (switch to fallback)' if fallback else '')
+            note = 'Downloading page {}{}'.format(num, ' (switch to fallback)' if fallback else '')
             return self._download_webpage(
                 base_url, item_id, note, query={'page': num})
 
@@ -629,8 +628,7 @@ class PornHubPagedPlaylistBaseIE(PornHubPlaylistBaseIE):
             page_entries = self._extract_entries(webpage, host)
             if not page_entries:
                 break
-            for e in page_entries:
-                yield e
+            yield from page_entries
             if not self._has_more(webpage):
                 break
 
@@ -646,7 +644,7 @@ class PornHubPagedPlaylistBaseIE(PornHubPlaylistBaseIE):
 
 
 class PornHubPagedVideoListIE(PornHubPagedPlaylistBaseIE):
-    _VALID_URL = r'https?://(?:[^/]+\.)?%s/(?!playlist/)(?P<id>(?:[^/]+/)*[^/?#&]+)' % PornHubBaseIE._PORNHUB_HOST_RE
+    _VALID_URL = rf'https?://(?:[^/]+\.)?{PornHubBaseIE._PORNHUB_HOST_RE}/(?!playlist/)(?P<id>(?:[^/]+/)*[^/?#&]+)'
     _TESTS = [{
         'url': 'https://www.pornhub.com/model/zoe_ph/videos',
         'only_matching': True,
@@ -748,11 +746,11 @@ class PornHubPagedVideoListIE(PornHubPagedPlaylistBaseIE):
     def suitable(cls, url):
         return (False
                 if PornHubIE.suitable(url) or PornHubUserIE.suitable(url) or PornHubUserVideosUploadIE.suitable(url)
-                else super(PornHubPagedVideoListIE, cls).suitable(url))
+                else super().suitable(url))
 
 
 class PornHubUserVideosUploadIE(PornHubPagedPlaylistBaseIE):
-    _VALID_URL = r'(?P<url>https?://(?:[^/]+\.)?%s/(?:(?:user|channel)s|model|pornstar)/(?P<id>[^/]+)/videos/upload)' % PornHubBaseIE._PORNHUB_HOST_RE
+    _VALID_URL = rf'(?P<url>https?://(?:[^/]+\.)?{PornHubBaseIE._PORNHUB_HOST_RE}/(?:(?:user|channel)s|model|pornstar)/(?P<id>[^/]+)/videos/upload)'
     _TESTS = [{
         'url': 'https://www.pornhub.com/pornstar/jenny-blighe/videos/upload',
         'info_dict': {
@@ -769,7 +767,7 @@ class PornHubUserVideosUploadIE(PornHubPagedPlaylistBaseIE):
 
 
 class PornHubPlaylistIE(PornHubPlaylistBaseIE):
-    _VALID_URL = r'(?P<url>https?://(?:[^/]+\.)?%s/playlist/(?P<id>[^/?#&]+))' % PornHubBaseIE._PORNHUB_HOST_RE
+    _VALID_URL = rf'(?P<url>https?://(?:[^/]+\.)?{PornHubBaseIE._PORNHUB_HOST_RE}/playlist/(?P<id>[^/?#&]+))'
     _TESTS = [{
         'url': 'https://www.pornhub.com/playlist/44121572',
         'info_dict': {
@@ -797,8 +795,8 @@ class PornHubPlaylistIE(PornHubPlaylistBaseIE):
         page_entries = self._extract_entries(webpage, host)
 
         def download_page(page_num):
-            note = 'Downloading page {}'.format(page_num)
-            page_url = 'https://www.{}/playlist/viewChunked'.format(host)
+            note = f'Downloading page {page_num}'
+            page_url = f'https://www.{host}/playlist/viewChunked'
             return self._download_webpage(page_url, item_id, note, query={
                 'id': playlist_id,
                 'page': page_num,
@@ -811,8 +809,7 @@ class PornHubPlaylistIE(PornHubPlaylistBaseIE):
                 page_entries = self._extract_entries(webpage, host)
             if not page_entries:
                 break
-            for e in page_entries:
-                yield e
+            yield from page_entries
 
     def _real_extract(self, url):
         mobj = self._match_valid_url(url)
diff --git a/plugins/youtube_download/yt_dlp/extractor/pornotube.py b/plugins/youtube_download/yt_dlp/extractor/pornotube.py
index e0960f4..80c9b27 100644
--- a/plugins/youtube_download/yt_dlp/extractor/pornotube.py
+++ b/plugins/youtube_download/yt_dlp/extractor/pornotube.py
@@ -20,7 +20,7 @@ class PornotubeIE(InfoExtractor):
             'thumbnail': r're:^https?://.*\.jpg$',
             'timestamp': 1417582800,
             'age_limit': 18,
-        }
+        },
     }
 
     def _real_extract(self, url):
@@ -29,25 +29,24 @@ class PornotubeIE(InfoExtractor):
         token = self._download_json(
             'https://api.aebn.net/auth/v2/origins/authenticate',
             video_id, note='Downloading token',
-            data=json.dumps({'credentials': 'Clip Application'}).encode('utf-8'),
+            data=json.dumps({'credentials': 'Clip Application'}).encode(),
             headers={
                 'Content-Type': 'application/json',
                 'Origin': 'http://www.pornotube.com',
             })['tokenKey']
 
         video_url = self._download_json(
-            'https://api.aebn.net/delivery/v1/clips/%s/MP4' % video_id,
+            f'https://api.aebn.net/delivery/v1/clips/{video_id}/MP4',
             video_id, note='Downloading delivery information',
             headers={'Authorization': token})['mediaUrl']
 
         FIELDS = (
             'title', 'description', 'startSecond', 'endSecond', 'publishDate',
-            'studios{name}', 'categories{name}', 'movieId', 'primaryImageNumber'
+            'studios{name}', 'categories{name}', 'movieId', 'primaryImageNumber',
         )
 
         info = self._download_json(
-            'https://api.aebn.net/content/v2/clips/%s?fields=%s'
-            % (video_id, ','.join(FIELDS)), video_id,
+            'https://api.aebn.net/content/v2/clips/{}?fields={}'.format(video_id, ','.join(FIELDS)), video_id,
             note='Downloading metadata',
             headers={'Authorization': token})
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/pornovoisines.py b/plugins/youtube_download/yt_dlp/extractor/pornovoisines.py
index aa48da0..587b3cd 100644
--- a/plugins/youtube_download/yt_dlp/extractor/pornovoisines.py
+++ b/plugins/youtube_download/yt_dlp/extractor/pornovoisines.py
@@ -1,12 +1,13 @@
 from .common import InfoExtractor
 from ..utils import (
-    int_or_none,
     float_or_none,
+    int_or_none,
     unified_strdate,
 )
 
 
 class PornoVoisinesIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?pornovoisines\.com/videos/show/(?P<id>\d+)/(?P<display_id>[^/.]+)'
 
     _TEST = {
@@ -28,9 +29,9 @@ class PornoVoisinesIE(InfoExtractor):
             'subtitles': {
                 'fr': [{
                     'ext': 'vtt',
-                }]
+                }],
             },
-        }
+        },
     }
 
     def _real_extract(self, url):
@@ -39,7 +40,7 @@ class PornoVoisinesIE(InfoExtractor):
         display_id = mobj.group('display_id')
 
         settings_url = self._download_json(
-            'http://www.pornovoisines.com/api/video/%s/getsettingsurl/' % video_id,
+            f'http://www.pornovoisines.com/api/video/{video_id}/getsettingsurl/',
             video_id, note='Getting settings URL')['video_settings_url']
         settings = self._download_json(settings_url, video_id)['data']
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/pornoxo.py b/plugins/youtube_download/yt_dlp/extractor/pornoxo.py
index 5104d8a..fa31546 100644
--- a/plugins/youtube_download/yt_dlp/extractor/pornoxo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/pornoxo.py
@@ -5,6 +5,7 @@ from ..utils import (
 
 
 class PornoXOIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?pornoxo\.com/videos/(?P<id>\d+)/(?P<display_id>[^/]+)\.html'
     _TEST = {
         'url': 'http://www.pornoxo.com/videos/7564/striptease-from-sexy-secretary.html',
@@ -18,7 +19,7 @@ class PornoXOIE(InfoExtractor):
             'categories': list,  # NSFW
             'thumbnail': r're:https?://.*\.jpg$',
             'age_limit': 18,
-        }
+        },
     }
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/pr0gramm.py b/plugins/youtube_download/yt_dlp/extractor/pr0gramm.py
index 2eb327f..d5d6ecd 100644
--- a/plugins/youtube_download/yt_dlp/extractor/pr0gramm.py
+++ b/plugins/youtube_download/yt_dlp/extractor/pr0gramm.py
@@ -1,97 +1,203 @@
-import re
+import datetime as dt
+import functools
+import json
+import urllib.parse
 
 from .common import InfoExtractor
-from ..utils import merge_dicts
+from ..utils import (
+    ExtractorError,
+    float_or_none,
+    int_or_none,
+    make_archive_id,
+    mimetype2ext,
+    str_or_none,
+    urljoin,
+)
+from ..utils.traversal import traverse_obj
 
 
-class Pr0grammStaticIE(InfoExtractor):
-    # Possible urls:
-    # https://pr0gramm.com/static/5466437
-    _VALID_URL = r'https?://pr0gramm\.com/static/(?P<id>[0-9]+)'
-    _TEST = {
-        'url': 'https://pr0gramm.com/static/5466437',
-        'md5': '52fa540d70d3edc286846f8ca85938aa',
-        'info_dict': {
-            'id': '5466437',
-            'ext': 'mp4',
-            'title': 'pr0gramm-5466437 by g11st',
-            'uploader': 'g11st',
-            'upload_date': '20221221',
-        }
-    }
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-
-        # Fetch media sources
-        entries = self._parse_html5_media_entries(url, webpage, video_id)
-        media_info = entries[0]
-
-        # Fetch author
-        uploader = self._html_search_regex(r'by\W+([\w-]+)\W+', webpage, 'uploader')
-
-        # Fetch approx upload timestamp from filename
-        # Have None-defaults in case the extraction fails
-        uploadDay = None
-        uploadMon = None
-        uploadYear = None
-        uploadTimestr = None
-        # (//img.pr0gramm.com/2022/12/21/62ae8aa5e2da0ebf.mp4)
-        m = re.search(r'//img\.pr0gramm\.com/(?P<year>[\d]+)/(?P<mon>[\d]+)/(?P<day>[\d]+)/\w+\.\w{,4}', webpage)
-
-        if (m):
-            # Up to a day of accuracy should suffice...
-            uploadDay = m.groupdict().get('day')
-            uploadMon = m.groupdict().get('mon')
-            uploadYear = m.groupdict().get('year')
-            uploadTimestr = uploadYear + uploadMon + uploadDay
-
-        return merge_dicts({
-            'id': video_id,
-            'title': 'pr0gramm-%s%s' % (video_id, (' by ' + uploader) if uploader else ''),
-            'uploader': uploader,
-            'upload_date': uploadTimestr
-        }, media_info)
-
-
-# This extractor is for the primary url (used for sharing, and appears in the
-# location bar) Since this page loads the DOM via JS, yt-dl can't find any
-# video information here. So let's redirect to a compatibility version of
-# the site, which does contain the <video>-element  by itself,  without requiring
-# js to be ran.
 class Pr0grammIE(InfoExtractor):
-    # Possible urls:
-    # https://pr0gramm.com/new/546637
-    # https://pr0gramm.com/new/video/546637
-    # https://pr0gramm.com/top/546637
-    # https://pr0gramm.com/top/video/546637
-    # https://pr0gramm.com/user/g11st/uploads/5466437
-    # https://pr0gramm.com/user/froschler/dafur-ist-man-hier/5091290
-    # https://pr0gramm.com/user/froschler/reinziehen-1elf/5232030
-    # https://pr0gramm.com/user/froschler/1elf/5232030
-    # https://pr0gramm.com/new/5495710:comment62621020 <- this is not the id!
-    # https://pr0gramm.com/top/fruher war alles damals/5498175
-
-    _VALID_URL = r'https?:\/\/pr0gramm\.com\/(?!static/\d+).+?\/(?P<id>[\d]+)(:|$)'
-    _TEST = {
+    _VALID_URL = r'https?://pr0gramm\.com\/(?:[^/?#]+/)+(?P<id>[\d]+)(?:[/?#:]|$)'
+    _TESTS = [{
         'url': 'https://pr0gramm.com/new/video/5466437',
         'info_dict': {
             'id': '5466437',
             'ext': 'mp4',
             'title': 'pr0gramm-5466437 by g11st',
+            'tags': ['Neon Genesis Evangelion', 'Touhou Project', 'Fly me to the Moon', 'Marisad', 'Marisa Kirisame', 'video', 'sound', 'Marisa', 'Anime'],
             'uploader': 'g11st',
+            'uploader_id': '394718',
+            'timestamp': 1671590240,
             'upload_date': '20221221',
-        }
-    }
+            'like_count': int,
+            'dislike_count': int,
+            'age_limit': 0,
+            'thumbnail': r're:^https://thumb\.pr0gramm\.com/.*\.jpg',
+            '_old_archive_ids': ['pr0grammstatic 5466437'],
+        },
+    }, {
+        'url': 'https://pr0gramm.com/new/3052805:comment28391322',
+        'info_dict': {
+            'id': '3052805',
+            'ext': 'mp4',
+            'title': 'pr0gramm-3052805 by Hansking1',
+            'tags': 'count:15',
+            'uploader': 'Hansking1',
+            'uploader_id': '385563',
+            'timestamp': 1552930408,
+            'upload_date': '20190318',
+            'like_count': int,
+            'dislike_count': int,
+            'age_limit': 0,
+            'thumbnail': r're:^https://thumb\.pr0gramm\.com/.*\.jpg',
+            '_old_archive_ids': ['pr0grammstatic 3052805'],
+        },
+    }, {
+        # Requires verified account
+        'url': 'https://pr0gramm.com/new/Gianna%20Michaels/5848332',
+        'info_dict': {
+            'id': '5848332',
+            'ext': 'mp4',
+            'title': 'pr0gramm-5848332 by erd0pfel',
+            'tags': 'count:18',
+            'uploader': 'erd0pfel',
+            'uploader_id': '349094',
+            'timestamp': 1694489652,
+            'upload_date': '20230912',
+            'like_count': int,
+            'dislike_count': int,
+            'age_limit': 18,
+            'thumbnail': r're:^https://thumb\.pr0gramm\.com/.*\.jpg',
+            '_old_archive_ids': ['pr0grammstatic 5848332'],
+        },
+    }, {
+        'url': 'https://pr0gramm.com/top/5895149',
+        'info_dict': {
+            'id': '5895149',
+            'ext': 'mp4',
+            'title': 'pr0gramm-5895149 by algoholigSeeManThrower',
+            'tags': 'count:19',
+            'uploader': 'algoholigSeeManThrower',
+            'uploader_id': '457556',
+            'timestamp': 1697580902,
+            'upload_date': '20231018',
+            'like_count': int,
+            'dislike_count': int,
+            'age_limit': 0,
+            'thumbnail': 'https://thumb.pr0gramm.com/2023/10/18/db47bb3db5e1a1b3.jpg',
+            '_old_archive_ids': ['pr0grammstatic 5895149'],
+        },
+    }, {
+        'url': 'https://pr0gramm.com/static/5466437',
+        'only_matching': True,
+    }, {
+        'url': 'https://pr0gramm.com/new/rowan%20atkinson%20herr%20bohne/3052805',
+        'only_matching': True,
+    }, {
+        'url': 'https://pr0gramm.com/user/froschler/dafur-ist-man-hier/5091290',
+        'only_matching': True,
+    }]
 
-    def _generic_title():
-        return "oof"
+    BASE_URL = 'https://pr0gramm.com'
+
+    @functools.cached_property
+    def _is_logged_in(self):
+        return 'pp' in self._get_cookies(self.BASE_URL)
+
+    @functools.cached_property
+    def _maximum_flags(self):
+        # We need to guess the flags for the content otherwise the api will raise an error
+        # We can guess the maximum allowed flags for the account from the cookies
+        # Bitflags are (msbf): pol, nsfp, nsfl, nsfw, sfw
+        flags = 0b10001
+        if self._is_logged_in:
+            flags |= 0b01000
+            cookies = self._get_cookies(self.BASE_URL)
+            if 'me' not in cookies:
+                self._download_webpage(self.BASE_URL, None, 'Refreshing verification information')
+            if traverse_obj(cookies, ('me', {lambda x: x.value}, {urllib.parse.unquote}, {json.loads}, 'verified')):
+                flags |= 0b00110
+
+        return flags
+
+    def _call_api(self, endpoint, video_id, query={}, note='Downloading API json'):
+        data = self._download_json(
+            f'https://pr0gramm.com/api/items/{endpoint}',
+            video_id, note, query=query, expected_status=403)
+
+        error = traverse_obj(data, ('error', {str}))
+        if error in ('nsfwRequired', 'nsflRequired', 'nsfpRequired', 'verificationRequired'):
+            if not self._is_logged_in:
+                self.raise_login_required()
+            raise ExtractorError(f'Unverified account cannot access NSFW/NSFL ({error})', expected=True)
+        elif error:
+            message = traverse_obj(data, ('msg', {str})) or error
+            raise ExtractorError(f'API returned error: {message}', expected=True)
+
+        return data
+
+    @staticmethod
+    def _create_source_url(path):
+        return urljoin('https://img.pr0gramm.com', path)
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
+        video_info = traverse_obj(
+            self._call_api('get', video_id, {'id': video_id, 'flags': self._maximum_flags}),
+            ('items', 0, {dict}))
 
-        return self.url_result(
-            'https://pr0gramm.com/static/' + video_id,
-            video_id=video_id,
-            ie=Pr0grammStaticIE.ie_key())
+        source = video_info.get('image')
+        if not source or not source.endswith('mp4'):
+            self.raise_no_formats('Could not extract a video', expected=bool(source), video_id=video_id)
+
+        metadata = self._call_api('info', video_id, {'itemId': video_id}, note='Downloading tags')
+        tags = traverse_obj(metadata, ('tags', ..., 'tag', {str}))
+        # Sorted by "confidence", higher confidence = earlier in list
+        confidences = traverse_obj(metadata, ('tags', ..., 'confidence', ({int}, {float})))
+        if confidences:
+            tags = [tag for _, tag in sorted(zip(confidences, tags), reverse=True)]
+
+        formats = traverse_obj(video_info, ('variants', ..., {
+            'format_id': ('name', {str}),
+            'url': ('path', {self._create_source_url}),
+            'ext': ('mimeType', {mimetype2ext}),
+            'vcodec': ('codec', {str}),
+            'width': ('width', {int_or_none}),
+            'height': ('height', {int_or_none}),
+            'bitrate': ('bitRate', {float_or_none}),
+            'filesize': ('fileSize', {int_or_none}),
+        })) if video_info.get('variants') else [{
+            'ext': 'mp4',
+            'format_id': 'source',
+            **traverse_obj(video_info, {
+                'url': ('image', {self._create_source_url}),
+                'width': ('width', {int_or_none}),
+                'height': ('height', {int_or_none}),
+            }),
+        }]
+
+        subtitles = {}
+        for subtitle in traverse_obj(video_info, ('subtitles', lambda _, v: v['language'])):
+            subtitles.setdefault(subtitle['language'], []).append(traverse_obj(subtitle, {
+                'url': ('path', {self._create_source_url}),
+                'note': ('label', {str}),
+            }))
+
+        return {
+            'id': video_id,
+            'title': f'pr0gramm-{video_id} by {video_info.get("user")}',
+            'tags': tags,
+            'formats': formats,
+            'subtitles': subtitles,
+            'age_limit': 18 if traverse_obj(video_info, ('flags', {0b110.__and__})) else 0,
+            '_old_archive_ids': [make_archive_id('Pr0grammStatic', video_id)],
+            **traverse_obj(video_info, {
+                'uploader': ('user', {str}),
+                'uploader_id': ('userId', {str_or_none}),
+                'like_count': ('up', {int}),
+                'dislike_count': ('down', {int}),
+                'timestamp': ('created', {int}),
+                'upload_date': ('created', {int}, {dt.date.fromtimestamp}, {lambda x: x.strftime('%Y%m%d')}),
+                'thumbnail': ('thumb', {urljoin('https://thumb.pr0gramm.com')}),
+            }),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/prankcast.py b/plugins/youtube_download/yt_dlp/extractor/prankcast.py
index b2ec5bb..84e6f7e 100644
--- a/plugins/youtube_download/yt_dlp/extractor/prankcast.py
+++ b/plugins/youtube_download/yt_dlp/extractor/prankcast.py
@@ -1,5 +1,8 @@
+import json
+
 from .common import InfoExtractor
-from ..utils import parse_iso8601, traverse_obj, try_call
+from ..utils import float_or_none, parse_iso8601, str_or_none, try_call
+from ..utils.traversal import traverse_obj
 
 
 class PrankCastIE(InfoExtractor):
@@ -13,14 +16,14 @@ class PrankCastIE(InfoExtractor):
             'display_id': 'Beverly-is-back-like-a-heart-attack-',
             'timestamp': 1661391575,
             'uploader': 'Devonanustart',
-            'channel_id': 4,
+            'channel_id': '4',
             'duration': 7918,
             'cast': ['Devonanustart', 'Phonelosers'],
             'description': '',
             'categories': ['prank'],
             'tags': ['prank call', 'prank', 'live show'],
-            'upload_date': '20220825'
-        }
+            'upload_date': '20220825',
+        },
     }, {
         'url': 'https://prankcast.com/phonelosers/showreel/2048-NOT-COOL',
         'info_dict': {
@@ -30,14 +33,14 @@ class PrankCastIE(InfoExtractor):
             'display_id': 'NOT-COOL',
             'timestamp': 1665028364,
             'uploader': 'phonelosers',
-            'channel_id': 6,
+            'channel_id': '6',
             'duration': 4044,
             'cast': ['phonelosers'],
             'description': '',
             'categories': ['prank'],
             'tags': ['prank call', 'prank', 'live show'],
-            'upload_date': '20221006'
-        }
+            'upload_date': '20221006',
+        },
     }]
 
     def _real_extract(self, url):
@@ -57,10 +60,78 @@ class PrankCastIE(InfoExtractor):
             'url': f'{json_info["broadcast_url"]}{json_info["recording_hash"]}.mp3',
             'timestamp': start_date,
             'uploader': uploader,
-            'channel_id': json_info.get('user_id'),
+            'channel_id': str_or_none(json_info.get('user_id')),
             'duration': try_call(lambda: parse_iso8601(json_info['end_date']) - start_date),
-            'cast': list(filter(None, [uploader] + traverse_obj(guests_json, (..., 'name')))),
+            'cast': list(filter(None, [uploader, *traverse_obj(guests_json, (..., 'name'))])),
             'description': json_info.get('broadcast_description'),
             'categories': [json_info.get('broadcast_category')],
-            'tags': try_call(lambda: json_info['broadcast_tags'].split(','))
+            'tags': try_call(lambda: json_info['broadcast_tags'].split(',')),
+        }
+
+
+class PrankCastPostIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?prankcast\.com/[^/?#]+/posts/(?P<id>\d+)-(?P<display_id>[^/?#]+)'
+    _TESTS = [{
+        'url': 'https://prankcast.com/devonanustart/posts/6214-happy-national-rachel-day-',
+        'info_dict': {
+            'id': '6214',
+            'ext': 'mp3',
+            'title': 'Happy National Rachel Day!',
+            'display_id': 'happy-national-rachel-day-',
+            'timestamp': 1704333938,
+            'uploader': 'Devonanustart',
+            'channel_id': '4',
+            'duration': 13175,
+            'cast': ['Devonanustart'],
+            'description': '',
+            'categories': ['prank call'],
+            'upload_date': '20240104',
+        },
+    }, {
+        'url': 'https://prankcast.com/despicabledogs/posts/6217-jake-the-work-crow-',
+        'info_dict': {
+            'id': '6217',
+            'ext': 'mp3',
+            'title': 'Jake the Work Crow!',
+            'display_id': 'jake-the-work-crow-',
+            'timestamp': 1704346592,
+            'uploader': 'despicabledogs',
+            'channel_id': '957',
+            'duration': 263.287,
+            'cast': ['despicabledogs'],
+            'description': 'https://imgur.com/a/vtxLvKU',
+            'categories': [],
+            'upload_date': '20240104',
+        },
+    }]
+
+    def _real_extract(self, url):
+        video_id, display_id = self._match_valid_url(url).group('id', 'display_id')
+
+        webpage = self._download_webpage(url, video_id)
+        post = self._search_nextjs_data(webpage, video_id)['props']['pageProps']['ssr_data_posts']
+        content = self._parse_json(post['post_contents_json'], video_id)[0]
+
+        uploader = post.get('user_name')
+        guests_json = traverse_obj(content, ('guests_json', {json.loads}, {dict})) or {}
+
+        return {
+            'id': video_id,
+            'title': post.get('post_title') or self._og_search_title(webpage),
+            'display_id': display_id,
+            'url': content.get('url'),
+            'timestamp': parse_iso8601(content.get('start_date') or content.get('crdate'), ' '),
+            'uploader': uploader,
+            'channel_id': str_or_none(post.get('user_id')),
+            'duration': float_or_none(content.get('duration')),
+            'cast': list(filter(None, [uploader, *traverse_obj(guests_json, (..., 'name'))])),
+            'description': post.get('post_body'),
+            'categories': list(filter(None, [content.get('category')])),
+            'tags': try_call(lambda: list(filter('', post['post_tags'].split(',')))),
+            'subtitles': {
+                'live_chat': [{
+                    'url': f'https://prankcast.com/api/private/chat/select-broadcast?id={post["content_id"]}&cache=',
+                    'ext': 'json',
+                }],
+            } if post.get('content_id') else None,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/premiershiprugby.py b/plugins/youtube_download/yt_dlp/extractor/premiershiprugby.py
index 67d41fd..313b4d2 100644
--- a/plugins/youtube_download/yt_dlp/extractor/premiershiprugby.py
+++ b/plugins/youtube_download/yt_dlp/extractor/premiershiprugby.py
@@ -14,7 +14,7 @@ class PremiershipRugbyIE(InfoExtractor):
             'duration': 6093.0,
             'tags': ['video'],
             'categories': ['Full Match', 'Harlequins', 'Newcastle Falcons', 'gallaher premiership'],
-        }
+        },
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/presstv.py b/plugins/youtube_download/yt_dlp/extractor/presstv.py
index 26ce74a..30eb64b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/presstv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/presstv.py
@@ -15,8 +15,8 @@ class PressTVIE(InfoExtractor):
             'title': 'Organic mattresses used to clean waste water',
             'upload_date': '20160409',
             'thumbnail': r're:^https?://.*\.jpg',
-            'description': 'md5:20002e654bbafb6908395a5c0cfcd125'
-        }
+            'description': 'md5:20002e654bbafb6908395a5c0cfcd125',
+        },
     }
 
     def _real_extract(self, url):
@@ -36,12 +36,12 @@ class PressTVIE(InfoExtractor):
             (180, '_low200.mp4'),
             (360, '_low400.mp4'),
             (720, '_low800.mp4'),
-            (1080, '.mp4')
+            (1080, '.mp4'),
         ]
 
         formats = [{
             'url': base_url + video_url[:-4] + extension,
-            'format_id': '%dp' % height,
+            'format_id': f'{height}p',
             'height': height,
         } for height, extension in _formats]
 
@@ -65,5 +65,5 @@ class PressTVIE(InfoExtractor):
             'formats': formats,
             'thumbnail': thumbnail,
             'upload_date': upload_date,
-            'description': description
+            'description': description,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/projectveritas.py b/plugins/youtube_download/yt_dlp/extractor/projectveritas.py
index 0e029ce..6f42485 100644
--- a/plugins/youtube_download/yt_dlp/extractor/projectveritas.py
+++ b/plugins/youtube_download/yt_dlp/extractor/projectveritas.py
@@ -7,6 +7,7 @@ from ..utils import (
 
 
 class ProjectVeritasIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?projectveritas\.com/(?P<type>news|video)/(?P<id>[^/?#]+)'
     _TESTS = [{
         'url': 'https://www.projectveritas.com/news/exclusive-inside-the-new-york-and-new-jersey-hospitals-battling-coronavirus/',
@@ -16,7 +17,7 @@ class ProjectVeritasIE(InfoExtractor):
             'title': 'Exclusive: Inside The New York and New Jersey Hospitals Battling Coronavirus',
             'upload_date': '20200327',
             'thumbnail': 'md5:6076477fe50b03eb8708be9415e18e1c',
-        }
+        },
     }, {
         'url': 'https://www.projectveritas.com/video/ilhan-omar-connected-ballot-harvester-in-cash-for-ballots-scheme-car-is-full/',
         'info_dict': {
@@ -25,13 +26,13 @@ class ProjectVeritasIE(InfoExtractor):
             'title': 'Ilhan Omar connected Ballot Harvester in cash-for-ballots scheme: "Car is full" of absentee ballots',
             'upload_date': '20200927',
             'thumbnail': 'md5:194b8edf0e2ba64f25500ff4378369a4',
-        }
+        },
     }]
 
     def _real_extract(self, url):
-        id, type = self._match_valid_url(url).group('id', 'type')
-        api_url = f'https://www.projectveritas.com/page-data/{type}/{id}/page-data.json'
-        data_json = self._download_json(api_url, id)['result']['data']
+        video_id, video_type = self._match_valid_url(url).group('id', 'type')
+        api_url = f'https://www.projectveritas.com/page-data/{video_type}/{video_id}/page-data.json'
+        data_json = self._download_json(api_url, video_id)['result']['data']
         main_data = traverse_obj(data_json, 'video', 'post')
         video_id = main_data['id']
         thumbnail = traverse_obj(main_data, ('image', 'ogImage', 'src'))
diff --git a/plugins/youtube_download/yt_dlp/extractor/prosiebensat1.py b/plugins/youtube_download/yt_dlp/extractor/prosiebensat1.py
index 46e2e8a..e8a4712 100644
--- a/plugins/youtube_download/yt_dlp/extractor/prosiebensat1.py
+++ b/plugins/youtube_download/yt_dlp/extractor/prosiebensat1.py
@@ -1,13 +1,13 @@
+import hashlib
 import re
 
-from hashlib import sha1
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     ExtractorError,
     determine_ext,
     float_or_none,
     int_or_none,
+    join_nonempty,
     merge_dicts,
     unified_strdate,
 )
@@ -42,7 +42,7 @@ class ProSiebenSat1BaseIE(InfoExtractor):
                 'Downloading protocols JSON',
                 headers=self.geo_verification_headers(), query={
                     'access_id': self._ACCESS_ID,
-                    'client_token': sha1((raw_ct).encode()).hexdigest(),
+                    'client_token': hashlib.sha1((raw_ct).encode()).hexdigest(),
                     'video_id': clip_id,
                 }, fatal=False, expected_status=(403,)) or {}
             error = protocols.get('error') or {}
@@ -53,7 +53,7 @@ class ProSiebenSat1BaseIE(InfoExtractor):
                 urls = (self._download_json(
                     self._V4_BASE_URL + 'urls', clip_id, 'Downloading urls JSON', query={
                         'access_id': self._ACCESS_ID,
-                        'client_token': sha1((raw_ct + server_token + self._SUPPORTED_PROTOCOLS).encode()).hexdigest(),
+                        'client_token': hashlib.sha1((raw_ct + server_token + self._SUPPORTED_PROTOCOLS).encode()).hexdigest(),
                         'protocols': self._SUPPORTED_PROTOCOLS,
                         'server_token': server_token,
                         'video_id': clip_id,
@@ -75,12 +75,12 @@ class ProSiebenSat1BaseIE(InfoExtractor):
                             'format_id': protocol,
                         })
         if not formats:
-            source_ids = [compat_str(source['id']) for source in video['sources']]
+            source_ids = [str(source['id']) for source in video['sources']]
 
-            client_id = self._SALT[:2] + sha1(''.join([clip_id, self._SALT, self._TOKEN, client_location, self._SALT, self._CLIENT_NAME]).encode('utf-8')).hexdigest()
+            client_id = self._SALT[:2] + hashlib.sha1(''.join([clip_id, self._SALT, self._TOKEN, client_location, self._SALT, self._CLIENT_NAME]).encode()).hexdigest()
 
             sources = self._download_json(
-                'http://vas.sim-technik.de/vas/live/v2/videos/%s/sources' % clip_id,
+                f'http://vas.sim-technik.de/vas/live/v2/videos/{clip_id}/sources',
                 clip_id, 'Downloading sources JSON', query={
                     'access_token': self._TOKEN,
                     'client_id': client_id,
@@ -96,9 +96,9 @@ class ProSiebenSat1BaseIE(InfoExtractor):
                 return (bitrate // 1000) if bitrate % 1000 == 0 else bitrate
 
             for source_id in source_ids:
-                client_id = self._SALT[:2] + sha1(''.join([self._SALT, clip_id, self._TOKEN, server_id, client_location, source_id, self._SALT, self._CLIENT_NAME]).encode('utf-8')).hexdigest()
+                client_id = self._SALT[:2] + hashlib.sha1(''.join([self._SALT, clip_id, self._TOKEN, server_id, client_location, source_id, self._SALT, self._CLIENT_NAME]).encode()).hexdigest()
                 urls = self._download_json(
-                    'http://vas.sim-technik.de/vas/live/v2/videos/%s/sources/url' % clip_id,
+                    f'http://vas.sim-technik.de/vas/live/v2/videos/{clip_id}/sources/url',
                     clip_id, 'Downloading urls JSON', fatal=False, query={
                         'access_token': self._TOKEN,
                         'client_id': client_id,
@@ -141,20 +141,20 @@ class ProSiebenSat1BaseIE(InfoExtractor):
                             app = path[:mp4colon_index]
                             play_path = path[mp4colon_index:]
                             formats.append({
-                                'url': '%s/%s' % (mobj.group('url'), app),
+                                'url': '{}/{}'.format(mobj.group('url'), app),
                                 'app': app,
                                 'play_path': play_path,
                                 'player_url': 'http://livepassdl.conviva.com/hf/ver/2.79.0.17083/LivePassModuleMain.swf',
                                 'page_url': 'http://www.prosieben.de',
                                 'tbr': tbr,
                                 'ext': 'flv',
-                                'format_id': 'rtmp%s' % ('-%d' % tbr if tbr else ''),
+                                'format_id': join_nonempty('rtmp', tbr),
                             })
                         else:
                             formats.append({
                                 'url': source_url,
                                 'tbr': tbr,
-                                'format_id': 'http%s' % ('-%d' % tbr if tbr else ''),
+                                'format_id': join_nonempty('http', tbr),
                             })
 
         return {
@@ -493,4 +493,4 @@ class ProSiebenSat1IE(ProSiebenSat1BaseIE):
             return self._extract_playlist(url, webpage)
         else:
             raise ExtractorError(
-                'Unsupported page type %s' % page_type, expected=True)
+                f'Unsupported page type {page_type}', expected=True)
diff --git a/plugins/youtube_download/yt_dlp/extractor/prx.py b/plugins/youtube_download/yt_dlp/extractor/prx.py
index 5bb1832..742479c 100644
--- a/plugins/youtube_download/yt_dlp/extractor/prx.py
+++ b/plugins/youtube_download/yt_dlp/extractor/prx.py
@@ -1,14 +1,15 @@
 import itertools
+
 from .common import InfoExtractor, SearchInfoExtractor
 from ..utils import (
-    urljoin,
-    traverse_obj,
+    clean_html,
     int_or_none,
     mimetype2ext,
-    clean_html,
-    url_or_none,
-    unified_timestamp,
     str_or_none,
+    traverse_obj,
+    unified_timestamp,
+    url_or_none,
+    urljoin,
 )
 
 
@@ -37,7 +38,7 @@ class PRXBaseIE(InfoExtractor):
             'filesize': image_response.get('size'),
             'width': image_response.get('width'),
             'height': image_response.get('height'),
-            'url': cls._extract_file_link(image_response)
+            'url': cls._extract_file_link(image_response),
         }
 
     @classmethod
@@ -62,7 +63,7 @@ class PRXBaseIE(InfoExtractor):
             'duration': int_or_none(response.get('duration')),
             'tags': response.get('tags'),
             'episode_number': int_or_none(response.get('episodeIdentifier')),
-            'season_number': int_or_none(response.get('seasonIdentifier'))
+            'season_number': int_or_none(response.get('seasonIdentifier')),
         }
 
     @classmethod
@@ -91,7 +92,7 @@ class PRXBaseIE(InfoExtractor):
             **base_info,
             'title': name,
             'channel_id': base_info.get('id'),
-            'channel_url': 'https://beta.prx.org/accounts/%s' % base_info.get('id'),
+            'channel_url': 'https://beta.prx.org/accounts/{}'.format(base_info.get('id')),
             'channel': name,
         }
 
@@ -110,7 +111,7 @@ class PRXBaseIE(InfoExtractor):
             'series_id': series.get('series_id'),
             'channel_id': account.get('channel_id'),
             'channel_url': account.get('channel_url'),
-            'channel': account.get('channel')
+            'channel': account.get('channel'),
         }
 
     def _entries(self, item_id, endpoint, entry_func, query=None):
@@ -123,7 +124,7 @@ class PRXBaseIE(InfoExtractor):
             response = self._call_api(f'{item_id}: page {page}', endpoint, query={
                 **(query or {}),
                 'page': page,
-                'per': 100
+                'per': 100,
             })
             items = self._get_prx_embed_response(response, 'items')
             if not response or not items:
@@ -141,8 +142,8 @@ class PRXBaseIE(InfoExtractor):
             return
         story.update({
             '_type': 'url',
-            'url': 'https://beta.prx.org/stories/%s' % story['id'],
-            'ie_key': PRXStoryIE.ie_key()
+            'url': 'https://beta.prx.org/stories/{}'.format(story['id']),
+            'ie_key': PRXStoryIE.ie_key(),
         })
         return story
 
@@ -152,8 +153,8 @@ class PRXBaseIE(InfoExtractor):
             return
         series.update({
             '_type': 'url',
-            'url': 'https://beta.prx.org/series/%s' % series['id'],
-            'ie_key': PRXSeriesIE.ie_key()
+            'url': 'https://beta.prx.org/series/{}'.format(series['id']),
+            'ie_key': PRXSeriesIE.ie_key(),
         })
         return series
 
@@ -204,8 +205,8 @@ class PRXStoryIE(PRXBaseIE):
                     'episode': 'Episode 8',
                     'release_date': '20211223',
                     'season': 'Season 5',
-                    'modified_date': '20220104'
-                }
+                    'modified_date': '20220104',
+                },
             }, {
                 'info_dict': {
                     'id': '399200_part2',
@@ -228,11 +229,11 @@ class PRXStoryIE(PRXBaseIE):
                     'episode': 'Episode 8',
                     'release_date': '20211223',
                     'season': 'Season 5',
-                    'modified_date': '20220104'
-                }
-            }
+                    'modified_date': '20220104',
+                },
+            },
 
-            ]
+            ],
         }, {
             # Story with only split audio
             'url': 'https://beta.prx.org/stories/326414',
@@ -250,7 +251,7 @@ class PRXStoryIE(PRXBaseIE):
                 'channel_url': 'https://beta.prx.org/accounts/206',
                 'channel': 'New Hampshire Public Radio',
             },
-            'playlist_count': 4
+            'playlist_count': 4,
         }, {
             # Story with single combined audio
             'url': 'https://beta.prx.org/stories/400404',
@@ -271,12 +272,12 @@ class PRXStoryIE(PRXBaseIE):
                 'tags': 'count:0',
                 'thumbnail': r're:https?://cms\.prx\.org/pub/\w+/0/web/story_image/767965/medium/Aurora_Over_Trees\.jpg',
                 'upload_date': '20220103',
-                'modified_date': '20220103'
-            }
+                'modified_date': '20220103',
+            },
         }, {
             'url': 'https://listen.prx.org/stories/399200',
-            'only_matching': True
-        }
+            'only_matching': True,
+        },
     ]
 
     def _extract_audio_pieces(self, audio_response):
@@ -289,7 +290,7 @@ class PRXStoryIE(PRXBaseIE):
             'asr': int_or_none(piece_response.get('frequency'), scale=1000),
             'abr': int_or_none(piece_response.get('bitRate')),
             'url': self._extract_file_link(piece_response),
-            'vcodec': 'none'
+            'vcodec': 'none',
         } for piece_response in sorted(
             self._get_prx_embed_response(audio_response, 'items') or [],
             key=lambda p: int_or_none(p.get('position')))]
@@ -303,18 +304,18 @@ class PRXStoryIE(PRXBaseIE):
         if len(audio_pieces) == 1:
             return {
                 'formats': audio_pieces,
-                **info
+                **info,
             }
 
         entries = [{
             **info,
-            'id': '%s_part%d' % (info['id'], (idx + 1)),
+            'id': '{}_part{}'.format(info['id'], (idx + 1)),
             'formats': [fmt],
         } for idx, fmt in enumerate(audio_pieces)]
         return {
             '_type': 'multi_video',
             'entries': entries,
-            **info
+            **info,
         }
 
     def _real_extract(self, url):
@@ -339,9 +340,9 @@ class PRXSeriesIE(PRXBaseIE):
                 'channel_url': 'https://beta.prx.org/accounts/206',
                 'channel': 'New Hampshire Public Radio',
                 'series': 'Outside/In',
-                'series_id': '36252'
+                'series_id': '36252',
             },
-            'playlist_mincount': 39
+            'playlist_mincount': 39,
         }, {
             # Blank series
             'url': 'https://beta.prx.org/series/25038',
@@ -354,18 +355,18 @@ class PRXSeriesIE(PRXBaseIE):
                 'channel_url': 'https://beta.prx.org/accounts/206',
                 'channel': 'New Hampshire Public Radio',
                 'series': '25038',
-                'series_id': '25038'
+                'series_id': '25038',
             },
-            'playlist_count': 0
-        }
+            'playlist_count': 0,
+        },
     ]
 
     def _extract_series(self, series_response):
         info = self._extract_series_info(series_response)
         return {
             '_type': 'playlist',
-            'entries': self._entries(info['id'], 'series/%s/stories' % info['id'], self._story_playlist_entry),
-            **info
+            'entries': self._entries(info['id'], 'series/{}/stories'.format(info['id']), self._story_playlist_entry),
+            **info,
         }
 
     def _real_extract(self, url):
@@ -385,9 +386,9 @@ class PRXAccountIE(PRXBaseIE):
             'channel_id': '206',
             'channel_url': 'https://beta.prx.org/accounts/206',
             'channel': 'New Hampshire Public Radio',
-            'thumbnails': 'count:1'
+            'thumbnails': 'count:1',
         },
-        'playlist_mincount': 380
+        'playlist_mincount': 380,
     }]
 
     def _extract_account(self, account_response):
@@ -399,7 +400,7 @@ class PRXAccountIE(PRXBaseIE):
         return {
             '_type': 'playlist',
             'entries': itertools.chain(series, stories),
-            **info
+            **info,
         }
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/puhutv.py b/plugins/youtube_download/yt_dlp/extractor/puhutv.py
index 4b8e5e9..b62050e 100644
--- a/plugins/youtube_download/yt_dlp/extractor/puhutv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/puhutv.py
@@ -1,10 +1,9 @@
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..networking.exceptions import HTTPError
 from ..utils import (
     ExtractorError,
-    int_or_none,
     float_or_none,
+    int_or_none,
     parse_resolution,
     str_or_none,
     try_get,
@@ -48,25 +47,25 @@ class PuhuTVIE(InfoExtractor):
     _SUBTITLE_LANGS = {
         'English': 'en',
         'Deutsch': 'de',
-        'عربى': 'ar'
+        'عربى': 'ar',
     }
 
     def _real_extract(self, url):
         display_id = self._match_id(url)
 
         info = self._download_json(
-            urljoin(url, '/api/slug/%s-izle' % display_id),
+            urljoin(url, f'/api/slug/{display_id}-izle'),
             display_id)['data']
 
-        video_id = compat_str(info['id'])
+        video_id = str(info['id'])
         show = info.get('title') or {}
         title = info.get('name') or show['name']
         if info.get('display_name'):
-            title = '%s %s' % (title, info['display_name'])
+            title = '{} {}'.format(title, info['display_name'])
 
         try:
             videos = self._download_json(
-                'https://puhutv.com/api/assets/%s/videos' % video_id,
+                f'https://puhutv.com/api/assets/{video_id}/videos',
                 display_id, 'Downloading video JSON',
                 headers=self.geo_verification_headers())
         except ExtractorError as e:
@@ -94,7 +93,7 @@ class PuhuTVIE(InfoExtractor):
             f = {
                 'url': media_url,
                 'ext': 'mp4',
-                'height': quality
+                'height': quality,
             }
             video_format = video.get('video_format')
             is_hls = (video_format == 'hls' or '/hls/' in media_url or '/chunklist.m3u8' in media_url) and playlist is False
@@ -106,12 +105,12 @@ class PuhuTVIE(InfoExtractor):
             else:
                 continue
             if quality:
-                format_id += '-%sp' % quality
+                format_id += f'-{quality}p'
             f['format_id'] = format_id
             formats.append(f)
 
         creator = try_get(
-            show, lambda x: x['producer']['name'], compat_str)
+            show, lambda x: x['producer']['name'], str)
 
         content = info.get('content') or {}
 
@@ -119,14 +118,14 @@ class PuhuTVIE(InfoExtractor):
             content, lambda x: x['images']['wide'], dict) or {}
         thumbnails = []
         for image_id, image_url in images.items():
-            if not isinstance(image_url, compat_str):
+            if not isinstance(image_url, str):
                 continue
             if not image_url.startswith(('http', '//')):
-                image_url = 'https://%s' % image_url
+                image_url = f'https://{image_url}'
             t = parse_resolution(image_id)
             t.update({
                 'id': image_id,
-                'url': image_url
+                'url': image_url,
             })
             thumbnails.append(t)
 
@@ -135,7 +134,7 @@ class PuhuTVIE(InfoExtractor):
             if not isinstance(genre, dict):
                 continue
             genre_name = genre.get('name')
-            if genre_name and isinstance(genre_name, compat_str):
+            if genre_name and isinstance(genre_name, str):
                 tags.append(genre_name)
 
         subtitles = {}
@@ -144,10 +143,10 @@ class PuhuTVIE(InfoExtractor):
                 continue
             lang = subtitle.get('language')
             sub_url = url_or_none(subtitle.get('url') or subtitle.get('file'))
-            if not lang or not isinstance(lang, compat_str) or not sub_url:
+            if not lang or not isinstance(lang, str) or not sub_url:
                 continue
             subtitles[self._SUBTITLE_LANGS.get(lang, lang)] = [{
-                'url': sub_url
+                'url': sub_url,
             }]
 
         return {
@@ -166,7 +165,7 @@ class PuhuTVIE(InfoExtractor):
             'tags': tags,
             'subtitles': subtitles,
             'thumbnails': thumbnails,
-            'formats': formats
+            'formats': formats,
         }
 
 
@@ -195,8 +194,8 @@ class PuhuTVSerieIE(InfoExtractor):
             has_more = True
             while has_more is True:
                 season = self._download_json(
-                    'https://galadriel.puhutv.com/seasons/%s' % season_id,
-                    season_id, 'Downloading page %s' % page, query={
+                    f'https://galadriel.puhutv.com/seasons/{season_id}',
+                    season_id, f'Downloading page {page}', query={
                         'page': page,
                         'per': 40,
                     })
@@ -208,7 +207,7 @@ class PuhuTVSerieIE(InfoExtractor):
                             continue
                         video_id = str_or_none(int_or_none(ep.get('id')))
                         yield self.url_result(
-                            'https://puhutv.com/%s' % slug_path,
+                            f'https://puhutv.com/{slug_path}',
                             ie=PuhuTVIE.ie_key(), video_id=video_id,
                             video_title=ep.get('name') or ep.get('eventLabel'))
                 page += 1
@@ -218,7 +217,7 @@ class PuhuTVSerieIE(InfoExtractor):
         playlist_id = self._match_id(url)
 
         info = self._download_json(
-            urljoin(url, '/api/slug/%s-detay' % playlist_id),
+            urljoin(url, f'/api/slug/{playlist_id}-detay'),
             playlist_id)['data']
 
         seasons = info.get('seasons')
@@ -229,5 +228,5 @@ class PuhuTVSerieIE(InfoExtractor):
         # For films, these are using same url with series
         video_id = info.get('slug') or info['assets'][0]['slug']
         return self.url_result(
-            'https://puhutv.com/%s-izle' % video_id,
+            f'https://puhutv.com/{video_id}-izle',
             PuhuTVIE.ie_key(), video_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/puls4.py b/plugins/youtube_download/yt_dlp/extractor/puls4.py
index 38c5d11..b43f035 100644
--- a/plugins/youtube_download/yt_dlp/extractor/puls4.py
+++ b/plugins/youtube_download/yt_dlp/extractor/puls4.py
@@ -1,5 +1,4 @@
 from .prosiebensat1 import ProSiebenSat1BaseIE
-from ..compat import compat_str
 from ..utils import parse_duration, unified_strdate
 
 
@@ -37,7 +36,7 @@ class Puls4IE(ProSiebenSat1BaseIE):
         player_content = media['playerContent']
         info = self._extract_video_info(url, player_content['id'])
         info.update({
-            'id': compat_str(media['objectId']),
+            'id': str(media['objectId']),
             'title': player_content['title'],
             'description': media.get('description'),
             'thumbnail': media.get('previewLink'),
diff --git a/plugins/youtube_download/yt_dlp/extractor/pyvideo.py b/plugins/youtube_download/yt_dlp/extractor/pyvideo.py
index 7b25166..6ae3155 100644
--- a/plugins/youtube_download/yt_dlp/extractor/pyvideo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/pyvideo.py
@@ -1,7 +1,6 @@
 import re
 
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import int_or_none
 
 
@@ -32,8 +31,8 @@ class PyvideoIE(InfoExtractor):
         entries = []
 
         data = self._download_json(
-            'https://raw.githubusercontent.com/pyvideo/data/master/%s/videos/%s.json'
-            % (category, video_id), video_id, fatal=False)
+            f'https://raw.githubusercontent.com/pyvideo/data/master/{category}/videos/{video_id}.json',
+            video_id, fatal=False)
 
         if data:
             for video in data['videos']:
@@ -43,7 +42,7 @@ class PyvideoIE(InfoExtractor):
                         entries.append(self.url_result(video_url, 'Youtube'))
                     else:
                         entries.append({
-                            'id': compat_str(data.get('id') or video_id),
+                            'id': str(data.get('id') or video_id),
                             'url': video_url,
                             'title': data['title'],
                             'description': data.get('description') or data.get('summary'),
diff --git a/plugins/youtube_download/yt_dlp/extractor/qdance.py b/plugins/youtube_download/yt_dlp/extractor/qdance.py
index d817677..4f71657 100644
--- a/plugins/youtube_download/yt_dlp/extractor/qdance.py
+++ b/plugins/youtube_download/yt_dlp/extractor/qdance.py
@@ -15,7 +15,7 @@ from ..utils import (
 
 class QDanceIE(InfoExtractor):
     _NETRC_MACHINE = 'qdance'
-    _VALID_URL = r'https?://(?:www\.)?q-dance\.com/network/(?:library|live)/(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:www\.)?q-dance\.com/network/(?:library|live)/(?P<id>[\w-]+)'
     _TESTS = [{
         'note': 'vod',
         'url': 'https://www.q-dance.com/network/library/146542138',
@@ -53,6 +53,27 @@ class QDanceIE(InfoExtractor):
             'channel_id': 'qdancenetwork.video_149170353',
         },
         'skip': 'Completed livestream',
+    }, {
+        'note': 'vod with alphanumeric id',
+        'url': 'https://www.q-dance.com/network/library/WhDleSIWSfeT3Q9ObBKBeA',
+        'info_dict': {
+            'id': 'WhDleSIWSfeT3Q9ObBKBeA',
+            'ext': 'mp4',
+            'title': 'Aftershock I Defqon.1 Weekend Festival 2023 I Sunday I BLUE',
+            'display_id': 'naam-i-defqon-1-weekend-festival-2023-i-dag-i-podium',
+            'description': 'Relive Defqon.1 Path of the Warrior with Aftershock at the BLUE 🔥',
+            'series': 'Defqon.1',
+            'series_id': '31840378',
+            'season': 'Defqon.1 Weekend Festival 2023',
+            'season_id': '141735599',
+            'duration': 3507,
+            'availability': 'premium_only',
+            'thumbnail': 'https://images.q-dance.network/1698158361-230625-135716-defqon-1-aftershock.jpg',
+        },
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        'url': 'https://www.q-dance.com/network/library/-uRFKXwmRZGVnve7av9uqA',
+        'only_matching': True,
     }]
 
     _access_token = None
@@ -119,7 +140,7 @@ class QDanceIE(InfoExtractor):
             'description': ('description', {str.strip}),
             'display_id': ('slug', {str}),
             'thumbnail': ('thumbnail', {url_or_none}),
-            'duration': ('durationInSeconds', {int_or_none}, {lambda x: x or None}),
+            'duration': ('durationInSeconds', {int_or_none}, filter),
             'availability': ('subscription', 'level', {extract_availability}),
             'is_live': ('type', {lambda x: x.lower() == 'live'}),
             'artist': ('acts', ..., {str}),
diff --git a/plugins/youtube_download/yt_dlp/extractor/qingting.py b/plugins/youtube_download/yt_dlp/extractor/qingting.py
index aa690d4..74fecee 100644
--- a/plugins/youtube_download/yt_dlp/extractor/qingting.py
+++ b/plugins/youtube_download/yt_dlp/extractor/qingting.py
@@ -1,5 +1,4 @@
 from .common import InfoExtractor
-
 from ..utils import traverse_obj
 
 
@@ -15,7 +14,7 @@ class QingTingIE(InfoExtractor):
             'channel': '睡前消息',
             'uploader': '马督工',
             'ext': 'm4a',
-        }
+        },
     }, {
         'url': 'https://m.qtfm.cn/vchannels/378005/programs/23023573/',
         'md5': '2703120b6abe63b5fa90b975a58f4c0e',
@@ -26,7 +25,7 @@ class QingTingIE(InfoExtractor):
             'channel': '睡前消息',
             'uploader': '马督工',
             'ext': 'm4a',
-        }
+        },
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/qqmusic.py b/plugins/youtube_download/yt_dlp/extractor/qqmusic.py
index 9285825..fb46e0d 100644
--- a/plugins/youtube_download/yt_dlp/extractor/qqmusic.py
+++ b/plugins/youtube_download/yt_dlp/extractor/qqmusic.py
@@ -1,48 +1,125 @@
+import base64
+import functools
+import json
 import random
-import re
 import time
 
 from .common import InfoExtractor
 from ..utils import (
-    clean_html,
     ExtractorError,
+    OnDemandPagedList,
+    clean_html,
+    int_or_none,
+    join_nonempty,
+    js_to_json,
+    str_or_none,
     strip_jsonp,
+    traverse_obj,
     unescapeHTML,
+    url_or_none,
+    urljoin,
 )
 
 
-class QQMusicIE(InfoExtractor):
+class QQMusicBaseIE(InfoExtractor):
+    def _get_cookie(self, key, default=None):
+        return getattr(self._get_cookies('https://y.qq.com').get(key), 'value', default)
+
+    def _get_g_tk(self):
+        n = 5381
+        for c in self._get_cookie('qqmusic_key', ''):
+            n += (n << 5) + ord(c)
+        return n & 2147483647
+
+    def _get_uin(self):
+        return int_or_none(self._get_cookie('uin')) or 0
+
+    @property
+    def is_logged_in(self):
+        return bool(self._get_uin() and self._get_cookie('fqm_pvqid'))
+
+    # Reference: m_r_GetRUin() in top_player.js
+    # http://imgcache.gtimg.cn/music/portal_v3/y/top_player.js
+    @staticmethod
+    def _m_r_get_ruin():
+        cur_ms = int(time.time() * 1000) % 1000
+        return int(round(random.random() * 2147483647) * cur_ms % 1E10)
+
+    def _download_init_data(self, url, mid, fatal=True):
+        webpage = self._download_webpage(url, mid, fatal=fatal)
+        return self._search_json(r'window\.__INITIAL_DATA__\s*=', webpage,
+                                 'init data', mid, transform_source=js_to_json, fatal=fatal)
+
+    def _make_fcu_req(self, req_dict, mid, headers={}, **kwargs):
+        return self._download_json(
+            'https://u.y.qq.com/cgi-bin/musicu.fcg', mid, data=json.dumps({
+                'comm': {
+                    'cv': 0,
+                    'ct': 24,
+                    'format': 'json',
+                    'uin': self._get_uin(),
+                },
+                **req_dict,
+            }, separators=(',', ':')).encode(), headers=headers, **kwargs)
+
+
+class QQMusicIE(QQMusicBaseIE):
     IE_NAME = 'qqmusic'
     IE_DESC = 'QQ音乐'
-    _VALID_URL = r'https?://y\.qq\.com/n/yqq/song/(?P<id>[0-9A-Za-z]+)\.html'
+    _VALID_URL = r'https?://y\.qq\.com/n/ryqq/songDetail/(?P<id>[0-9A-Za-z]+)'
     _TESTS = [{
-        'url': 'https://y.qq.com/n/yqq/song/004295Et37taLD.html',
+        'url': 'https://y.qq.com/n/ryqq/songDetail/004Ti8rT003TaZ',
+        'md5': 'd7adc5c438d12e2cb648cca81593fd47',
+        'info_dict': {
+            'id': '004Ti8rT003TaZ',
+            'ext': 'mp3',
+            'title': '永夜のパレード (永夜的游行)',
+            'album': '幻想遊園郷 -Fantastic Park-',
+            'release_date': '20111230',
+            'duration': 281,
+            'creators': ['ケーキ姫', 'JUMA'],
+            'genres': ['Pop'],
+            'description': 'md5:b5261f3d595657ae561e9e6aee7eb7d9',
+            'size': 4501244,
+            'thumbnail': r're:^https?://.*\.jpg(?:$|[#?])',
+            'subtitles': 'count:1',
+        },
+    }, {
+        'url': 'https://y.qq.com/n/ryqq/songDetail/004295Et37taLD',
         'md5': '5f1e6cea39e182857da7ffc5ef5e6bb8',
         'info_dict': {
             'id': '004295Et37taLD',
             'ext': 'mp3',
             'title': '可惜没如果',
-            'release_date': '20141227',
-            'creator': '林俊杰',
-            'description': 'md5:d85afb3051952ecc50a1ee8a286d1eac',
-            'thumbnail': r're:^https?://.*\.jpg$',
-        }
+            'album': '新地球 - 人 (Special Edition)',
+            'release_date': '20150129',
+            'duration': 298,
+            'creators': ['林俊杰'],
+            'genres': ['Pop'],
+            'description': 'md5:f568421ff618d2066e74b65a04149c4e',
+            'thumbnail': r're:^https?://.*\.jpg(?:$|[#?])',
+        },
+        'skip': 'premium member only',
     }, {
         'note': 'There is no mp3-320 version of this song.',
-        'url': 'https://y.qq.com/n/yqq/song/004MsGEo3DdNxV.html',
-        'md5': 'fa3926f0c585cda0af8fa4f796482e3e',
+        'url': 'https://y.qq.com/n/ryqq/songDetail/004MsGEo3DdNxV',
+        'md5': '028aaef1ae13d8a9f4861a92614887f9',
         'info_dict': {
             'id': '004MsGEo3DdNxV',
             'ext': 'mp3',
             'title': '如果',
+            'album': '新传媒电视连续剧金曲系列II',
             'release_date': '20050626',
-            'creator': '李季美',
-            'description': 'md5:46857d5ed62bc4ba84607a805dccf437',
-            'thumbnail': r're:^https?://.*\.jpg$',
-        }
+            'duration': 220,
+            'creators': ['李季美'],
+            'genres': [],
+            'description': 'md5:fc711212aa623b28534954dc4bd67385',
+            'size': 3535730,
+            'thumbnail': r're:^https?://.*\.jpg(?:$|[#?])',
+        },
     }, {
         'note': 'lyrics not in .lrc format',
-        'url': 'https://y.qq.com/n/yqq/song/001JyApY11tIp6.html',
+        'url': 'https://y.qq.com/n/ryqq/songDetail/001JyApY11tIp6',
         'info_dict': {
             'id': '001JyApY11tIp6',
             'ext': 'mp3',
@@ -50,186 +127,193 @@ class QQMusicIE(InfoExtractor):
             'release_date': '19970225',
             'creator': 'Dark Funeral',
             'description': 'md5:c9b20210587cbcd6836a1c597bab4525',
-            'thumbnail': r're:^https?://.*\.jpg$',
-        },
-        'params': {
-            'skip_download': True,
+            'thumbnail': r're:^https?://.*\.jpg(?:$|[#?])',
         },
+        'params': {'skip_download': True},
+        'skip': 'no longer available',
     }]
 
     _FORMATS = {
-        'mp3-320': {'prefix': 'M800', 'ext': 'mp3', 'preference': 40, 'abr': 320},
-        'mp3-128': {'prefix': 'M500', 'ext': 'mp3', 'preference': 30, 'abr': 128},
-        'm4a': {'prefix': 'C200', 'ext': 'm4a', 'preference': 10}
+        'F000': {'name': 'flac', 'prefix': 'F000', 'ext': 'flac', 'preference': 60},
+        'A000': {'name': 'ape', 'prefix': 'A000', 'ext': 'ape', 'preference': 50},
+        'M800': {'name': '320mp3', 'prefix': 'M800', 'ext': 'mp3', 'preference': 40, 'abr': 320},
+        'M500': {'name': '128mp3', 'prefix': 'M500', 'ext': 'mp3', 'preference': 30, 'abr': 128},
+        'C400': {'name': '96aac', 'prefix': 'C400', 'ext': 'm4a', 'preference': 20, 'abr': 96},
+        'C200': {'name': '48aac', 'prefix': 'C200', 'ext': 'm4a', 'preference': 20, 'abr': 48},
     }
 
-    # Reference: m_r_GetRUin() in top_player.js
-    # http://imgcache.gtimg.cn/music/portal_v3/y/top_player.js
-    @staticmethod
-    def m_r_get_ruin():
-        curMs = int(time.time() * 1000) % 1000
-        return int(round(random.random() * 2147483647) * curMs % 1E10)
-
     def _real_extract(self, url):
         mid = self._match_id(url)
 
-        detail_info_page = self._download_webpage(
-            'http://s.plcloud.music.qq.com/fcgi-bin/fcg_yqq_song_detail_info.fcg?songmid=%s&play=0' % mid,
-            mid, note='Download song detail info',
-            errnote='Unable to get song detail info', encoding='gbk')
+        init_data = self._download_init_data(url, mid, fatal=False)
+        info_data = self._make_fcu_req({'info': {
+            'module': 'music.pf_song_detail_svr',
+            'method': 'get_song_detail_yqq',
+            'param': {
+                'song_mid': mid,
+                'song_type': 0,
+            },
+        }}, mid, note='Downloading song info')['info']['data']['track_info']
 
-        song_name = self._html_search_regex(
-            r"songname:\s*'([^']+)'", detail_info_page, 'song name')
+        media_mid = info_data['file']['media_mid']
 
-        publish_time = self._html_search_regex(
-            r'发行时间：(\d{4}-\d{2}-\d{2})', detail_info_page,
-            'publish time', default=None)
-        if publish_time:
-            publish_time = publish_time.replace('-', '')
-
-        singer = self._html_search_regex(
-            r"singer:\s*'([^']+)", detail_info_page, 'singer', default=None)
-
-        lrc_content = self._html_search_regex(
-            r'<div class="content" id="lrc_content"[^<>]*>([^<>]+)</div>',
-            detail_info_page, 'LRC lyrics', default=None)
-        if lrc_content:
-            lrc_content = lrc_content.replace('\\n', '\n')
-
-        thumbnail_url = None
-        albummid = self._search_regex(
-            [r'albummid:\'([0-9a-zA-Z]+)\'', r'"albummid":"([0-9a-zA-Z]+)"'],
-            detail_info_page, 'album mid', default=None)
-        if albummid:
-            thumbnail_url = 'http://i.gtimg.cn/music/photo/mid_album_500/%s/%s/%s.jpg' \
-                            % (albummid[-2:-1], albummid[-1], albummid)
-
-        guid = self.m_r_get_ruin()
-
-        vkey = self._download_json(
-            'http://base.music.qq.com/fcgi-bin/fcg_musicexpress.fcg?json=3&guid=%s' % guid,
-            mid, note='Retrieve vkey', errnote='Unable to get vkey',
-            transform_source=strip_jsonp)['key']
+        data = self._make_fcu_req({
+            'req_1': {
+                'module': 'vkey.GetVkeyServer',
+                'method': 'CgiGetVkey',
+                'param': {
+                    'guid': str(self._m_r_get_ruin()),
+                    'songmid': [mid] * len(self._FORMATS),
+                    'songtype': [0] * len(self._FORMATS),
+                    'uin': str(self._get_uin()),
+                    'loginflag': 1,
+                    'platform': '20',
+                    'filename': [f'{f["prefix"]}{media_mid}.{f["ext"]}' for f in self._FORMATS.values()],
+                },
+            },
+            'req_2': {
+                'module': 'music.musichallSong.PlayLyricInfo',
+                'method': 'GetPlayLyricInfo',
+                'param': {'songMID': mid},
+            },
+        }, mid, note='Downloading formats and lyric', headers=self.geo_verification_headers())
 
+        code = traverse_obj(data, ('req_1', 'code', {int}))
+        if code != 0:
+            raise ExtractorError(f'Failed to download format info, error code {code or "unknown"}')
         formats = []
-        for format_id, details in self._FORMATS.items():
+        for media_info in traverse_obj(data, (
+            'req_1', 'data', 'midurlinfo', lambda _, v: v['songmid'] == mid and v['purl']),
+        ):
+            format_key = traverse_obj(media_info, ('filename', {str}, {lambda x: x[:4]}))
+            format_info = self._FORMATS.get(format_key) or {}
+            format_id = format_info.get('name')
             formats.append({
-                'url': 'http://cc.stream.qqmusic.qq.com/%s%s.%s?vkey=%s&guid=%s&fromtag=0'
-                       % (details['prefix'], mid, details['ext'], vkey, guid),
+                'url': urljoin('https://dl.stream.qqmusic.qq.com', media_info['purl']),
                 'format': format_id,
                 'format_id': format_id,
-                'quality': details['preference'],
-                'abr': details.get('abr'),
+                'size': traverse_obj(info_data, ('file', f'size_{format_id}', {int_or_none})),
+                'quality': format_info.get('preference'),
+                'abr': format_info.get('abr'),
+                'ext': format_info.get('ext'),
+                'vcodec': 'none',
             })
-        self._check_formats(formats, mid)
 
-        actual_lrc_lyrics = ''.join(
-            line + '\n' for line in re.findall(
-                r'(?m)^(\[[0-9]{2}:[0-9]{2}(?:\.[0-9]{2,})?\][^\n]*|\[[^\]]*\])', lrc_content))
+        if not formats and not self.is_logged_in:
+            self.raise_login_required()
+
+        if traverse_obj(data, ('req_2', 'code')):
+            self.report_warning(f'Failed to download lyric, error {data["req_2"]["code"]!r}')
+        lrc_content = traverse_obj(data, ('req_2', 'data', 'lyric', {lambda x: base64.b64decode(x).decode('utf-8')}))
 
         info_dict = {
             'id': mid,
             'formats': formats,
-            'title': song_name,
-            'release_date': publish_time,
-            'creator': singer,
-            'description': lrc_content,
-            'thumbnail': thumbnail_url
+            **traverse_obj(info_data, {
+                'title': ('title', {str}),
+                'album': ('album', 'title', {str}, filter),
+                'release_date': ('time_public', {lambda x: x.replace('-', '') or None}),
+                'creators': ('singer', ..., 'name', {str}),
+                'alt_title': ('subtitle', {str}, filter),
+                'duration': ('interval', {int_or_none}),
+            }),
+            **traverse_obj(init_data, ('detail', {
+                'thumbnail': ('picurl', {url_or_none}),
+                'description': ('info', 'intro', 'content', ..., 'value', {str}),
+                'genres': ('info', 'genre', 'content', ..., 'value', {str}, all),
+            }), get_all=False),
         }
-        if actual_lrc_lyrics:
-            info_dict['subtitles'] = {
-                'origin': [{
-                    'ext': 'lrc',
-                    'data': actual_lrc_lyrics,
-                }]
-            }
+        if lrc_content:
+            info_dict['subtitles'] = {'origin': [{'ext': 'lrc', 'data': lrc_content}]}
+            info_dict['description'] = join_nonempty(info_dict.get('description'), lrc_content, delim='\n')
         return info_dict
 
 
-class QQPlaylistBaseIE(InfoExtractor):
-    @staticmethod
-    def qq_static_url(category, mid):
-        return 'http://y.qq.com/y/static/%s/%s/%s/%s.html' % (category, mid[-2], mid[-1], mid)
-
-    def get_singer_all_songs(self, singmid, num):
-        return self._download_webpage(
-            r'https://c.y.qq.com/v8/fcg-bin/fcg_v8_singer_track_cp.fcg', singmid,
-            query={
-                'format': 'json',
-                'inCharset': 'utf8',
-                'outCharset': 'utf-8',
-                'platform': 'yqq',
-                'needNewCode': 0,
-                'singermid': singmid,
-                'order': 'listen',
-                'begin': 0,
-                'num': num,
-                'songstatus': 1,
-            })
-
-    def get_entries_from_page(self, singmid):
-        entries = []
-
-        default_num = 1
-        json_text = self.get_singer_all_songs(singmid, default_num)
-        json_obj_all_songs = self._parse_json(json_text, singmid)
-
-        if json_obj_all_songs['code'] == 0:
-            total = json_obj_all_songs['data']['total']
-            json_text = self.get_singer_all_songs(singmid, total)
-            json_obj_all_songs = self._parse_json(json_text, singmid)
-
-        for item in json_obj_all_songs['data']['list']:
-            if item['musicData'].get('songmid') is not None:
-                songmid = item['musicData']['songmid']
-                entries.append(self.url_result(
-                    r'https://y.qq.com/n/yqq/song/%s.html' % songmid, 'QQMusic', songmid))
-
-        return entries
-
-
-class QQMusicSingerIE(QQPlaylistBaseIE):
+class QQMusicSingerIE(QQMusicBaseIE):
     IE_NAME = 'qqmusic:singer'
     IE_DESC = 'QQ音乐 - 歌手'
-    _VALID_URL = r'https?://y\.qq\.com/n/yqq/singer/(?P<id>[0-9A-Za-z]+)\.html'
-    _TEST = {
-        'url': 'https://y.qq.com/n/yqq/singer/001BLpXF2DyJe2.html',
+    _VALID_URL = r'https?://y\.qq\.com/n/ryqq/singer/(?P<id>[0-9A-Za-z]+)'
+    _TESTS = [{
+        'url': 'https://y.qq.com/n/ryqq/singer/001BLpXF2DyJe2',
         'info_dict': {
             'id': '001BLpXF2DyJe2',
             'title': '林俊杰',
-            'description': 'md5:870ec08f7d8547c29c93010899103751',
+            'description': 'md5:10624ce73b06fa400bc846f59b0305fa',
+            'thumbnail': r're:^https?://.*\.jpg(?:$|[#?])',
         },
-        'playlist_mincount': 12,
-    }
+        'playlist_mincount': 100,
+    }, {
+        'url': 'https://y.qq.com/n/ryqq/singer/000Q00f213YzNV',
+        'info_dict': {
+            'id': '000Q00f213YzNV',
+            'title': '桃几OvO',
+            'description': '小破站小唱见~希望大家喜欢听我唱歌~！',
+            'thumbnail': r're:^https?://.*\.jpg(?:$|[#?])',
+        },
+        'playlist_count': 12,
+        'playlist': [{
+            'info_dict': {
+                'id': '0016cvsy02mmCl',
+                'ext': 'mp3',
+                'title': '群青',
+                'album': '桃几2021年翻唱集',
+                'release_date': '20210913',
+                'duration': 248,
+                'creators': ['桃几OvO'],
+                'genres': ['Pop'],
+                'description': 'md5:4296005a04edcb5cdbe0889d5055a7ae',
+                'size': 3970822,
+                'thumbnail': r're:^https?://.*\.jpg(?:$|[#?])',
+            },
+        }],
+    }]
+
+    _PAGE_SIZE = 50
+
+    def _fetch_page(self, mid, page_size, page_num):
+        data = self._make_fcu_req({'req_1': {
+            'module': 'music.web_singer_info_svr',
+            'method': 'get_singer_detail_info',
+            'param': {
+                'sort': 5,
+                'singermid': mid,
+                'sin': page_num * page_size,
+                'num': page_size,
+            }}}, mid, note=f'Downloading page {page_num}')
+        yield from traverse_obj(data, ('req_1', 'data', 'songlist', ..., {lambda x: self.url_result(
+            f'https://y.qq.com/n/ryqq/songDetail/{x["mid"]}', QQMusicIE, x['mid'], x.get('title'))}))
 
     def _real_extract(self, url):
         mid = self._match_id(url)
+        init_data = self._download_init_data(url, mid, fatal=False)
 
-        entries = self.get_entries_from_page(mid)
-        singer_page = self._download_webpage(url, mid, 'Download singer page')
-        singer_name = self._html_search_regex(
-            r"singername\s*:\s*'(.*?)'", singer_page, 'singer name', default=None)
-        singer_desc = None
+        return self.playlist_result(
+            OnDemandPagedList(functools.partial(self._fetch_page, mid, self._PAGE_SIZE), self._PAGE_SIZE),
+            mid, **traverse_obj(init_data, ('singerDetail', {
+                'title': ('basic_info', 'name', {str}),
+                'description': ('ex_info', 'desc', {str}),
+                'thumbnail': ('pic', 'pic', {url_or_none}),
+            })))
 
-        if mid:
-            singer_desc_page = self._download_xml(
-                'http://s.plcloud.music.qq.com/fcgi-bin/fcg_get_singer_desc.fcg', mid,
-                'Donwload singer description XML',
-                query={'utf8': 1, 'outCharset': 'utf-8', 'format': 'xml', 'singermid': mid},
-                headers={'Referer': 'https://y.qq.com/n/yqq/singer/'})
 
-            singer_desc = singer_desc_page.find('./data/info/desc').text
-
-        return self.playlist_result(entries, mid, singer_name, singer_desc)
+class QQPlaylistBaseIE(InfoExtractor):
+    def _extract_entries(self, info_json, path):
+        for song in traverse_obj(info_json, path):
+            song_mid = song.get('songmid')
+            if not song_mid:
+                continue
+            yield self.url_result(
+                f'https://y.qq.com/n/ryqq/songDetail/{song_mid}',
+                QQMusicIE, song_mid, song.get('songname'))
 
 
 class QQMusicAlbumIE(QQPlaylistBaseIE):
     IE_NAME = 'qqmusic:album'
     IE_DESC = 'QQ音乐 - 专辑'
-    _VALID_URL = r'https?://y\.qq\.com/n/yqq/album/(?P<id>[0-9A-Za-z]+)\.html'
+    _VALID_URL = r'https?://y\.qq\.com/n/ryqq/albumDetail/(?P<id>[0-9A-Za-z]+)'
 
     _TESTS = [{
-        'url': 'https://y.qq.com/n/yqq/album/000gXCTb2AhRR1.html',
+        'url': 'https://y.qq.com/n/ryqq/albumDetail/000gXCTb2AhRR1',
         'info_dict': {
             'id': '000gXCTb2AhRR1',
             'title': '我们都是这样长大的',
@@ -237,10 +321,10 @@ class QQMusicAlbumIE(QQPlaylistBaseIE):
         },
         'playlist_count': 4,
     }, {
-        'url': 'https://y.qq.com/n/yqq/album/002Y5a3b3AlCu3.html',
+        'url': 'https://y.qq.com/n/ryqq/albumDetail/002Y5a3b3AlCu3',
         'info_dict': {
             'id': '002Y5a3b3AlCu3',
-            'title': '그리고...',
+            'title': '그리고…',
             'description': 'md5:a48823755615508a95080e81b51ba729',
         },
         'playlist_count': 8,
@@ -249,49 +333,45 @@ class QQMusicAlbumIE(QQPlaylistBaseIE):
     def _real_extract(self, url):
         mid = self._match_id(url)
 
-        album = self._download_json(
-            'http://i.y.qq.com/v8/fcg-bin/fcg_v8_album_info_cp.fcg?albummid=%s&format=json' % mid,
-            mid, 'Download album page')['data']
+        album_json = self._download_json(
+            'http://i.y.qq.com/v8/fcg-bin/fcg_v8_album_info_cp.fcg',
+            mid, 'Download album page',
+            query={'albummid': mid, 'format': 'json'})['data']
 
-        entries = [
-            self.url_result(
-                'https://y.qq.com/n/yqq/song/' + song['songmid'] + '.html', 'QQMusic', song['songmid']
-            ) for song in album['list']
-        ]
-        album_name = album.get('name')
-        album_detail = album.get('desc')
-        if album_detail is not None:
-            album_detail = album_detail.strip()
+        entries = self._extract_entries(album_json, ('list', ...))
 
-        return self.playlist_result(entries, mid, album_name, album_detail)
+        return self.playlist_result(entries, mid, **traverse_obj(album_json, {
+            'title': ('name', {str}),
+            'description': ('desc', {str.strip}),
+        }))
 
 
 class QQMusicToplistIE(QQPlaylistBaseIE):
     IE_NAME = 'qqmusic:toplist'
     IE_DESC = 'QQ音乐 - 排行榜'
-    _VALID_URL = r'https?://y\.qq\.com/n/yqq/toplist/(?P<id>[0-9]+)\.html'
+    _VALID_URL = r'https?://y\.qq\.com/n/ryqq/toplist/(?P<id>[0-9]+)'
 
     _TESTS = [{
-        'url': 'https://y.qq.com/n/yqq/toplist/123.html',
+        'url': 'https://y.qq.com/n/ryqq/toplist/123',
         'info_dict': {
             'id': '123',
-            'title': '美国iTunes榜',
-            'description': 'md5:89db2335fdbb10678dee2d43fe9aba08',
+            'title': r're:美国热门音乐榜 \d{4}-\d{2}-\d{2}',
+            'description': '美国热门音乐榜，每周一更新。',
         },
-        'playlist_count': 100,
+        'playlist_count': 95,
     }, {
-        'url': 'https://y.qq.com/n/yqq/toplist/3.html',
+        'url': 'https://y.qq.com/n/ryqq/toplist/3',
         'info_dict': {
             'id': '3',
-            'title': '巅峰榜·欧美',
-            'description': 'md5:5a600d42c01696b26b71f8c4d43407da',
+            'title': r're:巅峰榜·欧美 \d{4}-\d{2}-\d{2}',
+            'description': 'md5:4def03b60d3644be4c9a36f21fd33857',
         },
         'playlist_count': 100,
     }, {
-        'url': 'https://y.qq.com/n/yqq/toplist/106.html',
+        'url': 'https://y.qq.com/n/ryqq/toplist/106',
         'info_dict': {
             'id': '106',
-            'title': '韩国Mnet榜',
+            'title': r're:韩国Mnet榜 \d{4}-\d{2}-\d{2}',
             'description': 'md5:cb84b325215e1d21708c615cac82a6e7',
         },
         'playlist_count': 50,
@@ -305,33 +385,20 @@ class QQMusicToplistIE(QQPlaylistBaseIE):
             note='Download toplist page',
             query={'type': 'toplist', 'topid': list_id, 'format': 'json'})
 
-        entries = [self.url_result(
-            'https://y.qq.com/n/yqq/song/' + song['data']['songmid'] + '.html', 'QQMusic',
-            song['data']['songmid'])
-            for song in toplist_json['songlist']]
-
-        topinfo = toplist_json.get('topinfo', {})
-        list_name = topinfo.get('ListName')
-        list_description = topinfo.get('info')
-        return self.playlist_result(entries, list_id, list_name, list_description)
+        return self.playlist_result(
+            self._extract_entries(toplist_json, ('songlist', ..., 'data')), list_id,
+            playlist_title=join_nonempty(*traverse_obj(
+                toplist_json, ((('topinfo', 'ListName'), 'update_time'), None)), delim=' '),
+            playlist_description=traverse_obj(toplist_json, ('topinfo', 'info')))
 
 
 class QQMusicPlaylistIE(QQPlaylistBaseIE):
     IE_NAME = 'qqmusic:playlist'
     IE_DESC = 'QQ音乐 - 歌单'
-    _VALID_URL = r'https?://y\.qq\.com/n/yqq/playlist/(?P<id>[0-9]+)\.html'
+    _VALID_URL = r'https?://y\.qq\.com/n/ryqq/playlist/(?P<id>[0-9]+)'
 
     _TESTS = [{
-        'url': 'http://y.qq.com/n/yqq/playlist/3462654915.html',
-        'info_dict': {
-            'id': '3462654915',
-            'title': '韩国5月新歌精选下旬',
-            'description': 'md5:d2c9d758a96b9888cf4fe82f603121d4',
-        },
-        'playlist_count': 40,
-        'skip': 'playlist gone',
-    }, {
-        'url': 'https://y.qq.com/n/yqq/playlist/1374105607.html',
+        'url': 'https://y.qq.com/n/ryqq/playlist/1374105607',
         'info_dict': {
             'id': '1374105607',
             'title': '易入人心的华语民谣',
@@ -347,19 +414,83 @@ class QQMusicPlaylistIE(QQPlaylistBaseIE):
             'http://i.y.qq.com/qzone-music/fcg-bin/fcg_ucc_getcdinfo_byids_cp.fcg',
             list_id, 'Download list page',
             query={'type': 1, 'json': 1, 'utf8': 1, 'onlysong': 0, 'disstid': list_id},
-            transform_source=strip_jsonp)
+            transform_source=strip_jsonp, headers={'Referer': url})
         if not len(list_json.get('cdlist', [])):
-            if list_json.get('code'):
-                raise ExtractorError(
-                    'QQ Music said: error %d in fetching playlist info' % list_json['code'],
-                    expected=True)
-            raise ExtractorError('Unable to get playlist info')
+            raise ExtractorError(join_nonempty(
+                'Unable to get playlist info',
+                join_nonempty('code', 'subcode', from_dict=list_json),
+                list_json.get('msg'), delim=': '))
 
-        cdlist = list_json['cdlist'][0]
-        entries = [self.url_result(
-            'https://y.qq.com/n/yqq/song/' + song['songmid'] + '.html', 'QQMusic', song['songmid'])
-            for song in cdlist['songlist']]
+        entries = self._extract_entries(list_json, ('cdlist', 0, 'songlist', ...))
 
-        list_name = cdlist.get('dissname')
-        list_description = clean_html(unescapeHTML(cdlist.get('desc')))
-        return self.playlist_result(entries, list_id, list_name, list_description)
+        return self.playlist_result(entries, list_id, **traverse_obj(list_json, ('cdlist', 0, {
+            'title': ('dissname', {str}),
+            'description': ('desc', {unescapeHTML}, {clean_html}),
+        })))
+
+
+class QQMusicVideoIE(QQMusicBaseIE):
+    IE_NAME = 'qqmusic:mv'
+    IE_DESC = 'QQ音乐 - MV'
+    _VALID_URL = r'https?://y\.qq\.com/n/ryqq/mv/(?P<id>[0-9A-Za-z]+)'
+
+    _TESTS = [{
+        'url': 'https://y.qq.com/n/ryqq/mv/002Vsarh3SVU8K',
+        'info_dict': {
+            'id': '002Vsarh3SVU8K',
+            'ext': 'mp4',
+            'title': 'The Chant (Extended Mix / Audio)',
+            'description': '',
+            'thumbnail': r're:^https?://.*\.jpg(?:$|[#?])',
+            'release_timestamp': 1688918400,
+            'release_date': '20230709',
+            'duration': 313,
+            'creators': ['Duke Dumont'],
+            'view_count': int,
+        },
+    }]
+
+    def _parse_url_formats(self, url_data):
+        return traverse_obj(url_data, ('mp4', lambda _, v: v['freeflow_url'], {
+            'url': ('freeflow_url', 0, {url_or_none}),
+            'filesize': ('fileSize', {int_or_none}),
+            'format_id': ('newFileType', {str_or_none}),
+        }))
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+
+        video_info = self._make_fcu_req({
+            'mvInfo': {
+                'module': 'music.video.VideoData',
+                'method': 'get_video_info_batch',
+                'param': {
+                    'vidlist': [video_id],
+                    'required': [
+                        'vid', 'type', 'sid', 'cover_pic', 'duration', 'singers',
+                        'video_pay', 'hint', 'code', 'msg', 'name', 'desc',
+                        'playcnt', 'pubdate', 'play_forbid_reason'],
+                },
+            },
+            'mvUrl': {
+                'module': 'music.stream.MvUrlProxy',
+                'method': 'GetMvUrls',
+                'param': {'vids': [video_id]},
+            },
+        }, video_id, headers=self.geo_verification_headers())
+        if traverse_obj(video_info, ('mvInfo', 'data', video_id, 'play_forbid_reason')) == 3:
+            self.raise_geo_restricted()
+
+        return {
+            'id': video_id,
+            'formats': self._parse_url_formats(traverse_obj(video_info, ('mvUrl', 'data', video_id))),
+            **traverse_obj(video_info, ('mvInfo', 'data', video_id, {
+                'title': ('name', {str}),
+                'description': ('desc', {str}),
+                'thumbnail': ('cover_pic', {url_or_none}),
+                'release_timestamp': ('pubdate', {int_or_none}),
+                'duration': ('duration', {int_or_none}),
+                'creators': ('singers', ..., 'name', {str}),
+                'view_count': ('playcnt', {int_or_none}),
+            })),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/r7.py b/plugins/youtube_download/yt_dlp/extractor/r7.py
index f067a05..79a4c0a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/r7.py
+++ b/plugins/youtube_download/yt_dlp/extractor/r7.py
@@ -3,6 +3,8 @@ from ..utils import int_or_none
 
 
 class R7IE(InfoExtractor):
+    _WORKING = False
+    _ENABLED = None  # XXX: pass through to GenericIE
     _VALID_URL = r'''(?x)
                         https?://
                         (?:
@@ -40,7 +42,7 @@ class R7IE(InfoExtractor):
         video_id = self._match_id(url)
 
         video = self._download_json(
-            'http://player-api.r7.com/video/i/%s' % video_id, video_id)
+            f'http://player-api.r7.com/video/i/{video_id}', video_id)
 
         title = video['title']
 
@@ -86,6 +88,8 @@ class R7IE(InfoExtractor):
 
 
 class R7ArticleIE(InfoExtractor):
+    _WORKING = False
+    _ENABLED = None  # XXX: pass through to GenericIE
     _VALID_URL = r'https?://(?:[a-zA-Z]+)\.r7\.com/(?:[^/]+/)+[^/?#&]+-(?P<id>\d+)'
     _TEST = {
         'url': 'http://tv.r7.com/record-play/balanco-geral/videos/policiais-humilham-suspeito-a-beira-da-morte-morre-com-dignidade-16102015',
@@ -94,7 +98,7 @@ class R7ArticleIE(InfoExtractor):
 
     @classmethod
     def suitable(cls, url):
-        return False if R7IE.suitable(url) else super(R7ArticleIE, cls).suitable(url)
+        return False if R7IE.suitable(url) else super().suitable(url)
 
     def _real_extract(self, url):
         display_id = self._match_id(url)
@@ -105,4 +109,4 @@ class R7ArticleIE(InfoExtractor):
             r'<div[^>]+(?:id=["\']player-|class=["\']embed["\'][^>]+id=["\'])([\da-f]{24})',
             webpage, 'video id')
 
-        return self.url_result('http://player.r7.com/video/i/%s' % video_id, R7IE.ie_key())
+        return self.url_result(f'http://player.r7.com/video/i/{video_id}', R7IE.ie_key())
diff --git a/plugins/youtube_download/yt_dlp/extractor/radiko.py b/plugins/youtube_download/yt_dlp/extractor/radiko.py
index cef68eb..f94d6a3 100644
--- a/plugins/youtube_download/yt_dlp/extractor/radiko.py
+++ b/plugins/youtube_download/yt_dlp/extractor/radiko.py
@@ -1,18 +1,23 @@
 import base64
+import random
+import re
 import urllib.parse
 
 from .common import InfoExtractor
 from ..utils import (
     ExtractorError,
     clean_html,
+    join_nonempty,
     time_seconds,
     try_call,
     unified_timestamp,
     update_url_query,
 )
+from ..utils.traversal import traverse_obj
 
 
 class RadikoBaseIE(InfoExtractor):
+    _GEO_BYPASS = False
     _FULL_KEY = None
     _HOSTS_FOR_TIME_FREE_FFMPEG_UNSUPPORTED = (
         'https://c-rpaa.smartstream.ne.jp',
@@ -32,7 +37,7 @@ class RadikoBaseIE(InfoExtractor):
         'https://c-radiko.smartstream.ne.jp',
     )
 
-    def _auth_client(self):
+    def _negotiate_token(self):
         _, auth1_handle = self._download_webpage_handle(
             'https://radiko.jp/v2/api/auth1', None, 'Downloading authentication page',
             headers={
@@ -58,10 +63,23 @@ class RadikoBaseIE(InfoExtractor):
                 'x-radiko-partialkey': partial_key,
             }).split(',')[0]
 
+        if area_id == 'OUT':
+            self.raise_geo_restricted(countries=['JP'])
+
         auth_data = (auth_token, area_id)
         self.cache.store('radiko', 'auth_data', auth_data)
         return auth_data
 
+    def _auth_client(self):
+        cachedata = self.cache.load('radiko', 'auth_data')
+        if cachedata is not None:
+            response = self._download_webpage(
+                'https://radiko.jp/v2/api/auth_check', None, 'Checking cached token', expected_status=401,
+                headers={'X-Radiko-AuthToken': cachedata[0], 'X-Radiko-AreaId': cachedata[1]})
+            if response == 'OK':
+                return cachedata
+        return self._negotiate_token()
+
     def _extract_full_key(self):
         if self._FULL_KEY:
             return self._FULL_KEY
@@ -75,7 +93,7 @@ class RadikoBaseIE(InfoExtractor):
 
         if full_key:
             full_key = full_key.encode()
-        else:  # use full key ever known
+        else:  # use only full key ever known
             full_key = b'bcd151073c03b352e1ef2fd66c32209da9ca0afa'
 
         self._FULL_KEY = full_key
@@ -83,8 +101,8 @@ class RadikoBaseIE(InfoExtractor):
 
     def _find_program(self, video_id, station, cursor):
         station_program = self._download_xml(
-            'https://radiko.jp/v3/program/station/weekly/%s.xml' % station, video_id,
-            note='Downloading radio program for %s station' % station)
+            f'https://radiko.jp/v3/program/station/weekly/{station}.xml', video_id,
+            note=f'Downloading radio program for {station} station')
 
         prog = None
         for p in station_program.findall('.//prog'):
@@ -103,24 +121,24 @@ class RadikoBaseIE(InfoExtractor):
         m3u8_playlist_data = self._download_xml(
             f'https://radiko.jp/v3/station/stream/pc_html5/{station}.xml', video_id,
             note='Downloading stream information')
-        m3u8_urls = m3u8_playlist_data.findall('.//url')
 
         formats = []
         found = set()
-        for url_tag in m3u8_urls:
-            pcu = url_tag.find('playlist_create_url').text
-            url_attrib = url_tag.attrib
+
+        timefree_int = 0 if is_onair else 1
+
+        for element in m3u8_playlist_data.findall(f'.//url[@timefree="{timefree_int}"]/playlist_create_url'):
+            pcu = element.text
+            if pcu in found:
+                continue
+            found.add(pcu)
             playlist_url = update_url_query(pcu, {
                 'station_id': station,
                 **query,
                 'l': '15',
-                'lsid': '88ecea37e968c1f17d5413312d9f8003',
+                'lsid': ''.join(random.choices('0123456789abcdef', k=32)),
                 'type': 'b',
             })
-            if playlist_url in found:
-                continue
-            else:
-                found.add(playlist_url)
 
             time_to_skip = None if is_onair else cursor - ft
 
@@ -138,15 +156,19 @@ class RadikoBaseIE(InfoExtractor):
                         not is_onair and pcu.startswith(self._HOSTS_FOR_TIME_FREE_FFMPEG_UNSUPPORTED)):
                     sf['preference'] = -100
                     sf['format_note'] = 'not preferred'
-                if not is_onair and url_attrib['timefree'] == '1' and time_to_skip:
-                    sf['downloader_options'] = {'ffmpeg_args': ['-ss', time_to_skip]}
+                if not is_onair and timefree_int == 1 and time_to_skip:
+                    sf['downloader_options'] = {'ffmpeg_args': ['-ss', str(time_to_skip)]}
             formats.extend(subformats)
 
         return formats
 
+    def _extract_performers(self, prog):
+        return traverse_obj(prog, (
+            'pfm/text()', ..., {lambda x: re.split(r'[/／、　,，]', x)}, ..., {str.strip})) or None
+
 
 class RadikoIE(RadikoBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?radiko\.jp/#!/ts/(?P<station>[A-Z0-9-]+)/(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:www\.)?radiko\.jp/#!/ts/(?P<station>[A-Z0-9-]+)/(?P<timestring>\d+)'
 
     _TESTS = [{
         # QRR (文化放送) station provides <desc>
@@ -162,14 +184,24 @@ class RadikoIE(RadikoBaseIE):
     }]
 
     def _real_extract(self, url):
-        station, video_id = self._match_valid_url(url).groups()
-        vid_int = unified_timestamp(video_id, False)
+        station, timestring = self._match_valid_url(url).group('station', 'timestring')
+        video_id = join_nonempty(station, timestring)
+        vid_int = unified_timestamp(timestring, False)
         prog, station_program, ft, radio_begin, radio_end = self._find_program(video_id, station, vid_int)
 
-        auth_cache = self.cache.load('radiko', 'auth_data')
-        for attempt in range(2):
-            auth_token, area_id = (not attempt and auth_cache) or self._auth_client()
-            formats = self._extract_formats(
+        auth_token, area_id = self._auth_client()
+
+        return {
+            'id': video_id,
+            'title': try_call(lambda: prog.find('title').text),
+            'cast': self._extract_performers(prog),
+            'description': clean_html(try_call(lambda: prog.find('info').text)),
+            'uploader': try_call(lambda: station_program.find('.//name').text),
+            'uploader_id': station,
+            'timestamp': vid_int,
+            'duration': try_call(lambda: unified_timestamp(radio_end, False) - unified_timestamp(radio_begin, False)),
+            'is_live': True,
+            'formats': self._extract_formats(
                 video_id=video_id, station=station, is_onair=False,
                 ft=ft, cursor=vid_int, auth_token=auth_token, area_id=area_id,
                 query={
@@ -177,20 +209,9 @@ class RadikoIE(RadikoBaseIE):
                     'ft': radio_begin,
                     'end_at': radio_end,
                     'to': radio_end,
-                    'seek': video_id,
-                })
-            if formats:
-                break
-
-        return {
-            'id': video_id,
-            'title': try_call(lambda: prog.find('title').text),
-            'description': clean_html(try_call(lambda: prog.find('info').text)),
-            'uploader': try_call(lambda: station_program.find('.//name').text),
-            'uploader_id': station,
-            'timestamp': vid_int,
-            'formats': formats,
-            'is_live': True,
+                    'seek': timestring,
+                },
+            ),
         }
 
 
@@ -232,6 +253,7 @@ class RadikoRadioIE(RadikoBaseIE):
         return {
             'id': station,
             'title': title,
+            'cast': self._extract_performers(prog),
             'description': description,
             'uploader': station_name,
             'uploader_id': station,
diff --git a/plugins/youtube_download/yt_dlp/extractor/radiobremen.py b/plugins/youtube_download/yt_dlp/extractor/radiobremen.py
deleted file mode 100644
index 99ba050..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/radiobremen.py
+++ /dev/null
@@ -1,59 +0,0 @@
-import re
-
-from .common import InfoExtractor
-from ..utils import parse_duration
-
-
-class RadioBremenIE(InfoExtractor):
-    _VALID_URL = r'http?://(?:www\.)?radiobremen\.de/mediathek/(?:index\.html)?\?id=(?P<id>[0-9]+)'
-    IE_NAME = 'radiobremen'
-
-    _TEST = {
-        'url': 'http://www.radiobremen.de/mediathek/?id=141876',
-        'info_dict': {
-            'id': '141876',
-            'ext': 'mp4',
-            'duration': 178,
-            'width': 512,
-            'title': 'Druck auf Patrick Öztürk',
-            'thumbnail': r're:https?://.*\.jpg$',
-            'description': 'Gegen den SPD-Bürgerschaftsabgeordneten Patrick Öztürk wird wegen Beihilfe zum gewerbsmäßigen Betrug ermittelt. Am Donnerstagabend sollte er dem Vorstand des SPD-Unterbezirks Bremerhaven dazu Rede und Antwort stehen.',
-        },
-    }
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        meta_url = 'http://www.radiobremen.de/apps/php/mediathek/metadaten.php?id=%s' % video_id
-        meta_doc = self._download_webpage(
-            meta_url, video_id, 'Downloading metadata')
-        title = self._html_search_regex(
-            r'<h1.*>(?P<title>.+)</h1>', meta_doc, 'title')
-        description = self._html_search_regex(
-            r'<p>(?P<description>.*)</p>', meta_doc, 'description', fatal=False)
-        duration = parse_duration(self._html_search_regex(
-            r'L&auml;nge:</td>\s+<td>(?P<duration>[0-9]+:[0-9]+)</td>',
-            meta_doc, 'duration', fatal=False))
-
-        page_doc = self._download_webpage(
-            url, video_id, 'Downloading video information')
-        mobj = re.search(
-            r"ardformatplayerclassic\(\'playerbereich\',\'(?P<width>[0-9]+)\',\'.*\',\'(?P<video_id>[0-9]+)\',\'(?P<secret>[0-9]+)\',\'(?P<thumbnail>.+)\',\'\'\)",
-            page_doc)
-        video_url = (
-            "http://dl-ondemand.radiobremen.de/mediabase/%s/%s_%s_%s.mp4" %
-            (video_id, video_id, mobj.group("secret"), mobj.group('width')))
-
-        formats = [{
-            'url': video_url,
-            'ext': 'mp4',
-            'width': int(mobj.group('width')),
-        }]
-        return {
-            'id': video_id,
-            'title': title,
-            'description': description,
-            'duration': duration,
-            'formats': formats,
-            'thumbnail': mobj.group('thumbnail'),
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/radiocanada.py b/plugins/youtube_download/yt_dlp/extractor/radiocanada.py
index 1a5a635..950b9ec 100644
--- a/plugins/youtube_download/yt_dlp/extractor/radiocanada.py
+++ b/plugins/youtube_download/yt_dlp/extractor/radiocanada.py
@@ -1,8 +1,8 @@
 from .common import InfoExtractor
 from ..networking.exceptions import HTTPError
 from ..utils import (
-    determine_ext,
     ExtractorError,
+    determine_ext,
     int_or_none,
     unified_strdate,
 )
@@ -24,7 +24,7 @@ class RadioCanadaIE(InfoExtractor):
             'params': {
                 # m3u8 download
                 'skip_download': True,
-            }
+            },
         },
         {
             # empty Title
@@ -50,7 +50,7 @@ class RadioCanadaIE(InfoExtractor):
                 'series': 'District 31',
             },
             'only_matching': True,
-        }
+        },
     ]
     _GEO_COUNTRIES = ['CA']
     _access_token = None
@@ -111,7 +111,7 @@ class RadioCanadaIE(InfoExtractor):
             if error == 'Le contenu sélectionné est disponible seulement en premium':
                 self.raise_login_required(error)
             raise ExtractorError(
-                '%s said: %s' % (self.IE_NAME, error), expected=True)
+                f'{self.IE_NAME} said: {error}', expected=True)
         formats = self._extract_m3u8_formats(v_url, video_id, 'mp4')
 
         subtitles = {}
@@ -162,4 +162,4 @@ class RadioCanadaAudioVideoIE(InfoExtractor):
     }]
 
     def _real_extract(self, url):
-        return self.url_result('radiocanada:medianet:%s' % self._match_id(url))
+        return self.url_result(f'radiocanada:medianet:{self._match_id(url)}')
diff --git a/plugins/youtube_download/yt_dlp/extractor/radiocomercial.py b/plugins/youtube_download/yt_dlp/extractor/radiocomercial.py
new file mode 100644
index 0000000..7e4609a
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/radiocomercial.py
@@ -0,0 +1,154 @@
+import itertools
+
+from .common import InfoExtractor
+from ..networking.exceptions import HTTPError
+from ..utils import (
+    ExtractorError,
+    extract_attributes,
+    get_element_by_class,
+    get_element_html_by_class,
+    get_element_text_and_html_by_tag,
+    get_elements_html_by_class,
+    int_or_none,
+    join_nonempty,
+    try_call,
+    unified_strdate,
+    update_url,
+    urljoin,
+)
+from ..utils.traversal import traverse_obj
+
+
+class RadioComercialIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?radiocomercial\.pt/podcasts/[^/?#]+/t?(?P<season>\d+)/(?P<id>[\w-]+)'
+    _TESTS = [{
+        'url': 'https://radiocomercial.pt/podcasts/o-homem-que-mordeu-o-cao/t6/taylor-swift-entranhando-se-que-nem-uma-espada-no-ventre-dos-fas#page-content-wrapper',
+        'md5': '5f4fe8e485b29d2e8fd495605bc2c7e4',
+        'info_dict': {
+            'id': 'taylor-swift-entranhando-se-que-nem-uma-espada-no-ventre-dos-fas',
+            'ext': 'mp3',
+            'title': 'Taylor Swift entranhando-se que nem uma espada no ventre dos fãs.',
+            'release_date': '20231025',
+            'thumbnail': r're:https://radiocomercial.pt/upload/[^.]+.jpg',
+            'season': 'Season 6',
+            'season_number': 6,
+        },
+    }, {
+        'url': 'https://radiocomercial.pt/podcasts/convenca-me-num-minuto/t3/convenca-me-num-minuto-que-os-lobisomens-existem',
+        'md5': '47e96c273aef96a8eb160cd6cf46d782',
+        'info_dict': {
+            'id': 'convenca-me-num-minuto-que-os-lobisomens-existem',
+            'ext': 'mp3',
+            'title': 'Convença-me num minuto que os lobisomens existem',
+            'release_date': '20231026',
+            'thumbnail': r're:https://radiocomercial.pt/upload/[^.]+.jpg',
+            'season': 'Season 3',
+            'season_number': 3,
+        },
+    }, {
+        'url': 'https://radiocomercial.pt/podcasts/inacreditavel-by-ines-castel-branco/t2/o-desastre-de-aviao',
+        'md5': '69be64255420fec23b7259955d771e54',
+        'info_dict': {
+            'id': 'o-desastre-de-aviao',
+            'ext': 'mp3',
+            'title': 'O desastre de avião',
+            'description': 'md5:8a82beeb372641614772baab7246245f',
+            'release_date': '20231101',
+            'thumbnail': r're:https://radiocomercial.pt/upload/[^.]+.jpg',
+            'season': 'Season 2',
+            'season_number': 2,
+        },
+        'params': {
+            # inconsistant md5
+            'skip_download': True,
+        },
+    }, {
+        'url': 'https://radiocomercial.pt/podcasts/tnt-todos-no-top/2023/t-n-t-29-de-outubro',
+        'md5': '91d32d4d4b1407272068b102730fc9fa',
+        'info_dict': {
+            'id': 't-n-t-29-de-outubro',
+            'ext': 'mp3',
+            'title': 'T.N.T 29 de outubro',
+            'release_date': '20231029',
+            'thumbnail': r're:https://radiocomercial.pt/upload/[^.]+.jpg',
+            'season': 'Season 2023',
+            'season_number': 2023,
+        },
+    }]
+
+    def _real_extract(self, url):
+        video_id, season = self._match_valid_url(url).group('id', 'season')
+        webpage = self._download_webpage(url, video_id)
+        return {
+            'id': video_id,
+            'title': self._html_extract_title(webpage),
+            'description': self._og_search_description(webpage, default=None),
+            'release_date': unified_strdate(get_element_by_class(
+                'date', get_element_html_by_class('descriptions', webpage) or '')),
+            'thumbnail': self._og_search_thumbnail(webpage),
+            'season_number': int_or_none(season),
+            'url': extract_attributes(get_element_html_by_class('audiofile', webpage) or '').get('href'),
+        }
+
+
+class RadioComercialPlaylistIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?radiocomercial\.pt/podcasts/(?P<id>[\w-]+)(?:/t?(?P<season>\d+))?/?(?:$|[?#])'
+    _TESTS = [{
+        'url': 'https://radiocomercial.pt/podcasts/convenca-me-num-minuto/t3',
+        'info_dict': {
+            'id': 'convenca-me-num-minuto_t3',
+            'title': 'Convença-me num Minuto - Temporada 3',
+        },
+        'playlist_mincount': 32,
+    }, {
+        'url': 'https://radiocomercial.pt/podcasts/o-homem-que-mordeu-o-cao',
+        'info_dict': {
+            'id': 'o-homem-que-mordeu-o-cao',
+            'title': 'O Homem Que Mordeu o Cão',
+        },
+        'playlist_mincount': 19,
+    }, {
+        'url': 'https://radiocomercial.pt/podcasts/as-minhas-coisas-favoritas',
+        'info_dict': {
+            'id': 'as-minhas-coisas-favoritas',
+            'title': 'As Minhas Coisas Favoritas',
+        },
+        'playlist_mincount': 131,
+    }, {
+        'url': 'https://radiocomercial.pt/podcasts/tnt-todos-no-top/t2023',
+        'info_dict': {
+            'id': 'tnt-todos-no-top_t2023',
+            'title': 'TNT - Todos No Top - Temporada 2023',
+        },
+        'playlist_mincount': 39,
+    }]
+
+    def _entries(self, url, playlist_id):
+        for page in itertools.count(1):
+            try:
+                webpage = self._download_webpage(
+                    f'{url}/{page}', playlist_id, f'Downloading page {page}')
+            except ExtractorError as e:
+                if isinstance(e.cause, HTTPError) and e.cause.status == 404:
+                    break
+                raise
+
+            episodes = get_elements_html_by_class('tm-ouvir-podcast', webpage)
+            if not episodes:
+                break
+            for url_path in traverse_obj(episodes, (..., {extract_attributes}, 'href')):
+                episode_url = urljoin(url, url_path)
+                if RadioComercialIE.suitable(episode_url):
+                    yield episode_url
+
+    def _real_extract(self, url):
+        podcast, season = self._match_valid_url(url).group('id', 'season')
+        playlist_id = join_nonempty(podcast, season, delim='_t')
+        url = update_url(url, query=None, fragment=None)
+        webpage = self._download_webpage(url, playlist_id)
+
+        name = try_call(lambda: get_element_text_and_html_by_tag('h1', webpage)[0])
+        title = name if name == season else join_nonempty(name, season, delim=' - Temporada ')
+
+        return self.playlist_from_matches(
+            self._entries(url, playlist_id), playlist_id, title, ie=RadioComercialIE)
diff --git a/plugins/youtube_download/yt_dlp/extractor/radiode.py b/plugins/youtube_download/yt_dlp/extractor/radiode.py
index 32c36d5..1bf7449 100644
--- a/plugins/youtube_download/yt_dlp/extractor/radiode.py
+++ b/plugins/youtube_download/yt_dlp/extractor/radiode.py
@@ -2,6 +2,7 @@ from .common import InfoExtractor
 
 
 class RadioDeIE(InfoExtractor):
+    _WORKING = False
     IE_NAME = 'radio.de'
     _VALID_URL = r'https?://(?P<id>.+?)\.(?:radio\.(?:de|at|fr|pt|es|pl|it)|rad\.io)'
     _TEST = {
@@ -16,7 +17,7 @@ class RadioDeIE(InfoExtractor):
         },
         'params': {
             'skip_download': True,
-        }
+        },
     }
 
     def _real_extract(self, url):
@@ -36,7 +37,7 @@ class RadioDeIE(InfoExtractor):
             'ext': stream['streamContentFormat'].lower(),
             'acodec': stream['streamContentFormat'],
             'abr': stream['bitRate'],
-            'asr': stream['sampleRate']
+            'asr': stream['sampleRate'],
         } for stream in broadcast['streamUrls']]
 
         return {
diff --git a/plugins/youtube_download/yt_dlp/extractor/radiofrance.py b/plugins/youtube_download/yt_dlp/extractor/radiofrance.py
index 92e51b7..9d90439 100644
--- a/plugins/youtube_download/yt_dlp/extractor/radiofrance.py
+++ b/plugins/youtube_download/yt_dlp/extractor/radiofrance.py
@@ -1,11 +1,22 @@
+import itertools
 import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..utils import parse_duration, unified_strdate
+from ..utils import (
+    int_or_none,
+    join_nonempty,
+    js_to_json,
+    parse_duration,
+    strftime_or_none,
+    traverse_obj,
+    unified_strdate,
+    urljoin,
+)
 
 
 class RadioFranceIE(InfoExtractor):
-    _VALID_URL = r'^https?://maison\.radiofrance\.fr/radiovisions/(?P<id>[^?#]+)'
+    _VALID_URL = r'https?://maison\.radiofrance\.fr/radiovisions/(?P<id>[^?#]+)'
     IE_NAME = 'radiofrance'
 
     _TEST = {
@@ -56,8 +67,32 @@ class RadioFranceIE(InfoExtractor):
         }
 
 
-class FranceCultureIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?radiofrance\.fr/(?:franceculture|fip|francemusique|mouv|franceinter)/podcasts/(?:[^?#]+/)?(?P<display_id>[^?#]+)-(?P<id>\d+)($|[?#])'
+class RadioFranceBaseIE(InfoExtractor):
+    _VALID_URL_BASE = r'https?://(?:www\.)?radiofrance\.fr'
+
+    _STATIONS_RE = '|'.join(map(re.escape, (
+        'franceculture',
+        'franceinfo',
+        'franceinter',
+        'francemusique',
+        'fip',
+        'mouv',
+    )))
+
+    def _extract_data_from_webpage(self, webpage, display_id, key):
+        return traverse_obj(self._search_json(
+            r'\bconst\s+data\s*=', webpage, key, display_id,
+            contains_pattern=r'\[\{(?s:.+)\}\]', transform_source=js_to_json),
+            (..., 'data', key, {dict}), get_all=False) or {}
+
+
+class FranceCultureIE(RadioFranceBaseIE):
+    _VALID_URL = rf'''(?x)
+        {RadioFranceBaseIE._VALID_URL_BASE}
+        /(?:{RadioFranceBaseIE._STATIONS_RE})
+        /podcasts/(?:[^?#]+/)?(?P<display_id>[^?#]+)-(?P<id>\d{{6,}})(?:$|[?#])
+    '''
+
     _TESTS = [
         {
             'url': 'https://www.radiofrance.fr/franceculture/podcasts/science-en-questions/la-physique-d-einstein-aiderait-elle-a-comprendre-le-cerveau-8440487',
@@ -67,15 +102,31 @@ class FranceCultureIE(InfoExtractor):
                 'ext': 'mp3',
                 'title': 'La physique d’Einstein aiderait-elle à comprendre le cerveau ?',
                 'description': 'Existerait-il un pont conceptuel entre la physique de l’espace-temps et les neurosciences ?',
-                'thumbnail': 'https://cdn.radiofrance.fr/s3/cruiser-production/2022/05/d184e7a3-4827-4494-bf94-04ed7b120db4/1200x630_gettyimages-200171095-001.jpg',
+                'thumbnail': r're:^https?://.*\.(?:jpg|png)',
                 'upload_date': '20220514',
                 'duration': 2750,
             },
         },
+        {
+            'url': 'https://www.radiofrance.fr/franceinter/podcasts/le-7-9-30/le-7-9-30-du-vendredi-10-mars-2023-2107675',
+            'info_dict': {
+                'id': '2107675',
+                'display_id': 'le-7-9-30-du-vendredi-10-mars-2023',
+                'title': 'Inflation alimentaire : comment en sortir ? - Régis Debray et Claude Grange - Cybèle Idelot',
+                'description': 'md5:36ee74351ede77a314fdebb94026b916',
+                'thumbnail': r're:^https?://.*\.(?:jpg|png)',
+                'upload_date': '20230310',
+                'duration': 8977,
+                'ext': 'mp3',
+            },
+        },
         {
             'url': 'https://www.radiofrance.fr/franceinter/podcasts/la-rafle-du-vel-d-hiv-une-affaire-d-etat/les-racines-du-crime-episode-1-3715507',
             'only_matching': True,
-        }
+        }, {
+            'url': 'https://www.radiofrance.fr/franceinfo/podcasts/le-billet-sciences/sante-bientot-un-vaccin-contre-l-asthme-allergique-3057200',
+            'only_matching': True,
+        },
     ]
 
     def _real_extract(self, url):
@@ -89,7 +140,6 @@ class FranceCultureIE(InfoExtractor):
             'id': video_id,
             'display_id': display_id,
             'url': video_data['contentUrl'],
-            'ext': video_data.get('encodingFormat'),
             'vcodec': 'none' if video_data.get('encodingFormat') == 'mp3' else None,
             'duration': parse_duration(video_data.get('duration')),
             'title': self._html_search_regex(r'(?s)<h1[^>]*itemprop="[^"]*name[^"]*"[^>]*>(.+?)</h1>',
@@ -100,5 +150,324 @@ class FranceCultureIE(InfoExtractor):
             'uploader': self._html_search_regex(
                 r'(?s)<span class="author">(.*?)</span>', webpage, 'uploader', default=None),
             'upload_date': unified_strdate(self._search_regex(
-                r'"datePublished"\s*:\s*"([^"]+)', webpage, 'timestamp', fatal=False))
+                r'"datePublished"\s*:\s*"([^"]+)', webpage, 'timestamp', fatal=False)),
         }
+
+
+class RadioFranceLiveIE(RadioFranceBaseIE):
+    _VALID_URL = rf'''(?x)
+        https?://(?:www\.)?radiofrance\.fr
+        /(?P<id>{RadioFranceBaseIE._STATIONS_RE})
+        /?(?P<substation_id>radio-[\w-]+)?(?:[#?]|$)
+    '''
+
+    _TESTS = [{
+        'url': 'https://www.radiofrance.fr/franceinter/',
+        'info_dict': {
+            'id': 'franceinter',
+            'title': str,
+            'live_status': 'is_live',
+            'ext': 'aac',
+        },
+        'params': {
+            'skip_download': 'Livestream',
+        },
+    }, {
+        'url': 'https://www.radiofrance.fr/franceculture',
+        'info_dict': {
+            'id': 'franceculture',
+            'title': str,
+            'live_status': 'is_live',
+            'ext': 'aac',
+        },
+        'params': {
+            'skip_download': 'Livestream',
+        },
+    }, {
+        'url': 'https://www.radiofrance.fr/mouv/radio-musique-kids-family',
+        'info_dict': {
+            'id': 'mouv-radio-musique-kids-family',
+            'title': str,
+            'live_status': 'is_live',
+            'ext': 'aac',
+        },
+        'params': {
+            'skip_download': 'Livestream',
+        },
+    }, {
+        'url': 'https://www.radiofrance.fr/mouv/radio-rnb-soul',
+        'info_dict': {
+            'id': 'mouv-radio-rnb-soul',
+            'title': str,
+            'live_status': 'is_live',
+            'ext': 'aac',
+        },
+        'params': {
+            'skip_download': 'Livestream',
+        },
+    }, {
+        'url': 'https://www.radiofrance.fr/mouv/radio-musique-mix',
+        'info_dict': {
+            'id': 'mouv-radio-musique-mix',
+            'title': str,
+            'live_status': 'is_live',
+            'ext': 'aac',
+        },
+        'params': {
+            'skip_download': 'Livestream',
+        },
+    }, {
+        'url': 'https://www.radiofrance.fr/fip/radio-rock',
+        'info_dict': {
+            'id': 'fip-radio-rock',
+            'title': str,
+            'live_status': 'is_live',
+            'ext': 'aac',
+        },
+        'params': {
+            'skip_download': 'Livestream',
+        },
+    }, {
+        'url': 'https://www.radiofrance.fr/mouv',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        station_id, substation_id = self._match_valid_url(url).group('id', 'substation_id')
+
+        if substation_id:
+            webpage = self._download_webpage(url, station_id)
+            api_response = self._extract_data_from_webpage(webpage, station_id, 'webRadioData')
+        else:
+            api_response = self._download_json(
+                f'https://www.radiofrance.fr/{station_id}/api/live', station_id)
+
+        formats, subtitles = [], {}
+        for media_source in traverse_obj(api_response, (('now', None), 'media', 'sources', lambda _, v: v['url'])):
+            if media_source.get('format') == 'hls':
+                fmts, subs = self._extract_m3u8_formats_and_subtitles(media_source['url'], station_id, fatal=False)
+                formats.extend(fmts)
+                self._merge_subtitles(subs, target=subtitles)
+            else:
+                formats.append({
+                    'url': media_source['url'],
+                    'abr': media_source.get('bitrate'),
+                })
+
+        return {
+            'id': join_nonempty(station_id, substation_id),
+            'title': traverse_obj(api_response, ('visual', 'legend')) or join_nonempty(
+                ('now', 'firstLine', 'title'), ('now', 'secondLine', 'title'), from_dict=api_response, delim=' - '),
+            'formats': formats,
+            'subtitles': subtitles,
+            'is_live': True,
+        }
+
+
+class RadioFrancePlaylistBaseIE(RadioFranceBaseIE):
+    """Subclasses must set _METADATA_KEY"""
+
+    def _call_api(self, content_id, cursor, page_num):
+        raise NotImplementedError('This method must be implemented by subclasses')
+
+    def _generate_playlist_entries(self, content_id, content_response):
+        for page_num in itertools.count(2):
+            for entry in content_response['items']:
+                yield self.url_result(
+                    f'https://www.radiofrance.fr/{entry["path"]}', url_transparent=True, **traverse_obj(entry, {
+                        'title': 'title',
+                        'description': 'standFirst',
+                        'timestamp': ('publishedDate', {int_or_none}),
+                        'thumbnail': ('visual', 'src'),
+                    }))
+
+            next_cursor = traverse_obj(content_response, (('pagination', None), 'next'), get_all=False)
+            if not next_cursor:
+                break
+
+            content_response = self._call_api(content_id, next_cursor, page_num)
+
+    def _real_extract(self, url):
+        display_id = self._match_id(url)
+
+        metadata = self._download_json(
+            'https://www.radiofrance.fr/api/v2.1/path', display_id,
+            query={'value': urllib.parse.urlparse(url).path})['content']
+
+        content_id = metadata['id']
+
+        return self.playlist_result(
+            self._generate_playlist_entries(content_id, metadata[self._METADATA_KEY]), content_id,
+            display_id=display_id, **{**traverse_obj(metadata, {
+                'title': 'title',
+                'description': 'standFirst',
+                'thumbnail': ('visual', 'src'),
+            }), **traverse_obj(metadata, {
+                'title': 'name',
+                'description': 'role',
+            })})
+
+
+class RadioFrancePodcastIE(RadioFrancePlaylistBaseIE):
+    _VALID_URL = rf'''(?x)
+        {RadioFranceBaseIE._VALID_URL_BASE}
+        /(?:{RadioFranceBaseIE._STATIONS_RE})
+        /podcasts/(?P<id>[\w-]+)/?(?:[?#]|$)
+    '''
+
+    _TESTS = [{
+        'url': 'https://www.radiofrance.fr/franceinfo/podcasts/le-billet-vert',
+        'info_dict': {
+            'id': 'eaf6ef81-a980-4f1c-a7d1-8a75ecd54b17',
+            'display_id': 'le-billet-vert',
+            'title': 'Le billet sciences',
+            'description': 'md5:eb1007b34b0c0a680daaa71525bbd4c1',
+            'thumbnail': r're:^https?://.*\.(?:jpg|png)',
+        },
+        'playlist_mincount': 11,
+    }, {
+        'url': 'https://www.radiofrance.fr/franceinter/podcasts/jean-marie-le-pen-l-obsession-nationale',
+        'info_dict': {
+            'id': '566fd524-3074-4fbc-ac69-8696f2152a54',
+            'display_id': 'jean-marie-le-pen-l-obsession-nationale',
+            'title': 'Jean-Marie Le Pen, l\'obsession nationale',
+            'description': 'md5:a07c0cfb894f6d07a62d0ad12c4b7d73',
+            'thumbnail': r're:^https?://.*\.(?:jpg|png)',
+        },
+        'playlist_count': 7,
+    }, {
+        'url': 'https://www.radiofrance.fr/franceculture/podcasts/serie-thomas-grjebine',
+        'info_dict': {
+            'id': '63c1ddc9-9f15-457a-98b2-411bac63f48d',
+            'display_id': 'serie-thomas-grjebine',
+            'title': 'Thomas Grjebine',
+        },
+        'playlist_count': 1,
+    }, {
+        'url': 'https://www.radiofrance.fr/fip/podcasts/certains-l-aiment-fip',
+        'info_dict': {
+            'id': '143dff38-e956-4a5d-8576-1c0b7242b99e',
+            'display_id': 'certains-l-aiment-fip',
+            'title': 'Certains l’aiment Fip',
+            'description': 'md5:ff974672ba00d4fd5be80fb001c5b27e',
+            'thumbnail': r're:^https?://.*\.(?:jpg|png)',
+        },
+        'playlist_mincount': 321,
+    }, {
+        'url': 'https://www.radiofrance.fr/franceinter/podcasts/le-7-9',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.radiofrance.fr/mouv/podcasts/dirty-mix',
+        'only_matching': True,
+    }]
+
+    _METADATA_KEY = 'expressions'
+
+    def _call_api(self, podcast_id, cursor, page_num):
+        return self._download_json(
+            f'https://www.radiofrance.fr/api/v2.1/concepts/{podcast_id}/expressions', podcast_id,
+            note=f'Downloading page {page_num}', query={'pageCursor': cursor})
+
+
+class RadioFranceProfileIE(RadioFrancePlaylistBaseIE):
+    _VALID_URL = rf'{RadioFranceBaseIE._VALID_URL_BASE}/personnes/(?P<id>[\w-]+)'
+
+    _TESTS = [{
+        'url': 'https://www.radiofrance.fr/personnes/thomas-pesquet?p=3',
+        'info_dict': {
+            'id': '86c62790-e481-11e2-9f7b-782bcb6744eb',
+            'display_id': 'thomas-pesquet',
+            'title': 'Thomas Pesquet',
+            'description': 'Astronaute à l\'agence spatiale européenne',
+        },
+        'playlist_mincount': 212,
+    }, {
+        'url': 'https://www.radiofrance.fr/personnes/eugenie-bastie',
+        'info_dict': {
+            'id': '9593050b-0183-4972-a0b5-d8f699079e02',
+            'display_id': 'eugenie-bastie',
+            'title': 'Eugénie Bastié',
+            'description': 'Journaliste et essayiste',
+            'thumbnail': r're:^https?://.*\.(?:jpg|png)',
+        },
+        'playlist_mincount': 39,
+    }, {
+        'url': 'https://www.radiofrance.fr/personnes/lea-salame',
+        'only_matching': True,
+    }]
+
+    _METADATA_KEY = 'documents'
+
+    def _call_api(self, profile_id, cursor, page_num):
+        resp = self._download_json(
+            f'https://www.radiofrance.fr/api/v2.1/taxonomy/{profile_id}/documents', profile_id,
+            note=f'Downloading page {page_num}', query={
+                'relation': 'personality',
+                'cursor': cursor,
+            })
+
+        resp['next'] = traverse_obj(resp, ('pagination', 'next'))
+        return resp
+
+
+class RadioFranceProgramScheduleIE(RadioFranceBaseIE):
+    _VALID_URL = rf'''(?x)
+        {RadioFranceBaseIE._VALID_URL_BASE}
+        /(?P<station>{RadioFranceBaseIE._STATIONS_RE})
+        /grille-programmes(?:\?date=(?P<date>[\d-]+))?
+    '''
+
+    _TESTS = [{
+        'url': 'https://www.radiofrance.fr/franceinter/grille-programmes?date=17-02-2023',
+        'info_dict': {
+            'id': 'franceinter-program-20230217',
+            'upload_date': '20230217',
+        },
+        'playlist_count': 25,
+    }, {
+        'url': 'https://www.radiofrance.fr/franceculture/grille-programmes?date=01-02-2023',
+        'info_dict': {
+            'id': 'franceculture-program-20230201',
+            'upload_date': '20230201',
+        },
+        'playlist_count': 25,
+    }, {
+        'url': 'https://www.radiofrance.fr/mouv/grille-programmes?date=19-03-2023',
+        'info_dict': {
+            'id': 'mouv-program-20230319',
+            'upload_date': '20230319',
+        },
+        'playlist_count': 3,
+    }, {
+        'url': 'https://www.radiofrance.fr/francemusique/grille-programmes?date=18-03-2023',
+        'info_dict': {
+            'id': 'francemusique-program-20230318',
+            'upload_date': '20230318',
+        },
+        'playlist_count': 15,
+    }, {
+        'url': 'https://www.radiofrance.fr/franceculture/grille-programmes',
+        'only_matching': True,
+    }]
+
+    def _generate_playlist_entries(self, webpage_url, api_response):
+        for entry in traverse_obj(api_response, ('steps', lambda _, v: v['expression']['path'])):
+            yield self.url_result(
+                urljoin(webpage_url, f'/{entry["expression"]["path"]}'), ie=FranceCultureIE,
+                url_transparent=True, **traverse_obj(entry, {
+                    'title': ('expression', 'title'),
+                    'thumbnail': ('expression', 'visual', 'src'),
+                    'timestamp': ('startTime', {int_or_none}),
+                    'series_id': ('concept', 'id'),
+                    'series': ('concept', 'title'),
+                }))
+
+    def _real_extract(self, url):
+        station, date = self._match_valid_url(url).group('station', 'date')
+        webpage = self._download_webpage(url, station)
+        grid_data = self._extract_data_from_webpage(webpage, station, 'grid')
+        upload_date = strftime_or_none(grid_data.get('date'), '%Y%m%d')
+
+        return self.playlist_result(
+            self._generate_playlist_entries(url, grid_data),
+            join_nonempty(station, 'program', upload_date), upload_date=upload_date)
diff --git a/plugins/youtube_download/yt_dlp/extractor/radiojavan.py b/plugins/youtube_download/yt_dlp/extractor/radiojavan.py
index 6a91394..53cbbe3 100644
--- a/plugins/youtube_download/yt_dlp/extractor/radiojavan.py
+++ b/plugins/youtube_download/yt_dlp/extractor/radiojavan.py
@@ -11,6 +11,7 @@ from ..utils import (
 
 
 class RadioJavanIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?radiojavan\.com/videos/video/(?P<id>[^/]+)/?'
     _TEST = {
         'url': 'http://www.radiojavan.com/videos/video/chaartaar-ashoobam',
@@ -24,7 +25,7 @@ class RadioJavanIE(InfoExtractor):
             'view_count': int,
             'like_count': int,
             'dislike_count': int,
-        }
+        },
     }
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/radiokapital.py b/plugins/youtube_download/yt_dlp/extractor/radiokapital.py
index 8f9737a..2d08708 100644
--- a/plugins/youtube_download/yt_dlp/extractor/radiokapital.py
+++ b/plugins/youtube_download/yt_dlp/extractor/radiokapital.py
@@ -1,22 +1,18 @@
-from .common import InfoExtractor
-from ..utils import (
-    clean_html,
-    traverse_obj,
-    unescapeHTML,
-)
-
 import itertools
-from urllib.parse import urlencode
+import urllib.parse
+
+from .common import InfoExtractor
+from ..utils import clean_html, traverse_obj, unescapeHTML
 
 
 class RadioKapitalBaseIE(InfoExtractor):
     def _call_api(self, resource, video_id, note='Downloading JSON metadata', qs={}):
         return self._download_json(
-            f'https://www.radiokapital.pl/wp-json/kapital/v1/{resource}?{urlencode(qs)}',
+            f'https://www.radiokapital.pl/wp-json/kapital/v1/{resource}?{urllib.parse.urlencode(qs)}',
             video_id, note=note)
 
     def _parse_episode(self, data):
-        release = '%s%s%s' % (data['published'][6:11], data['published'][3:6], data['published'][:3])
+        release = '{}{}{}'.format(data['published'][6:11], data['published'][3:6], data['published'][:3])
         return {
             '_type': 'url_transparent',
             'url': data['mixcloud_url'],
@@ -50,7 +46,7 @@ class RadioKapitalIE(RadioKapitalBaseIE):
     def _real_extract(self, url):
         video_id = self._match_id(url)
 
-        episode = self._call_api('episodes/%s' % video_id, video_id)
+        episode = self._call_api(f'episodes/{video_id}', video_id)
         return self._parse_episode(episode)
 
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/radioradicale.py b/plugins/youtube_download/yt_dlp/extractor/radioradicale.py
new file mode 100644
index 0000000..472e25c
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/radioradicale.py
@@ -0,0 +1,105 @@
+from .common import InfoExtractor
+from ..utils import url_or_none
+from ..utils.traversal import traverse_obj
+
+
+class RadioRadicaleIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?radioradicale\.it/scheda/(?P<id>[0-9]+)'
+    _TESTS = [{
+        'url': 'https://www.radioradicale.it/scheda/471591',
+        'md5': 'eb0fbe43a601f1a361cbd00f3c45af4a',
+        'info_dict': {
+            'id': '471591',
+            'ext': 'mp4',
+            'title': 'md5:e8fbb8de57011a3255db0beca69af73d',
+            'description': 'md5:5e15a789a2fe4d67da8d1366996e89ef',
+            'location': 'Napoli',
+            'duration': 2852.0,
+            'timestamp': 1459987200,
+            'upload_date': '20160407',
+            'thumbnail': 'https://www.radioradicale.it/photo400/0/0/9/0/1/00901768.jpg',
+        },
+    }, {
+        'url': 'https://www.radioradicale.it/scheda/742783/parlamento-riunito-in-seduta-comune-11a-della-xix-legislatura',
+        'info_dict': {
+            'id': '742783',
+            'title': 'Parlamento riunito in seduta comune (11ª della XIX legislatura)',
+            'description': '-) Votazione per l\'elezione di un giudice della Corte Costituzionale (nono scrutinio)',
+            'location': 'CAMERA',
+            'duration': 5868.0,
+            'timestamp': 1730246400,
+            'upload_date': '20241030',
+        },
+        'playlist': [{
+            'md5': 'aa48de55dcc45478e4cd200f299aab7d',
+            'info_dict': {
+                'id': '742783-0',
+                'ext': 'mp4',
+                'title': 'Parlamento riunito in seduta comune (11ª della XIX legislatura)',
+            },
+        }, {
+            'md5': 'be915c189c70ad2920e5810f32260ff5',
+            'info_dict': {
+                'id': '742783-1',
+                'ext': 'mp4',
+                'title': 'Parlamento riunito in seduta comune (11ª della XIX legislatura)',
+            },
+        }, {
+            'md5': 'f0ee4047342baf8ed3128a8417ac5e0a',
+            'info_dict': {
+                'id': '742783-2',
+                'ext': 'mp4',
+                'title': 'Parlamento riunito in seduta comune (11ª della XIX legislatura)',
+            },
+        }],
+    }]
+
+    def _entries(self, videos_info, page_id):
+        for idx, video in enumerate(traverse_obj(
+                videos_info, ('playlist', lambda _, v: v['sources']))):
+            video_id = f'{page_id}-{idx}'
+            formats = []
+            subtitles = {}
+
+            for m3u8_url in traverse_obj(video, ('sources', ..., 'src', {url_or_none})):
+                fmts, subs = self._extract_m3u8_formats_and_subtitles(m3u8_url, video_id)
+                formats.extend(fmts)
+                self._merge_subtitles(subs, target=subtitles)
+            for sub in traverse_obj(video, ('subtitles', ..., lambda _, v: url_or_none(v['src']))):
+                self._merge_subtitles({sub.get('srclang') or 'und': [{
+                    'url': sub['src'],
+                    'name': sub.get('label'),
+                }]}, target=subtitles)
+
+            yield {
+                'id': video_id,
+                'title': video.get('title'),
+                'formats': formats,
+                'subtitles': subtitles,
+            }
+
+    def _real_extract(self, url):
+        page_id = self._match_id(url)
+        webpage = self._download_webpage(url, page_id)
+
+        videos_info = self._search_json(
+            r'jQuery\.extend\(Drupal\.settings\s*,',
+            webpage, 'videos_info', page_id)['RRscheda']
+
+        entries = list(self._entries(videos_info, page_id))
+
+        common_info = {
+            'id': page_id,
+            'title': self._og_search_title(webpage),
+            'description': self._og_search_description(webpage),
+            'location': videos_info.get('luogo'),
+            **self._search_json_ld(webpage, page_id),
+        }
+
+        if len(entries) == 1:
+            return {
+                **entries[0],
+                **common_info,
+            }
+
+        return self.playlist_result(entries, multi_video=True, **common_info)
diff --git a/plugins/youtube_download/yt_dlp/extractor/radiozet.py b/plugins/youtube_download/yt_dlp/extractor/radiozet.py
index 6752017..e91b3b2 100644
--- a/plugins/youtube_download/yt_dlp/extractor/radiozet.py
+++ b/plugins/youtube_download/yt_dlp/extractor/radiozet.py
@@ -1,7 +1,7 @@
 from .common import InfoExtractor
 from ..utils import (
-    traverse_obj,
     strip_or_none,
+    traverse_obj,
 )
 
 
@@ -21,7 +21,7 @@ class RadioZetPodcastIE(InfoExtractor):
             'duration': 83,
             'series': 'Nie Ma Za Co',
             'creator': 'Katarzyna Pakosińska',
-        }
+        },
     }
 
     def _call_api(self, podcast_id, display_id):
diff --git a/plugins/youtube_download/yt_dlp/extractor/radlive.py b/plugins/youtube_download/yt_dlp/extractor/radlive.py
index 9bcbb11..6050892 100644
--- a/plugins/youtube_download/yt_dlp/extractor/radlive.py
+++ b/plugins/youtube_download/yt_dlp/extractor/radlive.py
@@ -1,13 +1,13 @@
 import json
 
+from .common import InfoExtractor
 from ..utils import (
     ExtractorError,
     format_field,
     traverse_obj,
     try_get,
-    unified_timestamp
+    unified_timestamp,
 )
-from .common import InfoExtractor
 
 
 class RadLiveIE(InfoExtractor):
@@ -27,7 +27,7 @@ class RadLiveIE(InfoExtractor):
             'channel': 'Proximity',
             'channel_id': '9ce6dd01-70a4-4d59-afb6-d01f807cd009',
             'channel_url': 'https://rad.live/content/channel/9ce6dd01-70a4-4d59-afb6-d01f807cd009',
-        }
+        },
     }, {
         'url': 'https://rad.live/content/episode/bbcf66ec-0d02-4ca0-8dc0-4213eb2429bf',
         'md5': '40b2175f347592125d93e9a344080125',
@@ -38,10 +38,6 @@ class RadLiveIE(InfoExtractor):
             'language': 'en',
             'thumbnail': 'https://lsp.littlstar.com/channels/WHISTLE/BAD_JOKES/SEASON_1/BAD_JOKES_101/poster.jpg',
             'description': 'Bad Jokes - Champions, Adam Pally, Super Troopers, Team Edge and 2Hype',
-            'release_timestamp': None,
-            'channel': None,
-            'channel_id': None,
-            'channel_url': None,
             'episode': 'E01: Bad Jokes 1',
             'episode_number': 1,
             'episode_id': '336',
@@ -108,7 +104,7 @@ class RadLiveSeasonIE(RadLiveIE):  # XXX: Do not subclass from concrete IE
 
     @classmethod
     def suitable(cls, url):
-        return False if RadLiveIE.suitable(url) else super(RadLiveSeasonIE, cls).suitable(url)
+        return False if RadLiveIE.suitable(url) else super().suitable(url)
 
     def _real_extract(self, url):
         season_id = self._match_id(url)
@@ -158,7 +154,7 @@ query WebChannelListing ($lrn: ID!) {
 
     @classmethod
     def suitable(cls, url):
-        return False if RadLiveIE.suitable(url) else super(RadLiveChannelIE, cls).suitable(url)
+        return False if RadLiveIE.suitable(url) else super().suitable(url)
 
     def _real_extract(self, url):
         channel_id = self._match_id(url)
@@ -168,8 +164,8 @@ query WebChannelListing ($lrn: ID!) {
             headers={'Content-Type': 'application/json'},
             data=json.dumps({
                 'query': self._QUERY,
-                'variables': {'lrn': f'lrn:12core:media:content:channel:{channel_id}'}
-            }).encode('utf-8'))
+                'variables': {'lrn': f'lrn:12core:media:content:channel:{channel_id}'},
+            }).encode())
 
         data = traverse_obj(graphql, ('data', 'channel'))
         if not data:
diff --git a/plugins/youtube_download/yt_dlp/extractor/rai.py b/plugins/youtube_download/yt_dlp/extractor/rai.py
index df4102a..c489dc7 100644
--- a/plugins/youtube_download/yt_dlp/extractor/rai.py
+++ b/plugins/youtube_download/yt_dlp/extractor/rai.py
@@ -1,12 +1,13 @@
 import re
 
 from .common import InfoExtractor
+from ..networking import HEADRequest
 from ..utils import (
+    ExtractorError,
+    GeoRestrictedError,
     clean_html,
     determine_ext,
-    ExtractorError,
     filter_dict,
-    GeoRestrictedError,
     int_or_none,
     join_nonempty,
     parse_duration,
@@ -27,6 +28,29 @@ class RaiBaseIE(InfoExtractor):
     _GEO_COUNTRIES = ['IT']
     _GEO_BYPASS = False
 
+    def _fix_m3u8_formats(self, media_url, video_id):
+        fmts = self._extract_m3u8_formats(
+            media_url, video_id, 'mp4', m3u8_id='hls', fatal=False)
+
+        # Fix malformed m3u8 manifests by setting audio-only/video-only formats
+        for f in fmts:
+            if not f.get('acodec'):
+                f['acodec'] = 'mp4a'
+            if not f.get('vcodec'):
+                f['vcodec'] = 'avc1'
+            man_url = f['url']
+            if re.search(r'chunklist(?:_b\d+)*_ao[_.]', man_url):  # audio only
+                f['vcodec'] = 'none'
+            elif re.search(r'chunklist(?:_b\d+)*_vo[_.]', man_url):  # video only
+                f['acodec'] = 'none'
+            else:  # video+audio
+                if f['acodec'] == 'none':
+                    f['acodec'] = 'mp4a'
+                if f['vcodec'] == 'none':
+                    f['vcodec'] = 'avc1'
+
+        return fmts
+
     def _extract_relinker_info(self, relinker_url, video_id, audio_only=False):
         def fix_cdata(s):
             # remove \r\n\t before and after <![CDATA[ ]]> to avoid
@@ -68,8 +92,7 @@ class RaiBaseIE(InfoExtractor):
                 'format_id': 'https-mp3',
             })
         elif ext == 'm3u8' or 'format=m3u8' in media_url:
-            formats.extend(self._extract_m3u8_formats(
-                media_url, video_id, 'mp4', m3u8_id='hls', fatal=False))
+            formats.extend(self._fix_m3u8_formats(media_url, video_id))
         elif ext == 'f4m':
             # very likely no longer needed. Cannot find any url that uses it.
             manifest_url = update_url_query(
@@ -91,7 +114,7 @@ class RaiBaseIE(InfoExtractor):
             self.raise_geo_restricted(countries=self._GEO_COUNTRIES, metadata_available=True)
 
         if not audio_only and not is_live:
-            formats.extend(self._create_http_urls(media_url, relinker_url, formats))
+            formats.extend(self._create_http_urls(media_url, relinker_url, formats, video_id))
 
         return filter_dict({
             'is_live': is_live,
@@ -99,7 +122,7 @@ class RaiBaseIE(InfoExtractor):
             'formats': formats,
         })
 
-    def _create_http_urls(self, manifest_url, relinker_url, fmts):
+    def _create_http_urls(self, manifest_url, relinker_url, fmts, video_id):
         _MANIFEST_REG = r'/(?P<id>\w+)(?:_(?P<quality>[\d\,]+))?(?:\.mp4)?(?:\.csmil)?/playlist\.m3u8'
         _MP4_TMPL = '%s&overrideUserAgentRule=mp4-%s'
         _QUALITY = {
@@ -120,7 +143,7 @@ class RaiBaseIE(InfoExtractor):
         }
 
         def percentage(number, target, pc=20, roof=125):
-            '''check if the target is in the range of number +/- percent'''
+            """check if the target is in the range of number +/- percent"""
             if not number or number < 0:
                 return False
             return abs(target - number) < min(float(number) * float(pc) / 100.0, roof)
@@ -152,10 +175,10 @@ class RaiBaseIE(InfoExtractor):
                 'format_id': f'https-{tbr}',
                 'width': format_copy.get('width'),
                 'height': format_copy.get('height'),
-                'tbr': format_copy.get('tbr'),
-                'vcodec': format_copy.get('vcodec'),
-                'acodec': format_copy.get('acodec'),
-                'fps': format_copy.get('fps'),
+                'tbr': format_copy.get('tbr') or tbr,
+                'vcodec': format_copy.get('vcodec') or 'avc1',
+                'acodec': format_copy.get('acodec') or 'mp4a',
+                'fps': format_copy.get('fps') or 25,
             } if format_copy else {
                 'format_id': f'https-{tbr}',
                 'width': _QUALITY[tbr][0],
@@ -166,9 +189,17 @@ class RaiBaseIE(InfoExtractor):
                 'fps': 25,
             }
 
+        # Check if MP4 download is available
+        try:
+            self._request_webpage(
+                HEADRequest(_MP4_TMPL % (relinker_url, '*')), video_id, 'Checking MP4 availability')
+        except ExtractorError as e:
+            self.to_screen(f'{video_id}: MP4 direct download is not available: {e.cause}')
+            return []
+
         # filter out single-stream formats
         fmts = [f for f in fmts
-                if not f.get('vcodec') == 'none' and not f.get('acodec') == 'none']
+                if f.get('vcodec') != 'none' and f.get('acodec') != 'none']
 
         mobj = re.search(_MANIFEST_REG, manifest_url)
         if not mobj:
@@ -182,7 +213,7 @@ class RaiBaseIE(InfoExtractor):
                 'url': _MP4_TMPL % (relinker_url, q),
                 'protocol': 'https',
                 'ext': 'mp4',
-                **get_format_info(q)
+                **get_format_info(q),
             })
         return formats
 
@@ -236,7 +267,7 @@ class RaiPlayIE(RaiBaseIE):
             'series': 'Report',
             'season': '2013/14',
             'subtitles': {'it': 'count:4'},
-            'release_year': 2022,
+            'release_year': 2024,
             'episode': 'Espresso nel caffè - 07/04/2014',
             'timestamp': 1396919880,
             'upload_date': '20140408',
@@ -244,7 +275,7 @@ class RaiPlayIE(RaiBaseIE):
         },
         'params': {'skip_download': True},
     }, {
-        # 1080p direct mp4 url
+        # 1080p
         'url': 'https://www.raiplay.it/video/2021/11/Blanca-S1E1-Senza-occhi-b1255a4a-8e72-4a2f-b9f3-fc1308e00736.html',
         'md5': 'aeda7243115380b2dd5e881fd42d949a',
         'info_dict': {
@@ -265,10 +296,10 @@ class RaiPlayIE(RaiBaseIE):
             'episode': 'Senza occhi',
             'timestamp': 1637318940,
             'upload_date': '20211119',
-            'formats': 'count:12',
+            'formats': 'count:7',
         },
         'params': {'skip_download': True},
-        'expected_warnings': ['Video not available. Likely due to geo-restriction.']
+        'expected_warnings': ['Video not available. Likely due to geo-restriction.'],
     }, {
         # 1500 quality
         'url': 'https://www.raiplay.it/video/2012/09/S1E11---Tutto-cio-che-luccica-0cab3323-732e-45d6-8e86-7704acab6598.html',
@@ -290,6 +321,27 @@ class RaiPlayIE(RaiBaseIE):
             'timestamp': 1348495020,
             'upload_date': '20120924',
         },
+    }, {
+        # checking program_info gives false positive for DRM
+        'url': 'https://www.raiplay.it/video/2022/10/Ad-ogni-costo---Un-giorno-in-Pretura---Puntata-del-15102022-1dfd1295-ea38-4bac-b51e-f87e2881693b.html',
+        'md5': '572c6f711b7c5f2d670ba419b4ae3b08',
+        'info_dict': {
+            'id': '1dfd1295-ea38-4bac-b51e-f87e2881693b',
+            'ext': 'mp4',
+            'title': 'Ad ogni costo - Un giorno in Pretura - Puntata del 15/10/2022',
+            'alt_title': 'St 2022/23 - Un giorno in pretura - Ad ogni costo',
+            'description': 'md5:4046d97b2687f74f06a8b8270ba5599f',
+            'uploader': 'Rai 3',
+            'duration': 3773.0,
+            'thumbnail': 'https://www.raiplay.it/dl/img/2022/10/12/1665586539957_2048x2048.png',
+            'creators': ['Rai 3'],
+            'series': 'Un giorno in pretura',
+            'season': '2022/23',
+            'episode': 'Ad ogni costo',
+            'timestamp': 1665507240,
+            'upload_date': '20221011',
+            'release_year': 2025,
+        },
     }, {
         'url': 'http://www.raiplay.it/video/2016/11/gazebotraindesi-efebe701-969c-4593-92f3-285f0d1ce750.html?',
         'only_matching': True,
@@ -309,9 +361,8 @@ class RaiPlayIE(RaiBaseIE):
         media = self._download_json(
             f'{base}.json', video_id, 'Downloading video JSON')
 
-        if not self.get_param('allow_unplayable_formats'):
-            if traverse_obj(media, (('program_info', None), 'rights_management', 'rights', 'drm')):
-                self.report_drm(video_id)
+        if traverse_obj(media, ('rights_management', 'rights', 'drm')):
+            self.report_drm(video_id)
 
         video = media['video']
         relinker_info = self._extract_relinker_info(video['content_url'], video_id)
@@ -342,7 +393,7 @@ class RaiPlayIE(RaiBaseIE):
             'episode_number': int_or_none(media.get('episode')),
             'subtitles': self._extract_subtitles(url, video),
             'release_year': int_or_none(traverse_obj(media, ('track_info', 'edit_year'))),
-            **relinker_info
+            **relinker_info,
         }
 
 
@@ -518,7 +569,7 @@ class RaiPlaySoundPlaylistIE(InfoExtractor):
         'info_dict': {
             'id': 'ilruggitodelconiglio',
             'title': 'Il Ruggito del Coniglio',
-            'description': 'md5:48cff6972435964284614d70474132e6',
+            'description': 'md5:62a627b3a2d0635d08fa8b6e0a04f27e',
         },
         'playlist_mincount': 65,
     }, {
@@ -565,7 +616,7 @@ class RaiIE(RaiBaseIE):
             'upload_date': '20140612',
         },
         'params': {'skip_download': True},
-        'expected_warnings': ['Video not available. Likely due to geo-restriction.']
+        'expected_warnings': ['Video not available. Likely due to geo-restriction.'],
     }, {
         'url': 'https://www.rai.it/dl/RaiTV/programmi/media/ContentItem-efb17665-691c-45d5-a60c-5301333cbb0c.html',
         'info_dict': {
@@ -575,7 +626,7 @@ class RaiIE(RaiBaseIE):
             'description': 'TG1 edizione integrale ore 20:00 del giorno 03/11/2016',
             'thumbnail': r're:^https?://.*\.jpg$',
             'duration': 2214,
-            'upload_date': '20161103'
+            'upload_date': '20161103',
         },
         'params': {'skip_download': True},
     }, {
@@ -601,7 +652,7 @@ class RaiIE(RaiBaseIE):
                     'ext': media.get('formatoAudio'),
                     'vcodec': 'none',
                     'acodec': media.get('formatoAudio'),
-                }]
+                }],
             }
         elif 'Video' in media['type']:
             relinker_info = self._extract_relinker_info(media['mediaUri'], content_id)
@@ -621,23 +672,24 @@ class RaiIE(RaiBaseIE):
             'upload_date': unified_strdate(media.get('date')),
             'duration': parse_duration(media.get('length')),
             'subtitles': self._extract_subtitles(url, media),
-            **relinker_info
+            **relinker_info,
         }
 
 
-class RaiNewsIE(RaiIE):  # XXX: Do not subclass from concrete IE
+class RaiNewsIE(RaiBaseIE):
     _VALID_URL = rf'https?://(www\.)?rainews\.it/(?!articoli)[^?#]+-(?P<id>{RaiBaseIE._UUID_RE})(?:-[^/?#]+)?\.html'
     _EMBED_REGEX = [rf'<iframe[^>]+data-src="(?P<url>/iframe/[^?#]+?{RaiBaseIE._UUID_RE}\.html)']
     _TESTS = [{
         # new rainews player (#3911)
-        'url': 'https://www.rainews.it/rubriche/24mm/video/2022/05/24mm-del-29052022-12cf645d-1ffd-4220-b27c-07c226dbdecf.html',
+        'url': 'https://www.rainews.it/video/2024/02/membri-della-croce-rossa-evacuano-gli-abitanti-di-un-villaggio-nella-regione-ucraina-di-kharkiv-il-filmato-dallucraina--31e8017c-845c-43f5-9c48-245b43c3a079.html',
         'info_dict': {
-            'id': '12cf645d-1ffd-4220-b27c-07c226dbdecf',
+            'id': '31e8017c-845c-43f5-9c48-245b43c3a079',
             'ext': 'mp4',
-            'title': 'Puntata del 29/05/2022',
-            'duration': 1589,
-            'upload_date': '20220529',
+            'title': 'md5:1e81364b09de4a149042bac3c7d36f0b',
+            'duration': 196,
+            'upload_date': '20240225',
             'uploader': 'rainews',
+            'formats': 'count:2',
         },
         'params': {'skip_download': True},
     }, {
@@ -650,7 +702,8 @@ class RaiNewsIE(RaiIE):  # XXX: Do not subclass from concrete IE
             'description': 'I film in uscita questa settimana.',
             'thumbnail': r're:^https?://.*\.png$',
             'duration': 833,
-            'upload_date': '20161103'
+            'upload_date': '20161103',
+            'formats': 'count:8',
         },
         'params': {'skip_download': True},
         'expected_warnings': ['unable to extract player_data'],
@@ -675,7 +728,7 @@ class RaiNewsIE(RaiIE):  # XXX: Do not subclass from concrete IE
         if not relinker_url:
             # fallback on old implementation for some old content
             try:
-                return self._extract_from_content_id(video_id, url)
+                return RaiIE._real_extract(self, url)
             except GeoRestrictedError:
                 raise
             except ExtractorError as e:
@@ -688,7 +741,7 @@ class RaiNewsIE(RaiIE):  # XXX: Do not subclass from concrete IE
             'title': player_data.get('title') or track_info.get('title') or self._og_search_title(webpage),
             'upload_date': unified_strdate(track_info.get('date')),
             'uploader': strip_or_none(track_info.get('editor') or None),
-            **relinker_info
+            **relinker_info,
         }
 
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/raywenderlich.py b/plugins/youtube_download/yt_dlp/extractor/raywenderlich.py
index e0e3c3e..3e74fd8 100644
--- a/plugins/youtube_download/yt_dlp/extractor/raywenderlich.py
+++ b/plugins/youtube_download/yt_dlp/extractor/raywenderlich.py
@@ -2,7 +2,6 @@ import re
 
 from .common import InfoExtractor
 from .vimeo import VimeoIE
-from ..compat import compat_str
 from ..utils import (
     ExtractorError,
     int_or_none,
@@ -67,12 +66,12 @@ class RayWenderlichIE(InfoExtractor):
                     continue
                 video_id = content.get('identifier')
                 if video_id:
-                    return compat_str(video_id)
+                    return str(video_id)
 
     def _real_extract(self, url):
         mobj = self._match_valid_url(url)
         course_id, lesson_id = mobj.group('course_id', 'id')
-        display_id = '%s/%s' % (course_id, lesson_id)
+        display_id = f'{course_id}/{lesson_id}'
 
         webpage = self._download_webpage(url, display_id)
 
@@ -110,8 +109,8 @@ class RayWenderlichIE(InfoExtractor):
             if csrf_token:
                 headers['X-CSRF-Token'] = csrf_token
             video = self._download_json(
-                'https://videos.raywenderlich.com/api/v1/videos/%s.json'
-                % video_id, display_id, headers=headers)['video']
+                f'https://videos.raywenderlich.com/api/v1/videos/{video_id}.json',
+                display_id, headers=headers)['video']
             vimeo_id = video['clips'][0]['provider_id']
             info.update({
                 '_type': 'url_transparent',
@@ -124,7 +123,7 @@ class RayWenderlichIE(InfoExtractor):
 
         return merge_dicts(info, self.url_result(
             VimeoIE._smuggle_referrer(
-                'https://player.vimeo.com/video/%s' % vimeo_id, url),
+                f'https://player.vimeo.com/video/{vimeo_id}', url),
             ie=VimeoIE.ie_key(), video_id=vimeo_id))
 
 
@@ -152,8 +151,7 @@ class RayWenderlichCourseIE(InfoExtractor):
 
     @classmethod
     def suitable(cls, url):
-        return False if RayWenderlichIE.suitable(url) else super(
-            RayWenderlichCourseIE, cls).suitable(url)
+        return False if RayWenderlichIE.suitable(url) else super().suitable(url)
 
     def _real_extract(self, url):
         course_id = self._match_id(url)
@@ -163,7 +161,7 @@ class RayWenderlichCourseIE(InfoExtractor):
         entries = []
         lesson_urls = set()
         for lesson_url in re.findall(
-                r'<a[^>]+\bhref=["\'](/%s/lessons/\d+)' % course_id, webpage):
+                rf'<a[^>]+\bhref=["\'](/{course_id}/lessons/\d+)', webpage):
             if lesson_url in lesson_urls:
                 continue
             lesson_urls.add(lesson_url)
diff --git a/plugins/youtube_download/yt_dlp/extractor/rbgtum.py b/plugins/youtube_download/yt_dlp/extractor/rbgtum.py
index 47649cf..5bb4655 100644
--- a/plugins/youtube_download/yt_dlp/extractor/rbgtum.py
+++ b/plugins/youtube_download/yt_dlp/extractor/rbgtum.py
@@ -1,10 +1,11 @@
 import re
 
 from .common import InfoExtractor
+from ..utils import ExtractorError, parse_qs, remove_start, traverse_obj
 
 
 class RbgTumIE(InfoExtractor):
-    _VALID_URL = r'https://live\.rbg\.tum\.de/w/(?P<id>.+)'
+    _VALID_URL = r'https?://(?:live\.rbg\.tum\.de|tum\.live)/w/(?P<id>[^?#]+)'
     _TESTS = [{
         # Combined view
         'url': 'https://live.rbg.tum.de/w/cpp/22128',
@@ -14,7 +15,7 @@ class RbgTumIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'Lecture: October 18. 2022',
             'series': 'Concepts of C++ programming (IN2377)',
-        }
+        },
     }, {
         # Presentation only
         'url': 'https://live.rbg.tum.de/w/I2DL/12349/PRES',
@@ -24,7 +25,7 @@ class RbgTumIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'Lecture 3: Introduction to Neural Networks',
             'series': 'Introduction to Deep Learning (IN2346)',
-        }
+        },
     }, {
         # Camera only
         'url': 'https://live.rbg.tum.de/w/fvv-info/16130/CAM',
@@ -34,17 +35,19 @@ class RbgTumIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'Fachschaftsvollversammlung',
             'series': 'Fachschaftsvollversammlung Informatik',
-        }
-    }, ]
+        },
+    }, {
+        'url': 'https://tum.live/w/linalginfo/27102',
+        'only_matching': True,
+    }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
 
-        m3u8 = self._html_search_regex(r'(https://.+?\.m3u8)', webpage, 'm3u8')
-        lecture_title = self._html_search_regex(r'(?si)<h1.*?>(.*)</h1>', webpage, 'title')
-        lecture_series_title = self._html_search_regex(
-            r'(?s)<title\b[^>]*>\s*(?:TUM-Live\s\|\s?)?([^:]+):?.*?</title>', webpage, 'series')
+        m3u8 = self._html_search_regex(r'"(https://[^"]+\.m3u8[^"]*)', webpage, 'm3u8')
+        lecture_title = self._html_search_regex(r'<h1[^>]*>([^<]+)</h1>', webpage, 'title', fatal=False)
+        lecture_series_title = remove_start(self._html_extract_title(webpage), 'TUM-Live | ')
 
         formats = self._extract_m3u8_formats(m3u8, video_id, 'mp4', entry_protocol='m3u8_native', m3u8_id='hls')
 
@@ -57,9 +60,9 @@ class RbgTumIE(InfoExtractor):
 
 
 class RbgTumCourseIE(InfoExtractor):
-    _VALID_URL = r'https://live\.rbg\.tum\.de/course/(?P<id>.+)'
+    _VALID_URL = r'https?://(?P<hostname>(?:live\.rbg\.tum\.de|tum\.live))/old/course/(?P<id>(?P<year>\d+)/(?P<term>\w+)/(?P<slug>[^/?#]+))'
     _TESTS = [{
-        'url': 'https://live.rbg.tum.de/course/2022/S/fpv',
+        'url': 'https://live.rbg.tum.de/old/course/2022/S/fpv',
         'info_dict': {
             'title': 'Funktionale Programmierung und Verifikation (IN0003)',
             'id': '2022/S/fpv',
@@ -69,7 +72,7 @@ class RbgTumCourseIE(InfoExtractor):
         },
         'playlist_count': 13,
     }, {
-        'url': 'https://live.rbg.tum.de/course/2022/W/set',
+        'url': 'https://live.rbg.tum.de/old/course/2022/W/set',
         'info_dict': {
             'title': 'SET FSMPIC',
             'id': '2022/W/set',
@@ -78,16 +81,62 @@ class RbgTumCourseIE(InfoExtractor):
             'noplaylist': False,
         },
         'playlist_count': 6,
-    }, ]
+    }, {
+        'url': 'https://tum.live/old/course/2023/S/linalginfo',
+        'only_matching': True,
+    }]
 
     def _real_extract(self, url):
-        course_id = self._match_id(url)
-        webpage = self._download_webpage(url, course_id)
+        course_id, hostname, year, term, slug = self._match_valid_url(url).group('id', 'hostname', 'year', 'term', 'slug')
+        meta = self._download_json(
+            f'https://{hostname}/api/courses/{slug}/', course_id, fatal=False,
+            query={'year': year, 'term': term}) or {}
+        lecture_series_title = meta.get('Name')
+        lectures = [self.url_result(f'https://{hostname}/w/{slug}/{stream_id}', RbgTumIE)
+                    for stream_id in traverse_obj(meta, ('Streams', ..., 'ID'))]
 
-        lecture_series_title = self._html_search_regex(r'(?si)<h1.*?>(.*)</h1>', webpage, 'title')
+        if not lectures:
+            webpage = self._download_webpage(url, course_id)
+            lecture_series_title = remove_start(self._html_extract_title(webpage), 'TUM-Live | ')
+            lectures = [self.url_result(f'https://{hostname}{lecture_path}', RbgTumIE)
+                        for lecture_path in re.findall(r'href="(/w/[^/"]+/[^/"]+)"', webpage)]
 
-        lecture_urls = []
-        for lecture_url in re.findall(r'(?i)href="/w/(.+)(?<!/cam)(?<!/pres)(?<!/chat)"', webpage):
-            lecture_urls.append(self.url_result('https://live.rbg.tum.de/w/' + lecture_url, ie=RbgTumIE.ie_key()))
+        return self.playlist_result(lectures, course_id, lecture_series_title)
 
-        return self.playlist_result(lecture_urls, course_id, lecture_series_title)
+
+class RbgTumNewCourseIE(InfoExtractor):
+    _VALID_URL = r'https?://(?P<hostname>(?:live\.rbg\.tum\.de|tum\.live))/\?'
+    _TESTS = [{
+        'url': 'https://live.rbg.tum.de/?year=2022&term=S&slug=fpv&view=3',
+        'info_dict': {
+            'title': 'Funktionale Programmierung und Verifikation (IN0003)',
+            'id': '2022/S/fpv',
+        },
+        'params': {
+            'noplaylist': False,
+        },
+        'playlist_count': 13,
+    }, {
+        'url': 'https://live.rbg.tum.de/?year=2022&term=W&slug=set&view=3',
+        'info_dict': {
+            'title': 'SET FSMPIC',
+            'id': '2022/W/set',
+        },
+        'params': {
+            'noplaylist': False,
+        },
+        'playlist_count': 6,
+    }, {
+        'url': 'https://tum.live/?year=2023&term=S&slug=linalginfo&view=3',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        query = parse_qs(url)
+        errors = [key for key in ('year', 'term', 'slug') if not query.get(key)]
+        if errors:
+            raise ExtractorError(f'Input URL is missing query parameters: {", ".join(errors)}')
+        year, term, slug = query['year'][0], query['term'][0], query['slug'][0]
+        hostname = self._match_valid_url(url).group('hostname')
+
+        return self.url_result(f'https://{hostname}/old/course/{year}/{term}/{slug}', RbgTumCourseIE)
diff --git a/plugins/youtube_download/yt_dlp/extractor/rbmaradio.py b/plugins/youtube_download/yt_dlp/extractor/rbmaradio.py
deleted file mode 100644
index 86c63db..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/rbmaradio.py
+++ /dev/null
@@ -1,68 +0,0 @@
-from .common import InfoExtractor
-from ..compat import compat_str
-from ..utils import (
-    clean_html,
-    int_or_none,
-    unified_timestamp,
-    update_url_query,
-)
-
-
-class RBMARadioIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?(?:rbmaradio|redbullradio)\.com/shows/(?P<show_id>[^/]+)/episodes/(?P<id>[^/?#&]+)'
-    _TEST = {
-        'url': 'https://www.rbmaradio.com/shows/main-stage/episodes/ford-lopatin-live-at-primavera-sound-2011',
-        'md5': '6bc6f9bcb18994b4c983bc3bf4384d95',
-        'info_dict': {
-            'id': 'ford-lopatin-live-at-primavera-sound-2011',
-            'ext': 'mp3',
-            'title': 'Main Stage - Ford & Lopatin at Primavera Sound',
-            'description': 'md5:d41d8cd98f00b204e9800998ecf8427e',
-            'thumbnail': r're:^https?://.*\.jpg',
-            'duration': 2452,
-            'timestamp': 1307103164,
-            'upload_date': '20110603',
-        },
-    }
-
-    def _real_extract(self, url):
-        mobj = self._match_valid_url(url)
-        show_id = mobj.group('show_id')
-        episode_id = mobj.group('id')
-
-        webpage = self._download_webpage(url, episode_id)
-
-        episode = self._parse_json(
-            self._search_regex(
-                r'__INITIAL_STATE__\s*=\s*({.+?})\s*</script>',
-                webpage, 'json data'),
-            episode_id)['episodes'][show_id][episode_id]
-
-        title = episode['title']
-
-        show_title = episode.get('showTitle')
-        if show_title:
-            title = '%s - %s' % (show_title, title)
-
-        formats = [{
-            'url': update_url_query(episode['audioURL'], query={'cbr': abr}),
-            'format_id': compat_str(abr),
-            'abr': abr,
-            'vcodec': 'none',
-        } for abr in (96, 128, 192, 256)]
-        self._check_formats(formats, episode_id)
-
-        description = clean_html(episode.get('longTeaser'))
-        thumbnail = self._proto_relative_url(episode.get('imageURL', {}).get('landscape'))
-        duration = int_or_none(episode.get('duration'))
-        timestamp = unified_timestamp(episode.get('publishedAt'))
-
-        return {
-            'id': episode_id,
-            'title': title,
-            'description': description,
-            'thumbnail': thumbnail,
-            'duration': duration,
-            'timestamp': timestamp,
-            'formats': formats,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/rcs.py b/plugins/youtube_download/yt_dlp/extractor/rcs.py
index 028d3d9..1925afb 100644
--- a/plugins/youtube_download/yt_dlp/extractor/rcs.py
+++ b/plugins/youtube_download/yt_dlp/extractor/rcs.py
@@ -64,7 +64,7 @@ class RCSBaseIE(InfoExtractor):
         'media2-doveviaggi-it.akamaized': 'viaggi',
         'media2-vivimilano-corriere-it.akamaized': 'vivimilano',
         'vivimilano-vh.akamaihd': 'vivimilano',
-        'media2-youreporter-it.akamaized': 'youreporter'
+        'media2-youreporter-it.akamaized': 'youreporter',
     }
 
     def _get_video_src(self, video):
@@ -97,7 +97,7 @@ class RCSBaseIE(InfoExtractor):
             yield {
                 'type': type_,
                 'url': url,
-                'bitrate': source.get('bitrate')
+                'bitrate': source.get('bitrate'),
             }
 
     def _create_http_formats(self, m3u8_formats, video_id):
@@ -185,7 +185,7 @@ class RCSBaseIE(InfoExtractor):
                     return {
                         '_type': 'url_transparent',
                         'url': emb,
-                        'ie_key': RCSEmbedsIE.ie_key()
+                        'ie_key': RCSEmbedsIE.ie_key(),
                     }
 
         if not video_data:
@@ -236,13 +236,13 @@ class RCSEmbedsIE(RCSBaseIE):
             'title': 'Sky Arte racconta Madonna nella serie "Artist to icon"',
             'description': 'md5:65b09633df9ffee57f48b39e34c9e067',
             'uploader': 'rcs.it',
-        }
+        },
     }, {
         'url': 'https://video.gazzanet.gazzetta.it/video-embed/gazzanet-mo05-0000260789',
-        'match_only': True
+        'only_matching': True,
     }, {
         'url': 'https://video.gazzetta.it/video-embed/49612410-00ca-11eb-bcd8-30d4253e0140',
-        'match_only': True
+        'only_matching': True,
     }]
     _WEBPAGE_TESTS = [{
         'url': 'https://www.iodonna.it/video-iodonna/personaggi-video/monica-bellucci-piu-del-lavoro-oggi-per-me-sono-importanti-lamicizia-e-la-famiglia/',
@@ -252,7 +252,7 @@ class RCSEmbedsIE(RCSBaseIE):
             'title': 'Monica Bellucci: «Più del lavoro, oggi per me sono importanti l\'amicizia e la famiglia»',
             'description': 'md5:daea6d9837351e56b1ab615c06bebac1',
             'uploader': 'rcs.it',
-        }
+        },
     }]
 
     @staticmethod
@@ -286,7 +286,7 @@ class RCSIE(RCSBaseIE):
             'title': 'Vettel guida la Ferrari SF90 al Mugello e al suo fianco c\'è Leclerc (bendato): il video è esilarante',
             'description': 'md5:3915ce5ebb3d2571deb69a5eb85ac9b5',
             'uploader': 'Corriere Tv',
-        }
+        },
     }, {
         # search for video id inside the page
         'url': 'https://viaggi.corriere.it/video/norvegia-il-nuovo-ponte-spettacolare-sopra-la-cascata-di-voringsfossen/',
@@ -298,7 +298,7 @@ class RCSIE(RCSBaseIE):
             'title': 'La nuova spettacolare attrazione in Norvegia: il ponte sopra Vøringsfossen',
             'description': 'md5:18b35a291f6746c0c8dacd16e5f5f4f8',
             'uploader': 'DOVE Viaggi',
-        }
+        },
     }, {
         # only audio format https://github.com/yt-dlp/yt-dlp/issues/5683
         'url': 'https://video.corriere.it/cronaca/audio-telefonata-il-papa-becciu-santita-lettera-che-mi-ha-inviato-condanna/b94c0d20-70c2-11ed-9572-e4b947a0ebd2',
@@ -310,7 +310,7 @@ class RCSIE(RCSBaseIE):
             'description': 'md5:c0ddb61bd94a8d4e0d4bb9cda50a689b',
             'uploader': 'Corriere Tv',
             'formats': [{'format_id': 'https-mp3', 'ext': 'mp3'}],
-        }
+        },
     }, {
         # old content still needs cdn migration
         'url': 'https://viaggi.corriere.it/video/milano-varallo-sesia-sul-treno-a-vapore/',
@@ -322,10 +322,10 @@ class RCSIE(RCSBaseIE):
             'title': 'Milano-Varallo Sesia sul treno a vapore',
             'description': 'md5:6348f47aac230397fe341a74f7678d53',
             'uploader': 'DOVE Viaggi',
-        }
+        },
     }, {
         'url': 'https://video.corriere.it/video-360/metro-copenaghen-tutta-italiana/a248a7f0-e2db-11e9-9830-af2de6b1f945',
-        'match_only': True
+        'only_matching': True,
     }]
 
 
@@ -346,7 +346,7 @@ class RCSVariousIE(RCSBaseIE):
             'title': 'Cervicalgia e mal di testa, il video con i suggerimenti dell\'esperto',
             'description': 'md5:ae21418f34cee0b8d02a487f55bcabb5',
             'uploader': 'leitv.it',
-        }
+        },
     }, {
         'url': 'https://www.youreporter.it/fiume-sesia-3-ottobre-2020/',
         'md5': '3989b6d603482611a2abd2f32b79f739',
@@ -357,7 +357,7 @@ class RCSVariousIE(RCSBaseIE):
             'title': 'Fiume Sesia 3 ottobre 2020',
             'description': 'md5:0070eef1cc884d13c970a4125063de55',
             'uploader': 'youreporter.it',
-        }
+        },
     }, {
         'url': 'https://www.amica.it/video-post/saint-omer-al-cinema-il-film-leone-dargento-che-ribalta-gli-stereotipi/',
         'md5': '187cce524dfd0343c95646c047375fc4',
@@ -368,5 +368,5 @@ class RCSVariousIE(RCSBaseIE):
             'title': '"Saint Omer": al cinema il film Leone d\'argento che ribalta gli stereotipi',
             'description': 'md5:b1c8869c2dcfd6073a2a311ba0008aa8',
             'uploader': 'rcs.it',
-        }
+        },
     }]
diff --git a/plugins/youtube_download/yt_dlp/extractor/rcti.py b/plugins/youtube_download/yt_dlp/extractor/rcti.py
index 79d9c8e..61b73a5 100644
--- a/plugins/youtube_download/yt_dlp/extractor/rcti.py
+++ b/plugins/youtube_download/yt_dlp/extractor/rcti.py
@@ -5,11 +5,11 @@ import time
 from .common import InfoExtractor
 from ..networking.exceptions import HTTPError
 from ..utils import (
-    dict_get,
     ExtractorError,
+    dict_get,
     strip_or_none,
     traverse_obj,
-    try_get
+    try_get,
 )
 
 
@@ -28,7 +28,7 @@ class RCTIPlusBaseIE(InfoExtractor):
 
 
 class RCTIPlusIE(RCTIPlusBaseIE):
-    _VALID_URL = r'https://www\.rctiplus\.com/(?:programs/\d+?/.*?/)?(?P<type>episode|clip|extra|live-event|missed-event)/(?P<id>\d+)/(?P<display_id>[^/?#&]+)'
+    _VALID_URL = r'https?://www\.rctiplus\.com/(?:programs/\d+?/.*?/)?(?P<type>episode|clip|extra|live-event|missed-event)/(?P<id>\d+)/(?P<display_id>[^/?#&]+)'
     _TESTS = [{
         'url': 'https://www.rctiplus.com/programs/1259/kiko-untuk-lola/episode/22124/untuk-lola',
         'md5': '56ed45affad45fa18d5592a1bc199997',
@@ -154,34 +154,34 @@ class RCTIPlusIE(RCTIPlusBaseIE):
             is_upcoming = try_get(video_json, lambda x: x['current_date'] < x['start_date'])
         if is_upcoming:
             self.raise_no_formats(
-                'This event will start at %s.' % video_json['live_label'] if video_json.get('live_label') else 'This event has not started yet.', expected=True)
+                'This event will start at {}.'.format(video_json['live_label']) if video_json.get('live_label') else 'This event has not started yet.', expected=True)
         if 'akamaized' in video_url:
             # For some videos hosted on Akamai's CDN (possibly AES-encrypted ones?), a session needs to at least be made via Conviva's API
             conviva_json_data = {
                 **self._CONVIVA_JSON_TEMPLATE,
                 'url': video_url,
-                'sst': int(time.time())
+                'sst': int(time.time()),
             }
             conviva_json_res = self._download_json(
                 'https://ff84ae928c3b33064b76dec08f12500465e59a6f.cws.conviva.com/0/wsg', display_id,
                 'Creating Conviva session', 'Failed to create Conviva session',
-                fatal=False, data=json.dumps(conviva_json_data).encode('utf-8'))
+                fatal=False, data=json.dumps(conviva_json_data).encode())
             if conviva_json_res and conviva_json_res.get('err') != 'ok':
-                self.report_warning('Conviva said: %s' % str(conviva_json_res.get('err')))
+                self.report_warning('Conviva said: {}'.format(str(conviva_json_res.get('err'))))
 
         video_meta, meta_paths = self._call_api(
-            'https://api.rctiplus.com/api/v1/%s/%s' % (video_type, video_id), display_id, 'Downloading video metadata')
+            f'https://api.rctiplus.com/api/v1/{video_type}/{video_id}', display_id, 'Downloading video metadata')
 
         thumbnails, image_path = [], meta_paths.get('image_path', 'https://rstatic.akamaized.net/media/')
         if video_meta.get('portrait_image'):
             thumbnails.append({
                 'id': 'portrait_image',
-                'url': '%s%d%s' % (image_path, 2000, video_meta['portrait_image'])  # 2000px seems to be the highest resolution that can be given
+                'url': '{}{}{}'.format(image_path, 2000, video_meta['portrait_image']),  # 2000px seems to be the highest resolution that can be given
             })
         if video_meta.get('landscape_image'):
             thumbnails.append({
                 'id': 'landscape_image',
-                'url': '%s%d%s' % (image_path, 2000, video_meta['landscape_image'])
+                'url': '{}{}{}'.format(image_path, 2000, video_meta['landscape_image']),
             })
         try:
             formats = self._extract_m3u8_formats(video_url, display_id, 'mp4', headers={'Referer': 'https://www.rctiplus.com/'})
@@ -218,7 +218,7 @@ class RCTIPlusIE(RCTIPlusBaseIE):
 
 
 class RCTIPlusSeriesIE(RCTIPlusBaseIE):
-    _VALID_URL = r'https://www\.rctiplus\.com/programs/(?P<id>\d+)/(?P<display_id>[^/?#&]+)(?:/(?P<type>episodes|extras|clips))?'
+    _VALID_URL = r'https?://www\.rctiplus\.com/programs/(?P<id>\d+)/(?P<display_id>[^/?#&]+)(?:/(?P<type>episodes|extras|clips))?'
     _TESTS = [{
         'url': 'https://www.rctiplus.com/programs/829/putri-untuk-pangeran',
         'playlist_mincount': 1019,
@@ -229,7 +229,7 @@ class RCTIPlusSeriesIE(RCTIPlusBaseIE):
             'age_limit': 2,
             'cast': ['Verrel Bramasta', 'Ranty Maria', 'Riza Syah', 'Ivan Fadilla', 'Nicole Parham', 'Dll', 'Aviv Elham'],
             'display_id': 'putri-untuk-pangeran',
-            'tag': 'count:18',
+            'tags': 'count:18',
         },
     }, {  # No episodes
         'url': 'https://www.rctiplus.com/programs/615/inews-pagi',
@@ -239,9 +239,9 @@ class RCTIPlusSeriesIE(RCTIPlusBaseIE):
             'title': 'iNews Pagi',
             'description': 'md5:f18ee3d4643cfb41c358e5a9b693ee04',
             'age_limit': 2,
-            'tag': 'count:11',
+            'tags': 'count:11',
             'display_id': 'inews-pagi',
-        }
+        },
     }]
     _AGE_RATINGS = {  # Based off https://id.wikipedia.org/wiki/Sistem_rating_konten_televisi with additional ratings
         'S-SU': 2,
@@ -255,13 +255,13 @@ class RCTIPlusSeriesIE(RCTIPlusBaseIE):
 
     @classmethod
     def suitable(cls, url):
-        return False if RCTIPlusIE.suitable(url) else super(RCTIPlusSeriesIE, cls).suitable(url)
+        return False if RCTIPlusIE.suitable(url) else super().suitable(url)
 
     def _entries(self, url, display_id=None, note='Downloading entries JSON', metadata={}):
         total_pages = 0
         try:
             total_pages = self._call_api(
-                '%s&length=20&page=0' % url,
+                f'{url}&length=20&page=0',
                 display_id, note)[1]['pagination']['total_page']
         except ExtractorError as e:
             if 'not found' in str(e):
@@ -272,8 +272,8 @@ class RCTIPlusSeriesIE(RCTIPlusBaseIE):
 
         for page_num in range(1, total_pages + 1):
             episode_list = self._call_api(
-                '%s&length=20&page=%s' % (url, page_num),
-                display_id, '%s page %s' % (note, page_num))[0] or []
+                f'{url}&length=20&page={page_num}',
+                display_id, f'{note} page {page_num}')[0] or []
 
             for video_json in episode_list:
                 yield {
@@ -288,7 +288,7 @@ class RCTIPlusSeriesIE(RCTIPlusBaseIE):
                     'duration': video_json.get('duration'),
                     'season_number': video_json.get('season'),
                     'episode_number': video_json.get('episode'),
-                    **metadata
+                    **metadata,
                 }
 
     def _series_entries(self, series_id, display_id=None, video_type=None, metadata={}):
@@ -327,8 +327,8 @@ class RCTIPlusSeriesIE(RCTIPlusBaseIE):
             'age_limit': try_get(series_meta, lambda x: self._AGE_RATINGS[x['age_restriction'][0]['code']]),
             'cast': traverse_obj(series_meta, (('starring', 'creator', 'writer'), ..., 'name'),
                                  expected_type=lambda x: strip_or_none(x) or None),
-            'tag': traverse_obj(series_meta, ('tag', ..., 'name'),
-                                expected_type=lambda x: strip_or_none(x) or None),
+            'tags': traverse_obj(series_meta, ('tag', ..., 'name'),
+                                 expected_type=lambda x: strip_or_none(x) or None),
         }
         return self.playlist_result(
             self._series_entries(series_id, display_id, video_type, metadata), series_id,
@@ -336,7 +336,7 @@ class RCTIPlusSeriesIE(RCTIPlusBaseIE):
 
 
 class RCTIPlusTVIE(RCTIPlusBaseIE):
-    _VALID_URL = r'https://www\.rctiplus\.com/((tv/(?P<tvname>\w+))|(?P<eventname>live-event|missed-event))'
+    _VALID_URL = r'https?://www\.rctiplus\.com/((tv/(?P<tvname>\w+))|(?P<eventname>live-event|missed-event))'
     _TESTS = [{
         'url': 'https://www.rctiplus.com/tv/rcti',
         'info_dict': {
@@ -348,7 +348,7 @@ class RCTIPlusTVIE(RCTIPlusBaseIE):
         },
         'params': {
             'skip_download': True,
-        }
+        },
     }, {
         # Returned video will always change
         'url': 'https://www.rctiplus.com/live-event',
@@ -361,7 +361,7 @@ class RCTIPlusTVIE(RCTIPlusBaseIE):
 
     @classmethod
     def suitable(cls, url):
-        return False if RCTIPlusIE.suitable(url) else super(RCTIPlusTVIE, cls).suitable(url)
+        return False if RCTIPlusIE.suitable(url) else super().suitable(url)
 
     def _real_extract(self, url):
         match = self._match_valid_url(url).groupdict()
diff --git a/plugins/youtube_download/yt_dlp/extractor/rds.py b/plugins/youtube_download/yt_dlp/extractor/rds.py
index 9a2e0d9..975b091 100644
--- a/plugins/youtube_download/yt_dlp/extractor/rds.py
+++ b/plugins/youtube_download/yt_dlp/extractor/rds.py
@@ -1,13 +1,13 @@
 from .common import InfoExtractor
 from ..utils import (
+    js_to_json,
     parse_duration,
     parse_iso8601,
-    js_to_json,
 )
-from ..compat import compat_str
 
 
 class RDSIE(InfoExtractor):
+    _WORKING = False
     IE_DESC = 'RDS.ca'
     _VALID_URL = r'https?://(?:www\.)?rds\.ca/vid(?:[eé]|%C3%A9)os/(?:[^/]+/)*(?P<id>[^/]+)-\d+\.\d+'
 
@@ -23,7 +23,7 @@ class RDSIE(InfoExtractor):
             'timestamp': 1606129030,
             'upload_date': '20201123',
             'duration': 773.039,
-        }
+        },
     }, {
         'url': 'http://www.rds.ca/vid%C3%A9os/un-voyage-positif-3.877934',
         'only_matching': True,
@@ -35,7 +35,7 @@ class RDSIE(InfoExtractor):
         webpage = self._download_webpage(url, display_id)
 
         item = self._parse_json(self._search_regex(r'(?s)itemToPush\s*=\s*({.+?});', webpage, 'item'), display_id, js_to_json)
-        video_id = compat_str(item['id'])
+        video_id = str(item['id'])
         title = item.get('title') or self._og_search_title(webpage) or self._html_search_meta(
             'title', webpage, 'title', fatal=True)
         description = self._og_search_description(webpage) or self._html_search_meta(
@@ -56,7 +56,7 @@ class RDSIE(InfoExtractor):
             '_type': 'url_transparent',
             'id': video_id,
             'display_id': display_id,
-            'url': '9c9media:rds_web:%s' % video_id,
+            'url': f'9c9media:rds_web:{video_id}',
             'title': title,
             'description': description,
             'thumbnail': thumbnail,
diff --git a/plugins/youtube_download/yt_dlp/extractor/recurbate.py b/plugins/youtube_download/yt_dlp/extractor/recurbate.py
deleted file mode 100644
index d7294cb..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/recurbate.py
+++ /dev/null
@@ -1,42 +0,0 @@
-from .common import InfoExtractor
-from ..networking.exceptions import HTTPError
-from ..utils import ExtractorError, merge_dicts
-
-
-class RecurbateIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?recurbate\.com/play\.php\?video=(?P<id>\d+)'
-    _TESTS = [{
-        'url': 'https://recurbate.com/play.php?video=39161415',
-        'md5': 'dd2b4ec57aa3e3572cb5cf0997fca99f',
-        'info_dict': {
-            'id': '39161415',
-            'ext': 'mp4',
-            'description': 'md5:db48d09e4d93fc715f47fd3d6b7edd51',
-            'title': 'Performer zsnicole33 show on 2022-10-25 20:23, Chaturbate Archive – Recurbate',
-            'age_limit': 18,
-        },
-        'skip': 'Website require membership.',
-    }]
-
-    def _real_extract(self, url):
-        SUBSCRIPTION_MISSING_MESSAGE = 'This video is only available for registered users; Set your authenticated browser user agent via the --user-agent parameter.'
-        video_id = self._match_id(url)
-        try:
-            webpage = self._download_webpage(url, video_id)
-        except ExtractorError as e:
-            if isinstance(e.cause, HTTPError) and e.cause.status == 403:
-                self.raise_login_required(msg=SUBSCRIPTION_MISSING_MESSAGE, method='cookies')
-            raise
-        token = self._html_search_regex(r'data-token="([^"]+)"', webpage, 'token')
-        video_url = f'https://recurbate.com/api/get.php?video={video_id}&token={token}'
-
-        video_webpage = self._download_webpage(video_url, video_id)
-        if video_webpage == 'shall_subscribe':
-            self.raise_login_required(msg=SUBSCRIPTION_MISSING_MESSAGE, method='cookies')
-        entries = self._parse_html5_media_entries(video_url, video_webpage, video_id)
-        return merge_dicts({
-            'id': video_id,
-            'title': self._html_extract_title(webpage, 'title'),
-            'description': self._og_search_description(webpage),
-            'age_limit': self._rta_search(webpage),
-        }, entries[0])
diff --git a/plugins/youtube_download/yt_dlp/extractor/redbee.py b/plugins/youtube_download/yt_dlp/extractor/redbee.py
index b59b518..d43bb0b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/redbee.py
+++ b/plugins/youtube_download/yt_dlp/extractor/redbee.py
@@ -41,8 +41,8 @@ class RedBeeBaseIE(InfoExtractor):
 
         return self._download_json(
             f'{self._API_URL}/auth/{"gigyaLogin" if jwt else "anonymous"}',
-            asset_id, data=json.dumps(request).encode('utf-8'), headers={
-                'Content-Type': 'application/json;charset=utf-8'
+            asset_id, data=json.dumps(request).encode(), headers={
+                'Content-Type': 'application/json;charset=utf-8',
             })['sessionToken']
 
     def _get_formats_and_subtitles(self, asset_id, **kwargs):
@@ -51,26 +51,26 @@ class RedBeeBaseIE(InfoExtractor):
             f'{self._API_URL}/entitlement/{asset_id}/play',
             asset_id, headers={
                 'Authorization': f'Bearer {bearer_token}',
-                'Accept': 'application/json, text/plain, */*'
+                'Accept': 'application/json, text/plain, */*',
             })
 
         formats, subtitles = [], {}
-        for format in api_response['formats']:
-            if not format.get('mediaLocator'):
+        for format_data in api_response['formats']:
+            if not format_data.get('mediaLocator'):
                 continue
 
             fmts, subs = [], {}
-            if format.get('format') == 'DASH':
+            if format_data.get('format') == 'DASH':
                 fmts, subs = self._extract_mpd_formats_and_subtitles(
-                    format['mediaLocator'], asset_id, fatal=False)
-            elif format.get('format') == 'SMOOTHSTREAMING':
+                    format_data['mediaLocator'], asset_id, fatal=False)
+            elif format_data.get('format') == 'SMOOTHSTREAMING':
                 fmts, subs = self._extract_ism_formats_and_subtitles(
-                    format['mediaLocator'], asset_id, fatal=False)
-            elif format.get('format') == 'HLS':
+                    format_data['mediaLocator'], asset_id, fatal=False)
+            elif format_data.get('format') == 'HLS':
                 fmts, subs = self._extract_m3u8_formats_and_subtitles(
-                    format['mediaLocator'], asset_id, fatal=False)
+                    format_data['mediaLocator'], asset_id, fatal=False)
 
-            if format.get('drm'):
+            if format_data.get('drm'):
                 for f in fmts:
                     f['has_drm'] = True
 
@@ -134,6 +134,7 @@ class ParliamentLiveUKIE(RedBeeBaseIE):
 
 
 class RTBFIE(RedBeeBaseIE):
+    _WORKING = False
     _VALID_URL = r'''(?x)
         https?://(?:www\.)?rtbf\.be/
         (?:
@@ -239,12 +240,12 @@ class RTBFIE(RedBeeBaseIE):
                 'APIKey': self._GIGYA_API_KEY,
                 'targetEnv': 'jssdk',
                 'sessionExpiration': '-2',
-            }).encode('utf-8'), headers={
+            }).encode(), headers={
                 'Content-Type': 'application/x-www-form-urlencoded',
             })
 
         if login_response['statusCode'] != 200:
-            raise ExtractorError('Login failed. Server message: %s' % login_response['errorMessage'], expected=True)
+            raise ExtractorError('Login failed. Server message: {}'.format(login_response['errorMessage']), expected=True)
 
         self._set_cookie('.rtbf.be', self._LOGIN_COOKIE_ID, login_response['sessionInfo']['login_token'],
                          secure=True, expire_time=time.time() + 3600)
@@ -286,7 +287,7 @@ class RTBFIE(RedBeeBaseIE):
 
         error = data.get('error')
         if error:
-            raise ExtractorError('%s said: %s' % (self.IE_NAME, error), expected=True)
+            raise ExtractorError(f'{self.IE_NAME} said: {error}', expected=True)
 
         provider = data.get('provider')
         if provider in self._PROVIDERS:
diff --git a/plugins/youtube_download/yt_dlp/extractor/redbulltv.py b/plugins/youtube_download/yt_dlp/extractor/redbulltv.py
index d1de249..ceeef52 100644
--- a/plugins/youtube_download/yt_dlp/extractor/redbulltv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/redbulltv.py
@@ -1,8 +1,8 @@
 from .common import InfoExtractor
 from ..networking.exceptions import HTTPError
 from ..utils import (
-    float_or_none,
     ExtractorError,
+    float_or_none,
 )
 
 
@@ -57,7 +57,7 @@ class RedBullTVIE(InfoExtractor):
                 'os_family': 'http',
             })
         if session.get('code') == 'error':
-            raise ExtractorError('%s said: %s' % (
+            raise ExtractorError('{} said: {}'.format(
                 self.IE_NAME, session['message']))
         token = session['token']
 
@@ -65,20 +65,19 @@ class RedBullTVIE(InfoExtractor):
             video = self._download_json(
                 'https://api.redbull.tv/v3/products/' + video_id,
                 video_id, note='Downloading video information',
-                headers={'Authorization': token}
+                headers={'Authorization': token},
             )
         except ExtractorError as e:
             if isinstance(e.cause, HTTPError) and e.cause.status == 404:
                 error_message = self._parse_json(
                     e.cause.response.read().decode(), video_id)['error']
-                raise ExtractorError('%s said: %s' % (
-                    self.IE_NAME, error_message), expected=True)
+                raise ExtractorError(f'{self.IE_NAME} said: {error_message}', expected=True)
             raise
 
         title = video['title'].strip()
 
         formats, subtitles = self._extract_m3u8_formats_and_subtitles(
-            'https://dms.redbull.tv/v3/%s/%s/playlist.m3u8' % (video_id, token),
+            f'https://dms.redbull.tv/v3/{video_id}/{token}/playlist.m3u8',
             video_id, 'mp4', entry_protocol='m3u8_native', m3u8_id='hls')
 
         for resource in video.get('resources', []):
@@ -86,13 +85,13 @@ class RedBullTVIE(InfoExtractor):
                 splitted_resource = resource.split('_')
                 if splitted_resource[2]:
                     subtitles.setdefault('en', []).append({
-                        'url': 'https://resources.redbull.tv/%s/%s' % (video_id, resource),
+                        'url': f'https://resources.redbull.tv/{video_id}/{resource}',
                         'ext': splitted_resource[2],
                     })
 
         subheading = video.get('subheading')
         if subheading:
-            title += ' - %s' % subheading
+            title += f' - {subheading}'
 
         return {
             'id': video_id,
@@ -135,7 +134,7 @@ class RedBullEmbedIE(RedBullTVIE):  # XXX: Do not subclass from concrete IE
     %s
     %s
   }
-}''' % (rrn_id, self._VIDEO_ESSENSE_TMPL % 'LiveVideo', self._VIDEO_ESSENSE_TMPL % 'VideoResource'),
+}''' % (rrn_id, self._VIDEO_ESSENSE_TMPL % 'LiveVideo', self._VIDEO_ESSENSE_TMPL % 'VideoResource'),  # noqa: UP031
             })['data']['resource']['videoEssence']['attributes']['assetId']
         return self.extract_info(asset_id)
 
@@ -155,7 +154,7 @@ class RedBullTVRrnContentIE(InfoExtractor):
 
     def _real_extract(self, url):
         region, lang, rrn_id = self._match_valid_url(url).groups()
-        rrn_id += ':%s-%s' % (lang, region.upper())
+        rrn_id += f':{lang}-{region.upper()}'
         return self.url_result(
             'https://www.redbull.com/embed/' + rrn_id,
             RedBullEmbedIE.ie_key(), rrn_id)
@@ -209,7 +208,7 @@ class RedBullIE(InfoExtractor):
                 regions.append('LAT')
             if lang in self._INT_FALLBACK_LIST:
                 regions.append('INT')
-        locale = '>'.join(['%s-%s' % (lang, reg) for reg in regions])
+        locale = '>'.join([f'{lang}-{reg}' for reg in regions])
 
         rrn_id = self._download_json(
             'https://www.redbull.com/v3/api/graphql/v1/v3/query/' + locale,
diff --git a/plugins/youtube_download/yt_dlp/extractor/reddit.py b/plugins/youtube_download/yt_dlp/extractor/reddit.py
index 813e628..be4c32e 100644
--- a/plugins/youtube_download/yt_dlp/extractor/reddit.py
+++ b/plugins/youtube_download/yt_dlp/extractor/reddit.py
@@ -1,3 +1,4 @@
+import json
 import urllib.parse
 
 from .common import InfoExtractor
@@ -5,17 +6,20 @@ from ..utils import (
     ExtractorError,
     float_or_none,
     int_or_none,
+    parse_qs,
     traverse_obj,
+    truncate_string,
     try_get,
     unescapeHTML,
-    urlencode_postdata,
+    update_url_query,
     url_or_none,
+    urlencode_postdata,
 )
 
 
 class RedditIE(InfoExtractor):
     _NETRC_MACHINE = 'reddit'
-    _VALID_URL = r'https?://(?P<host>(?:\w+\.)?reddit(?:media)?\.com)/(?P<slug>(?:(?:r|user)/[^/]+/)?comments/(?P<id>[^/?#&]+))'
+    _VALID_URL = r'https?://(?:\w+\.)?reddit(?:media)?\.com/(?P<slug>(?:(?:r|user)/[^/]+/)?comments/(?P<id>[^/?#&]+))'
     _TESTS = [{
         'url': 'https://www.reddit.com/r/videos/comments/6rrwyj/that_small_heart_attack/',
         'info_dict': {
@@ -23,6 +27,7 @@ class RedditIE(InfoExtractor):
             'ext': 'mp4',
             'display_id': '6rrwyj',
             'title': 'That small heart attack.',
+            'alt_title': 'That small heart attack.',
             'thumbnail': r're:^https?://.*\.(?:jpg|png)',
             'thumbnails': 'count:4',
             'timestamp': 1501941939,
@@ -46,7 +51,8 @@ class RedditIE(InfoExtractor):
             'id': 'gyh95hiqc0b11',
             'ext': 'mp4',
             'display_id': '90bu6w',
-            'title': 'Heat index was 110 degrees so we offered him a cold drink. He went for a full body soak instead',
+            'title': 'Heat index was 110 degrees so we offered him a cold drink. He went fo...',
+            'alt_title': 'Heat index was 110 degrees so we offered him a cold drink. He went for a full body soak instead',
             'thumbnail': r're:^https?://.*\.(?:jpg|png)',
             'thumbnails': 'count:7',
             'timestamp': 1532051078,
@@ -66,7 +72,8 @@ class RedditIE(InfoExtractor):
             'id': 'zasobba6wp071',
             'ext': 'mp4',
             'display_id': 'nip71r',
-            'title': 'I plan to make more stickers and prints! Check them out on my Etsy! Or get them through my Patreon. Links below.',
+            'title': 'I plan to make more stickers and prints! Check them out on my Etsy! O...',
+            'alt_title': 'I plan to make more stickers and prints! Check them out on my Etsy! Or get them through my Patreon. Links below.',
             'thumbnail': r're:^https?://.*\.(?:jpg|png)',
             'thumbnails': 'count:5',
             'timestamp': 1621709093,
@@ -76,7 +83,7 @@ class RedditIE(InfoExtractor):
             'like_count': int,
             'dislike_count': int,
             'comment_count': int,
-            'age_limit': 0,
+            'age_limit': 18,
             'channel_id': 'u_creepyt0es',
         },
         'params': {
@@ -88,7 +95,17 @@ class RedditIE(InfoExtractor):
         'playlist_count': 2,
         'info_dict': {
             'id': 'wzqkxp',
-            'title': 'md5:72d3d19402aa11eff5bd32fc96369b37',
+            'title': '[Finale] Kamen Rider Revice Episode 50 "Family to the End, Until the ...',
+            'alt_title': '[Finale] Kamen Rider Revice Episode 50 "Family to the End, Until the Day We Meet Again" Discussion',
+            'description': 'md5:5b7deb328062b164b15704c5fd67c335',
+            'uploader': 'TheTwelveYearOld',
+            'channel_id': 'KamenRider',
+            'comment_count': int,
+            'like_count': int,
+            'dislike_count': int,
+            'age_limit': 0,
+            'timestamp': 1661676059.0,
+            'upload_date': '20220828',
         },
     }, {
         # crossposted reddit-hosted media
@@ -99,6 +116,7 @@ class RedditIE(InfoExtractor):
             'ext': 'mp4',
             'display_id': 'zjjw82',
             'title': 'Cringe',
+            'alt_title': 'Cringe',
             'uploader': 'Otaku-senpai69420',
             'thumbnail': r're:^https?://.*\.(?:jpg|png)',
             'upload_date': '20221212',
@@ -119,6 +137,7 @@ class RedditIE(InfoExtractor):
             'ext': 'mp4',
             'display_id': '124pp33',
             'title': 'Harmless prank of some old friends',
+            'alt_title': 'Harmless prank of some old friends',
             'uploader': 'Dudezila',
             'channel_id': 'ContagiousLaughter',
             'duration': 17,
@@ -139,6 +158,7 @@ class RedditIE(InfoExtractor):
             'ext': 'mp4',
             'display_id': '12fujy3',
             'title': 'Based Hasan?',
+            'alt_title': 'Based Hasan?',
             'uploader': 'KingNigelXLII',
             'channel_id': 'GenZedong',
             'duration': 16,
@@ -150,6 +170,73 @@ class RedditIE(InfoExtractor):
             'like_count': int,
         },
         'skip': 'Requires account that has opted-in to the GenZedong subreddit',
+    }, {
+        # subtitles in HLS manifest
+        'url': 'https://www.reddit.com/r/Unexpected/comments/1cl9h0u/the_insurance_claim_will_be_interesting/',
+        'info_dict': {
+            'id': 'a2mdj5d57qyc1',
+            'ext': 'mp4',
+            'display_id': '1cl9h0u',
+            'title': 'The insurance claim will be interesting',
+            'alt_title': 'The insurance claim will be interesting',
+            'uploader': 'darrenpauli',
+            'channel_id': 'Unexpected',
+            'duration': 53,
+            'upload_date': '20240506',
+            'timestamp': 1714966382,
+            'age_limit': 0,
+            'comment_count': int,
+            'dislike_count': int,
+            'like_count': int,
+            'subtitles': {'en': 'mincount:1'},
+        },
+        'params': {
+            'skip_download': True,
+        },
+    }, {
+        # subtitles from caption-url
+        'url': 'https://www.reddit.com/r/soccer/comments/1cxwzso/tottenham_1_0_newcastle_united_james_maddison_31/',
+        'info_dict': {
+            'id': 'xbmj4t3igy1d1',
+            'ext': 'mp4',
+            'display_id': '1cxwzso',
+            'title': 'Tottenham [1] - 0 Newcastle United - James Maddison 31\'',
+            'alt_title': 'Tottenham [1] - 0 Newcastle United - James Maddison 31\'',
+            'uploader': 'Woodstovia',
+            'channel_id': 'soccer',
+            'duration': 30,
+            'upload_date': '20240522',
+            'timestamp': 1716373798,
+            'age_limit': 0,
+            'comment_count': int,
+            'dislike_count': int,
+            'like_count': int,
+            'subtitles': {'en': 'mincount:1'},
+        },
+        'params': {
+            'skip_download': True,
+            'writesubtitles': True,
+        },
+    }, {
+        # "gated" subreddit post
+        'url': 'https://old.reddit.com/r/ketamine/comments/degtjo/when_the_k_hits/',
+        'info_dict': {
+            'id': 'gqsbxts133r31',
+            'ext': 'mp4',
+            'display_id': 'degtjo',
+            'title': 'When the K hits',
+            'alt_title': 'When the K hits',
+            'uploader': '[deleted]',
+            'channel_id': 'ketamine',
+            'comment_count': int,
+            'like_count': int,
+            'dislike_count': int,
+            'age_limit': 18,
+            'duration': 34,
+            'thumbnail': r're:https?://.+/.+\.(?:jpg|png)',
+            'timestamp': 1570438713.0,
+            'upload_date': '20191007',
+        },
     }, {
         'url': 'https://www.reddit.com/r/videos/comments/6rrwyj',
         'only_matching': True,
@@ -197,16 +284,33 @@ class RedditIE(InfoExtractor):
         elif not traverse_obj(login, ('json', 'data', 'cookie', {str})):
             raise ExtractorError('Unable to login, no cookie was returned')
 
-    def _real_extract(self, url):
-        host, slug, video_id = self._match_valid_url(url).group('host', 'slug', 'id')
+    def _real_initialize(self):
+        # Set cookie to opt-in to age-restricted subreddits
+        self._set_cookie('reddit.com', 'over18', '1')
+        # Set cookie to opt-in to "gated" subreddits
+        options = traverse_obj(self._get_cookies('https://www.reddit.com/'), (
+            '_options', 'value', {urllib.parse.unquote}, {json.loads}, {dict})) or {}
+        options['pref_gated_sr_optin'] = True
+        self._set_cookie('reddit.com', '_options', urllib.parse.quote(json.dumps(options)))
 
-        data = self._download_json(
-            f'https://{host}/{slug}/.json', video_id, fatal=False, expected_status=403)
-        if not data:
-            fallback_host = 'old.reddit.com' if host != 'old.reddit.com' else 'www.reddit.com'
-            self.to_screen(f'{host} request failed, retrying with {fallback_host}')
+    def _get_subtitles(self, video_id):
+        # Fallback if there were no subtitles provided by DASH or HLS manifests
+        caption_url = f'https://v.redd.it/{video_id}/wh_ben_en.vtt'
+        if self._is_valid_url(caption_url, video_id, item='subtitles'):
+            return {'en': [{'url': caption_url}]}
+
+    def _real_extract(self, url):
+        slug, video_id = self._match_valid_url(url).group('slug', 'id')
+
+        try:
             data = self._download_json(
-                f'https://{fallback_host}/{slug}/.json', video_id, expected_status=403)
+                f'https://www.reddit.com/{slug}/.json', video_id, expected_status=403)
+        except ExtractorError as e:
+            if isinstance(e.cause, json.JSONDecodeError):
+                if self._get_cookies('https://www.reddit.com/').get('reddit_session'):
+                    raise ExtractorError('Your IP address is unable to access the Reddit API', expected=True)
+                self.raise_login_required('Account authentication is required')
+            raise
 
         if traverse_obj(data, 'error') == 403:
             reason = data.get('reason')
@@ -220,14 +324,6 @@ class RedditIE(InfoExtractor):
         data = data[0]['data']['children'][0]['data']
         video_url = data['url']
 
-        over_18 = data.get('over_18')
-        if over_18 is True:
-            age_limit = 18
-        elif over_18 is False:
-            age_limit = 0
-        else:
-            age_limit = None
-
         thumbnails = []
 
         def add_thumbnail(src):
@@ -253,15 +349,19 @@ class RedditIE(InfoExtractor):
                     add_thumbnail(resolution)
 
         info = {
-            'title': data.get('title'),
             'thumbnails': thumbnails,
-            'timestamp': float_or_none(data.get('created_utc')),
-            'uploader': data.get('author'),
-            'channel_id': data.get('subreddit'),
-            'like_count': int_or_none(data.get('ups')),
-            'dislike_count': int_or_none(data.get('downs')),
-            'comment_count': int_or_none(data.get('num_comments')),
-            'age_limit': age_limit,
+            'age_limit': {True: 18, False: 0}.get(data.get('over_18')),
+            **traverse_obj(data, {
+                'title': ('title', {truncate_string(left=72)}),
+                'alt_title': ('title', {str}),
+                'description': ('selftext', {str}, filter),
+                'timestamp': ('created_utc', {float_or_none}),
+                'uploader': ('author', {str}),
+                'channel_id': ('subreddit', {str}),
+                'like_count': ('ups', {int_or_none}),
+                'dislike_count': ('downs', {int_or_none}),
+                'comment_count': ('num_comments', {int_or_none}),
+            }),
         }
 
         parsed_url = urllib.parse.urlparse(video_url)
@@ -287,8 +387,9 @@ class RedditIE(InfoExtractor):
                         **info,
                     })
             if entries:
-                return self.playlist_result(entries, video_id, info.get('title'))
-            raise ExtractorError('No media found', expected=True)
+                return self.playlist_result(entries, video_id, **info)
+            self.raise_no_formats('No media found', expected=True, video_id=video_id)
+            return {**info, 'id': video_id}
 
         # Check if media is hosted on reddit:
         reddit_video = traverse_obj(data, (
@@ -307,6 +408,10 @@ class RedditIE(InfoExtractor):
 
             dash_playlist_url = playlist_urls[0] or f'https://v.redd.it/{video_id}/DASHPlaylist.mpd'
             hls_playlist_url = playlist_urls[1] or f'https://v.redd.it/{video_id}/HLSPlaylist.m3u8'
+            qs = traverse_obj(parse_qs(hls_playlist_url), {
+                'f': ('f', 0, {lambda x: ','.join([x, 'subsAll']) if x else 'hd,subsAll'}),
+            })
+            hls_playlist_url = update_url_query(hls_playlist_url, qs)
 
             formats = [{
                 'url': unescapeHTML(reddit_video['fallback_url']),
@@ -319,16 +424,20 @@ class RedditIE(InfoExtractor):
                 'format_id': 'fallback',
                 'format_note': 'DASH video, mp4_dash',
             }]
-            formats.extend(self._extract_m3u8_formats(
-                hls_playlist_url, display_id, 'mp4', m3u8_id='hls', fatal=False))
-            formats.extend(self._extract_mpd_formats(
-                dash_playlist_url, display_id, mpd_id='dash', fatal=False))
+            hls_fmts, subtitles = self._extract_m3u8_formats_and_subtitles(
+                hls_playlist_url, display_id, 'mp4', m3u8_id='hls', fatal=False)
+            formats.extend(hls_fmts)
+            dash_fmts, dash_subs = self._extract_mpd_formats_and_subtitles(
+                dash_playlist_url, display_id, mpd_id='dash', fatal=False)
+            formats.extend(dash_fmts)
+            self._merge_subtitles(dash_subs, target=subtitles)
 
             return {
                 **info,
                 'id': video_id,
                 'display_id': display_id,
                 'formats': formats,
+                'subtitles': subtitles or self.extract_subtitles(video_id),
                 'duration': int_or_none(reddit_video.get('duration')),
             }
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/redge.py b/plugins/youtube_download/yt_dlp/extractor/redge.py
new file mode 100644
index 0000000..5ae09a0
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/redge.py
@@ -0,0 +1,134 @@
+
+from .common import InfoExtractor
+from ..networking import HEADRequest
+from ..utils import (
+    float_or_none,
+    int_or_none,
+    join_nonempty,
+    parse_qs,
+    update_url_query,
+)
+from ..utils.traversal import traverse_obj
+
+
+class RedCDNLivxIE(InfoExtractor):
+    _VALID_URL = r'https?://[^.]+\.(?:dcs\.redcdn|atmcdn)\.pl/(?:live(?:dash|hls|ss)|nvr)/o2/(?P<tenant>[^/?#]+)/(?P<id>[^?#]+)\.livx'
+    IE_NAME = 'redcdnlivx'
+
+    _TESTS = [{
+        'url': 'https://r.dcs.redcdn.pl/livedash/o2/senat/ENC02/channel.livx?indexMode=true&startTime=638272860000&stopTime=638292544000',
+        'info_dict': {
+            'id': 'ENC02-638272860000-638292544000',
+            'ext': 'mp4',
+            'title': 'ENC02',
+            'duration': 19683.982,
+            'live_status': 'was_live',
+        },
+    }, {
+        'url': 'https://r.dcs.redcdn.pl/livedash/o2/sejm/ENC18/live.livx?indexMode=true&startTime=722333096000&stopTime=722335562000',
+        'info_dict': {
+            'id': 'ENC18-722333096000-722335562000',
+            'ext': 'mp4',
+            'title': 'ENC18',
+            'duration': 2463.995,
+            'live_status': 'was_live',
+        },
+    }, {
+        'url': 'https://r.dcs.redcdn.pl/livehls/o2/sportevolution/live/triathlon2018/warsaw.livx/playlist.m3u8?startTime=550305000000&stopTime=550327620000',
+        'info_dict': {
+            'id': 'triathlon2018-warsaw-550305000000-550327620000',
+            'ext': 'mp4',
+            'title': 'triathlon2018/warsaw',
+            'duration': 22619.98,
+            'live_status': 'was_live',
+        },
+    }, {
+        'url': 'https://n-25-12.dcs.redcdn.pl/nvr/o2/sejm/Migacz-ENC01/1.livx?startTime=722347200000&stopTime=722367345000',
+        'only_matching': True,
+    }, {
+        'url': 'https://redir.atmcdn.pl/nvr/o2/sejm/ENC08/1.livx?startTime=503831270000&stopTime=503840040000',
+        'only_matching': True,
+    }]
+
+    '''
+    Known methods (first in url path):
+    - `livedash` - DASH MPD
+    - `livehls` - HTTP Live Streaming
+    - `livess` - IIS Smooth Streaming
+    - `nvr` - CCTV mode, directly returns a file, typically flv, avc1, aac
+    - `sc` - shoutcast/icecast (audio streams, like radio)
+    '''
+
+    def _real_extract(self, url):
+        tenant, path = self._match_valid_url(url).group('tenant', 'id')
+        qs = parse_qs(url)
+        start_time = traverse_obj(qs, ('startTime', 0, {int_or_none}))
+        stop_time = traverse_obj(qs, ('stopTime', 0, {int_or_none}))
+
+        def livx_mode(mode):
+            suffix = ''
+            if mode == 'livess':
+                suffix = '/manifest'
+            elif mode == 'livehls':
+                suffix = '/playlist.m3u8'
+            file_qs = {}
+            if start_time:
+                file_qs['startTime'] = start_time
+            if stop_time:
+                file_qs['stopTime'] = stop_time
+            if mode == 'nvr':
+                file_qs['nolimit'] = 1
+            elif mode != 'sc':
+                file_qs['indexMode'] = 'true'
+            return update_url_query(f'https://r.dcs.redcdn.pl/{mode}/o2/{tenant}/{path}.livx{suffix}', file_qs)
+
+        # no id or title for a transmission. making ones up.
+        title = path \
+            .replace('/live', '').replace('live/', '') \
+            .replace('/channel', '').replace('channel/', '') \
+            .strip('/')
+        video_id = join_nonempty(title.replace('/', '-'), start_time, stop_time)
+
+        formats = []
+        # downloading the manifest separately here instead of _extract_ism_formats to also get some stream metadata
+        ism_res = self._download_xml_handle(
+            livx_mode('livess'), video_id,
+            note='Downloading ISM manifest',
+            errnote='Failed to download ISM manifest',
+            fatal=False)
+        ism_doc = None
+        if ism_res is not False:
+            ism_doc, ism_urlh = ism_res
+            formats, _ = self._parse_ism_formats_and_subtitles(ism_doc, ism_urlh.url, 'ss')
+
+        nvr_urlh = self._request_webpage(
+            HEADRequest(livx_mode('nvr')), video_id, 'Follow flv file redirect', fatal=False,
+            expected_status=lambda _: True)
+        if nvr_urlh and nvr_urlh.status == 200:
+            formats.append({
+                'url': nvr_urlh.url,
+                'ext': 'flv',
+                'format_id': 'direct-0',
+                'preference': -1,   # might be slow
+            })
+        formats.extend(self._extract_mpd_formats(livx_mode('livedash'), video_id, mpd_id='dash', fatal=False))
+        formats.extend(self._extract_m3u8_formats(
+            livx_mode('livehls'), video_id, m3u8_id='hls', ext='mp4', fatal=False))
+
+        time_scale = traverse_obj(ism_doc, ('@TimeScale', {int_or_none})) or 10000000
+        duration = traverse_obj(
+            ism_doc, ('@Duration', {float_or_none(scale=time_scale)})) or None
+
+        live_status = None
+        if traverse_obj(ism_doc, '@IsLive') == 'TRUE':
+            live_status = 'is_live'
+        elif duration:
+            live_status = 'was_live'
+
+        return {
+            'id': video_id,
+            'title': title,
+            'formats': formats,
+            'duration': duration,
+            'live_status': live_status,
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/redgifs.py b/plugins/youtube_download/yt_dlp/extractor/redgifs.py
index f945320..cd3cd32 100644
--- a/plugins/youtube_download/yt_dlp/extractor/redgifs.py
+++ b/plugins/youtube_download/yt_dlp/extractor/redgifs.py
@@ -1,18 +1,18 @@
 import functools
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import compat_parse_qs
 from ..networking.exceptions import HTTPError
 from ..utils import (
     ExtractorError,
+    OnDemandPagedList,
     int_or_none,
     qualities,
     try_get,
-    OnDemandPagedList,
 )
 
 
-class RedGifsBaseInfoExtractor(InfoExtractor):
+class RedGifsBaseIE(InfoExtractor):
     _FORMATS = {
         'gif': 250,
         'sd': 480,
@@ -71,7 +71,7 @@ class RedGifsBaseInfoExtractor(InfoExtractor):
             raise ExtractorError('Unable to get temporary token')
         self._API_HEADERS['authorization'] = f'Bearer {auth["token"]}'
 
-    def _call_api(self, ep, video_id, *args, **kwargs):
+    def _call_api(self, ep, video_id, **kwargs):
         for first_attempt in True, False:
             if 'authorization' not in self._API_HEADERS:
                 self._fetch_oauth_token(video_id)
@@ -79,7 +79,7 @@ class RedGifsBaseInfoExtractor(InfoExtractor):
                 headers = dict(self._API_HEADERS)
                 headers['x-customheader'] = f'https://www.redgifs.com/watch/{video_id}'
                 data = self._download_json(
-                    f'https://api.redgifs.com/v2/{ep}', video_id, headers=headers, *args, **kwargs)
+                    f'https://api.redgifs.com/v2/{ep}', video_id, headers=headers, **kwargs)
                 break
             except ExtractorError as e:
                 if first_attempt and isinstance(e.cause, HTTPError) and e.cause.status == 401:
@@ -113,8 +113,8 @@ class RedGifsBaseInfoExtractor(InfoExtractor):
         return page_fetcher(page) if page else OnDemandPagedList(page_fetcher, self._PAGE_SIZE)
 
 
-class RedGifsIE(RedGifsBaseInfoExtractor):
-    _VALID_URL = r'https?://(?:(?:www\.)?redgifs\.com/watch/|thumbs2\.redgifs\.com/)(?P<id>[^-/?#\.]+)'
+class RedGifsIE(RedGifsBaseIE):
+    _VALID_URL = r'https?://(?:(?:www\.)?redgifs\.com/(?:watch|ifr)/|thumbs2\.redgifs\.com/)(?P<id>[^-/?#\.]+)'
     _TESTS = [{
         'url': 'https://www.redgifs.com/watch/squeakyhelplesswisent',
         'info_dict': {
@@ -130,7 +130,7 @@ class RedGifsIE(RedGifsBaseInfoExtractor):
             'categories': list,
             'age_limit': 18,
             'tags': list,
-        }
+        },
     }, {
         'url': 'https://thumbs2.redgifs.com/SqueakyHelplessWisent-mobile.mp4#t=0',
         'info_dict': {
@@ -146,7 +146,23 @@ class RedGifsIE(RedGifsBaseInfoExtractor):
             'categories': list,
             'age_limit': 18,
             'tags': list,
-        }
+        },
+    }, {
+        'url': 'https://www.redgifs.com/ifr/squeakyhelplesswisent',
+        'info_dict': {
+            'id': 'squeakyhelplesswisent',
+            'ext': 'mp4',
+            'title': 'Hotwife Legs Thick',
+            'timestamp': 1636287915,
+            'upload_date': '20211107',
+            'uploader': 'ignored52',
+            'duration': 16,
+            'view_count': int,
+            'like_count': int,
+            'categories': list,
+            'age_limit': 18,
+            'tags': list,
+        },
     }]
 
     def _real_extract(self, url):
@@ -156,7 +172,7 @@ class RedGifsIE(RedGifsBaseInfoExtractor):
         return self._parse_gif_data(video_info['gif'])
 
 
-class RedGifsSearchIE(RedGifsBaseInfoExtractor):
+class RedGifsSearchIE(RedGifsBaseIE):
     IE_DESC = 'Redgifs search'
     _VALID_URL = r'https?://(?:www\.)?redgifs\.com/browse\?(?P<query>[^#]+)'
     _PAGE_SIZE = 80
@@ -166,7 +182,7 @@ class RedGifsSearchIE(RedGifsBaseInfoExtractor):
             'info_dict': {
                 'id': 'tags=Lesbian',
                 'title': 'Lesbian',
-                'description': 'RedGifs search for Lesbian, ordered by trending'
+                'description': 'RedGifs search for Lesbian, ordered by trending',
             },
             'playlist_mincount': 100,
         },
@@ -175,7 +191,7 @@ class RedGifsSearchIE(RedGifsBaseInfoExtractor):
             'info_dict': {
                 'id': 'type=g&order=latest&tags=Lesbian',
                 'title': 'Lesbian',
-                'description': 'RedGifs search for Lesbian, ordered by latest'
+                'description': 'RedGifs search for Lesbian, ordered by latest',
             },
             'playlist_mincount': 100,
         },
@@ -184,15 +200,15 @@ class RedGifsSearchIE(RedGifsBaseInfoExtractor):
             'info_dict': {
                 'id': 'type=g&order=latest&tags=Lesbian&page=2',
                 'title': 'Lesbian',
-                'description': 'RedGifs search for Lesbian, ordered by latest'
+                'description': 'RedGifs search for Lesbian, ordered by latest',
             },
             'playlist_count': 80,
-        }
+        },
     ]
 
     def _real_extract(self, url):
         query_str = self._match_valid_url(url).group('query')
-        query = compat_parse_qs(query_str)
+        query = urllib.parse.parse_qs(query_str)
         if not query.get('tags'):
             raise ExtractorError('Invalid query tags', expected=True)
 
@@ -210,45 +226,55 @@ class RedGifsSearchIE(RedGifsBaseInfoExtractor):
             entries, query_str, tags, f'RedGifs search for {tags}, ordered by {order}')
 
 
-class RedGifsUserIE(RedGifsBaseInfoExtractor):
+class RedGifsUserIE(RedGifsBaseIE):
     IE_DESC = 'Redgifs user'
     _VALID_URL = r'https?://(?:www\.)?redgifs\.com/users/(?P<username>[^/?#]+)(?:\?(?P<query>[^#]+))?'
-    _PAGE_SIZE = 30
+    _PAGE_SIZE = 80
     _TESTS = [
         {
             'url': 'https://www.redgifs.com/users/lamsinka89',
             'info_dict': {
                 'id': 'lamsinka89',
                 'title': 'lamsinka89',
-                'description': 'RedGifs user lamsinka89, ordered by recent'
+                'description': 'RedGifs user lamsinka89, ordered by recent',
             },
-            'playlist_mincount': 100,
+            'playlist_mincount': 391,
         },
         {
             'url': 'https://www.redgifs.com/users/lamsinka89?page=3',
             'info_dict': {
                 'id': 'lamsinka89?page=3',
                 'title': 'lamsinka89',
-                'description': 'RedGifs user lamsinka89, ordered by recent'
+                'description': 'RedGifs user lamsinka89, ordered by recent',
             },
-            'playlist_count': 30,
+            'playlist_count': 80,
         },
         {
             'url': 'https://www.redgifs.com/users/lamsinka89?order=best&type=g',
             'info_dict': {
                 'id': 'lamsinka89?order=best&type=g',
                 'title': 'lamsinka89',
-                'description': 'RedGifs user lamsinka89, ordered by best'
+                'description': 'RedGifs user lamsinka89, ordered by best',
             },
-            'playlist_mincount': 100,
-        }
+            'playlist_mincount': 391,
+        },
+        {
+            'url': 'https://www.redgifs.com/users/ignored52',
+            'note': 'https://github.com/yt-dlp/yt-dlp/issues/7382',
+            'info_dict': {
+                'id': 'ignored52',
+                'title': 'ignored52',
+                'description': 'RedGifs user ignored52, ordered by recent',
+            },
+            'playlist_mincount': 121,
+        },
     ]
 
     def _real_extract(self, url):
         username, query_str = self._match_valid_url(url).group('username', 'query')
         playlist_id = f'{username}?{query_str}' if query_str else username
 
-        query = compat_parse_qs(query_str)
+        query = urllib.parse.parse_qs(query_str)
         order = query.get('order', ('recent',))[0]
 
         entries = self._paged_entries(f'users/{username}/search', playlist_id, query, {
diff --git a/plugins/youtube_download/yt_dlp/extractor/redtube.py b/plugins/youtube_download/yt_dlp/extractor/redtube.py
index 49076cc..94a9054 100644
--- a/plugins/youtube_download/yt_dlp/extractor/redtube.py
+++ b/plugins/youtube_download/yt_dlp/extractor/redtube.py
@@ -1,17 +1,18 @@
 from .common import InfoExtractor
 from ..utils import (
-    determine_ext,
     ExtractorError,
+    determine_ext,
     int_or_none,
     merge_dicts,
     str_to_int,
     unified_strdate,
     url_or_none,
+    urljoin,
 )
 
 
 class RedTubeIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:(?:\w+\.)?redtube\.com/|embed\.redtube\.com/\?.*?\bid=)(?P<id>[0-9]+)'
+    _VALID_URL = r'https?://(?:(?:\w+\.)?redtube\.com(?:\.br)?/|embed\.redtube\.com/\?.*?\bid=)(?P<id>[0-9]+)'
     _EMBED_REGEX = [r'<iframe[^>]+?src=["\'](?P<url>(?:https?:)?//embed\.redtube\.com/\?.*?\bid=\d+)']
     _TESTS = [{
         'url': 'https://www.redtube.com/38864951',
@@ -34,12 +35,15 @@ class RedTubeIE(InfoExtractor):
     }, {
         'url': 'http://it.redtube.com/66418',
         'only_matching': True,
+    }, {
+        'url': 'https://www.redtube.com.br/103224331',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
         webpage = self._download_webpage(
-            'http://www.redtube.com/%s' % video_id, video_id)
+            f'https://www.redtube.com/{video_id}', video_id)
 
         ERRORS = (
             (('video-deleted-info', '>This video has been removed'), 'has been removed'),
@@ -49,14 +53,14 @@ class RedTubeIE(InfoExtractor):
         for patterns, message in ERRORS:
             if any(p in webpage for p in patterns):
                 raise ExtractorError(
-                    'Video %s %s' % (video_id, message), expected=True)
+                    f'Video {video_id} {message}', expected=True)
 
         info = self._search_json_ld(webpage, video_id, default={})
 
         if not info.get('title'):
             info['title'] = self._html_search_regex(
                 (r'<h(\d)[^>]+class="(?:video_title_text|videoTitle|video_title)[^"]*">(?P<title>(?:(?!\1).)+)</h\1>',
-                 r'(?:videoTitle|title)\s*:\s*(["\'])(?P<title>(?:(?!\1).)+)\1',),
+                 r'(?:videoTitle|title)\s*:\s*(["\'])(?P<title>(?:(?!\1).)+)\1'),
                 webpage, 'title', group='title',
                 default=None) or self._og_search_title(webpage)
 
@@ -79,7 +83,7 @@ class RedTubeIE(InfoExtractor):
                 'media definitions', default='{}'),
             video_id, fatal=False)
         for media in medias if isinstance(medias, list) else []:
-            format_url = url_or_none(media.get('videoUrl'))
+            format_url = urljoin('https://www.redtube.com', media.get('videoUrl'))
             if not format_url:
                 continue
             format_id = media.get('format')
diff --git a/plugins/youtube_download/yt_dlp/extractor/regiotv.py b/plugins/youtube_download/yt_dlp/extractor/regiotv.py
deleted file mode 100644
index edb6ae5..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/regiotv.py
+++ /dev/null
@@ -1,55 +0,0 @@
-from .common import InfoExtractor
-from ..networking import Request
-from ..utils import xpath_text, xpath_with_ns
-
-
-class RegioTVIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?regio-tv\.de/video/(?P<id>[0-9]+)'
-    _TESTS = [{
-        'url': 'http://www.regio-tv.de/video/395808.html',
-        'info_dict': {
-            'id': '395808',
-            'ext': 'mp4',
-            'title': 'Wir in Ludwigsburg',
-            'description': 'Mit unseren zuckersüßen Adventskindern, außerdem besuchen wir die Abendsterne!',
-        }
-    }, {
-        'url': 'http://www.regio-tv.de/video/395808',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        webpage = self._download_webpage(url, video_id)
-
-        key = self._search_regex(
-            r'key\s*:\s*(["\'])(?P<key>.+?)\1', webpage, 'key', group='key')
-        title = self._og_search_title(webpage)
-
-        SOAP_TEMPLATE = '<?xml version="1.0" encoding="utf-8"?><soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"><soap:Body><{0} xmlns="http://v.telvi.de/"><key xsi:type="xsd:string">{1}</key></{0}></soap:Body></soap:Envelope>'
-
-        request = Request(
-            'http://v.telvi.de/',
-            SOAP_TEMPLATE.format('GetHTML5VideoData', key).encode('utf-8'))
-        video_data = self._download_xml(request, video_id, 'Downloading video XML')
-
-        NS_MAP = {
-            'xsi': 'http://www.w3.org/2001/XMLSchema-instance',
-            'soap': 'http://schemas.xmlsoap.org/soap/envelope/',
-        }
-
-        video_url = xpath_text(
-            video_data, xpath_with_ns('.//video', NS_MAP), 'video url', fatal=True)
-        thumbnail = xpath_text(
-            video_data, xpath_with_ns('.//image', NS_MAP), 'thumbnail')
-        description = self._og_search_description(
-            webpage) or self._html_search_meta('description', webpage)
-
-        return {
-            'id': video_id,
-            'url': video_url,
-            'title': title,
-            'description': description,
-            'thumbnail': thumbnail,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/rentv.py b/plugins/youtube_download/yt_dlp/extractor/rentv.py
index fdde317..aed4380 100644
--- a/plugins/youtube_download/yt_dlp/extractor/rentv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/rentv.py
@@ -1,5 +1,4 @@
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     determine_ext,
     int_or_none,
@@ -8,6 +7,7 @@ from ..utils import (
 
 
 class RENTVIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'(?:rentv:|https?://(?:www\.)?ren\.tv/(?:player|video/epizod)/)(?P<id>\d+)'
     _TESTS = [{
         'url': 'http://ren.tv/video/epizod/118577',
@@ -18,7 +18,7 @@ class RENTVIE(InfoExtractor):
             'title': 'Документальный спецпроект: "Промывка мозгов. Технологии XXI века"',
             'timestamp': 1472230800,
             'upload_date': '20160826',
-        }
+        },
     }, {
         'url': 'http://ren.tv/player/118577',
         'only_matching': True,
@@ -59,6 +59,7 @@ class RENTVIE(InfoExtractor):
 
 
 class RENTVArticleIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?ren\.tv/novosti/\d{4}-\d{2}-\d{2}/(?P<id>[^/?#]+)'
     _TESTS = [{
         'url': 'http://ren.tv/novosti/2016-10-26/video-mikroavtobus-popavshiy-v-dtp-s-gruzovikami-v-podmoskove-prevratilsya-v',
@@ -68,7 +69,7 @@ class RENTVArticleIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'Видео: микроавтобус, попавший в ДТП с грузовиками в Подмосковье, превратился в груду металла',
             'description': 'Жертвами столкновения двух фур и микроавтобуса, по последним данным, стали семь человек.',
-        }
+        },
     }, {
         # TODO: invalid m3u8
         'url': 'http://ren.tv/novosti/2015-09-25/sluchaynyy-prohozhiy-poymal-avtougonshchika-v-murmanske-video',
@@ -97,6 +98,6 @@ class RENTVArticleIE(InfoExtractor):
             media_id = config_profile.get('mediaid')
             if not media_id:
                 continue
-            media_id = compat_str(media_id)
+            media_id = str(media_id)
             entries.append(self.url_result('rentv:' + media_id, 'RENTV', media_id))
         return self.playlist_result(entries, display_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/restudy.py b/plugins/youtube_download/yt_dlp/extractor/restudy.py
index 6d03256..e10811b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/restudy.py
+++ b/plugins/youtube_download/yt_dlp/extractor/restudy.py
@@ -2,6 +2,7 @@ from .common import InfoExtractor
 
 
 class RestudyIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:(?:www|portal)\.)?restudy\.dk/video/[^/]+/id/(?P<id>[0-9]+)'
     _TESTS = [{
         'url': 'https://www.restudy.dk/video/play/id/1637',
@@ -14,7 +15,7 @@ class RestudyIE(InfoExtractor):
         'params': {
             # rtmp download
             'skip_download': True,
-        }
+        },
     }, {
         'url': 'https://portal.restudy.dk/video/leiden-frosteffekt/id/1637',
         'only_matching': True,
@@ -29,7 +30,7 @@ class RestudyIE(InfoExtractor):
         description = self._og_search_description(webpage).strip()
 
         formats = self._extract_smil_formats(
-            'https://cdn.portal.restudy.dk/dynamic/themes/front/awsmedia/SmilDirectory/video_%s.xml' % video_id,
+            f'https://cdn.portal.restudy.dk/dynamic/themes/front/awsmedia/SmilDirectory/video_{video_id}.xml',
             video_id)
 
         return {
diff --git a/plugins/youtube_download/yt_dlp/extractor/reuters.py b/plugins/youtube_download/yt_dlp/extractor/reuters.py
index 6919425..69a858a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/reuters.py
+++ b/plugins/youtube_download/yt_dlp/extractor/reuters.py
@@ -2,13 +2,14 @@ import re
 
 from .common import InfoExtractor
 from ..utils import (
-    js_to_json,
     int_or_none,
+    js_to_json,
     unescapeHTML,
 )
 
 
 class ReutersIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?reuters\.com/.*?\?.*?videoId=(?P<id>[0-9]+)'
     _TEST = {
         'url': 'http://www.reuters.com/video/2016/05/20/san-francisco-police-chief-resigns?videoId=368575562',
@@ -17,25 +18,25 @@ class ReutersIE(InfoExtractor):
             'id': '368575562',
             'ext': 'mp4',
             'title': 'San Francisco police chief resigns',
-        }
+        },
     }
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
         webpage = self._download_webpage(
-            'http://www.reuters.com/assets/iframe/yovideo?videoId=%s' % video_id, video_id)
+            f'http://www.reuters.com/assets/iframe/yovideo?videoId={video_id}', video_id)
         video_data = js_to_json(self._search_regex(
             r'(?s)Reuters\.yovideo\.drawPlayer\(({.*?})\);',
             webpage, 'video data'))
 
         def get_json_value(key, fatal=False):
-            return self._search_regex(r'"%s"\s*:\s*"([^"]+)"' % key, video_data, key, fatal=fatal)
+            return self._search_regex(rf'"{key}"\s*:\s*"([^"]+)"', video_data, key, fatal=fatal)
 
         title = unescapeHTML(get_json_value('title', fatal=True))
         mmid, fid = re.search(r',/(\d+)\?f=(\d+)', get_json_value('flv', fatal=True)).groups()
 
         mas_data = self._download_json(
-            'http://mas-e.cds1.yospace.com/mas/%s/%s?trans=json' % (mmid, fid),
+            f'http://mas-e.cds1.yospace.com/mas/{mmid}/{fid}?trans=json',
             video_id, transform_source=js_to_json)
         formats = []
         for f in mas_data:
diff --git a/plugins/youtube_download/yt_dlp/extractor/reverbnation.py b/plugins/youtube_download/yt_dlp/extractor/reverbnation.py
index 06b6c3c..f3bcc2c 100644
--- a/plugins/youtube_download/yt_dlp/extractor/reverbnation.py
+++ b/plugins/youtube_download/yt_dlp/extractor/reverbnation.py
@@ -6,7 +6,7 @@ from ..utils import (
 
 
 class ReverbNationIE(InfoExtractor):
-    _VALID_URL = r'^https?://(?:www\.)?reverbnation\.com/.*?/song/(?P<id>\d+).*?$'
+    _VALID_URL = r'https?://(?:www\.)?reverbnation\.com/.*?/song/(?P<id>\d+).*?$'
     _TESTS = [{
         'url': 'http://www.reverbnation.com/alkilados/song/16965047-mona-lisa',
         'md5': 'c0aaf339bcee189495fdf5a8c8ba8645',
@@ -24,9 +24,9 @@ class ReverbNationIE(InfoExtractor):
         song_id = self._match_id(url)
 
         api_res = self._download_json(
-            'https://api.reverbnation.com/song/%s' % song_id,
+            f'https://api.reverbnation.com/song/{song_id}',
             song_id,
-            note='Downloading information of song %s' % song_id
+            note=f'Downloading information of song {song_id}',
         )
 
         THUMBNAILS = ('thumbnail', 'image')
@@ -36,7 +36,7 @@ class ReverbNationIE(InfoExtractor):
             if api_res.get(thumb_key):
                 thumbnails.append({
                     'url': api_res[thumb_key],
-                    'preference': quality(thumb_key)
+                    'preference': quality(thumb_key),
                 })
 
         return {
diff --git a/plugins/youtube_download/yt_dlp/extractor/rice.py b/plugins/youtube_download/yt_dlp/extractor/rice.py
deleted file mode 100644
index 3dd4d31..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/rice.py
+++ /dev/null
@@ -1,112 +0,0 @@
-import re
-
-from .common import InfoExtractor
-from ..compat import compat_parse_qs
-from ..utils import (
-    xpath_text,
-    xpath_element,
-    int_or_none,
-    parse_iso8601,
-    ExtractorError,
-)
-
-
-class RICEIE(InfoExtractor):
-    _VALID_URL = r'https?://mediahub\.rice\.edu/app/[Pp]ortal/video\.aspx\?(?P<query>.+)'
-    _TEST = {
-        'url': 'https://mediahub.rice.edu/app/Portal/video.aspx?PortalID=25ffd62c-3d01-4b29-8c70-7c94270efb3e&DestinationID=66bc9434-03bd-4725-b47e-c659d8d809db&ContentID=YEWIvbhb40aqdjMD1ALSqw',
-        'md5': '9b83b4a2eead4912dc3b7fac7c449b6a',
-        'info_dict': {
-            'id': 'YEWIvbhb40aqdjMD1ALSqw',
-            'ext': 'mp4',
-            'title': 'Active Learning in Archeology',
-            'upload_date': '20140616',
-            'timestamp': 1402926346,
-        }
-    }
-    _NS = 'http://schemas.datacontract.org/2004/07/ensembleVideo.Data.Service.Contracts.Models.Player.Config'
-
-    def _real_extract(self, url):
-        qs = compat_parse_qs(self._match_valid_url(url).group('query'))
-        if not qs.get('PortalID') or not qs.get('DestinationID') or not qs.get('ContentID'):
-            raise ExtractorError('Invalid URL', expected=True)
-
-        portal_id = qs['PortalID'][0]
-        playlist_id = qs['DestinationID'][0]
-        content_id = qs['ContentID'][0]
-
-        content_data = self._download_xml('https://mediahub.rice.edu/api/portal/GetContentTitle', content_id, query={
-            'portalId': portal_id,
-            'playlistId': playlist_id,
-            'contentId': content_id
-        })
-        metadata = xpath_element(content_data, './/metaData', fatal=True)
-        title = xpath_text(metadata, 'primaryTitle', fatal=True)
-        encodings = xpath_element(content_data, './/encodings', fatal=True)
-        player_data = self._download_xml('https://mediahub.rice.edu/api/player/GetPlayerConfig', content_id, query={
-            'temporaryLinkId': xpath_text(encodings, 'temporaryLinkId', fatal=True),
-            'contentId': content_id,
-        })
-
-        common_fmt = {}
-        dimensions = xpath_text(encodings, 'dimensions')
-        if dimensions:
-            wh = dimensions.split('x')
-            if len(wh) == 2:
-                common_fmt.update({
-                    'width': int_or_none(wh[0]),
-                    'height': int_or_none(wh[1]),
-                })
-
-        formats = []
-        rtsp_path = xpath_text(player_data, self._xpath_ns('RtspPath', self._NS))
-        if rtsp_path:
-            fmt = {
-                'url': rtsp_path,
-                'format_id': 'rtsp',
-            }
-            fmt.update(common_fmt)
-            formats.append(fmt)
-        for source in player_data.findall(self._xpath_ns('.//Source', self._NS)):
-            video_url = xpath_text(source, self._xpath_ns('File', self._NS))
-            if not video_url:
-                continue
-            if '.m3u8' in video_url:
-                formats.extend(self._extract_m3u8_formats(video_url, content_id, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=False))
-            else:
-                fmt = {
-                    'url': video_url,
-                    'format_id': video_url.split(':')[0],
-                }
-                fmt.update(common_fmt)
-                rtmp = re.search(r'^(?P<url>rtmp://[^/]+/(?P<app>.+))/(?P<playpath>mp4:.+)$', video_url)
-                if rtmp:
-                    fmt.update({
-                        'url': rtmp.group('url'),
-                        'play_path': rtmp.group('playpath'),
-                        'app': rtmp.group('app'),
-                        'ext': 'flv',
-                    })
-                formats.append(fmt)
-
-        thumbnails = []
-        for content_asset in content_data.findall('.//contentAssets'):
-            asset_type = xpath_text(content_asset, 'type')
-            if asset_type == 'image':
-                image_url = xpath_text(content_asset, 'httpPath')
-                if not image_url:
-                    continue
-                thumbnails.append({
-                    'id': xpath_text(content_asset, 'ID'),
-                    'url': image_url,
-                })
-
-        return {
-            'id': content_id,
-            'title': title,
-            'description': xpath_text(metadata, 'abstract'),
-            'duration': int_or_none(xpath_text(metadata, 'duration')),
-            'timestamp': parse_iso8601(xpath_text(metadata, 'dateUpdated')),
-            'thumbnails': thumbnails,
-            'formats': formats,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/ridehome.py b/plugins/youtube_download/yt_dlp/extractor/ridehome.py
new file mode 100644
index 0000000..58722bb
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/ridehome.py
@@ -0,0 +1,96 @@
+from .art19 import Art19IE
+from .common import InfoExtractor
+from ..utils import extract_attributes, get_elements_html_by_class
+from ..utils.traversal import traverse_obj
+
+
+class RideHomeIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?ridehome\.info/show/[\w-]+/(?P<id>[\w-]+)/?(?:$|[?#])'
+    _TESTS = [{
+        'url': 'https://www.ridehome.info/show/techmeme-ride-home/thu-1228-will-2024-be-the-year-apple-gets-serious-about-gaming-on-macs/',
+        'info_dict': {
+            'id': 'thu-1228-will-2024-be-the-year-apple-gets-serious-about-gaming-on-macs',
+        },
+        'playlist_count': 1,
+        'playlist': [{
+            'md5': 'c84ea3cc96950a9ab86fe540f3edc588',
+            'info_dict': {
+                'id': '540e5493-9fe6-4c14-a488-dc508d8794b2',
+                'ext': 'mp3',
+                'title': 'Thu. 12/28 – Will 2024 Be The Year Apple Gets Serious About Gaming On Macs?',
+                'description': 'md5:9dba86ae9b5047a8150eceddeeb629c2',
+                'series': 'Techmeme Ride Home',
+                'series_id': '3c30e8f4-ab48-415b-9421-1ae06cd4058b',
+                'upload_date': '20231228',
+                'timestamp': 1703780995,
+                'modified_date': '20231230',
+                'episode_id': '540e5493-9fe6-4c14-a488-dc508d8794b2',
+                'modified_timestamp': 1703912404,
+                'release_date': '20231228',
+                'release_timestamp': 1703782800,
+                'duration': 1000.1502,
+                'thumbnail': r're:^https?://content\.production\.cdn\.art19\.com/images/.*\.jpeg$',
+            },
+        }],
+    }, {
+        'url': 'https://www.ridehome.info/show/techmeme-ride-home/portfolio-profile-sensel-with-ilyarosenberg/',
+        'info_dict': {
+            'id': 'portfolio-profile-sensel-with-ilyarosenberg',
+        },
+        'playlist_count': 1,
+        'playlist': [{
+            'md5': 'bf9d6efad221008ce71aea09d5533cf6',
+            'info_dict': {
+                'id': '6beed803-b1ef-4536-9fef-c23cf6b4dcac',
+                'ext': 'mp3',
+                'title': '(Portfolio Profile) Sensel - With @IlyaRosenberg',
+                'description': 'md5:e1e4a970bce04290e0ba6f030b0125db',
+                'series': 'Techmeme Ride Home',
+                'series_id': '3c30e8f4-ab48-415b-9421-1ae06cd4058b',
+                'upload_date': '20220108',
+                'timestamp': 1641656064,
+                'modified_date': '20230418',
+                'episode_id': '6beed803-b1ef-4536-9fef-c23cf6b4dcac',
+                'modified_timestamp': 1681843318,
+                'release_date': '20220108',
+                'release_timestamp': 1641672000,
+                'duration': 2789.38122,
+                'thumbnail': r're:^https?://content\.production\.cdn\.art19\.com/images/.*\.jpeg$',
+            },
+        }],
+    }, {
+        'url': 'https://www.ridehome.info/show/spacecasts/big-tech-news-apples-macbook-pro-event/',
+        'info_dict': {
+            'id': 'big-tech-news-apples-macbook-pro-event',
+        },
+        'playlist_count': 1,
+        'playlist': [{
+            'md5': 'b1428530c6e03904a8271e978007fc05',
+            'info_dict': {
+                'id': 'f4780044-6c4b-4ce0-8215-8a86cc66bff7',
+                'ext': 'mp3',
+                'title': 'md5:e6c05d44d59b6577a4145ac339de5040',
+                'description': 'md5:14152f7228c8a301a77e3d6bc891b145',
+                'series': 'SpaceCasts',
+                'series_id': '8e3e837d-7fe0-4a23-8e11-894917e07e17',
+                'upload_date': '20211026',
+                'timestamp': 1635271450,
+                'modified_date': '20230502',
+                'episode_id': 'f4780044-6c4b-4ce0-8215-8a86cc66bff7',
+                'modified_timestamp': 1683057500,
+                'release_date': '20211026',
+                'release_timestamp': 1635272124,
+                'duration': 2266.30531,
+                'thumbnail': r're:^https?://content\.production\.cdn\.art19\.com/images/.*\.jpeg$',
+            },
+        }],
+    }]
+
+    def _real_extract(self, url):
+        article_id = self._match_id(url)
+        webpage = self._download_webpage(url, article_id)
+
+        urls = traverse_obj(
+            get_elements_html_by_class('iframeContainer', webpage),
+            (..., {extract_attributes}, lambda k, v: k == 'data-src' and Art19IE.suitable(v)))
+        return self.playlist_from_matches(urls, article_id, ie=Art19IE)
diff --git a/plugins/youtube_download/yt_dlp/extractor/rinsefm.py b/plugins/youtube_download/yt_dlp/extractor/rinsefm.py
new file mode 100644
index 0000000..5bc2eb8
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/rinsefm.py
@@ -0,0 +1,89 @@
+from .common import InfoExtractor
+from ..utils import (
+    MEDIA_EXTENSIONS,
+    determine_ext,
+    parse_iso8601,
+    traverse_obj,
+    url_or_none,
+)
+
+
+class RinseFMBaseIE(InfoExtractor):
+    @staticmethod
+    def _parse_entry(entry):
+        return {
+            **traverse_obj(entry, {
+                'id': ('id', {str}),
+                'title': ('title', {str}),
+                'url': ('fileUrl', {url_or_none}),
+                'release_timestamp': ('episodeDate', {parse_iso8601}),
+                'thumbnail': ('featuredImage', 0, 'filename', {str},
+                              {lambda x: x and f'https://rinse.imgix.net/media/{x}'}),
+                'webpage_url': ('slug', {str},
+                                {lambda x: x and f'https://rinse.fm/episodes/{x}'}),
+            }),
+            'vcodec': 'none',
+            'extractor_key': RinseFMIE.ie_key(),
+            'extractor': RinseFMIE.IE_NAME,
+        }
+
+
+class RinseFMIE(RinseFMBaseIE):
+    _VALID_URL = r'https?://(?:www\.)?rinse\.fm/episodes/(?P<id>[^/?#]+)'
+    _TESTS = [{
+        'url': 'https://rinse.fm/episodes/club-glow-15-12-2023-2000/',
+        'md5': '76ee0b719315617df42e15e710f46c7b',
+        'info_dict': {
+            'id': '1536535',
+            'ext': 'mp3',
+            'title': 'Club Glow - 15/12/2023 - 20:00',
+            'thumbnail': r're:^https://.+\.(?:jpg|JPG)$',
+            'release_timestamp': 1702598400,
+            'release_date': '20231215',
+        },
+    }]
+
+    def _real_extract(self, url):
+        display_id = self._match_id(url)
+        webpage = self._download_webpage(url, display_id)
+        entry = self._search_nextjs_data(webpage, display_id)['props']['pageProps']['entry']
+
+        return self._parse_entry(entry)
+
+
+class RinseFMArtistPlaylistIE(RinseFMBaseIE):
+    _VALID_URL = r'https?://(?:www\.)?rinse\.fm/shows/(?P<id>[^/?#]+)'
+    _TESTS = [{
+        'url': 'https://rinse.fm/shows/resources/',
+        'info_dict': {
+            'id': 'resources',
+            'title': '[re]sources',
+            'description': '[re]sources est un label parisien piloté par le DJ et producteur Tommy Kid.',
+        },
+        'playlist_mincount': 40,
+    }, {
+        'url': 'https://rinse.fm/shows/ivy/',
+        'info_dict': {
+            'id': 'ivy',
+            'title': '[IVY]',
+            'description': 'A dedicated space for DNB/Turbo House and 4x4.',
+        },
+        'playlist_mincount': 7,
+    }]
+
+    def _entries(self, data):
+        for episode in traverse_obj(data, (
+            'props', 'pageProps', 'episodes', lambda _, v: determine_ext(v['fileUrl']) in MEDIA_EXTENSIONS.audio),
+        ):
+            yield self._parse_entry(episode)
+
+    def _real_extract(self, url):
+        playlist_id = self._match_id(url)
+        webpage = self._download_webpage(url, playlist_id)
+        title = self._og_search_title(webpage) or self._html_search_meta('title', webpage)
+        description = self._og_search_description(webpage) or self._html_search_meta(
+            'description', webpage)
+        data = self._search_nextjs_data(webpage, playlist_id)
+
+        return self.playlist_result(
+            self._entries(data), playlist_id, title, description=description)
diff --git a/plugins/youtube_download/yt_dlp/extractor/rmcdecouverte.py b/plugins/youtube_download/yt_dlp/extractor/rmcdecouverte.py
index 8d29b30..e7b1e22 100644
--- a/plugins/youtube_download/yt_dlp/extractor/rmcdecouverte.py
+++ b/plugins/youtube_download/yt_dlp/extractor/rmcdecouverte.py
@@ -1,9 +1,7 @@
-from .common import InfoExtractor
+import urllib.parse
+
 from .brightcove import BrightcoveLegacyIE
-from ..compat import (
-    compat_parse_qs,
-    compat_urlparse,
-)
+from .common import InfoExtractor
 from ..utils import smuggle_url
 
 
@@ -59,7 +57,7 @@ class RMCDecouverteIE(InfoExtractor):
         webpage = self._download_webpage(url, display_id)
         brightcove_legacy_url = BrightcoveLegacyIE._extract_brightcove_url(webpage)
         if brightcove_legacy_url:
-            brightcove_id = compat_parse_qs(compat_urlparse.urlparse(
+            brightcove_id = urllib.parse.parse_qs(urllib.parse.urlparse(
                 brightcove_legacy_url).query)['@videoPlayer'][0]
         else:
             brightcove_id = self._search_regex(
diff --git a/plugins/youtube_download/yt_dlp/extractor/rockstargames.py b/plugins/youtube_download/yt_dlp/extractor/rockstargames.py
index c491aaf..02abd48 100644
--- a/plugins/youtube_download/yt_dlp/extractor/rockstargames.py
+++ b/plugins/youtube_download/yt_dlp/extractor/rockstargames.py
@@ -6,6 +6,7 @@ from ..utils import (
 
 
 class RockstarGamesIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?rockstargames\.com/videos(?:/video/|#?/?\?.*\bvideo=)(?P<id>\d+)'
     _TESTS = [{
         'url': 'https://www.rockstargames.com/videos/video/11544/',
@@ -18,7 +19,7 @@ class RockstarGamesIE(InfoExtractor):
             'thumbnail': r're:^https?://.*\.jpg$',
             'timestamp': 1464876000,
             'upload_date': '20160602',
-        }
+        },
     }, {
         'url': 'http://www.rockstargames.com/videos#/?video=48',
         'only_matching': True,
@@ -37,14 +38,14 @@ class RockstarGamesIE(InfoExtractor):
         title = video['title']
 
         formats = []
-        for video in video['files_processed']['video/mp4']:
-            if not video.get('src'):
+        for v in video['files_processed']['video/mp4']:
+            if not v.get('src'):
                 continue
-            resolution = video.get('resolution')
+            resolution = v.get('resolution')
             height = int_or_none(self._search_regex(
                 r'^(\d+)[pP]$', resolution or '', 'height', default=None))
             formats.append({
-                'url': self._proto_relative_url(video['src']),
+                'url': self._proto_relative_url(v['src']),
                 'format_id': resolution,
                 'height': height,
             })
diff --git a/plugins/youtube_download/yt_dlp/extractor/rokfin.py b/plugins/youtube_download/yt_dlp/extractor/rokfin.py
index 4a4d40b..be17465 100644
--- a/plugins/youtube_download/yt_dlp/extractor/rokfin.py
+++ b/plugins/youtube_download/yt_dlp/extractor/rokfin.py
@@ -1,8 +1,8 @@
+import datetime as dt
 import itertools
 import json
 import re
 import urllib.parse
-from datetime import datetime
 
 from .common import InfoExtractor, SearchInfoExtractor
 from ..utils import (
@@ -38,15 +38,14 @@ class RokfinIE(InfoExtractor):
             'upload_date': '20211023',
             'timestamp': 1634998029,
             'channel': 'Jimmy Dore',
-            'channel_id': 65429,
+            'channel_id': '65429',
             'channel_url': 'https://rokfin.com/TheJimmyDoreShow',
-            'duration': 213.0,
             'availability': 'public',
             'live_status': 'not_live',
             'dislike_count': int,
             'like_count': int,
             'duration': 213,
-        }
+        },
     }, {
         'url': 'https://rokfin.com/post/223/Julian-Assange-Arrested-Streaming-In-Real-Time',
         'info_dict': {
@@ -57,14 +56,14 @@ class RokfinIE(InfoExtractor):
             'upload_date': '20190412',
             'timestamp': 1555052644,
             'channel': 'Ron Placone',
-            'channel_id': 10,
+            'channel_id': '10',
             'channel_url': 'https://rokfin.com/RonPlacone',
             'availability': 'public',
             'live_status': 'not_live',
             'dislike_count': int,
             'like_count': int,
             'tags': ['FreeThinkingMedia^', 'RealProgressives^'],
-        }
+        },
     }, {
         'url': 'https://www.rokfin.com/stream/10543/Its-A-Crazy-Mess-Regional-Director-Blows-Whistle-On-Pfizers-Vaccine-Trial-Data',
         'info_dict': {
@@ -74,7 +73,7 @@ class RokfinIE(InfoExtractor):
             'thumbnail': r're:https://img\.production\.rokfin\.com/.+',
             'description': 'md5:324ce2d3e3b62e659506409e458b9d8e',
             'channel': 'TLAVagabond',
-            'channel_id': 53856,
+            'channel_id': '53856',
             'channel_url': 'https://rokfin.com/TLAVagabond',
             'availability': 'public',
             'is_live': False,
@@ -87,8 +86,7 @@ class RokfinIE(InfoExtractor):
             'dislike_count': int,
             'like_count': int,
             'tags': ['FreeThinkingMedia^'],
-            'duration': None,
-        }
+        },
     }, {
         'url': 'https://rokfin.com/post/126703/Brave-New-World--Aldous-Huxley-DEEPDIVE--Chpts-13--Quite-Frankly--Jay-Dyer',
         'info_dict': {
@@ -97,7 +95,7 @@ class RokfinIE(InfoExtractor):
             'title': 'Brave New World - Aldous Huxley DEEPDIVE!  (Chpts 1-3) - Quite Frankly & Jay Dyer',
             'thumbnail': r're:https://img\.production\.rokfin\.com/.+',
             'channel': 'Jay Dyer',
-            'channel_id': 186881,
+            'channel_id': '186881',
             'channel_url': 'https://rokfin.com/jaydyer',
             'availability': 'premium_only',
             'live_status': 'not_live',
@@ -108,7 +106,7 @@ class RokfinIE(InfoExtractor):
             'tags': ['FreeThinkingMedia^', 'OpenMind^'],
             'description': 'md5:cb04e32e68326c9b2b251b297bacff35',
             'duration': 3100,
-        }
+        },
     }, {
         'url': 'https://rokfin.com/stream/31332/The-Grayzone-live-on-Nordstream-blame-game',
         'info_dict': {
@@ -117,7 +115,7 @@ class RokfinIE(InfoExtractor):
             'title': 'The Grayzone live on Nordstream blame game',
             'thumbnail': r're:https://image\.v\.rokfin\.com/.+',
             'channel': 'Max Blumenthal',
-            'channel_id': 248902,
+            'channel_id': '248902',
             'channel_url': 'https://rokfin.com/MaxBlumenthal',
             'availability': 'premium_only',
             'live_status': 'was_live',
@@ -128,7 +126,7 @@ class RokfinIE(InfoExtractor):
             'release_date': '20230310',
             'upload_date': '20230310',
             'tags': ['FreeThinkingMedia^'],
-        }
+        },
     }]
 
     def _real_extract(self, url):
@@ -158,7 +156,7 @@ class RokfinIE(InfoExtractor):
                 self.raise_login_required('This video is only available to premium users', True, method='cookies')
             elif scheduled:
                 self.raise_no_formats(
-                    f'Stream is offline; scheduled for {datetime.fromtimestamp(scheduled).strftime("%Y-%m-%d %H:%M:%S")}',
+                    f'Stream is offline; scheduled for {dt.datetime.fromtimestamp(scheduled).strftime("%Y-%m-%d %H:%M:%S")}',
                     video_id=video_id, expected=True)
 
         uploader = traverse_obj(metadata, ('createdBy', 'username'), ('creator', 'username'))
@@ -175,7 +173,7 @@ class RokfinIE(InfoExtractor):
             'like_count': int_or_none(metadata.get('likeCount')),
             'dislike_count': int_or_none(metadata.get('dislikeCount')),
             'channel': str_or_none(traverse_obj(metadata, ('createdBy', 'name'), ('creator', 'name'))),
-            'channel_id': traverse_obj(metadata, ('createdBy', 'id'), ('creator', 'id')),
+            'channel_id': str_or_none(traverse_obj(metadata, ('createdBy', 'id'), ('creator', 'id'))),
             'channel_url': url_or_none(f'https://rokfin.com/{uploader}') if uploader else None,
             'timestamp': timestamp,
             'release_timestamp': timestamp if live_status != 'not_live' else None,
@@ -205,7 +203,7 @@ class RokfinIE(InfoExtractor):
                     'parent': 'root',
                     'like_count': int_or_none(comment.get('numLikes')),
                     'dislike_count': int_or_none(comment.get('numDislikes')),
-                    'timestamp': unified_timestamp(comment.get('postedAt'))
+                    'timestamp': unified_timestamp(comment.get('postedAt')),
                 }
 
             pages_total = int_or_none(raw_comments.get('totalPages')) or None
@@ -248,7 +246,7 @@ class RokfinIE(InfoExtractor):
                 'code': urllib.parse.parse_qs(urllib.parse.urldefrag(urlh.url).fragment).get('code')[0],
                 'client_id': 'web',
                 'grant_type': 'authorization_code',
-                'redirect_uri': 'https://rokfin.com/silent-check-sso.html'
+                'redirect_uri': 'https://rokfin.com/silent-check-sso.html',
             }))
 
     def _authentication_active(self):
@@ -278,7 +276,7 @@ class RokfinIE(InfoExtractor):
             data=urlencode_postdata({
                 'grant_type': 'refresh_token',
                 'refresh_token': refresh_token,
-                'client_id': 'web'
+                'client_id': 'web',
             }))
         headers['authorization'] = self._get_auth_token()
         if headers['authorization'] is None:
@@ -401,7 +399,7 @@ class RokfinSearchIE(SearchInfoExtractor):
         'info_dict': {
             'id': '"zelenko"',
             'title': '"zelenko"',
-        }
+        },
     }]
     _db_url = None
     _db_access_key = None
diff --git a/plugins/youtube_download/yt_dlp/extractor/roosterteeth.py b/plugins/youtube_download/yt_dlp/extractor/roosterteeth.py
index 94e673b..8b0099e 100644
--- a/plugins/youtube_download/yt_dlp/extractor/roosterteeth.py
+++ b/plugins/youtube_download/yt_dlp/extractor/roosterteeth.py
@@ -2,17 +2,18 @@ from .common import InfoExtractor
 from ..networking.exceptions import HTTPError
 from ..utils import (
     ExtractorError,
+    LazyList,
     int_or_none,
     join_nonempty,
-    LazyList,
+    parse_iso8601,
     parse_qs,
+    smuggle_url,
     str_or_none,
-    traverse_obj,
     url_or_none,
     urlencode_postdata,
     urljoin,
-    update_url_query,
 )
+from ..utils.traversal import traverse_obj
 
 
 class RoosterTeethBaseIE(InfoExtractor):
@@ -57,29 +58,37 @@ class RoosterTeethBaseIE(InfoExtractor):
         title = traverse_obj(attributes, 'title', 'display_title')
         sub_only = attributes.get('is_sponsors_only')
 
+        episode_id = str_or_none(data.get('uuid'))
+        video_id = str_or_none(data.get('id'))
+        if video_id and 'parent_content_id' in attributes:  # parent_content_id is a bonus-only key
+            video_id += '-bonus'  # there are collisions with bonus ids and regular ids
+        elif not video_id:
+            video_id = episode_id
+
         return {
-            'id': str(data.get('id')),
+            'id': video_id,
             'display_id': attributes.get('slug'),
             'title': title,
             'description': traverse_obj(attributes, 'description', 'caption'),
-            'series': attributes.get('show_title'),
+            'series': traverse_obj(attributes, 'show_title', 'parent_content_title'),
             'season_number': int_or_none(attributes.get('season_number')),
-            'season_id': attributes.get('season_id'),
+            'season_id': str_or_none(attributes.get('season_id')),
             'episode': title,
             'episode_number': int_or_none(attributes.get('number')),
-            'episode_id': str_or_none(data.get('uuid')),
+            'episode_id': episode_id,
             'channel_id': attributes.get('channel_id'),
             'duration': int_or_none(attributes.get('length')),
+            'release_timestamp': parse_iso8601(attributes.get('original_air_date')),
             'thumbnails': thumbnails,
             'availability': self._availability(
                 needs_premium=sub_only, needs_subscription=sub_only, needs_auth=sub_only,
                 is_private=False, is_unlisted=False),
-            'tags': attributes.get('genres')
+            'tags': attributes.get('genres'),
         }
 
 
 class RoosterTeethIE(RoosterTeethBaseIE):
-    _VALID_URL = r'https?://(?:.+?\.)?roosterteeth\.com/(?:episode|watch)/(?P<id>[^/?#&]+)'
+    _VALID_URL = r'https?://(?:.+?\.)?roosterteeth\.com/(?:bonus-feature|episode|watch)/(?P<id>[^/?#&]+)'
     _TESTS = [{
         'url': 'http://roosterteeth.com/episode/million-dollars-but-season-2-million-dollars-but-the-game-announcement',
         'info_dict': {
@@ -91,6 +100,17 @@ class RoosterTeethIE(RoosterTeethBaseIE):
             'thumbnail': r're:^https?://.*\.png$',
             'series': 'Million Dollars, But...',
             'episode': 'Million Dollars, But... The Game Announcement',
+            'tags': ['Game Show', 'Sketch'],
+            'season_number': 2,
+            'availability': 'public',
+            'episode_number': 10,
+            'episode_id': '00374575-464e-11e7-a302-065410f210c4',
+            'season': 'Season 2',
+            'season_id': 'ffa27d48-464d-11e7-a302-065410f210c4',
+            'channel_id': '92b6bb21-91d2-4b1b-bf95-3268fa0d9939',
+            'duration': 145,
+            'release_timestamp': 1462982400,
+            'release_date': '20160511',
         },
         'params': {'skip_download': True},
     }, {
@@ -104,8 +124,90 @@ class RoosterTeethIE(RoosterTeethBaseIE):
             'channel_id': '92f780eb-ebfe-4bf5-a3b5-c6ad5460a5f1',
             'thumbnail': r're:^https?://.*\.(png|jpe?g)$',
             'ext': 'mp4',
+            'availability': 'public',
+            'episode_id': 'f8117b13-f068-499e-803e-eec9ea2dec8c',
+            'episode_number': 3,
+            'tags': ['Animation'],
+            'season_id': '4b8f0a9e-12c4-41ed-8caa-fed15a85bab8',
+            'season': 'Season 1',
+            'series': 'RWBY: World of Remnant',
+            'season_number': 1,
+            'duration': 216,
+            'release_timestamp': 1413489600,
+            'release_date': '20141016',
         },
         'params': {'skip_download': True},
+    }, {
+        # bonus feature with /watch/ url
+        'url': 'https://roosterteeth.com/watch/rwby-bonus-21',
+        'info_dict': {
+            'id': '33-bonus',
+            'display_id': 'rwby-bonus-21',
+            'title': 'Volume 5 Yang Character Short',
+            'description': 'md5:8c2440bc763ea90c52cfe0a68093e1f7',
+            'episode': 'Volume 5 Yang Character Short',
+            'channel_id': '92f780eb-ebfe-4bf5-a3b5-c6ad5460a5f1',
+            'thumbnail': r're:^https?://.*\.(png|jpe?g)$',
+            'ext': 'mp4',
+            'availability': 'public',
+            'episode_id': 'f2a9f132-1fe2-44ad-8956-63d7c0267720',
+            'episode_number': 55,
+            'series': 'RWBY',
+            'duration': 255,
+            'release_timestamp': 1507993200,
+            'release_date': '20171014',
+        },
+        'params': {'skip_download': True},
+    }, {
+        # only works with video_data['attributes']['url'] m3u8 url
+        'url': 'https://www.roosterteeth.com/watch/achievement-hunter-achievement-hunter-fatality-walkthrough-deathstroke-lex-luthor-captain-marvel-green-lantern-and-wonder-woman',
+        'info_dict': {
+            'id': '25394',
+            'ext': 'mp4',
+            'title': 'Fatality Walkthrough: Deathstroke, Lex Luthor, Captain Marvel, Green Lantern, and Wonder Woman',
+            'description': 'md5:91bb934698344fb9647b1c7351f16964',
+            'availability': 'public',
+            'thumbnail': r're:^https?://.*\.(png|jpe?g)$',
+            'episode': 'Fatality Walkthrough: Deathstroke, Lex Luthor, Captain Marvel, Green Lantern, and Wonder Woman',
+            'episode_number': 71,
+            'episode_id': 'ffaec998-464d-11e7-a302-065410f210c4',
+            'season': 'Season 2008',
+            'tags': ['Gaming'],
+            'series': 'Achievement Hunter',
+            'display_id': 'md5:4465ce4f001735f9d7a2ae529a543d31',
+            'season_id': 'ffa13340-464d-11e7-a302-065410f210c4',
+            'season_number': 2008,
+            'channel_id': '2cb2a70c-be50-46f5-93d7-84a1baabb4f7',
+            'duration': 189,
+            'release_timestamp': 1228317300,
+            'release_date': '20081203',
+        },
+        'params': {'skip_download': True},
+    }, {
+        # brightcove fallback extraction needed
+        'url': 'https://roosterteeth.com/watch/lets-play-2013-126',
+        'info_dict': {
+            'id': '17845',
+            'ext': 'mp4',
+            'title': 'WWE \'13',
+            'availability': 'public',
+            'series': 'Let\'s Play',
+            'episode_number': 10,
+            'season_id': 'ffa23d9c-464d-11e7-a302-065410f210c4',
+            'channel_id': '75ba87e8-06fd-4482-bad9-52a4da2c6181',
+            'episode': 'WWE \'13',
+            'episode_id': 'ffdbe55e-464d-11e7-a302-065410f210c4',
+            'thumbnail': r're:^https?://.*\.(png|jpe?g)$',
+            'tags': ['Gaming', 'Our Favorites'],
+            'description': 'md5:b4a5226d2bbcf0dafbde11a2ba27262d',
+            'display_id': 'lets-play-2013-126',
+            'season_number': 3,
+            'season': 'Season 3',
+            'release_timestamp': 1359999840,
+            'release_date': '20130204',
+        },
+        'expected_warnings': ['Direct m3u8 URL returned HTTP Error 403'],
+        'params': {'skip_download': True},
     }, {
         'url': 'http://achievementhunter.roosterteeth.com/episode/off-topic-the-achievement-hunter-podcast-2016-i-didn-t-think-it-would-pass-31',
         'only_matching': True,
@@ -125,27 +227,51 @@ class RoosterTeethIE(RoosterTeethBaseIE):
     }, {
         'url': 'https://roosterteeth.com/watch/million-dollars-but-season-2-million-dollars-but-the-game-announcement',
         'only_matching': True,
+    }, {
+        'url': 'https://roosterteeth.com/bonus-feature/camp-camp-soundtrack-another-rap-song-about-foreign-cars-richie-branson',
+        'only_matching': True,
     }]
 
+    _BRIGHTCOVE_ACCOUNT_ID = '6203312018001'
+
+    def _extract_brightcove_formats_and_subtitles(self, bc_id, url, m3u8_url):
+        account_id = self._search_regex(
+            r'/accounts/(\d+)/videos/', m3u8_url, 'account id', default=self._BRIGHTCOVE_ACCOUNT_ID)
+        info = self._downloader.get_info_extractor('BrightcoveNew').extract(smuggle_url(
+            f'https://players.brightcove.net/{account_id}/default_default/index.html?videoId={bc_id}',
+            {'referrer': url}))
+        return info['formats'], info['subtitles']
+
     def _real_extract(self, url):
         display_id = self._match_id(url)
         api_episode_url = f'{self._API_BASE_URL}/watch/{display_id}'
 
         try:
             video_data = self._download_json(
-                api_episode_url + '/videos', display_id,
-                'Downloading video JSON metadata')['data'][0]
-            m3u8_url = video_data['attributes']['url']
-            # XXX: additional URL at video_data['links']['download']
+                api_episode_url + '/videos', display_id, 'Downloading video JSON metadata',
+                headers={'Client-Type': 'web'})['data'][0]  # web client-type yields ad-free streams
         except ExtractorError as e:
             if isinstance(e.cause, HTTPError) and e.cause.status == 403:
                 if self._parse_json(e.cause.response.read().decode(), display_id).get('access') is False:
                     self.raise_login_required(
-                        '%s is only available for FIRST members' % display_id)
+                        f'{display_id} is only available for FIRST members')
             raise
 
-        formats, subtitles = self._extract_m3u8_formats_and_subtitles(
-            m3u8_url, display_id, 'mp4', 'm3u8_native', m3u8_id='hls')
+        # XXX: additional ad-free URL at video_data['links']['download'] but often gives 403 errors
+        m3u8_url = video_data['attributes']['url']
+        is_brightcove = traverse_obj(video_data, ('attributes', 'encoding_pipeline')) == 'brightcove'
+        bc_id = traverse_obj(video_data, ('attributes', 'uid', {str}))
+
+        try:
+            formats, subtitles = self._extract_m3u8_formats_and_subtitles(
+                m3u8_url, display_id, 'mp4', 'm3u8_native', m3u8_id='hls')
+        except ExtractorError as e:
+            if is_brightcove and bc_id and isinstance(e.cause, HTTPError) and e.cause.status == 403:
+                self.report_warning(
+                    'Direct m3u8 URL returned HTTP Error 403; retrying with Brightcove extraction')
+                formats, subtitles = self._extract_brightcove_formats_and_subtitles(bc_id, url, m3u8_url)
+            else:
+                raise
 
         episode = self._download_json(
             api_episode_url, display_id,
@@ -155,7 +281,7 @@ class RoosterTeethIE(RoosterTeethBaseIE):
             'display_id': display_id,
             'formats': formats,
             'subtitles': subtitles,
-            **self._extract_video_info(episode)
+            **self._extract_video_info(episode),
         }
 
 
@@ -167,38 +293,53 @@ class RoosterTeethSeriesIE(RoosterTeethBaseIE):
         'info_dict': {
             'id': 'rwby-7',
             'title': 'RWBY - Season 7',
-        }
+        },
+    }, {
+        'url': 'https://roosterteeth.com/series/the-weird-place',
+        'playlist_count': 7,
+        'info_dict': {
+            'id': 'the-weird-place',
+            'title': 'The Weird Place',
+        },
     }, {
         'url': 'https://roosterteeth.com/series/role-initiative',
         'playlist_mincount': 16,
         'info_dict': {
             'id': 'role-initiative',
             'title': 'Role Initiative',
-        }
+        },
     }, {
         'url': 'https://roosterteeth.com/series/let-s-play-minecraft?season=9',
         'playlist_mincount': 50,
         'info_dict': {
             'id': 'let-s-play-minecraft-9',
             'title': 'Let\'s Play Minecraft - Season 9',
-        }
+        },
     }]
 
     def _entries(self, series_id, season_number):
         display_id = join_nonempty(series_id, season_number)
-        # TODO: extract bonus material
-        for data in self._download_json(
-                f'{self._API_BASE_URL}/shows/{series_id}/seasons?order=asc&order_by', display_id)['data']:
-            idx = traverse_obj(data, ('attributes', 'number'))
-            if season_number and idx != season_number:
-                continue
-            season_url = update_url_query(urljoin(self._API_BASE, data['links']['episodes']), {'per_page': 1000})
-            season = self._download_json(season_url, display_id, f'Downloading season {idx} JSON metadata')['data']
-            for episode in season:
+
+        def yield_episodes(data):
+            for episode in traverse_obj(data, ('data', lambda _, v: v['canonical_links']['self'])):
                 yield self.url_result(
-                    f'https://www.roosterteeth.com{episode["canonical_links"]["self"]}',
-                    RoosterTeethIE.ie_key(),
-                    **self._extract_video_info(episode))
+                    urljoin('https://www.roosterteeth.com', episode['canonical_links']['self']),
+                    RoosterTeethIE, **self._extract_video_info(episode))
+
+        series_data = self._download_json(
+            f'{self._API_BASE_URL}/shows/{series_id}/seasons?order=asc&order_by', display_id)
+        for season_data in traverse_obj(series_data, ('data', lambda _, v: v['links']['episodes'])):
+            idx = traverse_obj(season_data, ('attributes', 'number'))
+            if season_number is not None and idx != season_number:
+                continue
+            yield from yield_episodes(self._download_json(
+                urljoin(self._API_BASE, season_data['links']['episodes']), display_id,
+                f'Downloading season {idx} JSON metadata', query={'per_page': 1000}))
+
+        if season_number is None:  # extract series-level bonus features
+            yield from yield_episodes(self._download_json(
+                f'{self._API_BASE_URL}/shows/{series_id}/bonus_features?order=asc&order_by&per_page=1000',
+                display_id, 'Downloading bonus features JSON metadata', fatal=False))
 
     def _real_extract(self, url):
         series_id = self._match_id(url)
diff --git a/plugins/youtube_download/yt_dlp/extractor/rottentomatoes.py b/plugins/youtube_download/yt_dlp/extractor/rottentomatoes.py
index e357175..c229a1c 100644
--- a/plugins/youtube_download/yt_dlp/extractor/rottentomatoes.py
+++ b/plugins/youtube_download/yt_dlp/extractor/rottentomatoes.py
@@ -19,7 +19,7 @@ class RottenTomatoesIE(InfoExtractor):
             'id': '11028566',
             'ext': 'mp4',
             'title': 'Toy Story 3',
-            'description': 'From the creators of the beloved TOY STORY films, comes a story that will reunite the gang in a whole new way.'
+            'description': 'From the creators of the beloved TOY STORY films, comes a story that will reunite the gang in a whole new way.',
         },
         'skip': 'No longer available',
     }, {
@@ -30,7 +30,7 @@ class RottenTomatoesIE(InfoExtractor):
             'title': 'Toy Story 3: Trailer 2',
             'description': '',
             'thumbnail': r're:^https?://.*\.jpg$',
-            'duration': 149.941
+            'duration': 149.941,
         },
     }, {
         'url': 'http://www.rottentomatoes.com/m/toy_story_3',
diff --git a/plugins/youtube_download/yt_dlp/extractor/roya.py b/plugins/youtube_download/yt_dlp/extractor/roya.py
new file mode 100644
index 0000000..e9fe304
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/roya.py
@@ -0,0 +1,43 @@
+from .common import InfoExtractor
+from ..utils.traversal import traverse_obj
+
+
+class RoyaLiveIE(InfoExtractor):
+    _VALID_URL = r'https?://roya\.tv/live-stream/(?P<id>\d+)'
+    _TESTS = [{
+        'url': 'https://roya.tv/live-stream/1',
+        'info_dict': {
+            'id': '1',
+            'title': r're:Roya TV \d{4}-\d{2}-\d{2} \d{2}:\d{2}',
+            'ext': 'mp4',
+            'live_status': 'is_live',
+        },
+    }, {
+        'url': 'https://roya.tv/live-stream/21',
+        'info_dict': {
+            'id': '21',
+            'title': r're:Roya News \d{4}-\d{2}-\d{2} \d{2}:\d{2}',
+            'ext': 'mp4',
+            'live_status': 'is_live',
+        },
+    }, {
+        'url': 'https://roya.tv/live-stream/10000',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        media_id = self._match_id(url)
+
+        stream_url = self._download_json(
+            f'https://ticket.roya-tv.com/api/v5/fastchannel/{media_id}', media_id)['data']['secured_url']
+
+        title = traverse_obj(
+            self._download_json('https://backend.roya.tv/api/v01/channels/schedule-pagination', media_id, fatal=False),
+            ('data', 0, 'channel', lambda _, v: str(v['id']) == media_id, 'title', {str}, any))
+
+        return {
+            'id': media_id,
+            'formats': self._extract_m3u8_formats(stream_url, media_id, 'mp4', m3u8_id='hls', live=True),
+            'title': title,
+            'is_live': True,
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/rozhlas.py b/plugins/youtube_download/yt_dlp/extractor/rozhlas.py
index 6313432..4a10720 100644
--- a/plugins/youtube_download/yt_dlp/extractor/rozhlas.py
+++ b/plugins/youtube_download/yt_dlp/extractor/rozhlas.py
@@ -23,8 +23,8 @@ class RozhlasIE(InfoExtractor):
             'id': '3421320',
             'ext': 'mp3',
             'title': 'Echo Pavla Klusáka (30.06.2015 21:00)',
-            'description': 'Osmdesátiny Terryho Rileyho jsou skvělou příležitostí proletět se elektronickými i akustickými díly zakladatatele minimalismu, který je aktivní už přes padesát let'
-        }
+            'description': 'Osmdesátiny Terryho Rileyho jsou skvělou příležitostí proletět se elektronickými i akustickými díly zakladatatele minimalismu, který je aktivní už přes padesát let',
+        },
     }, {
         'url': 'http://prehravac.rozhlas.cz/audio/3421320/embed',
         'only_matching': True,
@@ -34,7 +34,7 @@ class RozhlasIE(InfoExtractor):
         audio_id = self._match_id(url)
 
         webpage = self._download_webpage(
-            'http://prehravac.rozhlas.cz/audio/%s' % audio_id, audio_id)
+            f'http://prehravac.rozhlas.cz/audio/{audio_id}', audio_id)
 
         title = self._html_search_regex(
             r'<h3>(.+?)</h3>\s*<p[^>]*>.*?</p>\s*<div[^>]+id=["\']player-track',
@@ -48,7 +48,7 @@ class RozhlasIE(InfoExtractor):
 
         return {
             'id': audio_id,
-            'url': 'http://media.rozhlas.cz/_audio/%s.mp3' % audio_id,
+            'url': f'http://media.rozhlas.cz/_audio/{audio_id}.mp3',
             'title': title,
             'description': description,
             'duration': duration,
@@ -110,7 +110,7 @@ class RozhlasVltavaIE(RozhlasBaseIE):
                 'artist': 'Aleš Stuchlý',
                 'channel_id': 'radio-wave',
             },
-        }]
+        }],
     }, {
         'url': 'https://wave.rozhlas.cz/poslechnete-si-neklid-podcastovy-thriller-o-vine-strachu-a-vztahu-ktery-zasel-8554744',
         'info_dict': {
@@ -183,7 +183,7 @@ class RozhlasVltavaIE(RozhlasBaseIE):
                 'chapter': 'Neklid #5',
                 'chapter_number': 5,
             },
-        }]
+        }],
     }, {
         'url': 'https://dvojka.rozhlas.cz/karel-siktanc-cerny-jezdec-bily-kun-napinava-pohadka-o-tajemnem-prizraku-8946969',
         'info_dict': {
@@ -220,7 +220,7 @@ class RozhlasVltavaIE(RozhlasBaseIE):
                 'duration': ('duration', {int_or_none}),
                 'artist': ('meta', 'ga', 'contentAuthor'),
                 'channel_id': ('meta', 'ga', 'contentCreator'),
-            })
+            }),
         }
 
     def _real_extract(self, url):
@@ -247,17 +247,17 @@ class MujRozhlasIE(RozhlasBaseIE):
         'url': 'https://www.mujrozhlas.cz/vykopavky/ach-jo-zase-teleci-rizek-je-mnohem-min-cesky-nez-jsme-si-mysleli',
         'md5': '6f8fd68663e64936623e67c152a669e0',
         'info_dict': {
-            'id': '10739193',
+            'id': '10787730',
             'ext': 'mp3',
             'title': 'Ach jo, zase to telecí! Řízek je mnohem míň český, než jsme si mysleli',
             'description': 'md5:db7141e9caaedc9041ec7cefb9a62908',
             'timestamp': 1684915200,
-            'modified_timestamp': 1684922446,
+            'modified_timestamp': 1687550432,
             'series': 'Vykopávky',
             'thumbnail': 'https://portal.rozhlas.cz/sites/default/files/images/84377046610af6ddc54d910b1dd7a22b.jpg',
             'channel_id': 'radio-wave',
             'upload_date': '20230524',
-            'modified_date': '20230524',
+            'modified_date': '20230623',
         },
     }, {
         # serial extraction
@@ -277,6 +277,26 @@ class MujRozhlasIE(RozhlasBaseIE):
             'title': 'Nespavci',
             'description': 'md5:c430adcbf9e2b9eac88b745881e814dc',
         },
+    }, {
+        # serialPart
+        'url': 'https://www.mujrozhlas.cz/povidka/gustavo-adolfo-becquer-hora-duchu',
+        'info_dict': {
+            'id': '8889035',
+            'ext': 'm4a',
+            'title': 'Gustavo Adolfo Bécquer: Hora duchů',
+            'description': 'md5:343a15257b376c276e210b78e900ffea',
+            'chapter': 'Hora duchů a Polibek – dva tajemné příběhy Gustava Adolfa Bécquera',
+            'thumbnail': 'https://portal.rozhlas.cz/sites/default/files/images/2adfe1387fb140634be725c1ccf26214.jpg',
+            'timestamp': 1708173000,
+            'episode': 'Episode 1',
+            'episode_number': 1,
+            'series': 'Povídka',
+            'modified_date': '20240217',
+            'upload_date': '20240217',
+            'modified_timestamp': 1708173198,
+            'channel_id': 'vltava',
+        },
+        'params': {'skip_download': 'dash'},
     }]
 
     def _call_api(self, path, item_id, msg='API JSON'):
@@ -301,7 +321,7 @@ class MujRozhlasIE(RozhlasBaseIE):
                 'timestamp': ('attributes', 'since', {unified_timestamp}),
                 'modified_timestamp': ('attributes', 'updated', {unified_timestamp}),
                 'thumbnail': ('attributes', 'asset', 'url', {url_or_none}),
-            })
+            }),
         }
 
     def _entries(self, api_url, playlist_id):
@@ -322,7 +342,7 @@ class MujRozhlasIE(RozhlasBaseIE):
 
         entity = info['siteEntityBundle']
 
-        if entity == 'episode':
+        if entity in ('episode', 'serialPart'):
             return self._extract_audio_entry(self._call_api(
                 'episodes', info['contentId'], 'episode info API JSON'))
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/rte.py b/plugins/youtube_download/yt_dlp/extractor/rte.py
index 7ba80d4..42ee9d2 100644
--- a/plugins/youtube_download/yt_dlp/extractor/rte.py
+++ b/plugins/youtube_download/yt_dlp/extractor/rte.py
@@ -3,13 +3,13 @@ import re
 from .common import InfoExtractor
 from ..networking.exceptions import HTTPError
 from ..utils import (
+    ExtractorError,
     float_or_none,
     parse_iso8601,
     str_or_none,
     try_get,
     unescapeHTML,
     url_or_none,
-    ExtractorError,
 )
 
 
@@ -35,7 +35,7 @@ class RteBaseIE(InfoExtractor):
                     error_info = self._parse_json(ee.cause.response.read().decode(), item_id, fatal=False)
                     if error_info:
                         raise ExtractorError(
-                            '%s said: %s' % (self.IE_NAME, error_info['message']),
+                            '{} said: {}'.format(self.IE_NAME, error_info['message']),
                             expected=True)
                 raise
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/rtl2.py b/plugins/youtube_download/yt_dlp/extractor/rtl2.py
index 056cf87..86e383a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/rtl2.py
+++ b/plugins/youtube_download/yt_dlp/extractor/rtl2.py
@@ -1,16 +1,7 @@
 import re
 
 from .common import InfoExtractor
-from ..aes import aes_cbc_decrypt_bytes, unpad_pkcs7
-from ..compat import (
-    compat_b64decode,
-    compat_str,
-)
-from ..utils import (
-    ExtractorError,
-    int_or_none,
-    strip_or_none,
-)
+from ..utils import int_or_none
 
 
 class RTL2IE(InfoExtractor):
@@ -22,7 +13,7 @@ class RTL2IE(InfoExtractor):
             'id': 'folge-203-0',
             'ext': 'f4v',
             'title': 'GRIP sucht den Sommerkönig',
-            'description': 'md5:e3adbb940fd3c6e76fa341b8748b562f'
+            'description': 'md5:e3adbb940fd3c6e76fa341b8748b562f',
         },
         'params': {
             # rtmp download
@@ -35,7 +26,7 @@ class RTL2IE(InfoExtractor):
             'id': 'anna-erwischt-alex',
             'ext': 'mp4',
             'title': 'Anna erwischt Alex!',
-            'description': 'Anna nimmt ihrem Vater nicht ab, dass er nicht spielt. Und tatsächlich erwischt sie ihn auf frischer Tat.'
+            'description': 'Anna nimmt ihrem Vater nicht ab, dass er nicht spielt. Und tatsächlich erwischt sie ihn auf frischer Tat.',
         },
         'params': {
             # rtmp download
@@ -102,92 +93,3 @@ class RTL2IE(InfoExtractor):
             'duration': int_or_none(video_info.get('duration')),
             'formats': formats,
         }
-
-
-class RTL2YouBaseIE(InfoExtractor):
-    _BACKWERK_BASE_URL = 'https://p-you-backwerk.rtl2apps.de/'
-
-
-class RTL2YouIE(RTL2YouBaseIE):
-    IE_NAME = 'rtl2:you'
-    _VALID_URL = r'http?://you\.rtl2\.de/(?:video/\d+/|youplayer/index\.html\?.*?\bvid=)(?P<id>\d+)'
-    _TESTS = [{
-        'url': 'http://you.rtl2.de/video/3002/15740/MJUNIK%20%E2%80%93%20Home%20of%20YOU/307-hirn-wo-bist-du',
-        'info_dict': {
-            'id': '15740',
-            'ext': 'mp4',
-            'title': 'MJUNIK – Home of YOU - #307 Hirn, wo bist du?!',
-            'description': 'md5:ddaa95c61b372b12b66e115b2772fe01',
-            'age_limit': 12,
-        },
-    }, {
-        'url': 'http://you.rtl2.de/youplayer/index.html?vid=15712',
-        'only_matching': True,
-    }]
-    _AES_KEY = b'\xe9W\xe4.<*\xb8\x1a\xd2\xb6\x92\xf3C\xd3\xefL\x1b\x03*\xbbbH\xc0\x03\xffo\xc2\xf2(\xaa\xaa!'
-    _GEO_COUNTRIES = ['DE']
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        stream_data = self._download_json(
-            self._BACKWERK_BASE_URL + 'stream/video/' + video_id, video_id)
-
-        data, iv = compat_b64decode(stream_data['streamUrl']).decode().split(':')
-        stream_url = unpad_pkcs7(aes_cbc_decrypt_bytes(
-            compat_b64decode(data), self._AES_KEY, compat_b64decode(iv)))
-        if b'rtl2_you_video_not_found' in stream_url:
-            raise ExtractorError('video not found', expected=True)
-
-        formats = self._extract_m3u8_formats(stream_url.decode(), video_id, 'mp4', 'm3u8_native')
-
-        video_data = self._download_json(
-            self._BACKWERK_BASE_URL + 'video/' + video_id, video_id)
-
-        series = video_data.get('formatTitle')
-        title = episode = video_data.get('title') or series
-        if series and series != title:
-            title = '%s - %s' % (series, title)
-
-        return {
-            'id': video_id,
-            'title': title,
-            'formats': formats,
-            'description': strip_or_none(video_data.get('description')),
-            'thumbnail': video_data.get('image'),
-            'duration': int_or_none(stream_data.get('duration') or video_data.get('duration'), 1000),
-            'series': series,
-            'episode': episode,
-            'age_limit': int_or_none(video_data.get('minimumAge')),
-        }
-
-
-class RTL2YouSeriesIE(RTL2YouBaseIE):
-    IE_NAME = 'rtl2:you:series'
-    _VALID_URL = r'http?://you\.rtl2\.de/videos/(?P<id>\d+)'
-    _TEST = {
-        'url': 'http://you.rtl2.de/videos/115/dragon-ball',
-        'info_dict': {
-            'id': '115',
-        },
-        'playlist_mincount': 5,
-    }
-
-    def _real_extract(self, url):
-        series_id = self._match_id(url)
-        stream_data = self._download_json(
-            self._BACKWERK_BASE_URL + 'videos',
-            series_id, query={
-                'formatId': series_id,
-                'limit': 1000000000,
-            })
-
-        entries = []
-        for video in stream_data.get('videos', []):
-            video_id = compat_str(video['videoId'])
-            if not video_id:
-                continue
-            entries.append(self.url_result(
-                'http://you.rtl2.de/video/%s/%s' % (series_id, video_id),
-                'RTL2You', video_id))
-        return self.playlist_result(entries, series_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/rtlnl.py b/plugins/youtube_download/yt_dlp/extractor/rtlnl.py
index 724cb64..4537b3d 100644
--- a/plugins/youtube_download/yt_dlp/extractor/rtlnl.py
+++ b/plugins/youtube_download/yt_dlp/extractor/rtlnl.py
@@ -57,7 +57,7 @@ class RtlNlIE(InfoExtractor):
             'thumbnail': r're:^https?://screenshots\.rtl\.nl/(?:[^/]+/)*sz=[0-9]+x[0-9]+/uuid=84ae5571-ac25-4225-ae0c-ef8d9efb2aed$',
             'upload_date': '20150215',
             'description': 'Er zijn nieuwe beelden vrijgegeven die vlak na de aanslag in Kopenhagen zijn gemaakt. Op de video is goed te zien hoe omstanders zich bekommeren om één van de slachtoffers, terwijl de eerste agenten ter plaatse komen.',
-        }
+        },
     }, {
         # empty synopsis and missing episodes (see https://github.com/ytdl-org/youtube-dl/issues/6275)
         # best format available nettv
@@ -99,14 +99,14 @@ class RtlNlIE(InfoExtractor):
     def _real_extract(self, url):
         uuid = self._match_id(url)
         info = self._download_json(
-            'http://www.rtl.nl/system/s4m/vfd/version=2/uuid=%s/fmt=adaptive/' % uuid,
+            f'http://www.rtl.nl/system/s4m/vfd/version=2/uuid={uuid}/fmt=adaptive/',
             uuid)
 
         material = info['material'][0]
         title = info['abstracts'][0]['name']
         subtitle = material.get('title')
         if subtitle:
-            title += ' - %s' % subtitle
+            title += f' - {subtitle}'
         description = material.get('synopsis')
 
         meta = info.get('meta', {})
@@ -129,7 +129,7 @@ class RtlNlIE(InfoExtractor):
                     r'/sz=([0-9]+)', meta[p], 'thumbnail width', fatal=False)),
                 'height': int_or_none(self._search_regex(
                     r'/sz=[0-9]+x([0-9]+)',
-                    meta[p], 'thumbnail height', fatal=False))
+                    meta[p], 'thumbnail height', fatal=False)),
             })
 
         return {
@@ -196,7 +196,7 @@ class RTLLuTeleVODIE(RTLLuBaseIE):
             'ext': 'mp4',
             'thumbnail': 'https://replay-assets.rtl.lu/2021/11/16/d3647fc4-470d-11ec-adc2-3a00abd6e90f_00008.jpg',
             'description': 'md5:b1db974408cc858c9fd241812e4a2a14',
-        }
+        },
     }, {
         'url': 'https://www.rtl.lu/video/3295215',
         'info_dict': {
@@ -205,7 +205,7 @@ class RTLLuTeleVODIE(RTLLuBaseIE):
             'ext': 'mp4',
             'thumbnail': 'https://replay-assets.rtl.lu/2022/06/28/0000_3295215_0000.jpg',
             'description': 'md5:85bcd4e0490aa6ec969d9bf16927437b',
-        }
+        },
     }]
 
 
@@ -221,7 +221,7 @@ class RTLLuArticleIE(RTLLuBaseIE):
             'thumbnail': 'https://static.rtl.lu/rtl2008.lu/nt/p/2022/06/28/19/e4b37d66ddf00bab4c45617b91a5bb9b.jpeg',
             'description': 'md5:5eab4a2a911c1fff7efc1682a38f9ef7',
             'title': 'md5:40aa85f135578fbd549d3c9370321f99',
-        }
+        },
     }, {
         # 5minutes
         'url': 'https://5minutes.rtl.lu/espace-frontaliers/frontaliers-en-questions/a/1853173.html',
@@ -231,7 +231,7 @@ class RTLLuArticleIE(RTLLuBaseIE):
             'description': 'md5:ac031da0740e997a5cf4633173634fee',
             'title': 'md5:87e17722ed21af0f24be3243f4ec0c46',
             'thumbnail': 'https://replay-assets.rtl.lu/2022/01/26/screenshot_20220126104933_3274749_12b249833469b0d6e4440a1dec83cdfa.jpg',
-        }
+        },
     }, {
         # today.lu
         'url': 'https://today.rtl.lu/entertainment/news/a/1936203.html',
@@ -241,7 +241,7 @@ class RTLLuArticleIE(RTLLuBaseIE):
             'title': 'Once Upon A Time...zu Lëtzebuerg: The Three Witches\' Tower',
             'description': 'The witchy theme continues in the latest episode of Once Upon A Time...',
             'thumbnail': 'https://replay-assets.rtl.lu/2022/07/02/screenshot_20220702122859_3290019_412dc5185951b7f6545a4039c8be9235.jpg',
-        }
+        },
     }]
 
 
@@ -256,7 +256,7 @@ class RTLLuLiveIE(RTLLuBaseIE):
             'live_status': 'is_live',
             'title': r're:RTL - Télé LIVE \d{4}-\d{2}-\d{2} \d{2}:\d{2}',
             'thumbnail': 'https://static.rtl.lu/livestream/channel1.jpg',
-        }
+        },
     }, {
         # Tele:live-2
         'url': 'https://www.rtl.lu/tele/live-2',
@@ -266,7 +266,7 @@ class RTLLuLiveIE(RTLLuBaseIE):
             'live_status': 'is_live',
             'title': r're:RTL - Télé LIVE \d{4}-\d{2}-\d{2} \d{2}:\d{2}',
             'thumbnail': 'https://static.rtl.lu/livestream/channel2.jpg',
-        }
+        },
     }, {
         # Radio:lauschteren
         'url': 'https://www.rtl.lu/radio/lauschteren',
@@ -276,7 +276,7 @@ class RTLLuLiveIE(RTLLuBaseIE):
             'live_status': 'is_live',
             'title': r're:RTL - Radio LIVE \d{4}-\d{2}-\d{2} \d{2}:\d{2}',
             'thumbnail': 'https://static.rtl.lu/livestream/rtlradiowebtv.jpg',
-        }
+        },
     }]
 
 
@@ -290,5 +290,5 @@ class RTLLuRadioIE(RTLLuBaseIE):
             'description': 'md5:f855a4f3e3235393ae47ed1db5d934b9',
             'title': '5 vir 12 - Stau um Stau',
             'thumbnail': 'https://static.rtl.lu/rtlg//2022/06/24/c9c19e5694a14be46a3647a3760e1f62.jpg',
-        }
+        },
     }]
diff --git a/plugins/youtube_download/yt_dlp/extractor/rtnews.py b/plugins/youtube_download/yt_dlp/extractor/rtnews.py
index 6be9945..558511f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/rtnews.py
+++ b/plugins/youtube_download/yt_dlp/extractor/rtnews.py
@@ -14,7 +14,7 @@ class RTNewsIE(InfoExtractor):
             'id': '546301',
             'title': 'Crowds gather to greet deported Djokovic as he returns to Serbia (VIDEO)',
             'description': 'md5:1d5bfe1a988d81fd74227cfdf93d314d',
-            'thumbnail': 'https://cdni.rt.com/files/2022.01/article/61e587a085f540102c3386c1.png'
+            'thumbnail': 'https://cdni.rt.com/files/2022.01/article/61e587a085f540102c3386c1.png',
         },
     }, {
         'url': 'https://www.rt.com/shows/in-question/535980-plot-to-assassinate-julian-assange/',
@@ -23,7 +23,7 @@ class RTNewsIE(InfoExtractor):
             'id': '535980',
             'title': 'The plot to assassinate Julian Assange',
             'description': 'md5:55279ce5e4441dc1d16e2e4a730152cd',
-            'thumbnail': 'https://cdni.rt.com/files/2021.09/article/615226f42030274e8879b53d.png'
+            'thumbnail': 'https://cdni.rt.com/files/2021.09/article/615226f42030274e8879b53d.png',
         },
         'playlist': [{
             'info_dict': {
@@ -31,7 +31,7 @@ class RTNewsIE(InfoExtractor):
                 'ext': 'mp4',
                 'title': '6152271d85f5400464496162',
             },
-        }]
+        }],
     }]
 
     def _entries(self, webpage):
@@ -46,12 +46,12 @@ class RTNewsIE(InfoExtractor):
                 }
 
     def _real_extract(self, url):
-        id = self._match_id(url)
-        webpage = self._download_webpage(url, id)
+        playlist_id = self._match_id(url)
+        webpage = self._download_webpage(url, playlist_id)
 
         return {
             '_type': 'playlist',
-            'id': id,
+            'id': playlist_id,
             'entries': self._entries(webpage),
             'title': self._og_search_title(webpage),
             'description': self._og_search_description(webpage),
@@ -71,9 +71,9 @@ class RTDocumentryIE(InfoExtractor):
             'description': 'md5:647c76984b7cb9a8b52a567e87448d88',
             'thumbnail': 'https://cdni.rt.com/rtd-files/films/escobars-hitman/escobars-hitman_11.jpg',
             'average_rating': 8.53,
-            'duration': 3134.0
+            'duration': 3134.0,
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }, {
         'url': 'https://rtd.rt.com/shows/the-kalashnikova-show-military-secrets-anna-knishenko/iskander-tactical-system-natos-headache/',
         'info_dict': {
@@ -86,9 +86,9 @@ class RTDocumentryIE(InfoExtractor):
             'duration': 274.0,
             'timestamp': 1605726000,
             'view_count': int,
-            'upload_date': '20201118'
+            'upload_date': '20201118',
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }, {
         'url': 'https://rtd.rt.com/series/i-am-hacked-trailer/introduction-to-safe-digital-life-ep2/',
         'info_dict': {
@@ -101,29 +101,29 @@ class RTDocumentryIE(InfoExtractor):
             'duration': 1524.0,
             'timestamp': 1636977600,
             'view_count': int,
-            'upload_date': '20211115'
+            'upload_date': '20211115',
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }]
 
     def _real_extract(self, url):
-        id = self._match_id(url)
-        webpage = self._download_webpage(url, id)
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
         ld_json = self._search_json_ld(webpage, None, fatal=False)
         if not ld_json:
             self.raise_no_formats('No video/audio found at the provided url.', expected=True)
         media_json = self._parse_json(
             self._search_regex(r'(?s)\'Med\'\s*:\s*\[\s*({.+})\s*\]\s*};', webpage, 'media info'),
-            id, transform_source=js_to_json)
+            video_id, transform_source=js_to_json)
         if 'title' not in ld_json and 'title' in media_json:
             ld_json['title'] = media_json['title']
         formats = [{'url': src['file']} for src in media_json.get('sources') or [] if src.get('file')]
 
         return {
-            'id': id,
+            'id': video_id,
             'thumbnail': media_json.get('image'),
             'formats': formats,
-            **ld_json
+            **ld_json,
         }
 
 
@@ -144,23 +144,23 @@ class RTDocumentryPlaylistIE(InfoExtractor):
         },
     }]
 
-    def _entries(self, webpage, id):
+    def _entries(self, webpage, playlist_id):
         video_urls = set(re.findall(r'list-2__link\s*"\s*href="([^"]+)"', webpage))
         for v_url in video_urls:
-            if id not in v_url:
+            if playlist_id not in v_url:
                 continue
             yield self.url_result(
-                'https://rtd.rt.com%s' % v_url,
+                f'https://rtd.rt.com{v_url}',
                 ie=RTDocumentryIE.ie_key())
 
     def _real_extract(self, url):
-        id = self._match_id(url)
-        webpage = self._download_webpage(url, id)
+        playlist_id = self._match_id(url)
+        webpage = self._download_webpage(url, playlist_id)
 
         return {
             '_type': 'playlist',
-            'id': id,
-            'entries': self._entries(webpage, id),
+            'id': playlist_id,
+            'entries': self._entries(webpage, playlist_id),
         }
 
 
@@ -174,20 +174,20 @@ class RuptlyIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'Japan: Double trouble! Tokyo zoo presents adorable panda twins | Video Ruptly',
             'description': 'md5:85a8da5fdb31486f0562daf4360ce75a',
-            'thumbnail': 'https://storage.ruptly.tv/thumbnails/20220112-020/i6JQKnTNpYuqaXsR/i6JQKnTNpYuqaXsR.jpg'
+            'thumbnail': 'https://storage.ruptly.tv/thumbnails/20220112-020/i6JQKnTNpYuqaXsR/i6JQKnTNpYuqaXsR.jpg',
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }]
 
     def _real_extract(self, url):
-        id = self._match_id(url)
-        webpage = self._download_webpage(url, id)
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
         m3u8_url = self._search_regex(r'preview_url"\s?:\s?"(https?://storage\.ruptly\.tv/video_projects/.+\.m3u8)"', webpage, 'm3u8 url', fatal=False)
         if not m3u8_url:
             self.raise_no_formats('No video/audio found at the provided url.', expected=True)
-        formats, subs = self._extract_m3u8_formats_and_subtitles(m3u8_url, id, ext='mp4')
+        formats, subs = self._extract_m3u8_formats_and_subtitles(m3u8_url, video_id, ext='mp4')
         return {
-            'id': id,
+            'id': video_id,
             'formats': formats,
             'subtitles': subs,
             'title': self._og_search_title(webpage),
diff --git a/plugins/youtube_download/yt_dlp/extractor/rtp.py b/plugins/youtube_download/yt_dlp/extractor/rtp.py
index 5928a20..03e9859 100644
--- a/plugins/youtube_download/yt_dlp/extractor/rtp.py
+++ b/plugins/youtube_download/yt_dlp/extractor/rtp.py
@@ -1,13 +1,22 @@
-from .common import InfoExtractor
-from ..utils import js_to_json
-import re
-import json
-import urllib.parse
 import base64
+import json
+import re
+import urllib.parse
+
+from .common import InfoExtractor, Request
+from ..utils import (
+    determine_ext,
+    int_or_none,
+    js_to_json,
+    parse_duration,
+    parse_iso8601,
+    url_or_none,
+)
+from ..utils.traversal import traverse_obj
 
 
 class RTPIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?rtp\.pt/play/p(?P<program_id>[0-9]+)/(?P<id>[^/?#]+)/?'
+    _VALID_URL = r'https?://(?:www\.)?rtp\.pt/play/(?:[^/#?]+/)?p(?P<program_id>\d+)/(?P<id>e\d+)'
     _TESTS = [{
         'url': 'http://www.rtp.pt/play/p405/e174042/paixoes-cruzadas',
         'md5': 'e736ce0c665e459ddb818546220b4ef8',
@@ -15,83 +24,173 @@ class RTPIE(InfoExtractor):
             'id': 'e174042',
             'ext': 'mp3',
             'title': 'Paixões Cruzadas',
-            'description': 'As paixões musicais de António Cartaxo e António Macedo',
+            'description': 'md5:af979e58ba0ab73f78435fc943fdb070',
             'thumbnail': r're:^https?://.*\.jpg',
+            'series': 'Paixões Cruzadas',
+            'duration': 2950.0,
+            'modified_timestamp': 1553693464,
+            'modified_date': '20190327',
+            'timestamp': 1417219200,
+            'upload_date': '20141129',
         },
     }, {
-        'url': 'http://www.rtp.pt/play/p831/a-quimica-das-coisas',
-        'only_matching': True,
+        'url': 'https://www.rtp.pt/play/zigzag/p13166/e757904/25-curiosidades-25-de-abril',
+        'md5': '5b4859940e3adef61247a77dfb76046a',
+        'info_dict': {
+            'id': 'e757904',
+            'ext': 'mp4',
+            'title': 'Estudar ou não estudar',
+            'description': 'md5:3bfd7eb8bebfd5711a08df69c9c14c35',
+            'thumbnail': r're:^https?://.*\.jpg',
+            'timestamp': 1711958401,
+            'duration': 146.0,
+            'upload_date': '20240401',
+            'modified_timestamp': 1712242991,
+            'series': '25 Curiosidades, 25 de Abril',
+            'episode_number': 2,
+            'episode': 'Estudar ou não estudar',
+            'modified_date': '20240404',
+        },
+    }, {
+        # Episode not accessible through API
+        'url': 'https://www.rtp.pt/play/estudoemcasa/p7776/e500050/portugues-1-ano',
+        'md5': '57660c0b46db9f22118c52cbd65975e4',
+        'info_dict': {
+            'id': 'e500050',
+            'ext': 'mp4',
+            'title': 'Português - 1.º ano',
+            'duration': 1669.0,
+            'description': 'md5:be68925c81269f8c6886589f25fe83ea',
+            'upload_date': '20201020',
+            'timestamp': 1603180799,
+            'thumbnail': 'https://cdn-images.rtp.pt/EPG/imagens/39482_59449_64850.png?v=3&w=860',
+        },
     }]
 
+    _USER_AGENT = 'rtpplay/2.0.66 (pt.rtp.rtpplay; build:2066; iOS 15.8.3) Alamofire/5.9.1'
+    _AUTH_TOKEN = None
+
+    def _fetch_auth_token(self):
+        if self._AUTH_TOKEN:
+            return self._AUTH_TOKEN
+        self._AUTH_TOKEN = traverse_obj(self._download_json(Request(
+            'https://rtpplayapi.rtp.pt/play/api/2/token-manager',
+            headers={
+                'Accept': '*/*',
+                'rtp-play-auth': 'RTPPLAY_MOBILE_IOS',
+                'rtp-play-auth-hash': 'fac9c328b2f27e26e03d7f8942d66c05b3e59371e16c2a079f5c83cc801bd3ee',
+                'rtp-play-auth-timestamp': '2145973229682',
+                'User-Agent': self._USER_AGENT,
+            }, extensions={'keep_header_casing': True}), None,
+            note='Fetching guest auth token', errnote='Could not fetch guest auth token',
+            fatal=False), ('token', 'token', {str}))
+        return self._AUTH_TOKEN
+
+    @staticmethod
+    def _cleanup_media_url(url):
+        if urllib.parse.urlparse(url).netloc == 'streaming-ondemand.rtp.pt':
+            return None
+        return url.replace('/drm-fps/', '/hls/').replace('/drm-dash/', '/dash/')
+
+    def _extract_formats(self, media_urls, episode_id):
+        formats = []
+        subtitles = {}
+        for media_url in set(traverse_obj(media_urls, (..., {url_or_none}, {self._cleanup_media_url}))):
+            ext = determine_ext(media_url)
+            if ext == 'm3u8':
+                fmts, subs = self._extract_m3u8_formats_and_subtitles(
+                    media_url, episode_id, m3u8_id='hls', fatal=False)
+                formats.extend(fmts)
+                self._merge_subtitles(subs, target=subtitles)
+            elif ext == 'mpd':
+                fmts, subs = self._extract_mpd_formats_and_subtitles(
+                    media_url, episode_id, mpd_id='dash', fatal=False)
+                formats.extend(fmts)
+                self._merge_subtitles(subs, target=subtitles)
+            else:
+                formats.append({
+                    'url': media_url,
+                    'format_id': 'http',
+                })
+        return formats, subtitles
+
+    def _extract_from_api(self, program_id, episode_id):
+        auth_token = self._fetch_auth_token()
+        if not auth_token:
+            return
+        episode_data = traverse_obj(self._download_json(
+            f'https://www.rtp.pt/play/api/1/get-episode/{program_id}/{episode_id[1:]}', episode_id,
+            query={'include_assets': 'true', 'include_webparams': 'true'},
+            headers={
+                'Accept': '*/*',
+                'Authorization': f'Bearer {auth_token}',
+                'User-Agent': self._USER_AGENT,
+            }, fatal=False), 'result', {dict})
+        if not episode_data:
+            return
+        asset_urls = traverse_obj(episode_data, ('assets', 0, 'asset_url', {dict}))
+        media_urls = traverse_obj(asset_urls, (
+            ((('hls', 'dash'), 'stream_url'), ('multibitrate', ('url_hls', 'url_dash'))),))
+        formats, subtitles = self._extract_formats(media_urls, episode_id)
+
+        for sub_data in traverse_obj(asset_urls, ('subtitles', 'vtt_list', lambda _, v: url_or_none(v['file']))):
+            subtitles.setdefault(sub_data.get('code') or 'pt', []).append({
+                'url': sub_data['file'],
+                'name': sub_data.get('language'),
+            })
+
+        return {
+            'id': episode_id,
+            'formats': formats,
+            'subtitles': subtitles,
+            'thumbnail': traverse_obj(episode_data, ('assets', 0, 'asset_thumbnail', {url_or_none})),
+            **traverse_obj(episode_data, ('episode', {
+                'title': (('episode_title', 'program_title'), {str}, filter, any),
+                'alt_title': ('episode_subtitle', {str}, filter),
+                'description': (('episode_description', 'episode_summary'), {str}, filter, any),
+                'timestamp': ('episode_air_date', {parse_iso8601(delimiter=' ')}),
+                'modified_timestamp': ('episode_lastchanged', {parse_iso8601(delimiter=' ')}),
+                'duration': ('episode_duration_complete', {parse_duration}),
+                'episode': ('episode_title', {str}, filter),
+                'episode_number': ('episode_number', {int_or_none}),
+                'season': ('program_season', {str}, filter),
+                'series': ('program_title', {str}, filter),
+            })),
+        }
+
     _RX_OBFUSCATION = re.compile(r'''(?xs)
         atob\s*\(\s*decodeURIComponent\s*\(\s*
             (\[[0-9A-Za-z%,'"]*\])
         \s*\.\s*join\(\s*(?:""|'')\s*\)\s*\)\s*\)
     ''')
 
-    def __unobfuscate(self, data, *, video_id):
-        if data.startswith('{'):
-            data = self._RX_OBFUSCATION.sub(
-                lambda m: json.dumps(
-                    base64.b64decode(urllib.parse.unquote(
-                        ''.join(self._parse_json(m.group(1), video_id))
-                    )).decode('iso-8859-1')),
-                data)
-        return js_to_json(data)
+    def __unobfuscate(self, data):
+        return self._RX_OBFUSCATION.sub(
+            lambda m: json.dumps(
+                base64.b64decode(urllib.parse.unquote(
+                    ''.join(json.loads(m.group(1))),
+                )).decode('iso-8859-1')),
+            data)
 
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        webpage = self._download_webpage(url, video_id)
-        title = self._html_search_meta(
-            'twitter:title', webpage, display_name='title', fatal=True)
-
-        f, config = self._search_regex(
-            r'''(?sx)
-                var\s+f\s*=\s*(?P<f>".*?"|{[^;]+?});\s*
-                var\s+player1\s+=\s+new\s+RTPPlayer\s*\((?P<config>{(?:(?!\*/).)+?})\);(?!\s*\*/)
-            ''', webpage,
-            'player config', group=('f', 'config'))
-
-        f = self._parse_json(
-            f, video_id,
-            lambda data: self.__unobfuscate(data, video_id=video_id))
-        config = self._parse_json(
-            config, video_id,
-            lambda data: self.__unobfuscate(data, video_id=video_id))
+    def _extract_from_html(self, url, episode_id):
+        webpage = self._download_webpage(url, episode_id)
 
         formats = []
-        if isinstance(f, dict):
-            f_hls = f.get('hls')
-            if f_hls is not None:
-                formats.extend(self._extract_m3u8_formats(
-                    f_hls, video_id, 'mp4', 'm3u8_native', m3u8_id='hls'))
-
-            f_dash = f.get('dash')
-            if f_dash is not None:
-                formats.extend(self._extract_mpd_formats(f_dash, video_id, mpd_id='dash'))
-        else:
-            formats.append({
-                'format_id': 'f',
-                'url': f,
-                'vcodec': 'none' if config.get('mediaType') == 'audio' else None,
-            })
-
         subtitles = {}
-
-        vtt = config.get('vtt')
-        if vtt is not None:
-            for lcode, lname, url in vtt:
-                subtitles.setdefault(lcode, []).append({
-                    'name': lname,
-                    'url': url,
-                })
+        media_urls = traverse_obj(re.findall(r'(?:var\s+f\s*=|RTPPlayer\({[^}]+file:)\s*({[^}]+}|"[^"]+")', webpage), (
+            -1, (({self.__unobfuscate}, {js_to_json}, {json.loads}, {dict.values}, ...), {json.loads})))
+        formats, subtitles = self._extract_formats(media_urls, episode_id)
 
         return {
-            'id': video_id,
-            'title': title,
+            'id': episode_id,
             'formats': formats,
-            'description': self._html_search_meta(['description', 'twitter:description'], webpage),
-            'thumbnail': config.get('poster') or self._og_search_thumbnail(webpage),
             'subtitles': subtitles,
+            'description': self._html_search_meta(['og:description', 'twitter:description'], webpage, default=None),
+            'thumbnail': self._html_search_meta(['og:image', 'twitter:image'], webpage, default=None),
+            **self._search_json_ld(webpage, episode_id, default={}),
+            'title': self._html_search_meta(['og:title', 'twitter:title'], webpage, default=None),
         }
+
+    def _real_extract(self, url):
+        program_id, episode_id = self._match_valid_url(url).group('program_id', 'id')
+        return self._extract_from_api(program_id, episode_id) or self._extract_from_html(url, episode_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/rtrfm.py b/plugins/youtube_download/yt_dlp/extractor/rtrfm.py
index 7381d82..7421e42 100644
--- a/plugins/youtube_download/yt_dlp/extractor/rtrfm.py
+++ b/plugins/youtube_download/yt_dlp/extractor/rtrfm.py
@@ -56,8 +56,8 @@ class RTRFMIE(InfoExtractor):
             url = None
             self.raise_no_formats('Expired or no episode on this date', expected=True)
         return {
-            'id': '%s-%s' % (show, date),
-            'title': '%s %s' % (title, date),
+            'id': f'{show}-{date}',
+            'title': f'{title} {date}',
             'series': title,
             'url': url,
             'release_date': date,
diff --git a/plugins/youtube_download/yt_dlp/extractor/rts.py b/plugins/youtube_download/yt_dlp/extractor/rts.py
index 9f73d18..dc1e2d3 100644
--- a/plugins/youtube_download/yt_dlp/extractor/rts.py
+++ b/plugins/youtube_download/yt_dlp/extractor/rts.py
@@ -1,7 +1,6 @@
 import re
 
 from .srgssr import SRGSSRIE
-from ..compat import compat_str
 from ..utils import (
     determine_ext,
     int_or_none,
@@ -13,6 +12,7 @@ from ..utils import (
 
 
 class RTSIE(SRGSSRIE):  # XXX: Do not subclass from concrete IE
+    _WORKING = False
     IE_DESC = 'RTS.ch'
     _VALID_URL = r'rts:(?P<rts_id>\d+)|https?://(?:.+?\.)?rts\.ch/(?:[^/]+/){2,}(?P<id>[0-9]+)-(?P<display_id>.+?)\.html'
 
@@ -109,7 +109,7 @@ class RTSIE(SRGSSRIE):  # XXX: Do not subclass from concrete IE
         {
             'url': 'http://pages.rts.ch/emissions/passe-moi-les-jumelles/5624065-entre-ciel-et-mer.html',
             'only_matching': True,
-        }
+        },
     ]
 
     def _real_extract(self, url):
@@ -119,7 +119,7 @@ class RTSIE(SRGSSRIE):  # XXX: Do not subclass from concrete IE
 
         def download_json(internal_id):
             return self._download_json(
-                'http://www.rts.ch/a/%s.html?f=json/article' % internal_id,
+                f'http://www.rts.ch/a/{internal_id}.html?f=json/article',
                 display_id)
 
         all_info = download_json(media_id)
@@ -148,7 +148,7 @@ class RTSIE(SRGSSRIE):  # XXX: Do not subclass from concrete IE
                         r'(?s)<iframe[^>]+class="srg-player"[^>]+src="[^"]+urn:([^"]+)"',
                         page)
                 if videos:
-                    entries = [self.url_result('srgssr:%s' % video_urn, 'SRGSSR') for video_urn in videos]
+                    entries = [self.url_result(f'srgssr:{video_urn}', 'SRGSSR') for video_urn in videos]
 
             if entries:
                 return self.playlist_result(entries, media_id, all_info.get('title'))
@@ -195,7 +195,7 @@ class RTSIE(SRGSSRIE):  # XXX: Do not subclass from concrete IE
                     'tbr': extract_bitrate(format_url),
                 })
 
-        download_base = 'http://rtsww%s-d.rts.ch/' % ('-a' if media_type == 'audio' else '')
+        download_base = 'http://rtsww{}-d.rts.ch/'.format('-a' if media_type == 'audio' else '')
         for media in info.get('media', []):
             media_url = media.get('url')
             if not media_url or re.match(r'https?://', media_url):
@@ -214,7 +214,7 @@ class RTSIE(SRGSSRIE):  # XXX: Do not subclass from concrete IE
         self._check_formats(formats, media_id)
 
         duration = info.get('duration') or info.get('cutout') or info.get('cutduration')
-        if isinstance(duration, compat_str):
+        if isinstance(duration, str):
             duration = parse_duration(duration)
 
         return {
diff --git a/plugins/youtube_download/yt_dlp/extractor/rtvcplay.py b/plugins/youtube_download/yt_dlp/extractor/rtvcplay.py
index 741c472..5b0eee9 100644
--- a/plugins/youtube_download/yt_dlp/extractor/rtvcplay.py
+++ b/plugins/youtube_download/yt_dlp/extractor/rtvcplay.py
@@ -1,16 +1,17 @@
 import re
 
-from .common import InfoExtractor, ExtractorError
+from .common import InfoExtractor
 from ..utils import (
+    ExtractorError,
     clean_html,
     determine_ext,
-    int_or_none,
     float_or_none,
+    int_or_none,
     js_to_json,
     mimetype2ext,
     traverse_obj,
-    urljoin,
     url_or_none,
+    urljoin,
 )
 
 
@@ -212,7 +213,7 @@ class RTVCPlayEmbedIE(RTVCPlayBaseIE):
             'title': 'Tráiler: Señoritas',
             'thumbnail': r're:^https?://.*\.(?:jpg|png)',
             'ext': 'mp4',
-        }
+        },
     }]
 
     def _real_extract(self, url):
@@ -234,7 +235,7 @@ class RTVCPlayEmbedIE(RTVCPlayBaseIE):
                 'title': 'title',
                 'description': 'description',
                 'thumbnail': ('image', ..., 'thumbnail', 'path'),
-            }, get_all=False)
+            }, get_all=False),
         }
 
 
@@ -281,5 +282,5 @@ class RTVCKalturaIE(RTVCPlayBaseIE):
                 'title': 'title',
                 'description': 'description',
                 'thumbnail': ('channel', 'image', 'logo', 'path'),
-            })
+            }),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/rtve.py b/plugins/youtube_download/yt_dlp/extractor/rtve.py
index a99a266..2812d93 100644
--- a/plugins/youtube_download/yt_dlp/extractor/rtve.py
+++ b/plugins/youtube_download/yt_dlp/extractor/rtve.py
@@ -1,36 +1,142 @@
 import base64
 import io
 import struct
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import compat_b64decode
 from ..utils import (
     ExtractorError,
+    clean_html,
     determine_ext,
     float_or_none,
+    make_archive_id,
+    parse_iso8601,
     qualities,
-    remove_end,
-    remove_start,
-    try_get,
+    url_or_none,
 )
+from ..utils.traversal import subs_list_to_dict, traverse_obj
 
 
-class RTVEALaCartaIE(InfoExtractor):
+class RTVEBaseIE(InfoExtractor):
+    # Reimplementation of https://js2.rtve.es/pages/app-player/3.5.1/js/pf_video.js
+    @staticmethod
+    def _decrypt_url(png):
+        encrypted_data = io.BytesIO(base64.b64decode(png)[8:])
+        while True:
+            length_data = encrypted_data.read(4)
+            length = struct.unpack('!I', length_data)[0]
+            chunk_type = encrypted_data.read(4)
+            if chunk_type == b'IEND':
+                break
+            data = encrypted_data.read(length)
+            if chunk_type == b'tEXt':
+                data = bytes(filter(None, data))
+                alphabet_data, _, url_data = data.partition(b'#')
+                quality_str, _, url_data = url_data.rpartition(b'%%')
+                quality_str = quality_str.decode() or ''
+                alphabet = RTVEBaseIE._get_alphabet(alphabet_data)
+                url = RTVEBaseIE._get_url(alphabet, url_data)
+                yield quality_str, url
+            encrypted_data.read(4)  # CRC
+
+    @staticmethod
+    def _get_url(alphabet, url_data):
+        url = ''
+        f = 0
+        e = 3
+        b = 1
+        for char in url_data.decode('iso-8859-1'):
+            if f == 0:
+                l = int(char) * 10
+                f = 1
+            else:
+                if e == 0:
+                    l += int(char)
+                    url += alphabet[l]
+                    e = (b + 3) % 4
+                    f = 0
+                    b += 1
+                else:
+                    e -= 1
+        return url
+
+    @staticmethod
+    def _get_alphabet(alphabet_data):
+        alphabet = []
+        e = 0
+        d = 0
+        for char in alphabet_data.decode('iso-8859-1'):
+            if d == 0:
+                alphabet.append(char)
+                d = e = (e + 1) % 4
+            else:
+                d -= 1
+        return alphabet
+
+    def _extract_png_formats_and_subtitles(self, video_id, media_type='videos'):
+        formats, subtitles = [], {}
+        q = qualities(['Media', 'Alta', 'HQ', 'HD_READY', 'HD_FULL'])
+        for manager in ('rtveplayw', 'default'):
+            png = self._download_webpage(
+                f'http://www.rtve.es/ztnr/movil/thumbnail/{manager}/{media_type}/{video_id}.png',
+                video_id, 'Downloading url information', query={'q': 'v2'}, fatal=False)
+            if not png:
+                continue
+
+            for quality, video_url in self._decrypt_url(png):
+                ext = determine_ext(video_url)
+                if ext == 'm3u8':
+                    fmts, subs = self._extract_m3u8_formats_and_subtitles(
+                        video_url, video_id, 'mp4', m3u8_id='hls', fatal=False)
+                    formats.extend(fmts)
+                    self._merge_subtitles(subs, target=subtitles)
+                elif ext == 'mpd':
+                    fmts, subs = self._extract_mpd_formats_and_subtitles(
+                        video_url, video_id, 'dash', fatal=False)
+                    formats.extend(fmts)
+                    self._merge_subtitles(subs, target=subtitles)
+                else:
+                    formats.append({
+                        'format_id': quality,
+                        'quality': q(quality),
+                        'url': video_url,
+                    })
+        return formats, subtitles
+
+    def _parse_metadata(self, metadata):
+        return traverse_obj(metadata, {
+            'title': ('title', {str.strip}),
+            'alt_title': ('alt', {str.strip}),
+            'description': ('description', {clean_html}),
+            'timestamp': ('dateOfEmission', {parse_iso8601(delimiter=' ')}),
+            'release_timestamp': ('publicationDate', {parse_iso8601(delimiter=' ')}),
+            'modified_timestamp': ('modificationDate', {parse_iso8601(delimiter=' ')}),
+            'thumbnail': (('thumbnail', 'image', 'imageSEO'), {url_or_none}, any),
+            'duration': ('duration', {float_or_none(scale=1000)}),
+            'is_live': ('live', {bool}),
+            'series': (('programTitle', ('programInfo', 'title')), {clean_html}, any),
+        })
+
+
+class RTVEALaCartaIE(RTVEBaseIE):
     IE_NAME = 'rtve.es:alacarta'
-    IE_DESC = 'RTVE a la carta'
-    _VALID_URL = r'https?://(?:www\.)?rtve\.es/(m/)?(alacarta/videos|filmoteca)/[^/]+/[^/]+/(?P<id>\d+)'
+    IE_DESC = 'RTVE a la carta and Play'
+    _VALID_URL = [
+        r'https?://(?:www\.)?rtve\.es/(?:m/)?(?:(?:alacarta|play)/videos|filmoteca)/(?!directo)(?:[^/?#]+/){2}(?P<id>\d+)',
+        r'https?://(?:www\.)?rtve\.es/infantil/serie/[^/?#]+/video/[^/?#]+/(?P<id>\d+)',
+    ]
 
     _TESTS = [{
-        'url': 'http://www.rtve.es/alacarta/videos/balonmano/o-swiss-cup-masculina-final-espana-suecia/2491869/',
-        'md5': '1d49b7e1ca7a7502c56a4bf1b60f1b43',
+        'url': 'http://www.rtve.es/alacarta/videos/la-aventura-del-saber/aventuraentornosilla/3088905/',
+        'md5': 'a964547824359a5753aef09d79fe984b',
         'info_dict': {
-            'id': '2491869',
+            'id': '3088905',
             'ext': 'mp4',
-            'title': 'Balonmano - Swiss Cup masculina. Final: España-Suecia',
-            'duration': 5024.566,
-            'series': 'Balonmano',
+            'title': 'En torno a la silla',
+            'duration': 1216.981,
+            'series': 'La aventura del Saber',
+            'thumbnail': 'https://img2.rtve.es/v/aventuraentornosilla_3088905.png',
         },
-        'expected_warnings': ['Failed to download MPD manifest', 'Failed to download m3u8 information'],
     }, {
         'note': 'Live stream',
         'url': 'http://www.rtve.es/alacarta/videos/television/24h-live/1694255/',
@@ -39,140 +145,88 @@ class RTVEALaCartaIE(InfoExtractor):
             'ext': 'mp4',
             'title': 're:^24H LIVE [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
             'is_live': True,
+            'live_status': 'is_live',
+            'thumbnail': r're:https://img2\.rtve\.es/v/.*\.png',
         },
         'params': {
             'skip_download': 'live stream',
         },
     }, {
         'url': 'http://www.rtve.es/alacarta/videos/servir-y-proteger/servir-proteger-capitulo-104/4236788/',
-        'md5': 'd850f3c8731ea53952ebab489cf81cbf',
+        'md5': 'f3cf0d1902d008c48c793e736706c174',
         'info_dict': {
             'id': '4236788',
             'ext': 'mp4',
-            'title': 'Servir y proteger - Capítulo 104',
-            'duration': 3222.0,
+            'title': 'Episodio 104',
+            'duration': 3222.8,
+            'thumbnail': r're:https://img2\.rtve\.es/v/.*\.png',
+            'series': 'Servir y proteger',
         },
-        'expected_warnings': ['Failed to download MPD manifest', 'Failed to download m3u8 information'],
     }, {
         'url': 'http://www.rtve.es/m/alacarta/videos/cuentame-como-paso/cuentame-como-paso-t16-ultimo-minuto-nuestra-vida-capitulo-276/2969138/?media=tve',
         'only_matching': True,
     }, {
         'url': 'http://www.rtve.es/filmoteca/no-do/not-1-introduccion-primer-noticiario-espanol/1465256/',
         'only_matching': True,
+    }, {
+        'url': 'https://www.rtve.es/play/videos/saber-vivir/07-07-24/16177116/',
+        'md5': 'a5b24fcdfa3ff5cb7908aba53d22d4b6',
+        'info_dict': {
+            'id': '16177116',
+            'ext': 'mp4',
+            'title': 'Saber vivir - 07/07/24',
+            'thumbnail': r're:https://img2\.rtve\.es/v/.*\.png',
+            'duration': 2162.68,
+            'series': 'Saber vivir',
+        },
+    }, {
+        'url': 'https://www.rtve.es/infantil/serie/agus-lui-churros-crafts/video/gusano/7048976/',
+        'info_dict': {
+            'id': '7048976',
+            'ext': 'mp4',
+            'title': 'Gusano',
+            'thumbnail': r're:https://img2\.rtve\.es/v/.*\.png',
+            'duration': 292.86,
+            'series': 'Agus & Lui: Churros y Crafts',
+            '_old_archive_ids': ['rtveinfantil 7048976'],
+        },
     }]
 
-    def _real_initialize(self):
-        user_agent_b64 = base64.b64encode(self.get_param('http_headers')['User-Agent'].encode('utf-8')).decode('utf-8')
-        self._manager = self._download_json(
-            'http://www.rtve.es/odin/loki/' + user_agent_b64,
-            None, 'Fetching manager info')['manager']
-
-    @staticmethod
-    def _decrypt_url(png):
-        encrypted_data = io.BytesIO(compat_b64decode(png)[8:])
-        while True:
-            length = struct.unpack('!I', encrypted_data.read(4))[0]
-            chunk_type = encrypted_data.read(4)
-            if chunk_type == b'IEND':
-                break
-            data = encrypted_data.read(length)
-            if chunk_type == b'tEXt':
-                alphabet_data, text = data.split(b'\0')
-                quality, url_data = text.split(b'%%')
-                alphabet = []
-                e = 0
-                d = 0
-                for l in alphabet_data.decode('iso-8859-1'):
-                    if d == 0:
-                        alphabet.append(l)
-                        d = e = (e + 1) % 4
-                    else:
-                        d -= 1
-                url = ''
-                f = 0
-                e = 3
-                b = 1
-                for letter in url_data.decode('iso-8859-1'):
-                    if f == 0:
-                        l = int(letter) * 10
-                        f = 1
-                    else:
-                        if e == 0:
-                            l += int(letter)
-                            url += alphabet[l]
-                            e = (b + 3) % 4
-                            f = 0
-                            b += 1
-                        else:
-                            e -= 1
-
-                yield quality.decode(), url
-            encrypted_data.read(4)  # CRC
-
-    def _extract_png_formats(self, video_id):
-        png = self._download_webpage(
-            'http://www.rtve.es/ztnr/movil/thumbnail/%s/videos/%s.png' % (self._manager, video_id),
-            video_id, 'Downloading url information', query={'q': 'v2'})
-        q = qualities(['Media', 'Alta', 'HQ', 'HD_READY', 'HD_FULL'])
-        formats = []
-        for quality, video_url in self._decrypt_url(png):
-            ext = determine_ext(video_url)
-            if ext == 'm3u8':
-                formats.extend(self._extract_m3u8_formats(
-                    video_url, video_id, 'mp4', 'm3u8_native',
-                    m3u8_id='hls', fatal=False))
-            elif ext == 'mpd':
-                formats.extend(self._extract_mpd_formats(
-                    video_url, video_id, 'dash', fatal=False))
-            else:
-                formats.append({
-                    'format_id': quality,
-                    'quality': q(quality),
-                    'url': video_url,
-                })
-        return formats
+    def _get_subtitles(self, video_id):
+        subtitle_data = self._download_json(
+            f'https://api2.rtve.es/api/videos/{video_id}/subtitulos.json', video_id,
+            'Downloading subtitles info')
+        return traverse_obj(subtitle_data, ('page', 'items', ..., {
+            'id': ('lang', {str}),
+            'url': ('src', {url_or_none}),
+        }, all, {subs_list_to_dict(lang='es')}))
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        info = self._download_json(
-            'http://www.rtve.es/api/videos/%s/config/alacarta_videos.json' % video_id,
+        metadata = self._download_json(
+            f'http://www.rtve.es/api/videos/{video_id}/config/alacarta_videos.json',
             video_id)['page']['items'][0]
-        if info['state'] == 'DESPU':
+        if metadata['state'] == 'DESPU':
             raise ExtractorError('The video is no longer available', expected=True)
-        title = info['title'].strip()
-        formats = self._extract_png_formats(video_id)
+        formats, subtitles = self._extract_png_formats_and_subtitles(video_id)
 
-        subtitles = None
-        sbt_file = info.get('sbtFile')
-        if sbt_file:
-            subtitles = self.extract_subtitles(video_id, sbt_file)
+        self._merge_subtitles(self.extract_subtitles(video_id), target=subtitles)
 
-        is_live = info.get('live') is True
+        is_infantil = urllib.parse.urlparse(url).path.startswith('/infantil/')
 
         return {
             'id': video_id,
-            'title': title,
             'formats': formats,
-            'thumbnail': info.get('image'),
             'subtitles': subtitles,
-            'duration': float_or_none(info.get('duration'), 1000),
-            'is_live': is_live,
-            'series': info.get('programTitle'),
+            **self._parse_metadata(metadata),
+            '_old_archive_ids': [make_archive_id('rtveinfantil', video_id)] if is_infantil else None,
         }
 
-    def _get_subtitles(self, video_id, sub_file):
-        subs = self._download_json(
-            sub_file + '.json', video_id,
-            'Downloading subtitles info')['page']['items']
-        return dict(
-            (s['lang'], [{'ext': 'vtt', 'url': s['src']}])
-            for s in subs)
 
-
-class RTVEAudioIE(RTVEALaCartaIE):  # XXX: Do not subclass from concrete IE
+class RTVEAudioIE(RTVEBaseIE):
     IE_NAME = 'rtve.es:audio'
     IE_DESC = 'RTVE audio'
-    _VALID_URL = r'https?://(?:www\.)?rtve\.es/(alacarta|play)/audios/[^/]+/[^/]+/(?P<id>[0-9]+)'
+    _VALID_URL = r'https?://(?:www\.)?rtve\.es/(alacarta|play)/audios/(?:[^/?#]+/){2}(?P<id>\d+)'
 
     _TESTS = [{
         'url': 'https://www.rtve.es/alacarta/audios/a-hombros-de-gigantes/palabra-ingeniero-codigos-informaticos-27-04-21/5889192/',
@@ -181,9 +235,11 @@ class RTVEAudioIE(RTVEALaCartaIE):  # XXX: Do not subclass from concrete IE
             'id': '5889192',
             'ext': 'mp3',
             'title': 'Códigos informáticos',
-            'thumbnail': r're:https?://.+/1598856591583.jpg',
+            'alt_title': 'Códigos informáticos - Escuchar ahora',
             'duration': 349.440,
             'series': 'A hombros de gigantes',
+            'description': 'md5:72b0d7c1ca20fd327bdfff7ac0171afb',
+            'thumbnail': 'https://img2.rtve.es/a/palabra-ingeniero-codigos-informaticos-270421_5889192.png',
         },
     }, {
         'url': 'https://www.rtve.es/play/audios/en-radio-3/ignatius-farray/5791165/',
@@ -192,9 +248,11 @@ class RTVEAudioIE(RTVEALaCartaIE):  # XXX: Do not subclass from concrete IE
             'id': '5791165',
             'ext': 'mp3',
             'title': 'Ignatius Farray',
+            'alt_title': 'En Radio 3 - Ignatius Farray - 13/02/21 - escuchar ahora',
             'thumbnail': r're:https?://.+/1613243011863.jpg',
             'duration': 3559.559,
-            'series': 'En Radio 3'
+            'series': 'En Radio 3',
+            'description': 'md5:124aa60b461e0b1724a380bad3bc4040',
         },
     }, {
         'url': 'https://www.rtve.es/play/audios/frankenstein-o-el-moderno-prometeo/capitulo-26-ultimo-muerte-victor-juan-jose-plans-mary-shelley/6082623/',
@@ -203,127 +261,101 @@ class RTVEAudioIE(RTVEALaCartaIE):  # XXX: Do not subclass from concrete IE
             'id': '6082623',
             'ext': 'mp3',
             'title': 'Capítulo 26 y último: La muerte de Victor',
+            'alt_title': 'Frankenstein o el moderno Prometeo - Capítulo 26 y último: La muerte de Victor',
             'thumbnail': r're:https?://.+/1632147445707.jpg',
             'duration': 3174.086,
-            'series': 'Frankenstein o el moderno Prometeo'
+            'series': 'Frankenstein o el moderno Prometeo',
+            'description': 'md5:4ee6fcb82ebe2e46d267e1d1c1a8f7b5',
         },
     }]
 
-    def _extract_png_formats(self, audio_id):
-        """
-        This function retrieves media related png thumbnail which obfuscate
-        valuable information about the media. This information is decrypted
-        via base class _decrypt_url function providing media quality and
-        media url
-        """
-        png = self._download_webpage(
-            'http://www.rtve.es/ztnr/movil/thumbnail/%s/audios/%s.png' %
-            (self._manager, audio_id),
-            audio_id, 'Downloading url information', query={'q': 'v2'})
-        q = qualities(['Media', 'Alta', 'HQ', 'HD_READY', 'HD_FULL'])
-        formats = []
-        for quality, audio_url in self._decrypt_url(png):
-            ext = determine_ext(audio_url)
-            if ext == 'm3u8':
-                formats.extend(self._extract_m3u8_formats(
-                    audio_url, audio_id, 'mp4', 'm3u8_native',
-                    m3u8_id='hls', fatal=False))
-            elif ext == 'mpd':
-                formats.extend(self._extract_mpd_formats(
-                    audio_url, audio_id, 'dash', fatal=False))
-            else:
-                formats.append({
-                    'format_id': quality,
-                    'quality': q(quality),
-                    'url': audio_url,
-                })
-        return formats
-
     def _real_extract(self, url):
         audio_id = self._match_id(url)
-        info = self._download_json(
-            'https://www.rtve.es/api/audios/%s.json' % audio_id,
-            audio_id)['page']['items'][0]
+        metadata = self._download_json(
+            f'https://www.rtve.es/api/audios/{audio_id}.json', audio_id)['page']['items'][0]
+
+        formats, subtitles = self._extract_png_formats_and_subtitles(audio_id, media_type='audios')
 
         return {
             'id': audio_id,
-            'title': info['title'].strip(),
-            'thumbnail': info.get('thumbnail'),
-            'duration': float_or_none(info.get('duration'), 1000),
-            'series': try_get(info, lambda x: x['programInfo']['title']),
-            'formats': self._extract_png_formats(audio_id),
+            'formats': formats,
+            'subtitles': subtitles,
+            **self._parse_metadata(metadata),
         }
 
 
-class RTVEInfantilIE(RTVEALaCartaIE):  # XXX: Do not subclass from concrete IE
-    IE_NAME = 'rtve.es:infantil'
-    IE_DESC = 'RTVE infantil'
-    _VALID_URL = r'https?://(?:www\.)?rtve\.es/infantil/serie/[^/]+/video/[^/]+/(?P<id>[0-9]+)/'
-
-    _TESTS = [{
-        'url': 'http://www.rtve.es/infantil/serie/cleo/video/maneras-vivir/3040283/',
-        'md5': '5747454717aedf9f9fdf212d1bcfc48d',
-        'info_dict': {
-            'id': '3040283',
-            'ext': 'mp4',
-            'title': 'Maneras de vivir',
-            'thumbnail': r're:https?://.+/1426182947956\.JPG',
-            'duration': 357.958,
-        },
-        'expected_warnings': ['Failed to download MPD manifest', 'Failed to download m3u8 information'],
-    }]
-
-
-class RTVELiveIE(RTVEALaCartaIE):  # XXX: Do not subclass from concrete IE
+class RTVELiveIE(RTVEBaseIE):
     IE_NAME = 'rtve.es:live'
     IE_DESC = 'RTVE.es live streams'
-    _VALID_URL = r'https?://(?:www\.)?rtve\.es/directo/(?P<id>[a-zA-Z0-9-]+)'
+    _VALID_URL = [
+        r'https?://(?:www\.)?rtve\.es/directo/(?P<id>[a-zA-Z0-9-]+)',
+        r'https?://(?:www\.)?rtve\.es/play/videos/directo/[^/?#]+/(?P<id>[a-zA-Z0-9-]+)',
+    ]
 
     _TESTS = [{
         'url': 'http://www.rtve.es/directo/la-1/',
         'info_dict': {
             'id': 'la-1',
             'ext': 'mp4',
-            'title': 're:^La 1 [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
+            'live_status': 'is_live',
+            'title': str,
+            'description': str,
+            'thumbnail': r're:https://img\d\.rtve\.es/resources/thumbslive/\d+\.jpg',
+            'timestamp': int,
+            'upload_date': str,
         },
-        'params': {
-            'skip_download': 'live stream',
-        }
+        'params': {'skip_download': 'live stream'},
+    }, {
+        'url': 'https://www.rtve.es/play/videos/directo/deportes/tdp/',
+        'info_dict': {
+            'id': 'tdp',
+            'ext': 'mp4',
+            'live_status': 'is_live',
+            'title': str,
+            'description': str,
+            'thumbnail': r're:https://img2\d\.rtve\.es/resources/thumbslive/\d+\.jpg',
+            'timestamp': int,
+            'upload_date': str,
+        },
+        'params': {'skip_download': 'live stream'},
+    }, {
+        'url': 'http://www.rtve.es/play/videos/directo/canales-lineales/la-1/',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
-        mobj = self._match_valid_url(url)
-        video_id = mobj.group('id')
-
+        video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
-        title = remove_end(self._og_search_title(webpage), ' en directo en RTVE.es')
-        title = remove_start(title, 'Estoy viendo ')
 
-        vidplayer_id = self._search_regex(
-            (r'playerId=player([0-9]+)',
-             r'class=["\'].*?\blive_mod\b.*?["\'][^>]+data-assetid=["\'](\d+)',
-             r'data-id=["\'](\d+)'),
-            webpage, 'internal video ID')
+        data_setup = self._search_json(
+            r'<div[^>]+class="[^"]*videoPlayer[^"]*"[^>]*data-setup=\'',
+            webpage, 'data_setup', video_id)
+
+        formats, subtitles = self._extract_png_formats_and_subtitles(data_setup['idAsset'])
 
         return {
             'id': video_id,
-            'title': title,
-            'formats': self._extract_png_formats(vidplayer_id),
+            **self._search_json_ld(webpage, video_id, fatal=False),
+            'title': self._html_extract_title(webpage),
+            'formats': formats,
+            'subtitles': subtitles,
             'is_live': True,
         }
 
 
 class RTVETelevisionIE(InfoExtractor):
     IE_NAME = 'rtve.es:television'
-    _VALID_URL = r'https?://(?:www\.)?rtve\.es/television/[^/]+/[^/]+/(?P<id>\d+).shtml'
+    _VALID_URL = r'https?://(?:www\.)?rtve\.es/television/[^/?#]+/[^/?#]+/(?P<id>\d+).shtml'
 
     _TEST = {
-        'url': 'http://www.rtve.es/television/20160628/revolucion-del-movil/1364141.shtml',
+        'url': 'https://www.rtve.es/television/20091103/video-inedito-del-8o-programa/299020.shtml',
         'info_dict': {
-            'id': '3069778',
+            'id': '572515',
             'ext': 'mp4',
-            'title': 'Documentos TV - La revolución del móvil',
-            'duration': 3496.948,
+            'title': 'Clase inédita',
+            'duration': 335.817,
+            'thumbnail': r're:https://img2\.rtve\.es/v/.*\.png',
+            'series': 'El coro de la cárcel',
         },
         'params': {
             'skip_download': True,
@@ -334,11 +366,8 @@ class RTVETelevisionIE(InfoExtractor):
         page_id = self._match_id(url)
         webpage = self._download_webpage(url, page_id)
 
-        alacarta_url = self._search_regex(
-            r'data-location="alacarta_videos"[^<]+url&quot;:&quot;(http://www\.rtve\.es/alacarta.+?)&',
-            webpage, 'alacarta url', default=None)
-        if alacarta_url is None:
-            raise ExtractorError(
-                'The webpage doesn\'t contain any video', expected=True)
+        play_url = self._html_search_meta('contentUrl', webpage)
+        if play_url is None:
+            raise ExtractorError('The webpage doesn\'t contain any video', expected=True)
 
-        return self.url_result(alacarta_url, ie=RTVEALaCartaIE.ie_key())
+        return self.url_result(play_url, ie=RTVEALaCartaIE.ie_key())
diff --git a/plugins/youtube_download/yt_dlp/extractor/rtvnh.py b/plugins/youtube_download/yt_dlp/extractor/rtvnh.py
deleted file mode 100644
index 7c61744..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/rtvnh.py
+++ /dev/null
@@ -1,58 +0,0 @@
-from .common import InfoExtractor
-from ..utils import ExtractorError
-
-
-class RTVNHIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?rtvnh\.nl/video/(?P<id>[0-9]+)'
-    _TEST = {
-        'url': 'http://www.rtvnh.nl/video/131946',
-        'md5': 'cdbec9f44550763c8afc96050fa747dc',
-        'info_dict': {
-            'id': '131946',
-            'ext': 'mp4',
-            'title': 'Grote zoektocht in zee bij Zandvoort naar vermiste vrouw',
-            'thumbnail': r're:^https?:.*\.jpg$'
-        }
-    }
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        meta = self._parse_json(self._download_webpage(
-            'http://www.rtvnh.nl/video/json?m=' + video_id, video_id), video_id)
-
-        status = meta.get('status')
-        if status != 200:
-            raise ExtractorError(
-                '%s returned error code %d' % (self.IE_NAME, status), expected=True)
-
-        formats = []
-        rtmp_formats = self._extract_smil_formats(
-            'http://www.rtvnh.nl/video/smil?m=' + video_id, video_id)
-        formats.extend(rtmp_formats)
-
-        for rtmp_format in rtmp_formats:
-            rtmp_url = '%s/%s' % (rtmp_format['url'], rtmp_format['play_path'])
-            rtsp_format = rtmp_format.copy()
-            del rtsp_format['play_path']
-            del rtsp_format['ext']
-            rtsp_format.update({
-                'format_id': rtmp_format['format_id'].replace('rtmp', 'rtsp'),
-                'url': rtmp_url.replace('rtmp://', 'rtsp://'),
-                'protocol': 'rtsp',
-            })
-            formats.append(rtsp_format)
-            http_base_url = rtmp_url.replace('rtmp://', 'http://')
-            formats.extend(self._extract_m3u8_formats(
-                http_base_url + '/playlist.m3u8', video_id, 'mp4',
-                'm3u8_native', m3u8_id='hls', fatal=False))
-            formats.extend(self._extract_f4m_formats(
-                http_base_url + '/manifest.f4m',
-                video_id, f4m_id='hds', fatal=False))
-
-        return {
-            'id': video_id,
-            'title': meta['title'].strip(),
-            'thumbnail': meta.get('image'),
-            'formats': formats
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/rtvs.py b/plugins/youtube_download/yt_dlp/extractor/rtvs.py
index a84a78d..fcbc88a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/rtvs.py
+++ b/plugins/youtube_download/yt_dlp/extractor/rtvs.py
@@ -1,7 +1,6 @@
 import re
 
 from .common import InfoExtractor
-
 from ..utils import (
     parse_duration,
     traverse_obj,
@@ -10,7 +9,9 @@ from ..utils import (
 
 
 class RTVSIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?rtvs\.sk/(?:radio|televizia)/archiv(?:/\d+)?/(?P<id>\d+)/?(?:[#?]|$)'
+    IE_NAME = 'stvr'
+    IE_DESC = 'Slovak Television and Radio (formerly RTVS)'
+    _VALID_URL = r'https?://(?:www\.)?(?:rtvs|stvr)\.sk/(?:radio|televizia)/archiv(?:/\d+)?/(?P<id>\d+)/?(?:[#?]|$)'
     _TESTS = [{
         # radio archive
         'url': 'http://www.rtvs.sk/radio/archiv/11224/414872',
@@ -20,9 +21,9 @@ class RTVSIE(InfoExtractor):
             'ext': 'mp3',
             'title': 'Ostrov pokladov 1 časť.mp3',
             'duration': 2854,
-            'thumbnail': 'https://www.rtvs.sk/media/a501/image/file/2/0000/b1R8.rtvs.jpg',
+            'thumbnail': 'https://www.stvr.sk/media/a501/image/file/2/0000/rtvs-00009383.png',
             'display_id': '135331',
-        }
+        },
     }, {
         # tv archive
         'url': 'http://www.rtvs.sk/televizia/archiv/8249/63118',
@@ -31,11 +32,11 @@ class RTVSIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'Amaro Džives - Náš deň',
             'description': 'Galavečer pri príležitosti Medzinárodného dňa Rómov.',
-            'thumbnail': 'https://www.rtvs.sk/media/a501/image/file/2/0031/L7Qm.amaro_dzives_png.jpg',
+            'thumbnail': 'https://www.stvr.sk/media/a501/image/file/2/0031/L7Qm.amaro_dzives_png.jpg',
             'timestamp': 1428555900,
             'upload_date': '20150409',
             'duration': 4986,
-        }
+        },
     }, {
         # tv archive
         'url': 'https://www.rtvs.sk/televizia/archiv/18083?utm_source=web&utm_medium=rozcestnik&utm_campaign=Robin',
@@ -48,8 +49,11 @@ class RTVSIE(InfoExtractor):
             'display_id': '307655',
             'duration': 831,
             'upload_date': '20211111',
-            'thumbnail': 'https://www.rtvs.sk/media/a501/image/file/2/0916/robin.jpg',
-        }
+            'thumbnail': 'https://www.stvr.sk/media/a501/image/file/2/0916/robin.jpg',
+        },
+    }, {
+        'url': 'https://www.stvr.sk/radio/archiv/11224/414872',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
@@ -81,5 +85,5 @@ class RTVSIE(InfoExtractor):
             'duration': parse_duration(traverse_obj(data, ('playlist', 0, 'length'))),
             'thumbnail': traverse_obj(data, ('playlist', 0, 'image')),
             'timestamp': unified_timestamp(traverse_obj(data, ('playlist', 0, 'datetime_create'))),
-            'formats': formats
+            'formats': formats,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/rtvslo.py b/plugins/youtube_download/yt_dlp/extractor/rtvslo.py
index 05942b6..b190d17 100644
--- a/plugins/youtube_download/yt_dlp/extractor/rtvslo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/rtvslo.py
@@ -1,10 +1,14 @@
+import re
+
 from .common import InfoExtractor
 from ..utils import (
     ExtractorError,
+    int_or_none,
     parse_duration,
     traverse_obj,
     unified_timestamp,
     url_or_none,
+    urljoin,
 )
 
 
@@ -20,61 +24,73 @@ class RTVSLOIE(InfoExtractor):
     _API_BASE = 'https://api.rtvslo.si/ava/{}/{}?client_id=82013fb3a531d5414f478747c1aca622'
     SUB_LANGS_MAP = {'Slovenski': 'sl'}
 
-    _TESTS = [
-        {
-            'url': 'https://www.rtvslo.si/rtv365/arhiv/174842550?s=tv',
-            'info_dict': {
-                'id': '174842550',
-                'ext': 'flv',
-                'release_timestamp': 1643140032,
-                'upload_date': '20220125',
-                'series': 'Dnevnik',
-                'thumbnail': 'https://img.rtvcdn.si/_up/ava/ava_misc/show_logos/92/dnevnik_3_wide2.jpg',
-                'description': 'md5:76a18692757aeb8f0f51221106277dd2',
-                'timestamp': 1643137046,
-                'title': 'Dnevnik',
-                'series_id': '92',
-                'release_date': '20220125',
-                'duration': 1789,
-            },
-        }, {
-            'url': 'https://365.rtvslo.si/arhiv/utrip/174843754',
-            'info_dict': {
-                'id': '174843754',
-                'ext': 'mp4',
-                'series_id': '94',
-                'release_date': '20220129',
-                'timestamp': 1643484455,
-                'title': 'Utrip',
-                'duration': 813,
-                'thumbnail': 'https://img.rtvcdn.si/_up/ava/ava_misc/show_logos/94/utrip_1_wide2.jpg',
-                'description': 'md5:77f2892630c7b17bb7a5bb84319020c9',
-                'release_timestamp': 1643485825,
-                'upload_date': '20220129',
-                'series': 'Utrip',
-            },
-        }, {
-            'url': 'https://365.rtvslo.si/arhiv/il-giornale-della-sera/174844609',
-            'info_dict': {
-                'id': '174844609',
-                'ext': 'mp3',
-                'series_id': '106615841',
-                'title': 'Il giornale della sera',
-                'duration': 1328,
-                'series': 'Il giornale della sera',
-                'timestamp': 1643743800,
-                'release_timestamp': 1643745424,
-                'thumbnail': 'https://img.rtvcdn.si/_up/ava/ava_misc/show_logos/il-giornale-della-sera_wide2.jpg',
-                'upload_date': '20220201',
-                'tbr': 128000,
-                'release_date': '20220201',
-            },
-
-        }, {
-            'url': 'https://4d.rtvslo.si/arhiv/dnevnik/174842550',
-            'only_matching': True
-        }
-    ]
+    _TESTS = [{
+        'url': 'https://www.rtvslo.si/rtv365/arhiv/174842550?s=tv',
+        'info_dict': {
+            'id': '174842550',
+            'ext': 'mp4',
+            'release_timestamp': 1643140032,
+            'upload_date': '20220125',
+            'series': 'Dnevnik',
+            'thumbnail': 'https://img.rtvcdn.si/_up/ava/ava_misc/show_logos/92/dnevnik_3_wide2.jpg',
+            'description': 'md5:76a18692757aeb8f0f51221106277dd2',
+            'timestamp': 1643137046,
+            'title': 'Dnevnik',
+            'series_id': '92',
+            'release_date': '20220125',
+            'duration': 1789,
+        },
+    }, {
+        'url': 'https://365.rtvslo.si/arhiv/utrip/174843754',
+        'info_dict': {
+            'id': '174843754',
+            'ext': 'mp4',
+            'series_id': '94',
+            'release_date': '20220129',
+            'timestamp': 1643484455,
+            'title': 'Utrip',
+            'duration': 813,
+            'thumbnail': 'https://img.rtvcdn.si/_up/ava/ava_misc/show_logos/94/utrip_1_wide2.jpg',
+            'description': 'md5:77f2892630c7b17bb7a5bb84319020c9',
+            'release_timestamp': 1643485825,
+            'upload_date': '20220129',
+            'series': 'Utrip',
+        },
+    }, {
+        'url': 'https://365.rtvslo.si/arhiv/il-giornale-della-sera/174844609',
+        'info_dict': {
+            'id': '174844609',
+            'ext': 'mp3',
+            'series_id': '106615841',
+            'title': 'Il giornale della sera',
+            'duration': 1328,
+            'series': 'Il giornale della sera',
+            'timestamp': 1643743800,
+            'release_timestamp': 1643745424,
+            'thumbnail': 'https://img.rtvcdn.si/_up/ava/ava_misc/show_logos/il-giornale-della-sera_wide2.jpg',
+            'upload_date': '20220201',
+            'tbr': 128000,
+            'release_date': '20220201',
+        },
+    }, {
+        'url': 'https://365.rtvslo.si/arhiv/razred-zase/148350750',
+        'info_dict': {
+            'id': '148350750',
+            'ext': 'mp4',
+            'title': 'Prvi šolski dan, mozaična oddaja za mlade',
+            'series': 'Razred zase',
+            'series_id': '148185730',
+            'duration': 1481,
+            'upload_date': '20121019',
+            'timestamp': 1350672122,
+            'release_date': '20121019',
+            'release_timestamp': 1350672122,
+            'thumbnail': 'https://img.rtvcdn.si/_up/ava/ava_misc/show_logos/148185730/razred_zase_2014_logo_4d_wide2.jpg',
+        },
+    }, {
+        'url': 'https://4d.rtvslo.si/arhiv/dnevnik/174842550',
+        'only_matching': True,
+    }]
 
     def _real_extract(self, url):
         v_id = self._match_id(url)
@@ -98,35 +114,36 @@ class RTVSLOIE(InfoExtractor):
         media = self._download_json(self._API_BASE.format('getMedia', v_id), v_id, query={'jwt': jwt})['response']
 
         formats = []
+        skip_protocols = ['smil', 'f4m', 'dash']
         adaptive_url = traverse_obj(media, ('addaptiveMedia', 'hls_sec'), expected_type=url_or_none)
         if adaptive_url:
-            formats = self._extract_wowza_formats(adaptive_url, v_id, skip_protocols=['smil'])
+            formats = self._extract_wowza_formats(adaptive_url, v_id, skip_protocols=skip_protocols)
 
         adaptive_url = traverse_obj(media, ('addaptiveMedia_sl', 'hls_sec'), expected_type=url_or_none)
         if adaptive_url:
-            for f in self._extract_wowza_formats(adaptive_url, v_id, skip_protocols=['smil']):
+            for f in self._extract_wowza_formats(adaptive_url, v_id, skip_protocols=skip_protocols):
                 formats.append({
                     **f,
                     'format_id': 'sign-' + f['format_id'],
                     'format_note': 'Sign language interpretation', 'preference': -10,
                     'language': (
                         'slv' if f.get('language') == 'eng' and f.get('acodec') != 'none'
-                        else f.get('language'))
+                        else f.get('language')),
                 })
 
-        formats.extend(
-            {
-                'url': f['streams'][strm],
-                'ext': traverse_obj(f, 'mediaType', expected_type=str.lower),
-                'width': f.get('width'),
-                'height': f.get('height'),
-                'tbr': f.get('bitrate'),
-                'filesize': f.get('filesize'),
-            }
-            for strm in ('http', 'https')
-            for f in media.get('mediaFiles') or []
-            if traverse_obj(f, ('streams', strm))
-        )
+        for mediafile in traverse_obj(media, ('mediaFiles', lambda _, v: url_or_none(v['streams']['https']))):
+            formats.append(traverse_obj(mediafile, {
+                'url': ('streams', 'https'),
+                'ext': ('mediaType', {str.lower}),
+                'width': ('width', {int_or_none}),
+                'height': ('height', {int_or_none}),
+                'tbr': ('bitrate', {int_or_none}),
+                'filesize': ('filesize', {int_or_none}),
+            }))
+
+        for mediafile in traverse_obj(media, ('mediaFiles', lambda _, v: url_or_none(v['streams']['hls_sec']))):
+            formats.extend(self._extract_wowza_formats(
+                mediafile['streams']['hls_sec'], v_id, skip_protocols=skip_protocols))
 
         if any('intermission.mp4' in x['url'] for x in formats):
             self.raise_geo_restricted(countries=self._GEO_COUNTRIES, metadata_available=True)
@@ -148,3 +165,31 @@ class RTVSLOIE(InfoExtractor):
             'series': meta.get('showName'),
             'series_id': meta.get('showId'),
         }
+
+
+class RTVSLOShowIE(InfoExtractor):
+    IE_NAME = 'rtvslo.si:show'
+    _VALID_URL = r'https?://(?:365|4d)\.rtvslo.si/oddaja/[^/?#&]+/(?P<id>\d+)'
+
+    _TESTS = [{
+        'url': 'https://365.rtvslo.si/oddaja/ekipa-bled/173250997',
+        'info_dict': {
+            'id': '173250997',
+            'title': 'Ekipa Bled',
+            'description': 'md5:c88471e27a1268c448747a5325319ab7',
+            'thumbnail': 'https://img.rtvcdn.si/_up/ava/ava_misc/show_logos/173250997/logo_wide1.jpg',
+        },
+        'playlist_count': 18,
+    }]
+
+    def _real_extract(self, url):
+        playlist_id = self._match_id(url)
+        webpage = self._download_webpage(url, playlist_id)
+
+        return self.playlist_from_matches(
+            re.findall(r'<a [^>]*\bhref="(/arhiv/[^"]+)"', webpage),
+            playlist_id, self._html_extract_title(webpage),
+            getter=urljoin('https://365.rtvslo.si'), ie=RTVSLOIE,
+            description=self._og_search_description(webpage),
+            thumbnail=self._og_search_thumbnail(webpage),
+        )
diff --git a/plugins/youtube_download/yt_dlp/extractor/rudovideo.py b/plugins/youtube_download/yt_dlp/extractor/rudovideo.py
new file mode 100644
index 0000000..1b85955
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/rudovideo.py
@@ -0,0 +1,135 @@
+from .common import InfoExtractor
+from ..utils import (
+    ExtractorError,
+    determine_ext,
+    js_to_json,
+    traverse_obj,
+    update_url_query,
+    url_or_none,
+)
+
+
+class RudoVideoIE(InfoExtractor):
+    _VALID_URL = r'https?://rudo\.video/(?P<type>vod|podcast|live)/(?P<id>[^/?&#]+)'
+    _EMBED_REGEX = [r'<iframe[^>]+src=[\'"](?P<url>(?:https?:)//rudo\.video/(?:vod|podcast|live)/[^\'"]+)']
+    _TESTS = [{
+        'url': 'https://rudo.video/podcast/cz2wrUy8l0o',
+        'md5': '28ed82b477708dc5e12e072da2449221',
+        'info_dict': {
+            'id': 'cz2wrUy8l0o',
+            'title': 'Diego Cabot',
+            'ext': 'mp4',
+            'thumbnail': r're:^(?:https?:)?//.*\.(png|jpg)$',
+        },
+    }, {
+        'url': 'https://rudo.video/podcast/bQkt07',
+        'md5': '36b22a9863de0f47f00fc7532a32a898',
+        'info_dict': {
+            'id': 'bQkt07',
+            'title': 'Tubular Bells',
+            'ext': 'mp4',
+            'thumbnail': r're:^(?:https?:)?//.*\.(png|jpg)$',
+        },
+    }, {
+        'url': 'https://rudo.video/podcast/b42ZUznHX0',
+        'md5': 'b91c70d832938871367f8ad10c895821',
+        'info_dict': {
+            'id': 'b42ZUznHX0',
+            'title': 'Columna Ruperto Concha',
+            'ext': 'mp3',
+            'thumbnail': r're:^(?:https?:)?//.*\.(png|jpg)$',
+        },
+    }, {
+        'url': 'https://rudo.video/vod/bN5AaJ',
+        'md5': '01324a329227e2591530ecb4f555c881',
+        'info_dict': {
+            'id': 'bN5AaJ',
+            'title': 'Ucrania 19.03',
+            'creator': 'La Tercera',
+            'ext': 'mp4',
+            'thumbnail': r're:^(?:https?:)?//.*\.(png|jpg)$',
+        },
+    }, {
+        'url': 'https://rudo.video/live/bbtv',
+        'info_dict': {
+            'id': 'bbtv',
+            'ext': 'mp4',
+            'creator': 'BioBioTV',
+            'live_status': 'is_live',
+            'title': r're:^LIVE BBTV\s\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}$',
+            'thumbnail': r're:^(?:https?:)?//.*\.(png|jpg)$',
+        },
+    }, {
+        'url': 'https://rudo.video/live/c13',
+        'info_dict': {
+            'id': 'c13',
+            'title': 'CANAL13',
+            'ext': 'mp4',
+        },
+        'skip': 'Geo-restricted to Chile',
+    }, {
+        'url': 'https://rudo.video/live/t13-13cl',
+        'info_dict': {
+            'id': 't13-13cl',
+            'title': 'T13',
+            'ext': 'mp4',
+        },
+        'skip': 'Geo-restricted to Chile',
+    }]
+
+    def _real_extract(self, url):
+        video_id, type_ = self._match_valid_url(url).group('id', 'type')
+        is_live = type_ == 'live'
+
+        webpage = self._download_webpage(url, video_id)
+        if 'Streaming is not available in your area' in webpage:
+            self.raise_geo_restricted()
+
+        media_url = (
+            self._search_regex(
+                r'var\s+streamURL\s*=\s*[\'"]([^?\'"]+)', webpage, 'stream url', default=None)
+            # Source URL must be used only if streamURL is unavailable
+            or self._search_regex(
+                r'<source[^>]+src=[\'"]([^\'"]+)', webpage, 'source url', default=None))
+        if not media_url:
+            youtube_url = self._search_regex(r'file:\s*[\'"]((?:https?:)//(?:www\.)?youtube\.com[^\'"]+)',
+                                             webpage, 'youtube url', default=None)
+            if youtube_url:
+                return self.url_result(youtube_url, 'Youtube')
+            raise ExtractorError('Unable to extract stream url')
+
+        token_array = self._search_json(
+            r'<script>var\s+_\$_[a-zA-Z0-9]+\s*=', webpage, 'access token array', video_id,
+            contains_pattern=r'\[(?s:.+)\]', default=None, transform_source=js_to_json)
+        if token_array:
+            token_url = traverse_obj(token_array, (..., {url_or_none}), get_all=False)
+            if not token_url:
+                raise ExtractorError('Invalid access token array')
+            access_token = self._download_json(
+                token_url, video_id, note='Downloading access token')['data']['authToken']
+            media_url = update_url_query(media_url, {'auth-token': access_token})
+
+        ext = determine_ext(media_url)
+        if ext == 'm3u8':
+            formats = self._extract_m3u8_formats(media_url, video_id, live=is_live)
+        elif ext == 'mp3':
+            formats = [{
+                'url': media_url,
+                'vcodec': 'none',
+            }]
+        else:
+            formats = [{'url': media_url}]
+
+        return {
+            'id': video_id,
+            'title': (self._search_regex(r'var\s+titleVideo\s*=\s*[\'"]([^\'"]+)',
+                                         webpage, 'title', default=None)
+                      or self._og_search_title(webpage)),
+            'creator': self._search_regex(r'var\s+videoAuthor\s*=\s*[\'"]([^?\'"]+)',
+                                          webpage, 'videoAuthor', default=None),
+            'thumbnail': (self._search_regex(r'var\s+posterIMG\s*=\s*[\'"]([^?\'"]+)',
+                                             webpage, 'thumbnail', default=None)
+                          or self._og_search_thumbnail(webpage)),
+            'formats': formats,
+            'is_live': is_live,
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/ruhd.py b/plugins/youtube_download/yt_dlp/extractor/ruhd.py
deleted file mode 100644
index abaa3f9..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/ruhd.py
+++ /dev/null
@@ -1,42 +0,0 @@
-from .common import InfoExtractor
-
-
-class RUHDIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?ruhd\.ru/play\.php\?vid=(?P<id>\d+)'
-    _TEST = {
-        'url': 'http://www.ruhd.ru/play.php?vid=207',
-        'md5': 'd1a9ec4edf8598e3fbd92bb16072ba83',
-        'info_dict': {
-            'id': '207',
-            'ext': 'divx',
-            'title': 'КОТ бааааам',
-            'description': 'классный кот)',
-            'thumbnail': r're:^http://.*\.jpg$',
-        }
-    }
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-
-        video_url = self._html_search_regex(
-            r'<param name="src" value="([^"]+)"', webpage, 'video url')
-        title = self._html_search_regex(
-            r'<title>([^<]+)&nbsp;&nbsp; RUHD\.ru - Видео Высокого качества №1 в России!</title>',
-            webpage, 'title')
-        description = self._html_search_regex(
-            r'(?s)<div id="longdesc">(.+?)<span id="showlink">',
-            webpage, 'description', fatal=False)
-        thumbnail = self._html_search_regex(
-            r'<param name="previewImage" value="([^"]+)"',
-            webpage, 'thumbnail', fatal=False)
-        if thumbnail:
-            thumbnail = 'http://www.ruhd.ru' + thumbnail
-
-        return {
-            'id': video_id,
-            'url': video_url,
-            'title': title,
-            'description': description,
-            'thumbnail': thumbnail,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/rule34video.py b/plugins/youtube_download/yt_dlp/extractor/rule34video.py
index 9d15f4d..3630f5e 100644
--- a/plugins/youtube_download/yt_dlp/extractor/rule34video.py
+++ b/plugins/youtube_download/yt_dlp/extractor/rule34video.py
@@ -1,14 +1,26 @@
 import re
 
-from ..utils import parse_duration
 from .common import InfoExtractor
+from ..utils import (
+    clean_html,
+    extract_attributes,
+    get_element_by_attribute,
+    get_element_by_class,
+    get_element_html_by_class,
+    get_elements_by_class,
+    int_or_none,
+    parse_count,
+    parse_duration,
+    unescapeHTML,
+)
+from ..utils.traversal import traverse_obj
 
 
 class Rule34VideoIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?rule34video\.com/videos/(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:www\.)?rule34video\.com/videos?/(?P<id>\d+)'
     _TESTS = [
         {
-            'url': 'https://rule34video.com/videos/3065157/shot-it-mmd-hmv/',
+            'url': 'https://rule34video.com/video/3065157/shot-it-mmd-hmv/',
             'md5': 'ffccac2c23799dabbd192621ae4d04f3',
             'info_dict': {
                 'id': '3065157',
@@ -16,8 +28,18 @@ class Rule34VideoIE(InfoExtractor):
                 'title': 'Shot It-(mmd hmv)',
                 'thumbnail': 'https://rule34video.com/contents/videos_screenshots/3065000/3065157/preview.jpg',
                 'duration': 347.0,
-                'age_limit': 18
-            }
+                'age_limit': 18,
+                'view_count': int,
+                'like_count': int,
+                'comment_count': int,
+                'timestamp': 1639872000,
+                'description': 'https://discord.gg/aBqPrHSHvv',
+                'upload_date': '20211219',
+                'uploader': 'Sweet HMV',
+                'uploader_url': 'https://rule34video.com/members/22119/',
+                'categories': ['3D', 'MMD', 'iwara'],
+                'tags': 'mincount:10',
+            },
         },
         {
             'url': 'https://rule34video.com/videos/3065296/lara-in-trouble-ep-7-wildeerstudio/',
@@ -28,8 +50,19 @@ class Rule34VideoIE(InfoExtractor):
                 'title': 'Lara in Trouble Ep. 7 [WildeerStudio]',
                 'thumbnail': 'https://rule34video.com/contents/videos_screenshots/3065000/3065296/preview.jpg',
                 'duration': 938.0,
-                'age_limit': 18
-            }
+                'age_limit': 18,
+                'view_count': int,
+                'like_count': int,
+                'comment_count': int,
+                'timestamp': 1640131200,
+                'description': '',
+                'creators': ['WildeerStudio'],
+                'upload_date': '20211222',
+                'uploader': 'CerZule',
+                'uploader_url': 'https://rule34video.com/members/36281/',
+                'categories': ['3D', 'Tomb Raider'],
+                'tags': 'mincount:40',
+            },
         },
     ]
 
@@ -47,15 +80,44 @@ class Rule34VideoIE(InfoExtractor):
                 'quality': quality,
             })
 
-        title = self._html_extract_title(webpage)
-        thumbnail = self._html_search_regex(r'preview_url:\s+\'([^\']+)\'', webpage, 'thumbnail', default=None)
-        duration = self._html_search_regex(r'"icon-clock"></i>\s+<span>((?:\d+:?)+)', webpage, 'duration', default=None)
+        categories, creators, uploader, uploader_url = [None] * 4
+        for col in get_elements_by_class('col', webpage):
+            label = clean_html(get_element_by_class('label', col))
+            if label == 'Categories:':
+                categories = list(map(clean_html, get_elements_by_class('item', col)))
+            elif label == 'Artist:':
+                creators = list(map(clean_html, get_elements_by_class('item', col)))
+            elif label == 'Uploaded By:':
+                uploader = clean_html(get_element_by_class('name', col))
+                uploader_url = extract_attributes(get_element_html_by_class('name', col) or '').get('href')
 
         return {
+            **traverse_obj(self._search_json_ld(webpage, video_id, default={}), ({
+                'title': 'title',
+                'view_count': 'view_count',
+                'like_count': 'like_count',
+                'duration': 'duration',
+                'timestamp': 'timestamp',
+                'description': 'description',
+                'thumbnail': ('thumbnails', 0, 'url'),
+            })),
             'id': video_id,
             'formats': formats,
-            'title': title,
-            'thumbnail': thumbnail,
-            'duration': parse_duration(duration),
-            'age_limit': 18
+            'title': self._html_extract_title(webpage),
+            'thumbnail': self._html_search_regex(
+                r'preview_url:\s+\'([^\']+)\'', webpage, 'thumbnail', default=None),
+            'duration': parse_duration(self._html_search_regex(
+                r'"icon-clock"></i>\s+<span>((?:\d+:?)+)', webpage, 'duration', default=None)),
+            'view_count': int_or_none(self._html_search_regex(
+                r'"icon-eye"></i>\s+<span>([ \d]+)', webpage, 'views', default='').replace(' ', '')),
+            'like_count': parse_count(get_element_by_class('voters count', webpage)),
+            'comment_count': int_or_none(self._search_regex(
+                r'[^(]+\((\d+)\)', get_element_by_attribute('href', '#tab_comments', webpage), 'comment count', fatal=False)),
+            'age_limit': 18,
+            'creators': creators,
+            'uploader': uploader,
+            'uploader_url': uploader_url,
+            'categories': categories,
+            'tags': list(map(unescapeHTML, re.findall(
+                r'<a class="tag_item"[^>]+\bhref="https://rule34video\.com/tags/\d+/"[^>]*>(?P<tag>[^>]*)</a>', webpage))),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/rumble.py b/plugins/youtube_download/yt_dlp/extractor/rumble.py
index f8bf4a1..757d699 100644
--- a/plugins/youtube_download/yt_dlp/extractor/rumble.py
+++ b/plugins/youtube_download/yt_dlp/extractor/rumble.py
@@ -7,15 +7,17 @@ from ..utils import (
     ExtractorError,
     UnsupportedError,
     clean_html,
-    determine_ext,
+    extract_attributes,
     format_field,
     get_element_by_class,
+    get_elements_html_by_class,
     int_or_none,
     join_nonempty,
     parse_count,
     parse_iso8601,
     traverse_obj,
     unescapeHTML,
+    urljoin,
 )
 
 
@@ -33,11 +35,11 @@ class RumbleEmbedIE(InfoExtractor):
             'upload_date': '20191020',
             'channel_url': 'https://rumble.com/c/WMAR',
             'channel': 'WMAR',
-            'thumbnail': 'https://sp.rmbl.ws/s8/1/5/M/z/1/5Mz1a.OvCc-small-WMAR-2-News-Latest-Headline.jpg',
+            'thumbnail': r're:https://.+\.jpg',
             'duration': 234,
             'uploader': 'WMAR',
             'live_status': 'not_live',
-        }
+        },
     }, {
         'url': 'https://rumble.com/embed/vslb7v',
         'md5': '7418035de1a30a178b8af34dc2b6a52b',
@@ -49,11 +51,11 @@ class RumbleEmbedIE(InfoExtractor):
             'upload_date': '20220217',
             'channel_url': 'https://rumble.com/c/CyberTechNews',
             'channel': 'CTNews',
-            'thumbnail': 'https://sp.rmbl.ws/s8/6/7/i/9/h/7i9hd.OvCc.jpg',
+            'thumbnail': r're:https://.+\.jpg',
             'duration': 901,
             'uploader': 'CTNews',
             'live_status': 'not_live',
-        }
+        },
     }, {
         'url': 'https://rumble.com/embed/vunh1h',
         'info_dict': {
@@ -73,33 +75,32 @@ class RumbleEmbedIE(InfoExtractor):
                     {
                         'url': r're:https://.+\.vtt',
                         'name': 'English',
-                        'ext': 'vtt'
-                    }
-                ]
+                        'ext': 'vtt',
+                    },
+                ],
             },
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }, {
         'url': 'https://rumble.com/embed/v1essrt',
         'info_dict': {
             'id': 'v1essrt',
             'ext': 'mp4',
-            'title': 'startswith:lofi hip hop radio - beats to relax/study',
+            'title': 'startswith:lofi hip hop radio 📚 - beats to relax/study to',
             'timestamp': 1661519399,
             'upload_date': '20220826',
             'channel_url': 'https://rumble.com/c/LofiGirl',
             'channel': 'Lofi Girl',
             'thumbnail': r're:https://.+\.jpg',
-            'duration': None,
             'uploader': 'Lofi Girl',
             'live_status': 'is_live',
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }, {
         'url': 'https://rumble.com/embed/v1amumr',
         'info_dict': {
             'id': 'v1amumr',
-            'ext': 'webm',
+            'ext': 'mp4',
             'fps': 60,
             'title': 'Turning Point USA 2022 Student Action Summit DAY 1  - Rumble Exclusive Live',
             'timestamp': 1658518457,
@@ -111,7 +112,23 @@ class RumbleEmbedIE(InfoExtractor):
             'uploader': 'Rumble Events',
             'live_status': 'was_live',
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
+    }, {
+        'url': 'https://rumble.com/embed/v6pezdb',
+        'info_dict': {
+            'id': 'v6pezdb',
+            'ext': 'mp4',
+            'title': '"Es war einmal ein Mädchen" – Ein filmisches Zeitzeugnis aus Leningrad 1944',
+            'uploader': 'RT DE',
+            'channel': 'RT DE',
+            'channel_url': 'https://rumble.com/c/RTDE',
+            'duration': 309,
+            'thumbnail': 'https://1a-1791.com/video/fww1/dc/s8/1/n/z/2/y/nz2yy.qR4e-small-Es-war-einmal-ein-Mdchen-Ei.jpg',
+            'timestamp': 1743703500,
+            'upload_date': '20250403',
+            'live_status': 'not_live',
+        },
+        'params': {'skip_download': True},
     }, {
         'url': 'https://rumble.com/embed/ufe9n.v5pv5f',
         'only_matching': True,
@@ -129,12 +146,12 @@ class RumbleEmbedIE(InfoExtractor):
                 'duration': 92,
                 'title': '911 Audio From The Man Who Wanted To Kill Supreme Court Justice Kavanaugh',
                 'channel_url': 'https://rumble.com/c/RichSementa',
-                'thumbnail': 'https://sp.rmbl.ws/s8/1/P/j/f/A/PjfAe.OvCc-small-911-Audio-From-The-Man-Who-.jpg',
+                'thumbnail': 'https://sp.rmbl.ws/s8/1/P/j/f/A/PjfAe.qR4e-small-911-Audio-From-The-Man-Who-.jpg',
                 'timestamp': 1654892716,
                 'uploader': 'Mr Producer Media',
                 'upload_date': '20220610',
                 'live_status': 'not_live',
-            }
+            },
         },
     ]
 
@@ -144,7 +161,7 @@ class RumbleEmbedIE(InfoExtractor):
         if embeds:
             return embeds
         return [f'https://rumble.com/embed/{mobj.group("id")}' for mobj in re.finditer(
-            r'<script>[^<]*\bRumble\(\s*"play"\s*,\s*{\s*[\'"]?video[\'"]?\s*:\s*[\'"](?P<id>[0-9a-z]+)[\'"]', webpage)]
+            r'<script>[^<]*\bRumble\(\s*"play"\s*,\s*{[^}]*[\'"]?video[\'"]?\s*:\s*[\'"](?P<id>[0-9a-z]+)[\'"]', webpage)]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
@@ -166,40 +183,42 @@ class RumbleEmbedIE(InfoExtractor):
             live_status = None
 
         formats = []
-        for ext, ext_info in (video.get('ua') or {}).items():
-            if isinstance(ext_info, dict):
-                for height, video_info in ext_info.items():
+        for format_type, format_info in (video.get('ua') or {}).items():
+            if isinstance(format_info, dict):
+                for height, video_info in format_info.items():
                     if not traverse_obj(video_info, ('meta', 'h', {int_or_none})):
                         video_info.setdefault('meta', {})['h'] = height
-                ext_info = ext_info.values()
+                format_info = format_info.values()
 
-            for video_info in ext_info:
+            for video_info in format_info:
                 meta = video_info.get('meta') or {}
                 if not video_info.get('url'):
                     continue
-                if ext == 'hls':
+                # With default query params returns m3u8 variants which are duplicates, without returns tar files
+                if format_type == 'tar':
+                    continue
+                if format_type == 'hls':
                     if meta.get('live') is True and video.get('live') == 1:
                         live_status = 'post_live'
                     formats.extend(self._extract_m3u8_formats(
                         video_info['url'], video_id,
                         ext='mp4', m3u8_id='hls', fatal=False, live=live_status == 'is_live'))
                     continue
-                timeline = ext == 'timeline'
-                if timeline:
-                    ext = determine_ext(video_info['url'])
+                is_timeline = format_type == 'timeline'
+                is_audio = format_type == 'audio'
                 formats.append({
-                    'ext': ext,
-                    'acodec': 'none' if timeline else None,
+                    'acodec': 'none' if is_timeline else None,
+                    'vcodec': 'none' if is_audio else None,
                     'url': video_info['url'],
-                    'format_id': join_nonempty(ext, format_field(meta, 'h', '%sp')),
-                    'format_note': 'Timeline' if timeline else None,
-                    'fps': None if timeline else video.get('fps'),
+                    'format_id': join_nonempty(format_type, format_field(meta, 'h', '%sp')),
+                    'format_note': 'Timeline' if is_timeline else None,
+                    'fps': None if is_timeline or is_audio else video.get('fps'),
                     **traverse_obj(meta, {
-                        'tbr': 'bitrate',
-                        'filesize': 'size',
-                        'width': 'w',
-                        'height': 'h',
-                    }, expected_type=lambda x: int(x) or None)
+                        'tbr': ('bitrate', {int_or_none}),
+                        'filesize': ('size', {int_or_none}),
+                        'width': ('w', {int_or_none}),
+                        'height': ('h', {int_or_none}),
+                    }),
                 })
 
         subtitles = {
@@ -236,7 +255,9 @@ class RumbleEmbedIE(InfoExtractor):
 
 class RumbleIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?rumble\.com/(?P<id>v(?!ideos)[\w.-]+)[^/]*$'
-    _EMBED_REGEX = [r'<a class=video-item--a href=(?P<url>/v[\w.-]+\.html)>']
+    _EMBED_REGEX = [
+        r'<a class=video-item--a href=(?P<url>/v[\w.-]+\.html)>',
+        r'<a[^>]+class="videostream__link link"[^>]+href=(?P<url>/v[\w.-]+\.html)[^>]*>']
     _TESTS = [{
         'add_ie': ['RumbleEmbed'],
         'url': 'https://rumble.com/vdmum1-moose-the-dog-helps-girls-dig-a-snow-fort.html',
@@ -254,9 +275,10 @@ class RumbleIE(InfoExtractor):
             'thumbnail': r're:https://.+\.jpg',
             'duration': 103,
             'like_count': int,
+            'dislike_count': int,
             'view_count': int,
             'live_status': 'not_live',
-        }
+        },
     }, {
         'url': 'http://www.rumble.com/vDMUM1?key=value',
         'only_matching': True,
@@ -278,6 +300,9 @@ class RumbleIE(InfoExtractor):
             'channel_url': 'https://rumble.com/c/Redacted',
             'live_status': 'not_live',
             'thumbnail': 'https://sp.rmbl.ws/s8/1/d/x/2/O/dx2Oi.qR4e-small-The-U.S.-CANNOT-hide-this-i.jpg',
+            'like_count': int,
+            'dislike_count': int,
+            'view_count': int,
         },
     }, {
         'url': 'https://rumble.com/v2e7fju-the-covid-twitter-files-drop-protecting-fauci-while-censoring-the-truth-wma.html',
@@ -296,12 +321,15 @@ class RumbleIE(InfoExtractor):
             'channel_url': 'https://rumble.com/c/KimIversen',
             'channel': 'Kim Iversen',
             'thumbnail': 'https://sp.rmbl.ws/s8/1/6/b/w/O/6bwOi.qR4e-small-The-Covid-Twitter-Files-Dro.jpg',
+            'like_count': int,
+            'dislike_count': int,
+            'view_count': int,
         },
     }]
 
     _WEBPAGE_TESTS = [{
         'url': 'https://rumble.com/videos?page=2',
-        'playlist_count': 25,
+        'playlist_mincount': 24,
         'info_dict': {
             'id': 'videos?page=2',
             'title': 'All videos',
@@ -309,17 +337,16 @@ class RumbleIE(InfoExtractor):
             'age_limit': 0,
         },
     }, {
-        'url': 'https://rumble.com/live-videos',
-        'playlist_mincount': 19,
+        'url': 'https://rumble.com/browse/live',
+        'playlist_mincount': 25,
         'info_dict': {
-            'id': 'live-videos',
-            'title': 'Live Videos',
-            'description': 'Live videos on Rumble.com',
+            'id': 'live',
+            'title': 'Browse',
             'age_limit': 0,
         },
     }, {
         'url': 'https://rumble.com/search/video?q=rumble&sort=views',
-        'playlist_count': 24,
+        'playlist_mincount': 24,
         'info_dict': {
             'id': 'video?q=rumble&sort=views',
             'title': 'Search results for: rumble',
@@ -334,19 +361,20 @@ class RumbleIE(InfoExtractor):
         if not url_info:
             raise UnsupportedError(url)
 
-        release_ts_str = self._search_regex(
-            r'(?:Livestream begins|Streamed on):\s+<time datetime="([^"]+)',
-            webpage, 'release date', fatal=False, default=None)
-        view_count_str = self._search_regex(r'<span class="media-heading-info">([\d,]+) Views',
-                                            webpage, 'view count', fatal=False, default=None)
-
-        return self.url_result(
-            url_info['url'], ie_key=url_info['ie_key'], url_transparent=True,
-            view_count=parse_count(view_count_str),
-            release_timestamp=parse_iso8601(release_ts_str),
-            like_count=parse_count(get_element_by_class('rumbles-count', webpage)),
-            description=clean_html(get_element_by_class('media-description', webpage)),
-        )
+        return {
+            '_type': 'url_transparent',
+            'ie_key': url_info['ie_key'],
+            'url': url_info['url'],
+            'release_timestamp': parse_iso8601(self._search_regex(
+                r'(?:Livestream begins|Streamed on):\s+<time datetime="([^"]+)', webpage, 'release date', default=None)),
+            'view_count': int_or_none(self._search_regex(
+                r'"userInteractionCount"\s*:\s*(\d+)', webpage, 'view count', default=None)),
+            'like_count': parse_count(self._search_regex(
+                r'<span data-js="rumbles_up_votes">\s*([\d,.KM]+)', webpage, 'like count', default=None)),
+            'dislike_count': parse_count(self._search_regex(
+                r'<span data-js="rumbles_down_votes">\s*([\d,.KM]+)', webpage, 'dislike count', default=None)),
+            'description': clean_html(get_element_by_class('media-description', webpage)),
+        }
 
 
 class RumbleChannelIE(InfoExtractor):
@@ -369,13 +397,15 @@ class RumbleChannelIE(InfoExtractor):
     def entries(self, url, playlist_id):
         for page in itertools.count(1):
             try:
-                webpage = self._download_webpage(f'{url}?page={page}', playlist_id, note='Downloading page %d' % page)
+                webpage = self._download_webpage(f'{url}?page={page}', playlist_id, note=f'Downloading page {page}')
             except ExtractorError as e:
                 if isinstance(e.cause, HTTPError) and e.cause.status == 404:
                     break
                 raise
-            for video_url in re.findall(r'class=video-item--a\s?href=([^>]+\.html)', webpage):
-                yield self.url_result('https://rumble.com' + video_url)
+            for video_url in traverse_obj(
+                get_elements_html_by_class('videostream__link', webpage), (..., {extract_attributes}, 'href'),
+            ):
+                yield self.url_result(urljoin('https://rumble.com', video_url))
 
     def _real_extract(self, url):
         url, playlist_id = self._match_valid_url(url).groups()
diff --git a/plugins/youtube_download/yt_dlp/extractor/rutube.py b/plugins/youtube_download/yt_dlp/extractor/rutube.py
index 08d9b92..20365ac 100644
--- a/plugins/youtube_download/yt_dlp/extractor/rutube.py
+++ b/plugins/youtube_download/yt_dlp/extractor/rutube.py
@@ -1,18 +1,22 @@
 import itertools
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_str,
-)
 from ..utils import (
-    determine_ext,
+    UnsupportedError,
     bool_or_none,
+    determine_ext,
     int_or_none,
+    js_to_json,
     parse_qs,
+    str_or_none,
     try_get,
     unified_timestamp,
     url_or_none,
 )
+from ..utils.traversal import (
+    subs_list_to_dict,
+    traverse_obj,
+)
 
 
 class RutubeBaseIE(InfoExtractor):
@@ -21,7 +25,7 @@ class RutubeBaseIE(InfoExtractor):
             query = {}
         query['format'] = 'json'
         return self._download_json(
-            'http://rutube.ru/api/video/%s/' % video_id,
+            f'https://rutube.ru/api/video/{video_id}/',
             video_id, 'Downloading video JSON',
             'Unable to download video JSON', query=query)
 
@@ -44,9 +48,9 @@ class RutubeBaseIE(InfoExtractor):
             'thumbnail': video.get('thumbnail_url'),
             'duration': duration,
             'uploader': try_get(video, lambda x: x['author']['name']),
-            'uploader_id': compat_str(uploader_id) if uploader_id else None,
+            'uploader_id': str(uploader_id) if uploader_id else None,
             'timestamp': unified_timestamp(video.get('created_ts')),
-            'category': [category] if category else None,
+            'categories': [category] if category else None,
             'age_limit': age_limit,
             'view_count': int_or_none(video.get('hits')),
             'comment_count': int_or_none(video.get('comments_count')),
@@ -63,18 +67,21 @@ class RutubeBaseIE(InfoExtractor):
             query = {}
         query['format'] = 'json'
         return self._download_json(
-            'http://rutube.ru/api/play/options/%s/' % video_id,
+            f'https://rutube.ru/api/play/options/{video_id}/',
             video_id, 'Downloading options JSON',
             'Unable to download options JSON',
             headers=self.geo_verification_headers(), query=query)
 
-    def _extract_formats(self, options, video_id):
+    def _extract_formats_and_subtitles(self, options, video_id):
         formats = []
+        subtitles = {}
         for format_id, format_url in options['video_balancer'].items():
             ext = determine_ext(format_url)
             if ext == 'm3u8':
-                formats.extend(self._extract_m3u8_formats(
-                    format_url, video_id, 'mp4', m3u8_id=format_id, fatal=False))
+                fmts, subs = self._extract_m3u8_formats_and_subtitles(
+                    format_url, video_id, 'mp4', m3u8_id=format_id, fatal=False)
+                formats.extend(fmts)
+                self._merge_subtitles(subs, target=subtitles)
             elif ext == 'f4m':
                 formats.extend(self._extract_f4m_formats(
                     format_url, video_id, f4m_id=format_id, fatal=False))
@@ -83,22 +90,32 @@ class RutubeBaseIE(InfoExtractor):
                     'url': format_url,
                     'format_id': format_id,
                 })
-        return formats
+        for hls_url in traverse_obj(options, ('live_streams', 'hls', ..., 'url', {url_or_none})):
+            fmts, subs = self._extract_m3u8_formats_and_subtitles(
+                hls_url, video_id, 'mp4', fatal=False, m3u8_id='hls')
+            formats.extend(fmts)
+            self._merge_subtitles(subs, target=subtitles)
+        self._merge_subtitles(traverse_obj(options, ('captions', ..., {
+            'id': 'code',
+            'url': 'file',
+            'name': ('langTitle', {str}),
+        }, all, {subs_list_to_dict(lang='ru')})), target=subtitles)
+        return formats, subtitles
 
-    def _download_and_extract_formats(self, video_id, query=None):
-        return self._extract_formats(
+    def _download_and_extract_formats_and_subtitles(self, video_id, query=None):
+        return self._extract_formats_and_subtitles(
             self._download_api_options(video_id, query=query), video_id)
 
 
 class RutubeIE(RutubeBaseIE):
     IE_NAME = 'rutube'
     IE_DESC = 'Rutube videos'
-    _VALID_URL = r'https?://rutube\.ru/(?:video(?:/private)?|(?:play/)?embed)/(?P<id>[\da-z]{32})'
+    _VALID_URL = r'https?://rutube\.ru/(?:(?:live/)?video(?:/private)?|(?:play/)?embed)/(?P<id>[\da-z]{32})'
     _EMBED_REGEX = [r'<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//rutube\.ru/(?:play/)?embed/[\da-z]{32}.*?)\1']
 
     _TESTS = [{
-        'url': 'http://rutube.ru/video/3eac3b4561676c17df9132a9a1e62e3e/',
-        'md5': 'e33ac625efca66aba86cbec9851f2692',
+        'url': 'https://rutube.ru/video/3eac3b4561676c17df9132a9a1e62e3e/',
+        'md5': '3d73fdfe5bb81b9aef139e22ef3de26a',
         'info_dict': {
             'id': '3eac3b4561676c17df9132a9a1e62e3e',
             'ext': 'mp4',
@@ -111,26 +128,25 @@ class RutubeIE(RutubeBaseIE):
             'upload_date': '20131016',
             'age_limit': 0,
             'view_count': int,
-            'thumbnail': 'http://pic.rutubelist.ru/video/d2/a0/d2a0aec998494a396deafc7ba2c82add.jpg',
-            'category': ['Новости и СМИ'],
+            'thumbnail': 'https://pic.rutubelist.ru/video/d2/a0/d2a0aec998494a396deafc7ba2c82add.jpg',
+            'categories': ['Новости и СМИ'],
             'chapters': [],
         },
-        'expected_warnings': ['Unable to download f4m'],
     }, {
-        'url': 'http://rutube.ru/play/embed/a10e53b86e8f349080f718582ce4c661',
+        'url': 'https://rutube.ru/play/embed/a10e53b86e8f349080f718582ce4c661',
         'only_matching': True,
     }, {
-        'url': 'http://rutube.ru/embed/a10e53b86e8f349080f718582ce4c661',
+        'url': 'https://rutube.ru/embed/a10e53b86e8f349080f718582ce4c661',
         'only_matching': True,
     }, {
-        'url': 'http://rutube.ru/video/3eac3b4561676c17df9132a9a1e62e3e/?pl_id=4252',
+        'url': 'https://rutube.ru/video/3eac3b4561676c17df9132a9a1e62e3e/?pl_id=4252',
         'only_matching': True,
     }, {
         'url': 'https://rutube.ru/video/10b3a03fc01d5bbcc632a2f3514e8aab/?pl_type=source',
         'only_matching': True,
     }, {
         'url': 'https://rutube.ru/video/private/884fb55f07a97ab673c7d654553e0f48/?p=x2QojCumHTS3rsKHWXN8Lg',
-        'md5': 'd106225f15d625538fe22971158e896f',
+        'md5': '4fce7b4fcc7b1bcaa3f45eb1e1ad0dd7',
         'info_dict': {
             'id': '884fb55f07a97ab673c7d654553e0f48',
             'ext': 'mp4',
@@ -143,66 +159,111 @@ class RutubeIE(RutubeBaseIE):
             'upload_date': '20221210',
             'age_limit': 0,
             'view_count': int,
-            'thumbnail': 'http://pic.rutubelist.ru/video/f2/d4/f2d42b54be0a6e69c1c22539e3152156.jpg',
-            'category': ['Видеоигры'],
+            'thumbnail': 'https://pic.rutubelist.ru/video/f2/d4/f2d42b54be0a6e69c1c22539e3152156.jpg',
+            'categories': ['Видеоигры'],
             'chapters': [],
         },
-        'expected_warnings': ['Unable to download f4m'],
     }, {
         'url': 'https://rutube.ru/video/c65b465ad0c98c89f3b25cb03dcc87c6/',
         'info_dict': {
             'id': 'c65b465ad0c98c89f3b25cb03dcc87c6',
             'ext': 'mp4',
             'chapters': 'count:4',
-            'category': ['Бизнес и предпринимательство'],
+            'categories': ['Бизнес и предпринимательство'],
             'description': 'md5:252feac1305257d8c1bab215cedde75d',
-            'thumbnail': 'http://pic.rutubelist.ru/video/71/8f/718f27425ea9706073eb80883dd3787b.png',
+            'thumbnail': 'https://pic.rutubelist.ru/video/71/8f/718f27425ea9706073eb80883dd3787b.png',
             'duration': 782,
             'age_limit': 0,
             'uploader_id': '23491359',
             'timestamp': 1677153329,
             'view_count': int,
             'upload_date': '20230223',
-            'title': 'Бизнес с нуля: найм сотрудников. Интервью с директором строительной компании',
+            'title': 'Бизнес с нуля: найм сотрудников. Интервью с директором строительной компании #1',
             'uploader': 'Стас Быков',
         },
-        'expected_warnings': ['Unable to download f4m'],
+    }, {
+        'url': 'https://rutube.ru/live/video/c58f502c7bb34a8fcdd976b221fca292/',
+        'info_dict': {
+            'id': 'c58f502c7bb34a8fcdd976b221fca292',
+            'ext': 'mp4',
+            'categories': ['Телепередачи'],
+            'description': '',
+            'thumbnail': 'https://pic.rutubelist.ru/video/14/19/14190807c0c48b40361aca93ad0867c7.jpg',
+            'live_status': 'is_live',
+            'age_limit': 0,
+            'uploader_id': '23460655',
+            'timestamp': 1652972968,
+            'view_count': int,
+            'upload_date': '20220519',
+            'title': r're:Первый канал. Прямой эфир \d{4}-\d{2}-\d{2} \d{2}:\d{2}$',
+            'uploader': 'Первый канал',
+        },
+    }, {
+        'url': 'https://rutube.ru/play/embed/03a9cb54bac3376af4c5cb0f18444e01/',
+        'info_dict': {
+            'id': '03a9cb54bac3376af4c5cb0f18444e01',
+            'ext': 'mp4',
+            'age_limit': 0,
+            'description': '',
+            'title': 'Церемония начала торгов акциями ПАО «ЕвроТранс»',
+            'chapters': [],
+            'upload_date': '20240829',
+            'duration': 293,
+            'uploader': 'MOEX - Московская биржа',
+            'timestamp': 1724946628,
+            'thumbnail': 'https://pic.rutubelist.ru/video/2e/24/2e241fddb459baf0fa54acfca44874f4.jpg',
+            'view_count': int,
+            'uploader_id': '38420507',
+            'categories': ['Интервью'],
+        },
+    }, {
+        'url': 'https://rutube.ru/video/5ab908fccfac5bb43ef2b1e4182256b0/',
+        'only_matching': True,
+    }, {
+        'url': 'https://rutube.ru/live/video/private/c58f502c7bb34a8fcdd976b221fca292/',
+        'only_matching': True,
     }]
 
-    @classmethod
-    def suitable(cls, url):
-        return False if RutubePlaylistIE.suitable(url) else super(RutubeIE, cls).suitable(url)
-
     def _real_extract(self, url):
         video_id = self._match_id(url)
         query = parse_qs(url)
         info = self._download_and_extract_info(video_id, query)
-        info['formats'] = self._download_and_extract_formats(video_id, query)
-        return info
+        formats, subtitles = self._download_and_extract_formats_and_subtitles(video_id, query)
+        return {
+            **info,
+            'formats': formats,
+            'subtitles': subtitles,
+        }
 
 
 class RutubeEmbedIE(RutubeBaseIE):
     IE_NAME = 'rutube:embed'
     IE_DESC = 'Rutube embedded videos'
-    _VALID_URL = r'https?://rutube\.ru/(?:video|play)/embed/(?P<id>[0-9]+)'
+    _VALID_URL = r'https?://rutube\.ru/(?:video|play)/embed/(?P<id>[0-9]+)(?:[?#/]|$)'
 
     _TESTS = [{
-        'url': 'http://rutube.ru/video/embed/6722881?vk_puid37=&vk_puid38=',
+        'url': 'https://rutube.ru/video/embed/6722881?vk_puid37=&vk_puid38=',
         'info_dict': {
             'id': 'a10e53b86e8f349080f718582ce4c661',
             'ext': 'mp4',
             'timestamp': 1387830582,
             'upload_date': '20131223',
             'uploader_id': '297833',
-            'description': 'Видео группы ★http://vk.com/foxkidsreset★ музей Fox Kids и Jetix<br/><br/> восстановлено и сделано в шикоформате subziro89 http://vk.com/subziro89',
             'uploader': 'subziro89 ILya',
             'title': 'Мистический городок Эйри в Индиан 5 серия озвучка subziro89',
+            'age_limit': 0,
+            'duration': 1395,
+            'chapters': [],
+            'description': 'md5:a5acea57bbc3ccdc3cacd1f11a014b5b',
+            'view_count': int,
+            'thumbnail': 'https://pic.rutubelist.ru/video/d3/03/d3031f4670a6e6170d88fb3607948418.jpg',
+            'categories': ['Сериалы'],
         },
         'params': {
             'skip_download': True,
         },
     }, {
-        'url': 'http://rutube.ru/play/embed/8083783',
+        'url': 'https://rutube.ru/play/embed/8083783',
         'only_matching': True,
     }, {
         # private video
@@ -217,11 +278,12 @@ class RutubeEmbedIE(RutubeBaseIE):
         query = parse_qs(url)
         options = self._download_api_options(embed_id, query)
         video_id = options['effective_video']
-        formats = self._extract_formats(options, video_id)
+        formats, subtitles = self._extract_formats_and_subtitles(options, video_id)
         info = self._download_and_extract_info(video_id, query)
         info.update({
             'extractor_key': 'Rutube',
             'formats': formats,
+            'subtitles': subtitles,
         })
         return info
 
@@ -236,7 +298,7 @@ class RutubePlaylistBaseIE(RutubeBaseIE):
             page = self._download_json(
                 next_page_url or self._next_page_url(
                     pagenum, playlist_id, *args, **kwargs),
-                playlist_id, 'Downloading page %s' % pagenum)
+                playlist_id, f'Downloading page {pagenum}')
 
             results = page.get('results')
             if not results or not isinstance(results, list):
@@ -272,14 +334,14 @@ class RutubeTagsIE(RutubePlaylistBaseIE):
     IE_DESC = 'Rutube tags'
     _VALID_URL = r'https?://rutube\.ru/tags/video/(?P<id>\d+)'
     _TESTS = [{
-        'url': 'http://rutube.ru/tags/video/1800/',
+        'url': 'https://rutube.ru/tags/video/1800/',
         'info_dict': {
             'id': '1800',
         },
         'playlist_mincount': 68,
     }]
 
-    _PAGE_TEMPLATE = 'http://rutube.ru/api/tags/video/%s/?page=%s&format=json'
+    _PAGE_TEMPLATE = 'https://rutube.ru/api/tags/video/%s/?page=%s&format=json'
 
 
 class RutubeMovieIE(RutubePlaylistBaseIE):
@@ -287,8 +349,8 @@ class RutubeMovieIE(RutubePlaylistBaseIE):
     IE_DESC = 'Rutube movies'
     _VALID_URL = r'https?://rutube\.ru/metainfo/tv/(?P<id>\d+)'
 
-    _MOVIE_TEMPLATE = 'http://rutube.ru/api/metainfo/tv/%s/?format=json'
-    _PAGE_TEMPLATE = 'http://rutube.ru/api/metainfo/tv/%s/video?page=%s&format=json'
+    _MOVIE_TEMPLATE = 'https://rutube.ru/api/metainfo/tv/%s/?format=json'
+    _PAGE_TEMPLATE = 'https://rutube.ru/api/metainfo/tv/%s/video?page=%s&format=json'
 
     def _real_extract(self, url):
         movie_id = self._match_id(url)
@@ -304,62 +366,82 @@ class RutubePersonIE(RutubePlaylistBaseIE):
     IE_DESC = 'Rutube person videos'
     _VALID_URL = r'https?://rutube\.ru/video/person/(?P<id>\d+)'
     _TESTS = [{
-        'url': 'http://rutube.ru/video/person/313878/',
+        'url': 'https://rutube.ru/video/person/313878/',
         'info_dict': {
             'id': '313878',
         },
-        'playlist_mincount': 37,
+        'playlist_mincount': 36,
     }]
 
-    _PAGE_TEMPLATE = 'http://rutube.ru/api/video/person/%s/?page=%s&format=json'
+    _PAGE_TEMPLATE = 'https://rutube.ru/api/video/person/%s/?page=%s&format=json'
 
 
 class RutubePlaylistIE(RutubePlaylistBaseIE):
     IE_NAME = 'rutube:playlist'
     IE_DESC = 'Rutube playlists'
-    _VALID_URL = r'https?://rutube\.ru/(?:video|(?:play/)?embed)/[\da-z]{32}/\?.*?\bpl_id=(?P<id>\d+)'
+    _VALID_URL = r'https?://rutube\.ru/plst/(?P<id>\d+)'
     _TESTS = [{
-        'url': 'https://rutube.ru/video/cecd58ed7d531fc0f3d795d51cee9026/?pl_id=3097&pl_type=tag',
+        'url': 'https://rutube.ru/plst/308547/',
         'info_dict': {
-            'id': '3097',
+            'id': '308547',
         },
-        'playlist_count': 27,
-    }, {
-        'url': 'https://rutube.ru/video/10b3a03fc01d5bbcc632a2f3514e8aab/?pl_id=4252&pl_type=source',
-        'only_matching': True,
+        'playlist_mincount': 22,
     }]
-
-    _PAGE_TEMPLATE = 'http://rutube.ru/api/playlist/%s/%s/?page=%s&format=json'
-
-    @classmethod
-    def suitable(cls, url):
-        from ..utils import int_or_none, parse_qs
-
-        if not super(RutubePlaylistIE, cls).suitable(url):
-            return False
-        params = parse_qs(url)
-        return params.get('pl_type', [None])[0] and int_or_none(params.get('pl_id', [None])[0])
-
-    def _next_page_url(self, page_num, playlist_id, item_kind):
-        return self._PAGE_TEMPLATE % (item_kind, playlist_id, page_num)
-
-    def _real_extract(self, url):
-        qs = parse_qs(url)
-        playlist_kind = qs['pl_type'][0]
-        playlist_id = qs['pl_id'][0]
-        return self._extract_playlist(playlist_id, item_kind=playlist_kind)
+    _PAGE_TEMPLATE = 'https://rutube.ru/api/playlist/custom/%s/videos?page=%s&format=json'
 
 
 class RutubeChannelIE(RutubePlaylistBaseIE):
     IE_NAME = 'rutube:channel'
     IE_DESC = 'Rutube channel'
-    _VALID_URL = r'https?://rutube\.ru/channel/(?P<id>\d+)/videos'
+    _VALID_URL = r'https?://rutube\.ru/(?:channel/(?P<id>\d+)|u/(?P<slug>\w+))(?:/(?P<section>videos|shorts|playlists))?'
     _TESTS = [{
         'url': 'https://rutube.ru/channel/639184/videos/',
         'info_dict': {
-            'id': '639184',
+            'id': '639184_videos',
         },
-        'playlist_mincount': 133,
+        'playlist_mincount': 129,
+    }, {
+        'url': 'https://rutube.ru/channel/25902603/shorts/',
+        'info_dict': {
+            'id': '25902603_shorts',
+        },
+        'playlist_mincount': 277,
+    }, {
+        'url': 'https://rutube.ru/channel/25902603/',
+        'info_dict': {
+            'id': '25902603',
+        },
+        'playlist_mincount': 406,
+    }, {
+        'url': 'https://rutube.ru/u/rutube/videos/',
+        'info_dict': {
+            'id': '23704195_videos',
+        },
+        'playlist_mincount': 113,
     }]
 
-    _PAGE_TEMPLATE = 'http://rutube.ru/api/video/person/%s/?page=%s&format=json'
+    _PAGE_TEMPLATE = 'https://rutube.ru/api/video/person/%s/?page=%s&format=json&origin__type=%s'
+
+    def _next_page_url(self, page_num, playlist_id, section):
+        origin_type = {
+            'videos': 'rtb,rst,ifrm,rspa',
+            'shorts': 'rshorts',
+            None: '',
+        }.get(section)
+        return self._PAGE_TEMPLATE % (playlist_id, page_num, origin_type)
+
+    def _real_extract(self, url):
+        playlist_id, slug, section = self._match_valid_url(url).group('id', 'slug', 'section')
+        if section == 'playlists':
+            raise UnsupportedError(url)
+        if slug:
+            webpage = self._download_webpage(url, slug)
+            redux_state = self._search_json(
+                r'window\.reduxState\s*=', webpage, 'redux state', slug, transform_source=js_to_json)
+            playlist_id = traverse_obj(redux_state, (
+                'api', 'queries', lambda k, _: k.startswith('channelIdBySlug'),
+                'data', 'channel_id', {int}, {str_or_none}, any))
+        playlist = self._extract_playlist(playlist_id, section=section)
+        if section:
+            playlist['id'] = f'{playlist_id}_{section}'
+        return playlist
diff --git a/plugins/youtube_download/yt_dlp/extractor/rutv.py b/plugins/youtube_download/yt_dlp/extractor/rutv.py
index d7f9a73..9bd26ad 100644
--- a/plugins/youtube_download/yt_dlp/extractor/rutv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/rutv.py
@@ -1,11 +1,7 @@
 import re
 
 from .common import InfoExtractor
-from ..utils import (
-    ExtractorError,
-    int_or_none,
-    str_to_int
-)
+from ..utils import ExtractorError, int_or_none, str_to_int
 
 
 class RUTVIE(InfoExtractor):
@@ -128,18 +124,18 @@ class RUTVIE(InfoExtractor):
         is_live = video_type == 'live'
 
         json_data = self._download_json(
-            'http://player.vgtrk.com/iframe/data%s/id/%s' % ('live' if is_live else 'video', video_id),
+            'http://player.vgtrk.com/iframe/data{}/id/{}'.format('live' if is_live else 'video', video_id),
             video_id, 'Downloading JSON')
 
         if json_data['errors']:
-            raise ExtractorError('%s said: %s' % (self.IE_NAME, json_data['errors']), expected=True)
+            raise ExtractorError('{} said: {}'.format(self.IE_NAME, json_data['errors']), expected=True)
 
         playlist = json_data['data']['playlist']
         medialist = playlist['medialist']
         media = medialist[0]
 
         if media['errors']:
-            raise ExtractorError('%s said: %s' % (self.IE_NAME, media['errors']), expected=True)
+            raise ExtractorError('{} said: {}'.format(self.IE_NAME, media['errors']), expected=True)
 
         view_count = int_or_none(playlist.get('count_views'))
         priority_transport = playlist['priority_transport']
@@ -179,12 +175,12 @@ class RUTVIE(InfoExtractor):
                     continue
                 else:
                     fmt = {
-                        'url': url
+                        'url': url,
                     }
                 fmt.update({
                     'width': int_or_none(quality, default=height, invscale=width, scale=height),
                     'height': int_or_none(quality, default=height),
-                    'format_id': '%s-%s' % (transport, quality),
+                    'format_id': f'{transport}-{quality}',
                     'source_preference': preference,
                 })
                 formats.append(fmt)
diff --git a/plugins/youtube_download/yt_dlp/extractor/ruutu.py b/plugins/youtube_download/yt_dlp/extractor/ruutu.py
index 33f6652..2dddb39 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ruutu.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ruutu.py
@@ -1,11 +1,11 @@
 import json
 import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import compat_urllib_parse_urlparse
 from ..utils import (
-    determine_ext,
     ExtractorError,
+    determine_ext,
     find_xpath_attr,
     int_or_none,
     traverse_obj,
@@ -164,7 +164,7 @@ class RuutuIE(InfoExtractor):
         video_id = self._match_id(url)
 
         video_xml = self._download_xml(
-            '%s/media-xml-cache' % self._API_BASE, video_id,
+            f'{self._API_BASE}/media-xml-cache', video_id,
             query={'id': video_id})
 
         formats = []
@@ -182,8 +182,8 @@ class RuutuIE(InfoExtractor):
                     processed_urls.append(video_url)
                     ext = determine_ext(video_url)
                     auth_video_url = url_or_none(self._download_webpage(
-                        '%s/auth/access/v2' % self._API_BASE, video_id,
-                        note='Downloading authenticated %s stream URL' % ext,
+                        f'{self._API_BASE}/auth/access/v2', video_id,
+                        note=f'Downloading authenticated {ext} stream URL',
                         fatal=False, query={'stream': video_url}))
                     if auth_video_url:
                         processed_urls.append(auth_video_url)
@@ -209,16 +209,16 @@ class RuutuIE(InfoExtractor):
                             'vcodec': 'none',
                         })
                     else:
-                        proto = compat_urllib_parse_urlparse(video_url).scheme
+                        proto = urllib.parse.urlparse(video_url).scheme
                         if not child.tag.startswith('HTTP') and proto != 'rtmp':
                             continue
                         preference = -1 if proto == 'rtmp' else 1
                         label = child.get('label')
                         tbr = int_or_none(child.get('bitrate'))
-                        format_id = '%s-%s' % (proto, label if label else tbr) if label or tbr else proto
+                        format_id = f'{proto}-{label if label else tbr}' if label or tbr else proto
                         if not self._is_valid_url(video_url, video_id, format_id):
                             continue
-                        width, height = [int_or_none(x) for x in child.get('resolution', 'x').split('x')[:2]]
+                        width, height = (int_or_none(x) for x in child.get('resolution', 'x').split('x')[:2])
                         formats.append({
                             'format_id': format_id,
                             'url': video_url,
@@ -242,7 +242,7 @@ class RuutuIE(InfoExtractor):
                 self.report_drm(video_id)
             ns_st_cds = pv('ns_st_cds')
             if ns_st_cds != 'free':
-                raise ExtractorError('This video is %s.' % ns_st_cds, expected=True)
+                raise ExtractorError(f'This video is {ns_st_cds}.', expected=True)
 
         themes = pv('themes')
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/ruv.py b/plugins/youtube_download/yt_dlp/extractor/ruv.py
index 12499d6..5e55a40 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ruv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ruv.py
@@ -131,10 +131,10 @@ class RuvSpilaIE(InfoExtractor):
         },
     }, {
         'url': 'https://www.ruv.is/ungruv/spila/ungruv/28046/8beuph',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.ruv.is/krakkaruv/spila/krakkafrettir/30712/9jbgb0',
-        'only_matching': True
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
@@ -153,7 +153,7 @@ class RuvSpilaIE(InfoExtractor):
                         }
                     }
                 }
-            }''' % (series_id, display_id)})['data']['Program']
+            }''' % (series_id, display_id)})['data']['Program']  # noqa: UP031
         episode = program['episodes'][0]
 
         subs = {}
@@ -182,5 +182,5 @@ class RuvSpilaIE(InfoExtractor):
             'timestamp': unified_timestamp(episode.get('firstrun')),
             'formats': formats,
             'age_limit': episode.get('rating'),
-            'chapters': clips
+            'chapters': clips,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/s4c.py b/plugins/youtube_download/yt_dlp/extractor/s4c.py
index 38a9058..6eb8b2b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/s4c.py
+++ b/plugins/youtube_download/yt_dlp/extractor/s4c.py
@@ -1,5 +1,5 @@
 from .common import InfoExtractor
-from ..utils import traverse_obj
+from ..utils import traverse_obj, url_or_none
 
 
 class S4CIE(InfoExtractor):
@@ -11,7 +11,8 @@ class S4CIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'Y Swn',
             'description': 'md5:f7681a30e4955b250b3224aa9fe70cf0',
-            'duration': 5340
+            'duration': 5340,
+            'thumbnail': 'https://www.s4c.cymru/amg/1920x1080/Y_Swn_2023S4C_099_ii.jpg',
         },
     }, {
         'url': 'https://www.s4c.cymru/clic/programme/856636948',
@@ -21,6 +22,7 @@ class S4CIE(InfoExtractor):
             'title': 'Am Dro',
             'duration': 2880,
             'description': 'md5:100d8686fc9a632a0cb2db52a3433ffe',
+            'thumbnail': 'https://www.s4c.cymru/amg/1920x1080/Am_Dro_2022-23S4C_P6_4005.jpg',
         },
     }]
 
@@ -30,7 +32,7 @@ class S4CIE(InfoExtractor):
             f'https://www.s4c.cymru/df/full_prog_details?lang=e&programme_id={video_id}',
             video_id, fatal=False)
 
-        filename = self._download_json(
+        player_config = self._download_json(
             'https://player-api.s4c-cdn.co.uk/player-configuration/prod', video_id, query={
                 'programme_id': video_id,
                 'signed': '0',
@@ -38,7 +40,13 @@ class S4CIE(InfoExtractor):
                 'mode': 'od',
                 'appId': 'clic',
                 'streamName': '',
-            }, note='Downloading player config JSON')['filename']
+            }, note='Downloading player config JSON')
+        subtitles = {}
+        for sub in traverse_obj(player_config, ('subtitles', lambda _, v: url_or_none(v['0']))):
+            subtitles.setdefault(sub.get('3', 'en'), []).append({
+                'url': sub['0'],
+                'name': sub.get('1'),
+            })
         m3u8_url = self._download_json(
             'https://player-api.s4c-cdn.co.uk/streaming-urls/prod', video_id, query={
                 'mode': 'od',
@@ -46,17 +54,50 @@ class S4CIE(InfoExtractor):
                 'region': 'WW',
                 'extra': 'false',
                 'thirdParty': 'false',
-                'filename': filename,
+                'filename': player_config['filename'],
             }, note='Downloading streaming urls JSON')['hls']
-        formats, subtitles = self._extract_m3u8_formats_and_subtitles(m3u8_url, video_id, 'mp4', m3u8_id='hls')
 
         return {
             'id': video_id,
-            'formats': formats,
+            'formats': self._extract_m3u8_formats(m3u8_url, video_id, 'mp4', m3u8_id='hls'),
             'subtitles': subtitles,
+            'thumbnail': url_or_none(player_config.get('poster')),
             **traverse_obj(details, ('full_prog_details', 0, {
                 'title': (('programme_title', 'series_title'), {str}),
                 'description': ('full_billing', {str.strip}),
                 'duration': ('duration', {lambda x: int(x) * 60}),
             }), get_all=False),
         }
+
+
+class S4CSeriesIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?s4c\.cymru/clic/series/(?P<id>\d+)'
+    _TESTS = [{
+        'url': 'https://www.s4c.cymru/clic/series/864982911',
+        'playlist_mincount': 6,
+        'info_dict': {
+            'id': '864982911',
+            'title': 'Iaith ar Daith',
+        },
+    }, {
+        'url': 'https://www.s4c.cymru/clic/series/866852587',
+        'playlist_mincount': 8,
+        'info_dict': {
+            'id': '866852587',
+            'title': 'FFIT Cymru',
+        },
+    }]
+
+    def _real_extract(self, url):
+        series_id = self._match_id(url)
+        series_details = self._download_json(
+            'https://www.s4c.cymru/df/series_details', series_id, query={
+                'lang': 'e',
+                'series_id': series_id,
+                'show_prog_in_series': 'Y',
+            }, note='Downloading series details JSON')
+
+        return self.playlist_result(
+            [self.url_result(f'https://www.s4c.cymru/clic/programme/{episode_id}', S4CIE, episode_id)
+             for episode_id in traverse_obj(series_details, ('other_progs_in_series', ..., 'id'))],
+            series_id, traverse_obj(series_details, ('full_prog_details', 0, 'series_title', {str})))
diff --git a/plugins/youtube_download/yt_dlp/extractor/safari.py b/plugins/youtube_download/yt_dlp/extractor/safari.py
index 8d322d7..86f34df 100644
--- a/plugins/youtube_download/yt_dlp/extractor/safari.py
+++ b/plugins/youtube_download/yt_dlp/extractor/safari.py
@@ -1,12 +1,8 @@
 import json
 import re
+import urllib.parse
 
 from .common import InfoExtractor
-
-from ..compat import (
-    compat_parse_qs,
-    compat_urlparse,
-)
 from ..utils import (
     ExtractorError,
     update_url_query,
@@ -35,9 +31,9 @@ class SafariBaseIE(InfoExtractor):
             return
 
         redirect_url = urlh.url
-        parsed_url = compat_urlparse.urlparse(redirect_url)
-        qs = compat_parse_qs(parsed_url.query)
-        next_uri = compat_urlparse.urljoin(
+        parsed_url = urllib.parse.urlparse(redirect_url)
+        qs = urllib.parse.parse_qs(parsed_url.query)
+        next_uri = urllib.parse.urljoin(
             'https://api.oreilly.com', qs['next'][0])
 
         auth, urlh = self._download_json_handle(
@@ -55,7 +51,7 @@ class SafariBaseIE(InfoExtractor):
         if (not auth.get('logged_in') and not auth.get('redirect_uri')
                 and credentials):
             raise ExtractorError(
-                'Unable to login: %s' % credentials, expected=True)
+                f'Unable to login: {credentials}', expected=True)
 
         # oreilly serves two same instances of the following cookies
         # in Set-Cookie header and expects first one to be actually set
@@ -63,7 +59,7 @@ class SafariBaseIE(InfoExtractor):
             self._apply_first_set_cookie_header(urlh, cookie)
 
         _, urlh = self._download_webpage_handle(
-            auth.get('redirect_uri') or next_uri, None, 'Completing login',)
+            auth.get('redirect_uri') or next_uri, None, 'Completing login')
 
         if is_logged(urlh):
             self.LOGGED_IN = True
@@ -125,7 +121,7 @@ class SafariIE(SafariBaseIE):
             partner_id = self._PARTNER_ID
             ui_id = self._UICONF_ID
         else:
-            video_id = '%s-%s' % (mobj.group('course_id'), mobj.group('part'))
+            video_id = '{}-{}'.format(mobj.group('course_id'), mobj.group('part'))
 
             webpage, urlh = self._download_webpage_handle(url, video_id)
 
@@ -145,14 +141,14 @@ class SafariIE(SafariBaseIE):
                 group='id')
 
         query = {
-            'wid': '_%s' % partner_id,
+            'wid': f'_{partner_id}',
             'uiconf_id': ui_id,
             'flashvars[referenceId]': reference_id,
         }
 
         if self.LOGGED_IN:
             kaltura_session = self._download_json(
-                '%s/player/kaltura_session/?reference_id=%s' % (self._API_BASE, reference_id),
+                f'{self._API_BASE}/player/kaltura_session/?reference_id={reference_id}',
                 video_id, 'Downloading kaltura session JSON',
                 'Unable to download kaltura session JSON', fatal=False,
                 headers={'Accept': 'application/json'})
@@ -181,7 +177,7 @@ class SafariApiIE(SafariBaseIE):
     def _real_extract(self, url):
         mobj = self._match_valid_url(url)
         part = self._download_json(
-            url, '%s/%s' % (mobj.group('course_id'), mobj.group('part')),
+            url, '{}/{}'.format(mobj.group('course_id'), mobj.group('part')),
             'Downloading part JSON')
         web_url = part['web_url']
         if 'library/view' in web_url:
@@ -237,18 +233,18 @@ class SafariCourseIE(SafariBaseIE):
     @classmethod
     def suitable(cls, url):
         return (False if SafariIE.suitable(url) or SafariApiIE.suitable(url)
-                else super(SafariCourseIE, cls).suitable(url))
+                else super().suitable(url))
 
     def _real_extract(self, url):
         course_id = self._match_id(url)
 
         course_json = self._download_json(
-            '%s/book/%s/?override_format=%s' % (self._API_BASE, course_id, self._API_FORMAT),
+            f'{self._API_BASE}/book/{course_id}/?override_format={self._API_FORMAT}',
             course_id, 'Downloading course JSON')
 
         if 'chapters' not in course_json:
             raise ExtractorError(
-                'No chapters found for course %s' % course_id, expected=True)
+                f'No chapters found for course {course_id}', expected=True)
 
         entries = [
             self.url_result(chapter, SafariApiIE.ie_key())
diff --git a/plugins/youtube_download/yt_dlp/extractor/saitosan.py b/plugins/youtube_download/yt_dlp/extractor/saitosan.py
index d2f60e9..4ed9195 100644
--- a/plugins/youtube_download/yt_dlp/extractor/saitosan.py
+++ b/plugins/youtube_download/yt_dlp/extractor/saitosan.py
@@ -3,6 +3,7 @@ from ..utils import ExtractorError, try_get
 
 
 class SaitosanIE(InfoExtractor):
+    _WORKING = False
     IE_NAME = 'Saitosan'
     _VALID_URL = r'https?://(?:www\.)?saitosan\.net/bview.html\?id=(?P<id>[0-9]+)'
     _TESTS = [{
@@ -46,15 +47,15 @@ class SaitosanIE(InfoExtractor):
         base += '&sid=' + sid
 
         self._download_webpage(base, b_id, note='Polling socket')
-        payload = '420["room_start_join",{"room_id":"%s"}]' % b_id
-        payload = '%s:%s' % (len(payload), payload)
+        payload = f'420["room_start_join",{{"room_id":"{b_id}"}}]'
+        payload = f'{len(payload)}:{payload}'
 
         self._download_webpage(base, b_id, data=payload, note='Polling socket with payload')
         response = self._download_socket_json(base, b_id, note='Polling socket')
         if not response.get('ok'):
             err = response.get('error') or {}
             raise ExtractorError(
-                '%s said: %s - %s' % (self.IE_NAME, err.get('code', '?'), err.get('msg', 'Unknown')) if err
+                '{} said: {} - {}'.format(self.IE_NAME, err.get('code', '?'), err.get('msg', 'Unknown')) if err
                 else 'The socket reported that the broadcast could not be joined. Maybe it\'s offline or the URL is incorrect',
                 expected=True, video_id=b_id)
 
@@ -70,5 +71,5 @@ class SaitosanIE(InfoExtractor):
             'formats': self._extract_m3u8_formats(m3u8_url, b_id, 'mp4', live=True),
             'thumbnail': m3u8_url.replace('av.m3u8', 'thumb'),
             'uploader': try_get(b_data, lambda x: x['broadcast_user']['name']),  # same as title
-            'is_live': True
+            'is_live': True,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/samplefocus.py b/plugins/youtube_download/yt_dlp/extractor/samplefocus.py
index e9f5c22..3db3ce1 100644
--- a/plugins/youtube_download/yt_dlp/extractor/samplefocus.py
+++ b/plugins/youtube_download/yt_dlp/extractor/samplefocus.py
@@ -28,15 +28,15 @@ class SampleFocusIE(InfoExtractor):
         },
     }, {
         'url': 'https://samplefocus.com/samples/dababy-style-bass-808',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://samplefocus.com/samples/young-chop-kick',
-        'only_matching': True
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
         display_id = self._match_id(url)
-        webpage = self._download_webpage(url, display_id)
+        webpage = self._download_webpage(url, display_id, impersonate=True)
 
         sample_id = self._search_regex(
             r'<input[^>]+id=(["\'])sample_id\1[^>]+value=(?:["\'])(?P<id>\d+)',
@@ -76,13 +76,21 @@ class SampleFocusIE(InfoExtractor):
 
         def extract_count(klass):
             return int_or_none(self._html_search_regex(
-                r'<span[^>]+class=(?:["\'])?%s-count[^>]*>(\d+)' % klass,
+                rf'<span[^>]+class=(?:["\'])?{klass}-count[^>]*>(\d+)',
                 webpage, klass, fatal=False))
 
         return {
             'id': sample_id,
             'title': title,
-            'url': mp3_url,
+            'formats': [{
+                'url': mp3_url,
+                'ext': 'mp3',
+                'vcodec': 'none',
+                'acodec': 'mp3',
+                'http_headers': {
+                    'Referer': url,
+                },
+            }],
             'display_id': display_id,
             'thumbnail': thumbnail,
             'uploader': uploader,
@@ -90,7 +98,7 @@ class SampleFocusIE(InfoExtractor):
                 r'<a[^>]+href=(["\'])/license\1[^>]*>(?P<license>[^<]+)<',
                 webpage, 'license', fatal=False, group='license'),
             'uploader_id': uploader_id,
-            'like_count': extract_count('sample-%s-favorites' % sample_id),
+            'like_count': extract_count(f'sample-{sample_id}-favorites'),
             'comment_count': extract_count('comments'),
             'comments': comments,
             'categories': categories,
diff --git a/plugins/youtube_download/yt_dlp/extractor/sapo.py b/plugins/youtube_download/yt_dlp/extractor/sapo.py
index beffaee..2b8c078 100644
--- a/plugins/youtube_download/yt_dlp/extractor/sapo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/sapo.py
@@ -64,7 +64,7 @@ class SapoIE(InfoExtractor):
         video_id = mobj.group('id')
 
         item = self._download_xml(
-            'http://rd3.videos.sapo.pt/%s/rss2' % video_id, video_id).find('./channel/item')
+            f'http://rd3.videos.sapo.pt/{video_id}/rss2', video_id).find('./channel/item')
 
         title = item.find('./title').text
         description = item.find('./{http://videos.sapo.pt/mrss/}synopse').text
diff --git a/plugins/youtube_download/yt_dlp/extractor/savefrom.py b/plugins/youtube_download/yt_dlp/extractor/savefrom.py
deleted file mode 100644
index 9c9e74b..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/savefrom.py
+++ /dev/null
@@ -1,30 +0,0 @@
-import os.path
-
-from .common import InfoExtractor
-
-
-class SaveFromIE(InfoExtractor):
-    IE_NAME = 'savefrom.net'
-    _VALID_URL = r'https?://[^.]+\.savefrom\.net/\#url=(?P<url>.*)$'
-
-    _TEST = {
-        'url': 'http://en.savefrom.net/#url=http://youtube.com/watch?v=UlVRAPW2WJY&utm_source=youtube.com&utm_medium=short_domains&utm_campaign=ssyoutube.com',
-        'info_dict': {
-            'id': 'UlVRAPW2WJY',
-            'ext': 'mp4',
-            'title': 'About Team Radical MMA | MMA Fighting',
-            'upload_date': '20120816',
-            'uploader': 'Howcast',
-            'uploader_id': 'Howcast',
-            'description': r're:(?s).* Hi, my name is Rene Dreifuss\. And I\'m here to show you some MMA.*',
-        },
-        'params': {
-            'skip_download': True
-        }
-    }
-
-    def _real_extract(self, url):
-        mobj = self._match_valid_url(url)
-        video_id = os.path.splitext(url.split('/')[-1])[0]
-
-        return self.url_result(mobj.group('url'), video_id=video_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/sbs.py b/plugins/youtube_download/yt_dlp/extractor/sbs.py
index 7a91150..7edb521 100644
--- a/plugins/youtube_download/yt_dlp/extractor/sbs.py
+++ b/plugins/youtube_download/yt_dlp/extractor/sbs.py
@@ -44,8 +44,6 @@ class SBSIE(InfoExtractor):
             'timestamp': 1408613220,
             'upload_date': '20140821',
             'uploader': 'SBSC',
-            'tags': None,
-            'categories': None,
         },
         'expected_warnings': ['Unable to download JSON metadata'],
     }, {
@@ -124,6 +122,15 @@ class SBSIE(InfoExtractor):
         if traverse_obj(media, ('partOfSeries', {dict})):
             media['epName'] = traverse_obj(media, ('title', {str}))
 
+        # Need to set different language for forced subs or else they have priority over full subs
+        fixed_subtitles = {}
+        for lang, subs in subtitles.items():
+            for sub in subs:
+                fixed_lang = lang
+                if sub['url'].lower().endswith('_fe.vtt'):
+                    fixed_lang += '-forced'
+                fixed_subtitles.setdefault(fixed_lang, []).append(sub)
+
         return {
             'id': video_id,
             **traverse_obj(media, {
@@ -153,6 +160,6 @@ class SBSIE(InfoExtractor):
                 }),
             }),
             'formats': formats,
-            'subtitles': subtitles,
+            'subtitles': fixed_subtitles,
             'uploader': 'SBSC',
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/sbscokr.py b/plugins/youtube_download/yt_dlp/extractor/sbscokr.py
new file mode 100644
index 0000000..93cf14f
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/sbscokr.py
@@ -0,0 +1,200 @@
+from .common import InfoExtractor
+from ..utils import (
+    clean_html,
+    int_or_none,
+    parse_iso8601,
+    parse_resolution,
+    url_or_none,
+)
+from ..utils.traversal import traverse_obj
+
+
+class SBSCoKrIE(InfoExtractor):
+    IE_NAME = 'sbs.co.kr'
+    _VALID_URL = [r'https?://allvod\.sbs\.co\.kr/allvod/vod(?:Package)?EndPage\.do\?(?:[^#]+&)?mdaId=(?P<id>\d+)',
+                  r'https?://programs\.sbs\.co\.kr/(?:enter|drama|culture|sports|plus|mtv|kth)/[a-z0-9]+/(?:vod|clip|movie)/\d+/(?P<id>(?:OC)?\d+)']
+
+    _TESTS = [{
+        'url': 'https://programs.sbs.co.kr/enter/dongsang2/clip/52007/OC467706746?div=main_pop_clip',
+        'md5': 'c3f6d45e1fb5682039d94cda23c36f19',
+        'info_dict': {
+            'id': 'OC467706746',
+            'ext': 'mp4',
+            'title': '‘아슬아슬’ 박군♥한영의 새 집 인테리어 대첩♨',
+            'description': 'md5:6a71eb1979ee4a94ea380310068ccab4',
+            'thumbnail': 'https://img2.sbs.co.kr/ops_clip_img/2023/10/10/34c4c0f9-a9a5-4ff6-a92e-9bb4b5f6fa65915w1280.jpg',
+            'release_timestamp': 1696889400,
+            'release_date': '20231009',
+            'view_count': int,
+            'like_count': int,
+            'duration': 238,
+            'age_limit': 15,
+            'series': '동상이몽2_너는 내 운명',
+            'episode': '레이디제인, ‘혼전임신설’ ‘3개월’ 앞당긴 결혼식 비하인드 스토리 최초 공개!',
+            'episode_number': 311,
+        },
+    }, {
+        'url': 'https://allvod.sbs.co.kr/allvod/vodPackageEndPage.do?mdaId=22000489324&combiId=PA000000284&packageType=A&isFreeYN=',
+        'md5': 'bf46b2e89fda7ae7de01f5743cef7236',
+        'info_dict': {
+            'id': '22000489324',
+            'ext': 'mp4',
+            'title': '[다시보기] 트롤리 15회',
+            'description': 'md5:0e55d74bef1ac55c61ae90c73ac485f4',
+            'thumbnail': 'https://img2.sbs.co.kr/img/sbs_cms/WE/2023/02/14/arC1676333794938-1280-720.jpg',
+            'release_timestamp': 1676325600,
+            'release_date': '20230213',
+            'view_count': int,
+            'like_count': int,
+            'duration': 5931,
+            'age_limit': 15,
+            'series': '트롤리',
+            'episode': '이거 다 거짓말이야',
+            'episode_number': 15,
+        },
+    }, {
+        'url': 'https://programs.sbs.co.kr/enter/fourman/vod/69625/22000508948',
+        'md5': '41e8ae4cc6c8424f4e4d76661a4becbf',
+        'info_dict': {
+            'id': '22000508948',
+            'ext': 'mp4',
+            'title': '[다시보기] 신발 벗고 돌싱포맨 104회',
+            'description': 'md5:c6a247383c4dd661e4b956bf4d3b586e',
+            'thumbnail': 'https://img2.sbs.co.kr/img/sbs_cms/WE/2023/08/30/2vb1693355446261-1280-720.jpg',
+            'release_timestamp': 1693342800,
+            'release_date': '20230829',
+            'view_count': int,
+            'like_count': int,
+            'duration': 7036,
+            'age_limit': 15,
+            'series': '신발 벗고 돌싱포맨',
+            'episode': '돌싱포맨 저격수들 등장!',
+            'episode_number': 104,
+        },
+    }]
+
+    def _call_api(self, video_id, rscuse=''):
+        return self._download_json(
+            f'https://api.play.sbs.co.kr/1.0/sbs_vodall/{video_id}', video_id,
+            note=f'Downloading m3u8 information {rscuse}',
+            query={
+                'platform': 'pcweb',
+                'protocol': 'download',
+                'absolute_show': 'Y',
+                'service': 'program',
+                'ssl': 'Y',
+                'rscuse': rscuse,
+            })
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+
+        details = self._call_api(video_id)
+        source = traverse_obj(details, ('vod', 'source', 'mediasource', {dict})) or {}
+
+        formats = []
+        for stream in traverse_obj(details, (
+            'vod', 'source', 'mediasourcelist', lambda _, v: v['mediaurl'] or v['mediarscuse'],
+        ), default=[source]):
+            if not stream.get('mediaurl'):
+                new_source = traverse_obj(
+                    self._call_api(video_id, rscuse=stream['mediarscuse']),
+                    ('vod', 'source', 'mediasource', {dict})) or {}
+                if new_source.get('mediarscuse') == source.get('mediarscuse') or not new_source.get('mediaurl'):
+                    continue
+                stream = new_source
+            formats.append({
+                'url': stream['mediaurl'],
+                'format_id': stream.get('mediarscuse'),
+                'format_note': stream.get('medianame'),
+                **parse_resolution(stream.get('quality')),
+                'preference': int_or_none(stream.get('mediarscuse')),
+            })
+
+        caption_url = traverse_obj(details, ('vod', 'source', 'subtitle', {url_or_none}))
+
+        return {
+            'id': video_id,
+            **traverse_obj(details, ('vod', {
+                'title': ('info', 'title'),
+                'duration': ('info', 'duration', {int_or_none}),
+                'view_count': ('info', 'viewcount', {int_or_none}),
+                'like_count': ('info', 'likecount', {int_or_none}),
+                'description': ('info', 'synopsis', {clean_html}),
+                'episode': ('info', 'content', ('contenttitle', 'title')),
+                'episode_number': ('info', 'content', 'number', {int_or_none}),
+                'series': ('info', 'program', 'programtitle'),
+                'age_limit': ('info', 'targetage', {int_or_none}),
+                'release_timestamp': ('info', 'broaddate', {parse_iso8601}),
+                'thumbnail': ('source', 'thumbnail', 'origin', {url_or_none}),
+            }), get_all=False),
+            'formats': formats,
+            'subtitles': {'ko': [{'url': caption_url}]} if caption_url else None,
+        }
+
+
+class SBSCoKrAllvodProgramIE(InfoExtractor):
+    IE_NAME = 'sbs.co.kr:allvod_program'
+    _VALID_URL = r'https?://allvod\.sbs\.co\.kr/allvod/vod(?:Free)?ProgramDetail\.do\?(?:[^#]+&)?pgmId=(?P<id>P?\d+)'
+
+    _TESTS = [{
+        'url': 'https://allvod.sbs.co.kr/allvod/vodFreeProgramDetail.do?type=legend&pgmId=22000010159&listOrder=vodCntAsc',
+        'info_dict': {
+            '_type': 'playlist',
+            'id': '22000010159',
+        },
+        'playlist_count': 18,
+    }, {
+        'url': 'https://allvod.sbs.co.kr/allvod/vodProgramDetail.do?pgmId=P460810577',
+        'info_dict': {
+            '_type': 'playlist',
+            'id': 'P460810577',
+        },
+        'playlist_count': 13,
+    }]
+
+    def _real_extract(self, url):
+        program_id = self._match_id(url)
+
+        details = self._download_json(
+            'https://allvod.sbs.co.kr/allvod/vodProgramDetail/vodProgramDetailAjax.do',
+            program_id, note='Downloading program details',
+            query={
+                'pgmId': program_id,
+                'currentCount': '10000',
+            })
+
+        return self.playlist_result(
+            [self.url_result(f'https://allvod.sbs.co.kr/allvod/vodEndPage.do?mdaId={video_id}', SBSCoKrIE)
+             for video_id in traverse_obj(details, ('list', ..., 'mdaId'))], program_id)
+
+
+class SBSCoKrProgramsVodIE(InfoExtractor):
+    IE_NAME = 'sbs.co.kr:programs_vod'
+    _VALID_URL = r'https?://programs\.sbs\.co\.kr/(?:enter|drama|culture|sports|plus|mtv)/(?P<id>[a-z0-9]+)/vods'
+
+    _TESTS = [{
+        'url': 'https://programs.sbs.co.kr/culture/morningwide/vods/65007',
+        'info_dict': {
+            '_type': 'playlist',
+            'id': '00000210215',
+        },
+        'playlist_mincount': 9782,
+    }, {
+        'url': 'https://programs.sbs.co.kr/enter/dongsang2/vods/52006',
+        'info_dict': {
+            '_type': 'playlist',
+            'id': '22000010476',
+        },
+        'playlist_mincount': 312,
+    }]
+
+    def _real_extract(self, url):
+        program_slug = self._match_id(url)
+
+        program_id = self._download_json(
+            f'https://static.apis.sbs.co.kr/program-api/1.0/menu/{program_slug}', program_slug,
+            note='Downloading program menu data')['program']['programid']
+
+        return self.url_result(
+            f'https://allvod.sbs.co.kr/allvod/vodProgramDetail.do?pgmId={program_id}', SBSCoKrAllvodProgramIE)
diff --git a/plugins/youtube_download/yt_dlp/extractor/screencast.py b/plugins/youtube_download/yt_dlp/extractor/screencast.py
index df5e79b..44b5891 100644
--- a/plugins/youtube_download/yt_dlp/extractor/screencast.py
+++ b/plugins/youtube_download/yt_dlp/extractor/screencast.py
@@ -1,7 +1,6 @@
-import urllib.request
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import compat_parse_qs
 from ..utils import ExtractorError
 
 
@@ -16,7 +15,7 @@ class ScreencastIE(InfoExtractor):
             'title': 'Color Measurement with Ocean Optics Spectrometers',
             'description': 'md5:240369cde69d8bed61349a199c5fb153',
             'thumbnail': r're:^https?://.*\.(?:gif|jpg)$',
-        }
+        },
     }, {
         'url': 'http://www.screencast.com/t/V2uXehPJa1ZI',
         'md5': 'e8e4b375a7660a9e7e35c33973410d34',
@@ -26,7 +25,7 @@ class ScreencastIE(InfoExtractor):
             'title': 'The Amadeus Spectrometer',
             'description': 're:^In this video, our friends at.*To learn more about Amadeus, visit',
             'thumbnail': r're:^https?://.*\.(?:gif|jpg)$',
-        }
+        },
     }, {
         'url': 'http://www.screencast.com/t/aAB3iowa',
         'md5': 'dedb2734ed00c9755761ccaee88527cd',
@@ -36,7 +35,7 @@ class ScreencastIE(InfoExtractor):
             'title': 'Google Earth Export',
             'description': 'Provides a demo of a CommunityViz export to Google Earth, one of the 3D viewing options.',
             'thumbnail': r're:^https?://.*\.(?:gif|jpg)$',
-        }
+        },
     }, {
         'url': 'http://www.screencast.com/t/X3ddTrYh',
         'md5': '669ee55ff9c51988b4ebc0877cc8b159',
@@ -46,7 +45,7 @@ class ScreencastIE(InfoExtractor):
             'title': 'Toolkit 6 User Group Webinar (2014-03-04) - Default Judgment and First Impression',
             'description': 'md5:7b9f393bc92af02326a5c5889639eab0',
             'thumbnail': r're:^https?://.*\.(?:gif|jpg)$',
-        }
+        },
     }, {
         'url': 'http://screencast.com/t/aAB3iowa',
         'only_matching': True,
@@ -71,8 +70,8 @@ class ScreencastIE(InfoExtractor):
                 if flash_vars_s:
                     flash_vars_s = flash_vars_s.replace(',', '&')
             if flash_vars_s:
-                flash_vars = compat_parse_qs(flash_vars_s)
-                video_url_raw = urllib.request.quote(
+                flash_vars = urllib.parse.parse_qs(flash_vars_s)
+                video_url_raw = urllib.parse.quote(
                     flash_vars['content'][0])
                 video_url = video_url_raw.replace('http%3A', 'http:')
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/screencastify.py b/plugins/youtube_download/yt_dlp/extractor/screencastify.py
index 136b847..3c43043 100644
--- a/plugins/youtube_download/yt_dlp/extractor/screencastify.py
+++ b/plugins/youtube_download/yt_dlp/extractor/screencastify.py
@@ -5,7 +5,10 @@ from ..utils import traverse_obj, update_url_query
 
 
 class ScreencastifyIE(InfoExtractor):
-    _VALID_URL = r'https?://watch\.screencastify\.com/v/(?P<id>[^/?#]+)'
+    _VALID_URL = [
+        r'https?://watch\.screencastify\.com/v/(?P<id>[^/?#]+)',
+        r'https?://app\.screencastify\.com/v[23]/watch/(?P<id>[^/?#]+)',
+    ]
     _TESTS = [{
         'url': 'https://watch.screencastify.com/v/sYVkZip3quLKhHw4Ybk8',
         'info_dict': {
@@ -19,6 +22,21 @@ class ScreencastifyIE(InfoExtractor):
         'params': {
             'skip_download': 'm3u8',
         },
+    }, {
+        'url': 'https://app.screencastify.com/v3/watch/J5N7H11wofDN1jZUCr3t',
+        'info_dict': {
+            'id': 'J5N7H11wofDN1jZUCr3t',
+            'ext': 'mp4',
+            'uploader': 'Scott Piesen',
+            'description': '',
+            'title': 'Lesson Recording 1-17 Burrr...',
+        },
+        'params': {
+            'skip_download': 'm3u8',
+        },
+    }, {
+        'url': 'https://app.screencastify.com/v2/watch/BQ26VbUdfbQLhKzkktOk',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/screencastomatic.py b/plugins/youtube_download/yt_dlp/extractor/screencastomatic.py
index 28e25e9..3af9135 100644
--- a/plugins/youtube_download/yt_dlp/extractor/screencastomatic.py
+++ b/plugins/youtube_download/yt_dlp/extractor/screencastomatic.py
@@ -23,7 +23,7 @@ class ScreencastOMaticIE(InfoExtractor):
             'description': 'as the title says! also: some general info re 1) VCE philosophy and 2) distance learning.',
             'duration': 369,
             'upload_date': '20141216',
-        }
+        },
     }, {
         'url': 'http://screencast-o-matic.com/player/c2lD3BeOPl',
         'only_matching': True,
diff --git a/plugins/youtube_download/yt_dlp/extractor/screenrec.py b/plugins/youtube_download/yt_dlp/extractor/screenrec.py
new file mode 100644
index 0000000..64f8d24
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/screenrec.py
@@ -0,0 +1,33 @@
+from .common import InfoExtractor
+
+
+class ScreenRecIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?screenrec\.com/share/(?P<id>\w{10})'
+    _TESTS = [{
+        'url': 'https://screenrec.com/share/DasLtbknYo',
+        'info_dict': {
+            'id': 'DasLtbknYo',
+            'ext': 'mp4',
+            'title': '02.05.2024_03.01.25_REC',
+            'description': 'Recorded with ScreenRec',
+            'thumbnail': r're:^https?://.*\.gif$',
+        },
+        'params': {
+            'skip_download': True,
+        },
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+
+        m3u8_url = self._search_regex(
+            r'customUrl\s*:\s*(["\'])(?P<url>(?:(?!\1).)+)\1', webpage, 'm3u8 URL', group='url')
+
+        return {
+            'id': video_id,
+            'title': self._og_search_title(webpage, default=None) or self._html_extract_title(webpage),
+            'description': self._og_search_description(webpage),
+            'thumbnail': self._og_search_thumbnail(webpage),
+            'formats': self._extract_m3u8_formats(m3u8_url, video_id, ext='mp4'),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/scrippsnetworks.py b/plugins/youtube_download/yt_dlp/extractor/scrippsnetworks.py
index adfd7e5..d770368 100644
--- a/plugins/youtube_download/yt_dlp/extractor/scrippsnetworks.py
+++ b/plugins/youtube_download/yt_dlp/extractor/scrippsnetworks.py
@@ -1,8 +1,8 @@
-import json
 import hashlib
+import json
 
-from .aws import AWSIE
 from .anvato import AnvatoIE
+from .aws import AWSIE
 from .common import InfoExtractor
 from ..utils import (
     smuggle_url,
@@ -39,6 +39,7 @@ class ScrippsNetworksWatchIE(AWSIE):
             'skip_download': True,
         },
         'add_ie': [AnvatoIE.ie_key()],
+        'skip': '404 Not Found',
     }]
 
     _SNI_TABLE = {
@@ -55,10 +56,10 @@ class ScrippsNetworksWatchIE(AWSIE):
         site_id, video_id = mobj.group('site', 'id')
 
         aws_identity_id_json = json.dumps({
-            'IdentityId': '%s:7655847c-0ae7-4d9b-80d6-56c062927eb3' % self._AWS_REGION
-        }).encode('utf-8')
+            'IdentityId': f'{self._AWS_REGION}:7655847c-0ae7-4d9b-80d6-56c062927eb3',
+        }).encode()
         token = self._download_json(
-            'https://cognito-identity.%s.amazonaws.com/' % self._AWS_REGION, video_id,
+            f'https://cognito-identity.{self._AWS_REGION}.amazonaws.com/', video_id,
             data=aws_identity_id_json,
             headers={
                 'Accept': '*/*',
@@ -84,11 +85,11 @@ class ScrippsNetworksWatchIE(AWSIE):
 
         def get(key):
             return xpath_text(
-                sts, './/{https://sts.amazonaws.com/doc/2011-06-15/}%s' % key,
+                sts, f'.//{{https://sts.amazonaws.com/doc/2011-06-15/}}{key}',
                 fatal=True)
 
         mcp_id = self._aws_execute_api({
-            'uri': '/1/web/brands/%s/episodes/scrid/%s' % (self._SNI_TABLE[site_id], video_id),
+            'uri': f'/1/web/brands/{self._SNI_TABLE[site_id]}/episodes/scrid/{video_id}',
             'access_key': get('AccessKeyId'),
             'secret_key': get('SecretAccessKey'),
             'session_token': get('SessionToken'),
@@ -96,7 +97,7 @@ class ScrippsNetworksWatchIE(AWSIE):
 
         return self.url_result(
             smuggle_url(
-                'anvato:anvato_scripps_app_web_prod_0837996dbe373629133857ae9eb72e740424d80a:%s' % mcp_id,
+                f'anvato:anvato_scripps_app_web_prod_0837996dbe373629133857ae9eb72e740424d80a:{mcp_id}',
                 {'geo_countries': ['US']}),
             AnvatoIE.ie_key(), video_id=mcp_id)
 
@@ -113,6 +114,11 @@ class ScrippsNetworksIE(InfoExtractor):
             'timestamp': 1475678834,
             'upload_date': '20161005',
             'uploader': 'SCNI-SCND',
+            'tags': 'count:10',
+            'creator': 'Cooking Channel',
+            'duration': 29.995,
+            'chapters': [{'start_time': 0.0, 'end_time': 29.995, 'title': '<Untitled Chapter 1>'}],
+            'thumbnail': 'https://images.dds.discovery.com/up/tp/Scripps_-_Food_Category_Prod/122/987/0260338_630x355.jpg',
         },
         'add_ie': ['ThePlatform'],
         'expected_warnings': ['No HLS formats found'],
diff --git a/plugins/youtube_download/yt_dlp/extractor/scrolller.py b/plugins/youtube_download/yt_dlp/extractor/scrolller.py
index 4f9fa14..a50822e 100644
--- a/plugins/youtube_download/yt_dlp/extractor/scrolller.py
+++ b/plugins/youtube_download/yt_dlp/extractor/scrolller.py
@@ -14,7 +14,7 @@ class ScrolllerIE(InfoExtractor):
             'thumbnail': 'https://zepto.scrolller.com/a-helping-hand-3ty9q8x094-540x960.jpg',
             'title': 'A helping hand',
             'age_limit': 0,
-        }
+        },
     }, {
         'url': 'https://scrolller.com/tigers-chasing-a-drone-c5d1f2so6j',
         'info_dict': {
@@ -23,7 +23,7 @@ class ScrolllerIE(InfoExtractor):
             'thumbnail': 'https://zepto.scrolller.com/tigers-chasing-a-drone-az9pkpguwe-540x303.jpg',
             'title': 'Tigers chasing a drone',
             'age_limit': 0,
-        }
+        },
     }, {
         'url': 'https://scrolller.com/baby-rhino-smells-something-9chhugsv9p',
         'info_dict': {
@@ -32,7 +32,7 @@ class ScrolllerIE(InfoExtractor):
             'thumbnail': 'https://atto.scrolller.com/hmm-whats-that-smell-bh54mf2c52-300x224.jpg',
             'title': 'Baby rhino smells something',
             'age_limit': 0,
-        }
+        },
     }, {
         'url': 'https://scrolller.com/its-all-fun-and-games-cco8jjmoh7',
         'info_dict': {
@@ -41,7 +41,7 @@ class ScrolllerIE(InfoExtractor):
             'thumbnail': 'https://atto.scrolller.com/its-all-fun-and-games-3amk9vg7m3-540x649.jpg',
             'title': 'It\'s all fun and games...',
             'age_limit': 0,
-        }
+        },
     }, {
         'url': 'https://scrolller.com/may-the-force-be-with-you-octokuro-yeytg1fs7a',
         'info_dict': {
@@ -50,7 +50,7 @@ class ScrolllerIE(InfoExtractor):
             'thumbnail': 'https://thumbs2.redgifs.com/DarkStarchyNautilus-poster.jpg',
             'title': 'May the force be with you (Octokuro)',
             'age_limit': 18,
-        }
+        },
     }]
 
     def _real_extract(self, url):
@@ -68,7 +68,7 @@ class ScrolllerIE(InfoExtractor):
                         height
                     }
                 }
-            }''' % video_id
+            }''' % video_id,  # noqa: UP031
         }
 
         video_data = self._download_json(
@@ -98,5 +98,5 @@ class ScrolllerIE(InfoExtractor):
             'title': video_data.get('title'),
             'thumbnails': thumbnails,
             'formats': formats,
-            'age_limit': 18 if video_data.get('isNsfw') else 0
+            'age_limit': 18 if video_data.get('isNsfw') else 0,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/scte.py b/plugins/youtube_download/yt_dlp/extractor/scte.py
index d839ffc..3971132 100644
--- a/plugins/youtube_download/yt_dlp/extractor/scte.py
+++ b/plugins/youtube_download/yt_dlp/extractor/scte.py
@@ -2,8 +2,8 @@ import re
 
 from .common import InfoExtractor
 from ..utils import (
-    decode_packed_codes,
     ExtractorError,
+    decode_packed_codes,
     urlencode_postdata,
 )
 
@@ -41,11 +41,12 @@ class SCTEBaseIE(InfoExtractor):
                 r'(?s)<[^>]+class=["\']AsiError["\'][^>]*>(.+?)</',
                 response, 'error message', default=None)
             if error:
-                raise ExtractorError('Unable to login: %s' % error, expected=True)
+                raise ExtractorError(f'Unable to login: {error}', expected=True)
             raise ExtractorError('Unable to log in')
 
 
 class SCTEIE(SCTEBaseIE):
+    _WORKING = False
     _VALID_URL = r'https?://learning\.scte\.org/mod/scorm/view\.php?.*?\bid=(?P<id>\d+)'
     _TESTS = [{
         'url': 'https://learning.scte.org/mod/scorm/view.php?id=31484',
@@ -65,9 +66,9 @@ class SCTEIE(SCTEBaseIE):
         title = self._search_regex(r'<h1>(.+?)</h1>', webpage, 'title')
 
         context_id = self._search_regex(r'context-(\d+)', webpage, video_id)
-        content_base = 'https://learning.scte.org/pluginfile.php/%s/mod_scorm/content/8/' % context_id
+        content_base = f'https://learning.scte.org/pluginfile.php/{context_id}/mod_scorm/content/8/'
         context = decode_packed_codes(self._download_webpage(
-            '%smobile/data.js' % content_base, video_id))
+            f'{content_base}mobile/data.js', video_id))
 
         data = self._parse_xml(
             self._search_regex(
@@ -93,6 +94,7 @@ class SCTEIE(SCTEBaseIE):
 
 
 class SCTECourseIE(SCTEBaseIE):
+    _WORKING = False
     _VALID_URL = r'https?://learning\.scte\.org/(?:mod/sub)?course/view\.php?.*?\bid=(?P<id>\d+)'
     _TESTS = [{
         'url': 'https://learning.scte.org/mod/subcourse/view.php?id=31491',
diff --git a/plugins/youtube_download/yt_dlp/extractor/seeker.py b/plugins/youtube_download/yt_dlp/extractor/seeker.py
deleted file mode 100644
index 65eb16a..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/seeker.py
+++ /dev/null
@@ -1,55 +0,0 @@
-import re
-
-from .common import InfoExtractor
-from ..utils import (
-    get_element_by_class,
-    strip_or_none,
-)
-
-
-class SeekerIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?seeker\.com/(?P<display_id>.*)-(?P<article_id>\d+)\.html'
-    _TESTS = [{
-        'url': 'http://www.seeker.com/should-trump-be-required-to-release-his-tax-returns-1833805621.html',
-        'md5': '897d44bbe0d8986a2ead96de565a92db',
-        'info_dict': {
-            'id': 'Elrn3gnY',
-            'ext': 'mp4',
-            'title': 'Should Trump Be Required To Release His Tax Returns?',
-            'description': 'md5:41efa8cfa8d627841045eec7b018eb45',
-            'timestamp': 1490090165,
-            'upload_date': '20170321',
-        }
-    }, {
-        'url': 'http://www.seeker.com/changes-expected-at-zoos-following-recent-gorilla-lion-shootings-1834116536.html',
-        'playlist': [
-            {
-                'md5': '0497b9f20495174be73ae136949707d2',
-                'info_dict': {
-                    'id': 'FihYQ8AE',
-                    'ext': 'mp4',
-                    'title': 'The Pros & Cons Of Zoos',
-                    'description': 'md5:d88f99a8ea8e7d25e6ff77f271b1271c',
-                    'timestamp': 1490039133,
-                    'upload_date': '20170320',
-                },
-            }
-        ],
-        'info_dict': {
-            'id': '1834116536',
-            'title': 'After Gorilla Killing, Changes Ahead for Zoos',
-            'description': 'The largest association of zoos and others are hoping to learn from recent incidents that led to the shooting deaths of a gorilla and two lions.',
-        },
-    }]
-
-    def _real_extract(self, url):
-        display_id, article_id = self._match_valid_url(url).groups()
-        webpage = self._download_webpage(url, display_id)
-        entries = []
-        for jwp_id in re.findall(r'data-video-id="([a-zA-Z0-9]{8})"', webpage):
-            entries.append(self.url_result(
-                'jwplatform:' + jwp_id, 'JWPlatform', jwp_id))
-        return self.playlist_result(
-            entries, article_id,
-            self._og_search_title(webpage),
-            strip_or_none(get_element_by_class('subtitle__text', webpage)) or self._og_search_description(webpage))
diff --git a/plugins/youtube_download/yt_dlp/extractor/sejmpl.py b/plugins/youtube_download/yt_dlp/extractor/sejmpl.py
new file mode 100644
index 0000000..eb433d2
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/sejmpl.py
@@ -0,0 +1,218 @@
+import datetime as dt
+
+from .common import InfoExtractor
+from .redge import RedCDNLivxIE
+from ..utils import (
+    clean_html,
+    join_nonempty,
+    js_to_json,
+    strip_or_none,
+    update_url_query,
+)
+from ..utils.traversal import traverse_obj
+
+
+def is_dst(date):
+    last_march = dt.datetime(date.year, 3, 31)
+    last_october = dt.datetime(date.year, 10, 31)
+    last_sunday_march = last_march - dt.timedelta(days=last_march.isoweekday() % 7)
+    last_sunday_october = last_october - dt.timedelta(days=last_october.isoweekday() % 7)
+    return last_sunday_march.replace(hour=2) <= date <= last_sunday_october.replace(hour=3)
+
+
+def rfc3339_to_atende(date):
+    date = dt.datetime.fromisoformat(date)
+    date = date + dt.timedelta(hours=1 if is_dst(date) else 0)
+    return int((date.timestamp() - 978307200) * 1000)
+
+
+class SejmIE(InfoExtractor):
+    _VALID_URL = (
+        r'https?://(?:www\.)?sejm\.gov\.pl/[Ss]ejm(?P<term>\d+)\.nsf/transmisje(?:_arch)?\.xsp(?:\?[^#]*)?#(?P<id>[\dA-F]+)',
+        r'https?://(?:www\.)?sejm\.gov\.pl/[Ss]ejm(?P<term>\d+)\.nsf/transmisje(?:_arch)?\.xsp\?(?:[^#]+&)?unid=(?P<id>[\dA-F]+)',
+        r'https?://sejm-embed\.redcdn\.pl/[Ss]ejm(?P<term>\d+)\.nsf/VideoFrame\.xsp/(?P<id>[\dA-F]+)',
+    )
+    IE_NAME = 'sejm'
+
+    _TESTS = [{
+        # multiple cameras, polish SL iterpreter
+        'url': 'https://www.sejm.gov.pl/Sejm10.nsf/transmisje_arch.xsp#6181EF1AD9CEEBB5C1258A6D006452B5',
+        'info_dict': {
+            'id': '6181EF1AD9CEEBB5C1258A6D006452B5',
+            'title': '1. posiedzenie Sejmu X kadencji',
+            'duration': 20145,
+            'live_status': 'was_live',
+            'location': 'Sala Posiedzeń',
+        },
+        'playlist': [{
+            'info_dict': {
+                'id': 'ENC01-722340000000-722360145000',
+                'ext': 'mp4',
+                'duration': 20145,
+                'title': '1. posiedzenie Sejmu X kadencji - ENC01',
+                'live_status': 'was_live',
+            },
+        }, {
+            'info_dict': {
+                'id': 'ENC30-722340000000-722360145000',
+                'ext': 'mp4',
+                'duration': 20145,
+                'title': '1. posiedzenie Sejmu X kadencji - ENC30',
+                'live_status': 'was_live',
+            },
+        }, {
+            'info_dict': {
+                'id': 'ENC31-722340000000-722360145000',
+                'ext': 'mp4',
+                'duration': 20145,
+                'title': '1. posiedzenie Sejmu X kadencji - ENC31',
+                'live_status': 'was_live',
+            },
+        }, {
+            'info_dict': {
+                'id': 'ENC32-722340000000-722360145000',
+                'ext': 'mp4',
+                'duration': 20145,
+                'title': '1. posiedzenie Sejmu X kadencji - ENC32',
+                'live_status': 'was_live',
+            },
+        }, {
+            # sign lang interpreter
+            'info_dict': {
+                'id': 'Migacz-ENC01-1-722340000000-722360145000',
+                'ext': 'mp4',
+                'duration': 20145,
+                'title': '1. posiedzenie Sejmu X kadencji - Migacz-ENC01',
+                'live_status': 'was_live',
+            },
+        }],
+    }, {
+        'url': 'https://www.sejm.gov.pl/Sejm8.nsf/transmisje.xsp?unid=9377A9D65518E9A5C125808E002E9FF2',
+        'info_dict': {
+            'id': '9377A9D65518E9A5C125808E002E9FF2',
+            'title': 'Debata "Lepsza Polska: obywatelska"',
+            'description': 'KP .Nowoczesna',
+            'duration': 8770,
+            'live_status': 'was_live',
+            'location': 'sala kolumnowa im. Kazimierza Pużaka (bud. C-D)',
+        },
+        'playlist': [{
+            'info_dict': {
+                'id': 'ENC08-1-503831270000-503840040000',
+                'ext': 'mp4',
+                'duration': 8770,
+                'title': 'Debata "Lepsza Polska: obywatelska" - ENC08',
+                'live_status': 'was_live',
+            },
+        }],
+    }, {
+        # 7th term is very special, since it does not use redcdn livx
+        'url': 'https://www.sejm.gov.pl/sejm7.nsf/transmisje_arch.xsp?rok=2015&month=11#A6E6D475ECCC6FE5C1257EF90034817F',
+        'info_dict': {
+            'id': 'A6E6D475ECCC6FE5C1257EF90034817F',
+            'title': 'Konferencja prasowa - Stanowisko SLD ws. składu nowego rządu',
+            'description': 'SLD - Biuro Prasowe Klubu',
+            'duration': 514,
+            'location': 'sala 101/bud. C',
+            'live_status': 'was_live',
+        },
+        'playlist': [{
+            'info_dict': {
+                'id': 'A6E6D475ECCC6FE5C1257EF90034817F',
+                'ext': 'mp4',
+                'title': 'Konferencja prasowa - Stanowisko SLD ws. składu nowego rządu',
+                'duration': 514,
+            },
+        }],
+    }, {
+        'url': 'https://sejm-embed.redcdn.pl/Sejm10.nsf/VideoFrame.xsp/FED58EABB97FBD53C1258A7400386492',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        term, video_id = self._match_valid_url(url).group('term', 'id')
+        frame = self._download_webpage(
+            f'https://sejm-embed.redcdn.pl/Sejm{term}.nsf/VideoFrame.xsp/{video_id}',
+            video_id)
+        # despite it says "transmisje_arch", it works for live streams too!
+        data = self._download_json(
+            f'https://www.sejm.gov.pl/Sejm{term}.nsf/transmisje_arch.xsp/json/{video_id}',
+            video_id)
+        params = data['params']
+
+        title = strip_or_none(data.get('title'))
+
+        if data.get('status') == 'VIDEO_ENDED':
+            live_status = 'was_live'
+        elif data.get('status') == 'VIDEO_PLAYING':
+            live_status = 'is_live'
+        else:
+            live_status = None
+            self.report_warning(f'unknown status: {data.get("status")}')
+
+        start_time = rfc3339_to_atende(params['start'])
+        # current streams have a stop time of *expected* end of session, but actual times
+        # can change during the transmission. setting a stop_time would artificially
+        # end the stream at that time, while the session actually keeps going.
+        if live_status == 'was_live':
+            stop_time = rfc3339_to_atende(params['stop'])
+            duration = (stop_time - start_time) // 1000
+        else:
+            stop_time, duration = None, None
+
+        entries = []
+
+        def add_entry(file, legacy_file=False):
+            if not file:
+                return
+            file = self._proto_relative_url(file)
+            if not legacy_file:
+                file = update_url_query(file, {'startTime': start_time})
+                if stop_time is not None:
+                    file = update_url_query(file, {'stopTime': stop_time})
+                stream_id = self._search_regex(r'/o2/sejm/([^/]+)/[^./]+\.livx', file, 'stream id')
+            common_info = {
+                'url': file,
+                'duration': duration,
+            }
+            if legacy_file:
+                entries.append({
+                    **common_info,
+                    'id': video_id,
+                    'title': title,
+                })
+            else:
+                entries.append({
+                    **common_info,
+                    '_type': 'url_transparent',
+                    'ie_key': RedCDNLivxIE.ie_key(),
+                    'id': stream_id,
+                    'title': join_nonempty(title, stream_id, delim=' - '),
+                })
+
+        cameras = self._search_json(
+            r'var\s+cameras\s*=', frame, 'camera list', video_id,
+            contains_pattern=r'\[(?s:.+)\]', transform_source=js_to_json,
+            fatal=False) or []
+        for camera_file in traverse_obj(cameras, (..., 'file', {dict})):
+            if camera_file.get('flv'):
+                add_entry(camera_file['flv'])
+            elif camera_file.get('mp4'):
+                # this is only a thing in 7th term. no streams before, and starting 8th it's redcdn livx
+                add_entry(camera_file['mp4'], legacy_file=True)
+            else:
+                self.report_warning('Unknown camera stream type found')
+
+        if params.get('mig'):
+            add_entry(self._search_regex(r"var sliUrl\s*=\s*'([^']+)'", frame, 'sign language interpreter url', fatal=False))
+
+        return {
+            '_type': 'playlist',
+            'entries': entries,
+            'id': video_id,
+            'title': title,
+            'description': clean_html(data.get('desc')) or None,
+            'duration': duration,
+            'live_status': live_status,
+            'location': strip_or_none(data.get('location')),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/sen.py b/plugins/youtube_download/yt_dlp/extractor/sen.py
new file mode 100644
index 0000000..d8f14ec
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/sen.py
@@ -0,0 +1,36 @@
+from .common import InfoExtractor
+from ..utils import url_or_none
+from ..utils.traversal import traverse_obj
+
+
+class SenIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?sen\.com/video/(?P<id>[0-9a-f-]+)'
+    _TEST = {
+        'url': 'https://www.sen.com/video/eef46eb1-4d79-4e28-be9d-bd937767f8c4',
+        'md5': 'ff615aca9691053c94f8f10d96cd7884',
+        'info_dict': {
+            'id': 'eef46eb1-4d79-4e28-be9d-bd937767f8c4',
+            'ext': 'mp4',
+            'description': 'Florida, 28 Sep 2022',
+            'title': 'Hurricane Ian',
+            'tags': ['North America', 'Storm', 'Weather'],
+        },
+    }
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+
+        api_data = self._download_json(f'https://api.sen.com/content/public/video/{video_id}', video_id)
+        m3u8_url = (traverse_obj(api_data, (
+            'data', 'nodes', lambda _, v: v['id'] == 'player', 'video', 'url', {url_or_none}, any))
+            or f'https://vod.sen.com/videos/{video_id}/manifest.m3u8')
+
+        return {
+            'id': video_id,
+            'formats': self._extract_m3u8_formats(m3u8_url, video_id, 'mp4'),
+            **traverse_obj(api_data, ('data', 'nodes', lambda _, v: v['id'] == 'details', any, 'content', {
+                'title': ('title', 'text', {str}),
+                'description': ('descriptions', 0, 'text', {str}),
+                'tags': ('badges', ..., 'text', {str}),
+            })),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/senalcolombia.py b/plugins/youtube_download/yt_dlp/extractor/senalcolombia.py
index f3c066d..b2f354f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/senalcolombia.py
+++ b/plugins/youtube_download/yt_dlp/extractor/senalcolombia.py
@@ -3,6 +3,7 @@ from .rtvcplay import RTVCKalturaIE
 
 
 class SenalColombiaLiveIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?senalcolombia\.tv/(?P<id>senal-en-vivo)'
 
     _TESTS = [{
diff --git a/plugins/youtube_download/yt_dlp/extractor/senategov.py b/plugins/youtube_download/yt_dlp/extractor/senategov.py
index 7ff0cf5..dc275e5 100644
--- a/plugins/youtube_download/yt_dlp/extractor/senategov.py
+++ b/plugins/youtube_download/yt_dlp/extractor/senategov.py
@@ -1,53 +1,19 @@
 import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_parse_qs,
-    compat_urlparse,
-)
 from ..utils import (
     ExtractorError,
-    parse_qs,
-    unsmuggle_url,
+    UnsupportedError,
+    make_archive_id,
+    remove_end,
+    url_or_none,
 )
-
-_COMMITTEES = {
-    'ag': ('76440', 'http://ag-f.akamaihd.net'),
-    'aging': ('76442', 'http://aging-f.akamaihd.net'),
-    'approps': ('76441', 'http://approps-f.akamaihd.net'),
-    'arch': ('', 'http://ussenate-f.akamaihd.net'),
-    'armed': ('76445', 'http://armed-f.akamaihd.net'),
-    'banking': ('76446', 'http://banking-f.akamaihd.net'),
-    'budget': ('76447', 'http://budget-f.akamaihd.net'),
-    'cecc': ('76486', 'http://srs-f.akamaihd.net'),
-    'commerce': ('80177', 'http://commerce1-f.akamaihd.net'),
-    'csce': ('75229', 'http://srs-f.akamaihd.net'),
-    'dpc': ('76590', 'http://dpc-f.akamaihd.net'),
-    'energy': ('76448', 'http://energy-f.akamaihd.net'),
-    'epw': ('76478', 'http://epw-f.akamaihd.net'),
-    'ethics': ('76449', 'http://ethics-f.akamaihd.net'),
-    'finance': ('76450', 'http://finance-f.akamaihd.net'),
-    'foreign': ('76451', 'http://foreign-f.akamaihd.net'),
-    'govtaff': ('76453', 'http://govtaff-f.akamaihd.net'),
-    'help': ('76452', 'http://help-f.akamaihd.net'),
-    'indian': ('76455', 'http://indian-f.akamaihd.net'),
-    'intel': ('76456', 'http://intel-f.akamaihd.net'),
-    'intlnarc': ('76457', 'http://intlnarc-f.akamaihd.net'),
-    'jccic': ('85180', 'http://jccic-f.akamaihd.net'),
-    'jec': ('76458', 'http://jec-f.akamaihd.net'),
-    'judiciary': ('76459', 'http://judiciary-f.akamaihd.net'),
-    'rpc': ('76591', 'http://rpc-f.akamaihd.net'),
-    'rules': ('76460', 'http://rules-f.akamaihd.net'),
-    'saa': ('76489', 'http://srs-f.akamaihd.net'),
-    'smbiz': ('76461', 'http://smbiz-f.akamaihd.net'),
-    'srs': ('75229', 'http://srs-f.akamaihd.net'),
-    'uscc': ('76487', 'http://srs-f.akamaihd.net'),
-    'vetaff': ('76462', 'http://vetaff-f.akamaihd.net'),
-}
+from ..utils.traversal import traverse_obj
 
 
 class SenateISVPIE(InfoExtractor):
-    _IE_NAME = 'senate.gov:isvp'
+    IE_NAME = 'senate.gov:isvp'
     _VALID_URL = r'https?://(?:www\.)?senate\.gov/isvp/?\?(?P<qs>.+)'
     _EMBED_REGEX = [r"<iframe[^>]+src=['\"](?P<url>https?://www\.senate\.gov/isvp/?\?[^'\"]+)['\"]"]
 
@@ -56,92 +22,128 @@ class SenateISVPIE(InfoExtractor):
         'info_dict': {
             'id': 'judiciary031715',
             'ext': 'mp4',
-            'title': 'Integrated Senate Video Player',
+            'title': 'ISVP',
             'thumbnail': r're:^https?://.*\.(?:jpg|png)$',
+            '_old_archive_ids': ['senategov judiciary031715'],
         },
         'params': {
             # m3u8 download
             'skip_download': True,
         },
+        'expected_warnings': ['Failed to download m3u8 information'],
     }, {
         'url': 'http://www.senate.gov/isvp/?type=live&comm=commerce&filename=commerce011514.mp4&auto_play=false',
         'info_dict': {
             'id': 'commerce011514',
             'ext': 'mp4',
-            'title': 'Integrated Senate Video Player'
+            'title': 'Integrated Senate Video Player',
+            '_old_archive_ids': ['senategov commerce011514'],
         },
         'params': {
             # m3u8 download
             'skip_download': True,
         },
+        'skip': 'This video is not available.',
     }, {
         'url': 'http://www.senate.gov/isvp/?type=arch&comm=intel&filename=intel090613&hc_location=ufi',
         # checksum differs each time
         'info_dict': {
             'id': 'intel090613',
             'ext': 'mp4',
-            'title': 'Integrated Senate Video Player'
-        }
+            'title': 'ISVP',
+            '_old_archive_ids': ['senategov intel090613'],
+        },
+        'expected_warnings': ['Failed to download m3u8 information'],
+    }, {
+        'url': 'https://www.senate.gov/isvp/?auto_play=false&comm=help&filename=help090920&poster=https://www.help.senate.gov/assets/images/video-poster.png&stt=950',
+        'info_dict': {
+            'id': 'help090920',
+            'ext': 'mp4',
+            'title': 'ISVP',
+            'thumbnail': 'https://www.help.senate.gov/assets/images/video-poster.png',
+            '_old_archive_ids': ['senategov help090920'],
+        },
     }, {
         # From http://www.c-span.org/video/?96791-1
         'url': 'http://www.senate.gov/isvp?type=live&comm=banking&filename=banking012715',
         'only_matching': True,
     }]
 
+    _COMMITTEES = {
+        'ag': ('76440', 'https://ag-f.akamaihd.net', '2036803', 'agriculture'),
+        'aging': ('76442', 'https://aging-f.akamaihd.net', '2036801', 'aging'),
+        'approps': ('76441', 'https://approps-f.akamaihd.net', '2036802', 'appropriations'),
+        'arch': ('', 'https://ussenate-f.akamaihd.net', '', 'arch'),
+        'armed': ('76445', 'https://armed-f.akamaihd.net', '2036800', 'armedservices'),
+        'banking': ('76446', 'https://banking-f.akamaihd.net', '2036799', 'banking'),
+        'budget': ('76447', 'https://budget-f.akamaihd.net', '2036798', 'budget'),
+        'cecc': ('76486', 'https://srs-f.akamaihd.net', '2036782', 'srs_cecc'),
+        'commerce': ('80177', 'https://commerce1-f.akamaihd.net', '2036779', 'commerce'),
+        'csce': ('75229', 'https://srs-f.akamaihd.net', '2036777', 'srs_srs'),
+        'dpc': ('76590', 'https://dpc-f.akamaihd.net', '', 'dpc'),
+        'energy': ('76448', 'https://energy-f.akamaihd.net', '2036797', 'energy'),
+        'epw': ('76478', 'https://epw-f.akamaihd.net', '2036783', 'environment'),
+        'ethics': ('76449', 'https://ethics-f.akamaihd.net', '2036796', 'ethics'),
+        'finance': ('76450', 'https://finance-f.akamaihd.net', '2036795', 'finance_finance'),
+        'foreign': ('76451', 'https://foreign-f.akamaihd.net', '2036794', 'foreignrelations'),
+        'govtaff': ('76453', 'https://govtaff-f.akamaihd.net', '2036792', 'hsgac'),
+        'help': ('76452', 'https://help-f.akamaihd.net', '2036793', 'help'),
+        'indian': ('76455', 'https://indian-f.akamaihd.net', '2036791', 'indianaffairs'),
+        'intel': ('76456', 'https://intel-f.akamaihd.net', '2036790', 'intelligence'),
+        'intlnarc': ('76457', 'https://intlnarc-f.akamaihd.net', '', 'internationalnarcoticscaucus'),
+        'jccic': ('85180', 'https://jccic-f.akamaihd.net', '2036778', 'jccic'),
+        'jec': ('76458', 'https://jec-f.akamaihd.net', '2036789', 'jointeconomic'),
+        'judiciary': ('76459', 'https://judiciary-f.akamaihd.net', '2036788', 'judiciary'),
+        'rpc': ('76591', 'https://rpc-f.akamaihd.net', '', 'rpc'),
+        'rules': ('76460', 'https://rules-f.akamaihd.net', '2036787', 'rules'),
+        'saa': ('76489', 'https://srs-f.akamaihd.net', '2036780', 'srs_saa'),
+        'smbiz': ('76461', 'https://smbiz-f.akamaihd.net', '2036786', 'smallbusiness'),
+        'srs': ('75229', 'https://srs-f.akamaihd.net', '2031966', 'srs_srs'),
+        'uscc': ('76487', 'https://srs-f.akamaihd.net', '2036781', 'srs_uscc'),
+        'vetaff': ('76462', 'https://vetaff-f.akamaihd.net', '2036785', 'veteransaffairs'),
+    }
+
     def _real_extract(self, url):
-        url, smuggled_data = unsmuggle_url(url, {})
-
-        qs = compat_parse_qs(self._match_valid_url(url).group('qs'))
-        if not qs.get('filename') or not qs.get('type') or not qs.get('comm'):
+        qs = urllib.parse.parse_qs(self._match_valid_url(url).group('qs'))
+        if not qs.get('filename') or not qs.get('comm'):
             raise ExtractorError('Invalid URL', expected=True)
-
-        video_id = re.sub(r'.mp4$', '', qs['filename'][0])
+        filename = qs['filename'][0]
+        video_id = remove_end(filename, '.mp4')
 
         webpage = self._download_webpage(url, video_id)
+        committee = qs['comm'][0]
 
-        if smuggled_data.get('force_title'):
-            title = smuggled_data['force_title']
-        else:
-            title = self._html_extract_title(webpage)
-        poster = qs.get('poster')
-        thumbnail = poster[0] if poster else None
-
-        video_type = qs['type'][0]
-        committee = video_type if video_type == 'arch' else qs['comm'][0]
-
-        stream_num, domain = _COMMITTEES[committee]
+        stream_num, stream_domain, stream_id, msl3 = self._COMMITTEES[committee]
 
+        urls_alternatives = [f'https://www-senate-gov-media-srs.akamaized.net/hls/live/{stream_id}/{committee}/{filename}/master.m3u8',
+                             f'https://www-senate-gov-msl3archive.akamaized.net/{msl3}/{filename}_1/master.m3u8',
+                             f'{stream_domain}/i/{filename}_1@{stream_num}/master.m3u8',
+                             f'{stream_domain}/i/{filename}.mp4/master.m3u8']
         formats = []
-        if video_type == 'arch':
-            filename = video_id if '.' in video_id else video_id + '.mp4'
-            m3u8_url = compat_urlparse.urljoin(domain, 'i/' + filename + '/master.m3u8')
-            formats = self._extract_m3u8_formats(m3u8_url, video_id, ext='mp4', m3u8_id='m3u8')
-        else:
-            hdcore_sign = 'hdcore=3.1.0'
-            url_params = (domain, video_id, stream_num)
-            f4m_url = f'%s/z/%s_1@%s/manifest.f4m?{hdcore_sign}' % url_params
-            m3u8_url = '%s/i/%s_1@%s/master.m3u8' % url_params
-            for entry in self._extract_f4m_formats(f4m_url, video_id, f4m_id='f4m'):
-                # URLs without the extra param induce an 404 error
-                entry.update({'extra_param_to_segment_url': hdcore_sign})
-                formats.append(entry)
-            for entry in self._extract_m3u8_formats(m3u8_url, video_id, ext='mp4', m3u8_id='m3u8'):
-                mobj = re.search(r'(?P<tag>(?:-p|-b)).m3u8', entry['url'])
-                if mobj:
-                    entry['format_id'] += mobj.group('tag')
-                formats.append(entry)
+        subtitles = {}
+        for video_url in urls_alternatives:
+            formats, subtitles = self._extract_m3u8_formats_and_subtitles(video_url, video_id, ext='mp4', fatal=False)
+            if formats:
+                break
 
         return {
             'id': video_id,
-            'title': title,
+            'title': self._html_extract_title(webpage),
             'formats': formats,
-            'thumbnail': thumbnail,
+            'subtitles': subtitles,
+            'thumbnail': traverse_obj(qs, ('poster', 0, {url_or_none})),
+            '_old_archive_ids': [make_archive_id(SenateGovIE, video_id)],
         }
 
 
 class SenateGovIE(InfoExtractor):
-    _IE_NAME = 'senate.gov'
-    _VALID_URL = r'https?:\/\/(?:www\.)?(help|appropriations|judiciary|banking|armed-services|finance)\.senate\.gov'
+    IE_NAME = 'senate.gov'
+    _SUBDOMAIN_RE = '|'.join(map(re.escape, (
+        'agriculture', 'aging', 'appropriations', 'armed-services', 'banking',
+        'budget', 'commerce', 'energy', 'epw', 'finance', 'foreign', 'help',
+        'intelligence', 'inaugural', 'judiciary', 'rules', 'sbc', 'veterans',
+    )))
+    _VALID_URL = rf'https?://(?:www\.)?(?:{_SUBDOMAIN_RE})\.senate\.gov'
     _TESTS = [{
         'url': 'https://www.help.senate.gov/hearings/vaccines-saving-lives-ensuring-confidence-and-protecting-public-health',
         'info_dict': {
@@ -150,6 +152,9 @@ class SenateGovIE(InfoExtractor):
             'title': 'Vaccines: Saving Lives, Ensuring Confidence, and Protecting Public Health',
             'description': 'The U.S. Senate Committee on Health, Education, Labor & Pensions',
             'ext': 'mp4',
+            'age_limit': 0,
+            'thumbnail': 'https://www.help.senate.gov/assets/images/sharelogo.jpg',
+            '_old_archive_ids': ['senategov help090920'],
         },
         'params': {'skip_download': 'm3u8'},
     }, {
@@ -159,8 +164,12 @@ class SenateGovIE(InfoExtractor):
             'display_id': 'watch?hearingid=B8A25434-5056-A066-6020-1F68CB75F0CD',
             'title': 'Review of the FY2019 Budget Request for the U.S. Army',
             'ext': 'mp4',
+            'age_limit': 0,
+            'thumbnail': 'https://www.appropriations.senate.gov/themes/appropriations/images/video-poster-flash-fit.png',
+            '_old_archive_ids': ['senategov appropsA051518'],
         },
         'params': {'skip_download': 'm3u8'},
+        'expected_warnings': ['Failed to download m3u8 information'],
     }, {
         'url': 'https://www.banking.senate.gov/hearings/21st-century-communities-public-transportation-infrastructure-investment-and-fast-act-reauthorization',
         'info_dict': {
@@ -169,32 +178,65 @@ class SenateGovIE(InfoExtractor):
             'title': '21st Century Communities: Public Transportation Infrastructure Investment and FAST Act Reauthorization',
             'description': 'The Official website of The United States Committee on Banking, Housing, and Urban Affairs',
             'ext': 'mp4',
+            'thumbnail': 'https://www.banking.senate.gov/themes/banking/images/sharelogo.jpg',
+            'age_limit': 0,
+            '_old_archive_ids': ['senategov banking041521'],
         },
         'params': {'skip_download': 'm3u8'},
+    }, {
+        'url': 'https://www.agriculture.senate.gov/hearings/hemp-production-and-the-2018-farm-bill',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.aging.senate.gov/hearings/the-older-americans-act-the-local-impact-of-the-law-and-the-upcoming-reauthorization',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.budget.senate.gov/hearings/improving-care-lowering-costs-achieving-health-care-efficiency',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.commerce.senate.gov/2024/12/communications-networks-safety-and-security',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.energy.senate.gov/hearings/2024/2/full-committee-hearing-to-examine',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.epw.senate.gov/public/index.cfm/hearings?ID=F63083EA-2C13-498C-B548-341BED68C209',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.foreign.senate.gov/hearings/american-diplomacy-and-global-leadership-review-of-the-fy25-state-department-budget-request',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.intelligence.senate.gov/hearings/foreign-threats-elections-2024-%E2%80%93-roles-and-responsibilities-us-tech-providers',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.inaugural.senate.gov/52nd-inaugural-ceremonies/',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.rules.senate.gov/hearings/02/07/2023/business-meeting',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.sbc.senate.gov/public/index.cfm/hearings?ID=5B13AA6B-8279-45AF-B54B-94156DC7A2AB',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.veterans.senate.gov/2024/5/frontier-health-care-ensuring-veterans-access-no-matter-where-they-live',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
         display_id = self._generic_id(url)
         webpage = self._download_webpage(url, display_id)
-        parse_info = parse_qs(self._search_regex(
-            r'<iframe class="[^>"]*streaminghearing[^>"]*"\s[^>]*\bsrc="([^">]*)', webpage, 'hearing URL'))
-
-        stream_num, stream_domain = _COMMITTEES[parse_info['comm'][-1]]
-        filename = parse_info['filename'][-1]
-
-        formats = self._extract_m3u8_formats(
-            f'{stream_domain}/i/{filename}_1@{stream_num}/master.m3u8',
-            display_id, ext='mp4')
+        url_info = next(SenateISVPIE.extract_from_webpage(self._downloader, url, webpage), None)
+        if not url_info:
+            raise UnsupportedError(url)
 
         title = self._html_search_regex(
-            (*self._og_regexes('title'), r'(?s)<title>([^<]*?)</title>'), webpage, 'video title')
+            (*self._og_regexes('title'), r'(?s)<title>([^<]*?)</title>'), webpage, 'video title', fatal=False)
 
         return {
-            'id': re.sub(r'.mp4$', '', filename),
+            **url_info,
+            '_type': 'url_transparent',
             'display_id': display_id,
             'title': re.sub(r'\s+', ' ', title.split('|')[0]).strip(),
             'description': self._og_search_description(webpage, default=None),
             'thumbnail': self._og_search_thumbnail(webpage, default=None),
             'age_limit': self._rta_search(webpage),
-            'formats': formats
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/sendtonews.py b/plugins/youtube_download/yt_dlp/extractor/sendtonews.py
index 3600e2e..ecf4b27 100644
--- a/plugins/youtube_download/yt_dlp/extractor/sendtonews.py
+++ b/plugins/youtube_download/yt_dlp/extractor/sendtonews.py
@@ -2,23 +2,24 @@ import re
 
 from .common import InfoExtractor
 from ..utils import (
-    float_or_none,
-    parse_iso8601,
-    update_url_query,
-    int_or_none,
     determine_protocol,
+    float_or_none,
+    int_or_none,
+    parse_iso8601,
     unescapeHTML,
+    update_url_query,
 )
 
 
 class SendtoNewsIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://embed\.sendtonews\.com/player2/embedplayer\.php\?.*\bSC=(?P<id>[0-9A-Za-z-]+)'
 
     _TEST = {
         # From http://cleveland.cbslocal.com/2016/05/16/indians-score-season-high-15-runs-in-blowout-win-over-reds-rapid-reaction/
         'url': 'http://embed.sendtonews.com/player2/embedplayer.php?SC=GxfCe0Zo7D-175909-5588&type=single&autoplay=on&sound=YES',
         'info_dict': {
-            'id': 'GxfCe0Zo7D-175909-5588'
+            'id': 'GxfCe0Zo7D-175909-5588',
         },
         'playlist_count': 8,
         # test the first video only to prevent lengthy tests
@@ -74,7 +75,7 @@ class SendtoNewsIE(InfoExtractor):
                 if not tbr:
                     continue
                 f.update({
-                    'format_id': '%s-%d' % (determine_protocol(f), tbr),
+                    'format_id': f'{determine_protocol(f)}-{tbr}',
                     'tbr': tbr,
                 })
 
@@ -97,7 +98,7 @@ class SendtoNewsIE(InfoExtractor):
                 'timestamp': parse_iso8601(video.get('S_sysDate'), delimiter=' '),
                 # 'tbr' was explicitly set to be preferred over 'height' originally,
                 # So this is being kept unless someone can confirm this is unnecessary
-                '_format_sort_fields': ('tbr', 'res')
+                '_format_sort_fields': ('tbr', 'res'),
             })
             entries.append(info_dict)
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/servus.py b/plugins/youtube_download/yt_dlp/extractor/servus.py
index dda1958..841c7eb 100644
--- a/plugins/youtube_download/yt_dlp/extractor/servus.py
+++ b/plugins/youtube_download/yt_dlp/extractor/servus.py
@@ -27,7 +27,7 @@ class ServusIE(InfoExtractor):
         'info_dict': {
             'id': 'AA-28BYCQNH92111',
             'ext': 'mp4',
-            'title': 'Klettersteige in den Alpen',
+            'title': 'Vie Ferrate - Klettersteige in den Alpen',
             'description': 'md5:25e47ddd83a009a0f9789ba18f2850ce',
             'thumbnail': r're:^https?://.*\.jpg',
             'duration': 2823,
@@ -38,8 +38,9 @@ class ServusIE(InfoExtractor):
             'season_number': 11,
             'episode': 'Episode 8 - Vie Ferrate – Klettersteige in den Alpen',
             'episode_number': 8,
+            'categories': ['Bergwelten'],
         },
-        'params': {'skip_download': 'm3u8'}
+        'params': {'skip_download': 'm3u8'},
     }, {
         'url': 'https://www.servustv.com/natur/v/aa-1xg5xwmgw2112/',
         'only_matching': True,
@@ -71,8 +72,11 @@ class ServusIE(InfoExtractor):
     def _real_extract(self, url):
         video_id = self._match_id(url).upper()
 
+        webpage = self._download_webpage(url, video_id)
+        next_data = self._search_nextjs_data(webpage, video_id, fatal=False)
+
         video = self._download_json(
-            'https://api-player.redbull.com/stv/servus-tv?timeZone=Europe/Berlin',
+            'https://api-player.redbull.com/stv/servus-tv-playnet',
             video_id, 'Downloading video JSON', query={'videoId': video_id})
         if not video.get('videoUrl'):
             self._report_errors(video)
@@ -89,7 +93,7 @@ class ServusIE(InfoExtractor):
         return {
             'id': video_id,
             'title': video.get('title'),
-            'description': self._get_description(video_id) or video.get('description'),
+            'description': self._get_description(next_data) or video.get('description'),
             'thumbnail': video.get('poster'),
             'duration': float_or_none(video.get('duration')),
             'timestamp': unified_timestamp(video.get('currentSunrise')),
@@ -100,16 +104,19 @@ class ServusIE(InfoExtractor):
             'episode_number': episode_number,
             'formats': formats,
             'subtitles': subtitles,
+            **traverse_obj(next_data, ('props', 'pageProps', 'data', {
+                'title': ('title', 'rendered', {str}),
+                'timestamp': ('stv_date', 'raw', {int}),
+                'duration': ('stv_duration', {float_or_none}),
+                'categories': ('category_names', ..., {str}),
+            })),
         }
 
-    def _get_description(self, video_id):
-        info = self._download_json(
-            f'https://backend.servustv.com/wp-json/rbmh/v2/media_asset/aa_id/{video_id}?fieldset=page',
-            video_id, fatal=False)
-
-        return join_nonempty(*traverse_obj(info, (
-            ('stv_short_description', 'stv_long_description'),
-            {lambda x: unescapeHTML(x.replace('\n\n', '\n'))})), delim='\n\n')
+    def _get_description(self, next_data):
+        return join_nonempty(*traverse_obj(next_data, (
+            'props', 'pageProps', 'data',
+            ('stv_short_description', 'stv_long_description'), {str},
+            {lambda x: x.replace('\n\n', '\n')}, {unescapeHTML})), delim='\n\n')
 
     def _report_errors(self, video):
         playability_errors = traverse_obj(video, ('playabilityErrors', ...))
diff --git a/plugins/youtube_download/yt_dlp/extractor/sevenplus.py b/plugins/youtube_download/yt_dlp/extractor/sevenplus.py
index 6c688d1..6e1fbe7 100644
--- a/plugins/youtube_download/yt_dlp/extractor/sevenplus.py
+++ b/plugins/youtube_download/yt_dlp/extractor/sevenplus.py
@@ -2,7 +2,6 @@ import json
 import re
 
 from .brightcove import BrightcoveNewBaseIE
-from ..compat import compat_str
 from ..networking.exceptions import HTTPError
 from ..utils import (
     ExtractorError,
@@ -31,7 +30,7 @@ class SevenPlusIE(BrightcoveNewBaseIE):
         },
         'params': {
             'skip_download': True,
-        }
+        },
     }, {
         'url': 'https://7plus.com.au/UUUU?episode-id=AUMS43-001',
         'only_matching': True,
@@ -71,7 +70,7 @@ class SevenPlusIE(BrightcoveNewBaseIE):
                 'idToken': id_token,
                 'platformId': 'web',
                 'regSource': '7plus',
-            }).encode('utf-8')) or {}
+            }).encode()) or {}
         self.token = token_resp.get('token')
         if not self.token:
             self.report_warning('Unable to log in: Could not extract auth token')
@@ -120,7 +119,7 @@ class SevenPlusIE(BrightcoveNewBaseIE):
                     if value:
                         info[dst_key] = value
                 info['series'] = try_get(
-                    item, lambda x: x['seriesLogo']['name'], compat_str)
+                    item, lambda x: x['seriesLogo']['name'], str)
                 mobj = re.search(r'^S(\d+)\s+E(\d+)\s+-\s+(.+)$', info['title'])
                 if mobj:
                     info.update({
diff --git a/plugins/youtube_download/yt_dlp/extractor/sexu.py b/plugins/youtube_download/yt_dlp/extractor/sexu.py
index 3117f81..71b1076 100644
--- a/plugins/youtube_download/yt_dlp/extractor/sexu.py
+++ b/plugins/youtube_download/yt_dlp/extractor/sexu.py
@@ -2,6 +2,7 @@ from .common import InfoExtractor
 
 
 class SexuIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?sexu\.com/(?P<id>\d+)'
     _TEST = {
         'url': 'http://sexu.com/961791/',
@@ -14,7 +15,7 @@ class SexuIE(InfoExtractor):
             'categories': list,  # NSFW
             'thumbnail': r're:https?://.*\.jpg$',
             'age_limit': 18,
-        }
+        },
     }
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/seznamzpravy.py b/plugins/youtube_download/yt_dlp/extractor/seznamzpravy.py
index 79e8885..6f2bfcd 100644
--- a/plugins/youtube_download/yt_dlp/extractor/seznamzpravy.py
+++ b/plugins/youtube_download/yt_dlp/extractor/seznamzpravy.py
@@ -1,19 +1,17 @@
+import urllib.parse
+
 from .common import InfoExtractor
-from ..compat import (
-    compat_str,
-    compat_urllib_parse_urlparse,
-)
 from ..utils import (
-    urljoin,
     int_or_none,
     parse_codecs,
     parse_qs,
     try_get,
+    urljoin,
 )
 
 
 def _raw_id(src_url):
-    return compat_urllib_parse_urlparse(src_url).path.split('/')[-1]
+    return urllib.parse.urlparse(src_url).path.split('/')[-1]
 
 
 class SeznamZpravyIE(InfoExtractor):
@@ -68,7 +66,7 @@ class SeznamZpravyIE(InfoExtractor):
 
             f = {
                 'url': urljoin(sdn_url, relative_url),
-                'format_id': 'http-%s' % format_id,
+                'format_id': f'http-{format_id}',
                 'tbr': int_or_none(format_data.get('bandwidth'), scale=1000),
                 'width': int_or_none(width),
                 'height': int_or_none(height),
@@ -79,7 +77,7 @@ class SeznamZpravyIE(InfoExtractor):
         pls = sdn_data.get('pls', {})
 
         def get_url(format_id):
-            return try_get(pls, lambda x: x[format_id]['url'], compat_str)
+            return try_get(pls, lambda x: x[format_id]['url'], str)
 
         dash_rel_url = get_url('dash')
         if dash_rel_url:
diff --git a/plugins/youtube_download/yt_dlp/extractor/shahid.py b/plugins/youtube_download/yt_dlp/extractor/shahid.py
index d509e88..f0a3b6b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/shahid.py
+++ b/plugins/youtube_download/yt_dlp/extractor/shahid.py
@@ -5,9 +5,9 @@ import re
 from .aws import AWSIE
 from ..networking.exceptions import HTTPError
 from ..utils import (
-    clean_html,
     ExtractorError,
     InAdvancePagedList,
+    clean_html,
     int_or_none,
     parse_iso8601,
     str_or_none,
@@ -63,17 +63,17 @@ class ShahidIE(ShahidBaseIE):
         'params': {
             # m3u8 download
             'skip_download': True,
-        }
+        },
     }, {
         'url': 'https://shahid.mbc.net/ar/movies/%D8%A7%D9%84%D9%82%D9%86%D8%A7%D8%B5%D8%A9/movie-151746',
-        'only_matching': True
+        'only_matching': True,
     }, {
         # shahid plus subscriber only
         'url': 'https://shahid.mbc.net/ar/series/%D9%85%D8%B1%D8%A7%D9%8A%D8%A7-2011-%D8%A7%D9%84%D9%85%D9%88%D8%B3%D9%85-1-%D8%A7%D9%84%D8%AD%D9%84%D9%82%D8%A9-1/episode-90511',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://shahid.mbc.net/en/shows/Ramez-Fi-Al-Shallal-season-1-episode-1/episode-359319',
-        'only_matching': True
+        'only_matching': True,
     }]
 
     def _perform_login(self, username, password):
@@ -84,7 +84,7 @@ class ShahidIE(ShahidBaseIE):
                     'email': username,
                     'password': password,
                     'basic': 'false',
-                }).encode('utf-8'), headers={
+                }).encode(), headers={
                     'Content-Type': 'application/json; charset=UTF-8',
                 })['user']
         except ExtractorError as e:
@@ -127,7 +127,7 @@ class ShahidIE(ShahidBaseIE):
         #     })['productModel']
 
         response = self._download_json(
-            'http://api.shahid.net/api/v1_1/%s/%s' % (page_type, video_id),
+            f'http://api.shahid.net/api/v1_1/{page_type}/{video_id}',
             video_id, 'Downloading video JSON', query={
                 'apiKey': 'sh@hid0nlin3',
                 'hash': 'b2wMCTHpSmyxGqQjJFOycRmLSex+BpTK/ooxy6vHaqs=',
@@ -136,7 +136,7 @@ class ShahidIE(ShahidBaseIE):
         error = data.get('error')
         if error:
             raise ExtractorError(
-                '%s returned error: %s' % (self.IE_NAME, '\n'.join(error.values())),
+                '{} returned error: {}'.format(self.IE_NAME, '\n'.join(error.values())),
                 expected=True)
 
         video = data[page_type]
@@ -175,7 +175,7 @@ class ShahidShowIE(ShahidBaseIE):
         'playlist_mincount': 32,
     }, {
         'url': 'https://shahid.mbc.net/ar/series/How-to-live-Longer-(The-Big-Think)/series-291861',
-        'only_matching': True
+        'only_matching': True,
     }]
     _PAGE_SIZE = 30
 
@@ -196,7 +196,7 @@ class ShahidShowIE(ShahidBaseIE):
                     'pageSize': 30,
                     'sorts': [{
                         'order': 'DESC',
-                        'type': 'SORTDATE'
+                        'type': 'SORTDATE',
                     }],
                 })
             for product in playlist.get('productList', {}).get('products', []):
diff --git a/plugins/youtube_download/yt_dlp/extractor/shared.py b/plugins/youtube_download/yt_dlp/extractor/shared.py
deleted file mode 100644
index 9a237b3..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/shared.py
+++ /dev/null
@@ -1,138 +0,0 @@
-import urllib.parse
-
-from .common import InfoExtractor
-from ..compat import compat_b64decode
-from ..utils import (
-    KNOWN_EXTENSIONS,
-    ExtractorError,
-    determine_ext,
-    int_or_none,
-    js_to_json,
-    parse_filesize,
-    rot47,
-    url_or_none,
-    urlencode_postdata,
-)
-
-
-class SharedBaseIE(InfoExtractor):
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        webpage, urlh = self._download_webpage_handle(url, video_id)
-
-        if self._FILE_NOT_FOUND in webpage:
-            raise ExtractorError(
-                'Video %s does not exist' % video_id, expected=True)
-
-        video_url = self._extract_video_url(webpage, video_id, url)
-
-        title = self._extract_title(webpage)
-        filesize = int_or_none(self._extract_filesize(webpage))
-
-        return {
-            'id': video_id,
-            'url': video_url,
-            'ext': 'mp4',
-            'filesize': filesize,
-            'title': title,
-        }
-
-    def _extract_title(self, webpage):
-        return compat_b64decode(self._html_search_meta(
-            'full:title', webpage, 'title')).decode('utf-8')
-
-    def _extract_filesize(self, webpage):
-        return self._html_search_meta(
-            'full:size', webpage, 'file size', fatal=False)
-
-
-class SharedIE(SharedBaseIE):
-    IE_DESC = 'shared.sx'
-    _VALID_URL = r'https?://shared\.sx/(?P<id>[\da-z]{10})'
-    _FILE_NOT_FOUND = '>File does not exist<'
-
-    _TEST = {
-        'url': 'http://shared.sx/0060718775',
-        'md5': '106fefed92a8a2adb8c98e6a0652f49b',
-        'info_dict': {
-            'id': '0060718775',
-            'ext': 'mp4',
-            'title': 'Bmp4',
-            'filesize': 1720110,
-        },
-    }
-
-    def _extract_video_url(self, webpage, video_id, url):
-        download_form = self._hidden_inputs(webpage)
-
-        video_page = self._download_webpage(
-            url, video_id, 'Downloading video page',
-            data=urlencode_postdata(download_form),
-            headers={
-                'Content-Type': 'application/x-www-form-urlencoded',
-                'Referer': url,
-            })
-
-        video_url = self._html_search_regex(
-            r'data-url=(["\'])(?P<url>(?:(?!\1).)+)\1',
-            video_page, 'video URL', group='url')
-
-        return video_url
-
-
-class VivoIE(SharedBaseIE):
-    IE_DESC = 'vivo.sx'
-    _VALID_URL = r'https?://vivo\.s[xt]/(?P<id>[\da-z]{10})'
-    _FILE_NOT_FOUND = '>The file you have requested does not exists or has been removed'
-
-    _TESTS = [{
-        'url': 'http://vivo.sx/d7ddda0e78',
-        'md5': '15b3af41be0b4fe01f4df075c2678b2c',
-        'info_dict': {
-            'id': 'd7ddda0e78',
-            'ext': 'mp4',
-            'title': 'Chicken',
-            'filesize': 515659,
-        },
-    }, {
-        'url': 'http://vivo.st/d7ddda0e78',
-        'only_matching': True,
-    }]
-
-    def _extract_title(self, webpage):
-        title = self._html_search_regex(
-            r'data-name\s*=\s*(["\'])(?P<title>(?:(?!\1).)+)\1', webpage,
-            'title', default=None, group='title')
-        if title:
-            ext = determine_ext(title)
-            if ext.lower() in KNOWN_EXTENSIONS:
-                title = title.rpartition('.' + ext)[0]
-            return title
-        return self._og_search_title(webpage)
-
-    def _extract_filesize(self, webpage):
-        return parse_filesize(self._search_regex(
-            r'data-type=["\']video["\'][^>]*>Watch.*?<strong>\s*\((.+?)\)',
-            webpage, 'filesize', fatal=False))
-
-    def _extract_video_url(self, webpage, video_id, url):
-        def decode_url_old(encoded_url):
-            return compat_b64decode(encoded_url).decode('utf-8')
-
-        stream_url = self._search_regex(
-            r'data-stream\s*=\s*(["\'])(?P<url>(?:(?!\1).)+)\1', webpage,
-            'stream url', default=None, group='url')
-        if stream_url:
-            stream_url = url_or_none(decode_url_old(stream_url))
-        if stream_url:
-            return stream_url
-
-        def decode_url(encoded_url):
-            return rot47(urllib.parse.unquote_plus(encoded_url))
-
-        return decode_url(self._parse_json(
-            self._search_regex(
-                r'(?s)InitializeStream\s*\(\s*({.+?})\s*\)\s*;', webpage,
-                'stream'),
-            video_id, transform_source=js_to_json)['source'])
diff --git a/plugins/youtube_download/yt_dlp/extractor/sharepoint.py b/plugins/youtube_download/yt_dlp/extractor/sharepoint.py
new file mode 100644
index 0000000..d4d5af0
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/sharepoint.py
@@ -0,0 +1,112 @@
+import json
+import urllib.parse
+
+from .common import InfoExtractor
+from ..utils import determine_ext, int_or_none, url_or_none
+from ..utils.traversal import traverse_obj
+
+
+class SharePointIE(InfoExtractor):
+    _BASE_URL_RE = r'https?://[\w-]+\.sharepoint\.com/'
+    _VALID_URL = [
+        rf'{_BASE_URL_RE}:v:/[a-z]/(?:[^/?#]+/)*(?P<id>[^/?#]{{46}})/?(?:$|[?#])',
+        rf'{_BASE_URL_RE}(?!:v:)(?:[^/?#]+/)*stream\.aspx\?(?:[^#]+&)?id=(?P<id>[^&#]+)',
+    ]
+    _TESTS = [{
+        'url': 'https://lut-my.sharepoint.com/:v:/g/personal/juha_eerola_student_lab_fi/EUrAmrktb4ZMhUcY9J2PqMEBD_9x_l0DyYWVgAvp-TTOMw?e=ZpQOOw',
+        'md5': '2950821d0d4937a0a76373782093b435',
+        'info_dict': {
+            'id': '01EQRS7EKKYCNLSLLPQZGIKRYY6SOY7KGB',
+            'display_id': 'EUrAmrktb4ZMhUcY9J2PqMEBD_9x_l0DyYWVgAvp-TTOMw',
+            'ext': 'mp4',
+            'title': 'CmvpJST',
+            'duration': 54.567,
+            'thumbnail': r're:https://.+/thumbnail',
+            'uploader_id': '8dcec565-a956-4b91-95e5-bacfb8bc015f',
+        },
+    }, {
+        'url': 'https://greaternyace.sharepoint.com/:v:/s/acementornydrive/ETski5eAfNVEoPRZUAyy1wEBpLgVFYWso5bjbZjfBLlPUg?e=PQUfVb',
+        'md5': 'c496a01644223273bff12e93e501afd1',
+        'info_dict': {
+            'id': '01QI4AVTZ3ESFZPAD42VCKB5CZKAGLFVYB',
+            'display_id': 'ETski5eAfNVEoPRZUAyy1wEBpLgVFYWso5bjbZjfBLlPUg',
+            'ext': 'mp4',
+            'title': '930103681233985536',
+            'duration': 3797.326,
+            'thumbnail': r're:https://.+/thumbnail',
+        },
+    }, {
+        'url': 'https://lut-my.sharepoint.com/personal/juha_eerola_student_lab_fi/_layouts/15/stream.aspx?id=%2Fpersonal%2Fjuha_eerola_student_lab_fi%2FDocuments%2FM-DL%2FCmvpJST.mp4&ga=1&referrer=StreamWebApp.Web&referrerScenario=AddressBarCopied.view',
+        'info_dict': {
+            'id': '01EQRS7EKKYCNLSLLPQZGIKRYY6SOY7KGB',
+            'display_id': '/personal/juha_eerola_student_lab_fi/Documents/M-DL/CmvpJST.mp4',
+            'ext': 'mp4',
+            'title': 'CmvpJST',
+            'duration': 54.567,
+            'thumbnail': r're:https://.+/thumbnail',
+            'uploader_id': '8dcec565-a956-4b91-95e5-bacfb8bc015f',
+        },
+        'skip': 'Session cookies needed',
+    }, {
+        'url': 'https://izoobasisschool.sharepoint.com/:v:/g/Eaqleq8COVBIvIPvod0U27oBypC6aWOkk8ptuDpmJ6arHw',
+        'only_matching': True,
+    }, {
+        'url': 'https://uskudaredutr-my.sharepoint.com/:v:/g/personal/songul_turkaydin_uskudar_edu_tr/EbTf-VRUIbtGuIN73tx1MuwBCHBOmNcWNqSLw61Fd2_o0g?e=n5Vkof',
+        'only_matching': True,
+    }, {
+        'url': 'https://epam-my.sharepoint.com/:v:/p/dzmitry_tamashevich/Ec4ZOs-rATZHjFYZWVxjczEB649FCoYFKDV_x3RxZiWAGA?e=4hswgA',
+        'only_matching': True,
+    }, {
+        'url': 'https://microsoft.sharepoint.com/:v:/t/MicrosoftSPARKRecordings-MSFTInternal/EWCyeqByVWBAt8wDvNZdV-UB0BvU5YVbKm0UHgdrUlI6dg?e=QbPck6',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        display_id = urllib.parse.unquote(self._match_id(url))
+        webpage, urlh = self._download_webpage_handle(url, display_id)
+        if urllib.parse.urlparse(urlh.url).hostname == 'login.microsoftonline.com':
+            self.raise_login_required(
+                'Session cookies are required for this URL and can be passed '
+                'with the --cookies option. The --cookies-from-browser option will not work', method=None)
+
+        video_data = self._search_json(r'g_fileInfo\s*=', webpage, 'player config', display_id)
+        video_id = video_data['VroomItemId']
+
+        parsed_url = urllib.parse.urlparse(video_data['.transformUrl'])
+        base_media_url = urllib.parse.urlunparse(parsed_url._replace(
+            path=urllib.parse.urljoin(f'{parsed_url.path}/', '../videomanifest'),
+            query=urllib.parse.urlencode({
+                **urllib.parse.parse_qs(parsed_url.query),
+                'cTag': video_data['.ctag'],
+                'action': 'Access',
+                'part': 'index',
+            }, doseq=True)))
+
+        # Web player adds more params to the format URLs but we still get all formats without them
+        formats = self._extract_mpd_formats(
+            base_media_url, video_id, mpd_id='dash', query={'format': 'dash'}, fatal=False)
+        for hls_type in ('hls', 'hls-vnext'):
+            formats.extend(self._extract_m3u8_formats(
+                base_media_url, video_id, 'mp4', m3u8_id=hls_type,
+                query={'format': hls_type}, fatal=False, quality=-2))
+
+        if video_url := traverse_obj(video_data, ('downloadUrl', {url_or_none})):
+            formats.append({
+                'url': video_url,
+                'ext': determine_ext(video_data.get('extension') or video_data.get('name')),
+                'quality': 1,
+                'format_id': 'source',
+                'filesize': int_or_none(video_data.get('size')),
+                'vcodec': 'none' if video_data.get('isAudio') is True else None,
+            })
+
+        return {
+            'id': video_id,
+            'formats': formats,
+            'title': video_data.get('title') or video_data.get('displayName'),
+            'display_id': display_id,
+            'uploader_id': video_data.get('authorId'),
+            'duration': traverse_obj(video_data, (
+                'MediaServiceFastMetadata', {json.loads}, 'media', 'duration', {lambda x: x / 10000000})),
+            'thumbnail': url_or_none(video_data.get('thumbnailUrl')),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/shemaroome.py b/plugins/youtube_download/yt_dlp/extractor/shemaroome.py
index ec9938b..3ab322f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/shemaroome.py
+++ b/plugins/youtube_download/yt_dlp/extractor/shemaroome.py
@@ -1,12 +1,9 @@
+import base64
+
 from .common import InfoExtractor
-from ..aes import aes_cbc_decrypt, unpad_pkcs7
-from ..compat import (
-    compat_b64decode,
-)
+from ..aes import aes_cbc_decrypt_bytes, unpad_pkcs7
 from ..utils import (
-    bytes_to_intlist,
     ExtractorError,
-    intlist_to_bytes,
     unified_strdate,
 )
 
@@ -24,8 +21,8 @@ class ShemarooMeIE(InfoExtractor):
             'description': 'md5:2782c4127807103cf5a6ae2ca33645ce',
         },
         'params': {
-            'skip_download': True
-        }
+            'skip_download': True,
+        },
     }, {
         'url': 'https://www.shemaroome.com/shows/jurm-aur-jazbaat/laalach',
         'info_dict': {
@@ -37,9 +34,9 @@ class ShemarooMeIE(InfoExtractor):
             'release_date': '20210507',
         },
         'params': {
-            'skip_download': True
+            'skip_download': True,
         },
-        'skip': 'Premium videos cannot be downloaded yet.'
+        'skip': 'Premium videos cannot be downloaded yet.',
     }, {
         'url': 'https://www.shemaroome.com/shows/jai-jai-jai-bajrang-bali/jai-jai-jai-bajrang-bali-episode-99',
         'info_dict': {
@@ -51,8 +48,8 @@ class ShemarooMeIE(InfoExtractor):
             'release_date': '20110101',
         },
         'params': {
-            'skip_download': True
-        }
+            'skip_download': True,
+        },
     }]
 
     def _real_extract(self, url):
@@ -69,10 +66,10 @@ class ShemarooMeIE(InfoExtractor):
         data_json = self._download_json('https://www.shemaroome.com/users/user_all_lists', video_id, data=data.encode())
         if not data_json.get('status'):
             raise ExtractorError('Premium videos cannot be downloaded yet.', expected=True)
-        url_data = bytes_to_intlist(compat_b64decode(data_json['new_play_url']))
-        key = bytes_to_intlist(compat_b64decode(data_json['key']))
-        iv = [0] * 16
-        m3u8_url = unpad_pkcs7(intlist_to_bytes(aes_cbc_decrypt(url_data, key, iv))).decode('ascii')
+        url_data = base64.b64decode(data_json['new_play_url'])
+        key = base64.b64decode(data_json['key'])
+        iv = bytes(16)
+        m3u8_url = unpad_pkcs7(aes_cbc_decrypt_bytes(url_data, key, iv)).decode('ascii')
         headers = {'stream_key': data_json['stream_key']}
         formats, m3u8_subs = self._extract_m3u8_formats_and_subtitles(m3u8_url, video_id, fatal=False, headers=headers)
         for fmt in formats:
diff --git a/plugins/youtube_download/yt_dlp/extractor/showroomlive.py b/plugins/youtube_download/yt_dlp/extractor/showroomlive.py
index ab18953..303f0b3 100644
--- a/plugins/youtube_download/yt_dlp/extractor/showroomlive.py
+++ b/plugins/youtube_download/yt_dlp/extractor/showroomlive.py
@@ -1,5 +1,4 @@
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     ExtractorError,
     int_or_none,
@@ -24,18 +23,18 @@ class ShowRoomLiveIE(InfoExtractor):
              r'(?:profile|room)\?room_id\=(\d+)'), webpage, 'room_id')
 
         room = self._download_json(
-            urljoin(url, '/api/room/profile?room_id=%s' % room_id),
+            urljoin(url, f'/api/room/profile?room_id={room_id}'),
             broadcaster_id)
 
         is_live = room.get('is_onlive')
         if is_live is not True:
-            raise ExtractorError('%s is offline' % broadcaster_id, expected=True)
+            raise ExtractorError(f'{broadcaster_id} is offline', expected=True)
 
         uploader = room.get('performer_name') or broadcaster_id
         title = room.get('room_name') or room.get('main_name') or uploader
 
         streaming_url_list = self._download_json(
-            urljoin(url, '/api/live/streaming_url?room_id=%s' % room_id),
+            urljoin(url, f'/api/live/streaming_url?room_id={room_id}'),
             broadcaster_id)['streaming_url_list']
 
         formats = []
@@ -68,7 +67,7 @@ class ShowRoomLiveIE(InfoExtractor):
                 })
 
         return {
-            'id': compat_str(room.get('live_id') or broadcaster_id),
+            'id': str(room.get('live_id') or broadcaster_id),
             'title': title,
             'description': room.get('description'),
             'timestamp': int_or_none(room.get('current_live_started_at')),
diff --git a/plugins/youtube_download/yt_dlp/extractor/sibnet.py b/plugins/youtube_download/yt_dlp/extractor/sibnet.py
index 73bb75d..c3fb72e 100644
--- a/plugins/youtube_download/yt_dlp/extractor/sibnet.py
+++ b/plugins/youtube_download/yt_dlp/extractor/sibnet.py
@@ -8,10 +8,10 @@ class SibnetEmbedIE(InfoExtractor):
     _WEBPAGE_TESTS = [{
         'url': 'https://phpbb3.x-tk.ru/bbcode-video-sibnet-t24.html',
         'info_dict': {
-            'id': 'shell',  # FIXME?
+            'id': 'shell',  # FIXME: Non unique ID?
             'ext': 'mp4',
             'age_limit': 0,
             'thumbnail': 'https://video.sibnet.ru/upload/cover/video_1887072_0.jpg',
             'title': 'КВН Москва не сразу строилась  - Девушка впервые играет в Mortal Kombat',
-        }
+        },
     }]
diff --git a/plugins/youtube_download/yt_dlp/extractor/simplecast.py b/plugins/youtube_download/yt_dlp/extractor/simplecast.py
index ec349dd..f6bb130 100644
--- a/plugins/youtube_download/yt_dlp/extractor/simplecast.py
+++ b/plugins/youtube_download/yt_dlp/extractor/simplecast.py
@@ -19,7 +19,7 @@ class SimplecastBaseIE(InfoExtractor):
 
     def _call_search_api(self, resource, resource_id, resource_url):
         return self._download_json(
-            'https://api.simplecast.com/%ss/search' % resource, resource_id,
+            f'https://api.simplecast.com/{resource}s/search', resource_id,
             data=urlencode_postdata({'url': resource_url}))
 
     def _parse_episode(self, episode):
@@ -33,7 +33,7 @@ class SimplecastBaseIE(InfoExtractor):
         season_id = None
         if season_href:
             season_id = self._search_regex(
-                r'https?://api.simplecast.com/seasons/(%s)' % self._UUID_REGEX,
+                rf'https?://api.simplecast.com/seasons/({self._UUID_REGEX})',
                 season_href, 'season id', default=None)
 
         webpage_url = episode.get('episode_url')
@@ -65,7 +65,7 @@ class SimplecastBaseIE(InfoExtractor):
 
 class SimplecastIE(SimplecastBaseIE):
     IE_NAME = 'simplecast'
-    _VALID_URL = r'https?://(?:api\.simplecast\.com/episodes|player\.simplecast\.com)/(?P<id>%s)' % SimplecastBaseIE._UUID_REGEX
+    _VALID_URL = rf'https?://(?:api\.simplecast\.com/episodes|player\.simplecast\.com)/(?P<id>{SimplecastBaseIE._UUID_REGEX})'
     _EMBED_REGEX = [rf'''(?x)<iframe[^>]+src=["\']
         (?P<url>https?://(?:
             embed\.simplecast\.com/[0-9a-f]{8}|
diff --git a/plugins/youtube_download/yt_dlp/extractor/sina.py b/plugins/youtube_download/yt_dlp/extractor/sina.py
index 9842811..974af1b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/sina.py
+++ b/plugins/youtube_download/yt_dlp/extractor/sina.py
@@ -11,7 +11,7 @@ from ..utils import (
 
 
 class SinaIE(InfoExtractor):
-    _VALID_URL = r'''(?x)https?://(?:.*?\.)?video\.sina\.com\.cn/
+    _VALID_URL = r'''(?x)https?://(?:[^/?#]+\.)?video\.sina\.com\.cn/
                         (?:
                             (?:view/|.*\#)(?P<id>\d+)|
                             .+?/(?P<pseudo_id>[^/?#]+)(?:\.s?html)|
@@ -28,7 +28,7 @@ class SinaIE(InfoExtractor):
                 'id': '250576622',
                 'ext': 'mp4',
                 'title': '现场:克鲁兹宣布退选 特朗普将稳获提名',
-            }
+            },
         },
         {
             'url': 'http://video.sina.com.cn/v/b/101314253-1290078633.html',
@@ -66,8 +66,7 @@ class SinaIE(InfoExtractor):
                 webpage = self._download_webpage(url, pseudo_id)
                 error = get_element_by_attribute('class', 'errtitle', webpage)
                 if error:
-                    raise ExtractorError('%s said: %s' % (
-                        self.IE_NAME, clean_html(error)), expected=True)
+                    raise ExtractorError(f'{self.IE_NAME} said: {clean_html(error)}', expected=True)
                 video_id = self._search_regex(
                     r"video_id\s*:\s*'(\d+)'", webpage, 'video id')
 
@@ -75,7 +74,7 @@ class SinaIE(InfoExtractor):
             'http://s.video.sina.com.cn/video/h5play',
             video_id, query={'video_id': video_id})
         if video_data['code'] != 1:
-            raise ExtractorError('%s said: %s' % (
+            raise ExtractorError('{} said: {}'.format(
                 self.IE_NAME, video_data['message']), expected=True)
         else:
             video_data = video_data['data']
diff --git a/plugins/youtube_download/yt_dlp/extractor/sixplay.py b/plugins/youtube_download/yt_dlp/extractor/sixplay.py
index ef93b92..6037a35 100644
--- a/plugins/youtube_download/yt_dlp/extractor/sixplay.py
+++ b/plugins/youtube_download/yt_dlp/extractor/sixplay.py
@@ -1,13 +1,10 @@
 from .common import InfoExtractor
-from ..compat import (
-    compat_str,
-)
 from ..utils import (
     determine_ext,
     int_or_none,
     parse_qs,
-    try_get,
     qualities,
+    try_get,
 )
 
 
@@ -44,9 +41,9 @@ class SixPlayIE(InfoExtractor):
         }.get(domain, ('6play', 'm6web'))
 
         data = self._download_json(
-            'https://pc.middleware.6play.fr/6play/v2/platforms/m6group_web/services/%s/videos/clip_%s' % (service, video_id),
+            f'https://pc.middleware.6play.fr/6play/v2/platforms/m6group_web/services/{service}/videos/clip_{video_id}',
             video_id, headers={
-                'x-customer-name': consumer_name
+                'x-customer-name': consumer_name,
             }, query={
                 'csa': 5,
                 'with': 'clips',
@@ -82,7 +79,7 @@ class SixPlayIE(InfoExtractor):
                         asset_url = urlh.url
                     asset_url = asset_url.replace('_drmnp.ism/', '_unpnp.ism/')
                     for i in range(3, 0, -1):
-                        asset_url = asset_url = asset_url.replace('_sd1/', '_sd%d/' % i)
+                        asset_url = asset_url.replace('_sd1/', f'_sd{i}/')
                         m3u8_formats = self._extract_m3u8_formats(
                             asset_url, video_id, 'mp4', 'm3u8_native',
                             m3u8_id='hls', fatal=False)
@@ -107,7 +104,7 @@ class SixPlayIE(InfoExtractor):
 
         def get(getter):
             for src in (data, clip_data):
-                v = try_get(src, getter, compat_str)
+                v = try_get(src, getter, str)
                 if v:
                     return v
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/skeb.py b/plugins/youtube_download/yt_dlp/extractor/skeb.py
index e02f8ce..bc5ec3d 100644
--- a/plugins/youtube_download/yt_dlp/extractor/skeb.py
+++ b/plugins/youtube_download/yt_dlp/extractor/skeb.py
@@ -10,7 +10,7 @@ class SkebIE(InfoExtractor):
         'info_dict': {
             'id': '466853',
             'title': '内容はおまかせします！ by 姫ノ森りぃる@一周年',
-            'descripion': 'md5:1ec50901efc3437cfbfe3790468d532d',
+            'description': 'md5:1ec50901efc3437cfbfe3790468d532d',
             'uploader': '姫ノ森りぃる@一周年',
             'uploader_id': 'riiru_wm',
             'age_limit': 0,
@@ -20,8 +20,8 @@ class SkebIE(InfoExtractor):
             'subtitles': {
                 'jpn': [{
                     'url': r're:https://skeb.+',
-                    'ext': 'vtt'
-                }]
+                    'ext': 'vtt',
+                }],
             },
             'width': 720,
             'height': 405,
@@ -34,7 +34,7 @@ class SkebIE(InfoExtractor):
         'info_dict': {
             'id': '489408',
             'title': 'いつもお世話になってお... by 古川ノブ@音楽とVlo...',
-            'descripion': 'md5:5adc2e41d06d33b558bf7b1faeb7b9c2',
+            'description': 'md5:5adc2e41d06d33b558bf7b1faeb7b9c2',
             'uploader': '古川ノブ@音楽とVlogのVtuber',
             'uploader_id': 'furukawa_nob',
             'age_limit': 0,
@@ -48,8 +48,8 @@ class SkebIE(InfoExtractor):
             'subtitles': {
                 'jpn': [{
                     'url': r're:https://skeb.+',
-                    'ext': 'vtt'
-                }]
+                    'ext': 'vtt',
+                }],
             },
             'duration': 98,
             'ext': 'mp3',
@@ -61,17 +61,17 @@ class SkebIE(InfoExtractor):
         'info_dict': {
             'id': '6',
             'title': 'ヒロ。\n\n私のキャラク... by 諸々',
-            'descripion': 'md5:aa6cbf2ba320b50bce219632de195f07',
+            'description': 'md5:aa6cbf2ba320b50bce219632de195f07',
             '_type': 'playlist',
             'entries': [{
                 'id': '486430',
                 'title': 'ヒロ。\n\n私のキャラク... by 諸々',
-                'descripion': 'md5:aa6cbf2ba320b50bce219632de195f07',
+                'description': 'md5:aa6cbf2ba320b50bce219632de195f07',
             }, {
                 'id': '486431',
                 'title': 'ヒロ。\n\n私のキャラク... by 諸々',
-            }]
-        }
+            }],
+        },
     }]
 
     def _real_extract(self, url):
@@ -81,7 +81,7 @@ class SkebIE(InfoExtractor):
         parent = {
             'id': video_id,
             'title': nuxt_data.get('title'),
-            'descripion': nuxt_data.get('description'),
+            'description': nuxt_data.get('description'),
             'uploader': traverse_obj(nuxt_data, ('creator', 'name')),
             'uploader_id': traverse_obj(nuxt_data, ('creator', 'screen_name')),
             'age_limit': 18 if nuxt_data.get('nsfw') else 0,
@@ -106,7 +106,7 @@ class SkebIE(InfoExtractor):
             if width is not None and height is not None:
                 # the longest side is at most 720px for non-client viewers
                 max_size = max(width, height)
-                width, height = list(x * 720 // max_size for x in (width, height))
+                width, height = (x * 720 // max_size for x in (width, height))
             entries.append({
                 **parent,
                 'id': str(item['id']),
@@ -116,7 +116,7 @@ class SkebIE(InfoExtractor):
                     'jpn': [{
                         'url': item.get('vtt_url'),
                         'ext': 'vtt',
-                    }]
+                    }],
                 } if item.get('vtt_url') else None,
                 'width': width,
                 'height': height,
diff --git a/plugins/youtube_download/yt_dlp/extractor/sky.py b/plugins/youtube_download/yt_dlp/extractor/sky.py
index 0a8b6cc..5c9e4f3 100644
--- a/plugins/youtube_download/yt_dlp/extractor/sky.py
+++ b/plugins/youtube_download/yt_dlp/extractor/sky.py
@@ -3,9 +3,7 @@ import re
 from .common import InfoExtractor
 from ..utils import (
     extract_attributes,
-    smuggle_url,
     strip_or_none,
-    urljoin,
 )
 
 
@@ -13,29 +11,10 @@ class SkyBaseIE(InfoExtractor):
     BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/%s/%s_default/index.html?videoId=%s'
     _SDC_EL_REGEX = r'(?s)(<div[^>]+data-(?:component-name|fn)="sdc-(?:articl|sit)e-video"[^>]*>)'
 
-    def _process_ooyala_element(self, webpage, sdc_el, url):
+    def _process_video_element(self, webpage, sdc_el, url):
         sdc = extract_attributes(sdc_el)
         provider = sdc.get('data-provider')
-        if provider == 'ooyala':
-            video_id = sdc['data-sdc-video-id']
-            video_url = 'ooyala:%s' % video_id
-            ie_key = 'Ooyala'
-            ooyala_el = self._search_regex(
-                r'(<div[^>]+class="[^"]*\bsdc-article-video__media-ooyala\b[^"]*"[^>]+data-video-id="%s"[^>]*>)' % video_id,
-                webpage, 'video data', fatal=False)
-            if ooyala_el:
-                ooyala_attrs = extract_attributes(ooyala_el) or {}
-                if ooyala_attrs.get('data-token-required') == 'true':
-                    token_fetch_url = (self._parse_json(ooyala_attrs.get(
-                        'data-token-fetch-options', '{}'),
-                        video_id, fatal=False) or {}).get('url')
-                    if token_fetch_url:
-                        embed_token = self._download_json(urljoin(
-                            url, token_fetch_url), video_id, fatal=False)
-                        if embed_token:
-                            video_url = smuggle_url(
-                                video_url, {'embed_token': embed_token})
-        elif provider == 'brightcove':
+        if provider == 'brightcove':
             video_id = sdc['data-video-id']
             account_id = sdc.get('data-account-id') or '6058004172001'
             player_id = sdc.get('data-player-id') or 'RC9PQUaJ6'
@@ -52,7 +31,7 @@ class SkyBaseIE(InfoExtractor):
     def _real_extract(self, url):
         video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
-        info = self._process_ooyala_element(webpage, self._search_regex(
+        info = self._process_video_element(webpage, self._search_regex(
             self._SDC_EL_REGEX, webpage, 'sdc element'), url)
         info.update({
             'title': self._og_search_title(webpage),
@@ -73,7 +52,7 @@ class SkySportsIE(SkyBaseIE):
             'title': 'Bale: It\'s our time to shine',
             'description': 'md5:e88bda94ae15f7720c5cb467e777bb6d',
         },
-        'add_ie': ['Ooyala'],
+        'add_ie': ['BrightcoveNew'],
     }, {
         'url': 'https://www.skysports.com/watch/video/sports/f1/12160544/abu-dhabi-gp-the-notebook',
         'only_matching': True,
@@ -115,14 +94,14 @@ class SkyNewsStoryIE(SkyBaseIE):
             'upload_date': '20211027',
             'timestamp': 1635317494,
             'uploader_id': '6058004172001',
-        }
+        },
     }
 
     def _real_extract(self, url):
         article_id = self._match_id(url)
         webpage = self._download_webpage(url, article_id)
 
-        entries = [self._process_ooyala_element(webpage, sdc_el, url)
+        entries = [self._process_video_element(webpage, sdc_el, url)
                    for sdc_el in re.findall(self._SDC_EL_REGEX, webpage)]
 
         return self.playlist_result(
@@ -149,7 +128,7 @@ class SkySportsNewsIE(SkyBaseIE):
 
         entries = []
         for sdc_el in re.findall(self._SDC_EL_REGEX, webpage):
-            entries.append(self._process_ooyala_element(webpage, sdc_el, url))
+            entries.append(self._process_video_element(webpage, sdc_el, url))
 
         return self.playlist_result(
             entries, article_id, self._og_search_title(webpage),
diff --git a/plugins/youtube_download/yt_dlp/extractor/skyit.py b/plugins/youtube_download/yt_dlp/extractor/skyit.py
index 42d30f7..0013d26 100644
--- a/plugins/youtube_download/yt_dlp/extractor/skyit.py
+++ b/plugins/youtube_download/yt_dlp/extractor/skyit.py
@@ -1,19 +1,19 @@
+import urllib.parse
+
 from .common import InfoExtractor
-from ..compat import (
-    compat_parse_qs,
-    compat_urllib_parse_urlparse,
-)
 from ..utils import (
+    clean_html,
     dict_get,
     int_or_none,
     parse_duration,
     unified_timestamp,
+    url_or_none,
+    urljoin,
 )
+from ..utils.traversal import traverse_obj
 
 
-class SkyItPlayerIE(InfoExtractor):
-    IE_NAME = 'player.sky.it'
-    _VALID_URL = r'https?://player\.sky\.it/player/(?:external|social)\.html\?.*?\bid=(?P<id>\d+)'
+class SkyItBaseIE(InfoExtractor):
     _GEO_BYPASS = False
     _DOMAIN = 'sky'
     _PLAYER_TMPL = 'https://player.sky.it/player/external.html?id=%s&domain=%s'
@@ -35,7 +35,6 @@ class SkyItPlayerIE(InfoExtractor):
             SkyItPlayerIE.ie_key(), video_id)
 
     def _parse_video(self, video, video_id):
-        title = video['title']
         is_live = video.get('type') == 'live'
         hls_url = video.get(('streaming' if is_live else 'hls') + '_url')
         if not hls_url and video.get('geoblock' if is_live else 'geob'):
@@ -45,7 +44,7 @@ class SkyItPlayerIE(InfoExtractor):
 
         return {
             'id': video_id,
-            'title': title,
+            'title': video.get('title'),
             'formats': formats,
             'thumbnail': dict_get(video, ('video_still', 'video_still_medium', 'thumb')),
             'description': video.get('short_desc') or None,
@@ -54,9 +53,14 @@ class SkyItPlayerIE(InfoExtractor):
             'is_live': is_live,
         }
 
+
+class SkyItPlayerIE(SkyItBaseIE):
+    IE_NAME = 'player.sky.it'
+    _VALID_URL = r'https?://player\.sky\.it/player/(?:external|social)\.html\?.*?\bid=(?P<id>\d+)'
+
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        domain = compat_parse_qs(compat_urllib_parse_urlparse(
+        domain = urllib.parse.parse_qs(urllib.parse.urlparse(
             url).query).get('domain', [None])[0]
         token = dict_get(self._TOKEN_MAP, (domain, 'sky'))
         video = self._download_json(
@@ -64,12 +68,12 @@ class SkyItPlayerIE(InfoExtractor):
             video_id, query={
                 'caller': 'sky',
                 'id': video_id,
-                'token': token
+                'token': token,
             }, headers=self.geo_verification_headers())
         return self._parse_video(video, video_id)
 
 
-class SkyItVideoIE(SkyItPlayerIE):  # XXX: Do not subclass from concrete IE
+class SkyItVideoIE(SkyItBaseIE):
     IE_NAME = 'video.sky.it'
     _VALID_URL = r'https?://(?:masterchef|video|xfactor)\.sky\.it(?:/[^/]+)*/video/[0-9a-z-]+-(?P<id>\d+)'
     _TESTS = [{
@@ -98,7 +102,7 @@ class SkyItVideoIE(SkyItPlayerIE):  # XXX: Do not subclass from concrete IE
         return self._player_url_result(video_id)
 
 
-class SkyItVideoLiveIE(SkyItPlayerIE):  # XXX: Do not subclass from concrete IE
+class SkyItVideoLiveIE(SkyItBaseIE):
     IE_NAME = 'video.sky.it:live'
     _VALID_URL = r'https?://video\.sky\.it/diretta/(?P<id>[^/?&#]+)'
     _TEST = {
@@ -126,7 +130,7 @@ class SkyItVideoLiveIE(SkyItPlayerIE):  # XXX: Do not subclass from concrete IE
         return self._parse_video(livestream, asset_id)
 
 
-class SkyItIE(SkyItPlayerIE):  # XXX: Do not subclass from concrete IE
+class SkyItIE(SkyItBaseIE):
     IE_NAME = 'sky.it'
     _VALID_URL = r'https?://(?:sport|tg24)\.sky\.it(?:/[^/]+)*/\d{4}/\d{2}/\d{2}/(?P<id>[^/?&#]+)'
     _TESTS = [{
@@ -225,3 +229,80 @@ class TV8ItIE(SkyItVideoIE):  # XXX: Do not subclass from concrete IE
         'params': {'skip_download': 'm3u8'},
     }]
     _DOMAIN = 'mtv8'
+
+
+class TV8ItLiveIE(SkyItBaseIE):
+    IE_NAME = 'tv8.it:live'
+    IE_DESC = 'TV8 Live'
+    _VALID_URL = r'https?://(?:www\.)?tv8\.it/streaming'
+    _TESTS = [{
+        'url': 'https://tv8.it/streaming',
+        'info_dict': {
+            'id': 'tv8',
+            'ext': 'mp4',
+            'title': str,
+            'description': str,
+            'is_live': True,
+            'live_status': 'is_live',
+        },
+    }]
+
+    def _real_extract(self, url):
+        video_id = 'tv8'
+        livestream = self._download_json(
+            'https://apid.sky.it/vdp/v1/getLivestream', video_id,
+            'Downloading manifest JSON', query={'id': '7'})
+        metadata = self._download_json('https://tv8.it/api/getStreaming', video_id, fatal=False)
+
+        return {
+            **self._parse_video(livestream, video_id),
+            **traverse_obj(metadata, ('info', {
+                'title': ('title', 'text', {str}),
+                'description': ('description', 'html', {clean_html}),
+            })),
+        }
+
+
+class TV8ItPlaylistIE(InfoExtractor):
+    IE_NAME = 'tv8.it:playlist'
+    IE_DESC = 'TV8 Playlist'
+    _VALID_URL = r'https?://(?:www\.)?tv8\.it/(?!video)[^/#?]+/(?P<id>[^/#?]+)'
+    _TESTS = [{
+        'url': 'https://tv8.it/intrattenimento/tv8-gialappas-night',
+        'playlist_mincount': 32,
+        'info_dict': {
+            'id': 'tv8-gialappas-night',
+            'title': 'Tv8 Gialappa\'s Night',
+            'description': 'md5:c876039d487d9cf40229b768872718ed',
+            'thumbnail': r're:https://static\.sky\.it/.+\.(png|jpe?g|webp)',
+        },
+    }, {
+        'url': 'https://tv8.it/sport/uefa-europa-league',
+        'playlist_mincount': 11,
+        'info_dict': {
+            'id': 'uefa-europa-league',
+            'title': 'UEFA Europa League',
+            'description': 'md5:9ab1832b7a8b1705b1f590e13a36bc6a',
+            'thumbnail': r're:https://static\.sky\.it/.+\.(png|jpe?g|webp)',
+        },
+    }]
+
+    def _real_extract(self, url):
+        playlist_id = self._match_id(url)
+        webpage = self._download_webpage(url, playlist_id)
+        data = self._search_nextjs_data(webpage, playlist_id)['props']['pageProps']['data']
+        entries = [self.url_result(
+            urljoin('https://tv8.it', card['href']), ie=TV8ItIE,
+            **traverse_obj(card, {
+                'description': ('extraData', 'videoDesc', {str}),
+                'id': ('extraData', 'asset_id', {str}),
+                'thumbnail': ('image', 'src', {url_or_none}),
+                'title': ('title', 'typography', 'text', {str}),
+            }))
+            for card in traverse_obj(data, ('lastContent', 'cards', lambda _, v: v['href']))]
+
+        return self.playlist_result(entries, playlist_id, **traverse_obj(data, ('card', 'desktop', {
+            'description': ('description', 'html', {clean_html}),
+            'thumbnail': ('image', 'src', {url_or_none}),
+            'title': ('title', 'text', {str}),
+        })))
diff --git a/plugins/youtube_download/yt_dlp/extractor/skylinewebcams.py b/plugins/youtube_download/yt_dlp/extractor/skylinewebcams.py
index 4292bb2..102a2f9 100644
--- a/plugins/youtube_download/yt_dlp/extractor/skylinewebcams.py
+++ b/plugins/youtube_download/yt_dlp/extractor/skylinewebcams.py
@@ -2,6 +2,7 @@ from .common import InfoExtractor
 
 
 class SkylineWebcamsIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?skylinewebcams\.com/[^/]+/webcam/(?:[^/]+/)+(?P<id>[^/]+)\.html'
     _TEST = {
         'url': 'https://www.skylinewebcams.com/it/webcam/italia/lazio/roma/scalinata-piazza-di-spagna-barcaccia.html',
@@ -14,7 +15,7 @@ class SkylineWebcamsIE(InfoExtractor):
         },
         'params': {
             'skip_download': True,
-        }
+        },
     }
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/skynewsarabia.py b/plugins/youtube_download/yt_dlp/extractor/skynewsarabia.py
index 6264b04..7ac2443 100644
--- a/plugins/youtube_download/yt_dlp/extractor/skynewsarabia.py
+++ b/plugins/youtube_download/yt_dlp/extractor/skynewsarabia.py
@@ -1,8 +1,7 @@
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
-    parse_iso8601,
     parse_duration,
+    parse_iso8601,
 )
 
 
@@ -10,7 +9,7 @@ class SkyNewsArabiaBaseIE(InfoExtractor):
     _IMAGE_BASE_URL = 'http://www.skynewsarabia.com/web/images'
 
     def _call_api(self, path, value):
-        return self._download_json('http://api.skynewsarabia.com/web/rest/v2/%s/%s.json' % (path, value), value)
+        return self._download_json(f'http://api.skynewsarabia.com/web/rest/v2/{path}/{value}.json', value)
 
     def _get_limelight_media_id(self, url):
         return self._search_regex(r'/media/[^/]+/([a-z0-9]{32})', url, 'limelight media id')
@@ -19,11 +18,11 @@ class SkyNewsArabiaBaseIE(InfoExtractor):
         return self._IMAGE_BASE_URL + image_path_template.format(width=width, height=height)
 
     def _extract_video_info(self, video_data):
-        video_id = compat_str(video_data['id'])
+        video_id = str(video_data['id'])
         topic = video_data.get('topicTitle')
         return {
             '_type': 'url_transparent',
-            'url': 'limelight:media:%s' % self._get_limelight_media_id(video_data['videoUrl'][0]['url']),
+            'url': 'limelight:media:{}'.format(self._get_limelight_media_id(video_data['videoUrl'][0]['url'])),
             'id': video_id,
             'title': video_data['headline'],
             'description': video_data.get('summary'),
@@ -32,12 +31,13 @@ class SkyNewsArabiaBaseIE(InfoExtractor):
             'duration': parse_duration(video_data.get('runTime')),
             'tags': video_data.get('tags', []),
             'categories': [topic] if topic else [],
-            'webpage_url': 'http://www.skynewsarabia.com/web/video/%s' % video_id,
+            'webpage_url': f'http://www.skynewsarabia.com/web/video/{video_id}',
             'ie_key': 'LimelightMedia',
         }
 
 
 class SkyNewsArabiaIE(SkyNewsArabiaBaseIE):
+    _WORKING = False
     IE_NAME = 'skynewsarabia:video'
     _VALID_URL = r'https?://(?:www\.)?skynewsarabia\.com/web/video/(?P<id>[0-9]+)'
     _TEST = {
@@ -64,6 +64,7 @@ class SkyNewsArabiaIE(SkyNewsArabiaBaseIE):
 
 
 class SkyNewsArabiaArticleIE(SkyNewsArabiaBaseIE):
+    _WORKING = False
     IE_NAME = 'skynewsarabia:article'
     _VALID_URL = r'https?://(?:www\.)?skynewsarabia\.com/web/article/(?P<id>[0-9]+)'
     _TESTS = [{
@@ -99,7 +100,7 @@ class SkyNewsArabiaArticleIE(SkyNewsArabiaBaseIE):
             topic = article_data.get('topicTitle')
             return {
                 '_type': 'url_transparent',
-                'url': 'limelight:media:%s' % self._get_limelight_media_id(media_asset['videoUrl'][0]['url']),
+                'url': 'limelight:media:{}'.format(self._get_limelight_media_id(media_asset['videoUrl'][0]['url'])),
                 'id': article_id,
                 'title': article_data['headline'],
                 'description': article_data.get('summary'),
diff --git a/plugins/youtube_download/yt_dlp/extractor/skynewsau.py b/plugins/youtube_download/yt_dlp/extractor/skynewsau.py
index 43a9c82..617738a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/skynewsau.py
+++ b/plugins/youtube_download/yt_dlp/extractor/skynewsau.py
@@ -22,21 +22,21 @@ class SkyNewsAUIE(InfoExtractor):
             'tags': ['fblink', 'msn', 'usa', 'world', 'yt'],
             'upload_date': '20211015',
         },
-        'params': {'skip_download': True, 'format': 'bv'}
+        'params': {'skip_download': True, 'format': 'bv'},
     }]
 
     _API_KEY = '6krsj3w249nk779d8fukqx9f'
 
     def _real_extract(self, url):
-        id = self._match_id(url)
-        webpage = self._download_webpage(url, id)
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
         embedcode = self._search_regex(r'embedcode\s?=\s?\"([^\"]+)\"', webpage, 'embedcode')
         data_json = self._download_json(
-            f'https://content.api.news/v3/videos/brightcove/{embedcode}?api_key={self._API_KEY}', id)['content']
+            f'https://content.api.news/v3/videos/brightcove/{embedcode}?api_key={self._API_KEY}', video_id)['content']
         return {
-            'id': id,
+            'id': video_id,
             '_type': 'url_transparent',
-            'url': 'https://players.brightcove.net/%s/default_default/index.html?videoId=%s' % tuple(embedcode.split('-')),
+            'url': 'https://players.brightcove.net/{}/default_default/index.html?videoId={}'.format(*tuple(embedcode.split('-'))),
             'ie_key': 'BrightcoveNew',
             'title': data_json.get('caption'),
             'upload_date': unified_strdate(try_get(data_json, lambda x: x['date']['created'])),
diff --git a/plugins/youtube_download/yt_dlp/extractor/slideshare.py b/plugins/youtube_download/yt_dlp/extractor/slideshare.py
index ab9dad0..302b6e1 100644
--- a/plugins/youtube_download/yt_dlp/extractor/slideshare.py
+++ b/plugins/youtube_download/yt_dlp/extractor/slideshare.py
@@ -1,9 +1,7 @@
 import json
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_urlparse,
-)
 from ..utils import (
     ExtractorError,
     get_element_by_id,
@@ -32,12 +30,12 @@ class SlideshareIE(InfoExtractor):
             webpage, 'slideshare object')
         info = json.loads(slideshare_obj)
         if info['slideshow']['type'] != 'video':
-            raise ExtractorError('Webpage type is "%s": only video extraction is supported for Slideshare' % info['slideshow']['type'], expected=True)
+            raise ExtractorError('Webpage type is "{}": only video extraction is supported for Slideshare'.format(info['slideshow']['type']), expected=True)
 
         doc = info['doc']
         bucket = info['jsplayer']['video_bucket']
         ext = info['jsplayer']['video_extension']
-        video_url = compat_urlparse.urljoin(bucket, doc + '-SD.' + ext)
+        video_url = urllib.parse.urljoin(bucket, doc + '-SD.' + ext)
         description = get_element_by_id('slideshow-description-paragraph', webpage) or self._html_search_regex(
             r'(?s)<p[^>]+itemprop="description"[^>]*>(.+?)</p>', webpage,
             'description', fatal=False)
diff --git a/plugins/youtube_download/yt_dlp/extractor/slideslive.py b/plugins/youtube_download/yt_dlp/extractor/slideslive.py
index 25f867a..e684ac7 100644
--- a/plugins/youtube_download/yt_dlp/extractor/slideslive.py
+++ b/plugins/youtube_download/yt_dlp/extractor/slideslive.py
@@ -1,5 +1,6 @@
 import re
 import urllib.parse
+import xml.etree.ElementTree
 
 from .common import InfoExtractor
 from ..utils import (
@@ -24,8 +25,8 @@ class SlidesLiveIE(InfoExtractor):
             'id': '38902413',
             'ext': 'mp4',
             'title': 'GCC IA16 backend',
-            'timestamp': 1648189972,
-            'upload_date': '20220325',
+            'timestamp': 1697793372,
+            'upload_date': '20231020',
             'thumbnail': r're:^https?://.*\.jpg',
             'thumbnails': 'count:42',
             'chapters': 'count:41',
@@ -41,8 +42,8 @@ class SlidesLiveIE(InfoExtractor):
             'id': '38935785',
             'ext': 'mp4',
             'title': 'Offline Reinforcement Learning: From Algorithms to Practical Challenges',
-            'upload_date': '20211115',
-            'timestamp': 1636996003,
+            'upload_date': '20231020',
+            'timestamp': 1697807002,
             'thumbnail': r're:^https?://.*\.(?:jpg|png)',
             'thumbnails': 'count:640',
             'chapters': 'count:639',
@@ -58,9 +59,9 @@ class SlidesLiveIE(InfoExtractor):
             'id': '38973182',
             'ext': 'mp4',
             'title': 'How Should a Machine Learning Researcher Think About AI Ethics?',
-            'upload_date': '20220201',
+            'upload_date': '20231020',
             'thumbnail': r're:^https?://.*\.jpg',
-            'timestamp': 1643728135,
+            'timestamp': 1697822521,
             'thumbnails': 'count:3',
             'chapters': 'count:2',
             'duration': 5889,
@@ -69,37 +70,22 @@ class SlidesLiveIE(InfoExtractor):
             'skip_download': 'm3u8',
         },
     }, {
-        # service_name = youtube, only XML slides info
+        # formerly youtube, converted to native
         'url': 'https://slideslive.com/38897546/special-metaprednaska-petra-ludwiga-hodnoty-pro-lepsi-spolecnost',
         'md5': '8a79b5e3d700837f40bd2afca3c8fa01',
         'info_dict': {
-            'id': 'jmg02wCJD5M',
-            'display_id': '38897546',
+            'id': '38897546',
             'ext': 'mp4',
             'title': 'SPECIÁL: Meta-přednáška Petra Ludwiga - Hodnoty pro lepší společnost',
-            'description': 'Watch full version of this video at https://slideslive.com/38897546.',
-            'channel_url': 'https://www.youtube.com/channel/UCZWdAkNYFncuX0khyvhqnxw',
-            'channel': 'SlidesLive Videos - G1',
-            'channel_id': 'UCZWdAkNYFncuX0khyvhqnxw',
-            'uploader_id': 'UCZWdAkNYFncuX0khyvhqnxw',
-            'uploader': 'SlidesLive Videos - G1',
-            'uploader_url': 'http://www.youtube.com/channel/UCZWdAkNYFncuX0khyvhqnxw',
-            'live_status': 'not_live',
-            'upload_date': '20160710',
-            'timestamp': 1618786715,
-            'duration': 6827,
-            'like_count': int,
-            'view_count': int,
-            'comment_count': int,
-            'channel_follower_count': int,
-            'age_limit': 0,
-            'thumbnail': r're:^https?://.*\.(?:jpg|webp)',
+            'thumbnail': r're:^https?://.*\.jpg',
+            'upload_date': '20231029',
+            'timestamp': 1698588144,
             'thumbnails': 'count:169',
-            'playable_in_embed': True,
-            'availability': 'unlisted',
-            'tags': [],
-            'categories': ['People & Blogs'],
             'chapters': 'count:168',
+            'duration': 6827,
+        },
+        'params': {
+            'skip_download': 'm3u8',
         },
     }, {
         # embed-only presentation, only XML slides info
@@ -110,8 +96,8 @@ class SlidesLiveIE(InfoExtractor):
             'title': 'Towards a Deep Network Architecture for Structured Smoothness',
             'thumbnail': r're:^https?://.*\.jpg',
             'thumbnails': 'count:8',
-            'timestamp': 1629671508,
-            'upload_date': '20210822',
+            'timestamp': 1697803109,
+            'upload_date': '20231020',
             'chapters': 'count:7',
             'duration': 326,
         },
@@ -127,8 +113,8 @@ class SlidesLiveIE(InfoExtractor):
             'title': 'MoReL: Multi-omics Relational Learning',
             'thumbnail': r're:^https?://.*\.(?:jpg|png)',
             'thumbnails': 'count:7',
-            'timestamp': 1654714970,
-            'upload_date': '20220608',
+            'timestamp': 1697824939,
+            'upload_date': '20231020',
             'chapters': 'count:6',
             'duration': 171,
         },
@@ -144,8 +130,8 @@ class SlidesLiveIE(InfoExtractor):
             'title': 'Decentralized Attribution of Generative Models',
             'thumbnail': r're:^https?://.*\.jpg',
             'thumbnails': 'count:16',
-            'timestamp': 1622806321,
-            'upload_date': '20210604',
+            'timestamp': 1697814901,
+            'upload_date': '20231020',
             'chapters': 'count:15',
             'duration': 306,
         },
@@ -161,8 +147,8 @@ class SlidesLiveIE(InfoExtractor):
             'title': 'Efficient Active Search for Combinatorial Optimization Problems',
             'thumbnail': r're:^https?://.*\.(?:jpg|png)',
             'thumbnails': 'count:9',
-            'timestamp': 1654714896,
-            'upload_date': '20220608',
+            'timestamp': 1697824757,
+            'upload_date': '20231020',
             'chapters': 'count:8',
             'duration': 295,
         },
@@ -176,10 +162,10 @@ class SlidesLiveIE(InfoExtractor):
             'id': '38979880',
             'ext': 'mp4',
             'title': 'The Representation Power of Neural Networks',
-            'timestamp': 1654714962,
+            'timestamp': 1697824919,
             'thumbnail': r're:^https?://.*\.(?:jpg|png)',
             'thumbnails': 'count:22',
-            'upload_date': '20220608',
+            'upload_date': '20231020',
             'chapters': 'count:21',
             'duration': 294,
         },
@@ -199,10 +185,10 @@ class SlidesLiveIE(InfoExtractor):
                 'id': '38979682',
                 'ext': 'mp4',
                 'title': 'LoRA: Low-Rank Adaptation of Large Language Models',
-                'timestamp': 1654714920,
+                'timestamp': 1697824815,
                 'thumbnail': r're:^https?://.*\.(?:jpg|png)',
                 'thumbnails': 'count:30',
-                'upload_date': '20220608',
+                'upload_date': '20231020',
                 'chapters': 'count:31',
                 'duration': 272,
             },
@@ -212,8 +198,8 @@ class SlidesLiveIE(InfoExtractor):
                 'ext': 'mp4',
                 'title': 'LoRA: Low-Rank Adaptation of Large Language Models - Slide 021',
                 'duration': 3,
-                'timestamp': 1654714920,
-                'upload_date': '20220608',
+                'timestamp': 1697824815,
+                'upload_date': '20231020',
             },
         }, {
             'info_dict': {
@@ -221,8 +207,8 @@ class SlidesLiveIE(InfoExtractor):
                 'ext': 'mp4',
                 'title': 'LoRA: Low-Rank Adaptation of Large Language Models - Slide 024',
                 'duration': 4,
-                'timestamp': 1654714920,
-                'upload_date': '20220608',
+                'timestamp': 1697824815,
+                'upload_date': '20231020',
             },
         }],
         'params': {
@@ -241,10 +227,10 @@ class SlidesLiveIE(InfoExtractor):
                 'id': '38979481',
                 'ext': 'mp4',
                 'title': 'How to Train Your MAML to Excel in Few-Shot Classification',
-                'timestamp': 1654714877,
+                'timestamp': 1697824716,
                 'thumbnail': r're:^https?://.*\.(?:jpg|png)',
                 'thumbnails': 'count:43',
-                'upload_date': '20220608',
+                'upload_date': '20231020',
                 'chapters': 'count:43',
                 'duration': 315,
             },
@@ -254,8 +240,8 @@ class SlidesLiveIE(InfoExtractor):
                 'ext': 'mp4',
                 'title': 'How to Train Your MAML to Excel in Few-Shot Classification - Slide 013',
                 'duration': 3,
-                'timestamp': 1654714877,
-                'upload_date': '20220608',
+                'timestamp': 1697824716,
+                'upload_date': '20231020',
             },
         }],
         'params': {
@@ -274,10 +260,10 @@ class SlidesLiveIE(InfoExtractor):
             'channel_id': 'UC62SdArr41t_-_fX40QCLRw',
             'channel_url': 'https://www.youtube.com/channel/UC62SdArr41t_-_fX40QCLRw',
             'uploader': 'SlidesLive Videos - A',
-            'uploader_id': 'UC62SdArr41t_-_fX40QCLRw',
-            'uploader_url': 'http://www.youtube.com/channel/UC62SdArr41t_-_fX40QCLRw',
+            'uploader_id': '@slideslivevideos-a6075',
+            'uploader_url': 'https://www.youtube.com/@slideslivevideos-a6075',
             'upload_date': '20200903',
-            'timestamp': 1602599092,
+            'timestamp': 1697805922,
             'duration': 942,
             'age_limit': 0,
             'live_status': 'not_live',
@@ -302,8 +288,8 @@ class SlidesLiveIE(InfoExtractor):
             'id': '38983994',
             'ext': 'mp4',
             'title': 'Zero-Shot AutoML with Pretrained Models',
-            'timestamp': 1662384834,
-            'upload_date': '20220905',
+            'timestamp': 1697826708,
+            'upload_date': '20231020',
             'thumbnail': r're:^https?://.*\.(?:jpg|png)',
             'thumbnails': 'count:23',
             'chapters': 'count:22',
@@ -335,8 +321,8 @@ class SlidesLiveIE(InfoExtractor):
             'title': 'Towards a Deep Network Architecture for Structured Smoothness',
             'thumbnail': r're:^https?://.*\.jpg',
             'thumbnails': 'count:8',
-            'timestamp': 1629671508,
-            'upload_date': '20210822',
+            'timestamp': 1697803109,
+            'upload_date': '20231020',
             'chapters': 'count:7',
             'duration': 326,
         },
@@ -385,7 +371,7 @@ class SlidesLiveIE(InfoExtractor):
             if not line.startswith('#EXT-SL-'):
                 continue
             tag, _, value = line.partition(':')
-            key = lookup.get(tag.lstrip('#EXT-SL-'))
+            key = lookup.get(tag[8:])
             if not key:
                 continue
             m3u8_dict[key] = value
@@ -469,11 +455,12 @@ class SlidesLiveIE(InfoExtractor):
             slides = self._download_xml(
                 player_info['slides_xml_url'], video_id, fatal=False,
                 note='Downloading slides XML', errnote='Failed to download slides info')
-            slide_url_template = 'https://cdn.slideslive.com/data/presentations/%s/slides/big/%s%s'
-            for slide_id, slide in enumerate(slides.findall('./slide') if slides else [], 1):
-                slides_info.append((
-                    slide_id, xpath_text(slide, './slideName', 'name'), '.jpg',
-                    int_or_none(xpath_text(slide, './timeSec', 'time'))))
+            if isinstance(slides, xml.etree.ElementTree.Element):
+                slide_url_template = 'https://cdn.slideslive.com/data/presentations/%s/slides/big/%s%s'
+                for slide_id, slide in enumerate(slides.findall('./slide')):
+                    slides_info.append((
+                        slide_id, xpath_text(slide, './slideName', 'name'), '.jpg',
+                        int_or_none(xpath_text(slide, './timeSec', 'time'))))
 
         chapters, thumbnails = [], []
         if url_or_none(player_info.get('thumbnail')):
@@ -528,7 +515,7 @@ class SlidesLiveIE(InfoExtractor):
             if service_name == 'vimeo':
                 info['url'] = smuggle_url(
                     f'https://player.vimeo.com/video/{service_id}',
-                    {'http_headers': {'Referer': url}})
+                    {'referer': url})
 
         video_slides = traverse_obj(slides, ('slides', ..., 'video', 'id'))
         if not video_slides:
@@ -545,7 +532,7 @@ class SlidesLiveIE(InfoExtractor):
                 }, note='Downloading video slides info', errnote='Failed to download video slides info') or {}
 
             for slide_id, slide in enumerate(traverse_obj(slides, ('slides', ...)), 1):
-                if not traverse_obj(slide, ('video', 'service')) == 'yoda':
+                if traverse_obj(slide, ('video', 'service')) != 'yoda':
                     continue
                 video_path = traverse_obj(slide, ('video', 'id'))
                 cdn_hostname = traverse_obj(service_data, (
diff --git a/plugins/youtube_download/yt_dlp/extractor/slutload.py b/plugins/youtube_download/yt_dlp/extractor/slutload.py
index 8e6e89c..c04898b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/slutload.py
+++ b/plugins/youtube_download/yt_dlp/extractor/slutload.py
@@ -11,7 +11,7 @@ class SlutloadIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'virginie baisee en cam',
             'age_limit': 18,
-            'thumbnail': r're:https?://.*?\.jpg'
+            'thumbnail': r're:https?://.*?\.jpg',
         },
     }, {
         # mobile site
@@ -29,14 +29,14 @@ class SlutloadIE(InfoExtractor):
         video_id = self._match_id(url)
 
         embed_page = self._download_webpage(
-            'http://www.slutload.com/embed_player/%s' % video_id, video_id,
+            f'http://www.slutload.com/embed_player/{video_id}', video_id,
             'Downloading embed page', fatal=False)
 
         if embed_page:
             def extract(what):
                 return self._html_search_regex(
-                    r'data-video-%s=(["\'])(?P<url>(?:(?!\1).)+)\1' % what,
-                    embed_page, 'video %s' % what, default=None, group='url')
+                    rf'data-video-{what}=(["\'])(?P<url>(?:(?!\1).)+)\1',
+                    embed_page, f'video {what}', default=None, group='url')
 
             video_url = extract('url')
             if video_url:
@@ -47,11 +47,11 @@ class SlutloadIE(InfoExtractor):
                     'url': video_url,
                     'title': title,
                     'thumbnail': extract('preview'),
-                    'age_limit': 18
+                    'age_limit': 18,
                 }
 
         webpage = self._download_webpage(
-            'http://www.slutload.com/video/_/%s/' % video_id, video_id)
+            f'http://www.slutload.com/video/_/{video_id}/', video_id)
         title = self._html_search_regex(
             r'<h1><strong>([^<]+)</strong>', webpage, 'title').strip()
         info = self._parse_html5_media_entries(url, webpage, video_id)[0]
diff --git a/plugins/youtube_download/yt_dlp/extractor/snapchat.py b/plugins/youtube_download/yt_dlp/extractor/snapchat.py
new file mode 100644
index 0000000..09e5766
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/snapchat.py
@@ -0,0 +1,76 @@
+from .common import InfoExtractor
+from ..utils import float_or_none, int_or_none, url_or_none
+from ..utils.traversal import traverse_obj
+
+
+class SnapchatSpotlightIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?snapchat\.com/spotlight/(?P<id>\w+)'
+
+    _TESTS = [{
+        'url': 'https://www.snapchat.com/spotlight/W7_EDlXWTBiXAEEniNoMPwAAYYWtidGhudGZpAX1TKn0JAX1TKnXJAAAAAA',
+        'md5': '46c580f63592d0cbb76e974d2f9f0fcc',
+        'info_dict': {
+            'id': 'W7_EDlXWTBiXAEEniNoMPwAAYYWtidGhudGZpAX1TKn0JAX1TKnXJAAAAAA',
+            'ext': 'mp4',
+            'title': 'Views 💕',
+            'description': '',
+            'thumbnail': r're:https://cf-st\.sc-cdn\.net/d/kKJHIR1QAznRKK9jgYYDq\.256\.IRZXSOY',
+            'duration': 4.665,
+            'timestamp': 1637777831.369,
+            'upload_date': '20211124',
+            'repost_count': int,
+            'uploader': 'shreypatel57',
+            'uploader_url': 'https://www.snapchat.com/add/shreypatel57',
+        },
+    }, {
+        'url': 'https://www.snapchat.com/spotlight/W7_EDlXWTBiXAEEniNoMPwAAYcnVjYWdwcGV1AZEaIYn5AZEaIYnrAAAAAQ',
+        'md5': '4cd9626458c1a0e3e6dbe72c544a9ec2',
+        'info_dict': {
+            'id': 'W7_EDlXWTBiXAEEniNoMPwAAYcnVjYWdwcGV1AZEaIYn5AZEaIYnrAAAAAQ',
+            'ext': 'mp4',
+            'title': 'Spotlight Snap',
+            'description': 'How he flirt her teacher🤭🤭🤩😍 #kdrama#cdrama #dramaclips #dramaspotlight',
+            'thumbnail': r're:https://cf-st\.sc-cdn\.net/i/ztfr6xFs0FOcFhwVczWfj\.256\.IRZXSOY',
+            'duration': 10.91,
+            'timestamp': 1722720291.307,
+            'upload_date': '20240803',
+            'view_count': int,
+            'repost_count': int,
+            'uploader': 'ganda0535',
+            'uploader_url': 'https://www.snapchat.com/add/ganda0535',
+            'tags': ['#dramaspotlight', '#dramaclips', '#cdrama', '#kdrama'],
+        },
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+        page_props = self._search_nextjs_data(webpage, video_id)['props']['pageProps']
+        video_data = traverse_obj(page_props, (
+            'spotlightFeed', 'spotlightStories',
+            lambda _, v: v['story']['storyId']['value'] == video_id, 'metadata', any), None)
+
+        return {
+            'id': video_id,
+            'ext': 'mp4',
+            **traverse_obj(video_data, ('videoMetadata', {
+                'title': ('name', {str}),
+                'description': ('description', {str}),
+                'timestamp': ('uploadDateMs', {float_or_none(scale=1000)}),
+                'view_count': ('viewCount', {int_or_none}, {lambda x: None if x == -1 else x}),
+                'repost_count': ('shareCount', {int_or_none}),
+                'url': ('contentUrl', {url_or_none}),
+                'width': ('width', {int_or_none}),
+                'height': ('height', {int_or_none}),
+                'duration': ('durationMs', {float_or_none(scale=1000)}),
+                'thumbnail': ('thumbnailUrl', {url_or_none}),
+                'uploader': ('creator', 'personCreator', 'username', {str}),
+                'uploader_url': ('creator', 'personCreator', 'url', {url_or_none}),
+            })),
+            **traverse_obj(video_data, {
+                'description': ('description', {str}),
+                'tags': ('hashtags', ..., {str}),
+                'view_count': ('engagementStats', 'viewCount', {int_or_none}, {lambda x: None if x == -1 else x}),
+                'repost_count': ('engagementStats', 'shareCount', {int_or_none}),
+            }),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/snotr.py b/plugins/youtube_download/yt_dlp/extractor/snotr.py
index 6889f19..859e5e8 100644
--- a/plugins/youtube_download/yt_dlp/extractor/snotr.py
+++ b/plugins/youtube_download/yt_dlp/extractor/snotr.py
@@ -30,7 +30,7 @@ class SnotrIE(InfoExtractor):
             'filesize_approx': 8500000,
             'description': 'The top 10 George W. Bush moments, brought to you by David Letterman!',
             'thumbnail': r're:^https?://.*\.jpg$',
-        }
+        },
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/softwhiteunderbelly.py b/plugins/youtube_download/yt_dlp/extractor/softwhiteunderbelly.py
new file mode 100644
index 0000000..ce1b214
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/softwhiteunderbelly.py
@@ -0,0 +1,87 @@
+from .common import InfoExtractor
+from .vimeo import VHXEmbedIE
+from ..utils import (
+    ExtractorError,
+    clean_html,
+    update_url,
+    urlencode_postdata,
+)
+from ..utils.traversal import find_element, traverse_obj
+
+
+class SoftWhiteUnderbellyIE(InfoExtractor):
+    _LOGIN_URL = 'https://www.softwhiteunderbelly.com/login'
+    _NETRC_MACHINE = 'softwhiteunderbelly'
+    _VALID_URL = r'https?://(?:www\.)?softwhiteunderbelly\.com/videos/(?P<id>[\w-]+)'
+    _TESTS = [{
+        'url': 'https://www.softwhiteunderbelly.com/videos/kenneth-final1',
+        'note': 'A single Soft White Underbelly Episode',
+        'md5': '8e79f29ec1f1bda6da2e0b998fcbebb8',
+        'info_dict': {
+            'id': '3201266',
+            'ext': 'mp4',
+            'display_id': 'kenneth-final1',
+            'title': 'Appalachian Man interview-Kenneth',
+            'description': 'Soft White Underbelly interview and portrait of Kenneth, an Appalachian man in Clay County, Kentucky.',
+            'thumbnail': 'https://vhx.imgix.net/softwhiteunderbelly/assets/249f6db0-2b39-49a4-979b-f8dad4681825.jpg',
+            'uploader_url': 'https://vimeo.com/user80538407',
+            'uploader': 'OTT Videos',
+            'uploader_id': 'user80538407',
+            'duration': 512,
+        },
+        'expected_warnings': ['Failed to parse XML: not well-formed'],
+    }, {
+        'url': 'https://www.softwhiteunderbelly.com/videos/tj-2-final-2160p',
+        'note': 'A single Soft White Underbelly Episode',
+        'md5': '286bd8851b4824c62afb369e6f307036',
+        'info_dict': {
+            'id': '3506029',
+            'ext': 'mp4',
+            'display_id': 'tj-2-final-2160p',
+            'title': 'Fentanyl Addict interview-TJ (follow up)',
+            'description': 'Soft White Underbelly follow up interview and portrait of TJ, a fentanyl addict on Skid Row.',
+            'thumbnail': 'https://vhx.imgix.net/softwhiteunderbelly/assets/c883d531-5da0-4faf-a2e2-8eba97e5adfc.jpg',
+            'duration': 817,
+            'uploader': 'OTT Videos',
+            'uploader_url': 'https://vimeo.com/user80538407',
+            'uploader_id': 'user80538407',
+        },
+        'expected_warnings': ['Failed to parse XML: not well-formed'],
+    }]
+
+    def _perform_login(self, username, password):
+        signin_page = self._download_webpage(self._LOGIN_URL, None, 'Fetching authenticity token')
+        self._download_webpage(
+            self._LOGIN_URL, None, 'Logging in',
+            data=urlencode_postdata({
+                'email': username,
+                'password': password,
+                'authenticity_token': self._html_search_regex(
+                    r'name=["\']authenticity_token["\']\s+value=["\']([^"\']+)', signin_page, 'authenticity_token'),
+                'utf8': True,
+            }),
+        )
+
+    def _real_extract(self, url):
+        display_id = self._match_id(url)
+
+        webpage = self._download_webpage(url, display_id)
+        if '<div id="watch-unauthorized"' in webpage:
+            if self._get_cookies('https://www.softwhiteunderbelly.com').get('_session'):
+                raise ExtractorError('This account is not subscribed to this content', expected=True)
+            self.raise_login_required()
+
+        embed_url, embed_id = self._html_search_regex(
+            r'embed_url:\s*["\'](?P<url>https?://embed\.vhx\.tv/videos/(?P<id>\d+)[^"\']*)',
+            webpage, 'embed url', group=('url', 'id'))
+
+        return {
+            '_type': 'url_transparent',
+            'ie_key': VHXEmbedIE.ie_key(),
+            'url': VHXEmbedIE._smuggle_referrer(embed_url, 'https://www.softwhiteunderbelly.com'),
+            'id': embed_id,
+            'display_id': display_id,
+            'title': traverse_obj(webpage, ({find_element(id='watch-info')}, {find_element(cls='video-title')}, {clean_html})),
+            'description': self._html_search_meta('description', webpage, default=None),
+            'thumbnail': update_url(self._og_search_thumbnail(webpage) or '', query=None) or None,
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/sohu.py b/plugins/youtube_download/yt_dlp/extractor/sohu.py
index a8f1e46..23faee1 100644
--- a/plugins/youtube_download/yt_dlp/extractor/sohu.py
+++ b/plugins/youtube_download/yt_dlp/extractor/sohu.py
@@ -1,14 +1,17 @@
+import base64
 import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_str,
-    compat_urllib_parse_urlencode,
-)
 from ..utils import (
     ExtractorError,
+    float_or_none,
     int_or_none,
+    traverse_obj,
     try_get,
+    unified_timestamp,
+    url_or_none,
+    urljoin,
 )
 
 
@@ -31,20 +34,33 @@ class SohuIE(InfoExtractor):
             'id': '409385080',
             'ext': 'mp4',
             'title': '《2015湖南卫视羊年元宵晚会》唐嫣《花好月圆》',
-        }
+        },
+        'skip': 'no longer available',
     }, {
         'url': 'http://my.tv.sohu.com/us/232799889/78693464.shtml',
         'info_dict': {
             'id': '78693464',
             'ext': 'mp4',
             'title': '【爱范品】第31期：MWC见不到的奇葩手机',
-        }
+            'uploader': '爱范儿视频',
+            'duration': 213,
+            'timestamp': 1425519600,
+            'upload_date': '20150305',
+            'thumbnail': 'http://e3f49eaa46b57.cdn.sohucs.com//group1/M10/83/FA/MTAuMTAuODguODA=/6_14cbccdde5eg104SysCutcloud_78693464_7_0b.jpg',
+            'tags': ['爱范儿', '爱范品', 'MWC', '手机'],
+        },
     }, {
         'note': 'Multipart video',
         'url': 'http://my.tv.sohu.com/pl/8384802/78910339.shtml',
         'info_dict': {
             'id': '78910339',
             'title': '【神探苍实战秘籍】第13期 战争之影 赫卡里姆',
+            'uploader': '小苍cany',
+            'duration': 744.0,
+            'timestamp': 1426269360,
+            'upload_date': '20150313',
+            'thumbnail': 'http://e3f49eaa46b57.cdn.sohucs.com//group1/M11/89/57/MTAuMTAuODguODA=/6_14cea022a1dg102SysCutcloud_78910339_8_0b.jpg',
+            'tags': ['小苍MM', '英雄联盟', '实战秘籍'],
         },
         'playlist': [{
             'info_dict': {
@@ -52,22 +68,22 @@ class SohuIE(InfoExtractor):
                 'ext': 'mp4',
                 'duration': 294,
                 'title': '【神探苍实战秘籍】第13期 战争之影 赫卡里姆',
-            }
+            },
         }, {
             'info_dict': {
                 'id': '78910339_part2',
                 'ext': 'mp4',
                 'duration': 300,
                 'title': '【神探苍实战秘籍】第13期 战争之影 赫卡里姆',
-            }
+            },
         }, {
             'info_dict': {
                 'id': '78910339_part3',
                 'ext': 'mp4',
                 'duration': 150,
                 'title': '【神探苍实战秘籍】第13期 战争之影 赫卡里姆',
-            }
-        }]
+            },
+        }],
     }, {
         'note': 'Video with title containing dash',
         'url': 'http://my.tv.sohu.com/us/249884221/78932792.shtml',
@@ -75,10 +91,15 @@ class SohuIE(InfoExtractor):
             'id': '78932792',
             'ext': 'mp4',
             'title': 'youtube-dl testing video',
+            'duration': 360,
+            'timestamp': 1426348620,
+            'upload_date': '20150314',
+            'thumbnail': 'http://e3f49eaa46b57.cdn.sohucs.com//group1/M02/8A/00/MTAuMTAuODguNzk=/6_14cee1be192g102SysCutcloud_78932792_7_7b.jpg',
+            'tags': [],
         },
         'params': {
-            'skip_download': True
-        }
+            'skip_download': True,
+        },
     }]
 
     def _real_extract(self, url):
@@ -91,7 +112,7 @@ class SohuIE(InfoExtractor):
 
             return self._download_json(
                 base_data_url + vid_id, video_id,
-                'Downloading JSON data for %s' % vid_id,
+                f'Downloading JSON data for {vid_id}',
                 headers=self.geo_verification_headers())
 
         mobj = self._match_valid_url(url)
@@ -100,7 +121,7 @@ class SohuIE(InfoExtractor):
 
         webpage = self._download_webpage(url, video_id)
 
-        title = re.sub(r' - 搜狐视频$', '', self._og_search_title(webpage))
+        title = re.sub(r'( - 高清正版在线观看)? - 搜狐视频$', '', self._og_search_title(webpage))
 
         vid = self._html_search_regex(
             r'var vid ?= ?["\'](\d+)["\']',
@@ -109,18 +130,18 @@ class SohuIE(InfoExtractor):
         if vid_data['play'] != 1:
             if vid_data.get('status') == 12:
                 raise ExtractorError(
-                    '%s said: There\'s something wrong in the video.' % self.IE_NAME,
+                    f'{self.IE_NAME} said: There\'s something wrong in the video.',
                     expected=True)
             else:
                 self.raise_geo_restricted(
-                    '%s said: The video is only licensed to users in Mainland China.' % self.IE_NAME)
+                    f'{self.IE_NAME} said: The video is only licensed to users in Mainland China.')
 
         formats_json = {}
         for format_id in ('nor', 'high', 'super', 'ori', 'h2644k', 'h2654k'):
-            vid_id = vid_data['data'].get('%sVid' % format_id)
+            vid_id = vid_data['data'].get(f'{format_id}Vid')
             if not vid_id:
                 continue
-            vid_id = compat_str(vid_id)
+            vid_id = str(vid_id)
             formats_json[format_id] = vid_data if vid == vid_id else _fetch_data(vid_id, mytv)
 
         part_count = vid_data['data']['totalBlocks']
@@ -132,36 +153,37 @@ class SohuIE(InfoExtractor):
                 allot = format_data['allot']
 
                 data = format_data['data']
-                clips_url = data['clipsURL']
+                clip_url = traverse_obj(data, (('clipsURL', 'mp4PlayUrl'), i, {url_or_none}), get_all=False)
+                if not clip_url:
+                    raise ExtractorError(f'Unable to extract url for clip {i}')
                 su = data['su']
 
                 video_url = 'newflv.sohu.ccgslb.net'
-                cdnId = None
+                cdn_id = None
                 retries = 0
 
                 while 'newflv.sohu.ccgslb.net' in video_url:
                     params = {
                         'prot': 9,
-                        'file': clips_url[i],
+                        'file': clip_url,
                         'new': su[i],
-                        'prod': 'flash',
+                        'prod': 'h5n',
                         'rb': 1,
                     }
 
-                    if cdnId is not None:
-                        params['idc'] = cdnId
+                    if cdn_id is not None:
+                        params['idc'] = cdn_id
 
-                    download_note = 'Downloading %s video URL part %d of %d' % (
-                        format_id, i + 1, part_count)
+                    download_note = f'Downloading {format_id} video URL part {i + 1} of {part_count}'
 
                     if retries > 0:
-                        download_note += ' (retry #%d)' % retries
+                        download_note += f' (retry #{retries})'
                     part_info = self._parse_json(self._download_webpage(
-                        'http://%s/?%s' % (allot, compat_urllib_parse_urlencode(params)),
+                        f'http://{allot}/?{urllib.parse.urlencode(params)}',
                         video_id, download_note), video_id)
 
                     video_url = part_info['url']
-                    cdnId = part_info.get('nid')
+                    cdn_id = part_info.get('nid')
 
                     retries += 1
                     if retries > 5:
@@ -178,7 +200,7 @@ class SohuIE(InfoExtractor):
                 })
 
             playlist.append({
-                'id': '%s_part%d' % (video_id, i + 1),
+                'id': f'{video_id}_part{i + 1}',
                 'title': title,
                 'duration': vid_data['data']['clipsDuration'][i],
                 'formats': formats,
@@ -193,6 +215,75 @@ class SohuIE(InfoExtractor):
                 'entries': playlist,
                 'id': video_id,
                 'title': title,
+                'duration': traverse_obj(vid_data, ('data', 'totalDuration', {float_or_none})),
             }
 
-        return info
+        if mytv:
+            publish_time = unified_timestamp(self._search_regex(
+                r'publishTime:\s*["\'](\d+-\d+-\d+ \d+:\d+)["\']', webpage, 'publish time', fatal=False))
+        else:
+            publish_time = traverse_obj(vid_data, ('tv_application_time', {unified_timestamp}))
+
+        return {
+            'timestamp': publish_time - 8 * 3600 if publish_time else None,
+            **traverse_obj(vid_data, {
+                'alt_title': ('data', 'subName', {str}),
+                'uploader': ('wm_data', 'wm_username', {str}),
+                'thumbnail': ('data', 'coverImg', {url_or_none}),
+                'tags': ('data', 'tag', {str.split}),
+            }),
+            **info,
+        }
+
+
+class SohuVIE(InfoExtractor):
+    _VALID_URL = r'https?://tv\.sohu\.com/v/(?P<id>[\w=-]+)\.html(?:$|[#?])'
+
+    _TESTS = [{
+        'note': 'Multipart video',
+        'url': 'https://tv.sohu.com/v/MjAyMzA2MTQvbjYwMTMxNTE5Mi5zaHRtbA==.html',
+        'info_dict': {
+            'id': '601315192',
+            'title': '《淬火丹心》第1集',
+            'alt_title': '“点天灯”发生事故',
+            'duration': 2701.692,
+            'timestamp': 1686758040,
+            'upload_date': '20230614',
+            'thumbnail': 'http://photocdn.tv.sohu.com/img/20230614/vrsa_hor_1686738763256_454010551.jpg',
+        },
+        'playlist_mincount': 9,
+        'skip': 'Only available in China',
+    }, {
+        'url': 'https://tv.sohu.com/v/dXMvMjMyNzk5ODg5Lzc4NjkzNDY0LnNodG1s.html',
+        'info_dict': {
+            'id': '78693464',
+            'ext': 'mp4',
+            'title': '【爱范品】第31期：MWC见不到的奇葩手机',
+            'uploader': '爱范儿视频',
+            'duration': 213,
+            'timestamp': 1425519600,
+            'upload_date': '20150305',
+            'thumbnail': 'http://e3f49eaa46b57.cdn.sohucs.com//group1/M10/83/FA/MTAuMTAuODguODA=/6_14cbccdde5eg104SysCutcloud_78693464_7_0b.jpg',
+            'tags': ['爱范儿', '爱范品', 'MWC', '手机'],
+        },
+    }, {
+        'note': 'Multipart video',
+        'url': 'https://tv.sohu.com/v/dXMvMjQyNTYyMTYzLzc4OTEwMzM5LnNodG1s.html?src=pl',
+        'info_dict': {
+            'id': '78910339',
+            'title': '【神探苍实战秘籍】第13期 战争之影 赫卡里姆',
+            'uploader': '小苍cany',
+            'duration': 744.0,
+            'timestamp': 1426269360,
+            'upload_date': '20150313',
+            'thumbnail': 'http://e3f49eaa46b57.cdn.sohucs.com//group1/M11/89/57/MTAuMTAuODguODA=/6_14cea022a1dg102SysCutcloud_78910339_8_0b.jpg',
+            'tags': ['小苍MM', '英雄联盟', '实战秘籍'],
+        },
+        'playlist_mincount': 3,
+    }]
+
+    def _real_extract(self, url):
+        encoded_id = self._match_id(url)
+        path = base64.urlsafe_b64decode(encoded_id).decode()
+        subdomain = 'tv' if re.match(r'\d+/n\d+\.shtml', path) else 'my.tv'
+        return self.url_result(urljoin(f'http://{subdomain}.sohu.com/', path), SohuIE)
diff --git a/plugins/youtube_download/yt_dlp/extractor/sonyliv.py b/plugins/youtube_download/yt_dlp/extractor/sonyliv.py
index 4379572..0cd914c 100644
--- a/plugins/youtube_download/yt_dlp/extractor/sonyliv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/sonyliv.py
@@ -1,4 +1,5 @@
-import datetime
+import datetime as dt
+import itertools
 import json
 import math
 import random
@@ -12,8 +13,8 @@ from ..utils import (
     int_or_none,
     jwt_decode_hs256,
     try_call,
-    try_get,
 )
+from ..utils.traversal import traverse_obj
 
 
 class SonyLIVIE(InfoExtractor):
@@ -72,7 +73,7 @@ class SonyLIVIE(InfoExtractor):
             if c == 'x':
                 t[i] = str(n)
             elif c == 'y':
-                t[i] = '{:x}'.format(3 & n | 8)
+                t[i] = f'{3 & n | 8:x}'
         return ''.join(t) + '-' + str(int(time.time() * 1000))
 
     def _perform_login(self, username, password):
@@ -93,7 +94,7 @@ class SonyLIVIE(InfoExtractor):
                 'mobileNumber': username,
                 'channelPartnerID': 'MSMIND',
                 'country': 'IN',
-                'timestamp': datetime.datetime.now().strftime('%Y-%m-%dT%H:%M:%S.%MZ'),
+                'timestamp': dt.datetime.now().strftime('%Y-%m-%dT%H:%M:%S.%MZ'),
                 'otpSize': 6,
                 'loginType': 'REGISTERORSIGNIN',
                 'isMobileMandatory': True,
@@ -110,7 +111,7 @@ class SonyLIVIE(InfoExtractor):
                 'otp': self._get_tfa_info('OTP'),
                 'dmaId': 'IN',
                 'ageConfirmation': True,
-                'timestamp': datetime.datetime.now().strftime('%Y-%m-%dT%H:%M:%S.%MZ'),
+                'timestamp': dt.datetime.now().strftime('%Y-%m-%dT%H:%M:%S.%MZ'),
                 'isMobileMandatory': True,
             }).encode())
         if otp_verify_json['resultCode'] == 'KO':
@@ -120,7 +121,7 @@ class SonyLIVIE(InfoExtractor):
     def _call_api(self, version, path, video_id):
         try:
             return self._download_json(
-                'https://apiv2.sonyliv.com/AGL/%s/A/ENG/WEB/%s' % (version, path),
+                f'https://apiv2.sonyliv.com/AGL/{version}/A/ENG/WEB/{path}',
                 video_id, headers=self._HEADERS)['resultObj']
         except ExtractorError as e:
             if isinstance(e.cause, HTTPError) and e.cause.status == 406 and self._parse_json(
@@ -145,7 +146,7 @@ class SonyLIVIE(InfoExtractor):
             self.report_drm(video_id)
         dash_url = content['videoURL']
         headers = {
-            'x-playback-session-id': '%s-%d' % (uuid.uuid4().hex, time.time() * 1000)
+            'x-playback-session-id': '%s-%d' % (uuid.uuid4().hex, time.time() * 1000),
         }
         formats = self._extract_mpd_formats(
             dash_url, video_id, mpd_id='dash', headers=headers, fatal=False)
@@ -183,38 +184,67 @@ class SonyLIVIE(InfoExtractor):
 
 
 class SonyLIVSeriesIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?sonyliv\.com/shows/[^/?#&]+-(?P<id>\d{10})$'
+    _VALID_URL = r'https?://(?:www\.)?sonyliv\.com/shows/[^/?#&]+-(?P<id>\d{10})/?(?:$|[?#])'
     _TESTS = [{
         'url': 'https://www.sonyliv.com/shows/adaalat-1700000091',
-        'playlist_mincount': 456,
+        'playlist_mincount': 452,
         'info_dict': {
             'id': '1700000091',
         },
+    }, {
+        'url': 'https://www.sonyliv.com/shows/beyhadh-1700000007/',
+        'playlist_mincount': 358,
+        'info_dict': {
+            'id': '1700000007',
+        },
     }]
-    _API_SHOW_URL = "https://apiv2.sonyliv.com/AGL/1.9/R/ENG/WEB/IN/DL/DETAIL/{}?kids_safe=false&from=0&to=49"
-    _API_EPISODES_URL = "https://apiv2.sonyliv.com/AGL/1.4/R/ENG/WEB/IN/CONTENT/DETAIL/BUNDLE/{}?from=0&to=1000&orderBy=episodeNumber&sortOrder=asc"
-    _API_SECURITY_URL = 'https://apiv2.sonyliv.com/AGL/1.4/A/ENG/WEB/ALL/GETTOKEN'
+    _API_BASE = 'https://apiv2.sonyliv.com/AGL'
+    _SORT_ORDERS = ('asc', 'desc')
 
-    def _entries(self, show_id):
+    def _entries(self, show_id, sort_order):
         headers = {
             'Accept': 'application/json, text/plain, */*',
             'Referer': 'https://www.sonyliv.com',
         }
         headers['security_token'] = self._download_json(
-            self._API_SECURITY_URL, video_id=show_id, headers=headers,
-            note='Downloading security token')['resultObj']
-        seasons = try_get(
-            self._download_json(self._API_SHOW_URL.format(show_id), video_id=show_id, headers=headers),
-            lambda x: x['resultObj']['containers'][0]['containers'], list)
-        for season in seasons or []:
-            season_id = season['id']
-            episodes = try_get(
-                self._download_json(self._API_EPISODES_URL.format(season_id), video_id=season_id, headers=headers),
-                lambda x: x['resultObj']['containers'][0]['containers'], list)
-            for episode in episodes or []:
-                video_id = episode.get('id')
-                yield self.url_result('sonyliv:%s' % video_id, ie=SonyLIVIE.ie_key(), video_id=video_id)
+            f'{self._API_BASE}/1.4/A/ENG/WEB/ALL/GETTOKEN', show_id,
+            'Downloading security token', headers=headers)['resultObj']
+        seasons = traverse_obj(self._download_json(
+            f'{self._API_BASE}/1.9/R/ENG/WEB/IN/DL/DETAIL/{show_id}', show_id,
+            'Downloading series JSON', headers=headers, query={
+                'kids_safe': 'false',
+                'from': '0',
+                'to': '49',
+            }), ('resultObj', 'containers', 0, 'containers', lambda _, v: int_or_none(v['id'])))
+
+        if sort_order == 'desc':
+            seasons = reversed(seasons)
+        for season in seasons:
+            season_id = str(season['id'])
+            note = traverse_obj(season, ('metadata', 'title', {str})) or 'season'
+            cursor = 0
+            for page_num in itertools.count(1):
+                episodes = traverse_obj(self._download_json(
+                    f'{self._API_BASE}/1.4/R/ENG/WEB/IN/CONTENT/DETAIL/BUNDLE/{season_id}',
+                    season_id, f'Downloading {note} page {page_num} JSON', headers=headers, query={
+                        'from': str(cursor),
+                        'to': str(cursor + 99),
+                        'orderBy': 'episodeNumber',
+                        'sortOrder': sort_order,
+                    }), ('resultObj', 'containers', 0, 'containers', lambda _, v: int_or_none(v['id'])))
+                if not episodes:
+                    break
+                for episode in episodes:
+                    video_id = str(episode['id'])
+                    yield self.url_result(f'sonyliv:{video_id}', SonyLIVIE, video_id)
+                cursor += 100
 
     def _real_extract(self, url):
         show_id = self._match_id(url)
-        return self.playlist_result(self._entries(show_id), playlist_id=show_id)
+
+        sort_order = self._configuration_arg('sort_order', [self._SORT_ORDERS[0]])[0]
+        if sort_order not in self._SORT_ORDERS:
+            raise ValueError(
+                f'Invalid sort order "{sort_order}". Allowed values are: {", ".join(self._SORT_ORDERS)}')
+
+        return self.playlist_result(self._entries(show_id, sort_order), playlist_id=show_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/soundcloud.py b/plugins/youtube_download/yt_dlp/extractor/soundcloud.py
index a7c2afd..c70940a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/soundcloud.py
+++ b/plugins/youtube_download/yt_dlp/extractor/soundcloud.py
@@ -1,30 +1,26 @@
+import functools
 import itertools
-import re
 import json
-# import random
+import re
 
-from .common import (
-    InfoExtractor,
-    SearchInfoExtractor
-)
-from ..compat import compat_str
-from ..networking import HEADRequest, Request
+from .common import InfoExtractor, SearchInfoExtractor
+from ..networking import HEADRequest
 from ..networking.exceptions import HTTPError
 from ..utils import (
-    error_to_compat_str,
     ExtractorError,
     float_or_none,
     int_or_none,
-    KNOWN_EXTENSIONS,
+    join_nonempty,
     mimetype2ext,
     parse_qs,
     str_or_none,
-    try_get,
+    try_call,
     unified_timestamp,
     update_url_query,
     url_or_none,
     urlhandle_detect_ext,
 )
+from ..utils.traversal import traverse_obj
 
 
 class SoundcloudEmbedIE(InfoExtractor):
@@ -54,10 +50,10 @@ class SoundcloudBaseIE(InfoExtractor):
     _API_AUTH_QUERY_TEMPLATE = '?client_id=%s'
     _API_AUTH_URL_PW = 'https://api-auth.soundcloud.com/web-auth/sign-in/password%s'
     _API_VERIFY_AUTH_TOKEN = 'https://api-auth.soundcloud.com/connect/session%s'
-    _access_token = None
     _HEADERS = {}
 
-    _IMAGE_REPL_RE = r'-([0-9a-z]+)\.jpg'
+    _IMAGE_REPL_RE = r'-[0-9a-z]+\.(?P<ext>jpg|png)'
+    _TAGS_RE = re.compile(r'"([^"]+)"|([^ ]+)')
 
     _ARTWORK_MAP = {
         'mini': 16,
@@ -72,6 +68,16 @@ class SoundcloudBaseIE(InfoExtractor):
         'original': 0,
     }
 
+    _DEFAULT_FORMATS = ['http_aac', 'hls_aac', 'http_opus', 'hls_opus', 'http_mp3', 'hls_mp3']
+
+    @functools.cached_property
+    def _is_requested(self):
+        return re.compile(r'|'.join(set(
+            re.escape(pattern).replace(r'\*', r'.*') if pattern != 'default'
+            else '|'.join(map(re.escape, self._DEFAULT_FORMATS))
+            for pattern in self._configuration_arg('formats', ['default'], ie_key=SoundcloudIE)
+        ))).fullmatch
+
     def _store_client_id(self, client_id):
         self.cache.store('soundcloud', 'client_id', client_id)
 
@@ -89,7 +95,7 @@ class SoundcloudBaseIE(InfoExtractor):
                     return
         raise ExtractorError('Unable to extract client id')
 
-    def _download_json(self, *args, **kwargs):
+    def _call_api(self, *args, **kwargs):
         non_fatal = kwargs.get('fatal') is False
         if non_fatal:
             del kwargs['fatal']
@@ -98,35 +104,45 @@ class SoundcloudBaseIE(InfoExtractor):
             query['client_id'] = self._CLIENT_ID
             kwargs['query'] = query
             try:
-                return super()._download_json(*args, **kwargs)
+                return self._download_json(*args, **kwargs)
             except ExtractorError as e:
                 if isinstance(e.cause, HTTPError) and e.cause.status in (401, 403):
                     self._store_client_id(None)
                     self._update_client_id()
                     continue
                 elif non_fatal:
-                    self.report_warning(error_to_compat_str(e))
+                    self.report_warning(str(e))
                     return False
                 raise
 
     def _initialize_pre_login(self):
         self._CLIENT_ID = self.cache.load('soundcloud', 'client_id') or 'a3e059563d7fd3372b49b37f00a00bcf'
 
-    def _perform_login(self, username, password):
-        if username != 'oauth':
-            self.report_warning(
-                'Login using username and password is not currently supported. '
-                'Use "--username oauth --password <oauth_token>" to login using an oauth token')
-        self._access_token = password
-        query = self._API_AUTH_QUERY_TEMPLATE % self._CLIENT_ID
-        payload = {'session': {'access_token': self._access_token}}
-        token_verification = Request(self._API_VERIFY_AUTH_TOKEN % query, json.dumps(payload).encode('utf-8'))
-        response = self._download_json(token_verification, None, note='Verifying login token...', fatal=False)
-        if response is not False:
-            self._HEADERS = {'Authorization': 'OAuth ' + self._access_token}
+    def _verify_oauth_token(self, token):
+        if self._request_webpage(
+                self._API_VERIFY_AUTH_TOKEN % (self._API_AUTH_QUERY_TEMPLATE % self._CLIENT_ID),
+                None, note='Verifying login token...', fatal=False,
+                data=json.dumps({'session': {'access_token': token}}).encode()):
+            self._HEADERS['Authorization'] = f'OAuth {token}'
             self.report_login()
         else:
-            self.report_warning('Provided authorization token seems to be invalid. Continue as guest')
+            self.report_warning('Provided authorization token is invalid. Continuing as guest')
+
+    def _real_initialize(self):
+        if self._HEADERS:
+            return
+        if token := try_call(lambda: self._get_cookies(self._BASE_URL)['oauth_token'].value):
+            self._verify_oauth_token(token)
+
+    def _perform_login(self, username, password):
+        if username != 'oauth':
+            raise ExtractorError(
+                'Login using username and password is not currently supported. '
+                'Use "--username oauth --password <oauth_token>" to login using an oauth token, '
+                f'or else {self._login_hint(method="cookies")}', expected=True)
+        if self._HEADERS:
+            return
+        self._verify_oauth_token(password)
 
         r'''
         def genDevId():
@@ -147,14 +163,17 @@ class SoundcloudBaseIE(InfoExtractor):
             'user_agent': self._USER_AGENT
         }
 
-        query = self._API_AUTH_QUERY_TEMPLATE % self._CLIENT_ID
-        login = sanitized_Request(self._API_AUTH_URL_PW % query, json.dumps(payload).encode('utf-8'))
-        response = self._download_json(login, None)
-        self._access_token = response.get('session').get('access_token')
-        if not self._access_token:
-            self.report_warning('Unable to get access token, login may has failed')
-        else:
-            self._HEADERS = {'Authorization': 'OAuth ' + self._access_token}
+        response = self._call_api(
+            self._API_AUTH_URL_PW % (self._API_AUTH_QUERY_TEMPLATE % self._CLIENT_ID),
+            None, note='Verifying login token...', fatal=False,
+            data=json.dumps(payload).encode())
+
+        if token := traverse_obj(response, ('session', 'access_token', {str})):
+            self._HEADERS['Authorization'] = f'OAuth {token}'
+            self.report_login()
+            return
+
+        raise ExtractorError('Unable to get access token, login may have failed', expected=True)
         '''
 
     # signature generation
@@ -175,136 +194,152 @@ class SoundcloudBaseIE(InfoExtractor):
         t = clid  # _CLIENT_ID
 
         d = '-'.join([str(mInt) for mInt in [a, i, s, w, u, l, b, k]])
-        p = n + y + d + r + e + t + d + n
-        h = p
+        h = n + y + d + r + e + t + d + n
 
         m = 8011470
-        f = 0
 
-        for f in range(f, len(h)):
+        for f in range(len(h)):
             m = (m >> 1) + ((1 & m) << 23)
             m += ord(h[f])
             m &= 16777215
 
         # c is not even needed
-        out = str(y) + ':' + str(d) + ':' + format(m, 'x') + ':' + str(c)
-
-        return out
+        return f'{y}:{d}:{m:x}:{c}'
 
     def _extract_info_dict(self, info, full_title=None, secret_token=None, extract_flat=False):
-        track_id = compat_str(info['id'])
-        title = info['title']
+        track_id = str(info['id'])
 
         format_urls = set()
         formats = []
+        has_drm = False
         query = {'client_id': self._CLIENT_ID}
         if secret_token:
             query['secret_token'] = secret_token
 
         if not extract_flat and info.get('downloadable') and info.get('has_downloads_left'):
-            download_url = update_url_query(
-                self._API_V2_BASE + 'tracks/' + track_id + '/download', query)
-            redirect_url = (self._download_json(download_url, track_id, fatal=False) or {}).get('redirectUri')
-            if redirect_url:
+            try:
+                # Do not use _call_api(); HTTP Error codes have different meanings for this request
+                download_data = self._download_json(
+                    f'{self._API_V2_BASE}tracks/{track_id}/download', track_id,
+                    'Downloading original download format info JSON', query=query, headers=self._HEADERS)
+            except ExtractorError as e:
+                if isinstance(e.cause, HTTPError) and e.cause.status == 401:
+                    self.report_warning(
+                        'Original download format is only available '
+                        f'for registered users. {self._login_hint()}')
+                elif isinstance(e.cause, HTTPError) and e.cause.status == 403:
+                    self.write_debug('Original download format is not available for this client')
+                else:
+                    self.report_warning(e.msg)
+                download_data = None
+
+            if redirect_url := traverse_obj(download_data, ('redirectUri', {url_or_none})):
                 urlh = self._request_webpage(
-                    HEADRequest(redirect_url), track_id, fatal=False)
+                    HEADRequest(redirect_url), track_id, 'Checking original download format availability',
+                    'Original download format is not available', fatal=False)
                 if urlh:
                     format_url = urlh.url
                     format_urls.add(format_url)
                     formats.append({
                         'format_id': 'download',
-                        'ext': urlhandle_detect_ext(urlh) or 'mp3',
+                        'ext': urlhandle_detect_ext(urlh, default='mp3'),
                         'filesize': int_or_none(urlh.headers.get('Content-Length')),
                         'url': format_url,
                         'quality': 10,
+                        'format_note': 'Original',
+                        'vcodec': 'none',
                     })
 
         def invalid_url(url):
             return not url or url in format_urls
 
-        def add_format(f, protocol, is_preview=False):
-            mobj = re.search(r'\.(?P<abr>\d+)\.(?P<ext>[0-9a-z]{3,4})(?=[/?])', stream_url)
-            if mobj:
-                for k, v in mobj.groupdict().items():
-                    if not f.get(k):
-                        f[k] = v
-            format_id_list = []
-            if protocol:
-                format_id_list.append(protocol)
-            ext = f.get('ext')
-            if ext == 'aac':
-                f['abr'] = '256'
-            for k in ('ext', 'abr'):
-                v = f.get(k)
-                if v:
-                    format_id_list.append(v)
-            preview = is_preview or re.search(r'/(?:preview|playlist)/0/30/', f['url'])
-            if preview:
-                format_id_list.append('preview')
-            abr = f.get('abr')
-            if abr:
-                f['abr'] = int(abr)
-            if protocol == 'hls':
-                protocol = 'm3u8' if ext == 'aac' else 'm3u8_native'
-            else:
-                protocol = 'http'
-            f.update({
-                'format_id': '_'.join(format_id_list),
-                'protocol': protocol,
-                'preference': -10 if preview else None,
-            })
-            formats.append(f)
-
         # New API
-        transcodings = try_get(
-            info, lambda x: x['media']['transcodings'], list) or []
-        for t in transcodings:
-            if not isinstance(t, dict):
+        for t in traverse_obj(info, ('media', 'transcodings', lambda _, v: url_or_none(v['url']) and v['preset'])):
+            if extract_flat:
+                break
+            format_url = t['url']
+            preset = t['preset']
+            preset_base = preset.partition('_')[0]
+
+            protocol = traverse_obj(t, ('format', 'protocol', {str})) or 'http'
+            if protocol.startswith(('ctr-', 'cbc-')):
+                has_drm = True
                 continue
-            format_url = url_or_none(t.get('url'))
-            if not format_url:
+            if protocol == 'progressive':
+                protocol = 'http'
+            if protocol != 'hls' and '/hls' in format_url:
+                protocol = 'hls'
+            if protocol == 'encrypted-hls' or '/encrypted-hls' in format_url:
+                protocol = 'hls-aes'
+
+            short_identifier = f'{protocol}_{preset_base}'
+            if preset_base == 'abr':
+                self.write_debug(f'Skipping broken "{short_identifier}" format')
                 continue
-            stream = None if extract_flat else self._download_json(
-                format_url, track_id, query=query, fatal=False, headers=self._HEADERS)
-            if not isinstance(stream, dict):
+            if not self._is_requested(short_identifier):
+                self.write_debug(f'"{short_identifier}" is not a requested format, skipping')
                 continue
-            stream_url = url_or_none(stream.get('url'))
+
+            # XXX: if not extract_flat, 429 error must be caught where _extract_info_dict is called
+            stream_url = traverse_obj(self._call_api(
+                format_url, track_id, f'Downloading {short_identifier} format info JSON',
+                query=query, headers=self._HEADERS), ('url', {url_or_none}))
             if invalid_url(stream_url):
                 continue
             format_urls.add(stream_url)
-            stream_format = t.get('format') or {}
-            protocol = stream_format.get('protocol')
-            if protocol != 'hls' and '/hls' in format_url:
-                protocol = 'hls'
-            ext = None
-            preset = str_or_none(t.get('preset'))
-            if preset:
-                ext = preset.split('_')[0]
-            if ext not in KNOWN_EXTENSIONS:
-                ext = mimetype2ext(stream_format.get('mime_type'))
-            add_format({
+
+            mime_type = traverse_obj(t, ('format', 'mime_type', {str}))
+            codec = self._search_regex(r'codecs="([^"]+)"', mime_type, 'codec', default=None)
+            ext = {
+                'mp4a': 'm4a',
+                'opus': 'opus',
+            }.get(codec[:4] if codec else None) or mimetype2ext(mime_type, default=None)
+            if not ext or ext == 'm3u8':
+                ext = preset_base
+
+            is_premium = t.get('quality') == 'hq'
+            abr = int_or_none(
+                self._search_regex(r'(\d+)k$', preset, 'abr', default=None)
+                or self._search_regex(r'\.(\d+)\.(?:opus|mp3)[/?]', stream_url, 'abr', default=None)
+                or (256 if (is_premium and 'aac' in preset) else None))
+
+            is_preview = (t.get('snipped')
+                          or '/preview/' in format_url
+                          or re.search(r'/(?:preview|playlist)/0/30/', stream_url))
+
+            formats.append({
+                'format_id': join_nonempty(protocol, preset, is_preview and 'preview', delim='_'),
                 'url': stream_url,
                 'ext': ext,
-            }, 'http' if protocol == 'progressive' else protocol,
-                t.get('snipped') or '/preview/' in format_url)
+                'acodec': codec,
+                'vcodec': 'none',
+                'abr': abr,
+                'protocol': 'm3u8_native' if protocol in ('hls', 'hls-aes') else 'http',
+                'container': 'm4a_dash' if ext == 'm4a' else None,
+                'quality': 5 if is_premium else 0 if (abr and abr >= 160) else -1,
+                'format_note': 'Premium' if is_premium else None,
+                'preference': -10 if is_preview else None,
+            })
 
-        for f in formats:
-            f['vcodec'] = 'none'
-
-        if not formats and info.get('policy') == 'BLOCK':
-            self.raise_geo_restricted(metadata_available=True)
+        if not formats:
+            if has_drm:
+                self.report_drm(track_id)
+            if info.get('policy') == 'BLOCK':
+                self.raise_geo_restricted(metadata_available=True)
 
         user = info.get('user') or {}
 
         thumbnails = []
         artwork_url = info.get('artwork_url')
         thumbnail = artwork_url or user.get('avatar_url')
-        if isinstance(thumbnail, compat_str):
-            if re.search(self._IMAGE_REPL_RE, thumbnail):
+        if url_or_none(thumbnail):
+            if mobj := re.search(self._IMAGE_REPL_RE, thumbnail):
                 for image_id, size in self._ARTWORK_MAP.items():
+                    # Soundcloud serves JPEG regardless of URL's ext *except* for "original" thumb
+                    ext = mobj.group('ext') if image_id == 'original' else 'jpg'
                     i = {
                         'id': image_id,
-                        'url': re.sub(self._IMAGE_REPL_RE, '-%s.jpg' % image_id, thumbnail),
+                        'url': re.sub(self._IMAGE_REPL_RE, f'-{image_id}.{ext}', thumbnail),
                     }
                     if image_id == 'tiny' and not artwork_url:
                         size = 18
@@ -320,7 +355,7 @@ class SoundcloudBaseIE(InfoExtractor):
                 thumbnails = [{'url': thumbnail}]
 
         def extract_count(key):
-            return int_or_none(info.get('%s_count' % key))
+            return int_or_none(info.get(f'{key}_count'))
 
         return {
             'id': track_id,
@@ -328,7 +363,8 @@ class SoundcloudBaseIE(InfoExtractor):
             'uploader_id': str_or_none(user.get('id')) or user.get('permalink'),
             'uploader_url': user.get('permalink_url'),
             'timestamp': unified_timestamp(info.get('created_at')),
-            'title': title,
+            'title': info.get('title'),
+            'track': info.get('title'),
             'description': info.get('description'),
             'thumbnails': thumbnails,
             'duration': float_or_none(info.get('duration'), 1000),
@@ -338,8 +374,10 @@ class SoundcloudBaseIE(InfoExtractor):
             'like_count': extract_count('favoritings') or extract_count('likes'),
             'comment_count': extract_count('comment'),
             'repost_count': extract_count('reposts'),
-            'genre': info.get('genre'),
-            'formats': formats if not extract_flat else None
+            'genres': traverse_obj(info, ('genre', {str}, filter, all, filter)),
+            'tags': traverse_obj(info, ('tag_list', {self._TAGS_RE.findall}, ..., ..., filter)),
+            'artists': traverse_obj(info, ('publisher_metadata', 'artist', {str}, filter, all, filter)),
+            'formats': formats if not extract_flat else None,
         }
 
     @classmethod
@@ -360,7 +398,7 @@ class SoundcloudIE(SoundcloudBaseIE):
                     (?:(?:(?:www\.|m\.)?soundcloud\.com/
                             (?!stations/track)
                             (?P<uploader>[\w\d-]+)/
-                            (?!(?:tracks|albums|sets(?:/.+?)?|reposts|likes|spotlight)/?(?:$|[?#]))
+                            (?!(?:tracks|albums|sets(?:/.+?)?|reposts|likes|spotlight|comments)/?(?:$|[?#]))
                             (?P<title>[\w\d-]+)
                             (?:/(?P<token>(?!(?:albums|sets|recommended))[^?]+?))?
                             (?:[?].*)?$)
@@ -372,11 +410,12 @@ class SoundcloudIE(SoundcloudBaseIE):
     _TESTS = [
         {
             'url': 'http://soundcloud.com/ethmusic/lostin-powers-she-so-heavy',
-            'md5': 'ebef0a451b909710ed1d7787dddbf0d7',
+            'md5': 'de9bac153e7427a7333b4b0c1b6a18d2',
             'info_dict': {
                 'id': '62986583',
-                'ext': 'mp3',
+                'ext': 'opus',
                 'title': 'Lostin Powers - She so Heavy (SneakPreview) Adrian Ackers Blueprint 1',
+                'track': 'Lostin Powers - She so Heavy (SneakPreview) Adrian Ackers Blueprint 1',
                 'description': 'No Downloads untill we record the finished version this weekend, i was too pumped n i had to post it , earl is prolly gonna b hella p.o\'d',
                 'uploader': 'E.T. ExTerrestrial Music',
                 'uploader_id': '1571244',
@@ -388,26 +427,35 @@ class SoundcloudIE(SoundcloudBaseIE):
                 'like_count': int,
                 'comment_count': int,
                 'repost_count': int,
-            }
+                'thumbnail': 'https://i1.sndcdn.com/artworks-000031955188-rwb18x-original.jpg',
+                'uploader_url': 'https://soundcloud.com/ethmusic',
+                'tags': 'count:14',
+            },
         },
         # geo-restricted
         {
             'url': 'https://soundcloud.com/the-concept-band/goldrushed-mastered?in=the-concept-band/sets/the-royal-concept-ep',
             'info_dict': {
                 'id': '47127627',
-                'ext': 'mp3',
+                'ext': 'opus',
                 'title': 'Goldrushed',
+                'track': 'Goldrushed',
                 'description': 'From Stockholm Sweden\r\nPovel / Magnus / Filip / David\r\nwww.theroyalconcept.com',
                 'uploader': 'The Royal Concept',
                 'uploader_id': '9615865',
                 'timestamp': 1337635207,
                 'upload_date': '20120521',
-                'duration': 227.155,
+                'duration': 227.103,
                 'license': 'all-rights-reserved',
                 'view_count': int,
                 'like_count': int,
                 'comment_count': int,
                 'repost_count': int,
+                'uploader_url': 'https://soundcloud.com/the-concept-band',
+                'thumbnail': 'https://i1.sndcdn.com/artworks-v8bFHhXm7Au6-0-original.jpg',
+                'genres': ['Alternative'],
+                'artists': ['The Royal Concept'],
+                'tags': [],
             },
         },
         # private link
@@ -418,7 +466,8 @@ class SoundcloudIE(SoundcloudBaseIE):
                 'id': '123998367',
                 'ext': 'mp3',
                 'title': 'Youtube - Dl Test Video \'\' Ä↭',
-                'description': 'test chars:  \"\'/\\ä↭',
+                'track': 'Youtube - Dl Test Video \'\' Ä↭',
+                'description': 'test chars:  "\'/\\ä↭',
                 'uploader': 'jaimeMF',
                 'uploader_id': '69767071',
                 'timestamp': 1386604920,
@@ -429,6 +478,10 @@ class SoundcloudIE(SoundcloudBaseIE):
                 'like_count': int,
                 'comment_count': int,
                 'repost_count': int,
+                'uploader_url': 'https://soundcloud.com/jaimemf',
+                'thumbnail': 'https://a1.sndcdn.com/images/default_avatar_large.png',
+                'genres': ['youtubedl'],
+                'tags': [],
             },
         },
         # private link (alt format)
@@ -439,7 +492,8 @@ class SoundcloudIE(SoundcloudBaseIE):
                 'id': '123998367',
                 'ext': 'mp3',
                 'title': 'Youtube - Dl Test Video \'\' Ä↭',
-                'description': 'test chars:  \"\'/\\ä↭',
+                'track': 'Youtube - Dl Test Video \'\' Ä↭',
+                'description': 'test chars:  "\'/\\ä↭',
                 'uploader': 'jaimeMF',
                 'uploader_id': '69767071',
                 'timestamp': 1386604920,
@@ -450,25 +504,50 @@ class SoundcloudIE(SoundcloudBaseIE):
                 'like_count': int,
                 'comment_count': int,
                 'repost_count': int,
+                'uploader_url': 'https://soundcloud.com/jaimemf',
+                'thumbnail': 'https://a1.sndcdn.com/images/default_avatar_large.png',
+                'genres': ['youtubedl'],
+                'tags': [],
             },
         },
         # downloadable song
         {
             'url': 'https://soundcloud.com/the80m/the-following',
-            'md5': '9ffcddb08c87d74fb5808a3c183a1d04',
+            'md5': 'ecb87d7705d5f53e6c02a63760573c75',  # wav: '9ffcddb08c87d74fb5808a3c183a1d04'
             'info_dict': {
                 'id': '343609555',
-                'ext': 'wav',
+                'ext': 'opus',  # wav original available with auth
+                'title': 'The Following',
+                'track': 'The Following',
+                'description': '',
+                'uploader': '80M',
+                'uploader_id': '312384765',
+                'uploader_url': 'https://soundcloud.com/the80m',
+                'upload_date': '20170922',
+                'timestamp': 1506120436,
+                'duration': 397.228,
+                'thumbnail': 'https://i1.sndcdn.com/artworks-000243916348-ktoo7d-original.jpg',
+                'license': 'all-rights-reserved',
+                'like_count': int,
+                'comment_count': int,
+                'repost_count': int,
+                'view_count': int,
+                'genres': ['Dance & EDM'],
+                'artists': ['80M'],
+                'tags': ['80M', 'EDM', 'Dance', 'Music'],
             },
+            'expected_warnings': ['Original download format is only available for registered users'],
         },
         # private link, downloadable format
+        # tags with spaces (e.g. "Uplifting Trance", "Ori Uplift")
         {
             'url': 'https://soundcloud.com/oriuplift/uponly-238-no-talking-wav/s-AyZUd',
-            'md5': '64a60b16e617d41d0bef032b7f55441e',
+            'md5': '2e1530d0e9986a833a67cb34fc90ece0',  # wav: '64a60b16e617d41d0bef032b7f55441e'
             'info_dict': {
                 'id': '340344461',
-                'ext': 'wav',
+                'ext': 'opus',  # wav original available with auth
                 'title': 'Uplifting Only 238 [No Talking] (incl. Alex Feed Guestmix) (Aug 31, 2017) [wav]',
+                'track': 'Uplifting Only 238 [No Talking] (incl. Alex Feed Guestmix) (Aug 31, 2017) [wav]',
                 'description': 'md5:fa20ee0fca76a3d6df8c7e57f3715366',
                 'uploader': 'Ori Uplift Music',
                 'uploader_id': '12563093',
@@ -480,7 +559,13 @@ class SoundcloudIE(SoundcloudBaseIE):
                 'like_count': int,
                 'comment_count': int,
                 'repost_count': int,
+                'thumbnail': 'https://i1.sndcdn.com/artworks-000240712245-kedn4p-original.jpg',
+                'uploader_url': 'https://soundcloud.com/oriuplift',
+                'genres': ['Trance'],
+                'artists': ['Ori Uplift'],
+                'tags': ['Orchestral', 'Emotional', 'Uplifting Trance', 'Trance', 'Ori Uplift', 'UpOnly'],
             },
+            'expected_warnings': ['Original download format is only available for registered users'],
         },
         # no album art, use avatar pic for thumbnail
         {
@@ -490,6 +575,7 @@ class SoundcloudIE(SoundcloudBaseIE):
                 'id': '309699954',
                 'ext': 'mp3',
                 'title': 'Sideways (Prod. Mad Real)',
+                'track': 'Sideways (Prod. Mad Real)',
                 'description': 'md5:d41d8cd98f00b204e9800998ecf8427e',
                 'uploader': 'garyvee',
                 'uploader_id': '2366352',
@@ -502,6 +588,9 @@ class SoundcloudIE(SoundcloudBaseIE):
                 'like_count': int,
                 'comment_count': int,
                 'repost_count': int,
+                'uploader_url': 'https://soundcloud.com/garyvee',
+                'artists': ['MadReal'],
+                'tags': [],
             },
             'params': {
                 'skip_download': True,
@@ -509,13 +598,14 @@ class SoundcloudIE(SoundcloudBaseIE):
         },
         {
             'url': 'https://soundcloud.com/giovannisarani/mezzo-valzer',
-            'md5': 'e22aecd2bc88e0e4e432d7dcc0a1abf7',
+            'md5': '8227c3473a4264df6b02ad7e5b7527ac',
             'info_dict': {
                 'id': '583011102',
-                'ext': 'mp3',
+                'ext': 'opus',
                 'title': 'Mezzo Valzer',
-                'description': 'md5:4138d582f81866a530317bae316e8b61',
-                'uploader': 'Micronie',
+                'track': 'Mezzo Valzer',
+                'description': 'md5:f4d5f39d52e0ccc2b4f665326428901a',
+                'uploader': 'Giovanni Sarani',
                 'uploader_id': '3352531',
                 'timestamp': 1551394171,
                 'upload_date': '20190228',
@@ -526,8 +616,49 @@ class SoundcloudIE(SoundcloudBaseIE):
                 'like_count': int,
                 'comment_count': int,
                 'repost_count': int,
+                'genres': ['Piano'],
+                'uploader_url': 'https://soundcloud.com/giovannisarani',
+                'tags': 'count:10',
             },
         },
+        # .png "original" artwork, 160kbps m4a HLS format
+        {
+            'url': 'https://soundcloud.com/skorxh/audio-dealer',
+            'info_dict': {
+                'id': '2011421339',
+                'ext': 'm4a',
+                'title': 'audio dealer',
+                'description': '',
+                'uploader': '$KORCH',
+                'uploader_id': '150292288',
+                'uploader_url': 'https://soundcloud.com/skorxh',
+                'comment_count': int,
+                'view_count': int,
+                'like_count': int,
+                'repost_count': int,
+                'duration': 213.469,
+                'tags': [],
+                'artists': ['$KORXH'],
+                'track': 'audio dealer',
+                'timestamp': 1737143201,
+                'upload_date': '20250117',
+                'license': 'all-rights-reserved',
+                'thumbnail': 'https://i1.sndcdn.com/artworks-a1wKGMYNreDLTMrT-fGjRiw-original.png',
+                'thumbnails': [
+                    {'id': 'mini', 'url': 'https://i1.sndcdn.com/artworks-a1wKGMYNreDLTMrT-fGjRiw-mini.jpg'},
+                    {'id': 'tiny', 'url': 'https://i1.sndcdn.com/artworks-a1wKGMYNreDLTMrT-fGjRiw-tiny.jpg'},
+                    {'id': 'small', 'url': 'https://i1.sndcdn.com/artworks-a1wKGMYNreDLTMrT-fGjRiw-small.jpg'},
+                    {'id': 'badge', 'url': 'https://i1.sndcdn.com/artworks-a1wKGMYNreDLTMrT-fGjRiw-badge.jpg'},
+                    {'id': 't67x67', 'url': 'https://i1.sndcdn.com/artworks-a1wKGMYNreDLTMrT-fGjRiw-t67x67.jpg'},
+                    {'id': 'large', 'url': 'https://i1.sndcdn.com/artworks-a1wKGMYNreDLTMrT-fGjRiw-large.jpg'},
+                    {'id': 't300x300', 'url': 'https://i1.sndcdn.com/artworks-a1wKGMYNreDLTMrT-fGjRiw-t300x300.jpg'},
+                    {'id': 'crop', 'url': 'https://i1.sndcdn.com/artworks-a1wKGMYNreDLTMrT-fGjRiw-crop.jpg'},
+                    {'id': 't500x500', 'url': 'https://i1.sndcdn.com/artworks-a1wKGMYNreDLTMrT-fGjRiw-t500x500.jpg'},
+                    {'id': 'original', 'url': 'https://i1.sndcdn.com/artworks-a1wKGMYNreDLTMrT-fGjRiw-original.png'},
+                ],
+            },
+            'params': {'skip_download': 'm3u8', 'format': 'hls_aac_160k'},
+        },
         {
             # AAC HQ format available (account with active subscription needed)
             'url': 'https://soundcloud.com/wandw/the-chainsmokers-ft-daya-dont-let-me-down-ww-remix-1',
@@ -553,30 +684,45 @@ class SoundcloudIE(SoundcloudBaseIE):
             if token:
                 query['secret_token'] = token
         else:
-            full_title = resolve_title = '%s/%s' % mobj.group('uploader', 'title')
+            full_title = resolve_title = '{}/{}'.format(*mobj.group('uploader', 'title'))
             token = mobj.group('token')
             if token:
-                resolve_title += '/%s' % token
+                resolve_title += f'/{token}'
             info_json_url = self._resolv_url(self._BASE_URL + resolve_title)
 
-        info = self._download_json(
+        info = self._call_api(
             info_json_url, full_title, 'Downloading info JSON', query=query, headers=self._HEADERS)
 
-        return self._extract_info_dict(info, full_title, token)
+        for retry in self.RetryManager():
+            try:
+                return self._extract_info_dict(info, full_title, token)
+            except ExtractorError as e:
+                if not isinstance(e.cause, HTTPError) or not e.cause.status == 429:
+                    raise
+                self.report_warning(
+                    'You have reached the API rate limit, which is ~600 requests per '
+                    '10 minutes. Use the --extractor-retries and --retry-sleep options '
+                    'to configure an appropriate retry count and wait time', only_once=True)
+                retry.error = e.cause
 
 
 class SoundcloudPlaylistBaseIE(SoundcloudBaseIE):
     def _extract_set(self, playlist, token=None):
-        playlist_id = compat_str(playlist['id'])
+        playlist_id = str(playlist['id'])
         tracks = playlist.get('tracks') or []
-        if not all([t.get('permalink_url') for t in tracks]) and token:
-            tracks = self._download_json(
+        if not all(t.get('permalink_url') for t in tracks) and token:
+            tracks = self._call_api(
                 self._API_V2_BASE + 'tracks', playlist_id,
                 'Downloading tracks', query={
-                    'ids': ','.join([compat_str(t['id']) for t in tracks]),
+                    'ids': ','.join([str(t['id']) for t in tracks]),
                     'playlistId': playlist_id,
                     'playlistSecretToken': token,
                 }, headers=self._HEADERS)
+        album_info = traverse_obj(playlist, {
+            'album': ('title', {str}),
+            'album_artist': ('user', 'username', {str}),
+            'album_type': ('set_type', {str}, {lambda x: x or 'playlist'}),
+        })
         entries = []
         for track in tracks:
             track_id = str_or_none(track.get('id'))
@@ -588,11 +734,17 @@ class SoundcloudPlaylistBaseIE(SoundcloudBaseIE):
                 if token:
                     url += '?secret_token=' + token
             entries.append(self.url_result(
-                url, SoundcloudIE.ie_key(), track_id))
+                url, SoundcloudIE.ie_key(), track_id, url_transparent=True, **album_info))
         return self.playlist_result(
             entries, playlist_id,
             playlist.get('title'),
-            playlist.get('description'))
+            playlist.get('description'),
+            **album_info,
+            **traverse_obj(playlist, {
+                'uploader': ('user', 'username', {str}),
+                'uploader_id': ('user', 'id', {str_or_none}),
+            }),
+        )
 
 
 class SoundcloudSetIE(SoundcloudPlaylistBaseIE):
@@ -604,6 +756,11 @@ class SoundcloudSetIE(SoundcloudPlaylistBaseIE):
             'id': '2284613',
             'title': 'The Royal Concept EP',
             'description': 'md5:71d07087c7a449e8941a70a29e34671e',
+            'uploader': 'The Royal Concept',
+            'uploader_id': '9615865',
+            'album': 'The Royal Concept EP',
+            'album_artists': ['The Royal Concept'],
+            'album_type': 'ep',
         },
         'playlist_mincount': 5,
     }, {
@@ -623,17 +780,17 @@ class SoundcloudSetIE(SoundcloudPlaylistBaseIE):
     def _real_extract(self, url):
         mobj = self._match_valid_url(url)
 
-        full_title = '%s/sets/%s' % mobj.group('uploader', 'slug_title')
+        full_title = '{}/sets/{}'.format(*mobj.group('uploader', 'slug_title'))
         token = mobj.group('token')
         if token:
             full_title += '/' + token
 
-        info = self._download_json(self._resolv_url(
+        info = self._call_api(self._resolv_url(
             self._BASE_URL + full_title), full_title, headers=self._HEADERS)
 
         if 'errors' in info:
-            msgs = (compat_str(err['error_message']) for err in info['errors'])
-            raise ExtractorError('unable to download video webpage: %s' % ','.join(msgs))
+            msgs = (str(err['error_message']) for err in info['errors'])
+            raise ExtractorError('unable to download video webpage: {}'.format(','.join(msgs)))
 
         return self._extract_set(info, token)
 
@@ -659,7 +816,7 @@ class SoundcloudPagedPlaylistBaseIE(SoundcloudBaseIE):
         for i in itertools.count():
             for retry in self.RetryManager():
                 try:
-                    response = self._download_json(
+                    response = self._call_api(
                         url, playlist_id, query=query, headers=self._HEADERS,
                         note=f'Downloading track page {i + 1}')
                     break
@@ -697,7 +854,7 @@ class SoundcloudUserIE(SoundcloudPagedPlaylistBaseIE):
                             (?:(?:www|m)\.)?soundcloud\.com/
                             (?P<user>[^/]+)
                             (?:/
-                                (?P<rsrc>tracks|albums|sets|reposts|likes|spotlight)
+                                (?P<rsrc>tracks|albums|sets|reposts|likes|spotlight|comments)
                             )?
                             /?(?:[?#].*)?$
                     '''
@@ -751,6 +908,13 @@ class SoundcloudUserIE(SoundcloudPagedPlaylistBaseIE):
             'title': 'Grynpyret (Spotlight)',
         },
         'playlist_mincount': 1,
+    }, {
+        'url': 'https://soundcloud.com/one-thousand-and-one/comments',
+        'info_dict': {
+            'id': '992430331',
+            'title': '7x11x13-testing (Comments)',
+        },
+        'playlist_mincount': 1,
     }]
 
     _BASE_URL_MAP = {
@@ -761,13 +925,14 @@ class SoundcloudUserIE(SoundcloudPagedPlaylistBaseIE):
         'reposts': 'stream/users/%s/reposts',
         'likes': 'users/%s/likes',
         'spotlight': 'users/%s/spotlight',
+        'comments': 'users/%s/comments',
     }
 
     def _real_extract(self, url):
         mobj = self._match_valid_url(url)
         uploader = mobj.group('user')
 
-        user = self._download_json(
+        user = self._call_api(
             self._resolv_url(self._BASE_URL + uploader),
             uploader, 'Downloading user info', headers=self._HEADERS)
 
@@ -776,7 +941,7 @@ class SoundcloudUserIE(SoundcloudPagedPlaylistBaseIE):
         return self._extract_playlist(
             self._API_V2_BASE + self._BASE_URL_MAP[resource] % user['id'],
             str_or_none(user.get('id')),
-            '%s (%s)' % (user['username'], resource.capitalize()))
+            '{} ({})'.format(user['username'], resource.capitalize()))
 
 
 class SoundcloudUserPermalinkIE(SoundcloudPagedPlaylistBaseIE):
@@ -788,16 +953,16 @@ class SoundcloudUserPermalinkIE(SoundcloudPagedPlaylistBaseIE):
             'id': '30909869',
             'title': 'neilcic',
         },
-        'playlist_mincount': 23,
+        'playlist_mincount': 22,
     }]
 
     def _real_extract(self, url):
         user_id = self._match_id(url)
-        user = self._download_json(
+        user = self._call_api(
             self._resolv_url(url), user_id, 'Downloading user info', headers=self._HEADERS)
 
         return self._extract_playlist(
-            f'{self._API_V2_BASE}stream/users/{user["id"]}', str(user['id']), user.get('username'))
+            f'{self._API_V2_BASE}users/{user["id"]}/tracks', str(user['id']), user.get('username'))
 
 
 class SoundcloudTrackStationIE(SoundcloudPagedPlaylistBaseIE):
@@ -815,13 +980,13 @@ class SoundcloudTrackStationIE(SoundcloudPagedPlaylistBaseIE):
     def _real_extract(self, url):
         track_name = self._match_id(url)
 
-        track = self._download_json(self._resolv_url(url), track_name, headers=self._HEADERS)
+        track = self._call_api(self._resolv_url(url), track_name, headers=self._HEADERS)
         track_id = self._search_regex(
             r'soundcloud:track-stations:(\d+)', track['id'], 'track id')
 
         return self._extract_playlist(
-            self._API_V2_BASE + 'stations/%s/tracks' % track['id'],
-            track_id, 'Track station: %s' % track['title'])
+            self._API_V2_BASE + 'stations/{}/tracks'.format(track['id']),
+            track_id, 'Track station: {}'.format(track['title']))
 
 
 class SoundcloudRelatedIE(SoundcloudPagedPlaylistBaseIE):
@@ -859,7 +1024,7 @@ class SoundcloudRelatedIE(SoundcloudPagedPlaylistBaseIE):
     def _real_extract(self, url):
         slug, relation = self._match_valid_url(url).group('slug', 'relation')
 
-        track = self._download_json(
+        track = self._call_api(
             self._resolv_url(self._BASE_URL + slug),
             slug, 'Downloading track info', headers=self._HEADERS)
 
@@ -869,7 +1034,7 @@ class SoundcloudRelatedIE(SoundcloudPagedPlaylistBaseIE):
 
         return self._extract_playlist(
             self._API_V2_BASE + self._BASE_URL_MAP[relation] % track['id'], str(track['id']),
-            '%s (%s)' % (track.get('title') or slug, relation.capitalize()))
+            '{} ({})'.format(track.get('title') or slug, relation.capitalize()))
 
 
 class SoundcloudPlaylistIE(SoundcloudPlaylistBaseIE):
@@ -881,6 +1046,11 @@ class SoundcloudPlaylistIE(SoundcloudPlaylistBaseIE):
             'id': '4110309',
             'title': 'TILT Brass - Bowery Poetry Club, August \'03 [Non-Site SCR 02]',
             'description': 're:.*?TILT Brass - Bowery Poetry Club',
+            'uploader': 'Non-Site Records',
+            'uploader_id': '33660914',
+            'album_artists': ['Non-Site Records'],
+            'album_type': 'playlist',
+            'album': 'TILT Brass - Bowery Poetry Club, August \'03 [Non-Site SCR 02]',
         },
         'playlist_count': 6,
     }]
@@ -894,7 +1064,7 @@ class SoundcloudPlaylistIE(SoundcloudPlaylistBaseIE):
         if token:
             query['secret_token'] = token
 
-        data = self._download_json(
+        data = self._call_api(
             self._API_V2_BASE + 'playlists/' + playlist_id,
             playlist_id, 'Downloading playlist', query=query, headers=self._HEADERS)
 
@@ -929,7 +1099,7 @@ class SoundcloudSearchIE(SoundcloudBaseIE, SearchInfoExtractor):
         next_url = update_url_query(self._API_V2_BASE + endpoint, query)
 
         for i in itertools.count(1):
-            response = self._download_json(
+            response = self._call_api(
                 next_url, collection_id, f'Downloading page {i}',
                 'Unable to download API page', headers=self._HEADERS)
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/soundgasm.py b/plugins/youtube_download/yt_dlp/extractor/soundgasm.py
index 9e59c7c..b524e24 100644
--- a/plugins/youtube_download/yt_dlp/extractor/soundgasm.py
+++ b/plugins/youtube_download/yt_dlp/extractor/soundgasm.py
@@ -15,7 +15,7 @@ class SoundgasmIE(InfoExtractor):
             'title': 'Piano sample',
             'description': 'Royalty Free Sample Music',
             'uploader': 'ytdl',
-        }
+        },
     }
 
     def _real_extract(self, url):
@@ -69,6 +69,6 @@ class SoundgasmProfileIE(InfoExtractor):
 
         entries = [
             self.url_result(audio_url, 'Soundgasm')
-            for audio_url in re.findall(r'href="([^"]+/u/%s/[^"]+)' % profile_id, webpage)]
+            for audio_url in re.findall(rf'href="([^"]+/u/{profile_id}/[^"]+)', webpage)]
 
         return self.playlist_result(entries, profile_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/southpark.py b/plugins/youtube_download/yt_dlp/extractor/southpark.py
index e23f192..3d661a8 100644
--- a/plugins/youtube_download/yt_dlp/extractor/southpark.py
+++ b/plugins/youtube_download/yt_dlp/extractor/southpark.py
@@ -87,7 +87,7 @@ class SouthParkDeIE(SouthParkIE):  # XXX: Do not subclass from concrete IE
             'id': 'e99d45ea-ed00-11e0-aca6-0026b9414f30',
             'ext': 'mp4',
             'title': 'Zahnfee Cartman',
-            'description': 'md5:b917eec991d388811d911fd1377671ac'
+            'description': 'md5:b917eec991d388811d911fd1377671ac',
         },
     }, {
         # episode
@@ -102,7 +102,7 @@ class SouthParkDeIE(SouthParkIE):  # XXX: Do not subclass from concrete IE
     def _get_feed_url(self, uri, url=None):
         video_id = self._id_from_uri(uri)
         config = self._download_json(
-            'http://media.mtvnservices.com/pmt/e1/access/index.html?uri=%s&configtype=edge&ref=%s' % (uri, url), video_id)
+            f'http://media.mtvnservices.com/pmt/e1/access/index.html?uri={uri}&configtype=edge&ref={url}', video_id)
         return self._remove_template_parameter(config['feedWithQueryParams'])
 
     def _get_feed_query(self, uri):
diff --git a/plugins/youtube_download/yt_dlp/extractor/sovietscloset.py b/plugins/youtube_download/yt_dlp/extractor/sovietscloset.py
index 453016c..d35214a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/sovietscloset.py
+++ b/plugins/youtube_download/yt_dlp/extractor/sovietscloset.py
@@ -1,8 +1,6 @@
+from .bunnycdn import BunnyCdnIE
 from .common import InfoExtractor
-from ..utils import (
-    try_get,
-    unified_timestamp
-)
+from ..utils import make_archive_id, try_get, unified_timestamp
 
 
 class SovietsClosetBaseIE(InfoExtractor):
@@ -46,7 +44,7 @@ class SovietsClosetIE(SovietsClosetBaseIE):
             'url': 'https://sovietscloset.com/video/1337',
             'md5': 'bd012b04b261725510ca5383074cdd55',
             'info_dict': {
-                'id': '1337',
+                'id': '2f0cfbf4-3588-43a9-a7d6-7c9ea3755e67',
                 'ext': 'mp4',
                 'title': 'The Witcher #13',
                 'thumbnail': r're:^https?://.*\.b-cdn\.net/2f0cfbf4-3588-43a9-a7d6-7c9ea3755e67/thumbnail\.jpg$',
@@ -58,25 +56,27 @@ class SovietsClosetIE(SovietsClosetBaseIE):
                 'upload_date': '20170413',
                 'uploader_id': 'SovietWomble',
                 'uploader_url': 'https://www.twitch.tv/SovietWomble',
-                'duration': 7007,
+                'duration': 7008,
                 'was_live': True,
                 'availability': 'public',
                 'series': 'The Witcher',
                 'season': 'Misc',
                 'episode_number': 13,
                 'episode': 'Episode 13',
+                'creators': ['SovietWomble'],
+                'description': '',
+                '_old_archive_ids': ['sovietscloset 1337'],
             },
         },
         {
             'url': 'https://sovietscloset.com/video/1105',
             'md5': '89fa928f183893cb65a0b7be846d8a90',
             'info_dict': {
-                'id': '1105',
+                'id': 'c0e5e76f-3a93-40b4-bf01-12343c2eec5d',
                 'ext': 'mp4',
                 'title': 'Arma 3 - Zeus Games #5',
                 'uploader': 'SovietWomble',
                 'thumbnail': r're:^https?://.*\.b-cdn\.net/c0e5e76f-3a93-40b4-bf01-12343c2eec5d/thumbnail\.jpg$',
-                'uploader': 'SovietWomble',
                 'creator': 'SovietWomble',
                 'release_timestamp': 1461157200,
                 'release_date': '20160420',
@@ -84,39 +84,20 @@ class SovietsClosetIE(SovietsClosetBaseIE):
                 'upload_date': '20160420',
                 'uploader_id': 'SovietWomble',
                 'uploader_url': 'https://www.twitch.tv/SovietWomble',
-                'duration': 8804,
+                'duration': 8805,
                 'was_live': True,
                 'availability': 'public',
                 'series': 'Arma 3',
                 'season': 'Zeus Games',
                 'episode_number': 5,
                 'episode': 'Episode 5',
+                'creators': ['SovietWomble'],
+                'description': '',
+                '_old_archive_ids': ['sovietscloset 1105'],
             },
         },
     ]
 
-    def _extract_bunnycdn_iframe(self, video_id, bunnycdn_id):
-        iframe = self._download_webpage(
-            f'https://iframe.mediadelivery.net/embed/5105/{bunnycdn_id}',
-            video_id, note='Downloading BunnyCDN iframe', headers=self.MEDIADELIVERY_REFERER)
-
-        m3u8_url = self._search_regex(r'(https?://.*?\.m3u8)', iframe, 'm3u8 url')
-        thumbnail_url = self._search_regex(r'(https?://.*?thumbnail\.jpg)', iframe, 'thumbnail url')
-
-        m3u8_formats = self._extract_m3u8_formats(m3u8_url, video_id, headers=self.MEDIADELIVERY_REFERER)
-
-        if not m3u8_formats:
-            duration = None
-        else:
-            duration = self._extract_m3u8_vod_duration(
-                m3u8_formats[0]['url'], video_id, headers=self.MEDIADELIVERY_REFERER)
-
-        return {
-            'formats': m3u8_formats,
-            'thumbnail': thumbnail_url,
-            'duration': duration,
-        }
-
     def _real_extract(self, url):
         video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
@@ -126,13 +107,13 @@ class SovietsClosetIE(SovietsClosetBaseIE):
 
         stream = self.parse_nuxt_jsonp(f'{static_assets_base}/video/{video_id}/payload.js', video_id, 'video')['stream']
 
-        return {
+        return self.url_result(
+            f'https://iframe.mediadelivery.net/embed/5105/{stream["bunnyId"]}', ie=BunnyCdnIE, url_transparent=True,
             **self.video_meta(
                 video_id=video_id, game_name=stream['game']['name'],
                 category_name=try_get(stream, lambda x: x['subcategory']['name'], str),
                 episode_number=stream.get('number'), stream_date=stream.get('date')),
-            **self._extract_bunnycdn_iframe(video_id, stream['bunnyId']),
-        }
+            _old_archive_ids=[make_archive_id(self, video_id)])
 
 
 class SovietsClosetPlaylistIE(SovietsClosetBaseIE):
diff --git a/plugins/youtube_download/yt_dlp/extractor/spankbang.py b/plugins/youtube_download/yt_dlp/extractor/spankbang.py
index 43da34a..05f0bb1 100644
--- a/plugins/youtube_download/yt_dlp/extractor/spankbang.py
+++ b/plugins/youtube_download/yt_dlp/extractor/spankbang.py
@@ -2,8 +2,8 @@ import re
 
 from .common import InfoExtractor
 from ..utils import (
-    determine_ext,
     ExtractorError,
+    determine_ext,
     merge_dicts,
     parse_duration,
     parse_resolution,
@@ -37,7 +37,7 @@ class SpankBangIE(InfoExtractor):
             'timestamp': 1617109572,
             'upload_date': '20210330',
             'age_limit': 18,
-        }
+        },
     }, {
         # 480p only
         'url': 'http://spankbang.com/1vt0/video/solvane+gangbang',
@@ -71,13 +71,15 @@ class SpankBangIE(InfoExtractor):
     def _real_extract(self, url):
         mobj = self._match_valid_url(url)
         video_id = mobj.group('id') or mobj.group('id_2')
+        country = self.get_param('geo_bypass_country') or 'US'
+        self._set_cookie('.spankbang.com', 'country', country.upper())
         webpage = self._download_webpage(
-            url.replace('/%s/embed' % video_id, '/%s/video' % video_id),
-            video_id, headers={'Cookie': 'country=US'})
+            url.replace(f'/{video_id}/embed', f'/{video_id}/video'),
+            video_id, impersonate=True)
 
         if re.search(r'<[^>]+\b(?:id|class)=["\']video_removed', webpage):
             raise ExtractorError(
-                'Video %s is not available' % video_id, expected=True)
+                f'Video {video_id} is not available', expected=True)
 
         formats = []
 
@@ -104,8 +106,7 @@ class SpankBangIE(InfoExtractor):
         STREAM_URL_PREFIX = 'stream_url_'
 
         for mobj in re.finditer(
-                r'%s(?P<id>[^\s=]+)\s*=\s*(["\'])(?P<url>(?:(?!\2).)+)\2'
-                % STREAM_URL_PREFIX, webpage):
+                rf'{STREAM_URL_PREFIX}(?P<id>[^\s=]+)\s*=\s*(["\'])(?P<url>(?:(?!\2).)+)\2', webpage):
             extract_format(mobj.group('id', 'url'))
 
         if not formats:
@@ -159,7 +160,7 @@ class SpankBangIE(InfoExtractor):
             'view_count': view_count,
             'formats': formats,
             'age_limit': age_limit,
-        }, info
+        }, info,
         )
 
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/spankwire.py b/plugins/youtube_download/yt_dlp/extractor/spankwire.py
deleted file mode 100644
index 334b297..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/spankwire.py
+++ /dev/null
@@ -1,174 +0,0 @@
-import re
-
-from .common import InfoExtractor
-from ..utils import (
-    float_or_none,
-    int_or_none,
-    merge_dicts,
-    str_or_none,
-    str_to_int,
-    url_or_none,
-)
-
-
-class SpankwireIE(InfoExtractor):
-    _VALID_URL = r'''(?x)
-                    https?://
-                        (?:www\.)?spankwire\.com/
-                        (?:
-                            [^/]+/video|
-                            EmbedPlayer\.aspx/?\?.*?\bArticleId=
-                        )
-                        (?P<id>\d+)
-                    '''
-    _EMBED_REGEX = [r'<iframe[^>]+\bsrc=["\'](?P<url>(?:https?:)?//(?:www\.)?spankwire\.com/EmbedPlayer\.aspx/?\?.*?\bArticleId=\d+)']
-    _TESTS = [{
-        # download URL pattern: */<height>P_<tbr>K_<video_id>.mp4
-        'url': 'http://www.spankwire.com/Buckcherry-s-X-Rated-Music-Video-Crazy-Bitch/video103545/',
-        'md5': '5aa0e4feef20aad82cbcae3aed7ab7cd',
-        'info_dict': {
-            'id': '103545',
-            'ext': 'mp4',
-            'title': 'Buckcherry`s X Rated Music Video Crazy Bitch',
-            'description': 'Crazy Bitch X rated music video.',
-            'duration': 222,
-            'uploader': 'oreusz',
-            'uploader_id': '124697',
-            'timestamp': 1178587885,
-            'upload_date': '20070508',
-            'average_rating': float,
-            'view_count': int,
-            'comment_count': int,
-            'age_limit': 18,
-            'categories': list,
-            'tags': list,
-        },
-    }, {
-        # download URL pattern: */mp4_<format_id>_<video_id>.mp4
-        'url': 'http://www.spankwire.com/Titcums-Compiloation-I/video1921551/',
-        'md5': '09b3c20833308b736ae8902db2f8d7e6',
-        'info_dict': {
-            'id': '1921551',
-            'ext': 'mp4',
-            'title': 'Titcums Compiloation I',
-            'description': 'cum on tits',
-            'uploader': 'dannyh78999',
-            'uploader_id': '3056053',
-            'upload_date': '20150822',
-            'age_limit': 18,
-        },
-        'params': {
-            'proxy': '127.0.0.1:8118'
-        },
-        'skip': 'removed',
-    }, {
-        'url': 'https://www.spankwire.com/EmbedPlayer.aspx/?ArticleId=156156&autostart=true',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        video = self._download_json(
-            'https://www.spankwire.com/api/video/%s.json' % video_id, video_id)
-
-        title = video['title']
-
-        formats = []
-        videos = video.get('videos')
-        if isinstance(videos, dict):
-            for format_id, format_url in videos.items():
-                video_url = url_or_none(format_url)
-                if not format_url:
-                    continue
-                height = int_or_none(self._search_regex(
-                    r'(\d+)[pP]', format_id, 'height', default=None))
-                m = re.search(
-                    r'/(?P<height>\d+)[pP]_(?P<tbr>\d+)[kK]', video_url)
-                if m:
-                    tbr = int(m.group('tbr'))
-                    height = height or int(m.group('height'))
-                else:
-                    tbr = None
-                formats.append({
-                    'url': video_url,
-                    'format_id': '%dp' % height if height else format_id,
-                    'height': height,
-                    'tbr': tbr,
-                })
-        m3u8_url = url_or_none(video.get('HLS'))
-        if m3u8_url:
-            formats.extend(self._extract_m3u8_formats(
-                m3u8_url, video_id, 'mp4', entry_protocol='m3u8_native',
-                m3u8_id='hls', fatal=False))
-
-        view_count = str_to_int(video.get('viewed'))
-
-        thumbnails = []
-        for preference, t in enumerate(('', '2x'), start=0):
-            thumbnail_url = url_or_none(video.get('poster%s' % t))
-            if not thumbnail_url:
-                continue
-            thumbnails.append({
-                'url': thumbnail_url,
-                'preference': preference,
-            })
-
-        def extract_names(key):
-            entries_list = video.get(key)
-            if not isinstance(entries_list, list):
-                return
-            entries = []
-            for entry in entries_list:
-                name = str_or_none(entry.get('name'))
-                if name:
-                    entries.append(name)
-            return entries
-
-        categories = extract_names('categories')
-        tags = extract_names('tags')
-
-        uploader = None
-        info = {}
-
-        webpage = self._download_webpage(
-            'https://www.spankwire.com/_/video%s/' % video_id, video_id,
-            fatal=False)
-        if webpage:
-            info = self._search_json_ld(webpage, video_id, default={})
-            thumbnail_url = None
-            if 'thumbnail' in info:
-                thumbnail_url = url_or_none(info['thumbnail'])
-                del info['thumbnail']
-            if not thumbnail_url:
-                thumbnail_url = self._og_search_thumbnail(webpage)
-            if thumbnail_url:
-                thumbnails.append({
-                    'url': thumbnail_url,
-                    'preference': 10,
-                })
-            uploader = self._html_search_regex(
-                r'(?s)by\s*<a[^>]+\bclass=["\']uploaded__by[^>]*>(.+?)</a>',
-                webpage, 'uploader', fatal=False)
-            if not view_count:
-                view_count = str_to_int(self._search_regex(
-                    r'data-views=["\']([\d,.]+)', webpage, 'view count',
-                    fatal=False))
-
-        return merge_dicts({
-            'id': video_id,
-            'title': title,
-            'description': video.get('description'),
-            'duration': int_or_none(video.get('duration')),
-            'thumbnails': thumbnails,
-            'uploader': uploader,
-            'uploader_id': str_or_none(video.get('userId')),
-            'timestamp': int_or_none(video.get('time_approved_on')),
-            'average_rating': float_or_none(video.get('rating')),
-            'view_count': view_count,
-            'comment_count': int_or_none(video.get('comments')),
-            'age_limit': 18,
-            'categories': categories,
-            'tags': tags,
-            'formats': formats,
-        }, info)
diff --git a/plugins/youtube_download/yt_dlp/extractor/spiegel.py b/plugins/youtube_download/yt_dlp/extractor/spiegel.py
index 3701e29..0397f83 100644
--- a/plugins/youtube_download/yt_dlp/extractor/spiegel.py
+++ b/plugins/youtube_download/yt_dlp/extractor/spiegel.py
@@ -4,7 +4,7 @@ from .jwplatform import JWPlatformIE
 
 class SpiegelIE(InfoExtractor):
     _UUID_RE = r'[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}'
-    _VALID_URL = r'https?://(?:www\.)?(?:spiegel|manager-magazin)\.de(?:/[^/]+)+/[^/]*-(?P<id>[0-9]+|%s)(?:-embed|-iframe)?(?:\.html)?(?:$|[#?])' % _UUID_RE
+    _VALID_URL = rf'https?://(?:www\.)?(?:spiegel|manager-magazin)\.de(?:/[^/]+)+/[^/]*-(?P<id>[0-9]+|{_UUID_RE})(?:-embed|-iframe)?(?:\.html)?(?:$|[#?])'
     _TESTS = [{
         'url': 'http://www.spiegel.de/video/vulkan-tungurahua-in-ecuador-ist-wieder-aktiv-video-1259285.html',
         'md5': '50c7948883ec85a3e431a0a44b7ad1d6',
@@ -45,7 +45,7 @@ class SpiegelIE(InfoExtractor):
             '_type': 'url_transparent',
             'id': video_id,
             'display_id': video_id,
-            'url': 'jwplatform:%s' % media_id,
+            'url': f'jwplatform:{media_id}',
             'title': self._og_search_title(webpage, default=None),
             'ie_key': JWPlatformIE.ie_key(),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/sport5.py b/plugins/youtube_download/yt_dlp/extractor/sport5.py
index 44b4067..6c45c3e 100644
--- a/plugins/youtube_download/yt_dlp/extractor/sport5.py
+++ b/plugins/youtube_download/yt_dlp/extractor/sport5.py
@@ -27,7 +27,7 @@ class Sport5IE(InfoExtractor):
                 'categories': list,
             },
             'skip': 'Blocked outside of Israel',
-        }
+        },
     ]
 
     def _real_extract(self, url):
@@ -39,13 +39,13 @@ class Sport5IE(InfoExtractor):
         video_id = self._html_search_regex(r'clipId=([\w-]+)', webpage, 'video id')
 
         metadata = self._download_xml(
-            'http://sport5-metadata-rr-d.nsacdn.com/vod/vod/%s/HDS/metadata.xml' % video_id,
+            f'http://sport5-metadata-rr-d.nsacdn.com/vod/vod/{video_id}/HDS/metadata.xml',
             video_id)
 
         error = metadata.find('./Error')
         if error is not None:
             raise ExtractorError(
-                '%s returned error: %s - %s' % (
+                '{} returned error: {} - {}'.format(
                     self.IE_NAME,
                     error.find('./Name').text,
                     error.find('./Description').text),
diff --git a/plugins/youtube_download/yt_dlp/extractor/sportdeutschland.py b/plugins/youtube_download/yt_dlp/extractor/sportdeutschland.py
index 30dbcf3..2d6acb8 100644
--- a/plugins/youtube_download/yt_dlp/extractor/sportdeutschland.py
+++ b/plugins/youtube_download/yt_dlp/extractor/sportdeutschland.py
@@ -24,7 +24,7 @@ class SportDeutschlandIE(InfoExtractor):
             'duration': 32447,
             'upload_date': '20230114',
             'timestamp': 1673733618,
-        }
+        },
     }, {
         'url': 'https://sportdeutschland.tv/deutscherbadmintonverband/bwf-tour-1-runde-feld-1-yonex-gainward-german-open-2022-0',
         'info_dict': {
@@ -40,7 +40,7 @@ class SportDeutschlandIE(InfoExtractor):
             'duration': 41097,
             'upload_date': '20220309',
             'timestamp': 1646860727.0,
-        }
+        },
     }, {
         'url': 'https://sportdeutschland.tv/ggcbremen/formationswochenende-latein-2023',
         'info_dict': {
@@ -66,8 +66,8 @@ class SportDeutschlandIE(InfoExtractor):
                 'upload_date': '20230225',
                 'timestamp': 1677349909,
                 'live_status': 'was_live',
-            }
-        }]
+            },
+        }],
     }, {
         'url': 'https://sportdeutschland.tv/dtb/gymnastik-international-tag-1',
         'info_dict': {
@@ -99,7 +99,7 @@ class SportDeutschlandIE(InfoExtractor):
             **traverse_obj(video, {
                 'id': 'id',
                 'duration': ('duration', {lambda x: float(x) > 0 and float(x)}),
-                'timestamp': ('created_at', {unified_timestamp})
+                'timestamp': ('created_at', {unified_timestamp}),
             }),
         }
 
@@ -120,7 +120,7 @@ class SportDeutschlandIE(InfoExtractor):
                 'is_live': 'currently_live',
                 'was_live': 'was_live',
                 'channel_url': ('profile', 'slug', {lambda x: f'https://sportdeutschland.tv/{x}'}),
-            }, get_all=False)
+            }, get_all=False),
         }
 
         parts = traverse_obj(meta, (('livestream', ('videos', ...)), ))
diff --git a/plugins/youtube_download/yt_dlp/extractor/spotify.py b/plugins/youtube_download/yt_dlp/extractor/spotify.py
index 55ce36a..de67a61 100644
--- a/plugins/youtube_download/yt_dlp/extractor/spotify.py
+++ b/plugins/youtube_download/yt_dlp/extractor/spotify.py
@@ -39,7 +39,7 @@ class SpotifyBaseIE(InfoExtractor):
                     'persistedQuery': {
                         'sha256Hash': self._OPERATION_HASHES[operation],
                     },
-                })
+                }),
             }, headers={'authorization': 'Bearer ' + self._ACCESS_TOKEN},
             **kwargs)['data']
 
@@ -115,7 +115,7 @@ class SpotifyIE(SpotifyBaseIE):
             'duration': 2083.605,
             'release_date': '20201217',
             'series': "The Guardian's Audio Long Reads",
-        }
+        },
     }, {
         'url': 'https://open.spotify.com/embed/episode/4TvCsKKs2thXmarHigWvXE?si=7eatS8AbQb6RxqO2raIuWA',
         'only_matching': True,
@@ -124,7 +124,7 @@ class SpotifyIE(SpotifyBaseIE):
     def _real_extract(self, url):
         episode_id = self._match_id(url)
         episode = self._call_api('Episode', episode_id, {
-            'uri': 'spotify:episode:' + episode_id
+            'uri': 'spotify:episode:' + episode_id,
         })['episode']
         return self._extract_episode(
             episode, try_get(episode, lambda x: x['podcast']['name']))
diff --git a/plugins/youtube_download/yt_dlp/extractor/spreaker.py b/plugins/youtube_download/yt_dlp/extractor/spreaker.py
index 36a9bd2..c64c2fc 100644
--- a/plugins/youtube_download/yt_dlp/extractor/spreaker.py
+++ b/plugins/youtube_download/yt_dlp/extractor/spreaker.py
@@ -1,41 +1,43 @@
 import itertools
 
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
+    filter_dict,
     float_or_none,
     int_or_none,
+    parse_qs,
     str_or_none,
     try_get,
     unified_timestamp,
     url_or_none,
 )
+from ..utils.traversal import traverse_obj
 
 
 def _extract_episode(data, episode_id=None):
     title = data['title']
     download_url = data['download_url']
 
-    series = try_get(data, lambda x: x['show']['title'], compat_str)
-    uploader = try_get(data, lambda x: x['author']['fullname'], compat_str)
+    series = try_get(data, lambda x: x['show']['title'], str)
+    uploader = try_get(data, lambda x: x['author']['fullname'], str)
 
     thumbnails = []
     for image in ('image_original', 'image_medium', 'image'):
-        image_url = url_or_none(data.get('%s_url' % image))
+        image_url = url_or_none(data.get(f'{image}_url'))
         if image_url:
             thumbnails.append({'url': image_url})
 
     def stats(key):
         return int_or_none(try_get(
             data,
-            (lambda x: x['%ss_count' % key],
-             lambda x: x['stats']['%ss' % key])))
+            (lambda x: x[f'{key}s_count'],
+             lambda x: x['stats'][f'{key}s'])))
 
     def duration(key):
         return float_or_none(data.get(key), scale=1000)
 
     return {
-        'id': compat_str(episode_id or data['episode_id']),
+        'id': str(episode_id or data['episode_id']),
         'url': download_url,
         'display_id': data.get('permalink'),
         'title': title,
@@ -59,15 +61,10 @@ def _extract_episode(data, episode_id=None):
 
 
 class SpreakerIE(InfoExtractor):
-    _VALID_URL = r'''(?x)
-                    https?://
-                        api\.spreaker\.com/
-                        (?:
-                            (?:download/)?episode|
-                            v2/episodes
-                        )/
-                        (?P<id>\d+)
-                    '''
+    _VALID_URL = [
+        r'https?://api\.spreaker\.com/(?:(?:download/)?episode|v2/episodes)/(?P<id>\d+)',
+        r'https?://(?:www\.)?spreaker\.com/episode/[^#?/]*?(?P<id>\d+)/?(?:[?#]|$)',
+    ]
     _TESTS = [{
         'url': 'https://api.spreaker.com/episode/12534508',
         'info_dict': {
@@ -84,7 +81,9 @@ class SpreakerIE(InfoExtractor):
             'view_count': int,
             'like_count': int,
             'comment_count': int,
-            'series': 'Success With Music (SWM)',
+            'series': 'Success With Music | SWM',
+            'thumbnail': 'https://d3wo5wojvuv7l.cloudfront.net/t_square_limited_160/images.spreaker.com/original/777ce4f96b71b0e1b7c09a5e625210e3.jpg',
+            'creators': ['SWM'],
         },
     }, {
         'url': 'https://api.spreaker.com/download/episode/12534508/swm_ep15_how_to_market_your_music_part_2.mp3',
@@ -92,52 +91,75 @@ class SpreakerIE(InfoExtractor):
     }, {
         'url': 'https://api.spreaker.com/v2/episodes/12534508?export=episode_segments',
         'only_matching': True,
+    }, {
+        'note': 'episode',
+        'url': 'https://www.spreaker.com/episode/grunge-music-origins-the-raw-sound-that-defined-a-generation--60269615',
+        'info_dict': {
+            'id': '60269615',
+            'display_id': 'grunge-music-origins-the-raw-sound-that-',
+            'ext': 'mp3',
+            'title': 'Grunge Music Origins - The Raw Sound that Defined a Generation',
+            'description': str,
+            'timestamp': 1717468905,
+            'upload_date': '20240604',
+            'uploader': 'Katie Brown 2',
+            'uploader_id': '17733249',
+            'duration': 818.83,
+            'view_count': int,
+            'like_count': int,
+            'comment_count': int,
+            'series': '90s Grunge',
+            'thumbnail': 'https://d3wo5wojvuv7l.cloudfront.net/t_square_limited_160/images.spreaker.com/original/bb0d4178f7cf57cc8786dedbd9c5d969.jpg',
+            'creators': ['Katie Brown 2'],
+        },
+    }, {
+        'url': 'https://www.spreaker.com/episode/60269615',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
         episode_id = self._match_id(url)
         data = self._download_json(
-            'https://api.spreaker.com/v2/episodes/%s' % episode_id,
-            episode_id)['response']['episode']
+            f'https://api.spreaker.com/v2/episodes/{episode_id}', episode_id,
+            query=traverse_obj(parse_qs(url), {'key': ('key', 0)}))['response']['episode']
         return _extract_episode(data, episode_id)
 
 
-class SpreakerPageIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?spreaker\.com/user/[^/]+/(?P<id>[^/?#&]+)'
-    _TESTS = [{
-        'url': 'https://www.spreaker.com/user/9780658/swm-ep15-how-to-market-your-music-part-2',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        display_id = self._match_id(url)
-        webpage = self._download_webpage(url, display_id)
-        episode_id = self._search_regex(
-            (r'data-episode_id=["\'](?P<id>\d+)',
-             r'episode_id\s*:\s*(?P<id>\d+)'), webpage, 'episode id')
-        return self.url_result(
-            'https://api.spreaker.com/episode/%s' % episode_id,
-            ie=SpreakerIE.ie_key(), video_id=episode_id)
-
-
 class SpreakerShowIE(InfoExtractor):
-    _VALID_URL = r'https?://api\.spreaker\.com/show/(?P<id>\d+)'
+    _VALID_URL = [
+        r'https?://api\.spreaker\.com/show/(?P<id>\d+)',
+        r'https?://(?:www\.)?spreaker\.com/podcast/[\w-]+--(?P<id>[\d]+)',
+        r'https?://(?:www\.)?spreaker\.com/show/(?P<id>\d+)/episodes/feed',
+    ]
     _TESTS = [{
         'url': 'https://api.spreaker.com/show/4652058',
         'info_dict': {
             'id': '4652058',
         },
         'playlist_mincount': 118,
+    }, {
+        'url': 'https://www.spreaker.com/podcast/health-wealth--5918323',
+        'info_dict': {
+            'id': '5918323',
+        },
+        'playlist_mincount': 60,
+    }, {
+        'url': 'https://www.spreaker.com/show/5887186/episodes/feed',
+        'info_dict': {
+            'id': '5887186',
+        },
+        'playlist_mincount': 290,
     }]
 
-    def _entries(self, show_id):
+    def _entries(self, show_id, key=None):
         for page_num in itertools.count(1):
             episodes = self._download_json(
-                'https://api.spreaker.com/show/%s/episodes' % show_id,
-                show_id, note='Downloading JSON page %d' % page_num, query={
+                f'https://api.spreaker.com/show/{show_id}/episodes',
+                show_id, note=f'Downloading JSON page {page_num}', query=filter_dict({
                     'page': page_num,
                     'max_per_page': 100,
-                })
+                    'key': key,
+                }))
             pager = try_get(episodes, lambda x: x['response']['pager'], dict)
             if not pager:
                 break
@@ -153,21 +175,5 @@ class SpreakerShowIE(InfoExtractor):
 
     def _real_extract(self, url):
         show_id = self._match_id(url)
-        return self.playlist_result(self._entries(show_id), playlist_id=show_id)
-
-
-class SpreakerShowPageIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?spreaker\.com/show/(?P<id>[^/?#&]+)'
-    _TESTS = [{
-        'url': 'https://www.spreaker.com/show/success-with-music',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        display_id = self._match_id(url)
-        webpage = self._download_webpage(url, display_id)
-        show_id = self._search_regex(
-            r'show_id\s*:\s*(?P<id>\d+)', webpage, 'show id')
-        return self.url_result(
-            'https://api.spreaker.com/show/%s' % show_id,
-            ie=SpreakerShowIE.ie_key(), video_id=show_id)
+        key = traverse_obj(parse_qs(url), ('key', 0))
+        return self.playlist_result(self._entries(show_id, key), playlist_id=show_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/springboardplatform.py b/plugins/youtube_download/yt_dlp/extractor/springboardplatform.py
index a98584a..cd3261d 100644
--- a/plugins/youtube_download/yt_dlp/extractor/springboardplatform.py
+++ b/plugins/youtube_download/yt_dlp/extractor/springboardplatform.py
@@ -4,11 +4,11 @@ from .common import InfoExtractor
 from ..utils import (
     ExtractorError,
     int_or_none,
-    xpath_attr,
-    xpath_text,
-    xpath_element,
     unescapeHTML,
     unified_timestamp,
+    xpath_attr,
+    xpath_element,
+    xpath_text,
 )
 
 
@@ -52,8 +52,7 @@ class SpringboardPlatformIE(InfoExtractor):
         index = mobj.group('index') or mobj.group('index_2')
 
         video = self._download_xml(
-            'http://cms.springboardplatform.com/xml_feeds_advanced/index/%s/rss3/%s'
-            % (index, video_id), video_id)
+            f'http://cms.springboardplatform.com/xml_feeds_advanced/index/{index}/rss3/{video_id}', video_id)
 
         item = xpath_element(video, './/item', 'item', fatal=True)
 
@@ -66,7 +65,7 @@ class SpringboardPlatformIE(InfoExtractor):
 
         if 'error_video.mp4' in video_url:
             raise ExtractorError(
-                'Video %s no longer exists' % video_id, expected=True)
+                f'Video {video_id} no longer exists', expected=True)
 
         duration = int_or_none(content.get('duration'))
         tbr = int_or_none(content.get('bitrate'))
diff --git a/plugins/youtube_download/yt_dlp/extractor/sproutvideo.py b/plugins/youtube_download/yt_dlp/extractor/sproutvideo.py
new file mode 100644
index 0000000..c092359
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/sproutvideo.py
@@ -0,0 +1,198 @@
+import base64
+import urllib.parse
+
+from .common import InfoExtractor
+from ..networking.exceptions import HTTPError
+from ..utils import (
+    ExtractorError,
+    int_or_none,
+    qualities,
+    remove_start,
+    smuggle_url,
+    unsmuggle_url,
+    update_url_query,
+    url_or_none,
+    urlencode_postdata,
+)
+from ..utils.traversal import traverse_obj
+
+
+class SproutVideoIE(InfoExtractor):
+    _NO_SCHEME_RE = r'//videos\.sproutvideo\.com/embed/(?P<id>[\da-f]+)/[\da-f]+'
+    _VALID_URL = rf'https?:{_NO_SCHEME_RE}'
+    _EMBED_REGEX = [rf'<iframe [^>]*\bsrc=["\'](?P<url>(?:https?:)?{_NO_SCHEME_RE}[^"\']*)["\']']
+    _TESTS = [{
+        'url': 'https://videos.sproutvideo.com/embed/4c9dddb01910e3c9c4/0fc24387c4f24ee3',
+        'md5': '1343ce1a6cb39d67889bfa07c7b02b0e',
+        'info_dict': {
+            'id': '4c9dddb01910e3c9c4',
+            'ext': 'mp4',
+            'title': 'Adrien Labaeye : Berlin, des communautés aux communs',
+            'duration': 576,
+            'thumbnail': r're:https?://images\.sproutvideo\.com/.+\.jpg',
+        },
+    }, {
+        'url': 'https://videos.sproutvideo.com/embed/a79fdcb21f1be2c62e/93bf31e41e39ca27',
+        'md5': 'cebae5cf558cca83271917cf4ec03f26',
+        'info_dict': {
+            'id': 'a79fdcb21f1be2c62e',
+            'ext': 'mp4',
+            'title': 'HS_01_Live Stream 2023-01-14 10:00',
+            'duration': 703,
+            'thumbnail': r're:https?://images\.sproutvideo\.com/.+\.jpg',
+        },
+    }, {
+        # http formats 'sd' and 'hd' are available
+        'url': 'https://videos.sproutvideo.com/embed/119cd6bc1a18e6cd98/30751a1761ae5b90',
+        'md5': 'f368c78df07e78a749508b221528672c',
+        'info_dict': {
+            'id': '119cd6bc1a18e6cd98',
+            'ext': 'mp4',
+            'title': '3. Updating your Partner details',
+            'thumbnail': r're:https?://images\.sproutvideo\.com/.+\.jpg',
+            'duration': 60,
+        },
+        'params': {'format': 'hd'},
+    }, {
+        # subtitles
+        'url': 'https://videos.sproutvideo.com/embed/119dd8ba121ee0cc98/4ee50c88a343215d?type=hd',
+        'md5': '7f6798f037d7a3e3e07e67959de68fc6',
+        'info_dict': {
+            'id': '119dd8ba121ee0cc98',
+            'ext': 'mp4',
+            'title': 'Recipients Setup - Domestic Wire Only',
+            'thumbnail': r're:https?://images\.sproutvideo\.com/.+\.jpg',
+            'duration': 77,
+            'subtitles': {'en': 'count:1'},
+        },
+    }]
+    _WEBPAGE_TESTS = [{
+        'url': 'https://www.solidarum.org/vivre-ensemble/adrien-labaeye-berlin-des-communautes-aux-communs',
+        'info_dict': {
+            'id': '4c9dddb01910e3c9c4',
+            'ext': 'mp4',
+            'title': 'Adrien Labaeye : Berlin, des communautés aux communs',
+            'duration': 576,
+            'thumbnail': r're:https?://images\.sproutvideo\.com/.+\.jpg',
+        },
+    }]
+    _M3U8_URL_TMPL = 'https://{base}.videos.sproutvideo.com/{s3_user_hash}/{s3_video_hash}/video/index.m3u8'
+    _QUALITIES = ('hd', 'uhd', 'source')  # Exclude 'sd' to prioritize hls formats above it
+
+    @staticmethod
+    def _policy_to_qs(policy, signature_key, as_string=False):
+        query = {}
+        for key, value in policy['signatures'][signature_key].items():
+            query[remove_start(key, 'CloudFront-')] = value
+        query['sessionID'] = policy['sessionID']
+        return urllib.parse.urlencode(query, doseq=True) if as_string else query
+
+    @classmethod
+    def _extract_embed_urls(cls, url, webpage):
+        for embed_url in super()._extract_embed_urls(url, webpage):
+            if embed_url.startswith('//'):
+                embed_url = f'https:{embed_url}'
+            yield smuggle_url(embed_url, {'referer': url})
+
+    def _real_extract(self, url):
+        url, smuggled_data = unsmuggle_url(url, {})
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(
+            url, video_id, headers=traverse_obj(smuggled_data, {'Referer': 'referer'}))
+        data = self._search_json(
+            r'var\s+dat\s*=\s*["\']', webpage, 'data', video_id, contains_pattern=r'[A-Za-z0-9+/=]+',
+            end_pattern=r'["\'];', transform_source=lambda x: base64.b64decode(x).decode())
+
+        formats, subtitles = [], {}
+        headers = {
+            'Accept': '*/*',
+            'Origin': 'https://videos.sproutvideo.com',
+            'Referer': url,
+        }
+
+        # HLS extraction is fatal; only attempt it if the JSON data says it's available
+        if traverse_obj(data, 'hls'):
+            manifest_query = self._policy_to_qs(data, 'm')
+            fragment_query = self._policy_to_qs(data, 't', as_string=True)
+            key_query = self._policy_to_qs(data, 'k', as_string=True)
+
+            formats.extend(self._extract_m3u8_formats(
+                self._M3U8_URL_TMPL.format(**data), video_id, 'mp4',
+                m3u8_id='hls', headers=headers, query=manifest_query))
+            for fmt in formats:
+                fmt.update({
+                    'url': update_url_query(fmt['url'], manifest_query),
+                    'extra_param_to_segment_url': fragment_query,
+                    'extra_param_to_key_url': key_query,
+                })
+
+        if downloads := traverse_obj(data, ('downloads', {dict.items}, lambda _, v: url_or_none(v[1]))):
+            quality = qualities(self._QUALITIES)
+            acodec = 'none' if data.get('has_audio') is False else None
+            formats.extend([{
+                'format_id': str(format_id),
+                'url': format_url,
+                'ext': 'mp4',
+                'quality': quality(format_id),
+                'acodec': acodec,
+            } for format_id, format_url in downloads])
+
+        for sub_data in traverse_obj(data, ('subtitleData', lambda _, v: url_or_none(v['src']))):
+            subtitles.setdefault(sub_data.get('srclang', 'en'), []).append({
+                'url': sub_data['src'],
+            })
+
+        return {
+            'id': video_id,
+            'formats': formats,
+            'subtitles': subtitles,
+            'http_headers': headers,
+            **traverse_obj(data, {
+                'title': ('title', {str}),
+                'duration': ('duration', {int_or_none}),
+                'thumbnail': ('posterframe_url', {url_or_none}),
+            }),
+        }
+
+
+class VidsIoIE(InfoExtractor):
+    IE_NAME = 'vids.io'
+    _VALID_URL = r'https?://[\w-]+\.vids\.io/videos/(?P<id>[\da-f]+)/(?P<display_id>[\w-]+)'
+    _TESTS = [{
+        'url': 'https://how-to-video.vids.io/videos/799cd8b11c10efc1f0/how-to-video-live-streaming',
+        'md5': '9bbbb2c0c0739eb163b80f87b8d77c9e',
+        'info_dict': {
+            'id': '799cd8b11c10efc1f0',
+            'ext': 'mp4',
+            'title': 'How to Video: Live Streaming',
+            'duration': 2787,
+            'thumbnail': r're:https?://images\.sproutvideo\.com/.+\.jpg',
+        },
+    }]
+
+    def _real_extract(self, url):
+        video_id, display_id = self._match_valid_url(url).group('id', 'display_id')
+        webpage, urlh = self._download_webpage_handle(url, display_id, expected_status=403)
+
+        if urlh.status == 403:
+            password = self.get_param('videopassword')
+            if not password:
+                raise ExtractorError(
+                    'This video is password-protected; use the --video-password option', expected=True)
+            try:
+                webpage = self._download_webpage(
+                    url, display_id, 'Submitting video password',
+                    data=urlencode_postdata({
+                        'password': password,
+                        **self._hidden_inputs(webpage),
+                    }))
+                # Requests with user's session cookie `_sproutvideo_session` are now authorized
+            except ExtractorError as e:
+                if isinstance(e.cause, HTTPError) and e.cause.status == 403:
+                    raise ExtractorError('Incorrect password', expected=True)
+                raise
+
+        if embed_url := next(SproutVideoIE._extract_embed_urls(url, webpage), None):
+            return self.url_result(embed_url, SproutVideoIE, video_id)
+
+        raise ExtractorError('Unable to extract any SproutVideo embed url')
diff --git a/plugins/youtube_download/yt_dlp/extractor/srgssr.py b/plugins/youtube_download/yt_dlp/extractor/srgssr.py
index 145f25e..c01fd12 100644
--- a/plugins/youtube_download/yt_dlp/extractor/srgssr.py
+++ b/plugins/youtube_download/yt_dlp/extractor/srgssr.py
@@ -48,7 +48,7 @@ class SRGSSRIE(InfoExtractor):
     def _get_tokenized_src(self, url, video_id, format_id):
         token = self._download_json(
             'http://tp.srgssr.ch/akahd/token?acl=*',
-            video_id, 'Downloading %s token' % format_id, fatal=False) or {}
+            video_id, f'Downloading {format_id} token', fatal=False) or {}
         auth_params = try_get(token, lambda x: x['token']['authparams'])
         if auth_params:
             url += ('?' if '?' not in url else '&') + auth_params
@@ -57,8 +57,7 @@ class SRGSSRIE(InfoExtractor):
     def _get_media_data(self, bu, media_type, media_id):
         query = {'onlyChapters': True} if media_type == 'video' else {}
         full_media_data = self._download_json(
-            'https://il.srgssr.ch/integrationlayer/2.0/%s/mediaComposition/%s/%s.json'
-            % (bu, media_type, media_id),
+            f'https://il.srgssr.ch/integrationlayer/2.0/{bu}/mediaComposition/{media_type}/{media_id}.json',
             media_id, query=query)['chapterList']
         try:
             media_data = next(
@@ -73,7 +72,7 @@ class SRGSSRIE(InfoExtractor):
                 self.raise_geo_restricted(
                     msg=message, countries=self._GEO_COUNTRIES)
             raise ExtractorError(
-                '%s said: %s' % (self.IE_NAME, message), expected=True)
+                f'{self.IE_NAME} said: {message}', expected=True)
 
         return media_data
 
@@ -119,7 +118,7 @@ class SRGSSRIE(InfoExtractor):
         # whole episode.
         if int_or_none(media_data.get('position')) == 0:
             for p in ('S', 'H'):
-                podcast_url = media_data.get('podcast%sdUrl' % p)
+                podcast_url = media_data.get(f'podcast{p}dUrl')
                 if not podcast_url:
                     continue
                 quality = p + 'D'
@@ -207,7 +206,7 @@ class SRGSSRPlayIE(InfoExtractor):
         'params': {
             # m3u8 download
             'skip_download': True,
-        }
+        },
     }, {
         'url': 'http://play.swissinfo.ch/play/tv/business/video/why-people-were-against-tax-reforms?id=42960270',
         'info_dict': {
@@ -223,7 +222,7 @@ class SRGSSRPlayIE(InfoExtractor):
         },
         'params': {
             'skip_download': True,
-        }
+        },
     }, {
         'url': 'https://www.srf.ch/play/tv/popupvideoplayer?id=c4dba0ca-e75b-43b2-a34f-f708a4932e01',
         'only_matching': True,
@@ -244,4 +243,4 @@ class SRGSSRPlayIE(InfoExtractor):
         bu = mobj.group('bu')
         media_type = mobj.group('type') or mobj.group('type_2')
         media_id = mobj.group('id')
-        return self.url_result('srgssr:%s:%s:%s' % (bu[:3], media_type, media_id), 'SRGSSR')
+        return self.url_result(f'srgssr:{bu[:3]}:{media_type}:{media_id}', 'SRGSSR')
diff --git a/plugins/youtube_download/yt_dlp/extractor/srmediathek.py b/plugins/youtube_download/yt_dlp/extractor/srmediathek.py
index 3cc3987..fc63d9b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/srmediathek.py
+++ b/plugins/youtube_download/yt_dlp/extractor/srmediathek.py
@@ -6,6 +6,7 @@ from ..utils import (
 
 
 class SRMediathekIE(ARDMediathekBaseIE):
+    _WORKING = False
     IE_NAME = 'sr:mediathek'
     IE_DESC = 'Saarländischer Rundfunk'
     _VALID_URL = r'https?://sr-mediathek(?:\.sr-online)?\.de/index\.php\?.*?&id=(?P<id>[0-9]+)'
@@ -42,7 +43,7 @@ class SRMediathekIE(ARDMediathekBaseIE):
         webpage = self._download_webpage(url, video_id)
 
         if '>Der gew&uuml;nschte Beitrag ist leider nicht mehr verf&uuml;gbar.<' in webpage:
-            raise ExtractorError('Video %s is no longer available' % video_id, expected=True)
+            raise ExtractorError(f'Video {video_id} is no longer available', expected=True)
 
         media_collection_url = self._search_regex(
             r'data-mediacollection-ardplayer="([^"]+)"', webpage, 'media collection url')
diff --git a/plugins/youtube_download/yt_dlp/extractor/stacommu.py b/plugins/youtube_download/yt_dlp/extractor/stacommu.py
index 6f58f06..8300185 100644
--- a/plugins/youtube_download/yt_dlp/extractor/stacommu.py
+++ b/plugins/youtube_download/yt_dlp/extractor/stacommu.py
@@ -38,9 +38,48 @@ class StacommuBaseIE(WrestleUniverseBaseIE):
             return None
         return traverse_obj(encryption_data, {'key': ('key', {decrypt}), 'iv': ('iv', {decrypt})})
 
+    def _extract_vod(self, url):
+        video_id = self._match_id(url)
+        video_info = self._download_metadata(
+            url, video_id, 'ja', ('dehydratedState', 'queries', 0, 'state', 'data'))
+        hls_info, decrypt = self._call_encrypted_api(
+            video_id, ':watch', 'stream information', data={'method': 1})
+
+        return {
+            'id': video_id,
+            'formats': self._get_formats(hls_info, ('protocolHls', 'url', {url_or_none}), video_id),
+            'hls_aes': self._extract_hls_key(hls_info, 'protocolHls', decrypt),
+            **traverse_obj(video_info, {
+                'title': ('displayName', {str}),
+                'description': ('description', {str}),
+                'timestamp': ('watchStartTime', {int_or_none}),
+                'thumbnail': ('keyVisualUrl', {url_or_none}),
+                'cast': ('casts', ..., 'displayName', {str}),
+                'duration': ('duration', {int}),
+            }),
+        }
+
+    def _extract_ppv(self, url):
+        video_id = self._match_id(url)
+        video_info = self._call_api(video_id, msg='video information', query={'al': 'ja'}, auth=False)
+        hls_info, decrypt = self._call_encrypted_api(
+            video_id, ':watchArchive', 'stream information', data={'method': 1})
+
+        return {
+            'id': video_id,
+            'formats': self._get_formats(hls_info, ('hls', 'urls', ..., {url_or_none}), video_id),
+            'hls_aes': self._extract_hls_key(hls_info, 'hls', decrypt),
+            **traverse_obj(video_info, {
+                'title': ('displayName', {str}),
+                'timestamp': ('startTime', {int_or_none}),
+                'thumbnail': ('keyVisualUrl', {url_or_none}),
+                'duration': ('duration', {int_or_none}),
+            }),
+        }
+
 
 class StacommuVODIE(StacommuBaseIE):
-    _VALID_URL = r'https?://www\.stacommu\.jp/videos/episodes/(?P<id>[\da-zA-Z]+)'
+    _VALID_URL = r'https?://www\.stacommu\.jp/(?:en/)?videos/episodes/(?P<id>[\da-zA-Z]+)'
     _TESTS = [{
         # not encrypted
         'url': 'https://www.stacommu.jp/videos/episodes/aXcVKjHyAENEjard61soZZ',
@@ -79,34 +118,19 @@ class StacommuVODIE(StacommuBaseIE):
         'params': {
             'skip_download': 'm3u8',
         },
+    }, {
+        'url': 'https://www.stacommu.jp/en/videos/episodes/aXcVKjHyAENEjard61soZZ',
+        'only_matching': True,
     }]
 
     _API_PATH = 'videoEpisodes'
 
     def _real_extract(self, url):
-        video_id = self._match_id(url)
-        video_info = self._download_metadata(
-            url, video_id, 'ja', ('dehydratedState', 'queries', 0, 'state', 'data'))
-        hls_info, decrypt = self._call_encrypted_api(
-            video_id, ':watch', 'stream information', data={'method': 1})
-
-        return {
-            'id': video_id,
-            'formats': self._get_formats(hls_info, ('protocolHls', 'url', {url_or_none}), video_id),
-            'hls_aes': self._extract_hls_key(hls_info, 'protocolHls', decrypt),
-            **traverse_obj(video_info, {
-                'title': ('displayName', {str}),
-                'description': ('description', {str}),
-                'timestamp': ('watchStartTime', {int_or_none}),
-                'thumbnail': ('keyVisualUrl', {url_or_none}),
-                'cast': ('casts', ..., 'displayName', {str}),
-                'duration': ('duration', {int}),
-            }),
-        }
+        return self._extract_vod(url)
 
 
 class StacommuLiveIE(StacommuBaseIE):
-    _VALID_URL = r'https?://www\.stacommu\.jp/live/(?P<id>[\da-zA-Z]+)'
+    _VALID_URL = r'https?://www\.stacommu\.jp/(?:en/)?live/(?P<id>[\da-zA-Z]+)'
     _TESTS = [{
         'url': 'https://www.stacommu.jp/live/d2FJ3zLnndegZJCAEzGM3m',
         'info_dict': {
@@ -125,24 +149,92 @@ class StacommuLiveIE(StacommuBaseIE):
         'params': {
             'skip_download': 'm3u8',
         },
+    }, {
+        'url': 'https://www.stacommu.jp/en/live/d2FJ3zLnndegZJCAEzGM3m',
+        'only_matching': True,
     }]
 
     _API_PATH = 'events'
 
     def _real_extract(self, url):
-        video_id = self._match_id(url)
-        video_info = self._call_api(video_id, msg='video information', query={'al': 'ja'}, auth=False)
-        hls_info, decrypt = self._call_encrypted_api(
-            video_id, ':watchArchive', 'stream information', data={'method': 1})
+        return self._extract_ppv(url)
 
-        return {
-            'id': video_id,
-            'formats': self._get_formats(hls_info, ('hls', 'urls', ..., {url_or_none}), video_id),
-            'hls_aes': self._extract_hls_key(hls_info, 'hls', decrypt),
-            **traverse_obj(video_info, {
-                'title': ('displayName', {str}),
-                'timestamp': ('startTime', {int_or_none}),
-                'thumbnail': ('keyVisualUrl', {url_or_none}),
-                'duration': ('duration', {int_or_none}),
-            }),
-        }
+
+class TheaterComplexTownBaseIE(StacommuBaseIE):
+    _NETRC_MACHINE = 'theatercomplextown'
+    _API_HOST = 'api.theater-complex.town'
+    _LOGIN_QUERY = {'key': 'AIzaSyAgNCqToaIz4a062EeIrkhI_xetVfAOrfc'}
+    _LOGIN_HEADERS = {
+        'Accept': '*/*',
+        'Content-Type': 'application/json',
+        'X-Client-Version': 'Chrome/JsCore/9.23.0/FirebaseCore-web',
+        'Referer': 'https://www.theater-complex.town/',
+        'Origin': 'https://www.theater-complex.town',
+    }
+
+
+class TheaterComplexTownVODIE(TheaterComplexTownBaseIE):
+    _VALID_URL = r'https?://(?:www\.)?theater-complex\.town/(?:(?:en|ja)/)?videos/episodes/(?P<id>\w+)'
+    IE_NAME = 'theatercomplextown:vod'
+    _TESTS = [{
+        'url': 'https://www.theater-complex.town/videos/episodes/hoxqidYNoAn7bP92DN6p78',
+        'info_dict': {
+            'id': 'hoxqidYNoAn7bP92DN6p78',
+            'ext': 'mp4',
+            'title': '演劇ドラフトグランプリ2023　劇団『恋のぼり』〜劇団名決定秘話ラジオ',
+            'description': 'md5:a7e2e9cf570379ea67fb630f345ff65d',
+            'cast': ['玉城 裕規', '石川 凌雅'],
+            'thumbnail': 'https://image.theater-complex.town/5URnXX6KCeDysuFrPkP38o/5URnXX6KCeDysuFrPkP38o',
+            'upload_date': '20231103',
+            'timestamp': 1699016400,
+            'duration': 868,
+        },
+        'params': {
+            'skip_download': 'm3u8',
+        },
+    }, {
+        'url': 'https://www.theater-complex.town/en/videos/episodes/6QT7XYwM9dJz5Gf9VB6K5y',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.theater-complex.town/ja/videos/episodes/hoxqidYNoAn7bP92DN6p78',
+        'only_matching': True,
+    }]
+
+    _API_PATH = 'videoEpisodes'
+
+    def _real_extract(self, url):
+        return self._extract_vod(url)
+
+
+class TheaterComplexTownPPVIE(TheaterComplexTownBaseIE):
+    _VALID_URL = r'https?://(?:www\.)?theater-complex\.town/(?:(?:en|ja)/)?(?:ppv|live)/(?P<id>\w+)'
+    IE_NAME = 'theatercomplextown:ppv'
+    _TESTS = [{
+        'url': 'https://www.theater-complex.town/ppv/wytW3X7khrjJBUpKuV3jen',
+        'info_dict': {
+            'id': 'wytW3X7khrjJBUpKuV3jen',
+            'ext': 'mp4',
+            'title': 'BREAK FREE STARS　11月5日（日）12:30千秋楽公演',
+            'thumbnail': 'https://image.theater-complex.town/5GWEB31JcTUfjtgdeV5t6o/5GWEB31JcTUfjtgdeV5t6o',
+            'upload_date': '20231105',
+            'timestamp': 1699155000,
+            'duration': 8378,
+        },
+        'params': {
+            'skip_download': 'm3u8',
+        },
+    }, {
+        'url': 'https://www.theater-complex.town/en/ppv/wytW3X7khrjJBUpKuV3jen',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.theater-complex.town/ja/ppv/qwUVmLmGEiZ3ZW6it9uGys',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.theater-complex.town/en/live/79akNM7bJeD5Fi9EP39aDp',
+        'only_matching': True,
+    }]
+
+    _API_PATH = 'events'
+
+    def _real_extract(self, url):
+        return self._extract_ppv(url)
diff --git a/plugins/youtube_download/yt_dlp/extractor/stageplus.py b/plugins/youtube_download/yt_dlp/extractor/stageplus.py
index adb4ebb..6399072 100644
--- a/plugins/youtube_download/yt_dlp/extractor/stageplus.py
+++ b/plugins/youtube_download/yt_dlp/extractor/stageplus.py
@@ -21,7 +21,7 @@ class StagePlusVODConcertIE(InfoExtractor):
             'id': 'vod_concert_APNM8GRFDPHMASJKBSPJACG',
             'title': 'Yuja Wang plays Rachmaninoff\'s Piano Concerto No. 2 – from Odeonsplatz',
             'description': 'md5:50f78ec180518c9bdb876bac550996fc',
-            'artist': ['Yuja Wang', 'Lorenzo Viotti'],
+            'artists': ['Yuja Wang', 'Lorenzo Viotti'],
             'upload_date': '20230331',
             'timestamp': 1680249600,
             'release_date': '20210709',
@@ -40,10 +40,10 @@ class StagePlusVODConcertIE(InfoExtractor):
                 'release_timestamp': 1625788800,
                 'duration': 2207,
                 'chapters': 'count:5',
-                'artist': ['Yuja Wang'],
-                'composer': ['Sergei Rachmaninoff'],
+                'artists': ['Yuja Wang'],
+                'composers': ['Sergei Rachmaninoff'],
                 'album': 'Yuja Wang plays Rachmaninoff\'s Piano Concerto No. 2 – from Odeonsplatz',
-                'album_artist': ['Yuja Wang', 'Lorenzo Viotti'],
+                'album_artists': ['Yuja Wang', 'Lorenzo Viotti'],
                 'track': 'Piano Concerto No. 2 in C Minor, Op. 18',
                 'track_number': 1,
                 'genre': 'Instrumental Concerto',
@@ -468,13 +468,13 @@ fragment BannerFields on Banner {
         }, data=json.dumps({
             'query': self._GRAPHQL_QUERY,
             'variables': {'videoId': concert_id},
-            'operationName': 'videoDetailPage'
+            'operationName': 'videoDetailPage',
         }, separators=(',', ':')).encode())['data']['node']
 
         metadata = traverse_obj(data, {
             'title': 'title',
             'description': ('shortDescription', {str}),
-            'artist': ('artists', 'edges', ..., 'node', 'name'),
+            'artists': ('artists', 'edges', ..., 'node', 'name'),
             'timestamp': ('archiveReleaseDate', {unified_timestamp}),
             'release_timestamp': ('productionDate', {unified_timestamp}),
         })
@@ -484,20 +484,17 @@ fragment BannerFields on Banner {
             'url': 'url',
         })) or None
 
-        m3u8_headers = {'jwt': self._TOKEN}
-
         entries = []
         for idx, video in enumerate(traverse_obj(data, (
                 'performanceWorks', lambda _, v: v['id'] and url_or_none(v['stream']['url']))), 1):
             formats, subtitles = self._extract_m3u8_formats_and_subtitles(
-                video['stream']['url'], video['id'], 'mp4', m3u8_id='hls', headers=m3u8_headers)
+                video['stream']['url'], video['id'], 'mp4', m3u8_id='hls', query={'token': self._TOKEN})
             entries.append({
                 'id': video['id'],
                 'formats': formats,
                 'subtitles': subtitles,
-                'http_headers': m3u8_headers,
                 'album': metadata.get('title'),
-                'album_artist': metadata.get('artist'),
+                'album_artists': metadata.get('artist'),
                 'track_number': idx,
                 **metadata,
                 **traverse_obj(video, {
@@ -509,8 +506,8 @@ fragment BannerFields on Banner {
                             'title': 'title',
                             'start_time': ('mark', {float_or_none}),
                         }),
-                    'artist': ('artists', 'edges', ..., 'node', 'name'),
-                    'composer': ('work', 'composers', ..., 'name'),
+                    'artists': ('artists', 'edges', ..., 'node', 'name'),
+                    'composers': ('work', 'composers', ..., 'name'),
                     'genre': ('work', 'genre', 'title'),
                 }),
             })
diff --git a/plugins/youtube_download/yt_dlp/extractor/stanfordoc.py b/plugins/youtube_download/yt_dlp/extractor/stanfordoc.py
index be0f4af..ab41091 100644
--- a/plugins/youtube_download/yt_dlp/extractor/stanfordoc.py
+++ b/plugins/youtube_download/yt_dlp/extractor/stanfordoc.py
@@ -19,7 +19,7 @@ class StanfordOpenClassroomIE(InfoExtractor):
             'id': 'PracticalUnix_intro-environment',
             'ext': 'mp4',
             'title': 'Intro Environment',
-        }
+        },
     }
 
     def _real_extract(self, url):
@@ -34,12 +34,12 @@ class StanfordOpenClassroomIE(InfoExtractor):
                 'upload_date': None,
             }
 
-            baseUrl = 'http://openclassroom.stanford.edu/MainFolder/courses/' + course + '/videos/'
-            xmlUrl = baseUrl + video + '.xml'
-            mdoc = self._download_xml(xmlUrl, info['id'])
+            base_url = 'http://openclassroom.stanford.edu/MainFolder/courses/' + course + '/videos/'
+            xml_url = base_url + video + '.xml'
+            mdoc = self._download_xml(xml_url, info['id'])
             try:
                 info['title'] = mdoc.findall('./title')[0].text
-                info['url'] = baseUrl + mdoc.findall('./videoFile')[0].text
+                info['url'] = base_url + mdoc.findall('./videoFile')[0].text
             except IndexError:
                 raise ExtractorError('Invalid metadata XML file')
             return info
@@ -66,7 +66,7 @@ class StanfordOpenClassroomIE(InfoExtractor):
 
             links = orderedSet(re.findall(r'<a href="(VideoPage\.php\?[^"]+)">', coursepage))
             info['entries'] = [self.url_result(
-                'http://openclassroom.stanford.edu/MainFolder/%s' % unescapeHTML(l)
+                f'http://openclassroom.stanford.edu/MainFolder/{unescapeHTML(l)}',
             ) for l in links]
             return info
         else:  # Root page
@@ -78,12 +78,12 @@ class StanfordOpenClassroomIE(InfoExtractor):
             }
             info['title'] = info['id']
 
-            rootURL = 'http://openclassroom.stanford.edu/MainFolder/HomePage.php'
-            rootpage = self._download_webpage(rootURL, info['id'],
+            root_url = 'http://openclassroom.stanford.edu/MainFolder/HomePage.php'
+            rootpage = self._download_webpage(root_url, info['id'],
                                               errnote='Unable to download course info page')
 
             links = orderedSet(re.findall(r'<a href="(CoursePage\.php\?[^"]+)">', rootpage))
             info['entries'] = [self.url_result(
-                'http://openclassroom.stanford.edu/MainFolder/%s' % unescapeHTML(l)
+                f'http://openclassroom.stanford.edu/MainFolder/{unescapeHTML(l)}',
             ) for l in links]
             return info
diff --git a/plugins/youtube_download/yt_dlp/extractor/startrek.py b/plugins/youtube_download/yt_dlp/extractor/startrek.py
index e92122f..c591871 100644
--- a/plugins/youtube_download/yt_dlp/extractor/startrek.py
+++ b/plugins/youtube_download/yt_dlp/extractor/startrek.py
@@ -3,6 +3,7 @@ from ..utils import int_or_none, urljoin
 
 
 class StarTrekIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'(?P<base>https?://(?:intl|www)\.startrek\.com)/videos/(?P<id>[^/]+)'
     _TESTS = [{
         'url': 'https://intl.startrek.com/videos/watch-welcoming-jess-bush-to-the-ready-room',
@@ -21,7 +22,7 @@ class StarTrekIE(InfoExtractor):
             }, {
                 'url': 'https://media.startrek.com/2022/06/16/2043801155561/1069981_hls/trr_snw_107_v4-c4bfc25d/stream_vtt.m3u8',
             }]},
-        }
+        },
     }, {
         'url': 'https://www.startrek.com/videos/watch-ethan-peck-and-gia-sandhu-beam-down-to-the-ready-room',
         'md5': 'f5ad74fbb86e91e0882fc0a333178d1d',
@@ -37,7 +38,7 @@ class StarTrekIE(InfoExtractor):
             'subtitles': {'en-US': [{
                 'url': r're:https://(?:intl|www)\.startrek\.com/sites/default/files/video/captions/2022-06/TRR_SNW_105_v5\.vtt',
             }]},
-        }
+        },
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/startv.py b/plugins/youtube_download/yt_dlp/extractor/startv.py
index bb6e8f1..8cb5765 100644
--- a/plugins/youtube_download/yt_dlp/extractor/startv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/startv.py
@@ -1,24 +1,21 @@
 from .common import InfoExtractor
-from ..compat import (
-    compat_str,
-)
 from ..utils import (
-    clean_html,
     ExtractorError,
-    traverse_obj,
+    clean_html,
     int_or_none,
+    traverse_obj,
 )
 
 
 class StarTVIE(InfoExtractor):
-    _VALID_URL = r"""(?x)
+    _VALID_URL = r'''(?x)
         https?://(?:www\.)?startv\.com\.tr/
         (?:
             (?:dizi|program)/(?:[^/?#&]+)/(?:bolumler|fragmanlar|ekstralar)|
             video/arsiv/(?:dizi|program)/(?:[^/?#&]+)
         )/
         (?P<id>[^/?#&]+)
-    """
+    '''
     IE_NAME = 'startv'
     _TESTS = [
         {
@@ -32,41 +29,41 @@ class StarTVIE(InfoExtractor):
                 'description': 'md5:3a8049f05a75c2e8747116a673275de4',
                 'thumbnail': r're:^https?://.*\.jpg(?:\?.*?)?$',
                 'timestamp': 1569281400,
-                'upload_date': '20190923'
+                'upload_date': '20190923',
             },
         },
         {
             'url': 'https://www.startv.com.tr/video/arsiv/dizi/avlu/44-bolum',
-            'only_matching': True
+            'only_matching': True,
         },
         {
             'url': 'https://www.startv.com.tr/dizi/cocuk/fragmanlar/5-bolum-fragmani',
-            'only_matching': True
+            'only_matching': True,
         },
         {
             'url': 'https://www.startv.com.tr/dizi/cocuk/ekstralar/5-bolumun-nefes-kesen-final-sahnesi',
-            'only_matching': True
+            'only_matching': True,
         },
         {
             'url': 'https://www.startv.com.tr/program/burcu-ile-haftasonu/bolumler/1-bolum',
-            'only_matching': True
+            'only_matching': True,
         },
         {
             'url': 'https://www.startv.com.tr/program/burcu-ile-haftasonu/fragmanlar/2-fragman',
-            'only_matching': True
+            'only_matching': True,
         },
         {
             'url': 'https://www.startv.com.tr/video/arsiv/program/buyukrisk/14-bolumde-hangi-unlu-ne-sordu-',
-            'only_matching': True
+            'only_matching': True,
         },
         {
             'url': 'https://www.startv.com.tr/video/arsiv/program/buyukrisk/buyuk-risk-334-bolum',
-            'only_matching': True
+            'only_matching': True,
         },
         {
             'url': 'https://www.startv.com.tr/video/arsiv/program/dada/dada-58-bolum',
-            'only_matching': True
-        }
+            'only_matching': True,
+        },
     ]
 
     def _real_extract(self, url):
@@ -80,7 +77,7 @@ class StarTVIE(InfoExtractor):
         if not info:
             raise ExtractorError('Failed to extract API data')
 
-        video_id = compat_str(info.get('id'))
+        video_id = str(info.get('id'))
         title = info.get('title') or self._og_search_title(webpage)
         description = clean_html(info.get('description')) or self._og_search_description(webpage, default=None)
         thumbnail = self._proto_relative_url(
@@ -96,5 +93,5 @@ class StarTVIE(InfoExtractor):
             'description': description,
             'thumbnail': thumbnail,
             'timestamp': int_or_none(info.get('release_date')),
-            'formats': formats
+            'formats': formats,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/steam.py b/plugins/youtube_download/yt_dlp/extractor/steam.py
index 7daee2f..b7f8ac3 100644
--- a/plugins/youtube_download/yt_dlp/extractor/steam.py
+++ b/plugins/youtube_download/yt_dlp/extractor/steam.py
@@ -2,14 +2,15 @@ import re
 
 from .common import InfoExtractor
 from ..utils import (
-    extract_attributes,
     ExtractorError,
+    extract_attributes,
     get_element_by_class,
+    str_or_none,
 )
 
 
 class SteamIE(InfoExtractor):
-    _VALID_URL = r"""(?x)
+    _VALID_URL = r'''(?x)
         https?://(?:store\.steampowered|steamcommunity)\.com/
             (?:agecheck/)?
             (?P<urltype>video|app)/ #If the page is only for videos or for a game
@@ -17,7 +18,7 @@ class SteamIE(InfoExtractor):
             (?P<videoID>\d*)(?P<extra>\??) # For urltype == video we sometimes get the videoID
         |
         https?://(?:www\.)?steamcommunity\.com/sharedfiles/filedetails/\?id=(?P<fileID>[0-9]+)
-    """
+    '''
     _VIDEO_PAGE_TEMPLATE = 'http://store.steampowered.com/video/%s/'
     _AGECHECK_TEMPLATE = 'http://store.steampowered.com/agecheck/video/%s/?snr=1_agecheck_agecheck__age-gate&ageDay=1&ageMonth=January&ageYear=1970'
     _TESTS = [{
@@ -30,8 +31,7 @@ class SteamIE(InfoExtractor):
                     'ext': 'mp4',
                     'title': 'Terraria video 256785003',
                     'thumbnail': r're:^https://cdn\.[^\.]+\.steamstatic\.com',
-                    'n_entries': 2,
-                }
+                },
             },
             {
                 'md5': '6a294ee0c4b1f47f5bb76a65e31e3592',
@@ -39,11 +39,9 @@ class SteamIE(InfoExtractor):
                     'id': '2040428',
                     'ext': 'mp4',
                     'title': 'Terraria video 2040428',
-                    'playlist_index': 2,
                     'thumbnail': r're:^https://cdn\.[^\.]+\.steamstatic\.com',
-                    'n_entries': 2,
-                }
-            }
+                },
+            },
         ],
         'info_dict': {
             'id': '105600',
@@ -51,27 +49,25 @@ class SteamIE(InfoExtractor):
         },
         'params': {
             'playlistend': 2,
-        }
+        },
     }, {
         'url': 'https://store.steampowered.com/app/271590/Grand_Theft_Auto_V/',
         'info_dict': {
-            'id': '256757115',
-            'title': 'Grand Theft Auto V video 256757115',
-            'ext': 'mp4',
-            'thumbnail': r're:^https://cdn\.[^\.]+\.steamstatic\.com',
-            'n_entries': 20,
+            'id': '271590',
+            'title': 'Grand Theft Auto V',
         },
+        'playlist_count': 23,
     }]
 
     def _real_extract(self, url):
         m = self._match_valid_url(url)
-        fileID = m.group('fileID')
-        if fileID:
+        file_id = m.group('fileID')
+        if file_id:
             video_url = url
-            playlist_id = fileID
+            playlist_id = file_id
         else:
-            gameID = m.group('gameID')
-            playlist_id = gameID
+            game_id = m.group('gameID')
+            playlist_id = game_id
             video_url = self._VIDEO_PAGE_TEMPLATE % playlist_id
 
         self._set_cookie('steampowered.com', 'wants_mature_content', '1')
@@ -103,7 +99,7 @@ class SteamIE(InfoExtractor):
                 entry['thumbnail'] = movie.get('data-poster')
                 for quality in ('', '-hd'):
                     for ext in ('webm', 'mp4'):
-                        video_url = movie.get('data-%s%s-source' % (ext, quality))
+                        video_url = movie.get(f'data-{ext}{quality}-source')
                         if video_url:
                             formats.append({
                                 'format_id': ext + quality,
@@ -136,7 +132,7 @@ class SteamCommunityBroadcastIE(InfoExtractor):
             'id': '76561199073851486',
             'title': r're:Steam Community :: pepperm!nt :: Broadcast 2022-06-26 \d{2}:\d{2}',
             'ext': 'mp4',
-            'uploader_id': 1113585758,
+            'uploader_id': '1113585758',
             'uploader': 'pepperm!nt',
             'live_status': 'is_live',
         },
@@ -169,6 +165,6 @@ class SteamCommunityBroadcastIE(InfoExtractor):
             'live_status': 'is_live',
             'view_count': json_data.get('num_view'),
             'uploader': uploader_json.get('persona_name'),
-            'uploader_id': uploader_json.get('accountid'),
+            'uploader_id': str_or_none(uploader_json.get('accountid')),
             'subtitles': subs,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/stitcher.py b/plugins/youtube_download/yt_dlp/extractor/stitcher.py
index 2fd200f..09ebabb 100644
--- a/plugins/youtube_download/yt_dlp/extractor/stitcher.py
+++ b/plugins/youtube_download/yt_dlp/extractor/stitcher.py
@@ -1,9 +1,8 @@
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
+    ExtractorError,
     clean_html,
     clean_podcast_url,
-    ExtractorError,
     int_or_none,
     str_or_none,
     try_get,
@@ -37,7 +36,7 @@ class StitcherBaseIE(InfoExtractor):
 
     def _extract_episode(self, episode, audio_url, show_info):
         info = {
-            'id': compat_str(episode['id']),
+            'id': str(episode['id']),
             'display_id': episode.get('slug'),
             'title': episode['title'].strip(),
             'description': self._extract_description(episode),
@@ -126,7 +125,7 @@ class StitcherShowIE(StitcherBaseIE):
     def _real_extract(self, url):
         show_slug = self._match_id(url)
         data = self._call_api(
-            'search/show/%s/allEpisodes' % show_slug, show_slug, {'count': 10000})
+            f'search/show/{show_slug}/allEpisodes', show_slug, {'count': 10000})
         show = try_get(data, lambda x: x['shows'][0], dict) or {}
         show_info = self._extract_show_info(show)
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/storyfire.py b/plugins/youtube_download/yt_dlp/extractor/storyfire.py
index 035747c..d5430e6 100644
--- a/plugins/youtube_download/yt_dlp/extractor/storyfire.py
+++ b/plugins/youtube_download/yt_dlp/extractor/storyfire.py
@@ -2,9 +2,9 @@ import functools
 
 from .common import InfoExtractor
 from ..utils import (
+    OnDemandPagedList,
     format_field,
     int_or_none,
-    OnDemandPagedList,
     smuggle_url,
 )
 
@@ -14,8 +14,8 @@ class StoryFireBaseIE(InfoExtractor):
 
     def _call_api(self, path, video_id, resource, query=None):
         return self._download_json(
-            'https://storyfire.com/app/%s/%s' % (path, video_id), video_id,
-            'Downloading %s JSON metadata' % resource, query=query)
+            f'https://storyfire.com/app/{path}/{video_id}', video_id,
+            f'Downloading {resource} JSON metadata', query=query)
 
     def _parse_video(self, video):
         title = video['title']
@@ -32,9 +32,7 @@ class StoryFireBaseIE(InfoExtractor):
             'description': video.get('description'),
             'url': smuggle_url(
                 'https://player.vimeo.com/video/' + vimeo_id, {
-                    'http_headers': {
-                        'Referer': 'https://storyfire.com/',
-                    }
+                    'referer': 'https://storyfire.com/',
                 }),
             'thumbnail': video.get('storyImage'),
             'view_count': int_or_none(video.get('views')),
@@ -71,7 +69,7 @@ class StoryFireIE(StoryFireBaseIE):
         'params': {
             'skip_download': True,
         },
-        'expected_warnings': ['Unable to download JSON metadata']
+        'expected_warnings': ['Unable to download JSON metadata'],
     }
 
     def _real_extract(self, url):
@@ -94,7 +92,7 @@ class StoryFireUserIE(StoryFireBaseIE):
 
     def _fetch_page(self, user_id, page):
         videos = self._call_api(
-            'publicVideos', user_id, 'page %d' % (page + 1), {
+            'publicVideos', user_id, f'page {page + 1}', {
                 'skip': page * self._PAGE_SIZE,
             })['videos']
         for video in videos:
diff --git a/plugins/youtube_download/yt_dlp/extractor/streaks.py b/plugins/youtube_download/yt_dlp/extractor/streaks.py
new file mode 100644
index 0000000..1b37184
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/streaks.py
@@ -0,0 +1,236 @@
+import json
+import urllib.parse
+
+from .common import InfoExtractor
+from ..networking.exceptions import HTTPError
+from ..utils import (
+    ExtractorError,
+    filter_dict,
+    float_or_none,
+    join_nonempty,
+    mimetype2ext,
+    parse_iso8601,
+    unsmuggle_url,
+    update_url_query,
+    url_or_none,
+)
+from ..utils.traversal import traverse_obj
+
+
+class StreaksBaseIE(InfoExtractor):
+    _API_URL_TEMPLATE = 'https://{}.api.streaks.jp/v1/projects/{}/medias/{}{}'
+    _GEO_BYPASS = False
+    _GEO_COUNTRIES = ['JP']
+
+    def _extract_from_streaks_api(self, project_id, media_id, headers=None, query=None, ssai=False):
+        try:
+            response = self._download_json(
+                self._API_URL_TEMPLATE.format('playback', project_id, media_id, ''),
+                media_id, 'Downloading STREAKS playback API JSON', headers={
+                    'Accept': 'application/json',
+                    'Origin': 'https://players.streaks.jp',
+                    **self.geo_verification_headers(),
+                    **(headers or {}),
+                })
+        except ExtractorError as e:
+            if isinstance(e.cause, HTTPError) and e.cause.status in {403, 404}:
+                error = self._parse_json(e.cause.response.read().decode(), media_id, fatal=False)
+                message = traverse_obj(error, ('message', {str}))
+                code = traverse_obj(error, ('code', {str}))
+                if code == 'REQUEST_FAILED':
+                    self.raise_geo_restricted(message, countries=self._GEO_COUNTRIES)
+                elif code == 'MEDIA_NOT_FOUND':
+                    raise ExtractorError(message, expected=True)
+                elif code or message:
+                    raise ExtractorError(join_nonempty(code, message, delim=': '))
+            raise
+
+        streaks_id = response['id']
+        live_status = {
+            'clip': 'was_live',
+            'file': 'not_live',
+            'linear': 'is_live',
+            'live': 'is_live',
+        }.get(response.get('type'))
+
+        formats, subtitles = [], {}
+        drm_formats = False
+
+        for source in traverse_obj(response, ('sources', lambda _, v: v['src'])):
+            if source.get('key_systems'):
+                drm_formats = True
+                continue
+
+            src_url = source['src']
+            is_live = live_status == 'is_live'
+            ext = mimetype2ext(source.get('type'))
+            if ext != 'm3u8':
+                self.report_warning(f'Unsupported stream type: {ext}')
+                continue
+
+            if is_live and ssai:
+                session_params = traverse_obj(self._download_json(
+                    self._API_URL_TEMPLATE.format('ssai', project_id, streaks_id, '/ssai/session'),
+                    media_id, 'Downloading session parameters',
+                    headers={'Content-Type': 'application/json', 'Accept': 'application/json'},
+                    data=json.dumps({'id': source['id']}).encode(),
+                ), (0, 'query', {urllib.parse.parse_qs}))
+                src_url = update_url_query(src_url, session_params)
+
+            fmts, subs = self._extract_m3u8_formats_and_subtitles(
+                src_url, media_id, 'mp4', m3u8_id='hls', fatal=False, live=is_live, query=query)
+            formats.extend(fmts)
+            self._merge_subtitles(subs, target=subtitles)
+
+        if not formats and drm_formats:
+            self.report_drm(media_id)
+        self._remove_duplicate_formats(formats)
+
+        for subs in traverse_obj(response, (
+            'tracks', lambda _, v: v['kind'] in ('captions', 'subtitles') and url_or_none(v['src']),
+        )):
+            lang = traverse_obj(subs, ('srclang', {str.lower})) or 'ja'
+            subtitles.setdefault(lang, []).append({'url': subs['src']})
+
+        return {
+            'id': streaks_id,
+            'display_id': media_id,
+            'formats': formats,
+            'live_status': live_status,
+            'subtitles': subtitles,
+            'uploader_id': project_id,
+            **traverse_obj(response, {
+                'title': ('name', {str}),
+                'description': ('description', {str}, filter),
+                'duration': ('duration', {float_or_none}),
+                'modified_timestamp': ('updated_at', {parse_iso8601}),
+                'tags': ('tags', ..., {str}),
+                'thumbnails': (('poster', 'thumbnail'), 'src', {'url': {url_or_none}}),
+                'timestamp': ('created_at', {parse_iso8601}),
+            }),
+        }
+
+
+class StreaksIE(StreaksBaseIE):
+    _VALID_URL = [
+        r'https?://players\.streaks\.jp/(?P<project_id>[\w-]+)/[\da-f]+/index\.html\?(?:[^#]+&)?m=(?P<id>(?:ref:)?[\w-]+)',
+        r'https?://playback\.api\.streaks\.jp/v1/projects/(?P<project_id>[\w-]+)/medias/(?P<id>(?:ref:)?[\w-]+)',
+    ]
+    _EMBED_REGEX = [rf'<iframe\s+[^>]*\bsrc\s*=\s*["\'](?P<url>{_VALID_URL[0]})']
+    _TESTS = [{
+        'url': 'https://players.streaks.jp/tipness/08155cd19dc14c12bebefb69b92eafcc/index.html?m=dbdf2df35b4d483ebaeeaeb38c594647',
+        'info_dict': {
+            'id': 'dbdf2df35b4d483ebaeeaeb38c594647',
+            'ext': 'mp4',
+            'title': '3shunenCM_edit.mp4',
+            'display_id': 'dbdf2df35b4d483ebaeeaeb38c594647',
+            'duration': 47.533,
+            'live_status': 'not_live',
+            'modified_date': '20230726',
+            'modified_timestamp': 1690356180,
+            'timestamp': 1690355996,
+            'upload_date': '20230726',
+            'uploader_id': 'tipness',
+        },
+    }, {
+        'url': 'https://players.streaks.jp/ktv-web/0298e8964c164ab384c07ef6e08c444b/index.html?m=ref:mycoffeetime_250317',
+        'info_dict': {
+            'id': 'dccdc079e3fd41f88b0c8435e2d453ab',
+            'ext': 'mp4',
+            'title': 'わたしの珈琲時間_250317',
+            'display_id': 'ref:mycoffeetime_250317',
+            'duration': 122.99,
+            'live_status': 'not_live',
+            'modified_date': '20250310',
+            'modified_timestamp': 1741586302,
+            'thumbnail': r're:https?://.+\.jpg',
+            'timestamp': 1741585839,
+            'upload_date': '20250310',
+            'uploader_id': 'ktv-web',
+        },
+    }, {
+        'url': 'https://playback.api.streaks.jp/v1/projects/ktv-web/medias/b5411938e1e5435dac71edf829dd4813',
+        'info_dict': {
+            'id': 'b5411938e1e5435dac71edf829dd4813',
+            'ext': 'mp4',
+            'title': 'KANTELE_SYUSEi_0630',
+            'display_id': 'b5411938e1e5435dac71edf829dd4813',
+            'live_status': 'not_live',
+            'modified_date': '20250122',
+            'modified_timestamp': 1737522999,
+            'thumbnail': r're:https?://.+\.jpg',
+            'timestamp': 1735205137,
+            'upload_date': '20241226',
+            'uploader_id': 'ktv-web',
+        },
+    }, {
+        # TVer Olympics: website already down, but api remains accessible
+        'url': 'https://playback.api.streaks.jp/v1/projects/tver-olympic/medias/ref:sp_240806_1748_dvr',
+        'info_dict': {
+            'id': 'c10f7345adb648cf804d7578ab93b2e3',
+            'ext': 'mp4',
+            'title': 'サッカー 男子 準決勝_dvr',
+            'display_id': 'ref:sp_240806_1748_dvr',
+            'duration': 12960.0,
+            'live_status': 'was_live',
+            'modified_date': '20240805',
+            'modified_timestamp': 1722896263,
+            'timestamp': 1722777618,
+            'upload_date': '20240804',
+            'uploader_id': 'tver-olympic',
+        },
+    }, {
+        # TBS FREE: 24-hour stream
+        'url': 'https://playback.api.streaks.jp/v1/projects/tbs/medias/ref:simul-02',
+        'info_dict': {
+            'id': 'c4e83a7b48f4409a96adacec674b4e22',
+            'ext': 'mp4',
+            'title': str,
+            'display_id': 'ref:simul-02',
+            'live_status': 'is_live',
+            'modified_date': '20241031',
+            'modified_timestamp': 1730339858,
+            'timestamp': 1705466840,
+            'upload_date': '20240117',
+            'uploader_id': 'tbs',
+        },
+    }, {
+        # DRM protected
+        'url': 'https://players.streaks.jp/sp-jbc/a12d7ee0f40c49d6a0a2bff520639677/index.html?m=5f89c62f37ee4a68be8e6e3b1396c7d8',
+        'only_matching': True,
+    }]
+    _WEBPAGE_TESTS = [{
+        'url': 'https://event.play.jp/playnext2023/',
+        'info_dict': {
+            'id': '2d975178293140dc8074a7fc536a7604',
+            'ext': 'mp4',
+            'title': 'PLAY NEXTキームービー（本番）',
+            'uploader_id': 'play',
+            'duration': 17.05,
+            'thumbnail': r're:https?://.+\.jpg',
+            'timestamp': 1668387517,
+            'upload_date': '20221114',
+            'modified_timestamp': 1739411523,
+            'modified_date': '20250213',
+            'live_status': 'not_live',
+        },
+    }, {
+        'url': 'https://wowshop.jp/Page/special/cooking_goods/?bid=wowshop&srsltid=AfmBOor_phUNoPEE_UCPiGGSCMrJE5T2US397smvsbrSdLqUxwON0el4',
+        'playlist_mincount': 2,
+        'info_dict': {
+            'id': '?bid=wowshop&srsltid=AfmBOor_phUNoPEE_UCPiGGSCMrJE5T2US397smvsbrSdLqUxwON0el4',
+            'title': 'ワンランク上の料理道具でとびきりの“おいしい”を食卓へ｜wowshop',
+            'description': 'md5:914b5cb8624fc69274c7fb7b2342958f',
+            'age_limit': 0,
+            'thumbnail': 'https://wowshop.jp/Page/special/cooking_goods/images/ogp.jpg',
+        },
+    }]
+
+    def _real_extract(self, url):
+        url, smuggled_data = unsmuggle_url(url, {})
+        project_id, media_id = self._match_valid_url(url).group('project_id', 'id')
+
+        return self._extract_from_streaks_api(
+            project_id, media_id, headers=filter_dict({
+                'X-Streaks-Api-Key': smuggled_data.get('api_key'),
+            }))
diff --git a/plugins/youtube_download/yt_dlp/extractor/streamable.py b/plugins/youtube_download/yt_dlp/extractor/streamable.py
index 462861e..62ae0ee 100644
--- a/plugins/youtube_download/yt_dlp/extractor/streamable.py
+++ b/plugins/youtube_download/yt_dlp/extractor/streamable.py
@@ -3,8 +3,8 @@ from ..utils import (
     ExtractorError,
     float_or_none,
     int_or_none,
-    try_get,
     parse_codecs,
+    try_get,
 )
 
 
@@ -25,7 +25,7 @@ class StreamableIE(InfoExtractor):
                 'upload_date': '20160208',
                 'duration': 61.516,
                 'view_count': int,
-            }
+            },
         },
         # older video without bitrate, width/height, codecs, etc. info
         {
@@ -40,7 +40,7 @@ class StreamableIE(InfoExtractor):
                 'upload_date': '20150311',
                 'duration': 12,
                 'view_count': int,
-            }
+            },
         },
         {
             'url': 'https://streamable.com/e/dnd1',
@@ -49,7 +49,7 @@ class StreamableIE(InfoExtractor):
         {
             'url': 'https://streamable.com/s/okkqk/drxjds',
             'only_matching': True,
-        }
+        },
     ]
 
     def _real_extract(self, url):
@@ -59,7 +59,7 @@ class StreamableIE(InfoExtractor):
         # to return video info like the title properly sometimes, and doesn't
         # include info like the video duration
         video = self._download_json(
-            'https://ajax.streamable.com/videos/%s' % video_id, video_id)
+            f'https://ajax.streamable.com/videos/{video_id}', video_id)
 
         # Format IDs:
         # 0 The video is being uploaded
@@ -99,5 +99,5 @@ class StreamableIE(InfoExtractor):
             'timestamp': float_or_none(video.get('date_added')),
             'duration': float_or_none(video.get('duration')),
             'view_count': int_or_none(video.get('plays')),
-            'formats': formats
+            'formats': formats,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/streamcloud.py b/plugins/youtube_download/yt_dlp/extractor/streamcloud.py
deleted file mode 100644
index 7289809..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/streamcloud.py
+++ /dev/null
@@ -1,75 +0,0 @@
-import re
-
-from .common import InfoExtractor
-from ..utils import (
-    ExtractorError,
-    urlencode_postdata,
-)
-
-
-class StreamcloudIE(InfoExtractor):
-    IE_NAME = 'streamcloud.eu'
-    _VALID_URL = r'https?://streamcloud\.eu/(?P<id>[a-zA-Z0-9_-]+)(?:/(?P<fname>[^#?]*)\.html)?'
-
-    _TESTS = [{
-        'url': 'http://streamcloud.eu/skp9j99s4bpz/youtube-dl_test_video_____________-BaW_jenozKc.mp4.html',
-        'md5': '6bea4c7fa5daaacc2a946b7146286686',
-        'info_dict': {
-            'id': 'skp9j99s4bpz',
-            'ext': 'mp4',
-            'title': 'youtube-dl test video  \'/\\ ä ↭',
-        },
-        'skip': 'Only available from the EU'
-    }, {
-        'url': 'http://streamcloud.eu/ua8cmfh1nbe6/NSHIP-148--KUC-NG--H264-.mp4.html',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        url = 'http://streamcloud.eu/%s' % video_id
-
-        orig_webpage = self._download_webpage(url, video_id)
-
-        if '>File Not Found<' in orig_webpage:
-            raise ExtractorError(
-                'Video %s does not exist' % video_id, expected=True)
-
-        fields = re.findall(r'''(?x)<input\s+
-            type="(?:hidden|submit)"\s+
-            name="([^"]+)"\s+
-            (?:id="[^"]+"\s+)?
-            value="([^"]*)"
-            ''', orig_webpage)
-
-        self._sleep(6, video_id)
-
-        webpage = self._download_webpage(
-            url, video_id, data=urlencode_postdata(fields), headers={
-                b'Content-Type': b'application/x-www-form-urlencoded',
-            })
-
-        try:
-            title = self._html_search_regex(
-                r'<h1[^>]*>([^<]+)<', webpage, 'title')
-            video_url = self._search_regex(
-                r'file:\s*"([^"]+)"', webpage, 'video URL')
-        except ExtractorError:
-            message = self._html_search_regex(
-                r'(?s)<div[^>]+class=(["\']).*?msgboxinfo.*?\1[^>]*>(?P<message>.+?)</div>',
-                webpage, 'message', default=None, group='message')
-            if message:
-                raise ExtractorError('%s said: %s' % (self.IE_NAME, message), expected=True)
-            raise
-        thumbnail = self._search_regex(
-            r'image:\s*"([^"]+)"', webpage, 'thumbnail URL', fatal=False)
-
-        return {
-            'id': video_id,
-            'title': title,
-            'url': video_url,
-            'thumbnail': thumbnail,
-            'http_headers': {
-                'Referer': url,
-            },
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/streamcz.py b/plugins/youtube_download/yt_dlp/extractor/streamcz.py
index c4537ba..4122ba8 100644
--- a/plugins/youtube_download/yt_dlp/extractor/streamcz.py
+++ b/plugins/youtube_download/yt_dlp/extractor/streamcz.py
@@ -23,7 +23,7 @@ class StreamCZIE(InfoExtractor):
             'description': 'md5:8f5f09b9b7bc67df910486cdd88f7165',
             'duration': 1369.6,
             'view_count': int,
-        }
+        },
     }, {
         'url': 'https://www.stream.cz/kdo-to-mluvi/kdo-to-mluvi-velke-odhaleni-prinasi-novy-porad-uz-od-25-srpna-64087937',
         'md5': '41fd358000086a1ccdb068c77809b158',
@@ -35,7 +35,7 @@ class StreamCZIE(InfoExtractor):
             'description': 'md5:97a811000a6460266029d6c1c2ebcd59',
             'duration': 50.2,
             'view_count': int,
-        }
+        },
     }, {
         'url': 'https://www.stream.cz/tajemno/znicehonic-jim-skrz-strechu-prolitnul-zahadny-predmet-badatele-vse-objasnili-64147267',
         'md5': '3ee4d0be040e8f4a543e67e509d55e3f',
@@ -47,7 +47,7 @@ class StreamCZIE(InfoExtractor):
             'description': 'md5:4b8ada6718d34bb011c4e04ca4bc19bf',
             'duration': 442.84,
             'view_count': int,
-        }
+        },
     }]
 
     def _extract_formats(self, spl_url, video):
@@ -86,9 +86,9 @@ class StreamCZIE(InfoExtractor):
                         perex
                         duration
                         views
-                    }'''
-            }).encode('utf-8'),
-            headers={'Content-Type': 'application/json;charset=UTF-8'}
+                    }''',
+            }).encode(),
+            headers={'Content-Type': 'application/json;charset=UTF-8'},
         )['data']['episode']
 
         spl_url = data['spl'] + 'spl2,3'
@@ -105,7 +105,7 @@ class StreamCZIE(InfoExtractor):
             for ext, sub_url in subs.get('urls').items():
                 subtitles.setdefault(subs['language'], []).append({
                     'ext': ext,
-                    'url': urljoin(spl_url, sub_url)
+                    'url': urljoin(spl_url, sub_url),
                 })
 
         formats = list(self._extract_formats(spl_url, video))
diff --git a/plugins/youtube_download/yt_dlp/extractor/streamff.py b/plugins/youtube_download/yt_dlp/extractor/streamff.py
deleted file mode 100644
index 93c4294..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/streamff.py
+++ /dev/null
@@ -1,30 +0,0 @@
-from .common import InfoExtractor
-from ..utils import int_or_none, parse_iso8601
-
-
-class StreamFFIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?streamff\.com/v/(?P<id>[a-zA-Z0-9]+)'
-
-    _TESTS = [{
-        'url': 'https://streamff.com/v/55cc94',
-        'md5': '8745a67bb5e5c570738efe7983826370',
-        'info_dict': {
-            'id': '55cc94',
-            'ext': 'mp4',
-            'title': '55cc94',
-            'timestamp': 1634764643,
-            'upload_date': '20211020',
-            'view_count': int,
-        }
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        json_data = self._download_json(f'https://streamff.com/api/videos/{video_id}', video_id)
-        return {
-            'id': video_id,
-            'title': json_data.get('name') or video_id,
-            'url': 'https://streamff.com/%s' % json_data['videoLink'],
-            'view_count': int_or_none(json_data.get('views')),
-            'timestamp': parse_iso8601(json_data.get('date')),
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/streetvoice.py b/plugins/youtube_download/yt_dlp/extractor/streetvoice.py
index a32c8bc..60056f7 100644
--- a/plugins/youtube_download/yt_dlp/extractor/streetvoice.py
+++ b/plugins/youtube_download/yt_dlp/extractor/streetvoice.py
@@ -33,7 +33,7 @@ class StreetVoiceIE(InfoExtractor):
             'track': '流浪',
             'track_id': '123688',
             'album': '2010',
-        }
+        },
     }, {
         'url': 'http://tw.streetvoice.com/skippylu/songs/94440/',
         'only_matching': True,
@@ -41,7 +41,7 @@ class StreetVoiceIE(InfoExtractor):
 
     def _real_extract(self, url):
         song_id = self._match_id(url)
-        base_url = 'https://streetvoice.com/api/v4/song/%s/' % song_id
+        base_url = f'https://streetvoice.com/api/v4/song/{song_id}/'
         song = self._download_json(base_url, song_id, query={
             'fields': 'album,comments_count,created_at,id,image,length,likes_count,name,nickname,plays_count,profile,share_count,synopsis,user,username',
         })
@@ -51,7 +51,7 @@ class StreetVoiceIE(InfoExtractor):
         for suffix, format_id in [('hls/file', 'hls'), ('file', 'http'), ('file/original', 'original')]:
             f_url = (self._download_json(
                 base_url + suffix + '/', song_id,
-                'Downloading %s format URL' % format_id,
+                f'Downloading {format_id} format URL',
                 data=b'', fatal=False) or {}).get('file')
             if not f_url:
                 continue
@@ -86,7 +86,7 @@ class StreetVoiceIE(InfoExtractor):
             'timestamp': parse_iso8601(song.get('created_at')),
             'uploader': try_get(user, lambda x: x['profile']['nickname']),
             'uploader_id': str_or_none(user.get('id')),
-            'uploader_url': urljoin(url, '/%s/' % username) if username else None,
+            'uploader_url': urljoin(url, f'/{username}/') if username else None,
             'view_count': get_count('plays'),
             'like_count': get_count('likes'),
             'comment_count': get_count('comments'),
diff --git a/plugins/youtube_download/yt_dlp/extractor/stretchinternet.py b/plugins/youtube_download/yt_dlp/extractor/stretchinternet.py
index e438dee..232837d 100644
--- a/plugins/youtube_download/yt_dlp/extractor/stretchinternet.py
+++ b/plugins/youtube_download/yt_dlp/extractor/stretchinternet.py
@@ -12,7 +12,7 @@ class StretchInternetIE(InfoExtractor):
             # 'timestamp': 1575668361,
             # 'upload_date': '20191206',
             'uploader_id': '99997',
-        }
+        },
     }
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/stripchat.py b/plugins/youtube_download/yt_dlp/extractor/stripchat.py
index b9523c8..8484604 100644
--- a/plugins/youtube_download/yt_dlp/extractor/stripchat.py
+++ b/plugins/youtube_download/yt_dlp/extractor/stripchat.py
@@ -3,7 +3,7 @@ from ..utils import (
     ExtractorError,
     UserNotLive,
     lowercase_escape,
-    traverse_obj
+    traverse_obj,
 )
 
 
@@ -22,30 +22,27 @@ class StripchatIE(InfoExtractor):
         'skip': 'Room is offline',
     }, {
         'url': 'https://stripchat.com/Rakhijaan@xh',
-        'only_matching': True
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id, headers=self.geo_verification_headers())
+        data = self._search_json(
+            r'<script\b[^>]*>\s*window\.__PRELOADED_STATE__\s*=',
+            webpage, 'data', video_id, transform_source=lowercase_escape)
 
-        data = self._parse_json(
-            self._search_regex(
-                r'<script\b[^>]*>\s*window\.__PRELOADED_STATE__\s*=(?P<value>.*?)<\/script>',
-                webpage, 'data', default='{}', group='value'),
-            video_id, transform_source=lowercase_escape, fatal=False)
-        if not data:
-            raise ExtractorError('Unable to find configuration for stream.')
-
-        if traverse_obj(data, ('viewCam', 'show'), expected_type=dict):
-            raise ExtractorError('Model is in private show', expected=True)
-        elif not traverse_obj(data, ('viewCam', 'model', 'isLive'), expected_type=bool):
+        if traverse_obj(data, ('viewCam', 'show', {dict})):
+            raise ExtractorError('Model is in a private show', expected=True)
+        if not traverse_obj(data, ('viewCam', 'model', 'isLive', {bool})):
             raise UserNotLive(video_id=video_id)
 
-        model_id = traverse_obj(data, ('viewCam', 'model', 'id'), expected_type=int)
+        model_id = data['viewCam']['model']['id']
 
         formats = []
-        for host in traverse_obj(data, ('config', 'data', (
+        # HLS hosts are currently found in .configV3.static.features.hlsFallback.fallbackDomains[]
+        # The rest of the path is for backwards compatibility and to guard against A/B testing
+        for host in traverse_obj(data, ((('config', 'data'), ('configV3', 'static')), (
                 (('features', 'featuresV2'), 'hlsFallback', 'fallbackDomains', ...), 'hlsStreamHost'))):
             formats = self._extract_m3u8_formats(
                 f'https://edge-hls.{host}/hls/{model_id}/master/{model_id}_auto.m3u8',
@@ -53,7 +50,7 @@ class StripchatIE(InfoExtractor):
             if formats:
                 break
         if not formats:
-            self.raise_no_formats('No active streams found', expected=True)
+            self.raise_no_formats('Unable to extract stream host', video_id=video_id)
 
         return {
             'id': video_id,
diff --git a/plugins/youtube_download/yt_dlp/extractor/stv.py b/plugins/youtube_download/yt_dlp/extractor/stv.py
index 8b3e635..c489e42 100644
--- a/plugins/youtube_download/yt_dlp/extractor/stv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/stv.py
@@ -1,5 +1,4 @@
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     float_or_none,
     int_or_none,
@@ -21,7 +20,7 @@ class STVPlayerIE(InfoExtractor):
             'ext': 'mp4',
             'upload_date': '20170301',
             'title': '60 seconds on set with Laura Norton',
-            'description': "How many questions can Laura - a.k.a Kerry Wyatt - answer in 60 seconds? Let\'s find out!",
+            'description': "How many questions can Laura - a.k.a Kerry Wyatt - answer in 60 seconds? Let's find out!",
             'timestamp': 1488388054,
             'uploader_id': '1486976045',
         },
@@ -41,19 +40,19 @@ class STVPlayerIE(InfoExtractor):
         ptype, video_id = self._match_valid_url(url).groups()
 
         webpage = self._download_webpage(url, video_id, fatal=False) or ''
-        props = self._search_nextjs_data(webpage, video_id, default='{}').get('props') or {}
+        props = self._search_nextjs_data(webpage, video_id, default={}).get('props') or {}
         player_api_cache = try_get(
             props, lambda x: x['initialReduxState']['playerApiCache']) or {}
 
         api_path, resp = None, {}
         for k, v in player_api_cache.items():
-            if k.startswith('/episodes/') or k.startswith('/shortform/'):
+            if k.startswith(('/episodes/', '/shortform/')):
                 api_path, resp = k, v
                 break
         else:
             episode_id = str_or_none(try_get(
                 props, lambda x: x['pageProps']['episodeId']))
-            api_path = '/%s/%s' % (self._PTYPE_MAP[ptype], episode_id or video_id)
+            api_path = f'/{self._PTYPE_MAP[ptype]}/{episode_id or video_id}'
 
         result = resp.get('results')
         if not result:
@@ -62,7 +61,7 @@ class STVPlayerIE(InfoExtractor):
             result = resp['results']
 
         video = result['video']
-        video_id = compat_str(video['id'])
+        video_id = str(video['id'])
 
         subtitles = {}
         _subtitles = result.get('_subtitles') or {}
diff --git a/plugins/youtube_download/yt_dlp/extractor/subsplash.py b/plugins/youtube_download/yt_dlp/extractor/subsplash.py
new file mode 100644
index 0000000..33494e8
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/subsplash.py
@@ -0,0 +1,199 @@
+import functools
+import math
+
+from .common import InfoExtractor
+from ..utils import (
+    InAdvancePagedList,
+    int_or_none,
+    parse_iso8601,
+    try_call,
+    url_or_none,
+)
+from ..utils.traversal import traverse_obj
+
+
+class SubsplashBaseIE(InfoExtractor):
+    def _get_headers(self, url, display_id):
+        token = try_call(lambda: self._get_cookies(url)['ss-token-guest'].value)
+        if not token:
+            webpage, urlh = self._download_webpage_handle(url, display_id)
+            token = (
+                try_call(lambda: self._get_cookies(url)['ss-token-guest'].value)
+                or urlh.get_header('x-api-token')
+                or self._search_json(
+                    r'<script[^>]+\bid="shoebox-tokens"[^>]*>', webpage, 'shoebox tokens',
+                    display_id, default={}).get('apiToken')
+                or self._search_regex(r'\\"tokens\\":{\\"guest\\":\\"([A-Za-z0-9._-]+)\\"', webpage, 'token', default=None))
+
+        if not token:
+            self.report_warning('Unable to extract auth token')
+            return None
+        return {'Authorization': f'Bearer {token}'}
+
+    def _extract_video(self, data, video_id):
+        formats = []
+        video_data = traverse_obj(data, ('_embedded', 'video', '_embedded', {dict}))
+        m3u8_url = traverse_obj(video_data, ('playlists', 0, '_links', 'related', 'href', {url_or_none}))
+        if m3u8_url:
+            formats.extend(self._extract_m3u8_formats(m3u8_url, video_id, 'mp4', m3u8_id='hls', fatal=False))
+        mp4_entry = traverse_obj(video_data, ('video-outputs', lambda _, v: url_or_none(v['_links']['related']['href']), any))
+        if mp4_entry:
+            formats.append({
+                'url': mp4_entry['_links']['related']['href'],
+                'format_id': 'direct',
+                'quality': 1,
+                **traverse_obj(mp4_entry, {
+                    'height': ('height', {int_or_none}),
+                    'width': ('width', {int_or_none}),
+                    'filesize': ('file_size', {int_or_none}),
+                }),
+            })
+        return {
+            'id': video_id,
+            'formats': formats,
+            **traverse_obj(data, {
+                'title': ('title', {str}),
+                'description': ('summary_text', {str}),
+                'thumbnail': ('_embedded', 'images', 0, '_links', 'related', 'href', {url_or_none}),
+                'duration': ('_embedded', 'video', 'duration', {int_or_none(scale=1000)}),
+                'timestamp': ('date', {parse_iso8601}),
+                'release_timestamp': ('published_at', {parse_iso8601}),
+                'modified_timestamp': ('updated_at', {parse_iso8601}),
+            }),
+        }
+
+
+class SubsplashIE(SubsplashBaseIE):
+    _VALID_URL = [
+        r'https?://(?:www\.)?subsplash\.com/(?:u/)?[^/?#]+/[^/?#]+/(?:d/|mi/\+)(?P<id>\w+)',
+        r'https?://(?:\w+\.)?subspla\.sh/(?P<id>\w+)',
+    ]
+    _TESTS = [{
+        'url': 'https://subsplash.com/u/skywatchtv/media/d/5whnx5s-the-grand-delusion-taking-place-right-now',
+        'md5': 'd468729814e533cec86f1da505dec82d',
+        'info_dict': {
+            'id': '5whnx5s',
+            'ext': 'mp4',
+            'title': 'THE GRAND DELUSION TAKING PLACE RIGHT NOW!',
+            'description': 'md5:220a630865c3697b0ec9dcb3a70cbc33',
+            'upload_date': '20240901',
+            'duration': 1710,
+            'thumbnail': r're:https?://.*\.(?:jpg|png)$',
+            'modified_date': '20240901',
+            'release_date': '20240901',
+            'release_timestamp': 1725195600,
+            'timestamp': 1725148800,
+            'modified_timestamp': 1725195657,
+        },
+    }, {
+        'url': 'https://subsplash.com/u/prophecywatchers/media/d/n4dr8b2-the-transhumanist-plan-for-humanity-billy-crone',
+        'md5': '01982d58021af81c969958459bd81f13',
+        'info_dict': {
+            'id': 'n4dr8b2',
+            'ext': 'mp4',
+            'title': 'The Transhumanist Plan for Humanity | Billy Crone',
+            'upload_date': '20240903',
+            'duration': 1709,
+            'thumbnail': r're:https?://.*\.(?:jpg|png)$',
+            'timestamp': 1725321600,
+            'modified_date': '20241010',
+            'release_date': '20240903',
+            'release_timestamp': 1725379200,
+            'modified_timestamp': 1728577804,
+        },
+    }, {
+        'url': 'https://subsplash.com/laiglesiadelcentro/vid/mi/+ecb6a6b?autoplay=true',
+        'md5': '013c9b1e391dd4b34d8612439445deef',
+        'info_dict': {
+            'id': 'ecb6a6b',
+            'ext': 'mp4',
+            'thumbnail': r're:https?://.*\.(?:jpg|png)$',
+            'release_timestamp': 1477095852,
+            'title': 'En el Principio Era el Verbo | EVANGELIO DE JUAN | Ps. Gadiel Ríos',
+            'timestamp': 1425772800,
+            'upload_date': '20150308',
+            'description': 'md5:f368221de93176654989ba66bb564798',
+            'modified_timestamp': 1730258864,
+            'modified_date': '20241030',
+            'release_date': '20161022',
+        },
+    }, {
+        'url': 'https://prophecywatchers.subspla.sh/8gps8cx',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        data = self._download_json(
+            'https://core.subsplash.com/media/v1/media-items',
+            video_id, headers=self._get_headers(url, video_id),
+            query={
+                'filter[short_code]': video_id,
+                'include': 'images,audio.audio-outputs,audio.video,video.video-outputs,video.playlists,document,broadcast',
+            })
+        return self._extract_video(traverse_obj(data, ('_embedded', 'media-items', 0)), video_id)
+
+
+class SubsplashPlaylistIE(SubsplashBaseIE):
+    IE_NAME = 'subsplash:playlist'
+    _VALID_URL = r'https?://(?:www\.)?subsplash\.com/[^/?#]+/(?:our-videos|media)/ms/\+(?P<id>\w+)'
+    _PAGE_SIZE = 15
+    _TESTS = [{
+        'url': 'https://subsplash.com/skywatchtv/our-videos/ms/+dbyjzp8',
+        'info_dict': {
+            'id': 'dbyjzp8',
+            'title': 'Five in Ten',
+        },
+        'playlist_mincount': 11,
+    }, {
+        'url': 'https://subsplash.com/prophecywatchers/media/ms/+n42mr48',
+        'info_dict': {
+            'id': 'n42mr48',
+            'title': 'Road to Zion Series',
+        },
+        'playlist_mincount': 13,
+    }, {
+        'url': 'https://subsplash.com/prophecywatchers/media/ms/+918b9f6',
+        'only_matching': True,
+    }]
+
+    def _entries(self, series_id, headers, page):
+        data = self._download_json(
+            'https://core.subsplash.com/media/v1/media-items', series_id, headers=headers,
+            query={
+                'filter[broadcast.status|broadcast.status]': 'null|on-demand',
+                'filter[media_series]': series_id,
+                'filter[status]': 'published',
+                'include': 'images,audio.audio-outputs,audio.video,video.video-outputs,video.playlists,document',
+                'page[number]': page + 1,
+                'page[size]': self._PAGE_SIZE,
+                'sort': '-position',
+            }, note=f'Downloading page {page + 1}')
+
+        for entry in traverse_obj(data, ('_embedded', 'media-items', lambda _, v: v['short_code'])):
+            entry_id = entry['short_code']
+            info = self._extract_video(entry, entry_id)
+            yield {
+                **info,
+                'webpage_url': f'https://subspla.sh/{entry_id}',
+                'extractor_key': SubsplashIE.ie_key(),
+                'extractor': SubsplashIE.IE_NAME,
+            }
+
+    def _real_extract(self, url):
+        display_id = self._match_id(url)
+        headers = self._get_headers(url, display_id)
+
+        data = self._download_json(
+            'https://core.subsplash.com/media/v1/media-series', display_id, headers=headers,
+            query={'filter[short_code]': display_id})
+        series_data = traverse_obj(data, ('_embedded', 'media-series', 0, {
+            'id': ('id', {str}),
+            'title': ('title', {str}),
+            'count': ('media_items_count', {int}),
+        }))
+        total_pages = math.ceil(series_data['count'] / self._PAGE_SIZE)
+
+        return self.playlist_result(
+            InAdvancePagedList(functools.partial(self._entries, series_data['id'], headers), total_pages, self._PAGE_SIZE),
+            display_id, series_data['title'])
diff --git a/plugins/youtube_download/yt_dlp/extractor/substack.py b/plugins/youtube_download/yt_dlp/extractor/substack.py
index 3782cee..b70d40f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/substack.py
+++ b/plugins/youtube_download/yt_dlp/extractor/substack.py
@@ -2,7 +2,13 @@ import re
 import urllib.parse
 
 from .common import InfoExtractor
-from ..utils import js_to_json, str_or_none, traverse_obj
+from ..networking import HEADRequest
+from ..utils import (
+    determine_ext,
+    js_to_json,
+    str_or_none,
+)
+from ..utils.traversal import traverse_obj
 
 
 class SubstackIE(InfoExtractor):
@@ -18,7 +24,7 @@ class SubstackIE(InfoExtractor):
             'thumbnail': 'md5:bec758a34d8ee9142d43bcebdf33af18',
             'uploader': 'Maybe Baby',
             'uploader_id': '33628',
-        }
+        },
     }, {
         'url': 'https://haleynahman.substack.com/p/-dear-danny-i-found-my-boyfriends?s=r',
         'md5': '0a63eacec877a1171a62cfa69710fcea',
@@ -30,7 +36,7 @@ class SubstackIE(InfoExtractor):
             'thumbnail': 'md5:daa40b6b79249417c14ff8103db29639',
             'uploader': 'Maybe Baby',
             'uploader_id': '33628',
-        }
+        },
     }, {
         'url': 'https://andrewzimmern.substack.com/p/mussels-with-black-bean-sauce-recipe',
         'md5': 'fd3c07077b02444ff0130715b5f632bb',
@@ -42,7 +48,20 @@ class SubstackIE(InfoExtractor):
             'thumbnail': 'md5:e30bfaa9da40e82aa62354263a9dd232',
             'uploader': "Andrew Zimmern's Spilled Milk ",
             'uploader_id': '577659',
-        }
+        },
+    }, {
+        # Podcast that needs its file extension resolved to mp3
+        'url': 'https://persuasion1.substack.com/p/summers',
+        'md5': '1456a755d46084744facdfac9edf900f',
+        'info_dict': {
+            'id': '141970405',
+            'ext': 'mp3',
+            'title': 'Larry Summers on What Went Wrong on Campus',
+            'description': 'Yascha Mounk and Larry Summers also discuss the promise and perils of artificial intelligence.',
+            'thumbnail': r're:https://substackcdn\.com/image/.+\.jpeg',
+            'uploader': 'Persuasion',
+            'uploader_id': '61579',
+        },
     }]
 
     @classmethod
@@ -50,16 +69,16 @@ class SubstackIE(InfoExtractor):
         if not re.search(r'<script[^>]+src=["\']https://substackcdn.com/[^"\']+\.js', webpage):
             return
 
-        mobj = re.search(r'{[^}]*["\']subdomain["\']\s*:\s*["\'](?P<subdomain>[^"]+)', webpage)
+        mobj = re.search(r'{[^}]*\\?["\']subdomain\\?["\']\s*:\s*\\?["\'](?P<subdomain>[^\\"\']+)', webpage)
         if mobj:
             parsed = urllib.parse.urlparse(url)
             yield parsed._replace(netloc=f'{mobj.group("subdomain")}.substack.com').geturl()
-            raise cls.StopExtraction()
+            raise cls.StopExtraction
 
-    def _extract_video_formats(self, video_id, username):
+    def _extract_video_formats(self, video_id, url):
         formats, subtitles = [], {}
         for video_format in ('hls', 'mp4'):
-            video_url = f'https://{username}.substack.com/api/v1/video/upload/{video_id}/src?type={video_format}'
+            video_url = urllib.parse.urljoin(url, f'/api/v1/video/upload/{video_id}/src?type={video_format}')
 
             if video_format == 'hls':
                 fmts, subs = self._extract_m3u8_formats_and_subtitles(video_url, video_id, 'mp4', fatal=False)
@@ -81,12 +100,25 @@ class SubstackIE(InfoExtractor):
             r'window\._preloads\s*=\s*JSON\.parse\(', webpage, 'json string',
             display_id, transform_source=js_to_json, contains_pattern=r'"{(?s:.+)}"'), display_id)
 
+        canonical_url = url
+        domain = traverse_obj(webpage_info, ('domainInfo', 'customDomain', {str}))
+        if domain:
+            canonical_url = urllib.parse.urlparse(url)._replace(netloc=domain).geturl()
+
         post_type = webpage_info['post']['type']
         formats, subtitles = [], {}
         if post_type == 'podcast':
-            formats, subtitles = [{'url': webpage_info['post']['podcast_url']}], {}
+            fmt = {'url': webpage_info['post']['podcast_url']}
+            if not determine_ext(fmt['url'], default_ext=None):
+                # The redirected format URL expires but the original URL doesn't,
+                # so we only want to extract the extension from this request
+                fmt['ext'] = determine_ext(self._request_webpage(
+                    HEADRequest(fmt['url']), display_id,
+                    'Resolving podcast file extension',
+                    'Podcast URL is invalid').url)
+            formats.append(fmt)
         elif post_type == 'video':
-            formats, subtitles = self._extract_video_formats(webpage_info['post']['videoUpload']['id'], username)
+            formats, subtitles = self._extract_video_formats(webpage_info['post']['videoUpload']['id'], canonical_url)
         else:
             self.raise_no_formats(f'Page type "{post_type}" is not supported')
 
@@ -99,4 +131,5 @@ class SubstackIE(InfoExtractor):
             'thumbnail': traverse_obj(webpage_info, ('post', 'cover_image')),
             'uploader': traverse_obj(webpage_info, ('pub', 'name')),
             'uploader_id': str_or_none(traverse_obj(webpage_info, ('post', 'publication_id'))),
+            'webpage_url': canonical_url,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/sunporno.py b/plugins/youtube_download/yt_dlp/extractor/sunporno.py
index 708873a..6078d50 100644
--- a/plugins/youtube_download/yt_dlp/extractor/sunporno.py
+++ b/plugins/youtube_download/yt_dlp/extractor/sunporno.py
@@ -2,10 +2,10 @@ import re
 
 from .common import InfoExtractor
 from ..utils import (
-    parse_duration,
-    int_or_none,
-    qualities,
     determine_ext,
+    int_or_none,
+    parse_duration,
+    qualities,
 )
 
 
@@ -22,7 +22,7 @@ class SunPornoIE(InfoExtractor):
             'thumbnail': r're:^https?://.*\.jpg$',
             'duration': 302,
             'age_limit': 18,
-        }
+        },
     }, {
         'url': 'http://embeds.sunporno.com/embed/807778',
         'only_matching': True,
@@ -32,7 +32,7 @@ class SunPornoIE(InfoExtractor):
         video_id = self._match_id(url)
 
         webpage = self._download_webpage(
-            'http://www.sunporno.com/videos/%s' % video_id, video_id)
+            f'http://www.sunporno.com/videos/{video_id}', video_id)
 
         title = self._html_extract_title(webpage)
         description = self._html_search_meta(
diff --git a/plugins/youtube_download/yt_dlp/extractor/sverigesradio.py b/plugins/youtube_download/yt_dlp/extractor/sverigesradio.py
index 01a07b3..944ce18 100644
--- a/plugins/youtube_download/yt_dlp/extractor/sverigesradio.py
+++ b/plugins/youtube_download/yt_dlp/extractor/sverigesradio.py
@@ -51,7 +51,7 @@ class SverigesRadioBaseIE(InfoExtractor):
             query['quality'] = quality
             audio_url_data = self._download_json(
                 self._BASE_URL + 'getaudiourl', audio_id,
-                'Downloading %s format JSON metadata' % quality,
+                f'Downloading {quality} format JSON metadata',
                 fatal=False, query=query) or {}
             audio_url = audio_url_data.get('audioUrl')
             if not audio_url or audio_url in urls:
diff --git a/plugins/youtube_download/yt_dlp/extractor/svt.py b/plugins/youtube_download/yt_dlp/extractor/svt.py
index 31bf7f9..b5df2e1 100644
--- a/plugins/youtube_download/yt_dlp/extractor/svt.py
+++ b/plugins/youtube_download/yt_dlp/extractor/svt.py
@@ -1,15 +1,14 @@
+import json
 import re
 
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     determine_ext,
     dict_get,
     int_or_none,
-    unified_timestamp,
-    str_or_none,
-    strip_or_none,
+    traverse_obj,
     try_get,
+    unified_timestamp,
 )
 
 
@@ -100,7 +99,7 @@ class SVTBaseIE(InfoExtractor):
 
 class SVTIE(SVTBaseIE):
     _VALID_URL = r'https?://(?:www\.)?svt\.se/wd\?(?:.*?&)?widgetId=(?P<widget_id>\d+)&.*?\barticleId=(?P<id>\d+)'
-    _EMBED_REGEX = [r'(?:<iframe src|href)="(?P<url>%s[^"]*)"' % _VALID_URL]
+    _EMBED_REGEX = [rf'(?:<iframe src|href)="(?P<url>{_VALID_URL}[^"]*)"']
     _TEST = {
         'url': 'http://www.svt.se/wd?widgetId=23991&sectionId=541&articleId=2900353&type=embed&contextSectionId=123&autostart=false',
         'md5': '33e9a5d8f646523ce0868ecfb0eed77d',
@@ -119,7 +118,7 @@ class SVTIE(SVTBaseIE):
         article_id = mobj.group('id')
 
         info = self._download_json(
-            'http://www.svt.se/wd?widgetId=%s&articleId=%s&format=json&type=embed&output=json' % (widget_id, article_id),
+            f'http://www.svt.se/wd?widgetId={widget_id}&articleId={article_id}&format=json&type=embed&output=json',
             article_id)
 
         info_dict = self._extract_video(info['video'], article_id)
@@ -159,14 +158,50 @@ class SVTPlayIE(SVTPlayBaseIE):
             'subtitles': {
                 'sv': [{
                     'ext': 'vtt',
-                }]
+                }],
             },
         },
         'params': {
-            # skip for now due to download test asserts that segment is > 10000 bytes and svt uses
-            # init segments that are smaller
-            # AssertionError: Expected test_SVTPlay_jNwpV9P.mp4 to be at least 9.77KiB, but it's only 864.00B
-            'skip_download': True,
+            'skip_download': 'm3u8',
+        },
+        'skip': 'Episode is no longer available',
+    }, {
+        'url': 'https://www.svtplay.se/video/emBxBQj',
+        'md5': '2382036fd6f8c994856c323fe51c426e',
+        'info_dict': {
+            'id': 'eyBd9aj',
+            'ext': 'mp4',
+            'title': '1. Farlig kryssning',
+            'timestamp': 1491019200,
+            'upload_date': '20170401',
+            'duration': 2566,
+            'thumbnail': r're:^https?://(?:.*[\.-]jpg|www.svtstatic.se/image/.*)$',
+            'age_limit': 0,
+            'episode': '1. Farlig kryssning',
+            'series': 'Rederiet',
+            'subtitles': {
+                'sv': 'count:3',
+            },
+        },
+        'params': {
+            'skip_download': 'm3u8',
+        },
+    }, {
+        'url': 'https://www.svtplay.se/video/jz2rYz7/anders-hansen-moter/james-fallon?info=visa',
+        'info_dict': {
+            'id': 'jvXAGVb',
+            'ext': 'mp4',
+            'title': 'James Fallon',
+            'timestamp': 1673917200,
+            'upload_date': '20230117',
+            'duration': 1081,
+            'thumbnail': r're:^https?://(?:.*[\.-]jpg|www.svtstatic.se/image/.*)$',
+            'age_limit': 0,
+            'episode': 'James Fallon',
+            'series': 'Anders Hansen möter...',
+        },
+        'params': {
+            'skip_download': 'dash',
         },
     }, {
         'url': 'https://www.svtplay.se/video/30479064/husdrommar/husdrommar-sasong-8-designdrommar-i-stenungsund?modalId=8zVbDPA',
@@ -200,7 +235,7 @@ class SVTPlayIE(SVTPlayBaseIE):
 
     def _extract_by_video_id(self, video_id, webpage=None):
         data = self._download_json(
-            'https://api.svt.se/videoplayer-api/video/%s' % video_id,
+            f'https://api.svt.se/videoplayer-api/video/{video_id}',
             video_id, headers=self.geo_verification_headers())
         info_dict = self._extract_video(data, video_id)
         if not info_dict.get('title'):
@@ -245,17 +280,18 @@ class SVTPlayIE(SVTPlayBaseIE):
 
             svt_id = try_get(
                 data, lambda x: x['statistics']['dataLake']['content']['id'],
-                compat_str)
+                str)
+
+        if not svt_id:
+            nextjs_data = self._search_nextjs_data(webpage, video_id, fatal=False)
+            svt_id = traverse_obj(nextjs_data, (
+                'props', 'urqlState', ..., 'data', {json.loads}, 'detailsPageByPath',
+                'video', 'svtId', {str}), get_all=False)
 
         if not svt_id:
             svt_id = self._search_regex(
                 (r'<video[^>]+data-video-id=["\']([\da-zA-Z-]+)',
-                 r'<[^>]+\bdata-rt=["\']top-area-play-button["\'][^>]+\bhref=["\'][^"\']*video/%s/[^"\']*\b(?:modalId|id)=([\da-zA-Z-]+)' % re.escape(video_id),
-                 r'["\']videoSvtId["\']\s*:\s*["\']([\da-zA-Z-]+)',
-                 r'["\']videoSvtId\\?["\']\s*:\s*\\?["\']([\da-zA-Z-]+)',
-                 r'"content"\s*:\s*{.*?"id"\s*:\s*"([\da-zA-Z-]+)"',
-                 r'["\']svtId["\']\s*:\s*["\']([\da-zA-Z-]+)',
-                 r'["\']svtId\\?["\']\s*:\s*\\?["\']([\da-zA-Z-]+)'),
+                 r'<[^>]+\bdata-rt=["\']top-area-play-button["\'][^>]+\bhref=["\'][^"\']*video/[\w-]+/[^"\']*\b(?:modalId|id)=([\w-]+)'),
                 webpage, 'video id')
 
         info_dict = self._extract_by_video_id(svt_id, webpage)
@@ -286,7 +322,7 @@ class SVTSeriesIE(SVTPlayBaseIE):
 
     @classmethod
     def suitable(cls, url):
-        return False if SVTIE.suitable(url) or SVTPlayIE.suitable(url) else super(SVTSeriesIE, cls).suitable(url)
+        return False if SVTIE.suitable(url) or SVTPlayIE.suitable(url) else super().suitable(url)
 
     def _real_extract(self, url):
         series_slug, season_id = self._match_valid_url(url).groups()
@@ -312,7 +348,7 @@ class SVTSeriesIE(SVTPlayBaseIE):
     name
     shortDescription
   }
-}''' % series_slug,
+}''' % series_slug,  # noqa: UP031
             })['data']['listablesBySlug'][0]
 
         season_name = None
@@ -331,7 +367,7 @@ class SVTSeriesIE(SVTPlayBaseIE):
             for item in items:
                 video = item.get('item') or {}
                 content_id = video.get('videoSvtId')
-                if not content_id or not isinstance(content_id, compat_str):
+                if not content_id or not isinstance(content_id, str):
                     continue
                 entries.append(self.url_result(
                     'svt:' + content_id, SVTPlayIE.ie_key(), content_id))
@@ -340,7 +376,7 @@ class SVTSeriesIE(SVTPlayBaseIE):
         season_name = season_name or season_id
 
         if title and season_name:
-            title = '%s - %s' % (title, season_name)
+            title = f'{title} - {season_name}'
         elif season_id:
             title = season_id
 
@@ -349,15 +385,55 @@ class SVTSeriesIE(SVTPlayBaseIE):
             dict_get(series, ('longDescription', 'shortDescription')))
 
 
-class SVTPageIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?svt\.se/(?P<path>(?:[^/]+/)*(?P<id>[^/?&#]+))'
+class SVTPageIE(SVTBaseIE):
+    _VALID_URL = r'https?://(?:www\.)?svt\.se/(?:[^/?#]+/)*(?P<id>[^/?&#]+)'
     _TESTS = [{
+        'url': 'https://www.svt.se/nyheter/lokalt/skane/viktor-18-forlorade-armar-och-ben-i-sepsis-vill-ateruppta-karaten-och-bli-svetsare',
+        'info_dict': {
+            'title': 'Viktor, 18, förlorade armar och ben i sepsis – vill återuppta karaten och bli svetsare',
+            'id': 'viktor-18-forlorade-armar-och-ben-i-sepsis-vill-ateruppta-karaten-och-bli-svetsare',
+        },
+        'playlist_count': 2,
+    }, {
+        'url': 'https://www.svt.se/nyheter/lokalt/skane/forsvarsmakten-om-trafikkaoset-pa-e22-kunde-inte-varit-dar-snabbare',
+        'info_dict': {
+            'id': 'jXvk42E',
+            'title': 'Försvarsmakten om trafikkaoset på E22: Kunde inte varit där snabbare',
+            'ext': 'mp4',
+            'duration': 80,
+            'age_limit': 0,
+            'timestamp': 1704370009,
+            'episode': 'Försvarsmakten om trafikkaoset på E22: Kunde inte varit där snabbare',
+            'series': 'Lokala Nyheter Skåne',
+            'upload_date': '20240104',
+        },
+        'params': {
+            'skip_download': True,
+        },
+    }, {
+        'url': 'https://www.svt.se/nyheter/svtforum/2023-tungt-ar-for-svensk-media',
+        'info_dict': {
+            'title': '2023 tungt år för svensk media',
+            'id': 'ewqAZv4',
+            'ext': 'mp4',
+            'duration': 3074,
+            'age_limit': 0,
+            'series': '',
+            'timestamp': 1702980479,
+            'upload_date': '20231219',
+            'episode': 'Mediestudier',
+        },
+        'params': {
+            'skip_download': True,
+        },
+    }, {
         'url': 'https://www.svt.se/sport/ishockey/bakom-masken-lehners-kamp-mot-mental-ohalsa',
         'info_dict': {
             'id': '25298267',
             'title': 'Bakom masken – Lehners kamp mot mental ohälsa',
         },
         'playlist_count': 4,
+        'skip': 'Video is gone',
     }, {
         'url': 'https://www.svt.se/nyheter/utrikes/svenska-andrea-ar-en-mil-fran-branderna-i-kalifornien',
         'info_dict': {
@@ -365,6 +441,7 @@ class SVTPageIE(InfoExtractor):
             'title': 'Svenska Andrea redo att fly sitt hem i Kalifornien',
         },
         'playlist_count': 2,
+        'skip': 'Video is gone',
     }, {
         # only programTitle
         'url': 'http://www.svt.se/sport/ishockey/jagr-tacklar-giroux-under-intervjun',
@@ -375,6 +452,7 @@ class SVTPageIE(InfoExtractor):
             'duration': 27,
             'age_limit': 0,
         },
+        'skip': 'Video is gone',
     }, {
         'url': 'https://www.svt.se/nyheter/lokalt/vast/svt-testar-tar-nagon-upp-skrapet-1',
         'only_matching': True,
@@ -385,29 +463,26 @@ class SVTPageIE(InfoExtractor):
 
     @classmethod
     def suitable(cls, url):
-        return False if SVTIE.suitable(url) or SVTPlayIE.suitable(url) else super(SVTPageIE, cls).suitable(url)
+        return False if SVTIE.suitable(url) or SVTPlayIE.suitable(url) else super().suitable(url)
 
     def _real_extract(self, url):
-        path, display_id = self._match_valid_url(url).groups()
+        display_id = self._match_id(url)
 
-        article = self._download_json(
-            'https://api.svt.se/nss-api/page/' + path, display_id,
-            query={'q': 'articles'})['articles']['content'][0]
+        webpage = self._download_webpage(url, display_id)
+        title = self._og_search_title(webpage)
 
-        entries = []
+        urql_state = self._search_json(
+            r'window\.svt\.(?:nyh\.)?urqlState\s*=', webpage, 'json data', display_id)
 
-        def _process_content(content):
-            if content.get('_type') in ('VIDEOCLIP', 'VIDEOEPISODE'):
-                video_id = compat_str(content['image']['svtId'])
-                entries.append(self.url_result(
-                    'svt:' + video_id, SVTPlayIE.ie_key(), video_id))
+        data = traverse_obj(urql_state, (..., 'data', {str}, {json.loads}), get_all=False) or {}
 
-        for media in article.get('media', []):
-            _process_content(media)
+        def entries():
+            for video_id in set(traverse_obj(data, (
+                'page', (('topMedia', 'svtId'), ('body', ..., 'video', 'svtId')), {str},
+            ))):
+                info = self._extract_video(
+                    self._download_json(f'https://api.svt.se/video/{video_id}', video_id), video_id)
+                info['title'] = title
+                yield info
 
-        for obj in article.get('structuredBody', []):
-            _process_content(obj.get('content') or {})
-
-        return self.playlist_result(
-            entries, str_or_none(article.get('id')),
-            strip_or_none(article.get('title')))
+        return self.playlist_result(entries(), display_id, title)
diff --git a/plugins/youtube_download/yt_dlp/extractor/swearnet.py b/plugins/youtube_download/yt_dlp/extractor/swearnet.py
index 6e216a2..2d6fb3e 100644
--- a/plugins/youtube_download/yt_dlp/extractor/swearnet.py
+++ b/plugins/youtube_download/yt_dlp/extractor/swearnet.py
@@ -1,73 +1,45 @@
-from .common import InfoExtractor
-from ..utils import int_or_none, traverse_obj
+from .vidyard import VidyardBaseIE
+from ..utils import ExtractorError, int_or_none, make_archive_id
 
 
-class SwearnetEpisodeIE(InfoExtractor):
+class SwearnetEpisodeIE(VidyardBaseIE):
     _VALID_URL = r'https?://www\.swearnet\.com/shows/(?P<id>[\w-]+)/seasons/(?P<season_num>\d+)/episodes/(?P<episode_num>\d+)'
     _TESTS = [{
         'url': 'https://www.swearnet.com/shows/gettin-learnt-with-ricky/seasons/1/episodes/1',
         'info_dict': {
-            'id': '232819',
+            'id': 'wicK2EOzjOdxkUXGDIgcPw',
+            'display_id': '232819',
             'ext': 'mp4',
             'episode_number': 1,
             'episode': 'Episode 1',
             'duration': 719,
-            'description': 'md5:c48ef71440ce466284c07085cd7bd761',
+            'description': r're:Are you drunk and high and craving a grilled cheese sandwich.+',
             'season': 'Season 1',
             'title': 'Episode 1 - Grilled Cheese Sammich',
             'season_number': 1,
-            'thumbnail': 'https://cdn.vidyard.com/thumbnails/232819/_RX04IKIq60a2V6rIRqq_Q_small.jpg',
-        }
+            'thumbnail': 'https://cdn.vidyard.com/thumbnails/custom/0dd74f9b-388a-452e-b570-b407fb64435b_small.jpg',
+            'tags': ['Getting Learnt with Ricky', 'drunk', 'grilled cheese', 'high'],
+            '_old_archive_ids': ['swearnetepisode 232819'],
+        },
     }]
 
-    def _get_formats_and_subtitle(self, video_source, video_id):
-        video_source = video_source or {}
-        formats, subtitles = [], {}
-        for key, value in video_source.items():
-            if key == 'hls':
-                for video_hls in value:
-                    fmts, subs = self._extract_m3u8_formats_and_subtitles(video_hls.get('url'), video_id)
-                    formats.extend(fmts)
-                    self._merge_subtitles(subs, target=subtitles)
-            else:
-                formats.extend({
-                    'url': video_mp4.get('url'),
-                    'ext': 'mp4'
-                } for video_mp4 in value)
-
-        return formats, subtitles
-
-    def _get_direct_subtitle(self, caption_json):
-        subs = {}
-        for caption in caption_json:
-            subs.setdefault(caption.get('language') or 'und', []).append({
-                'url': caption.get('vttUrl'),
-                'name': caption.get('name')
-            })
-
-        return subs
-
     def _real_extract(self, url):
-        display_id, season_number, episode_number = self._match_valid_url(url).group('id', 'season_num', 'episode_num')
-        webpage = self._download_webpage(url, display_id)
+        slug, season_number, episode_number = self._match_valid_url(url).group('id', 'season_num', 'episode_num')
+        webpage = self._download_webpage(url, slug)
 
-        external_id = self._search_regex(r'externalid\s*=\s*"([^"]+)', webpage, 'externalid')
-        json_data = self._download_json(
-            f'https://play.vidyard.com/player/{external_id}.json', display_id)['payload']['chapters'][0]
+        try:
+            external_id = self._search_regex(r'externalid\s*=\s*"([^"]+)', webpage, 'externalid')
+        except ExtractorError:
+            if 'Upgrade Now' in webpage:
+                self.raise_login_required()
+            raise
 
-        formats, subtitles = self._get_formats_and_subtitle(json_data['sources'], display_id)
-        self._merge_subtitles(self._get_direct_subtitle(json_data.get('captions')), target=subtitles)
+        info = self._process_video_json(self._fetch_video_json(external_id)['chapters'][0], external_id)
+        if info.get('display_id'):
+            info['_old_archive_ids'] = [make_archive_id(self, info['display_id'])]
 
         return {
-            'id': str(json_data['videoId']),
-            'title': json_data.get('name') or self._html_search_meta(['og:title', 'twitter:title'], webpage),
-            'description': (json_data.get('description')
-                            or self._html_search_meta(['og:description', 'twitter:description'], webpage)),
-            'duration': int_or_none(json_data.get('seconds')),
-            'formats': formats,
-            'subtitles': subtitles,
+            **info,
             'season_number': int_or_none(season_number),
             'episode_number': int_or_none(episode_number),
-            'thumbnails': [{'url': thumbnail_url}
-                           for thumbnail_url in traverse_obj(json_data, ('thumbnailUrls', ...))]
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/swrmediathek.py b/plugins/youtube_download/yt_dlp/extractor/swrmediathek.py
deleted file mode 100644
index 38bdfce..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/swrmediathek.py
+++ /dev/null
@@ -1,111 +0,0 @@
-from .common import InfoExtractor
-from ..utils import (
-    parse_duration,
-    int_or_none,
-    determine_protocol,
-)
-
-
-class SWRMediathekIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?swrmediathek\.de/(?:content/)?player\.htm\?show=(?P<id>[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12})'
-
-    _TESTS = [{
-        'url': 'http://swrmediathek.de/player.htm?show=849790d0-dab8-11e3-a953-0026b975f2e6',
-        'md5': '8c5f6f0172753368547ca8413a7768ac',
-        'info_dict': {
-            'id': '849790d0-dab8-11e3-a953-0026b975f2e6',
-            'ext': 'mp4',
-            'title': 'SWR odysso',
-            'description': 'md5:2012e31baad36162e97ce9eb3f157b8a',
-            'thumbnail': r're:^http:.*\.jpg$',
-            'duration': 2602,
-            'upload_date': '20140515',
-            'uploader': 'SWR Fernsehen',
-            'uploader_id': '990030',
-        },
-    }, {
-        'url': 'http://swrmediathek.de/player.htm?show=0e1a8510-ddf2-11e3-9be3-0026b975f2e6',
-        'md5': 'b10ab854f912eecc5a6b55cd6fc1f545',
-        'info_dict': {
-            'id': '0e1a8510-ddf2-11e3-9be3-0026b975f2e6',
-            'ext': 'mp4',
-            'title': 'Nachtcafé - Alltagsdroge Alkohol - zwischen Sektempfang und Komasaufen',
-            'description': 'md5:e0a3adc17e47db2c23aab9ebc36dbee2',
-            'thumbnail': r're:http://.*\.jpg',
-            'duration': 5305,
-            'upload_date': '20140516',
-            'uploader': 'SWR Fernsehen',
-            'uploader_id': '990030',
-        },
-        'skip': 'redirect to http://swrmediathek.de/index.htm?hinweis=swrlink',
-    }, {
-        'url': 'http://swrmediathek.de/player.htm?show=bba23e10-cb93-11e3-bf7f-0026b975f2e6',
-        'md5': '4382e4ef2c9d7ce6852535fa867a0dd3',
-        'info_dict': {
-            'id': 'bba23e10-cb93-11e3-bf7f-0026b975f2e6',
-            'ext': 'mp3',
-            'title': 'Saša Stanišic: Vor dem Fest',
-            'description': 'md5:5b792387dc3fbb171eb709060654e8c9',
-            'thumbnail': r're:http://.*\.jpg',
-            'duration': 3366,
-            'upload_date': '20140520',
-            'uploader': 'SWR 2',
-            'uploader_id': '284670',
-        },
-        'skip': 'redirect to http://swrmediathek.de/index.htm?hinweis=swrlink',
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        video = self._download_json(
-            'http://swrmediathek.de/AjaxEntry?ekey=%s' % video_id,
-            video_id, 'Downloading video JSON')
-
-        attr = video['attr']
-        title = attr['entry_title']
-        media_type = attr.get('entry_etype')
-
-        formats = []
-        for entry in video.get('sub', []):
-            if entry.get('name') != 'entry_media':
-                continue
-
-            entry_attr = entry.get('attr', {})
-            f_url = entry_attr.get('val2')
-            if not f_url:
-                continue
-            codec = entry_attr.get('val0')
-            if codec == 'm3u8':
-                formats.extend(self._extract_m3u8_formats(
-                    f_url, video_id, 'mp4', 'm3u8_native',
-                    m3u8_id='hls', fatal=False))
-            elif codec == 'f4m':
-                formats.extend(self._extract_f4m_formats(
-                    f_url + '?hdcore=3.7.0', video_id,
-                    f4m_id='hds', fatal=False))
-            else:
-                formats.append({
-                    'format_id': determine_protocol({'url': f_url}),
-                    'url': f_url,
-                    'quality': int_or_none(entry_attr.get('val1')),
-                    'vcodec': codec if media_type == 'Video' else 'none',
-                    'acodec': codec if media_type == 'Audio' else None,
-                })
-
-        upload_date = None
-        entry_pdatet = attr.get('entry_pdatet')
-        if entry_pdatet:
-            upload_date = entry_pdatet[:-4]
-
-        return {
-            'id': video_id,
-            'title': title,
-            'description': attr.get('entry_descl'),
-            'thumbnail': attr.get('entry_image_16_9'),
-            'duration': parse_duration(attr.get('entry_durat')),
-            'upload_date': upload_date,
-            'uploader': attr.get('channel_title'),
-            'uploader_id': attr.get('channel_idkey'),
-            'formats': formats,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/syfy.py b/plugins/youtube_download/yt_dlp/extractor/syfy.py
index c79d27a..a32b500 100644
--- a/plugins/youtube_download/yt_dlp/extractor/syfy.py
+++ b/plugins/youtube_download/yt_dlp/extractor/syfy.py
@@ -1,11 +1,12 @@
 from .adobepass import AdobePassIE
 from ..utils import (
-    update_url_query,
     smuggle_url,
+    update_url_query,
 )
 
 
 class SyfyIE(AdobePassIE):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?syfy\.com/(?:[^/]+/)?videos/(?P<id>[^/?#]+)'
     _TESTS = [{
         'url': 'http://www.syfy.com/theinternetruinedmylife/videos/the-internet-ruined-my-life-season-1-trailer',
@@ -23,14 +24,15 @@ class SyfyIE(AdobePassIE):
             'skip_download': True,
         },
         'add_ie': ['ThePlatform'],
+        'skip': 'Redirects to main page',
     }]
 
     def _real_extract(self, url):
         display_id = self._match_id(url)
         webpage = self._download_webpage(url, display_id)
-        syfy_mpx = list(self._parse_json(self._search_regex(
+        syfy_mpx = next(iter(self._parse_json(self._search_regex(
             r'jQuery\.extend\(Drupal\.settings\s*,\s*({.+?})\);', webpage, 'drupal settings'),
-            display_id)['syfy']['syfy_mpx'].values())[0]
+            display_id)['syfy']['syfy_mpx'].values()))
         video_id = syfy_mpx['mpxGUID']
         title = syfy_mpx['episodeTitle']
         query = {
diff --git a/plugins/youtube_download/yt_dlp/extractor/syvdk.py b/plugins/youtube_download/yt_dlp/extractor/syvdk.py
index 287fb26..ec16683 100644
--- a/plugins/youtube_download/yt_dlp/extractor/syvdk.py
+++ b/plugins/youtube_download/yt_dlp/extractor/syvdk.py
@@ -13,8 +13,8 @@ class SYVDKIE(InfoExtractor):
             'display_id': 'isabella-arendt-stiller-op-for-de-konservative-2',
             'ext': 'mp3',
             'title': 'Isabella Arendt stiller op for De Konservative',
-            'description': 'md5:f5fa6a431813bf37284f3412ad7c6c06'
-        }
+            'description': 'md5:f5fa6a431813bf37284f3412ad7c6c06',
+        },
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/tagesschau.py b/plugins/youtube_download/yt_dlp/extractor/tagesschau.py
index e23b490..4c537df 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tagesschau.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tagesschau.py
@@ -12,6 +12,7 @@ from ..utils import (
 
 
 class TagesschauIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?tagesschau\.de/(?P<path>[^/]+/(?:[^/]+/)*?(?P<id>[^/#?]+?(?:-?[0-9]+)?))(?:~_?[^/#?]+?)?\.html'
 
     _TESTS = [{
@@ -140,10 +141,10 @@ class TagesschauIE(InfoExtractor):
                 if not formats:
                     continue
                 entries.append({
-                    'id': '%s-%d' % (display_id, num),
+                    'id': f'{display_id}-{num}',
                     'title': try_get(video, lambda x: x['mc']['_title']),
                     'duration': int_or_none(try_get(video, lambda x: x['mc']['_duration'])),
-                    'formats': formats
+                    'formats': formats,
                 })
 
         if not entries:
diff --git a/plugins/youtube_download/yt_dlp/extractor/taptap.py b/plugins/youtube_download/yt_dlp/extractor/taptap.py
new file mode 100644
index 0000000..f590019
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/taptap.py
@@ -0,0 +1,275 @@
+import re
+import uuid
+
+from .common import InfoExtractor
+from ..utils import (
+    clean_html,
+    int_or_none,
+    join_nonempty,
+    str_or_none,
+    url_or_none,
+)
+from ..utils.traversal import traverse_obj
+
+
+class TapTapBaseIE(InfoExtractor):
+    _X_UA = 'V=1&PN=WebApp&LANG=zh_CN&VN_CODE=102&LOC=CN&PLT=PC&DS=Android&UID={uuid}&OS=Windows&OSV=10&DT=PC'
+    _VIDEO_API = 'https://www.taptap.cn/webapiv2/video-resource/v1/multi-get'
+    _INFO_API = None
+    _INFO_QUERY_KEY = 'id'
+    _DATA_PATH = None
+    _ID_PATH = None
+    _META_PATH = None
+
+    def _get_api(self, url, video_id, query, **kwargs):
+        query = {**query, 'X-UA': self._X_UA.format(uuid=uuid.uuid4())}
+        return self._download_json(url, video_id, query=query, **kwargs)['data']
+
+    def _extract_video(self, video_id):
+        video_data = self._get_api(self._VIDEO_API, video_id, query={'video_ids': video_id})['list'][0]
+
+        # h265 playlist contains both h265 and h264 formats
+        video_url = traverse_obj(video_data, ('play_url', ('url_h265', 'url'), {url_or_none}, any))
+        formats = self._extract_m3u8_formats(video_url, video_id, fatal=False)
+        for fmt in formats:
+            if re.search(r'^(hev|hvc|hvt)\d', fmt.get('vcodec', '')):
+                fmt['format_id'] = join_nonempty(fmt.get('format_id'), 'h265', delim='_')
+
+        return {
+            'id': str(video_id),
+            'formats': formats,
+            **traverse_obj(video_data, ({
+                'duration': ('info', 'duration', {int_or_none}),
+                'thumbnail': ('thumbnail', ('original_url', 'url'), {url_or_none}),
+            }), get_all=False),
+        }
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        query = {self._INFO_QUERY_KEY: video_id}
+
+        data = traverse_obj(
+            self._get_api(self._INFO_API, video_id, query=query), self._DATA_PATH)
+
+        metainfo = traverse_obj(data, self._META_PATH)
+        entries = [{
+            **metainfo,
+            **self._extract_video(id_),
+        } for id_ in set(traverse_obj(data, self._ID_PATH))]
+
+        return self.playlist_result(entries, **metainfo, id=video_id)
+
+
+class TapTapMomentIE(TapTapBaseIE):
+    _VALID_URL = r'https?://www\.taptap\.cn/moment/(?P<id>\d+)'
+    _INFO_API = 'https://www.taptap.cn/webapiv2/moment/v3/detail'
+    _ID_PATH = ('moment', 'topic', (('videos', ...), 'pin_video'), 'video_id')
+    _META_PATH = ('moment', {
+        'timestamp': ('created_time', {int_or_none}),
+        'modified_timestamp': ('edited_time', {int_or_none}),
+        'uploader': ('author', 'user', 'name', {str}),
+        'uploader_id': ('author', 'user', 'id', {int}, {str_or_none}),
+        'title': ('topic', 'title', {str}),
+        'description': ('topic', 'summary', {str}),
+    })
+    _TESTS = [{
+        'url': 'https://www.taptap.cn/moment/194618230982052443',
+        'info_dict': {
+            'id': '194618230982052443',
+            'title': '《崩坏3》开放世界「后崩坏书」新篇章 于淹没之地仰视辰星',
+            'description': 'md5:cf66f7819d413641b8b28c8543f4ecda',
+            'timestamp': 1633453402,
+            'upload_date': '20211005',
+            'modified_timestamp': 1633453402,
+            'modified_date': '20211005',
+            'uploader': '乌酱',
+            'uploader_id': '532896',
+        },
+        'playlist_count': 1,
+        'playlist': [{
+            'info_dict': {
+                'id': '2202584',
+                'ext': 'mp4',
+                'title': '《崩坏3》开放世界「后崩坏书」新篇章 于淹没之地仰视辰星',
+                'description': 'md5:cf66f7819d413641b8b28c8543f4ecda',
+                'duration': 66,
+                'timestamp': 1633453402,
+                'upload_date': '20211005',
+                'modified_timestamp': 1633453402,
+                'modified_date': '20211005',
+                'uploader': '乌酱',
+                'uploader_id': '532896',
+                'thumbnail': r're:^https?://.*\.(png|jpg)',
+            },
+        }],
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        'url': 'https://www.taptap.cn/moment/521630629209573493',
+        'info_dict': {
+            'id': '521630629209573493',
+            'title': '《崩坏：星穹铁道》黄泉角色PV——「你的颜色」',
+            'description': 'md5:2c81245da864428c904d53ae4ad2182b',
+            'timestamp': 1711425600,
+            'upload_date': '20240326',
+            'modified_timestamp': 1711425600,
+            'modified_date': '20240326',
+            'uploader': '崩坏：星穹铁道',
+            'uploader_id': '414732580',
+        },
+        'playlist_count': 1,
+        'playlist': [{
+            'info_dict': {
+                'id': '4006511',
+                'ext': 'mp4',
+                'title': '《崩坏：星穹铁道》黄泉角色PV——「你的颜色」',
+                'description': 'md5:2c81245da864428c904d53ae4ad2182b',
+                'duration': 173,
+                'timestamp': 1711425600,
+                'upload_date': '20240326',
+                'modified_timestamp': 1711425600,
+                'modified_date': '20240326',
+                'uploader': '崩坏：星穹铁道',
+                'uploader_id': '414732580',
+                'thumbnail': r're:^https?://.*\.(png|jpg)',
+            },
+        }],
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        'url': 'https://www.taptap.cn/moment/540493587511511299',
+        'playlist_count': 2,
+        'info_dict': {
+            'id': '540493587511511299',
+            'title': '中式民俗解谜《纸嫁衣7》、新系列《纸不语》公布！',
+            'description': 'md5:d60842350e686ddb242291ddfb8e39c9',
+            'timestamp': 1715920200,
+            'upload_date': '20240517',
+            'modified_timestamp': 1715942225,
+            'modified_date': '20240517',
+            'uploader': 'TapTap 编辑',
+            'uploader_id': '7159244',
+        },
+        'params': {'skip_download': 'm3u8'},
+    }]
+
+
+class TapTapAppIE(TapTapBaseIE):
+    _VALID_URL = r'https?://www\.taptap\.cn/app/(?P<id>\d+)'
+    _INFO_API = 'https://www.taptap.cn/webapiv2/app/v4/detail'
+    _ID_PATH = (('app_videos', 'videos'), ..., 'video_id')
+    _META_PATH = {
+        'title': ('title', {str}),
+        'description': ('description', 'text', {str}, {clean_html}),
+    }
+    _TESTS = [{
+        'url': 'https://www.taptap.cn/app/168332',
+        'info_dict': {
+            'id': '168332',
+            'title': '原神',
+            'description': 'md5:e345f39a5fea5de2a46923f70d5f76ab',
+        },
+        'playlist_count': 2,
+        'playlist': [{
+            'info_dict': {
+                'id': '4058443',
+                'ext': 'mp4',
+                'title': '原神',
+                'description': 'md5:e345f39a5fea5de2a46923f70d5f76ab',
+                'duration': 26,
+                'thumbnail': r're:^https?://.*\.(png|jpg)',
+            },
+        }, {
+            'info_dict': {
+                'id': '4058462',
+                'ext': 'mp4',
+                'title': '原神',
+                'description': 'md5:e345f39a5fea5de2a46923f70d5f76ab',
+                'duration': 295,
+                'thumbnail': r're:^https?://.*\.(png|jpg)',
+            },
+        }],
+        'params': {'skip_download': 'm3u8'},
+    }]
+
+
+class TapTapIntlBaseIE(TapTapBaseIE):
+    _X_UA = 'V=1&PN=WebAppIntl2&LANG=zh_TW&VN_CODE=115&VN=0.1.0&LOC=CN&PLT=PC&DS=Android&UID={uuid}&CURR=&DT=PC&OS=Windows&OSV=NT%208.0.0'
+    _VIDEO_API = 'https://www.taptap.io/webapiv2/video-resource/v1/multi-get'
+
+
+class TapTapAppIntlIE(TapTapIntlBaseIE):
+    _VALID_URL = r'https?://www\.taptap\.io/app/(?P<id>\d+)'
+    _INFO_API = 'https://www.taptap.io/webapiv2/i/app/v5/detail'
+    _DATA_PATH = 'app'
+    _ID_PATH = (('app_videos', 'videos'), ..., 'video_id')
+    _META_PATH = {
+        'title': ('title', {str}),
+        'description': ('description', 'text', {str}, {clean_html}),
+    }
+    _TESTS = [{
+        'url': 'https://www.taptap.io/app/233287',
+        'info_dict': {
+            'id': '233287',
+            'title': '《虹彩六號 M》',
+            'description': 'md5:418285f9c15347fc3cf3e3a3c649f182',
+        },
+        'playlist_count': 1,
+        'playlist': [{
+            'info_dict': {
+                'id': '2149708997',
+                'ext': 'mp4',
+                'title': '《虹彩六號 M》',
+                'description': 'md5:418285f9c15347fc3cf3e3a3c649f182',
+                'duration': 78,
+                'thumbnail': r're:^https?://.*\.(png|jpg)',
+            },
+        }],
+        'params': {'skip_download': 'm3u8'},
+    }]
+
+
+class TapTapPostIntlIE(TapTapIntlBaseIE):
+    _VALID_URL = r'https?://www\.taptap\.io/post/(?P<id>\d+)'
+    _INFO_API = 'https://www.taptap.io/webapiv2/creation/post/v1/detail'
+    _INFO_QUERY_KEY = 'id_str'
+    _DATA_PATH = 'post'
+    _ID_PATH = ((('videos', ...), 'pin_video'), 'video_id')
+    _META_PATH = {
+        'timestamp': ('published_time', {int_or_none}),
+        'modified_timestamp': ('edited_time', {int_or_none}),
+        'uploader': ('user', 'name', {str}),
+        'uploader_id': ('user', 'id', {int}, {str_or_none}),
+        'title': ('title', {str}),
+        'description': ('list_fields', 'summary', {str}),
+    }
+    _TESTS = [{
+        'url': 'https://www.taptap.io/post/571785',
+        'info_dict': {
+            'id': '571785',
+            'title': 'Arknights x Rainbow Six Siege | Event PV',
+            'description': 'md5:f7717c13f6d3108e22db7303e6690bf7',
+            'timestamp': 1614664951,
+            'upload_date': '20210302',
+            'modified_timestamp': 1614664951,
+            'modified_date': '20210302',
+            'uploader': 'TapTap Editor',
+            'uploader_id': '80224473',
+        },
+        'playlist_count': 1,
+        'playlist': [{
+            'info_dict': {
+                'id': '2149491903',
+                'ext': 'mp4',
+                'title': 'Arknights x Rainbow Six Siege | Event PV',
+                'description': 'md5:f7717c13f6d3108e22db7303e6690bf7',
+                'duration': 122,
+                'timestamp': 1614664951,
+                'upload_date': '20210302',
+                'modified_timestamp': 1614664951,
+                'modified_date': '20210302',
+                'uploader': 'TapTap Editor',
+                'uploader_id': '80224473',
+                'thumbnail': r're:^https?://.*\.(png|jpg)',
+            },
+        }],
+        'params': {'skip_download': 'm3u8'},
+    }]
diff --git a/plugins/youtube_download/yt_dlp/extractor/tass.py b/plugins/youtube_download/yt_dlp/extractor/tass.py
index 67e544a..d4c5b41 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tass.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tass.py
@@ -8,6 +8,7 @@ from ..utils import (
 
 
 class TassIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:tass\.ru|itar-tass\.com)/[^/]+/(?P<id>\d+)'
     _TESTS = [
         {
diff --git a/plugins/youtube_download/yt_dlp/extractor/tbs.py b/plugins/youtube_download/yt_dlp/extractor/tbs.py
index 808c6c7..9b9aa50 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tbs.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tbs.py
@@ -1,10 +1,7 @@
 import re
+import urllib.parse
 
 from .turner import TurnerBaseIE
-from ..compat import (
-    compat_urllib_parse_urlparse,
-    compat_parse_qs,
-)
 from ..utils import (
     float_or_none,
     int_or_none,
@@ -27,7 +24,7 @@ class TBSIE(TurnerBaseIE):
         'params': {
             # m3u8 download
             'skip_download': True,
-        }
+        },
     }, {
         'url': 'http://www.tbs.com/shows/search-party/season-1/episode-1/explicit-the-mysterious-disappearance-of-the-girl-no-one-knew',
         'only_matching': True,
@@ -42,20 +39,20 @@ class TBSIE(TurnerBaseIE):
         drupal_settings = self._parse_json(self._search_regex(
             r'<script[^>]+?data-drupal-selector="drupal-settings-json"[^>]*?>({.+?})</script>',
             webpage, 'drupal setting'), display_id)
-        isLive = 'watchtnt' in path or 'watchtbs' in path
-        video_data = next(v for v in drupal_settings['turner_playlist'] if isLive or v.get('url') == path)
+        is_live = 'watchtnt' in path or 'watchtbs' in path
+        video_data = next(v for v in drupal_settings['turner_playlist'] if is_live or v.get('url') == path)
 
         media_id = video_data['mediaID']
         title = video_data['title']
-        tokenizer_query = compat_parse_qs(compat_urllib_parse_urlparse(
+        tokenizer_query = urllib.parse.parse_qs(urllib.parse.urlparse(
             drupal_settings['ngtv_token_url']).query)
 
         info = self._extract_ngtv_info(
             media_id, tokenizer_query, {
                 'url': url,
                 'site_name': site[:3].upper(),
-                'auth_required': video_data.get('authRequired') == '1' or isLive,
-                'is_live': isLive
+                'auth_required': video_data.get('authRequired') == '1' or is_live,
+                'is_live': is_live,
             })
 
         thumbnails = []
@@ -84,6 +81,6 @@ class TBSIE(TurnerBaseIE):
             'season_number': int_or_none(video_data.get('season')),
             'episode_number': int_or_none(video_data.get('episode')),
             'thumbnails': thumbnails,
-            'is_live': isLive
+            'is_live': is_live,
         })
         return info
diff --git a/plugins/youtube_download/yt_dlp/extractor/tbsjp.py b/plugins/youtube_download/yt_dlp/extractor/tbsjp.py
new file mode 100644
index 0000000..0d521f1
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/tbsjp.py
@@ -0,0 +1,150 @@
+from .common import InfoExtractor
+from ..networking.exceptions import HTTPError
+from ..utils import (
+    ExtractorError,
+    clean_html,
+    int_or_none,
+    str_or_none,
+    unified_timestamp,
+    urljoin,
+)
+from ..utils.traversal import find_element, traverse_obj
+
+
+class TBSJPEpisodeIE(InfoExtractor):
+    _VALID_URL = r'https?://cu\.tbs\.co\.jp/episode/(?P<id>[\d_]+)'
+    _GEO_BYPASS = False
+    _TESTS = [{
+        'url': 'https://cu.tbs.co.jp/episode/23613_2044134_1000049010',
+        'skip': 'streams geo-restricted, Japan only. Also, will likely expire eventually',
+        'info_dict': {
+            'title': 'VIVANT 第三話 誤送金完結へ!絶体絶命の反撃開始',
+            'id': '23613_2044134_1000049010',
+            'ext': 'mp4',
+            'upload_date': '20230728',
+            'duration': 3517,
+            'release_timestamp': 1691118230,
+            'episode': '第三話 誤送金完結へ!絶体絶命の反撃開始',
+            'release_date': '20230804',
+            'categories': 'count:11',
+            'episode_number': 3,
+            'timestamp': 1690522538,
+            'description': 'md5:2b796341af1ef772034133174ba4a895',
+            'series': 'VIVANT',
+        },
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+        meta = self._search_json(r'window\.app\s*=', webpage, 'episode info', video_id, fatal=False)
+        episode = traverse_obj(meta, ('falcorCache', 'catalog', 'episode', video_id, 'value'))
+
+        tf_path = self._search_regex(
+            r'<script[^>]+src=["\'](/assets/tf\.[^"\']+\.js)["\']', webpage, 'stream API config')
+        tf_js = self._download_webpage(urljoin(url, tf_path), video_id, note='Downloading stream API config')
+        video_url = self._search_regex(r'videoPlaybackUrl:\s*[\'"]([^\'"]+)[\'"]', tf_js, 'stream API url')
+        api_key = self._search_regex(r'api_key:\s*[\'"]([^\'"]+)[\'"]', tf_js, 'stream API key')
+
+        try:
+            source_meta = self._download_json(f'{video_url}ref:{video_id}', video_id,
+                                              headers={'X-Streaks-Api-Key': api_key},
+                                              note='Downloading stream metadata')
+        except ExtractorError as e:
+            if isinstance(e.cause, HTTPError) and e.cause.status == 403:
+                self.raise_geo_restricted(countries=['JP'])
+            raise
+
+        formats, subtitles = [], {}
+        for src in traverse_obj(source_meta, ('sources', ..., 'src')):
+            fmts, subs = self._extract_m3u8_formats_and_subtitles(src, video_id, fatal=False)
+            formats.extend(fmts)
+            self._merge_subtitles(subs, target=subtitles)
+
+        return {
+            'title': traverse_obj(webpage, ({find_element(tag='h3')}, {clean_html})),
+            'id': video_id,
+            **traverse_obj(episode, {
+                'categories': ('keywords', {list}),
+                'id': ('content_id', {str}),
+                'description': ('description', 0, 'value'),
+                'timestamp': ('created_at', {unified_timestamp}),
+                'release_timestamp': ('pub_date', {unified_timestamp}),
+                'duration': ('tv_episode_info', 'duration', {int_or_none}),
+                'episode_number': ('tv_episode_info', 'episode_number', {int_or_none}),
+                'episode': ('title', lambda _, v: not v.get('is_phonetic'), 'value'),
+                'series': ('custom_data', 'program_name'),
+            }, get_all=False),
+            'formats': formats,
+            'subtitles': subtitles,
+        }
+
+
+class TBSJPProgramIE(InfoExtractor):
+    _VALID_URL = r'https?://cu\.tbs\.co\.jp/program/(?P<id>\d+)'
+    _TESTS = [{
+        'url': 'https://cu.tbs.co.jp/program/23601',
+        'playlist_mincount': 4,
+        'info_dict': {
+            'id': '23601',
+            'categories': ['エンタメ', 'ミライカプセル', '会社', '働く', 'バラエティ', '動画'],
+            'description': '幼少期の夢は大人になって、どう成長したのだろうか？\nそしてその夢は今後、どのように広がっていくのか？\nいま話題の会社で働く人の「夢の成長」を描く',
+            'series': 'ミライカプセル　-I have a dream-',
+            'title': 'ミライカプセル　-I have a dream-',
+        },
+    }]
+
+    def _real_extract(self, url):
+        programme_id = self._match_id(url)
+        webpage = self._download_webpage(url, programme_id)
+        meta = self._search_json(r'window\.app\s*=', webpage, 'programme info', programme_id)
+
+        programme = traverse_obj(meta, ('falcorCache', 'catalog', 'program', programme_id, 'false', 'value'))
+
+        return {
+            '_type': 'playlist',
+            'entries': [self.url_result(f'https://cu.tbs.co.jp/episode/{video_id}', TBSJPEpisodeIE, video_id)
+                        for video_id in traverse_obj(programme, ('custom_data', 'seriesList', 'episodeCode', ...))],
+            'id': programme_id,
+            **traverse_obj(programme, {
+                'categories': ('keywords', ...),
+                'id': ('tv_episode_info', 'show_content_id', {str_or_none}),
+                'description': ('custom_data', 'program_description'),
+                'series': ('custom_data', 'program_name'),
+                'title': ('custom_data', 'program_name'),
+            }),
+        }
+
+
+class TBSJPPlaylistIE(InfoExtractor):
+    _VALID_URL = r'https?://cu\.tbs\.co\.jp/playlist/(?P<id>[\da-f]+)'
+    _TESTS = [{
+        'url': 'https://cu.tbs.co.jp/playlist/184f9970e7ba48e4915f1b252c55015e',
+        'playlist_mincount': 4,
+        'info_dict': {
+            'title': 'まもなく配信終了',
+            'id': '184f9970e7ba48e4915f1b252c55015e',
+        },
+    }]
+
+    def _real_extract(self, url):
+        playlist_id = self._match_id(url)
+        page = self._download_webpage(url, playlist_id)
+        meta = self._search_json(r'window\.app\s*=', page, 'playlist info', playlist_id)
+        playlist = traverse_obj(meta, ('falcorCache', 'playList', playlist_id))
+
+        def entries():
+            for entry in traverse_obj(playlist, ('catalogs', 'value', lambda _, v: v['content_id'])):
+                # TODO: it's likely possible to get all metadata from the playlist page json instead
+                content_id = entry['content_id']
+                content_type = entry.get('content_type')
+                if content_type == 'tv_show':
+                    yield self.url_result(
+                        f'https://cu.tbs.co.jp/program/{content_id}', TBSJPProgramIE, content_id)
+                elif content_type == 'tv_episode':
+                    yield self.url_result(
+                        f'https://cu.tbs.co.jp/episode/{content_id}', TBSJPEpisodeIE, content_id)
+                else:
+                    self.report_warning(f'Skipping "{content_id}" with unsupported content_type "{content_type}"')
+
+        return self.playlist_result(entries(), playlist_id, traverse_obj(playlist, ('display_name', 'value')))
diff --git a/plugins/youtube_download/yt_dlp/extractor/tdslifeway.py b/plugins/youtube_download/yt_dlp/extractor/tdslifeway.py
deleted file mode 100644
index 3623a68..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/tdslifeway.py
+++ /dev/null
@@ -1,31 +0,0 @@
-from .common import InfoExtractor
-
-
-class TDSLifewayIE(InfoExtractor):
-    _VALID_URL = r'https?://tds\.lifeway\.com/v1/trainingdeliverysystem/courses/(?P<id>\d+)/index\.html'
-
-    _TEST = {
-        # From http://www.ministrygrid.com/training-viewer/-/training/t4g-2014-conference/the-gospel-by-numbers-4/the-gospel-by-numbers
-        'url': 'http://tds.lifeway.com/v1/trainingdeliverysystem/courses/3453494717001/index.html?externalRegistration=AssetId%7C34F466F1-78F3-4619-B2AB-A8EFFA55E9E9%21InstanceId%7C0%21UserId%7Caaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa&grouping=http%3A%2F%2Flifeway.com%2Fvideo%2F3453494717001&activity_id=http%3A%2F%2Flifeway.com%2Fvideo%2F3453494717001&content_endpoint=http%3A%2F%2Ftds.lifeway.com%2Fv1%2Ftrainingdeliverysystem%2FScormEngineInterface%2FTCAPI%2Fcontent%2F&actor=%7B%22name%22%3A%5B%22Guest%20Guest%22%5D%2C%22account%22%3A%5B%7B%22accountServiceHomePage%22%3A%22http%3A%2F%2Fscorm.lifeway.com%2F%22%2C%22accountName%22%3A%22aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa%22%7D%5D%2C%22objectType%22%3A%22Agent%22%7D&content_token=462a50b2-b6f9-4970-99b1-930882c499fb&registration=93d6ec8e-7f7b-4ed3-bbc8-a857913c0b2a&externalConfiguration=access%7CFREE%21adLength%7C-1%21assignOrgId%7C4AE36F78-299A-425D-91EF-E14A899B725F%21assignOrgParentId%7C%21courseId%7C%21isAnonymous%7Cfalse%21previewAsset%7Cfalse%21previewLength%7C-1%21previewMode%7Cfalse%21royalty%7CFREE%21sessionId%7C671422F9-8E79-48D4-9C2C-4EE6111EA1CD%21trackId%7C&auth=Basic%20OjhmZjk5MDBmLTBlYTMtNDJhYS04YjFlLWE4MWQ3NGNkOGRjYw%3D%3D&endpoint=http%3A%2F%2Ftds.lifeway.com%2Fv1%2Ftrainingdeliverysystem%2FScormEngineInterface%2FTCAPI%2F',
-        'info_dict': {
-            'id': '3453494717001',
-            'ext': 'mp4',
-            'title': 'The Gospel by Numbers',
-            'thumbnail': r're:^https?://.*\.jpg',
-            'upload_date': '20140410',
-            'description': 'Coming soon from T4G 2014!',
-            'uploader_id': '2034960640001',
-            'timestamp': 1397145591,
-        },
-        'params': {
-            # m3u8 download
-            'skip_download': True,
-        },
-        'add_ie': ['BrightcoveNew'],
-    }
-
-    BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/2034960640001/default_default/index.html?videoId=%s'
-
-    def _real_extract(self, url):
-        brightcove_id = self._match_id(url)
-        return self.url_result(self.BRIGHTCOVE_URL_TEMPLATE % brightcove_id, 'BrightcoveNew', brightcove_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/teachable.py b/plugins/youtube_download/yt_dlp/extractor/teachable.py
index 01906bd..0d39be6 100644
--- a/plugins/youtube_download/yt_dlp/extractor/teachable.py
+++ b/plugins/youtube_download/yt_dlp/extractor/teachable.py
@@ -3,10 +3,10 @@ import re
 from .common import InfoExtractor
 from .wistia import WistiaIE
 from ..utils import (
-    clean_html,
     ExtractorError,
-    int_or_none,
+    clean_html,
     get_element_by_class,
+    int_or_none,
     strip_or_none,
     urlencode_postdata,
     urljoin,
@@ -29,7 +29,7 @@ class TeachableBaseIE(InfoExtractor):
         'courses.workitdaily.com': 'workitdaily',
     }
 
-    _VALID_URL_SUB_TUPLE = (_URL_PREFIX, '|'.join(re.escape(site) for site in _SITES.keys()))
+    _VALID_URL_SUB_TUPLE = (_URL_PREFIX, '|'.join(re.escape(site) for site in _SITES))
 
     def _real_initialize(self):
         self._logged_in = False
@@ -43,8 +43,8 @@ class TeachableBaseIE(InfoExtractor):
             return
 
         login_page, urlh = self._download_webpage_handle(
-            'https://%s/sign_in' % site, None,
-            'Downloading %s login page' % site)
+            f'https://{site}/sign_in', None,
+            f'Downloading {site} login page')
 
         def is_logged(webpage):
             return any(re.search(p, webpage) for p in (
@@ -73,7 +73,7 @@ class TeachableBaseIE(InfoExtractor):
             post_url = urljoin(login_url, post_url)
 
         response = self._download_webpage(
-            post_url, None, 'Logging in to %s' % site,
+            post_url, None, f'Logging in to {site}',
             data=urlencode_postdata(login_form),
             headers={
                 'Content-Type': 'application/x-www-form-urlencoded',
@@ -82,8 +82,8 @@ class TeachableBaseIE(InfoExtractor):
 
         if '>I accept the new Privacy Policy<' in response:
             raise ExtractorError(
-                'Unable to login: %s asks you to accept new Privacy Policy. '
-                'Go to https://%s/ and accept.' % (site, site), expected=True)
+                f'Unable to login: {site} asks you to accept new Privacy Policy. '
+                f'Go to https://{site}/ and accept.', expected=True)
 
         # Successful login
         if is_logged(response):
@@ -93,19 +93,20 @@ class TeachableBaseIE(InfoExtractor):
         message = get_element_by_class('alert', response)
         if message is not None:
             raise ExtractorError(
-                'Unable to login: %s' % clean_html(message), expected=True)
+                f'Unable to login: {clean_html(message)}', expected=True)
 
         raise ExtractorError('Unable to log in')
 
 
 class TeachableIE(TeachableBaseIE):
+    _WORKING = False
     _VALID_URL = r'''(?x)
                     (?:
-                        %shttps?://(?P<site_t>[^/]+)|
-                        https?://(?:www\.)?(?P<site>%s)
+                        {}https?://(?P<site_t>[^/]+)|
+                        https?://(?:www\.)?(?P<site>{})
                     )
                     /courses/[^/]+/lectures/(?P<id>\d+)
-                    ''' % TeachableBaseIE._VALID_URL_SUB_TUPLE
+                    '''.format(*TeachableBaseIE._VALID_URL_SUB_TUPLE)
 
     _TESTS = [{
         'url': 'https://gns3.teachable.com/courses/gns3-certified-associate/lectures/6842364',
@@ -145,7 +146,7 @@ class TeachableIE(TeachableBaseIE):
         if cls._is_teachable(webpage):
             if re.match(r'https?://[^/]+/(?:courses|p)', url):
                 yield f'{cls._URL_PREFIX}{url}'
-                raise cls.StopExtraction()
+                raise cls.StopExtraction
 
     def _real_extract(self, url):
         mobj = self._match_valid_url(url)
@@ -177,7 +178,7 @@ class TeachableIE(TeachableBaseIE):
         chapter = None
         chapter_number = None
         section_item = self._search_regex(
-            r'(?s)(?P<li><li[^>]+\bdata-lecture-id=["\']%s[^>]+>.+?</li>)' % video_id,
+            rf'(?s)(?P<li><li[^>]+\bdata-lecture-id=["\']{video_id}[^>]+>.+?</li>)',
             webpage, 'section item', default=None, group='li')
         if section_item:
             chapter_number = int_or_none(self._search_regex(
@@ -210,11 +211,11 @@ class TeachableIE(TeachableBaseIE):
 class TeachableCourseIE(TeachableBaseIE):
     _VALID_URL = r'''(?x)
                         (?:
-                            %shttps?://(?P<site_t>[^/]+)|
-                            https?://(?:www\.)?(?P<site>%s)
+                            {}https?://(?P<site_t>[^/]+)|
+                            https?://(?:www\.)?(?P<site>{})
                         )
                         /(?:courses|p)/(?:enrolled/)?(?P<id>[^/?#&]+)
-                    ''' % TeachableBaseIE._VALID_URL_SUB_TUPLE
+                    '''.format(*TeachableBaseIE._VALID_URL_SUB_TUPLE)
     _TESTS = [{
         'url': 'http://v1.upskillcourses.com/courses/essential-web-developer-course/',
         'info_dict': {
@@ -241,8 +242,7 @@ class TeachableCourseIE(TeachableBaseIE):
 
     @classmethod
     def suitable(cls, url):
-        return False if TeachableIE.suitable(url) else super(
-            TeachableCourseIE, cls).suitable(url)
+        return False if TeachableIE.suitable(url) else super().suitable(url)
 
     def _real_extract(self, url):
         mobj = self._match_valid_url(url)
@@ -258,7 +258,7 @@ class TeachableCourseIE(TeachableBaseIE):
 
         webpage = self._download_webpage(url, course_id)
 
-        url_base = 'https://%s/' % site
+        url_base = f'https://{site}/'
 
         entries = []
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/teachertube.py b/plugins/youtube_download/yt_dlp/extractor/teachertube.py
index c3eec27..4c26d31 100644
--- a/plugins/youtube_download/yt_dlp/extractor/teachertube.py
+++ b/plugins/youtube_download/yt_dlp/extractor/teachertube.py
@@ -2,13 +2,14 @@ import re
 
 from .common import InfoExtractor
 from ..utils import (
-    determine_ext,
     ExtractorError,
+    determine_ext,
     qualities,
 )
 
 
 class TeacherTubeIE(InfoExtractor):
+    _WORKING = False
     IE_NAME = 'teachertube'
     IE_DESC = 'teachertube.com videos'
 
@@ -49,7 +50,7 @@ class TeacherTubeIE(InfoExtractor):
             r'<div\b[^>]+\bclass=["\']msgBox error[^>]+>([^<]+)', webpage,
             'error', default=None)
         if error:
-            raise ExtractorError('%s said: %s' % (self.IE_NAME, error), expected=True)
+            raise ExtractorError(f'{self.IE_NAME} said: {error}', expected=True)
 
         title = self._html_search_meta('title', webpage, 'title', fatal=True)
         TITLE_SUFFIX = ' - TeacherTube'
@@ -69,7 +70,7 @@ class TeacherTubeIE(InfoExtractor):
         formats = [
             {
                 'url': media_url,
-                'quality': quality(determine_ext(media_url))
+                'quality': quality(determine_ext(media_url)),
             } for media_url in set(media_urls)
         ]
 
@@ -87,6 +88,7 @@ class TeacherTubeIE(InfoExtractor):
 
 
 class TeacherTubeUserIE(InfoExtractor):
+    _WORKING = False
     IE_NAME = 'teachertube:user:collection'
     IE_DESC = 'teachertube.com user and collection videos'
 
@@ -100,7 +102,7 @@ class TeacherTubeUserIE(InfoExtractor):
     _TEST = {
         'url': 'http://www.teachertube.com/user/profile/rbhagwati2',
         'info_dict': {
-            'id': 'rbhagwati2'
+            'id': 'rbhagwati2',
         },
         'playlist_mincount': 179,
     }
@@ -113,10 +115,10 @@ class TeacherTubeUserIE(InfoExtractor):
         webpage = self._download_webpage(url, user_id)
         urls.extend(re.findall(self._MEDIA_RE, webpage))
 
-        pages = re.findall(r'/ajax-user/user-videos/%s\?page=([0-9]+)' % user_id, webpage)[:-1]
+        pages = re.findall(rf'/ajax-user/user-videos/{user_id}\?page=([0-9]+)', webpage)[:-1]
         for p in pages:
-            more = 'http://www.teachertube.com/ajax-user/user-videos/%s?page=%s' % (user_id, p)
-            webpage = self._download_webpage(more, user_id, 'Downloading page %s/%s' % (p, len(pages)))
+            more = f'http://www.teachertube.com/ajax-user/user-videos/{user_id}?page={p}'
+            webpage = self._download_webpage(more, user_id, f'Downloading page {p}/{len(pages)}')
             video_urls = re.findall(self._MEDIA_RE, webpage)
             urls.extend(video_urls)
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/teachingchannel.py b/plugins/youtube_download/yt_dlp/extractor/teachingchannel.py
index 275f6d1..5791292 100644
--- a/plugins/youtube_download/yt_dlp/extractor/teachingchannel.py
+++ b/plugins/youtube_download/yt_dlp/extractor/teachingchannel.py
@@ -2,6 +2,7 @@ from .common import InfoExtractor
 
 
 class TeachingChannelIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?teachingchannel\.org/videos?/(?P<id>[^/?&#]+)'
 
     _TEST = {
diff --git a/plugins/youtube_download/yt_dlp/extractor/teamcoco.py b/plugins/youtube_download/yt_dlp/extractor/teamcoco.py
index d32f812..a94ff9b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/teamcoco.py
+++ b/plugins/youtube_download/yt_dlp/extractor/teamcoco.py
@@ -13,8 +13,8 @@ from ..utils import (
     parse_qs,
     traverse_obj,
     unified_timestamp,
-    urljoin,
     url_or_none,
+    urljoin,
 )
 
 
@@ -136,7 +136,7 @@ class TeamcocoIE(TeamcocoBaseIE):
             'blocks', lambda _, v: v['name'] in ('meta-tags', 'video-player', 'video-info'), 'props', {dict})))
 
         thumbnail = traverse_obj(
-            info, (('image', 'poster'), {lambda x: urljoin('https://teamcoco.com/', x)}), get_all=False)
+            info, (('image', 'poster'), {urljoin('https://teamcoco.com/')}), get_all=False)
         video_id = traverse_obj(parse_qs(thumbnail), ('id', 0)) or display_id
 
         formats, subtitles = self._get_formats_and_subtitles(info, video_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/teamtreehouse.py b/plugins/youtube_download/yt_dlp/extractor/teamtreehouse.py
index dd802db..ba25cdc 100644
--- a/plugins/youtube_download/yt_dlp/extractor/teamtreehouse.py
+++ b/plugins/youtube_download/yt_dlp/extractor/teamtreehouse.py
@@ -2,9 +2,9 @@ import re
 
 from .common import InfoExtractor
 from ..utils import (
+    ExtractorError,
     clean_html,
     determine_ext,
-    ExtractorError,
     float_or_none,
     get_element_by_class,
     get_element_by_id,
diff --git a/plugins/youtube_download/yt_dlp/extractor/techtalks.py b/plugins/youtube_download/yt_dlp/extractor/techtalks.py
deleted file mode 100644
index d37de36..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/techtalks.py
+++ /dev/null
@@ -1,80 +0,0 @@
-import re
-
-from .common import InfoExtractor
-from ..utils import (
-    get_element_by_attribute,
-    clean_html,
-)
-
-
-class TechTalksIE(InfoExtractor):
-    _VALID_URL = r'https?://techtalks\.tv/talks/(?:[^/]+/)?(?P<id>\d+)'
-
-    _TESTS = [{
-        'url': 'http://techtalks.tv/talks/learning-topic-models-going-beyond-svd/57758/',
-        'info_dict': {
-            'id': '57758',
-            'title': 'Learning Topic Models --- Going beyond SVD',
-        },
-        'playlist': [
-            {
-                'info_dict': {
-                    'id': '57758',
-                    'ext': 'flv',
-                    'title': 'Learning Topic Models --- Going beyond SVD',
-                },
-            },
-            {
-                'info_dict': {
-                    'id': '57758-slides',
-                    'ext': 'flv',
-                    'title': 'Learning Topic Models --- Going beyond SVD',
-                },
-            },
-        ],
-        'params': {
-            # rtmp download
-            'skip_download': True,
-        },
-    }, {
-        'url': 'http://techtalks.tv/talks/57758',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        mobj = self._match_valid_url(url)
-        talk_id = mobj.group('id')
-        webpage = self._download_webpage(url, talk_id)
-        rtmp_url = self._search_regex(
-            r'netConnectionUrl: \'(.*?)\'', webpage, 'rtmp url')
-        play_path = self._search_regex(
-            r'href=\'(.*?)\' [^>]*id="flowplayer_presenter"',
-            webpage, 'presenter play path')
-        title = clean_html(get_element_by_attribute('class', 'title', webpage))
-        video_info = {
-            'id': talk_id,
-            'title': title,
-            'url': rtmp_url,
-            'play_path': play_path,
-            'ext': 'flv',
-        }
-        m_slides = re.search(r'<a class="slides" href=\'(.*?)\'', webpage)
-        if m_slides is None:
-            return video_info
-        else:
-            return {
-                '_type': 'playlist',
-                'id': talk_id,
-                'title': title,
-                'entries': [
-                    video_info,
-                    # The slides video
-                    {
-                        'id': talk_id + '-slides',
-                        'title': title,
-                        'url': rtmp_url,
-                        'play_path': m_slides.group(1),
-                        'ext': 'flv',
-                    },
-                ],
-            }
diff --git a/plugins/youtube_download/yt_dlp/extractor/ted.py b/plugins/youtube_download/yt_dlp/extractor/ted.py
index c28a154..8544c8b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ted.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ted.py
@@ -2,14 +2,13 @@ import itertools
 import re
 
 from .common import InfoExtractor
-
 from ..utils import (
     int_or_none,
+    parse_duration,
     str_to_int,
     try_get,
-    url_or_none,
     unified_strdate,
-    parse_duration,
+    url_or_none,
 )
 
 
@@ -47,11 +46,11 @@ class TedTalkIE(TedBaseIE):
         webpage = self._download_webpage(url, display_id)
         talk_info = self._search_nextjs_data(webpage, display_id)['props']['pageProps']['videoData']
         video_id = talk_info['id']
-        playerData = self._parse_json(talk_info.get('playerData'), video_id)
+        player_data = self._parse_json(talk_info.get('playerData'), video_id)
 
         http_url = None
         formats, subtitles = [], {}
-        for format_id, resources in (playerData.get('resources') or {}).items():
+        for format_id, resources in (player_data.get('resources') or {}).items():
             if format_id == 'hls':
                 stream_url = url_or_none(try_get(resources, lambda x: x['stream']))
                 if not stream_url:
@@ -72,7 +71,7 @@ class TedTalkIE(TedBaseIE):
                     bitrate = int_or_none(resource.get('bitrate'))
                     formats.append({
                         'url': h264_url,
-                        'format_id': '%s-%sk' % (format_id, bitrate),
+                        'format_id': f'{format_id}-{bitrate}k',
                         'tbr': bitrate,
                     })
                     if re.search(r'\d+k', h264_url):
@@ -82,7 +81,7 @@ class TedTalkIE(TedBaseIE):
                 if not streamer:
                     continue
                 formats.extend({
-                    'format_id': '%s-%s' % (format_id, resource.get('name')),
+                    'format_id': '{}-{}'.format(format_id, resource.get('name')),
                     'url': streamer,
                     'play_path': resource['file'],
                     'ext': 'flv',
@@ -99,7 +98,7 @@ class TedTalkIE(TedBaseIE):
                     continue
                 bitrate_url = re.sub(r'\d+k', bitrate, http_url)
                 if not self._is_valid_url(
-                        bitrate_url, video_id, '%s bitrate' % bitrate):
+                        bitrate_url, video_id, f'{bitrate} bitrate'):
                     continue
                 f = m3u8_format.copy()
                 f.update({
@@ -120,12 +119,12 @@ class TedTalkIE(TedBaseIE):
             })
 
         if not formats:
-            external = playerData.get('external') or {}
+            external = player_data.get('external') or {}
             service = external.get('service') or ''
             ext_url = external.get('code') if service.lower() == 'youtube' else None
             return self.url_result(ext_url or external['uri'])
 
-        thumbnail = playerData.get('thumb') or self._og_search_property('image', webpage)
+        thumbnail = player_data.get('thumb') or self._og_search_property('image', webpage)
         if thumbnail:
             # trim thumbnail resize parameters
             thumbnail = thumbnail.split('?')[0]
@@ -142,7 +141,7 @@ class TedTalkIE(TedBaseIE):
             'view_count': str_to_int(talk_info.get('viewedCount')),
             'upload_date': unified_strdate(talk_info.get('publishedAt')),
             'release_date': unified_strdate(talk_info.get('recordedOn')),
-            'tags': try_get(playerData, lambda x: x['targeting']['tag'].split(',')),
+            'tags': try_get(player_data, lambda x: x['targeting']['tag'].split(',')),
         }
 
 
@@ -154,7 +153,7 @@ class TedSeriesIE(TedBaseIE):
             'id': '3',
             'title': 'Small Thing Big Idea',
             'series': 'Small Thing Big Idea',
-            'description': 'md5:6869ca52cec661aef72b3e9f7441c55c'
+            'description': 'md5:6869ca52cec661aef72b3e9f7441c55c',
         },
         'playlist_mincount': 16,
     }, {
@@ -164,7 +163,7 @@ class TedSeriesIE(TedBaseIE):
             'title': 'The Way We Work Season 2',
             'series': 'The Way We Work',
             'description': 'md5:59469256e533e1a48c4aa926a382234c',
-            'season_number': 2
+            'season_number': 2,
         },
         'playlist_mincount': 8,
     }]
@@ -195,7 +194,7 @@ class TedPlaylistIE(TedBaseIE):
         'info_dict': {
             'id': '171',
             'title': 'The most popular talks of all time',
-            'description': 'md5:d2f22831dc86c7040e733a3cb3993d78'
+            'description': 'md5:d2f22831dc86c7040e733a3cb3993d78',
         },
         'playlist_mincount': 25,
     }]
diff --git a/plugins/youtube_download/yt_dlp/extractor/tele13.py b/plugins/youtube_download/yt_dlp/extractor/tele13.py
index 212af37..0d72177 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tele13.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tele13.py
@@ -1,14 +1,14 @@
 from .common import InfoExtractor
 from .youtube import YoutubeIE
 from ..utils import (
+    determine_ext,
     js_to_json,
     qualities,
-    determine_ext,
 )
 
 
 class Tele13IE(InfoExtractor):
-    _VALID_URL = r'^https?://(?:www\.)?t13\.cl/videos(?:/[^/]+)+/(?P<id>[\w-]+)'
+    _VALID_URL = r'https?://(?:www\.)?t13\.cl/videos(?:/[^/]+)+/(?P<id>[\w-]+)'
     _TESTS = [
         {
             'url': 'http://www.t13.cl/videos/actualidad/el-circulo-de-hierro-de-michelle-bachelet-en-su-regreso-a-la-moneda',
@@ -36,7 +36,7 @@ class Tele13IE(InfoExtractor):
                 'uploader_id': 'UCnLY_3ezwNcDSC_Wc6suZxw',
             },
             'add_ie': ['Youtube'],
-        }
+        },
     ]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/tele5.py b/plugins/youtube_download/yt_dlp/extractor/tele5.py
index 9260db2..a455375 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tele5.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tele5.py
@@ -1,88 +1,77 @@
-from .dplay import DPlayIE
-from ..compat import compat_urlparse
-from ..utils import (
-    ExtractorError,
-    extract_attributes,
-)
+import functools
+
+from .dplay import DiscoveryPlusBaseIE
+from ..utils import join_nonempty
+from ..utils.traversal import traverse_obj
 
 
-class Tele5IE(DPlayIE):  # XXX: Do not subclass from concrete IE
-    _VALID_URL = r'https?://(?:www\.)?tele5\.de/(?:[^/]+/)*(?P<id>[^/?#&]+)'
-    _GEO_COUNTRIES = ['DE']
+class Tele5IE(DiscoveryPlusBaseIE):
+    _VALID_URL = r'https?://(?:www\.)?tele5\.de/(?P<parent_slug>[\w-]+)/(?P<slug_a>[\w-]+)(?:/(?P<slug_b>[\w-]+))?'
     _TESTS = [{
-        'url': 'https://www.tele5.de/mediathek/filme-online/videos?vid=1549416',
+        # slug_a and slug_b
+        'url': 'https://tele5.de/mediathek/stargate-atlantis/quarantane',
         'info_dict': {
-            'id': '1549416',
+            'id': '6852024',
             'ext': 'mp4',
-            'upload_date': '20180814',
-            'timestamp': 1534290623,
-            'title': 'Pandorum',
+            'title': 'Quarantäne',
+            'description': 'md5:6af0373bd0fcc4f13e5d47701903d675',
+            'episode': 'Episode 73',
+            'episode_number': 73,
+            'season': 'Season 4',
+            'season_number': 4,
+            'series': 'Stargate Atlantis',
+            'upload_date': '20240525',
+            'timestamp': 1716643200,
+            'duration': 2503.2,
+            'thumbnail': 'https://eu1-prod-images.disco-api.com/2024/05/21/c81fcb45-8902-309b-badb-4e6d546b575d.jpeg',
+            'creators': ['Tele5'],
+            'tags': [],
         },
-        'params': {
-            'skip_download': True,
-        },
-        'skip': 'No longer available: "404 Seite nicht gefunden"',
     }, {
-        # jwplatform, nexx unavailable
-        'url': 'https://www.tele5.de/filme/ghoul-das-geheimnis-des-friedhofmonsters/',
+        # only slug_a
+        'url': 'https://tele5.de/mediathek/inside-out',
         'info_dict': {
-            'id': 'WJuiOlUp',
+            'id': '6819502',
             'ext': 'mp4',
-            'upload_date': '20200603',
-            'timestamp': 1591214400,
-            'title': 'Ghoul - Das Geheimnis des Friedhofmonsters',
-            'description': 'md5:42002af1d887ff3d5b2b3ca1f8137d97',
+            'title': 'Inside out',
+            'description': 'md5:7e5f32ed0be5ddbd27713a34b9293bfd',
+            'series': 'Inside out',
+            'upload_date': '20240523',
+            'timestamp': 1716494400,
+            'duration': 5343.4,
+            'thumbnail': 'https://eu1-prod-images.disco-api.com/2024/05/15/181eba3c-f9f0-3faf-b14d-0097050a3aa4.jpeg',
+            'creators': ['Tele5'],
+            'tags': [],
         },
-        'params': {
-            'skip_download': True,
-        },
-        'skip': 'No longer available, redirects to Filme page',
     }, {
-        'url': 'https://tele5.de/mediathek/angel-of-mine/',
+        # playlist
+        'url': 'https://tele5.de/mediathek/schlefaz',
         'info_dict': {
-            'id': '1252360',
-            'ext': 'mp4',
-            'upload_date': '20220109',
-            'timestamp': 1641762000,
-            'title': 'Angel of Mine',
-            'description': 'md5:a72546a175e1286eb3251843a52d1ad7',
+            'id': 'mediathek-schlefaz',
         },
-        'params': {
-            'format': 'bestvideo',
-        },
-    }, {
-        'url': 'https://www.tele5.de/kalkofes-mattscheibe/video-clips/politik-und-gesellschaft?ve_id=1551191',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.tele5.de/video-clip/?ve_id=1609440',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.tele5.de/filme/schlefaz-dragon-crusaders/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.tele5.de/filme/making-of/avengers-endgame/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.tele5.de/star-trek/raumschiff-voyager/ganze-folge/das-vinculum/',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.tele5.de/anders-ist-sevda/',
-        'only_matching': True,
+        'playlist_mincount': 3,
     }]
 
     def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-        player_element = self._search_regex(r'(<hyoga-player\b[^>]+?>)', webpage, 'video player')
-        player_info = extract_attributes(player_element)
-        asset_id, country, realm = (player_info[x] for x in ('assetid', 'locale', 'realm', ))
-        endpoint = compat_urlparse.urlparse(player_info['endpoint']).hostname
-        source_type = player_info.get('sourcetype')
-        if source_type:
-            endpoint = '%s-%s' % (source_type, endpoint)
-        try:
-            return self._get_disco_api_info(url, asset_id, endpoint, realm, country)
-        except ExtractorError as e:
-            if getattr(e, 'message', '') == 'Missing deviceId in context':
-                self.report_drm(video_id)
-            raise
+        parent_slug, slug_a, slug_b = self._match_valid_url(url).group('parent_slug', 'slug_a', 'slug_b')
+        playlist_id = join_nonempty(parent_slug, slug_a, slug_b, delim='-')
+
+        query = {'environment': 'tele5', 'v': '2'}
+        if not slug_b:
+            endpoint = f'page/{slug_a}'
+            query['parent_slug'] = parent_slug
+        else:
+            endpoint = f'videos/{slug_b}'
+            query['filter[show.slug]'] = slug_a
+        cms_data = self._download_json(f'https://de-api.loma-cms.com/feloma/{endpoint}/', playlist_id, query=query)
+
+        return self.playlist_result(map(
+            functools.partial(self._get_disco_api_info, url, disco_host='eu1-prod.disco-api.com', realm='dmaxde', country='DE'),
+            traverse_obj(cms_data, ('blocks', ..., 'videoId', {str}))), playlist_id)
+
+    def _update_disco_api_headers(self, headers, disco_base, display_id, realm):
+        headers.update({
+            'x-disco-params': f'realm={realm}',
+            'x-disco-client': 'Alps:HyogaPlayer:0.0.0',
+            'Authorization': self._get_auth(disco_base, display_id, realm),
+        })
diff --git a/plugins/youtube_download/yt_dlp/extractor/telecaribe.py b/plugins/youtube_download/yt_dlp/extractor/telecaribe.py
index 91118a1..5391876 100644
--- a/plugins/youtube_download/yt_dlp/extractor/telecaribe.py
+++ b/plugins/youtube_download/yt_dlp/extractor/telecaribe.py
@@ -37,7 +37,7 @@ class TelecaribePlayIE(InfoExtractor):
         },
         'params': {
             'skip_download': 'Livestream',
-        }
+        },
     }, {
         'url': 'https://www.play.telecaribe.co/liveplus',
         'info_dict': {
diff --git a/plugins/youtube_download/yt_dlp/extractor/telecinco.py b/plugins/youtube_download/yt_dlp/extractor/telecinco.py
index 20bb824..a34f2af 100644
--- a/plugins/youtube_download/yt_dlp/extractor/telecinco.py
+++ b/plugins/youtube_download/yt_dlp/extractor/telecinco.py
@@ -2,15 +2,69 @@ import json
 import re
 
 from .common import InfoExtractor
+from ..networking.exceptions import HTTPError
 from ..utils import (
+    ExtractorError,
     clean_html,
     int_or_none,
+    join_nonempty,
     str_or_none,
-    try_get,
+    traverse_obj,
+    update_url,
+    url_or_none,
 )
 
 
-class TelecincoIE(InfoExtractor):
+class TelecincoBaseIE(InfoExtractor):
+    def _parse_content(self, content, url):
+        video_id = content['dataMediaId']
+        config = self._download_json(
+            content['dataConfig'], video_id, 'Downloading config JSON')
+        services = config['services']
+        caronte = self._download_json(services['caronte'], video_id)
+        if traverse_obj(caronte, ('dls', 0, 'drm', {bool})):
+            self.report_drm(video_id)
+
+        stream = caronte['dls'][0]['stream']
+        headers = {
+            'Referer': url,
+            'Origin': re.match(r'https?://[^/]+', url).group(0),
+        }
+        geo_headers = {**headers, **self.geo_verification_headers()}
+
+        try:
+            cdn = self._download_json(
+                caronte['cerbero'], video_id, data=json.dumps({
+                    'bbx': caronte['bbx'],
+                    'gbx': self._download_json(services['gbx'], video_id)['gbx'],
+                }).encode(), headers={
+                    'Content-Type': 'application/json',
+                    **geo_headers,
+                })['tokens']['1']['cdn']
+        except ExtractorError as error:
+            if isinstance(error.cause, HTTPError) and error.cause.status == 403:
+                error_code = traverse_obj(
+                    self._webpage_read_content(error.cause.response, caronte['cerbero'], video_id, fatal=False),
+                    ({json.loads}, 'code', {int}))
+                if error_code in (4038, 40313):
+                    self.raise_geo_restricted(countries=['ES'])
+            raise
+
+        formats = self._extract_m3u8_formats(
+            update_url(stream, query=cdn), video_id, 'mp4', m3u8_id='hls', headers=geo_headers)
+
+        return {
+            'id': video_id,
+            'title': traverse_obj(config, ('info', 'title', {str})),
+            'formats': formats,
+            'thumbnail': (traverse_obj(content, ('dataPoster', {url_or_none}))
+                          or traverse_obj(config, 'poster', 'imageUrl', expected_type=url_or_none)),
+            'duration': traverse_obj(content, ('dataDuration', {int_or_none})),
+            'http_headers': headers,
+        }
+
+
+class TelecincoIE(TelecincoBaseIE):
     IE_DESC = 'telecinco.es, cuatro.com and mediaset.es'
     _VALID_URL = r'https?://(?:www\.)?(?:telecinco\.es|cuatro\.com|mediaset\.es)/(?:[^/]+/)+(?P<id>.+?)\.html'
 
@@ -29,7 +83,8 @@ class TelecincoIE(InfoExtractor):
                 'title': 'Con Martín Berasategui, hacer un bacalao al pil-pil es fácil y divertido',
                 'duration': 662,
             },
-        }]
+        }],
+        'skip': 'HTTP Error 410 Gone',
     }, {
         'url': 'http://www.cuatro.com/deportes/futbol/barcelona/Leo_Messi-Champions-Roma_2_2052780128.html',
         'md5': 'c86fe0d99e3bdb46b7950d38bf6ef12a',
@@ -40,23 +95,24 @@ class TelecincoIE(InfoExtractor):
             'description': 'md5:a62ecb5f1934fc787107d7b9a2262805',
             'duration': 79,
         },
+        'skip': 'Redirects to main page',
     }, {
         'url': 'http://www.mediaset.es/12meses/campanas/doylacara/conlatratanohaytrato/Ayudame-dar-cara-trata-trato_2_1986630220.html',
-        'md5': 'eddb50291df704ce23c74821b995bcac',
+        'md5': '5ce057f43f30b634fbaf0f18c71a140a',
         'info_dict': {
             'id': 'aywerkD2Sv1vGNqq9b85Q2',
             'ext': 'mp4',
             'title': '#DOYLACARA. Con la trata no hay trato',
-            'description': 'md5:2771356ff7bfad9179c5f5cd954f1477',
             'duration': 50,
+            'thumbnail': 'https://album.mediaset.es/eimg/2017/11/02/1tlQLO5Q3mtKT24f3EaC24.jpg',
         },
     }, {
         # video in opening's content
         'url': 'https://www.telecinco.es/vivalavida/fiorella-sobrina-edmundo-arrocet-entrevista_18_2907195140.html',
         'info_dict': {
-            'id': '2907195140',
+            'id': '1691427',
             'title': 'La surrealista entrevista a la sobrina de Edmundo Arrocet: "No puedes venir aquí y tomarnos por tontos"',
-            'description': 'md5:73f340a7320143d37ab895375b2bf13a',
+            'description': r're:Fiorella, la sobrina de Edmundo Arrocet, concedió .{727}',
         },
         'playlist': [{
             'md5': 'adb28c37238b675dad0f042292f209a7',
@@ -65,6 +121,7 @@ class TelecincoIE(InfoExtractor):
                 'ext': 'mp4',
                 'title': 'La surrealista entrevista a la sobrina de Edmundo Arrocet: "No puedes venir aquí y tomarnos por tontos"',
                 'duration': 1015,
+                'thumbnail': 'https://album.mediaset.es/eimg/2020/02/29/5opaC37lUhKlZ7FoDhiVC.jpg',
             },
         }],
         'params': {
@@ -77,71 +134,33 @@ class TelecincoIE(InfoExtractor):
         'url': 'http://www.telecinco.es/espanasinirmaslejos/Espana-gran-destino-turistico_2_1240605043.html',
         'only_matching': True,
     }, {
-        # ooyala video
         'url': 'http://www.cuatro.com/chesterinlove/a-carta/chester-chester_in_love-chester_edu_2_2331030022.html',
         'only_matching': True,
     }]
 
-    def _parse_content(self, content, url):
-        video_id = content['dataMediaId']
-        config = self._download_json(
-            content['dataConfig'], video_id, 'Downloading config JSON')
-        title = config['info']['title']
-        services = config['services']
-        caronte = self._download_json(services['caronte'], video_id)
-        stream = caronte['dls'][0]['stream']
-        headers = self.geo_verification_headers()
-        headers.update({
-            'Content-Type': 'application/json;charset=UTF-8',
-            'Origin': re.match(r'https?://[^/]+', url).group(0),
-        })
-        cdn = self._download_json(
-            caronte['cerbero'], video_id, data=json.dumps({
-                'bbx': caronte['bbx'],
-                'gbx': self._download_json(services['gbx'], video_id)['gbx'],
-            }).encode(), headers=headers)['tokens']['1']['cdn']
-        formats = self._extract_m3u8_formats(
-            stream + '?' + cdn, video_id, 'mp4', 'm3u8_native', m3u8_id='hls')
-
-        return {
-            'id': video_id,
-            'title': title,
-            'formats': formats,
-            'thumbnail': content.get('dataPoster') or config.get('poster', {}).get('imageUrl'),
-            'duration': int_or_none(content.get('dataDuration')),
-        }
-
     def _real_extract(self, url):
         display_id = self._match_id(url)
         webpage = self._download_webpage(url, display_id)
-        article = self._parse_json(self._search_regex(
-            r'window\.\$REACTBASE_STATE\.article(?:_multisite)?\s*=\s*({.+})',
-            webpage, 'article'), display_id)['article']
-        title = article.get('title')
-        description = clean_html(article.get('leadParagraph')) or ''
+        article = self._search_json(
+            r'window\.\$REACTBASE_STATE\.article(?:_multisite)?\s*=',
+            webpage, 'article', display_id)['article']
+        description = traverse_obj(article, ('leadParagraph', {clean_html}, filter))
+
         if article.get('editorialType') != 'VID':
             entries = []
-            body = [article.get('opening')]
-            body.extend(try_get(article, lambda x: x['body'], list) or [])
-            for p in body:
-                if not isinstance(p, dict):
-                    continue
-                content = p.get('content')
-                if not content:
-                    continue
+
+            for p in traverse_obj(article, ((('opening', all), 'body'), lambda _, v: v['content'])):
+                content = p['content']
                 type_ = p.get('type')
-                if type_ == 'paragraph':
-                    content_str = str_or_none(content)
-                    if content_str:
-                        description += content_str
-                    continue
-                if type_ == 'video' and isinstance(content, dict):
+                if type_ == 'paragraph' and isinstance(content, str):
+                    description = join_nonempty(description, content, delim='')
+                elif type_ == 'video' and isinstance(content, dict):
                     entries.append(self._parse_content(content, url))
+
             return self.playlist_result(
-                entries, str_or_none(article.get('id')), title, description)
-        content = article['opening']['content']
-        info = self._parse_content(content, url)
-        info.update({
-            'description': description,
-        })
+                entries, str_or_none(article.get('id')),
+                traverse_obj(article, ('title', {str})), clean_html(description))
+
+        info = self._parse_content(article['opening']['content'], url)
+        info['description'] = description
         return info
diff --git a/plugins/youtube_download/yt_dlp/extractor/telegraaf.py b/plugins/youtube_download/yt_dlp/extractor/telegraaf.py
index 13e9515..c0bcdc2 100644
--- a/plugins/youtube_download/yt_dlp/extractor/telegraaf.py
+++ b/plugins/youtube_download/yt_dlp/extractor/telegraaf.py
@@ -40,11 +40,11 @@ class TelegraafIE(InfoExtractor):
       videoId
     }
   }
-}''' % article_id,
+}''' % article_id,  # noqa: UP031
             })['data']['article']['videos'][0]['videoId']
 
         item = self._download_json(
-            'https://content.tmgvideo.nl/playlist/item=%s/playlist.json' % video_id,
+            f'https://content.tmgvideo.nl/playlist/item={video_id}/playlist.json',
             video_id)['items'][0]
         title = item['title']
 
@@ -62,7 +62,7 @@ class TelegraafIE(InfoExtractor):
                 formats.extend(self._extract_mpd_formats(
                     manifest_url, video_id, mpd_id='dash', fatal=False))
             else:
-                self.report_warning('Unknown adaptive format %s' % ext)
+                self.report_warning(f'Unknown adaptive format {ext}')
         for location in locations.get('progressive', []):
             src = try_get(location, lambda x: x['sources'][0]['src'])
             if not src:
@@ -72,7 +72,7 @@ class TelegraafIE(InfoExtractor):
                 'url': src,
                 'width': int_or_none(location.get('width')),
                 'height': int_or_none(location.get('height')),
-                'format_id': 'http' + ('-%s' % label if label else ''),
+                'format_id': 'http' + (f'-{label}' if label else ''),
             })
 
         return {
diff --git a/plugins/youtube_download/yt_dlp/extractor/telegram.py b/plugins/youtube_download/yt_dlp/extractor/telegram.py
index 5ec5485..4ec8bcc 100644
--- a/plugins/youtube_download/yt_dlp/extractor/telegram.py
+++ b/plugins/youtube_download/yt_dlp/extractor/telegram.py
@@ -62,7 +62,7 @@ class TelegramEmbedIE(InfoExtractor):
         },
         'params': {
             'noplaylist': True,
-        }
+        },
     }, {
         # 2-video post with 'single' query param
         'url': 'https://t.me/vorposte/29342?single',
diff --git a/plugins/youtube_download/yt_dlp/extractor/telemb.py b/plugins/youtube_download/yt_dlp/extractor/telemb.py
index 3d29dac..6644648 100644
--- a/plugins/youtube_download/yt_dlp/extractor/telemb.py
+++ b/plugins/youtube_download/yt_dlp/extractor/telemb.py
@@ -5,6 +5,7 @@ from ..utils import remove_start
 
 
 class TeleMBIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?telemb\.be/(?P<display_id>.+?)_d_(?P<id>\d+)\.html'
     _TESTS = [
         {
@@ -17,7 +18,7 @@ class TeleMBIE(InfoExtractor):
                 'title': 'Mons - Cook with Danielle : des cours de cuisine en anglais ! - Les reportages',
                 'description': 'md5:bc5225f47b17c309761c856ad4776265',
                 'thumbnail': r're:^http://.*\.(?:jpg|png)$',
-            }
+            },
         },
         {
             # non-ASCII characters in download URL
@@ -30,7 +31,7 @@ class TeleMBIE(InfoExtractor):
                 'title': 'Havré - Incendie mortel - Les reportages',
                 'description': 'md5:5e54cb449acb029c2b7734e2d946bd4a',
                 'thumbnail': r're:^http://.*\.(?:jpg|png)$',
-            }
+            },
         },
     ]
 
@@ -45,7 +46,7 @@ class TeleMBIE(InfoExtractor):
         for video_url in re.findall(r'file\s*:\s*"([^"]+)"', webpage):
             fmt = {
                 'url': video_url,
-                'format_id': video_url.split(':')[0]
+                'format_id': video_url.split(':')[0],
             }
             rtmp = re.search(r'^(?P<url>rtmp://[^/]+/(?P<app>.+))/(?P<playpath>mp4:.+)$', video_url)
             if rtmp:
diff --git a/plugins/youtube_download/yt_dlp/extractor/telemundo.py b/plugins/youtube_download/yt_dlp/extractor/telemundo.py
index 54e74a6..7f4cecd 100644
--- a/plugins/youtube_download/yt_dlp/extractor/telemundo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/telemundo.py
@@ -4,7 +4,7 @@ from ..utils import try_get, unified_timestamp
 
 
 class TelemundoIE(InfoExtractor):
-
+    _WORKING = False
     _VALID_URL = r'https?:\/\/(?:www\.)?telemundo\.com\/.+?video\/[^\/]+(?P<id>tmvo\d{7})'
     _TESTS = [{
         'url': 'https://www.telemundo.com/noticias/noticias-telemundo-en-la-noche/empleo/video/esta-aplicacion-gratuita-esta-ayudando-los-latinos-encontrar-trabajo-en-estados-unidos-tmvo9829325',
@@ -19,7 +19,7 @@ class TelemundoIE(InfoExtractor):
         },
         'params': {
             'skip_download': True,
-        }
+        },
     }, {
         'url': 'https://www.telemundo.com/shows/al-rojo-vivo/empleo/video/personajes-de-times-square-piden-que-la-ciudad-de-nueva-york-los-deje-volver-trabajar-tmvo9816272',
         'only_matching': True,
@@ -46,5 +46,5 @@ class TelemundoIE(InfoExtractor):
             'formats': formats,
             'timestamp': date,
             'uploader': 'Telemundo',
-            'uploader_id': self._search_regex(r'https?:\/\/(?:[^/]+\/){3}video\/(?P<id>[^\/]+)', m3u8_url, 'Akamai account', fatal=False)
+            'uploader_id': self._search_regex(r'https?:\/\/(?:[^/]+\/){3}video\/(?P<id>[^\/]+)', m3u8_url, 'Akamai account', fatal=False),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/telequebec.py b/plugins/youtube_download/yt_dlp/extractor/telequebec.py
index e891372..7f5d5d2 100644
--- a/plugins/youtube_download/yt_dlp/extractor/telequebec.py
+++ b/plugins/youtube_download/yt_dlp/extractor/telequebec.py
@@ -1,5 +1,4 @@
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     int_or_none,
     smuggle_url,
@@ -72,7 +71,7 @@ class TeleQuebecIE(TeleQuebecBaseIE):
         product = media.get('product') or {}
         season = product.get('season') or {}
         info.update({
-            'description': try_get(media, lambda x: x['descriptions'][-1]['text'], compat_str),
+            'description': try_get(media, lambda x: x['descriptions'][-1]['text'], str),
             'series': try_get(season, lambda x: x['serie']['titre']),
             'season': season.get('name'),
             'season_number': int_or_none(season.get('seasonNo')),
@@ -83,7 +82,7 @@ class TeleQuebecIE(TeleQuebecBaseIE):
 
 
 class TeleQuebecSquatIE(InfoExtractor):
-    _VALID_URL = r'https://squat\.telequebec\.tv/videos/(?P<id>\d+)'
+    _VALID_URL = r'https?://squat\.telequebec\.tv/videos/(?P<id>\d+)'
     _TESTS = [{
         'url': 'https://squat.telequebec.tv/videos/9314',
         'info_dict': {
@@ -108,14 +107,14 @@ class TeleQuebecSquatIE(InfoExtractor):
         video_id = self._match_id(url)
 
         video = self._download_json(
-            'https://squat.api.telequebec.tv/v1/videos/%s' % video_id,
+            f'https://squat.api.telequebec.tv/v1/videos/{video_id}',
             video_id)
 
         media_id = video['sourceId']
 
         return {
             '_type': 'url_transparent',
-            'url': 'http://zonevideo.telequebec.tv/media/%s' % media_id,
+            'url': f'http://zonevideo.telequebec.tv/media/{media_id}',
             'ie_key': TeleQuebecIE.ie_key(),
             'id': media_id,
             'title': video.get('titre'),
diff --git a/plugins/youtube_download/yt_dlp/extractor/teletask.py b/plugins/youtube_download/yt_dlp/extractor/teletask.py
index a73dd68..050196c 100644
--- a/plugins/youtube_download/yt_dlp/extractor/teletask.py
+++ b/plugins/youtube_download/yt_dlp/extractor/teletask.py
@@ -5,6 +5,7 @@ from ..utils import unified_strdate
 
 
 class TeleTaskIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?tele-task\.de/archive/video/html5/(?P<id>[0-9]+)'
     _TEST = {
         'url': 'http://www.tele-task.de/archive/video/html5/26168/',
@@ -19,7 +20,7 @@ class TeleTaskIE(InfoExtractor):
                 'ext': 'mp4',
                 'title': 'Duplicate Detection',
                 'upload_date': '20141218',
-            }
+            },
         }, {
             'md5': 'e1e7218c5f0e4790015a437fcf6c71b4',
             'info_dict': {
@@ -27,8 +28,8 @@ class TeleTaskIE(InfoExtractor):
                 'ext': 'mp4',
                 'title': 'Duplicate Detection',
                 'upload_date': '20141218',
-            }
-        }]
+            },
+        }],
     }
 
     def _real_extract(self, url):
@@ -41,7 +42,7 @@ class TeleTaskIE(InfoExtractor):
             r'Date:</td><td>([^<]+)</td>', webpage, 'date', fatal=False))
 
         entries = [{
-            'id': '%s-%s' % (lecture_id, format_id),
+            'id': f'{lecture_id}-{format_id}',
             'url': video_url,
             'title': title,
             'upload_date': upload_date,
diff --git a/plugins/youtube_download/yt_dlp/extractor/telewebion.py b/plugins/youtube_download/yt_dlp/extractor/telewebion.py
index 550549f..02a6ea8 100644
--- a/plugins/youtube_download/yt_dlp/extractor/telewebion.py
+++ b/plugins/youtube_download/yt_dlp/extractor/telewebion.py
@@ -1,52 +1,134 @@
+from __future__ import annotations
+
+import functools
+import json
+import textwrap
+
 from .common import InfoExtractor
+from ..utils import ExtractorError, format_field, int_or_none, parse_iso8601
+from ..utils.traversal import traverse_obj
+
+
+def _fmt_url(url):
+    return format_field(template=url, default=None)
 
 
 class TelewebionIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?telewebion\.com/#!/episode/(?P<id>\d+)'
-
-    _TEST = {
-        'url': 'http://www.telewebion.com/#!/episode/1263668/',
+    _WORKING = False
+    _VALID_URL = r'https?://(?:www\.)?telewebion\.com/episode/(?P<id>(?:0x[a-fA-F\d]+|\d+))'
+    _TESTS = [{
+        'url': 'http://www.telewebion.com/episode/0x1b3139c/',
         'info_dict': {
-            'id': '1263668',
+            'id': '0x1b3139c',
             'ext': 'mp4',
-            'title': 'قرعه\u200cکشی لیگ قهرمانان اروپا',
-            'thumbnail': r're:^https?://.*\.jpg',
+            'title': 'قرعه‌کشی لیگ قهرمانان اروپا',
+            'series': '+ فوتبال',
+            'series_id': '0x1b2505c',
+            'channel': 'شبکه 3',
+            'channel_id': '0x1b1a761',
+            'channel_url': 'https://telewebion.com/live/tv3',
+            'timestamp': 1425522414,
+            'upload_date': '20150305',
+            'release_timestamp': 1425517020,
+            'release_date': '20150305',
+            'duration': 420,
             'view_count': int,
+            'tags': ['ورزشی', 'لیگ اروپا', 'اروپا'],
+            'thumbnail': 'https://static.telewebion.com/episodeImages/YjFhM2MxMDBkMDNiZTU0MjE5YjQ3ZDY0Mjk1ZDE0ZmUwZWU3OTE3OWRmMDAyODNhNzNkNjdmMWMzMWIyM2NmMA/default',
         },
-        'params': {
-            # m3u8 download
-            'skip_download': True,
+        'skip_download': 'm3u8',
+    }, {
+        'url': 'https://telewebion.com/episode/162175536',
+        'info_dict': {
+            'id': '0x9aa9a30',
+            'ext': 'mp4',
+            'title': 'کارما یعنی این !',
+            'series': 'پاورقی',
+            'series_id': '0x29a7426',
+            'channel': 'شبکه 2',
+            'channel_id': '0x1b1a719',
+            'channel_url': 'https://telewebion.com/live/tv2',
+            'timestamp': 1699979968,
+            'upload_date': '20231114',
+            'release_timestamp': 1699991638,
+            'release_date': '20231114',
+            'duration': 78,
+            'view_count': int,
+            'tags': ['کلیپ های منتخب', ' کلیپ طنز ', ' کلیپ سیاست ', 'پاورقی', 'ویژه فلسطین'],
+            'thumbnail': 'https://static.telewebion.com/episodeImages/871e9455-7567-49a5-9648-34c22c197f5f/default',
         },
-    }
+        'skip_download': 'm3u8',
+    }]
+
+    def _call_graphql_api(
+        self, operation, video_id, query,
+        variables: dict[str, tuple[str, str]] | None = None,
+        note='Downloading GraphQL JSON metadata',
+    ):
+        parameters = ''
+        if variables:
+            parameters = ', '.join(f'${name}: {type_}' for name, (type_, _) in variables.items())
+            parameters = f'({parameters})'
+
+        result = self._download_json('https://graph.telewebion.com/graphql', video_id, note, data=json.dumps({
+            'operationName': operation,
+            'query': f'query {operation}{parameters} @cacheControl(maxAge: 60) {{{query}\n}}\n',
+            'variables': {name: value for name, (_, value) in (variables or {}).items()},
+        }, separators=(',', ':')).encode(), headers={
+            'Content-Type': 'application/json',
+            'Accept': 'application/json',
+        })
+        if not result or traverse_obj(result, 'errors'):
+            message = ', '.join(traverse_obj(result, ('errors', ..., 'message', {str})))
+            raise ExtractorError(message or 'Unknown GraphQL API error')
+
+        return result['data']
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
+        if not video_id.startswith('0x'):
+            video_id = hex(int(video_id))
 
-        secure_token = self._download_webpage(
-            'http://m.s2.telewebion.com/op/op?action=getSecurityToken', video_id)
-        episode_details = self._download_json(
-            'http://m.s2.telewebion.com/op/op', video_id,
-            query={'action': 'getEpisodeDetails', 'episode_id': video_id})
+        episode_data = self._call_graphql_api('getEpisodeDetail', video_id, textwrap.dedent('''
+            queryEpisode(filter: {EpisodeID: $EpisodeId}, first: 1) {
+              title
+              program {
+                ProgramID
+                title
+              }
+              image
+              view_count
+              duration
+              started_at
+              created_at
+              channel {
+                ChannelID
+                name
+                descriptor
+              }
+              tags {
+                name
+              }
+            }
+        '''), {'EpisodeId': ('[ID!]', video_id)})
 
-        m3u8_url = 'http://m.s1.telewebion.com/smil/%s.m3u8?filepath=%s&m3u8=1&secure_token=%s' % (
-            video_id, episode_details['file_path'], secure_token)
-        formats = self._extract_m3u8_formats(
-            m3u8_url, video_id, ext='mp4', m3u8_id='hls')
-
-        picture_paths = [
-            episode_details.get('picture_path'),
-            episode_details.get('large_picture_path'),
-        ]
-
-        thumbnails = [{
-            'url': picture_path,
-            'preference': idx,
-        } for idx, picture_path in enumerate(picture_paths) if picture_path is not None]
-
-        return {
-            'id': video_id,
-            'title': episode_details['title'],
-            'formats': formats,
-            'thumbnails': thumbnails,
-            'view_count': episode_details.get('view_count'),
-        }
+        info_dict = traverse_obj(episode_data, ('queryEpisode', 0, {
+            'title': ('title', {str}),
+            'view_count': ('view_count', {int_or_none}),
+            'duration': ('duration', {int_or_none}),
+            'tags': ('tags', ..., 'name', {str}),
+            'release_timestamp': ('started_at', {parse_iso8601}),
+            'timestamp': ('created_at', {parse_iso8601}),
+            'series': ('program', 'title', {str}),
+            'series_id': ('program', 'ProgramID', {str}),
+            'channel': ('channel', 'name', {str}),
+            'channel_id': ('channel', 'ChannelID', {str}),
+            'channel_url': ('channel', 'descriptor', {_fmt_url('https://telewebion.com/live/%s')}),
+            'thumbnail': ('image', {_fmt_url('https://static.telewebion.com/episodeImages/%s/default')}),
+            'formats': (
+                'channel', 'descriptor', {str},
+                {_fmt_url(f'https://cdna.telewebion.com/%s/episode/{video_id}/playlist.m3u8')},
+                {functools.partial(self._extract_m3u8_formats, video_id=video_id, ext='mp4', m3u8_id='hls')}),
+        }))
+        info_dict['id'] = video_id
+        return info_dict
diff --git a/plugins/youtube_download/yt_dlp/extractor/tempo.py b/plugins/youtube_download/yt_dlp/extractor/tempo.py
index 9318d6f..4cd16f2 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tempo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tempo.py
@@ -5,7 +5,7 @@ from ..utils import (
     int_or_none,
     parse_iso8601,
     traverse_obj,
-    try_call
+    try_call,
 )
 
 
@@ -20,8 +20,8 @@ class IVXPlayerIE(InfoExtractor):
             'upload_date': '20221204',
             'title': 'Film Indonesia di Disney Content Showcase Asia Pacific 2022',
             'timestamp': 1670151746,
-            'thumbnail': 'https://ivx-image.ivideosmart.com/serve/image/video/2366065?width=300'
-        }
+            'thumbnail': 'https://ivx-image.ivideosmart.com/serve/image/video/2366065?width=300',
+        },
     }]
     _WEBPAGE_TESTS = [{
         'url': 'https://www.cantika.com/video/31737/film-indonesia-di-disney-content-showcase-asia-pacific-2022',
@@ -32,8 +32,8 @@ class IVXPlayerIE(InfoExtractor):
             'title': 'Serial Indonesia di Disney Content Showcase Asia Pacific 2022',
             'timestamp': 1670639416,
             'upload_date': '20221210',
-            'thumbnail': 'https://ivx-image.ivideosmart.com/serve/image/video/2374200?width=300'
-        }
+            'thumbnail': 'https://ivx-image.ivideosmart.com/serve/image/video/2374200?width=300',
+        },
     }, {
         'url': 'https://www.gooto.com/video/11437/wuling-suv-ramai-dikunjungi-di-giias-2018',
         'info_dict': {
@@ -44,8 +44,8 @@ class IVXPlayerIE(InfoExtractor):
             'description': 'md5:6d901483d0aacc664aecb4489719aafa',
             'duration': 75,
             'timestamp': 1534011263,
-            'thumbnail': 'https://ivx-image.ivideosmart.com/serve/image/video/892109?width=300'
-        }
+            'thumbnail': 'https://ivx-image.ivideosmart.com/serve/image/video/892109?width=300',
+        },
     }]
 
     @classmethod
@@ -56,7 +56,7 @@ class IVXPlayerIE(InfoExtractor):
             webpage)
         if mobj:
             yield f'ivxplayer:{mobj.group("video_id")}:{mobj.group("player_key")}'
-            raise cls.StopExtraction()
+            raise cls.StopExtraction
 
     def _real_extract(self, url):
         video_id, player_key = self._match_valid_url(url).group('video_id', 'player_key')
@@ -74,7 +74,7 @@ class IVXPlayerIE(InfoExtractor):
             'timestamp': parse_iso8601(traverse_obj(json_data, ('ivx', 'published_at'))),
             'formats': formats,
             'subtitles': subtitles,
-            'thumbnail': traverse_obj(json_data, ('ivx', 'thumbnail_url'))
+            'thumbnail': traverse_obj(json_data, ('ivx', 'thumbnail_url')),
         }
 
 
@@ -93,7 +93,7 @@ class TempoIE(InfoExtractor):
             'timestamp': 1658907970,
             'upload_date': '20220727',
             'tags': ['Anies Baswedan', ' PTUN', ' PTUN | Pengadilan Tata Usaha Negara', ' PTUN Batalkan UMP DKI', ' UMP DKI'],
-        }
+        },
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/tencent.py b/plugins/youtube_download/yt_dlp/extractor/tencent.py
index 6618ea4..b281ad1 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tencent.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tencent.py
@@ -1,4 +1,3 @@
-import functools
 import random
 import re
 import string
@@ -8,8 +7,8 @@ from .common import InfoExtractor
 from ..aes import aes_cbc_encrypt_bytes
 from ..utils import (
     ExtractorError,
-    float_or_none,
     determine_ext,
+    float_or_none,
     int_or_none,
     js_to_json,
     traverse_obj,
@@ -25,7 +24,7 @@ class TencentBaseIE(InfoExtractor):
         if api_response.get('code') != '0.0' and msg is not None:
             if msg in (
                 '您所在区域暂无此内容版权（如设置VPN请关闭后重试）',
-                'This content is not available in your area due to copyright restrictions. Please choose other videos.'
+                'This content is not available in your area due to copyright restrictions. Please choose other videos.',
             ):
                 self.raise_geo_restricted()
             raise ExtractorError(f'Tencent said: {msg}')
@@ -278,7 +277,7 @@ class VQQSeriesIE(VQQBaseIE):
             webpage)]
 
         return self.playlist_from_matches(
-            episode_paths, series_id, ie=VQQVideoIE, getter=functools.partial(urljoin, url),
+            episode_paths, series_id, ie=VQQVideoIE, getter=urljoin(url),
             title=self._get_clean_title(traverse_obj(webpage_metadata, ('coverInfo', 'title'))
                                         or self._og_search_title(webpage)),
             description=(traverse_obj(webpage_metadata, ('coverInfo', 'description'))
@@ -328,7 +327,7 @@ class WeTvBaseIE(TencentBaseIE):
                          or re.findall(r'<a[^>]+class="play-video__link"[^>]+href="(?P<path>[^"]+)', webpage))
 
         return self.playlist_from_matches(
-            episode_paths, series_id, ie=ie, getter=functools.partial(urljoin, url),
+            episode_paths, series_id, ie=ie, getter=urljoin(url),
             title=self._get_clean_title(traverse_obj(webpage_metadata, ('coverInfo', 'title'))
                                         or self._og_search_title(webpage)),
             description=(traverse_obj(webpage_metadata, ('coverInfo', 'description'))
diff --git a/plugins/youtube_download/yt_dlp/extractor/tennistv.py b/plugins/youtube_download/yt_dlp/extractor/tennistv.py
index c1b4a33..197d789 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tennistv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tennistv.py
@@ -47,7 +47,7 @@ class TennisTVIE(InfoExtractor):
     _HEADERS = {
         'origin': 'https://www.tennistv.com',
         'referer': 'https://www.tennistv.com/',
-        'content-Type': 'application/x-www-form-urlencoded'
+        'content-Type': 'application/x-www-form-urlencoded',
     }
 
     def _perform_login(self, username, password):
@@ -58,7 +58,7 @@ class TennisTVIE(InfoExtractor):
                 'redirect_uri': 'https://tennistv.com',
                 'response_mode': 'fragment',
                 'response_type': 'code',
-                'scope': 'openid'
+                'scope': 'openid',
             })
 
         post_url = self._html_search_regex(r'action=["\']([^"\']+?)["\']\s+method=["\']post["\']', login_page, 'login POST url')
@@ -67,7 +67,7 @@ class TennisTVIE(InfoExtractor):
             headers=self._HEADERS, data=urlencode_postdata({
                 'username': username,
                 'password': password,
-                'submitAction': 'Log In'
+                'submitAction': 'Log In',
             }))
         if 'Your username or password was incorrect' in temp_page:
             raise ExtractorError('Your username or password was incorrect', expected=True)
@@ -82,14 +82,14 @@ class TennisTVIE(InfoExtractor):
                 'response_type': 'code',
                 'scope': 'openid',
                 'nonce': random_uuidv4(),
-                'prompt': 'none'
+                'prompt': 'none',
             })
 
         self.get_token(None, {
             'code': urllib.parse.parse_qs(handle.url)['code'][-1],
             'grant_type': 'authorization_code',
             'client_id': 'tennis-tv-web',
-            'redirect_uri': 'https://www.tennistv.com/resources/v1.1.10/html/silent-check-sso.html'
+            'redirect_uri': 'https://www.tennistv.com/resources/v1.1.10/html/silent-check-sso.html',
         })
 
     def get_token(self, video_id, payload):
@@ -109,7 +109,7 @@ class TennisTVIE(InfoExtractor):
             self.raise_login_required()
         self.access_token, self.refresh_token = cookies['access_token'].value, cookies['refresh_token'].value
 
-    def _download_session_json(self, video_id, entryid,):
+    def _download_session_json(self, video_id, entryid):
         return self._download_json(
             f'https://atppayments.streamamg.com/api/v1/session/ksession/?lang=en&apijwttoken={self.access_token}&entryId={entryid}',
             video_id, 'Downloading ksession token', 'Failed to download ksession token', headers=self._HEADERS)
@@ -126,7 +126,7 @@ class TennisTVIE(InfoExtractor):
             self.get_token(video_id, {
                 'grant_type': 'refresh_token',
                 'refresh_token': self.refresh_token,
-                'client_id': 'tennis-tv-web'
+                'client_id': 'tennis-tv-web',
             })
             k_session = self._download_session_json(video_id, entryid).get('KSession')
             if k_session is None:
diff --git a/plugins/youtube_download/yt_dlp/extractor/tenplay.py b/plugins/youtube_download/yt_dlp/extractor/tenplay.py
index c7097cf..cc7bc3b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tenplay.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tenplay.py
@@ -1,30 +1,30 @@
-from datetime import datetime
-import base64
+import itertools
 
 from .common import InfoExtractor
 from ..networking import HEADRequest
-from ..utils import int_or_none, urlencode_postdata
+from ..utils import int_or_none, traverse_obj, url_or_none, urljoin
 
 
 class TenPlayIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?10play\.com\.au/(?:[^/]+/)+(?P<id>tpv\d{6}[a-z]{5})'
     _NETRC_MACHINE = '10play'
     _TESTS = [{
-        'url': 'https://10play.com.au/neighbours/web-extras/season-39/nathan-borg-is-the-first-aussie-actor-with-a-cochlear-implant-to-join-neighbours/tpv210128qupwd',
+        'url': 'https://10play.com.au/neighbours/web-extras/season-41/heres-a-first-look-at-mischa-bartons-neighbours-debut/tpv230911hyxnz',
         'info_dict': {
-            'id': '6226844312001',
+            'id': '6336940246112',
             'ext': 'mp4',
-            'title': 'Nathan Borg Is The First Aussie Actor With A Cochlear Implant To Join Neighbours',
-            'alt_title': 'Nathan Borg Is The First Aussie Actor With A Cochlear Implant To Join Neighbours',
-            'description': 'md5:a02d0199c901c2dd4c796f1e7dd0de43',
-            'duration': 186,
-            'season': 39,
+            'title': 'Here\'s A First Look At Mischa Barton\'s Neighbours Debut',
+            'alt_title': 'Here\'s A First Look At Mischa Barton\'s Neighbours Debut',
+            'description': 'Neighbours Premieres Monday, September 18 At 4:30pm On 10 And 10 Play And 6:30pm On 10 Peach',
+            'duration': 74,
+            'season': 'Season 41',
+            'season_number': 41,
             'series': 'Neighbours',
             'thumbnail': r're:https://.*\.jpg',
             'uploader': 'Channel 10',
             'age_limit': 15,
-            'timestamp': 1611810000,
-            'upload_date': '20210128',
+            'timestamp': 1694386800,
+            'upload_date': '20230910',
             'uploader_id': '2199827728001',
         },
         'params': {
@@ -32,21 +32,30 @@ class TenPlayIE(InfoExtractor):
         },
         'skip': 'Only available in Australia',
     }, {
-        'url': 'https://10play.com.au/todd-sampsons-body-hack/episodes/season-4/episode-7/tpv200921kvngh',
+        'url': 'https://10play.com.au/neighbours/episodes/season-42/episode-9107/tpv240902nzqyp',
         'info_dict': {
-            'id': '6192880312001',
+            'id': '9000000000091177',
             'ext': 'mp4',
-            'title': "Todd Sampson's Body Hack - S4 Ep. 2",
-            'description': 'md5:fa278820ad90f08ea187f9458316ac74',
+            'title': 'Neighbours - S42 Ep. 9107',
+            'alt_title': 'Thu 05 Sep',
+            'description': 'md5:37a1f4271be34b9ee2b533426a5fbaef',
+            'duration': 1388,
+            'episode': 'Episode 9107',
+            'episode_number': 9107,
+            'season': 'Season 42',
+            'season_number': 42,
+            'series': 'Neighbours',
+            'thumbnail': r're:https://.*\.jpg',
             'age_limit': 15,
-            'timestamp': 1600770600,
-            'upload_date': '20200922',
+            'timestamp': 1725517860,
+            'upload_date': '20240905',
             'uploader': 'Channel 10',
-            'uploader_id': '2199827728001'
+            'uploader_id': '2199827728001',
         },
         'params': {
             'skip_download': True,
-        }
+        },
+        'skip': 'Only available in Australia',
     }, {
         'url': 'https://10play.com.au/how-to-stay-married/web-extras/season-1/terrys-talks-ep-1-embracing-change/tpv190915ylupc',
         'only_matching': True,
@@ -60,56 +69,95 @@ class TenPlayIE(InfoExtractor):
         'MA': 15,
         'MA15+': 15,
         'R': 18,
-        'X': 18
+        'X': 18,
     }
 
-    def _get_bearer_token(self, video_id):
-        username, password = self._get_login_info()
-        if username is None or password is None:
-            self.raise_login_required('Your 10play account\'s details must be provided with --username and --password.')
-        _timestamp = datetime.now().strftime('%Y%m%d000000')
-        _auth_header = base64.b64encode(_timestamp.encode('ascii')).decode('ascii')
-        data = self._download_json('https://10play.com.au/api/user/auth', video_id, 'Getting bearer token', headers={
-            'X-Network-Ten-Auth': _auth_header,
-        }, data=urlencode_postdata({
-            'email': username,
-            'password': password,
-        }))
-        return 'Bearer ' + data['jwt']['accessToken']
-
     def _real_extract(self, url):
         content_id = self._match_id(url)
         data = self._download_json(
             'https://10play.com.au/api/v1/videos/' + content_id, content_id)
-        headers = {}
 
-        if data.get('memberGated') is True:
-            _token = self._get_bearer_token(content_id)
-            headers = {'Authorization': _token}
-
-        _video_url = self._download_json(
-            data.get('playbackApiEndpoint'), content_id, 'Downloading video JSON',
-            headers=headers).get('source')
-        m3u8_url = self._request_webpage(HEADRequest(
-            _video_url), content_id).url
+        video_data = self._download_json(
+            f'https://vod.ten.com.au/api/videos/bcquery?command=find_videos_by_id&video_id={data["altId"]}',
+            content_id, 'Downloading video JSON')
+        m3u8_url = self._request_webpage(
+            HEADRequest(video_data['items'][0]['HLSURL']),
+            content_id, 'Checking stream URL').url
         if '10play-not-in-oz' in m3u8_url:
             self.raise_geo_restricted(countries=['AU'])
+        # Attempt to get a higher quality stream
+        m3u8_url = m3u8_url.replace(',150,75,55,0000', ',300,150,75,55,0000')
         formats = self._extract_m3u8_formats(m3u8_url, content_id, 'mp4')
 
         return {
+            'id': content_id,
             'formats': formats,
-            'subtitles': {'en': [{'url': data.get('captionUrl')}]} if data.get('captionUrl') else None,
-            'id': data.get('altId') or content_id,
-            'duration': data.get('duration'),
-            'title': data.get('subtitle'),
-            'alt_title': data.get('title'),
-            'description': data.get('description'),
-            'age_limit': self._AUS_AGES.get(data.get('classification')),
-            'series': data.get('tvShow'),
-            'season': int_or_none(data.get('season')),
-            'episode_number': int_or_none(data.get('episode')),
-            'timestamp': data.get('published'),
-            'thumbnail': data.get('imageUrl'),
+            'subtitles': {'en': [{'url': data['captionUrl']}]} if url_or_none(data.get('captionUrl')) else None,
             'uploader': 'Channel 10',
             'uploader_id': '2199827728001',
+            **traverse_obj(data, {
+                'id': ('altId', {str}),
+                'duration': ('duration', {int_or_none}),
+                'title': ('subtitle', {str}),
+                'alt_title': ('title', {str}),
+                'description': ('description', {str}),
+                'age_limit': ('classification', {self._AUS_AGES.get}),
+                'series': ('tvShow', {str}),
+                'season_number': ('season', {int_or_none}),
+                'episode_number': ('episode', {int_or_none}),
+                'timestamp': ('published', {int_or_none}),
+                'thumbnail': ('imageUrl', {url_or_none}),
+            }),
         }
+
+
+class TenPlaySeasonIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?10play\.com\.au/(?P<show>[^/?#]+)/episodes/(?P<season>[^/?#]+)/?(?:$|[?#])'
+    _TESTS = [{
+        'url': 'https://10play.com.au/masterchef/episodes/season-14',
+        'info_dict': {
+            'title': 'Season 14',
+            'id': 'MjMyOTIy',
+        },
+        'playlist_mincount': 64,
+    }, {
+        'url': 'https://10play.com.au/the-bold-and-the-beautiful-fast-tracked/episodes/season-2022',
+        'info_dict': {
+            'title': 'Season 2022',
+            'id': 'Mjc0OTIw',
+        },
+        'playlist_mincount': 256,
+    }]
+
+    def _entries(self, load_more_url, display_id=None):
+        skip_ids = []
+        for page in itertools.count(1):
+            episodes_carousel = self._download_json(
+                load_more_url, display_id, query={'skipIds[]': skip_ids},
+                note=f'Fetching episodes page {page}')
+
+            episodes_chunk = episodes_carousel['items']
+            skip_ids.extend(ep['id'] for ep in episodes_chunk)
+
+            for ep in episodes_chunk:
+                yield ep['cardLink']
+            if not episodes_carousel['hasMore']:
+                break
+
+    def _real_extract(self, url):
+        show, season = self._match_valid_url(url).group('show', 'season')
+        season_info = self._download_json(
+            f'https://10play.com.au/api/shows/{show}/episodes/{season}', f'{show}/{season}')
+
+        episodes_carousel = traverse_obj(season_info, (
+            'content', 0, 'components', (
+                lambda _, v: v['title'].lower() == 'episodes',
+                (..., {dict}),
+            )), get_all=False) or {}
+
+        playlist_id = episodes_carousel['tpId']
+
+        return self.playlist_from_matches(
+            self._entries(urljoin(url, episodes_carousel['loadMoreUrl']), playlist_id),
+            playlist_id, traverse_obj(season_info, ('content', 0, 'title', {str})),
+            getter=urljoin(url))
diff --git a/plugins/youtube_download/yt_dlp/extractor/testurl.py b/plugins/youtube_download/yt_dlp/extractor/testurl.py
index 3cf0017..31e3c4d 100644
--- a/plugins/youtube_download/yt_dlp/extractor/testurl.py
+++ b/plugins/youtube_download/yt_dlp/extractor/testurl.py
@@ -30,7 +30,7 @@ class TestURLIE(InfoExtractor):
             ), None)
             if not extractor:
                 raise ExtractorError(
-                    'Found multiple matching extractors: %s' % ' '.join(ie.IE_NAME for ie in matching_extractors),
+                    'Found multiple matching extractors: {}'.format(' '.join(ie.IE_NAME for ie in matching_extractors)),
                     expected=True)
         else:
             extractor = matching_extractors[0]
diff --git a/plugins/youtube_download/yt_dlp/extractor/tf1.py b/plugins/youtube_download/yt_dlp/extractor/tf1.py
index 4cf0322..5bade3a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tf1.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tf1.py
@@ -27,6 +27,25 @@ class TF1IE(InfoExtractor):
             # Sometimes wat serves the whole file with the --test option
             'skip_download': True,
         },
+    }, {
+        'url': 'https://www.tf1.fr/tmc/burger-quiz/videos/burger-quiz-du-19-aout-2023-s03-episode-21-85585666.html',
+        'info_dict': {
+            'id': '14010600',
+            'ext': 'mp4',
+            'title': 'Burger Quiz - S03 EP21 avec Eye Haidara, Anne Depétrini, Jonathan Zaccaï et Pio Marmaï',
+            'thumbnail': 'https://photos.tf1.fr/1280/720/burger-quiz-11-9adb79-0@1x.jpg',
+            'description': 'Manu Payet recevra Eye Haidara, Anne Depétrini, Jonathan Zaccaï et Pio Marmaï.',
+            'upload_date': '20230819',
+            'timestamp': 1692469471,
+            'season_number': 3,
+            'series': 'Burger Quiz',
+            'episode_number': 21,
+            'season': 'Season 3',
+            'tags': 'count:13',
+            'episode': 'Episode 21',
+            'duration': 2312,
+        },
+        'params': {'skip_download': 'm3u8'},
     }, {
         'url': 'http://www.tf1.fr/tf1/koh-lanta/videos/replay-koh-lanta-22-mai-2015.html',
         'only_matching': True,
@@ -43,7 +62,7 @@ class TF1IE(InfoExtractor):
                 'variables': json.dumps({
                     'programSlug': program_slug,
                     'slug': slug,
-                })
+                }),
             })['data']['videoBySlug']
         wat_id = video['streamId']
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/tfo.py b/plugins/youtube_download/yt_dlp/extractor/tfo.py
index d417f50..0d1b252 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tfo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tfo.py
@@ -16,7 +16,7 @@ class TFOIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'Video Game Hackathon',
             'description': 'md5:558afeba217c6c8d96c60e5421795c07',
-        }
+        },
     }
 
     def _real_extract(self, url):
@@ -31,7 +31,7 @@ class TFOIE(InfoExtractor):
         if infos.get('success') == 0:
             if infos.get('code') == 'ErrGeoBlocked':
                 self.raise_geo_restricted(countries=self._GEO_COUNTRIES)
-            raise ExtractorError('%s said: %s' % (self.IE_NAME, clean_html(infos['msg'])), expected=True)
+            raise ExtractorError('{} said: {}'.format(self.IE_NAME, clean_html(infos['msg'])), expected=True)
         video_data = infos['data']
 
         return {
diff --git a/plugins/youtube_download/yt_dlp/extractor/theguardian.py b/plugins/youtube_download/yt_dlp/extractor/theguardian.py
new file mode 100644
index 0000000..7e8f9fe
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/theguardian.py
@@ -0,0 +1,134 @@
+import itertools
+
+from .common import InfoExtractor
+from ..utils import (
+    clean_html,
+    extract_attributes,
+    get_element_by_class,
+    get_element_html_by_class,
+    get_elements_html_by_class,
+    parse_qs,
+    traverse_obj,
+    unified_strdate,
+    urljoin,
+)
+
+
+class TheGuardianPodcastIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?theguardian\.com/\w+/audio/\d{4}/\w{3}/\d{1,2}/(?P<id>[\w-]+)'
+    _TESTS = [{
+        'url': 'https://www.theguardian.com/news/audio/2023/nov/03/we-are-just-getting-started-the-plastic-eating-bacteria-that-could-change-the-world-podcast',
+        'md5': 'd1771744681789b4cd7da2a08e487702',
+        'info_dict': {
+            'id': 'we-are-just-getting-started-the-plastic-eating-bacteria-that-could-change-the-world-podcast',
+            'ext': 'mp3',
+            'title': '‘We are just getting started’: the plastic-eating bacteria that could change the world – podcast',
+            'description': 'md5:cfd3df2791d394d2ab62cd571d5207ee',
+            'creator': 'Stephen Buranyi',
+            'thumbnail': 'md5:73c12558fcb3b0e2a59422bfb33b3f79',
+            'release_date': '20231103',
+        },
+    }, {
+        'url': 'https://www.theguardian.com/news/audio/2023/oct/30/the-trials-of-robert-habeck-is-the-worlds-most-powerful-green-politician-doomed-to-fail-podcast',
+        'md5': 'd1771744681789b4cd7da2a08e487702',
+        'info_dict': {
+            'id': 'the-trials-of-robert-habeck-is-the-worlds-most-powerful-green-politician-doomed-to-fail-podcast',
+            'ext': 'mp3',
+            'title': 'The trials of Robert Habeck: is the world’s most powerful green politician doomed to fail? – podcast',
+            'description': 'md5:1b5cf6582d1771c6b7077784b5456994',
+            'creator': 'Philip Oltermann',
+            'thumbnail': 'md5:6e5c5ec43843e956e20be793722e9080',
+            'release_date': '20231030',
+        },
+    }, {
+        'url': 'https://www.theguardian.com/football/audio/2023/nov/06/arsenal-feel-hard-done-by-and-luton-hold-liverpool-football-weekly',
+        'md5': 'a2fcff6f8e060a95b1483295273dc35e',
+        'info_dict': {
+            'id': 'arsenal-feel-hard-done-by-and-luton-hold-liverpool-football-weekly',
+            'ext': 'mp3',
+            'title': 'Arsenal feel hard done by and Luton hold Liverpool – Football Weekly',
+            'description': 'md5:286a9fbddaeb7c83cc65d1c4a5330b2a',
+            'creator': 'Max Rushden',
+            'thumbnail': 'md5:93eb7d6440f1bb94eb3a6cad63f48afd',
+            'release_date': '20231106',
+        },
+    }, {
+        'url': 'https://www.theguardian.com/politics/audio/2023/nov/02/the-covid-inquiry-politics-weekly-uk-podcast',
+        'md5': '06a0f7e9701a80c8064a5d35690481ec',
+        'info_dict': {
+            'id': 'the-covid-inquiry-politics-weekly-uk-podcast',
+            'ext': 'mp3',
+            'title': 'The Covid inquiry | Politics Weekly UK - podcast',
+            'description': 'md5:207c98859c14903582b17d25b014046e',
+            'creator': 'Gaby Hinsliff',
+            'thumbnail': 'md5:28932a7b5a25b057be330d2ed70ea7f3',
+            'release_date': '20231102',
+        },
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+        return {
+            'id': video_id,
+            'title': self._og_search_title(webpage) or get_element_by_class('content__headline', webpage),
+            'description': self._og_search_description(webpage),
+            'creator': self._html_search_meta('author', webpage),
+            'thumbnail': self._og_search_thumbnail(webpage),
+            'release_date': unified_strdate(self._html_search_meta('article:published_time', webpage)),
+            'url': extract_attributes(get_element_html_by_class(
+                'podcast__player', webpage) or '').get('data-source'),
+        }
+
+
+class TheGuardianPodcastPlaylistIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?theguardian\.com/\w+/series/(?P<id>[\w-]+)(?:\?page=\d+)?'
+    _TESTS = [{
+        'url': 'https://www.theguardian.com/football/series/theguardianswomensfootballweekly',
+        'info_dict': {
+            'id': 'theguardianswomensfootballweekly',
+            'title': "The Guardian's Women's Football Weekly",
+            'description': 'md5:e2cc021311e582d29935a73614a43f51',
+        },
+        'playlist_mincount': 69,
+    }, {
+        'url': 'https://www.theguardian.com/news/series/todayinfocus?page=2',
+        'info_dict': {
+            'id': 'todayinfocus',
+            'title': 'Today in Focus',
+            'description': 'md5:0f097764fc0d359e0b6eb537be0387e2',
+        },
+        'playlist_mincount': 1261,
+    }, {
+        'url': 'https://www.theguardian.com/news/series/the-audio-long-read',
+        'info_dict': {
+            'id': 'the-audio-long-read',
+            'title': 'The Audio Long Read',
+            'description': 'md5:5462994a27527309562b25b6defc4ef3',
+        },
+        'playlist_mincount': 996,
+    }]
+
+    def _entries(self, url, playlist_id):
+        for page in itertools.count(1):
+            webpage, urlh = self._download_webpage_handle(
+                url, playlist_id, f'Downloading page {page}', query={'page': page})
+            if 'page' not in parse_qs(urlh.url):
+                break
+
+            episodes = get_elements_html_by_class('fc-item--type-media', webpage)
+            yield from traverse_obj(episodes, (..., {extract_attributes}, 'data-id'))
+
+    def _real_extract(self, url):
+        podcast_id = self._match_id(url)
+
+        webpage = self._download_webpage(url, podcast_id)
+
+        title = clean_html(get_element_by_class(
+            'index-page-header__title', webpage) or get_element_by_class('flagship-audio__title', webpage))
+        description = self._og_search_description(webpage) or self._html_search_meta(
+            'description', webpage)
+
+        return self.playlist_from_matches(
+            self._entries(url, podcast_id), podcast_id, title, description=description,
+            ie=TheGuardianPodcastIE, getter=urljoin('https://www.theguardian.com'))
diff --git a/plugins/youtube_download/yt_dlp/extractor/theholetv.py b/plugins/youtube_download/yt_dlp/extractor/theholetv.py
index a13f83b..a3a7024 100644
--- a/plugins/youtube_download/yt_dlp/extractor/theholetv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/theholetv.py
@@ -12,8 +12,8 @@ class TheHoleTvIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'Сергей Орлов — Громкий вопрос',
             'thumbnail': 'https://assets-cdn.the-hole.tv/images/t8gan4n6zn627e7wni11b2uemqts',
-            'description': 'md5:45741a9202331f995d9fb76996759379'
-        }
+            'description': 'md5:45741a9202331f995d9fb76996759379',
+        },
     }]
 
     def _real_extract(self, url):
@@ -31,5 +31,5 @@ class TheHoleTvIE(InfoExtractor):
             'description': self._og_search_description(webpage),
             'thumbnail': player_attrs.get('data-player-poster-value'),
             'formats': formats,
-            'subtitles': subtitles
+            'subtitles': subtitles,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/theintercept.py b/plugins/youtube_download/yt_dlp/extractor/theintercept.py
index a991a4d..dcdca8f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/theintercept.py
+++ b/plugins/youtube_download/yt_dlp/extractor/theintercept.py
@@ -1,9 +1,8 @@
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
-    parse_iso8601,
-    int_or_none,
     ExtractorError,
+    int_or_none,
+    parse_iso8601,
 )
 
 
@@ -20,7 +19,7 @@ class TheInterceptIE(InfoExtractor):
             'timestamp': 1450429239,
             'upload_date': '20151218',
             'comment_count': int,
-        }
+        },
     }]
 
     def _real_extract(self, url):
@@ -35,8 +34,8 @@ class TheInterceptIE(InfoExtractor):
             if post['slug'] == display_id:
                 return {
                     '_type': 'url_transparent',
-                    'url': 'jwplatform:%s' % post['fov_videoid'],
-                    'id': compat_str(post['ID']),
+                    'url': 'jwplatform:{}'.format(post['fov_videoid']),
+                    'id': str(post['ID']),
                     'display_id': display_id,
                     'title': post['title'],
                     'description': post.get('excerpt'),
diff --git a/plugins/youtube_download/yt_dlp/extractor/theplatform.py b/plugins/youtube_download/yt_dlp/extractor/theplatform.py
index 99caeb5..b73bea1 100644
--- a/plugins/youtube_download/yt_dlp/extractor/theplatform.py
+++ b/plugins/youtube_download/yt_dlp/extractor/theplatform.py
@@ -1,29 +1,26 @@
+import hashlib
+import hmac
 import re
 import time
-import hmac
-import binascii
-import hashlib
 
-
-from .once import OnceIE
 from .adobepass import AdobePassIE
-from ..networking import Request
+from .once import OnceIE
+from ..networking import HEADRequest, Request
 from ..utils import (
-    determine_ext,
     ExtractorError,
+    determine_ext,
+    find_xpath_attr,
     float_or_none,
     int_or_none,
-    parse_qs,
-    unsmuggle_url,
-    update_url_query,
-    xpath_with_ns,
     mimetype2ext,
-    find_xpath_attr,
+    parse_qs,
     traverse_obj,
+    unsmuggle_url,
     update_url,
+    update_url_query,
     urlhandle_detect_ext,
+    xpath_with_ns,
 )
-from ..networking import HEADRequest
 
 default_ns = 'http://www.w3.org/2005/SMIL21/Language'
 _x = lambda p: xpath_with_ns(p, {'smil': default_ns})
@@ -44,8 +41,7 @@ class ThePlatformBaseIE(OnceIE):
                 if exception.get('value') == 'GeoLocationBlocked':
                     self.raise_geo_restricted(error_element.attrib['abstract'])
                 elif error_element.attrib['src'].startswith(
-                        'http://link.theplatform.%s/s/errorFiles/Unavailable.'
-                        % self._TP_TLD):
+                        f'http://link.theplatform.{self._TP_TLD}/s/errorFiles/Unavailable.'):
                     raise ExtractorError(
                         error_element.attrib['abstract'], expected=True)
 
@@ -72,7 +68,7 @@ class ThePlatformBaseIE(OnceIE):
         return formats, subtitles
 
     def _download_theplatform_metadata(self, path, video_id):
-        info_url = 'http://link.theplatform.%s/s/%s?format=preview' % (self._TP_TLD, path)
+        info_url = f'http://link.theplatform.{self._TP_TLD}/s/{path}?format=preview'
         return self._download_json(info_url, video_id)
 
     def _parse_theplatform_metadata(self, info):
@@ -104,6 +100,10 @@ class ThePlatformBaseIE(OnceIE):
                 _add_chapter(chapter.get('startTime'), chapter.get('endTime'))
             _add_chapter(tp_chapters[-1].get('startTime'), tp_chapters[-1].get('endTime') or duration)
 
+        def extract_site_specific_field(field):
+            # A number of sites have custom-prefixed keys, e.g. 'cbc$seasonNumber'
+            return traverse_obj(info, lambda k, v: v and k.endswith(f'${field}'), get_all=False)
+
         return {
             'title': info['title'],
             'subtitles': subtitles,
@@ -113,6 +113,15 @@ class ThePlatformBaseIE(OnceIE):
             'timestamp': int_or_none(info.get('pubDate'), 1000) or None,
             'uploader': info.get('billingCode'),
             'chapters': chapters,
+            'creator': traverse_obj(info, ('author', {str})) or None,
+            'categories': traverse_obj(info, (
+                'categories', lambda _, v: v.get('label') in ('category', None), 'name', {str})) or None,
+            'tags': traverse_obj(info, ('keywords', {lambda x: re.split(r'[;,]\s?', x) if x else None})),
+            'location': extract_site_specific_field('region'),
+            'series': extract_site_specific_field('show') or extract_site_specific_field('seriesTitle'),
+            'season_number': int_or_none(extract_site_specific_field('seasonNumber')),
+            'episode_number': int_or_none(extract_site_specific_field('episodeNumber')),
+            'media_type': extract_site_specific_field('programmingType') or extract_site_specific_field('type'),
         }
 
     def _extract_theplatform_metadata(self, path, video_id):
@@ -130,7 +139,7 @@ class ThePlatformIE(ThePlatformBaseIE, AdobePassIE):
             <meta\s+
                 property=(["'])(?:og:video(?::(?:secure_)?url)?|twitter:player)\1\s+
                 content=(["'])(?P<url>https?://player\.theplatform\.com/p/.+?)\2''',
-        r'(?s)<(?:iframe|script)[^>]+src=(["\'])(?P<url>(?:https?:)?//player\.theplatform\.com/p/.+?)\1'
+        r'(?s)<(?:iframe|script)[^>]+src=(["\'])(?P<url>(?:https?:)?//player\.theplatform\.com/p/.+?)\1',
     ]
 
     _TESTS = [{
@@ -167,7 +176,7 @@ class ThePlatformIE(ThePlatformBaseIE, AdobePassIE):
             # rtmp download
             'skip_download': True,
         },
-        'skip': '404 Not Found',
+        'skip': 'CNet no longer uses ThePlatform',
     }, {
         'url': 'https://player.theplatform.com/p/D6x-PC/pulse_preview/embed/select/media/yMBg9E8KFxZD',
         'info_dict': {
@@ -177,7 +186,7 @@ class ThePlatformIE(ThePlatformBaseIE, AdobePassIE):
             'title': 'HIGHLIGHTS: USA bag first ever series Cup win',
             'uploader': 'EGSM',
         },
-        'skip': '404 Not Found',
+        'skip': 'Dead link',
     }, {
         'url': 'http://player.theplatform.com/p/NnzsPC/widget/select/media/4Y0TlYUr_ZT7',
         'only_matching': True,
@@ -195,7 +204,7 @@ class ThePlatformIE(ThePlatformBaseIE, AdobePassIE):
             'upload_date': '20150701',
             'uploader': 'NBCU-NEWS',
         },
-        'skip': '404 Not Found',
+        'skip': 'Error: Player PID "nbcNewsOffsite" is disabled',
     }, {
         # From http://www.nbc.com/the-blacklist/video/sir-crispin-crandall/2928790?onid=137781#vc137781=1
         # geo-restricted (US), HLS encrypted with AES-128
@@ -215,17 +224,14 @@ class ThePlatformIE(ThePlatformBaseIE, AdobePassIE):
         flags = '10' if include_qs else '00'
         expiration_date = '%x' % (int(time.time()) + life)
 
-        def str_to_hex(str):
-            return binascii.b2a_hex(str.encode('ascii')).decode('ascii')
-
-        def hex_to_bytes(hex):
-            return binascii.a2b_hex(hex.encode('ascii'))
+        def str_to_hex(str_data):
+            return str_data.encode('ascii').hex()
 
         relative_path = re.match(r'https?://link\.theplatform\.com/s/([^?]+)', url).group(1)
-        clear_text = hex_to_bytes(flags + expiration_date + str_to_hex(relative_path))
+        clear_text = bytes.fromhex(flags + expiration_date + str_to_hex(relative_path))
         checksum = hmac.new(sig_key.encode('ascii'), clear_text, hashlib.sha1).hexdigest()
         sig = flags + expiration_date + checksum + str_to_hex(sig_secret)
-        return '%s&sig=%s' % (url, sig)
+        return f'{url}&sig={sig}'
 
     def _real_extract(self, url):
         url, smuggled_data = unsmuggle_url(url, {})
@@ -264,7 +270,7 @@ class ThePlatformIE(ThePlatformBaseIE, AdobePassIE):
                     break
             if feed_id is None:
                 raise ExtractorError('Unable to find feed id')
-            return self.url_result('http://feed.theplatform.com/f/%s/%s?byGuid=%s' % (
+            return self.url_result('http://feed.theplatform.com/f/{}/{}?byGuid={}'.format(
                 provider_id, feed_id, qs_dict['guid'][0]))
 
         if smuggled_data.get('force_smil_url', False):
@@ -288,13 +294,10 @@ class ThePlatformIE(ThePlatformBaseIE, AdobePassIE):
             config_url = config_url.replace('swf/', 'config/')
             config_url = config_url.replace('onsite/', 'onsite/config/')
             config = self._download_json(config_url, video_id, 'Downloading config')
-            if 'releaseUrl' in config:
-                release_url = config['releaseUrl']
-            else:
-                release_url = 'http://link.theplatform.com/s/%s?mbr=true' % path
+            release_url = config.get('releaseUrl') or f'http://link.theplatform.com/s/{path}?mbr=true'
             smil_url = release_url + '&formats=MPEG4&manifest=f4m'
         else:
-            smil_url = 'http://link.theplatform.com/s/%s?mbr=true' % path
+            smil_url = f'http://link.theplatform.com/s/{path}?mbr=true'
 
         sig = smuggled_data.get('sig')
         if sig:
@@ -377,7 +380,7 @@ class ThePlatformFeedIE(ThePlatformBaseIE):
                 if asset_type in asset_types_query:
                     query.update(asset_types_query[asset_type])
                 cur_formats, cur_subtitles = self._extract_theplatform_smil(update_url_query(
-                    main_smil_url or smil_url, query), video_id, 'Downloading SMIL data for %s' % asset_type)
+                    main_smil_url or smil_url, query), video_id, f'Downloading SMIL data for {asset_type}')
                 formats.extend(cur_formats)
                 subtitles = self._merge_subtitles(subtitles, cur_subtitles)
 
@@ -390,7 +393,7 @@ class ThePlatformFeedIE(ThePlatformBaseIE):
         timestamp = int_or_none(entry.get('media$availableDate'), scale=1000)
         categories = [item['media$name'] for item in entry.get('media$categories', [])]
 
-        ret = self._extract_theplatform_metadata('%s/%s' % (provider_id, first_video_id), video_id)
+        ret = self._extract_theplatform_metadata(f'{provider_id}/{first_video_id}', video_id)
         subtitles = self._merge_subtitles(subtitles, ret['subtitles'])
         ret.update({
             'id': video_id,
diff --git a/plugins/youtube_download/yt_dlp/extractor/thestar.py b/plugins/youtube_download/yt_dlp/extractor/thestar.py
index 293c34c..38aa695 100644
--- a/plugins/youtube_download/yt_dlp/extractor/thestar.py
+++ b/plugins/youtube_download/yt_dlp/extractor/thestar.py
@@ -18,7 +18,7 @@ class TheStarIE(InfoExtractor):
         'params': {
             # m3u8 download
             'skip_download': True,
-        }
+        },
     }
     BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/794267642001/default_default/index.html?videoId=%s'
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/theta.py b/plugins/youtube_download/yt_dlp/extractor/theta.py
deleted file mode 100644
index ecf0ea0..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/theta.py
+++ /dev/null
@@ -1,90 +0,0 @@
-from .common import InfoExtractor
-from ..utils import try_get
-
-
-class ThetaStreamIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?theta\.tv/(?!video/)(?P<id>[a-z0-9-]+)'
-    _TESTS = [{
-        'url': 'https://www.theta.tv/davirus',
-        'skip': 'The live may have ended',
-        'info_dict': {
-            'id': 'DaVirus',
-            'ext': 'mp4',
-            'title': 'I choose you - My Community is King -👀 - YO HABLO ESPANOL - CODE DAVIRUS',
-            'thumbnail': r're:https://live-thumbnails-prod-theta-tv\.imgix\.net/thumbnail/.+\.jpg',
-        }
-    }, {
-        'url': 'https://www.theta.tv/mst3k',
-        'note': 'This channel is live 24/7',
-        'info_dict': {
-            'id': 'MST3K',
-            'ext': 'mp4',
-            'title': 'Mystery Science Theatre 3000 24/7 Powered by the THETA Network.',
-            'thumbnail': r're:https://user-prod-theta-tv\.imgix\.net/.+\.jpg',
-        }
-    }, {
-        'url': 'https://www.theta.tv/contv-anime',
-        'info_dict': {
-            'id': 'ConTVAnime',
-            'ext': 'mp4',
-            'title': 'CONTV ANIME 24/7. Powered by THETA Network.',
-            'thumbnail': r're:https://user-prod-theta-tv\.imgix\.net/.+\.jpg',
-        }
-    }]
-
-    def _real_extract(self, url):
-        channel_id = self._match_id(url)
-        info = self._download_json(f'https://api.theta.tv/v1/channel?alias={channel_id}', channel_id)['body']
-
-        m3u8_playlist = next(
-            data['url'] for data in info['live_stream']['video_urls']
-            if data.get('type') != 'embed' and data.get('resolution') in ('master', 'source'))
-
-        formats = self._extract_m3u8_formats(m3u8_playlist, channel_id, 'mp4', m3u8_id='hls', live=True)
-
-        channel = try_get(info, lambda x: x['user']['username'])  # using this field instead of channel_id due to capitalization
-
-        return {
-            'id': channel,
-            'title': try_get(info, lambda x: x['live_stream']['title']),
-            'channel': channel,
-            'view_count': try_get(info, lambda x: x['live_stream']['view_count']),
-            'is_live': True,
-            'formats': formats,
-            'thumbnail': try_get(info, lambda x: x['live_stream']['thumbnail_url']),
-        }
-
-
-class ThetaVideoIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?theta\.tv/video/(?P<id>vid[a-z0-9]+)'
-    _TEST = {
-        'url': 'https://www.theta.tv/video/vidiq6aaet3kzf799p0',
-        'md5': '633d8c29eb276bb38a111dbd591c677f',
-        'info_dict': {
-            'id': 'vidiq6aaet3kzf799p0',
-            'ext': 'mp4',
-            'title': 'Theta EdgeCast Tutorial',
-            'uploader': 'Pixiekittie',
-            'description': 'md5:e316253f5bdced8b5a46bb50ae60a09f',
-            'thumbnail': r're:https://user-prod-theta-tv\.imgix\.net/.+/vod_thumb/.+.jpg',
-        }
-    }
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        info = self._download_json(f'https://api.theta.tv/v1/video/{video_id}/raw', video_id)['body']
-
-        m3u8_playlist = try_get(info, lambda x: x['video_urls'][0]['url'])
-
-        formats = self._extract_m3u8_formats(m3u8_playlist, video_id, 'mp4', m3u8_id='hls')
-
-        return {
-            'id': video_id,
-            'title': info.get('title'),
-            'uploader': try_get(info, lambda x: x['user']['username']),
-            'description': info.get('description'),
-            'view_count': info.get('view_count'),
-            'like_count': info.get('like_count'),
-            'formats': formats,
-            'thumbnail': info.get('thumbnail_url'),
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/theweatherchannel.py b/plugins/youtube_download/yt_dlp/extractor/theweatherchannel.py
index 682e433..424f778 100644
--- a/plugins/youtube_download/yt_dlp/extractor/theweatherchannel.py
+++ b/plugins/youtube_download/yt_dlp/extractor/theweatherchannel.py
@@ -11,18 +11,20 @@ from ..utils import (
 class TheWeatherChannelIE(ThePlatformIE):  # XXX: Do not subclass from concrete IE
     _VALID_URL = r'https?://(?:www\.)?weather\.com(?P<asset_name>(?:/(?P<locale>[a-z]{2}-[A-Z]{2}))?/(?:[^/]+/)*video/(?P<id>[^/?#]+))'
     _TESTS = [{
-        'url': 'https://weather.com/series/great-outdoors/video/ice-climber-is-in-for-a-shock',
-        'md5': 'c4cbe74c9c17c5676b704b950b73dd92',
+        'url': 'https://weather.com/storms/hurricane/video/invest-95l-in-atlantic-has-a-medium-chance-of-development',
+        'md5': '68f0cf616435683f27ce36bd9c927394',
         'info_dict': {
-            'id': 'cc82397e-cc3f-4d11-9390-a785add090e8',
+            'id': '81acef2d-ee8c-4545-ba83-bff3cc80db97',
             'ext': 'mp4',
-            'title': 'Ice Climber Is In For A Shock',
-            'description': 'md5:55606ce1378d4c72e6545e160c9d9695',
-            'uploader': 'TWC - Digital (No Distro)',
-            'uploader_id': '6ccd5455-16bb-46f2-9c57-ff858bb9f62c',
-            'upload_date': '20160720',
-            'timestamp': 1469018835,
-        }
+            'title': 'Invest 95L In Atlantic Has A Medium Chance Of Development',
+            'description': 'md5:0de720fd5f0d0e32207bd4c270fff824',
+            'uploader': 'TWC - Digital',
+            'uploader_id': 'b5a999e0-9e04-11e1-9ee2-001d092f5a10',
+            'upload_date': '20230721',
+            'timestamp': 1689967343,
+            'display_id': 'invest-95l-in-atlantic-has-a-medium-chance-of-development',
+            'duration': 34.0,
+        },
     }, {
         'url': 'https://weather.com/en-CA/international/videos/video/unidentified-object-falls-from-sky-in-india',
         'only_matching': True,
@@ -32,7 +34,7 @@ class TheWeatherChannelIE(ThePlatformIE):  # XXX: Do not subclass from concrete
         asset_name, locale, display_id = self._match_valid_url(url).groups()
         if not locale:
             locale = 'en-US'
-        video_data = list(self._download_json(
+        video_data = next(iter(self._download_json(
             'https://weather.com/api/v1/p/redux-dal', display_id, data=json.dumps([{
                 'name': 'getCMSAssetsUrlConfig',
                 'params': {
@@ -42,10 +44,10 @@ class TheWeatherChannelIE(ThePlatformIE):  # XXX: Do not subclass from concrete
                             '$in': asset_name,
                         },
                     },
-                }
+                },
             }]).encode(), headers={
                 'Content-Type': 'application/json',
-            })['dal']['getCMSAssetsUrlConfig'].values())[0]['data'][0]
+            })['dal']['getCMSAssetsUrlConfig'].values()))['data'][0]
         video_id = video_data['id']
         seo_meta = video_data.get('seometa', {})
         title = video_data.get('title') or seo_meta['title']
diff --git a/plugins/youtube_download/yt_dlp/extractor/thisamericanlife.py b/plugins/youtube_download/yt_dlp/extractor/thisamericanlife.py
index 9a3d798..8b5d1e6 100644
--- a/plugins/youtube_download/yt_dlp/extractor/thisamericanlife.py
+++ b/plugins/youtube_download/yt_dlp/extractor/thisamericanlife.py
@@ -22,11 +22,11 @@ class ThisAmericanLifeIE(InfoExtractor):
         video_id = self._match_id(url)
 
         webpage = self._download_webpage(
-            'http://www.thisamericanlife.org/radio-archives/episode/%s' % video_id, video_id)
+            f'http://www.thisamericanlife.org/radio-archives/episode/{video_id}', video_id)
 
         return {
             'id': video_id,
-            'url': 'http://stream.thisamericanlife.org/{0}/stream/{0}_64k.m3u8'.format(video_id),
+            'url': f'http://stream.thisamericanlife.org/{video_id}/stream/{video_id}_64k.m3u8',
             'protocol': 'm3u8_native',
             'ext': 'm4a',
             'acodec': 'aac',
diff --git a/plugins/youtube_download/yt_dlp/extractor/thisav.py b/plugins/youtube_download/yt_dlp/extractor/thisav.py
deleted file mode 100644
index b1cd57d..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/thisav.py
+++ /dev/null
@@ -1,66 +0,0 @@
-from .common import InfoExtractor
-from ..utils import remove_end
-
-
-class ThisAVIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?thisav\.com/video/(?P<id>[0-9]+)/.*'
-    _TESTS = [{
-        # jwplayer
-        'url': 'http://www.thisav.com/video/47734/%98%26sup1%3B%83%9E%83%82---just-fit.html',
-        'md5': '0480f1ef3932d901f0e0e719f188f19b',
-        'info_dict': {
-            'id': '47734',
-            'ext': 'flv',
-            'title': '高樹マリア - Just fit',
-            'uploader': 'dj7970',
-            'uploader_id': 'dj7970'
-        }
-    }, {
-        # html5 media
-        'url': 'http://www.thisav.com/video/242352/nerdy-18yo-big-ass-tattoos-and-glasses.html',
-        'md5': 'ba90c076bd0f80203679e5b60bf523ee',
-        'info_dict': {
-            'id': '242352',
-            'ext': 'mp4',
-            'title': 'Nerdy 18yo Big Ass Tattoos and Glasses',
-            'uploader': 'cybersluts',
-            'uploader_id': 'cybersluts',
-        },
-    }]
-
-    def _real_extract(self, url):
-        mobj = self._match_valid_url(url)
-
-        video_id = mobj.group('id')
-        webpage = self._download_webpage(url, video_id)
-        title = remove_end(self._html_extract_title(webpage), ' - 視頻 - ThisAV.com-世界第一中文成人娛樂網站')
-        video_url = self._html_search_regex(
-            r"addVariable\('file','([^']+)'\);", webpage, 'video url', default=None)
-        if video_url:
-            info_dict = {
-                'formats': [{
-                    'url': video_url,
-                }],
-            }
-        else:
-            entries = self._parse_html5_media_entries(url, webpage, video_id)
-            if entries:
-                info_dict = entries[0]
-            else:
-                info_dict = self._extract_jwplayer_data(
-                    webpage, video_id, require_title=False)
-        uploader = self._html_search_regex(
-            r': <a href="http://www\.thisav\.com/user/[0-9]+/(?:[^"]+)">([^<]+)</a>',
-            webpage, 'uploader name', fatal=False)
-        uploader_id = self._html_search_regex(
-            r': <a href="http://www\.thisav\.com/user/[0-9]+/([^"]+)">(?:[^<]+)</a>',
-            webpage, 'uploader id', fatal=False)
-
-        info_dict.update({
-            'id': video_id,
-            'uploader': uploader,
-            'uploader_id': uploader_id,
-            'title': title,
-        })
-
-        return info_dict
diff --git a/plugins/youtube_download/yt_dlp/extractor/thisoldhouse.py b/plugins/youtube_download/yt_dlp/extractor/thisoldhouse.py
index cc7beee..fbc12d5 100644
--- a/plugins/youtube_download/yt_dlp/extractor/thisoldhouse.py
+++ b/plugins/youtube_download/yt_dlp/extractor/thisoldhouse.py
@@ -1,35 +1,72 @@
+import json
+
+from .brightcove import BrightcoveNewIE
 from .common import InfoExtractor
+from .zype import ZypeIE
 from ..networking import HEADRequest
+from ..networking.exceptions import HTTPError
+from ..utils import (
+    ExtractorError,
+    filter_dict,
+    parse_qs,
+    smuggle_url,
+    try_call,
+    urlencode_postdata,
+)
 
 
 class ThisOldHouseIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?thisoldhouse\.com/(?:watch|how-to|tv-episode|(?:[^/]+/)?\d+)/(?P<id>[^/?#]+)'
+    _NETRC_MACHINE = 'thisoldhouse'
+    _VALID_URL = r'https?://(?:www\.)?thisoldhouse\.com/(?:watch|how-to|tv-episode|(?:[^/?#]+/)?\d+)/(?P<id>[^/?#]+)'
     _TESTS = [{
-        'url': 'https://www.thisoldhouse.com/how-to/how-to-build-storage-bench',
+        # Unresolved Brightcove URL embed (formerly Zype), free
+        'url': 'https://www.thisoldhouse.com/furniture/21017078/how-to-build-a-storage-bench',
         'info_dict': {
-            'id': '5dcdddf673c3f956ef5db202',
+            'id': '6325298523112',
             'ext': 'mp4',
             'title': 'How to Build a Storage Bench',
             'description': 'In the workshop, Tom Silva and Kevin O\'Connor build a storage bench for an entryway.',
-            'timestamp': 1442548800,
-            'upload_date': '20150918',
-            'duration': 674,
-            'view_count': int,
-            'average_rating': 0,
-            'thumbnail': r're:^https?://.*\.jpg\?\d+$',
-            'display_id': 'how-to-build-a-storage-bench',
+            'timestamp': 1681793639,
+            'upload_date': '20230418',
+            'duration': 674.54,
+            'tags': 'count:11',
+            'uploader_id': '6314471934001',
+            'thumbnail': r're:^https?://.*\.jpg',
         },
         'params': {
             'skip_download': True,
         },
     }, {
+        # Brightcove embed, authwalled
+        'url': 'https://www.thisoldhouse.com/glen-ridge-generational/99537/s45-e17-multi-generational',
+        'info_dict': {
+            'id': '6349675446112',
+            'ext': 'mp4',
+            'title': 'E17 | Glen Ridge Generational | Multi-Generational',
+            'description': 'md5:53c6bc2e8031f3033d693d9a3563222c',
+            'timestamp': 1711382202,
+            'upload_date': '20240325',
+            'duration': 1422.229,
+            'tags': 'count:13',
+            'uploader_id': '6314471934001',
+            'thumbnail': r're:^https?://.*\.jpg',
+        },
+        'expected_warnings': ['Login with password is not supported for this website'],
+        'params': {
+            'skip_download': True,
+        },
+        'skip': 'Requires subscription',
+    }, {
+        # Page no longer has video
         'url': 'https://www.thisoldhouse.com/watch/arlington-arts-crafts-arts-and-crafts-class-begins',
         'only_matching': True,
     }, {
+        # 404 Not Found
         'url': 'https://www.thisoldhouse.com/tv-episode/ask-toh-shelf-rough-electric',
         'only_matching': True,
     }, {
-        'url': 'https://www.thisoldhouse.com/furniture/21017078/how-to-build-a-storage-bench',
+        # 404 Not Found
+        'url': 'https://www.thisoldhouse.com/how-to/how-to-build-storage-bench',
         'only_matching': True,
     }, {
         'url': 'https://www.thisoldhouse.com/21113884/s41-e13-paradise-lost',
@@ -39,17 +76,59 @@ class ThisOldHouseIE(InfoExtractor):
         'url': 'https://www.thisoldhouse.com/21083431/seaside-transformation-the-westerly-project',
         'only_matching': True,
     }]
-    _ZYPE_TMPL = 'https://player.zype.com/embed/%s.html?api_key=hsOk_yMSPYNrT22e9pu8hihLXjaZf0JW5jsOWv4ZqyHJFvkJn6rtToHl09tbbsbe'
+
+    _LOGIN_URL = 'https://login.thisoldhouse.com/usernamepassword/login'
+
+    def _perform_login(self, username, password):
+        self._request_webpage(
+            HEADRequest('https://www.thisoldhouse.com/insider'), None, 'Requesting session cookies')
+        urlh = self._request_webpage(
+            'https://www.thisoldhouse.com/wp-login.php', None, 'Requesting login info',
+            errnote='Unable to login', query={'redirect_to': 'https://www.thisoldhouse.com/insider'})
+
+        try:
+            auth_form = self._download_webpage(
+                self._LOGIN_URL, None, 'Submitting credentials', headers={
+                    'Content-Type': 'application/json',
+                    'Referer': urlh.url,
+                }, data=json.dumps(filter_dict({
+                    **{('client_id' if k == 'client' else k): v[0] for k, v in parse_qs(urlh.url).items()},
+                    'tenant': 'thisoldhouse',
+                    'username': username,
+                    'password': password,
+                    'popup_options': {},
+                    'sso': True,
+                    '_csrf': try_call(lambda: self._get_cookies(self._LOGIN_URL)['_csrf'].value),
+                    '_intstate': 'deprecated',
+                }), separators=(',', ':')).encode())
+        except ExtractorError as e:
+            if isinstance(e.cause, HTTPError) and e.cause.status == 401:
+                raise ExtractorError('Invalid username or password', expected=True)
+            raise
+
+        self._request_webpage(
+            'https://login.thisoldhouse.com/login/callback', None, 'Completing login',
+            data=urlencode_postdata(self._hidden_inputs(auth_form)))
 
     def _real_extract(self, url):
         display_id = self._match_id(url)
         webpage = self._download_webpage(url, display_id)
         if 'To Unlock This content' in webpage:
-            self.raise_login_required(method='cookies')
-        video_url = self._search_regex(
+            self.raise_login_required(
+                'This video is only available for subscribers. '
+                'Note that --cookies-from-browser may not work due to this site using session cookies')
+
+        video_url, video_id = self._search_regex(
             r'<iframe[^>]+src=[\'"]((?:https?:)?//(?:www\.)?thisoldhouse\.(?:chorus\.build|com)/videos/zype/([0-9a-f]{24})[^\'"]*)[\'"]',
-            webpage, 'video url')
-        if 'subscription_required=true' in video_url or 'c-entry-group-labels__image' in webpage:
-            return self.url_result(self._request_webpage(HEADRequest(video_url), display_id).url, 'Zype', display_id)
-        video_id = self._search_regex(r'(?:https?:)?//(?:www\.)?thisoldhouse\.(?:chorus\.build|com)/videos/zype/([0-9a-f]{24})', video_url, 'video id')
-        return self.url_result(self._ZYPE_TMPL % video_id, 'Zype', video_id)
+            webpage, 'zype url', group=(1, 2), default=(None, None))
+        if video_url:
+            video_url = self._request_webpage(HEADRequest(video_url), video_id, 'Resolving Zype URL').url
+            return self.url_result(video_url, ZypeIE, video_id)
+
+        video_url, video_id = self._search_regex([
+            r'<iframe[^>]+src=[\'"]((?:https?:)?//players\.brightcove\.net/\d+/\w+/index\.html\?videoId=(\d+))',
+            r'<iframe[^>]+src=[\'"]((?:https?:)?//(?:www\.)thisoldhouse\.com/videos/brightcove/(\d+))'],
+            webpage, 'iframe url', group=(1, 2))
+        if not parse_qs(video_url).get('videoId'):
+            video_url = self._request_webpage(HEADRequest(video_url), video_id, 'Resolving Brightcove URL').url
+        return self.url_result(smuggle_url(video_url, {'referrer': url}), BrightcoveNewIE, video_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/thisvid.py b/plugins/youtube_download/yt_dlp/extractor/thisvid.py
index 9d3368e..2fd6ae8 100644
--- a/plugins/youtube_download/yt_dlp/extractor/thisvid.py
+++ b/plugins/youtube_download/yt_dlp/extractor/thisvid.py
@@ -27,7 +27,7 @@ class ThisVidIE(InfoExtractor):
             'uploader': 'jeanslevisjeans',
             'display_id': 'sitting-on-ball-tight-jeans',
             'age_limit': 18,
-        }
+        },
     }, {
         'url': 'https://thisvid.com/embed/3533241/',
         'md5': '839becb572995687e11a69dc4358a386',
@@ -40,7 +40,7 @@ class ThisVidIE(InfoExtractor):
             'uploader': 'jeanslevisjeans',
             'display_id': 'sitting-on-ball-tight-jeans',
             'age_limit': 18,
-        }
+        },
     }]
 
     def _real_extract(self, url):
@@ -134,7 +134,7 @@ class ThisVidPlaylistBaseIE(InfoExtractor):
         title = re.split(
             r'(?i)\s*\|\s*ThisVid\.com\s*$',
             self._og_search_title(webpage, default=None)
-            or self._html_search_regex(r'(?s)<title\b[^>]*>(.+?)</title', webpage, 'title', fatal=False) or '', 1)[0] or None
+            or self._html_search_regex(r'(?s)<title\b[^>]*>(.+?)</title', webpage, 'title', fatal=False) or '', maxsplit=1)[0] or None
 
         return self.playlist_from_matches(
             self._generate_playlist_entries(url, playlist_id, webpage),
diff --git a/plugins/youtube_download/yt_dlp/extractor/threeqsdn.py b/plugins/youtube_download/yt_dlp/extractor/threeqsdn.py
index 7841f8d..45fdef9 100644
--- a/plugins/youtube_download/yt_dlp/extractor/threeqsdn.py
+++ b/plugins/youtube_download/yt_dlp/extractor/threeqsdn.py
@@ -1,8 +1,8 @@
 from .common import InfoExtractor
 from ..networking.exceptions import HTTPError
 from ..utils import (
-    determine_ext,
     ExtractorError,
+    determine_ext,
     float_or_none,
     int_or_none,
     join_nonempty,
@@ -14,7 +14,7 @@ class ThreeQSDNIE(InfoExtractor):
     IE_NAME = '3qsdn'
     IE_DESC = '3Q SDN'
     _VALID_URL = r'https?://playout\.3qsdn\.com/(?P<id>[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12})'
-    _EMBED_REGEX = [r'<iframe[^>]+\b(?:data-)?src=(["\'])(?P<url>%s.*?)\1' % _VALID_URL]
+    _EMBED_REGEX = [rf'<iframe[^>]+\b(?:data-)?src=(["\'])(?P<url>{_VALID_URL}.*?)\1']
     _TESTS = [{
         # https://player.3qsdn.com/demo.html
         'url': 'https://playout.3qsdn.com/7201c779-6b3c-11e7-a40e-002590c750be',
@@ -121,7 +121,7 @@ class ThreeQSDNIE(InfoExtractor):
                     height = int_or_none(s.get('height'))
                     formats.append({
                         'ext': ext,
-                        'format_id': join_nonempty('http', ext, height and '%dp' % height),
+                        'format_id': join_nonempty('http', ext, height and f'{height}p'),
                         'height': height,
                         'source_preference': 0,
                         'url': src,
@@ -152,5 +152,5 @@ class ThreeQSDNIE(InfoExtractor):
             # It seems like this would be correctly handled by default
             # However, unless someone can confirm this, the old
             # behaviour is being kept as-is
-            '_format_sort_fields': ('res', 'source_preference')
+            '_format_sort_fields': ('res', 'source_preference'),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/threespeak.py b/plugins/youtube_download/yt_dlp/extractor/threespeak.py
index dbd5090..32ea177 100644
--- a/plugins/youtube_download/yt_dlp/extractor/threespeak.py
+++ b/plugins/youtube_download/yt_dlp/extractor/threespeak.py
@@ -24,32 +24,32 @@ class ThreeSpeakIE(InfoExtractor):
             'duration': 2703.867833,
             'filesize': 1620054781,
         },
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }]
 
     def _real_extract(self, url):
-        id = self._match_id(url)
-        webpage = self._download_webpage(url, id)
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
         json_str = self._html_search_regex(r'JSON\.parse\(\'([^\']+)\'\)', webpage, 'json')
         # The json string itself is escaped. Hence the double parsing
-        data_json = self._parse_json(self._parse_json(f'"{json_str}"', id), id)
-        video_json = self._parse_json(data_json['json_metadata'], id)
+        data_json = self._parse_json(self._parse_json(f'"{json_str}"', video_id), video_id)
+        video_json = self._parse_json(data_json['json_metadata'], video_id)
         formats, subtitles = [], {}
         og_m3u8 = self._html_search_regex(r'<meta\s?property=\"ogvideo\"\s?content=\"([^\"]+)\">', webpage, 'og m3u8', fatal=False)
         if og_m3u8:
-            https_frmts, https_subs = self._extract_m3u8_formats_and_subtitles(og_m3u8, id, fatal=False, m3u8_id='https')
+            https_frmts, https_subs = self._extract_m3u8_formats_and_subtitles(og_m3u8, video_id, fatal=False, m3u8_id='https')
             formats.extend(https_frmts)
             subtitles = self._merge_subtitles(subtitles, https_subs)
         ipfs_m3u8 = try_get(video_json, lambda x: x['video']['info']['ipfs'])
         if ipfs_m3u8:
-            ipfs_frmts, ipfs_subs = self._extract_m3u8_formats_and_subtitles(f'https://ipfs.3speak.tv/ipfs/{ipfs_m3u8}',
-                                                                             id, fatal=False, m3u8_id='ipfs')
+            ipfs_frmts, ipfs_subs = self._extract_m3u8_formats_and_subtitles(
+                f'https://ipfs.3speak.tv/ipfs/{ipfs_m3u8}', video_id, fatal=False, m3u8_id='ipfs')
             formats.extend(ipfs_frmts)
             subtitles = self._merge_subtitles(subtitles, ipfs_subs)
         mp4_file = try_get(video_json, lambda x: x['video']['info']['file'])
         if mp4_file:
             formats.append({
-                'url': f'https://threespeakvideo.b-cdn.net/{id}/{mp4_file}',
+                'url': f'https://threespeakvideo.b-cdn.net/{video_id}/{mp4_file}',
                 'ext': 'mp4',
                 'format_id': 'https-mp4',
                 'duration': try_get(video_json, lambda x: x['video']['info']['duration']),
@@ -58,7 +58,7 @@ class ThreeSpeakIE(InfoExtractor):
                 'format_note': 'Original file',
             })
         return {
-            'id': id,
+            'id': video_id,
             'title': data_json.get('title') or data_json.get('root_title'),
             'uploader': data_json.get('author'),
             'description': try_get(video_json, lambda x: x['video']['content']['description']),
@@ -82,12 +82,12 @@ class ThreeSpeakUserIE(InfoExtractor):
     }]
 
     def _real_extract(self, url):
-        id = self._match_id(url)
-        webpage = self._download_webpage(url, id)
+        playlist_id = self._match_id(url)
+        webpage = self._download_webpage(url, playlist_id)
         entries = [
             self.url_result(
-                'https://3speak.tv/watch?v=%s' % video,
+                f'https://3speak.tv/watch?v={video}',
                 ie=ThreeSpeakIE.ie_key())
             for video in re.findall(r'data-payout\s?\=\s?\"([^\"]+)\"', webpage) if video
         ]
-        return self.playlist_result(entries, id)
+        return self.playlist_result(entries, playlist_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/tiktok.py b/plugins/youtube_download/yt_dlp/extractor/tiktok.py
index f14c4f9..d9280ce 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tiktok.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tiktok.py
@@ -1,154 +1,275 @@
+import functools
 import itertools
 import json
 import random
 import re
 import string
 import time
+import urllib.parse
+import uuid
 
 from .common import InfoExtractor
-from ..compat import compat_urllib_parse_unquote, compat_urllib_parse_urlparse
 from ..networking import HEADRequest
 from ..utils import (
     ExtractorError,
-    LazyList,
     UnsupportedError,
     UserNotLive,
     determine_ext,
+    filter_dict,
     format_field,
-    get_element_by_id,
-    get_first,
     int_or_none,
     join_nonempty,
     merge_dicts,
+    mimetype2ext,
+    parse_qs,
     qualities,
-    remove_start,
     srt_subtitles_timecode,
     str_or_none,
     traverse_obj,
+    truncate_string,
     try_call,
     try_get,
     url_or_none,
+    urlencode_postdata,
 )
 
 
 class TikTokBaseIE(InfoExtractor):
-    _APP_VERSIONS = [('26.1.3', '260103'), ('26.1.2', '260102'), ('26.1.1', '260101'), ('25.6.2', '250602')]
-    _WORKING_APP_VERSION = None
-    _APP_NAME = 'trill'
-    _AID = 1180
     _UPLOADER_URL_FORMAT = 'https://www.tiktok.com/@%s'
     _WEBPAGE_HOST = 'https://www.tiktok.com/'
     QUALITIES = ('360p', '540p', '720p', '1080p')
 
-    @property
+    _APP_INFO_DEFAULTS = {
+        # unique "install id"
+        'iid': None,
+        # TikTok (KR/PH/TW/TH/VN) = trill, TikTok (rest of world) = musical_ly, Douyin = aweme
+        'app_name': 'musical_ly',
+        'app_version': '35.1.3',
+        'manifest_app_version': '2023501030',
+        # "app id": aweme = 1128, trill = 1180, musical_ly = 1233, universal = 0
+        'aid': '0',
+    }
+    _APP_INFO_POOL = None
+    _APP_INFO = None
+    _APP_USER_AGENT = None
+
+    @functools.cached_property
+    def _KNOWN_APP_INFO(self):
+        # If we have a genuine device ID, we may not need any IID
+        default = [''] if self._KNOWN_DEVICE_ID else []
+        return self._configuration_arg('app_info', default, ie_key=TikTokIE)
+
+    @functools.cached_property
+    def _KNOWN_DEVICE_ID(self):
+        return self._configuration_arg('device_id', [None], ie_key=TikTokIE)[0]
+
+    @functools.cached_property
+    def _DEVICE_ID(self):
+        return self._KNOWN_DEVICE_ID or str(random.randint(7250000000000000000, 7351147085025500000))
+
+    @functools.cached_property
     def _API_HOSTNAME(self):
         return self._configuration_arg(
             'api_hostname', ['api16-normal-c-useast1a.tiktokv.com'], ie_key=TikTokIE)[0]
 
+    def _get_next_app_info(self):
+        if self._APP_INFO_POOL is None:
+            defaults = {
+                key: self._configuration_arg(key, [default], ie_key=TikTokIE)[0]
+                for key, default in self._APP_INFO_DEFAULTS.items()
+                if key != 'iid'
+            }
+            self._APP_INFO_POOL = [
+                {**defaults, **dict(
+                    (k, v) for k, v in zip(self._APP_INFO_DEFAULTS, app_info.split('/')) if v
+                )} for app_info in self._KNOWN_APP_INFO
+            ]
+
+        if not self._APP_INFO_POOL:
+            return False
+
+        self._APP_INFO = self._APP_INFO_POOL.pop(0)
+
+        app_name = self._APP_INFO['app_name']
+        version = self._APP_INFO['manifest_app_version']
+        if app_name == 'musical_ly':
+            package = f'com.zhiliaoapp.musically/{version}'
+        else:  # trill, aweme
+            package = f'com.ss.android.ugc.{app_name}/{version}'
+        self._APP_USER_AGENT = f'{package} (Linux; U; Android 13; en_US; Pixel 7; Build/TD1A.220804.031; Cronet/58.0.2991.0)'
+
+        return True
+
     @staticmethod
     def _create_url(user_id, video_id):
         return f'https://www.tiktok.com/@{user_id or "_"}/video/{video_id}'
 
     def _get_sigi_state(self, webpage, display_id):
-        return self._parse_json(get_element_by_id(
-            'SIGI_STATE|sigi-persisted-data', webpage, escape_value=False), display_id)
+        return self._search_json(
+            r'<script[^>]+\bid="(?:SIGI_STATE|sigi-persisted-data)"[^>]*>', webpage,
+            'sigi state', display_id, end_pattern=r'</script>', default={})
 
-    def _call_api_impl(self, ep, query, manifest_app_version, video_id, fatal=True,
+    def _get_universal_data(self, webpage, display_id):
+        return traverse_obj(self._search_json(
+            r'<script[^>]+\bid="__UNIVERSAL_DATA_FOR_REHYDRATION__"[^>]*>', webpage,
+            'universal data', display_id, end_pattern=r'</script>', default={}),
+            ('__DEFAULT_SCOPE__', {dict})) or {}
+
+    def _call_api_impl(self, ep, video_id, query=None, data=None, headers=None, fatal=True,
                        note='Downloading API JSON', errnote='Unable to download API page'):
         self._set_cookie(self._API_HOSTNAME, 'odin_tt', ''.join(random.choices('0123456789abcdef', k=160)))
         webpage_cookies = self._get_cookies(self._WEBPAGE_HOST)
         if webpage_cookies.get('sid_tt'):
             self._set_cookie(self._API_HOSTNAME, 'sid_tt', webpage_cookies['sid_tt'].value)
         return self._download_json(
-            'https://%s/aweme/v1/%s/' % (self._API_HOSTNAME, ep), video_id=video_id,
+            f'https://{self._API_HOSTNAME}/aweme/v1/{ep}/', video_id=video_id,
             fatal=fatal, note=note, errnote=errnote, headers={
-                'User-Agent': f'com.ss.android.ugc.{self._APP_NAME}/{manifest_app_version} (Linux; U; Android 13; en_US; Pixel 7; Build/TD1A.220804.031; Cronet/58.0.2991.0)',
+                'User-Agent': self._APP_USER_AGENT,
                 'Accept': 'application/json',
-            }, query=query)
+                **(headers or {}),
+            }, query=query, data=data)
 
-    def _build_api_query(self, query, app_version, manifest_app_version):
-        return {
+    def _build_api_query(self, query):
+        return filter_dict({
             **query,
-            'version_name': app_version,
-            'version_code': manifest_app_version,
-            'build_number': app_version,
-            'manifest_version_code': manifest_app_version,
-            'update_version_code': manifest_app_version,
-            'openudid': ''.join(random.choices('0123456789abcdef', k=16)),
-            'uuid': ''.join(random.choices(string.digits, k=16)),
-            '_rticket': int(time.time() * 1000),
-            'ts': int(time.time()),
-            'device_brand': 'Google',
-            'device_type': 'Pixel 7',
             'device_platform': 'android',
+            'os': 'android',
+            'ssmix': 'a',
+            '_rticket': int(time.time() * 1000),
+            'cdid': str(uuid.uuid4()),
+            'channel': 'googleplay',
+            'aid': self._APP_INFO['aid'],
+            'app_name': self._APP_INFO['app_name'],
+            'version_code': ''.join(f'{int(v):02d}' for v in self._APP_INFO['app_version'].split('.')),
+            'version_name': self._APP_INFO['app_version'],
+            'manifest_version_code': self._APP_INFO['manifest_app_version'],
+            'update_version_code': self._APP_INFO['manifest_app_version'],
+            'ab_version': self._APP_INFO['app_version'],
             'resolution': '1080*2400',
             'dpi': 420,
-            'os_version': '13',
-            'os_api': '29',
-            'carrier_region': 'US',
-            'sys_region': 'US',
-            'region': 'US',
-            'app_name': self._APP_NAME,
-            'app_language': 'en',
+            'device_type': 'Pixel 7',
+            'device_brand': 'Google',
             'language': 'en',
-            'timezone_name': 'America/New_York',
-            'timezone_offset': '-14400',
-            'channel': 'googleplay',
+            'os_api': '29',
+            'os_version': '13',
             'ac': 'wifi',
-            'mcc_mnc': '310260',
-            'is_my_cn': 0,
-            'aid': self._AID,
-            'ssmix': 'a',
-            'as': 'a1qwert123',
-            'cp': 'cbfhckdckkde1',
-        }
+            'is_pad': '0',
+            'current_region': 'US',
+            'app_type': 'normal',
+            'sys_region': 'US',
+            'last_install_time': int(time.time()) - random.randint(86400, 1123200),
+            'timezone_name': 'America/New_York',
+            'residence': 'US',
+            'app_language': 'en',
+            'timezone_offset': '-14400',
+            'host_abi': 'armeabi-v7a',
+            'locale': 'en',
+            'ac2': 'wifi5g',
+            'uoo': '1',
+            'carrier_region': 'US',
+            'op_region': 'US',
+            'build_number': self._APP_INFO['app_version'],
+            'region': 'US',
+            'ts': int(time.time()),
+            'iid': self._APP_INFO.get('iid'),
+            'device_id': self._DEVICE_ID,
+            'openudid': ''.join(random.choices('0123456789abcdef', k=16)),
+        })
 
-    def _call_api(self, ep, query, video_id, fatal=True,
+    def _call_api(self, ep, video_id, query=None, data=None, headers=None, fatal=True,
                   note='Downloading API JSON', errnote='Unable to download API page'):
-        if not self._WORKING_APP_VERSION:
-            app_version = self._configuration_arg('app_version', [''], ie_key=TikTokIE.ie_key())[0]
-            manifest_app_version = self._configuration_arg('manifest_app_version', [''], ie_key=TikTokIE.ie_key())[0]
-            if app_version and manifest_app_version:
-                self._WORKING_APP_VERSION = (app_version, manifest_app_version)
-                self.write_debug('Imported app version combo from extractor arguments')
-            elif app_version or manifest_app_version:
-                self.report_warning('Only one of the two required version params are passed as extractor arguments', only_once=True)
+        if not self._APP_INFO and not self._get_next_app_info():
+            message = 'No working app info is available'
+            if fatal:
+                raise ExtractorError(message, expected=True)
+            else:
+                self.report_warning(message)
+                return
 
-        if self._WORKING_APP_VERSION:
-            app_version, manifest_app_version = self._WORKING_APP_VERSION
-            real_query = self._build_api_query(query, app_version, manifest_app_version)
-            return self._call_api_impl(ep, real_query, manifest_app_version, video_id, fatal, note, errnote)
-
-        for count, (app_version, manifest_app_version) in enumerate(self._APP_VERSIONS, start=1):
-            real_query = self._build_api_query(query, app_version, manifest_app_version)
+        max_tries = len(self._APP_INFO_POOL) + 1  # _APP_INFO_POOL + _APP_INFO
+        for count in itertools.count(1):
+            self.write_debug(str(self._APP_INFO))
+            real_query = self._build_api_query(query or {})
             try:
-                res = self._call_api_impl(ep, real_query, manifest_app_version, video_id, fatal, note, errnote)
-                self._WORKING_APP_VERSION = (app_version, manifest_app_version)
-                return res
+                return self._call_api_impl(
+                    ep, video_id, query=real_query, data=data, headers=headers,
+                    fatal=fatal, note=note, errnote=errnote)
             except ExtractorError as e:
                 if isinstance(e.cause, json.JSONDecodeError) and e.cause.pos == 0:
-                    if count == len(self._APP_VERSIONS):
+                    message = str(e.cause or e.msg)
+                    if not self._get_next_app_info():
                         if fatal:
-                            raise e
+                            raise
                         else:
-                            self.report_warning(str(e.cause or e.msg))
+                            self.report_warning(message)
                             return
-                    self.report_warning('%s. Retrying... (attempt %s of %s)' % (str(e.cause or e.msg), count, len(self._APP_VERSIONS)))
+                    self.report_warning(f'{message}. Retrying... (attempt {count} of {max_tries})')
                     continue
-                raise e
+                raise
 
     def _extract_aweme_app(self, aweme_id):
-        feed_list = self._call_api(
-            'feed', {'aweme_id': aweme_id}, aweme_id, note='Downloading video feed',
-            errnote='Unable to download video feed').get('aweme_list') or []
-        aweme_detail = next((aweme for aweme in feed_list if str(aweme.get('aweme_id')) == aweme_id), None)
+        aweme_detail = traverse_obj(
+            self._call_api('multi/aweme/detail', aweme_id, data=urlencode_postdata({
+                'aweme_ids': f'[{aweme_id}]',
+                'request_source': '0',
+            }), headers={'X-Argus': ''}), ('aweme_details', 0, {dict}))
         if not aweme_detail:
-            raise ExtractorError('Unable to find video in feed', video_id=aweme_id)
+            raise ExtractorError('Unable to extract aweme detail info', video_id=aweme_id)
         return self._parse_aweme_video_app(aweme_detail)
 
-    def _get_subtitles(self, aweme_detail, aweme_id):
+    def _extract_web_data_and_status(self, url, video_id, fatal=True):
+        video_data, status = {}, -1
+
+        res = self._download_webpage_handle(url, video_id, fatal=fatal, headers={'User-Agent': 'Mozilla/5.0'})
+        if res is False:
+            return video_data, status
+
+        webpage, urlh = res
+        if urllib.parse.urlparse(urlh.url).path == '/login':
+            message = 'TikTok is requiring login for access to this content'
+            if fatal:
+                self.raise_login_required(message)
+            self.report_warning(f'{message}. {self._login_hint()}')
+            return video_data, status
+
+        if universal_data := self._get_universal_data(webpage, video_id):
+            self.write_debug('Found universal data for rehydration')
+            status = traverse_obj(universal_data, ('webapp.video-detail', 'statusCode', {int})) or 0
+            video_data = traverse_obj(universal_data, ('webapp.video-detail', 'itemInfo', 'itemStruct', {dict}))
+
+        elif sigi_data := self._get_sigi_state(webpage, video_id):
+            self.write_debug('Found sigi state data')
+            status = traverse_obj(sigi_data, ('VideoPage', 'statusCode', {int})) or 0
+            video_data = traverse_obj(sigi_data, ('ItemModule', video_id, {dict}))
+
+        elif next_data := self._search_nextjs_data(webpage, video_id, default={}):
+            self.write_debug('Found next.js data')
+            status = traverse_obj(next_data, ('props', 'pageProps', 'statusCode', {int})) or 0
+            video_data = traverse_obj(next_data, ('props', 'pageProps', 'itemInfo', 'itemStruct', {dict}))
+
+        elif fatal:
+            raise ExtractorError('Unable to extract webpage video data')
+
+        if not traverse_obj(video_data, ('video', {dict})) and traverse_obj(video_data, ('isContentClassified', {bool})):
+            message = 'This post may not be comfortable for some audiences. Log in for access'
+            if fatal:
+                self.raise_login_required(message)
+            self.report_warning(f'{message}. {self._login_hint()}', video_id=video_id)
+
+        return video_data, status
+
+    def _get_subtitles(self, aweme_detail, aweme_id, user_name):
         # TODO: Extract text positioning info
+
+        EXT_MAP = {  # From lowest to highest preference
+            'creator_caption': 'json',
+            'srt': 'srt',
+            'webvtt': 'vtt',
+        }
+        preference = qualities(tuple(EXT_MAP.values()))
+
         subtitles = {}
+
         # aweme/detail endpoint subs
         captions_info = traverse_obj(
             aweme_detail, ('interaction_stickers', ..., 'auto_video_caption_info', 'auto_captions', ...), expected_type=dict)
@@ -164,7 +285,7 @@ class TikTokBaseIE(InfoExtractor):
                 'ext': 'srt',
                 'data': '\n\n'.join(
                     f'{i + 1}\n{srt_subtitles_timecode(line["start_time"] / 1000)} --> {srt_subtitles_timecode(line["end_time"] / 1000)}\n{line["text"]}'
-                    for i, line in enumerate(caption_json['utterances']) if line.get('text'))
+                    for i, line in enumerate(caption_json['utterances']) if line.get('text')),
             })
         # feed endpoint subs
         if not subtitles:
@@ -172,37 +293,42 @@ class TikTokBaseIE(InfoExtractor):
                 if not caption.get('url'):
                     continue
                 subtitles.setdefault(caption.get('lang') or 'en', []).append({
-                    'ext': remove_start(caption.get('caption_format'), 'web'),
                     'url': caption['url'],
+                    'ext': EXT_MAP.get(caption.get('Format')),
                 })
         # webpage subs
         if not subtitles:
-            for caption in traverse_obj(aweme_detail, ('video', 'subtitleInfos', ...), expected_type=dict):
-                if not caption.get('Url'):
-                    continue
+            if user_name:  # only _parse_aweme_video_app needs to extract the webpage here
+                aweme_detail, _ = self._extract_web_data_and_status(
+                    self._create_url(user_name, aweme_id), aweme_id, fatal=False)
+            for caption in traverse_obj(aweme_detail, ('video', 'subtitleInfos', lambda _, v: v['Url'])):
                 subtitles.setdefault(caption.get('LanguageCodeName') or 'en', []).append({
-                    'ext': remove_start(caption.get('Format'), 'web'),
                     'url': caption['Url'],
+                    'ext': EXT_MAP.get(caption.get('Format')),
                 })
+
+        # Deprioritize creator_caption json since it can't be embedded or used by media players
+        for lang, subs_list in subtitles.items():
+            subtitles[lang] = sorted(subs_list, key=lambda x: preference(x['ext']))
+
         return subtitles
 
+    def _parse_url_key(self, url_key):
+        format_id, codec, res, bitrate = self._search_regex(
+            r'v[^_]+_(?P<id>(?P<codec>[^_]+)_(?P<res>\d+p)_(?P<bitrate>\d+))', url_key,
+            'url key', default=(None, None, None, None), group=('id', 'codec', 'res', 'bitrate'))
+        if not format_id:
+            return {}, None
+        return {
+            'format_id': format_id,
+            'vcodec': 'h265' if codec == 'bytevc1' else codec,
+            'tbr': int_or_none(bitrate, scale=1000) or None,
+            'quality': qualities(self.QUALITIES)(res),
+        }, res
+
     def _parse_aweme_video_app(self, aweme_detail):
         aweme_id = aweme_detail['aweme_id']
         video_info = aweme_detail['video']
-
-        def parse_url_key(url_key):
-            format_id, codec, res, bitrate = self._search_regex(
-                r'v[^_]+_(?P<id>(?P<codec>[^_]+)_(?P<res>\d+p)_(?P<bitrate>\d+))', url_key,
-                'url key', default=(None, None, None, None), group=('id', 'codec', 'res', 'bitrate'))
-            if not format_id:
-                return {}, None
-            return {
-                'format_id': format_id,
-                'vcodec': 'h265' if codec == 'bytevc1' else codec,
-                'tbr': int_or_none(bitrate, scale=1000) or None,
-                'quality': qualities(self.QUALITIES)(res),
-            }, res
-
         known_resolutions = {}
 
         def audio_meta(url):
@@ -217,10 +343,11 @@ class TikTokBaseIE(InfoExtractor):
             } if ext == 'mp3' or '-music-' in url else {}
 
         def extract_addr(addr, add_meta={}):
-            parsed_meta, res = parse_url_key(addr.get('url_key', ''))
+            parsed_meta, res = self._parse_url_key(addr.get('url_key', ''))
+            is_bytevc2 = parsed_meta.get('vcodec') == 'bytevc2'
             if res:
-                known_resolutions.setdefault(res, {}).setdefault('height', add_meta.get('height') or addr.get('height'))
-                known_resolutions[res].setdefault('width', add_meta.get('width') or addr.get('width'))
+                known_resolutions.setdefault(res, {}).setdefault('height', int_or_none(addr.get('height')))
+                known_resolutions[res].setdefault('width', int_or_none(addr.get('width')))
                 parsed_meta.update(known_resolutions.get(res, {}))
                 add_meta.setdefault('height', int_or_none(res[:-1]))
             return [{
@@ -230,29 +357,37 @@ class TikTokBaseIE(InfoExtractor):
                 'acodec': 'aac',
                 'source_preference': -2 if 'aweme/v1' in url else -1,  # Downloads from API might get blocked
                 **add_meta, **parsed_meta,
+                # bytevc2 is bytedance's own custom h266/vvc codec, as-of-yet unplayable
+                'preference': -100 if is_bytevc2 else -1,
                 'format_note': join_nonempty(
-                    add_meta.get('format_note'), '(API)' if 'aweme/v1' in url else None, delim=' '),
+                    add_meta.get('format_note'), '(API)' if 'aweme/v1' in url else None,
+                    '(UNPLAYABLE)' if is_bytevc2 else None, delim=' '),
                 **audio_meta(url),
             } for url in addr.get('url_list') or []]
 
         # Hack: Add direct video links first to prioritize them when removing duplicate formats
         formats = []
+        width = int_or_none(video_info.get('width'))
+        height = int_or_none(video_info.get('height'))
+        ratio = try_call(lambda: width / height) or 0.5625
         if video_info.get('play_addr'):
             formats.extend(extract_addr(video_info['play_addr'], {
                 'format_id': 'play_addr',
                 'format_note': 'Direct video',
                 'vcodec': 'h265' if traverse_obj(
                     video_info, 'is_bytevc1', 'is_h265') else 'h264',  # TODO: Check for "direct iOS" videos, like https://www.tiktok.com/@cookierun_dev/video/7039716639834656002
-                'width': video_info.get('width'),
-                'height': video_info.get('height'),
+                'width': width,
+                'height': height,
             }))
         if video_info.get('download_addr'):
-            formats.extend(extract_addr(video_info['download_addr'], {
+            download_addr = video_info['download_addr']
+            dl_width = int_or_none(download_addr.get('width'))
+            formats.extend(extract_addr(download_addr, {
                 'format_id': 'download_addr',
                 'format_note': 'Download video%s' % (', watermarked' if video_info.get('has_watermark') else ''),
                 'vcodec': 'h264',
-                'width': video_info.get('width'),
-                'height': video_info.get('height'),
+                'width': dl_width,
+                'height': try_call(lambda: int(dl_width / ratio)),  # download_addr['height'] is wrong
                 'preference': -2 if video_info.get('has_watermark') else -1,
             }))
         if video_info.get('play_addr_h264'):
@@ -283,23 +418,10 @@ class TikTokBaseIE(InfoExtractor):
         auth_cookie = self._get_cookies(self._WEBPAGE_HOST).get('sid_tt')
         if auth_cookie:
             for f in formats:
-                self._set_cookie(compat_urllib_parse_urlparse(f['url']).hostname, 'sid_tt', auth_cookie.value)
-
-        thumbnails = []
-        for cover_id in ('cover', 'ai_dynamic_cover', 'animated_cover', 'ai_dynamic_cover_bak',
-                         'origin_cover', 'dynamic_cover'):
-            for cover_url in traverse_obj(video_info, (cover_id, 'url_list', ...)):
-                thumbnails.append({
-                    'id': cover_id,
-                    'url': cover_url,
-                })
+                self._set_cookie(urllib.parse.urlparse(f['url']).hostname, 'sid_tt', auth_cookie.value)
 
         stats_info = aweme_detail.get('statistics') or {}
-        author_info = aweme_detail.get('author') or {}
         music_info = aweme_detail.get('music') or {}
-        user_url = self._UPLOADER_URL_FORMAT % (traverse_obj(author_info,
-                                                             'sec_uid', 'id', 'uid', 'unique_id',
-                                                             expected_type=str_or_none, get_all=False))
         labels = traverse_obj(aweme_detail, ('hybrid_label', ..., 'text'), expected_type=str)
 
         contained_music_track = traverse_obj(
@@ -307,19 +429,23 @@ class TikTokBaseIE(InfoExtractor):
         contained_music_author = traverse_obj(
             music_info, ('matched_song', 'author'), ('matched_pgc_sound', 'author'), 'author', expected_type=str)
 
-        is_generic_og_trackname = music_info.get('is_original_sound') and music_info.get('title') == 'original sound - %s' % music_info.get('owner_handle')
+        is_generic_og_trackname = music_info.get('is_original_sound') and music_info.get('title') == 'original sound - {}'.format(music_info.get('owner_handle'))
         if is_generic_og_trackname:
             music_track, music_author = contained_music_track or 'original sound', contained_music_author
         else:
-            music_track, music_author = music_info.get('title'), music_info.get('author')
+            music_track, music_author = music_info.get('title'), traverse_obj(music_info, ('author', {str}))
+
+        author_info = traverse_obj(aweme_detail, ('author', {
+            'uploader': ('unique_id', {str}),
+            'uploader_id': ('uid', {str_or_none}),
+            'channel': ('nickname', {str}),
+            'channel_id': ('sec_uid', {str}),
+        }))
 
         return {
             'id': aweme_id,
-            'extractor_key': TikTokIE.ie_key(),
-            'extractor': TikTokIE.IE_NAME,
-            'webpage_url': self._create_url(author_info.get('uid'), aweme_id),
             **traverse_obj(aweme_detail, {
-                'title': ('desc', {str}),
+                'title': ('desc', {truncate_string(left=72)}),
                 'description': ('desc', {str}),
                 'timestamp': ('create_time', {int_or_none}),
             }),
@@ -329,20 +455,30 @@ class TikTokBaseIE(InfoExtractor):
                 'repost_count': 'share_count',
                 'comment_count': 'comment_count',
             }, expected_type=int_or_none),
-            **traverse_obj(author_info, {
-                'uploader': 'unique_id',
-                'uploader_id': 'uid',
-                'creator': 'nickname',
-                'channel_id': 'sec_uid',
-            }, expected_type=str_or_none),
-            'uploader_url': user_url,
+            **author_info,
+            'channel_url': format_field(author_info, 'channel_id', self._UPLOADER_URL_FORMAT, default=None),
+            'uploader_url': format_field(
+                author_info, ['uploader', 'uploader_id'], self._UPLOADER_URL_FORMAT, default=None),
             'track': music_track,
             'album': str_or_none(music_info.get('album')) or None,
-            'artist': music_author or None,
+            'artists': re.split(r'(?:, | & )', music_author) if music_author else None,
             'formats': formats,
-            'subtitles': self.extract_subtitles(aweme_detail, aweme_id),
-            'thumbnails': thumbnails,
-            'duration': int_or_none(traverse_obj(video_info, 'duration', ('download_addr', 'duration')), scale=1000),
+            'subtitles': self.extract_subtitles(
+                aweme_detail, aweme_id, traverse_obj(author_info, 'uploader', 'uploader_id', 'channel_id')),
+            'thumbnails': [
+                {
+                    'id': cover_id,
+                    'url': cover_url,
+                    'preference': -1 if cover_id in ('cover', 'origin_cover') else -2,
+                }
+                for cover_id in (
+                    'cover', 'ai_dynamic_cover', 'animated_cover',
+                    'ai_dynamic_cover_bak', 'origin_cover', 'dynamic_cover')
+                for cover_url in traverse_obj(video_info, (cover_id, 'url_list', ...))
+            ],
+            'duration': (traverse_obj(video_info, (
+                (None, 'download_addr'), 'duration', {int_or_none(scale=1000)}, any))
+                or traverse_obj(music_info, ('duration', {int_or_none}))),
             'availability': self._availability(
                 is_private='Private' in labels,
                 needs_subscription='Friends only' in labels,
@@ -350,77 +486,137 @@ class TikTokBaseIE(InfoExtractor):
             '_format_sort_fields': ('quality', 'codec', 'size', 'br'),
         }
 
-    def _parse_aweme_video_web(self, aweme_detail, webpage_url, video_id):
-        video_info = aweme_detail['video']
-        author_info = traverse_obj(aweme_detail, 'authorInfo', 'author', expected_type=dict, default={})
-        music_info = aweme_detail.get('music') or {}
-        stats_info = aweme_detail.get('stats') or {}
-        channel_id = traverse_obj(author_info or aweme_detail, (('authorSecId', 'secUid'), {str}), get_all=False)
-        user_url = self._UPLOADER_URL_FORMAT % channel_id if channel_id else None
-
+    def _extract_web_formats(self, aweme_detail):
+        COMMON_FORMAT_INFO = {
+            'ext': 'mp4',
+            'vcodec': 'h264',
+            'acodec': 'aac',
+        }
+        video_info = traverse_obj(aweme_detail, ('video', {dict})) or {}
+        play_width = int_or_none(video_info.get('width'))
+        play_height = int_or_none(video_info.get('height'))
+        ratio = try_call(lambda: play_width / play_height) or 0.5625
         formats = []
-        width = int_or_none(video_info.get('width'))
-        height = int_or_none(video_info.get('height'))
+
+        for bitrate_info in traverse_obj(video_info, ('bitrateInfo', lambda _, v: v['PlayAddr']['UrlList'])):
+            format_info, res = self._parse_url_key(
+                traverse_obj(bitrate_info, ('PlayAddr', 'UrlKey', {str})) or '')
+            # bytevc2 is bytedance's own custom h266/vvc codec, as-of-yet unplayable
+            is_bytevc2 = format_info.get('vcodec') == 'bytevc2'
+            format_info.update({
+                'format_note': 'UNPLAYABLE' if is_bytevc2 else None,
+                'preference': -100 if is_bytevc2 else -1,
+                'filesize': traverse_obj(bitrate_info, ('PlayAddr', 'DataSize', {int_or_none})),
+            })
+
+            if dimension := (res and int(res[:-1])):
+                if dimension == 540:  # '540p' is actually 576p
+                    dimension = 576
+                if ratio < 1:  # portrait: res/dimension is width
+                    y = int(dimension / ratio)
+                    format_info.update({
+                        'width': dimension,
+                        'height': y - (y % 2),
+                    })
+                else:  # landscape: res/dimension is height
+                    x = int(dimension * ratio)
+                    format_info.update({
+                        'width': x + (x % 2),
+                        'height': dimension,
+                    })
+
+            for video_url in traverse_obj(bitrate_info, ('PlayAddr', 'UrlList', ..., {url_or_none})):
+                formats.append({
+                    **COMMON_FORMAT_INFO,
+                    **format_info,
+                    'url': self._proto_relative_url(video_url),
+                })
+
+        # We don't have res string for play formats, but need quality for sorting & de-duplication
+        play_quality = traverse_obj(formats, (lambda _, v: v['width'] == play_width, 'quality', any))
 
         for play_url in traverse_obj(video_info, ('playAddr', ((..., 'src'), None), {url_or_none})):
             formats.append({
+                **COMMON_FORMAT_INFO,
+                'format_id': 'play',
                 'url': self._proto_relative_url(play_url),
-                'ext': 'mp4',
-                'width': width,
-                'height': height,
+                'width': play_width,
+                'height': play_height,
+                'quality': play_quality,
             })
 
         for download_url in traverse_obj(video_info, (('downloadAddr', ('download', 'url')), {url_or_none})):
             formats.append({
+                **COMMON_FORMAT_INFO,
                 'format_id': 'download',
                 'url': self._proto_relative_url(download_url),
-                'ext': 'mp4',
-                'width': width,
-                'height': height,
+                'format_note': 'watermarked',
+                'preference': -2,
             })
 
         self._remove_duplicate_formats(formats)
 
-        thumbnails = []
-        for thumb_url in traverse_obj(aweme_detail, (
-                (None, 'video'), ('thumbnail', 'cover', 'dynamicCover', 'originCover'), {url_or_none})):
-            thumbnails.append({
-                'url': self._proto_relative_url(thumb_url),
-                'width': width,
-                'height': height,
+        # Is it a slideshow with only audio for download?
+        if not formats and traverse_obj(aweme_detail, ('music', 'playUrl', {url_or_none})):
+            audio_url = aweme_detail['music']['playUrl']
+            ext = traverse_obj(parse_qs(audio_url), (
+                'mime_type', -1, {lambda x: x.replace('_', '/')}, {mimetype2ext})) or 'm4a'
+            formats.append({
+                'format_id': 'audio',
+                'url': self._proto_relative_url(audio_url),
+                'ext': ext,
+                'acodec': 'aac' if ext == 'm4a' else ext,
+                'vcodec': 'none',
             })
 
+        # Filter out broken formats, see https://github.com/yt-dlp/yt-dlp/issues/11034
+        return [f for f in formats if urllib.parse.urlparse(f['url']).hostname != 'www.tiktok.com']
+
+    def _parse_aweme_video_web(self, aweme_detail, webpage_url, video_id, extract_flat=False):
+        author_info = traverse_obj(aweme_detail, (('authorInfo', 'author', None), {
+            'channel': ('nickname', {str}),
+            'channel_id': (('authorSecId', 'secUid'), {str}),
+            'uploader': (('uniqueId', 'author'), {str}),
+            'uploader_id': (('authorId', 'uid', 'id'), {str_or_none}),
+        }), get_all=False)
+
         return {
             'id': video_id,
+            'formats': None if extract_flat else self._extract_web_formats(aweme_detail),
+            'subtitles': None if extract_flat else self.extract_subtitles(aweme_detail, video_id, None),
+            'http_headers': {'Referer': webpage_url},
+            **author_info,
+            'channel_url': format_field(author_info, 'channel_id', self._UPLOADER_URL_FORMAT, default=None),
+            'uploader_url': format_field(
+                author_info, ['uploader', 'uploader_id'], self._UPLOADER_URL_FORMAT, default=None),
+            **traverse_obj(aweme_detail, ('music', {
+                'track': ('title', {str}),
+                'album': ('album', {str}, filter),
+                'artists': ('authorName', {str}, {lambda x: re.split(r'(?:, | & )', x) if x else None}),
+                'duration': ('duration', {int_or_none}),
+            })),
             **traverse_obj(aweme_detail, {
-                'title': ('desc', {str}),
+                'title': ('desc', {truncate_string(left=72)}),
                 'description': ('desc', {str}),
-                'duration': ('video', 'duration', {int_or_none}),
+                # audio-only slideshows have a video duration of 0 and an actual audio duration
+                'duration': ('video', 'duration', {int_or_none}, filter),
                 'timestamp': ('createTime', {int_or_none}),
             }),
-            **traverse_obj(author_info or aweme_detail, {
-                'creator': ('nickname', {str}),
-                'uploader': (('uniqueId', 'author'), {str}),
-                'uploader_id': (('authorId', 'uid', 'id'), {str_or_none}),
-            }, get_all=False),
-            **traverse_obj(stats_info, {
+            **traverse_obj(aweme_detail, ('stats', {
                 'view_count': 'playCount',
                 'like_count': 'diggCount',
                 'repost_count': 'shareCount',
                 'comment_count': 'commentCount',
-            }, expected_type=int_or_none),
-            **traverse_obj(music_info, {
-                'track': 'title',
-                'album': ('album', {lambda x: x or None}),
-                'artist': 'authorName',
-            }, expected_type=str),
-            'channel_id': channel_id,
-            'uploader_url': user_url,
-            'formats': formats,
-            'thumbnails': thumbnails,
-            'http_headers': {
-                'Referer': webpage_url,
-            }
+            }), expected_type=int_or_none),
+            'thumbnails': [
+                {
+                    'id': cover_id,
+                    'url': self._proto_relative_url(cover_url),
+                    'preference': -2 if cover_id == 'dynamicCover' else -1,
+                }
+                for cover_id in ('thumbnail', 'cover', 'dynamicCover', 'originCover')
+                for cover_url in traverse_obj(aweme_detail, ((None, 'video'), cover_id, {url_or_none}))
+            ],
         }
 
 
@@ -457,20 +653,21 @@ class TikTokIE(TikTokBaseIE):
         'skip': '404 Not Found',
     }, {
         'url': 'https://www.tiktok.com/@patroxofficial/video/6742501081818877190?langCountry=en',
-        'md5': '6f3cf8cdd9b28cb8363fe0a9a160695b',
+        'md5': 'f21112672ee4ce05ca390fb6522e1b6f',
         'info_dict': {
             'id': '6742501081818877190',
             'ext': 'mp4',
-            'title': 'md5:5e2a23877420bb85ce6521dbee39ba94',
+            'title': 'Tag 1 Friend reverse this Video and look what happens 🤩😱 @skyandtami ...',
             'description': 'md5:5e2a23877420bb85ce6521dbee39ba94',
             'duration': 27,
-            'height': 960,
-            'width': 540,
+            'height': 1024,
+            'width': 576,
             'uploader': 'patrox',
             'uploader_id': '18702747',
-            'uploader_url': 'https://www.tiktok.com/@MS4wLjABAAAAiFnldaILebi5heDoVU6bn4jBWWycX6-9U3xuNPqZ8Ws',
+            'uploader_url': 'https://www.tiktok.com/@patrox',
+            'channel_url': 'https://www.tiktok.com/@MS4wLjABAAAAiFnldaILebi5heDoVU6bn4jBWWycX6-9U3xuNPqZ8Ws',
             'channel_id': 'MS4wLjABAAAAiFnldaILebi5heDoVU6bn4jBWWycX6-9U3xuNPqZ8Ws',
-            'creator': 'patroX',
+            'channel': 'patroX',
             'thumbnail': r're:^https?://[\w\/\.\-]+(~[\w\-]+\.image)?',
             'upload_date': '20190930',
             'timestamp': 1569860870,
@@ -478,11 +675,11 @@ class TikTokIE(TikTokBaseIE):
             'like_count': int,
             'repost_count': int,
             'comment_count': int,
-            'artist': 'Evan Todd, Jessica Keenan Wynn, Alice Lee, Barrett Wilbert Weed & Jon Eidson',
+            'artists': ['Evan Todd', 'Jessica Keenan Wynn', 'Alice Lee', 'Barrett Wilbert Weed', 'Jon Eidson'],
             'track': 'Big Fun',
         },
     }, {
-        # Banned audio, only available on the app
+        # Banned audio, was available on the app, now works with web too
         'url': 'https://www.tiktok.com/@barudakhb_/video/6984138651336838402',
         'info_dict': {
             'id': '6984138651336838402',
@@ -490,12 +687,13 @@ class TikTokIE(TikTokBaseIE):
             'title': 'Balas @yolaaftwsr hayu yu ? #SquadRandom_ 🔥',
             'description': 'Balas @yolaaftwsr hayu yu ? #SquadRandom_ 🔥',
             'uploader': 'barudakhb_',
-            'creator': 'md5:29f238c49bc0c176cb3cef1a9cea9fa6',
+            'channel': 'md5:29f238c49bc0c176cb3cef1a9cea9fa6',
             'uploader_id': '6974687867511718913',
-            'uploader_url': 'https://www.tiktok.com/@MS4wLjABAAAAbhBwQC-R1iKoix6jDFsF-vBdfx2ABoDjaZrM9fX6arU3w71q3cOWgWuTXn1soZ7d',
+            'uploader_url': 'https://www.tiktok.com/@barudakhb_',
+            'channel_url': 'https://www.tiktok.com/@MS4wLjABAAAAbhBwQC-R1iKoix6jDFsF-vBdfx2ABoDjaZrM9fX6arU3w71q3cOWgWuTXn1soZ7d',
             'channel_id': 'MS4wLjABAAAAbhBwQC-R1iKoix6jDFsF-vBdfx2ABoDjaZrM9fX6arU3w71q3cOWgWuTXn1soZ7d',
             'track': 'Boka Dance',
-            'artist': 'md5:29f238c49bc0c176cb3cef1a9cea9fa6',
+            'artists': ['md5:29f238c49bc0c176cb3cef1a9cea9fa6'],
             'timestamp': 1626121503,
             'duration': 18,
             'thumbnail': r're:^https?://[\w\/\.\-]+(~[\w\-]+\.image)?',
@@ -514,7 +712,7 @@ class TikTokIE(TikTokBaseIE):
             'title': 'Slap and Run!',
             'description': 'Slap and Run!',
             'uploader': 'user440922249',
-            'creator': 'Slap And Run',
+            'channel': 'Slap And Run',
             'uploader_id': '7036055384943690754',
             'uploader_url': 'https://www.tiktok.com/@MS4wLjABAAAATh8Vewkn0LYM7Fo03iec3qKdeCUOcBIouRk1mkiag6h3o_pQu_dUXvZ2EZlGST7_',
             'channel_id': 'MS4wLjABAAAATh8Vewkn0LYM7Fo03iec3qKdeCUOcBIouRk1mkiag6h3o_pQu_dUXvZ2EZlGST7_',
@@ -528,7 +726,7 @@ class TikTokIE(TikTokBaseIE):
             'repost_count': int,
             'comment_count': int,
         },
-        'params': {'skip_download': True},  # XXX: unable to download video data: HTTP Error 403: Forbidden
+        'skip': 'This video is unavailable',
     }, {
         # Video without title and description
         'url': 'https://www.tiktok.com/@pokemonlife22/video/7059698374567611694',
@@ -538,16 +736,17 @@ class TikTokIE(TikTokBaseIE):
             'title': 'TikTok video #7059698374567611694',
             'description': '',
             'uploader': 'pokemonlife22',
-            'creator': 'Pokemon',
+            'channel': 'Pokemon',
             'uploader_id': '6820838815978423302',
-            'uploader_url': 'https://www.tiktok.com/@MS4wLjABAAAA0tF1nBwQVVMyrGu3CqttkNgM68Do1OXUFuCY0CRQk8fEtSVDj89HqoqvbSTmUP2W',
+            'uploader_url': 'https://www.tiktok.com/@pokemonlife22',
+            'channel_url': 'https://www.tiktok.com/@MS4wLjABAAAA0tF1nBwQVVMyrGu3CqttkNgM68Do1OXUFuCY0CRQk8fEtSVDj89HqoqvbSTmUP2W',
             'channel_id': 'MS4wLjABAAAA0tF1nBwQVVMyrGu3CqttkNgM68Do1OXUFuCY0CRQk8fEtSVDj89HqoqvbSTmUP2W',
             'track': 'original sound',
             'timestamp': 1643714123,
             'duration': 6,
             'thumbnail': r're:^https?://[\w\/\.\-]+(~[\w\-]+\.image)?',
             'upload_date': '20220201',
-            'artist': 'Pokemon',
+            'artists': ['Pokemon'],
             'view_count': int,
             'like_count': int,
             'repost_count': int,
@@ -584,36 +783,39 @@ class TikTokIE(TikTokBaseIE):
             'ext': 'mp3',
             'title': 'TikTok video #7139980461132074283',
             'description': '',
-            'creator': 'Antaura',
+            'channel': 'Antaura',
             'uploader': '_le_cannibale_',
             'uploader_id': '6604511138619654149',
-            'uploader_url': 'https://www.tiktok.com/@MS4wLjABAAAAoShJqaw_5gvy48y3azFeFcT4jeyKWbB0VVYasOCt2tTLwjNFIaDcHAM4D-QGXFOP',
+            'uploader_url': 'https://www.tiktok.com/@_le_cannibale_',
+            'channel_url': 'https://www.tiktok.com/@MS4wLjABAAAAoShJqaw_5gvy48y3azFeFcT4jeyKWbB0VVYasOCt2tTLwjNFIaDcHAM4D-QGXFOP',
             'channel_id': 'MS4wLjABAAAAoShJqaw_5gvy48y3azFeFcT4jeyKWbB0VVYasOCt2tTLwjNFIaDcHAM4D-QGXFOP',
-            'artist': 'nathan !',
+            'artists': ['nathan !'],
             'track': 'grahamscott canon',
+            'duration': 10,
             'upload_date': '20220905',
             'timestamp': 1662406249,
             'view_count': int,
             'like_count': int,
             'repost_count': int,
             'comment_count': int,
-            'thumbnail': r're:^https://.+\.webp',
+            'thumbnail': r're:^https://.+\.(?:webp|jpe?g)',
         },
     }, {
         # only available via web
         'url': 'https://www.tiktok.com/@moxypatch/video/7206382937372134662',
-        'md5': '6aba7fad816e8709ff2c149679ace165',
+        'md5': '4cdefa501ac8ac20bf04986e10916fea',
         'info_dict': {
             'id': '7206382937372134662',
             'ext': 'mp4',
             'title': 'md5:1d95c0b96560ca0e8a231af4172b2c0a',
             'description': 'md5:1d95c0b96560ca0e8a231af4172b2c0a',
-            'creator': 'MoxyPatch',
+            'channel': 'MoxyPatch',
             'uploader': 'moxypatch',
             'uploader_id': '7039142049363379205',
-            'uploader_url': 'https://www.tiktok.com/@MS4wLjABAAAAFhqKnngMHJSsifL0w1vFOP5kn3Ndo1ODp0XuIBkNMBCkALTvwILdpu12g3pTtL4V',
+            'uploader_url': 'https://www.tiktok.com/@moxypatch',
+            'channel_url': 'https://www.tiktok.com/@MS4wLjABAAAAFhqKnngMHJSsifL0w1vFOP5kn3Ndo1ODp0XuIBkNMBCkALTvwILdpu12g3pTtL4V',
             'channel_id': 'MS4wLjABAAAAFhqKnngMHJSsifL0w1vFOP5kn3Ndo1ODp0XuIBkNMBCkALTvwILdpu12g3pTtL4V',
-            'artist': 'your worst nightmare',
+            'artists': ['your worst nightmare'],
             'track': 'original sound',
             'upload_date': '20230303',
             'timestamp': 1677866781,
@@ -628,7 +830,7 @@ class TikTokIE(TikTokBaseIE):
         'expected_warnings': ['Unable to find video in feed'],
     }, {
         # 1080p format
-        'url': 'https://www.tiktok.com/@tatemcrae/video/7107337212743830830',
+        'url': 'https://www.tiktok.com/@tatemcrae/video/7107337212743830830',  # FIXME: Web can only get audio
         'md5': '982512017a8a917124d5a08c8ae79621',
         'info_dict': {
             'id': '7107337212743830830',
@@ -639,8 +841,8 @@ class TikTokIE(TikTokBaseIE):
             'uploader_id': '86328792343818240',
             'uploader_url': 'https://www.tiktok.com/@MS4wLjABAAAA-0bQT0CqebTRr6I4IkYvMDMKSRSJHLNPBo5HrSklJwyA2psXLSZG5FP-LMNpHnJd',
             'channel_id': 'MS4wLjABAAAA-0bQT0CqebTRr6I4IkYvMDMKSRSJHLNPBo5HrSklJwyA2psXLSZG5FP-LMNpHnJd',
-            'creator': 'tate mcrae',
-            'artist': 'tate mcrae',
+            'channel': 'tate mcrae',
+            'artists': ['tate mcrae'],
             'track': 'original sound',
             'upload_date': '20220609',
             'timestamp': 1654805899,
@@ -651,7 +853,7 @@ class TikTokIE(TikTokBaseIE):
             'comment_count': int,
             'thumbnail': r're:^https://.+\.webp',
         },
-        'params': {'format': 'bytevc1_1080p_808907-0'},
+        'skip': 'Unavailable via feed API, only audio available via web',
     }, {
         # Slideshow, audio-only m4a format
         'url': 'https://www.tiktok.com/@hara_yoimiya/video/7253412088251534594',
@@ -659,153 +861,197 @@ class TikTokIE(TikTokBaseIE):
         'info_dict': {
             'id': '7253412088251534594',
             'ext': 'm4a',
-            'title': 'я ред флаг простите #переписка #щитпост #тревожныйтиппривязанности #рекомендации ',
+            'title': 'я ред флаг простите #переписка #щитпост #тревожныйтиппривязанности #р...',
             'description': 'я ред флаг простите #переписка #щитпост #тревожныйтиппривязанности #рекомендации ',
             'uploader': 'hara_yoimiya',
             'uploader_id': '6582536342634676230',
-            'uploader_url': 'https://www.tiktok.com/@MS4wLjABAAAAIAlDxriiPWLE-p8p1R_0Bx8qWKfi-7zwmGhzU8Mv25W8sNxjfIKrol31qTczzuLB',
+            'uploader_url': 'https://www.tiktok.com/@hara_yoimiya',
+            'channel_url': 'https://www.tiktok.com/@MS4wLjABAAAAIAlDxriiPWLE-p8p1R_0Bx8qWKfi-7zwmGhzU8Mv25W8sNxjfIKrol31qTczzuLB',
             'channel_id': 'MS4wLjABAAAAIAlDxriiPWLE-p8p1R_0Bx8qWKfi-7zwmGhzU8Mv25W8sNxjfIKrol31qTczzuLB',
-            'creator': 'лампочка',
-            'artist': 'Øneheart',
+            'channel': 'лампочка(!)',
+            'artists': ['Øneheart'],
             'album': 'watching the stars',
             'track': 'watching the stars',
+            'duration': 60,
             'upload_date': '20230708',
             'timestamp': 1688816612,
             'view_count': int,
             'like_count': int,
             'comment_count': int,
             'repost_count': int,
-            'thumbnail': r're:^https://.+\.webp',
+            'thumbnail': r're:^https://.+\.(?:webp|jpe?g)',
         },
     }, {
         # Auto-captions available
         'url': 'https://www.tiktok.com/@hankgreen1/video/7047596209028074758',
-        'only_matching': True
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
         video_id, user_id = self._match_valid_url(url).group('id', 'user_id')
-        try:
-            return self._extract_aweme_app(video_id)
-        except ExtractorError as e:
-            self.report_warning(f'{e}; trying with webpage')
+
+        if self._KNOWN_APP_INFO:
+            try:
+                return self._extract_aweme_app(video_id)
+            except ExtractorError as e:
+                e.expected = True
+                self.report_warning(f'{e}; trying with webpage')
 
         url = self._create_url(user_id, video_id)
-        webpage = self._download_webpage(url, video_id, headers={'User-Agent': 'Mozilla/5.0'})
-        next_data = self._search_nextjs_data(webpage, video_id, default='{}')
-        if next_data:
-            status = traverse_obj(next_data, ('props', 'pageProps', 'statusCode'), expected_type=int) or 0
-            video_data = traverse_obj(next_data, ('props', 'pageProps', 'itemInfo', 'itemStruct'), expected_type=dict)
-        else:
-            sigi_data = self._get_sigi_state(webpage, video_id)
-            status = traverse_obj(sigi_data, ('VideoPage', 'statusCode'), expected_type=int) or 0
-            video_data = traverse_obj(sigi_data, ('ItemModule', video_id), expected_type=dict)
+        video_data, status = self._extract_web_data_and_status(url, video_id)
 
-        if status == 0:
+        if video_data and status == 0:
             return self._parse_aweme_video_web(video_data, url, video_id)
-        elif status == 10216:
-            raise ExtractorError('This video is private', expected=True)
-        raise ExtractorError('Video not available', video_id=video_id)
+        elif status in (10216, 10222):
+            # 10216: private post; 10222: private account
+            self.raise_login_required(
+                'You do not have permission to view this post. Log into an account that has access')
+        elif status == 10204:
+            raise ExtractorError('Your IP address is blocked from accessing this post', expected=True)
+        raise ExtractorError(f'Video not available, status code {status}', video_id=video_id)
 
 
 class TikTokUserIE(TikTokBaseIE):
     IE_NAME = 'tiktok:user'
-    _VALID_URL = r'https?://(?:www\.)?tiktok\.com/@(?P<id>[\w\.-]+)/?(?:$|[#?])'
-    _WORKING = False
+    _VALID_URL = r'(?:tiktokuser:|https?://(?:www\.)?tiktok\.com/@)(?P<id>[\w.-]+)/?(?:$|[#?])'
     _TESTS = [{
         'url': 'https://tiktok.com/@corgibobaa?lang=en',
         'playlist_mincount': 45,
         'info_dict': {
-            'id': '6935371178089399301',
+            'id': 'MS4wLjABAAAAepiJKgwWhulvCpSuUVsp7sgVVsFJbbNaLeQ6OQ0oAJERGDUIXhb2yxxHZedsItgT',
             'title': 'corgibobaa',
-            'thumbnail': r're:https://.+_1080x1080\.webp'
         },
-        'expected_warnings': ['Retrying']
     }, {
         'url': 'https://www.tiktok.com/@6820838815978423302',
         'playlist_mincount': 5,
         'info_dict': {
-            'id': '6820838815978423302',
+            'id': 'MS4wLjABAAAA0tF1nBwQVVMyrGu3CqttkNgM68Do1OXUFuCY0CRQk8fEtSVDj89HqoqvbSTmUP2W',
             'title': '6820838815978423302',
-            'thumbnail': r're:https://.+_1080x1080\.webp'
         },
-        'expected_warnings': ['Retrying']
     }, {
         'url': 'https://www.tiktok.com/@meme',
         'playlist_mincount': 593,
         'info_dict': {
-            'id': '79005827461758976',
+            'id': 'MS4wLjABAAAAiKfaDWeCsT3IHwY77zqWGtVRIy9v4ws1HbVi7auP1Vx7dJysU_hc5yRiGywojRD6',
             'title': 'meme',
-            'thumbnail': r're:https://.+_1080x1080\.webp'
         },
-        'expected_warnings': ['Retrying']
+    }, {
+        'url': 'tiktokuser:MS4wLjABAAAAM3R2BtjzVT-uAtstkl2iugMzC6AtnpkojJbjiOdDDrdsTiTR75-8lyWJCY5VvDrZ',
+        'playlist_mincount': 31,
+        'info_dict': {
+            'id': 'MS4wLjABAAAAM3R2BtjzVT-uAtstkl2iugMzC6AtnpkojJbjiOdDDrdsTiTR75-8lyWJCY5VvDrZ',
+        },
     }]
+    _USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:115.0) Gecko/20100101 Firefox/115.0'
+    _API_BASE_URL = 'https://www.tiktok.com/api/creator/item_list/'
 
-    r'''  # TODO: Fix by adding _signature to api_url
-    def _entries(self, webpage, user_id, username):
-        secuid = self._search_regex(r'\"secUid\":\"(?P<secUid>[^\"]+)', webpage, username)
-        verifyfp_cookie = self._get_cookies('https://www.tiktok.com').get('s_v_web_id')
-        if not verifyfp_cookie:
-            raise ExtractorError('Improper cookies (missing s_v_web_id).', expected=True)
-        api_url = f'https://m.tiktok.com/api/post/item_list/?aid=1988&cookie_enabled=true&count=30&verifyFp={verifyfp_cookie.value}&secUid={secuid}&cursor='
-        cursor = '0'
-        for page in itertools.count():
-            data_json = self._download_json(api_url + cursor, username, note='Downloading Page %d' % page)
-            for video in data_json.get('itemList', []):
-                video_id = video['id']
-                video_url = f'https://www.tiktok.com/@{user_id}/video/{video_id}'
-                yield self._url_result(video_url, 'TikTok', video_id, str_or_none(video.get('desc')))
-            if not data_json.get('hasMore'):
-                break
-            cursor = data_json['cursor']
-    '''
-
-    def _video_entries_api(self, webpage, user_id, username):
-        query = {
-            'user_id': user_id,
-            'count': 21,
-            'max_cursor': 0,
-            'min_cursor': 0,
-            'retry_type': 'no_retry',
-            'device_id': ''.join(random.choices(string.digits, k=19)),  # Some endpoints don't like randomized device_id, so it isn't directly set in _call_api.
+    def _build_web_query(self, sec_uid, cursor):
+        return {
+            'aid': '1988',
+            'app_language': 'en',
+            'app_name': 'tiktok_web',
+            'browser_language': 'en-US',
+            'browser_name': 'Mozilla',
+            'browser_online': 'true',
+            'browser_platform': 'Win32',
+            'browser_version': '5.0 (Windows)',
+            'channel': 'tiktok_web',
+            'cookie_enabled': 'true',
+            'count': '15',
+            'cursor': cursor,
+            'device_id': self._DEVICE_ID,
+            'device_platform': 'web_pc',
+            'focus_state': 'true',
+            'from_page': 'user',
+            'history_len': '2',
+            'is_fullscreen': 'false',
+            'is_page_visible': 'true',
+            'language': 'en',
+            'os': 'windows',
+            'priority_region': '',
+            'referer': '',
+            'region': 'US',
+            'screen_height': '1080',
+            'screen_width': '1920',
+            'secUid': sec_uid,
+            'type': '1',  # pagination type: 0 == oldest-to-newest, 1 == newest-to-oldest
+            'tz_name': 'UTC',
+            'verifyFp': f'verify_{"".join(random.choices(string.hexdigits, k=7))}',
+            'webcast_language': 'en',
         }
 
-        for page in itertools.count(1):
-            for retry in self.RetryManager():
-                try:
-                    post_list = self._call_api(
-                        'aweme/post', query, username, note=f'Downloading user video list page {page}',
-                        errnote='Unable to download user video list')
-                except ExtractorError as e:
-                    if isinstance(e.cause, json.JSONDecodeError) and e.cause.pos == 0:
-                        retry.error = e
-                        continue
-                    raise
-            yield from post_list.get('aweme_list', [])
-            if not post_list.get('has_more'):
-                break
-            query['max_cursor'] = post_list['max_cursor']
+    def _entries(self, sec_uid, user_name):
+        display_id = user_name or sec_uid
+        seen_ids = set()
 
-    def _entries_api(self, user_id, videos):
-        for video in videos:
-            yield {
-                **self._parse_aweme_video_app(video),
-                'extractor_key': TikTokIE.ie_key(),
-                'extractor': 'TikTok',
-                'webpage_url': f'https://tiktok.com/@{user_id}/video/{video["aweme_id"]}',
-            }
+        cursor = int(time.time() * 1E3)
+        for page in itertools.count(1):
+            response = self._download_json(
+                self._API_BASE_URL, display_id, f'Downloading page {page}',
+                query=self._build_web_query(sec_uid, cursor), headers={'User-Agent': self._USER_AGENT})
+
+            for video in traverse_obj(response, ('itemList', lambda _, v: v['id'])):
+                video_id = video['id']
+                if video_id in seen_ids:
+                    continue
+                seen_ids.add(video_id)
+                webpage_url = self._create_url(display_id, video_id)
+                yield self.url_result(
+                    webpage_url, TikTokIE,
+                    **self._parse_aweme_video_web(video, webpage_url, video_id, extract_flat=True))
+
+            old_cursor = cursor
+            cursor = traverse_obj(
+                response, ('itemList', -1, 'createTime', {lambda x: int(x * 1E3)}))
+            if not cursor or old_cursor == cursor:
+                # User may not have posted within this ~1 week lookback, so manually adjust cursor
+                cursor = old_cursor - 7 * 86_400_000
+            # In case 'hasMorePrevious' is wrong, break if we have gone back before TikTok existed
+            if cursor < 1472706000000 or not traverse_obj(response, 'hasMorePrevious'):
+                break
+
+    def _get_sec_uid(self, user_url, user_name, msg):
+        webpage = self._download_webpage(
+            user_url, user_name, fatal=False, headers={'User-Agent': 'Mozilla/5.0'},
+            note=f'Downloading {msg} webpage', errnote=f'Unable to download {msg} webpage') or ''
+        return (traverse_obj(self._get_universal_data(webpage, user_name),
+                             ('webapp.user-detail', 'userInfo', 'user', 'secUid', {str}))
+                or traverse_obj(self._get_sigi_state(webpage, user_name),
+                                ('LiveRoom', 'liveRoomUserInfo', 'user', 'secUid', {str}),
+                                ('UserModule', 'users', ..., 'secUid', {str}, any)))
 
     def _real_extract(self, url):
-        user_name = self._match_id(url)
-        webpage = self._download_webpage(url, user_name, headers={
-            'User-Agent': 'facebookexternalhit/1.1 (+http://www.facebook.com/externalhit_uatext.php)'
-        })
-        user_id = self._html_search_regex(r'snssdk\d*://user/profile/(\d+)', webpage, 'user ID', default=None) or user_name
+        user_name, sec_uid = self._match_id(url), None
+        if mobj := re.fullmatch(r'MS4wLjABAAAA[\w-]{64}', user_name):
+            user_name, sec_uid = None, mobj.group(0)
+        else:
+            sec_uid = (self._get_sec_uid(self._UPLOADER_URL_FORMAT % user_name, user_name, 'user')
+                       or self._get_sec_uid(self._UPLOADER_URL_FORMAT % f'{user_name}/live', user_name, 'live'))
 
-        videos = LazyList(self._video_entries_api(webpage, user_id, user_name))
-        thumbnail = traverse_obj(videos, (0, 'author', 'avatar_larger', 'url_list', 0))
+        if not sec_uid:
+            webpage = self._download_webpage(
+                f'https://www.tiktok.com/embed/@{user_name}', user_name,
+                note='Downloading user embed page', fatal=False) or ''
+            data = traverse_obj(self._search_json(
+                r'<script[^>]+\bid=[\'"]__FRONTITY_CONNECT_STATE__[\'"][^>]*>',
+                webpage, 'data', user_name, default={}),
+                ('source', 'data', f'/embed/@{user_name}', {dict}))
 
-        return self.playlist_result(self._entries_api(user_id, videos), user_id, user_name, thumbnail=thumbnail)
+            for aweme_id in traverse_obj(data, ('videoList', ..., 'id', {str})):
+                webpage_url = self._create_url(user_name, aweme_id)
+                video_data, _ = self._extract_web_data_and_status(webpage_url, aweme_id, fatal=False)
+                sec_uid = self._parse_aweme_video_web(
+                    video_data, webpage_url, aweme_id, extract_flat=True).get('channel_id')
+                if sec_uid:
+                    break
+
+        if not sec_uid:
+            raise ExtractorError(
+                'Unable to extract secondary user ID. If you are able to get the channel_id '
+                'from a video posted by this user, try using "tiktokuser:channel_id" as the '
+                'input URL (replacing `channel_id` with its actual value)', expected=True)
+
+        return self.playlist_result(self._entries(sec_uid, user_name), sec_uid, user_name)
 
 
 class TikTokBaseListIE(TikTokBaseIE):  # XXX: Conventionally, base classes should end with BaseIE/InfoExtractor
@@ -815,14 +1061,15 @@ class TikTokBaseListIE(TikTokBaseIE):  # XXX: Conventionally, base classes shoul
             'cursor': 0,
             'count': 20,
             'type': 5,
-            'device_id': ''.join(random.choices(string.digits, k=19))
+            'device_id': self._DEVICE_ID,
         }
 
         for page in itertools.count(1):
             for retry in self.RetryManager():
                 try:
                     post_list = self._call_api(
-                        self._API_ENDPOINT, query, display_id, note=f'Downloading video list page {page}',
+                        self._API_ENDPOINT, display_id, query=query,
+                        note=f'Downloading video list page {page}',
                         errnote='Unable to download video list')
                 except ExtractorError as e:
                     if isinstance(e.cause, json.JSONDecodeError) and e.cause.pos == 0:
@@ -855,17 +1102,17 @@ class TikTokSoundIE(TikTokBaseListIE):
         'url': 'https://www.tiktok.com/music/Build-a-Btch-6956990112127585029?lang=en',
         'playlist_mincount': 100,
         'info_dict': {
-            'id': '6956990112127585029'
+            'id': '6956990112127585029',
         },
-        'expected_warnings': ['Retrying']
+        'expected_warnings': ['Retrying'],
     }, {
         # Actual entries are less than listed video count
         'url': 'https://www.tiktok.com/music/jiefei-soap-remix-7036843036118469381',
         'playlist_mincount': 2182,
         'info_dict': {
-            'id': '7036843036118469381'
+            'id': '7036843036118469381',
         },
-        'expected_warnings': ['Retrying']
+        'expected_warnings': ['Retrying'],
     }]
 
 
@@ -881,11 +1128,11 @@ class TikTokEffectIE(TikTokBaseListIE):
         'info_dict': {
             'id': '1258156',
         },
-        'expected_warnings': ['Retrying']
+        'expected_warnings': ['Retrying'],
     }, {
         # Different entries between mobile and web, depending on region
         'url': 'https://www.tiktok.com/sticker/Elf-Friend-479565',
-        'only_matching': True
+        'only_matching': True,
     }]
 
 
@@ -902,39 +1149,99 @@ class TikTokTagIE(TikTokBaseListIE):
             'id': '46294678',
             'title': 'hello2018',
         },
-        'expected_warnings': ['Retrying']
+        'expected_warnings': ['Retrying'],
     }, {
         'url': 'https://tiktok.com/tag/fypシ?is_copy_url=0&is_from_webapp=v1',
-        'only_matching': True
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
         display_id = self._match_id(url)
         webpage = self._download_webpage(url, display_id, headers={
-            'User-Agent': 'facebookexternalhit/1.1 (+http://www.facebook.com/externalhit_uatext.php)'
+            'User-Agent': 'facebookexternalhit/1.1 (+http://www.facebook.com/externalhit_uatext.php)',
         })
         tag_id = self._html_search_regex(r'snssdk\d*://challenge/detail/(\d+)', webpage, 'tag ID')
         return self.playlist_result(self._entries(tag_id, display_id), tag_id, display_id)
 
 
+class TikTokCollectionIE(TikTokBaseIE):
+    IE_NAME = 'tiktok:collection'
+    _VALID_URL = r'https?://www\.tiktok\.com/@(?P<user_id>[\w.-]+)/collection/(?P<title>[^/?#]+)-(?P<id>\d+)/?(?:[?#]|$)'
+    _TESTS = [{
+        # playlist should have exactly 9 videos
+        'url': 'https://www.tiktok.com/@imanoreotwe/collection/count-test-7371330159376370462',
+        'info_dict': {
+            'id': '7371330159376370462',
+            'title': 'imanoreotwe-count-test',
+        },
+        'playlist_count': 9,
+    }, {
+        # tests returning multiple pages of a large collection
+        'url': 'https://www.tiktok.com/@imanoreotwe/collection/%F0%9F%98%82-7111887189571160875',
+        'info_dict': {
+            'id': '7111887189571160875',
+            'title': 'imanoreotwe-%F0%9F%98%82',
+        },
+        'playlist_mincount': 100,
+    }]
+    _API_BASE_URL = 'https://www.tiktok.com/api/collection/item_list/'
+    _PAGE_COUNT = 30
+
+    def _build_web_query(self, collection_id, cursor):
+        return {
+            'aid': '1988',
+            'collectionId': collection_id,
+            'count': self._PAGE_COUNT,
+            'cursor': cursor,
+            'sourceType': '113',
+        }
+
+    def _entries(self, collection_id):
+        cursor = 0
+        for page in itertools.count(1):
+            response = self._download_json(
+                self._API_BASE_URL, collection_id, f'Downloading page {page}',
+                query=self._build_web_query(collection_id, cursor))
+
+            for video in traverse_obj(response, ('itemList', lambda _, v: v['id'])):
+                video_id = video['id']
+                author = traverse_obj(video, ('author', ('uniqueId', 'secUid', 'id'), {str}, any)) or '_'
+                webpage_url = self._create_url(author, video_id)
+                yield self.url_result(
+                    webpage_url, TikTokIE,
+                    **self._parse_aweme_video_web(video, webpage_url, video_id, extract_flat=True))
+
+            if not traverse_obj(response, 'hasMore'):
+                break
+            cursor += self._PAGE_COUNT
+
+    def _real_extract(self, url):
+        collection_id, title, user_name = self._match_valid_url(url).group('id', 'title', 'user_id')
+
+        return self.playlist_result(
+            self._entries(collection_id), collection_id, '-'.join((user_name, title)))
+
+
 class DouyinIE(TikTokBaseIE):
     _VALID_URL = r'https?://(?:www\.)?douyin\.com/video/(?P<id>[0-9]+)'
     _TESTS = [{
         'url': 'https://www.douyin.com/video/6961737553342991651',
-        'md5': 'a97db7e3e67eb57bf40735c022ffa228',
+        'md5': '9ecce7bc5b302601018ecb2871c63a75',
         'info_dict': {
             'id': '6961737553342991651',
             'ext': 'mp4',
             'title': '#杨超越  小小水手带你去远航❤️',
             'description': '#杨超越  小小水手带你去远航❤️',
+            'uploader': '6897520xka',
             'uploader_id': '110403406559',
             'uploader_url': 'https://www.douyin.com/user/MS4wLjABAAAAEKnfa654JAJ_N5lgZDQluwsxmY0lhfmEYNQBBkwGG98',
             'channel_id': 'MS4wLjABAAAAEKnfa654JAJ_N5lgZDQluwsxmY0lhfmEYNQBBkwGG98',
-            'creator': '杨超越',
-            'duration': 19782,
+            'channel': '杨超越',
+            'duration': 19,
             'timestamp': 1620905839,
             'upload_date': '20210513',
             'track': '@杨超越创作的原声',
+            'artists': ['杨超越'],
             'view_count': int,
             'like_count': int,
             'repost_count': int,
@@ -943,20 +1250,22 @@ class DouyinIE(TikTokBaseIE):
         },
     }, {
         'url': 'https://www.douyin.com/video/6982497745948921092',
-        'md5': '34a87ebff3833357733da3fe17e37c0e',
+        'md5': '15c5e660b7048af3707304e3cc02bbb5',
         'info_dict': {
             'id': '6982497745948921092',
             'ext': 'mp4',
             'title': '这个夏日和小羊@杨超越 一起遇见白色幻想',
             'description': '这个夏日和小羊@杨超越 一起遇见白色幻想',
+            'uploader': '0731chaoyue',
             'uploader_id': '408654318141572',
             'uploader_url': 'https://www.douyin.com/user/MS4wLjABAAAAZJpnglcjW2f_CMVcnqA_6oVBXKWMpH0F8LIHuUu8-lA',
             'channel_id': 'MS4wLjABAAAAZJpnglcjW2f_CMVcnqA_6oVBXKWMpH0F8LIHuUu8-lA',
-            'creator': '杨超越工作室',
-            'duration': 42479,
+            'channel': '杨超越工作室',
+            'duration': 42,
             'timestamp': 1625739481,
             'upload_date': '20210708',
             'track': '@杨超越工作室创作的原声',
+            'artists': ['杨超越工作室'],
             'view_count': int,
             'like_count': int,
             'repost_count': int,
@@ -965,20 +1274,22 @@ class DouyinIE(TikTokBaseIE):
         },
     }, {
         'url': 'https://www.douyin.com/video/6953975910773099811',
-        'md5': 'dde3302460f19db59c47060ff013b902',
+        'md5': '0e6443758b8355db9a3c34864a4276be',
         'info_dict': {
             'id': '6953975910773099811',
             'ext': 'mp4',
             'title': '#一起看海  出现在你的夏日里',
             'description': '#一起看海  出现在你的夏日里',
+            'uploader': '6897520xka',
             'uploader_id': '110403406559',
             'uploader_url': 'https://www.douyin.com/user/MS4wLjABAAAAEKnfa654JAJ_N5lgZDQluwsxmY0lhfmEYNQBBkwGG98',
             'channel_id': 'MS4wLjABAAAAEKnfa654JAJ_N5lgZDQluwsxmY0lhfmEYNQBBkwGG98',
-            'creator': '杨超越',
-            'duration': 17343,
+            'channel': '杨超越',
+            'duration': 17,
             'timestamp': 1619098692,
             'upload_date': '20210422',
             'track': '@杨超越创作的原声',
+            'artists': ['杨超越'],
             'view_count': int,
             'like_count': int,
             'repost_count': int,
@@ -1004,20 +1315,22 @@ class DouyinIE(TikTokBaseIE):
         'skip': 'No longer available',
     }, {
         'url': 'https://www.douyin.com/video/6963263655114722595',
-        'md5': 'cf9f11f0ec45d131445ec2f06766e122',
+        'md5': '1440bcf59d8700f8e014da073a4dfea8',
         'info_dict': {
             'id': '6963263655114722595',
             'ext': 'mp4',
             'title': '#哪个爱豆的105度最甜 换个角度看看我哈哈',
             'description': '#哪个爱豆的105度最甜 换个角度看看我哈哈',
+            'uploader': '6897520xka',
             'uploader_id': '110403406559',
             'uploader_url': 'https://www.douyin.com/user/MS4wLjABAAAAEKnfa654JAJ_N5lgZDQluwsxmY0lhfmEYNQBBkwGG98',
             'channel_id': 'MS4wLjABAAAAEKnfa654JAJ_N5lgZDQluwsxmY0lhfmEYNQBBkwGG98',
-            'creator': '杨超越',
-            'duration': 15115,
+            'channel': '杨超越',
+            'duration': 15,
             'timestamp': 1621261163,
             'upload_date': '20210517',
             'track': '@杨超越创作的原声',
+            'artists': ['杨超越'],
             'view_count': int,
             'like_count': int,
             'repost_count': int,
@@ -1025,34 +1338,23 @@ class DouyinIE(TikTokBaseIE):
             'thumbnail': r're:https?://.+\.jpe?g',
         },
     }]
-    _APP_VERSIONS = [('23.3.0', '230300')]
-    _APP_NAME = 'aweme'
-    _AID = 1128
-    _API_HOSTNAME = 'aweme.snssdk.com'
     _UPLOADER_URL_FORMAT = 'https://www.douyin.com/user/%s'
     _WEBPAGE_HOST = 'https://www.douyin.com/'
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
 
-        try:
-            return self._extract_aweme_app(video_id)
-        except ExtractorError as e:
-            e.expected = True
-            self.to_screen(f'{e}; trying with webpage')
-
-        webpage = self._download_webpage(url, video_id)
-        render_data = self._search_json(
-            r'<script [^>]*\bid=[\'"]RENDER_DATA[\'"][^>]*>', webpage, 'render data', video_id,
-            contains_pattern=r'%7B(?s:.+)%7D', fatal=False, transform_source=compat_urllib_parse_unquote)
-        if not render_data:
+        detail = traverse_obj(self._download_json(
+            'https://www.douyin.com/aweme/v1/web/aweme/detail/', video_id,
+            'Downloading web detail JSON', 'Failed to download web detail JSON',
+            query={'aweme_id': video_id}, fatal=False), ('aweme_detail', {dict}))
+        if not detail:
             # TODO: Run verification challenge code to generate signature cookies
-            cookies = self._get_cookies(self._WEBPAGE_HOST)
-            expected = not cookies.get('s_v_web_id') or not cookies.get('ttwid')
             raise ExtractorError(
-                'Fresh cookies (not necessarily logged in) are needed', expected=expected)
+                'Fresh cookies (not necessarily logged in) are needed',
+                expected=not self._get_cookies(self._WEBPAGE_HOST).get('s_v_web_id'))
 
-        return self._parse_aweme_video_web(get_first(render_data, ('aweme', 'detail')), url, video_id)
+        return self._parse_aweme_video_app(detail)
 
 
 class TikTokVMIE(InfoExtractor):
@@ -1181,10 +1483,12 @@ class TikTokLiveIE(TikTokBaseIE):
             url, uploader or room_id, headers={'User-Agent': 'Mozilla/5.0'}, fatal=not room_id)
 
         if webpage:
-            data = try_call(lambda: self._get_sigi_state(webpage, uploader or room_id))
-            room_id = (traverse_obj(data, ('UserModule', 'users', ..., 'roomId', {str_or_none}), get_all=False)
-                       or self._search_regex(r'snssdk\d*://live\?room_id=(\d+)', webpage, 'room ID', default=None)
-                       or room_id)
+            data = self._get_sigi_state(webpage, uploader or room_id)
+            room_id = (
+                traverse_obj(data, ((
+                    ('LiveRoom', 'liveRoomUserInfo', 'user'),
+                    ('UserModule', 'users', ...)), 'roomId', {str}, any))
+                or self._search_regex(r'snssdk\d*://live\?room_id=(\d+)', webpage, 'room ID', default=room_id))
             uploader = uploader or traverse_obj(
                 data, ('LiveRoom', 'liveRoomUserInfo', 'user', 'uniqueId'),
                 ('UserModule', 'users', ..., 'uniqueId'), get_all=False, expected_type=str)
@@ -1205,7 +1509,7 @@ class TikTokLiveIE(TikTokBaseIE):
 
             sdk_params = traverse_obj(stream, ('main', 'sdk_params', {parse_inner}, {
                 'vcodec': ('VCodec', {str}),
-                'tbr': ('vbitrate', {lambda x: int_or_none(x, 1000)}),
+                'tbr': ('vbitrate', {int_or_none(scale=1000)}),
                 'resolution': ('resolution', {lambda x: re.match(r'(?i)\d+x\d+|\d+p', x).group().lower()}),
             }))
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/tinypic.py b/plugins/youtube_download/yt_dlp/extractor/tinypic.py
deleted file mode 100644
index 216208c..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/tinypic.py
+++ /dev/null
@@ -1,54 +0,0 @@
-import re
-
-from .common import InfoExtractor
-from ..utils import ExtractorError
-
-
-class TinyPicIE(InfoExtractor):
-    IE_NAME = 'tinypic'
-    IE_DESC = 'tinypic.com videos'
-    _VALID_URL = r'https?://(?:.+?\.)?tinypic\.com/player\.php\?v=(?P<id>[^&]+)&s=\d+'
-
-    _TESTS = [
-        {
-            'url': 'http://tinypic.com/player.php?v=6xw7tc%3E&s=5#.UtqZmbRFCM8',
-            'md5': '609b74432465364e72727ebc6203f044',
-            'info_dict': {
-                'id': '6xw7tc',
-                'ext': 'flv',
-                'title': 'shadow phenomenon weird',
-            },
-        },
-        {
-            'url': 'http://de.tinypic.com/player.php?v=dy90yh&s=8',
-            'only_matching': True,
-        }
-    ]
-
-    def _real_extract(self, url):
-        mobj = self._match_valid_url(url)
-        video_id = mobj.group('id')
-
-        webpage = self._download_webpage(url, video_id, 'Downloading page')
-
-        mobj = re.search(r'(?m)fo\.addVariable\("file",\s"(?P<fileid>[\da-z]+)"\);\n'
-                         r'\s+fo\.addVariable\("s",\s"(?P<serverid>\d+)"\);', webpage)
-        if mobj is None:
-            raise ExtractorError('Video %s does not exist' % video_id, expected=True)
-
-        file_id = mobj.group('fileid')
-        server_id = mobj.group('serverid')
-
-        KEYWORDS_SUFFIX = ', Video, images, photos, videos, myspace, ebay, video hosting, photo hosting'
-        keywords = self._html_search_meta('keywords', webpage, 'title')
-        title = keywords[:-len(KEYWORDS_SUFFIX)] if keywords.endswith(KEYWORDS_SUFFIX) else ''
-
-        video_url = 'http://v%s.tinypic.com/%s.flv' % (server_id, file_id)
-        thumbnail = 'http://v%s.tinypic.com/%s_th.jpg' % (server_id, file_id)
-
-        return {
-            'id': file_id,
-            'url': video_url,
-            'thumbnail': thumbnail,
-            'title': title
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/tmz.py b/plugins/youtube_download/yt_dlp/extractor/tmz.py
index ffb30c6..c9f23a8 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tmz.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tmz.py
@@ -8,158 +8,160 @@ from ..utils import (
 
 
 class TMZIE(InfoExtractor):
-    _VALID_URL = r"https?://(?:www\.)?tmz\.com/.*"
+    _VALID_URL = r'https?://(?:www\.)?tmz\.com/.*'
     _TESTS = [
         {
-            "url": "http://www.tmz.com/videos/0-cegprt2p/",
-            "info_dict": {
-                "id": "http://www.tmz.com/videos/0-cegprt2p/",
-                "ext": "mp4",
-                "title": "No Charges Against Hillary Clinton? Harvey Says It Ain't Over Yet",
-                "description": "Harvey talks about Director Comey’s decision not to prosecute Hillary Clinton.",
-                "timestamp": 1467831837,
-                "uploader": "TMZ Staff",
-                "upload_date": "20160706",
-                "thumbnail": "https://imagez.tmz.com/image/5e/4by3/2016/07/06/5eea7dc01baa5c2e83eb06930c170e46_xl.jpg",
-                "duration": 772.0,
+            'url': 'http://www.tmz.com/videos/0-cegprt2p/',
+            'info_dict': {
+                'id': 'http://www.tmz.com/videos/0-cegprt2p/',
+                'ext': 'mp4',
+                'title': 'No Charges Against Hillary Clinton? Harvey Says It Ain\'t Over Yet',
+                'description': 'Harvey talks about Director Comey’s decision not to prosecute Hillary Clinton.',
+                'timestamp': 1467831837,
+                'uploader': 'TMZ Staff',
+                'upload_date': '20160706',
+                'thumbnail': 'https://imagez.tmz.com/image/5e/4by3/2016/07/06/5eea7dc01baa5c2e83eb06930c170e46_xl.jpg',
+                'duration': 772.0,
             },
         },
         {
-            "url": "https://www.tmz.com/videos/071119-chris-morgan-women-4590005-0-zcsejvcr/",
-            "info_dict": {
-                "id": "https://www.tmz.com/videos/071119-chris-morgan-women-4590005-0-zcsejvcr/",
-                "ext": "mp4",
-                "title": "Angry Bagel Shop Guy Says He Doesn't Trust Women",
-                "description": "The enraged man who went viral for ranting about women on dating sites before getting ragdolled in a bagel shop is defending his misogyny ... he says it's women's fault in the first place.",
-                "timestamp": 1562889485,
-                "uploader": "TMZ Staff",
-                "upload_date": "20190711",
-                "thumbnail": "https://imagez.tmz.com/image/a8/4by3/2019/07/12/a85480d27b2f50a7bfea2322151d67a5_xl.jpg",
-                "duration": 123.0,
+            'url': 'https://www.tmz.com/videos/071119-chris-morgan-women-4590005-0-zcsejvcr/',
+            'info_dict': {
+                'id': 'https://www.tmz.com/videos/071119-chris-morgan-women-4590005-0-zcsejvcr/',
+                'ext': 'mp4',
+                'title': 'Angry Bagel Shop Guy Says He Doesn\'t Trust Women',
+                'description': 'The enraged man who went viral for ranting about women on dating sites before getting ragdolled in a bagel shop is defending his misogyny ... he says it\'s women\'s fault in the first place.',
+                'timestamp': 1562889485,
+                'uploader': 'TMZ Staff',
+                'upload_date': '20190711',
+                'thumbnail': 'https://imagez.tmz.com/image/a8/4by3/2019/07/12/a85480d27b2f50a7bfea2322151d67a5_xl.jpg',
+                'duration': 123.0,
             },
         },
         {
-            "url": "http://www.tmz.com/2015/04/19/bobby-brown-bobbi-kristina-awake-video-concert",
-            "md5": "5429c85db8bde39a473a56ca8c4c5602",
-            "info_dict": {
-                "id": "http://www.tmz.com/2015/04/19/bobby-brown-bobbi-kristina-awake-video-concert",
-                "ext": "mp4",
-                "title": "Bobby Brown Tells Crowd ... Bobbi Kristina is Awake",
-                "description": 'Bobby Brown stunned his audience during a concert Saturday night, when he told the crowd, "Bobbi is awake.  She\'s watching me."',
-                "timestamp": 1429467813,
-                "uploader": "TMZ Staff",
-                "upload_date": "20150419",
-                "duration": 29.0,
-                "thumbnail": "https://imagez.tmz.com/image/15/4by3/2015/04/20/1539c7ae136359fc979236fa6a9449dd_xl.jpg",
+            'url': 'http://www.tmz.com/2015/04/19/bobby-brown-bobbi-kristina-awake-video-concert',
+            'md5': '5429c85db8bde39a473a56ca8c4c5602',
+            'info_dict': {
+                'id': 'http://www.tmz.com/2015/04/19/bobby-brown-bobbi-kristina-awake-video-concert',
+                'ext': 'mp4',
+                'title': 'Bobby Brown Tells Crowd ... Bobbi Kristina is Awake',
+                'description': 'Bobby Brown stunned his audience during a concert Saturday night, when he told the crowd, "Bobbi is awake.  She\'s watching me."',
+                'timestamp': 1429467813,
+                'uploader': 'TMZ Staff',
+                'upload_date': '20150419',
+                'duration': 29.0,
+                'thumbnail': 'https://imagez.tmz.com/image/15/4by3/2015/04/20/1539c7ae136359fc979236fa6a9449dd_xl.jpg',
             },
         },
         {
-            "url": "http://www.tmz.com/2015/09/19/patti-labelle-concert-fan-stripping-kicked-out-nicki-minaj/",
-            "info_dict": {
-                "id": "http://www.tmz.com/2015/09/19/patti-labelle-concert-fan-stripping-kicked-out-nicki-minaj/",
-                "ext": "mp4",
-                "title": "Patti LaBelle -- Goes Nuclear On Stripping Fan",
-                "description": "Patti LaBelle made it known loud and clear last night ... NO "
-                "ONE gets on her stage and strips down.",
-                "timestamp": 1442683746,
-                "uploader": "TMZ Staff",
-                "upload_date": "20150919",
-                "duration": 104.0,
-                "thumbnail": "https://imagez.tmz.com/image/5e/4by3/2015/09/20/5e57d7575062528082994e18ac3f0f48_xl.jpg",
+            'url': 'http://www.tmz.com/2015/09/19/patti-labelle-concert-fan-stripping-kicked-out-nicki-minaj/',
+            'info_dict': {
+                'id': 'http://www.tmz.com/2015/09/19/patti-labelle-concert-fan-stripping-kicked-out-nicki-minaj/',
+                'ext': 'mp4',
+                'title': 'Patti LaBelle -- Goes Nuclear On Stripping Fan',
+                'description': 'Patti LaBelle made it known loud and clear last night ... NO '
+                'ONE gets on her stage and strips down.',
+                'timestamp': 1442683746,
+                'uploader': 'TMZ Staff',
+                'upload_date': '20150919',
+                'duration': 104.0,
+                'thumbnail': 'https://imagez.tmz.com/image/5e/4by3/2015/09/20/5e57d7575062528082994e18ac3f0f48_xl.jpg',
             },
         },
         {
-            "url": "http://www.tmz.com/2016/01/28/adam-silver-sting-drake-blake-griffin/",
-            "info_dict": {
-                "id": "http://www.tmz.com/2016/01/28/adam-silver-sting-drake-blake-griffin/",
-                "ext": "mp4",
-                "title": "NBA's Adam Silver -- Blake Griffin's a Great Guy ... He'll Learn from This",
-                "description": "Two pretty parts of this video with NBA Commish Adam Silver.",
-                "timestamp": 1454010989,
-                "uploader": "TMZ Staff",
-                "upload_date": "20160128",
-                "duration": 59.0,
-                "thumbnail": "https://imagez.tmz.com/image/38/4by3/2016/01/29/3856e83e0beb57059ec412122b842fb1_xl.jpg",
+            'url': 'http://www.tmz.com/2016/01/28/adam-silver-sting-drake-blake-griffin/',
+            'info_dict': {
+                'id': 'http://www.tmz.com/2016/01/28/adam-silver-sting-drake-blake-griffin/',
+                'ext': 'mp4',
+                'title': 'NBA\'s Adam Silver -- Blake Griffin\'s a Great Guy ... He\'ll Learn from This',
+                'description': 'Two pretty parts of this video with NBA Commish Adam Silver.',
+                'timestamp': 1454010989,
+                'uploader': 'TMZ Staff',
+                'upload_date': '20160128',
+                'duration': 59.0,
+                'thumbnail': 'https://imagez.tmz.com/image/38/4by3/2016/01/29/3856e83e0beb57059ec412122b842fb1_xl.jpg',
             },
         },
         {
-            "url": "http://www.tmz.com/2016/10/27/donald-trump-star-vandal-arrested-james-otis/",
-            "info_dict": {
-                "id": "http://www.tmz.com/2016/10/27/donald-trump-star-vandal-arrested-james-otis/",
-                "ext": "mp4",
-                "title": "Trump Star Vandal -- I'm Not Afraid of Donald or the Cops!",
-                "description": "James Otis is the the guy who took a pickaxe to Donald Trump's star on the Walk of Fame, and he tells TMZ .. he's ready and willing to go to jail for the crime.",
-                "timestamp": 1477500095,
-                "uploader": "TMZ Staff",
-                "upload_date": "20161026",
-                "thumbnail": "https://imagez.tmz.com/image/0d/4by3/2016/10/27/0d904814d4a75dcf9cc3b8cfd1edc1a3_xl.jpg",
-                "duration": 128.0,
+            'url': 'http://www.tmz.com/2016/10/27/donald-trump-star-vandal-arrested-james-otis/',
+            'info_dict': {
+                'id': 'http://www.tmz.com/2016/10/27/donald-trump-star-vandal-arrested-james-otis/',
+                'ext': 'mp4',
+                'title': 'Trump Star Vandal -- I\'m Not Afraid of Donald or the Cops!',
+                'description': 'James Otis is the the guy who took a pickaxe to Donald Trump\'s star on the Walk of Fame, and he tells TMZ .. he\'s ready and willing to go to jail for the crime.',
+                'timestamp': 1477500095,
+                'uploader': 'TMZ Staff',
+                'upload_date': '20161026',
+                'thumbnail': 'https://imagez.tmz.com/image/0d/4by3/2016/10/27/0d904814d4a75dcf9cc3b8cfd1edc1a3_xl.jpg',
+                'duration': 128.0,
             },
         },
         {
-            "url": "https://www.tmz.com/videos/2020-10-31-103120-beverly-hills-protest-4878209/",
-            "info_dict": {
-                "id": "https://www.tmz.com/videos/2020-10-31-103120-beverly-hills-protest-4878209/",
-                "ext": "mp4",
-                "title": "Cops Use Billy Clubs Against Pro-Trump and Anti-Fascist "
-                "Demonstrators",
-                "description": "Beverly Hills may be an omen of what's coming next week, "
-                "because things got crazy on the streets and cops started "
-                "swinging their billy clubs at both Anti-Fascist and Pro-Trump "
-                "demonstrators.",
-                "timestamp": 1604182772,
-                "uploader": "TMZ Staff",
-                "upload_date": "20201031",
-                "duration": 96.0,
-                "thumbnail": "https://imagez.tmz.com/image/f3/4by3/2020/10/31/f37bd5a8aef84497866f425130c58be3_xl.jpg",
+            'url': 'https://www.tmz.com/videos/2020-10-31-103120-beverly-hills-protest-4878209/',
+            'info_dict': {
+                'id': 'https://www.tmz.com/videos/2020-10-31-103120-beverly-hills-protest-4878209/',
+                'ext': 'mp4',
+                'title': 'Cops Use Billy Clubs Against Pro-Trump and Anti-Fascist '
+                'Demonstrators',
+                'description': 'Beverly Hills may be an omen of what\'s coming next week, '
+                'because things got crazy on the streets and cops started '
+                'swinging their billy clubs at both Anti-Fascist and Pro-Trump '
+                'demonstrators.',
+                'timestamp': 1604182772,
+                'uploader': 'TMZ Staff',
+                'upload_date': '20201031',
+                'duration': 96.0,
+                'thumbnail': 'https://imagez.tmz.com/image/f3/4by3/2020/10/31/f37bd5a8aef84497866f425130c58be3_xl.jpg',
             },
         },
         {
-            "url": "https://www.tmz.com/2020/11/05/gervonta-davis-car-crash-hit-and-run-police/",
-            "info_dict": {
-                "id": "Dddb6IGe-ws",
-                "ext": "mp4",
-                "title": "SICK LAMBO GERVONTA DAVIS IN HIS NEW RIDE RIGHT AFTER KO AFTER LEO  EsNews Boxing",
-                "uploader": "ESNEWS",
-                "description": "md5:49675bc58883ccf80474b8aa701e1064",
-                "upload_date": "20201102",
-                "uploader_id": "ESNEWS",
-                "uploader_url": "http://www.youtube.com/user/ESNEWS",
-                "like_count": int,
-                "channel_id": "UCI-Oq7oFGakzSzHFlTtsUsQ",
-                "channel": "ESNEWS",
-                "view_count": int,
-                "duration": 225,
-                "live_status": "not_live",
-                "thumbnail": "https://i.ytimg.com/vi_webp/Dddb6IGe-ws/maxresdefault.webp",
-                "channel_url": "https://www.youtube.com/channel/UCI-Oq7oFGakzSzHFlTtsUsQ",
-                "channel_follower_count": int,
-                "playable_in_embed": True,
-                "categories": ["Sports"],
-                "age_limit": 0,
-                "tags": "count:10",
-                "availability": "public",
+            'url': 'https://www.tmz.com/2020/11/05/gervonta-davis-car-crash-hit-and-run-police/',
+            'info_dict': {
+                'id': 'Dddb6IGe-ws',
+                'ext': 'mp4',
+                'title': 'SICK LAMBO GERVONTA DAVIS IN HIS NEW RIDE RIGHT AFTER KO AFTER LEO  EsNews Boxing',
+                'uploader': 'ESNEWS',
+                'description': 'md5:49675bc58883ccf80474b8aa701e1064',
+                'upload_date': '20201102',
+                'uploader_id': '@ESNEWS',
+                'uploader_url': 'https://www.youtube.com/@ESNEWS',
+                'like_count': int,
+                'channel_id': 'UCI-Oq7oFGakzSzHFlTtsUsQ',
+                'channel': 'ESNEWS',
+                'view_count': int,
+                'duration': 225,
+                'live_status': 'not_live',
+                'thumbnail': 'https://i.ytimg.com/vi_webp/Dddb6IGe-ws/maxresdefault.webp',
+                'channel_url': 'https://www.youtube.com/channel/UCI-Oq7oFGakzSzHFlTtsUsQ',
+                'channel_follower_count': int,
+                'playable_in_embed': True,
+                'categories': ['Sports'],
+                'age_limit': 0,
+                'tags': 'count:10',
+                'availability': 'public',
+                'comment_count': int,
             },
         },
         {
-            "url": "https://www.tmz.com/2020/11/19/conor-mcgregor-dustin-poirier-contract-fight-ufc-257-fight-island/",
-            "info_dict": {
-                "id": "1329450007125225473",
-                "ext": "mp4",
-                "title": "The Mac Life - BREAKING: Conor McGregor (@thenotoriousmma) has signed his bout agreement for his rematch with Dustin Poirier for January 23.",
-                "uploader": "The Mac Life",
-                "description": "md5:56e6009bbc3d12498e10d08a8e1f1c69",
-                "upload_date": "20201119",
-                "uploader_id": "TheMacLife",
-                "timestamp": 1605800556,
-                "thumbnail": "https://pbs.twimg.com/media/EnMmfT8XYAExgxJ.jpg?name=small",
-                "like_count": int,
-                "duration": 11.812,
-                "uploader_url": "https://twitter.com/TheMacLife",
-                "age_limit": 0,
-                "repost_count": int,
-                "tags": [],
-                "comment_count": int,
+            'url': 'https://www.tmz.com/2020/11/19/conor-mcgregor-dustin-poirier-contract-fight-ufc-257-fight-island/',
+            'info_dict': {
+                'id': '1329448013937471491',
+                'ext': 'mp4',
+                'title': 'The Mac Life - BREAKING: Conor McGregor (@thenotoriousmma) has signed his bout agreement for his rematch with Dustin Poirier for January 23.',
+                'uploader': 'The Mac Life',
+                'description': 'md5:56e6009bbc3d12498e10d08a8e1f1c69',
+                'upload_date': '20201119',
+                'display_id': '1329450007125225473',
+                'uploader_id': 'TheMacLife',
+                'timestamp': 1605800556,
+                'thumbnail': 'https://pbs.twimg.com/media/EnMmfT8XYAExgxJ.jpg?name=small',
+                'like_count': int,
+                'duration': 11.812,
+                'uploader_url': 'https://twitter.com/TheMacLife',
+                'age_limit': 0,
+                'repost_count': int,
+                'tags': [],
+                'comment_count': int,
             },
         },
     ]
@@ -167,25 +169,23 @@ class TMZIE(InfoExtractor):
     def _real_extract(self, url):
         webpage = self._download_webpage(url, url)
         jsonld = self._search_json_ld(webpage, url)
-        if not jsonld or "url" not in jsonld:
+        if not jsonld or 'url' not in jsonld:
             # try to extract from YouTube Player API
             # see https://developers.google.com/youtube/iframe_api_reference#Video_Queueing_Functions
             match_obj = re.search(r'\.cueVideoById\(\s*(?P<quote>[\'"])(?P<id>.*?)(?P=quote)', webpage)
             if match_obj:
-                res = self.url_result(match_obj.group("id"))
-                return res
+                return self.url_result(match_obj.group('id'))
             # try to extract from twitter
-            blockquote_el = get_element_by_attribute("class", "twitter-tweet", webpage)
+            blockquote_el = get_element_by_attribute('class', 'twitter-tweet', webpage)
             if blockquote_el:
                 matches = re.findall(
                     r'<a[^>]+href=\s*(?P<quote>[\'"])(?P<link>.*?)(?P=quote)',
                     blockquote_el)
                 if matches:
                     for _, match in matches:
-                        if "/status/" in match:
-                            res = self.url_result(match)
-                            return res
-            raise ExtractorError("No video found!")
+                        if '/status/' in match:
+                            return self.url_result(match)
+            raise ExtractorError('No video found!')
         if id not in jsonld:
-            jsonld["id"] = url
+            jsonld['id'] = url
         return jsonld
diff --git a/plugins/youtube_download/yt_dlp/extractor/tnaflix.py b/plugins/youtube_download/yt_dlp/extractor/tnaflix.py
index b2baf2e..22832e0 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tnaflix.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tnaflix.py
@@ -1,7 +1,6 @@
 import re
 
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     fix_xml_ampersands,
     float_or_none,
@@ -64,7 +63,7 @@ class TNAFlixNetworkBaseIE(InfoExtractor):
         height = int_or_none(xpath_text(timeline, './imageHeight', 'thumbnail height'))
 
         return [{
-            'url': self._proto_relative_url(pattern_el.text.replace('#', compat_str(i)), 'http:'),
+            'url': self._proto_relative_url(pattern_el.text.replace('#', str(i)), 'http:'),
             'width': width,
             'height': height,
         } for i in range(first, last + 1)]
@@ -138,7 +137,7 @@ class TNAFlixNetworkBaseIE(InfoExtractor):
 
             thumbnails = self._extract_thumbnails(cfg_xml) or []
             thumbnails.append({
-                'url': self._proto_relative_url(xpath_text(cfg_xml, './startThumb', 'thumbnail'), 'http:')
+                'url': self._proto_relative_url(xpath_text(cfg_xml, './startThumb', 'thumbnail'), 'http:'),
             })
 
         # check for EMPFlix-style JSON and extract
@@ -239,7 +238,7 @@ class TNAFlixIE(TNAEMPFlixBaseIE):
             'duration': 91,
             'age_limit': 18,
             'categories': list,
-        }
+        },
     }, {
         # non-anonymous uploader, categories
         'url': 'https://www.tnaflix.com/teen-porn/Educational-xxx-video/video6538',
@@ -255,7 +254,7 @@ class TNAFlixIE(TNAEMPFlixBaseIE):
             'age_limit': 18,
             'uploader': 'bobwhite39',
             'categories': list,
-        }
+        },
     }, {
         'url': 'https://www.tnaflix.com/amateur-porn/bunzHD-Ms.Donk/video358632',
         'only_matching': True,
@@ -277,9 +276,8 @@ class EMPFlixIE(TNAEMPFlixBaseIE):
             'thumbnail': r're:https?://.*\.jpg$',
             'duration': 83,
             'age_limit': 18,
-            'uploader': None,
             'categories': list,
-        }
+        },
     }, {
         'url': 'http://www.empflix.com/videos/[AROMA][ARMD-718]-Aoi-Yoshino-Sawa-25826.html',
         'only_matching': True,
@@ -314,7 +312,7 @@ class MovieFapIE(TNAFlixNetworkBaseIE):
             'comment_count': int,
             'average_rating': float,
             'categories': ['Amateur', 'Masturbation', 'Mature', 'Flashing'],
-        }
+        },
     }, {
         # quirky single-format case where the extension is given as fid, but the video is really an flv
         'url': 'http://www.moviefap.com/videos/e5da0d3edce5404418f5/jeune-couple-russe.html',
diff --git a/plugins/youtube_download/yt_dlp/extractor/toggle.py b/plugins/youtube_download/yt_dlp/extractor/toggle.py
index 7073733..fbef7cc 100644
--- a/plugins/youtube_download/yt_dlp/extractor/toggle.py
+++ b/plugins/youtube_download/yt_dlp/extractor/toggle.py
@@ -26,37 +26,13 @@ class ToggleIE(InfoExtractor):
         },
         'params': {
             'skip_download': 'm3u8 download',
-        }
+        },
     }, {
-        'note': 'DRM-protected video',
         'url': 'http://www.mewatch.sg/en/movies/dug-s-special-mission/341413',
-        'info_dict': {
-            'id': '341413',
-            'ext': 'wvm',
-            'title': 'Dug\'s Special Mission',
-            'description': 'md5:e86c6f4458214905c1772398fabc93e0',
-            'upload_date': '20150827',
-            'timestamp': 1440644006,
-        },
-        'params': {
-            'skip_download': 'DRM-protected wvm download',
-        }
+        'only_matching': True,
     }, {
-        # this also tests correct video id extraction
-        'note': 'm3u8 links are geo-restricted, but Android/mp4 is okay',
         'url': 'http://www.mewatch.sg/en/series/28th-sea-games-5-show/28th-sea-games-5-show-ep11/332861',
-        'info_dict': {
-            'id': '332861',
-            'ext': 'mp4',
-            'title': '28th SEA Games (5 Show) -  Episode  11',
-            'description': 'md5:3cd4f5f56c7c3b1340c50a863f896faa',
-            'upload_date': '20150605',
-            'timestamp': 1433480166,
-        },
-        'params': {
-            'skip_download': 'DRM-protected wvm download',
-        },
-        'skip': 'm3u8 links are geo-restricted'
+        'only_matching': True,
     }, {
         'url': 'http://video.toggle.sg/en/clips/seraph-sun-aloysius-will-suddenly-sing-some-old-songs-in-high-pitch-on-set/343331',
         'only_matching': True,
@@ -92,14 +68,14 @@ class ToggleIE(InfoExtractor):
                     'LocaleLanguage': '',
                     'LocaleCountry': '',
                     'LocaleDevice': '',
-                    'LocaleUserState': 0
+                    'LocaleUserState': 0,
                 },
                 'Platform': 0,
                 'SiteGuid': 0,
                 'DomainID': '0',
                 'UDID': '',
                 'ApiUser': self._API_USER,
-                'ApiPass': self._API_PASS
+                'ApiPass': self._API_PASS,
             },
             'MediaID': video_id,
             'mediaType': 0,
@@ -107,7 +83,7 @@ class ToggleIE(InfoExtractor):
 
         info = self._download_json(
             'http://tvpapi.as.tvinci.com/v2_9/gateways/jsonpostgw.aspx?m=GetMediaInfo',
-            video_id, 'Downloading video info json', data=json.dumps(params).encode('utf-8'))
+            video_id, 'Downloading video info json', data=json.dumps(params).encode())
 
         title = info['MediaName']
 
@@ -122,8 +98,8 @@ class ToggleIE(InfoExtractor):
             if ext == 'm3u8':
                 m3u8_formats = self._extract_m3u8_formats(
                     video_url, video_id, ext='mp4', m3u8_id=vid_format,
-                    note='Downloading %s m3u8 information' % vid_format,
-                    errnote='Failed to download %s m3u8 information' % vid_format,
+                    note=f'Downloading {vid_format} m3u8 information',
+                    errnote=f'Failed to download {vid_format} m3u8 information',
                     fatal=False)
                 for f in m3u8_formats:
                     # Apple FairPlay Streaming
@@ -133,14 +109,14 @@ class ToggleIE(InfoExtractor):
             elif ext == 'mpd':
                 formats.extend(self._extract_mpd_formats(
                     video_url, video_id, mpd_id=vid_format,
-                    note='Downloading %s MPD manifest' % vid_format,
-                    errnote='Failed to download %s MPD manifest' % vid_format,
+                    note=f'Downloading {vid_format} MPD manifest',
+                    errnote=f'Failed to download {vid_format} MPD manifest',
                     fatal=False))
             elif ext == 'ism':
                 formats.extend(self._extract_ism_formats(
                     video_url, video_id, ism_id=vid_format,
-                    note='Downloading %s ISM manifest' % vid_format,
-                    errnote='Failed to download %s ISM manifest' % vid_format,
+                    note=f'Downloading {vid_format} ISM manifest',
+                    errnote=f'Failed to download {vid_format} ISM manifest',
                     fatal=False))
             elif ext == 'mp4':
                 formats.append({
diff --git a/plugins/youtube_download/yt_dlp/extractor/tokentube.py b/plugins/youtube_download/yt_dlp/extractor/tokentube.py
deleted file mode 100644
index d022e27..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/tokentube.py
+++ /dev/null
@@ -1,153 +0,0 @@
-import functools
-import re
-
-from .common import InfoExtractor
-from ..utils import (
-    clean_html,
-    get_element_by_class,
-    parse_count,
-    remove_end,
-    unified_strdate,
-    js_to_json,
-    OnDemandPagedList,
-)
-
-
-class TokentubeIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?tokentube\.net/(?:view\?[vl]=|[vl]/)(?P<id>\d+)'
-    _TESTS = [{
-        'url': 'https://tokentube.net/l/3236632011/Praise-A-Thon-Pastori-Chrisin-ja-Pastori-Bennyn-kanssa-27-8-2021',
-        'info_dict': {
-            'id': '3236632011',
-            'ext': 'mp4',
-            'title': 'Praise-A-Thon Pastori Chrisin ja Pastori Bennyn kanssa 27.8.2021',
-            'description': '',
-            'uploader': 'Pastori Chris - Rapsodia.fi',
-            'upload_date': '20210827',
-        },
-        'params': {
-            'skip_download': True,
-        },
-    }, {
-        'url': 'https://tokentube.net/v/3950239124/Linux-Ubuntu-Studio-perus-k%C3%A4ytt%C3%B6',
-        'md5': '0e1f00421f501f5eada9890d38fcfb56',
-        'info_dict': {
-            'id': '3950239124',
-            'ext': 'mp4',
-            'title': 'Linux Ubuntu Studio perus käyttö',
-            'description': 'md5:46077d0daaba1974f2dc381257f9d64c',
-            'uploader': 'jyrilehtonen',
-            'upload_date': '20210825',
-        },
-    }, {
-        'url': 'https://tokentube.net/view?v=3582463289',
-        'info_dict': {
-            'id': '3582463289',
-            'ext': 'mp4',
-            'title': 'Police for Freedom - toiminta aloitetaan Suomessa ❤️??',
-            'description': 'md5:37ebf1cb44264e0bf23ed98b337ee63e',
-            'uploader': 'Voitontie',
-            'upload_date': '20210428',
-        }
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-
-        title = self._html_search_regex(r'<h1\s*class=["\']title-text["\']>(.+?)</h1>', webpage, 'title')
-
-        data_json = self._html_search_regex(r'({["\']html5["\'].+?}}}+)', webpage, 'data json')
-        data_json = self._parse_json(js_to_json(data_json), video_id, fatal=False)
-
-        sources = data_json.get('sources') or self._parse_json(
-            self._html_search_regex(r'updateSrc\(([^\)]+)\)', webpage, 'sources'),
-            video_id, transform_source=js_to_json)
-
-        formats = [{
-            'url': format.get('src'),
-            'format_id': format.get('label'),
-            'height': format.get('res'),
-        } for format in sources]
-
-        view_count = parse_count(self._html_search_regex(
-            r'<p\s*class=["\']views_counter["\']>\s*([\d\.,]+)\s*<span>views?</span></p>',
-            webpage, 'view_count', fatal=False))
-
-        like_count = parse_count(self._html_search_regex(
-            r'<div\s*class="sh_button\s*likes_count">\s*(\d+)\s*</div>',
-            webpage, 'like count', fatal=False))
-
-        dislike_count = parse_count(self._html_search_regex(
-            r'<div\s*class="sh_button\s*dislikes_count">\s*(\d+)\s*</div>',
-            webpage, 'dislike count', fatal=False))
-
-        upload_date = unified_strdate(self._html_search_regex(
-            r'<span\s*class="p-date">Published\s*on\s+([^<]+)',
-            webpage, 'upload date', fatal=False))
-
-        uploader = self._html_search_regex(
-            r'<a\s*class="place-left"[^>]+>(.+?)</a>',
-            webpage, 'uploader', fatal=False)
-
-        description = (clean_html(get_element_by_class('p-d-txt', webpage))
-                       or self._html_search_meta(('og:description', 'description', 'twitter:description'), webpage))
-
-        description = remove_end(description, 'Category')
-
-        return {
-            'id': video_id,
-            'formats': formats,
-            'title': title,
-            'view_count': view_count,
-            'like_count': like_count,
-            'dislike_count': dislike_count,
-            'upload_date': upload_date,
-            'description': description,
-            'uploader': uploader,
-        }
-
-
-class TokentubeChannelIE(InfoExtractor):
-    _PAGE_SIZE = 20
-    IE_NAME = 'Tokentube:channel'
-    _VALID_URL = r'https?://(?:www\.)?tokentube\.net/channel/(?P<id>\d+)/[^/]+(?:/videos)?'
-    _TESTS = [{
-        'url': 'https://tokentube.net/channel/3697658904/TokenTube',
-        'info_dict': {
-            'id': '3697658904',
-        },
-        'playlist_mincount': 7,
-    }, {
-        'url': 'https://tokentube.net/channel/3353234420/Linux/videos',
-        'info_dict': {
-            'id': '3353234420',
-        },
-        'playlist_mincount': 20,
-    }, {
-        'url': 'https://tokentube.net/channel/3475834195/Voitontie',
-        'info_dict': {
-            'id': '3475834195',
-        },
-        'playlist_mincount': 150,
-    }]
-
-    def _fetch_page(self, channel_id, page):
-        page += 1
-        videos_info = self._download_webpage(
-            f'https://tokentube.net/videos?p=0&m=1&sort=recent&u={channel_id}&page={page}',
-            channel_id, headers={'X-Requested-With': 'XMLHttpRequest'},
-            note=f'Downloading page {page}', fatal=False)
-        if '</i> Sorry, no results were found.' not in videos_info:
-            for path, media_id in re.findall(
-                    r'<a[^>]+\bhref=["\']([^"\']+/[lv]/(\d+)/\S+)["\'][^>]+>',
-                    videos_info):
-                yield self.url_result(path, ie=TokentubeIE.ie_key(), video_id=media_id)
-
-    def _real_extract(self, url):
-        channel_id = self._match_id(url)
-
-        entries = OnDemandPagedList(functools.partial(
-            self._fetch_page, channel_id), self._PAGE_SIZE)
-
-        return self.playlist_result(entries, channel_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/tonline.py b/plugins/youtube_download/yt_dlp/extractor/tonline.py
index 7202826..cfbd36b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tonline.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tonline.py
@@ -3,6 +3,8 @@ from ..utils import int_or_none, join_nonempty
 
 
 class TOnlineIE(InfoExtractor):
+    _WORKING = False
+    _ENABLED = None  # XXX: pass through to GenericIE
     IE_NAME = 't-online.de'
     _VALID_URL = r'https?://(?:www\.)?t-online\.de/tv/(?:[^/]+/)*id_(?P<id>\d+)'
     _TEST = {
@@ -13,13 +15,13 @@ class TOnlineIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'Drittes Remis! Zidane: "Es muss etwas passieren"',
             'description': 'Es läuft nicht rund bei Real Madrid. Das 1:1 gegen den SD Eibar war das dritte Unentschieden in Folge in der Liga.',
-        }
+        },
     }
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
         video_data = self._download_json(
-            'http://www.t-online.de/tv/id_%s/tid_json_video' % video_id, video_id)
+            f'http://www.t-online.de/tv/id_{video_id}/tid_json_video', video_id)
         title = video_data['subtitle']
 
         formats = []
diff --git a/plugins/youtube_download/yt_dlp/extractor/toongoggles.py b/plugins/youtube_download/yt_dlp/extractor/toongoggles.py
index 1b8fc3a..bfeb16a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/toongoggles.py
+++ b/plugins/youtube_download/yt_dlp/extractor/toongoggles.py
@@ -18,7 +18,7 @@ class ToonGogglesIE(InfoExtractor):
             'description': 'Bernard decides to play football in order to be better than Lloyd and tries to beat him no matter how, he even cheats.',
             'upload_date': '20160718',
             'timestamp': 1468879330,
-        }
+        },
     }, {
         'url': 'http://www.toongoggles.com/shows/227759/om-nom-stories-around-the-world',
         'info_dict': {
diff --git a/plugins/youtube_download/yt_dlp/extractor/toutv.py b/plugins/youtube_download/yt_dlp/extractor/toutv.py
index ced1224..cbd2c9c 100644
--- a/plugins/youtube_download/yt_dlp/extractor/toutv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/toutv.py
@@ -61,7 +61,7 @@ class TouTvIE(RadioCanadaIE):  # XXX: Do not subclass from concrete IE
     def _real_extract(self, url):
         path = self._match_id(url)
         metadata = self._download_json(
-            'https://services.radio-canada.ca/toutv/presentation/%s' % path, path, query={
+            f'https://services.radio-canada.ca/toutv/presentation/{path}', path, query={
                 'client_key': self._CLIENT_KEY,
                 'device': 'web',
                 'version': 4,
diff --git a/plugins/youtube_download/yt_dlp/extractor/toypics.py b/plugins/youtube_download/yt_dlp/extractor/toypics.py
index bc73361..5b625a3 100644
--- a/plugins/youtube_download/yt_dlp/extractor/toypics.py
+++ b/plugins/youtube_download/yt_dlp/extractor/toypics.py
@@ -1,8 +1,10 @@
-from .common import InfoExtractor
 import re
 
+from .common import InfoExtractor
+
 
 class ToypicsIE(InfoExtractor):
+    _WORKING = False
     IE_DESC = 'Toypics video'
     _VALID_URL = r'https?://videos\.toypics\.net/view/(?P<id>[0-9]+)'
     _TEST = {
@@ -14,7 +16,7 @@ class ToypicsIE(InfoExtractor):
             'title': "Chance-Bulge'd, 2",
             'age_limit': 18,
             'uploader': 'kidsune',
-        }
+        },
     }
 
     def _real_extract(self, url):
@@ -43,6 +45,7 @@ class ToypicsIE(InfoExtractor):
 
 
 class ToypicsUserIE(InfoExtractor):
+    _WORKING = False
     IE_DESC = 'Toypics user profile'
     _VALID_URL = r'https?://videos\.toypics\.net/(?!view)(?P<id>[^/?#&]+)'
     _TEST = {
@@ -67,10 +70,10 @@ class ToypicsUserIE(InfoExtractor):
         urls = []
         page_count = (video_count + PAGE_SIZE + 1) // PAGE_SIZE
         for n in range(1, page_count + 1):
-            lpage_url = url + '/public/%d' % n
+            lpage_url = url + f'/public/{n}'
             lpage = self._download_webpage(
                 lpage_url, username,
-                note='Downloading page %d/%d' % (n, page_count))
+                note=f'Downloading page {n}/{page_count}')
             urls.extend(
                 re.findall(
                     r'<div[^>]+class=["\']preview[^>]+>\s*<a[^>]+href="(https?://videos\.toypics\.net/view/[^"]+)"',
@@ -83,5 +86,5 @@ class ToypicsUserIE(InfoExtractor):
                 '_type': 'url',
                 'url': eurl,
                 'ie_key': 'Toypics',
-            } for eurl in urls]
+            } for eurl in urls],
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/traileraddict.py b/plugins/youtube_download/yt_dlp/extractor/traileraddict.py
index 5c4a138..81c9365 100644
--- a/plugins/youtube_download/yt_dlp/extractor/traileraddict.py
+++ b/plugins/youtube_download/yt_dlp/extractor/traileraddict.py
@@ -14,7 +14,7 @@ class TrailerAddictIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'Prince Avalanche Trailer',
             'description': 'Trailer for Prince Avalanche.\n\nTwo highway road workers spend the summer of 1988 away from their city lives. The isolated landscape becomes a place of misadventure as the men find themselves at odds with each other and the women they left behind.',
-        }
+        },
     }
 
     def _real_extract(self, url):
@@ -39,7 +39,7 @@ class TrailerAddictIE(InfoExtractor):
         else:
             fvar = 'fvar'
 
-        info_url = 'http://www.traileraddict.com/%s.php?tid=%s' % (fvar, str(video_id))
+        info_url = f'http://www.traileraddict.com/{fvar}.php?tid={video_id!s}'
         info_webpage = self._download_webpage(info_url, video_id, 'Downloading the info webpage')
 
         final_url = self._search_regex(r'&fileurl=(.+)',
diff --git a/plugins/youtube_download/yt_dlp/extractor/triller.py b/plugins/youtube_download/yt_dlp/extractor/triller.py
index 56e51fe..3bdeedd 100644
--- a/plugins/youtube_download/yt_dlp/extractor/triller.py
+++ b/plugins/youtube_download/yt_dlp/extractor/triller.py
@@ -14,8 +14,8 @@ from ..utils import (
     traverse_obj,
     unified_timestamp,
     url_basename,
-    urljoin,
     url_or_none,
+    urljoin,
 )
 
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/trilulilu.py b/plugins/youtube_download/yt_dlp/extractor/trilulilu.py
deleted file mode 100644
index fb97be7..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/trilulilu.py
+++ /dev/null
@@ -1,100 +0,0 @@
-from .common import InfoExtractor
-from ..utils import (
-    ExtractorError,
-    int_or_none,
-    parse_iso8601,
-)
-
-
-class TriluliluIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:(?:www|m)\.)?trilulilu\.ro/(?:[^/]+/)?(?P<id>[^/#\?]+)'
-    _TESTS = [{
-        'url': 'http://www.trilulilu.ro/big-buck-bunny-1',
-        'md5': '68da087b676a6196a413549212f60cc6',
-        'info_dict': {
-            'id': 'ae2899e124140b',
-            'ext': 'mp4',
-            'title': 'Big Buck Bunny',
-            'description': ':) pentru copilul din noi',
-            'uploader_id': 'chipy',
-            'upload_date': '20120304',
-            'timestamp': 1330830647,
-            'uploader': 'chipy',
-            'view_count': int,
-            'like_count': int,
-            'comment_count': int,
-        },
-    }, {
-        'url': 'http://www.trilulilu.ro/adena-ft-morreti-inocenta',
-        'md5': '929dfb8729dc71750463af88bbbbf4a4',
-        'info_dict': {
-            'id': 'f299710e3c91c5',
-            'ext': 'mp4',
-            'title': 'Adena ft. Morreti - Inocenta',
-            'description': 'pop music',
-            'uploader_id': 'VEVOmixt',
-            'upload_date': '20151204',
-            'uploader': 'VEVOmixt',
-            'timestamp': 1449187937,
-            'view_count': int,
-            'like_count': int,
-            'comment_count': int,
-        },
-    }]
-
-    def _real_extract(self, url):
-        display_id = self._match_id(url)
-        media_info = self._download_json('http://m.trilulilu.ro/%s?format=json' % display_id, display_id)
-
-        age_limit = 0
-        errors = media_info.get('errors', {})
-        if errors.get('friends'):
-            raise ExtractorError('This video is private.', expected=True)
-        elif errors.get('geoblock'):
-            raise ExtractorError('This video is not available in your country.', expected=True)
-        elif errors.get('xxx_unlogged'):
-            age_limit = 18
-
-        media_class = media_info.get('class')
-        if media_class not in ('video', 'audio'):
-            raise ExtractorError('not a video or an audio')
-
-        user = media_info.get('user', {})
-
-        thumbnail = media_info.get('cover_url')
-        if thumbnail:
-            thumbnail.format(width='1600', height='1200')
-
-        # TODO: get correct ext for audio files
-        stream_type = media_info.get('stream_type')
-        formats = [{
-            'url': media_info['href'],
-            'ext': stream_type,
-        }]
-        if media_info.get('is_hd'):
-            formats.append({
-                'format_id': 'hd',
-                'url': media_info['hrefhd'],
-                'ext': stream_type,
-            })
-        if media_class == 'audio':
-            formats[0]['vcodec'] = 'none'
-        else:
-            formats[0]['format_id'] = 'sd'
-
-        return {
-            'id': media_info['identifier'].split('|')[1],
-            'display_id': display_id,
-            'formats': formats,
-            'title': media_info['title'],
-            'description': media_info.get('description'),
-            'thumbnail': thumbnail,
-            'uploader_id': user.get('username'),
-            'uploader': user.get('fullname'),
-            'timestamp': parse_iso8601(media_info.get('published'), ' '),
-            'duration': int_or_none(media_info.get('duration')),
-            'view_count': int_or_none(media_info.get('count_views')),
-            'like_count': int_or_none(media_info.get('count_likes')),
-            'comment_count': int_or_none(media_info.get('count_comments')),
-            'age_limit': age_limit,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/trovo.py b/plugins/youtube_download/yt_dlp/extractor/trovo.py
index 545a672..7d800ae 100644
--- a/plugins/youtube_download/yt_dlp/extractor/trovo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/trovo.py
@@ -63,7 +63,7 @@ class TrovoIE(TrovoBaseIE):
             'title': '💥IGRAMO IGRICE UPADAJTE💥2500/5000 2022-06-28 22:01',
             'live_status': 'is_live',
         },
-        'skip': 'May not be live'
+        'skip': 'May not be live',
     }]
 
     def _real_extract(self, url):
@@ -77,7 +77,7 @@ class TrovoIE(TrovoBaseIE):
             },
         })
         if live_info.get('isLive') == 0:
-            raise ExtractorError('%s is offline' % username, expected=True)
+            raise ExtractorError(f'{username} is offline', expected=True)
         program_info = live_info['programInfo']
         program_id = program_info['id']
         title = program_info['title']
diff --git a/plugins/youtube_download/yt_dlp/extractor/trtcocuk.py b/plugins/youtube_download/yt_dlp/extractor/trtcocuk.py
index f27f5a1..0c899f1 100644
--- a/plugins/youtube_download/yt_dlp/extractor/trtcocuk.py
+++ b/plugins/youtube_download/yt_dlp/extractor/trtcocuk.py
@@ -15,7 +15,7 @@ class TrtCocukVideoIE(InfoExtractor):
             'title': 'Kaptan Pengu ve Arkadaşları 1 Bölüm İzle TRT Çocuk',
             'release_date': '20201209',
             'release_timestamp': 1607513774,
-        }
+        },
     }, {
         'url': 'https://www.trtcocuk.net.tr/video/sef-rokanin-lezzet-dunyasi-17',
         'info_dict': {
@@ -23,7 +23,7 @@ class TrtCocukVideoIE(InfoExtractor):
             'ext': 'mp4',
             'series': '"Şef Roka\'nın Lezzet Dünyası"',
             'title': 'Şef Roka\'nın Lezzet Dünyası 17 Bölüm İzle TRT Çocuk',
-        }
+        },
     }]
 
     def _real_extract(self, url):
@@ -44,5 +44,5 @@ class TrtCocukVideoIE(InfoExtractor):
             'season_number': int_or_none(nuxtjs_data.get('season')),
             'release_timestamp': parse_iso8601(nuxtjs_data.get('publishedDate')),
             'series': traverse_obj(nuxtjs_data, ('show', 0, 'title')),
-            'title': self._html_extract_title(webpage)  # TODO: get better title
+            'title': self._html_extract_title(webpage),  # TODO: get better title
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/trtworld.py b/plugins/youtube_download/yt_dlp/extractor/trtworld.py
new file mode 100644
index 0000000..d33b9aa
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/trtworld.py
@@ -0,0 +1,101 @@
+from .common import InfoExtractor
+from ..utils import ExtractorError, determine_ext, parse_iso8601, url_or_none
+from ..utils.traversal import traverse_obj
+
+
+class TrtWorldIE(InfoExtractor):
+    _VALID_URL = r'https?://www\.trtworld\.com/video/[\w-]+/[\w-]+-(?P<id>\d+)'
+
+    _TESTS = [{
+        'url': 'https://www.trtworld.com/video/news/turkiye-switches-to-sustainable-tourism-16067690',
+        'info_dict': {
+            'id': '16067690',
+            'ext': 'mp4',
+            'title': 'Türkiye switches to sustainable tourism',
+            'release_timestamp': 1701529569,
+            'release_date': '20231202',
+            'thumbnail': 'https://cdn-i.pr.trt.com.tr/trtworld/17647563_0-0-1920-1080.jpeg',
+            'description': 'md5:0a975c04257fb529c8f99c7b76a2cf12',
+        },
+    }, {
+        'url': 'https://www.trtworld.com/video/one-offs/frames-from-anatolia-recreating-a-james-bond-scene-in-istanbuls-grand-bazaar-14541780',
+        'info_dict': {
+            'id': '14541780',
+            'ext': 'mp4',
+            'title': 'Frames From Anatolia: Recreating a ‘James Bond’ Scene in Istanbul’s Grand Bazaar',
+            'release_timestamp': 1692440844,
+            'release_date': '20230819',
+            'thumbnail': 'https://cdn-i.pr.trt.com.tr/trtworld/16939810_0-0-1920-1080.jpeg',
+            'description': 'md5:4050e21570cc3c40b6c9badae800a94f',
+        },
+    }, {
+        'url': 'https://www.trtworld.com/video/the-newsmakers/can-sudan-find-peace-amidst-failed-transition-to-democracy-12904760',
+        'info_dict': {
+            'id': '12904760',
+            'ext': 'mp4',
+            'title': 'Can Sudan find peace amidst failed transition to democracy?',
+            'release_timestamp': 1681972747,
+            'release_date': '20230420',
+            'thumbnail': 'http://cdni0.trtworld.com/w768/q70/154214_NMYOUTUBETEMPLATE1_1681833018736.jpg',
+        },
+    }, {
+        'url': 'https://www.trtworld.com/video/africa-matters/locals-learning-to-cope-with-rising-tides-of-kenyas-great-lakes-16059545',
+        'info_dict': {
+            'id': 'zEns2dWl00w',
+            'ext': 'mp4',
+            'title': "Locals learning to cope with rising tides of Kenya's Great Lakes",
+            'thumbnail': 'https://i.ytimg.com/vi/zEns2dWl00w/maxresdefault.jpg',
+            'description': 'md5:3ad9d7c5234d752a4ead4340c79c6b8d',
+            'channel_id': 'UC7fWeaHhqgM4Ry-RMpM2YYw',
+            'channel_url': 'https://www.youtube.com/channel/UC7fWeaHhqgM4Ry-RMpM2YYw',
+            'duration': 210,
+            'view_count': int,
+            'age_limit': 0,
+            'webpage_url': 'https://www.youtube.com/watch?v=zEns2dWl00w',
+            'categories': ['News & Politics'],
+            'channel': 'TRT World',
+            'channel_follower_count': int,
+            'channel_is_verified': True,
+            'uploader': 'TRT World',
+            'uploader_id': '@trtworld',
+            'uploader_url': 'https://www.youtube.com/@trtworld',
+            'upload_date': '20231202',
+            'availability': 'public',
+            'comment_count': int,
+            'playable_in_embed': True,
+            'tags': [],
+            'live_status': 'not_live',
+            'like_count': int,
+        },
+    }]
+
+    def _real_extract(self, url):
+        display_id = self._match_id(url)
+        webpage = self._download_webpage(url, display_id)
+        nuxtjs_data = self._search_nuxt_data(webpage, display_id)['videoData']['content']['platforms']
+        formats = []
+        for media_url in traverse_obj(nuxtjs_data, (
+                ('website', 'ott'), 'metadata', ('hls_url', 'url'), {url_or_none})):
+            # NB: Website sometimes serves mp4 files under `hls_url` key
+            if determine_ext(media_url) == 'm3u8':
+                formats.extend(self._extract_m3u8_formats(media_url, display_id, fatal=False))
+            else:
+                formats.append({
+                    'format_id': 'http',
+                    'url': media_url,
+                })
+        if not formats:
+            if youtube_id := traverse_obj(nuxtjs_data, ('youtube', 'metadata', 'youtubeId')):
+                return self.url_result(youtube_id, 'Youtube')
+            raise ExtractorError('No video found', expected=True)
+
+        return {
+            'id': display_id,
+            'formats': formats,
+            **traverse_obj(nuxtjs_data, (('website', 'ott'), {
+                'title': ('fields', 'title', 'text', {str}),
+                'description': ('fields', 'description', 'text', {str}),
+                'thumbnail': ('fields', 'thumbnail', 'url', {url_or_none}),
+                'release_timestamp': ('published', 'date', {parse_iso8601}),
+            }), get_all=False),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/trueid.py b/plugins/youtube_download/yt_dlp/extractor/trueid.py
index 86f0990..183364b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/trueid.py
+++ b/plugins/youtube_download/yt_dlp/extractor/trueid.py
@@ -1,13 +1,13 @@
 from .common import InfoExtractor
 from ..networking.exceptions import HTTPError
 from ..utils import (
-    determine_ext,
     ExtractorError,
+    determine_ext,
     int_or_none,
     parse_age_limit,
     traverse_obj,
     unified_timestamp,
-    url_or_none
+    url_or_none,
 )
 
 
@@ -31,7 +31,7 @@ class TrueIDIE(InfoExtractor):
             'upload_date': '20200916',
             'release_date': '20200630',
         },
-        'expected_warnings': ['Video is geo restricted.']
+        'expected_warnings': ['Video is geo restricted.'],
     }, {
         'url': 'https://trueid.id/series/zZOBVPb62EwR/qXY73rwyl7oj/one-piece-ep-1/',
         'md5': '1c6d976049bc3c89a8a25aed2c3fb081',
@@ -51,7 +51,7 @@ class TrueIDIE(InfoExtractor):
             'upload_date': '20210112',
             'release_date': '20210131',
         },
-        'expected_warnings': ['Video is geo restricted.']
+        'expected_warnings': ['Video is geo restricted.'],
     }, {
         'url': 'https://vn.trueid.net/series/7DNPM7Bpa9wv/pwLgEQ4Xbda2/haikyu-vua-bong-chuyen-phan-1/',
         'info_dict': {
@@ -69,7 +69,7 @@ class TrueIDIE(InfoExtractor):
             'upload_date': '20210818',
             'release_date': '20210818',
         },
-        'expected_warnings': ['Video is geo restricted.']
+        'expected_warnings': ['Video is geo restricted.'],
     }, {
         'url': 'https://trueid.ph/series/l8rvvAw7Jwv8/l8rvvAw7Jwv8/naruto-trailer/',
         'only_matching': True,
diff --git a/plugins/youtube_download/yt_dlp/extractor/truth.py b/plugins/youtube_download/yt_dlp/extractor/truth.py
index 1c6409c..51d28d1 100644
--- a/plugins/youtube_download/yt_dlp/extractor/truth.py
+++ b/plugins/youtube_download/yt_dlp/extractor/truth.py
@@ -19,7 +19,6 @@ class TruthIE(InfoExtractor):
                 'id': '108779000807761862',
                 'ext': 'qt',
                 'title': 'Truth video #108779000807761862',
-                'description': None,
                 'timestamp': 1659835827,
                 'upload_date': '20220807',
                 'uploader': 'Donald J. Trump',
diff --git a/plugins/youtube_download/yt_dlp/extractor/trutv.py b/plugins/youtube_download/yt_dlp/extractor/trutv.py
index ea0f2f4..cbfe67a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/trutv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/trutv.py
@@ -32,7 +32,7 @@ class TruTVIE(TurnerBaseIE):
             display_id = clip_slug
 
         data = self._download_json(
-            'https://api.trutv.com/v2/web/%s/%s/%s' % (path, series_slug, display_id),
+            f'https://api.trutv.com/v2/web/{path}/{series_slug}/{display_id}',
             display_id)
         video_data = data['episode'] if video_id else data['info']
         media_id = video_data['mediaId']
diff --git a/plugins/youtube_download/yt_dlp/extractor/tube8.py b/plugins/youtube_download/yt_dlp/extractor/tube8.py
index 77ed05f..7267bf2 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tube8.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tube8.py
@@ -1,13 +1,20 @@
 import re
+import urllib.parse
 
+from .common import InfoExtractor
+from ..aes import aes_decrypt_text
 from ..utils import (
+    determine_ext,
+    format_field,
     int_or_none,
     str_to_int,
+    strip_or_none,
+    url_or_none,
 )
-from .keezmovies import KeezMoviesIE
 
 
-class Tube8IE(KeezMoviesIE):  # XXX: Do not subclass from concrete IE
+class Tube8IE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?tube8\.com/(?:[^/]+/)+(?P<display_id>[^/]+)/(?P<id>\d+)'
     _EMBED_REGEX = [r'<iframe[^>]+\bsrc=["\'](?P<url>(?:https?:)?//(?:www\.)?tube8\.com/embed/(?:[^/]+/)+\d+)']
     _TESTS = [{
@@ -30,6 +37,90 @@ class Tube8IE(KeezMoviesIE):  # XXX: Do not subclass from concrete IE
         'only_matching': True,
     }]
 
+    def _extract_info(self, url, fatal=True):
+        mobj = self._match_valid_url(url)
+        video_id = mobj.group('id')
+        display_id = (mobj.group('display_id')
+                      if 'display_id' in mobj.groupdict()
+                      else None) or mobj.group('id')
+
+        webpage = self._download_webpage(
+            url, display_id, headers={'Cookie': 'age_verified=1'})
+
+        formats = []
+        format_urls = set()
+
+        title = None
+        thumbnail = None
+        duration = None
+        encrypted = False
+
+        def extract_format(format_url, height=None):
+            format_url = url_or_none(format_url)
+            if not format_url or not format_url.startswith(('http', '//')):
+                return
+            if format_url in format_urls:
+                return
+            format_urls.add(format_url)
+            tbr = int_or_none(self._search_regex(
+                r'[/_](\d+)[kK][/_]', format_url, 'tbr', default=None))
+            if not height:
+                height = int_or_none(self._search_regex(
+                    r'[/_](\d+)[pP][/_]', format_url, 'height', default=None))
+            if encrypted:
+                format_url = aes_decrypt_text(
+                    video_url, title, 32).decode('utf-8')
+            formats.append({
+                'url': format_url,
+                'format_id': format_field(height, None, '%dp'),
+                'height': height,
+                'tbr': tbr,
+            })
+
+        flashvars = self._parse_json(
+            self._search_regex(
+                r'flashvars\s*=\s*({.+?});', webpage,
+                'flashvars', default='{}'),
+            display_id, fatal=False)
+
+        if flashvars:
+            title = flashvars.get('video_title')
+            thumbnail = flashvars.get('image_url')
+            duration = int_or_none(flashvars.get('video_duration'))
+            encrypted = flashvars.get('encrypted') is True
+            for key, value in flashvars.items():
+                mobj = re.search(r'quality_(\d+)[pP]', key)
+                if mobj:
+                    extract_format(value, int(mobj.group(1)))
+            video_url = flashvars.get('video_url')
+            if video_url and determine_ext(video_url, None):
+                extract_format(video_url)
+
+        video_url = self._html_search_regex(
+            r'flashvars\.video_url\s*=\s*(["\'])(?P<url>http.+?)\1',
+            webpage, 'video url', default=None, group='url')
+        if video_url:
+            extract_format(urllib.parse.unquote(video_url))
+
+        if not formats:
+            if 'title="This video is no longer available"' in webpage:
+                self.raise_no_formats(
+                    f'Video {video_id} is no longer available', expected=True)
+
+        if not title:
+            title = self._html_search_regex(
+                r'<h1[^>]*>([^<]+)', webpage, 'title')
+
+        return webpage, {
+            'id': video_id,
+            'display_id': display_id,
+            'title': strip_or_none(title),
+            'thumbnail': thumbnail,
+            'duration': duration,
+            'age_limit': 18,
+            'formats': formats,
+        }
+
     def _real_extract(self, url):
         webpage, info = self._extract_info(url)
 
@@ -62,8 +153,8 @@ class Tube8IE(KeezMoviesIE):  # XXX: Do not subclass from concrete IE
         tags_str = self._search_regex(
             r'(?s)Tags:\s*</dt>\s*<dd>(.+?)</(?!a)',
             webpage, 'tags', fatal=False)
-        tags = [t for t in re.findall(
-            r'<a[^>]+href=[^>]+>([^<]+)', tags_str)] if tags_str else None
+        tags = list(re.findall(
+            r'<a[^>]+href=[^>]+>([^<]+)', tags_str)) if tags_str else None
 
         info.update({
             'description': description,
diff --git a/plugins/youtube_download/yt_dlp/extractor/tubetugraz.py b/plugins/youtube_download/yt_dlp/extractor/tubetugraz.py
index a351e4e..805e268 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tubetugraz.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tubetugraz.py
@@ -21,16 +21,20 @@ class TubeTuGrazBaseIE(InfoExtractor):
         if not urlh:
             return
 
-        content, urlh = self._download_webpage_handle(
+        response = self._download_webpage_handle(
             urlh.url, None, fatal=False, headers={'referer': urlh.url},
             note='logging in', errnote='unable to log in',
             data=urlencode_postdata({
                 'lang': 'de',
                 '_eventId_proceed': '',
                 'j_username': username,
-                'j_password': password
+                'j_password': password,
             }))
-        if not urlh or urlh.url == 'https://tube.tugraz.at/paella/ui/index.html':
+        if not response:
+            return
+
+        content, urlh = response
+        if urlh.url == 'https://tube.tugraz.at/paella/ui/index.html':
             return
 
         if not self._html_search_regex(
@@ -39,7 +43,7 @@ class TubeTuGrazBaseIE(InfoExtractor):
             self.report_warning('unable to login: incorrect password')
             return
 
-        content, urlh = self._download_webpage_handle(
+        urlh = self._request_webpage(
             urlh.url, None, fatal=False, headers={'referer': urlh.url},
             note='logging in with TFA', errnote='unable to log in with TFA',
             data=urlencode_postdata({
@@ -53,33 +57,33 @@ class TubeTuGrazBaseIE(InfoExtractor):
         self.report_warning('unable to login: incorrect TFA code')
 
     def _extract_episode(self, episode_info):
-        id = episode_info.get('id')
+        video_id = episode_info.get('id')
         formats = list(self._extract_formats(
-            traverse_obj(episode_info, ('mediapackage', 'media', 'track')), id))
+            traverse_obj(episode_info, ('mediapackage', 'media', 'track')), video_id))
 
         title = traverse_obj(episode_info, ('mediapackage', 'title'), 'dcTitle')
         series_title = traverse_obj(episode_info, ('mediapackage', 'seriestitle'))
         creator = ', '.join(variadic(traverse_obj(
             episode_info, ('mediapackage', 'creators', 'creator'), 'dcCreator', default='')))
         return {
-            'id': id,
+            'id': video_id,
             'title': title,
             'creator': creator or None,
             'duration': traverse_obj(episode_info, ('mediapackage', 'duration'), 'dcExtent'),
             'series': series_title,
             'series_id': traverse_obj(episode_info, ('mediapackage', 'series'), 'dcIsPartOf'),
             'episode': series_title and title,
-            'formats': formats
+            'formats': formats,
         }
 
-    def _set_format_type(self, formats, type):
+    def _set_format_type(self, formats, fmt_type):
         for f in formats:
-            f['format_note'] = type
-            if not type.startswith(self._FORMAT_TYPES[0]):
+            f['format_note'] = fmt_type
+            if not fmt_type.startswith(self._FORMAT_TYPES[0]):
                 f['preference'] = -2
         return formats
 
-    def _extract_formats(self, format_list, id):
+    def _extract_formats(self, format_list, video_id):
         has_hls, has_dash = False, False
 
         for format_info in format_list or []:
@@ -87,7 +91,7 @@ class TubeTuGrazBaseIE(InfoExtractor):
             if url is None:
                 continue
 
-            type = format_info.get('type') or 'unknown'
+            fmt_type = format_info.get('type') or 'unknown'
             transport = (format_info.get('transport') or 'https').lower()
 
             if transport == 'https':
@@ -100,10 +104,10 @@ class TubeTuGrazBaseIE(InfoExtractor):
                 }]
             elif transport == 'hls':
                 has_hls, formats = True, self._extract_m3u8_formats(
-                    url, id, 'mp4', fatal=False, note=f'downloading {type} HLS manifest')
+                    url, video_id, 'mp4', fatal=False, note=f'downloading {fmt_type} HLS manifest')
             elif transport == 'dash':
                 has_dash, formats = True, self._extract_mpd_formats(
-                    url, id, fatal=False, note=f'downloading {type} DASH manifest')
+                    url, video_id, fatal=False, note=f'downloading {fmt_type} DASH manifest')
             else:
                 # RTMP, HDS, SMOOTH, and unknown formats
                 # - RTMP url fails on every tested entry until now
@@ -111,21 +115,21 @@ class TubeTuGrazBaseIE(InfoExtractor):
                 # - SMOOTH url 404's on every tested entry until now
                 continue
 
-            yield from self._set_format_type(formats, type)
+            yield from self._set_format_type(formats, fmt_type)
 
         # TODO: Add test for these
-        for type in self._FORMAT_TYPES:
+        for fmt_type in self._FORMAT_TYPES:
             if not has_hls:
                 hls_formats = self._extract_m3u8_formats(
-                    f'https://wowza.tugraz.at/matterhorn_engage/smil:engage-player_{id}_{type}.smil/playlist.m3u8',
-                    id, 'mp4', fatal=False, note=f'Downloading {type} HLS manifest', errnote=False) or []
-                yield from self._set_format_type(hls_formats, type)
+                    f'https://wowza.tugraz.at/matterhorn_engage/smil:engage-player_{video_id}_{fmt_type}.smil/playlist.m3u8',
+                    video_id, 'mp4', fatal=False, note=f'Downloading {fmt_type} HLS manifest', errnote=False) or []
+                yield from self._set_format_type(hls_formats, fmt_type)
 
             if not has_dash:
                 dash_formats = self._extract_mpd_formats(
-                    f'https://wowza.tugraz.at/matterhorn_engage/smil:engage-player_{id}_{type}.smil/manifest_mpm4sav_mvlist.mpd',
-                    id, fatal=False, note=f'Downloading {type} DASH manifest', errnote=False)
-                yield from self._set_format_type(dash_formats, type)
+                    f'https://wowza.tugraz.at/matterhorn_engage/smil:engage-player_{video_id}_{fmt_type}.smil/manifest_mpm4sav_mvlist.mpd',
+                    video_id, fatal=False, note=f'Downloading {fmt_type} DASH manifest', errnote=False)
+                yield from self._set_format_type(dash_formats, fmt_type)
 
 
 class TubeTuGrazIE(TubeTuGrazBaseIE):
@@ -148,7 +152,7 @@ class TubeTuGrazIE(TubeTuGrazBaseIE):
                 'creator': 'Safran C',
                 'duration': 3295818,
                 'series_id': 'b1192fff-2aa7-4bf0-a5cf-7b15c3bd3b34',
-            }
+            },
         }, {
             'url': 'https://tube.tugraz.at/paella/ui/watch.html?id=2df6d787-e56a-428d-8ef4-d57f07eef238',
             'md5': 'de0d854a56bf7318d2b693fe1adb89a5',
@@ -158,7 +162,7 @@ class TubeTuGrazIE(TubeTuGrazBaseIE):
                 'ext': 'mp4',
             },
             'expected_warnings': ['Extractor failed to obtain "title"'],
-        }
+        },
     ]
 
     def _real_extract(self, url):
@@ -193,7 +197,7 @@ class TubeTuGrazSeriesIE(TubeTuGrazBaseIE):
                     'series': '[209351] Strassenwesen',
                     'creator': 'Neuhold R',
                     'duration': 6127024,
-                }
+                },
             },
             {
                 'info_dict': {
@@ -205,7 +209,7 @@ class TubeTuGrazSeriesIE(TubeTuGrazBaseIE):
                     'series': '[209351] Strassenwesen',
                     'creator': 'Neuhold R',
                     'duration': 5374422,
-                }
+                },
             },
             {
                 'info_dict': {
@@ -217,7 +221,7 @@ class TubeTuGrazSeriesIE(TubeTuGrazBaseIE):
                     'series': '[209351] Strassenwesen',
                     'creator': 'Neuhold R',
                     'duration': 5566404,
-                }
+                },
             },
             {
                 'info_dict': {
@@ -229,24 +233,25 @@ class TubeTuGrazSeriesIE(TubeTuGrazBaseIE):
                     'series': '[209351] Strassenwesen',
                     'creator': 'Neuhold R',
                     'duration': 5420200,
-                }
-            }
+                },
+            },
         ],
-        'min_playlist_count': 4
+        'playlist_mincount': 4,
     }]
 
     def _real_extract(self, url):
-        id = self._match_id(url)
-        episodes_data = self._download_json(self._API_EPISODE, id, query={'sid': id}, note='Downloading episode list')
+        playlist_id = self._match_id(url)
+        episodes_data = self._download_json(
+            self._API_EPISODE, playlist_id, query={'sid': playlist_id}, note='Downloading episode list')
         series_data = self._download_json(
-            'https://tube.tugraz.at/series/series.json', id, fatal=False,
+            'https://tube.tugraz.at/series/series.json', playlist_id, fatal=False,
             note='downloading series metadata', errnote='failed to download series metadata',
             query={
-                'seriesId': id,
+                'seriesId': playlist_id,
                 'count': 1,
-                'sort': 'TITLE'
+                'sort': 'TITLE',
             })
 
         return self.playlist_result(
-            map(self._extract_episode, episodes_data['search-results']['result']), id,
+            map(self._extract_episode, episodes_data['search-results']['result']), playlist_id,
             traverse_obj(series_data, ('catalogs', 0, 'http://purl.org/dc/terms/', 'title', 0, 'value')))
diff --git a/plugins/youtube_download/yt_dlp/extractor/tubitv.py b/plugins/youtube_download/yt_dlp/extractor/tubitv.py
index bd46bc3..694a92f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tubitv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tubitv.py
@@ -6,34 +6,48 @@ from ..utils import (
     ExtractorError,
     int_or_none,
     js_to_json,
+    strip_or_none,
     traverse_obj,
+    url_or_none,
     urlencode_postdata,
 )
 
 
 class TubiTvIE(InfoExtractor):
-    _VALID_URL = r'''(?x)
-                    (?:
-                        tubitv:|
-                        https?://(?:www\.)?tubitv\.com/(?:video|movies|tv-shows)/
-                    )
-                    (?P<id>[0-9]+)'''
+    IE_NAME = 'tubitv'
+    _VALID_URL = r'https?://(?:www\.)?tubitv\.com/(?P<type>video|movies|tv-shows)/(?P<id>\d+)'
     _LOGIN_URL = 'http://tubitv.com/login'
     _NETRC_MACHINE = 'tubitv'
-    _GEO_COUNTRIES = ['US']
     _TESTS = [{
-        'url': 'https://tubitv.com/movies/383676/tracker',
-        'md5': '566fa0f76870302d11af0de89511d3f0',
+        'url': 'https://tubitv.com/movies/100004539/the-39-steps',
         'info_dict': {
-            'id': '383676',
+            'id': '100004539',
             'ext': 'mp4',
-            'title': 'Tracker',
-            'description': 'md5:ff320baf43d0ad2655e538c1d5cd9706',
-            'uploader_id': 'f866e2677ea2f0dff719788e4f7f9195',
-            'release_year': 2010,
+            'title': 'The 39 Steps',
+            'description': 'md5:bb2f2dd337f0dc58c06cb509943f54c8',
+            'uploader_id': 'abc2558d54505d4f0f32be94f2e7108c',
+            'release_year': 1935,
             'thumbnail': r're:^https?://.+\.(jpe?g|png)$',
-            'duration': 6122,
+            'duration': 5187,
         },
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        'url': 'https://tubitv.com/tv-shows/554628/s01-e01-rise-of-the-snakes',
+        'info_dict': {
+            'id': '554628',
+            'ext': 'mp4',
+            'title': 'S01:E01 - Rise of the Snakes',
+            'description': 'md5:ba136f586de53af0372811e783a3f57d',
+            'episode': 'Rise of the Snakes',
+            'episode_number': 1,
+            'season': 'Season 1',
+            'season_number': 1,
+            'uploader_id': '2a9273e728c510d22aa5c57d0646810b',
+            'release_year': 2011,
+            'thumbnail': r're:^https?://.+\.(jpe?g|png)$',
+            'duration': 1376,
+        },
+        'params': {'skip_download': 'm3u8'},
     }, {
         'url': 'http://tubitv.com/video/283829/the_comedian_at_the_friday',
         'md5': '43ac06be9326f41912dc64ccf7a80320',
@@ -44,7 +58,7 @@ class TubiTvIE(InfoExtractor):
             'description': 'A stand up comedian is forced to look at the decisions in his life while on a one week trip to the west coast.',
             'uploader_id': 'bc168bee0d18dd1cb3b86c68706ab434',
         },
-        'skip': 'Content Unavailable'
+        'skip': 'Content Unavailable',
     }, {
         'url': 'http://tubitv.com/tv-shows/321886/s01_e01_on_nom_stories',
         'only_matching': True,
@@ -58,7 +72,7 @@ class TubiTvIE(InfoExtractor):
             'uploader_id': 'd8fed30d4f24fcb22ec294421b9defc2',
             'release_year': 1979,
         },
-        'skip': 'Content Unavailable'
+        'skip': 'Content Unavailable',
     }]
 
     # DRM formats are included only to raise appropriate error
@@ -81,88 +95,109 @@ class TubiTvIE(InfoExtractor):
                 'Login failed (invalid username/password)', expected=True)
 
     def _real_extract(self, url):
-        video_id = self._match_id(url)
-        video_data = self._download_json(f'https://tubitv.com/oz/videos/{video_id}/content', video_id, query={
-            'video_resources': ['dash', 'hlsv3', 'hlsv6', *self._UNPLAYABLE_FORMATS],
-        })
-        title = video_data['title']
+        video_id, video_type = self._match_valid_url(url).group('id', 'type')
+        webpage = self._download_webpage(f'https://tubitv.com/{video_type}/{video_id}/', video_id)
+        video_data = self._search_json(
+            r'window\.__data\s*=', webpage, 'data', video_id,
+            transform_source=js_to_json)['video']['byId'][video_id]
 
         formats = []
         drm_formats = False
 
-        for resource in video_data['video_resources']:
-            if resource['type'] in ('dash', ):
-                formats += self._extract_mpd_formats(resource['manifest']['url'], video_id, mpd_id=resource['type'], fatal=False)
-            elif resource['type'] in ('hlsv3', 'hlsv6'):
-                formats += self._extract_m3u8_formats(resource['manifest']['url'], video_id, 'mp4', m3u8_id=resource['type'], fatal=False)
-            elif resource['type'] in self._UNPLAYABLE_FORMATS:
+        for resource in traverse_obj(video_data, ('video_resources', lambda _, v: url_or_none(v['manifest']['url']))):
+            resource_type = resource.get('type')
+            manifest_url = resource['manifest']['url']
+            if resource_type == 'dash':
+                formats.extend(self._extract_mpd_formats(manifest_url, video_id, mpd_id=resource_type, fatal=False))
+            elif resource_type in ('hlsv3', 'hlsv6'):
+                formats.extend(self._extract_m3u8_formats(manifest_url, video_id, 'mp4', m3u8_id=resource_type, fatal=False))
+            elif resource_type in self._UNPLAYABLE_FORMATS:
                 drm_formats = True
+            else:
+                self.report_warning(f'Skipping unknown resource type "{resource_type}"')
 
         if not formats and drm_formats:
             self.report_drm(video_id)
         elif not formats and not video_data.get('policy_match'):  # policy_match is False if content was removed
             raise ExtractorError('This content is currently unavailable', expected=True)
 
-        thumbnails = []
-        for thumbnail_url in video_data.get('thumbnails', []):
-            if not thumbnail_url:
-                continue
-            thumbnails.append({
-                'url': self._proto_relative_url(thumbnail_url),
-            })
-
         subtitles = {}
-        for sub in video_data.get('subtitles', []):
-            sub_url = sub.get('url')
-            if not sub_url:
-                continue
+        for sub in traverse_obj(video_data, ('subtitles', lambda _, v: url_or_none(v['url']))):
             subtitles.setdefault(sub.get('lang', 'English'), []).append({
-                'url': self._proto_relative_url(sub_url),
+                'url': self._proto_relative_url(sub['url']),
             })
 
+        title = traverse_obj(video_data, ('title', {str}))
         season_number, episode_number, episode_title = self._search_regex(
             r'^S(\d+):E(\d+) - (.+)', title, 'episode info', fatal=False, group=(1, 2, 3), default=(None, None, None))
 
         return {
             'id': video_id,
-            'title': title,
+            'title': strip_or_none(title),
             'formats': formats,
             'subtitles': subtitles,
-            'thumbnails': thumbnails,
-            'description': video_data.get('description'),
-            'duration': int_or_none(video_data.get('duration')),
-            'uploader_id': video_data.get('publisher_id'),
-            'release_year': int_or_none(video_data.get('year')),
             'season_number': int_or_none(season_number),
             'episode_number': int_or_none(episode_number),
-            'episode_title': episode_title
+            'episode': strip_or_none(episode_title),
+            **traverse_obj(video_data, {
+                'description': ('description', {str}),
+                'duration': ('duration', {int_or_none}),
+                'uploader_id': ('publisher_id', {str}),
+                'release_year': ('year', {int_or_none}),
+                'thumbnails': ('thumbnails', ..., {url_or_none}, {'url': {self._proto_relative_url}}),
+            }),
         }
 
 
 class TubiTvShowIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?tubitv\.com/series/[0-9]+/(?P<show_name>[^/?#]+)'
+    IE_NAME = 'tubitv:series'
+    _VALID_URL = r'https?://(?:www\.)?tubitv\.com/series/\d+/(?P<show_name>[^/?#]+)(?:/season-(?P<season>\d+))?'
     _TESTS = [{
         'url': 'https://tubitv.com/series/3936/the-joy-of-painting-with-bob-ross?start=true',
-        'playlist_mincount': 390,
+        'playlist_mincount': 389,
         'info_dict': {
             'id': 'the-joy-of-painting-with-bob-ross',
-        }
+        },
+    }, {
+        'url': 'https://tubitv.com/series/2311/the-saddle-club/season-1',
+        'playlist_count': 26,
+        'info_dict': {
+            'id': 'the-saddle-club-season-1',
+        },
+    }, {
+        'url': 'https://tubitv.com/series/2311/the-saddle-club/season-3',
+        'playlist_count': 19,
+        'info_dict': {
+            'id': 'the-saddle-club-season-3',
+        },
+    }, {
+        'url': 'https://tubitv.com/series/2311/the-saddle-club/',
+        'playlist_mincount': 71,
+        'info_dict': {
+            'id': 'the-saddle-club',
+        },
     }]
 
-    def _entries(self, show_url, show_name):
-        show_webpage = self._download_webpage(show_url, show_name)
+    def _entries(self, show_url, playlist_id, selected_season):
+        webpage = self._download_webpage(show_url, playlist_id)
 
-        show_json = self._parse_json(self._search_regex(
-            r'window\.__data\s*=\s*({[^<]+});\s*</script>',
-            show_webpage, 'data'), show_name, transform_source=js_to_json)['video']
+        data = self._search_json(
+            r'window\.__data\s*=', webpage, 'data', playlist_id,
+            transform_source=js_to_json)['video']
 
-        for episode_id in show_json['fullContentById'].keys():
-            if traverse_obj(show_json, ('byId', episode_id, 'type')) == 's':
-                continue
-            yield self.url_result(
-                'tubitv:%s' % episode_id,
-                ie=TubiTvIE.ie_key(), video_id=episode_id)
+        # v['number'] is already a decimal string, but stringify to protect against API changes
+        path = [lambda _, v: str(v['number']) == selected_season] if selected_season else [..., {dict}]
+
+        for season in traverse_obj(data, ('byId', lambda _, v: v['type'] == 's', 'seasons', *path)):
+            season_number = int_or_none(season.get('number'))
+            for episode in traverse_obj(season, ('episodes', lambda _, v: v['id'])):
+                episode_id = episode['id']
+                yield self.url_result(
+                    f'https://tubitv.com/tv-shows/{episode_id}/', TubiTvIE, episode_id,
+                    season_number=season_number, episode_number=int_or_none(episode.get('num')))
 
     def _real_extract(self, url):
-        show_name = self._match_valid_url(url).group('show_name')
-        return self.playlist_result(self._entries(url, show_name), playlist_id=show_name)
+        playlist_id, selected_season = self._match_valid_url(url).group('show_name', 'season')
+        if selected_season:
+            playlist_id = f'{playlist_id}-season-{selected_season}'
+        return self.playlist_result(self._entries(url, playlist_id, selected_season), playlist_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/tumblr.py b/plugins/youtube_download/yt_dlp/extractor/tumblr.py
index a26bdca..1f2c9b1 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tumblr.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tumblr.py
@@ -3,12 +3,13 @@ from ..utils import (
     ExtractorError,
     int_or_none,
     traverse_obj,
-    urlencode_postdata
+    url_or_none,
+    urlencode_postdata,
 )
 
 
 class TumblrIE(InfoExtractor):
-    _VALID_URL = r'https?://(?P<blog_name>[^/?#&]+)\.tumblr\.com/(?:post|video)/(?P<id>[0-9]+)(?:$|[/?#])'
+    _VALID_URL = r'https?://(?P<blog_name_1>[^/?#&]+)\.tumblr\.com/(?:post|video|(?P<blog_name_2>[a-zA-Z\d-]+))/(?P<id>[0-9]+)(?:$|[/?#])'
     _NETRC_MACHINE = 'tumblr'
     _LOGIN_URL = 'https://www.tumblr.com/login'
     _OAUTH_URL = 'https://www.tumblr.com/api/v2/oauth2/token'
@@ -28,7 +29,7 @@ class TumblrIE(InfoExtractor):
             'repost_count': int,
             'age_limit': 0,
             'tags': ['Orphan Black', 'Tatiana Maslany', 'Interview', 'Video', 'OB S1 DVD Extras'],
-        }
+        },
     }, {
         'note': 'multiple formats',
         'url': 'https://maskofthedragon.tumblr.com/post/626907179849564160/mona-talking-in-english',
@@ -65,7 +66,8 @@ class TumblrIE(InfoExtractor):
             'repost_count': int,
             'age_limit': 0,
             'tags': [],
-        }
+        },
+        'skip': '404',
     }, {
         'note': 'dashboard only (original post)',
         'url': 'https://jujanon.tumblr.com/post/159704441298/my-baby-eating',
@@ -82,7 +84,7 @@ class TumblrIE(InfoExtractor):
             'repost_count': int,
             'age_limit': 0,
             'tags': ['crabs', 'my video', 'my pets'],
-        }
+        },
     }, {
         'note': 'dashboard only (reblog)',
         'url': 'https://bartlebyshop.tumblr.com/post/180294460076/duality-of-bird',
@@ -98,8 +100,7 @@ class TumblrIE(InfoExtractor):
             'like_count': int,
             'repost_count': int,
             'age_limit': 0,
-            'tags': [],
-        }
+        },
     }, {
         'note': 'dashboard only (external)',
         'url': 'https://afloweroutofstone.tumblr.com/post/675661759168823296/the-blues-remembers-everything-the-country-forgot',
@@ -109,14 +110,13 @@ class TumblrIE(InfoExtractor):
             'title': 'The Blues Remembers Everything the Country Forgot',
             'alt_title': 'The Blues Remembers Everything the Country Forgot',
             'description': 'md5:1a6b4097e451216835a24c1023707c79',
-            'release_date': '20201224',
             'creator': 'md5:c2239ba15430e87c3b971ba450773272',
             'uploader': 'Moor Mother - Topic',
             'upload_date': '20201223',
             'uploader_id': 'UCxrMtFBRkFvQJ_vVM4il08w',
             'uploader_url': 'http://www.youtube.com/channel/UCxrMtFBRkFvQJ_vVM4il08w',
             'thumbnail': r're:^https?://i.ytimg.com/.*',
-            'channel': 'Moor Mother - Topic',
+            'channel': 'Moor Mother',
             'channel_id': 'UCxrMtFBRkFvQJ_vVM4il08w',
             'channel_url': 'https://www.youtube.com/channel/UCxrMtFBRkFvQJ_vVM4il08w',
             'channel_follower_count': int,
@@ -135,24 +135,10 @@ class TumblrIE(InfoExtractor):
             'release_year': 2020,
         },
         'add_ie': ['Youtube'],
-    }, {
-        'url': 'http://naked-yogi.tumblr.com/post/118312946248/naked-smoking-stretching',
-        'md5': 'de07e5211d60d4f3a2c3df757ea9f6ab',
-        'info_dict': {
-            'id': 'Wmur',
-            'ext': 'mp4',
-            'title': 'naked smoking & stretching',
-            'upload_date': '20150506',
-            'timestamp': 1430931613,
-            'age_limit': 18,
-            'uploader_id': '1638622',
-            'uploader': 'naked-yogi',
-        },
-        # 'add_ie': ['Vidme'],
-        'skip': 'dead embedded video host'
+        'skip': 'Video Unavailable',
     }, {
         'url': 'https://prozdvoices.tumblr.com/post/673201091169681408/what-recording-voice-acting-sounds-like',
-        'md5': 'a0063fc8110e6c9afe44065b4ea68177',
+        'md5': 'cb8328a6723c30556cef59e370202918',
         'info_dict': {
             'id': 'eomhW5MLGWA',
             'ext': 'mp4',
@@ -160,8 +146,8 @@ class TumblrIE(InfoExtractor):
             'description': 'md5:1da3faa22d0e0b1d8b50216c284ee798',
             'uploader': 'ProZD',
             'upload_date': '20220112',
-            'uploader_id': 'ProZD',
-            'uploader_url': 'http://www.youtube.com/user/ProZD',
+            'uploader_id': '@ProZD',
+            'uploader_url': 'https://www.youtube.com/@ProZD',
             'thumbnail': r're:^https?://i.ytimg.com/.*',
             'channel': 'ProZD',
             'channel_id': 'UC6MFZAOHXlKK1FI7V0XQVeA',
@@ -176,6 +162,10 @@ class TumblrIE(InfoExtractor):
             'live_status': 'not_live',
             'playable_in_embed': True,
             'availability': 'public',
+            'heatmap': 'count:100',
+            'channel_is_verified': True,
+            'timestamp': 1642014562,
+            'comment_count': int,
         },
         'add_ie': ['Youtube'],
     }, {
@@ -183,37 +173,22 @@ class TumblrIE(InfoExtractor):
         'md5': '203e9eb8077e3f45bfaeb4c86c1467b8',
         'info_dict': {
             'id': '87816359',
-            'ext': 'mov',
+            'ext': 'mp4',
             'title': 'Harold Ramis',
-            'description': 'md5:be8e68cbf56ce0785c77f0c6c6dfaf2c',
+            'description': 'md5:c99882405fcca0b1d348ad093f8f1672',
             'uploader': 'Resolution Productions Group',
             'uploader_id': 'resolutionproductions',
             'uploader_url': 'https://vimeo.com/resolutionproductions',
             'upload_date': '20140227',
             'thumbnail': r're:^https?://i.vimeocdn.com/video/.*',
-            'timestamp': 1393523719,
+            'timestamp': 1393541719,
             'duration': 291,
+            'comment_count': int,
+            'like_count': int,
+            'release_timestamp': 1393541719,
+            'release_date': '20140227',
         },
         'add_ie': ['Vimeo'],
-    }, {
-        'url': 'http://sutiblr.tumblr.com/post/139638707273',
-        'md5': '2dd184b3669e049ba40563a7d423f95c',
-        'info_dict': {
-            'id': 'ir7qBEIKqvq',
-            'ext': 'mp4',
-            'title': 'Vine by sutiblr',
-            'alt_title': 'Vine by sutiblr',
-            'uploader': 'sutiblr',
-            'uploader_id': '1198993975374495744',
-            'upload_date': '20160220',
-            'like_count': int,
-            'comment_count': int,
-            'repost_count': int,
-            'thumbnail': r're:^https?://.*\.jpg',
-            'timestamp': 1455940159,
-            'view_count': int,
-        },
-        'add_ie': ['Vine'],
     }, {
         'url': 'https://silami.tumblr.com/post/84250043974/my-bad-river-flows-in-you-impression-on-maschine',
         'md5': '3c92d7c3d867f14ccbeefa2119022277',
@@ -232,13 +207,156 @@ class TumblrIE(InfoExtractor):
             'upload_date': '20140429',
         },
         'add_ie': ['Instagram'],
+    }, {
+        'note': 'new url scheme',
+        'url': 'https://www.tumblr.com/autumnsister/765162750456578048?source=share',
+        'info_dict': {
+            'id': '765162750456578048',
+            'ext': 'mp4',
+            'uploader_url': 'https://autumnsister.tumblr.com/',
+            'tags': ['autumn', 'food', 'curators on tumblr'],
+            'like_count': int,
+            'thumbnail': 'https://64.media.tumblr.com/tumblr_sklad89N3x1ygquow_frame1.jpg',
+            'title': '🪹',
+            'uploader_id': 'autumnsister',
+            'repost_count': int,
+            'age_limit': 0,
+        },
+    }, {
+        'note': 'bandcamp album embed',
+        'url': 'https://patricia-taxxon.tumblr.com/post/704473755725004800/patricia-taxxon-agnes-hilda-patricia-taxxon',
+        'info_dict': {
+            'id': 'agnes-hilda',
+            'title': 'Agnes & Hilda',
+            'description': 'The inexplicable joy of an artist. Wash paws after listening.',
+            'uploader_id': 'patriciataxxon',
+        },
+        'playlist_count': 8,
+    }, {
+        'note': 'bandcamp track embeds (many)',
+        'url': 'https://www.tumblr.com/felixcosm/730460905855467520/if-youre-looking-for-new-music-to-write-or',
+        'info_dict': {
+            'id': '730460905855467520',
+            'uploader_id': 'felixcosm',
+            'repost_count': int,
+            'tags': 'count:15',
+            'description': 'md5:2eb3482a3c6987280cbefb6839068f32',
+            'like_count': int,
+            'age_limit': 0,
+            'title': 'If you\'re looking for new music to write or imagine scenerios to: STOP. This is for you.',
+            'uploader_url': 'https://felixcosm.tumblr.com/',
+        },
+        'playlist_count': 10,
+    }, {
+        'note': 'soundcloud track embed',
+        'url': 'https://silverfoxstole.tumblr.com/post/765305403763556352/jamie-robertson-doctor-who-8th-doctor',
+        'info_dict': {
+            'id': '1218136399',
+            'ext': 'opus',
+            'comment_count': int,
+            'genres': [],
+            'repost_count': int,
+            'uploader': 'Jamie Robertson',
+            'title': 'Doctor Who - 8th doctor -   Stranded Theme never released and used.',
+            'duration': 46.106,
+            'uploader_id': '2731064',
+            'thumbnail': 'https://i1.sndcdn.com/artworks-MVgcPm5jN42isC5M-6Dz22w-original.jpg',
+            'timestamp': 1645181261,
+            'uploader_url': 'https://soundcloud.com/jamierobertson',
+            'view_count': int,
+            'upload_date': '20220218',
+            'description': 'md5:ab924dd9994d0a7d64d6d31bf2af4625',
+            'license': 'all-rights-reserved',
+            'like_count': int,
+        },
+    }, {
+        'note': 'soundcloud set embed',
+        'url': 'https://www.tumblr.com/beyourselfchulanmaria/703505323122638848/chu-lan-maria-the-playlist-%E5%BF%83%E7%9A%84%E5%91%BC%E5%96%9A-call-of-the',
+        'info_dict': {
+            'id': '691222680',
+            'title': '心的呼喚 Call of the heart I',
+            'description': 'md5:25952a8d178a3aa55e40fcbb646a38c3',
+        },
+        'playlist_mincount': 19,
+    }, {
+        'note': 'dailymotion video embed',
+        'url': 'https://www.tumblr.com/funvibecentral/759390024460632064',
+        'info_dict': {
+            'id': 'x94cnnk',
+            'ext': 'mp4',
+            'description': 'Funny dailymotion shorts.\n#funny #fun#comedy #romantic #exciting',
+            'uploader': 'FunVibe Central',
+            'like_count': int,
+            'view_count': int,
+            'timestamp': 1724210553,
+            'title': 'Woman watching other Woman',
+            'tags': [],
+            'upload_date': '20240821',
+            'age_limit': 0,
+            'uploader_id': 'x32m6ye',
+            'duration': 20,
+            'thumbnail': r're:https://(?:s[12]\.)dmcdn\.net/v/Wtqh01cnxKNXLG1N8/x1080',
+        },
+    }, {
+        'note': 'tiktok video embed',
+        'url': 'https://fansofcolor.tumblr.com/post/660637918605475840/blockquote-class-tiktok-embed',
+        'info_dict': {
+            'id': '7000937272010935558',
+            'ext': 'mp4',
+            'artists': ['Alicia Dreaming'],
+            'like_count': int,
+            'repost_count': int,
+            'thumbnail': r're:^https?://[\w\/\.\-]+(~[\w\-]+\.image)?',
+            'channel_id': 'MS4wLjABAAAAsJohwz_dU4KfAOc61cbGDAZ46-5hg2ANTXVQlRe1ipDhpX08PywR3PPiple1NTAo',
+            'uploader': 'aliciadreaming',
+            'description': 'huge casting news Greyworm will be  #louisdulac #racebending #interviewwiththevampire',
+            'title': 'huge casting news Greyworm will be  #louisdulac #racebending #interviewwiththevampire',
+            'channel_url': 'https://www.tiktok.com/@MS4wLjABAAAAsJohwz_dU4KfAOc61cbGDAZ46-5hg2ANTXVQlRe1ipDhpX08PywR3PPiple1NTAo',
+            'uploader_id': '7000478462196990982',
+            'uploader_url': 'https://www.tiktok.com/@aliciadreaming',
+            'timestamp': 1630032733,
+            'channel': 'Alicia Dreaming',
+            'track': 'original sound',
+            'upload_date': '20210827',
+            'view_count': int,
+            'comment_count': int,
+            'duration': 59,
+        },
+    }, {
+        'note': 'tumblr video AND youtube embed',
+        'url': 'https://www.tumblr.com/anyaboz/765332564457209856/my-music-video-for-selkie-by-nobodys-wolf-child',
+        'info_dict': {
+            'id': '765332564457209856',
+            'uploader_id': 'anyaboz',
+            'repost_count': int,
+            'age_limit': 0,
+            'uploader_url': 'https://anyaboz.tumblr.com/',
+            'description': 'md5:9a129cf6ce9d87a80ffd3c6dedd4d1e6',
+            'like_count': int,
+            'title': 'md5:b18a2ac9387681d20303e485db85c1b5',
+            'tags': ['music video', 'nobodys wolf child', 'selkie', 'Stop Motion Animation', 'stop Motion', 'room guardians', 'Youtube'],
+        },
+        'playlist_count': 2,
+    }, {
+        # twitch_live provider - error when linked account is not live
+        'url': 'https://www.tumblr.com/anarcho-skamunist/722224493650722816/hollow-knight-stream-right-now-going-to-fight',
+        'only_matching': True,
     }]
 
     _providers = {
         'instagram': 'Instagram',
         'vimeo': 'Vimeo',
-        'vine': 'Vine',
         'youtube': 'Youtube',
+        'dailymotion': 'Dailymotion',
+        'tiktok': 'TikTok',
+        'twitch_live': 'TwitchStream',
+        'bandcamp': None,
+        'soundcloud': None,
+    }
+    # known not to be supported
+    _unsupported_providers = {
+        # seems like podcasts can't be embedded
+        'spotify',
     }
 
     _ACCESS_TOKEN = None
@@ -256,23 +374,40 @@ class TumblrIE(InfoExtractor):
         if not self._ACCESS_TOKEN:
             return
 
-        self._download_json(
-            self._OAUTH_URL, None, 'Logging in',
-            data=urlencode_postdata({
-                'password': password,
-                'grant_type': 'password',
-                'username': username,
-            }), headers={
-                'Content-Type': 'application/x-www-form-urlencoded',
-                'Authorization': f'Bearer {self._ACCESS_TOKEN}',
-            },
-            errnote='Login failed', fatal=False)
+        data = {
+            'password': password,
+            'grant_type': 'password',
+            'username': username,
+        }
+        if self.get_param('twofactor'):
+            data['tfa_token'] = self.get_param('twofactor')
+
+        def _call_login():
+            return self._download_json(
+                self._OAUTH_URL, None, 'Logging in',
+                data=urlencode_postdata(data),
+                headers={
+                    'Content-Type': 'application/x-www-form-urlencoded',
+                    'Authorization': f'Bearer {self._ACCESS_TOKEN}',
+                },
+                errnote='Login failed', fatal=False,
+                expected_status=lambda s: 400 <= s < 500)
+
+        response = _call_login()
+        if traverse_obj(response, 'error') == 'tfa_required':
+            data['tfa_token'] = self._get_tfa_info()
+            response = _call_login()
+        if traverse_obj(response, 'error'):
+            raise ExtractorError(
+                f'API returned error {": ".join(traverse_obj(response, (("error", "error_description"), {str})))}')
 
     def _real_extract(self, url):
-        blog, video_id = self._match_valid_url(url).groups()
+        blog_1, blog_2, video_id = self._match_valid_url(url).groups()
+        blog = blog_2 or blog_1
 
-        url = f'http://{blog}.tumblr.com/post/{video_id}/'
-        webpage, urlh = self._download_webpage_handle(url, video_id)
+        url = f'http://{blog}.tumblr.com/post/{video_id}'
+        webpage, urlh = self._download_webpage_handle(
+            url, video_id, headers={'User-Agent': 'WhatsApp/2.0'})  # whatsapp ua bypasses problems
 
         redirect_url = urlh.url
 
@@ -289,23 +424,69 @@ class TumblrIE(InfoExtractor):
                 self._download_json(
                     f'https://www.tumblr.com/api/v2/blog/{blog}/posts/{video_id}/permalink',
                     video_id, headers={'Authorization': f'Bearer {self._ACCESS_TOKEN}'}, fatal=False),
-                ('response', 'timeline', 'elements', 0)) or {}
-        content_json = traverse_obj(post_json, ('trail', 0, 'content'), ('content')) or []
-        video_json = next(
-            (item for item in content_json if item.get('type') == 'video'), {})
-        media_json = video_json.get('media') or {}
-        if api_only and not media_json.get('url') and not video_json.get('url'):
-            raise ExtractorError('Failed to find video data for dashboard-only post')
+                ('response', 'timeline', 'elements', 0, {dict})) or {}
+        content_json = traverse_obj(post_json, ((('trail', 0), None), 'content', ..., {dict}))
 
-        if not media_json.get('url') and video_json.get('url'):
-            # external video host
-            return self.url_result(
-                video_json['url'],
-                self._providers.get(video_json.get('provider'), 'Generic'))
+        # the url we're extracting from might be an original post or it might be a reblog.
+        # if it's a reblog, og:description will be the reblogger's comment, not the uploader's.
+        # content_json is always the op, so if it exists but has no text, there's no description
+        if content_json:
+            description = '\n\n'.join(
+                item.get('text') for item in content_json if item.get('type') == 'text') or None
+        else:
+            description = self._og_search_description(webpage, default=None)
+        uploader_id = traverse_obj(post_json, 'reblogged_root_name', 'blog_name')
 
-        video_url = self._og_search_video_url(webpage, default=None)
-        duration = None
+        info_dict = {
+            'id': video_id,
+            'title': post_json.get('summary') or (blog if api_only else self._html_search_regex(
+                r'(?s)<title>(?P<title>.*?)(?: \| Tumblr)?</title>', webpage, 'title', default=blog)),
+            'description': description,
+            'uploader_id': uploader_id,
+            'uploader_url': f'https://{uploader_id}.tumblr.com/' if uploader_id else None,
+            **traverse_obj(post_json, {
+                'like_count': ('like_count', {int_or_none}),
+                'repost_count': ('reblog_count', {int_or_none}),
+                'tags': ('tags', ..., {str}),
+            }),
+            'age_limit': {True: 18, False: 0}.get(post_json.get('is_nsfw')),
+        }
+
+        # for tumblr's own video hosting
+        fallback_format = None
         formats = []
+        video_url = self._og_search_video_url(webpage, default=None)
+        # for external video hosts
+        entries = []
+        ignored_providers = set()
+        unknown_providers = set()
+
+        for video_json in traverse_obj(content_json, lambda _, v: v['type'] in ('video', 'audio')):
+            media_json = video_json.get('media') or {}
+            if api_only and not media_json.get('url') and not video_json.get('url'):
+                raise ExtractorError('Failed to find video data for dashboard-only post')
+            provider = video_json.get('provider')
+
+            if provider in ('tumblr', None):
+                fallback_format = {
+                    'url': media_json.get('url') or video_url,
+                    'width': int_or_none(
+                        media_json.get('width') or self._og_search_property('video:width', webpage, default=None)),
+                    'height': int_or_none(
+                        media_json.get('height') or self._og_search_property('video:height', webpage, default=None)),
+                }
+                continue
+            elif provider in self._unsupported_providers:
+                ignored_providers.add(provider)
+                continue
+            elif provider and provider not in self._providers:
+                unknown_providers.add(provider)
+            if video_json.get('url'):
+                # external video host
+                entries.append(self.url_result(
+                    video_json['url'], self._providers.get(provider)))
+
+        duration = None
 
         # iframes can supply duration and sometimes additional formats, so check for one
         iframe_url = self._search_regex(
@@ -344,44 +525,36 @@ class TumblrIE(InfoExtractor):
                         'quality': quality,
                     } for quality, (video_url, format_id) in enumerate(sources)]
 
-        if not media_json.get('url') and not video_url and not iframe_url:
-            # external video host (but we weren't able to figure it out from the api)
-            iframe_url = self._search_regex(
-                r'src=["\'](https?://safe\.txmblr\.com/svc/embed/inline/[^"\']+)["\']',
-                webpage, 'embed iframe url', default=None)
-            return self.url_result(iframe_url or redirect_url, 'Generic')
+        if not formats and fallback_format:
+            formats.append(fallback_format)
 
-        formats = formats or [{
-            'url': media_json.get('url') or video_url,
-            'width': int_or_none(
-                media_json.get('width') or self._og_search_property('video:width', webpage, default=None)),
-            'height': int_or_none(
-                media_json.get('height') or self._og_search_property('video:height', webpage, default=None)),
-        }]
+        if formats:
+            # tumblr's own video is always above embeds
+            entries.insert(0, {
+                **info_dict,
+                'formats': formats,
+                'duration': duration,
+                'thumbnail': (traverse_obj(video_json, ('poster', 0, 'url', {url_or_none}))
+                              or self._og_search_thumbnail(webpage, default=None)),
+            })
 
-        # the url we're extracting from might be an original post or it might be a reblog.
-        # if it's a reblog, og:description will be the reblogger's comment, not the uploader's.
-        # content_json is always the op, so if it exists but has no text, there's no description
-        if content_json:
-            description = '\n\n'.join((
-                item.get('text') for item in content_json if item.get('type') == 'text')) or None
-        else:
-            description = self._og_search_description(webpage, default=None)
-        uploader_id = traverse_obj(post_json, 'reblogged_root_name', 'blog_name')
+        if ignored_providers:
+            if not entries:
+                raise ExtractorError(f'None of embed providers are supported: {", ".join(ignored_providers)!s}', video_id=video_id, expected=True)
+            else:
+                self.report_warning(f'Skipped embeds from unsupported providers: {", ".join(ignored_providers)!s}', video_id)
+        if unknown_providers:
+            self.report_warning(f'Unrecognized providers, please report: {", ".join(unknown_providers)!s}', video_id)
 
+        if not entries:
+            self.raise_no_formats('No video could be found in this post', expected=True, video_id=video_id)
+        if len(entries) == 1:
+            return {
+                **info_dict,
+                **entries[0],
+            }
         return {
-            'id': video_id,
-            'title': post_json.get('summary') or (blog if api_only else self._html_search_regex(
-                r'(?s)<title>(?P<title>.*?)(?: \| Tumblr)?</title>', webpage, 'title')),
-            'description': description,
-            'thumbnail': (traverse_obj(video_json, ('poster', 0, 'url'))
-                          or self._og_search_thumbnail(webpage, default=None)),
-            'uploader_id': uploader_id,
-            'uploader_url': f'https://{uploader_id}.tumblr.com/' if uploader_id else None,
-            'duration': duration,
-            'like_count': post_json.get('like_count'),
-            'repost_count': post_json.get('reblog_count'),
-            'age_limit': {True: 18, False: 0}.get(post_json.get('is_nsfw')),
-            'tags': post_json.get('tags'),
-            'formats': formats,
+            **info_dict,
+            '_type': 'playlist',
+            'entries': entries,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/tunein.py b/plugins/youtube_download/yt_dlp/extractor/tunein.py
index fd2fe13..05bb2a9 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tunein.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tunein.py
@@ -117,7 +117,7 @@ class TuneInPodcastIE(TuneInBaseIE):
         'playlist_mincount': 200,
     }, {
         'url': 'https://tunein.com/embed/player/p191660/',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://tunein.com/podcasts/World-News/BBC-News-p14/',
         'info_dict': {
@@ -230,5 +230,5 @@ class TuneInShortenerIE(InfoExtractor):
         if url_parsed.port == 443:
             url = url_parsed._replace(netloc=url_parsed.hostname).url
 
-        self.to_screen('Following redirect: %s' % url)
+        self.to_screen(f'Following redirect: {url}')
         return self.url_result(url)
diff --git a/plugins/youtube_download/yt_dlp/extractor/tunepk.py b/plugins/youtube_download/yt_dlp/extractor/tunepk.py
deleted file mode 100644
index e4e507b..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/tunepk.py
+++ /dev/null
@@ -1,87 +0,0 @@
-from .common import InfoExtractor
-from ..compat import compat_str
-from ..utils import (
-    int_or_none,
-    try_get,
-    unified_timestamp,
-)
-
-
-class TunePkIE(InfoExtractor):
-    _VALID_URL = r'''(?x)
-                    https?://
-                        (?:
-                            (?:www\.)?tune\.pk/(?:video/|player/embed_player.php?.*?\bvid=)|
-                            embed\.tune\.pk/play/
-                        )
-                        (?P<id>\d+)
-                    '''
-    _TESTS = [{
-        'url': 'https://tune.pk/video/6919541/maudie-2017-international-trailer-1-ft-ethan-hawke-sally-hawkins',
-        'md5': '0c537163b7f6f97da3c5dd1e3ef6dd55',
-        'info_dict': {
-            'id': '6919541',
-            'ext': 'mp4',
-            'title': 'Maudie (2017) | International Trailer # 1 ft Ethan Hawke, Sally Hawkins',
-            'description': 'md5:eb5a04114fafef5cec90799a93a2d09c',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'timestamp': 1487327564,
-            'upload_date': '20170217',
-            'uploader': 'Movie Trailers',
-            'duration': 107,
-            'view_count': int,
-        }
-    }, {
-        'url': 'https://tune.pk/player/embed_player.php?vid=6919541&folder=2017/02/17/&width=600&height=350&autoplay=no',
-        'only_matching': True,
-    }, {
-        'url': 'https://embed.tune.pk/play/6919541?autoplay=no&ssl=yes&inline=true',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        webpage = self._download_webpage(
-            'https://tune.pk/video/%s' % video_id, video_id)
-
-        details = self._parse_json(
-            self._search_regex(
-                r'new\s+TunePlayer\(({.+?})\)\s*;\s*\n', webpage, 'tune player'),
-            video_id)['details']
-
-        video = details['video']
-        title = video.get('title') or self._og_search_title(
-            webpage, default=None) or self._html_search_meta(
-            'title', webpage, 'title', fatal=True)
-
-        formats = self._parse_jwplayer_formats(
-            details['player']['sources'], video_id)
-
-        description = self._og_search_description(
-            webpage, default=None) or self._html_search_meta(
-            'description', webpage, 'description')
-
-        thumbnail = video.get('thumb') or self._og_search_thumbnail(
-            webpage, default=None) or self._html_search_meta(
-            'thumbnail', webpage, 'thumbnail')
-
-        timestamp = unified_timestamp(video.get('date_added'))
-        uploader = try_get(
-            video, lambda x: x['uploader']['name'],
-            compat_str) or self._html_search_meta('author', webpage, 'author')
-
-        duration = int_or_none(video.get('duration'))
-        view_count = int_or_none(video.get('views'))
-
-        return {
-            'id': video_id,
-            'title': title,
-            'description': description,
-            'thumbnail': thumbnail,
-            'timestamp': timestamp,
-            'uploader': uploader,
-            'duration': duration,
-            'view_count': view_count,
-            'formats': formats,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/turbo.py b/plugins/youtube_download/yt_dlp/extractor/turbo.py
deleted file mode 100644
index cdb7dcf..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/turbo.py
+++ /dev/null
@@ -1,64 +0,0 @@
-import re
-
-from .common import InfoExtractor
-from ..compat import compat_str
-from ..utils import (
-    ExtractorError,
-    int_or_none,
-    qualities,
-    xpath_text,
-)
-
-
-class TurboIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?turbo\.fr/videos-voiture/(?P<id>[0-9]+)-'
-    _API_URL = 'http://www.turbo.fr/api/tv/xml.php?player_generique=player_generique&id={0:}'
-    _TEST = {
-        'url': 'http://www.turbo.fr/videos-voiture/454443-turbo-du-07-09-2014-renault-twingo-3-bentley-continental-gt-speed-ces-guide-achat-dacia.html',
-        'md5': '33f4b91099b36b5d5a91f84b5bcba600',
-        'info_dict': {
-            'id': '454443',
-            'ext': 'mp4',
-            'duration': 3715,
-            'title': 'Turbo du 07/09/2014 : Renault Twingo 3, Bentley Continental GT Speed, CES, Guide Achat Dacia... ',
-            'description': 'Turbo du 07/09/2014 : Renault Twingo 3, Bentley Continental GT Speed, CES, Guide Achat Dacia...',
-            'thumbnail': r're:^https?://.*\.jpg$',
-        }
-    }
-
-    def _real_extract(self, url):
-        mobj = self._match_valid_url(url)
-        video_id = mobj.group('id')
-
-        webpage = self._download_webpage(url, video_id)
-
-        playlist = self._download_xml(self._API_URL.format(video_id), video_id)
-        item = playlist.find('./channel/item')
-        if item is None:
-            raise ExtractorError('Playlist item was not found', expected=True)
-
-        title = xpath_text(item, './title', 'title')
-        duration = int_or_none(xpath_text(item, './durate', 'duration'))
-        thumbnail = xpath_text(item, './visuel_clip', 'thumbnail')
-        description = self._html_search_meta('description', webpage)
-
-        formats = []
-        get_quality = qualities(['3g', 'sd', 'hq'])
-        for child in item:
-            m = re.search(r'url_video_(?P<quality>.+)', child.tag)
-            if m:
-                quality = compat_str(m.group('quality'))
-                formats.append({
-                    'format_id': quality,
-                    'url': child.text,
-                    'quality': get_quality(quality),
-                })
-
-        return {
-            'id': video_id,
-            'title': title,
-            'duration': duration,
-            'thumbnail': thumbnail,
-            'description': description,
-            'formats': formats,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/turner.py b/plugins/youtube_download/yt_dlp/extractor/turner.py
index 630d84b..8b79a8b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/turner.py
+++ b/plugins/youtube_download/yt_dlp/extractor/turner.py
@@ -1,19 +1,18 @@
 import re
 
 from .adobepass import AdobePassIE
-from ..compat import compat_str
 from ..utils import (
-    fix_xml_ampersands,
-    xpath_text,
-    int_or_none,
-    determine_ext,
-    float_or_none,
-    parse_duration,
-    xpath_attr,
-    update_url_query,
     ExtractorError,
+    determine_ext,
+    fix_xml_ampersands,
+    float_or_none,
+    int_or_none,
+    parse_duration,
     strip_or_none,
+    update_url_query,
     url_or_none,
+    xpath_attr,
+    xpath_text,
 )
 
 
@@ -79,7 +78,7 @@ class TurnerBaseIE(AdobePassIE):
             ext = determine_ext(video_url)
             if video_url.startswith('/mp4:protected/'):
                 continue
-                # TODO Correct extraction for these files
+                # TODO: Correct extraction for these files
                 # protected_path_data = path_data.get('protected')
                 # if not protected_path_data or not rtmp_src:
                 #     continue
@@ -160,7 +159,7 @@ class TurnerBaseIE(AdobePassIE):
                         'height': int(mobj.group('height')),
                         'tbr': int_or_none(mobj.group('bitrate')),
                     })
-                elif isinstance(format_id, compat_str):
+                elif isinstance(format_id, str):
                     if format_id.isdigit():
                         f['tbr'] = int(format_id)
                     else:
@@ -187,7 +186,7 @@ class TurnerBaseIE(AdobePassIE):
                         'scc': 'scc',
                         'webvtt': 'vtt',
                         'smptett': 'tt',
-                    }.get(source.get('format'))
+                    }.get(source.get('format')),
                 })
 
         thumbnails.extend({
@@ -219,7 +218,7 @@ class TurnerBaseIE(AdobePassIE):
     def _extract_ngtv_info(self, media_id, tokenizer_query, ap_data=None):
         is_live = ap_data.get('is_live')
         streams_data = self._download_json(
-            'http://medium.ngtv.io/media/%s/tv' % media_id,
+            f'http://medium.ngtv.io/media/{media_id}/tv',
             media_id)['media']['tv']
         duration = None
         chapters = []
diff --git a/plugins/youtube_download/yt_dlp/extractor/tv2.py b/plugins/youtube_download/yt_dlp/extractor/tv2.py
index f6b452d..601ecab 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tv2.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tv2.py
@@ -3,10 +3,10 @@ import re
 from .common import InfoExtractor
 from ..networking.exceptions import HTTPError
 from ..utils import (
-    determine_ext,
     ExtractorError,
-    int_or_none,
+    determine_ext,
     float_or_none,
+    int_or_none,
     js_to_json,
     parse_iso8601,
     remove_end,
@@ -52,10 +52,10 @@ class TV2IE(InfoExtractor):
         format_urls = []
         for protocol in self._PROTOCOLS:
             try:
-                data = self._download_json('https://api.sumo.tv2.no/play/%s?stream=%s' % (video_id, protocol),
+                data = self._download_json(f'https://api.sumo.tv2.no/play/{video_id}?stream={protocol}',
                                            video_id, 'Downloading playabck JSON',
                                            headers={'content-type': 'application/json'},
-                                           data='{"device":{"id":"1-1-1","name":"Nettleser (HTML)"}}'.encode())['playback']
+                                           data=b'{"device":{"id":"1-1-1","name":"Nettleser (HTML)"}}')['playback']
             except ExtractorError as e:
                 if isinstance(e.cause, HTTPError) and e.cause.status == 401:
                     error = self._parse_json(e.cause.response.read().decode(), video_id)['error']
@@ -71,7 +71,7 @@ class TV2IE(InfoExtractor):
                 video_url = item.get('url')
                 if not video_url or video_url in format_urls:
                     continue
-                format_id = '%s-%s' % (protocol.lower(), item.get('type'))
+                format_id = '{}-{}'.format(protocol.lower(), item.get('type'))
                 if not self._is_valid_url(video_url, video_id, format_id):
                     continue
                 format_urls.append(video_url)
@@ -97,9 +97,9 @@ class TV2IE(InfoExtractor):
             self.report_drm(video_id)
 
         thumbnails = [{
-            'id': type,
+            'id': thumb_type,
             'url': thumb_url,
-        } for type, thumb_url in (asset.get('images') or {}).items()]
+        } for thumb_type, thumb_url in (asset.get('images') or {}).items()]
 
         return {
             'id': video_id,
@@ -151,7 +151,7 @@ class TV2ArticleIE(InfoExtractor):
                     assets.append(asset)
 
         entries = [
-            self.url_result('http://www.tv2.no/v/%s' % asset_id, 'TV2')
+            self.url_result(f'http://www.tv2.no/v/{asset_id}', 'TV2')
             for asset_id in assets]
 
         title = remove_end(self._og_search_title(webpage), ' - TV2.no')
@@ -161,6 +161,7 @@ class TV2ArticleIE(InfoExtractor):
 
 
 class KatsomoIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?(?:katsomo|mtv(uutiset)?)\.fi/(?:sarja/[0-9a-z-]+-\d+/[0-9a-z-]+-|(?:#!/)?jakso/(?:\d+/[^/]+/)?|video/prog)(?P<id>\d+)'
     _TESTS = [{
         'url': 'https://www.mtv.fi/sarja/mtv-uutiset-live-33001002003/lahden-pelicans-teki-kovan-ratkaisun-ville-nieminen-pihalle-1181321',
@@ -195,7 +196,7 @@ class KatsomoIE(InfoExtractor):
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        api_base = 'http://%s/api/web/asset/%s' % (self._API_DOMAIN, video_id)
+        api_base = f'http://{self._API_DOMAIN}/api/web/asset/{video_id}'
 
         asset = self._download_json(
             api_base + '.json', video_id,
@@ -208,7 +209,7 @@ class KatsomoIE(InfoExtractor):
         for protocol in self._PROTOCOLS:
             try:
                 data = self._download_json(
-                    api_base + '/play.json?protocol=%s&videoFormat=SMIL+ISMUSP' % protocol,
+                    api_base + f'/play.json?protocol={protocol}&videoFormat=SMIL+ISMUSP',
                     video_id, 'Downloading play JSON')['playback']
             except ExtractorError as e:
                 if isinstance(e.cause, HTTPError) and e.cause.status == 401:
@@ -231,7 +232,7 @@ class KatsomoIE(InfoExtractor):
                 video_url = item.get('url')
                 if not video_url or video_url in format_urls:
                     continue
-                format_id = '%s-%s' % (protocol.lower(), item.get('mediaFormat'))
+                format_id = '{}-{}'.format(protocol.lower(), item.get('mediaFormat'))
                 if not self._is_valid_url(video_url, video_id, format_id):
                     continue
                 format_urls.append(video_url)
@@ -279,6 +280,7 @@ class KatsomoIE(InfoExtractor):
 
 
 class MTVUutisetArticleIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)mtvuutiset\.fi/artikkeli/[^/]+/(?P<id>\d+)'
     _TESTS = [{
         'url': 'https://www.mtvuutiset.fi/artikkeli/tallaisia-vaurioita-viking-amorellassa-on-useamman-osaston-alla-vetta/7931384',
diff --git a/plugins/youtube_download/yt_dlp/extractor/tv24ua.py b/plugins/youtube_download/yt_dlp/extractor/tv24ua.py
index 89905ac..2787de4 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tv24ua.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tv24ua.py
@@ -15,7 +15,7 @@ class TV24UAVideoIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'У Харкові ворожа ракета прилетіла в будинок, де слухали пісні про "офіцерів-росіян"',
             'thumbnail': r're:^https?://.*\.jpe?g',
-        }
+        },
     }, {
         'url': 'https://24tv.ua/news/showPlayer.do?videoUrl=2022/07/2074790&objectId=2074790&w=640&h=360',
         'only_matching': True,
@@ -32,7 +32,7 @@ class TV24UAVideoIE(InfoExtractor):
                 'ext': 'mp4',
                 'title': 'Росіяни руйнують Бородянку на Київщині та стріляють з літаків по мешканцях: шокуючі фото',
                 'thumbnail': r're:^https?://.*\.jpe?g',
-            }
+            },
         },
         {
             'url': 'https://24tv.ua/vipalyuyut-nashi-mista-sela-dsns-pokazali-motoroshni-naslidki_n1883966',
@@ -43,7 +43,7 @@ class TV24UAVideoIE(InfoExtractor):
                 'thumbnail': r're:^https?://.*\.jpe?g',
             },
             'params': {'allowed_extractors': ['Generic', '24tv.ua']},
-        }
+        },
     ]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/tv2dk.py b/plugins/youtube_download/yt_dlp/extractor/tv2dk.py
index 35e92f1..bad120f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tv2dk.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tv2dk.py
@@ -2,12 +2,13 @@ import json
 import re
 
 from .common import InfoExtractor
+from .jwplatform import JWPlatformIE
 from ..utils import (
     determine_ext,
-    extract_attributes,
     js_to_json,
     url_or_none,
 )
+from ..utils.traversal import find_element, traverse_obj
 
 
 class TV2DKIE(InfoExtractor):
@@ -21,35 +22,46 @@ class TV2DKIE(InfoExtractor):
                             tv2fyn|
                             tv2east|
                             tv2lorry|
-                            tv2nord
+                            tv2nord|
+                            tv2kosmopol
                         )\.dk/
-                        (:[^/]+/)*
+                        (?:[^/?#]+/)*
                         (?P<id>[^/?\#&]+)
                     '''
     _TESTS = [{
         'url': 'https://www.tvsyd.dk/nyheder/28-10-2019/1930/1930-28-okt-2019?autoplay=1#player',
         'info_dict': {
-            'id': '0_52jmwa0p',
+            'id': 'sPp5z21q',
             'ext': 'mp4',
             'title': '19:30 - 28. okt. 2019',
-            'timestamp': 1572290248,
+            'description': '',
+            'thumbnail': 'https://cdn.jwplayer.com/v2/media/sPp5z21q/poster.jpg?width=720',
+            'timestamp': 1572287400,
             'upload_date': '20191028',
-            'uploader_id': 'tvsyd',
-            'duration': 1347,
-            'view_count': int,
         },
-        'add_ie': ['Kaltura'],
     }, {
         'url': 'https://www.tv2lorry.dk/gadekamp/gadekamp-6-hoejhuse-i-koebenhavn',
         'info_dict': {
-            'id': '1_7iwll9n0',
+            'id': 'oD9cyq0m',
             'ext': 'mp4',
-            'upload_date': '20211027',
             'title': 'Gadekamp #6 - Højhuse i København',
-            'uploader_id': 'tv2lorry',
-            'timestamp': 1635345229,
+            'description': '',
+            'thumbnail': 'https://cdn.jwplayer.com/v2/media/oD9cyq0m/poster.jpg?width=720',
+            'timestamp': 1635348600,
+            'upload_date': '20211027',
         },
-        'add_ie': ['Kaltura'],
+    }, {
+        'url': 'https://www.tvsyd.dk/haderslev/x-factor-brodre-fulde-af-selvtillid-er-igen-hjemme-hos-mor-vores-diagnoser-har-vaeret-en-fordel',
+        'info_dict': {
+            'id': 'x-factor-brodre-fulde-af-selvtillid-er-igen-hjemme-hos-mor-vores-diagnoser-har-vaeret-en-fordel',
+        },
+        'playlist_count': 2,
+    }, {
+        'url': 'https://www.tv2ostjylland.dk/aarhus/dom-kan-fa-alvorlige-konsekvenser',
+        'info_dict': {
+            'id': 'dom-kan-fa-alvorlige-konsekvenser',
+        },
+        'playlist_count': 3,
     }, {
         'url': 'https://www.tv2ostjylland.dk/artikel/minister-gaar-ind-i-sag-om-diabetes-teknologi',
         'only_matching': True,
@@ -71,40 +83,22 @@ class TV2DKIE(InfoExtractor):
     }, {
         'url': 'https://www.tv2nord.dk/artikel/dybt-uacceptabelt',
         'only_matching': True,
+    }, {
+        'url': 'https://www.tv2kosmopol.dk/metropolen/chaufforer-beordres-til-at-kore-videre-i-ulovlige-busser-med-rode-advarselslamper',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-
         webpage = self._download_webpage(url, video_id)
+        search_space = traverse_obj(webpage, {find_element(tag='article')}) or webpage
 
-        entries = []
+        player_ids = traverse_obj(
+            re.findall(r'x-data="(?:video_player|simple_player)\(({[^"]+})', search_space),
+            (..., {js_to_json}, {json.loads}, ('jwpMediaId', 'videoId'), {str}))
 
-        def add_entry(partner_id, kaltura_id):
-            entries.append(self.url_result(
-                'kaltura:%s:%s' % (partner_id, kaltura_id), 'Kaltura',
-                video_id=kaltura_id))
-
-        for video_el in re.findall(r'(?s)<[^>]+\bdata-entryid\s*=[^>]*>', webpage):
-            video = extract_attributes(video_el)
-            kaltura_id = video.get('data-entryid')
-            if not kaltura_id:
-                continue
-            partner_id = video.get('data-partnerid')
-            if not partner_id:
-                continue
-            add_entry(partner_id, kaltura_id)
-        if not entries:
-            kaltura_id = self._search_regex(
-                (r'entry_id\s*:\s*["\']([0-9a-z_]+)',
-                 r'\\u002FentryId\\u002F(\w+)\\u002F'), webpage, 'kaltura id')
-            partner_id = self._search_regex(
-                (r'\\u002Fp\\u002F(\d+)\\u002F', r'/p/(\d+)/'), webpage,
-                'partner id')
-            add_entry(partner_id, kaltura_id)
-        if len(entries) == 1:
-            return entries[0]
-        return self.playlist_result(entries)
+        return self.playlist_from_matches(
+            player_ids, video_id, getter=lambda x: f'jwplatform:{x}', ie=JWPlatformIE)
 
 
 class TV2DKBornholmPlayIE(InfoExtractor):
diff --git a/plugins/youtube_download/yt_dlp/extractor/tv2hu.py b/plugins/youtube_download/yt_dlp/extractor/tv2hu.py
index d4c21c0..3fd41a3 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tv2hu.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tv2hu.py
@@ -1,8 +1,7 @@
-# encoding: utf-8
 from .common import InfoExtractor
 from ..utils import (
-    traverse_obj,
     UnsupportedError,
+    traverse_obj,
 )
 
 
@@ -20,7 +19,6 @@ class TV2HuIE(InfoExtractor):
             'description': 'md5:7350147e75485a59598e806c47967b07',
             'thumbnail': r're:^https?://.*\.jpg$',
             'release_date': '20210825',
-            'season_number': None,
             'episode_number': 213,
         },
         'params': {
@@ -38,8 +36,6 @@ class TV2HuIE(InfoExtractor):
             'description': 'md5:47762155dc9a50241797ded101b1b08c',
             'thumbnail': r're:^https?://.*\.jpg$',
             'release_date': '20210118',
-            'season_number': None,
-            'episode_number': None,
         },
         'params': {
             'skip_download': True,
@@ -47,14 +43,14 @@ class TV2HuIE(InfoExtractor):
     }]
 
     def _real_extract(self, url):
-        id = self._match_id(url)
-        json_data = self._download_json(f'https://tv2play.hu/api/search/{id}', id)
+        video_id = self._match_id(url)
+        json_data = self._download_json(f'https://tv2play.hu/api/search/{video_id}', video_id)
 
         if json_data['contentType'] == 'showpage':
             ribbon_ids = traverse_obj(json_data, ('pages', ..., 'tabs', ..., 'ribbonIds'), get_all=False, expected_type=list)
             entries = [self.url_result(f'https://tv2play.hu/szalag/{ribbon_id}',
                                        ie=TV2HuSeriesIE.ie_key(), video_id=ribbon_id) for ribbon_id in ribbon_ids]
-            return self.playlist_result(entries, playlist_id=id)
+            return self.playlist_result(entries, playlist_id=video_id)
         elif json_data['contentType'] != 'video':
             raise UnsupportedError(url)
 
@@ -91,17 +87,17 @@ class TV2HuSeriesIE(InfoExtractor):
         'playlist_mincount': 284,
         'info_dict': {
             'id': '59',
-        }
+        },
     }]
 
     def _real_extract(self, url):
-        id = self._match_id(url)
-        json_data = self._download_json(f'https://tv2play.hu/api/ribbons/{id}/0?size=100000', id)
+        playlist_id = self._match_id(url)
+        json_data = self._download_json(f'https://tv2play.hu/api/ribbons/{playlist_id}/0?size=100000', playlist_id)
         entries = []
         for card in json_data.get('cards', []):
             video_id = card.get('slug')
             if video_id:
-                entries.append(self.url_result(f'https://tv2play.hu/{video_id}',
-                                               ie=TV2HuIE.ie_key(), video_id=video_id))
+                entries.append(self.url_result(
+                    f'https://tv2play.hu/{video_id}', TV2HuIE, video_id))
 
-        return self.playlist_result(entries, playlist_id=id)
+        return self.playlist_result(entries, playlist_id=playlist_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/tv4.py b/plugins/youtube_download/yt_dlp/extractor/tv4.py
index 10a2fe6..73a446e 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tv4.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tv4.py
@@ -76,7 +76,7 @@ class TV4IE(InfoExtractor):
         {
             'url': 'https://www.tv4play.se/program/nyheterna/avsnitt/13315940',
             'only_matching': True,
-        }
+        },
     ]
 
     def _call_api(self, endpoint, video_id, headers=None, query={}):
diff --git a/plugins/youtube_download/yt_dlp/extractor/tv5mondeplus.py b/plugins/youtube_download/yt_dlp/extractor/tv5mondeplus.py
index bd0be78..953eb77 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tv5mondeplus.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tv5mondeplus.py
@@ -1,61 +1,106 @@
+import urllib.parse
+
 from .common import InfoExtractor
 from ..utils import (
+    clean_html,
     determine_ext,
     extract_attributes,
+    get_element_by_class,
+    get_element_html_by_class,
     int_or_none,
-    parse_duration,
-    try_get,
+    url_or_none,
 )
+from ..utils.traversal import traverse_obj
 
 
 class TV5MondePlusIE(InfoExtractor):
-    IE_DESC = 'TV5MONDE+'
-    _VALID_URL = r'https?://(?:www\.)?(?:tv5mondeplus|revoir\.tv5monde)\.com/toutes-les-videos/[^/]+/(?P<id>[^/?#]+)'
+    IE_NAME = 'TV5MONDE'
+    _VALID_URL = r'https?://(?:www\.)?tv5monde\.com/tv/video/(?P<id>[^/?#]+)'
     _TESTS = [{
-        # movie
-        'url': 'https://revoir.tv5monde.com/toutes-les-videos/cinema/ceux-qui-travaillent',
-        'md5': '32fa0cde16a4480d1251502a66856d5f',
+        # documentary
+        'url': 'https://www.tv5monde.com/tv/video/65931-baudouin-l-heritage-d-un-roi-baudouin-l-heritage-d-un-roi',
+        'md5': 'd2a708902d3df230a357c99701aece05',
         'info_dict': {
-            'id': 'dc57a011-ec4b-4648-2a9a-4f03f8352ed3',
-            'display_id': 'ceux-qui-travaillent',
+            'id': '3FPa7JMu21_6D4BA7b',
+            'display_id': '65931-baudouin-l-heritage-d-un-roi-baudouin-l-heritage-d-un-roi',
             'ext': 'mp4',
-            'title': 'Ceux qui travaillent',
-            'description': 'md5:570e8bb688036ace873b2d50d24c026d',
-            'upload_date': '20210819',
+            'title': "Baudouin, l'héritage d'un roi",
+            'thumbnail': 'https://psi.tv5monde.com/upsilon-images/960x540/6f/baudouin-f49c6b0e.jpg',
+            'duration': 4842,
+            'upload_date': '20240130',
+            'timestamp': 1706641242,
+            'episode': "BAUDOUIN, L'HERITAGE D'UN ROI",
+            'description': 'md5:78125c74a5cac06d7743a2d09126edad',
+            'series': "Baudouin, l'héritage d'un roi",
         },
     }, {
         # series episode
-        'url': 'https://revoir.tv5monde.com/toutes-les-videos/series-fictions/vestiaires-caro-actrice',
+        'url': 'https://www.tv5monde.com/tv/video/52952-toute-la-vie-mardi-23-mars-2021',
+        'md5': 'f5e09637cadd55639c05874e22eb56bf',
         'info_dict': {
-            'id': '9e9d599e-23af-6915-843e-ecbf62e97925',
-            'display_id': 'vestiaires-caro-actrice',
+            'id': 'obRRZ8m6g9_6D4BA7b',
+            'display_id': '52952-toute-la-vie-mardi-23-mars-2021',
             'ext': 'mp4',
-            'title': "Vestiaires - Caro actrice",
-            'description': 'md5:db15d2e1976641e08377f942778058ea',
-            'upload_date': '20210819',
-            'series': "Vestiaires",
-            'episode': 'Caro actrice',
-        },
-        'params': {
-            'skip_download': True,
+            'title': 'Toute la vie',
+            'description': 'md5:a824a2e1dfd94cf45fa379a1fb43ce65',
+            'thumbnail': 'https://psi.tv5monde.com/media/image/960px/5880553.jpg',
+            'duration': 2526,
+            'upload_date': '20230721',
+            'timestamp': 1689971646,
+            'series': 'Toute la vie',
+            'episode': 'Mardi 23 mars 2021',
         },
     }, {
-        'url': 'https://revoir.tv5monde.com/toutes-les-videos/series-fictions/neuf-jours-en-hiver-neuf-jours-en-hiver',
-        'only_matching': True,
+        # movie
+        'url': 'https://www.tv5monde.com/tv/video/8771-ce-fleuve-qui-nous-charrie-ce-fleuve-qui-nous-charrie-p001-ce-fleuve-qui-nous-charrie',
+        'md5': '87cefc34e10a6bf4f7823cccd7b36eb2',
+        'info_dict': {
+            'id': 'DOcfvdLKXL_6D4BA7b',
+            'display_id': '8771-ce-fleuve-qui-nous-charrie-ce-fleuve-qui-nous-charrie-p001-ce-fleuve-qui-nous-charrie',
+            'ext': 'mp4',
+            'title': 'Ce fleuve qui nous charrie',
+            'description': 'md5:62ba3f875343c7fc4082bdfbbc1be992',
+            'thumbnail': 'https://psi.tv5monde.com/media/image/960px/5476617.jpg',
+            'duration': 5300,
+            'upload_date': '20210822',
+            'timestamp': 1629594105,
+            'episode': 'CE FLEUVE QUI NOUS CHARRIE-P001-CE FLEUVE QUI NOUS CHARRIE',
+            'series': 'Ce fleuve qui nous charrie',
+        },
     }, {
-        'url': 'https://revoir.tv5monde.com/toutes-les-videos/info-societe/le-journal-de-la-rts-edition-du-30-01-20-19h30',
-        'only_matching': True,
+        # news
+        'url': 'https://www.tv5monde.com/tv/video/70402-tv5monde-le-journal-edition-du-08-05-24-11h',
+        'md5': 'c62977d6d10754a2ecebba70ad370479',
+        'info_dict': {
+            'id': 'LgQFrOCNsc_6D4BA7b',
+            'display_id': '70402-tv5monde-le-journal-edition-du-08-05-24-11h',
+            'ext': 'mp4',
+            'title': 'TV5MONDE, le journal',
+            'description': 'md5:777dc209eaa4423b678477c36b0b04a8',
+            'thumbnail': 'https://psi.tv5monde.com/media/image/960px/6184105.jpg',
+            'duration': 854,
+            'upload_date': '20240508',
+            'timestamp': 1715159640,
+            'series': 'TV5MONDE, le journal',
+            'episode': 'EDITION DU 08/05/24 - 11H',
+        },
     }]
     _GEO_BYPASS = False
 
+    @staticmethod
+    def _extract_subtitles(data_captions):
+        subtitles = {}
+        for f in traverse_obj(data_captions, ('files', lambda _, v: url_or_none(v['file']))):
+            subtitles.setdefault(f.get('label') or 'fra', []).append({'url': f['file']})
+        return subtitles
+
     def _real_extract(self, url):
         display_id = self._match_id(url)
-        webpage = self._download_webpage(url, display_id)
+        webpage = self._download_webpage(url, display_id, impersonate=True)
 
         if ">Ce programme n'est malheureusement pas disponible pour votre zone géographique.<" in webpage:
             self.raise_geo_restricted(countries=['FR'])
 
-        title = episode = self._html_search_regex(r'<h1>([^<]+)', webpage, 'title')
         vpl_data = extract_attributes(self._search_regex(
             r'(<[^>]+class="video_player_loader"[^>]+>)',
             webpage, 'video player loader'))
@@ -63,57 +108,71 @@ class TV5MondePlusIE(InfoExtractor):
         video_files = self._parse_json(
             vpl_data['data-broadcast'], display_id)
         formats = []
-        for video_file in video_files:
-            v_url = video_file.get('url')
-            if not v_url:
-                continue
-            video_format = video_file.get('format') or determine_ext(v_url)
-            if video_format == 'm3u8':
-                formats.extend(self._extract_m3u8_formats(
-                    v_url, display_id, 'mp4', 'm3u8_native',
-                    m3u8_id='hls', fatal=False))
-            else:
-                formats.append({
-                    'url': v_url,
-                    'format_id': video_format,
-                })
+        video_id = None
+
+        def process_video_files(v):
+            nonlocal video_id
+            for video_file in v:
+                v_url = video_file.get('url')
+                if not v_url:
+                    continue
+                if video_file.get('type') == 'application/deferred':
+                    d_param = urllib.parse.quote(v_url)
+                    token = video_file.get('token')
+                    if not token:
+                        continue
+                    deferred_json = self._download_json(
+                        f'https://api.tv5monde.com/player/asset/{d_param}/resolve?condenseKS=true',
+                        display_id, 'Downloading deferred info', fatal=False, impersonate=True,
+                        headers={'Authorization': f'Bearer {token}'})
+                    v_url = traverse_obj(deferred_json, (0, 'url', {url_or_none}))
+                    if not v_url:
+                        continue
+                    # data-guid from the webpage isn't stable, use the material id from the json urls
+                    video_id = self._search_regex(
+                        r'materials/([\da-zA-Z]{10}_[\da-fA-F]{7})/', v_url, 'video id', default=None)
+                    process_video_files(deferred_json)
+
+                video_format = video_file.get('format') or determine_ext(v_url)
+                if video_format == 'm3u8':
+                    formats.extend(self._extract_m3u8_formats(
+                        v_url, display_id, 'mp4', 'm3u8_native',
+                        m3u8_id='hls', fatal=False))
+                elif video_format == 'mpd':
+                    formats.extend(self._extract_mpd_formats(
+                        v_url, display_id, fatal=False))
+                else:
+                    formats.append({
+                        'url': v_url,
+                        'format_id': video_format,
+                    })
+
+        process_video_files(video_files)
 
         metadata = self._parse_json(
-            vpl_data['data-metadata'], display_id)
-        duration = (int_or_none(try_get(metadata, lambda x: x['content']['duration']))
-                    or parse_duration(self._html_search_meta('duration', webpage)))
+            vpl_data.get('data-metadata') or '{}', display_id, fatal=False)
 
-        description = self._html_search_regex(
-            r'(?s)<div[^>]+class=["\']episode-texte[^>]+>(.+?)</div>', webpage,
-            'description', fatal=False)
-
-        series = self._html_search_regex(
-            r'<p[^>]+class=["\']episode-emission[^>]+>([^<]+)', webpage,
-            'series', default=None)
-
-        if series and series != title:
-            title = '%s - %s' % (series, title)
-
-        upload_date = self._search_regex(
-            r'(?:date_publication|publish_date)["\']\s*:\s*["\'](\d{4}_\d{2}_\d{2})',
-            webpage, 'upload date', default=None)
-        if upload_date:
-            upload_date = upload_date.replace('_', '')
-
-        video_id = self._search_regex(
-            (r'data-guid=["\']([\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12})',
-             r'id_contenu["\']\s:\s*(\d+)'), webpage, 'video id',
-            default=display_id)
+        if not video_id:
+            video_id = self._search_regex(
+                (r'data-guid=["\']([\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12})',
+                 r'id_contenu["\']\s:\s*(\d+)'), webpage, 'video id',
+                default=display_id)
 
         return {
+            **traverse_obj(metadata, ('content', {
+                'id': ('id', {str}),
+                'title': ('title', {str}),
+                'episode': ('title', {str}),
+                'series': ('series', {str}),
+                'timestamp': ('publishDate_ts', {int_or_none}),
+                'duration': ('duration', {int_or_none}),
+            })),
             'id': video_id,
             'display_id': display_id,
-            'title': title,
-            'description': description,
-            'thumbnail': vpl_data.get('data-image'),
-            'duration': duration,
-            'upload_date': upload_date,
+            'title': clean_html(get_element_by_class('main-title', webpage)),
+            'description': clean_html(get_element_by_class('text', get_element_html_by_class('ep-summary', webpage) or '')),
+            'thumbnail': url_or_none(vpl_data.get('data-image')),
             'formats': formats,
-            'series': series,
-            'episode': episode,
+            'subtitles': self._extract_subtitles(self._parse_json(
+                traverse_obj(vpl_data, ('data-captions', {str}), default='{}'), display_id, fatal=False)),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/tv5unis.py b/plugins/youtube_download/yt_dlp/extractor/tv5unis.py
index 978255b..88fd334 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tv5unis.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tv5unis.py
@@ -32,7 +32,7 @@ class TV5UnisBaseIE(InfoExtractor):
       }
     }
   }
-}''' % (self._GQL_QUERY_NAME, self._gql_args(groups)),
+}''' % (self._GQL_QUERY_NAME, self._gql_args(groups)),  # noqa: UP031
             })['data'][self._GQL_QUERY_NAME]
         media_id = product['videoElement']['mediaId']
 
@@ -61,13 +61,13 @@ class TV5UnisVideoIE(TV5UnisBaseIE):
             'ext': 'mp4',
             'title': 'Watatatow',
             'duration': 10.01,
-        }
+        },
     }
     _GQL_QUERY_NAME = 'productById'
 
     @staticmethod
     def _gql_args(groups):
-        return 'id: %s' % groups
+        return f'id: {groups}'
 
 
 class TV5UnisIE(TV5UnisBaseIE):
@@ -80,7 +80,7 @@ class TV5UnisIE(TV5UnisBaseIE):
             'id': 'e5ee23a586c44612a56aad61accf16ef',
             'ext': 'mp4',
             'title': 'Je ne peux pas lui résister',
-            'description': "Atys, le nouveau concierge de l'école, a réussi à ébranler la confiance de Mado en affirmant qu\'une médaille, ce n'est que du métal. Comme Mado essaie de lui prouver que ses valeurs sont solides, il veut la mettre à l'épreuve...",
+            'description': "Atys, le nouveau concierge de l'école, a réussi à ébranler la confiance de Mado en affirmant qu'une médaille, ce n'est que du métal. Comme Mado essaie de lui prouver que ses valeurs sont solides, il veut la mettre à l'épreuve...",
             'subtitles': {
                 'fr': 'count:1',
             },
@@ -110,7 +110,7 @@ class TV5UnisIE(TV5UnisBaseIE):
 
     @staticmethod
     def _gql_args(groups):
-        args = 'rootProductSlug: "%s"' % groups[0]
+        args = f'rootProductSlug: "{groups[0]}"'
         if groups[1]:
-            args += ', seasonNumber: %s, episodeNumber: %s' % groups[1:]
+            args += ', seasonNumber: {}, episodeNumber: {}'.format(*groups[1:])
         return args
diff --git a/plugins/youtube_download/yt_dlp/extractor/tva.py b/plugins/youtube_download/yt_dlp/extractor/tva.py
index 9afe233..48c4e9c 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tva.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tva.py
@@ -1,85 +1,76 @@
+import re
+
+from .brightcove import BrightcoveNewIE
 from .common import InfoExtractor
-from ..utils import (
-    float_or_none,
-    int_or_none,
-    smuggle_url,
-    strip_or_none,
-)
+from ..utils import float_or_none, int_or_none, smuggle_url, strip_or_none
+from ..utils.traversal import traverse_obj
 
 
 class TVAIE(InfoExtractor):
-    _VALID_URL = r'https?://videos?\.tva\.ca/details/_(?P<id>\d+)'
+    IE_NAME = 'tvaplus'
+    IE_DESC = 'TVA+'
+    _VALID_URL = r'https?://(?:www\.)?tvaplus\.ca/(?:[^/?#]+/)*[\w-]+-(?P<id>\d+)(?:$|[#?])'
     _TESTS = [{
-        'url': 'https://videos.tva.ca/details/_5596811470001',
-        'info_dict': {
-            'id': '5596811470001',
-            'ext': 'mp4',
-            'title': 'Un extrait de l\'épisode du dimanche 8 octobre 2017 !',
-            'uploader_id': '5481942443001',
-            'upload_date': '20171003',
-            'timestamp': 1507064617,
-        },
-        'params': {
-            # m3u8 download
-            'skip_download': True,
-        },
-        'skip': 'HTTP Error 404: Not Found',
-    }, {
-        'url': 'https://video.tva.ca/details/_5596811470001',
-        'only_matching': True,
-    }]
-    BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/5481942443001/default_default/index.html?videoId=%s'
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        return {
-            '_type': 'url_transparent',
-            'id': video_id,
-            'url': smuggle_url(self.BRIGHTCOVE_URL_TEMPLATE % video_id, {'geo_countries': ['CA']}),
-            'ie_key': 'BrightcoveNew',
-        }
-
-
-class QubIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?qub\.ca/(?:[^/]+/)*[0-9a-z-]+-(?P<id>\d+)'
-    _TESTS = [{
-        'url': 'https://www.qub.ca/tvaplus/tva/alerte-amber/saison-1/episode-01-1000036619',
+        'url': 'https://www.tvaplus.ca/tva/alerte-amber/saison-1/episode-01-1000036619',
         'md5': '949490fd0e7aee11d0543777611fbd53',
         'info_dict': {
             'id': '6084352463001',
             'ext': 'mp4',
-            'title': 'Épisode 01',
+            'title': 'Mon dernier jour',
             'uploader_id': '5481942443001',
             'upload_date': '20190907',
             'timestamp': 1567899756,
             'description': 'md5:9c0d7fbb90939420c651fd977df90145',
+            'thumbnail': r're:https://.+\.jpg',
+            'episode': 'Mon dernier jour',
+            'episode_number': 1,
+            'tags': ['alerte amber', 'alerte amber saison 1', 'surdemande'],
+            'duration': 2625.963,
+            'season': 'Season 1',
+            'season_number': 1,
+            'series': 'Alerte Amber',
+            'channel': 'TVA',
         },
     }, {
-        'url': 'https://www.qub.ca/tele/video/lcn-ca-vous-regarde-rev-30s-ap369664-1009357943',
-        'only_matching': True,
+        'url': 'https://www.tvaplus.ca/tva/le-baiser-du-barbu/le-baiser-du-barbu-886644190',
+        'info_dict': {
+            'id': '6354448043112',
+            'ext': 'mp4',
+            'title': 'Le Baiser du barbu',
+            'uploader_id': '5481942443001',
+            'upload_date': '20240606',
+            'timestamp': 1717694023,
+            'description': 'md5:025b1219086c1cbf4bc27e4e034e8b57',
+            'thumbnail': r're:https://.+\.jpg',
+            'episode': 'Le Baiser du barbu',
+            'tags': ['fullepisode', 'films'],
+            'duration': 6053.504,
+            'series': 'Le Baiser du barbu',
+            'channel': 'TVA',
+        },
     }]
-    # reference_id also works with old account_id(5481942443001)
-    # BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/5813221784001/default_default/index.html?videoId=ref:%s'
+    _BC_URL_TMPL = 'https://players.brightcove.net/5481942443001/default_default/index.html?videoId={}'
 
     def _real_extract(self, url):
         entity_id = self._match_id(url)
-        entity = self._download_json(
-            'https://www.qub.ca/proxy/pfu/content-delivery-service/v1/entities',
-            entity_id, query={'id': entity_id})
+        webpage = self._download_webpage(url, entity_id)
+        entity = self._search_nextjs_data(webpage, entity_id)['props']['pageProps']['staticEntity']
         video_id = entity['videoId']
         episode = strip_or_none(entity.get('name'))
 
         return {
             '_type': 'url_transparent',
+            'url': smuggle_url(self._BC_URL_TMPL.format(video_id), {'geo_countries': ['CA']}),
+            'ie_key': BrightcoveNewIE.ie_key(),
             'id': video_id,
             'title': episode,
-            # 'url': self.BRIGHTCOVE_URL_TEMPLATE % entity['referenceId'],
-            'url': 'https://videos.tva.ca/details/_' + video_id,
-            'description': entity.get('longDescription'),
-            'duration': float_or_none(entity.get('durationMillis'), 1000),
             'episode': episode,
-            'episode_number': int_or_none(entity.get('episodeNumber')),
-            # 'ie_key': 'BrightcoveNew',
-            'ie_key': TVAIE.ie_key(),
+            **traverse_obj(entity, {
+                'description': ('longDescription', {str}),
+                'duration': ('durationMillis', {float_or_none(scale=1000)}),
+                'channel': ('knownEntities', 'channel', 'name', {str}),
+                'series': ('knownEntities', 'videoShow', 'name', {str}),
+                'season_number': ('slug', {lambda x: re.search(r'/s(?:ai|ea)son-(\d+)/', x)}, 1, {int_or_none}),
+                'episode_number': ('episodeNumber', {int_or_none}),
+            }),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/tvanouvelles.py b/plugins/youtube_download/yt_dlp/extractor/tvanouvelles.py
index b9f5e11..855c771 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tvanouvelles.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tvanouvelles.py
@@ -1,7 +1,7 @@
 import re
 
-from .common import InfoExtractor
 from .brightcove import BrightcoveNewIE
+from .common import InfoExtractor
 
 
 class TVANouvellesIE(InfoExtractor):
@@ -42,7 +42,7 @@ class TVANouvellesArticleIE(InfoExtractor):
 
     @classmethod
     def suitable(cls, url):
-        return False if TVANouvellesIE.suitable(url) else super(TVANouvellesArticleIE, cls).suitable(url)
+        return False if TVANouvellesIE.suitable(url) else super().suitable(url)
 
     def _real_extract(self, url):
         display_id = self._match_id(url)
@@ -51,7 +51,7 @@ class TVANouvellesArticleIE(InfoExtractor):
 
         entries = [
             self.url_result(
-                'http://www.tvanouvelles.ca/videos/%s' % mobj.group('id'),
+                'http://www.tvanouvelles.ca/videos/{}'.format(mobj.group('id')),
                 ie=TVANouvellesIE.ie_key(), video_id=mobj.group('id'))
             for mobj in re.finditer(
                 r'data-video-id=(["\'])?(?P<id>\d+)', webpage)]
diff --git a/plugins/youtube_download/yt_dlp/extractor/tvc.py b/plugins/youtube_download/yt_dlp/extractor/tvc.py
index caa76ab..7c8c922 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tvc.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tvc.py
@@ -24,7 +24,7 @@ class TVCIE(InfoExtractor):
         video_id = self._match_id(url)
 
         video = self._download_json(
-            'http://www.tvc.ru/video/json/id/%s' % video_id, video_id)
+            f'http://www.tvc.ru/video/json/id/{video_id}', video_id)
 
         formats = []
         for info in video.get('path', {}).get('quality', []):
diff --git a/plugins/youtube_download/yt_dlp/extractor/tver.py b/plugins/youtube_download/yt_dlp/extractor/tver.py
index cebd027..805150d 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tver.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tver.py
@@ -1,86 +1,161 @@
-from .common import InfoExtractor
+from .streaks import StreaksBaseIE
 from ..utils import (
     ExtractorError,
+    int_or_none,
     join_nonempty,
+    make_archive_id,
     smuggle_url,
     str_or_none,
     strip_or_none,
-    traverse_obj,
+    update_url_query,
 )
+from ..utils.traversal import require, traverse_obj
 
 
-class TVerIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?tver\.jp/(?:(?P<type>lp|corner|series|episodes?|feature|tokyo2020/video)/)+(?P<id>[a-zA-Z0-9]+)'
+class TVerIE(StreaksBaseIE):
+    _VALID_URL = r'https?://(?:www\.)?tver\.jp/(?:(?P<type>lp|corner|series|episodes?|feature)/)+(?P<id>[a-zA-Z0-9]+)'
+    _GEO_COUNTRIES = ['JP']
+    _GEO_BYPASS = False
     _TESTS = [{
-        'skip': 'videos are only available for 7 days',
-        'url': 'https://tver.jp/episodes/ep83nf3w4p',
+        # via Streaks backend
+        'url': 'https://tver.jp/episodes/epc1hdugbk',
         'info_dict': {
-            'title': '家事ヤロウ!!! 売り場席巻のチーズSP＆財前直見×森泉親子の脱東京暮らし密着！',
-            'description': 'md5:dc2c06b6acc23f1e7c730c513737719b',
-            'series': '家事ヤロウ!!!',
-            'episode': '売り場席巻のチーズSP＆財前直見×森泉親子の脱東京暮らし密着！',
-            'alt_title': '売り場席巻のチーズSP＆財前直見×森泉親子の脱東京暮らし密着！',
-            'channel': 'テレビ朝日',
-            'onair_label': '5月3日(火)放送分',
-            'ext_title': '家事ヤロウ!!! 売り場席巻のチーズSP＆財前直見×森泉親子の脱東京暮らし密着！ テレビ朝日 5月3日(火)放送分',
+            'id': 'epc1hdugbk',
+            'ext': 'mp4',
+            'display_id': 'ref:baeebeac-a2a6-4dbf-9eb3-c40d59b40068',
+            'title': '神回だけ見せます！ #2 壮烈！車大騎馬戦（木曜スペシャル）',
+            'alt_title': '神回だけ見せます！ #2 壮烈！車大騎馬戦（木曜スペシャル） 日テレ',
+            'description': 'md5:2726f742d5e3886edeaf72fb6d740fef',
+            'uploader_id': 'tver-ntv',
+            'channel': '日テレ',
+            'duration': 1158.024,
+            'thumbnail': 'https://statics.tver.jp/images/content/thumbnail/episode/xlarge/epc1hdugbk.jpg?v=16',
+            'series': '神回だけ見せます！',
+            'episode': '#2 壮烈！車大騎馬戦（木曜スペシャル）',
+            'episode_number': 2,
+            'timestamp': 1736486036,
+            'upload_date': '20250110',
+            'modified_timestamp': 1736870264,
+            'modified_date': '20250114',
+            'live_status': 'not_live',
+            'release_timestamp': 1651453200,
+            'release_date': '20220502',
+            '_old_archive_ids': ['brightcovenew ref:baeebeac-a2a6-4dbf-9eb3-c40d59b40068'],
         },
-        'add_ie': ['BrightcoveNew'],
+    }, {
+        # via Brightcove backend (deprecated)
+        'url': 'https://tver.jp/episodes/epc1hdugbk',
+        'info_dict': {
+            'id': 'ref:baeebeac-a2a6-4dbf-9eb3-c40d59b40068',
+            'ext': 'mp4',
+            'title': '神回だけ見せます！ #2 壮烈！車大騎馬戦（木曜スペシャル）',
+            'alt_title': '神回だけ見せます！ #2 壮烈！車大騎馬戦（木曜スペシャル） 日テレ',
+            'description': 'md5:2726f742d5e3886edeaf72fb6d740fef',
+            'uploader_id': '4394098882001',
+            'channel': '日テレ',
+            'duration': 1158.101,
+            'thumbnail': 'https://statics.tver.jp/images/content/thumbnail/episode/xlarge/epc1hdugbk.jpg?v=16',
+            'tags': [],
+            'series': '神回だけ見せます！',
+            'episode': '#2 壮烈！車大騎馬戦（木曜スペシャル）',
+            'episode_number': 2,
+            'timestamp': 1651388531,
+            'upload_date': '20220501',
+            'release_timestamp': 1651453200,
+            'release_date': '20220502',
+        },
+        'params': {'extractor_args': {'tver': {'backend': ['brightcove']}}},
     }, {
         'url': 'https://tver.jp/corner/f0103888',
         'only_matching': True,
     }, {
         'url': 'https://tver.jp/lp/f0033031',
         'only_matching': True,
+    }, {
+        'url': 'https://tver.jp/series/srtxft431v',
+        'info_dict': {
+            'id': 'srtxft431v',
+            'title': '名探偵コナン',
+        },
+        'playlist_mincount': 21,
+    }, {
+        'url': 'https://tver.jp/series/sru35hwdd2',
+        'info_dict': {
+            'id': 'sru35hwdd2',
+            'title': '神回だけ見せます！',
+        },
+        'playlist_count': 11,
+    }, {
+        'url': 'https://tver.jp/series/srkq2shp9d',
+        'only_matching': True,
     }]
     BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/%s/default_default/index.html?videoId=%s'
-    _PLATFORM_UID = None
-    _PLATFORM_TOKEN = None
+    _HEADERS = {
+        'x-tver-platform-type': 'web',
+        'Origin': 'https://tver.jp',
+        'Referer': 'https://tver.jp/',
+    }
+    _PLATFORM_QUERY = {}
 
     def _real_initialize(self):
-        create_response = self._download_json(
-            'https://platform-api.tver.jp/v2/api/platform_users/browser/create', None,
-            note='Creating session', data=b'device_type=pc', headers={
-                'Origin': 'https://s.tver.jp',
-                'Referer': 'https://s.tver.jp/',
-                'Content-Type': 'application/x-www-form-urlencoded',
+        session_info = self._download_json(
+            'https://platform-api.tver.jp/v2/api/platform_users/browser/create',
+            None, 'Creating session', data=b'device_type=pc')
+        self._PLATFORM_QUERY = traverse_obj(session_info, ('result', {
+            'platform_uid': 'platform_uid',
+            'platform_token': 'platform_token',
+        }))
+
+    def _call_platform_api(self, path, video_id, note=None, fatal=True, query=None):
+        return self._download_json(
+            f'https://platform-api.tver.jp/service/api/{path}', video_id, note,
+            fatal=fatal, headers=self._HEADERS, query={
+                **self._PLATFORM_QUERY,
+                **(query or {}),
             })
-        self._PLATFORM_UID = traverse_obj(create_response, ('result', 'platform_uid'))
-        self._PLATFORM_TOKEN = traverse_obj(create_response, ('result', 'platform_token'))
+
+    def _yield_episode_ids_for_series(self, series_id):
+        seasons_info = self._download_json(
+            f'https://service-api.tver.jp/api/v1/callSeriesSeasons/{series_id}',
+            series_id, 'Downloading seasons info', headers=self._HEADERS)
+        for season_id in traverse_obj(
+                seasons_info, ('result', 'contents', lambda _, v: v['type'] == 'season', 'content', 'id', {str})):
+            episodes_info = self._call_platform_api(
+                f'v1/callSeasonEpisodes/{season_id}', series_id, f'Downloading season {season_id} episodes info')
+            yield from traverse_obj(episodes_info, (
+                'result', 'contents', lambda _, v: v['type'] == 'episode', 'content', 'id', {str}))
 
     def _real_extract(self, url):
         video_id, video_type = self._match_valid_url(url).group('id', 'type')
-        if video_type not in {'series', 'episodes'}:
+        backend = self._configuration_arg('backend', ['streaks'])[0]
+        if backend not in ('brightcove', 'streaks'):
+            raise ExtractorError(f'Invalid backend value: {backend}', expected=True)
+
+        if video_type == 'series':
+            series_info = self._call_platform_api(
+                f'v2/callSeries/{video_id}', video_id, 'Downloading series info')
+            return self.playlist_from_matches(
+                self._yield_episode_ids_for_series(video_id), video_id,
+                traverse_obj(series_info, ('result', 'content', 'content', 'title', {str})),
+                ie=TVerIE, getter=lambda x: f'https://tver.jp/episodes/{x}')
+
+        if video_type != 'episodes':
             webpage = self._download_webpage(url, video_id, note='Resolving to new URL')
             video_id = self._match_id(self._search_regex(
                 (r'canonical"\s*href="(https?://tver\.jp/[^"]+)"', r'&link=(https?://tver\.jp/[^?&]+)[?&]'),
                 webpage, 'url regex'))
 
-        episode_info = self._download_json(
-            f'https://platform-api.tver.jp/service/api/v1/callEpisode/{video_id}?require_data=mylist,later[epefy106ur],good[epefy106ur],resume[epefy106ur]',
-            video_id, fatal=False,
-            query={
-                'platform_uid': self._PLATFORM_UID,
-                'platform_token': self._PLATFORM_TOKEN,
-            }, headers={
-                'x-tver-platform-type': 'web'
+        episode_info = self._call_platform_api(
+            f'v1/callEpisode/{video_id}', video_id, 'Downloading episode info', fatal=False, query={
+                'require_data': 'mylist,later[epefy106ur],good[epefy106ur],resume[epefy106ur]',
             })
         episode_content = traverse_obj(
             episode_info, ('result', 'episode', 'content')) or {}
 
+        version = traverse_obj(episode_content, ('version', {str_or_none}), default='5')
         video_info = self._download_json(
-            f'https://statics.tver.jp/content/episode/{video_id}.json', video_id,
-            query={
-                'v': str_or_none(episode_content.get('version')) or '5',
-            }, headers={
-                'Origin': 'https://tver.jp',
-                'Referer': 'https://tver.jp/',
-            })
-        p_id = video_info['video']['accountID']
-        r_id = traverse_obj(video_info, ('video', ('videoRefID', 'videoID')), get_all=False)
-        if not r_id:
-            raise ExtractorError('Failed to extract reference ID for Brightcove')
-        if not r_id.isdigit():
-            r_id = f'ref:{r_id}'
+            f'https://statics.tver.jp/content/episode/{video_id}.json', video_id, 'Downloading video info',
+            query={'v': version}, headers={'Referer': 'https://tver.jp/'})
 
         episode = strip_or_none(episode_content.get('title'))
         series = str_or_none(episode_content.get('seriesTitle'))
@@ -90,16 +165,70 @@ class TVerIE(InfoExtractor):
         provider = str_or_none(episode_content.get('productionProviderName'))
         onair_label = str_or_none(episode_content.get('broadcastDateLabel'))
 
-        return {
-            '_type': 'url_transparent',
+        thumbnails = [
+            {
+                'id': quality,
+                'url': update_url_query(
+                    f'https://statics.tver.jp/images/content/thumbnail/episode/{quality}/{video_id}.jpg',
+                    {'v': version}),
+                'width': width,
+                'height': height,
+            }
+            for quality, width, height in [
+                ('small', 480, 270),
+                ('medium', 640, 360),
+                ('large', 960, 540),
+                ('xlarge', 1280, 720),
+            ]
+        ]
+
+        metadata = {
             'title': title,
             'series': series,
             'episode': episode,
             # an another title which is considered "full title" for some viewers
             'alt_title': join_nonempty(title, provider, onair_label, delim=' '),
             'channel': provider,
-            'description': str_or_none(video_info.get('description')),
-            'url': smuggle_url(
-                self.BRIGHTCOVE_URL_TEMPLATE % (p_id, r_id), {'geo_countries': ['JP']}),
-            'ie_key': 'BrightcoveNew',
+            'thumbnails': thumbnails,
+            **traverse_obj(video_info, {
+                'description': ('description', {str}),
+                'release_timestamp': ('viewStatus', 'startAt', {int_or_none}),
+                'episode_number': ('no', {int_or_none}),
+            }),
+        }
+
+        brightcove_id = traverse_obj(video_info, ('video', ('videoRefID', 'videoID'), {str}, any))
+        if brightcove_id and not brightcove_id.isdecimal():
+            brightcove_id = f'ref:{brightcove_id}'
+
+        streaks_id = traverse_obj(video_info, ('streaks', 'videoRefID', {str}))
+        if streaks_id and not streaks_id.startswith('ref:'):
+            streaks_id = f'ref:{streaks_id}'
+
+        # Deprecated Brightcove extraction reachable w/extractor-arg or fallback; errors are expected
+        if backend == 'brightcove' or not streaks_id:
+            if backend != 'brightcove':
+                self.report_warning(
+                    'No STREAKS ID found; falling back to Brightcove extraction', video_id=video_id)
+            if not brightcove_id:
+                raise ExtractorError('Unable to extract brightcove reference ID', expected=True)
+            account_id = traverse_obj(video_info, (
+                'video', 'accountID', {str}, {require('brightcove account ID', expected=True)}))
+            return {
+                **metadata,
+                '_type': 'url_transparent',
+                'url': smuggle_url(
+                    self.BRIGHTCOVE_URL_TEMPLATE % (account_id, brightcove_id),
+                    {'geo_countries': ['JP']}),
+                'ie_key': 'BrightcoveNew',
+            }
+
+        return {
+            **self._extract_from_streaks_api(video_info['streaks']['projectID'], streaks_id, {
+                'Origin': 'https://tver.jp',
+                'Referer': 'https://tver.jp/',
+            }),
+            **metadata,
+            'id': video_id,
+            '_old_archive_ids': [make_archive_id('BrightcoveNew', brightcove_id)] if brightcove_id else None,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/tvigle.py b/plugins/youtube_download/yt_dlp/extractor/tvigle.py
index 6c98219..6b87eca 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tvigle.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tvigle.py
@@ -46,7 +46,7 @@ class TvigleIE(InfoExtractor):
         }, {
             'url': 'https://cloud.tvigle.ru/video/5267604/',
             'only_matching': True,
-        }
+        },
     ]
 
     def _real_extract(self, url):
@@ -63,7 +63,7 @@ class TvigleIE(InfoExtractor):
                 webpage, 'video id')
 
         video_data = self._download_json(
-            'http://cloud.tvigle.ru/api/play/video/%s/' % video_id, display_id)
+            f'http://cloud.tvigle.ru/api/play/video/{video_id}/', display_id)
 
         item = video_data['playlist']['items'][0]
 
@@ -76,7 +76,7 @@ class TvigleIE(InfoExtractor):
                     msg=error_message, countries=self._GEO_COUNTRIES)
             else:
                 raise ExtractorError(
-                    '%s returned error: %s' % (self.IE_NAME, error_message),
+                    f'{self.IE_NAME} returned error: {error_message}',
                     expected=True)
 
         title = item['title']
@@ -115,7 +115,7 @@ class TvigleIE(InfoExtractor):
                         item, lambda x: x['video_files_size'][vcodec][format_id]))
                     formats.append({
                         'url': video_url,
-                        'format_id': '%s-%s' % (vcodec, format_id),
+                        'format_id': f'{vcodec}-{format_id}',
                         'vcodec': vcodec,
                         'height': int_or_none(height),
                         'filesize': filesize,
diff --git a/plugins/youtube_download/yt_dlp/extractor/tviplayer.py b/plugins/youtube_download/yt_dlp/extractor/tviplayer.py
index 7e9b04d..17f8535 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tviplayer.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tviplayer.py
@@ -14,7 +14,7 @@ class TVIPlayerIE(InfoExtractor):
             'thumbnail': 'https://www.iol.pt/multimedia/oratvi/multimedia/imagem/id/61c8ee630cf2cc58e7d98d9f/',
             'season_number': 8,
             'season': 'Season 8',
-        }
+        },
     }, {
         'url': 'https://tviplayer.iol.pt/programa/isabel/62b471090cf26256cd2a8594/video/62be445f0cf2ea4f0a5218e5',
         'info_dict': {
@@ -25,7 +25,7 @@ class TVIPlayerIE(InfoExtractor):
             'title': 'Isabel - Episódio 1',
             'thumbnail': 'https://www.iol.pt/multimedia/oratvi/multimedia/imagem/id/62beac200cf2f9a86eab856b/',
             'season_number': 1,
-        }
+        },
     }, {
         # no /programa/
         'url': 'https://tviplayer.iol.pt/video/62c4131c0cf2f9a86eac06bb',
@@ -37,7 +37,7 @@ class TVIPlayerIE(InfoExtractor):
             'season': 'Season 2',
             'duration': 148,
             'season_number': 2,
-        }
+        },
     }, {
         # episodio url
         'url': 'https://tviplayer.iol.pt/programa/para-sempre/61716c360cf2365a5ed894c4/episodio/t1e187',
@@ -49,7 +49,7 @@ class TVIPlayerIE(InfoExtractor):
             'thumbnail': 'https://www.iol.pt/multimedia/oratvi/multimedia/imagem/id/62eda30b0cf2ea367d48973b/',
             'duration': 1250,
             'season_number': 1,
-        }
+        },
     }]
 
     def _real_initialize(self):
diff --git a/plugins/youtube_download/yt_dlp/extractor/tvn24.py b/plugins/youtube_download/yt_dlp/extractor/tvn24.py
index 9c777c1..a0590e4 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tvn24.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tvn24.py
@@ -1,13 +1,14 @@
 from .common import InfoExtractor
 from ..utils import (
-    int_or_none,
     NO_DEFAULT,
+    int_or_none,
     unescapeHTML,
 )
 
 
 class TVN24IE(InfoExtractor):
-    _VALID_URL = r'https?://(?:(?:[^/]+)\.)?tvn24(?:bis)?\.pl/(?:[^/]+/)*(?P<id>[^/]+)'
+    _WORKING = False
+    _VALID_URL = r'https?://(?:(?!eurosport)[^/]+\.)?tvn24(?:bis)?\.pl/(?:[^/?#]+/)*(?P<id>[^/?#]+)'
     _TESTS = [{
         'url': 'http://www.tvn24.pl/wiadomosci-z-kraju,3/oredzie-artura-andrusa,702428.html',
         'md5': 'fbdec753d7bc29d96036808275f2130c',
@@ -17,7 +18,7 @@ class TVN24IE(InfoExtractor):
             'title': '"Święta mają być wesołe, dlatego, ludziska, wszyscy pod jemiołę"',
             'description': 'Wyjątkowe orędzie Artura Andrusa, jednego z gości Szkła kontaktowego.',
             'thumbnail': 're:https?://.*[.]jpeg',
-        }
+        },
     }, {
         # different layout
         'url': 'https://tvnmeteo.tvn24.pl/magazyny/maja-w-ogrodzie,13/odcinki-online,1,4,1,0/pnacza-ptaki-i-iglaki-odc-691-hgtv-odc-29,1771763.html',
@@ -57,7 +58,7 @@ class TVN24IE(InfoExtractor):
         def extract_json(attr, name, default=NO_DEFAULT, fatal=True):
             return self._parse_json(
                 self._search_regex(
-                    r'\b%s=(["\'])(?P<json>(?!\1).+?)\1' % attr, webpage,
+                    rf'\b{attr}=(["\'])(?P<json>(?!\1).+?)\1', webpage,
                     name, group='json', default=default, fatal=fatal) or '{}',
                 display_id, transform_source=unescapeHTML, fatal=fatal)
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/tvnet.py b/plugins/youtube_download/yt_dlp/extractor/tvnet.py
deleted file mode 100644
index 77426f7..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/tvnet.py
+++ /dev/null
@@ -1,138 +0,0 @@
-import re
-
-from .common import InfoExtractor
-from ..utils import (
-    int_or_none,
-    unescapeHTML,
-    url_or_none,
-)
-
-
-class TVNetIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:[^/]+)\.tvnet\.gov\.vn/[^/]+/(?:\d+/)?(?P<id>\d+)(?:/|$)'
-    _TESTS = [{
-        # video
-        'url': 'http://de.tvnet.gov.vn/video/109788/vtv1---bac-tuyet-tai-lao-cai-va-ha-giang/tin-nong-24h',
-        'md5': 'b4d7abe0252c9b47774760b7519c7558',
-        'info_dict': {
-            'id': '109788',
-            'ext': 'mp4',
-            'title': 'VTV1 - Bắc tuyết tại Lào Cai và Hà Giang',
-            'thumbnail': r're:(?i)https?://.*\.(?:jpg|png)',
-            'is_live': False,
-            'view_count': int,
-        },
-    }, {
-        # audio
-        'url': 'http://vn.tvnet.gov.vn/radio/27017/vov1---ban-tin-chieu-10062018/doi-song-va-xa-hoi',
-        'md5': 'b5875ce9b0a2eecde029216d0e6db2ae',
-        'info_dict': {
-            'id': '27017',
-            'ext': 'm4a',
-            'title': 'VOV1 - Bản tin chiều (10/06/2018)',
-            'thumbnail': r're:(?i)https?://.*\.(?:jpg|png)',
-            'is_live': False,
-        },
-    }, {
-        'url': 'http://us.tvnet.gov.vn/video/118023/129999/ngay-0705',
-        'info_dict': {
-            'id': '129999',
-            'ext': 'mp4',
-            'title': 'VTV1 - Quốc hội với cử tri (11/06/2018)',
-            'thumbnail': r're:(?i)https?://.*\.(?:jpg|png)',
-            'is_live': False,
-        },
-        'params': {
-            'skip_download': True,
-        },
-    }, {
-        # live stream
-        'url': 'http://us.tvnet.gov.vn/kenh-truyen-hinh/1011/vtv1',
-        'info_dict': {
-            'id': '1011',
-            'ext': 'mp4',
-            'title': r're:^VTV1 \| LiveTV [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
-            'thumbnail': r're:(?i)https?://.*\.(?:jpg|png)',
-            'is_live': True,
-        },
-        'params': {
-            'skip_download': True,
-        },
-    }, {
-        # radio live stream
-        'url': 'http://vn.tvnet.gov.vn/kenh-truyen-hinh/1014',
-        'info_dict': {
-            'id': '1014',
-            'ext': 'm4a',
-            'title': r're:VOV1 \| LiveTV [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
-            'thumbnail': r're:(?i)https?://.*\.(?:jpg|png)',
-            'is_live': True,
-        },
-        'params': {
-            'skip_download': True,
-        },
-    }, {
-        'url': 'http://us.tvnet.gov.vn/phim/6136/25510/vtv3---ca-mot-doi-an-oan-tap-1-50/phim-truyen-hinh',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        webpage = self._download_webpage(url, video_id)
-
-        title = self._og_search_title(
-            webpage, default=None) or self._html_search_meta(
-            'title', webpage, default=None) or self._search_regex(
-            r'<title>([^<]+)<', webpage, 'title')
-        title = re.sub(r'\s*-\s*TV Net\s*$', '', title)
-
-        if '/video/' in url or '/radio/' in url:
-            is_live = False
-        elif '/kenh-truyen-hinh/' in url:
-            is_live = True
-        else:
-            is_live = None
-
-        data_file = unescapeHTML(self._search_regex(
-            r'data-file=(["\'])(?P<url>(?:https?:)?//.+?)\1', webpage,
-            'data file', group='url'))
-
-        stream_urls = set()
-        formats = []
-        for stream in self._download_json(data_file, video_id):
-            if not isinstance(stream, dict):
-                continue
-            stream_url = url_or_none(stream.get('url'))
-            if stream_url in stream_urls or not stream_url:
-                continue
-            stream_urls.add(stream_url)
-            formats.extend(self._extract_m3u8_formats(
-                stream_url, video_id, 'mp4', live=is_live, m3u8_id='hls', fatal=False))
-
-        # better support for radio streams
-        if title.startswith('VOV'):
-            for f in formats:
-                f.update({
-                    'ext': 'm4a',
-                    'vcodec': 'none',
-                })
-
-        thumbnail = self._og_search_thumbnail(
-            webpage, default=None) or unescapeHTML(
-            self._search_regex(
-                r'data-image=(["\'])(?P<url>(?:https?:)?//.+?)\1', webpage,
-                'thumbnail', default=None, group='url'))
-
-        view_count = int_or_none(self._search_regex(
-            r'(?s)<div[^>]+\bclass=["\'].*?view-count[^>]+>.*?(\d+).*?</div>',
-            webpage, 'view count', default=None))
-
-        return {
-            'id': video_id,
-            'title': title,
-            'thumbnail': thumbnail,
-            'is_live': is_live,
-            'view_count': view_count,
-            'formats': formats,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/tvnoe.py b/plugins/youtube_download/yt_dlp/extractor/tvnoe.py
index 712fbb2..24a8262 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tvnoe.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tvnoe.py
@@ -7,6 +7,7 @@ from ..utils import (
 
 
 class TVNoeIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?tvnoe\.cz/video/(?P<id>[0-9]+)'
     _TEST = {
         'url': 'http://www.tvnoe.cz/video/10362',
@@ -17,7 +18,7 @@ class TVNoeIE(InfoExtractor):
             'series': 'Noční univerzita',
             'title': 'prof. Tomáš Halík, Th.D. - Návrat náboženství a střet civilizací',
             'description': 'md5:f337bae384e1a531a52c55ebc50fff41',
-        }
+        },
     }
 
     def _real_extract(self, url):
@@ -39,7 +40,7 @@ class TVNoeIE(InfoExtractor):
                 'field-name-field-podnazev', webpage)),
             'description': clean_html(get_element_by_class(
                 'field-name-body', webpage)),
-            'series': clean_html(get_element_by_class('title', webpage))
+            'series': clean_html(get_element_by_class('title', webpage)),
         })
 
         return info_dict
diff --git a/plugins/youtube_download/yt_dlp/extractor/tvnow.py b/plugins/youtube_download/yt_dlp/extractor/tvnow.py
deleted file mode 100644
index 0acc306..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/tvnow.py
+++ /dev/null
@@ -1,639 +0,0 @@
-import re
-
-from .common import InfoExtractor
-from ..compat import compat_str
-from ..utils import (
-    ExtractorError,
-    get_element_by_id,
-    int_or_none,
-    parse_iso8601,
-    parse_duration,
-    str_or_none,
-    try_get,
-    update_url_query,
-    urljoin,
-)
-
-
-class TVNowBaseIE(InfoExtractor):
-    _VIDEO_FIELDS = (
-        'id', 'title', 'free', 'geoblocked', 'articleLong', 'articleShort',
-        'broadcastStartDate', 'isDrm', 'duration', 'season', 'episode',
-        'manifest.dashclear', 'manifest.hlsclear', 'manifest.smoothclear',
-        'format.title', 'format.defaultImage169Format', 'format.defaultImage169Logo')
-
-    def _call_api(self, path, video_id, query):
-        return self._download_json(
-            'https://api.tvnow.de/v3/' + path, video_id, query=query)
-
-    def _extract_video(self, info, display_id):
-        video_id = compat_str(info['id'])
-        title = info['title']
-
-        paths = []
-        for manifest_url in (info.get('manifest') or {}).values():
-            if not manifest_url:
-                continue
-            manifest_url = update_url_query(manifest_url, {'filter': ''})
-            path = self._search_regex(r'https?://[^/]+/(.+?)\.ism/', manifest_url, 'path')
-            if path in paths:
-                continue
-            paths.append(path)
-
-            def url_repl(proto, suffix):
-                return re.sub(
-                    r'(?:hls|dash|hss)([.-])', proto + r'\1', re.sub(
-                        r'\.ism/(?:[^.]*\.(?:m3u8|mpd)|[Mm]anifest)',
-                        '.ism/' + suffix, manifest_url))
-
-            def make_urls(proto, suffix):
-                urls = [url_repl(proto, suffix)]
-                hd_url = urls[0].replace('/manifest/', '/ngvod/')
-                if hd_url != urls[0]:
-                    urls.append(hd_url)
-                return urls
-
-            for man_url in make_urls('dash', '.mpd'):
-                formats = self._extract_mpd_formats(
-                    man_url, video_id, mpd_id='dash', fatal=False)
-            for man_url in make_urls('hss', 'Manifest'):
-                formats.extend(self._extract_ism_formats(
-                    man_url, video_id, ism_id='mss', fatal=False))
-            for man_url in make_urls('hls', '.m3u8'):
-                formats.extend(self._extract_m3u8_formats(
-                    man_url, video_id, 'mp4', 'm3u8_native', m3u8_id='hls',
-                    fatal=False))
-            if formats:
-                break
-        else:
-            if not self.get_param('allow_unplayable_formats') and info.get('isDrm'):
-                raise ExtractorError(
-                    'Video %s is DRM protected' % video_id, expected=True)
-            if info.get('geoblocked'):
-                raise self.raise_geo_restricted()
-            if not info.get('free', True):
-                raise ExtractorError(
-                    'Video %s is not available for free' % video_id, expected=True)
-
-        description = info.get('articleLong') or info.get('articleShort')
-        timestamp = parse_iso8601(info.get('broadcastStartDate'), ' ')
-        duration = parse_duration(info.get('duration'))
-
-        f = info.get('format', {})
-
-        thumbnails = [{
-            'url': 'https://aistvnow-a.akamaihd.net/tvnow/movie/%s' % video_id,
-        }]
-        thumbnail = f.get('defaultImage169Format') or f.get('defaultImage169Logo')
-        if thumbnail:
-            thumbnails.append({
-                'url': thumbnail,
-            })
-
-        return {
-            'id': video_id,
-            'display_id': display_id,
-            'title': title,
-            'description': description,
-            'thumbnails': thumbnails,
-            'timestamp': timestamp,
-            'duration': duration,
-            'series': f.get('title'),
-            'season_number': int_or_none(info.get('season')),
-            'episode_number': int_or_none(info.get('episode')),
-            'episode': title,
-            'formats': formats,
-        }
-
-
-class TVNowIE(TVNowBaseIE):
-    _VALID_URL = r'''(?x)
-                    https?://
-                        (?:www\.)?tvnow\.(?:de|at|ch)/(?P<station>[^/]+)/
-                        (?P<show_id>[^/]+)/
-                        (?!(?:list|jahr)(?:/|$))(?P<id>[^/?\#&]+)
-                    '''
-
-    @classmethod
-    def suitable(cls, url):
-        return (False if TVNowNewIE.suitable(url) or TVNowSeasonIE.suitable(url) or TVNowAnnualIE.suitable(url) or TVNowShowIE.suitable(url)
-                else super(TVNowIE, cls).suitable(url))
-
-    _TESTS = [{
-        'url': 'https://www.tvnow.de/rtl2/grip-das-motormagazin/der-neue-porsche-911-gt-3/player',
-        'info_dict': {
-            'id': '331082',
-            'display_id': 'grip-das-motormagazin/der-neue-porsche-911-gt-3',
-            'ext': 'mp4',
-            'title': 'Der neue Porsche 911 GT 3',
-            'description': 'md5:6143220c661f9b0aae73b245e5d898bb',
-            'timestamp': 1495994400,
-            'upload_date': '20170528',
-            'duration': 5283,
-            'series': 'GRIP - Das Motormagazin',
-            'season_number': 14,
-            'episode_number': 405,
-            'episode': 'Der neue Porsche 911 GT 3',
-        },
-    }, {
-        # rtl2
-        'url': 'https://www.tvnow.de/rtl2/armes-deutschland/episode-0008/player',
-        'only_matching': True,
-    }, {
-        # rtlnitro
-        'url': 'https://www.tvnow.de/nitro/alarm-fuer-cobra-11-die-autobahnpolizei/auf-eigene-faust-pilot/player',
-        'only_matching': True,
-    }, {
-        # superrtl
-        'url': 'https://www.tvnow.de/superrtl/die-lustigsten-schlamassel-der-welt/u-a-ketchup-effekt/player',
-        'only_matching': True,
-    }, {
-        # ntv
-        'url': 'https://www.tvnow.de/ntv/startup-news/goetter-in-weiss/player',
-        'only_matching': True,
-    }, {
-        # vox
-        'url': 'https://www.tvnow.de/vox/auto-mobil/neues-vom-automobilmarkt-2017-11-19-17-00-00/player',
-        'only_matching': True,
-    }, {
-        # rtlplus
-        'url': 'https://www.tvnow.de/rtlplus/op-ruft-dr-bruckner/die-vernaehte-frau/player',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.tvnow.de/rtl2/grip-das-motormagazin/der-neue-porsche-911-gt-3',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        mobj = self._match_valid_url(url)
-        display_id = '%s/%s' % mobj.group(2, 3)
-
-        info = self._call_api(
-            'movies/' + display_id, display_id, query={
-                'fields': ','.join(self._VIDEO_FIELDS),
-            })
-
-        return self._extract_video(info, display_id)
-
-
-class TVNowNewIE(InfoExtractor):
-    _VALID_URL = r'''(?x)
-                    (?P<base_url>https?://
-                        (?:www\.)?tvnow\.(?:de|at|ch)/
-                        (?:shows|serien))/
-                        (?P<show>[^/]+)-\d+/
-                        [^/]+/
-                        episode-\d+-(?P<episode>[^/?$&]+)-(?P<id>\d+)
-                    '''
-
-    _TESTS = [{
-        'url': 'https://www.tvnow.de/shows/grip-das-motormagazin-1669/2017-05/episode-405-der-neue-porsche-911-gt-3-331082',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        mobj = self._match_valid_url(url)
-        base_url = re.sub(r'(?:shows|serien)', '_', mobj.group('base_url'))
-        show, episode = mobj.group('show', 'episode')
-        return self.url_result(
-            # Rewrite new URLs to the old format and use extraction via old API
-            # at api.tvnow.de as a loophole for bypassing premium content checks
-            '%s/%s/%s' % (base_url, show, episode),
-            ie=TVNowIE.ie_key(), video_id=mobj.group('id'))
-
-
-class TVNowFilmIE(TVNowBaseIE):
-    _VALID_URL = r'''(?x)
-                    (?P<base_url>https?://
-                        (?:www\.)?tvnow\.(?:de|at|ch)/
-                        (?:filme))/
-                        (?P<title>[^/?$&]+)-(?P<id>\d+)
-                    '''
-    _TESTS = [{
-        'url': 'https://www.tvnow.de/filme/lord-of-war-haendler-des-todes-7959',
-        'info_dict': {
-            'id': '1426690',
-            'display_id': 'lord-of-war-haendler-des-todes',
-            'ext': 'mp4',
-            'title': 'Lord of War',
-            'description': 'md5:5eda15c0d5b8cb70dac724c8a0ff89a9',
-            'timestamp': 1550010000,
-            'upload_date': '20190212',
-            'duration': 7016,
-        },
-    }, {
-        'url': 'https://www.tvnow.de/filme/the-machinist-12157',
-        'info_dict': {
-            'id': '328160',
-            'display_id': 'the-machinist',
-            'ext': 'mp4',
-            'title': 'The Machinist',
-            'description': 'md5:9a0e363fdd74b3a9e1cdd9e21d0ecc28',
-            'timestamp': 1496469720,
-            'upload_date': '20170603',
-            'duration': 5836,
-        },
-    }, {
-        'url': 'https://www.tvnow.de/filme/horst-schlaemmer-isch-kandidiere-17777',
-        'only_matching': True,  # DRM protected
-    }]
-
-    def _real_extract(self, url):
-        mobj = self._match_valid_url(url)
-        display_id = mobj.group('title')
-
-        webpage = self._download_webpage(url, display_id, fatal=False)
-        if not webpage:
-            raise ExtractorError('Cannot download "%s"' % url, expected=True)
-
-        json_text = get_element_by_id('now-web-state', webpage)
-        if not json_text:
-            raise ExtractorError('Cannot read video data', expected=True)
-
-        json_data = self._parse_json(
-            json_text,
-            display_id,
-            transform_source=lambda x: x.replace('&q;', '"'),
-            fatal=False)
-        if not json_data:
-            raise ExtractorError('Cannot read video data', expected=True)
-
-        player_key = next(
-            (key for key in json_data.keys() if 'module/player' in key),
-            None)
-        page_key = next(
-            (key for key in json_data.keys() if 'page/filme' in key),
-            None)
-        movie_id = try_get(
-            json_data,
-            [
-                lambda x: x[player_key]['body']['id'],
-                lambda x: x[page_key]['body']['modules'][0]['id'],
-                lambda x: x[page_key]['body']['modules'][1]['id']],
-            int)
-        if not movie_id:
-            raise ExtractorError('Cannot extract movie ID', expected=True)
-
-        info = self._call_api(
-            'movies/%d' % movie_id,
-            display_id,
-            query={'fields': ','.join(self._VIDEO_FIELDS)})
-
-        return self._extract_video(info, display_id)
-
-
-class TVNowNewBaseIE(InfoExtractor):
-    def _call_api(self, path, video_id, query={}):
-        result = self._download_json(
-            'https://apigw.tvnow.de/module/' + path, video_id, query=query)
-        error = result.get('error')
-        if error:
-            raise ExtractorError(
-                '%s said: %s' % (self.IE_NAME, error), expected=True)
-        return result
-
-
-r"""
-TODO: new apigw.tvnow.de based version of TVNowIE. Replace old TVNowIE with it
-when api.tvnow.de is shut down. This version can't bypass premium checks though.
-class TVNowIE(TVNowNewBaseIE):
-    _VALID_URL = r'''(?x)
-                    https?://
-                        (?:www\.)?tvnow\.(?:de|at|ch)/
-                        (?:shows|serien)/[^/]+/
-                        (?:[^/]+/)+
-                        (?P<display_id>[^/?$&]+)-(?P<id>\d+)
-                    '''
-
-    _TESTS = [{
-        # episode with annual navigation
-        'url': 'https://www.tvnow.de/shows/grip-das-motormagazin-1669/2017-05/episode-405-der-neue-porsche-911-gt-3-331082',
-        'info_dict': {
-            'id': '331082',
-            'display_id': 'grip-das-motormagazin/der-neue-porsche-911-gt-3',
-            'ext': 'mp4',
-            'title': 'Der neue Porsche 911 GT 3',
-            'description': 'md5:6143220c661f9b0aae73b245e5d898bb',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'timestamp': 1495994400,
-            'upload_date': '20170528',
-            'duration': 5283,
-            'series': 'GRIP - Das Motormagazin',
-            'season_number': 14,
-            'episode_number': 405,
-            'episode': 'Der neue Porsche 911 GT 3',
-        },
-    }, {
-        # rtl2, episode with season navigation
-        'url': 'https://www.tvnow.de/shows/armes-deutschland-11471/staffel-3/episode-14-bernd-steht-seit-der-trennung-von-seiner-frau-allein-da-526124',
-        'only_matching': True,
-    }, {
-        # rtlnitro
-        'url': 'https://www.tvnow.de/serien/alarm-fuer-cobra-11-die-autobahnpolizei-1815/staffel-13/episode-5-auf-eigene-faust-pilot-366822',
-        'only_matching': True,
-    }, {
-        # superrtl
-        'url': 'https://www.tvnow.de/shows/die-lustigsten-schlamassel-der-welt-1221/staffel-2/episode-14-u-a-ketchup-effekt-364120',
-        'only_matching': True,
-    }, {
-        # ntv
-        'url': 'https://www.tvnow.de/shows/startup-news-10674/staffel-2/episode-39-goetter-in-weiss-387630',
-        'only_matching': True,
-    }, {
-        # vox
-        'url': 'https://www.tvnow.de/shows/auto-mobil-174/2017-11/episode-46-neues-vom-automobilmarkt-2017-11-19-17-00-00-380072',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.tvnow.de/shows/grip-das-motormagazin-1669/2017-05/episode-405-der-neue-porsche-911-gt-3-331082',
-        'only_matching': True,
-    }]
-
-    def _extract_video(self, info, url, display_id):
-        config = info['config']
-        source = config['source']
-
-        video_id = compat_str(info.get('id') or source['videoId'])
-        title = source['title'].strip()
-
-        paths = []
-        for manifest_url in (info.get('manifest') or {}).values():
-            if not manifest_url:
-                continue
-            manifest_url = update_url_query(manifest_url, {'filter': ''})
-            path = self._search_regex(r'https?://[^/]+/(.+?)\.ism/', manifest_url, 'path')
-            if path in paths:
-                continue
-            paths.append(path)
-
-            def url_repl(proto, suffix):
-                return re.sub(
-                    r'(?:hls|dash|hss)([.-])', proto + r'\1', re.sub(
-                        r'\.ism/(?:[^.]*\.(?:m3u8|mpd)|[Mm]anifest)',
-                        '.ism/' + suffix, manifest_url))
-
-            formats = self._extract_mpd_formats(
-                url_repl('dash', '.mpd'), video_id,
-                mpd_id='dash', fatal=False)
-            formats.extend(self._extract_ism_formats(
-                url_repl('hss', 'Manifest'),
-                video_id, ism_id='mss', fatal=False))
-            formats.extend(self._extract_m3u8_formats(
-                url_repl('hls', '.m3u8'), video_id, 'mp4',
-                'm3u8_native', m3u8_id='hls', fatal=False))
-            if formats:
-                break
-        else:
-            if try_get(info, lambda x: x['rights']['isDrm']):
-                raise ExtractorError(
-                    'Video %s is DRM protected' % video_id, expected=True)
-            if try_get(config, lambda x: x['boards']['geoBlocking']['block']):
-                raise self.raise_geo_restricted()
-            if not info.get('free', True):
-                raise ExtractorError(
-                    'Video %s is not available for free' % video_id, expected=True)
-
-        description = source.get('description')
-        thumbnail = url_or_none(source.get('poster'))
-        timestamp = unified_timestamp(source.get('previewStart'))
-        duration = parse_duration(source.get('length'))
-
-        series = source.get('format')
-        season_number = int_or_none(self._search_regex(
-            r'staffel-(\d+)', url, 'season number', default=None))
-        episode_number = int_or_none(self._search_regex(
-            r'episode-(\d+)', url, 'episode number', default=None))
-
-        return {
-            'id': video_id,
-            'display_id': display_id,
-            'title': title,
-            'description': description,
-            'thumbnail': thumbnail,
-            'timestamp': timestamp,
-            'duration': duration,
-            'series': series,
-            'season_number': season_number,
-            'episode_number': episode_number,
-            'episode': title,
-            'formats': formats,
-        }
-
-    def _real_extract(self, url):
-        display_id, video_id = self._match_valid_url(url).groups()
-        info = self._call_api('player/' + video_id, video_id)
-        return self._extract_video(info, video_id, display_id)
-
-
-class TVNowFilmIE(TVNowIE):  # XXX: Do not subclass from concrete IE
-    _VALID_URL = r'''(?x)
-                    (?P<base_url>https?://
-                        (?:www\.)?tvnow\.(?:de|at|ch)/
-                        (?:filme))/
-                        (?P<title>[^/?$&]+)-(?P<id>\d+)
-                    '''
-    _TESTS = [{
-        'url': 'https://www.tvnow.de/filme/lord-of-war-haendler-des-todes-7959',
-        'info_dict': {
-            'id': '1426690',
-            'display_id': 'lord-of-war-haendler-des-todes',
-            'ext': 'mp4',
-            'title': 'Lord of War',
-            'description': 'md5:5eda15c0d5b8cb70dac724c8a0ff89a9',
-            'timestamp': 1550010000,
-            'upload_date': '20190212',
-            'duration': 7016,
-        },
-    }, {
-        'url': 'https://www.tvnow.de/filme/the-machinist-12157',
-        'info_dict': {
-            'id': '328160',
-            'display_id': 'the-machinist',
-            'ext': 'mp4',
-            'title': 'The Machinist',
-            'description': 'md5:9a0e363fdd74b3a9e1cdd9e21d0ecc28',
-            'timestamp': 1496469720,
-            'upload_date': '20170603',
-            'duration': 5836,
-        },
-    }, {
-        'url': 'https://www.tvnow.de/filme/horst-schlaemmer-isch-kandidiere-17777',
-        'only_matching': True,  # DRM protected
-    }]
-
-    def _real_extract(self, url):
-        mobj = self._match_valid_url(url)
-        display_id = mobj.group('title')
-
-        webpage = self._download_webpage(url, display_id, fatal=False)
-        if not webpage:
-            raise ExtractorError('Cannot download "%s"' % url, expected=True)
-
-        json_text = get_element_by_id('now-web-state', webpage)
-        if not json_text:
-            raise ExtractorError('Cannot read video data', expected=True)
-
-        json_data = self._parse_json(
-            json_text,
-            display_id,
-            transform_source=lambda x: x.replace('&q;', '"'),
-            fatal=False)
-        if not json_data:
-            raise ExtractorError('Cannot read video data', expected=True)
-
-        player_key = next(
-            (key for key in json_data.keys() if 'module/player' in key),
-            None)
-        page_key = next(
-            (key for key in json_data.keys() if 'page/filme' in key),
-            None)
-        movie_id = try_get(
-            json_data,
-            [
-                lambda x: x[player_key]['body']['id'],
-                lambda x: x[page_key]['body']['modules'][0]['id'],
-                lambda x: x[page_key]['body']['modules'][1]['id']],
-            int)
-        if not movie_id:
-            raise ExtractorError('Cannot extract movie ID', expected=True)
-
-        info = self._call_api('player/%d' % movie_id, display_id)
-        return self._extract_video(info, url, display_id)
-"""
-
-
-class TVNowListBaseIE(TVNowNewBaseIE):
-    _SHOW_VALID_URL = r'''(?x)
-                    (?P<base_url>
-                        https?://
-                            (?:www\.)?tvnow\.(?:de|at|ch)/(?:shows|serien)/
-                            [^/?#&]+-(?P<show_id>\d+)
-                    )
-                    '''
-
-    @classmethod
-    def suitable(cls, url):
-        return (False if TVNowNewIE.suitable(url)
-                else super(TVNowListBaseIE, cls).suitable(url))
-
-    def _extract_items(self, url, show_id, list_id, query):
-        items = self._call_api(
-            'teaserrow/format/episode/' + show_id, list_id,
-            query=query)['items']
-
-        entries = []
-        for item in items:
-            if not isinstance(item, dict):
-                continue
-            item_url = urljoin(url, item.get('url'))
-            if not item_url:
-                continue
-            video_id = str_or_none(item.get('id') or item.get('videoId'))
-            item_title = item.get('subheadline') or item.get('text')
-            entries.append(self.url_result(
-                item_url, ie=TVNowNewIE.ie_key(), video_id=video_id,
-                video_title=item_title))
-
-        return self.playlist_result(entries, '%s/%s' % (show_id, list_id))
-
-
-class TVNowSeasonIE(TVNowListBaseIE):
-    _VALID_URL = r'%s/staffel-(?P<id>\d+)' % TVNowListBaseIE._SHOW_VALID_URL
-    _TESTS = [{
-        'url': 'https://www.tvnow.de/serien/alarm-fuer-cobra-11-die-autobahnpolizei-1815/staffel-13',
-        'info_dict': {
-            'id': '1815/13',
-        },
-        'playlist_mincount': 22,
-    }]
-
-    def _real_extract(self, url):
-        _, show_id, season_id = self._match_valid_url(url).groups()
-        return self._extract_items(
-            url, show_id, season_id, {'season': season_id})
-
-
-class TVNowAnnualIE(TVNowListBaseIE):
-    _VALID_URL = r'%s/(?P<year>\d{4})-(?P<month>\d{2})' % TVNowListBaseIE._SHOW_VALID_URL
-    _TESTS = [{
-        'url': 'https://www.tvnow.de/shows/grip-das-motormagazin-1669/2017-05',
-        'info_dict': {
-            'id': '1669/2017-05',
-        },
-        'playlist_mincount': 2,
-    }]
-
-    def _real_extract(self, url):
-        _, show_id, year, month = self._match_valid_url(url).groups()
-        return self._extract_items(
-            url, show_id, '%s-%s' % (year, month), {
-                'year': int(year),
-                'month': int(month),
-            })
-
-
-class TVNowShowIE(TVNowListBaseIE):
-    _VALID_URL = TVNowListBaseIE._SHOW_VALID_URL
-    _TESTS = [{
-        # annual navigationType
-        'url': 'https://www.tvnow.de/shows/grip-das-motormagazin-1669',
-        'info_dict': {
-            'id': '1669',
-        },
-        'playlist_mincount': 73,
-    }, {
-        # season navigationType
-        'url': 'https://www.tvnow.de/shows/armes-deutschland-11471',
-        'info_dict': {
-            'id': '11471',
-        },
-        'playlist_mincount': 3,
-    }]
-
-    @classmethod
-    def suitable(cls, url):
-        return (False if TVNowNewIE.suitable(url) or TVNowSeasonIE.suitable(url) or TVNowAnnualIE.suitable(url)
-                else super(TVNowShowIE, cls).suitable(url))
-
-    def _real_extract(self, url):
-        base_url, show_id = self._match_valid_url(url).groups()
-
-        result = self._call_api(
-            'teaserrow/format/navigation/' + show_id, show_id)
-
-        items = result['items']
-
-        entries = []
-        navigation = result.get('navigationType')
-        if navigation == 'annual':
-            for item in items:
-                if not isinstance(item, dict):
-                    continue
-                year = int_or_none(item.get('year'))
-                if year is None:
-                    continue
-                months = item.get('months')
-                if not isinstance(months, list):
-                    continue
-                for month_dict in months:
-                    if not isinstance(month_dict, dict) or not month_dict:
-                        continue
-                    month_number = int_or_none(list(month_dict.keys())[0])
-                    if month_number is None:
-                        continue
-                    entries.append(self.url_result(
-                        '%s/%04d-%02d' % (base_url, year, month_number),
-                        ie=TVNowAnnualIE.ie_key()))
-        elif navigation == 'season':
-            for item in items:
-                if not isinstance(item, dict):
-                    continue
-                season_number = int_or_none(item.get('season'))
-                if season_number is None:
-                    continue
-                entries.append(self.url_result(
-                    '%s/staffel-%d' % (base_url, season_number),
-                    ie=TVNowSeasonIE.ie_key()))
-        else:
-            raise ExtractorError('Unknown navigationType')
-
-        return self.playlist_result(entries, show_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/tvp.py b/plugins/youtube_download/yt_dlp/extractor/tvp.py
index 2aa0dd8..416cbab 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tvp.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tvp.py
@@ -4,10 +4,10 @@ import re
 
 from .common import InfoExtractor
 from ..utils import (
+    ExtractorError,
     clean_html,
     determine_ext,
     dict_get,
-    ExtractorError,
     int_or_none,
     js_to_json,
     str_or_none,
@@ -21,7 +21,7 @@ from ..utils import (
 class TVPIE(InfoExtractor):
     IE_NAME = 'tvp'
     IE_DESC = 'Telewizja Polska'
-    _VALID_URL = r'https?://(?:[^/]+\.)?(?:tvp(?:parlament)?\.(?:pl|info)|tvpworld\.com|swipeto\.pl)/(?:(?!\d+/)[^/]+/)*(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:[^/]+\.)?(?:tvp(?:parlament)?\.(?:pl|info)|tvpworld\.com|swipeto\.pl)/(?:(?!\d+/)[^/]+/)*(?P<id>\d+)(?:[/?#]|$)'
 
     _TESTS = [{
         # TVPlayer 2 in js wrapper
@@ -98,7 +98,7 @@ class TVPIE(InfoExtractor):
         'playlist_mincount': 1800,
         'params': {
             'skip_download': True,
-        }
+        },
     }, {
         # ABC-specific video embeding
         # moved to https://bajkowakraina.tvp.pl/wideo/50981130,teleranek,51027049,zubr,51116450
@@ -221,7 +221,7 @@ class TVPIE(InfoExtractor):
         if website_data.get('items_total_count') > website_data.get('items_per_page'):
             for page in itertools.count(2):
                 page_website_data = self._parse_vue_website_data(
-                    self._download_webpage(url, page_id, note='Downloading page #%d' % page,
+                    self._download_webpage(url, page_id, note=f'Downloading page #{page}',
                                            query={'page': page}),
                     page_id)
                 if not page_website_data.get('videos') and not page_website_data.get('items'):
@@ -290,7 +290,7 @@ class TVPStreamIE(InfoExtractor):
 
     def _real_extract(self, url):
         channel_id = self._match_id(url)
-        channel_url = self._proto_relative_url('//stream.tvp.pl/?channel_id=%s' % channel_id or 'default')
+        channel_url = self._proto_relative_url(f'//stream.tvp.pl/?channel_id={channel_id}' or 'default')
         webpage = self._download_webpage(channel_url, channel_id or 'default', 'Downloading channel webpage')
         channels = self._search_json(
             r'window\.__channels\s*=', webpage, 'channel list', channel_id,
@@ -300,7 +300,7 @@ class TVPStreamIE(InfoExtractor):
         return {
             '_type': 'url_transparent',
             'id': channel_id or channel['id'],
-            'url': 'tvp:%s' % audition['video_id'],
+            'url': 'tvp:{}'.format(audition['video_id']),
             'title': audition.get('title'),
             'alt_title': channel.get('title'),
             'is_live': True,
@@ -379,8 +379,7 @@ class TVPEmbedIE(InfoExtractor):
         ))
 
         webpage = self._download_webpage(
-            ('https://www.tvp.pl/sess/TVPlayer2/api.php?id=%s'
-             + '&@method=getTvpConfig&@callback=%s') % (video_id, callback), video_id)
+            f'https://www.tvp.pl/sess/TVPlayer2/api.php?id={video_id}&@method=getTvpConfig&@callback={callback}', video_id)
 
         # stripping JSONP padding
         datastr = webpage[15 + len(callback):-3]
@@ -470,7 +469,7 @@ class TVPEmbedIE(InfoExtractor):
         # vod.tvp.pl
         if info.get('vortalName') == 'vod':
             info_dict.update({
-                'title': '%s, %s' % (info.get('title'), info.get('subtitle')),
+                'title': '{}, {}'.format(info.get('title'), info.get('subtitle')),
                 'series': info.get('title'),
                 'season': info.get('season'),
                 'episode_number': info.get('episode'),
@@ -514,7 +513,7 @@ class TVPVODBaseIE(InfoExtractor):
 
 class TVPVODVideoIE(TVPVODBaseIE):
     IE_NAME = 'tvp:vod'
-    _VALID_URL = r'https?://vod\.tvp\.pl/[a-z\d-]+,\d+/[a-z\d-]+(?<!-odcinki)(?:-odcinki,\d+/odcinek-\d+,S\d+E\d+)?,(?P<id>\d+)(?:\?[^#]+)?(?:#.+)?$'
+    _VALID_URL = r'https?://vod\.tvp\.pl/(?P<category>[a-z\d-]+,\d+)/[a-z\d-]+(?<!-odcinki)(?:-odcinki,\d+/odcinek--?\d+,S-?\d+E-?\d+)?,(?P<id>\d+)/?(?:[?#]|$)'
 
     _TESTS = [{
         'url': 'https://vod.tvp.pl/dla-dzieci,24/laboratorium-alchemika-odcinki,309338/odcinek-24,S01E24,311357',
@@ -560,12 +559,26 @@ class TVPVODVideoIE(TVPVODBaseIE):
             'thumbnail': 're:https?://.+',
         },
         'params': {'skip_download': 'm3u8'},
+    }, {
+        'url': 'https://vod.tvp.pl/live,1/tvp-world,399731',
+        'info_dict': {
+            'id': '399731',
+            'ext': 'mp4',
+            'title': r're:TVP WORLD \d{4}-\d{2}-\d{2} \d{2}:\d{2}',
+            'live_status': 'is_live',
+            'thumbnail': 're:https?://.+',
+        },
+    }, {
+        'url': 'https://vod.tvp.pl/informacje-i-publicystyka,205/konskie-2025-debata-przedwyborcza-odcinki,2028435/odcinek--1,S01E-1,2028419',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
-        video_id = self._match_id(url)
+        category, video_id = self._match_valid_url(url).group('category', 'id')
 
-        info_dict = self._parse_video(self._call_api(f'vods/{video_id}', video_id), with_url=False)
+        is_live = category == 'live,1'
+        entity = 'lives' if is_live else 'vods'
+        info_dict = self._parse_video(self._call_api(f'{entity}/{video_id}', video_id), with_url=False)
 
         playlist = self._call_api(f'{video_id}/videos/playlist', video_id, query={'videoType': 'MOVIE'})
 
@@ -582,6 +595,8 @@ class TVPVODVideoIE(TVPVODBaseIE):
                 'ext': 'ttml',
             })
 
+        info_dict['is_live'] = is_live
+
         return info_dict
 
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/tvplay.py b/plugins/youtube_download/yt_dlp/extractor/tvplay.py
index 48a6efe..b4a927a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tvplay.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tvplay.py
@@ -1,11 +1,11 @@
 import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import compat_urlparse
 from ..networking.exceptions import HTTPError
 from ..utils import (
-    determine_ext,
     ExtractorError,
+    determine_ext,
     int_or_none,
     parse_iso8601,
     qualities,
@@ -107,7 +107,7 @@ class TVPlayIE(InfoExtractor):
         {
             'url': 'mtg:418113',
             'only_matching': True,
-        }
+        },
     ]
 
     def _real_extract(self, url):
@@ -118,13 +118,13 @@ class TVPlayIE(InfoExtractor):
         if geo_country:
             self._initialize_geo_bypass({'countries': [geo_country.upper()]})
         video = self._download_json(
-            'http://playapi.mtgx.tv/v3/videos/%s' % video_id, video_id, 'Downloading video JSON')
+            f'http://playapi.mtgx.tv/v3/videos/{video_id}', video_id, 'Downloading video JSON')
 
         title = video['title']
 
         try:
             streams = self._download_json(
-                'http://playapi.mtgx.tv/v3/videos/stream/%s' % video_id,
+                f'http://playapi.mtgx.tv/v3/videos/stream/{video_id}',
                 video_id, 'Downloading streams JSON')
         except ExtractorError as e:
             if isinstance(e.cause, HTTPError) and e.cause.status == 403:
@@ -143,7 +143,7 @@ class TVPlayIE(InfoExtractor):
                 formats.extend(self._extract_f4m_formats(
                     update_url_query(video_url, {
                         'hdcore': '3.5.0',
-                        'plugin': 'aasp-3.5.0.151.81'
+                        'plugin': 'aasp-3.5.0.151.81',
                     }), video_id, f4m_id='hds', fatal=False))
             elif ext == 'm3u8':
                 formats.extend(self._extract_m3u8_formats(
@@ -184,7 +184,7 @@ class TVPlayIE(InfoExtractor):
         if sami_path:
             lang = self._search_regex(
                 r'_([a-z]{2})\.xml', sami_path, 'lang',
-                default=compat_urlparse.urlparse(url).netloc.rsplit('.', 1)[-1])
+                default=urllib.parse.urlparse(url).netloc.rsplit('.', 1)[-1])
             subtitles[lang] = [{
                 'url': sami_path,
             }]
@@ -250,7 +250,7 @@ class TVPlayHomeIE(InfoExtractor):
             'description': 'md5:c6926e9710f1a126f028fbe121eddb79',
             'duration': 2440,
         },
-        'skip': '404'
+        'skip': '404',
     }, {
         'url': 'https://play.tv3.lt/lives/tv6-lt,live-2838694/optibet-a-lygos-rungtynes-marijampoles-suduva--vilniaus-riteriai,programme-3422014',
         'only_matching': True,
diff --git a/plugins/youtube_download/yt_dlp/extractor/tvplayer.py b/plugins/youtube_download/yt_dlp/extractor/tvplayer.py
index 228c236..7c47bc7 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tvplayer.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tvplayer.py
@@ -1,11 +1,10 @@
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..networking.exceptions import HTTPError
 from ..utils import (
+    ExtractorError,
     extract_attributes,
     try_get,
     urlencode_postdata,
-    ExtractorError,
 )
 
 
@@ -21,7 +20,7 @@ class TVPlayerIE(InfoExtractor):
         'params': {
             # m3u8 download
             'skip_download': True,
-        }
+        },
     }
 
     def _real_extract(self, url):
@@ -48,7 +47,7 @@ class TVPlayerIE(InfoExtractor):
 
         validate = context['validate']
         platform = try_get(
-            context, lambda x: x['platform']['key'], compat_str) or 'firefox'
+            context, lambda x: x['platform']['key'], str) or 'firefox'
 
         try:
             response = self._download_json(
@@ -66,7 +65,7 @@ class TVPlayerIE(InfoExtractor):
                 response = self._parse_json(
                     e.cause.response.read().decode(), resource_id)['tvplayer']['response']
                 raise ExtractorError(
-                    '%s said: %s' % (self.IE_NAME, response['error']), expected=True)
+                    '{} said: {}'.format(self.IE_NAME, response['error']), expected=True)
             raise
 
         formats = self._extract_m3u8_formats(response['stream'], display_id, 'mp4')
diff --git a/plugins/youtube_download/yt_dlp/extractor/tvw.py b/plugins/youtube_download/yt_dlp/extractor/tvw.py
new file mode 100644
index 0000000..0ab926d
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/tvw.py
@@ -0,0 +1,165 @@
+import json
+
+from .common import InfoExtractor
+from ..utils import (
+    clean_html,
+    extract_attributes,
+    parse_qs,
+    remove_end,
+    require,
+    unified_timestamp,
+    url_or_none,
+)
+from ..utils.traversal import find_element, traverse_obj
+
+
+class TvwIE(InfoExtractor):
+    IE_NAME = 'tvw'
+    _VALID_URL = r'https?://(?:www\.)?tvw\.org/video/(?P<id>[^/?#]+)'
+    _TESTS = [{
+        'url': 'https://tvw.org/video/billy-frank-jr-statue-maquette-unveiling-ceremony-2024011211/',
+        'md5': '9ceb94fe2bb7fd726f74f16356825703',
+        'info_dict': {
+            'id': '2024011211',
+            'ext': 'mp4',
+            'title': 'Billy Frank Jr. Statue Maquette Unveiling Ceremony',
+            'thumbnail': r're:^https?://.*\.(?:jpe?g|png)$',
+            'description': 'md5:58a8150017d985b4f377e11ee8f6f36e',
+            'timestamp': 1704902400,
+            'upload_date': '20240110',
+            'location': 'Legislative Building',
+            'display_id': 'billy-frank-jr-statue-maquette-unveiling-ceremony-2024011211',
+            'categories': ['General Interest'],
+        },
+    }, {
+        'url': 'https://tvw.org/video/ebeys-landing-state-park-2024081007/',
+        'md5': '71e87dae3deafd65d75ff3137b9a32fc',
+        'info_dict': {
+            'id': '2024081007',
+            'ext': 'mp4',
+            'title': 'Ebey\'s Landing State Park',
+            'thumbnail': r're:^https?://.*\.(?:jpe?g|png)$',
+            'description': 'md5:50c5bd73bde32fa6286a008dbc853386',
+            'timestamp': 1724310900,
+            'upload_date': '20240822',
+            'location': 'Ebey’s Landing State Park',
+            'display_id': 'ebeys-landing-state-park-2024081007',
+            'categories': ['Washington State Parks'],
+        },
+    }, {
+        'url': 'https://tvw.org/video/home-warranties-workgroup-2',
+        'md5': 'f678789bf94d07da89809f213cf37150',
+        'info_dict': {
+            'id': '1999121000',
+            'ext': 'mp4',
+            'title': 'Home Warranties Workgroup',
+            'thumbnail': r're:^https?://.*\.(?:jpe?g|png)$',
+            'description': 'md5:861396cc523c9641d0dce690bc5c35f3',
+            'timestamp': 946389600,
+            'upload_date': '19991228',
+            'display_id': 'home-warranties-workgroup-2',
+            'categories': ['Legislative'],
+        },
+    }, {
+        'url': 'https://tvw.org/video/washington-to-washington-a-new-space-race-2022041111/?eventID=2022041111',
+        'md5': '6f5551090b351aba10c0d08a881b4f30',
+        'info_dict': {
+            'id': '2022041111',
+            'ext': 'mp4',
+            'title': 'Washington to Washington - A New Space Race',
+            'thumbnail': r're:^https?://.*\.(?:jpe?g|png)$',
+            'description': 'md5:f65a24eec56107afbcebb3aa5cd26341',
+            'timestamp': 1650394800,
+            'upload_date': '20220419',
+            'location': 'Hayner Media Center',
+            'display_id': 'washington-to-washington-a-new-space-race-2022041111',
+            'categories': ['Washington to Washington', 'General Interest'],
+        },
+    }]
+
+    def _real_extract(self, url):
+        display_id = self._match_id(url)
+        webpage = self._download_webpage(url, display_id)
+
+        client_id = self._html_search_meta('clientID', webpage, fatal=True)
+        video_id = self._html_search_meta('eventID', webpage, fatal=True)
+
+        video_data = self._download_json(
+            'https://api.v3.invintus.com/v2/Event/getDetailed', video_id,
+            headers={
+                'authorization': 'embedder',
+                'wsc-api-key': '7WhiEBzijpritypp8bqcU7pfU9uicDR',
+            },
+            data=json.dumps({
+                'clientID': client_id,
+                'eventID': video_id,
+                'showStreams': True,
+            }).encode())['data']
+
+        formats = []
+        subtitles = {}
+        for stream_url in traverse_obj(video_data, ('streamingURIs', ..., {url_or_none})):
+            fmts, subs = self._extract_m3u8_formats_and_subtitles(
+                stream_url, video_id, 'mp4', m3u8_id='hls', fatal=False)
+            formats.extend(fmts)
+            self._merge_subtitles(subs, target=subtitles)
+        if caption_url := traverse_obj(video_data, ('captionPath', {url_or_none})):
+            subtitles.setdefault('en', []).append({'url': caption_url, 'ext': 'vtt'})
+
+        return {
+            'id': video_id,
+            'display_id': display_id,
+            'formats': formats,
+            'subtitles': subtitles,
+            'title': remove_end(self._og_search_title(webpage, default=None), ' - TVW'),
+            'description': self._og_search_description(webpage, default=None),
+            **traverse_obj(video_data, {
+                'title': ('title', {str}),
+                'description': ('description', {clean_html}),
+                'categories': ('categories', ..., {str}),
+                'thumbnail': ('videoThumbnail', {url_or_none}),
+                'timestamp': ('startDateTime', {unified_timestamp}),
+                'location': ('locationName', {str}),
+                'is_live': ('eventStatus', {lambda x: x == 'live'}),
+            }),
+        }
+
+
+class TvwTvChannelsIE(InfoExtractor):
+    IE_NAME = 'tvw:tvchannels'
+    _VALID_URL = r'https?://(?:www\.)?tvw\.org/tvchannels/(?P<id>[^/?#]+)'
+    _TESTS = [{
+        'url': 'https://tvw.org/tvchannels/air/',
+        'info_dict': {
+            'id': 'air',
+            'ext': 'mp4',
+            'title': r're:TVW Cable Channel Live Stream',
+            'thumbnail': r're:https?://.+/.+\.(?:jpe?g|png)$',
+            'live_status': 'is_live',
+        },
+    }, {
+        'url': 'https://tvw.org/tvchannels/tvw2/',
+        'info_dict': {
+            'id': 'tvw2',
+            'ext': 'mp4',
+            'title': r're:TVW-2 Broadcast Channel',
+            'thumbnail': r're:https?://.+/.+\.(?:jpe?g|png)$',
+            'live_status': 'is_live',
+        },
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+
+        m3u8_url = traverse_obj(webpage, (
+            {find_element(id='invintus-persistent-stream-frame', html=True)}, {extract_attributes},
+            'src', {parse_qs}, 'encoder', 0, {json.loads}, 'live247URI', {url_or_none}, {require('stream url')}))
+
+        return {
+            'id': video_id,
+            'formats': self._extract_m3u8_formats(m3u8_url, video_id, 'mp4', m3u8_id='hls', live=True),
+            'title': remove_end(self._og_search_title(webpage, default=None), ' - TVW'),
+            'thumbnail': self._og_search_thumbnail(webpage, default=None),
+            'is_live': True,
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/tweakers.py b/plugins/youtube_download/yt_dlp/extractor/tweakers.py
index e8e1fc6..77a4136 100644
--- a/plugins/youtube_download/yt_dlp/extractor/tweakers.py
+++ b/plugins/youtube_download/yt_dlp/extractor/tweakers.py
@@ -1,7 +1,7 @@
 from .common import InfoExtractor
 from ..utils import (
-    int_or_none,
     determine_ext,
+    int_or_none,
     mimetype2ext,
 )
 
@@ -19,13 +19,13 @@ class TweakersIE(InfoExtractor):
             'thumbnail': r're:^https?://.*\.jpe?g$',
             'duration': 386,
             'uploader_id': 's7JeEm',
-        }
+        },
     }
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
         video_data = self._download_json(
-            'https://tweakers.net/video/s1playlist/%s/1920/1080/playlist.json' % video_id,
+            f'https://tweakers.net/video/s1playlist/{video_id}/1920/1080/playlist.json',
             video_id)['items'][0]
 
         title = video_data['title']
diff --git a/plugins/youtube_download/yt_dlp/extractor/twentyfourvideo.py b/plugins/youtube_download/yt_dlp/extractor/twentyfourvideo.py
deleted file mode 100644
index baeb85d..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/twentyfourvideo.py
+++ /dev/null
@@ -1,128 +0,0 @@
-from .common import InfoExtractor
-from ..utils import (
-    parse_iso8601,
-    int_or_none,
-    xpath_attr,
-    xpath_element,
-)
-
-
-class TwentyFourVideoIE(InfoExtractor):
-    IE_NAME = '24video'
-    _VALID_URL = r'''(?x)
-                    https?://
-                        (?P<host>
-                            (?:(?:www|porno?)\.)?24video\.
-                            (?:net|me|xxx|sexy?|tube|adult|site|vip)
-                        )/
-                        (?:
-                            video/(?:(?:view|xml)/)?|
-                            player/new24_play\.swf\?id=
-                        )
-                        (?P<id>\d+)
-                    '''
-
-    _TESTS = [{
-        'url': 'http://www.24video.net/video/view/1044982',
-        'md5': 'e09fc0901d9eaeedac872f154931deeb',
-        'info_dict': {
-            'id': '1044982',
-            'ext': 'mp4',
-            'title': 'Эротика каменного века',
-            'description': 'Как смотрели порно в каменном веке.',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'uploader': 'SUPERTELO',
-            'duration': 31,
-            'timestamp': 1275937857,
-            'upload_date': '20100607',
-            'age_limit': 18,
-            'like_count': int,
-            'dislike_count': int,
-        },
-    }, {
-        'url': 'http://www.24video.net/player/new24_play.swf?id=1044982',
-        'only_matching': True,
-    }, {
-        'url': 'http://www.24video.me/video/view/1044982',
-        'only_matching': True,
-    }, {
-        'url': 'http://www.24video.tube/video/view/2363750',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.24video.site/video/view/2640421',
-        'only_matching': True,
-    }, {
-        'url': 'https://porno.24video.net/video/2640421-vsya-takaya-gibkaya-i-v-masle',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.24video.vip/video/view/1044982',
-        'only_matching': True,
-    }, {
-        'url': 'https://porn.24video.net/video/2640421-vsya-takay',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        mobj = self._match_valid_url(url)
-        video_id = mobj.group('id')
-        host = mobj.group('host')
-
-        webpage = self._download_webpage(
-            'http://%s/video/view/%s' % (host, video_id), video_id)
-
-        title = self._og_search_title(webpage)
-        description = self._html_search_regex(
-            r'<(p|span)[^>]+itemprop="description"[^>]*>(?P<description>[^<]+)</\1>',
-            webpage, 'description', fatal=False, group='description')
-        thumbnail = self._og_search_thumbnail(webpage)
-        duration = int_or_none(self._og_search_property(
-            'duration', webpage, 'duration', fatal=False))
-        timestamp = parse_iso8601(self._search_regex(
-            r'<time[^>]+\bdatetime="([^"]+)"[^>]+itemprop="uploadDate"',
-            webpage, 'upload date', fatal=False))
-
-        uploader = self._html_search_regex(
-            r'class="video-uploaded"[^>]*>\s*<a href="/jsecUser/movies/[^"]+"[^>]*>([^<]+)</a>',
-            webpage, 'uploader', fatal=False)
-
-        view_count = int_or_none(self._html_search_regex(
-            r'<span class="video-views">(\d+) просмотр',
-            webpage, 'view count', fatal=False))
-        comment_count = int_or_none(self._html_search_regex(
-            r'<a[^>]+href="#tab-comments"[^>]*>(\d+) комментари',
-            webpage, 'comment count', default=None))
-
-        # Sets some cookies
-        self._download_xml(
-            r'http://%s/video/xml/%s?mode=init' % (host, video_id),
-            video_id, 'Downloading init XML')
-
-        video_xml = self._download_xml(
-            'http://%s/video/xml/%s?mode=play' % (host, video_id),
-            video_id, 'Downloading video XML')
-
-        video = xpath_element(video_xml, './/video', 'video', fatal=True)
-
-        formats = [{
-            'url': xpath_attr(video, '', 'url', 'video URL', fatal=True),
-        }]
-
-        like_count = int_or_none(video.get('ratingPlus'))
-        dislike_count = int_or_none(video.get('ratingMinus'))
-        age_limit = 18 if video.get('adult') == 'true' else 0
-
-        return {
-            'id': video_id,
-            'title': title,
-            'description': description,
-            'thumbnail': thumbnail,
-            'uploader': uploader,
-            'duration': duration,
-            'timestamp': timestamp,
-            'view_count': view_count,
-            'comment_count': comment_count,
-            'like_count': like_count,
-            'dislike_count': dislike_count,
-            'age_limit': age_limit,
-            'formats': formats,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/twentymin.py b/plugins/youtube_download/yt_dlp/extractor/twentymin.py
index 74f90b0..a08c591 100644
--- a/plugins/youtube_download/yt_dlp/extractor/twentymin.py
+++ b/plugins/youtube_download/yt_dlp/extractor/twentymin.py
@@ -47,14 +47,14 @@ class TwentyMinutenIE(InfoExtractor):
         video_id = self._match_id(url)
 
         video = self._download_json(
-            'http://api.20min.ch/video/%s/show' % video_id,
+            f'http://api.20min.ch/video/{video_id}/show',
             video_id)['content']
 
         title = video['title']
 
         formats = [{
             'format_id': format_id,
-            'url': 'http://podcast.20min-tv.ch/podcast/20min/%s%s.mp4' % (video_id, p),
+            'url': f'http://podcast.20min-tv.ch/podcast/20min/{video_id}{p}.mp4',
             'quality': quality,
         } for quality, (format_id, p) in enumerate([('sd', ''), ('hd', 'h')])]
 
@@ -64,7 +64,7 @@ class TwentyMinutenIE(InfoExtractor):
         def extract_count(kind):
             return try_get(
                 video,
-                lambda x: int_or_none(x['communityobject']['thumbs_%s' % kind]))
+                lambda x: int_or_none(x['communityobject'][f'thumbs_{kind}']))
 
         like_count = extract_count('up')
         dislike_count = extract_count('down')
diff --git a/plugins/youtube_download/yt_dlp/extractor/twentythreevideo.py b/plugins/youtube_download/yt_dlp/extractor/twentythreevideo.py
index 290c376..af7c006 100644
--- a/plugins/youtube_download/yt_dlp/extractor/twentythreevideo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/twentythreevideo.py
@@ -16,7 +16,7 @@ class TwentyThreeVideoIE(InfoExtractor):
             'upload_date': '20171221',
             'uploader_id': '12258964',
             'uploader': 'Rasmus Bysted',
-        }
+        },
     }, {
         'url': 'https://bonnier-publications-danmark.23video.com/v.ihtml/player.html?token=f0dc46476e06e13afd5a1f84a29e31e8&source=embed&photo%5fid=36137620',
         'only_matching': True,
@@ -24,7 +24,7 @@ class TwentyThreeVideoIE(InfoExtractor):
 
     def _real_extract(self, url):
         domain, query, photo_id = self._match_valid_url(url).groups()
-        base_url = 'https://%s' % domain
+        base_url = f'https://{domain}'
         photo_data = self._download_json(
             base_url + '/api/photo/list?' + query, photo_id, query={
                 'format': 'json',
diff --git a/plugins/youtube_download/yt_dlp/extractor/twitcasting.py b/plugins/youtube_download/yt_dlp/extractor/twitcasting.py
index dff353a..0a7f95c 100644
--- a/plugins/youtube_download/yt_dlp/extractor/twitcasting.py
+++ b/plugins/youtube_download/yt_dlp/extractor/twitcasting.py
@@ -5,24 +5,26 @@ import re
 from .common import InfoExtractor
 from ..dependencies import websockets
 from ..utils import (
-    clean_html,
     ExtractorError,
+    UserNotLive,
+    clean_html,
     float_or_none,
     get_element_by_class,
     get_element_by_id,
     parse_duration,
     qualities,
     str_to_int,
-    traverse_obj,
     try_get,
     unified_timestamp,
+    url_or_none,
     urlencode_postdata,
     urljoin,
 )
+from ..utils.traversal import traverse_obj
 
 
 class TwitCastingIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:[^/]+\.)?twitcasting\.tv/(?P<uploader_id>[^/]+)/(?:movie|twplayer)/(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:[^/?#]+\.)?twitcasting\.tv/(?P<uploader_id>[^/?#]+)/(?:movie|twplayer)/(?P<id>\d+)'
     _M3U8_HEADERS = {
         'Origin': 'https://twitcasting.tv',
         'Referer': 'https://twitcasting.tv/',
@@ -137,13 +139,7 @@ class TwitCastingIE(InfoExtractor):
             r'data-toggle="true"[^>]+datetime="([^"]+)"',
             webpage, 'datetime', None))
 
-        stream_server_data = self._download_json(
-            'https://twitcasting.tv/streamserver.php?target=%s&mode=client' % uploader_id, video_id,
-            'Downloading live info', fatal=False)
-
-        is_live = 'data-status="online"' in webpage
-        if not traverse_obj(stream_server_data, 'llfmp4') and is_live:
-            self.raise_login_required(method='cookies')
+        is_live = any(f'data-{x}' in webpage for x in ['is-onlive="true"', 'live-type="live"', 'status="online"'])
 
         base_dict = {
             'title': title,
@@ -164,31 +160,40 @@ class TwitCastingIE(InfoExtractor):
                 return [data_movie_url]
 
         m3u8_urls = (try_get(webpage, find_dmu, list)
-                     or traverse_obj(video_js_data, (..., 'source', 'url'))
-                     or ([f'https://twitcasting.tv/{uploader_id}/metastream.m3u8'] if is_live else None))
-        if not m3u8_urls:
-            raise ExtractorError('Failed to get m3u8 playlist')
+                     or traverse_obj(video_js_data, (..., 'source', 'url')))
 
         if is_live:
-            m3u8_url = m3u8_urls[0]
-            formats = self._extract_m3u8_formats(
-                m3u8_url, video_id, ext='mp4', m3u8_id='hls',
-                live=True, headers=self._M3U8_HEADERS)
+            stream_data = self._download_json(
+                'https://twitcasting.tv/streamserver.php',
+                video_id, 'Downloading live info', query={
+                    'target': uploader_id,
+                    'mode': 'client',
+                    'player': 'pc_web',
+                })
 
-            if traverse_obj(stream_server_data, ('hls', 'source')):
-                formats.extend(self._extract_m3u8_formats(
-                    m3u8_url, video_id, ext='mp4', m3u8_id='source',
-                    live=True, query={'mode': 'source'},
-                    note='Downloading source quality m3u8',
-                    headers=self._M3U8_HEADERS, fatal=False))
+            formats = []
+            # low: 640x360, medium: 1280x720, high: 1920x1080
+            qq = qualities(['low', 'medium', 'high'])
+            for quality, m3u8_url in traverse_obj(stream_data, (
+                'tc-hls', 'streams', {dict.items}, lambda _, v: url_or_none(v[1]),
+            )):
+                formats.append({
+                    'url': m3u8_url,
+                    'format_id': f'hls-{quality}',
+                    'ext': 'mp4',
+                    'quality': qq(quality),
+                    'protocol': 'm3u8',
+                    'http_headers': self._M3U8_HEADERS,
+                })
 
             if websockets:
                 qq = qualities(['base', 'mobilesource', 'main'])
-                streams = traverse_obj(stream_server_data, ('llfmp4', 'streams')) or {}
-                for mode, ws_url in streams.items():
+                for mode, ws_url in traverse_obj(stream_data, (
+                    'llfmp4', 'streams', {dict.items}, lambda _, v: url_or_none(v[1]),
+                )):
                     formats.append({
                         'url': ws_url,
-                        'format_id': 'ws-%s' % mode,
+                        'format_id': f'ws-{mode}',
                         'ext': 'mp4',
                         'quality': qq(mode),
                         'source_preference': -10,
@@ -196,10 +201,15 @@ class TwitCastingIE(InfoExtractor):
                         'protocol': 'websocket_frag',
                     })
 
+            if not formats:
+                self.raise_login_required()
+
             infodict = {
                 'formats': formats,
                 '_format_sort_fields': ('source', ),
             }
+        elif not m3u8_urls:
+            raise ExtractorError('Failed to get m3u8 playlist')
         elif len(m3u8_urls) == 1:
             formats = self._extract_m3u8_formats(
                 m3u8_urls[0], video_id, 'mp4', headers=self._M3U8_HEADERS)
@@ -231,54 +241,64 @@ class TwitCastingIE(InfoExtractor):
 
 
 class TwitCastingLiveIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:[^/]+\.)?twitcasting\.tv/(?P<id>[^/]+)/?(?:[#?]|$)'
+    _VALID_URL = r'https?://(?:[^/?#]+\.)?twitcasting\.tv/(?P<id>[^/?#]+)/?(?:[#?]|$)'
     _TESTS = [{
         'url': 'https://twitcasting.tv/ivetesangalo',
         'only_matching': True,
+    }, {
+        'url': 'https://twitcasting.tv/c:unusedlive',
+        'expected_exception': 'UserNotLive',
     }]
 
     def _real_extract(self, url):
         uploader_id = self._match_id(url)
         self.to_screen(
-            'Downloading live video of user {0}. '
-            'Pass "https://twitcasting.tv/{0}/show" to download the history'.format(uploader_id))
+            f'Downloading live video of user {uploader_id}. '
+            f'Pass "https://twitcasting.tv/{uploader_id}/show" to download the history')
 
-        webpage = self._download_webpage(url, uploader_id)
+        is_live = traverse_obj(self._download_json(
+            f'https://frontendapi.twitcasting.tv/watch/user/{uploader_id}',
+            uploader_id, 'Checking live status', data=b'', fatal=False), ('is_live', {bool}))
+        if is_live is False:  # only raise here if API response was as expected
+            raise UserNotLive(video_id=uploader_id)
+
+        # Use /show/ page so that password-protected and members-only livestreams can be found
+        webpage = self._download_webpage(
+            f'https://twitcasting.tv/{uploader_id}/show/', uploader_id, 'Downloading live history')
+        is_live = is_live or self._search_regex(
+            r'(?s)(<span\s*class="tw-movie-thumbnail2-badge"\s*data-status="live">\s*LIVE)',
+            webpage, 'is live?', default=False)
+        # Current live is always the first match
         current_live = self._search_regex(
-            (r'data-type="movie" data-id="(\d+)">',
-             r'tw-sound-flag-open-link" data-id="(\d+)" style=',),
-            webpage, 'current live ID', default=None)
-        if not current_live:
-            # fetch unfiltered /show to find running livestreams; we can't get ID of the password-protected livestream above
-            webpage = self._download_webpage(
-                f'https://twitcasting.tv/{uploader_id}/show/', uploader_id,
-                note='Downloading live history')
-            is_live = self._search_regex(r'(?s)(<span\s*class="tw-movie-thumbnail-badge"\s*data-status="live">\s*LIVE)', webpage, 'is live?', default=None)
-            if is_live:
-                # get the first live; running live is always at the first
-                current_live = self._search_regex(
-                    r'(?s)<a\s+class="tw-movie-thumbnail"\s*href="/[^/]+/movie/(?P<video_id>\d+)"\s*>.+?</a>',
-                    webpage, 'current live ID 2', default=None, group='video_id')
-        if not current_live:
-            raise ExtractorError('The user is not currently live')
-        return self.url_result('https://twitcasting.tv/%s/movie/%s' % (uploader_id, current_live))
+            r'(?s)<a\s+class="tw-movie-thumbnail2"\s+href="/[^/"]+/movie/(?P<video_id>\d+)"',
+            webpage, 'current live ID', default=None, group='video_id')
+        if not is_live or not current_live:
+            raise UserNotLive(video_id=uploader_id)
+
+        return self.url_result(f'https://twitcasting.tv/{uploader_id}/movie/{current_live}', TwitCastingIE)
 
 
 class TwitCastingUserIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:[^/]+\.)?twitcasting\.tv/(?P<id>[^/]+)/show/?(?:[#?]|$)'
+    _VALID_URL = r'https?://(?:[^/?#]+\.)?twitcasting\.tv/(?P<id>[^/?#]+)/(?:show|archive)/?(?:[#?]|$)'
     _TESTS = [{
+        'url': 'https://twitcasting.tv/natsuiromatsuri/archive/',
+        'info_dict': {
+            'id': 'natsuiromatsuri',
+            'title': 'natsuiromatsuri - Live History',
+        },
+        'playlist_mincount': 235,
+    }, {
         'url': 'https://twitcasting.tv/noriyukicas/show',
         'only_matching': True,
     }]
 
     def _entries(self, uploader_id):
-        base_url = next_url = 'https://twitcasting.tv/%s/show' % uploader_id
+        base_url = next_url = f'https://twitcasting.tv/{uploader_id}/show'
         for page_num in itertools.count(1):
             webpage = self._download_webpage(
-                next_url, uploader_id, query={'filter': 'watchable'}, note='Downloading page %d' % page_num)
+                next_url, uploader_id, query={'filter': 'watchable'}, note=f'Downloading page {page_num}')
             matches = re.finditer(
-                r'''(?isx)<a\s+class="tw-movie-thumbnail"\s*href="(?P<url>/[^/]+/movie/\d+)"\s*>.+?</a>''',
-                webpage)
+                r'(?s)<a\s+class="tw-movie-thumbnail2"\s+href="(?P<url>/[^/"]+/movie/\d+)"', webpage)
             for mobj in matches:
                 yield self.url_result(urljoin(base_url, mobj.group('url')))
 
@@ -292,4 +312,4 @@ class TwitCastingUserIE(InfoExtractor):
     def _real_extract(self, url):
         uploader_id = self._match_id(url)
         return self.playlist_result(
-            self._entries(uploader_id), uploader_id, '%s - Live History' % uploader_id)
+            self._entries(uploader_id), uploader_id, f'{uploader_id} - Live History')
diff --git a/plugins/youtube_download/yt_dlp/extractor/twitch.py b/plugins/youtube_download/yt_dlp/extractor/twitch.py
index 3297ef0..4f4c596 100644
--- a/plugins/youtube_download/yt_dlp/extractor/twitch.py
+++ b/plugins/youtube_download/yt_dlp/extractor/twitch.py
@@ -3,14 +3,9 @@ import itertools
 import json
 import random
 import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_parse_qs,
-    compat_str,
-    compat_urllib_parse_urlencode,
-    compat_urllib_parse_urlparse,
-)
 from ..utils import (
     ExtractorError,
     UserNotLive,
@@ -19,19 +14,20 @@ from ..utils import (
     dict_get,
     float_or_none,
     int_or_none,
+    join_nonempty,
     make_archive_id,
     parse_duration,
     parse_iso8601,
     parse_qs,
     qualities,
     str_or_none,
-    traverse_obj,
     try_get,
     unified_timestamp,
     update_url_query,
     url_or_none,
     urljoin,
 )
+from ..utils.traversal import traverse_obj, value
 
 
 class TwitchBaseIE(InfoExtractor):
@@ -47,10 +43,10 @@ class TwitchBaseIE(InfoExtractor):
         'CollectionSideBar': '27111f1b382effad0b6def325caef1909c733fe6a4fbabf54f8d491ef2cf2f14',
         'FilterableVideoTower_Videos': 'a937f1d22e269e39a03b509f65a7490f9fc247d7f83d6ac1421523e3b68042cb',
         'ClipsCards__User': 'b73ad2bfaecfd30a9e6c28fada15bd97032c83ec77a0440766a56fe0bd632777',
+        'ShareClipRenderStatus': 'f130048a462a0ac86bb54d653c968c514e9ab9ca94db52368c1179e97b0f16eb',
         'ChannelCollectionsContent': '447aec6a0cc1e8d0a8d7732d47eb0762c336a2294fdb009e9c9d854e49d484b9',
         'StreamMetadata': 'a647c2a13599e5991e175155f798ca7f1ecddde73f7f341f39009c14dbf59962',
         'ComscoreStreamingQuery': 'e1edae8122517d013405f237ffcc124515dc6ded82480a88daef69c83b53ac01',
-        'VideoAccessToken_Clip': '36b89d2507fce29e5ca551df756d27c1cfe079e2609642b4390aa4c35796eb11',
         'VideoPreviewOverlay': '3006e77e51b128d838fa4e835723ca4dc9a05c5efd4466c1085215c6e437e65c',
         'VideoMetadata': '49b5b8f268cdeb259d75b58dcb0c1a748e3b575003448a2333dc5cdafd49adad',
         'VideoPlayer_ChapterSelectButtonVideo': '8d2793384aac3773beab5e59bd5d6f585aedb923d292800119e03d40cd0f9b41',
@@ -65,7 +61,7 @@ class TwitchBaseIE(InfoExtractor):
     def _perform_login(self, username, password):
         def fail(message):
             raise ExtractorError(
-                'Unable to login. Twitch said: %s' % message, expected=True)
+                f'Unable to login. Twitch said: {message}', expected=True)
 
         def login_step(page, urlh, note, data):
             form = self._hidden_inputs(page)
@@ -157,12 +153,12 @@ class TwitchBaseIE(InfoExtractor):
                 'persistedQuery': {
                     'version': 1,
                     'sha256Hash': self._OPERATION_HASHES[op['operationName']],
-                }
+                },
             }
         return self._download_base_gql(video_id, ops, note)
 
     def _download_access_token(self, video_id, token_kind, param_name):
-        method = '%sPlaybackAccessToken' % token_kind
+        method = f'{token_kind}PlaybackAccessToken'
         ops = {
             'query': '''{
               %s(
@@ -177,11 +173,11 @@ class TwitchBaseIE(InfoExtractor):
                 value
                 signature
               }
-            }''' % (method, param_name, video_id),
+            }''' % (method, param_name, video_id),  # noqa: UP031
         }
         return self._download_base_gql(
             video_id, ops,
-            'Downloading %s access token GraphQL' % token_kind)['data'][method]
+            f'Downloading {token_kind} access token GraphQL')['data'][method]
 
     def _get_thumbnails(self, thumbnail):
         return [{
@@ -191,6 +187,27 @@ class TwitchBaseIE(InfoExtractor):
             'url': thumbnail,
         }] if thumbnail else None
 
+    def _extract_twitch_m3u8_formats(self, path, video_id, token, signature):
+        formats = self._extract_m3u8_formats(
+            f'{self._USHER_BASE}/{path}/{video_id}.m3u8', video_id, 'mp4', query={
+                'allow_source': 'true',
+                'allow_audio_only': 'true',
+                'allow_spectre': 'true',
+                'p': random.randint(1000000, 10000000),
+                'platform': 'web',
+                'player': 'twitchweb',
+                'supported_codecs': 'av1,h265,h264',
+                'playlist_include_framerate': 'true',
+                'sig': signature,
+                'token': token,
+            })
+        for fmt in formats:
+            if fmt.get('vcodec') and fmt['vcodec'].startswith('av01'):
+                # mpegts does not yet have proper support for av1
+                fmt['downloader_options'] = {'ffmpeg_args_out': ['-f', 'mp4']}
+
+        return formats
+
 
 class TwitchVodIE(TwitchBaseIE):
     IE_NAME = 'twitch:vod'
@@ -222,8 +239,8 @@ class TwitchVodIE(TwitchBaseIE):
                 {
                     'start_time': 0,
                     'end_time': 17208,
-                    'title': 'League of Legends'
-                }
+                    'title': 'League of Legends',
+                },
             ],
             'live_status': 'was_live',
         },
@@ -281,25 +298,25 @@ class TwitchVodIE(TwitchBaseIE):
                 {
                     'start_time': 0,
                     'end_time': 573,
-                    'title': 'League of Legends'
+                    'title': 'League of Legends',
                 },
                 {
                     'start_time': 573,
                     'end_time': 3922,
-                    'title': 'Legends of Runeterra'
+                    'title': 'Legends of Runeterra',
                 },
                 {
                     'start_time': 3922,
                     'end_time': 11643,
-                    'title': 'Art'
-                }
+                    'title': 'Art',
+                },
             ],
             'live_status': 'was_live',
             'thumbnail': r're:^https?://.*\.jpg$',
             'view_count': int,
         },
         'params': {
-            'skip_download': True
+            'skip_download': True,
         },
     }, {
         'note': 'Storyboards',
@@ -318,18 +335,18 @@ class TwitchVodIE(TwitchBaseIE):
                 {
                     'start_time': 0,
                     'end_time': 573,
-                    'title': 'League of Legends'
+                    'title': 'League of Legends',
                 },
                 {
                     'start_time': 573,
                     'end_time': 3922,
-                    'title': 'Legends of Runeterra'
+                    'title': 'Legends of Runeterra',
                 },
                 {
                     'start_time': 3922,
                     'end_time': 11643,
-                    'title': 'Art'
-                }
+                    'title': 'Art',
+                },
             ],
             'live_status': 'was_live',
             'thumbnail': r're:^https?://.*\.jpg$',
@@ -339,8 +356,8 @@ class TwitchVodIE(TwitchBaseIE):
         },
         'params': {
             'format': 'mhtml',
-            'skip_download': True
-        }
+            'skip_download': True,
+        },
     }, {
         'note': 'VOD with single chapter',
         'url': 'https://www.twitch.tv/videos/1536751224',
@@ -357,17 +374,17 @@ class TwitchVodIE(TwitchBaseIE):
                 {
                     'start_time': 0,
                     'end_time': 8353,
-                    'title': 'League of Legends'
-                }
+                    'title': 'League of Legends',
+                },
             ],
             'live_status': 'was_live',
             'thumbnail': r're:^https?://.*\.jpg$',
             'view_count': int,
         },
         'params': {
-            'skip_download': True
+            'skip_download': True,
         },
-        'expected_warnings': ['Unable to download JSON metadata: HTTP Error 403: Forbidden']
+        'expected_warnings': ['Unable to download JSON metadata: HTTP Error 403: Forbidden'],
     }, {
         'url': 'https://www.twitch.tv/tangotek/schedule?vodID=1822395420',
         'only_matching': True,
@@ -468,7 +485,7 @@ class TwitchVodIE(TwitchBaseIE):
         vod_id = info.get('id') or item_id
         # id backward compatibility for download archives
         if vod_id[0] != 'v':
-            vod_id = 'v%s' % vod_id
+            vod_id = f'v{vod_id}'
         thumbnail = url_or_none(info.get('previewThumbnailURL'))
         is_live = None
         if thumbnail:
@@ -483,8 +500,8 @@ class TwitchVodIE(TwitchBaseIE):
             'description': info.get('description'),
             'duration': int_or_none(info.get('lengthSeconds')),
             'thumbnails': self._get_thumbnails(thumbnail),
-            'uploader': try_get(info, lambda x: x['owner']['displayName'], compat_str),
-            'uploader_id': try_get(info, lambda x: x['owner']['login'], compat_str),
+            'uploader': try_get(info, lambda x: x['owner']['displayName'], str),
+            'uploader_id': try_get(info, lambda x: x['owner']['login'], str),
             'timestamp': unified_timestamp(info.get('publishedAt')),
             'view_count': int_or_none(info.get('viewCount')),
             'chapters': list(self._extract_chapters(info, item_id)),
@@ -532,27 +549,15 @@ class TwitchVodIE(TwitchBaseIE):
         info = self._extract_info_gql(video, vod_id)
         access_token = self._download_access_token(vod_id, 'video', 'id')
 
-        formats = self._extract_m3u8_formats(
-            '%s/vod/%s.m3u8?%s' % (
-                self._USHER_BASE, vod_id,
-                compat_urllib_parse_urlencode({
-                    'allow_source': 'true',
-                    'allow_audio_only': 'true',
-                    'allow_spectre': 'true',
-                    'player': 'twitchweb',
-                    'playlist_include_framerate': 'true',
-                    'nauth': access_token['value'],
-                    'nauthsig': access_token['signature'],
-                })),
-            vod_id, 'mp4', entry_protocol='m3u8_native')
-
+        formats = self._extract_twitch_m3u8_formats(
+            'vod', vod_id, access_token['value'], access_token['signature'])
         formats.extend(self._extract_storyboard(vod_id, video.get('storyboard'), info.get('duration')))
 
         self._prefer_source(formats)
         info['formats'] = formats
 
-        parsed_url = compat_urllib_parse_urlparse(url)
-        query = compat_parse_qs(parsed_url.query)
+        parsed_url = urllib.parse.urlparse(url)
+        query = urllib.parse.parse_qs(parsed_url.query)
         if 't' in query:
             info['start_time'] = parse_duration(query['t'][0])
 
@@ -560,7 +565,7 @@ class TwitchVodIE(TwitchBaseIE):
             info['subtitles'] = {
                 'rechat': [{
                     'url': update_url_query(
-                        'https://api.twitch.tv/v5/videos/%s/comments' % vod_id, {
+                        f'https://api.twitch.tv/v5/videos/{vod_id}/comments', {
                             'client_id': self._CLIENT_ID,
                         }),
                     'ext': 'json',
@@ -579,7 +584,7 @@ def _make_video_result(node):
         '_type': 'url_transparent',
         'ie_key': TwitchVodIE.ie_key(),
         'id': 'v' + video_id,
-        'url': 'https://www.twitch.tv/videos/%s' % video_id,
+        'url': f'https://www.twitch.tv/videos/{video_id}',
         'title': node.get('title'),
         'thumbnail': node.get('previewThumbnailURL'),
         'duration': float_or_none(node.get('lengthSeconds')),
@@ -630,7 +635,7 @@ class TwitchPlaylistBaseIE(TwitchBaseIE):
     def _entries(self, channel_name, *args):
         cursor = None
         variables_common = self._make_variables(channel_name, *args)
-        entries_key = '%ss' % self._ENTRY_KIND
+        entries_key = f'{self._ENTRY_KIND}s'
         for page_num in itertools.count(1):
             variables = variables_common.copy()
             variables['limit'] = self._PAGE_LIMIT
@@ -641,7 +646,7 @@ class TwitchPlaylistBaseIE(TwitchBaseIE):
                     'operationName': self._OPERATION_NAME,
                     'variables': variables,
                 }],
-                'Downloading %ss GraphQL page %s' % (self._NODE_KIND, page_num),
+                f'Downloading {self._NODE_KIND}s GraphQL page {page_num}',
                 fatal=False)
             if not page:
                 break
@@ -663,7 +668,7 @@ class TwitchPlaylistBaseIE(TwitchBaseIE):
                 if entry:
                     cursor = edge.get('cursor')
                     yield entry
-            if not cursor or not isinstance(cursor, compat_str):
+            if not cursor or not isinstance(cursor, str):
                 break
 
 
@@ -757,7 +762,7 @@ class TwitchVideosIE(TwitchPlaylistBaseIE):
                 if any(ie.suitable(url) for ie in (
                     TwitchVideosClipsIE,
                     TwitchVideosCollectionsIE))
-                else super(TwitchVideosIE, cls).suitable(url))
+                else super().suitable(url))
 
     @staticmethod
     def _make_variables(channel_name, broadcast_type, sort):
@@ -774,15 +779,15 @@ class TwitchVideosIE(TwitchPlaylistBaseIE):
     def _real_extract(self, url):
         channel_name = self._match_id(url)
         qs = parse_qs(url)
-        filter = qs.get('filter', ['all'])[0]
+        video_filter = qs.get('filter', ['all'])[0]
         sort = qs.get('sort', ['time'])[0]
-        broadcast = self._BROADCASTS.get(filter, self._DEFAULT_BROADCAST)
+        broadcast = self._BROADCASTS.get(video_filter, self._DEFAULT_BROADCAST)
         return self.playlist_result(
             self._entries(channel_name, broadcast.type, sort),
             playlist_id=channel_name,
-            playlist_title='%s - %s sorted by %s'
-            % (channel_name, broadcast.label,
-               self._SORTED_BY.get(sort, self._DEFAULT_SORTED_BY)))
+            playlist_title=(
+                f'{channel_name} - {broadcast.label} '
+                f'sorted by {self._SORTED_BY.get(sort, self._DEFAULT_SORTED_BY)}'))
 
 
 class TwitchVideosClipsIE(TwitchPlaylistBaseIE):
@@ -820,11 +825,11 @@ class TwitchVideosClipsIE(TwitchPlaylistBaseIE):
     _NODE_KIND = 'Clip'
 
     @staticmethod
-    def _make_variables(channel_name, filter):
+    def _make_variables(channel_name, channel_filter):
         return {
             'login': channel_name,
             'criteria': {
-                'filter': filter,
+                'filter': channel_filter,
             },
         }
 
@@ -850,12 +855,12 @@ class TwitchVideosClipsIE(TwitchPlaylistBaseIE):
     def _real_extract(self, url):
         channel_name = self._match_id(url)
         qs = parse_qs(url)
-        range = qs.get('range', ['7d'])[0]
-        clip = self._RANGE.get(range, self._DEFAULT_CLIP)
+        date_range = qs.get('range', ['7d'])[0]
+        clip = self._RANGE.get(date_range, self._DEFAULT_CLIP)
         return self.playlist_result(
             self._entries(channel_name, clip.filter),
             playlist_id=channel_name,
-            playlist_title='%s - Clips %s' % (channel_name, clip.label))
+            playlist_title=f'{channel_name} - Clips {clip.label}')
 
 
 class TwitchVideosCollectionsIE(TwitchPlaylistBaseIE):
@@ -899,7 +904,7 @@ class TwitchVideosCollectionsIE(TwitchPlaylistBaseIE):
             '_type': 'url_transparent',
             'ie_key': TwitchCollectionIE.ie_key(),
             'id': collection_id,
-            'url': 'https://www.twitch.tv/collections/%s' % collection_id,
+            'url': f'https://www.twitch.tv/collections/{collection_id}',
             'title': node.get('title'),
             'thumbnail': node.get('thumbnailURL'),
             'duration': float_or_none(node.get('lengthSeconds')),
@@ -911,7 +916,7 @@ class TwitchVideosCollectionsIE(TwitchPlaylistBaseIE):
         channel_name = self._match_id(url)
         return self.playlist_result(
             self._entries(channel_name), playlist_id=channel_name,
-            playlist_title='%s - Collections' % channel_name)
+            playlist_title=f'{channel_name} - Collections')
 
 
 class TwitchStreamIE(TwitchBaseIE):
@@ -988,7 +993,7 @@ class TwitchStreamIE(TwitchBaseIE):
                     TwitchVideosClipsIE,
                     TwitchVideosCollectionsIE,
                     TwitchClipsIE))
-                else super(TwitchStreamIE, cls).suitable(url))
+                else super().suitable(url))
 
     def _real_extract(self, url):
         channel_name = self._match_id(url).lower()
@@ -1017,7 +1022,7 @@ class TwitchStreamIE(TwitchBaseIE):
 
         if not user:
             raise ExtractorError(
-                '%s does not exist' % channel_name, expected=True)
+                f'{channel_name} does not exist', expected=True)
 
         stream = user['stream']
 
@@ -1026,23 +1031,10 @@ class TwitchStreamIE(TwitchBaseIE):
 
         access_token = self._download_access_token(
             channel_name, 'stream', 'channelName')
-        token = access_token['value']
 
         stream_id = stream.get('id') or channel_name
-        query = {
-            'allow_source': 'true',
-            'allow_audio_only': 'true',
-            'allow_spectre': 'true',
-            'p': random.randint(1000000, 10000000),
-            'player': 'twitchweb',
-            'playlist_include_framerate': 'true',
-            'segment_preference': '4',
-            'sig': access_token['signature'].encode('utf-8'),
-            'token': token.encode('utf-8'),
-        }
-        formats = self._extract_m3u8_formats(
-            '%s/api/channel/hls/%s.m3u8' % (self._USHER_BASE, channel_name),
-            stream_id, 'mp4', query=query)
+        formats = self._extract_twitch_m3u8_formats(
+            'api/channel/hls', channel_name, access_token['value'], access_token['signature'])
         self._prefer_source(formats)
 
         view_count = stream.get('viewers')
@@ -1051,16 +1043,16 @@ class TwitchStreamIE(TwitchBaseIE):
         sq_user = try_get(gql, lambda x: x[1]['data']['user'], dict) or {}
         uploader = sq_user.get('displayName')
         description = try_get(
-            sq_user, lambda x: x['broadcastSettings']['title'], compat_str)
+            sq_user, lambda x: x['broadcastSettings']['title'], str)
 
         thumbnail = url_or_none(try_get(
             gql, lambda x: x[2]['data']['user']['stream']['previewImageURL'],
-            compat_str))
+            str))
 
         title = uploader or channel_name
         stream_type = stream.get('type')
         if stream_type in ['rerun', 'live']:
-            title += ' (%s)' % stream_type
+            title += f' ({stream_type})'
 
         return {
             'id': stream_id,
@@ -1092,16 +1084,44 @@ class TwitchClipsIE(TwitchBaseIE):
         'url': 'https://clips.twitch.tv/FaintLightGullWholeWheat',
         'md5': '761769e1eafce0ffebfb4089cb3847cd',
         'info_dict': {
-            'id': '42850523',
+            'id': '396245304',
             'display_id': 'FaintLightGullWholeWheat',
             'ext': 'mp4',
             'title': 'EA Play 2016 Live from the Novo Theatre',
+            'duration': 32,
+            'view_count': int,
             'thumbnail': r're:^https?://.*\.jpg',
             'timestamp': 1465767393,
             'upload_date': '20160612',
-            'creator': 'EA',
-            'uploader': 'stereotype_',
-            'uploader_id': '43566419',
+            'creators': ['EA'],
+            'channel': 'EA',
+            'channel_id': '25163635',
+            'channel_is_verified': False,
+            'channel_follower_count': int,
+            'uploader': 'EA',
+            'uploader_id': '25163635',
+        },
+    }, {
+        'url': 'https://www.twitch.tv/xqc/clip/CulturedAmazingKuduDatSheffy-TiZ_-ixAGYR3y2Uy',
+        'md5': 'e90fe616b36e722a8cfa562547c543f0',
+        'info_dict': {
+            'id': '3207364882',
+            'display_id': 'CulturedAmazingKuduDatSheffy-TiZ_-ixAGYR3y2Uy',
+            'ext': 'mp4',
+            'title': 'A day in the life of xQc',
+            'duration': 60,
+            'view_count': int,
+            'thumbnail': r're:^https?://.*\.jpg',
+            'timestamp': 1742869615,
+            'upload_date': '20250325',
+            'creators': ['xQc'],
+            'channel': 'xQc',
+            'channel_id': '71092938',
+            'channel_is_verified': True,
+            'channel_follower_count': int,
+            'uploader': 'xQc',
+            'uploader_id': '71092938',
+            'categories': ['Just Chatting'],
         },
     }, {
         # multiple formats
@@ -1125,16 +1145,14 @@ class TwitchClipsIE(TwitchBaseIE):
     }]
 
     def _real_extract(self, url):
-        video_id = self._match_id(url)
+        slug = self._match_id(url)
 
         clip = self._download_gql(
-            video_id, [{
-                'operationName': 'VideoAccessToken_Clip',
-                'variables': {
-                    'slug': video_id,
-                },
+            slug, [{
+                'operationName': 'ShareClipRenderStatus',
+                'variables': {'slug': slug},
             }],
-            'Downloading clip access token GraphQL')[0]['data']['clip']
+            'Downloading clip GraphQL')[0]['data']['clip']
 
         if not clip:
             raise ExtractorError(
@@ -1144,81 +1162,71 @@ class TwitchClipsIE(TwitchBaseIE):
             'sig': clip['playbackAccessToken']['signature'],
             'token': clip['playbackAccessToken']['value'],
         }
-
-        data = self._download_base_gql(
-            video_id, {
-                'query': '''{
-  clip(slug: "%s") {
-    broadcaster {
-      displayName
-    }
-    createdAt
-    curator {
-      displayName
-      id
-    }
-    durationSeconds
-    id
-    tiny: thumbnailURL(width: 86, height: 45)
-    small: thumbnailURL(width: 260, height: 147)
-    medium: thumbnailURL(width: 480, height: 272)
-    title
-    videoQualities {
-      frameRate
-      quality
-      sourceURL
-    }
-    viewCount
-  }
-}''' % video_id}, 'Downloading clip GraphQL', fatal=False)
-
-        if data:
-            clip = try_get(data, lambda x: x['data']['clip'], dict) or clip
+        asset_default = traverse_obj(clip, ('assets', 0, {dict})) or {}
+        asset_portrait = traverse_obj(clip, ('assets', 1, {dict})) or {}
 
         formats = []
-        for option in clip.get('videoQualities', []):
-            if not isinstance(option, dict):
-                continue
-            source = url_or_none(option.get('sourceURL'))
-            if not source:
-                continue
+        default_aspect_ratio = float_or_none(asset_default.get('aspectRatio'))
+        formats.extend(traverse_obj(asset_default, ('videoQualities', lambda _, v: url_or_none(v['sourceURL']), {
+            'url': ('sourceURL', {update_url_query(query=access_query)}),
+            'format_id': ('quality', {str}),
+            'height': ('quality', {int_or_none}),
+            'fps': ('frameRate', {float_or_none}),
+            'aspect_ratio': {value(default_aspect_ratio)},
+        })))
+        portrait_aspect_ratio = float_or_none(asset_portrait.get('aspectRatio'))
+        for source in traverse_obj(asset_portrait, ('videoQualities', lambda _, v: url_or_none(v['sourceURL']))):
             formats.append({
-                'url': update_url_query(source, access_query),
-                'format_id': option.get('quality'),
-                'height': int_or_none(option.get('quality')),
-                'fps': int_or_none(option.get('frameRate')),
+                'url': update_url_query(source['sourceURL'], access_query),
+                'format_id': join_nonempty('portrait', source.get('quality')),
+                'height': int_or_none(source.get('quality')),
+                'fps': float_or_none(source.get('frameRate')),
+                'aspect_ratio': portrait_aspect_ratio,
+                'quality': -2,
             })
 
         thumbnails = []
-        for thumbnail_id in ('tiny', 'small', 'medium'):
-            thumbnail_url = clip.get(thumbnail_id)
-            if not thumbnail_url:
-                continue
-            thumb = {
-                'id': thumbnail_id,
-                'url': thumbnail_url,
-            }
-            mobj = re.search(r'-(\d+)x(\d+)\.', thumbnail_url)
-            if mobj:
-                thumb.update({
-                    'height': int(mobj.group(2)),
-                    'width': int(mobj.group(1)),
-                })
-            thumbnails.append(thumb)
+        thumb_asset_default_url = url_or_none(asset_default.get('thumbnailURL'))
+        if thumb_asset_default_url:
+            thumbnails.append({
+                'id': 'default',
+                'url': thumb_asset_default_url,
+                'preference': 0,
+            })
+        if thumb_asset_portrait_url := url_or_none(asset_portrait.get('thumbnailURL')):
+            thumbnails.append({
+                'id': 'portrait',
+                'url': thumb_asset_portrait_url,
+                'preference': -1,
+            })
+        thumb_default_url = url_or_none(clip.get('thumbnailURL'))
+        if thumb_default_url and thumb_default_url != thumb_asset_default_url:
+            thumbnails.append({
+                'id': 'small',
+                'url': thumb_default_url,
+                'preference': -2,
+            })
 
         old_id = self._search_regex(r'%7C(\d+)(?:-\d+)?.mp4', formats[-1]['url'], 'old id', default=None)
 
         return {
-            'id': clip.get('id') or video_id,
+            'id': clip.get('id') or slug,
             '_old_archive_ids': [make_archive_id(self, old_id)] if old_id else None,
-            'display_id': video_id,
-            'title': clip.get('title'),
+            'display_id': slug,
             'formats': formats,
-            'duration': int_or_none(clip.get('durationSeconds')),
-            'view_count': int_or_none(clip.get('viewCount')),
-            'timestamp': unified_timestamp(clip.get('createdAt')),
             'thumbnails': thumbnails,
-            'creator': try_get(clip, lambda x: x['broadcaster']['displayName'], compat_str),
-            'uploader': try_get(clip, lambda x: x['curator']['displayName'], compat_str),
-            'uploader_id': try_get(clip, lambda x: x['curator']['id'], compat_str),
+            **traverse_obj(clip, {
+                'title': ('title', {str}),
+                'duration': ('durationSeconds', {int_or_none}),
+                'view_count': ('viewCount', {int_or_none}),
+                'timestamp': ('createdAt', {parse_iso8601}),
+                'creators': ('broadcaster', 'displayName', {str}, filter, all),
+                'channel': ('broadcaster', 'displayName', {str}),
+                'channel_id': ('broadcaster', 'id', {str}),
+                'channel_follower_count': ('broadcaster', 'followers', 'totalCount', {int_or_none}),
+                'channel_is_verified': ('broadcaster', 'isPartner', {bool}),
+                'uploader': ('curator', 'displayName', {str}),
+                'uploader_id': ('curator', 'id', {str}),
+                'categories': ('game', 'displayName', {str}, filter, all, filter),
+            }),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/twitter.py b/plugins/youtube_download/yt_dlp/extractor/twitter.py
index 34b8625..5eee3e7 100644
--- a/plugins/youtube_download/yt_dlp/extractor/twitter.py
+++ b/plugins/youtube_download/yt_dlp/extractor/twitter.py
@@ -1,14 +1,13 @@
 import functools
 import json
+import math
 import re
+import urllib.parse
 
 from .common import InfoExtractor
 from .periscope import PeriscopeBaseIE, PeriscopeIE
-from ..compat import (
-    compat_parse_qs,
-    compat_urllib_parse_unquote,
-    compat_urllib_parse_urlparse,
-)
+from ..jsinterp import js_number_to_string
+from ..networking.exceptions import HTTPError
 from ..utils import (
     ExtractorError,
     dict_get,
@@ -16,11 +15,13 @@ from ..utils import (
     float_or_none,
     format_field,
     int_or_none,
+    join_nonempty,
     make_archive_id,
     remove_end,
     str_or_none,
     strip_or_none,
     traverse_obj,
+    truncate_string,
     try_call,
     try_get,
     unified_timestamp,
@@ -32,9 +33,9 @@ from ..utils import (
 
 class TwitterBaseIE(InfoExtractor):
     _NETRC_MACHINE = 'twitter'
-    _API_BASE = 'https://api.twitter.com/1.1/'
-    _GRAPHQL_API_BASE = 'https://twitter.com/i/api/graphql/'
-    _BASE_REGEX = r'https?://(?:(?:www|m(?:obile)?)\.)?(?:twitter\.com|twitter3e4tixl4xyajtrzo62zg5vztmjuricljdp2c5kshju4avyoid\.onion)/'
+    _API_BASE = 'https://api.x.com/1.1/'
+    _GRAPHQL_API_BASE = 'https://x.com/i/api/graphql/'
+    _BASE_REGEX = r'https?://(?:(?:www|m(?:obile)?)\.)?(?:(?:twitter|x)\.com|twitter3e4tixl4xyajtrzo62zg5vztmjuricljdp2c5kshju4avyoid\.onion)/'
     _AUTH = 'AAAAAAAAAAAAAAAAAAAAANRILgAAAAAAnNwIzUejRCOuH5E6I8xnZz4puTs%3D1Zv7ttfk8LF81IUq16cHjhLTvJu4FA33AGWWjCpTnA'
     _LEGACY_AUTH = 'AAAAAAAAAAAAAAAAAAAAAIK1zgAAAAAA2tUWuhGZ2JceoId5GwYWU5GspY4%3DUq7gzFoCZs1QfwGoVdvSac3IniczZEYXIcDyumCauIXpcAPorE'
     _flow_token = None
@@ -44,9 +45,9 @@ class TwitterBaseIE(InfoExtractor):
             'flow_context': {
                 'debug_overrides': {},
                 'start_location': {
-                    'location': 'unknown'
-                }
-            }
+                    'location': 'unknown',
+                },
+            },
         },
         'subtask_versions': {
             'action_list': 2,
@@ -89,8 +90,8 @@ class TwitterBaseIE(InfoExtractor):
             'user_recommendations_list': 4,
             'user_recommendations_urt': 1,
             'wait_spinner': 3,
-            'web_modal': 1
-        }
+            'web_modal': 1,
+        },
     }, separators=(',', ':')).encode()
 
     def _extract_variant_formats(self, variant, video_id):
@@ -98,14 +99,18 @@ class TwitterBaseIE(InfoExtractor):
         if not variant_url:
             return [], {}
         elif '.m3u8' in variant_url:
-            return self._extract_m3u8_formats_and_subtitles(
+            fmts, subs = self._extract_m3u8_formats_and_subtitles(
                 variant_url, video_id, 'mp4', 'm3u8_native',
                 m3u8_id='hls', fatal=False)
+            for f in traverse_obj(fmts, lambda _, v: v['vcodec'] == 'none' and v.get('tbr') is None):
+                if mobj := re.match(r'hls-[Aa]udio-(?P<bitrate>\d{4,})', f['format_id']):
+                    f['tbr'] = int_or_none(mobj.group('bitrate'), 1000)
+            return fmts, subs
         else:
             tbr = int_or_none(dict_get(variant, ('bitrate', 'bit_rate')), 1000) or None
             f = {
                 'url': variant_url,
-                'format_id': 'http' + ('-%d' % tbr if tbr else ''),
+                'format_id': join_nonempty('http', tbr),
                 'tbr': tbr,
             }
             self._search_dimensions_in_video_url(f, variant_url)
@@ -120,7 +125,7 @@ class TwitterBaseIE(InfoExtractor):
         subtitles = {}
         urls = []
         for video_variant in vmap_data.findall('.//{http://twitter.com/schema/videoVMapV2.xsd}videoVariant'):
-            video_variant.attrib['url'] = compat_urllib_parse_unquote(
+            video_variant.attrib['url'] = urllib.parse.unquote(
                 video_variant.attrib['url'])
             urls.append(video_variant.attrib['url'])
             fmts, subs = self._extract_variant_formats(
@@ -147,10 +152,14 @@ class TwitterBaseIE(InfoExtractor):
     def is_logged_in(self):
         return bool(self._get_cookies(self._API_BASE).get('auth_token'))
 
+    @functools.cached_property
+    def _selected_api(self):
+        return self._configuration_arg('api', ['graphql'], ie_key='Twitter')[0]
+
     def _fetch_guest_token(self, display_id):
         guest_token = traverse_obj(self._download_json(
             f'{self._API_BASE}guest/activate.json', display_id, 'Downloading guest token', data=b'',
-            headers=self._set_base_headers(legacy=display_id and self._configuration_arg('legacy_api'))),
+            headers=self._set_base_headers(legacy=display_id and self._selected_api == 'legacy')),
             ('guest_token', {str}))
         if not guest_token:
             raise ExtractorError('Could not retrieve guest token')
@@ -186,23 +195,21 @@ class TwitterBaseIE(InfoExtractor):
         if self.is_logged_in:
             return
 
-        webpage = self._download_webpage('https://twitter.com/', None, 'Downloading login page')
-        guest_token = self._search_regex(
-            r'\.cookie\s*=\s*["\']gt=(\d+);', webpage, 'gt', default=None) or self._fetch_guest_token(None)
+        guest_token = self._fetch_guest_token(None)
         headers = {
             **self._set_base_headers(),
             'content-type': 'application/json',
             'x-guest-token': guest_token,
             'x-twitter-client-language': 'en',
             'x-twitter-active-user': 'yes',
-            'Referer': 'https://twitter.com/',
-            'Origin': 'https://twitter.com',
+            'Referer': 'https://x.com/',
+            'Origin': 'https://x.com',
         }
 
         def build_login_json(*subtask_inputs):
             return json.dumps({
                 'flow_token': self._flow_token,
-                'subtask_inputs': subtask_inputs
+                'subtask_inputs': subtask_inputs,
             }, separators=(',', ':')).encode()
 
         def input_dict(subtask_id, text):
@@ -210,8 +217,8 @@ class TwitterBaseIE(InfoExtractor):
                 'subtask_id': subtask_id,
                 'enter_text': {
                     'text': text,
-                    'link': 'next_link'
-                }
+                    'link': 'next_link',
+                },
             }
 
         next_subtask = self._call_login_api(
@@ -224,8 +231,8 @@ class TwitterBaseIE(InfoExtractor):
                         'subtask_id': next_subtask,
                         'js_instrumentation': {
                             'response': '{}',
-                            'link': 'next_link'
-                        }
+                            'link': 'next_link',
+                        },
                     }))
 
             elif next_subtask == 'LoginEnterUserIdentifierSSO':
@@ -237,12 +244,12 @@ class TwitterBaseIE(InfoExtractor):
                                 'key': 'user_identifier',
                                 'response_data': {
                                     'text_data': {
-                                        'result': username
-                                    }
-                                }
+                                        'result': username,
+                                    },
+                                },
                             }],
-                            'link': 'next_link'
-                        }
+                            'link': 'next_link',
+                        },
                     }))
 
             elif next_subtask == 'LoginEnterAlternateIdentifierSubtask':
@@ -257,8 +264,8 @@ class TwitterBaseIE(InfoExtractor):
                         'subtask_id': next_subtask,
                         'enter_password': {
                             'password': password,
-                            'link': 'next_link'
-                        }
+                            'link': 'next_link',
+                        },
                     }))
 
             elif next_subtask == 'AccountDuplicationCheck':
@@ -266,8 +273,8 @@ class TwitterBaseIE(InfoExtractor):
                     'Submitting account duplication check', headers, data=build_login_json({
                         'subtask_id': next_subtask,
                         'check_logged_in_account': {
-                            'link': 'AccountDuplicationCheck_false'
-                        }
+                            'link': 'AccountDuplicationCheck_false',
+                        },
                     }))
 
             elif next_subtask == 'LoginTwoFactorAuthChallenge':
@@ -295,13 +302,13 @@ class TwitterBaseIE(InfoExtractor):
         self.report_login()
 
     def _call_api(self, path, video_id, query={}, graphql=False):
-        headers = self._set_base_headers(legacy=not graphql and self._configuration_arg('legacy_api'))
+        headers = self._set_base_headers(legacy=not graphql and self._selected_api == 'legacy')
         headers.update({
             'x-twitter-auth-type': 'OAuth2Session',
             'x-twitter-client-language': 'en',
             'x-twitter-active-user': 'yes',
         } if self.is_logged_in else {
-            'x-guest-token': self._fetch_guest_token(video_id)
+            'x-guest-token': self._fetch_guest_token(video_id),
         })
         allowed_status = {400, 401, 403, 404} if graphql else {403}
         result = self._download_json(
@@ -352,6 +359,7 @@ class TwitterCardIE(InfoExtractor):
                 'display_id': '560070183650213889',
                 'uploader_url': 'https://twitter.com/Twitter',
             },
+            'skip': 'This content is no longer available.',
         },
         {
             'url': 'https://twitter.com/i/cards/tfw/v1/623160978427936768',
@@ -359,7 +367,7 @@ class TwitterCardIE(InfoExtractor):
             'info_dict': {
                 'id': '623160978427936768',
                 'ext': 'mp4',
-                'title': "NASA - Fly over Pluto's icy Norgay Mountains and Sputnik Plain in this @NASANewHorizons #PlutoFlyby video.",
+                'title': "NASA - Fly over Pluto's icy Norgay Mountains and Sputnik Plain in this @NASA...",
                 'description': "Fly over Pluto's icy Norgay Mountains and Sputnik Plain in this @NASANewHorizons #PlutoFlyby video. https://t.co/BJYgOjSeGA",
                 'uploader': 'NASA',
                 'uploader_id': 'NASA',
@@ -371,12 +379,14 @@ class TwitterCardIE(InfoExtractor):
                 'like_count': int,
                 'repost_count': int,
                 'tags': ['PlutoFlyby'],
+                'channel_id': '11348282',
+                '_old_archive_ids': ['twitter 623160978427936768'],
             },
-            'params': {'format': '[protocol=https]'}
+            'params': {'format': '[protocol=https]'},
         },
         {
             'url': 'https://twitter.com/i/cards/tfw/v1/654001591733886977',
-            'md5': 'b6d9683dd3f48e340ded81c0e917ad46',
+            'md5': 'fb08fbd69595cbd8818f0b2f2a94474d',
             'info_dict': {
                 'id': 'dq4Oj5quskI',
                 'ext': 'mp4',
@@ -384,12 +394,12 @@ class TwitterCardIE(InfoExtractor):
                 'description': 'md5:a831e97fa384863d6e26ce48d1c43376',
                 'upload_date': '20111013',
                 'uploader': 'OMG! UBUNTU!',
-                'uploader_id': 'omgubuntu',
+                'uploader_id': '@omgubuntu',
                 'channel_url': 'https://www.youtube.com/channel/UCIiSwcm9xiFb3Y4wjzR41eQ',
                 'channel_id': 'UCIiSwcm9xiFb3Y4wjzR41eQ',
                 'channel_follower_count': int,
                 'chapters': 'count:8',
-                'uploader_url': 'http://www.youtube.com/user/omgubuntu',
+                'uploader_url': 'https://www.youtube.com/@omgubuntu',
                 'duration': 138,
                 'categories': ['Film & Animation'],
                 'age_limit': 0,
@@ -401,29 +411,12 @@ class TwitterCardIE(InfoExtractor):
                 'tags': 'count:12',
                 'channel': 'OMG! UBUNTU!',
                 'playable_in_embed': True,
+                'heatmap': 'count:100',
+                'timestamp': 1318500227,
+                'live_status': 'not_live',
             },
             'add_ie': ['Youtube'],
         },
-        {
-            'url': 'https://twitter.com/i/cards/tfw/v1/665289828897005568',
-            'info_dict': {
-                'id': 'iBb2x00UVlv',
-                'ext': 'mp4',
-                'upload_date': '20151113',
-                'uploader_id': '1189339351084113920',
-                'uploader': 'ArsenalTerje',
-                'title': 'Vine by ArsenalTerje',
-                'timestamp': 1447451307,
-                'alt_title': 'Vine by ArsenalTerje',
-                'comment_count': int,
-                'like_count': int,
-                'thumbnail': r're:^https?://[^?#]+\.jpg',
-                'view_count': int,
-                'repost_count': int,
-            },
-            'add_ie': ['Vine'],
-            'params': {'skip_download': 'm3u8'},
-        },
         {
             'url': 'https://twitter.com/i/videos/tweet/705235433198714880',
             'md5': '884812a2adc8aaf6fe52b15ccbfa3b88',
@@ -465,6 +458,7 @@ class TwitterIE(TwitterBaseIE):
             'title': 'FREE THE NIPPLE - FTN supporters on Hollywood Blvd today!',
             'thumbnail': r're:^https?://.*\.jpg',
             'description': 'FTN supporters on Hollywood Blvd today! http://t.co/c7jHH749xJ',
+            'channel_id': '549749560',
             'uploader': 'FREE THE NIPPLE',
             'uploader_id': 'freethenipple',
             'duration': 12.922,
@@ -474,10 +468,11 @@ class TwitterIE(TwitterBaseIE):
             'comment_count': int,
             'repost_count': int,
             'like_count': int,
-            'view_count': int,
             'tags': [],
             'age_limit': 18,
+            '_old_archive_ids': ['twitter 643211948184596480'],
         },
+        'skip': 'Requires authentication',
     }, {
         'url': 'https://twitter.com/giphz/status/657991469417025536/photo/1',
         'md5': 'f36dcd5fb92bf7057f155e7d927eeb42',
@@ -500,6 +495,7 @@ class TwitterIE(TwitterBaseIE):
             'ext': 'mp4',
             'title': r're:Star Wars.*A new beginning is coming December 18.*',
             'description': 'A new beginning is coming December 18. Watch the official 60 second #TV spot for #StarWars: #TheForceAwakens. https://t.co/OkSqT2fjWJ',
+            'channel_id': '20106852',
             'uploader_id': 'starwars',
             'uploader': r're:Star Wars.*',
             'timestamp': 1447395772,
@@ -510,6 +506,7 @@ class TwitterIE(TwitterBaseIE):
             'like_count': int,
             'tags': ['TV', 'StarWars', 'TheForceAwakens'],
             'age_limit': 0,
+            '_old_archive_ids': ['twitter 665052190608723968'],
         },
     }, {
         'url': 'https://twitter.com/BTNBrentYarina/status/705235433198714880',
@@ -544,6 +541,7 @@ class TwitterIE(TwitterBaseIE):
             'title': 'jaydin donte geer - BEAT PROD: @suhmeduh #Damndaniel',
             'description': 'BEAT PROD: @suhmeduh  https://t.co/HBrQ4AfpvZ #Damndaniel https://t.co/byBooq2ejZ',
             'thumbnail': r're:^https?://.*\.jpg',
+            'channel_id': '1383165541',
             'uploader': 'jaydin donte geer',
             'uploader_id': 'jaydingeer',
             'duration': 30.0,
@@ -553,37 +551,20 @@ class TwitterIE(TwitterBaseIE):
             'comment_count': int,
             'repost_count': int,
             'like_count': int,
-            'view_count': int,
             'tags': ['Damndaniel'],
             'age_limit': 0,
+            '_old_archive_ids': ['twitter 700207533655363584'],
         },
-    }, {
-        'url': 'https://twitter.com/Filmdrunk/status/713801302971588609',
-        'md5': '89a15ed345d13b86e9a5a5e051fa308a',
-        'info_dict': {
-            'id': 'MIOxnrUteUd',
-            'ext': 'mp4',
-            'title': 'Dr.Pepperの飲み方 #japanese #バカ #ドクペ #電動ガン',
-            'uploader': 'TAKUMA',
-            'uploader_id': '1004126642786242560',
-            'timestamp': 1402826626,
-            'upload_date': '20140615',
-            'thumbnail': r're:^https?://.*\.jpg',
-            'alt_title': 'Vine by TAKUMA',
-            'comment_count': int,
-            'repost_count': int,
-            'like_count': int,
-            'view_count': int,
-        },
-        'add_ie': ['Vine'],
+        'skip': 'Tweet has been deleted',
     }, {
         'url': 'https://twitter.com/captainamerica/status/719944021058060289',
         'info_dict': {
             'id': '717462543795523584',
             'display_id': '719944021058060289',
             'ext': 'mp4',
-            'title': 'Captain America - @King0fNerd Are you sure you made the right choice? Find out in theaters.',
+            'title': 'Captain America - @King0fNerd Are you sure you made the right choice? Find out in theat...',
             'description': '@King0fNerd Are you sure you made the right choice? Find out in theaters. https://t.co/GpgYi9xMJI',
+            'channel_id': '701615052',
             'uploader_id': 'CaptainAmerica',
             'uploader': 'Captain America',
             'duration': 3.17,
@@ -594,9 +575,9 @@ class TwitterIE(TwitterBaseIE):
             'comment_count': int,
             'repost_count': int,
             'like_count': int,
-            'view_count': int,
             'tags': [],
             'age_limit': 0,
+            '_old_archive_ids': ['twitter 719944021058060289'],
         },
     }, {
         'url': 'https://twitter.com/OPP_HSD/status/779210622571536384',
@@ -611,14 +592,16 @@ class TwitterIE(TwitterBaseIE):
             'thumbnail': r're:^https?://.*\.jpg',
         },
         'add_ie': ['Periscope'],
+        'skip': 'Broadcast not found',
     }, {
         # has mp4 formats via mobile API
         'url': 'https://twitter.com/news_al3alm/status/852138619213144067',
         'info_dict': {
             'id': '852077943283097602',
             'ext': 'mp4',
-            'title': 'عالم الأخبار - كلمة تاريخية بجلسة الجناسي التاريخية.. النائب خالد مؤنس العتيبي للمعارضين : اتقوا الله .. الظلم ظلمات يوم القيامة',
+            'title': 'عالم الأخبار - كلمة تاريخية بجلسة الجناسي التاريخية.. النائب خالد مؤنس العتيبي للمعا...',
             'description': 'كلمة تاريخية بجلسة الجناسي التاريخية.. النائب خالد مؤنس العتيبي للمعارضين : اتقوا الله .. الظلم ظلمات يوم القيامة   https://t.co/xg6OhpyKfN',
+            'channel_id': '2526757026',
             'uploader': 'عالم الأخبار',
             'uploader_id': 'news_al3alm',
             'duration': 277.4,
@@ -630,9 +613,9 @@ class TwitterIE(TwitterBaseIE):
             'thumbnail': r're:^https?://.*\.jpg',
             'tags': [],
             'repost_count': int,
-            'view_count': int,
             'like_count': int,
             'comment_count': int,
+            '_old_archive_ids': ['twitter 852138619213144067'],
         },
     }, {
         'url': 'https://twitter.com/i/web/status/910031516746514432',
@@ -640,9 +623,10 @@ class TwitterIE(TwitterBaseIE):
             'id': '910030238373089285',
             'display_id': '910031516746514432',
             'ext': 'mp4',
-            'title': 'Préfet de Guadeloupe - [Direct] #Maria Le centre se trouve actuellement au sud de Basse-Terre. Restez confinés. Réfugiez-vous dans la pièce la + sûre.',
+            'title': 'Préfet de Guadeloupe - [Direct] #Maria Le centre se trouve actuellement au sud de Basse-Terr...',
             'thumbnail': r're:^https?://.*\.jpg',
             'description': '[Direct] #Maria Le centre se trouve actuellement au sud de Basse-Terre. Restez confinés. Réfugiez-vous dans la pièce la + sûre. https://t.co/mwx01Rs4lo',
+            'channel_id': '2319432498',
             'uploader': 'Préfet de Guadeloupe',
             'uploader_id': 'Prefet971',
             'duration': 47.48,
@@ -652,9 +636,9 @@ class TwitterIE(TwitterBaseIE):
             'comment_count': int,
             'repost_count': int,
             'like_count': int,
-            'view_count': int,
             'tags': ['Maria'],
             'age_limit': 0,
+            '_old_archive_ids': ['twitter 910031516746514432'],
         },
         'params': {
             'skip_download': True,  # requires ffmpeg
@@ -669,6 +653,7 @@ class TwitterIE(TwitterBaseIE):
             'title': 're:.*?Shep is on a roll today.*?',
             'thumbnail': r're:^https?://.*\.jpg',
             'description': 'md5:37b9f2ff31720cef23b2bd42ee8a0f09',
+            'channel_id': '255036353',
             'uploader': 'Lis Power',
             'uploader_id': 'LisPower1',
             'duration': 111.278,
@@ -678,9 +663,9 @@ class TwitterIE(TwitterBaseIE):
             'comment_count': int,
             'repost_count': int,
             'like_count': int,
-            'view_count': int,
             'tags': [],
             'age_limit': 0,
+            '_old_archive_ids': ['twitter 1001551623938805763'],
         },
         'params': {
             'skip_download': True,  # requires ffmpeg
@@ -707,6 +692,7 @@ class TwitterIE(TwitterBaseIE):
             'tags': [],
             'age_limit': 0,
         },
+        'skip': 'This Tweet is unavailable',
     }, {
         # not available in Periscope
         'url': 'https://twitter.com/ViviEducation/status/1136534865145286656',
@@ -721,6 +707,7 @@ class TwitterIE(TwitterBaseIE):
             'view_count': int,
         },
         'add_ie': ['TwitterBroadcast'],
+        'skip': 'Broadcast no longer exists',
     }, {
         # unified card
         'url': 'https://twitter.com/BrooklynNets/status/1349794411333394432?s=20',
@@ -728,9 +715,10 @@ class TwitterIE(TwitterBaseIE):
             'id': '1349774757969989634',
             'display_id': '1349794411333394432',
             'ext': 'mp4',
-            'title': 'md5:d1c4941658e4caaa6cb579260d85dcba',
+            'title': "Brooklyn Nets - WATCH: Sean Marks' full media session after our acquisition of 8-time...",
             'thumbnail': r're:^https?://.*\.jpg',
             'description': 'md5:71ead15ec44cee55071547d6447c6a3e',
+            'channel_id': '18552281',
             'uploader': 'Brooklyn Nets',
             'uploader_id': 'BrooklynNets',
             'duration': 324.484,
@@ -742,6 +730,7 @@ class TwitterIE(TwitterBaseIE):
             'like_count': int,
             'tags': [],
             'age_limit': 0,
+            '_old_archive_ids': ['twitter 1349794411333394432'],
         },
         'params': {
             'skip_download': True,
@@ -752,10 +741,11 @@ class TwitterIE(TwitterBaseIE):
             'id': '1577855447914409984',
             'display_id': '1577855540407197696',
             'ext': 'mp4',
-            'title': 'md5:9d198efb93557b8f8d5b78c480407214',
+            'title': 'Oshtru - gm ✨️ now I can post image and video. nice update.',
             'description': 'md5:b9c3699335447391d11753ab21c70a74',
             'upload_date': '20221006',
-            'uploader': 'oshtru',
+            'channel_id': '143077138',
+            'uploader': 'Oshtru',
             'uploader_id': 'oshtru',
             'uploader_url': 'https://twitter.com/oshtru',
             'thumbnail': r're:^https?://.*\.jpg',
@@ -764,18 +754,19 @@ class TwitterIE(TwitterBaseIE):
             'comment_count': int,
             'repost_count': int,
             'like_count': int,
-            'view_count': int,
             'tags': [],
             'age_limit': 0,
+            '_old_archive_ids': ['twitter 1577855540407197696'],
         },
         'params': {'skip_download': True},
     }, {
         'url': 'https://twitter.com/UltimaShadowX/status/1577719286659006464',
         'info_dict': {
             'id': '1577719286659006464',
-            'title': 'Ultima📛 | #вʟм - Test',
+            'title': 'Ultima - Test',
             'description': 'Test https://t.co/Y3KEZD7Dad',
-            'uploader': 'Ultima📛 | #вʟм',
+            'channel_id': '168922496',
+            'uploader': 'Ultima',
             'uploader_id': 'UltimaShadowX',
             'uploader_url': 'https://twitter.com/UltimaShadowX',
             'upload_date': '20221005',
@@ -794,9 +785,10 @@ class TwitterIE(TwitterBaseIE):
             'id': '1575559336759263233',
             'display_id': '1575560063510810624',
             'ext': 'mp4',
-            'title': 'md5:eec26382babd0f7c18f041db8ae1c9c9',
+            'title': 'Max Olson - Absolutely heartbreaking footage captured by our surge probe of catas...',
             'thumbnail': r're:^https?://.*\.jpg',
             'description': 'md5:95aea692fda36a12081b9629b02daa92',
+            'channel_id': '1094109584',
             'uploader': 'Max Olson',
             'uploader_id': 'MesoMax919',
             'uploader_url': 'https://twitter.com/MesoMax919',
@@ -806,12 +798,12 @@ class TwitterIE(TwitterBaseIE):
             'comment_count': int,
             'repost_count': int,
             'like_count': int,
-            'view_count': int,
             'tags': ['HurricaneIan'],
             'age_limit': 0,
+            '_old_archive_ids': ['twitter 1575560063510810624'],
         },
     }, {
-        # Adult content, fails if not logged in (GraphQL)
+        # Adult content, fails if not logged in
         'url': 'https://twitter.com/Rizdraws/status/1575199173472927762',
         'info_dict': {
             'id': '1575199163847000068',
@@ -819,6 +811,7 @@ class TwitterIE(TwitterBaseIE):
             'ext': 'mp4',
             'title': str,
             'description': str,
+            'channel_id': '1217167793541480450',
             'uploader': str,
             'uploader_id': 'Rizdraws',
             'uploader_url': 'https://twitter.com/Rizdraws',
@@ -829,17 +822,20 @@ class TwitterIE(TwitterBaseIE):
             'repost_count': int,
             'comment_count': int,
             'age_limit': 18,
-            'tags': []
+            'tags': [],
+            '_old_archive_ids': ['twitter 1575199173472927762'],
         },
+        'params': {'skip_download': 'The media could not be played'},
         'skip': 'Requires authentication',
     }, {
-        # Playlist result only with auth
+        # Playlist result only with graphql API
         'url': 'https://twitter.com/Srirachachau/status/1395079556562706435',
         'playlist_mincount': 2,
         'info_dict': {
             'id': '1395079556562706435',
             'title': str,
             'tags': [],
+            'channel_id': '21539378',
             'uploader': str,
             'like_count': int,
             'upload_date': '20210519',
@@ -857,6 +853,7 @@ class TwitterIE(TwitterBaseIE):
         'info_dict': {
             'id': '1578353380363501568',
             'title': str,
+            'channel_id': '2195866214',
             'uploader_id': 'DavidToons_',
             'repost_count': int,
             'like_count': int,
@@ -876,6 +873,7 @@ class TwitterIE(TwitterBaseIE):
             'id': '1578401165338976258',
             'title': str,
             'description': 'md5:659a6b517a034b4cee5d795381a2dc41',
+            'channel_id': '19338359',
             'uploader': str,
             'uploader_id': 'primevideouk',
             'timestamp': 1665155137,
@@ -898,31 +896,31 @@ class TwitterIE(TwitterBaseIE):
             'uploader_id': 'MoniqueCamarra',
             'live_status': 'was_live',
             'release_timestamp': 1658417414,
-            'description': 'md5:4dc8e972f1d8b3c6580376fabb02a3ad',
+            'description': r're:Twitter Space participated by Sergej Sumlenny.+',
             'timestamp': 1658407771,
             'release_date': '20220721',
             'upload_date': '20220721',
         },
         'add_ie': ['TwitterSpaces'],
         'params': {'skip_download': 'm3u8'},
-        'skip': 'Requires authentication',
     }, {
         # URL specifies video number but --yes-playlist
         'url': 'https://twitter.com/CTVJLaidlaw/status/1600649710662213632/video/1',
         'playlist_mincount': 2,
         'info_dict': {
             'id': '1600649710662213632',
-            'title': 'md5:be05989b0722e114103ed3851a0ffae2',
+            'title': "Jocelyn Laidlaw - How Kirstie Alley's tragic death inspired me to share more about my c...",
             'timestamp': 1670459604.0,
             'description': 'md5:591c19ce66fadc2359725d5cd0d1052c',
             'comment_count': int,
-            'uploader_id': 'CTVJLaidlaw',
+            'uploader_id': 'JocelynVLaidlaw',
+            'channel_id': '80082014',
             'repost_count': int,
             'tags': ['colorectalcancer', 'cancerjourney', 'imnotaquitter'],
             'upload_date': '20221208',
             'age_limit': 0,
             'uploader': 'Jocelyn Laidlaw',
-            'uploader_url': 'https://twitter.com/CTVJLaidlaw',
+            'uploader_url': 'https://twitter.com/JocelynVLaidlaw',
             'like_count': int,
         },
     }, {
@@ -931,22 +929,23 @@ class TwitterIE(TwitterBaseIE):
         'info_dict': {
             'id': '1600649511827013632',
             'ext': 'mp4',
-            'title': 'md5:7662a0a27ce6faa3e5b160340f3cfab1',
+            'title': "Jocelyn Laidlaw - How Kirstie Alley's tragic death inspired me to share more about my c... #1",
             'thumbnail': r're:^https?://.+\.jpg',
             'timestamp': 1670459604.0,
-            'uploader_id': 'CTVJLaidlaw',
+            'channel_id': '80082014',
+            'uploader_id': 'JocelynVLaidlaw',
             'uploader': 'Jocelyn Laidlaw',
             'repost_count': int,
             'comment_count': int,
             'tags': ['colorectalcancer', 'cancerjourney', 'imnotaquitter'],
             'duration': 102.226,
-            'uploader_url': 'https://twitter.com/CTVJLaidlaw',
+            'uploader_url': 'https://twitter.com/JocelynVLaidlaw',
             'display_id': '1600649710662213632',
             'like_count': int,
-            'view_count': int,
             'description': 'md5:591c19ce66fadc2359725d5cd0d1052c',
             'upload_date': '20221208',
             'age_limit': 0,
+            '_old_archive_ids': ['twitter 1600649710662213632'],
         },
         'params': {'noplaylist': True},
     }, {
@@ -960,6 +959,7 @@ class TwitterIE(TwitterBaseIE):
             'title': '뽀 - 아 최우제 이동속도 봐',
             'description': '아 최우제 이동속도 봐 https://t.co/dxu2U5vXXB',
             'duration': 24.598,
+            'channel_id': '1281839411068432384',
             'uploader': '뽀',
             'uploader_id': 's2FAKER',
             'uploader_url': 'https://twitter.com/s2FAKER',
@@ -971,8 +971,9 @@ class TwitterIE(TwitterBaseIE):
             'like_count': int,
             'repost_count': int,
             'comment_count': int,
-            'view_count': int,
+            '_old_archive_ids': ['twitter 1621117700482416640'],
         },
+        'skip': 'Requires authentication',
     }, {
         'url': 'https://twitter.com/hlo_again/status/1599108751385972737/video/2',
         'info_dict': {
@@ -980,6 +981,7 @@ class TwitterIE(TwitterBaseIE):
             'display_id': '1599108751385972737',
             'ext': 'mp4',
             'title': '\u06ea - \U0001F48B',
+            'channel_id': '1347791436809441283',
             'uploader_url': 'https://twitter.com/hlo_again',
             'like_count': int,
             'uploader_id': 'hlo_again',
@@ -987,39 +989,41 @@ class TwitterIE(TwitterBaseIE):
             'repost_count': int,
             'duration': 9.531,
             'comment_count': int,
-            'view_count': int,
             'upload_date': '20221203',
             'age_limit': 0,
             'timestamp': 1670092210.0,
             'tags': [],
             'uploader': '\u06ea',
             'description': '\U0001F48B https://t.co/bTj9Qz7vQP',
+            '_old_archive_ids': ['twitter 1599108751385972737'],
         },
         'params': {'noplaylist': True},
+        'skip': 'Tweet is limited',
     }, {
         'url': 'https://twitter.com/MunTheShinobi/status/1600009574919962625',
         'info_dict': {
             'id': '1600009362759733248',
             'display_id': '1600009574919962625',
             'ext': 'mp4',
+            'channel_id': '211814412',
             'uploader_url': 'https://twitter.com/MunTheShinobi',
             'description': 'This is a genius ad by Apple. \U0001f525\U0001f525\U0001f525\U0001f525\U0001f525 https://t.co/cNsA0MoOml',
-            'view_count': int,
             'thumbnail': 'https://pbs.twimg.com/ext_tw_video_thumb/1600009362759733248/pu/img/XVhFQivj75H_YxxV.jpg?name=orig',
             'age_limit': 0,
-            'uploader': 'Mün The Friend Of YWAP',
+            'uploader': 'Boy Called Mün',
             'repost_count': int,
             'upload_date': '20221206',
-            'title': 'Mün The Friend Of YWAP - This is a genius ad by Apple. \U0001f525\U0001f525\U0001f525\U0001f525\U0001f525',
+            'title': 'Boy Called Mün - This is a genius ad by Apple. \U0001f525\U0001f525\U0001f525\U0001f525\U0001f525',
             'comment_count': int,
             'like_count': int,
             'tags': [],
             'uploader_id': 'MunTheShinobi',
             'duration': 139.987,
             'timestamp': 1670306984.0,
+            '_old_archive_ids': ['twitter 1600009574919962625'],
         },
     }, {
-        # url to retweet id w/ legacy api
+        # retweeted_status (private)
         'url': 'https://twitter.com/liberdalau/status/1623739803874349067',
         'info_dict': {
             'id': '1623274794488659969',
@@ -1039,32 +1043,145 @@ class TwitterIE(TwitterBaseIE):
             'like_count': int,
             'repost_count': int,
         },
-        'params': {'extractor_args': {'twitter': {'legacy_api': ['']}}},
         'skip': 'Protected tweet',
     }, {
-        # orig tweet w/ graphql
-        'url': 'https://twitter.com/liberdalau/status/1623739803874349067',
+        # retweeted_status
+        'url': 'https://twitter.com/playstrumpcard/status/1695424220702888009',
         'info_dict': {
-            'id': '1623274794488659969',
-            'display_id': '1623739803874349067',
+            'id': '1694928337846538240',
             'ext': 'mp4',
-            'title': '@selfisekai@hackerspace.pl 🐀 - RT @Johnnybull3ts: Me after going viral to over 30million people:    Whoopsie-daisy',
-            'description': 'md5:9258bdbb54793bdc124fe1cd47e96c6a',
-            'uploader': '@selfisekai@hackerspace.pl 🐀',
-            'uploader_id': 'liberdalau',
-            'uploader_url': 'https://twitter.com/liberdalau',
+            'display_id': '1695424220702888009',
+            'title': 'Benny Johnson - Donald Trump driving through the urban, poor neighborhoods of Atlanta...',
+            'description': 'md5:004f2d37fd58737724ec75bc7e679938',
+            'channel_id': '15212187',
+            'uploader': 'Benny Johnson',
+            'uploader_id': 'bennyjohnson',
+            'uploader_url': 'https://twitter.com/bennyjohnson',
             'age_limit': 0,
             'tags': [],
-            'duration': 8.033,
-            'timestamp': 1675964711.0,
-            'upload_date': '20230209',
-            'thumbnail': r're:https://pbs\.twimg\.com/ext_tw_video_thumb/.+',
+            'duration': 45.001,
+            'timestamp': 1692962814.0,
+            'upload_date': '20230825',
+            'thumbnail': r're:https://pbs\.twimg\.com/amplify_video_thumb/.+',
             'like_count': int,
-            'view_count': int,
             'repost_count': int,
             'comment_count': int,
+            '_old_archive_ids': ['twitter 1695424220702888009'],
+        },
+    }, {
+        # retweeted_status w/ legacy API
+        'url': 'https://twitter.com/playstrumpcard/status/1695424220702888009',
+        'info_dict': {
+            'id': '1694928337846538240',
+            'ext': 'mp4',
+            'display_id': '1695424220702888009',
+            'title': 'Benny Johnson - Donald Trump driving through the urban, poor neighborhoods of Atlanta...',
+            'description': 'md5:004f2d37fd58737724ec75bc7e679938',
+            'channel_id': '15212187',
+            'uploader': 'Benny Johnson',
+            'uploader_id': 'bennyjohnson',
+            'uploader_url': 'https://twitter.com/bennyjohnson',
+            'age_limit': 0,
+            'tags': [],
+            'duration': 45.001,
+            'timestamp': 1692962814.0,
+            'upload_date': '20230825',
+            'thumbnail': r're:https://pbs\.twimg\.com/amplify_video_thumb/.+',
+            'like_count': int,
+            'repost_count': int,
+            '_old_archive_ids': ['twitter 1695424220702888009'],
+        },
+        'params': {'extractor_args': {'twitter': {'api': ['legacy']}}},
+    }, {
+        # Broadcast embedded in tweet
+        'url': 'https://twitter.com/JessicaDobsonWX/status/1731121063248175384',
+        'info_dict': {
+            'id': '1rmxPMjLzAXKN',
+            'ext': 'mp4',
+            'title': 'WAVE Weather Now - Saturday 12/2/23 Update',
+            'uploader': 'Jessica Dobson',
+            'uploader_id': 'JessicaDobsonWX',
+            'uploader_url': 'https://twitter.com/JessicaDobsonWX',
+            'timestamp': 1701566398,
+            'upload_date': '20231203',
+            'live_status': 'was_live',
+            'thumbnail': r're:https://[^/]+pscp\.tv/.+\.jpg',
+            'concurrent_view_count': int,
+            'view_count': int,
+        },
+        'add_ie': ['TwitterBroadcast'],
+        'skip': 'Broadcast no longer exists',
+    }, {
+        # Animated gif and quote tweet video
+        'url': 'https://twitter.com/BAKKOOONN/status/1696256659889565950',
+        'playlist_mincount': 2,
+        'info_dict': {
+            'id': '1696256659889565950',
+            'title': 'BAKOON - https://t.co/zom968d0a0',
+            'description': 'https://t.co/zom968d0a0',
+            'tags': [],
+            'channel_id': '1263540390',
+            'uploader': 'BAKOON',
+            'uploader_id': 'BAKKOOONN',
+            'uploader_url': 'https://twitter.com/BAKKOOONN',
+            'age_limit': 18,
+            'timestamp': 1693254077.0,
+            'upload_date': '20230828',
+            'like_count': int,
+            'comment_count': int,
+            'repost_count': int,
+        },
+        'skip': 'Requires authentication',
+    }, {
+        # "stale tweet" with typename "TweetWithVisibilityResults"
+        'url': 'https://twitter.com/RobertKennedyJr/status/1724884212803834154',
+        'md5': '511377ff8dfa7545307084dca4dce319',
+        'info_dict': {
+            'id': '1724883339285544960',
+            'ext': 'mp4',
+            'title': 'Robert F. Kennedy Jr - A beautifully crafted short film by Mikki Willis about my independent...',
+            'description': 'md5:9dc14f5b0f1311fc7caf591ae253a164',
+            'display_id': '1724884212803834154',
+            'channel_id': '337808606',
+            'uploader': 'Robert F. Kennedy Jr',
+            'uploader_id': 'RobertKennedyJr',
+            'uploader_url': 'https://twitter.com/RobertKennedyJr',
+            'upload_date': '20231115',
+            'timestamp': 1700079417.0,
+            'duration': 341.048,
+            'thumbnail': r're:https://pbs\.twimg\.com/amplify_video_thumb/.+',
+            'tags': ['Kennedy24'],
+            'repost_count': int,
+            'like_count': int,
+            'comment_count': int,
+            'age_limit': 0,
+            '_old_archive_ids': ['twitter 1724884212803834154'],
+        },
+    }, {
+        # x.com
+        'url': 'https://x.com/historyinmemes/status/1790637656616943991',
+        'md5': '4549eda363fecfe37439c455923cba2c',
+        'info_dict': {
+            'id': '1790637589910654976',
+            'ext': 'mp4',
+            'title': 'Historic Vids - One of the most intense moments in history',
+            'description': 'One of the most intense moments in history https://t.co/Zgzhvix8ES',
+            'display_id': '1790637656616943991',
+            'uploader': 'Historic Vids',
+            'uploader_id': 'historyinmemes',
+            'uploader_url': 'https://twitter.com/historyinmemes',
+            'channel_id': '855481986290524160',
+            'upload_date': '20240515',
+            'timestamp': 1715756260.0,
+            'duration': 15.488,
+            'tags': [],
+            'comment_count': int,
+            'repost_count': int,
+            'like_count': int,
+            'thumbnail': r're:https://pbs\.twimg\.com/amplify_video_thumb/.+',
+            'age_limit': 0,
+            '_old_archive_ids': ['twitter 1790637656616943991'],
         },
-        'skip': 'Protected tweet',
     }, {
         # onion route
         'url': 'https://twitter3e4tixl4xyajtrzo62zg5vztmjuricljdp2c5kshju4avyoid.onion/TwitterBlue/status/1484226494708662273',
@@ -1103,36 +1220,43 @@ class TwitterIE(TwitterBaseIE):
         'only_matching': True,
     }]
 
-    def _graphql_to_legacy(self, data, twid):
-        result = traverse_obj(data, (
-            'threaded_conversation_with_injections_v2', 'instructions', 0, 'entries',
-            lambda _, v: v['entryId'] == f'tweet-{twid}', 'content', 'itemContent',
-            'tweet_results', 'result', ('tweet', None), {dict},
-        ), default={}, get_all=False) if self.is_logged_in else traverse_obj(
-            data, ('tweetResult', 'result', {dict}), default={})
+    _MEDIA_ID_RE = re.compile(r'_video/(\d+)/')
+    _GRAPHQL_ENDPOINT = '2ICDjqPd81tulZcYrtpTuQ/TweetResultByRestId'
 
-        if result.get('__typename') not in ('Tweet', 'TweetTombstone', 'TweetUnavailable', None):
-            self.report_warning(f'Unknown typename: {result.get("__typename")}', twid, only_once=True)
+    def _graphql_to_legacy(self, data, twid):
+        result = traverse_obj(data, ('tweetResult', 'result', {dict})) or {}
+
+        typename = result.get('__typename')
+        if typename not in ('Tweet', 'TweetWithVisibilityResults', 'TweetTombstone', 'TweetUnavailable', None):
+            self.report_warning(f'Unknown typename: {typename}', twid, only_once=True)
 
         if 'tombstone' in result:
             cause = remove_end(traverse_obj(result, ('tombstone', 'text', 'text', {str})), '. Learn more')
             raise ExtractorError(f'Twitter API says: {cause or "Unknown error"}', expected=True)
-        elif result.get('__typename') == 'TweetUnavailable':
+        elif typename == 'TweetUnavailable':
             reason = result.get('reason')
             if reason == 'NsfwLoggedOut':
                 self.raise_login_required('NSFW tweet requires authentication')
             elif reason == 'Protected':
                 self.raise_login_required('You are not authorized to view this protected tweet')
             raise ExtractorError(reason or 'Requested tweet is unavailable', expected=True)
+        # Result for "stale tweet" needs additional transformation
+        elif typename == 'TweetWithVisibilityResults':
+            result = traverse_obj(result, ('tweet', {dict})) or {}
 
         status = result.get('legacy', {})
         status.update(traverse_obj(result, {
             'user': ('core', 'user_results', 'result', 'legacy'),
             'card': ('card', 'legacy'),
             'quoted_status': ('quoted_status_result', 'result', 'legacy'),
+            'retweeted_status': ('legacy', 'retweeted_status_result', 'result', 'legacy'),
         }, expected_type=dict, default={}))
 
-        # extra transformation is needed since result does not match legacy format
+        # extra transformations needed since result does not match legacy format
+        if status.get('retweeted_status'):
+            status['retweeted_status']['user'] = traverse_obj(status, (
+                'retweeted_status_result', 'result', 'core', 'user_results', 'result', 'legacy', {dict})) or {}
+
         binding_values = {
             binding_value.get('key'): binding_value.get('value')
             for binding_value in traverse_obj(status, ('card', 'binding_values', ..., {dict}))
@@ -1144,37 +1268,6 @@ class TwitterIE(TwitterBaseIE):
 
     def _build_graphql_query(self, media_id):
         return {
-            'variables': {
-                'focalTweetId': media_id,
-                'includePromotedContent': True,
-                'with_rux_injections': False,
-                'withBirdwatchNotes': True,
-                'withCommunity': True,
-                'withDownvotePerspective': False,
-                'withQuickPromoteEligibilityTweetFields': True,
-                'withReactionsMetadata': False,
-                'withReactionsPerspective': False,
-                'withSuperFollowsTweetFields': True,
-                'withSuperFollowsUserFields': True,
-                'withV2Timeline': True,
-                'withVoice': True,
-            },
-            'features': {
-                'graphql_is_translatable_rweb_tweet_is_translatable_enabled': False,
-                'interactive_text_enabled': True,
-                'responsive_web_edit_tweet_api_enabled': True,
-                'responsive_web_enhance_cards_enabled': True,
-                'responsive_web_graphql_timeline_navigation_enabled': False,
-                'responsive_web_text_conversations_enabled': False,
-                'responsive_web_uc_gql_enabled': True,
-                'standardized_nudges_misinfo': True,
-                'tweet_with_visibility_results_prefer_gql_limited_actions_policy_enabled': False,
-                'tweetypie_unmention_optimization_enabled': True,
-                'unified_cards_ad_metadata_container_dynamic_card_content_query_enabled': True,
-                'verified_phone_label_enabled': False,
-                'vibe_api_enabled': True,
-            },
-        } if self.is_logged_in else {
             'variables': {
                 'tweetId': media_id,
                 'withCommunity': False,
@@ -1200,42 +1293,65 @@ class TwitterIE(TwitterBaseIE):
                 'responsive_web_media_download_video_enabled': False,
                 'responsive_web_graphql_skip_user_profile_image_extensions_enabled': False,
                 'responsive_web_graphql_timeline_navigation_enabled': True,
-                'responsive_web_enhance_cards_enabled': False
+                'responsive_web_enhance_cards_enabled': False,
             },
             'fieldToggles': {
-                'withArticleRichContentState': False
-            }
+                'withArticleRichContentState': False,
+            },
         }
 
-    def _extract_status(self, twid):
-        if self.is_logged_in:
-            return self._graphql_to_legacy(
-                self._call_graphql_api('zZXycP0V6H7m-2r0mOnFcA/TweetDetail', twid), twid)
-
-        try:
-            if not self._configuration_arg('legacy_api'):
-                return self._graphql_to_legacy(
-                    self._call_graphql_api('2ICDjqPd81tulZcYrtpTuQ/TweetResultByRestId', twid), twid)
-            return traverse_obj(self._call_api(f'statuses/show/{twid}.json', twid, {
-                'cards_platform': 'Web-12',
-                'include_cards': 1,
-                'include_reply_count': 1,
-                'include_user_entities': 0,
-                'tweet_mode': 'extended',
-            }), 'retweeted_status', None)
-
-        except ExtractorError as e:
-            if e.expected:
-                raise
-            self.report_warning(
-                f'{e.orig_msg}. Falling back to syndication endpoint; some metadata may be missing', twid)
+    def _generate_syndication_token(self, twid):
+        # ((Number(twid) / 1e15) * Math.PI).toString(36).replace(/(0+|\.)/g, '')
+        translation = str.maketrans(dict.fromkeys('0.'))
+        return js_number_to_string((int(twid) / 1e15) * math.pi, 36).translate(translation)
 
+    def _call_syndication_api(self, twid):
+        self.report_warning(
+            'Not all metadata or media is available via syndication endpoint', twid, only_once=True)
         status = self._download_json(
             'https://cdn.syndication.twimg.com/tweet-result', twid, 'Downloading syndication JSON',
-            headers={'User-Agent': 'Googlebot'}, query={'id': twid})
-        status['extended_entities'] = {'media': status.get('mediaDetails')}
+            headers={'User-Agent': 'Googlebot'}, query={
+                'id': twid,
+                'token': self._generate_syndication_token(twid),
+            })
+        if not status:
+            raise ExtractorError('Syndication endpoint returned empty JSON response')
+        # Transform the result so its structure matches that of legacy/graphql
+        media = []
+        for detail in traverse_obj(status, ((None, 'quoted_tweet'), 'mediaDetails', ..., {dict})):
+            detail['id_str'] = traverse_obj(detail, (
+                'video_info', 'variants', ..., 'url', {self._MEDIA_ID_RE.search}, 1), get_all=False) or twid
+            media.append(detail)
+        status['extended_entities'] = {'media': media}
+
         return status
 
+    def _extract_status(self, twid):
+        if self._selected_api not in ('graphql', 'legacy', 'syndication'):
+            raise ExtractorError(f'{self._selected_api!r} is not a valid API selection', expected=True)
+
+        try:
+            if self.is_logged_in or self._selected_api == 'graphql':
+                status = self._graphql_to_legacy(self._call_graphql_api(self._GRAPHQL_ENDPOINT, twid), twid)
+            elif self._selected_api == 'legacy':
+                status = self._call_api(f'statuses/show/{twid}.json', twid, {
+                    'cards_platform': 'Web-12',
+                    'include_cards': 1,
+                    'include_reply_count': 1,
+                    'include_user_entities': 0,
+                    'tweet_mode': 'extended',
+                })
+        except ExtractorError as e:
+            if not isinstance(e.cause, HTTPError) or not e.cause.status == 429:
+                raise
+            self.report_warning('Rate-limit exceeded; falling back to syndication endpoint')
+            status = self._call_syndication_api(twid)
+
+        if self._selected_api == 'syndication':
+            status = self._call_syndication_api(twid)
+
+        return traverse_obj(status, 'retweeted_status', None, expected_type=dict) or {}
+
     def _real_extract(self, url):
         twid, selected_index = self._match_valid_url(url).group('id', 'index')
         status = self._extract_status(twid)
@@ -1243,7 +1359,7 @@ class TwitterIE(TwitterBaseIE):
         title = description = traverse_obj(
             status, (('full_text', 'text'), {lambda x: x.replace('\n', ' ')}), get_all=False) or ''
         # strip  'https -_t.co_BJYgOjSeGA' junk from filenames
-        title = re.sub(r'\s+(https?://[^ ]+)', '', title)
+        title = truncate_string(re.sub(r'\s+(https?://[^ ]+)', '', title), left=72)
         user = status.get('user') or {}
         uploader = user.get('name')
         if uploader:
@@ -1256,6 +1372,7 @@ class TwitterIE(TwitterBaseIE):
             'description': description,
             'uploader': uploader,
             'timestamp': unified_timestamp(status.get('created_at')),
+            'channel_id': str_or_none(status.get('user_id_str')) or str_or_none(user.get('id_str')),
             'uploader_id': uploader_id,
             'uploader_url': format_field(uploader_id, None, 'https://twitter.com/%s'),
             'like_count': int_or_none(status.get('favorite_count')),
@@ -1266,10 +1383,7 @@ class TwitterIE(TwitterBaseIE):
         }
 
         def extract_from_video_info(media):
-            media_id = traverse_obj(media, 'id_str', 'id', (
-                'video_info', 'variants', ..., 'url',
-                {functools.partial(re.search, r'_video/(\d+)/')}, 1
-            ), get_all=False, expected_type=str_or_none) or twid
+            media_id = traverse_obj(media, 'id_str', 'id', expected_type=str_or_none)
             self.write_debug(f'Extracting from video info: {media_id}')
 
             formats = []
@@ -1298,10 +1412,10 @@ class TwitterIE(TwitterBaseIE):
                 'formats': formats,
                 'subtitles': subtitles,
                 'thumbnails': thumbnails,
-                'view_count': traverse_obj(media, ('mediaStats', 'viewCount', {int_or_none})),
+                'view_count': traverse_obj(media, ('mediaStats', 'viewCount', {int_or_none})),  # No longer available
                 'duration': float_or_none(traverse_obj(media, ('video_info', 'duration_millis')), 1000),
-                # The codec of http formats are unknown
-                '_format_sort_fields': ('res', 'br', 'size', 'proto'),
+                # Prioritize m3u8 formats for compat, see https://github.com/yt-dlp/yt-dlp/issues/8117
+                '_format_sort_fields': ('res', 'proto:m3u8', 'br', 'size'),  # http format codec is unknown
             }
 
         def extract_from_card_info(card):
@@ -1453,9 +1567,9 @@ class TwitterAmplifyIE(TwitterBaseIE):
 
         def _find_dimension(target):
             w = int_or_none(self._html_search_meta(
-                'twitter:%s:width' % target, webpage, fatal=False))
+                f'twitter:{target}:width', webpage, fatal=False))
             h = int_or_none(self._html_search_meta(
-                'twitter:%s:height' % target, webpage, fatal=False))
+                f'twitter:{target}:height', webpage, fatal=False))
             return w, h
 
         if thumbnail:
@@ -1484,7 +1598,7 @@ class TwitterBroadcastIE(TwitterBaseIE, PeriscopeBaseIE):
     IE_NAME = 'twitter:broadcast'
     _VALID_URL = TwitterBaseIE._BASE_REGEX + r'i/broadcasts/(?P<id>[0-9a-zA-Z]{13})'
 
-    _TEST = {
+    _TESTS = [{
         # untitled Periscope video
         'url': 'https://twitter.com/i/broadcasts/1yNGaQLWpejGj',
         'info_dict': {
@@ -1492,25 +1606,64 @@ class TwitterBroadcastIE(TwitterBaseIE, PeriscopeBaseIE):
             'ext': 'mp4',
             'title': 'Andrea May Sahouri - Periscope Broadcast',
             'uploader': 'Andrea May Sahouri',
-            'uploader_id': '1PXEdBZWpGwKe',
+            'uploader_id': 'andreamsahouri',
+            'uploader_url': 'https://twitter.com/andreamsahouri',
+            'timestamp': 1590973638,
+            'upload_date': '20200601',
             'thumbnail': r're:^https?://[^?#]+\.jpg\?token=',
             'view_count': int,
         },
-    }
+    }, {
+        'url': 'https://twitter.com/i/broadcasts/1ZkKzeyrPbaxv',
+        'info_dict': {
+            'id': '1ZkKzeyrPbaxv',
+            'ext': 'mp4',
+            'title': 'Starship | SN10 | High-Altitude Flight Test',
+            'uploader': 'SpaceX',
+            'uploader_id': 'SpaceX',
+            'uploader_url': 'https://twitter.com/SpaceX',
+            'timestamp': 1614812942,
+            'upload_date': '20210303',
+            'thumbnail': r're:^https?://[^?#]+\.jpg\?token=',
+            'view_count': int,
+        },
+    }, {
+        'url': 'https://twitter.com/i/broadcasts/1OyKAVQrgzwGb',
+        'info_dict': {
+            'id': '1OyKAVQrgzwGb',
+            'ext': 'mp4',
+            'title': 'Starship Flight Test',
+            'uploader': 'SpaceX',
+            'uploader_id': 'SpaceX',
+            'uploader_url': 'https://twitter.com/SpaceX',
+            'timestamp': 1681993964,
+            'upload_date': '20230420',
+            'thumbnail': r're:^https?://[^?#]+\.jpg\?token=',
+            'view_count': int,
+        },
+    }]
 
     def _real_extract(self, url):
         broadcast_id = self._match_id(url)
         broadcast = self._call_api(
             'broadcasts/show.json', broadcast_id,
             {'ids': broadcast_id})['broadcasts'][broadcast_id]
+        if not broadcast:
+            raise ExtractorError('Broadcast no longer exists', expected=True)
         info = self._parse_broadcast_data(broadcast, broadcast_id)
+        info['title'] = broadcast.get('status') or info.get('title')
+        info['uploader_id'] = broadcast.get('twitter_username') or info.get('uploader_id')
+        info['uploader_url'] = format_field(broadcast, 'twitter_username', 'https://twitter.com/%s', default=None)
+        if info['live_status'] == 'is_upcoming':
+            return info
+
         media_key = broadcast['media_key']
         source = self._call_api(
             f'live_video_stream/status/{media_key}', media_key)['source']
         m3u8_url = source.get('noRedirectPlaybackUrl') or source['location']
         if '/live_video_stream/geoblocked/' in m3u8_url:
             self.raise_geo_restricted()
-        m3u8_id = compat_parse_qs(compat_urllib_parse_urlparse(
+        m3u8_id = urllib.parse.parse_qs(urllib.parse.urlparse(
             m3u8_url).query).get('type', [None])[0]
         state, width, height = self._extract_common_format_info(broadcast)
         info['formats'] = self._extract_pscp_m3u8_formats(
@@ -1523,19 +1676,20 @@ class TwitterSpacesIE(TwitterBaseIE):
     _VALID_URL = TwitterBaseIE._BASE_REGEX + r'i/spaces/(?P<id>[0-9a-zA-Z]{13})'
 
     _TESTS = [{
-        'url': 'https://twitter.com/i/spaces/1RDxlgyvNXzJL',
+        'url': 'https://twitter.com/i/spaces/1OwxWwQOPlNxQ',
         'info_dict': {
-            'id': '1RDxlgyvNXzJL',
+            'id': '1OwxWwQOPlNxQ',
             'ext': 'm4a',
-            'title': 'King Carlo e la mossa Kansas City per fare il Grande Centro',
-            'description': 'Twitter Space participated by annarita digiorgio, Signor Ernesto, Raffaello Colosimo, Simone M. Sepe',
-            'uploader': r're:Lucio Di Gaetano.*?',
-            'uploader_id': 'luciodigaetano',
+            'title': 'Everybody in: @mtbarra & @elonmusk discuss the future of EV charging',
+            'description': 'Twitter Space participated by Elon Musk',
             'live_status': 'was_live',
-            'timestamp': 1659877956,
-            'upload_date': '20220807',
-            'release_timestamp': 1659904215,
-            'release_date': '20220807',
+            'release_date': '20230608',
+            'release_timestamp': 1686256230,
+            'thumbnail': r're:https?://pbs\.twimg\.com/profile_images/.+',
+            'timestamp': 1686254250,
+            'upload_date': '20230608',
+            'uploader': 'Mary Barra',
+            'uploader_id': 'mtbarra',
         },
         'params': {'skip_download': 'm3u8'},
     }, {
@@ -1549,10 +1703,13 @@ class TwitterSpacesIE(TwitterBaseIE):
             'uploader': 'Google Cloud',
             'uploader_id': 'googlecloud',
             'live_status': 'post_live',
+            'thumbnail': r're:https?://pbs\.twimg\.com/profile_images/.+',
             'timestamp': 1681409554,
             'upload_date': '20230413',
-            'release_timestamp': 1681839000,
+            'release_timestamp': 1681839082,
             'release_date': '20230418',
+            'protocol': 'm3u8',  # ffmpeg is forced
+            'container': 'm4a_dash',  # audio-only format fixup is applied
         },
         'params': {'skip_download': 'm3u8'},
     }, {
@@ -1563,11 +1720,35 @@ class TwitterSpacesIE(TwitterBaseIE):
             'ext': 'm4a',
             'title': 'あ',
             'description': 'Twitter Space participated by nobody yet',
-            'uploader': '息根とめる🔪Twitchで復活',
+            'uploader': '息根とめる',
             'uploader_id': 'tomeru_ikinone',
             'live_status': 'was_live',
+            'release_date': '20230601',
+            'release_timestamp': 1685617200,
+            'thumbnail': r're:https?://pbs\.twimg\.com/profile_images/.+',
             'timestamp': 1685617198,
             'upload_date': '20230601',
+            'protocol': 'm3u8',  # ffmpeg is forced
+            'container': 'm4a_dash',  # audio-only format fixup is applied
+        },
+        'params': {'skip_download': 'm3u8'},
+    }, {
+        # Video Space
+        'url': 'https://x.com/i/spaces/1DXGydznBYWKM',
+        'info_dict': {
+            'id': '1DXGydznBYWKM',
+            'ext': 'mp4',
+            'title': 'America and Israel’s “special relationship”',
+            'description': 'Twitter Space participated by nobody yet',
+            'uploader': 'Candace Owens',
+            'uploader_id': 'RealCandaceO',
+            'live_status': 'was_live',
+            'thumbnail': r're:https?://pbs\.twimg\.com/profile_images/.+',
+            'timestamp': 1723931351,
+            'upload_date': '20240817',
+            'release_timestamp': 1723932056,
+            'release_date': '20240817',
+            'protocol': 'm3u8_native',  # not ffmpeg, detected as video space
         },
         'params': {'skip_download': 'm3u8'},
     }]
@@ -1607,8 +1788,6 @@ class TwitterSpacesIE(TwitterBaseIE):
 
     def _real_extract(self, url):
         space_id = self._match_id(url)
-        if not self.is_logged_in:
-            self.raise_login_required('Twitter Spaces require authentication')
         space_data = self._call_graphql_api('HPEisOmj1epUNLCWTYhUWw/AudioSpaceById', space_id)['audioSpace']
         if not space_data:
             raise ExtractorError('Twitter Space not found', expected=True)
@@ -1618,6 +1797,7 @@ class TwitterSpacesIE(TwitterBaseIE):
         is_live = live_status == 'is_live'
 
         formats = []
+        headers = {'Referer': 'https://twitter.com/'}
         if live_status == 'is_upcoming':
             self.raise_no_formats('Twitter Space not started yet', expected=True)
         elif not is_live and not metadata.get('is_space_available_for_replay'):
@@ -1626,13 +1806,17 @@ class TwitterSpacesIE(TwitterBaseIE):
             source = traverse_obj(
                 self._call_api(f'live_video_stream/status/{metadata["media_key"]}', metadata['media_key']),
                 ('source', ('noRedirectPlaybackUrl', 'location'), {url_or_none}), get_all=False)
-            formats = self._extract_m3u8_formats(  # XXX: Some Spaces need ffmpeg as downloader
-                source, metadata['media_key'], 'm4a', entry_protocol='m3u8', live=is_live,
-                headers={'Referer': 'https://twitter.com/'}, fatal=False) if source else []
-            for fmt in formats:
-                fmt.update({'vcodec': 'none', 'acodec': 'aac'})
-                if not is_live:
-                    fmt['container'] = 'm4a_dash'
+            is_audio_space = source and 'audio-space' in source
+            formats = self._extract_m3u8_formats(
+                source, metadata['media_key'], 'm4a' if is_audio_space else 'mp4',
+                # XXX: Some audio-only Spaces need ffmpeg as downloader
+                entry_protocol='m3u8' if is_audio_space else 'm3u8_native',
+                live=is_live, headers=headers, fatal=False) if source else []
+            if is_audio_space:
+                for fmt in formats:
+                    fmt.update({'vcodec': 'none', 'acodec': 'aac'})
+                    if not is_live:
+                        fmt['container'] = 'm4a_dash'
 
         participants = ', '.join(traverse_obj(
             space_data, ('participants', 'speakers', ..., 'display_name'))) or 'nobody yet'
@@ -1642,33 +1826,37 @@ class TwitterSpacesIE(TwitterBaseIE):
 
         return {
             'id': space_id,
-            'title': metadata.get('title'),
             'description': f'Twitter Space participated by {participants}',
-            'uploader': traverse_obj(
-                metadata, ('creator_results', 'result', 'legacy', 'name')),
-            'uploader_id': traverse_obj(
-                metadata, ('creator_results', 'result', 'legacy', 'screen_name')),
-            'live_status': live_status,
-            'release_timestamp': try_call(
-                lambda: int_or_none(metadata['scheduled_start'], scale=1000)),
-            'timestamp': int_or_none(metadata.get('created_at'), scale=1000),
             'formats': formats,
+            'http_headers': headers,
+            'live_status': live_status,
+            **traverse_obj(metadata, {
+                'title': ('title', {str}),
+                # started_at is None when stream is_upcoming so fallback to scheduled_start for --wait-for-video
+                'release_timestamp': (('started_at', 'scheduled_start'), {int_or_none(scale=1000)}, any),
+                'timestamp': ('created_at', {int_or_none(scale=1000)}),
+            }),
+            **traverse_obj(metadata, ('creator_results', 'result', 'legacy', {
+                'uploader': ('name', {str}),
+                'uploader_id': ('screen_name', {str_or_none}),
+                'thumbnail': ('profile_image_url_https', {lambda x: x.replace('_normal', '_400x400')}, {url_or_none}),
+            })),
         }
 
 
 class TwitterShortenerIE(TwitterBaseIE):
     IE_NAME = 'twitter:shortener'
-    _VALID_URL = r'https?://t.co/(?P<id>[^?]+)|tco:(?P<eid>[^?]+)'
+    _VALID_URL = r'https?://t\.co/(?P<id>[^?#]+)|tco:(?P<eid>[^?#]+)'
     _BASE_URL = 'https://t.co/'
 
     def _real_extract(self, url):
         mobj = self._match_valid_url(url)
-        eid, id = mobj.group('eid', 'id')
+        eid, shortcode = mobj.group('eid', 'id')
         if eid:
-            id = eid
-            url = self._BASE_URL + id
-        new_url = self._request_webpage(url, id, headers={'User-Agent': 'curl'}).url
-        __UNSAFE_LINK = "https://twitter.com/safety/unsafe_link_warning?unsafe_link="
+            shortcode = eid
+            url = self._BASE_URL + shortcode
+        new_url = self._request_webpage(url, shortcode, headers={'User-Agent': 'curl'}).url
+        __UNSAFE_LINK = 'https://twitter.com/safety/unsafe_link_warning?unsafe_link='
         if new_url.startswith(__UNSAFE_LINK):
-            new_url = new_url.replace(__UNSAFE_LINK, "")
+            new_url = new_url.replace(__UNSAFE_LINK, '')
         return self.url_result(new_url)
diff --git a/plugins/youtube_download/yt_dlp/extractor/txxx.py b/plugins/youtube_download/yt_dlp/extractor/txxx.py
index fff7a5d..488c13b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/txxx.py
+++ b/plugins/youtube_download/yt_dlp/extractor/txxx.py
@@ -10,6 +10,7 @@ from ..utils import (
     parse_duration,
     traverse_obj,
     try_call,
+    url_or_none,
     urljoin,
     variadic,
 )
@@ -83,7 +84,8 @@ class TxxxIE(InfoExtractor):
             'like_count': int,
             'dislike_count': int,
             'age_limit': 18,
-        }
+            'thumbnail': 'https://tn.txxx.tube/contents/videos_sources/16574000/16574965/screenshots/1.jpg',
+        },
     }, {
         'url': 'https://txxx.tube/videos/16574965/digital-desire-malena-morgan/',
         'md5': 'c54e4ace54320aaf8e2a72df87859391',
@@ -98,7 +100,8 @@ class TxxxIE(InfoExtractor):
             'like_count': int,
             'dislike_count': int,
             'age_limit': 18,
-        }
+            'thumbnail': 'https://tn.txxx.tube/contents/videos_sources/16574000/16574965/screenshots/1.jpg',
+        },
     }, {
         'url': 'https://vxxx.com/video-68925/',
         'md5': '1fcff3748b0c5b41fe41d0afa22409e1',
@@ -113,7 +116,8 @@ class TxxxIE(InfoExtractor):
             'like_count': int,
             'dislike_count': int,
             'age_limit': 18,
-        }
+            'thumbnail': 'https://tn.vxxx.com/contents/videos_sources/68000/68925/screenshots/1.jpg',
+        },
     }, {
         'url': 'https://hclips.com/videos/6291073/malena-morgan-masturbates-her-sweet/',
         'md5': 'a5dd4f83363972ee043313cff85e7e26',
@@ -128,7 +132,8 @@ class TxxxIE(InfoExtractor):
             'like_count': int,
             'dislike_count': int,
             'age_limit': 18,
-        }
+            'thumbnail': 'https://hctn.nv7s.com/contents/videos_sources/6291000/6291073/screenshots/1.jpg',
+        },
     }, {
         'url': 'https://hdzog.com/videos/67063/gorgeous-malena-morgan-will-seduce-you-at-the-first-glance/',
         'md5': 'f8bdedafd45d1ec2875c43fe33a846d3',
@@ -143,7 +148,8 @@ class TxxxIE(InfoExtractor):
             'like_count': int,
             'dislike_count': int,
             'age_limit': 18,
-        }
+            'thumbnail': 'https://tn.hdzog.com/contents/videos_sources/67000/67063/screenshots/1.jpg',
+        },
     }, {
         'url': 'https://hdzog.tube/videos/67063/gorgeous-malena-morgan-will-seduce-you-at-the-first-glance/',
         'md5': 'f8bdedafd45d1ec2875c43fe33a846d3',
@@ -158,7 +164,8 @@ class TxxxIE(InfoExtractor):
             'like_count': int,
             'dislike_count': int,
             'age_limit': 18,
-        }
+            'thumbnail': 'https://tn.hdzog.com/contents/videos_sources/67000/67063/screenshots/1.jpg',
+        },
     }, {
         'url': 'https://hotmovs.com/videos/8789287/unbelievable-malena-morgan-performing-in-incredible-masturantion/',
         'md5': '71d32c51584876472db87e561171a386',
@@ -173,7 +180,8 @@ class TxxxIE(InfoExtractor):
             'like_count': int,
             'dislike_count': int,
             'age_limit': 18,
-        }
+            'thumbnail': 'https://tn.hotmovs.com/contents/videos_sources/8789000/8789287/screenshots/10.jpg',
+        },
     }, {
         'url': 'https://hotmovs.tube/videos/8789287/unbelievable-malena-morgan-performing-in-incredible-masturantion/',
         'md5': '71d32c51584876472db87e561171a386',
@@ -188,7 +196,8 @@ class TxxxIE(InfoExtractor):
             'like_count': int,
             'dislike_count': int,
             'age_limit': 18,
-        }
+            'thumbnail': 'https://tn.hotmovs.com/contents/videos_sources/8789000/8789287/screenshots/10.jpg',
+        },
     }, {
         'url': 'https://inporn.com/video/517897/malena-morgan-solo/',
         'md5': '344db467481edf78f193cdf5820a7cfb',
@@ -203,7 +212,8 @@ class TxxxIE(InfoExtractor):
             'like_count': int,
             'dislike_count': int,
             'age_limit': 18,
-        }
+            'thumbnail': 'https://iptn.m3pd.com/media/tn/sources/517897_1.jpg',
+        },
     }, {
         'url': 'https://privatehomeclips.com/videos/3630599/malena-morgan-cam-show/',
         'md5': 'ea657273e352493c5fb6357fbfa4f126',
@@ -218,7 +228,8 @@ class TxxxIE(InfoExtractor):
             'like_count': int,
             'dislike_count': int,
             'age_limit': 18,
-        }
+            'thumbnail': 'https://hctn.nv7s.com/contents/videos_sources/3630000/3630599/screenshots/15.jpg',
+        },
     }, {
         'url': 'https://tubepornclassic.com/videos/1015455/mimi-rogers-full-body-massage-nude-compilation/',
         'md5': '2e9a6cf610c9862e86e0ce24f08f4427',
@@ -233,7 +244,8 @@ class TxxxIE(InfoExtractor):
             'like_count': int,
             'dislike_count': int,
             'age_limit': 18,
-        }
+            'thumbnail': 'https://tn.tubepornclassic.com/contents/videos_sources/1015000/1015455/screenshots/6.jpg',
+        },
     }, {
         'url': 'https://upornia.com/videos/1498858/twistys-malena-morgan-starring-at-dr-morgan-baller/',
         'md5': '7ff7033340bc88a173198b7c22600e4f',
@@ -248,7 +260,8 @@ class TxxxIE(InfoExtractor):
             'like_count': int,
             'dislike_count': int,
             'age_limit': 18,
-        }
+            'thumbnail': 'https://tn.upornia.com/contents/videos_sources/1498000/1498858/screenshots/1.jpg',
+        },
     }, {
         'url': 'https://upornia.tube/videos/1498858/twistys-malena-morgan-starring-at-dr-morgan-baller/',
         'md5': '7ff7033340bc88a173198b7c22600e4f',
@@ -263,7 +276,8 @@ class TxxxIE(InfoExtractor):
             'like_count': int,
             'dislike_count': int,
             'age_limit': 18,
-        }
+            'thumbnail': 'https://tn.upornia.com/contents/videos_sources/1498000/1498858/screenshots/1.jpg',
+        },
     }, {
         'url': 'https://vjav.com/videos/11761/yui-hatano-in-if-yui-was-my-girlfriend2/',
         'md5': '6de5bc1f13bdfc3491a77f23edb1676f',
@@ -278,7 +292,8 @@ class TxxxIE(InfoExtractor):
             'like_count': int,
             'dislike_count': int,
             'age_limit': 18,
-        }
+            'thumbnail': 'https://tn.vjav.com/contents/videos_sources/11000/11761/screenshots/23.jpg',
+        },
     }, {
         'url': 'https://vjav.tube/videos/11761/yui-hatano-in-if-yui-was-my-girlfriend2/',
         'md5': '6de5bc1f13bdfc3491a77f23edb1676f',
@@ -293,7 +308,8 @@ class TxxxIE(InfoExtractor):
             'like_count': int,
             'dislike_count': int,
             'age_limit': 18,
-        }
+            'thumbnail': 'https://tn.vjav.com/contents/videos_sources/11000/11761/screenshots/23.jpg',
+        },
     }, {
         'url': 'https://voyeurhit.com/videos/332875/charlotte-stokely-elle-alexandra-malena-morgan-lingerie/',
         'md5': '12b4666e9c3e60dafe9182e5d12aae33',
@@ -308,7 +324,8 @@ class TxxxIE(InfoExtractor):
             'like_count': int,
             'dislike_count': int,
             'age_limit': 18,
-        }
+            'thumbnail': 'https://tn.voyeurhit.com/contents/videos_sources/332000/332875/screenshots/1.jpg',
+        },
     }, {
         'url': 'https://voyeurhit.tube/videos/332875/charlotte-stokely-elle-alexandra-malena-morgan-lingerie/',
         'md5': '12b4666e9c3e60dafe9182e5d12aae33',
@@ -323,7 +340,8 @@ class TxxxIE(InfoExtractor):
             'like_count': int,
             'dislike_count': int,
             'age_limit': 18,
-        }
+            'thumbnail': 'https://tn.voyeurhit.com/contents/videos_sources/332000/332875/screenshots/1.jpg',
+        },
     }]
     _WEBPAGE_TESTS = [{
         'url': 'https://pornzog.com/video/9125519/michelle-malone-dreamgirls-wild-wet-3/',
@@ -338,7 +356,8 @@ class TxxxIE(InfoExtractor):
             'like_count': int,
             'dislike_count': int,
             'age_limit': 18,
-        }
+            'thumbnail': 'https://hctn.nv7s.com/contents/videos_sources/5119000/5119660/screenshots/1.jpg',
+        },
     }]
 
     def _call_api(self, url, video_id, fatal=False, **kwargs):
@@ -371,6 +390,7 @@ class TxxxIE(InfoExtractor):
             'like_count': int_or_none(traverse_obj(video_info, ('video', 'statistics', 'likes'))),
             'dislike_count': int_or_none(traverse_obj(video_info, ('video', 'statistics', 'dislikes'))),
             'age_limit': 18,
+            'thumbnail': traverse_obj(video_info, ('video', 'thumbsrc', {url_or_none})),
             'formats': get_formats(host, video_file),
         }
 
@@ -395,7 +415,7 @@ class PornTopIE(InfoExtractor):
             'timestamp': 1609455029,
             'upload_date': '20201231',
             'thumbnail': 'https://tn.porntop.com/media/tn/sources/101569_1.jpg',
-        }
+        },
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/udemy.py b/plugins/youtube_download/yt_dlp/extractor/udemy.py
index 5c29605..2801aa8 100644
--- a/plugins/youtube_download/yt_dlp/extractor/udemy.py
+++ b/plugins/youtube_download/yt_dlp/extractor/udemy.py
@@ -1,7 +1,7 @@
 import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import compat_str, compat_urlparse
 from ..networking import Request
 from ..networking.exceptions import HTTPError
 from ..utils import (
@@ -73,22 +73,21 @@ class UdemyIE(InfoExtractor):
         course_id = course.get('id') or self._search_regex(
             [
                 r'data-course-id=["\'](\d+)',
-                r'&quot;courseId&quot;\s*:\s*(\d+)'
+                r'&quot;courseId&quot;\s*:\s*(\d+)',
             ], webpage, 'course id')
         return course_id, course.get('title')
 
     def _enroll_course(self, base_url, webpage, course_id):
         def combine_url(base_url, url):
-            return compat_urlparse.urljoin(base_url, url) if not url.startswith('http') else url
+            return urllib.parse.urljoin(base_url, url) if not url.startswith('http') else url
 
         checkout_url = unescapeHTML(self._search_regex(
             r'href=(["\'])(?P<url>(?:https?://(?:www\.)?udemy\.com)?/(?:payment|cart)/checkout/.+?)\1',
             webpage, 'checkout url', group='url', default=None))
         if checkout_url:
             raise ExtractorError(
-                'Course %s is not free. You have to pay for it before you can download. '
-                'Use this URL to confirm purchase: %s'
-                % (course_id, combine_url(base_url, checkout_url)),
+                f'Course {course_id} is not free. You have to pay for it before you can download. '
+                f'Use this URL to confirm purchase: {combine_url(base_url, checkout_url)}',
                 expected=True)
 
         enroll_url = unescapeHTML(self._search_regex(
@@ -100,12 +99,11 @@ class UdemyIE(InfoExtractor):
                 course_id, 'Enrolling in the course',
                 headers={'Referer': base_url})
             if '>You have enrolled in' in webpage:
-                self.to_screen('%s: Successfully enrolled in the course' % course_id)
+                self.to_screen(f'{course_id}: Successfully enrolled in the course')
 
     def _download_lecture(self, course_id, lecture_id):
         return self._download_json(
-            'https://www.udemy.com/api-2.0/users/me/subscribed-courses/%s/lectures/%s?'
-            % (course_id, lecture_id),
+            f'https://www.udemy.com/api-2.0/users/me/subscribed-courses/{course_id}/lectures/{lecture_id}?',
             lecture_id, 'Downloading lecture JSON', query={
                 'fields[lecture]': 'title,description,view_html,asset',
                 'fields[asset]': 'asset_type,stream_url,thumbnail_url,download_urls,stream_urls,captions,data,course_is_drmed',
@@ -116,17 +114,17 @@ class UdemyIE(InfoExtractor):
             return
         error = response.get('error')
         if error:
-            error_str = 'Udemy returned error #%s: %s' % (error.get('code'), error.get('message'))
+            error_str = 'Udemy returned error #{}: {}'.format(error.get('code'), error.get('message'))
             error_data = error.get('data')
             if error_data:
-                error_str += ' - %s' % error_data.get('formErrors')
+                error_str += ' - {}'.format(error_data.get('formErrors'))
             raise ExtractorError(error_str, expected=True)
 
     def _download_webpage_handle(self, *args, **kwargs):
         headers = kwargs.get('headers', {}).copy()
         headers['User-Agent'] = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.109 Safari/537.36'
         kwargs['headers'] = headers
-        ret = super(UdemyIE, self)._download_webpage_handle(
+        ret = super()._download_webpage_handle(
             *args, **kwargs)
         if not ret:
             return ret
@@ -151,14 +149,14 @@ class UdemyIE(InfoExtractor):
                 headers['X-Udemy-Client-Id'] = cookie.value
             elif cookie.name == 'access_token':
                 headers['X-Udemy-Bearer-Token'] = cookie.value
-                headers['X-Udemy-Authorization'] = 'Bearer %s' % cookie.value
+                headers['X-Udemy-Authorization'] = f'Bearer {cookie.value}'
 
         if isinstance(url_or_request, Request):
             url_or_request.headers.update(headers)
         else:
             url_or_request = Request(url_or_request, headers=headers)
 
-        response = super(UdemyIE, self)._download_json(url_or_request, *args, **kwargs)
+        response = super()._download_json(url_or_request, *args, **kwargs)
         self._handle_error(response)
         return response
 
@@ -195,7 +193,7 @@ class UdemyIE(InfoExtractor):
                 r'(?s)<div[^>]+class="form-errors[^"]*">(.+?)</div>',
                 response, 'error message', default=None)
             if error:
-                raise ExtractorError('Unable to login: %s' % error, expected=True)
+                raise ExtractorError(f'Unable to login: {error}', expected=True)
             raise ExtractorError('Unable to log in')
 
     def _real_extract(self, url):
@@ -226,7 +224,7 @@ class UdemyIE(InfoExtractor):
         asset_type = asset.get('asset_type') or asset.get('assetType')
         if asset_type != 'Video':
             raise ExtractorError(
-                'Lecture %s is not a video' % lecture_id, expected=True)
+                f'Lecture {lecture_id} is not a video', expected=True)
 
         stream_url = asset.get('stream_url') or asset.get('streamUrl')
         if stream_url:
@@ -235,7 +233,7 @@ class UdemyIE(InfoExtractor):
             if youtube_url:
                 return self.url_result(youtube_url, 'Youtube')
 
-        video_id = compat_str(asset['id'])
+        video_id = str(asset['id'])
         thumbnail = asset.get('thumbnail_url') or asset.get('thumbnailUrl')
         duration = float_or_none(asset.get('data', {}).get('duration'))
 
@@ -287,7 +285,7 @@ class UdemyIE(InfoExtractor):
                 format_id = source.get('label')
                 f = {
                     'url': video_url,
-                    'format_id': '%sp' % format_id,
+                    'format_id': f'{format_id}p',
                     'height': int_or_none(format_id),
                 }
                 if format_id:
@@ -316,7 +314,7 @@ class UdemyIE(InfoExtractor):
                 })
 
         for url_kind in ('download', 'stream'):
-            urls = asset.get('%s_urls' % url_kind)
+            urls = asset.get(f'{url_kind}_urls')
             if isinstance(urls, dict):
                 extract_formats(urls.get('Video'))
 
@@ -328,7 +326,7 @@ class UdemyIE(InfoExtractor):
                 cc_url = url_or_none(cc.get('url'))
                 if not cc_url:
                     continue
-                lang = try_get(cc, lambda x: x['locale']['locale'], compat_str)
+                lang = try_get(cc, lambda x: x['locale']['locale'], str)
                 sub_dict = (automatic_captions if cc.get('source') == 'auto'
                             else subtitles)
                 sub_dict.setdefault(lang or 'en', []).append({
@@ -363,7 +361,7 @@ class UdemyIE(InfoExtractor):
                 else:
                     formats.append(add_output_format_meta({
                         'url': src,
-                        'format_id': '%dp' % height if height else None,
+                        'format_id': f'{height}p' if height else None,
                         'height': height,
                     }, res))
 
@@ -423,7 +421,7 @@ class UdemyCourseIE(UdemyIE):  # XXX: Do not subclass from concrete IE
 
     @classmethod
     def suitable(cls, url):
-        return False if UdemyIE.suitable(url) else super(UdemyCourseIE, cls).suitable(url)
+        return False if UdemyIE.suitable(url) else super().suitable(url)
 
     def _real_extract(self, url):
         course_path = self._match_id(url)
@@ -435,7 +433,7 @@ class UdemyCourseIE(UdemyIE):  # XXX: Do not subclass from concrete IE
         self._enroll_course(url, webpage, course_id)
 
         response = self._download_json(
-            'https://www.udemy.com/api-2.0/courses/%s/cached-subscriber-curriculum-items' % course_id,
+            f'https://www.udemy.com/api-2.0/courses/{course_id}/cached-subscriber-curriculum-items',
             course_id, 'Downloading course curriculum', query={
                 'fields[chapter]': 'title,object_index',
                 'fields[lecture]': 'title,asset',
diff --git a/plugins/youtube_download/yt_dlp/extractor/udn.py b/plugins/youtube_download/yt_dlp/extractor/udn.py
index 10668ac..9970e4f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/udn.py
+++ b/plugins/youtube_download/yt_dlp/extractor/udn.py
@@ -1,4 +1,5 @@
 import re
+import urllib.parse
 
 from .common import InfoExtractor
 from ..utils import (
@@ -6,14 +7,13 @@ from ..utils import (
     int_or_none,
     js_to_json,
 )
-from ..compat import compat_urlparse
 
 
 class UDNEmbedIE(InfoExtractor):
     IE_DESC = '聯合影音'
     _PROTOCOL_RELATIVE_VALID_URL = r'//video\.udn\.com/(?:embed|play)/news/(?P<id>\d+)'
     _VALID_URL = r'https?:' + _PROTOCOL_RELATIVE_VALID_URL
-    _EMBED_REGEX = [r'<iframe[^>]+src="(?:https?:)?(?P<url>%s)"' % _PROTOCOL_RELATIVE_VALID_URL]
+    _EMBED_REGEX = [rf'<iframe[^>]+src="(?:https?:)?(?P<url>{_PROTOCOL_RELATIVE_VALID_URL})"']
     _TESTS = [{
         'url': 'http://video.udn.com/embed/news/300040',
         'info_dict': {
@@ -66,8 +66,8 @@ class UDNEmbedIE(InfoExtractor):
                 continue
 
             video_url = self._download_webpage(
-                compat_urlparse.urljoin(url, api_url), video_id,
-                note='retrieve url for %s video' % video_type)
+                urllib.parse.urljoin(url, api_url), video_id,
+                note=f'retrieve url for {video_type} video')
 
             ext = determine_ext(video_url)
             if ext == 'm3u8':
diff --git a/plugins/youtube_download/yt_dlp/extractor/ukcolumn.py b/plugins/youtube_download/yt_dlp/extractor/ukcolumn.py
index aade79f..f141804 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ukcolumn.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ukcolumn.py
@@ -1,14 +1,15 @@
-from ..utils import (
-    unescapeHTML,
-    urljoin,
-    ExtractorError,
-)
 from .common import InfoExtractor
 from .vimeo import VimeoIE
 from .youtube import YoutubeIE
+from ..utils import (
+    ExtractorError,
+    unescapeHTML,
+    urljoin,
+)
 
 
 class UkColumnIE(InfoExtractor):
+    _WORKING = False
     IE_NAME = 'ukcolumn'
     _VALID_URL = r'(?i)https?://(?:www\.)?ukcolumn\.org(/index\.php)?/(?:video|ukcolumn-news)/(?P<id>[-a-z0-9]+)'
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/uktvplay.py b/plugins/youtube_download/yt_dlp/extractor/uktvplay.py
index ab22a8e..9abe343 100644
--- a/plugins/youtube_download/yt_dlp/extractor/uktvplay.py
+++ b/plugins/youtube_download/yt_dlp/extractor/uktvplay.py
@@ -18,7 +18,7 @@ class UKTVPlayIE(InfoExtractor):
             # m3u8 download
             'skip_download': True,
         },
-        'expected_warnings': ['Failed to download MPD manifest']
+        'expected_warnings': ['Failed to download MPD manifest'],
     }, {
         'url': 'https://uktvplay.uktv.co.uk/shows/africa/watch-online/5983349675001',
         'only_matching': True,
diff --git a/plugins/youtube_download/yt_dlp/extractor/uliza.py b/plugins/youtube_download/yt_dlp/extractor/uliza.py
new file mode 100644
index 0000000..5766bd3
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/uliza.py
@@ -0,0 +1,113 @@
+from .common import InfoExtractor
+from ..utils import (
+    ExtractorError,
+    int_or_none,
+    make_archive_id,
+    parse_qs,
+    time_seconds,
+)
+from ..utils.traversal import traverse_obj
+
+
+class UlizaPlayerIE(InfoExtractor):
+    _VALID_URL = r'https://player-api\.p\.uliza\.jp/v1/players/[^?#]+\?(?:[^#]*&)?name=(?P<id>[^#&]+)'
+    _TESTS = [{
+        'url': 'https://player-api.p.uliza.jp/v1/players/timeshift-disabled/pia/admin?type=normal&playerobjectname=ulizaPlayer&name=livestream01_dvr&repeatable=true',
+        'info_dict': {
+            'id': '88f3109a-f503-4d0f-a9f7-9f39ac745d84',
+            'ext': 'mp4',
+            'title': '88f3109a-f503-4d0f-a9f7-9f39ac745d84',
+            'live_status': 'was_live',
+            '_old_archive_ids': ['piaulizaportal 88f3109a-f503-4d0f-a9f7-9f39ac745d84'],
+        },
+    }, {
+        'url': 'https://player-api.p.uliza.jp/v1/players/uliza_jp_gallery_normal/promotion/admin?type=presentation&name=cookings&targetid=player1',
+        'info_dict': {
+            'id': 'ae350126-5e22-4a7f-a8ac-8d0fd448b800',
+            'ext': 'mp4',
+            'title': 'ae350126-5e22-4a7f-a8ac-8d0fd448b800',
+            'live_status': 'not_live',
+            '_old_archive_ids': ['piaulizaportal ae350126-5e22-4a7f-a8ac-8d0fd448b800'],
+        },
+    }, {
+        'url': 'https://player-api.p.uliza.jp/v1/players/default-player/pia/admin?type=normal&name=pia_movie_uliza_fix&targetid=ulizahtml5&repeatable=true',
+        'info_dict': {
+            'id': '0644ecc8-e354-41b4-b957-3b08a2d63df1',
+            'ext': 'mp4',
+            'title': '0644ecc8-e354-41b4-b957-3b08a2d63df1',
+            'live_status': 'not_live',
+            '_old_archive_ids': ['piaulizaportal 0644ecc8-e354-41b4-b957-3b08a2d63df1'],
+        },
+    }]
+
+    def _real_extract(self, url):
+        display_id = self._match_id(url)
+        player_data = self._download_webpage(
+            url, display_id, headers={'Referer': 'https://player-api.p.uliza.jp/'},
+            note='Fetching player data', errnote='Unable to fetch player data')
+
+        m3u8_url = self._search_regex(
+            r'["\'](https://vms-api\.p\.uliza\.jp/v1/prog-index\.m3u8[^"\']+)', player_data, 'm3u8 url')
+        video_id = parse_qs(m3u8_url).get('ss', [display_id])[0]
+
+        formats = self._extract_m3u8_formats(m3u8_url, video_id)
+        m3u8_type = self._search_regex(
+            r'/hls/(dvr|video)/', traverse_obj(formats, (0, 'url')), 'm3u8 type', default=None)
+        return {
+            'id': video_id,
+            'title': video_id,
+            'formats': formats,
+            'live_status': {
+                'video': 'is_live',
+                'dvr': 'was_live',  # short-term archives
+            }.get(m3u8_type, 'not_live'),  # VOD or long-term archives
+            '_old_archive_ids': [make_archive_id('PIAULIZAPortal', video_id)],
+        }
+
+
+class UlizaPortalIE(InfoExtractor):
+    IE_DESC = 'ulizaportal.jp'
+    _VALID_URL = r'https?://(?:www\.)?ulizaportal\.jp/pages/(?P<id>[\da-f]{8}-(?:[\da-f]{4}-){3}[\da-f]{12})'
+    _TESTS = [{
+        'url': 'https://ulizaportal.jp/pages/005f18b7-e810-5618-cb82-0987c5755d44',
+        'info_dict': {
+            'id': 'ae350126-5e22-4a7f-a8ac-8d0fd448b800',
+            'display_id': '005f18b7-e810-5618-cb82-0987c5755d44',
+            'title': 'プレゼンテーションプレイヤーのサンプル',
+            'live_status': 'not_live',
+            '_old_archive_ids': ['piaulizaportal ae350126-5e22-4a7f-a8ac-8d0fd448b800'],
+        },
+        'params': {
+            'skip_download': True,
+            'ignore_no_formats_error': True,
+        },
+    }, {
+        'url': 'https://ulizaportal.jp/pages/005e1b23-fe93-5780-19a0-98e917cc4b7d?expires=4102412400&signature=f422a993b683e1068f946caf406d211c17d1ef17da8bef3df4a519502155aa91&version=1',
+        'info_dict': {
+            'id': '0644ecc8-e354-41b4-b957-3b08a2d63df1',
+            'display_id': '005e1b23-fe93-5780-19a0-98e917cc4b7d',
+            'title': '【確認用】視聴サンプルページ（ULIZA）',
+            'live_status': 'not_live',
+            '_old_archive_ids': ['piaulizaportal 0644ecc8-e354-41b4-b957-3b08a2d63df1'],
+        },
+        'params': {
+            'skip_download': True,
+            'ignore_no_formats_error': True,
+        },
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+
+        expires = int_or_none(traverse_obj(parse_qs(url), ('expires', 0)))
+        if expires and expires <= time_seconds():
+            raise ExtractorError('The link is expired', video_id=video_id, expected=True)
+
+        webpage = self._download_webpage(url, video_id)
+
+        player_data_url = self._search_regex(
+            r'<script [^>]*\bsrc="(https://player-api\.p\.uliza\.jp/v1/players/[^"]+)"',
+            webpage, 'player data url')
+        return self.url_result(
+            player_data_url, UlizaPlayerIE, url_transparent=True,
+            display_id=video_id, video_title=self._html_extract_title(webpage))
diff --git a/plugins/youtube_download/yt_dlp/extractor/umg.py b/plugins/youtube_download/yt_dlp/extractor/umg.py
index 3ffcb73..b509fda 100644
--- a/plugins/youtube_download/yt_dlp/extractor/umg.py
+++ b/plugins/youtube_download/yt_dlp/extractor/umg.py
@@ -7,6 +7,7 @@ from ..utils import (
 
 
 class UMGDeIE(InfoExtractor):
+    _WORKING = False
     IE_NAME = 'umg:de'
     IE_DESC = 'Universal Music Deutschland'
     _VALID_URL = r'https?://(?:www\.)?universal-music\.de/[^/]+/videos/[^/?#]+-(?P<id>\d+)'
@@ -19,7 +20,7 @@ class UMGDeIE(InfoExtractor):
             'title': 'Jedes Wort ist Gold wert',
             'timestamp': 1513591800,
             'upload_date': '20171218',
-        }
+        },
     }
 
     def _real_extract(self, url):
@@ -44,7 +45,7 @@ class UMGDeIE(InfoExtractor):
       createdDate
     }
   }
-}''' % video_id})['data']['universalMusic']['video']
+}''' % video_id})['data']['universalMusic']['video']  # noqa: UP031
 
         title = video_data['headline']
         hls_url_template = 'http://mediadelivery.universal-music-services.de/vod/mp4:autofill/storage/' + '/'.join(list(video_id)) + '/content/%s/file/playlist.m3u8'
diff --git a/plugins/youtube_download/yt_dlp/extractor/unistra.py b/plugins/youtube_download/yt_dlp/extractor/unistra.py
index 6e872cd..edc1f85 100644
--- a/plugins/youtube_download/yt_dlp/extractor/unistra.py
+++ b/plugins/youtube_download/yt_dlp/extractor/unistra.py
@@ -27,7 +27,7 @@ class UnistraIE(InfoExtractor):
                 'title': 'Prix Louise Weiss 2014',
                 'description': 'md5:cc3a8735f079f4fb6b0b570fc10c135a',
             },
-        }
+        },
     ]
 
     def _real_extract(self, url):
@@ -43,9 +43,9 @@ class UnistraIE(InfoExtractor):
         for file_path in files:
             format_id = 'HD' if file_path.endswith('-HD.mp4') else 'SD'
             formats.append({
-                'url': 'http://vod-flash.u-strasbg.fr:8080%s' % file_path,
+                'url': f'http://vod-flash.u-strasbg.fr:8080{file_path}',
                 'format_id': format_id,
-                'quality': quality(format_id)
+                'quality': quality(format_id),
             })
 
         title = self._html_search_regex(
@@ -60,5 +60,5 @@ class UnistraIE(InfoExtractor):
             'title': title,
             'description': description,
             'thumbnail': thumbnail,
-            'formats': formats
+            'formats': formats,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/unity.py b/plugins/youtube_download/yt_dlp/extractor/unity.py
index d1b0ecb..7d6ffb0 100644
--- a/plugins/youtube_download/yt_dlp/extractor/unity.py
+++ b/plugins/youtube_download/yt_dlp/extractor/unity.py
@@ -3,6 +3,7 @@ from .youtube import YoutubeIE
 
 
 class UnityIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?unity3d\.com/learn/tutorials/(?:[^/]+/)*(?P<id>[^/?#&]+)'
     _TESTS = [{
         'url': 'https://unity3d.com/learn/tutorials/topics/animation/animate-anything-mecanim',
@@ -15,7 +16,7 @@ class UnityIE(InfoExtractor):
             'uploader': 'Unity',
             'uploader_id': 'Unity3D',
             'upload_date': '20140926',
-        }
+        },
     }, {
         'url': 'https://unity3d.com/learn/tutorials/projects/2d-ufo-tutorial/following-player-camera?playlist=25844',
         'only_matching': True,
diff --git a/plugins/youtube_download/yt_dlp/extractor/unscripted.py b/plugins/youtube_download/yt_dlp/extractor/unscripted.py
deleted file mode 100644
index 6643a71..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/unscripted.py
+++ /dev/null
@@ -1,53 +0,0 @@
-from .common import InfoExtractor
-from ..utils import parse_duration, traverse_obj
-
-
-class UnscriptedNewsVideoIE(InfoExtractor):
-    _VALID_URL = r'https?://www\.unscripted\.news/videos/(?P<id>[\w-]+)'
-    _TESTS = [{
-        'url': 'https://www.unscripted.news/videos/a-day-at-the-farmers-protest',
-        'info_dict': {
-            'id': '60c0a55cd1e99b1079918a57',
-            'display_id': 'a-day-at-the-farmers-protest',
-            'ext': 'mp4',
-            'title': 'A Day at the Farmers\' Protest',
-            'description': 'md5:4b3df22747a03e8f14f746dd72190384',
-            'thumbnail': 'https://s3.unscripted.news/anj2/60c0a55cd1e99b1079918a57/5f199a65-c803-4a5c-8fce-2077359c3b72.jpg',
-            'duration': 2251.0,
-            'series': 'Ground Reports',
-        }
-    }, {
-        'url': 'https://www.unscripted.news/videos/you-get-the-politicians-you-deserve-ft-shashi-tharoor',
-        'info_dict': {
-            'id': '5fb3afbf18ac817d341a74d8',
-            'display_id': 'you-get-the-politicians-you-deserve-ft-shashi-tharoor',
-            'ext': 'mp4',
-            'cast': ['Avalok Langer', 'Ashwin Mehta'],
-            'thumbnail': 'https://s3.unscripted.news/anj2/5fb3afbf18ac817d341a74d8/82bd7942-4f20-4cd8-98ae-83f9e814f998.jpg',
-            'description': 'md5:1e91b069238a705ca3a40f87e6f1182c',
-            'duration': 1046.0,
-            'series': 'Dumb Questions Only',
-            'title': 'You Get The Politicians You Deserve! ft. Shashi Tharoor',
-        }
-    }]
-
-    def _real_extract(self, url):
-        display_id = self._match_id(url)
-        webpage = self._download_webpage(url, display_id)
-        nextjs_data = self._search_nextjs_data(webpage, display_id)['props']['pageProps']['dataLocal']
-
-        # TODO: get subtitle from srt key
-        formats, subtitles = self._extract_m3u8_formats_and_subtitles(nextjs_data['alt_content'], display_id)
-
-        return {
-            'id': nextjs_data['_id'],
-            'display_id': display_id,
-            'title': nextjs_data.get('title') or self._og_search_title(webpage),
-            'description': nextjs_data.get('sh_heading') or self._og_search_description(webpage),
-            'formats': formats,
-            'subtitles': subtitles,
-            'thumbnail': self._og_search_thumbnail(webpage),
-            'duration': parse_duration(nextjs_data.get('duration')),
-            'series': traverse_obj(nextjs_data, ('show', 'topic')),
-            'cast': traverse_obj(nextjs_data, ('cast_crew', ..., 'displayname')),
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/unsupported.py b/plugins/youtube_download/yt_dlp/extractor/unsupported.py
index bbcbf3a..31393b0 100644
--- a/plugins/youtube_download/yt_dlp/extractor/unsupported.py
+++ b/plugins/youtube_download/yt_dlp/extractor/unsupported.py
@@ -23,7 +23,7 @@ class KnownDRMIE(UnsupportedInfoExtractor):
 
     Add to this list only if:
     * You are reasonably certain that the site uses DRM for ALL their videos
-    * Multiple users have asked about this site on github/reddit/discord
+    * Multiple users have asked about this site on github/discord
     """
 
     URLS = (
@@ -48,6 +48,11 @@ class KnownDRMIE(UnsupportedInfoExtractor):
         r'joyn\.de',
         r'amazon\.(?:\w{2}\.)?\w+/gp/video',
         r'music\.amazon\.(?:\w{2}\.)?\w+',
+        r'(?:watch|front)\.njpwworld\.com',
+        r'qub\.ca/vrai',
+        r'(?:beta\.)?crunchyroll\.com',
+        r'viki\.com',
+        r'deezer\.com',
     )
 
     _TESTS = [{
@@ -141,6 +146,28 @@ class KnownDRMIE(UnsupportedInfoExtractor):
         # https://github.com/yt-dlp/yt-dlp/issues/5767
         'url': 'https://www.hulu.com/movie/anthem-6b25fac9-da2b-45a3-8e09-e4156b0471cc',
         'only_matching': True,
+    }, {
+        # https://github.com/yt-dlp/yt-dlp/pull/8570
+        'url': 'https://watch.njpwworld.com/player/36447/series?assetType=series',
+        'only_matching': True,
+    }, {
+        'url': 'https://front.njpwworld.com/p/s_series_00563_16_bs',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.qub.ca/vrai/l-effet-bocuse-d-or/saison-1/l-effet-bocuse-d-or-saison-1-bande-annonce-1098225063',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.crunchyroll.com/watch/GY2P1Q98Y/to-the-future',
+        'only_matching': True,
+    }, {
+        'url': 'https://beta.crunchyroll.com/pt-br/watch/G8WUN8VKP/the-ruler-of-conspiracy',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.viki.com/videos/1175236v-choosing-spouse-by-lottery-episode-1',
+        'only_matching': True,
+    }, {
+        'url': 'http://www.deezer.com/playlist/176747451',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
@@ -164,11 +191,29 @@ class KnownPiracyIE(UnsupportedInfoExtractor):
         r'viewsb\.com',
         r'filemoon\.sx',
         r'hentai\.animestigma\.com',
+        r'thisav\.com',
+        r'gounlimited\.to',
+        r'highstream\.tv',
+        r'uqload\.com',
+        r'vedbam\.xyz',
+        r'vadbam\.net'
+        r'vidlo\.us',
+        r'wolfstream\.tv',
+        r'xvideosharing\.com',
+        r'(?:\w+\.)?viidshar\.com',
+        r'sxyprn\.com',
+        r'jable\.tv',
+        r'91porn\.com',
+        r'einthusan\.(?:tv|com|ca)',
+        r'yourupload\.com',
     )
 
     _TESTS = [{
         'url': 'http://dood.to/e/5s1wmbdacezb',
         'only_matching': True,
+    }, {
+        'url': 'https://thisav.com/en/terms',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/uol.py b/plugins/youtube_download/yt_dlp/extractor/uol.py
index 068c2b8..5198e89 100644
--- a/plugins/youtube_download/yt_dlp/extractor/uol.py
+++ b/plugins/youtube_download/yt_dlp/extractor/uol.py
@@ -1,8 +1,6 @@
+import urllib.parse
+
 from .common import InfoExtractor
-from ..compat import (
-    compat_str,
-    compat_urllib_parse_urlencode,
-)
 from ..utils import (
     clean_html,
     int_or_none,
@@ -26,7 +24,7 @@ class UOLIE(InfoExtractor):
             'description': 'md5:3f8c11a0c0556d66daf7e5b45ef823b2',
             'timestamp': 1470421860,
             'upload_date': '20160805',
-        }
+        },
     }, {
         'url': 'http://tvuol.uol.com.br/video/incendio-destroi-uma-das-maiores-casas-noturnas-de-londres-04024E9A3268D4C95326',
         'md5': '2850a0e8dfa0a7307e04a96c5bdc5bc2',
@@ -37,7 +35,7 @@ class UOLIE(InfoExtractor):
             'description': 'Em Londres, um incêndio destruiu uma das maiores boates da cidade. Não há informações sobre vítimas.',
             'timestamp': 1470674520,
             'upload_date': '20160808',
-        }
+        },
     }, {
         'url': 'http://mais.uol.com.br/static/uolplayer/index.html?mediaId=15951931',
         'only_matching': True,
@@ -68,12 +66,12 @@ class UOLIE(InfoExtractor):
             # https://api.mais.uol.com.br/apiuol/v4/player/data/[MEDIA_ID]
             'https://api.mais.uol.com.br/apiuol/v3/media/detail/' + video_id,
             video_id)['item']
-        media_id = compat_str(video_data['mediaId'])
+        media_id = str(video_data['mediaId'])
         title = video_data['title']
         ver = video_data.get('revision', 2)
 
         uol_formats = self._download_json(
-            'https://croupier.mais.uol.com.br/v3/formats/%s/jsonp' % media_id,
+            f'https://croupier.mais.uol.com.br/v3/formats/{media_id}/jsonp',
             media_id)
         quality = qualities(['mobile', 'WEBM', '360p', '720p', '1080p'])
         formats = []
@@ -96,7 +94,7 @@ class UOLIE(InfoExtractor):
                 m3u8_formats = self._extract_m3u8_formats(
                     f_url, media_id, 'mp4', 'm3u8_native',
                     m3u8_id='hls', fatal=False)
-                encoded_query = compat_urllib_parse_urlencode(query)
+                encoded_query = urllib.parse.urlencode(query)
                 for m3u8_f in m3u8_formats:
                     m3u8_f['extra_param_to_segment_url'] = encoded_query
                     m3u8_f['url'] = update_url_query(m3u8_f['url'], query)
diff --git a/plugins/youtube_download/yt_dlp/extractor/urort.py b/plugins/youtube_download/yt_dlp/extractor/urort.py
index debd2ba..0693129 100644
--- a/plugins/youtube_download/yt_dlp/extractor/urort.py
+++ b/plugins/youtube_download/yt_dlp/extractor/urort.py
@@ -5,6 +5,7 @@ from ..utils import unified_strdate
 
 
 class UrortIE(InfoExtractor):
+    _WORKING = False
     IE_DESC = 'NRK P3 Urørt'
     _VALID_URL = r'https?://(?:www\.)?urort\.p3\.no/#!/Band/(?P<id>[^/]+)$'
 
@@ -22,22 +23,22 @@ class UrortIE(InfoExtractor):
         },
         'params': {
             'matchtitle': '^The Bomb$',  # To test, we want just one video
-        }
+        },
     }
 
     def _real_extract(self, url):
         playlist_id = self._match_id(url)
 
-        fstr = urllib.parse.quote("InternalBandUrl eq '%s'" % playlist_id)
-        json_url = 'http://urort.p3.no/breeze/urort/TrackDTOViews?$filter=%s&$orderby=Released%%20desc&$expand=Tags%%2CFiles' % fstr
+        fstr = urllib.parse.quote(f"InternalBandUrl eq '{playlist_id}'")
+        json_url = f'http://urort.p3.no/breeze/urort/TrackDTOViews?$filter={fstr}&$orderby=Released%20desc&$expand=Tags%2CFiles'
         songs = self._download_json(json_url, playlist_id)
         entries = []
         for s in songs:
             formats = [{
                 'tbr': f.get('Quality'),
                 'ext': f['FileType'],
-                'format_id': '%s-%s' % (f['FileType'], f.get('Quality', '')),
-                'url': 'http://p3urort.blob.core.windows.net/tracks/%s' % f['FileRef'],
+                'format_id': '{}-{}'.format(f['FileType'], f.get('Quality', '')),
+                'url': 'http://p3urort.blob.core.windows.net/tracks/{}'.format(f['FileRef']),
                 'quality': 3 if f['FileType'] == 'mp3' else 2,
             } for f in s['Files']]
             e = {
@@ -45,7 +46,7 @@ class UrortIE(InfoExtractor):
                 'title': s['Title'],
                 'uploader_id': playlist_id,
                 'uploader': s.get('BandName', playlist_id),
-                'thumbnail': 'http://urort.p3.no/cloud/images/%s' % s['Image'],
+                'thumbnail': 'http://urort.p3.no/cloud/images/{}'.format(s['Image']),
                 'upload_date': unified_strdate(s.get('Released')),
                 'formats': formats,
             }
diff --git a/plugins/youtube_download/yt_dlp/extractor/urplay.py b/plugins/youtube_download/yt_dlp/extractor/urplay.py
index 7f97fc9..79bb8a8 100644
--- a/plugins/youtube_download/yt_dlp/extractor/urplay.py
+++ b/plugins/youtube_download/yt_dlp/extractor/urplay.py
@@ -1,9 +1,9 @@
 from .common import InfoExtractor
 from ..utils import (
-    dict_get,
     ExtractorError,
-    int_or_none,
     ISO639Utils,
+    dict_get,
+    int_or_none,
     parse_age_limit,
     try_get,
     unified_timestamp,
@@ -98,7 +98,7 @@ class URPlayIE(InfoExtractor):
             file_http = v.get('location')
             if file_http:
                 formats.extend(self._extract_wowza_formats(
-                    'http://%s/%splaylist.m3u8' % (host, file_http),
+                    f'http://{host}/{file_http}playlist.m3u8',
                     video_id, skip_protocols=['f4m', 'rtmp', 'rtsp']))
 
         subtitles = {}
@@ -116,14 +116,14 @@ class URPlayIE(InfoExtractor):
             for k, v in stream.items():
                 if (k in ('sd', 'hd') or not isinstance(v, dict)):
                     continue
-                lang, sttl_url = (v.get(kk) for kk in ('language', 'location', ))
+                lang, sttl_url = (v.get(kk) for kk in ('language', 'location'))
                 if not sttl_url:
                     continue
                 lang = parse_lang_code(lang)
                 if not lang:
                     continue
                 sttl = subtitles.get(lang) or []
-                sttl.append({'ext': k, 'url': sttl_url, })
+                sttl.append({'ext': k, 'url': sttl_url})
                 subtitles[lang] = sttl
 
         image = urplayer_data.get('image') or {}
@@ -146,7 +146,7 @@ class URPlayIE(InfoExtractor):
 
         return {
             'id': video_id,
-            'title': '%s : %s' % (series_title, episode) if series_title else episode,
+            'title': f'{series_title} : {episode}' if series_title else episode,
             'description': urplayer_data.get('description'),
             'thumbnails': thumbnails,
             'timestamp': unified_timestamp(urplayer_data.get('publishedAt')),
diff --git a/plugins/youtube_download/yt_dlp/extractor/usatoday.py b/plugins/youtube_download/yt_dlp/extractor/usatoday.py
index 3243f3e..6ad18ff 100644
--- a/plugins/youtube_download/yt_dlp/extractor/usatoday.py
+++ b/plugins/youtube_download/yt_dlp/extractor/usatoday.py
@@ -6,7 +6,6 @@ from ..utils import (
     try_get,
     update_url_query,
 )
-from ..compat import compat_str
 
 
 class USATodayIE(InfoExtractor):
@@ -23,7 +22,7 @@ class USATodayIE(InfoExtractor):
             'description': 'md5:7e50464fdf2126b0f533748d3c78d58f',
             'uploader_id': '29906170001',
             'upload_date': '20160313',
-        }
+        },
     }, {
         # ui-video-data[asset_metadata][items][brightcoveaccount] = 28911775001
         'url': 'https://www.usatoday.com/story/tech/science/2018/08/21/yellowstone-supervolcano-eruption-stop-worrying-its-blow/973633002/',
@@ -35,7 +34,7 @@ class USATodayIE(InfoExtractor):
             'description': 'md5:3715e7927639a4f16b474e9391687c62',
             'uploader_id': '28911775001',
             'upload_date': '20180820',
-        }
+        },
     }]
     BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/%s/default_default/index.html?videoId=%s'
 
@@ -51,7 +50,7 @@ class USATodayIE(InfoExtractor):
         return {
             '_type': 'url_transparent',
             'url': self.BRIGHTCOVE_URL_TEMPLATE % (item.get('brightcoveaccount', '29906170001'), item.get('brightcoveid') or video_data['brightcove_id']),
-            'id': compat_str(video_data['id']),
+            'id': str(video_data['id']),
             'title': video_data['title'],
             'thumbnail': video_data.get('thumbnail'),
             'description': video_data.get('description'),
diff --git a/plugins/youtube_download/yt_dlp/extractor/ustream.py b/plugins/youtube_download/yt_dlp/extractor/ustream.py
index 5df2416..0fdf8f7 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ustream.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ustream.py
@@ -1,16 +1,13 @@
 import random
 import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_str,
-    compat_urlparse,
-)
 from ..utils import (
-    encode_data_uri,
     ExtractorError,
-    int_or_none,
+    encode_data_uri,
     float_or_none,
+    int_or_none,
     join_nonempty,
     mimetype2ext,
     str_or_none,
@@ -76,20 +73,20 @@ class UstreamIE(InfoExtractor):
         def num_to_hex(n):
             return hex(n)[2:]
 
-        rnd = random.randrange
+        rnd = lambda x: random.randrange(int(x))
 
         if not extra_note:
             extra_note = ''
 
         conn_info = self._download_json(
-            'http://r%d-1-%s-recorded-lp-live.ums.ustream.tv/1/ustream' % (rnd(1e8), video_id),
+            f'http://r{rnd(1e8)}-1-{video_id}-recorded-lp-live.ums.ustream.tv/1/ustream',
             video_id, note='Downloading connection info' + extra_note,
             query={
                 'type': 'viewer',
                 'appId': app_id_ver[0],
                 'appVersion': app_id_ver[1],
-                'rsid': '%s:%s' % (num_to_hex(rnd(1e8)), num_to_hex(rnd(1e8))),
-                'rpin': '_rpin.%d' % rnd(1e15),
+                'rsid': f'{num_to_hex(rnd(1e8))}:{num_to_hex(rnd(1e8))}',
+                'rpin': f'_rpin.{rnd(1e15)}',
                 'referrer': url,
                 'media': video_id,
                 'application': 'recorded',
@@ -98,7 +95,7 @@ class UstreamIE(InfoExtractor):
         connection_id = conn_info[0]['args'][0]['connectionId']
 
         return self._download_json(
-            'http://%s/1/ustream?connectionId=%s' % (host, connection_id),
+            f'http://{host}/1/ustream?connectionId={connection_id}',
             video_id, note='Downloading stream info' + extra_note)
 
     def _get_streams(self, url, video_id, app_id_ver):
@@ -106,14 +103,14 @@ class UstreamIE(InfoExtractor):
         for trial_count in range(3):
             stream_info = self._get_stream_info(
                 url, video_id, app_id_ver,
-                extra_note=' (try %d)' % (trial_count + 1) if trial_count > 0 else '')
+                extra_note=f' (try {trial_count + 1})' if trial_count > 0 else '')
             if 'stream' in stream_info[0]['args'][0]:
                 return stream_info[0]['args'][0]['stream']
         return []
 
     def _parse_segmented_mp4(self, dash_stream_info):
         def resolve_dash_template(template, idx, chunk_hash):
-            return template.replace('%', compat_str(idx), 1).replace('%', chunk_hash)
+            return template.replace('%', str(idx), 1).replace('%', chunk_hash)
 
         formats = []
         for stream in dash_stream_info['streams']:
@@ -121,13 +118,13 @@ class UstreamIE(InfoExtractor):
             provider = dash_stream_info['providers'][0]
             fragments = [{
                 'url': resolve_dash_template(
-                    provider['url'] + stream['initUrl'], 0, dash_stream_info['hashes']['0'])
+                    provider['url'] + stream['initUrl'], 0, dash_stream_info['hashes']['0']),
             }]
             for idx in range(dash_stream_info['videoLength'] // dash_stream_info['chunkTime']):
                 fragments.append({
                     'url': resolve_dash_template(
                         provider['url'] + stream['segmentUrl'], idx,
-                        dash_stream_info['hashes'][compat_str(idx // 10 * 10)])
+                        dash_stream_info['hashes'][str(idx // 10 * 10)]),
                 })
             content_type = stream['contentType']
             kind = content_type.split('/')[0]
@@ -173,16 +170,16 @@ class UstreamIE(InfoExtractor):
                 r'ustream\.vars\.offAirContentVideoIds=([^;]+);', webpage,
                 'content video IDs'), video_id)
             return self.playlist_result(
-                map(lambda u: self.url_result('http://www.ustream.tv/recorded/' + u, 'Ustream'), content_video_ids),
+                (self.url_result('http://www.ustream.tv/recorded/' + u, 'Ustream') for u in content_video_ids),
                 video_id)
 
         params = self._download_json(
-            'https://api.ustream.tv/videos/%s.json' % video_id, video_id)
+            f'https://api.ustream.tv/videos/{video_id}.json', video_id)
 
         error = params.get('error')
         if error:
             raise ExtractorError(
-                '%s returned error: %s' % (self.IE_NAME, error), expected=True)
+                f'{self.IE_NAME} returned error: {error}', expected=True)
 
         video = params['video']
 
@@ -255,12 +252,12 @@ class UstreamChannelIE(InfoExtractor):
         channel_id = self._html_search_meta('ustream:channel_id', webpage)
 
         BASE = 'http://www.ustream.tv'
-        next_url = '/ajax/socialstream/videos/%s/1.json' % channel_id
+        next_url = f'/ajax/socialstream/videos/{channel_id}/1.json'
         video_ids = []
         while next_url:
             reply = self._download_json(
-                compat_urlparse.urljoin(BASE, next_url), display_id,
-                note='Downloading video information (next: %d)' % (len(video_ids) + 1))
+                urllib.parse.urljoin(BASE, next_url), display_id,
+                note=f'Downloading video information (next: {len(video_ids) + 1})')
             video_ids.extend(re.findall(r'data-content-id="(\d.*)"', reply['data']))
             next_url = reply['nextUrl']
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/ustudio.py b/plugins/youtube_download/yt_dlp/extractor/ustudio.py
index c3aeeb9..b5da88b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ustudio.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ustudio.py
@@ -1,8 +1,8 @@
 from .common import InfoExtractor
 from ..utils import (
     int_or_none,
-    unified_strdate,
     unescapeHTML,
+    unified_strdate,
 )
 
 
@@ -21,14 +21,14 @@ class UstudioIE(InfoExtractor):
             'thumbnail': r're:^https?://.*\.jpg$',
             'upload_date': '20111107',
             'uploader': 'Tony Farley',
-        }
+        },
     }
 
     def _real_extract(self, url):
         video_id, display_id = self._match_valid_url(url).groups()
 
         config = self._download_xml(
-            'http://v1.ustudio.com/embed/%s/ustudio/config.xml' % video_id,
+            f'http://v1.ustudio.com/embed/{video_id}/ustudio/config.xml',
             display_id)
 
         def extract(kind):
@@ -36,7 +36,7 @@ class UstudioIE(InfoExtractor):
                 'url': unescapeHTML(item.attrib['url']),
                 'width': int_or_none(item.get('width')),
                 'height': int_or_none(item.get('height')),
-            } for item in config.findall('./qualities/quality/%s' % kind) if item.get('url')]
+            } for item in config.findall(f'./qualities/quality/{kind}') if item.get('url')]
 
         formats = extract('video')
 
@@ -74,13 +74,13 @@ class UstudioEmbedIE(InfoExtractor):
             'title': '5 Things IT Should Know About Video',
             'description': 'md5:93d32650884b500115e158c5677d25ad',
             'uploader_id': 'DeN7VdYRDKhP',
-        }
+        },
     }
 
     def _real_extract(self, url):
         uploader_id, video_id = self._match_valid_url(url).groups()
         video_data = self._download_json(
-            'http://app.ustudio.com/embed/%s/%s/config.json' % (uploader_id, video_id),
+            f'http://app.ustudio.com/embed/{uploader_id}/{video_id}/config.json',
             video_id)['videos'][0]
         title = video_data['name']
 
@@ -92,7 +92,7 @@ class UstudioEmbedIE(InfoExtractor):
                     continue
                 height = int_or_none(quality.get('height'))
                 formats.append({
-                    'format_id': '%s-%dp' % (ext, height) if height else ext,
+                    'format_id': f'{ext}-{height}p' if height else ext,
                     'url': quality_url,
                     'width': int_or_none(quality.get('width')),
                     'height': height,
diff --git a/plugins/youtube_download/yt_dlp/extractor/utreon.py b/plugins/youtube_download/yt_dlp/extractor/utreon.py
index 90c10c0..fc44df9 100644
--- a/plugins/youtube_download/yt_dlp/extractor/utreon.py
+++ b/plugins/youtube_download/yt_dlp/extractor/utreon.py
@@ -10,7 +10,8 @@ from ..utils import (
 
 
 class UtreonIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?utreon.com/v/(?P<id>[a-zA-Z0-9_-]+)'
+    IE_NAME = 'playeur'
+    _VALID_URL = r'https?://(?:www\.)?(?:utreon|playeur)\.com/v/(?P<id>[\w-]+)'
     _TESTS = [{
         'url': 'https://utreon.com/v/z_I7ikQbuDw',
         'info_dict': {
@@ -19,31 +20,34 @@ class UtreonIE(InfoExtractor):
             'title': 'Freedom Friday meditation - Rising in the wind',
             'description': 'md5:a9bf15a42434a062fe313b938343ad1b',
             'uploader': 'Heather Dawn Elemental Health',
-            'thumbnail': 'https://data-1.utreon.com/v/MG/M2/NT/z_I7ikQbuDw/z_I7ikQbuDw_preview.jpg',
+            'thumbnail': r're:^https?://.+\.jpg',
             'release_date': '20210723',
-        }
+            'duration': 586,
+        },
     }, {
         'url': 'https://utreon.com/v/jerJw5EOOVU',
         'info_dict': {
             'id': 'jerJw5EOOVU',
             'ext': 'mp4',
             'title': 'When I\'m alone, I love to reflect in peace, to make my dreams come true... [Quotes and Poems]',
-            'description': 'md5:61ee6c2da98be51b04b969ca80273aaa',
+            'description': 'md5:4026aa3a2c10169c3649926ac8ef62b6',
             'uploader': 'Frases e Poemas Quotes and Poems',
-            'thumbnail': 'https://data-1.utreon.com/v/Mz/Zh/ND/jerJw5EOOVU/jerJw5EOOVU_89af85470a4b16eededde7f8674c96d9_cover.jpg',
+            'thumbnail': r're:^https?://.+\.jpg',
             'release_date': '20210723',
-        }
+            'duration': 60,
+        },
     }, {
         'url': 'https://utreon.com/v/C4ZxXhYBBmE',
         'info_dict': {
             'id': 'C4ZxXhYBBmE',
             'ext': 'mp4',
             'title': 'Biden’s Capital Gains Tax Rate to Test World’s Highest',
-            'description': 'md5:fb5a6c2e506f013cc76f133f673bc5c8',
+            'description': 'md5:995aa9ad0733c0e5863ebdeff954f40e',
             'uploader': 'Nomad Capitalist',
-            'thumbnail': 'https://data-1.utreon.com/v/ZD/k1/Mj/C4ZxXhYBBmE/C4ZxXhYBBmE_628342076198c9c06dd6b2c665978584_cover.jpg',
+            'thumbnail': r're:^https?://.+\.jpg',
             'release_date': '20210723',
-        }
+            'duration': 884,
+        },
     }, {
         'url': 'https://utreon.com/v/Y-stEH-FBm8',
         'info_dict': {
@@ -52,15 +56,28 @@ class UtreonIE(InfoExtractor):
             'title': 'Creeper-Chan Pranks Steve! 💚 [MINECRAFT ANIME]',
             'description': 'md5:7a48450b0d761b96dec194be0c5ecb5f',
             'uploader': 'Merryweather Comics',
-            'thumbnail': 'https://data-1.utreon.com/v/MT/E4/Zj/Y-stEH-FBm8/Y-stEH-FBm8_5290676a41a4a1096db133b09f54f77b_cover.jpg',
+            'thumbnail': r're:^https?://.+\.jpg',
             'release_date': '20210718',
-        }},
-    ]
+            'duration': 151,
+        },
+    }, {
+        'url': 'https://playeur.com/v/Wzqp-UrxSeu',
+        'info_dict': {
+            'id': 'Wzqp-UrxSeu',
+            'ext': 'mp4',
+            'title': 'Update: Clockwork Basilisk Books on the Way!',
+            'description': 'md5:d9756b0b1884c904655b0e170d17cea5',
+            'uploader': 'Forgotten Weapons',
+            'release_date': '20240208',
+            'thumbnail': r're:^https?://.+\.jpg',
+            'duration': 262,
+        },
+    }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
         json_data = self._download_json(
-            'https://api.utreon.com/v1/videos/' + video_id,
+            'https://api.playeur.com/v1/videos/' + video_id,
             video_id)
         videos_json = json_data['videos']
         formats = [{
diff --git a/plugins/youtube_download/yt_dlp/extractor/varzesh3.py b/plugins/youtube_download/yt_dlp/extractor/varzesh3.py
index 2c13cbd..07a2d53 100644
--- a/plugins/youtube_download/yt_dlp/extractor/varzesh3.py
+++ b/plugins/youtube_download/yt_dlp/extractor/varzesh3.py
@@ -7,6 +7,7 @@ from ..utils import (
 
 
 class Varzesh3IE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?video\.varzesh3\.com/(?:[^/]+/)+(?P<id>[^/]+)/?'
     _TESTS = [{
         'url': 'http://video.varzesh3.com/germany/bundesliga/5-%D9%88%D8%A7%DA%A9%D9%86%D8%B4-%D8%A8%D8%B1%D8%AA%D8%B1-%D8%AF%D8%B1%D9%88%D8%A7%D8%B2%D9%87%E2%80%8C%D8%A8%D8%A7%D9%86%D8%A7%D9%86%D8%9B%D9%87%D9%81%D8%AA%D9%87-26-%D8%A8%D9%88%D9%86%D8%AF%D8%B3/',
diff --git a/plugins/youtube_download/yt_dlp/extractor/vbox7.py b/plugins/youtube_download/yt_dlp/extractor/vbox7.py
index be35dad..f5d0502 100644
--- a/plugins/youtube_download/yt_dlp/extractor/vbox7.py
+++ b/plugins/youtube_download/yt_dlp/extractor/vbox7.py
@@ -1,5 +1,6 @@
 from .common import InfoExtractor
-from ..utils import ExtractorError
+from ..utils import ExtractorError, base_url, int_or_none, url_basename
+from ..utils.traversal import traverse_obj
 
 
 class Vbox7IE(InfoExtractor):
@@ -19,7 +20,7 @@ class Vbox7IE(InfoExtractor):
     _GEO_COUNTRIES = ['BG']
     _TESTS = [{
         'url': 'http://vbox7.com/play:0946fff23c',
-        'md5': 'a60f9ab3a3a2f013ef9a967d5f7be5bf',
+        'md5': '50ca1f78345a9c15391af47d8062d074',
         'info_dict': {
             'id': '0946fff23c',
             'ext': 'mp4',
@@ -29,19 +30,25 @@ class Vbox7IE(InfoExtractor):
             'timestamp': 1470982814,
             'upload_date': '20160812',
             'uploader': 'zdraveibulgaria',
-        },
-        'params': {
-            'proxy': '127.0.0.1:8118',
+            'view_count': int,
+            'duration': 2640,
         },
     }, {
         'url': 'http://vbox7.com/play:249bb972c2',
-        'md5': '99f65c0c9ef9b682b97313e052734c3f',
+        'md5': 'da1dd2eb245200cb86e6d09d43232116',
         'info_dict': {
             'id': '249bb972c2',
             'ext': 'mp4',
             'title': 'Смях! Чудо - чист за секунди - Скрита камера',
+            'uploader': 'svideteliat_ot_varshava',
+            'view_count': int,
+            'timestamp': 1360215023,
+            'thumbnail': 'https://i49.vbox7.com/o/249/249bb972c20.jpg',
+            'description': 'Смях! Чудо - чист за секунди - Скрита камера',
+            'upload_date': '20130207',
+            'duration': 83,
         },
-        'skip': 'georestricted',
+        'expected_warnings': ['Failed to download m3u8 information'],
     }, {
         'url': 'http://vbox7.com/emb/external.php?vid=a240d20f9c&autoplay=1',
         'only_matching': True,
@@ -53,41 +60,38 @@ class Vbox7IE(InfoExtractor):
     def _real_extract(self, url):
         video_id = self._match_id(url)
 
-        response = self._download_json(
-            'https://www.vbox7.com/ajax/video/nextvideo.php?vid=%s' % video_id,
-            video_id)
+        data = self._download_json(
+            'https://www.vbox7.com/aj/player/item/options', video_id,
+            query={'vid': video_id})['options']
 
-        if 'error' in response:
-            raise ExtractorError(
-                '%s said: %s' % (self.IE_NAME, response['error']), expected=True)
+        src_url = data.get('src')
+        if src_url in (None, '', 'blank'):
+            raise ExtractorError('Video is unavailable', expected=True)
 
-        video = response['options']
+        fmt_base = url_basename(src_url).rsplit('.', 1)[0].rsplit('_', 1)[0]
+        if fmt_base == 'vn':
+            self.raise_geo_restricted()
 
-        title = video['title']
-        video_url = video['src']
+        fmt_base = base_url(src_url) + fmt_base
 
-        if '/na.mp4' in video_url:
-            self.raise_geo_restricted(countries=self._GEO_COUNTRIES)
+        formats = self._extract_m3u8_formats(
+            f'{fmt_base}.m3u8', video_id, m3u8_id='hls', fatal=False)
+        # TODO: Add MPD formats, when dash range support is added
+        for res in traverse_obj(data, ('resolutions', lambda _, v: v != 0, {int})):
+            formats.append({
+                'url': f'{fmt_base}_{res}.mp4',
+                'format_id': f'http-{res}',
+                'height': res,
+            })
 
-        uploader = video.get('uploader')
-
-        webpage = self._download_webpage(
-            'http://vbox7.com/play:%s' % video_id, video_id, fatal=None)
-
-        info = {}
-
-        if webpage:
-            info = self._search_json_ld(
-                webpage.replace('"/*@context"', '"@context"'), video_id,
-                fatal=False)
-
-        info.update({
+        return {
             'id': video_id,
-            'title': title,
-            'url': video_url,
-            'uploader': uploader,
-            'thumbnail': self._proto_relative_url(
-                info.get('thumbnail') or self._og_search_thumbnail(webpage),
-                'http:'),
-        })
-        return info
+            'formats': formats,
+            **self._search_json_ld(self._download_webpage(
+                f'https://www.vbox7.com/play:{video_id}', video_id, fatal=False) or '', video_id, fatal=False),
+            **traverse_obj(data, {
+                'title': ('title', {str}),
+                'uploader': ('uploader', {str}),
+                'duration': ('duration', {int_or_none}),
+            }),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/veehd.py b/plugins/youtube_download/yt_dlp/extractor/veehd.py
deleted file mode 100644
index 5ecd887..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/veehd.py
+++ /dev/null
@@ -1,116 +0,0 @@
-import re
-import json
-
-from .common import InfoExtractor
-from ..compat import (
-    compat_urllib_parse_unquote,
-    compat_urlparse,
-)
-from ..utils import (
-    ExtractorError,
-    clean_html,
-    get_element_by_id,
-)
-
-
-class VeeHDIE(InfoExtractor):
-    _VALID_URL = r'https?://veehd\.com/video/(?P<id>\d+)'
-
-    # Seems VeeHD videos have multiple copies on several servers, all of
-    # whom have different MD5 checksums, so omit md5 field in all tests
-    _TESTS = [{
-        'url': 'http://veehd.com/video/4639434_Solar-Sinter',
-        'info_dict': {
-            'id': '4639434',
-            'ext': 'mp4',
-            'title': 'Solar Sinter',
-            'uploader_id': 'VideoEyes',
-            'description': 'md5:46a840e8692ddbaffb5f81d9885cb457',
-        },
-        'skip': 'Video deleted',
-    }, {
-        'url': 'http://veehd.com/video/4905758_Elysian-Fields-Channeling',
-        'info_dict': {
-            'id': '4905758',
-            'ext': 'mp4',
-            'title': 'Elysian Fields - Channeling',
-            'description': 'md5:360e4e95fdab58aefbea0f2a19e5604b',
-            'uploader_id': 'spotted',
-        }
-    }, {
-        'url': 'http://veehd.com/video/2046729_2012-2009-DivX-Trailer',
-        'info_dict': {
-            'id': '2046729',
-            'ext': 'avi',
-            'title': '2012 (2009) DivX Trailer',
-            'description': 'md5:75435ee95255e6a9838ac6f6f3a2396b',
-            'uploader_id': 'Movie_Trailers',
-        }
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        # VeeHD seems to send garbage on the first request.
-        # See https://github.com/ytdl-org/youtube-dl/issues/2102
-        self._download_webpage(url, video_id, 'Requesting webpage')
-        webpage = self._download_webpage(url, video_id)
-
-        if 'This video has been removed<' in webpage:
-            raise ExtractorError('Video %s has been removed' % video_id, expected=True)
-
-        player_path = self._search_regex(
-            r'\$\("#playeriframe"\).attr\({src : "(.+?)"',
-            webpage, 'player path')
-        player_url = compat_urlparse.urljoin(url, player_path)
-
-        self._download_webpage(player_url, video_id, 'Requesting player page')
-        player_page = self._download_webpage(
-            player_url, video_id, 'Downloading player page')
-
-        video_url = None
-
-        config_json = self._search_regex(
-            r'value=\'config=({.+?})\'', player_page, 'config json', default=None)
-
-        if config_json:
-            config = json.loads(config_json)
-            video_url = compat_urllib_parse_unquote(config['clip']['url'])
-
-        if not video_url:
-            video_url = self._html_search_regex(
-                r'<embed[^>]+type="video/divx"[^>]+src="([^"]+)"',
-                player_page, 'video url', default=None)
-
-        if not video_url:
-            iframe_src = self._search_regex(
-                r'<iframe[^>]+src="/?([^"]+)"', player_page, 'iframe url')
-            iframe_url = 'http://veehd.com/%s' % iframe_src
-
-            self._download_webpage(iframe_url, video_id, 'Requesting iframe page')
-            iframe_page = self._download_webpage(
-                iframe_url, video_id, 'Downloading iframe page')
-
-            video_url = self._search_regex(
-                r"file\s*:\s*'([^']+)'", iframe_page, 'video url')
-
-        title = clean_html(get_element_by_id('videoName', webpage).rpartition('|')[0])
-        uploader_id = self._html_search_regex(
-            r'<a href="/profile/\d+">(.+?)</a>',
-            webpage, 'uploader')
-        thumbnail = self._search_regex(
-            r'<img id="veehdpreview" src="(.+?)"',
-            webpage, 'thumbnail')
-        description = self._html_search_regex(
-            r'<td class="infodropdown".*?<div>(.*?)<ul',
-            webpage, 'description', flags=re.DOTALL)
-
-        return {
-            '_type': 'video',
-            'id': video_id,
-            'title': title,
-            'url': video_url,
-            'uploader_id': uploader_id,
-            'thumbnail': thumbnail,
-            'description': description,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/veo.py b/plugins/youtube_download/yt_dlp/extractor/veo.py
index ef44d42..9d3c39f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/veo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/veo.py
@@ -1,5 +1,4 @@
 from .common import InfoExtractor
-
 from ..utils import (
     int_or_none,
     mimetype2ext,
@@ -23,7 +22,7 @@ class VeoIE(InfoExtractor):
             'timestamp': 1603847208,
             'duration': 1916,
             'view_count': int,
-        }
+        },
     }, {
         'url': 'https://app.veo.co/matches/20220313-2022-03-13_u15m-plsjq-vs-csl/',
         'only_matching': True,
@@ -33,10 +32,10 @@ class VeoIE(InfoExtractor):
         video_id = self._match_id(url)
 
         metadata = self._download_json(
-            'https://app.veo.co/api/app/matches/%s' % video_id, video_id)
+            f'https://app.veo.co/api/app/matches/{video_id}', video_id)
 
         video_data = self._download_json(
-            'https://app.veo.co/api/app/matches/%s/videos' % video_id, video_id, 'Downloading video data')
+            f'https://app.veo.co/api/app/matches/{video_id}/videos', video_id, 'Downloading video data')
 
         formats = []
         for fmt in video_data:
diff --git a/plugins/youtube_download/yt_dlp/extractor/veoh.py b/plugins/youtube_download/yt_dlp/extractor/veoh.py
deleted file mode 100644
index 92ff865..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/veoh.py
+++ /dev/null
@@ -1,188 +0,0 @@
-import functools
-import json
-
-from .common import InfoExtractor
-from ..utils import (
-    ExtractorError,
-    OnDemandPagedList,
-    int_or_none,
-    parse_duration,
-    qualities,
-    try_get,
-)
-
-
-class VeohIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?veoh\.com/(?:watch|videos|embed|iphone/#_Watch)/(?P<id>(?:v|e|yapi-)[\da-zA-Z]+)'
-
-    _TESTS = [{
-        'url': 'http://www.veoh.com/watch/v56314296nk7Zdmz3',
-        'md5': '620e68e6a3cff80086df3348426c9ca3',
-        'info_dict': {
-            'id': 'v56314296nk7Zdmz3',
-            'ext': 'mp4',
-            'title': 'Straight Backs Are Stronger',
-            'description': 'md5:203f976279939a6dc664d4001e13f5f4',
-            'thumbnail': 're:https://fcache\\.veoh\\.com/file/f/th56314296\\.jpg(\\?.*)?',
-            'uploader': 'LUMOback',
-            'duration': 46,
-            'view_count': int,
-            'average_rating': int,
-            'comment_count': int,
-            'age_limit': 0,
-            'categories': ['technology_and_gaming'],
-            'tags': ['posture', 'posture', 'sensor', 'back', 'pain', 'wearable', 'tech', 'lumo'],
-        },
-    }, {
-        'url': 'http://www.veoh.com/embed/v56314296nk7Zdmz3',
-        'only_matching': True,
-    }, {
-        'url': 'http://www.veoh.com/watch/v27701988pbTc4wzN?h1=Chile+workers+cover+up+to+avoid+skin+damage',
-        'md5': '4a6ff84b87d536a6a71e6aa6c0ad07fa',
-        'info_dict': {
-            'id': '27701988',
-            'ext': 'mp4',
-            'title': 'Chile workers cover up to avoid skin damage',
-            'description': 'md5:2bd151625a60a32822873efc246ba20d',
-            'uploader': 'afp-news',
-            'duration': 123,
-        },
-        'skip': 'This video has been deleted.',
-    }, {
-        'url': 'http://www.veoh.com/watch/v69525809F6Nc4frX',
-        'md5': '4fde7b9e33577bab2f2f8f260e30e979',
-        'note': 'Embedded ooyala video',
-        'info_dict': {
-            'id': '69525809',
-            'ext': 'mp4',
-            'title': 'Doctors Alter Plan For Preteen\'s Weight Loss Surgery',
-            'description': 'md5:f5a11c51f8fb51d2315bca0937526891',
-            'uploader': 'newsy-videos',
-        },
-        'skip': 'This video has been deleted.',
-    }, {
-        'url': 'http://www.veoh.com/watch/e152215AJxZktGS',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.veoh.com/videos/v16374379WA437rMH',
-        'md5': 'cceb73f3909063d64f4b93d4defca1b3',
-        'info_dict': {
-            'id': 'v16374379WA437rMH',
-            'ext': 'mp4',
-            'title': 'Phantasmagoria 2, pt. 1-3',
-            'description': 'Phantasmagoria: a Puzzle of Flesh',
-            'thumbnail': 're:https://fcache\\.veoh\\.com/file/f/th16374379\\.jpg(\\?.*)?',
-            'uploader': 'davidspackage',
-            'duration': 968,
-            'view_count': int,
-            'average_rating': int,
-            'comment_count': int,
-            'age_limit': 18,
-            'categories': ['technology_and_gaming', 'gaming'],
-            'tags': ['puzzle', 'of', 'flesh'],
-        }
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        metadata = self._download_json(
-            'https://www.veoh.com/watch/getVideo/' + video_id,
-            video_id)
-        video = metadata['video']
-        title = video['title']
-
-        thumbnail_url = None
-        q = qualities(['Regular', 'HQ'])
-        formats = []
-        for f_id, f_url in video.get('src', {}).items():
-            if not f_url:
-                continue
-            if f_id == 'poster':
-                thumbnail_url = f_url
-            else:
-                formats.append({
-                    'format_id': f_id,
-                    'quality': q(f_id),
-                    'url': f_url,
-                })
-
-        categories = metadata.get('categoryPath')
-        if not categories:
-            category = try_get(video, lambda x: x['category'].strip().removeprefix('category_'))
-            categories = [category] if category else None
-        tags = video.get('tags')
-
-        return {
-            'id': video_id,
-            'title': title,
-            'description': video.get('description'),
-            'thumbnail': thumbnail_url,
-            'uploader': video.get('author', {}).get('nickname'),
-            'duration': int_or_none(video.get('lengthBySec')) or parse_duration(video.get('length')),
-            'view_count': int_or_none(video.get('views')),
-            'formats': formats,
-            'average_rating': int_or_none(video.get('rating')),
-            'comment_count': int_or_none(video.get('numOfComments')),
-            'age_limit': 18 if video.get('contentRatingId') == 2 else 0,
-            'categories': categories,
-            'tags': tags.split(', ') if tags else None,
-        }
-
-
-class VeohUserIE(VeohIE):  # XXX: Do not subclass from concrete IE
-    _VALID_URL = r'https?://(?:www\.)?veoh\.com/users/(?P<id>[\w-]+)'
-    IE_NAME = 'veoh:user'
-
-    _TESTS = [
-        {
-            'url': 'https://www.veoh.com/users/valentinazoe',
-            'info_dict': {
-                'id': 'valentinazoe',
-                'title': 'valentinazoe (Uploads)'
-            },
-            'playlist_mincount': 75
-        },
-        {
-            'url': 'https://www.veoh.com/users/PiensaLibre',
-            'info_dict': {
-                'id': 'PiensaLibre',
-                'title': 'PiensaLibre (Uploads)'
-            },
-            'playlist_mincount': 2
-        }]
-
-    _PAGE_SIZE = 16
-
-    def _fetch_page(self, uploader, page):
-        response = self._download_json(
-            'https://www.veoh.com/users/published/videos', uploader,
-            note=f'Downloading videos page {page + 1}',
-            headers={
-                'x-csrf-token': self._TOKEN,
-                'content-type': 'application/json;charset=UTF-8'
-            },
-            data=json.dumps({
-                'username': uploader,
-                'maxResults': self._PAGE_SIZE,
-                'page': page + 1,
-                'requestName': 'userPage'
-            }).encode('utf-8'))
-        if not response.get('success'):
-            raise ExtractorError(response['message'])
-
-        for video in response['videos']:
-            yield self.url_result(f'https://www.veoh.com/watch/{video["permalinkId"]}', VeohIE,
-                                  video['permalinkId'], video.get('title'))
-
-    def _real_initialize(self):
-        webpage = self._download_webpage(
-            'https://www.veoh.com', None, note='Downloading authorization token')
-        self._TOKEN = self._search_regex(
-            r'csrfToken:\s*(["\'])(?P<token>[0-9a-zA-Z]{40})\1', webpage,
-            'request token', group='token')
-
-    def _real_extract(self, url):
-        uploader = self._match_id(url)
-        return self.playlist_result(OnDemandPagedList(
-            functools.partial(self._fetch_page, uploader),
-            self._PAGE_SIZE), uploader, f'{uploader} (Uploads)')
diff --git a/plugins/youtube_download/yt_dlp/extractor/vesti.py b/plugins/youtube_download/yt_dlp/extractor/vesti.py
index e9731a9..844041a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/vesti.py
+++ b/plugins/youtube_download/yt_dlp/extractor/vesti.py
@@ -1,11 +1,12 @@
 import re
 
 from .common import InfoExtractor
-from ..utils import ExtractorError
 from .rutv import RUTVIE
+from ..utils import ExtractorError
 
 
 class VestiIE(InfoExtractor):
+    _WORKING = False
     IE_DESC = 'Вести.Ru'
     _VALID_URL = r'https?://(?:.+?\.)?vesti\.ru/(?P<id>.+)'
 
@@ -93,7 +94,7 @@ class VestiIE(InfoExtractor):
                 # rtmp download
                 'skip_download': True,
             },
-            'skip': 'Translation has finished'
+            'skip': 'Translation has finished',
         },
     ]
 
@@ -108,7 +109,7 @@ class VestiIE(InfoExtractor):
             page)
         if mobj:
             video_id = mobj.group('id')
-            page = self._download_webpage('http://www.vesti.ru/only_video.html?vid=%s' % video_id, video_id,
+            page = self._download_webpage(f'http://www.vesti.ru/only_video.html?vid={video_id}', video_id,
                                           'Downloading video page')
 
         rutv_url = RUTVIE._extract_url(page)
diff --git a/plugins/youtube_download/yt_dlp/extractor/vevo.py b/plugins/youtube_download/yt_dlp/extractor/vevo.py
index aa40227..8552a60 100644
--- a/plugins/youtube_download/yt_dlp/extractor/vevo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/vevo.py
@@ -1,8 +1,7 @@
-import re
 import json
+import re
 
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..networking.exceptions import HTTPError
 from ..utils import (
     ExtractorError,
@@ -22,10 +21,10 @@ class VevoBaseIE(InfoExtractor):
 
 
 class VevoIE(VevoBaseIE):
-    '''
+    """
     Accepts urls from vevo.com or in the format 'vevo:{id}'
     (currently used by MTVIE and MySpaceIE)
-    '''
+    """
     _VALID_URL = r'''(?x)
         (?:https?://(?:www\.)?vevo\.com/watch/(?!playlist|genre)(?:[^/]+/(?:[^/]+/)?)?|
            https?://cache\.vevo\.com/m/html/embed\.html\?video=|
@@ -166,14 +165,14 @@ class VevoIE(VevoBaseIE):
             data=json.dumps({
                 'client_id': 'SPupX1tvqFEopQ1YS6SS',
                 'grant_type': 'urn:vevo:params:oauth:grant-type:anonymous',
-            }).encode('utf-8'),
+            }).encode(),
             headers={
                 'Content-Type': 'application/json',
             })
 
         if re.search(r'(?i)THIS PAGE IS CURRENTLY UNAVAILABLE IN YOUR REGION', webpage):
             self.raise_geo_restricted(
-                '%s said: This page is currently unavailable in your region' % self.IE_NAME)
+                f'{self.IE_NAME} said: This page is currently unavailable in your region')
 
         auth_info = self._parse_json(webpage, video_id)
         self._api_url_template = self.http_scheme() + '//apiv2.vevo.com/%s?token=' + auth_info['legacy_token']
@@ -185,7 +184,7 @@ class VevoIE(VevoBaseIE):
             if isinstance(e.cause, HTTPError):
                 errors = self._parse_json(e.cause.response.read().decode(), None)['errors']
                 error_message = ', '.join([error['message'] for error in errors])
-                raise ExtractorError('%s said: %s' % (self.IE_NAME, error_message), expected=True)
+                raise ExtractorError(f'{self.IE_NAME} said: {error_message}', expected=True)
             raise
         return data
 
@@ -195,11 +194,11 @@ class VevoIE(VevoBaseIE):
         self._initialize_api(video_id)
 
         video_info = self._call_api(
-            'video/%s' % video_id, video_id, 'Downloading api video info',
+            f'video/{video_id}', video_id, 'Downloading api video info',
             'Failed to download video info')
 
         video_versions = self._call_api(
-            'video/%s/streams' % video_id, video_id,
+            f'video/{video_id}/streams', video_id,
             'Downloading video versions info',
             'Failed to download video versions info',
             fatal=False)
@@ -215,7 +214,7 @@ class VevoIE(VevoBaseIE):
                 video_versions = [
                     value
                     for key, value in json_data['apollo']['data'].items()
-                    if key.startswith('%s.streams' % video_id)]
+                    if key.startswith(f'{video_id}.streams')]
 
         uploader = None
         artist = None
@@ -238,16 +237,16 @@ class VevoIE(VevoBaseIE):
                 continue
             elif '.mpd' in version_url:
                 formats.extend(self._extract_mpd_formats(
-                    version_url, video_id, mpd_id='dash-%s' % version,
-                    note='Downloading %s MPD information' % version,
-                    errnote='Failed to download %s MPD information' % version,
+                    version_url, video_id, mpd_id=f'dash-{version}',
+                    note=f'Downloading {version} MPD information',
+                    errnote=f'Failed to download {version} MPD information',
                     fatal=False))
             elif '.m3u8' in version_url:
                 formats.extend(self._extract_m3u8_formats(
                     version_url, video_id, 'mp4', 'm3u8_native',
-                    m3u8_id='hls-%s' % version,
-                    note='Downloading %s m3u8 information' % version,
-                    errnote='Failed to download %s m3u8 information' % version,
+                    m3u8_id=f'hls-{version}',
+                    note=f'Downloading {version} m3u8 information',
+                    errnote=f'Failed to download {version} m3u8 information',
                     fatal=False))
             else:
                 m = re.search(r'''(?xi)
@@ -275,13 +274,13 @@ class VevoIE(VevoBaseIE):
 
         track = video_info['title']
         if featured_artist:
-            artist = '%s ft. %s' % (artist, featured_artist)
-        title = '%s - %s' % (artist, track) if artist else track
+            artist = f'{artist} ft. {featured_artist}'
+        title = f'{artist} - {track}' if artist else track
 
         genres = video_info.get('genres')
         genre = (
             genres[0] if genres and isinstance(genres, list)
-            and isinstance(genres[0], compat_str) else None)
+            and isinstance(genres[0], str) else None)
 
         is_explicit = video_info.get('isExplicit')
         if is_explicit is True:
@@ -337,15 +336,15 @@ class VevoPlaylistIE(VevoBaseIE):
                 r'<meta[^>]+content=(["\'])vevo://video/(?P<id>.+?)\1[^>]*>',
                 webpage, 'video id', default=None, group='id')
             if video_id:
-                return self.url_result('vevo:%s' % video_id, VevoIE.ie_key())
+                return self.url_result(f'vevo:{video_id}', VevoIE.ie_key())
 
-        playlists = self._extract_json(webpage, playlist_id)['default']['%ss' % playlist_kind]
+        playlists = self._extract_json(webpage, playlist_id)['default'][f'{playlist_kind}s']
 
-        playlist = (list(playlists.values())[0]
+        playlist = (next(iter(playlists.values()))
                     if playlist_kind == 'playlist' else playlists[playlist_id])
 
         entries = [
-            self.url_result('vevo:%s' % src, VevoIE.ie_key())
+            self.url_result(f'vevo:{src}', VevoIE.ie_key())
             for src in playlist['isrcs']]
 
         return self.playlist_result(
diff --git a/plugins/youtube_download/yt_dlp/extractor/vgtv.py b/plugins/youtube_download/yt_dlp/extractor/vgtv.py
index db338fa..1eb2553 100644
--- a/plugins/youtube_download/yt_dlp/extractor/vgtv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/vgtv.py
@@ -39,7 +39,7 @@ class VGTVIE(XstreamIE):  # XXX: Do not subclass from concrete IE
     _VALID_URL = r'''(?x)
                     (?:https?://(?:www\.)?
                     (?P<host>
-                        %s
+                        {}
                     )
                     /?
                     (?:
@@ -48,10 +48,10 @@ class VGTVIE(XstreamIE):  # XXX: Do not subclass from concrete IE
                         a(?:rticles)?/
                     )|
                     (?P<appname>
-                        %s
+                        {}
                     ):)
                     (?P<id>\d+)
-                    ''' % ('|'.join(_HOST_TO_APPNAME.keys()), '|'.join(_APP_NAME_TO_VENDOR.keys()))
+                    '''.format('|'.join(_HOST_TO_APPNAME.keys()), '|'.join(_APP_NAME_TO_VENDOR.keys()))
 
     _TESTS = [
         {
@@ -174,13 +174,12 @@ class VGTVIE(XstreamIE):  # XXX: Do not subclass from concrete IE
         vendor = self._APP_NAME_TO_VENDOR[appname]
 
         data = self._download_json(
-            'http://svp.vg.no/svp/api/v1/%s/assets/%s?appName=%s-website'
-            % (vendor, video_id, appname),
+            f'http://svp.vg.no/svp/api/v1/{vendor}/assets/{video_id}?appName={appname}-website',
             video_id, 'Downloading media JSON')
 
         if data.get('status') == 'inactive':
             raise ExtractorError(
-                'Video %s is no longer available' % video_id, expected=True)
+                f'Video {video_id} is no longer available', expected=True)
 
         info = {
             'formats': [],
@@ -203,7 +202,7 @@ class VGTVIE(XstreamIE):  # XXX: Do not subclass from concrete IE
         if hds_url:
             hdcore_sign = 'hdcore=3.7.0'
             f4m_formats = self._extract_f4m_formats(
-                hds_url + '?%s' % hdcore_sign, video_id, f4m_id='hds', fatal=False)
+                hds_url + f'?{hdcore_sign}', video_id, f4m_id='hds', fatal=False)
             if f4m_formats:
                 for entry in f4m_formats:
                     # URLs without the extra param induce an 404 error
@@ -225,7 +224,7 @@ class VGTVIE(XstreamIE):  # XXX: Do not subclass from concrete IE
                     'width': int(mobj.group(1)),
                     'height': int(mobj.group(2)),
                     'tbr': tbr,
-                    'format_id': 'mp4-%s' % tbr,
+                    'format_id': f'mp4-{tbr}',
                 })
             formats.append(format_info)
 
@@ -275,7 +274,7 @@ class BTArticleIE(InfoExtractor):
         webpage = self._download_webpage(url, self._match_id(url))
         video_id = self._search_regex(
             r'<video[^>]+data-id="(\d+)"', webpage, 'video id')
-        return self.url_result('bttv:%s' % video_id, 'VGTV')
+        return self.url_result(f'bttv:{video_id}', 'VGTV')
 
 
 class BTVestlendingenIE(InfoExtractor):
@@ -308,4 +307,4 @@ class BTVestlendingenIE(InfoExtractor):
     }]
 
     def _real_extract(self, url):
-        return self.url_result('bttv:%s' % self._match_id(url), 'VGTV')
+        return self.url_result(f'bttv:{self._match_id(url)}', 'VGTV')
diff --git a/plugins/youtube_download/yt_dlp/extractor/vh1.py b/plugins/youtube_download/yt_dlp/extractor/vh1.py
index 41b8a46..53d5a71 100644
--- a/plugins/youtube_download/yt_dlp/extractor/vh1.py
+++ b/plugins/youtube_download/yt_dlp/extractor/vh1.py
@@ -1,6 +1,6 @@
 from .mtv import MTVServicesInfoExtractor
 
-# TODO Remove - Reason: Outdated Site
+# TODO: Remove - Reason: Outdated Site
 
 
 class VH1IE(MTVServicesInfoExtractor):
diff --git a/plugins/youtube_download/yt_dlp/extractor/vice.py b/plugins/youtube_download/yt_dlp/extractor/vice.py
index 8a71268..3739a37 100644
--- a/plugins/youtube_download/yt_dlp/extractor/vice.py
+++ b/plugins/youtube_download/yt_dlp/extractor/vice.py
@@ -7,13 +7,12 @@ import time
 from .adobepass import AdobePassIE
 from .common import InfoExtractor
 from .youtube import YoutubeIE
-from ..compat import compat_str
 from ..networking.exceptions import HTTPError
 from ..utils import (
-    clean_html,
     ExtractorError,
-    int_or_none,
     OnDemandPagedList,
+    clean_html,
+    int_or_none,
     parse_age_limit,
     str_or_none,
     try_get,
@@ -28,7 +27,7 @@ class ViceBaseIE(InfoExtractor):
   %s(locale: "%s", %s: "%s"%s) {
     %s
   }
-}''' % (resource, locale, resource_key, resource_id, args, fields),
+}''' % (resource, locale, resource_key, resource_id, args, fields),  # noqa: UP031
             })['data'][resource]
 
 
@@ -127,7 +126,7 @@ class ViceIE(ViceBaseIE, AdobePassIE):
 
         query.update({
             'exp': exp,
-            'sign': hashlib.sha512(('%s:GET:%d' % (video_id, exp)).encode()).hexdigest(),
+            'sign': hashlib.sha512(f'{video_id}:GET:{exp}'.encode()).hexdigest(),
             'skipadstitching': 1,
             'platform': 'desktop',
             'rn': random.randint(10000, 100000),
@@ -135,14 +134,13 @@ class ViceIE(ViceBaseIE, AdobePassIE):
 
         try:
             preplay = self._download_json(
-                'https://vms.vice.com/%s/video/preplay/%s' % (locale, video_id),
+                f'https://vms.vice.com/{locale}/video/preplay/{video_id}',
                 video_id, query=query)
         except ExtractorError as e:
             if isinstance(e.cause, HTTPError) and e.cause.status in (400, 401):
                 error = json.loads(e.cause.response.read().decode())
                 error_message = error.get('error_description') or error['details']
-                raise ExtractorError('%s said: %s' % (
-                    self.IE_NAME, error_message), expected=True)
+                raise ExtractorError(f'{self.IE_NAME} said: {error_message}', expected=True)
             raise
 
         video_data = preplay['video']
@@ -157,7 +155,7 @@ class ViceIE(ViceBaseIE, AdobePassIE):
             cc_url = subtitle.get('url')
             if not cc_url:
                 continue
-            language_code = try_get(subtitle, lambda x: x['languages'][0]['language_code'], compat_str) or 'en'
+            language_code = try_get(subtitle, lambda x: x['languages'][0]['language_code'], str) or 'en'
             subtitles.setdefault(language_code, []).append({
                 'url': cc_url,
             })
@@ -171,7 +169,7 @@ class ViceIE(ViceBaseIE, AdobePassIE):
             'duration': int_or_none(video_data.get('video_duration')),
             'timestamp': int_or_none(video_data.get('created_at'), 1000),
             'age_limit': parse_age_limit(video_data.get('video_rating') or rating),
-            'series': try_get(video_data, lambda x: x['show']['base']['display_title'], compat_str),
+            'series': try_get(video_data, lambda x: x['show']['base']['display_title'], str),
             'episode_number': int_or_none(episode.get('episode_number')),
             'episode_id': str_or_none(episode.get('id') or video_data.get('episode_id')),
             'season_number': int_or_none(season.get('season_number')),
@@ -202,7 +200,7 @@ class ViceShowIE(ViceBaseIE):
     def _fetch_page(self, locale, show_id, page):
         videos = self._call_api('videos', 'show_id', show_id, locale, '''body
     id
-    url''', ', page: %d, per_page: %d' % (page + 1, self._PAGE_SIZE))
+    url''', f', page: {page + 1}, per_page: {self._PAGE_SIZE}')
         for video in videos:
             yield self.url_result(
                 video['url'], ViceIE.ie_key(), video.get('id'))
@@ -224,7 +222,7 @@ class ViceShowIE(ViceBaseIE):
 
 class ViceArticleIE(ViceBaseIE):
     IE_NAME = 'vice:article'
-    _VALID_URL = r'https://(?:www\.)?vice\.com/(?P<locale>[^/]+)/article/(?:[0-9a-z]{6}/)?(?P<id>[^?#]+)'
+    _VALID_URL = r'https?://(?:www\.)?vice\.com/(?P<locale>[^/]+)/article/(?:[0-9a-z]{6}/)?(?P<id>[^?#]+)'
 
     _TESTS = [{
         'url': 'https://www.vice.com/en_us/article/on-set-with-the-woman-making-mormon-porn-in-utah',
@@ -302,12 +300,6 @@ class ViceArticleIE(ViceBaseIE):
         if vice_url:
             return _url_res(vice_url, ViceIE.ie_key())
 
-        embed_code = self._search_regex(
-            r'embedCode=([^&\'"]+)', body,
-            'ooyala embed code', default=None)
-        if embed_code:
-            return _url_res('ooyala:%s' % embed_code, 'Ooyala')
-
         youtube_url = YoutubeIE._extract_url(body)
         if youtube_url:
             return _url_res(youtube_url, YoutubeIE.ie_key())
diff --git a/plugins/youtube_download/yt_dlp/extractor/vidbit.py b/plugins/youtube_download/yt_dlp/extractor/vidbit.py
deleted file mode 100644
index 2813032..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/vidbit.py
+++ /dev/null
@@ -1,82 +0,0 @@
-from .common import InfoExtractor
-from ..compat import compat_urlparse
-from ..utils import (
-    int_or_none,
-    js_to_json,
-    remove_end,
-    unified_strdate,
-)
-
-
-class VidbitIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?vidbit\.co/(?:watch|embed)\?.*?\bv=(?P<id>[\da-zA-Z]+)'
-    _TESTS = [{
-        'url': 'http://www.vidbit.co/watch?v=jkL2yDOEq2',
-        'md5': '1a34b7f14defe3b8fafca9796892924d',
-        'info_dict': {
-            'id': 'jkL2yDOEq2',
-            'ext': 'mp4',
-            'title': 'Intro to VidBit',
-            'description': 'md5:5e0d6142eec00b766cbf114bfd3d16b7',
-            'thumbnail': r're:https?://.*\.jpg$',
-            'upload_date': '20160618',
-            'view_count': int,
-            'comment_count': int,
-        }
-    }, {
-        'url': 'http://www.vidbit.co/embed?v=jkL2yDOEq2&auto=0&water=0',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        webpage = self._download_webpage(
-            compat_urlparse.urljoin(url, '/watch?v=%s' % video_id), video_id)
-
-        video_url, title = [None] * 2
-
-        config = self._parse_json(self._search_regex(
-            r'(?s)\.setup\(({.+?})\);', webpage, 'setup', default='{}'),
-            video_id, transform_source=js_to_json)
-        if config:
-            if config.get('file'):
-                video_url = compat_urlparse.urljoin(url, config['file'])
-            title = config.get('title')
-
-        if not video_url:
-            video_url = compat_urlparse.urljoin(url, self._search_regex(
-                r'file\s*:\s*(["\'])(?P<url>(?:(?!\1).)+)\1',
-                webpage, 'video URL', group='url'))
-
-        if not title:
-            title = remove_end(
-                self._html_search_regex(
-                    (r'<h1>(.+?)</h1>', r'<title>(.+?)</title>'),
-                    webpage, 'title', default=None) or self._og_search_title(webpage),
-                ' - VidBit')
-
-        description = self._html_search_meta(
-            ('description', 'og:description', 'twitter:description'),
-            webpage, 'description')
-
-        upload_date = unified_strdate(self._html_search_meta(
-            'datePublished', webpage, 'upload date'))
-
-        view_count = int_or_none(self._search_regex(
-            r'<strong>(\d+)</strong> views',
-            webpage, 'view count', fatal=False))
-        comment_count = int_or_none(self._search_regex(
-            r'id=["\']cmt_num["\'][^>]*>\((\d+)\)',
-            webpage, 'comment count', fatal=False))
-
-        return {
-            'id': video_id,
-            'url': video_url,
-            'title': title,
-            'description': description,
-            'thumbnail': self._og_search_thumbnail(webpage),
-            'upload_date': upload_date,
-            'view_count': view_count,
-            'comment_count': comment_count,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/viddler.py b/plugins/youtube_download/yt_dlp/extractor/viddler.py
index 4091477..60ebfbd 100644
--- a/plugins/youtube_download/yt_dlp/extractor/viddler.py
+++ b/plugins/youtube_download/yt_dlp/extractor/viddler.py
@@ -25,7 +25,7 @@ class ViddlerIE(InfoExtractor):
             'view_count': int,
             'comment_count': int,
             'categories': ['video content', 'high quality video', 'video made easy', 'how to produce video with limited resources', 'viddler'],
-        }
+        },
     }, {
         'url': 'http://www.viddler.com/v/4d03aad9/',
         'md5': 'f12c5a7fa839c47a79363bfdf69404fb',
@@ -38,7 +38,7 @@ class ViddlerIE(InfoExtractor):
             'timestamp': 1422285291,
             'view_count': int,
             'comment_count': int,
-        }
+        },
     }, {
         'url': 'http://www.viddler.com/player/221ebbbd/0/',
         'md5': '740511f61d3d1bb71dc14a0fe01a1c10',
@@ -52,7 +52,7 @@ class ViddlerIE(InfoExtractor):
             'timestamp': 1411997190,
             'view_count': int,
             'comment_count': int,
-        }
+        },
     }, {
         # secret protected
         'url': 'http://www.viddler.com/v/890c0985?secret=34051570',
diff --git a/plugins/youtube_download/yt_dlp/extractor/videa.py b/plugins/youtube_download/yt_dlp/extractor/videa.py
index 59ae933..8dc7ebd 100644
--- a/plugins/youtube_download/yt_dlp/extractor/videa.py
+++ b/plugins/youtube_download/yt_dlp/extractor/videa.py
@@ -1,9 +1,10 @@
+import base64
 import random
 import string
 import struct
 
 from .common import InfoExtractor
-from ..compat import compat_b64decode, compat_ord
+from ..compat import compat_ord
 from ..utils import (
     ExtractorError,
     int_or_none,
@@ -38,6 +39,7 @@ class VideaIE(InfoExtractor):
             'title': 'Az őrült kígyász 285 kígyót enged szabadon',
             'thumbnail': r're:^https?://.*',
             'duration': 21,
+            'age_limit': 0,
         },
     }, {
         'url': 'http://videa.hu/videok/origo/jarmuvek/supercars-elozes-jAHDWfWSJH5XuFhH',
@@ -48,6 +50,7 @@ class VideaIE(InfoExtractor):
             'title': 'Supercars előzés',
             'thumbnail': r're:^https?://.*',
             'duration': 64,
+            'age_limit': 0,
         },
     }, {
         'url': 'http://videa.hu/player?v=8YfIAjxwWGwT8HVQ',
@@ -58,6 +61,7 @@ class VideaIE(InfoExtractor):
             'title': 'Az őrült kígyász 285 kígyót enged szabadon',
             'thumbnail': r're:^https?://.*',
             'duration': 21,
+            'age_limit': 0,
         },
     }, {
         'url': 'http://videa.hu/player/v/8YfIAjxwWGwT8HVQ?autoplay=1',
@@ -115,7 +119,7 @@ class VideaIE(InfoExtractor):
         l = nonce[:32]
         s = nonce[32:]
         result = ''
-        for i in range(0, 32):
+        for i in range(32):
             result += s[i - (self._STATIC_SECRET.index(l[i]) - 31)]
 
         query = parse_qs(player_url)
@@ -124,13 +128,13 @@ class VideaIE(InfoExtractor):
         query['_t'] = result[:16]
 
         b64_info, handle = self._download_webpage_handle(
-            'http://videa.hu/videaplayer_get_xml.php', video_id, query=query)
+            'http://videa.hu/player/xml', video_id, query=query)
         if b64_info.startswith('<?xml'):
             info = self._parse_xml(b64_info, video_id)
         else:
             key = result[16:] + random_seed + handle.headers['x-videa-xs']
             info = self._parse_xml(self.rc4(
-                compat_b64decode(b64_info), key), video_id)
+                base64.b64decode(b64_info), key), video_id)
 
         video = xpath_element(info, './video', 'video')
         if video is None:
diff --git a/plugins/youtube_download/yt_dlp/extractor/videocampus_sachsen.py b/plugins/youtube_download/yt_dlp/extractor/videocampus_sachsen.py
index 37bc7d7..3db3cf9 100644
--- a/plugins/youtube_download/yt_dlp/extractor/videocampus_sachsen.py
+++ b/plugins/youtube_download/yt_dlp/extractor/videocampus_sachsen.py
@@ -14,67 +14,77 @@ class VideocampusSachsenIE(InfoExtractor):
         'corporate.demo.vimp.com',
         'dancehalldatabase.com',
         'drehzahl.tv',
-        'educhannel.hs-gesundheit.de',
+        'educhannel.hs-gesundheit.de',  # Hochschule für Gesundheit NRW
         'emedia.ls.haw-hamburg.de',
         'globale-evolution.net',
         'hohu.tv',
         'htvideos.hightechhigh.org',
         'k210039.vimp.mivitec.net',
         'media.cmslegal.com',
-        'media.hs-furtwangen.de',
-        'media.hwr-berlin.de',
+        'media.fh-swf.de',  # Fachhochschule Südwestfalen
+        'media.hs-furtwangen.de',  # Hochschule Furtwangen
+        'media.hwr-berlin.de',  # Hochschule für Wirtschaft und Recht Berlin
         'mediathek.dkfz.de',
-        'mediathek.htw-berlin.de',
+        'mediathek.htw-berlin.de',  # Hochschule für Technik und Wirtschaft Berlin
         'mediathek.polizei-bw.de',
-        'medien.hs-merseburg.de',
-        'mportal.europa-uni.de',
+        'medien.hs-merseburg.de',  # Hochschule Merseburg
+        'mitmedia.manukau.ac.nz',  # Manukau Institute of Technology Auckland (NZ)
+        'mportal.europa-uni.de',  # Europa-Universität Viadrina
         'pacific.demo.vimp.com',
         'slctv.com',
         'streaming.prairiesouth.ca',
         'tube.isbonline.cn',
-        'univideo.uni-kassel.de',
+        'univideo.uni-kassel.de',  # Universität Kassel
         'ursula2.genetics.emory.edu',
         'ursulablicklevideoarchiv.com',
         'v.agrarumweltpaedagogik.at',
         'video.eplay-tv.de',
-        'video.fh-dortmund.de',
-        'video.hs-offenburg.de',
-        'video.hs-pforzheim.de',
-        'video.hspv.nrw.de',
+        'video.fh-dortmund.de',  # Fachhochschule Dortmund
+        'video.hs-nb.de',  # Hochschule Neubrandenburg
+        'video.hs-offenburg.de',  # Hochschule Offenburg
+        'video.hs-pforzheim.de',  # Hochschule Pforzheim
+        'video.hspv.nrw.de',  # Hochschule für Polizei und öffentliche Verwaltung NRW
         'video.irtshdf.fr',
         'video.pareygo.de',
-        'video.tu-freiberg.de',
-        'videocampus.sachsen.de',
-        'videoportal.uni-freiburg.de',
-        'videoportal.vm.uni-freiburg.de',
+        'video.tu-dortmund.de',  # Technische Universität Dortmund
+        'video.tu-freiberg.de',  # Technische Universität Bergakademie Freiberg
+        'videocampus.sachsen.de',  # Video Campus Sachsen (gemeinsame Videoplattform sächsischer Universitäten, Hochschulen und der Berufsakademie Sachsen)
+        'videoportal.uni-freiburg.de',  # Albert-Ludwigs-Universität Freiburg
+        'videoportal.vm.uni-freiburg.de',  # Albert-Ludwigs-Universität Freiburg
         'videos.duoc.cl',
-        'videos.uni-paderborn.de',
+        'videos.uni-paderborn.de',  # Universität Paderborn
         'vimp-bemus.udk-berlin.de',
         'vimp.aekwl.de',
         'vimp.hs-mittweida.de',
-        'vimp.oth-regensburg.de',
-        'vimp.ph-heidelberg.de',
+        'vimp.landesfilmdienste.de',
+        'vimp.oth-regensburg.de',  # Ostbayerische Technische Hochschule Regensburg
+        'vimp.ph-heidelberg.de',  # Pädagogische Hochschule Heidelberg
         'vimp.sma-events.com',
         'vimp.weka-fachmedien.de',
+        'vimpdesk.com',
         'webtv.univ-montp3.fr',
-        'www.b-tu.de/media',
+        'www.b-tu.de/media',  # Brandenburgische Technische Universität Cottbus-Senftenberg
         'www.bergauf.tv',
         'www.bigcitytv.de',
         'www.cad-videos.de',
         'www.drehzahl.tv',
-        'www.fh-bielefeld.de/medienportal',
         'www.hohu.tv',
+        'www.hsbi.de/medienportal',  # Hochschule Bielefeld
+        'www.logistic.tv',
         'www.orvovideo.com',
+        'www.printtube.co.uk',
         'www.rwe.tv',
         'www.salzi.tv',
+        'www.signtube.co.uk',
+        'www.twb-power.com',
         'www.wenglor-media.com',
         'www2.univ-sba.dz',
     )
-    _VALID_URL = r'''(?x)https?://(?P<host>%s)/(?:
+    _VALID_URL = r'''(?x)https?://(?P<host>{})/(?:
         m/(?P<tmp_id>[0-9a-f]+)|
-        (?:category/)?video/(?P<display_id>[\w-]+)/(?P<id>[0-9a-f]{32})|
-        media/embed.*(?:\?|&)key=(?P<embed_id>[0-9a-f]{32}&?)
-    )''' % ('|'.join(map(re.escape, _INSTANCES)))
+        (?:category/)?video/(?P<display_id>[\w-]+)/(?P<id>[0-9a-f]{{32}})|
+        media/embed.*(?:\?|&)key=(?P<embed_id>[0-9a-f]{{32}}&?)
+    )'''.format('|'.join(map(re.escape, _INSTANCES)))
 
     _TESTS = [
         {
@@ -119,7 +129,7 @@ class VideocampusSachsenIE(InfoExtractor):
                 'thumbnail': 'https://www2.univ-sba.dz/cache/4d5d4a0b4189271a8cc6cb5328e14769.jpg',
                 'display_id': 'Presentation-de-la-Faculte-de-droit-et-des-sciences-politiques-Journee-portes-ouvertes-202122',
                 'ext': 'mp4',
-            }
+            },
         },
         {
             'url': 'https://vimp.weka-fachmedien.de/video/Preisverleihung-Produkte-des-Jahres-2022/c8816f1cc942c12b6cce57c835cffd7c',
@@ -187,23 +197,24 @@ class VideocampusSachsenIE(InfoExtractor):
 
 class ViMPPlaylistIE(InfoExtractor):
     IE_NAME = 'ViMP:Playlist'
-    _VALID_URL = r'''(?x)(?P<host>https?://(?:%s))/(?:
-        album/view/aid/(?P<album_id>[0-9]+)|
-        (?P<mode>category|channel)/(?P<name>[\w-]+)/(?P<id>[0-9]+)
-    )''' % '|'.join(map(re.escape, VideocampusSachsenIE._INSTANCES))
+    _VALID_URL = r'''(?x)(?P<host>https?://(?:{}))/(?:
+        (?P<mode1>album)/view/aid/(?P<album_id>[0-9]+)|
+        (?P<mode2>category|channel)/(?P<name>[\w-]+)/(?P<channel_id>[0-9]+)|
+        (?P<mode3>tag)/(?P<tag_id>[0-9]+)
+    )'''.format('|'.join(map(re.escape, VideocampusSachsenIE._INSTANCES)))
 
     _TESTS = [{
         'url': 'https://vimp.oth-regensburg.de/channel/Designtheorie-1-SoSe-2020/3',
         'info_dict': {
             'id': 'channel-3',
-            'title': 'Designtheorie 1 SoSe 2020 :: Channels :: ViMP OTH Regensburg',
+            'title': 'Designtheorie 1 SoSe 2020 - Channels - ViMP OTH Regensburg',
         },
         'playlist_mincount': 9,
     }, {
-        'url': 'https://www.fh-bielefeld.de/medienportal/album/view/aid/208',
+        'url': 'https://www.hsbi.de/medienportal/album/view/aid/208',
         'info_dict': {
             'id': 'album-208',
-            'title': 'KG Praktikum ABT/MEC :: Playlists :: FH-Medienportal',
+            'title': 'KG Praktikum ABT/MEC - Playlists - HSBI-Medienportal',
         },
         'playlist_mincount': 4,
     }, {
@@ -213,41 +224,51 @@ class ViMPPlaylistIE(InfoExtractor):
             'title': 'Online-Seminare ONYX - BPS - Bildungseinrichtungen - VCS',
         },
         'playlist_mincount': 7,
+    }, {
+        'url': 'https://videocampus.sachsen.de/tag/26902',
+        'info_dict': {
+            'id': 'tag-26902',
+            'title': 'advanced mobile and v2x communication - Tags - VCS',
+        },
+        'playlist_mincount': 6,
     }]
     _PAGE_SIZE = 10
 
-    def _fetch_page(self, host, url_part, id, data, page):
+    def _fetch_page(self, host, url_part, playlist_id, data, page):
         webpage = self._download_webpage(
-            f'{host}/media/ajax/component/boxList/{url_part}', id,
+            f'{host}/media/ajax/component/boxList/{url_part}', playlist_id,
             query={'page': page, 'page_only': 1}, data=urlencode_postdata(data))
-        urls = re.findall(r'"([^"]+/video/[^"]+)"', webpage)
+        urls = re.findall(r'"([^"]*/video/[^"]+)"', webpage)
 
         for url in urls:
             yield self.url_result(host + url, VideocampusSachsenIE)
 
     def _real_extract(self, url):
-        host, album_id, mode, name, id = self._match_valid_url(url).group(
-            'host', 'album_id', 'mode', 'name', 'id')
+        host, album_id, name, channel_id, tag_id, mode1, mode2, mode3 = self._match_valid_url(url).group(
+            'host', 'album_id', 'name', 'channel_id', 'tag_id', 'mode1', 'mode2', 'mode3')
 
-        webpage = self._download_webpage(url, album_id or id, fatal=False) or ''
+        mode = mode1 or mode2 or mode3
+        playlist_id = album_id or channel_id or tag_id
+
+        webpage = self._download_webpage(url, playlist_id, fatal=False) or ''
         title = (self._html_search_meta('title', webpage, fatal=False)
                  or self._html_extract_title(webpage))
 
         url_part = (f'aid/{album_id}' if album_id
-                    else f'category/{name}/category_id/{id}' if mode == 'category'
-                    else f'title/{name}/channel/{id}')
+                    else f'category/{name}/category_id/{channel_id}' if mode == 'category'
+                    else f'title/{name}/channel/{channel_id}' if mode == 'channel'
+                    else f'tag/{tag_id}')
 
-        mode = mode or 'album'
         data = {
             'vars[mode]': mode,
-            f'vars[{mode}]': album_id or id,
-            'vars[context]': '4' if album_id else '1' if mode == 'category' else '3',
-            'vars[context_id]': album_id or id,
+            f'vars[{mode}]': playlist_id,
+            'vars[context]': '4' if album_id else '1' if mode == 'category' else '3' if mode == 'album' else '0',
+            'vars[context_id]': playlist_id,
             'vars[layout]': 'thumb',
             'vars[per_page][thumb]': str(self._PAGE_SIZE),
         }
 
         return self.playlist_result(
             OnDemandPagedList(functools.partial(
-                self._fetch_page, host, url_part, album_id or id, data), self._PAGE_SIZE),
-            playlist_title=title, id=f'{mode}-{album_id or id}')
+                self._fetch_page, host, url_part, playlist_id, data), self._PAGE_SIZE),
+            playlist_title=title, id=f'{mode}-{playlist_id}')
diff --git a/plugins/youtube_download/yt_dlp/extractor/videofyme.py b/plugins/youtube_download/yt_dlp/extractor/videofyme.py
index 1d1c8f7..6cdda75 100644
--- a/plugins/youtube_download/yt_dlp/extractor/videofyme.py
+++ b/plugins/youtube_download/yt_dlp/extractor/videofyme.py
@@ -6,6 +6,7 @@ from ..utils import (
 
 
 class VideofyMeIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.videofy\.me/.+?|p\.videofy\.me/v)/(?P<id>\d+)(&|#|$)'
     IE_NAME = 'videofy.me'
 
@@ -22,7 +23,7 @@ class VideofyMeIE(InfoExtractor):
             'uploader': 'VideofyMe',
             'uploader_id': 'thisisvideofyme',
             'view_count': int,
-            'likes': int,
+            'like_count': int,
             'comment_count': int,
         },
     }
@@ -30,7 +31,7 @@ class VideofyMeIE(InfoExtractor):
     def _real_extract(self, url):
         video_id = self._match_id(url)
 
-        config = self._download_json('http://vf-player-info-loader.herokuapp.com/%s.json' % video_id, video_id)['videoinfo']
+        config = self._download_json(f'http://vf-player-info-loader.herokuapp.com/{video_id}.json', video_id)['videoinfo']
 
         video = config.get('video')
         blog = config.get('blog', {})
@@ -45,6 +46,6 @@ class VideofyMeIE(InfoExtractor):
             'uploader': blog.get('name'),
             'uploader_id': blog.get('identifier'),
             'view_count': int_or_none(self._search_regex(r'([0-9]+)', video.get('views'), 'view count', fatal=False)),
-            'likes': int_or_none(video.get('likes')),
+            'like_count': int_or_none(video.get('likes')),
             'comment_count': int_or_none(video.get('nrOfComments')),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/videoken.py b/plugins/youtube_download/yt_dlp/extractor/videoken.py
index 560b41a..dc1dcf1 100644
--- a/plugins/youtube_download/yt_dlp/extractor/videoken.py
+++ b/plugins/youtube_download/yt_dlp/extractor/videoken.py
@@ -11,6 +11,7 @@ from ..utils import (
     ExtractorError,
     InAdvancePagedList,
     int_or_none,
+    remove_start,
     traverse_obj,
     update_url_query,
     url_or_none,
@@ -39,11 +40,11 @@ class VideoKenBaseIE(InfoExtractor):
         if not video_url and not video_id:
             return
         elif not video_url or 'embed/sign-in' in video_url:
-            video_url = f'https://slideslive.com/embed/{video_id.lstrip("slideslive-")}'
+            video_url = f'https://slideslive.com/embed/{remove_start(video_id, "slideslive-")}'
         if url_or_none(referer):
             return update_url_query(video_url, {
                 'embed_parent_url': referer,
-                'embed_container_origin': f'https://{urllib.parse.urlparse(referer).netloc}',
+                'embed_container_origin': f'https://{urllib.parse.urlparse(referer).hostname}',
             })
         return video_url
 
@@ -57,12 +58,12 @@ class VideoKenBaseIE(InfoExtractor):
                 video_url = video_id
                 ie_key = 'Youtube'
             else:
-                video_url = traverse_obj(video, 'embed_url', 'embeddableurl')
-                if urllib.parse.urlparse(video_url).netloc == 'slideslive.com':
+                video_url = traverse_obj(video, 'embed_url', 'embeddableurl', expected_type=url_or_none)
+                if not video_url:
+                    continue
+                elif urllib.parse.urlparse(video_url).hostname == 'slideslive.com':
                     ie_key = SlidesLiveIE
                     video_url = self._create_slideslive_url(video_url, video_id, url)
-            if not video_url:
-                continue
             yield self.url_result(video_url, ie_key, video_id)
 
 
@@ -178,7 +179,7 @@ class VideoKenIE(VideoKenBaseIE):
             return self.url_result(
                 self._create_slideslive_url(None, video_id, url), SlidesLiveIE, video_id)
         elif re.match(r'^[\w-]{11}$', video_id):
-            self.url_result(video_id, 'Youtube', video_id)
+            return self.url_result(video_id, 'Youtube', video_id)
         else:
             raise ExtractorError('Unable to extract without VideoKen API response')
 
@@ -292,7 +293,7 @@ class VideoKenTopicIE(VideoKenBaseIE):
         'playlist_mincount': 77,
         'info_dict': {
             'id': 'gravitational_waves',
-            'title': 'gravitational waves'
+            'title': 'gravitational waves',
         },
     }, {
         'url': 'https://videos.cncf.io/topic/prometheus/',
diff --git a/plugins/youtube_download/yt_dlp/extractor/videomore.py b/plugins/youtube_download/yt_dlp/extractor/videomore.py
index ddc33f7..c41d3d9 100644
--- a/plugins/youtube_download/yt_dlp/extractor/videomore.py
+++ b/plugins/youtube_download/yt_dlp/extractor/videomore.py
@@ -1,7 +1,4 @@
 from .common import InfoExtractor
-from ..compat import (
-    compat_str,
-)
 from ..utils import (
     int_or_none,
     parse_qs,
@@ -253,7 +250,7 @@ class VideomoreVideoIE(VideomoreBaseIE):
         'params': {
             'skip_download': True,
         },
-        'skip': 'redirects to https://more.tv/'
+        'skip': 'redirects to https://more.tv/',
     }, {
         'url': 'https://videomore.ru/molodezhka/6_sezon/29_seriya?utm_so',
         'only_matching': True,
@@ -264,7 +261,7 @@ class VideomoreVideoIE(VideomoreBaseIE):
 
     @classmethod
     def suitable(cls, url):
-        return False if VideomoreIE.suitable(url) else super(VideomoreVideoIE, cls).suitable(url)
+        return False if VideomoreIE.suitable(url) else super().suitable(url)
 
     def _real_extract(self, url):
         display_id = self._match_id(url)
@@ -292,14 +289,14 @@ class VideomoreSeasonIE(VideomoreBaseIE):
     @classmethod
     def suitable(cls, url):
         return (False if (VideomoreIE.suitable(url) or VideomoreVideoIE.suitable(url))
-                else super(VideomoreSeasonIE, cls).suitable(url))
+                else super().suitable(url))
 
     def _real_extract(self, url):
         display_id = self._match_id(url)
         season = self._download_page_data(display_id)
-        season_id = compat_str(season['id'])
+        season_id = str(season['id'])
         tracks = self._download_json(
-            self._API_BASE_URL + 'seasons/%s/tracks' % season_id,
+            self._API_BASE_URL + f'seasons/{season_id}/tracks',
             season_id)['data']
         entries = []
         for track in tracks:
diff --git a/plugins/youtube_download/yt_dlp/extractor/videopress.py b/plugins/youtube_download/yt_dlp/extractor/videopress.py
index 0734aee..d3c9c8e 100644
--- a/plugins/youtube_download/yt_dlp/extractor/videopress.py
+++ b/plugins/youtube_download/yt_dlp/extractor/videopress.py
@@ -14,7 +14,7 @@ from ..utils import (
 class VideoPressIE(InfoExtractor):
     _ID_REGEX = r'[\da-zA-Z]{8}'
     _PATH_REGEX = r'video(?:\.word)?press\.com/embed/'
-    _VALID_URL = r'https?://%s(?P<id>%s)' % (_PATH_REGEX, _ID_REGEX)
+    _VALID_URL = rf'https?://{_PATH_REGEX}(?P<id>{_ID_REGEX})'
     _EMBED_REGEX = [rf'<iframe[^>]+src=["\'](?P<url>(?:https?://)?{_PATH_REGEX}{_ID_REGEX})']
     _TESTS = [{
         'url': 'https://videopress.com/embed/kUJmAcSf',
@@ -44,7 +44,7 @@ class VideoPressIE(InfoExtractor):
         query = random_birthday('birth_year', 'birth_month', 'birth_day')
         query['fields'] = 'description,duration,file_url_base,files,height,original,poster,rating,title,upload_date,width'
         video = self._download_json(
-            'https://public-api.wordpress.com/rest/v1.1/videos/%s' % video_id,
+            f'https://public-api.wordpress.com/rest/v1.1/videos/{video_id}',
             video_id, query=query)
 
         title = video['title']
@@ -63,7 +63,7 @@ class VideoPressIE(InfoExtractor):
                 if ext in ('mp4', 'ogg'):
                     formats.append({
                         'url': urljoin(base_url, path),
-                        'format_id': '%s-%s' % (format_id, ext),
+                        'format_id': f'{format_id}-{ext}',
                         'ext': determine_ext(path, ext),
                         'quality': quality(format_id),
                     })
diff --git a/plugins/youtube_download/yt_dlp/extractor/vidflex.py b/plugins/youtube_download/yt_dlp/extractor/vidflex.py
new file mode 100644
index 0000000..ce0880b
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/vidflex.py
@@ -0,0 +1,148 @@
+import base64
+import json
+
+from .common import InfoExtractor
+from ..utils import (
+    int_or_none,
+    join_nonempty,
+    mimetype2ext,
+    url_or_none,
+)
+from ..utils.traversal import traverse_obj
+
+
+class VidflexIE(InfoExtractor):
+    _DOMAINS_RE = [
+        r'[^.]+\.vidflex\.tv',
+        r'(?:www\.)?acactv\.ca',
+        r'(?:www\.)?albertalacrossetv\.com',
+        r'(?:www\.)?cjfltv\.com',
+        r'(?:www\.)?figureitoutbaseball\.com',
+        r'(?:www\.)?ocaalive\.com',
+        r'(?:www\.)?pegasussports\.tv',
+        r'(?:www\.)?praxisseries\.ca',
+        r'(?:www\.)?silenticetv\.com',
+        r'(?:www\.)?tuffhedemantv\.com',
+        r'(?:www\.)?watchfuntv\.com',
+        r'live\.ofsaa\.on\.ca',
+        r'tv\.procoro\.ca',
+        r'tv\.realcastmedia\.net',
+        r'tv\.fringetheatre\.ca',
+        r'video\.haisla\.ca',
+        r'video\.hockeycanada\.ca',
+        r'video\.huuayaht\.org',
+        r'video\.turningpointensemble\.ca',
+        r'videos\.livingworks\.net',
+        r'videos\.telusworldofscienceedmonton\.ca',
+        r'watch\.binghamtonbulldogs\.com',
+        r'watch\.rekindle\.tv',
+        r'watch\.wpca\.com',
+    ]
+    _VALID_URL = rf'https?://(?:{"|".join(_DOMAINS_RE)})/[a-z]{{2}}(?:-[a-z]{{2}})?/c/[\w-]+\.(?P<id>\d+)'
+    _TESTS = [{
+        'url': 'https://video.hockeycanada.ca/en/c/nwt-micd-up-with-jamie-lee-rattray.107486',
+        'only_matching': True,
+    }, {
+        # m3u8 + https
+        'url': 'https://video.hockeycanada.ca/en-us/c/nwt-micd-up-with-jamie-lee-rattray.107486',
+        'info_dict': {
+            'id': '107486',
+            'title': 'NWT: Mic’d up with Jamie Lee Rattray',
+            'ext': 'mp4',
+            'duration': 115,
+            'timestamp': 1634310409,
+            'upload_date': '20211015',
+            'tags': ['English', '2021', "National Women's Team"],
+            'description': 'md5:efb1cf6165b48cc3f5555c4262dd5b23',
+            'thumbnail': r're:^https?://wpmedia01-a\.akamaihd\.net/en/asset/public/image/.+',
+        },
+        'params': {'skip_download': True},
+    }, {
+        'url': 'https://video.hockeycanada.ca/en/c/mwc-remembering-the-wild-ride-in-riga.112307',
+        'info_dict': {
+            'id': '112307',
+            'title': 'MWC: Remembering the wild ride in Riga',
+            'ext': 'mp4',
+            'duration': 322,
+            'timestamp': 1716235607,
+            'upload_date': '20240520',
+            'tags': ['English', '2024', "National Men's Team", 'IIHF World Championship', 'Fan'],
+            'description': r're:.+Canada’s National Men’s Team.+',
+            'thumbnail': r're:^https?://wpmedia01-a\.akamaihd\.net/en/asset/public/image/.+',
+        },
+        'params': {'skip_download': True},
+    }, {
+        # the same video in French
+        'url': 'https://video.hockeycanada.ca/fr/c/cmm-retour-sur-un-parcours-endiable-a-riga.112304',
+        'info_dict': {
+            'id': '112304',
+            'title': 'CMM : Retour sur un parcours endiablé à Riga',
+            'ext': 'mp4',
+            'duration': 322,
+            'timestamp': 1716235545,
+            'upload_date': '20240520',
+            'tags': ['French', '2024', "National Men's Team", 'IIHF World Championship', 'Fan'],
+            'description': 'md5:cf825222882a3dab1cd62cffcf3b4d1f',
+            'thumbnail': r're:^https?://wpmedia01-a\.akamaihd\.net/en/asset/public/image/.+',
+        },
+        'params': {'skip_download': True},
+    }, {
+        'url': 'https://myfbcgreenville.vidflex.tv/en/c/may-12th-2024.658',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.figureitoutbaseball.com/en/c/fiob-podcast-14-dan-bertolini-ncaa-d1-head-coach-recorded-11-29-2018.1367',
+        'only_matching': True,
+    }, {
+        'url': 'https://videos.telusworldofscienceedmonton.ca/en/c/the-aurora-project-timelapse-4.577',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.tuffhedemantv.com/en/c/2022-tuff-hedeman-tour-hobbs-nm-january-22.227',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.albertalacrossetv.com/en/c/up-floor-ground-balls-one-more.3449',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.silenticetv.com/en/c/jp-unlocked-day-in-the-life-of-langley-ha-15u.5197',
+        'only_matching': True,
+    }, {
+        'url': 'https://jphl.vidflex.tv/en/c/jp-unlocked-day-in-the-life-of-langley-ha-15u.5197',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+
+        data_url = self._html_search_regex(
+            r'content_api:\s*(["\'])(?P<url>https?://(?:(?!\1).)+)\1', webpage, 'content api url', group='url')
+        media_config = traverse_obj(
+            self._download_json(data_url, video_id),
+            ('config', {base64.b64decode}, {bytes.decode}, {json.loads}, {dict}))
+
+        return {
+            'id': video_id,
+            'formats': list(self._yield_formats(media_config, video_id)),
+            **self._search_json_ld(
+                webpage.replace('/*<![CDATA[*/', '').replace('/*]]>*/', ''), video_id),
+        }
+
+    def _yield_formats(self, media_config, video_id):
+        for media_source in traverse_obj(media_config, ('media', 'source', lambda _, v: url_or_none(v['src']))):
+            media_url = media_source['src']
+            media_type = mimetype2ext(media_source.get('type'))
+
+            if media_type == 'm3u8':
+                yield from self._extract_m3u8_formats(media_url, video_id, fatal=False, m3u8_id='hls')
+            elif media_type == 'mp4':
+                bitrate = self._search_regex(r'_(\d+)k\.mp4', media_url, 'bitrate', default=None)
+                yield {
+                    'format_id': join_nonempty('http', bitrate),
+                    'url': media_url,
+                    'ext': 'mp4',
+                    'tbr': int_or_none(bitrate),
+                }
+            else:
+                yield {
+                    'url': media_url,
+                    'ext': media_type,
+                }
diff --git a/plugins/youtube_download/yt_dlp/extractor/vidio.py b/plugins/youtube_download/yt_dlp/extractor/vidio.py
index 770aa28..955a116 100644
--- a/plugins/youtube_download/yt_dlp/extractor/vidio.py
+++ b/plugins/youtube_download/yt_dlp/extractor/vidio.py
@@ -1,7 +1,7 @@
 from .common import InfoExtractor
 from ..utils import (
-    clean_html,
     ExtractorError,
+    clean_html,
     format_field,
     get_element_by_class,
     int_or_none,
@@ -31,7 +31,7 @@ class VidioBaseIE(InfoExtractor):
         login_page = self._download_webpage(
             self._LOGIN_URL, None, 'Downloading log in page')
 
-        login_form = self._form_hidden_inputs("login-form", login_page)
+        login_form = self._form_hidden_inputs('login-form', login_page)
         login_form.update({
             'user[login]': username,
             'user[password]': password,
@@ -52,7 +52,7 @@ class VidioBaseIE(InfoExtractor):
             elif reason:
                 subreason = get_element_by_class('onboarding-modal__description-text', login_post) or ''
                 raise ExtractorError(
-                    'Unable to log in: %s. %s' % (reason, clean_html(subreason)), expected=True)
+                    f'Unable to log in: {reason}. {clean_html(subreason)}', expected=True)
             raise ExtractorError('Unable to log in')
 
     def _initialize_pre_login(self):
@@ -98,7 +98,7 @@ class VidioIE(VidioBaseIE):
     }, {
         # Premier-exclusive video
         'url': 'https://www.vidio.com/watch/1550718-stand-by-me-doraemon',
-        'only_matching': True
+        'only_matching': True,
     }, {
         # embed url from https://enamplus.liputan6.com/read/5033648/video-fakta-temuan-suspek-cacar-monyet-di-jawa-tengah
         'url': 'https://www.vidio.com/embed/7115874-fakta-temuan-suspek-cacar-monyet-di-jawa-tengah',
@@ -135,7 +135,7 @@ class VidioIE(VidioBaseIE):
 
         if is_premium:
             sources = self._download_json(
-                'https://www.vidio.com/interactions_stream.json?video_id=%s&type=videos' % video_id,
+                f'https://www.vidio.com/interactions_stream.json?video_id={video_id}&type=videos',
                 display_id, note='Downloading premier API JSON')
             if not (sources.get('source') or sources.get('source_dash')):
                 self.raise_login_required('This video is only available for registered users with the appropriate subscription')
@@ -199,7 +199,7 @@ class VidioPremierIE(VidioBaseIE):
     def _playlist_entries(self, playlist_url, display_id):
         index = 1
         while playlist_url:
-            playlist_json = self._call_api(playlist_url, display_id, 'Downloading API JSON page %s' % index)
+            playlist_json = self._call_api(playlist_url, display_id, f'Downloading API JSON page {index}')
             for video_json in playlist_json.get('data', []):
                 link = video_json['links']['watchpage']
                 yield self.url_result(link, 'Vidio', video_json['id'])
@@ -217,14 +217,14 @@ class VidioPremierIE(VidioBaseIE):
                 self._playlist_entries(playlist_url, playlist_id),
                 playlist_id=playlist_id, playlist_title=idata.get('title'))
 
-        playlist_data = self._call_api('https://api.vidio.com/content_profiles/%s/playlists' % playlist_id, display_id)
+        playlist_data = self._call_api(f'https://api.vidio.com/content_profiles/{playlist_id}/playlists', display_id)
 
         return self.playlist_from_matches(
             playlist_data.get('data', []), playlist_id=playlist_id, ie=self.ie_key(),
             getter=lambda data: smuggle_url(url, {
                 'url': data['relationships']['videos']['links']['related'],
                 'id': data['id'],
-                'title': try_get(data, lambda x: x['attributes']['name'])
+                'title': try_get(data, lambda x: x['attributes']['name']),
             }))
 
 
@@ -252,7 +252,7 @@ class VidioLiveIE(VidioBaseIE):
     def _real_extract(self, url):
         video_id, display_id = self._match_valid_url(url).groups()
         stream_data = self._call_api(
-            'https://www.vidio.com/api/livestreamings/%s/detail' % video_id, display_id)
+            f'https://www.vidio.com/api/livestreamings/{video_id}/detail', display_id)
         stream_meta = stream_data['livestreamings'][0]
         user = stream_data.get('users', [{}])[0]
 
@@ -265,14 +265,14 @@ class VidioLiveIE(VidioBaseIE):
                 self.report_drm(video_id)
         if stream_meta.get('is_premium'):
             sources = self._download_json(
-                'https://www.vidio.com/interactions_stream.json?video_id=%s&type=livestreamings' % video_id,
+                f'https://www.vidio.com/interactions_stream.json?video_id={video_id}&type=livestreamings',
                 display_id, note='Downloading premier API JSON')
             if not (sources.get('source') or sources.get('source_dash')):
                 self.raise_login_required('This video is only available for registered users with the appropriate subscription')
 
             if str_or_none(sources.get('source')):
                 token_json = self._download_json(
-                    'https://www.vidio.com/live/%s/tokens' % video_id,
+                    f'https://www.vidio.com/live/{video_id}/tokens',
                     display_id, note='Downloading HLS token JSON', data=b'')
                 formats.extend(self._extract_m3u8_formats(
                     sources['source'] + '?' + token_json.get('token', ''), display_id, 'mp4', 'm3u8_native'))
@@ -281,7 +281,7 @@ class VidioLiveIE(VidioBaseIE):
         else:
             if stream_meta.get('stream_token_url'):
                 token_json = self._download_json(
-                    'https://www.vidio.com/live/%s/tokens' % video_id,
+                    f'https://www.vidio.com/live/{video_id}/tokens',
                     display_id, note='Downloading HLS token JSON', data=b'')
                 formats.extend(self._extract_m3u8_formats(
                     stream_meta['stream_token_url'] + '?' + token_json.get('token', ''),
diff --git a/plugins/youtube_download/yt_dlp/extractor/vidlii.py b/plugins/youtube_download/yt_dlp/extractor/vidlii.py
index 44353b7..d9e33ca 100644
--- a/plugins/youtube_download/yt_dlp/extractor/vidlii.py
+++ b/plugins/youtube_download/yt_dlp/extractor/vidlii.py
@@ -3,8 +3,8 @@ import re
 from .common import InfoExtractor
 from ..networking import HEADRequest
 from ..utils import (
-    format_field,
     float_or_none,
+    format_field,
     get_element_by_id,
     int_or_none,
     str_to_int,
@@ -34,7 +34,7 @@ class VidLiiIE(InfoExtractor):
             'average_rating': float,
             'categories': ['News & Politics'],
             'tags': ['Vidlii', 'Jan', 'Videogames'],
-        }
+        },
     }, {
         'url': 'https://www.vidlii.com/watch?v=zTAtaAgOLKt',
         'md5': '5778f7366aa4c569b77002f8bf6b614f',
@@ -63,7 +63,7 @@ class VidLiiIE(InfoExtractor):
         video_id = self._match_id(url)
 
         webpage = self._download_webpage(
-            'https://www.vidlii.com/watch?v=%s' % video_id, video_id)
+            f'https://www.vidlii.com/watch?v={video_id}', video_id)
         formats = []
 
         sources = [source[1] for source in re.findall(
diff --git a/plugins/youtube_download/yt_dlp/extractor/vidly.py b/plugins/youtube_download/yt_dlp/extractor/vidly.py
new file mode 100644
index 0000000..60698f0
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/vidly.py
@@ -0,0 +1,83 @@
+from .common import InfoExtractor
+from ..utils import (
+    ExtractorError,
+    mimetype2ext,
+    url_or_none,
+)
+from ..utils.traversal import traverse_obj
+
+
+class VidlyIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:vid\.ly/|(?:s\.)?vid\.ly/embeded\.html\?(?:[^#]+&)?link=)(?P<id>\w+)'
+    _EMBED_REGEX = [r'<script[^>]+\bsrc=[\'"](?P<url>(?:https?:)?//vid\.ly/\w+/embed[^\'"]+)',
+                    r'<iframe[^>]+\bsrc=[\'"](?P<url>(?:https?:)?//(?:s\.)?vid\.ly/embeded\.html\?(?:[^#\'"]+&)?link=\w+[^\'"]+)']
+    _TESTS = [{
+        # JWPlayer 7, Embeds forbidden
+        'url': 'https://vid.ly/2i3o9j/embed',
+        'info_dict': {
+            'id': '2i3o9j',
+            'ext': 'mp4',
+            'title': '2i3o9j',
+            'thumbnail': r're:https://\w+\.cloudfront\.net/',
+        },
+    }, {
+        # JWPlayer 6
+        'url': 'http://s.vid.ly/embeded.html?link=jw_test&new=1&autoplay=true&controls=true',
+        'info_dict': {
+            'id': 'jw_test',
+            'ext': 'mp4',
+            'title': '2x8m8t',
+            'thumbnail': r're:https://\w+\.cloudfront\.net/',
+        },
+    }, {
+        # Vidlyplayer
+        'url': 'https://vid.ly/7x0e6l',
+        'info_dict': {
+            'id': '7x0e6l',
+            'ext': 'mp4',
+            'title': '7x0e6l',
+        },
+    }]
+    _WEBPAGE_TESTS = [{
+        'url': 'https://www.petfinder.com/dog/gus-57378930/tn/ooltewah/furever-furkids-rescue-tn592/',
+        'info_dict': {
+            'id': 'w8p5b0',
+            'ext': 'mp4',
+            'title': 'w8p5b0',
+            'thumbnail': r're:https://\w+\.cloudfront\.net/',
+        },
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+
+        embed_script = self._download_webpage(
+            f'https://vid.ly/{video_id}/embed', video_id, headers={'Referer': 'https://vid.ly/'})
+        player = self._search_json(r'initCallback\(', embed_script, 'player', video_id)
+
+        player_type = player.get('player') or ''
+        if player_type.startswith('jwplayer'):
+            return self._parse_jwplayer_data(player['config'], video_id)
+        elif not player_type.startswith('vidly'):
+            raise ExtractorError(f'Unknown player type {player_type!r}')
+
+        formats = []
+        ext = mimetype2ext(traverse_obj(player, ('config', 'type')))
+        for source, fid in [('source', 'sd'), ('source_hd', 'hd')]:
+            if traverse_obj(player, ('config', source, {url_or_none})):
+                formats.append({
+                    'url': player['config'][source],
+                    'format_id': f'http-{fid}',
+                    'ext': ext,
+                })
+        # Has higher quality formats
+        formats.extend(self._extract_m3u8_formats(
+            f'https://d3fenhwk93s16g.cloudfront.net/{video_id}/hls.m3u8', video_id,
+            fatal=False, note='Requesting higher quality m3u8 formats',
+            errnote='No higher quality m3u8 formats found') or [])
+
+        return {
+            'id': video_id,
+            'title': video_id,
+            'formats': formats,
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/vidyard.py b/plugins/youtube_download/yt_dlp/extractor/vidyard.py
new file mode 100644
index 0000000..89a89b1
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/vidyard.py
@@ -0,0 +1,425 @@
+import re
+
+from .common import InfoExtractor
+from ..utils import (
+    extract_attributes,
+    float_or_none,
+    int_or_none,
+    join_nonempty,
+    mimetype2ext,
+    parse_resolution,
+    str_or_none,
+    unescapeHTML,
+    url_or_none,
+)
+from ..utils.traversal import traverse_obj
+
+
+class VidyardBaseIE(InfoExtractor):
+    _HEADERS = {'Referer': 'https://play.vidyard.com/'}
+
+    def _get_formats_and_subtitles(self, sources, video_id):
+        formats, subtitles = [], {}
+
+        def add_hls_fmts_and_subs(m3u8_url):
+            fmts, subs = self._extract_m3u8_formats_and_subtitles(
+                m3u8_url, video_id, 'mp4', m3u8_id='hls', headers=self._HEADERS, fatal=False)
+            formats.extend(fmts)
+            self._merge_subtitles(subs, target=subtitles)
+
+        hls_list = isinstance(sources, dict) and sources.pop('hls', None)
+        if master_m3u8_url := traverse_obj(
+                hls_list, (lambda _, v: v['profile'] == 'auto', 'url', {url_or_none}, any)):
+            add_hls_fmts_and_subs(master_m3u8_url)
+        if not formats:  # These are duplicate and unnecesary requests if we got 'auto' hls fmts
+            for variant_m3u8_url in traverse_obj(hls_list, (..., 'url', {url_or_none})):
+                add_hls_fmts_and_subs(variant_m3u8_url)
+
+        for source_type, source_list in traverse_obj(sources, ({dict.items}, ...)):
+            for source in traverse_obj(source_list, lambda _, v: url_or_none(v['url'])):
+                profile = source.get('profile')
+                formats.append({
+                    'url': source['url'],
+                    'ext': mimetype2ext(source.get('mimeType'), default=None),
+                    'format_id': join_nonempty('http', source_type, profile),
+                    **parse_resolution(profile),
+                })
+
+        self._remove_duplicate_formats(formats)
+        return formats, subtitles
+
+    def _get_direct_subtitles(self, caption_json):
+        subs = {}
+        for caption in traverse_obj(caption_json, lambda _, v: url_or_none(v['vttUrl'])):
+            subs.setdefault(caption.get('language') or 'und', []).append({
+                'url': caption['vttUrl'],
+                'name': caption.get('name'),
+            })
+
+        return subs
+
+    def _fetch_video_json(self, video_id):
+        return self._download_json(
+            f'https://play.vidyard.com/player/{video_id}.json', video_id)['payload']
+
+    def _process_video_json(self, json_data, video_id):
+        formats, subtitles = self._get_formats_and_subtitles(json_data['sources'], video_id)
+        self._merge_subtitles(self._get_direct_subtitles(json_data.get('captions')), target=subtitles)
+
+        return {
+            **traverse_obj(json_data, {
+                'id': ('facadeUuid', {str}),
+                'display_id': ('videoId', {int}, {str_or_none}),
+                'title': ('name', {str}),
+                'description': ('description', {str}, {unescapeHTML}, filter),
+                'duration': ((
+                    ('milliseconds', {float_or_none(scale=1000)}),
+                    ('seconds', {int_or_none})), any),
+                'thumbnails': ('thumbnailUrls', ('small', 'normal'), {'url': {url_or_none}}),
+                'tags': ('tags', ..., 'name', {str}),
+            }),
+            'formats': formats,
+            'subtitles': subtitles,
+            'http_headers': self._HEADERS,
+        }
+
+
+class VidyardIE(VidyardBaseIE):
+    _VALID_URL = [
+        r'https?://[\w-]+(?:\.hubs)?\.vidyard\.com/watch/(?P<id>[\w-]+)',
+        r'https?://(?:embed|share)\.vidyard\.com/share/(?P<id>[\w-]+)',
+        r'https?://play\.vidyard\.com/(?:player/)?(?P<id>[\w-]+)',
+    ]
+    _EMBED_REGEX = [r'<iframe[^>]* src=["\'](?P<url>(?:https?:)?//play\.vidyard\.com/[\w-]+)']
+    _TESTS = [{
+        'url': 'https://vyexample03.hubs.vidyard.com/watch/oTDMPlUv--51Th455G5u7Q',
+        'info_dict': {
+            'id': 'oTDMPlUv--51Th455G5u7Q',
+            'display_id': '50347',
+            'ext': 'mp4',
+            'title': 'Homepage Video',
+            'description': 'Look I changed the description.',
+            'thumbnail': 'https://cdn.vidyard.com/thumbnails/50347/OUPa5LTKV46849sLYngMqQ_small.jpg',
+            'duration': 99,
+            'tags': ['these', 'are', 'all', 'tags'],
+        },
+    }, {
+        'url': 'https://share.vidyard.com/watch/PaQzDAT1h8JqB8ivEu2j6Y?',
+        'info_dict': {
+            'id': 'PaQzDAT1h8JqB8ivEu2j6Y',
+            'display_id': '9281024',
+            'ext': 'mp4',
+            'title': 'Inline Embed',
+            'thumbnail': 'https://cdn.vidyard.com/thumbnails/spacer.gif',
+            'duration': 41.186,
+        },
+    }, {
+        'url': 'https://embed.vidyard.com/share/oTDMPlUv--51Th455G5u7Q',
+        'info_dict': {
+            'id': 'oTDMPlUv--51Th455G5u7Q',
+            'display_id': '50347',
+            'ext': 'mp4',
+            'title': 'Homepage Video',
+            'description': 'Look I changed the description.',
+            'thumbnail': 'https://cdn.vidyard.com/thumbnails/50347/OUPa5LTKV46849sLYngMqQ_small.jpg',
+            'duration': 99,
+            'tags': ['these', 'are', 'all', 'tags'],
+        },
+    }, {
+        # First video from playlist below
+        'url': 'https://embed.vidyard.com/share/SyStyHtYujcBHe5PkZc5DL',
+        'info_dict': {
+            'id': 'SyStyHtYujcBHe5PkZc5DL',
+            'display_id': '41974005',
+            'ext': 'mp4',
+            'title': 'Prepare the Frame and Track for Palm Beach Polysatin Shutters With BiFold Track',
+            'description': r're:In this video, you will learn how to prepare the frame.+',
+            'thumbnail': 'https://cdn.vidyard.com/thumbnails/41974005/IJw7oCaJcF1h7WWu3OVZ8A_small.png',
+            'duration': 258.666,
+        },
+    }, {
+        # Playlist
+        'url': 'https://thelink.hubs.vidyard.com/watch/pwu7pCYWSwAnPxs8nDoFrE',
+        'info_dict': {
+            'id': 'pwu7pCYWSwAnPxs8nDoFrE',
+            'title': 'PLAYLIST - Palm Beach Shutters- Bi-Fold Track System Installation',
+            'entries': [{
+                'id': 'SyStyHtYujcBHe5PkZc5DL',
+                'display_id': '41974005',
+                'ext': 'mp4',
+                'title': 'Prepare the Frame and Track for Palm Beach Polysatin Shutters With BiFold Track',
+                'thumbnail': 'https://cdn.vidyard.com/thumbnails/41974005/IJw7oCaJcF1h7WWu3OVZ8A_small.png',
+                'duration': 258.666,
+            }, {
+                'id': '1Fw4B84jZTXLXWqkE71RiM',
+                'display_id': '5861113',
+                'ext': 'mp4',
+                'title': 'Palm Beach - Bi-Fold Track System "Frame Installation"',
+                'thumbnail': 'https://cdn.vidyard.com/thumbnails/5861113/29CJ54s5g1_aP38zkKLHew_small.jpg',
+                'duration': 167.858,
+            }, {
+                'id': 'DqP3wBvLXSpxrcqpT5kEeo',
+                'display_id': '41976334',
+                'ext': 'mp4',
+                'title': 'Install the Track for Palm Beach Polysatin Shutters With BiFold Track',
+                'thumbnail': 'https://cdn.vidyard.com/thumbnails/5861090/RwG2VaTylUa6KhSTED1r1Q_small.png',
+                'duration': 94.229,
+            }, {
+                'id': 'opfybfxpzQArxqtQYB6oBU',
+                'display_id': '41976364',
+                'ext': 'mp4',
+                'title': 'Install the Panel for Palm Beach Polysatin Shutters With BiFold Track',
+                'thumbnail': 'https://cdn.vidyard.com/thumbnails/5860926/JIOaJR08dM4QgXi_iQ2zGA_small.png',
+                'duration': 191.467,
+            }, {
+                'id': 'rWrXvkbTNNaNqD6189HJya',
+                'display_id': '41976382',
+                'ext': 'mp4',
+                'title': 'Adjust the Panels for Palm Beach Polysatin Shutters With BiFold Track',
+                'thumbnail': 'https://cdn.vidyard.com/thumbnails/5860687/CwHxBv4UudAhOh43FVB4tw_small.png',
+                'duration': 138.155,
+            }, {
+                'id': 'eYPTB521MZ9TPEArSethQ5',
+                'display_id': '41976409',
+                'ext': 'mp4',
+                'title': 'Assemble and Install the Valance for Palm Beach Polysatin Shutters With BiFold Track',
+                'thumbnail': 'https://cdn.vidyard.com/thumbnails/5861425/0y68qlMU4O5VKU7bJ8i_AA_small.png',
+                'duration': 148.224,
+            }],
+        },
+        'playlist_count': 6,
+    }, {
+        # Non hubs.vidyard.com playlist
+        'url': 'https://salesforce.vidyard.com/watch/d4vqPjs7Q5EzVEis5QT3jd',
+        'info_dict': {
+            'id': 'd4vqPjs7Q5EzVEis5QT3jd',
+            'title': 'How To: Service Cloud: Import External Content in Lightning Knowledge',
+            'entries': [{
+                'id': 'mcjDpSZir2iSttbvFkx6Rv',
+                'display_id': '29479036',
+                'ext': 'mp4',
+                'title': 'Welcome to this Expert Coaching Series',
+                'thumbnail': 'https://cdn.vidyard.com/thumbnails/ouyQi9WuwyiOupChUWNmjQ/7170d3485ba602e012df05_small.jpg',
+                'duration': 38.205,
+            }, {
+                'id': '84bPYwpg243G6xYEfJdYw9',
+                'display_id': '21820704',
+                'ext': 'mp4',
+                'title': 'Chapter 1 - Title + Agenda',
+                'thumbnail': 'https://cdn.vidyard.com/thumbnails/HFPN0ZgQq4Ow8BghGcQSow/bfaa30123c8f6601e7d7f2_small.jpg',
+                'duration': 98.016,
+            }, {
+                'id': 'nP17fMuvA66buVHUrzqjTi',
+                'display_id': '21820707',
+                'ext': 'mp4',
+                'title': 'Chapter 2 - Import Options',
+                'thumbnail': 'https://cdn.vidyard.com/thumbnails/rGRIF5nFjPI9OOA2qJ_Dbg/86a8d02bfec9a566845dd4_small.jpg',
+                'duration': 199.136,
+            }, {
+                'id': 'm54EcwXdpA5gDBH5rgCYoV',
+                'display_id': '21820710',
+                'ext': 'mp4',
+                'title': 'Chapter 3 - Importing Article Translations',
+                'thumbnail': 'https://cdn.vidyard.com/thumbnails/IVX4XR8zpSsiNIHx45kz-A/1ccbf8a29a33856d06b3ed_small.jpg',
+                'duration': 184.352,
+            }, {
+                'id': 'j4nzS42oq4hE9oRV73w3eQ',
+                'display_id': '21820716',
+                'ext': 'mp4',
+                'title': 'Chapter 4 - Best Practices',
+                'thumbnail': 'https://cdn.vidyard.com/thumbnails/BtrRrQpRDLbA4AT95YQyog/1f1e6b8e7fdc3fa95ec8d3_small.jpg',
+                'duration': 296.960,
+            }, {
+                'id': 'y28PYfW5pftvers9PXzisC',
+                'display_id': '21820727',
+                'ext': 'mp4',
+                'title': 'Chapter 5 - Migration Steps',
+                'thumbnail': 'https://cdn.vidyard.com/thumbnails/K2CdQOXDfLcrVTF60r0bdw/a09239ada28b6ffce12b1f_small.jpg',
+                'duration': 620.640,
+            }, {
+                'id': 'YWU1eQxYvhj29SjYoPw5jH',
+                'display_id': '21820733',
+                'ext': 'mp4',
+                'title': 'Chapter 6 - Demo',
+                'thumbnail': 'https://cdn.vidyard.com/thumbnails/rsmhP-cO8dAa8ilvFGCX0g/7911ef415167cd14032068_small.jpg',
+                'duration': 631.456,
+            }, {
+                'id': 'nmEvVqpwdJUgb74zKsLGxn',
+                'display_id': '29479037',
+                'ext': 'mp4',
+                'title': 'Schedule Your Follow-Up',
+                'thumbnail': 'https://cdn.vidyard.com/thumbnails/Rtwc7X4PEkF4Ae5kHi-Jvw/174ebed3f34227b1ffa1d0_small.jpg',
+                'duration': 33.608,
+            }],
+        },
+        'playlist_count': 8,
+    }, {
+        # URL of iframe embed src
+        'url': 'https://play.vidyard.com/iDqTwWGrd36vaLuaCY3nTs.html',
+        'info_dict': {
+            'id': 'iDqTwWGrd36vaLuaCY3nTs',
+            'display_id': '9281009',
+            'ext': 'mp4',
+            'title': 'Lightbox Embed',
+            'thumbnail': 'https://cdn.vidyard.com/thumbnails/spacer.gif',
+            'duration': 39.035,
+        },
+    }, {
+        # Player JSON URL
+        'url': 'https://play.vidyard.com/player/7GAApnNNbcZZ46k6JqJQSh.json?disable_analytics=0',
+        'info_dict': {
+            'id': '7GAApnNNbcZZ46k6JqJQSh',
+            'display_id': '820026',
+            'ext': 'mp4',
+            'title': 'The Art of Storytelling: How to Deliver Your Brand Story with Content & Social',
+            'thumbnail': 'https://cdn.vidyard.com/thumbnails/MhbE-5sEFQu4x3fI6FkNlA/41eb5717c557cd19456910_small.jpg',
+            'duration': 2153.013,
+            'tags': ['Summit2017'],
+        },
+    }, {
+        'url': 'http://share.vidyard.com/share/diYeo6YR2yiGgL8odvS8Ri',
+        'only_matching': True,
+    }, {
+        'url': 'https://play.vidyard.com/FFlz3ZpxhIfKQ1fd9DAryA',
+        'only_matching': True,
+    }, {
+        'url': 'https://play.vidyard.com/qhMAu5A76GZVrFzOPgSf9A/type/standalone',
+        'only_matching': True,
+    }]
+    _WEBPAGE_TESTS = [{
+        # URL containing inline/lightbox embedded video
+        'url': 'https://resources.altium.com/p/2-the-extreme-importance-of-pc-board-stack-up',
+        'info_dict': {
+            'id': 'GDx1oXrFWj4XHbipfoXaMn',
+            'display_id': '3225198',
+            'ext': 'mp4',
+            'title': 'The Extreme Importance of PC Board Stack Up',
+            'thumbnail': 'https://cdn.vidyard.com/thumbnails/73_Q3_hBexWX7Og1sae6cg/9998fa4faec921439e2c04_small.jpg',
+            'duration': 3422.742,
+        },
+    }, {
+        # <script ... id="vidyard_embed_code_DXx2sW4WaLA6hTdGFz7ja8" src="//play.vidyard.com/DXx2sW4WaLA6hTdGFz7ja8.js?
+        'url': 'http://videos.vivint.com/watch/DXx2sW4WaLA6hTdGFz7ja8',
+        'info_dict': {
+            'id': 'DXx2sW4WaLA6hTdGFz7ja8',
+            'display_id': '2746529',
+            'ext': 'mp4',
+            'title': 'How To Powercycle the Smart Hub Panel',
+            'duration': 30.613,
+            'thumbnail': 'https://cdn.vidyard.com/thumbnails/_-6cw8xQUJ3qiCs_JENc_A/b21d7a5e47967f49399d30_small.jpg',
+        },
+    }, {
+        # <script id="vidyard_embed_code_MIBHhiLVTxga7wqLsuoDjQ" src="//embed.vidyard.com/embed/MIBHhiLVTxga7wqLsuoDjQ/inline?v=2.1">
+        'url': 'https://www.babypips.com/learn/forex/introduction-to-metatrader4',
+        'info_dict': {
+            'id': 'MIBHhiLVTxga7wqLsuoDjQ',
+            'display_id': '20291',
+            'ext': 'mp4',
+            'title': 'Lesson 1 - Opening an MT4 Account',
+            'description': 'Never heard of MetaTrader4? Here\'s the 411 on the popular trading platform!',
+            'duration': 168,
+            'thumbnail': 'https://cdn.vidyard.com/thumbnails/20291/IM-G2WXQR9VBLl2Cmzvftg_small.jpg',
+        },
+    }, {
+        # <iframe ... src="//play.vidyard.com/d61w8EQoZv1LDuPxDkQP2Q/type/background?preview=1"
+        'url': 'https://www.avaya.com/en/',
+        'info_dict': {
+            # These values come from the generic extractor and don't matter
+            'id': str,
+            'title': str,
+            'age_limit': 0,
+            'upload_date': str,
+            'description': str,
+            'thumbnail': str,
+            'timestamp': float,
+        },
+        'playlist': [{
+            'info_dict': {
+                'id': 'd61w8EQoZv1LDuPxDkQP2Q',
+                'display_id': '42456529',
+                'ext': 'mp4',
+                'title': 'GettyImages-1027',
+                'duration': 6.0,
+                'thumbnail': 'https://cdn.vidyard.com/thumbnails/42061563/p6bY08d2N4e4IDz-7J4_wkgsPq3-qgcx_small.jpg',
+            },
+        }, {
+            'info_dict': {
+                'id': 'VAsYDi7eiqZRbHodUA2meC',
+                'display_id': '42456569',
+                'ext': 'mp4',
+                'title': 'GettyImages-1325598833',
+                'duration': 6.083,
+                'thumbnail': 'https://cdn.vidyard.com/thumbnails/42052358/y3qrbDpn_2quWr_5XBi7yzS3UvEI__ZM_small.jpg',
+            },
+        }],
+        'playlist_count': 2,
+    }, {
+        # <div class="vidyard-player-embed" data-uuid="vpCWTVHw3qrciLtVY94YkS"
+        'url': 'https://www.gogoair.com/',
+        'info_dict': {
+            # These values come from the generic extractor and don't matter
+            'id': str,
+            'title': str,
+            'description': str,
+            'age_limit': 0,
+        },
+        'playlist': [{
+            'info_dict': {
+                'id': 'vpCWTVHw3qrciLtVY94YkS',
+                'display_id': '40780699',
+                'ext': 'mp4',
+                'title': 'Upgrade to AVANCE 100% worth it - Jason Talley, Owner and Pilot, Testimonial',
+                'description': 'md5:f609824839439a51990cef55ffc472aa',
+                'duration': 70.737,
+                'thumbnail': 'https://cdn.vidyard.com/thumbnails/40780699/KzjfYZz5MZl2gHF_e-4i2c6ib1cLDweQ_small.jpg',
+            },
+        }, {
+            'info_dict': {
+                'id': 'xAmV9AsLbnitCw35paLBD8',
+                'display_id': '31130867',
+                'ext': 'mp4',
+                'title': 'Brad Keselowski goes faster with Gogo AVANCE inflight Wi-Fi',
+                'duration': 132.565,
+                'thumbnail': 'https://cdn.vidyard.com/thumbnails/31130867/HknyDtLdm2Eih9JZ4A5XLjhfBX_6HRw5_small.jpg',
+            },
+        }, {
+            'info_dict': {
+                'id': 'RkkrFRNxfP79nwCQavecpF',
+                'display_id': '39009815',
+                'ext': 'mp4',
+                'title': 'Live Demo of Gogo Galileo',
+                'description': 'md5:e2df497236f4e12c3fef8b392b5f23e0',
+                'duration': 112.128,
+                'thumbnail': 'https://cdn.vidyard.com/thumbnails/38144873/CWLlxfUbJ4Gh0ThbUum89IsEM4yupzMb_small.jpg',
+            },
+        }],
+        'playlist_count': 3,
+    }]
+
+    @classmethod
+    def _extract_embed_urls(cls, url, webpage):
+        # Handle protocol-less embed URLs
+        for embed_url in super()._extract_embed_urls(url, webpage):
+            if embed_url.startswith('//'):
+                embed_url = f'https:{embed_url}'
+            yield embed_url
+
+        # Extract inline/lightbox embeds
+        for embed_element in re.findall(
+                r'(<(?:img|div)[^>]* class=(["\'])(?:[^>"\']* )?vidyard-player-embed(?: [^>"\']*)?\2[^>]+>)', webpage):
+            if video_id := extract_attributes(embed_element[0]).get('data-uuid'):
+                yield f'https://play.vidyard.com/{video_id}'
+
+        for embed_id in re.findall(r'<script[^>]* id=["\']vidyard_embed_code_([\w-]+)["\']', webpage):
+            yield f'https://play.vidyard.com/{embed_id}'
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        video_json = self._fetch_video_json(video_id)
+
+        if len(video_json['chapters']) == 1:
+            return self._process_video_json(video_json['chapters'][0], video_id)
+
+        return self.playlist_result(
+            (self._process_video_json(chapter, video_id) for chapter in video_json['chapters']),
+            str(video_json['playerUuid']), video_json.get('name'))
diff --git a/plugins/youtube_download/yt_dlp/extractor/viewlift.py b/plugins/youtube_download/yt_dlp/extractor/viewlift.py
index 8f686f0..4a7ba98 100644
--- a/plugins/youtube_download/yt_dlp/extractor/viewlift.py
+++ b/plugins/youtube_download/yt_dlp/extractor/viewlift.py
@@ -5,6 +5,7 @@ from ..networking.exceptions import HTTPError
 from ..utils import (
     ExtractorError,
     int_or_none,
+    join_nonempty,
     parse_age_limit,
     traverse_obj,
 )
@@ -12,7 +13,7 @@ from ..utils import (
 
 class ViewLiftBaseIE(InfoExtractor):
     _API_BASE = 'https://prod-api.viewlift.com/'
-    _DOMAINS_REGEX = r'(?:(?:main\.)?snagfilms|snagxtreme|funnyforfree|kiddovid|winnersview|(?:monumental|lax)sportsnetwork|vayafilm|failarmy|ftfnext|lnppass\.legapallacanestro|moviespree|app\.myoutdoortv|neoufitness|pflmma|theidentitytb)\.com|(?:hoichoi|app\.horseandcountry|kronon|marquee|supercrosslive)\.tv'
+    _DOMAINS_REGEX = r'(?:(?:main\.)?snagfilms|snagxtreme|funnyforfree|kiddovid|winnersview|(?:monumental|lax)sportsnetwork|vayafilm|failarmy|ftfnext|lnppass\.legapallacanestro|moviespree|app\.myoutdoortv|neoufitness|pflmma|theidentitytb|chorki)\.com|(?:hoichoi|app\.horseandcountry|kronon|marquee|supercrosslive)\.tv'
     _SITE_MAP = {
         'ftfnext': 'lax',
         'funnyforfree': 'snagfilms',
@@ -27,6 +28,7 @@ class ViewLiftBaseIE(InfoExtractor):
         'snagxtreme': 'snagfilms',
         'theidentitytb': 'tampabay',
         'vayafilm': 'snagfilms',
+        'chorki': 'prothomalo',
     }
     _TOKENS = {}
 
@@ -61,8 +63,8 @@ class ViewLiftBaseIE(InfoExtractor):
 
 class ViewLiftEmbedIE(ViewLiftBaseIE):
     IE_NAME = 'viewlift:embed'
-    _VALID_URL = r'https?://(?:(?:www|embed)\.)?(?P<domain>%s)/embed/player\?.*\bfilmId=(?P<id>[\da-f]{8}-(?:[\da-f]{4}-){3}[\da-f]{12})' % ViewLiftBaseIE._DOMAINS_REGEX
-    _EMBED_REGEX = [r'<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//(?:embed\.)?(?:%s)/embed/player.+?)\1' % ViewLiftBaseIE._DOMAINS_REGEX]
+    _VALID_URL = rf'https?://(?:(?:www|embed)\.)?(?P<domain>{ViewLiftBaseIE._DOMAINS_REGEX})/embed/player\?.*\bfilmId=(?P<id>[\da-f]{{8}}-(?:[\da-f]{{4}}-){{3}}[\da-f]{{12}})'
+    _EMBED_REGEX = [rf'<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//(?:embed\.)?(?:{ViewLiftBaseIE._DOMAINS_REGEX})/embed/player.+?)\1']
     _TESTS = [{
         'url': 'http://embed.snagfilms.com/embed/player?filmId=74849a00-85a9-11e1-9660-123139220831&w=500',
         'md5': '2924e9215c6eff7a55ed35b72276bd93',
@@ -73,7 +75,7 @@ class ViewLiftEmbedIE(ViewLiftBaseIE):
             'description': 'md5:b542bef32a6f657dadd0df06e26fb0c8',
             'timestamp': 1334350096,
             'upload_date': '20120413',
-        }
+        },
     }, {
         # invalid labels, 360p is better that 480p
         'url': 'http://www.snagfilms.com/embed/player?filmId=17ca0950-a74a-11e0-a92a-0026bb61d036',
@@ -97,7 +99,7 @@ class ViewLiftEmbedIE(ViewLiftBaseIE):
 
         content_data = self._call_api(
             site, 'entitlement/video/status', film_id, url, {
-                'id': film_id
+                'id': film_id,
             })['video']
         gist = content_data['gist']
         title = gist['title']
@@ -119,7 +121,7 @@ class ViewLiftEmbedIE(ViewLiftBaseIE):
                 'height', default=None))
             formats.append({
                 'url': video_asset_url,
-                'format_id': 'http%s' % ('-%d' % bitrate if bitrate else ''),
+                'format_id': join_nonempty('http', bitrate),
                 'tbr': bitrate,
                 'height': height,
                 'vcodec': video_asset.get('codec'),
@@ -152,7 +154,7 @@ class ViewLiftEmbedIE(ViewLiftBaseIE):
 class ViewLiftIE(ViewLiftBaseIE):
     IE_NAME = 'viewlift'
     _API_BASE = 'https://prod-api-cached-2.viewlift.com/'
-    _VALID_URL = r'https?://(?:www\.)?(?P<domain>%s)(?P<path>(?:/(?:films/title|show|(?:news/)?videos?|watch))?/(?P<id>[^?#]+))' % ViewLiftBaseIE._DOMAINS_REGEX
+    _VALID_URL = rf'https?://(?:www\.)?(?P<domain>{ViewLiftBaseIE._DOMAINS_REGEX})(?P<path>(?:/(?:films/title|show|(?:news/)?videos?|watch))?/(?P<id>[^?#]+))'
     _TESTS = [{
         'url': 'http://www.snagfilms.com/films/title/lost_for_life',
         'md5': '19844f897b35af219773fd63bdec2942',
@@ -168,7 +170,7 @@ class ViewLiftIE(ViewLiftBaseIE):
             'age_limit': 14,
             'upload_date': '20150421',
             'timestamp': 1429656820,
-        }
+        },
     }, {
         'url': 'http://www.snagfilms.com/show/the_world_cut_project/india',
         'md5': 'e6292e5b837642bbda82d7f8bf3fbdfd',
@@ -182,7 +184,7 @@ class ViewLiftIE(ViewLiftBaseIE):
             'duration': 979,
             'timestamp': 1399478279,
             'upload_date': '20140507',
-        }
+        },
     }, {
         'url': 'http://main.snagfilms.com/augie_alone/s_2_ep_12_love',
         'info_dict': {
@@ -230,7 +232,6 @@ class ViewLiftIE(ViewLiftBaseIE):
             'description': 'md5:e28f2fb8680096a69c944d37c1fa5ffc',
             'thumbnail': r're:^https?://.*\.jpg$',
             'upload_date': '20211006',
-            'series': None
         },
         'params': {'skip_download': True},
     }, {  # Free film
@@ -242,7 +243,6 @@ class ViewLiftIE(ViewLiftBaseIE):
             'description': 'md5:605cba408e51a79dafcb824bdeded51e',
             'thumbnail': r're:^https?://.*\.jpg$',
             'upload_date': '20210827',
-            'series': None
         },
         'params': {'skip_download': True},
     }, {  # Free episode
@@ -254,7 +254,7 @@ class ViewLiftIE(ViewLiftBaseIE):
             'description': 'md5:ca30a682b4528d02a3eb6d0427dd0f87',
             'thumbnail': r're:^https?://.*\.jpg$',
             'upload_date': '20210830',
-            'series': 'Case Jaundice'
+            'series': 'Case Jaundice',
         },
         'params': {'skip_download': True},
     }, {  # Free video
@@ -266,7 +266,7 @@ class ViewLiftIE(ViewLiftBaseIE):
             'description': 'md5:9d21edc1827d32f8633eb67c2054fc31',
             'thumbnail': r're:^https?://.*\.jpg$',
             'upload_date': '20211006',
-            'series': 'Six (Hindi)'
+            'series': 'Six (Hindi)',
         },
         'params': {'skip_download': True},
     }, {  # Free episode
@@ -278,7 +278,7 @@ class ViewLiftIE(ViewLiftBaseIE):
             'description': 'md5:ef6ffae01a3d83438597367400f824ed',
             'thumbnail': r're:^https?://.*\.jpg$',
             'upload_date': '20211004',
-            'series': 'Asian Paints Moner Thikana'
+            'series': 'Asian Paints Moner Thikana',
         },
         'params': {'skip_download': True},
     }, {  # Free series
@@ -295,12 +295,39 @@ class ViewLiftIE(ViewLiftBaseIE):
         },
     }, {  # Premium movie
         'url': 'https://www.hoichoi.tv/movies/detective-2020',
-        'only_matching': True
+        'only_matching': True,
+    }, {  # Chorki Premium series
+        'url': 'https://www.chorki.com/bn/series/sinpaat',
+        'playlist_mincount': 7,
+        'info_dict': {
+            'id': 'bn/series/sinpaat',
+        },
+    }, {  # Chorki free movie
+        'url': 'https://www.chorki.com/bn/videos/bangla-movie-bikkhov',
+        'info_dict': {
+            'id': '564e755b-f5c7-4515-aee6-8959bee18c93',
+            'title': 'Bikkhov',
+            'ext': 'mp4',
+            'upload_date': '20230824',
+            'timestamp': 1692860553,
+            'categories': ['Action Movies', 'Salman Special'],
+            'tags': 'count:14',
+            'thumbnail': 'https://snagfilms-a.akamaihd.net/dd078ff5-b16e-45e4-9723-501b56b9df0a/images/2023/08/24/1692860450729_1920x1080_16x9Images.jpg',
+            'display_id': 'bn/videos/bangla-movie-bikkhov',
+            'description': 'md5:71492b086450625f4374a3eb824f27dc',
+            'duration': 8002,
+        },
+        'params': {
+            'skip_download': True,
+        },
+    }, {  # Chorki Premium movie
+        'url': 'https://www.chorki.com/bn/videos/something-like-an-autobiography',
+        'only_matching': True,
     }]
 
     @classmethod
     def suitable(cls, url):
-        return False if ViewLiftEmbedIE.suitable(url) else super(ViewLiftIE, cls).suitable(url)
+        return False if ViewLiftEmbedIE.suitable(url) else super().suitable(url)
 
     def _show_entries(self, domain, seasons):
         for season in seasons:
@@ -329,7 +356,7 @@ class ViewLiftIE(ViewLiftBaseIE):
         film_id = next(m['contentData'][0]['gist']['id'] for m in modules if m.get('moduleType') == 'VideoDetailModule')
         return {
             '_type': 'url_transparent',
-            'url': 'http://%s/embed/player?filmId=%s' % (domain, film_id),
+            'url': f'http://{domain}/embed/player?filmId={film_id}',
             'id': film_id,
             'display_id': display_id,
             'ie_key': 'ViewLiftEmbed',
diff --git a/plugins/youtube_download/yt_dlp/extractor/viidea.py b/plugins/youtube_download/yt_dlp/extractor/viidea.py
index 649ffe3..2f04e88 100644
--- a/plugins/youtube_download/yt_dlp/extractor/viidea.py
+++ b/plugins/youtube_download/yt_dlp/extractor/viidea.py
@@ -1,10 +1,7 @@
 import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_str,
-    compat_urlparse,
-)
 from ..networking.exceptions import HTTPError
 from ..utils import (
     ExtractorError,
@@ -124,13 +121,13 @@ class ViideaIE(InfoExtractor):
              r'cfg\s*:\s*({[^}]+})'],
             webpage, 'cfg'), lecture_slug, js_to_json)
 
-        lecture_id = compat_str(cfg['obj_id'])
+        lecture_id = str(cfg['obj_id'])
 
         base_url = self._proto_relative_url(cfg['livepipe'], 'http:')
 
         try:
             lecture_data = self._download_json(
-                '%s/site/api/lecture/%s?format=json' % (base_url, lecture_id),
+                f'{base_url}/site/api/lecture/{lecture_id}?format=json',
                 lecture_id)['lecture'][0]
         except ExtractorError as e:
             if isinstance(e.cause, HTTPError) and e.cause.status == 403:
@@ -150,18 +147,18 @@ class ViideaIE(InfoExtractor):
 
         playlist_entries = []
         lecture_type = lecture_data.get('type')
-        parts = [compat_str(video) for video in cfg.get('videos', [])]
+        parts = [str(video) for video in cfg.get('videos', [])]
         if parts:
             multipart = len(parts) > 1
 
             def extract_part(part_id):
-                smil_url = '%s/%s/video/%s/smil.xml' % (base_url, lecture_slug, part_id)
+                smil_url = f'{base_url}/{lecture_slug}/video/{part_id}/smil.xml'
                 smil = self._download_smil(smil_url, lecture_id)
                 info = self._parse_smil(smil, smil_url, lecture_id)
-                info['id'] = lecture_id if not multipart else '%s_part%s' % (lecture_id, part_id)
-                info['display_id'] = lecture_slug if not multipart else '%s_part%s' % (lecture_slug, part_id)
+                info['id'] = lecture_id if not multipart else f'{lecture_id}_part{part_id}'
+                info['display_id'] = lecture_slug if not multipart else f'{lecture_slug}_part{part_id}'
                 if multipart:
-                    info['title'] += ' (Part %s)' % part_id
+                    info['title'] += f' (Part {part_id})'
                 switch = smil.find('.//switch')
                 if switch is not None:
                     info['duration'] = parse_duration(switch.attrib.get('dur'))
@@ -187,9 +184,9 @@ class ViideaIE(InfoExtractor):
         # It's probably a playlist
         if not parts or lecture_type == 'evt':
             playlist_webpage = self._download_webpage(
-                '%s/site/ajax/drilldown/?id=%s' % (base_url, lecture_id), lecture_id)
+                f'{base_url}/site/ajax/drilldown/?id={lecture_id}', lecture_id)
             entries = [
-                self.url_result(compat_urlparse.urljoin(url, video_url), 'Viidea')
+                self.url_result(urllib.parse.urljoin(url, video_url), 'Viidea')
                 for _, video_url in re.findall(
                     r'<a[^>]+href=(["\'])(.+?)\1[^>]+id=["\']lec=\d+', playlist_webpage)]
             playlist_entries.extend(entries)
diff --git a/plugins/youtube_download/yt_dlp/extractor/viki.py b/plugins/youtube_download/yt_dlp/extractor/viki.py
deleted file mode 100644
index 3246dab..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/viki.py
+++ /dev/null
@@ -1,346 +0,0 @@
-import hashlib
-import hmac
-import json
-import time
-
-from .common import InfoExtractor
-from ..utils import (
-    ExtractorError,
-    int_or_none,
-    parse_age_limit,
-    parse_iso8601,
-    try_get,
-)
-
-
-class VikiBaseIE(InfoExtractor):
-    _VALID_URL_BASE = r'https?://(?:www\.)?viki\.(?:com|net|mx|jp|fr)/'
-    _API_URL_TEMPLATE = 'https://api.viki.io%s'
-
-    _DEVICE_ID = '112395910d'
-    _APP = '100005a'
-    _APP_VERSION = '6.11.3'
-    _APP_SECRET = 'd96704b180208dbb2efa30fe44c48bd8690441af9f567ba8fd710a72badc85198f7472'
-
-    _GEO_BYPASS = False
-    _NETRC_MACHINE = 'viki'
-
-    _token = None
-
-    _ERRORS = {
-        'geo': 'Sorry, this content is not available in your region.',
-        'upcoming': 'Sorry, this content is not yet available.',
-        'paywall': 'Sorry, this content is only available to Viki Pass Plus subscribers',
-    }
-
-    def _stream_headers(self, timestamp, sig):
-        return {
-            'X-Viki-manufacturer': 'vivo',
-            'X-Viki-device-model': 'vivo 1606',
-            'X-Viki-device-os-ver': '6.0.1',
-            'X-Viki-connection-type': 'WIFI',
-            'X-Viki-carrier': '',
-            'X-Viki-as-id': '100005a-1625321982-3932',
-            'timestamp': str(timestamp),
-            'signature': str(sig),
-            'x-viki-app-ver': self._APP_VERSION
-        }
-
-    def _api_query(self, path, version=4, **kwargs):
-        path += '?' if '?' not in path else '&'
-        query = f'/v{version}/{path}app={self._APP}'
-        if self._token:
-            query += '&token=%s' % self._token
-        return query + ''.join(f'&{name}={val}' for name, val in kwargs.items())
-
-    def _sign_query(self, path):
-        timestamp = int(time.time())
-        query = self._api_query(path, version=5)
-        sig = hmac.new(
-            self._APP_SECRET.encode('ascii'), f'{query}&t={timestamp}'.encode('ascii'), hashlib.sha1).hexdigest()
-        return timestamp, sig, self._API_URL_TEMPLATE % query
-
-    def _call_api(
-            self, path, video_id, note='Downloading JSON metadata', data=None, query=None, fatal=True):
-        if query is None:
-            timestamp, sig, url = self._sign_query(path)
-        else:
-            url = self._API_URL_TEMPLATE % self._api_query(path, version=4)
-        resp = self._download_json(
-            url, video_id, note, fatal=fatal, query=query,
-            data=json.dumps(data).encode('utf-8') if data else None,
-            headers=({'x-viki-app-ver': self._APP_VERSION} if data
-                     else self._stream_headers(timestamp, sig) if query is None
-                     else None), expected_status=400) or {}
-
-        self._raise_error(resp.get('error'), fatal)
-        return resp
-
-    def _raise_error(self, error, fatal=True):
-        if error is None:
-            return
-        msg = '%s said: %s' % (self.IE_NAME, error)
-        if fatal:
-            raise ExtractorError(msg, expected=True)
-        else:
-            self.report_warning(msg)
-
-    def _check_errors(self, data):
-        for reason, status in (data.get('blocking') or {}).items():
-            if status and reason in self._ERRORS:
-                message = self._ERRORS[reason]
-                if reason == 'geo':
-                    self.raise_geo_restricted(msg=message)
-                elif reason == 'paywall':
-                    if try_get(data, lambda x: x['paywallable']['tvod']):
-                        self._raise_error('This video is for rent only or TVOD (Transactional Video On demand)')
-                    self.raise_login_required(message)
-                self._raise_error(message)
-
-    def _perform_login(self, username, password):
-        self._token = self._call_api(
-            'sessions.json', None, 'Logging in', fatal=False,
-            data={'username': username, 'password': password}).get('token')
-        if not self._token:
-            self.report_warning('Login Failed: Unable to get session token')
-
-    @staticmethod
-    def dict_selection(dict_obj, preferred_key):
-        if preferred_key in dict_obj:
-            return dict_obj[preferred_key]
-        return (list(filter(None, dict_obj.values())) or [None])[0]
-
-
-class VikiIE(VikiBaseIE):
-    IE_NAME = 'viki'
-    _VALID_URL = r'%s(?:videos|player)/(?P<id>[0-9]+v)' % VikiBaseIE._VALID_URL_BASE
-    _TESTS = [{
-        'note': 'Free non-DRM video with storyboards in MPD',
-        'url': 'https://www.viki.com/videos/1175236v-choosing-spouse-by-lottery-episode-1',
-        'info_dict': {
-            'id': '1175236v',
-            'ext': 'mp4',
-            'title': 'Choosing Spouse by Lottery - Episode 1',
-            'timestamp': 1606463239,
-            'age_limit': 13,
-            'uploader': 'FCC',
-            'upload_date': '20201127',
-        },
-    }, {
-        'url': 'http://www.viki.com/videos/1023585v-heirs-episode-14',
-        'info_dict': {
-            'id': '1023585v',
-            'ext': 'mp4',
-            'title': 'Heirs - Episode 14',
-            'uploader': 'SBS Contents Hub',
-            'timestamp': 1385047627,
-            'upload_date': '20131121',
-            'age_limit': 13,
-            'duration': 3570,
-            'episode_number': 14,
-        },
-        'skip': 'Blocked in the US',
-    }, {
-        # clip
-        'url': 'http://www.viki.com/videos/1067139v-the-avengers-age-of-ultron-press-conference',
-        'md5': '86c0b5dbd4d83a6611a79987cc7a1989',
-        'info_dict': {
-            'id': '1067139v',
-            'ext': 'mp4',
-            'title': "'The Avengers: Age of Ultron' Press Conference",
-            'description': 'md5:d70b2f9428f5488321bfe1db10d612ea',
-            'duration': 352,
-            'timestamp': 1430380829,
-            'upload_date': '20150430',
-            'uploader': 'Arirang TV',
-            'like_count': int,
-            'age_limit': 0,
-        },
-        'skip': 'Sorry. There was an error loading this video',
-    }, {
-        'url': 'http://www.viki.com/videos/1048879v-ankhon-dekhi',
-        'info_dict': {
-            'id': '1048879v',
-            'ext': 'mp4',
-            'title': 'Ankhon Dekhi',
-            'duration': 6512,
-            'timestamp': 1408532356,
-            'upload_date': '20140820',
-            'uploader': 'Spuul',
-            'like_count': int,
-            'age_limit': 13,
-        },
-        'skip': 'Blocked in the US',
-    }, {
-        # episode
-        'url': 'http://www.viki.com/videos/44699v-boys-over-flowers-episode-1',
-        'md5': '0a53dc252e6e690feccd756861495a8c',
-        'info_dict': {
-            'id': '44699v',
-            'ext': 'mp4',
-            'title': 'Boys Over Flowers - Episode 1',
-            'description': 'md5:b89cf50038b480b88b5b3c93589a9076',
-            'duration': 4172,
-            'timestamp': 1270496524,
-            'upload_date': '20100405',
-            'uploader': 'group8',
-            'like_count': int,
-            'age_limit': 13,
-            'episode_number': 1,
-        },
-    }, {
-        # youtube external
-        'url': 'http://www.viki.com/videos/50562v-poor-nastya-complete-episode-1',
-        'md5': '63f8600c1da6f01b7640eee7eca4f1da',
-        'info_dict': {
-            'id': '50562v',
-            'ext': 'webm',
-            'title': 'Poor Nastya [COMPLETE] - Episode 1',
-            'description': '',
-            'duration': 606,
-            'timestamp': 1274949505,
-            'upload_date': '20101213',
-            'uploader': 'ad14065n',
-            'uploader_id': 'ad14065n',
-            'like_count': int,
-            'age_limit': 13,
-        },
-        'skip': 'Page not found!',
-    }, {
-        'url': 'http://www.viki.com/player/44699v',
-        'only_matching': True,
-    }, {
-        # non-English description
-        'url': 'http://www.viki.com/videos/158036v-love-in-magic',
-        'md5': '41faaba0de90483fb4848952af7c7d0d',
-        'info_dict': {
-            'id': '158036v',
-            'ext': 'mp4',
-            'uploader': 'I Planet Entertainment',
-            'upload_date': '20111122',
-            'timestamp': 1321985454,
-            'description': 'md5:44b1e46619df3a072294645c770cef36',
-            'title': 'Love In Magic',
-            'age_limit': 13,
-        },
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        video = self._call_api(f'videos/{video_id}.json', video_id, 'Downloading video JSON', query={})
-        self._check_errors(video)
-
-        title = try_get(video, lambda x: x['titles']['en'], str)
-        episode_number = int_or_none(video.get('number'))
-        if not title:
-            title = 'Episode %d' % episode_number if video.get('type') == 'episode' else video.get('id') or video_id
-            container_titles = try_get(video, lambda x: x['container']['titles'], dict) or {}
-            container_title = self.dict_selection(container_titles, 'en')
-            title = '%s - %s' % (container_title, title)
-
-        thumbnails = [{
-            'id': thumbnail_id,
-            'url': thumbnail['url'],
-        } for thumbnail_id, thumbnail in (video.get('images') or {}).items() if thumbnail.get('url')]
-
-        resp = self._call_api(
-            'playback_streams/%s.json?drms=dt3&device_id=%s' % (video_id, self._DEVICE_ID),
-            video_id, 'Downloading video streams JSON')['main'][0]
-
-        stream_id = try_get(resp, lambda x: x['properties']['track']['stream_id'])
-        subtitles = dict((lang, [{
-            'ext': ext,
-            'url': self._API_URL_TEMPLATE % self._api_query(
-                f'videos/{video_id}/auth_subtitles/{lang}.{ext}', stream_id=stream_id)
-        } for ext in ('srt', 'vtt')]) for lang in (video.get('subtitle_completions') or {}).keys())
-
-        mpd_url = resp['url']
-        # 720p is hidden in another MPD which can be found in the current manifest content
-        mpd_content = self._download_webpage(mpd_url, video_id, note='Downloading initial MPD manifest')
-        mpd_url = self._search_regex(
-            r'(?mi)<BaseURL>(http.+.mpd)', mpd_content, 'new manifest', default=mpd_url)
-        if 'mpdhd_high' not in mpd_url and 'sig=' not in mpd_url:
-            # Modify the URL to get 1080p
-            mpd_url = mpd_url.replace('mpdhd', 'mpdhd_high')
-        formats = self._extract_mpd_formats(mpd_url, video_id)
-
-        return {
-            'id': video_id,
-            'formats': formats,
-            'title': title,
-            'description': self.dict_selection(video.get('descriptions', {}), 'en'),
-            'duration': int_or_none(video.get('duration')),
-            'timestamp': parse_iso8601(video.get('created_at')),
-            'uploader': video.get('author'),
-            'uploader_url': video.get('author_url'),
-            'like_count': int_or_none(try_get(video, lambda x: x['likes']['count'])),
-            'age_limit': parse_age_limit(video.get('rating')),
-            'thumbnails': thumbnails,
-            'subtitles': subtitles,
-            'episode_number': episode_number,
-        }
-
-
-class VikiChannelIE(VikiBaseIE):
-    IE_NAME = 'viki:channel'
-    _VALID_URL = r'%s(?:tv|news|movies|artists)/(?P<id>[0-9]+c)' % VikiBaseIE._VALID_URL_BASE
-    _TESTS = [{
-        'url': 'http://www.viki.com/tv/50c-boys-over-flowers',
-        'info_dict': {
-            'id': '50c',
-            'title': 'Boys Over Flowers',
-            'description': 'md5:804ce6e7837e1fd527ad2f25420f4d59',
-        },
-        'playlist_mincount': 51,
-    }, {
-        'url': 'http://www.viki.com/tv/1354c-poor-nastya-complete',
-        'info_dict': {
-            'id': '1354c',
-            'title': 'Poor Nastya [COMPLETE]',
-            'description': 'md5:05bf5471385aa8b21c18ad450e350525',
-        },
-        'playlist_count': 127,
-        'skip': 'Page not found',
-    }, {
-        'url': 'http://www.viki.com/news/24569c-showbiz-korea',
-        'only_matching': True,
-    }, {
-        'url': 'http://www.viki.com/movies/22047c-pride-and-prejudice-2005',
-        'only_matching': True,
-    }, {
-        'url': 'http://www.viki.com/artists/2141c-shinee',
-        'only_matching': True,
-    }]
-
-    _video_types = ('episodes', 'movies', 'clips', 'trailers')
-
-    def _entries(self, channel_id):
-        params = {
-            'app': self._APP, 'token': self._token, 'only_ids': 'true',
-            'direction': 'asc', 'sort': 'number', 'per_page': 30
-        }
-        video_types = self._configuration_arg('video_types') or self._video_types
-        for video_type in video_types:
-            if video_type not in self._video_types:
-                self.report_warning(f'Unknown video_type: {video_type}')
-            page_num = 0
-            while True:
-                page_num += 1
-                params['page'] = page_num
-                res = self._call_api(
-                    f'containers/{channel_id}/{video_type}.json', channel_id, query=params, fatal=False,
-                    note='Downloading %s JSON page %d' % (video_type.title(), page_num))
-
-                for video_id in res.get('response') or []:
-                    yield self.url_result(f'https://www.viki.com/videos/{video_id}', VikiIE.ie_key(), video_id)
-                if not res.get('more'):
-                    break
-
-    def _real_extract(self, url):
-        channel_id = self._match_id(url)
-        channel = self._call_api('containers/%s.json' % channel_id, channel_id, 'Downloading channel JSON')
-        self._check_errors(channel)
-        return self.playlist_result(
-            self._entries(channel_id), channel_id,
-            self.dict_selection(channel['titles'], 'en'),
-            self.dict_selection(channel['descriptions'], 'en'))
diff --git a/plugins/youtube_download/yt_dlp/extractor/vimeo.py b/plugins/youtube_download/yt_dlp/extractor/vimeo.py
index e72fa50..fb9af7a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/vimeo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/vimeo.py
@@ -1,32 +1,37 @@
 import base64
 import functools
-import re
 import itertools
+import json
+import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import compat_str, compat_urlparse
 from ..networking import HEADRequest, Request
 from ..networking.exceptions import HTTPError
 from ..utils import (
+    ExtractorError,
+    OnDemandPagedList,
     clean_html,
     determine_ext,
-    ExtractorError,
     get_element_by_class,
-    js_to_json,
     int_or_none,
+    join_nonempty,
+    js_to_json,
     merge_dicts,
-    OnDemandPagedList,
     parse_filesize,
     parse_iso8601,
     parse_qs,
+    qualities,
     smuggle_url,
     str_or_none,
+    traverse_obj,
     try_get,
     unified_timestamp,
     unsmuggle_url,
+    url_or_none,
     urlencode_postdata,
-    urljoin,
     urlhandle_detect_ext,
+    urljoin,
 )
 
 
@@ -34,31 +39,37 @@ class VimeoBaseInfoExtractor(InfoExtractor):
     _NETRC_MACHINE = 'vimeo'
     _LOGIN_REQUIRED = False
     _LOGIN_URL = 'https://vimeo.com/log_in'
+    _IOS_CLIENT_AUTH = 'MTMxNzViY2Y0NDE0YTQ5YzhjZTc0YmU0NjVjNDQxYzNkYWVjOWRlOTpHKzRvMmgzVUh4UkxjdU5FRW80cDNDbDhDWGR5dVJLNUJZZ055dHBHTTB4V1VzaG41bEx1a2hiN0NWYWNUcldSSW53dzRUdFRYZlJEZmFoTTArOTBUZkJHS3R4V2llYU04Qnl1bERSWWxUdXRidjNqR2J4SHFpVmtFSUcyRktuQw=='
+    _IOS_CLIENT_HEADERS = {
+        'Accept': 'application/vnd.vimeo.*+json; version=3.4.10',
+        'Accept-Language': 'en',
+        'User-Agent': 'Vimeo/11.10.0 (com.vimeo; build:250424.164813.0; iOS 18.4.1) Alamofire/5.9.0 VimeoNetworking/5.0.0',
+    }
+    _IOS_OAUTH_CACHE_KEY = 'oauth-token-ios'
+    _ios_oauth_token = None
 
     @staticmethod
     def _smuggle_referrer(url, referrer_url):
-        return smuggle_url(url, {'http_headers': {'Referer': referrer_url}})
+        return smuggle_url(url, {'referer': referrer_url})
 
     def _unsmuggle_headers(self, url):
         """@returns (url, smuggled_data, headers)"""
         url, data = unsmuggle_url(url, {})
         headers = self.get_param('http_headers').copy()
-        if 'http_headers' in data:
-            headers.update(data['http_headers'])
+        if 'referer' in data:
+            headers['Referer'] = data['referer']
         return url, data, headers
 
     def _perform_login(self, username, password):
-        webpage = self._download_webpage(
-            self._LOGIN_URL, None, 'Downloading login page')
-        token, vuid = self._extract_xsrft_and_vuid(webpage)
+        viewer = self._download_json('https://vimeo.com/_next/viewer', None, 'Downloading login token')
         data = {
             'action': 'login',
             'email': username,
             'password': password,
             'service': 'vimeo',
-            'token': token,
+            'token': viewer['xsrft'],
         }
-        self._set_vimeo_cookie('vuid', vuid)
+        self._set_vimeo_cookie('vuid', viewer['vuid'])
         try:
             self._download_webpage(
                 self._LOGIN_URL, None, 'Logging in',
@@ -85,29 +96,26 @@ class VimeoBaseInfoExtractor(InfoExtractor):
                 expected=True)
         return password
 
-    def _verify_video_password(self, url, video_id, password, token, vuid):
-        if url.startswith('http://'):
-            # vimeo only supports https now, but the user can give an http url
-            url = url.replace('http://', 'https://')
-        self._set_vimeo_cookie('vuid', vuid)
-        return self._download_webpage(
-            url + '/password', video_id, 'Verifying the password',
-            'Wrong password', data=urlencode_postdata({
-                'password': password,
-                'token': token,
-            }), headers={
-                'Content-Type': 'application/x-www-form-urlencoded',
-                'Referer': url,
-            })
-
-    def _extract_xsrft_and_vuid(self, webpage):
-        xsrft = self._search_regex(
-            r'(?:(?P<q1>["\'])xsrft(?P=q1)\s*:|xsrft\s*[=:])\s*(?P<q>["\'])(?P<xsrft>.+?)(?P=q)',
-            webpage, 'login token', group='xsrft')
-        vuid = self._search_regex(
-            r'["\']vuid["\']\s*:\s*(["\'])(?P<vuid>.+?)\1',
-            webpage, 'vuid', group='vuid')
-        return xsrft, vuid
+    def _verify_video_password(self, video_id):
+        video_password = self._get_video_password()
+        token = self._download_json(
+            'https://vimeo.com/_next/viewer', video_id, 'Downloading viewer info')['xsrft']
+        url = f'https://vimeo.com/{video_id}'
+        try:
+            self._request_webpage(
+                f'{url}/password', video_id,
+                'Submitting video password', data=json.dumps({
+                    'password': video_password,
+                    'token': token,
+                }, separators=(',', ':')).encode(), headers={
+                    'Accept': '*/*',
+                    'Content-Type': 'application/json',
+                    'Referer': url,
+                }, impersonate=True)
+        except ExtractorError as error:
+            if isinstance(error.cause, HTTPError) and error.cause.status == 418:
+                raise ExtractorError('Wrong password', expected=True)
+            raise
 
     def _extract_vimeo_config(self, webpage, video_id, *args, **kwargs):
         vimeo_config = self._search_regex(
@@ -123,7 +131,13 @@ class VimeoBaseInfoExtractor(InfoExtractor):
         video_data = config['video']
         video_title = video_data.get('title')
         live_event = video_data.get('live_event') or {}
-        is_live = live_event.get('status') == 'started'
+        live_status = {
+            'pending': 'is_upcoming',
+            'active': 'is_upcoming',
+            'started': 'is_live',
+            'ended': 'post_live',
+        }.get(live_event.get('status'))
+        is_live = live_status == 'is_live'
         request = config.get('request') or {}
 
         formats = []
@@ -136,7 +150,7 @@ class VimeoBaseInfoExtractor(InfoExtractor):
                 continue
             formats.append({
                 'url': video_url,
-                'format_id': 'http-%s' % f.get('quality'),
+                'format_id': 'http-{}'.format(f.get('quality')),
                 'source_preference': 10,
                 'width': int_or_none(f.get('width')),
                 'height': int_or_none(f.get('height')),
@@ -145,26 +159,33 @@ class VimeoBaseInfoExtractor(InfoExtractor):
             })
 
         # TODO: fix handling of 308 status code returned for live archive manifest requests
+        QUALITIES = ('low', 'medium', 'high')
+        quality = qualities(QUALITIES)
         sep_pattern = r'/sep/video/'
         for files_type in ('hls', 'dash'):
             for cdn_name, cdn_data in (try_get(config_files, lambda x: x[files_type]['cdns']) or {}).items():
                 manifest_url = cdn_data.get('url')
                 if not manifest_url:
                     continue
-                format_id = '%s-%s' % (files_type, cdn_name)
+                format_id = f'{files_type}-{cdn_name}'
                 sep_manifest_urls = []
                 if re.search(sep_pattern, manifest_url):
                     for suffix, repl in (('', 'video'), ('_sep', 'sep/video')):
                         sep_manifest_urls.append((format_id + suffix, re.sub(
-                            sep_pattern, '/%s/' % repl, manifest_url)))
+                            sep_pattern, f'/{repl}/', manifest_url)))
                 else:
                     sep_manifest_urls = [(format_id, manifest_url)]
                 for f_id, m_url in sep_manifest_urls:
                     if files_type == 'hls':
                         fmts, subs = self._extract_m3u8_formats_and_subtitles(
                             m_url, video_id, 'mp4', live=is_live, m3u8_id=f_id,
-                            note='Downloading %s m3u8 information' % cdn_name,
+                            note=f'Downloading {cdn_name} m3u8 information',
                             fatal=False)
+                        # m3u8 doesn't give audio bitrates; need to prioritize based on GROUP-ID
+                        # See: https://github.com/yt-dlp/yt-dlp/issues/10854
+                        for f in fmts:
+                            if mobj := re.search(rf'audio-({"|".join(QUALITIES)})', f['format_id']):
+                                f['quality'] = quality(mobj.group(1))
                         formats.extend(fmts)
                         self._merge_subtitles(subs, target=subtitles)
                     elif files_type == 'dash':
@@ -174,7 +195,7 @@ class VimeoBaseInfoExtractor(InfoExtractor):
                                 m_url = real_m_url
                         fmts, subs = self._extract_mpd_formats_and_subtitles(
                             m_url.replace('/master.json', '/master.mpd'), video_id, f_id,
-                            'Downloading %s MPD information' % cdn_name,
+                            f'Downloading {cdn_name} MPD information',
                             fatal=False)
                         formats.extend(fmts)
                         self._merge_subtitles(subs, target=subtitles)
@@ -202,25 +223,11 @@ class VimeoBaseInfoExtractor(InfoExtractor):
                     'width': int_or_none(key),
                     'url': thumb,
                 })
-            thumbnail = video_data.get('thumbnail')
-            if thumbnail:
-                thumbnails.append({
-                    'url': thumbnail,
-                })
+            thumbnails.extend(traverse_obj(video_data, (('thumbnail', 'thumbnail_url'), {'url': {url_or_none}})))
 
         owner = video_data.get('owner') or {}
         video_uploader_url = owner.get('url')
 
-        duration = int_or_none(video_data.get('duration'))
-        chapter_data = try_get(config, lambda x: x['embed']['chapters']) or []
-        chapters = [{
-            'title': current_chapter.get('title'),
-            'start_time': current_chapter.get('timecode'),
-            'end_time': next_chapter.get('timecode'),
-        } for current_chapter, next_chapter in zip(chapter_data, chapter_data[1:] + [{'timecode': duration}])]
-        if chapters and chapters[0]['start_time']:  # Chapters may not start from 0
-            chapters[:0] = [{'title': '<Untitled>', 'start_time': 0, 'end_time': chapters[0]['start_time']}]
-
         return {
             'id': str_or_none(video_data.get('id')) or video_id,
             'title': video_title,
@@ -228,32 +235,73 @@ class VimeoBaseInfoExtractor(InfoExtractor):
             'uploader_id': video_uploader_url.split('/')[-1] if video_uploader_url else None,
             'uploader_url': video_uploader_url,
             'thumbnails': thumbnails,
-            'duration': duration,
-            'chapters': chapters or None,
+            'duration': int_or_none(video_data.get('duration')),
+            'chapters': sorted(traverse_obj(config, (
+                'embed', 'chapters', lambda _, v: int(v['timecode']) is not None, {
+                    'title': ('title', {str}),
+                    'start_time': ('timecode', {int_or_none}),
+                })), key=lambda c: c['start_time']) or None,
             'formats': formats,
             'subtitles': subtitles,
-            'is_live': is_live,
+            'live_status': live_status,
+            'release_timestamp': traverse_obj(live_event, ('ingest', 'scheduled_start_time', {parse_iso8601})),
             # Note: Bitrates are completely broken. Single m3u8 may contain entries in kbps and bps
             # at the same time without actual units specified.
             '_format_sort_fields': ('quality', 'res', 'fps', 'hdr:12', 'source'),
         }
 
-    def _extract_original_format(self, url, video_id, unlisted_hash=None):
+    def _fetch_oauth_token(self):
+        if not self._ios_oauth_token:
+            self._ios_oauth_token = self.cache.load(self._NETRC_MACHINE, self._IOS_OAUTH_CACHE_KEY)
+
+        if not self._ios_oauth_token:
+            self._ios_oauth_token = self._download_json(
+                'https://api.vimeo.com/oauth/authorize/client', None,
+                'Fetching OAuth token', 'Failed to fetch OAuth token',
+                headers={
+                    'Authorization': f'Basic {self._IOS_CLIENT_AUTH}',
+                    **self._IOS_CLIENT_HEADERS,
+                }, data=urlencode_postdata({
+                    'grant_type': 'client_credentials',
+                    'scope': 'private public create edit delete interact upload purchased stats',
+                }, quote_via=urllib.parse.quote))['access_token']
+            self.cache.store(self._NETRC_MACHINE, self._IOS_OAUTH_CACHE_KEY, self._ios_oauth_token)
+
+        return self._ios_oauth_token
+
+    def _call_videos_api(self, video_id, unlisted_hash=None, **kwargs):
+        return self._download_json(
+            join_nonempty(f'https://api.vimeo.com/videos/{video_id}', unlisted_hash, delim=':'),
+            video_id, 'Downloading API JSON', headers={
+                'Authorization': f'Bearer {self._fetch_oauth_token()}',
+                **self._IOS_CLIENT_HEADERS,
+            }, query={
+                'fields': ','.join((
+                    'config_url', 'embed_player_config_url', 'player_embed_url', 'download', 'play',
+                    'files', 'description', 'license', 'release_time', 'created_time', 'stats.plays',
+                    'metadata.connections.comments.total', 'metadata.connections.likes.total')),
+            }, **kwargs)
+
+    def _extract_original_format(self, url, video_id, unlisted_hash=None, api_data=None):
+        # Original/source formats are only available when logged in
+        if not self._get_cookies('https://vimeo.com/').get('vimeo'):
+            return
+
         query = {'action': 'load_download_config'}
         if unlisted_hash:
             query['unlisted_hash'] = unlisted_hash
         download_data = self._download_json(
-            url, video_id, fatal=False, query=query,
-            headers={'X-Requested-With': 'XMLHttpRequest'},
+            url, video_id, 'Loading download config JSON', fatal=False,
+            query=query, headers={'X-Requested-With': 'XMLHttpRequest'},
             expected_status=(403, 404)) or {}
         source_file = download_data.get('source_file')
         download_url = try_get(source_file, lambda x: x['download_url'])
         if download_url and not source_file.get('is_cold') and not source_file.get('is_defrosting'):
             source_name = source_file.get('public_name', 'Original')
-            if self._is_valid_url(download_url, video_id, '%s video' % source_name):
+            if self._is_valid_url(download_url, video_id, f'{source_name} video'):
                 ext = (try_get(
                     source_file, lambda x: x['extension'],
-                    compat_str) or determine_ext(
+                    str) or determine_ext(
                     download_url, None) or 'mp4').lower()
                 return {
                     'url': download_url,
@@ -265,15 +313,9 @@ class VimeoBaseInfoExtractor(InfoExtractor):
                     'quality': 1,
                 }
 
-        jwt_response = self._download_json(
-            'https://vimeo.com/_rv/viewer', video_id, note='Downloading jwt token', fatal=False) or {}
-        if not jwt_response.get('jwt'):
-            return
-        headers = {'Authorization': 'jwt %s' % jwt_response['jwt']}
-        original_response = self._download_json(
-            f'https://api.vimeo.com/videos/{video_id}', video_id,
-            headers=headers, fatal=False, expected_status=(403, 404)) or {}
-        for download_data in original_response.get('download') or []:
+        original_response = api_data or self._call_videos_api(
+            video_id, unlisted_hash, fatal=False, expected_status=(403, 404))
+        for download_data in traverse_obj(original_response, ('download', ..., {dict})):
             download_url = download_data.get('link')
             if not download_url or download_data.get('quality') != 'source':
                 continue
@@ -355,10 +397,10 @@ class VimeoIE(VimeoBaseInfoExtractor):
             'params': {
                 'format': 'best[protocol=https]',
             },
-            'skip': 'No longer available'
+            'skip': 'No longer available',
         },
         {
-            'url': 'http://player.vimeo.com/video/54469442',
+            'url': 'https://player.vimeo.com/video/54469442',
             'md5': '619b811a4417aa4abe78dc653becf511',
             'note': 'Videos that embed the url in the player page',
             'info_dict': {
@@ -369,12 +411,12 @@ class VimeoIE(VimeoBaseInfoExtractor):
                 'uploader_url': r're:https?://(?:www\.)?vimeo\.com/businessofsoftware',
                 'uploader_id': 'businessofsoftware',
                 'duration': 3610,
-                'description': None,
-                'thumbnail': 'https://i.vimeocdn.com/video/376682406-f34043e7b766af6bef2af81366eacd6724f3fc3173179a11a97a1e26587c9529-d_1280',
+                'thumbnail': 'https://i.vimeocdn.com/video/376682406-f34043e7b766af6bef2af81366eacd6724f3fc3173179a11a97a1e26587c9529-d',
             },
             'params': {
                 'format': 'best[protocol=https]',
             },
+            'expected_warnings': ['Failed to parse XML: not well-formed'],
         },
         {
             'url': 'http://vimeo.com/68375962',
@@ -384,22 +426,24 @@ class VimeoIE(VimeoBaseInfoExtractor):
                 'id': '68375962',
                 'ext': 'mp4',
                 'title': 'youtube-dl password protected test video',
-                'timestamp': 1371200155,
+                'timestamp': 1371214555,
                 'upload_date': '20130614',
+                'release_timestamp': 1371214555,
+                'release_date': '20130614',
                 'uploader_url': r're:https?://(?:www\.)?vimeo\.com/user18948128',
                 'uploader_id': 'user18948128',
                 'uploader': 'Jaime Marquínez Ferrándiz',
                 'duration': 10,
-                'description': 'md5:6173f270cd0c0119f22817204b3eb86c',
-                'thumbnail': 'https://i.vimeocdn.com/video/440665496-b2c5aee2b61089442c794f64113a8e8f7d5763c3e6b3ebfaf696ae6413f8b1f4-d_1280',
-                'view_count': int,
                 'comment_count': int,
                 'like_count': int,
+                'view_count': int,
+                'thumbnail': 'https://i.vimeocdn.com/video/440665496-b2c5aee2b61089442c794f64113a8e8f7d5763c3e6b3ebfaf696ae6413f8b1f4-d',
             },
             'params': {
                 'format': 'best[protocol=https]',
                 'videopassword': 'youtube-dl',
             },
+            'expected_warnings': ['Failed to parse XML: not well-formed'],
         },
         {
             'url': 'http://vimeo.com/channels/keypeele/75629013',
@@ -417,35 +461,44 @@ class VimeoIE(VimeoBaseInfoExtractor):
                 'timestamp': 1380339469,
                 'upload_date': '20130928',
                 'duration': 187,
-                'thumbnail': 'https://i.vimeocdn.com/video/450239872-a05512d9b1e55d707a7c04365c10980f327b06d966351bc403a5d5d65c95e572-d_1280',
+                'thumbnail': 'https://i.vimeocdn.com/video/450239872-a05512d9b1e55d707a7c04365c10980f327b06d966351bc403a5d5d65c95e572-d',
                 'view_count': int,
                 'comment_count': int,
                 'like_count': int,
             },
             'params': {'format': 'http-1080p'},
+            'expected_warnings': ['Failed to parse XML: not well-formed'],
         },
         {
             'url': 'http://vimeo.com/76979871',
             'note': 'Video with subtitles',
             'info_dict': {
                 'id': '76979871',
-                'ext': 'mov',
+                'ext': 'mp4',
                 'title': 'The New Vimeo Player (You Know, For Videos)',
-                'description': 'md5:2ec900bf97c3f389378a96aee11260ea',
-                'timestamp': 1381846109,
+                'description': str,  # FIXME: Dynamic SEO spam description
+                'timestamp': 1381860509,
                 'upload_date': '20131015',
+                'release_timestamp': 1381860509,
+                'release_date': '20131015',
                 'uploader_url': r're:https?://(?:www\.)?vimeo\.com/staff',
                 'uploader_id': 'staff',
-                'uploader': 'Vimeo Staff',
+                'uploader': 'Vimeo',
                 'duration': 62,
+                'comment_count': int,
+                'like_count': int,
+                'thumbnail': 'https://i.vimeocdn.com/video/452001751-8216e0571c251a09d7a8387550942d89f7f86f6398f8ed886e639b0dd50d3c90-d',
                 'subtitles': {
-                    'de': [{'ext': 'vtt'}],
-                    'en': [{'ext': 'vtt'}],
-                    'es': [{'ext': 'vtt'}],
-                    'fr': [{'ext': 'vtt'}],
+                    'de': 'count:3',
+                    'en': 'count:3',
+                    'es': 'count:3',
+                    'fr': 'count:3',
                 },
             },
-            'expected_warnings': ['Ignoring subtitle tracks found in the HLS manifest'],
+            'expected_warnings': [
+                'Ignoring subtitle tracks found in the HLS manifest',
+                'Failed to parse XML: not well-formed',
+            ],
         },
         {
             # from https://www.ouya.tv/game/Pier-Solar-and-the-Great-Architects/
@@ -459,13 +512,14 @@ class VimeoIE(VimeoBaseInfoExtractor):
                 'uploader_url': r're:https?://(?:www\.)?vimeo\.com/user28849593',
                 'uploader_id': 'user28849593',
                 'duration': 118,
-                'thumbnail': 'https://i.vimeocdn.com/video/478636036-c18440305ef3df9decfb6bf207a61fe39d2d17fa462a96f6f2d93d30492b037d-d_1280',
+                'thumbnail': 'https://i.vimeocdn.com/video/478636036-c18440305ef3df9decfb6bf207a61fe39d2d17fa462a96f6f2d93d30492b037d-d',
             },
+            'expected_warnings': ['Failed to parse XML: not well-formed'],
         },
         {
-            # contains original format
+            # contains Original format
             'url': 'https://vimeo.com/33951933',
-            'md5': '53c688fa95a55bf4b7293d37a89c5c53',
+            # 'md5': '53c688fa95a55bf4b7293d37a89c5c53',
             'info_dict': {
                 'id': '33951933',
                 'ext': 'mp4',
@@ -473,33 +527,43 @@ class VimeoIE(VimeoBaseInfoExtractor):
                 'uploader': 'The DMCI',
                 'uploader_url': r're:https?://(?:www\.)?vimeo\.com/dmci',
                 'uploader_id': 'dmci',
-                'timestamp': 1324343742,
+                'timestamp': 1324361742,
                 'upload_date': '20111220',
-                'description': 'md5:ae23671e82d05415868f7ad1aec21147',
+                'description': 'md5:f37b4ad0f3ded6fa16f38ecde16c3c44',
                 'duration': 60,
                 'comment_count': int,
                 'view_count': int,
-                'thumbnail': 'https://i.vimeocdn.com/video/231174622-dd07f015e9221ff529d451e1cc31c982b5d87bfafa48c4189b1da72824ee289a-d_1280',
+                'thumbnail': 'https://i.vimeocdn.com/video/231174622-dd07f015e9221ff529d451e1cc31c982b5d87bfafa48c4189b1da72824ee289a-d',
                 'like_count': int,
+                'release_timestamp': 1324361742,
+                'release_date': '20111220',
             },
+            # 'params': {'format': 'Original'},
+            'expected_warnings': ['Failed to parse XML: not well-formed'],
         },
         {
-            'note': 'Contains original format not accessible in webpage',
+            'note': 'Contains source format not accessible in webpage',
             'url': 'https://vimeo.com/393756517',
-            'md5': 'c464af248b592190a5ffbb5d33f382b0',
+            # 'md5': 'c464af248b592190a5ffbb5d33f382b0',
             'info_dict': {
                 'id': '393756517',
-                'ext': 'mov',
-                'timestamp': 1582642091,
+                # 'ext': 'mov',
+                'ext': 'mp4',
+                'timestamp': 1582660091,
                 'uploader_id': 'frameworkla',
                 'title': 'Straight To Hell - Sabrina: Netflix',
                 'uploader': 'Framework Studio',
-                'description': 'md5:f2edc61af3ea7a5592681ddbb683db73',
                 'upload_date': '20200225',
                 'duration': 176,
-                'thumbnail': 'https://i.vimeocdn.com/video/859377297-836494a4ef775e9d4edbace83937d9ad34dc846c688c0c419c0e87f7ab06c4b3-d_1280',
+                'thumbnail': 'https://i.vimeocdn.com/video/859377297-836494a4ef775e9d4edbace83937d9ad34dc846c688c0c419c0e87f7ab06c4b3-d',
                 'uploader_url': 'https://vimeo.com/frameworkla',
+                'comment_count': int,
+                'like_count': int,
+                'release_timestamp': 1582660091,
+                'release_date': '20200225',
             },
+            # 'params': {'format': 'source'},
+            'expected_warnings': ['Failed to parse XML: not well-formed'],
         },
         {
             # only available via https://vimeo.com/channels/tributes/6213729 and
@@ -516,16 +580,18 @@ class VimeoIE(VimeoBaseInfoExtractor):
                 'channel_id': 'tributes',
                 'timestamp': 1250886430,
                 'upload_date': '20090821',
-                'description': 'md5:bdbf314014e58713e6e5b66eb252f4a6',
+                'description': str,  # FIXME: Dynamic SEO spam description
                 'duration': 321,
                 'comment_count': int,
                 'view_count': int,
-                'thumbnail': 'https://i.vimeocdn.com/video/22728298-bfc22146f930de7cf497821c7b0b9f168099201ecca39b00b6bd31fcedfca7a6-d_1280',
+                'thumbnail': 'https://i.vimeocdn.com/video/22728298-bfc22146f930de7cf497821c7b0b9f168099201ecca39b00b6bd31fcedfca7a6-d',
                 'like_count': int,
+                'tags': ['[the shining', 'vimeohq', 'cv', 'vimeo tribute]'],
             },
             'params': {
                 'skip_download': True,
             },
+            'expected_warnings': ['Failed to parse XML: not well-formed'],
         },
         {
             # redirects to ondemand extractor and should be passed through it
@@ -548,28 +614,23 @@ class VimeoIE(VimeoBaseInfoExtractor):
             'skip': 'this page is no longer available.',
         },
         {
-            'url': 'http://player.vimeo.com/video/68375962',
+            'url': 'https://player.vimeo.com/video/68375962',
             'md5': 'aaf896bdb7ddd6476df50007a0ac0ae7',
             'info_dict': {
                 'id': '68375962',
                 'ext': 'mp4',
                 'title': 'youtube-dl password protected test video',
-                'timestamp': 1371200155,
-                'upload_date': '20130614',
                 'uploader_url': r're:https?://(?:www\.)?vimeo\.com/user18948128',
                 'uploader_id': 'user18948128',
                 'uploader': 'Jaime Marquínez Ferrándiz',
                 'duration': 10,
-                'description': 'md5:6173f270cd0c0119f22817204b3eb86c',
-                'thumbnail': 'https://i.vimeocdn.com/video/440665496-b2c5aee2b61089442c794f64113a8e8f7d5763c3e6b3ebfaf696ae6413f8b1f4-d_1280',
-                'view_count': int,
-                'comment_count': int,
-                'like_count': int,
+                'thumbnail': 'https://i.vimeocdn.com/video/440665496-b2c5aee2b61089442c794f64113a8e8f7d5763c3e6b3ebfaf696ae6413f8b1f4-d',
             },
             'params': {
                 'format': 'best[protocol=https]',
                 'videopassword': 'youtube-dl',
             },
+            'expected_warnings': ['Failed to parse XML: not well-formed'],
         },
         {
             'url': 'http://vimeo.com/moogaloop.swf?clip_id=2539741',
@@ -597,10 +658,10 @@ class VimeoIE(VimeoBaseInfoExtractor):
                 'title': "youtube-dl test video '' ä↭𝕐-BaW jenozKc",
                 'uploader': 'Philipp Hagemeister',
                 'uploader_id': 'user20132939',
-                'description': 'md5:fa7b6c6d8db0bdc353893df2f111855b',
+                'description': str,  # FIXME: Dynamic SEO spam description
                 'upload_date': '20150209',
                 'timestamp': 1423518307,
-                'thumbnail': 'https://i.vimeocdn.com/video/default_1280',
+                'thumbnail': r're:https://i\.vimeocdn\.com/video/default',
                 'duration': 10,
                 'like_count': int,
                 'uploader_url': 'https://vimeo.com/user20132939',
@@ -611,6 +672,7 @@ class VimeoIE(VimeoBaseInfoExtractor):
                 'format': 'best[protocol=https]',
                 'videopassword': 'youtube-dl',
             },
+            'expected_warnings': ['Failed to parse XML: not well-formed'],
         },
         {
             # source file returns 403: Forbidden
@@ -632,29 +694,41 @@ class VimeoIE(VimeoBaseInfoExtractor):
                 'license': 'by-nc',
                 'duration': 159,
                 'comment_count': int,
-                'thumbnail': 'https://i.vimeocdn.com/video/562802436-585eeb13b5020c6ac0f171a2234067938098f84737787df05ff0d767f6d54ee9-d_1280',
+                'thumbnail': 'https://i.vimeocdn.com/video/562802436-585eeb13b5020c6ac0f171a2234067938098f84737787df05ff0d767f6d54ee9-d',
                 'like_count': int,
                 'uploader_url': 'https://vimeo.com/aliniamedia',
                 'release_date': '20160329',
+                'view_count': int,
             },
             'params': {'skip_download': True},
+            'expected_warnings': ['Failed to parse XML: not well-formed'],
         },
         {
             'url': 'https://vimeo.com/138909882',
             'info_dict': {
                 'id': '138909882',
+                # 'ext': 'm4v',
                 'ext': 'mp4',
                 'title': 'Eastnor Castle 2015 Firework Champions - The Promo!',
-                'description': 'md5:5967e090768a831488f6e74b7821b3c1',
+                'description': 'md5:9441e6829ae94f380cc6417d982f63ac',
                 'uploader_id': 'fireworkchampions',
                 'uploader': 'Firework Champions',
                 'upload_date': '20150910',
-                'timestamp': 1441901895,
+                'timestamp': 1441916295,
+                'thumbnail': 'https://i.vimeocdn.com/video/534715882-6ff8e4660cbf2fea68282876d8d44f318825dfe572cc4016e73b3266eac8ae3a-d',
+                'uploader_url': 'https://vimeo.com/fireworkchampions',
+                'duration': 229,
+                'view_count': int,
+                'like_count': int,
+                'comment_count': int,
+                'release_timestamp': 1441916295,
+                'release_date': '20150910',
             },
             'params': {
                 'skip_download': True,
-                'format': 'Original',
+                # 'format': 'source',
             },
+            'expected_warnings': ['Failed to parse XML: not well-formed'],
         },
         {
             'url': 'https://vimeo.com/channels/staffpicks/143603739',
@@ -671,12 +745,14 @@ class VimeoIE(VimeoBaseInfoExtractor):
                 'duration': 336,
                 'comment_count': int,
                 'view_count': int,
-                'thumbnail': 'https://i.vimeocdn.com/video/541243181-b593db36a16db2f0096f655da3f5a4dc46b8766d77b0f440df937ecb0c418347-d_1280',
+                'thumbnail': 'https://i.vimeocdn.com/video/541243181-b593db36a16db2f0096f655da3f5a4dc46b8766d77b0f440df937ecb0c418347-d',
                 'like_count': int,
                 'uploader_url': 'https://vimeo.com/karimhd',
                 'channel_url': 'https://vimeo.com/channels/staffpicks',
+                'tags': 'count:6',
             },
             'params': {'skip_download': 'm3u8'},
+            'expected_warnings': ['Failed to parse XML: not well-formed'],
         },
         {
             # requires passing unlisted_hash(a52724358e) to load_download_config request
@@ -694,7 +770,7 @@ class VimeoIE(VimeoBaseInfoExtractor):
                 'release_timestamp': 1627621014,
                 'duration': 976,
                 'comment_count': int,
-                'thumbnail': 'https://i.vimeocdn.com/video/1202249320-4ddb2c30398c0dc0ee059172d1bd5ea481ad12f0e0e3ad01d2266f56c744b015-d_1280',
+                'thumbnail': 'https://i.vimeocdn.com/video/1202249320-4ddb2c30398c0dc0ee059172d1bd5ea481ad12f0e0e3ad01d2266f56c744b015-d',
                 'like_count': int,
                 'uploader_url': 'https://vimeo.com/txwestcapital',
                 'release_date': '20210730',
@@ -706,6 +782,82 @@ class VimeoIE(VimeoBaseInfoExtractor):
             'params': {
                 'skip_download': True,
             },
+            'expected_warnings': ['Failed to parse XML: not well-formed'],
+        },
+        {
+            # chapters must be sorted, see: https://github.com/yt-dlp/yt-dlp/issues/5308
+            'url': 'https://player.vimeo.com/video/756714419',
+            'info_dict': {
+                'id': '756714419',
+                'ext': 'mp4',
+                'title': 'Dr Arielle Schwartz - Therapeutic yoga for optimum sleep',
+                'uploader': 'Alex Howard',
+                'uploader_id': 'user54729178',
+                'uploader_url': 'https://vimeo.com/user54729178',
+                'thumbnail': r're:https://i\.vimeocdn\.com/video/1520099929-[\da-f]+-d',
+                'duration': 2636,
+                'chapters': [
+                    {'start_time': 0, 'end_time': 10, 'title': '<Untitled Chapter 1>'},
+                    {'start_time': 10, 'end_time': 106, 'title': 'Welcoming Dr Arielle Schwartz'},
+                    {'start_time': 106, 'end_time': 305, 'title': 'What is therapeutic yoga?'},
+                    {'start_time': 305, 'end_time': 594, 'title': 'Vagal toning practices'},
+                    {'start_time': 594, 'end_time': 888, 'title': 'Trauma and difficulty letting go'},
+                    {'start_time': 888, 'end_time': 1059, 'title': "Dr Schwartz' insomnia experience"},
+                    {'start_time': 1059, 'end_time': 1471, 'title': 'A strategy for helping sleep issues'},
+                    {'start_time': 1471, 'end_time': 1667, 'title': 'Yoga nidra'},
+                    {'start_time': 1667, 'end_time': 2121, 'title': 'Wisdom in stillness'},
+                    {'start_time': 2121, 'end_time': 2386, 'title': 'What helps us be more able to let go?'},
+                    {'start_time': 2386, 'end_time': 2510, 'title': 'Practical tips to help ourselves'},
+                    {'start_time': 2510, 'end_time': 2636, 'title': 'Where to find out more'},
+                ],
+            },
+            'params': {
+                'http_headers': {'Referer': 'https://sleepsuperconference.com'},
+                'skip_download': 'm3u8',
+            },
+            'expected_warnings': ['Failed to parse XML: not well-formed'],
+        },
+        {
+            # vimeo.com URL with unlisted hash and Original format
+            'url': 'https://vimeo.com/144579403/ec02229140',
+            # 'md5': '6b662c2884e0373183fbde2a0d15cb78',
+            'info_dict': {
+                'id': '144579403',
+                'ext': 'mp4',
+                'title': 'SALESMANSHIP',
+                'description': 'md5:4338302f347a1ff8841b4a3aecaa09f0',
+                'uploader': 'Off the Picture Pictures',
+                'uploader_id': 'offthepicturepictures',
+                'uploader_url': 'https://vimeo.com/offthepicturepictures',
+                'duration': 669,
+                'upload_date': '20151104',
+                'timestamp': 1446607180,
+                'release_date': '20151104',
+                'release_timestamp': 1446607180,
+                'like_count': int,
+                'view_count': int,
+                'comment_count': int,
+                'thumbnail': r're:https://i\.vimeocdn\.com/video/1018638656-[\da-f]+-d',
+            },
+            # 'params': {'format': 'Original'},
+            'expected_warnings': ['Failed to parse XML: not well-formed'],
+        },
+        {
+            # player.vimeo.com URL with source format
+            'url': 'https://player.vimeo.com/video/859028877',
+            # 'md5': '19ca3d2463441dee2d2f0671ac2916a2',
+            'info_dict': {
+                'id': '859028877',
+                'ext': 'mp4',
+                'title': 'Ariana Grande - Honeymoon Avenue (Live from London)',
+                'uploader': 'Raja Virdi',
+                'uploader_id': 'rajavirdi',
+                'uploader_url': 'https://vimeo.com/rajavirdi',
+                'duration': 300,
+                'thumbnail': r're:https://i\.vimeocdn\.com/video/1716727772-[\da-f]+-d',
+            },
+            # 'params': {'format': 'source'},
+            'expected_warnings': ['Failed to parse XML: not well-formed'],
         },
         {
             # user playlist alias -> https://vimeo.com/258705797
@@ -734,28 +886,34 @@ class VimeoIE(VimeoBaseInfoExtractor):
             'Content-Type': 'application/x-www-form-urlencoded',
         })
         checked = self._download_json(
-            f'{compat_urlparse.urlsplit(url)._replace(query=None).geturl()}/check-password',
+            f'{urllib.parse.urlsplit(url)._replace(query=None).geturl()}/check-password',
             video_id, 'Verifying the password', data=data, headers=headers)
         if checked is False:
             raise ExtractorError('Wrong video password', expected=True)
         return checked
 
     def _extract_from_api(self, video_id, unlisted_hash=None):
-        token = self._download_json(
-            'https://vimeo.com/_rv/jwt', video_id, headers={
-                'X-Requested-With': 'XMLHttpRequest'
-            })['token']
-        api_url = 'https://api.vimeo.com/videos/' + video_id
-        if unlisted_hash:
-            api_url += ':' + unlisted_hash
-        video = self._download_json(
-            api_url, video_id, headers={
-                'Authorization': 'jwt ' + token,
-            }, query={
-                'fields': 'config_url,created_time,description,license,metadata.connections.comments.total,metadata.connections.likes.total,release_time,stats.plays',
-            })
+        for retry in (False, True):
+            try:
+                video = self._call_videos_api(video_id, unlisted_hash)
+                break
+            except ExtractorError as e:
+                if (not retry and isinstance(e.cause, HTTPError) and e.cause.status == 400
+                    and 'password' in traverse_obj(
+                        self._webpage_read_content(e.cause.response, e.cause.response.url, video_id, fatal=False),
+                        ({json.loads}, 'invalid_parameters', ..., 'field'),
+                )):
+                    self._verify_video_password(video_id)
+                    continue
+                raise
+
         info = self._parse_config(self._download_json(
             video['config_url'], video_id), video_id)
+        source_format = self._extract_original_format(
+            f'https://vimeo.com/{video_id}', video_id, unlisted_hash, api_data=video)
+        if source_format:
+            info['formats'].append(source_format)
+
         get_timestamp = lambda x: parse_iso8601(video.get(x + '_time'))
         info.update({
             'description': video.get('description'),
@@ -785,7 +943,7 @@ class VimeoIE(VimeoBaseInfoExtractor):
         jwt = viewer['jwt']
         album = self._download_json(
             'https://api.vimeo.com/albums/' + album_id,
-            album_id, headers={'Authorization': 'jwt ' + jwt},
+            album_id, headers={'Authorization': 'jwt ' + jwt, 'Accept': 'application/json'},
             query={'fields': 'description,name,privacy'})
         if try_get(album, lambda x: x['privacy']['view']) == 'password':
             password = self.get_param('videopassword')
@@ -796,7 +954,7 @@ class VimeoIE(VimeoBaseInfoExtractor):
             self._set_vimeo_cookie('vuid', viewer['vuid'])
             try:
                 self._download_json(
-                    'https://vimeo.com/showcase/%s/auth' % album_id,
+                    f'https://vimeo.com/showcase/{album_id}/auth',
                     album_id, 'Verifying the password', data=urlencode_postdata({
                         'password': password,
                         'token': viewer['xsrft'],
@@ -823,21 +981,33 @@ class VimeoIE(VimeoBaseInfoExtractor):
             url = 'https://vimeo.com/' + video_id
 
         self._try_album_password(url)
+        is_secure = urllib.parse.urlparse(url).scheme == 'https'
         try:
             # Retrieve video webpage to extract further information
             webpage, urlh = self._download_webpage_handle(
-                url, video_id, headers=headers)
+                url, video_id, headers=headers, impersonate=is_secure)
             redirect_url = urlh.url
-        except ExtractorError as ee:
-            if isinstance(ee.cause, HTTPError) and ee.cause.status == 403:
-                errmsg = ee.cause.response.read()
-                if b'Because of its privacy settings, this video cannot be played here' in errmsg:
-                    raise ExtractorError(
-                        'Cannot download embed-only video without embedding '
-                        'URL. Please call yt-dlp with the URL of the page '
-                        'that embeds this video.',
-                        expected=True)
-            raise
+        except ExtractorError as error:
+            if not isinstance(error.cause, HTTPError) or error.cause.status not in (403, 429):
+                raise
+            errmsg = error.cause.response.read()
+            if b'Because of its privacy settings, this video cannot be played here' in errmsg:
+                raise ExtractorError(
+                    'Cannot download embed-only video without embedding URL. Please call yt-dlp '
+                    'with the URL of the page that embeds this video.', expected=True)
+            # 403 == vimeo.com TLS fingerprint or DC IP block; 429 == player.vimeo.com TLS FP block
+            status = error.cause.status
+            dcip_msg = 'If you are using a data center IP or VPN/proxy, your IP may be blocked'
+            if target := error.cause.response.extensions.get('impersonate'):
+                raise ExtractorError(
+                    f'Got HTTP Error {status} when using impersonate target "{target}". {dcip_msg}')
+            elif not is_secure:
+                raise ExtractorError(f'Got HTTP Error {status}. {dcip_msg}', expected=True)
+            raise ExtractorError(
+                'This request has been blocked due to its TLS fingerprint. Install a '
+                'required impersonation dependency if possible, or else if you are okay with '
+                f'{self._downloader._format_err("compromising your security/cookies", "light red")}, '
+                f'try replacing "https:" with "http:" in the input URL. {dcip_msg}.', expected=True)
 
         if '://player.vimeo.com/video/' in url:
             config = self._search_json(
@@ -845,20 +1015,19 @@ class VimeoIE(VimeoBaseInfoExtractor):
             if config.get('view') == 4:
                 config = self._verify_player_video_password(
                     redirect_url, video_id, headers)
-            return self._parse_config(config, video_id)
-
-        if re.search(r'<form[^>]+?id="pw_form"', webpage):
-            video_password = self._get_video_password()
-            token, vuid = self._extract_xsrft_and_vuid(webpage)
-            webpage = self._verify_video_password(
-                redirect_url, video_id, video_password, token, vuid)
+            info = self._parse_config(config, video_id)
+            source_format = self._extract_original_format(
+                f'https://vimeo.com/{video_id}', video_id, unlisted_hash)
+            if source_format:
+                info['formats'].append(source_format)
+            return info
 
         vimeo_config = self._extract_vimeo_config(webpage, video_id, default=None)
         if vimeo_config:
             seed_status = vimeo_config.get('seed_status') or {}
             if seed_status.get('state') == 'failed':
                 raise ExtractorError(
-                    '%s said: %s' % (self.IE_NAME, seed_status['title']),
+                    '{} said: {}'.format(self.IE_NAME, seed_status['title']),
                     expected=True)
 
         cc_license = None
@@ -910,7 +1079,7 @@ class VimeoIE(VimeoBaseInfoExtractor):
             feature_id = vod.get('feature_id')
             if feature_id and not data.get('force_feature_id', False):
                 return self.url_result(smuggle_url(
-                    'https://player.vimeo.com/player/%s' % feature_id,
+                    f'https://player.vimeo.com/player/{feature_id}',
                     {'force_feature_id': True}), 'Vimeo')
 
         if not video_description:
@@ -982,7 +1151,7 @@ class VimeoOndemandIE(VimeoIE):  # XXX: Do not subclass from concrete IE
             'description': 'md5:aeeba3dbd4d04b0fa98a4fdc9c639998',
             'upload_date': '20140906',
             'timestamp': 1410032453,
-            'thumbnail': 'https://i.vimeocdn.com/video/488238335-d7bf151c364cff8d467f1b73784668fe60aae28a54573a35d53a1210ae283bd8-d_1280',
+            'thumbnail': r're:https://i\.vimeocdn\.com/video/\d+-[\da-f]+-d',
             'comment_count': int,
             'license': 'https://creativecommons.org/licenses/by-nc-nd/3.0/',
             'duration': 53,
@@ -992,7 +1161,7 @@ class VimeoOndemandIE(VimeoIE):  # XXX: Do not subclass from concrete IE
         'params': {
             'format': 'best[protocol=https]',
         },
-        'expected_warnings': ['Unable to download JSON metadata'],
+        'expected_warnings': ['Failed to parse XML: not well-formed'],
     }, {
         # requires Referer to be passed along with og:video:url
         'url': 'https://vimeo.com/ondemand/36938/126682985',
@@ -1009,13 +1178,14 @@ class VimeoOndemandIE(VimeoIE):  # XXX: Do not subclass from concrete IE
             'duration': 121,
             'comment_count': int,
             'view_count': int,
-            'thumbnail': 'https://i.vimeocdn.com/video/517077723-7066ae1d9a79d3eb361334fb5d58ec13c8f04b52f8dd5eadfbd6fb0bcf11f613-d_1280',
+            'thumbnail': r're:https://i\.vimeocdn\.com/video/\d+-[\da-f]+-d',
             'like_count': int,
+            'tags': 'count:5',
         },
         'params': {
             'skip_download': True,
         },
-        'expected_warnings': ['Unable to download JSON metadata'],
+        'expected_warnings': ['Failed to parse XML: not well-formed'],
     }, {
         'url': 'https://vimeo.com/ondemand/nazmaalik',
         'only_matching': True,
@@ -1045,7 +1215,7 @@ class VimeoChannelIE(VimeoBaseInfoExtractor):
     _BASE_URL_TEMPL = 'https://vimeo.com/channels/%s'
 
     def _page_url(self, base_url, pagenum):
-        return '%s/videos/page:%d/' % (base_url, pagenum)
+        return f'{base_url}/videos/page:{pagenum}/'
 
     def _extract_list_title(self, webpage):
         return self._TITLE or self._html_search_regex(
@@ -1056,7 +1226,7 @@ class VimeoChannelIE(VimeoBaseInfoExtractor):
             page_url = self._page_url(base_url, pagenum)
             webpage = self._download_webpage(
                 page_url, list_id,
-                'Downloading page %s' % pagenum)
+                f'Downloading page {pagenum}')
 
             if pagenum == 1:
                 yield self._extract_list_title(webpage)
@@ -1068,13 +1238,13 @@ class VimeoChannelIE(VimeoBaseInfoExtractor):
             if clips:
                 for video_id, video_url, video_title in clips:
                     yield self.url_result(
-                        compat_urlparse.urljoin(base_url, video_url),
+                        urllib.parse.urljoin(base_url, video_url),
                         VimeoIE.ie_key(), video_id=video_id, video_title=video_title)
             # More relaxed fallback
             else:
                 for video_id in re.findall(r'id=["\']clip_(\d+)', webpage):
                     yield self.url_result(
-                        'https://vimeo.com/%s' % video_id,
+                        f'https://vimeo.com/{video_id}',
                         VimeoIE.ie_key(), video_id=video_id)
 
             if re.search(self._MORE_PAGES_INDICATOR, webpage, re.DOTALL) is None:
@@ -1097,7 +1267,7 @@ class VimeoUserIE(VimeoChannelIE):  # XXX: Do not subclass from concrete IE
     _TESTS = [{
         'url': 'https://vimeo.com/nkistudio/videos',
         'info_dict': {
-            'title': 'Nki',
+            'title': 'AKAMA',
             'id': 'nkistudio',
         },
         'playlist_mincount': 66,
@@ -1129,7 +1299,7 @@ class VimeoAlbumIE(VimeoBaseInfoExtractor):
         'playlist_count': 1,
         'params': {
             'videopassword': 'youtube-dl',
-        }
+        },
     }]
     _PAGE_SIZE = 100
 
@@ -1144,13 +1314,15 @@ class VimeoAlbumIE(VimeoBaseInfoExtractor):
             query['_hashed_pass'] = hashed_pass
         try:
             videos = self._download_json(
-                'https://api.vimeo.com/albums/%s/videos' % album_id,
-                album_id, 'Downloading page %d' % api_page, query=query, headers={
+                f'https://api.vimeo.com/albums/{album_id}/videos',
+                album_id, f'Downloading page {api_page}', query=query, headers={
                     'Authorization': 'jwt ' + authorization,
+                    'Accept': 'application/json',
                 })['data']
         except ExtractorError as e:
             if isinstance(e.cause, HTTPError) and e.cause.status == 400:
                 return
+            raise
         for video in videos:
             link = video.get('link')
             if not link:
@@ -1171,7 +1343,7 @@ class VimeoAlbumIE(VimeoBaseInfoExtractor):
         jwt = viewer['jwt']
         album = self._download_json(
             'https://api.vimeo.com/albums/' + album_id,
-            album_id, headers={'Authorization': 'jwt ' + jwt},
+            album_id, headers={'Authorization': 'jwt ' + jwt, 'Accept': 'application/json'},
             query={'fields': 'description,name,privacy'})
         hashed_pass = None
         if try_get(album, lambda x: x['privacy']['view']) == 'password':
@@ -1183,7 +1355,7 @@ class VimeoAlbumIE(VimeoBaseInfoExtractor):
             self._set_vimeo_cookie('vuid', viewer['vuid'])
             try:
                 hashed_pass = self._download_json(
-                    'https://vimeo.com/showcase/%s/auth' % album_id,
+                    f'https://vimeo.com/showcase/{album_id}/auth',
                     album_id, 'Verifying the password', data=urlencode_postdata({
                         'password': password,
                         'token': viewer['xsrft'],
@@ -1217,8 +1389,22 @@ class VimeoGroupsIE(VimeoChannelIE):  # XXX: Do not subclass from concrete IE
 class VimeoReviewIE(VimeoBaseInfoExtractor):
     IE_NAME = 'vimeo:review'
     IE_DESC = 'Review pages on vimeo'
-    _VALID_URL = r'(?P<url>https://vimeo\.com/[^/]+/review/(?P<id>[^/]+)/[0-9a-f]{10})'
+    _VALID_URL = r'https?://vimeo\.com/(?P<user>[^/?#]+)/review/(?P<id>\d+)/(?P<hash>[\da-f]{10})'
     _TESTS = [{
+        'url': 'https://vimeo.com/user170863801/review/996447483/a316d6ed8d',
+        'info_dict': {
+            'id': '996447483',
+            'ext': 'mp4',
+            'title': 'Rodeo day 1-_2',
+            'uploader': 'BROADKAST',
+            'uploader_id': 'user170863801',
+            'uploader_url': 'https://vimeo.com/user170863801',
+            'duration': 30,
+            'thumbnail': r're:https://i\.vimeocdn\.com/video/\d+-[\da-f]+-d',
+        },
+        'params': {'skip_download': 'm3u8'},
+        'expected_warnings': ['Failed to parse XML: not well-formed'],
+    }, {
         'url': 'https://vimeo.com/user21297594/review/75524534/3c257a1b5d',
         'md5': 'c507a72f780cacc12b2248bb4006d253',
         'info_dict': {
@@ -1232,6 +1418,7 @@ class VimeoReviewIE(VimeoBaseInfoExtractor):
             'thumbnail': 'https://i.vimeocdn.com/video/450115033-43303819d9ebe24c2630352e18b7056d25197d09b3ae901abdac4c4f1d68de71-d_1280',
             'uploader_url': 'https://vimeo.com/user21297594',
         },
+        'skip': '404 Not Found',
     }, {
         'note': 'video player needs Referer',
         'url': 'https://vimeo.com/user22258446/review/91613211/13f927e053',
@@ -1263,28 +1450,19 @@ class VimeoReviewIE(VimeoBaseInfoExtractor):
     }]
 
     def _real_extract(self, url):
-        page_url, video_id = self._match_valid_url(url).groups()
-        data = self._download_json(
-            page_url.replace('/review/', '/review/data/'), video_id)
+        user, video_id, review_hash = self._match_valid_url(url).group('user', 'id', 'hash')
+        data_url = f'https://vimeo.com/{user}/review/data/{video_id}/{review_hash}'
+        data = self._download_json(data_url, video_id)
         if data.get('isLocked') is True:
-            video_password = self._get_video_password()
-            viewer = self._download_json(
-                'https://vimeo.com/_rv/viewer', video_id)
-            webpage = self._verify_video_password(
-                'https://vimeo.com/' + video_id, video_id,
-                video_password, viewer['xsrft'], viewer['vuid'])
-            clip_page_config = self._parse_json(self._search_regex(
-                r'window\.vimeo\.clip_page_config\s*=\s*({.+?});',
-                webpage, 'clip page config'), video_id)
-            config_url = clip_page_config['player']['config_url']
-            clip_data = clip_page_config.get('clip') or {}
-        else:
-            clip_data = data['clipData']
-            config_url = clip_data['configUrl']
+            self._verify_video_password(video_id)
+            data = self._download_json(data_url, video_id)
+        clip_data = data['clipData']
+        config_url = clip_data['configUrl']
         config = self._download_json(config_url, video_id)
         info_dict = self._parse_config(config, video_id)
         source_format = self._extract_original_format(
-            page_url + '/action', video_id)
+            f'https://vimeo.com/{user}/review/{video_id}/{review_hash}/action',
+            video_id, unlisted_hash=clip_data.get('unlistedHash'))
         if source_format:
             info_dict['formats'].append(source_format)
         info_dict['description'] = clean_html(clip_data.get('description'))
@@ -1303,7 +1481,7 @@ class VimeoWatchLaterIE(VimeoChannelIE):  # XXX: Do not subclass from concrete I
     }]
 
     def _page_url(self, base_url, pagenum):
-        url = '%s/page:%d/' % (base_url, pagenum)
+        url = f'{base_url}/page:{pagenum}/'
         request = Request(url)
         # Set the header to get a partial html page with the ids,
         # the normal page doesn't contain them.
@@ -1331,11 +1509,11 @@ class VimeoLikesIE(VimeoChannelIE):  # XXX: Do not subclass from concrete IE
     }]
 
     def _page_url(self, base_url, pagenum):
-        return '%s/page:%d/' % (base_url, pagenum)
+        return f'{base_url}/page:{pagenum}/'
 
     def _real_extract(self, url):
         user_id = self._match_id(url)
-        return self._extract_videos(user_id, 'https://vimeo.com/%s/likes' % user_id)
+        return self._extract_videos(user_id, f'https://vimeo.com/{user_id}/likes')
 
 
 class VHXEmbedIE(VimeoBaseInfoExtractor):
@@ -1376,20 +1554,22 @@ class VimeoProIE(VimeoBaseInfoExtractor):
             'uploader_id': 'openstreetmapus',
             'uploader': 'OpenStreetMap US',
             'title': 'Andy Allan - Putting the Carto into OpenStreetMap Cartography',
-            'description': 'md5:2c362968038d4499f4d79f88458590c1',
+            'description': 'md5:8cf69a1a435f2d763f4adf601e9c3125',
             'duration': 1595,
             'upload_date': '20130610',
-            'timestamp': 1370893156,
+            'timestamp': 1370907556,
             'license': 'by',
-            'thumbnail': 'https://i.vimeocdn.com/video/440260469-19b0d92fca3bd84066623b53f1eb8aaa3980c6c809e2d67b6b39ab7b4a77a344-d_960',
+            'thumbnail': r're:https://i\.vimeocdn\.com/video/\d+-[\da-f]+-d',
             'view_count': int,
             'comment_count': int,
             'like_count': int,
-            'tags': 'count:1',
+            'release_timestamp': 1370907556,
+            'release_date': '20130610',
         },
         'params': {
             'format': 'best[protocol=https]',
         },
+        'expected_warnings': ['Failed to parse XML: not well-formed'],
     }, {
         # password-protected VimeoPro page with Vimeo player embed
         'url': 'https://vimeopro.com/cadfem/simulation-conference-mechanische-systeme-in-perfektion',
@@ -1397,7 +1577,7 @@ class VimeoProIE(VimeoBaseInfoExtractor):
             'id': '764543723',
             'ext': 'mp4',
             'title': 'Mechanische Systeme in Perfektion: Realität erfassen, Innovation treiben',
-            'thumbnail': 'https://i.vimeocdn.com/video/1543784598-a1a750494a485e601110136b9fe11e28c2131942452b3a5d30391cb3800ca8fd-d_1280',
+            'thumbnail': r're:https://i\.vimeocdn\.com/video/\d+-[\da-f]+-d',
             'description': 'md5:2a9d195cd1b0f6f79827107dc88c2420',
             'uploader': 'CADFEM',
             'uploader_id': 'cadfem',
@@ -1409,6 +1589,7 @@ class VimeoProIE(VimeoBaseInfoExtractor):
             'videopassword': 'Conference2022',
             'skip_download': True,
         },
+        'expected_warnings': ['Failed to parse XML: not well-formed'],
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/vimple.py b/plugins/youtube_download/yt_dlp/extractor/vimple.py
deleted file mode 100644
index fdccf46..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/vimple.py
+++ /dev/null
@@ -1,58 +0,0 @@
-from .common import InfoExtractor
-from ..utils import int_or_none
-
-
-class SprutoBaseIE(InfoExtractor):
-    def _extract_spruto(self, spruto, video_id):
-        playlist = spruto['playlist'][0]
-        title = playlist['title']
-        video_id = playlist.get('videoId') or video_id
-        thumbnail = playlist.get('posterUrl') or playlist.get('thumbnailUrl')
-        duration = int_or_none(playlist.get('duration'))
-
-        formats = [{
-            'url': f['url'],
-        } for f in playlist['video']]
-
-        return {
-            'id': video_id,
-            'title': title,
-            'thumbnail': thumbnail,
-            'duration': duration,
-            'formats': formats,
-        }
-
-
-class VimpleIE(SprutoBaseIE):
-    IE_DESC = 'Vimple - one-click video hosting'
-    _VALID_URL = r'https?://(?:player\.vimple\.(?:ru|co)/iframe|vimple\.(?:ru|co))/(?P<id>[\da-f-]{32,36})'
-    _TESTS = [{
-        'url': 'http://vimple.ru/c0f6b1687dcd4000a97ebe70068039cf',
-        'md5': '2e750a330ed211d3fd41821c6ad9a279',
-        'info_dict': {
-            'id': 'c0f6b168-7dcd-4000-a97e-be70068039cf',
-            'ext': 'mp4',
-            'title': 'Sunset',
-            'duration': 20,
-            'thumbnail': r're:https?://.*?\.jpg',
-        },
-    }, {
-        'url': 'http://player.vimple.ru/iframe/52e1beec-1314-4a83-aeac-c61562eadbf9',
-        'only_matching': True,
-    }, {
-        'url': 'http://vimple.co/04506a053f124483b8fb05ed73899f19',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        webpage = self._download_webpage(
-            'http://player.vimple.ru/iframe/%s' % video_id, video_id)
-
-        spruto = self._parse_json(
-            self._search_regex(
-                r'sprutoData\s*:\s*({.+?}),\r\n', webpage, 'spruto data'),
-            video_id)
-
-        return self._extract_spruto(spruto, video_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/vine.py b/plugins/youtube_download/yt_dlp/extractor/vine.py
deleted file mode 100644
index 1909980..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/vine.py
+++ /dev/null
@@ -1,151 +0,0 @@
-from .common import InfoExtractor
-from ..compat import compat_str
-from ..utils import (
-    determine_ext,
-    format_field,
-    int_or_none,
-    unified_timestamp,
-)
-
-
-class VineIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?vine\.co/(?:v|oembed)/(?P<id>\w+)'
-    _EMBED_REGEX = [r'<iframe[^>]+src=[\'"](?P<url>(?:https?:)?//(?:www\.)?vine\.co/v/[^/]+/embed/(?:simple|postcard))']
-    _TESTS = [{
-        'url': 'https://vine.co/v/b9KOOWX7HUx',
-        'md5': '2f36fed6235b16da96ce9b4dc890940d',
-        'info_dict': {
-            'id': 'b9KOOWX7HUx',
-            'ext': 'mp4',
-            'title': 'Chicken.',
-            'alt_title': 'Vine by Jack',
-            'timestamp': 1368997951,
-            'upload_date': '20130519',
-            'uploader': 'Jack',
-            'uploader_id': '76',
-            'view_count': int,
-            'like_count': int,
-            'comment_count': int,
-            'repost_count': int,
-        },
-    }, {
-        'url': 'https://vine.co/v/e192BnZnZ9V',
-        'info_dict': {
-            'id': 'e192BnZnZ9V',
-            'ext': 'mp4',
-            'title': 'ยิ้ม~ เขิน~ อาย~ น่าร้ากอ้ะ >//< @n_whitewo @orlameena #lovesicktheseries  #lovesickseason2',
-            'alt_title': 'Vine by Pimry_zaa',
-            'timestamp': 1436057405,
-            'upload_date': '20150705',
-            'uploader': 'Pimry_zaa',
-            'uploader_id': '1135760698325307392',
-            'view_count': int,
-            'like_count': int,
-            'comment_count': int,
-            'repost_count': int,
-        },
-        'params': {
-            'skip_download': True,
-        },
-    }, {
-        'url': 'https://vine.co/v/MYxVapFvz2z',
-        'only_matching': True,
-    }, {
-        'url': 'https://vine.co/v/bxVjBbZlPUH',
-        'only_matching': True,
-    }, {
-        'url': 'https://vine.co/oembed/MYxVapFvz2z.json',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        data = self._download_json(
-            'https://archive.vine.co/posts/%s.json' % video_id, video_id)
-
-        def video_url(kind):
-            for url_suffix in ('Url', 'URL'):
-                format_url = data.get('video%s%s' % (kind, url_suffix))
-                if format_url:
-                    return format_url
-
-        formats = []
-        for quality, format_id in enumerate(('low', '', 'dash')):
-            format_url = video_url(format_id.capitalize())
-            if not format_url:
-                continue
-            # DASH link returns plain mp4
-            if format_id == 'dash' and determine_ext(format_url) == 'mpd':
-                formats.extend(self._extract_mpd_formats(
-                    format_url, video_id, mpd_id='dash', fatal=False))
-            else:
-                formats.append({
-                    'url': format_url,
-                    'format_id': format_id or 'standard',
-                    'quality': quality,
-                })
-        self._check_formats(formats, video_id)
-
-        username = data.get('username')
-
-        alt_title = format_field(username, None, 'Vine by %s')
-
-        return {
-            'id': video_id,
-            'title': data.get('description') or alt_title or 'Vine video',
-            'alt_title': alt_title,
-            'thumbnail': data.get('thumbnailUrl'),
-            'timestamp': unified_timestamp(data.get('created')),
-            'uploader': username,
-            'uploader_id': data.get('userIdStr'),
-            'view_count': int_or_none(data.get('loops')),
-            'like_count': int_or_none(data.get('likes')),
-            'comment_count': int_or_none(data.get('comments')),
-            'repost_count': int_or_none(data.get('reposts')),
-            'formats': formats,
-        }
-
-
-class VineUserIE(InfoExtractor):
-    IE_NAME = 'vine:user'
-    _VALID_URL = r'https?://vine\.co/(?P<u>u/)?(?P<user>[^/]+)'
-    _VINE_BASE_URL = 'https://vine.co/'
-    _TESTS = [{
-        'url': 'https://vine.co/itsruthb',
-        'info_dict': {
-            'id': 'itsruthb',
-            'title': 'Ruth B',
-            'description': '| Instagram/Twitter: itsruthb | still a lost boy from neverland',
-        },
-        'playlist_mincount': 611,
-    }, {
-        'url': 'https://vine.co/u/942914934646415360',
-        'only_matching': True,
-    }]
-
-    @classmethod
-    def suitable(cls, url):
-        return False if VineIE.suitable(url) else super(VineUserIE, cls).suitable(url)
-
-    def _real_extract(self, url):
-        mobj = self._match_valid_url(url)
-        user = mobj.group('user')
-        u = mobj.group('u')
-
-        profile_url = '%sapi/users/profiles/%s%s' % (
-            self._VINE_BASE_URL, 'vanity/' if not u else '', user)
-        profile_data = self._download_json(
-            profile_url, user, note='Downloading user profile data')
-
-        data = profile_data['data']
-        user_id = data.get('userId') or data['userIdStr']
-        profile = self._download_json(
-            'https://archive.vine.co/profiles/%s.json' % user_id, user_id)
-        entries = [
-            self.url_result(
-                'https://vine.co/v/%s' % post_id, ie='Vine', video_id=post_id)
-            for post_id in profile['posts']
-            if post_id and isinstance(post_id, compat_str)]
-        return self.playlist_result(
-            entries, user, profile.get('username'), profile.get('description'))
diff --git a/plugins/youtube_download/yt_dlp/extractor/viously.py b/plugins/youtube_download/yt_dlp/extractor/viously.py
new file mode 100644
index 0000000..3e8519c
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/viously.py
@@ -0,0 +1,60 @@
+import base64
+import re
+
+from .common import InfoExtractor
+from ..utils import (
+    extract_attributes,
+    int_or_none,
+    parse_iso8601,
+)
+from ..utils.traversal import traverse_obj
+
+
+class ViouslyIE(InfoExtractor):
+    _VALID_URL = False
+    _WEBPAGE_TESTS = [{
+        'url': 'http://www.turbo.fr/videos-voiture/454443-turbo-du-07-09-2014-renault-twingo-3-bentley-continental-gt-speed-ces-guide-achat-dacia.html',
+        'md5': '37a6c3381599381ff53a7e1e0575c0bc',
+        'info_dict': {
+            'id': 'F_xQzS2jwb3',
+            'ext': 'mp4',
+            'title': 'Turbo du 07/09/2014\xa0: Renault Twingo 3, Bentley Continental GT Speed, CES, Guide Achat Dacia...',
+            'description': 'Turbo du 07/09/2014\xa0: Renault Twingo 3, Bentley Continental GT Speed, CES, Guide Achat Dacia...',
+            'age_limit': 0,
+            'upload_date': '20230328',
+            'timestamp': 1680037507,
+            'duration': 3716,
+            'categories': ['motors'],
+        },
+    }]
+
+    def _extract_from_webpage(self, url, webpage):
+        viously_players = re.findall(r'<div[^>]*class="(?:[^"]*\s)?v(?:iou)?sly-player(?:\s[^"]*)?"[^>]*>', webpage)
+        if not viously_players:
+            return
+
+        def custom_decode(text):
+            STANDARD_ALPHABET = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='
+            CUSTOM_ALPHABET = 'VIOUSLYABCDEFGHJKMNPQRTWXZviouslyabcdefghjkmnpqrtwxz9876543210+/='
+            data = base64.b64decode(text.translate(str.maketrans(CUSTOM_ALPHABET, STANDARD_ALPHABET)))
+            return data.decode('utf-8').strip('\x00')
+
+        for video_id in traverse_obj(viously_players, (..., {extract_attributes}, 'id')):
+            formats = self._extract_m3u8_formats(
+                f'https://www.viously.com/video/hls/{video_id}/index.m3u8', video_id, fatal=False)
+            if not formats:
+                continue
+            data = self._download_json(
+                f'https://www.viously.com/export/json/{video_id}', video_id,
+                transform_source=custom_decode, fatal=False)
+            yield {
+                'id': video_id,
+                'formats': formats,
+                **traverse_obj(data, ('video', {
+                    'title': ('title', {str}),
+                    'description': ('description', {str}),
+                    'duration': ('duration', {int_or_none}),
+                    'timestamp': ('iso_date', {parse_iso8601}),
+                    'categories': ('category', 'name', {str}, {lambda x: [x] if x else None}),
+                })),
+            }
diff --git a/plugins/youtube_download/yt_dlp/extractor/viqeo.py b/plugins/youtube_download/yt_dlp/extractor/viqeo.py
index 79b9f29..433fdc7 100644
--- a/plugins/youtube_download/yt_dlp/extractor/viqeo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/viqeo.py
@@ -7,6 +7,7 @@ from ..utils import (
 
 
 class ViqeoIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'''(?x)
                         (?:
                             viqeo:|
@@ -38,7 +39,7 @@ class ViqeoIE(InfoExtractor):
         video_id = self._match_id(url)
 
         webpage = self._download_webpage(
-            'https://cdn.viqeo.tv/embed/?vid=%s' % video_id, video_id)
+            f'https://cdn.viqeo.tv/embed/?vid={video_id}', video_id)
 
         data = self._parse_json(
             self._search_regex(
diff --git a/plugins/youtube_download/yt_dlp/extractor/viu.py b/plugins/youtube_download/yt_dlp/extractor/viu.py
index 6f9af9f..f4ed96b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/viu.py
+++ b/plugins/youtube_download/yt_dlp/extractor/viu.py
@@ -1,19 +1,18 @@
-import re
 import json
-import uuid
 import random
+import re
 import urllib.parse
+import uuid
 
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     ExtractorError,
     int_or_none,
     remove_end,
+    smuggle_url,
     strip_or_none,
     traverse_obj,
     try_get,
-    smuggle_url,
     unified_timestamp,
     unsmuggle_url,
     url_or_none,
@@ -68,7 +67,7 @@ class ViuIE(ViuBaseIE):
             'clip/load', video_id, 'Downloading video data', query={
                 'appid': 'viu_desktop',
                 'fmt': 'json',
-                'id': video_id
+                'id': video_id,
             })['item'][0]
 
         title = video_data['title']
@@ -82,7 +81,7 @@ class ViuIE(ViuBaseIE):
         # hls_file = video_data.get('hlsfile')
         hls_file = video_data.get('jwhlsfile')
         if url_path and tdirforwhole and hls_file:
-            m3u8_url = '%s/%s/%s' % (url_path, tdirforwhole, hls_file)
+            m3u8_url = f'{url_path}/{tdirforwhole}/{hls_file}'
         else:
             # m3u8_url = re.sub(
             #     r'(/hlsc_)[a-z]+(\d+\.m3u8)',
@@ -91,12 +90,12 @@ class ViuIE(ViuBaseIE):
         formats, subtitles = self._extract_m3u8_formats_and_subtitles(m3u8_url, video_id, 'mp4')
 
         for key, value in video_data.items():
-            mobj = re.match(r'^subtitle_(?P<lang>[^_]+)_(?P<ext>(vtt|srt))', key)
+            mobj = re.match(r'subtitle_(?P<lang>[^_]+)_(?P<ext>(vtt|srt))', key)
             if not mobj:
                 continue
             subtitles.setdefault(mobj.group('lang'), []).append({
                 'url': value,
-                'ext': mobj.group('ext')
+                'ext': mobj.group('ext'),
             })
 
         return {
@@ -132,7 +131,7 @@ class ViuPlaylistIE(ViuBaseIE):
             'Downloading playlist info', query={
                 'appid': 'viu_desktop',
                 'fmt': 'json',
-                'id': 'playlist-' + playlist_id
+                'id': 'playlist-' + playlist_id,
             })['container']
 
         entries = []
@@ -140,7 +139,7 @@ class ViuPlaylistIE(ViuBaseIE):
             item_id = item.get('id')
             if not item_id:
                 continue
-            item_id = compat_str(item_id)
+            item_id = str(item_id)
             entries.append(self.url_result(
                 'viu:' + item_id, 'Viu', item_id))
 
@@ -227,14 +226,14 @@ class ViuOTTIE(InfoExtractor):
                 return
             headers = {
                 'Authorization': f'Bearer {self._auth_codes[country_code]}',
-                'Content-Type': 'application/json'
+                'Content-Type': 'application/json',
             }
             data = self._download_json(
                 'https://api-gateway-global.viu.com/api/account/validate',
                 video_id, 'Validating email address', headers=headers,
                 data=json.dumps({
                     'principal': username,
-                    'provider': 'email'
+                    'provider': 'email',
                 }).encode())
             if not data.get('exists'):
                 raise ExtractorError('Invalid email address')
@@ -264,8 +263,8 @@ class ViuOTTIE(InfoExtractor):
                 'platformFlagLabel': 'web',
                 'language': 'en',
                 'uuid': str(uuid.uuid4()),
-                'carrierId': '0'
-            }).encode('utf-8'))['token']
+                'carrierId': '0',
+            }).encode())['token']
 
     def _real_extract(self, url):
         url, idata = unsmuggle_url(url, {})
@@ -319,7 +318,7 @@ class ViuOTTIE(InfoExtractor):
                 headers={
                     'Authorization': f'Bearer {self._auth_codes[country_code]}',
                     'Referer': url,
-                    'Origin': url
+                    'Origin': url,
                 })
             return self._detect_error(stream_data).get('stream')
 
@@ -365,7 +364,7 @@ class ViuOTTIE(InfoExtractor):
                 'url': stream_url,
                 'height': height,
                 'ext': 'mp4',
-                'filesize': try_get(stream_data, lambda x: x['size'][vid_format], int)
+                'filesize': try_get(stream_data, lambda x: x['size'][vid_format], int),
             })
 
         subtitles = {}
@@ -415,12 +414,12 @@ class ViuOTTIndonesiaBaseIE(InfoExtractor):
 
     _HEADERS = {
         'x-session-id': _SESSION_ID,
-        'x-client': 'browser'
+        'x-client': 'browser',
     }
 
     _AGE_RATINGS_MAPPER = {
         'ADULTS': 18,
-        'teens': 13
+        'teens': 13,
     }
 
     def _real_initialize(self):
@@ -447,7 +446,7 @@ class ViuOTTIndonesiaIE(ViuOTTIndonesiaBaseIE):
             'thumbnail': 'https://vuclipi-a.akamaihd.net/p/cloudinary/h_171,w_304,dpr_1.5,f_auto,c_thumb,q_auto:low/1165863189/d-1',
             'upload_date': '20210101',
             'timestamp': 1609459200,
-        }
+        },
     }, {
         'url': 'https://www.viu.com/ott/id/id/all/video-korean-reality-tv_shows-entertainment_weekly_episode_1622-1118617054',
         'info_dict': {
@@ -461,8 +460,8 @@ class ViuOTTIndonesiaIE(ViuOTTIndonesiaBaseIE):
             'thumbnail': 'https://vuclipi-a.akamaihd.net/p/cloudinary/h_171,w_304,dpr_1.5,f_auto,c_thumb,q_auto:low/1120187848/d-1',
             'timestamp': 1420070400,
             'upload_date': '20150101',
-            'cast': ['Shin Hyun-joon', 'Lee Da-Hee']
-        }
+            'cast': ['Shin Hyun-joon', 'Lee Da-Hee'],
+        },
     }, {
         # age-limit test
         'url': 'https://www.viu.com/ott/id/id/all/video-japanese-trailer-tv_shows-trailer_jujutsu_kaisen_ver_01-1166044219?containerId=playlist-26273140',
@@ -477,7 +476,7 @@ class ViuOTTIndonesiaIE(ViuOTTIndonesiaBaseIE):
             'description': 'Trailer \'Jujutsu Kaisen\' Ver.01',
             'cast': ['Junya Enoki', ' Yûichi Nakamura', ' Yuma Uchida', 'Asami Seto'],
             'age_limit': 13,
-        }
+        },
     }, {
         # json ld metadata type equal to Movie instead of TVEpisodes
         'url': 'https://www.viu.com/ott/id/id/all/video-japanese-animation-movies-demon_slayer_kimetsu_no_yaiba_the_movie_mugen_train-1165892707?containerId=1675060691786',
@@ -492,7 +491,7 @@ class ViuOTTIndonesiaIE(ViuOTTIndonesiaBaseIE):
             'thumbnail': 'https://vuclipi-a.akamaihd.net/p/cloudinary/h_171,w_304,dpr_1.5,f_auto,c_thumb,q_auto:low/1165895279/d-1',
             'description': 'md5:1ce9c35a3aeab384085533f746c87469',
             'duration': 7021,
-        }
+        },
     }]
 
     def _real_extract(self, url):
@@ -538,5 +537,5 @@ class ViuOTTIndonesiaIE(ViuOTTIndonesiaBaseIE):
             'episode_number': (traverse_obj(initial_state, 'episode_no', 'episodeno', expected_type=int_or_none)
                                or int_or_none(episode.get('episodeNumber'))),
             'cast': traverse_obj(episode, ('actor', ..., 'name'), default=None),
-            'age_limit': self._AGE_RATINGS_MAPPER.get(initial_state.get('internal_age_rating'))
+            'age_limit': self._AGE_RATINGS_MAPPER.get(initial_state.get('internal_age_rating')),
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/vk.py b/plugins/youtube_download/yt_dlp/extractor/vk.py
index 9154228..c269802 100644
--- a/plugins/youtube_download/yt_dlp/extractor/vk.py
+++ b/plugins/youtube_download/yt_dlp/extractor/vk.py
@@ -17,6 +17,7 @@ from ..utils import (
     get_element_html_by_id,
     int_or_none,
     join_nonempty,
+    parse_qs,
     parse_resolution,
     str_or_none,
     str_to_int,
@@ -27,8 +28,8 @@ from ..utils import (
     url_or_none,
     urlencode_postdata,
     urljoin,
-    traverse_obj,
 )
+from ..utils.traversal import require, traverse_obj
 
 
 class VKBaseIE(InfoExtractor):
@@ -91,18 +92,18 @@ class VKBaseIE(InfoExtractor):
 class VKIE(VKBaseIE):
     IE_NAME = 'vk'
     IE_DESC = 'VK'
-    _EMBED_REGEX = [r'<iframe[^>]+?src=(["\'])(?P<url>https?://vk\.com/video_ext\.php.+?)\1']
+    _EMBED_REGEX = [r'<iframe[^>]+?src=(["\'])(?P<url>https?://vk(?:(?:video)?\.ru|\.com)/video_ext\.php.+?)\1']
     _VALID_URL = r'''(?x)
                     https?://
                         (?:
                             (?:
-                                (?:(?:m|new)\.)?vk\.com/video_|
-                                (?:www\.)?daxab.com/
+                                (?:(?:m|new)\.)?vk(?:(?:video)?\.ru|\.com)/video_|
+                                (?:www\.)?daxab\.com/
                             )
                             ext\.php\?(?P<embed_query>.*?\boid=(?P<oid>-?\d+).*?\bid=(?P<id>\d+).*)|
                             (?:
-                                (?:(?:m|new)\.)?vk\.com/(?:.+?\?.*?z=)?(?:video|clip)|
-                                (?:www\.)?daxab.com/embed/
+                                (?:(?:m|new)\.)?vk(?:(?:video)?\.ru|\.com)/(?:.+?\?.*?z=)?(?:video|clip)|
+                                (?:www\.)?daxab\.com/embed/
                             )
                             (?P<videoid>-?\d+_\d+)(?:.*\blist=(?P<list_id>([\da-f]+)|(ln-[\da-zA-Z]+)))?
                         )
@@ -110,11 +111,12 @@ class VKIE(VKBaseIE):
 
     _TESTS = [
         {
-            'url': 'http://vk.com/videos-77521?z=video-77521_162222515%2Fclub77521',
+            'url': 'https://vk.com/videos-77521?z=video-77521_162222515%2Fclub77521',
             'info_dict': {
                 'id': '-77521_162222515',
                 'ext': 'mp4',
                 'title': 'ProtivoGunz - Хуёвая песня',
+                'description': 'Видео из официальной группы Noize MC\nhttp://vk.com/noizemc',
                 'uploader': 're:(?:Noize MC|Alexander Ilyashenko).*',
                 'uploader_id': '39545378',
                 'duration': 195,
@@ -127,7 +129,7 @@ class VKIE(VKBaseIE):
             'params': {'skip_download': 'm3u8'},
         },
         {
-            'url': 'http://vk.com/video205387401_165548505',
+            'url': 'https://vk.com/video205387401_165548505',
             'info_dict': {
                 'id': '205387401_165548505',
                 'ext': 'mp4',
@@ -140,7 +142,7 @@ class VKIE(VKBaseIE):
                 'comment_count': int,
                 'like_count': int,
                 'thumbnail': r're:https?://.+(?:\.jpg|getVideoPreview.*)$',
-            }
+            },
         },
         {
             'note': 'Embedded video',
@@ -164,6 +166,7 @@ class VKIE(VKBaseIE):
                 'id': '-93049196_456239755',
                 'ext': 'mp4',
                 'title': '8 серия (озвучка)',
+                'description': 'Видео из официальной группы Noize MC\nhttp://vk.com/noizemc',
                 'duration': 8383,
                 'comment_count': int,
                 'uploader': 'Dizi2021',
@@ -182,10 +185,10 @@ class VKIE(VKBaseIE):
                 'ext': 'mp4',
                 'title': "DSWD Awards 'Children's Joy Foundation, Inc.' Certificate of Registration and License to Operate",
                 'description': 'md5:bf9c26cfa4acdfb146362682edd3827a',
-                'duration': 178,
+                'duration': 179,
                 'upload_date': '20130117',
                 'uploader': "Children's Joy Foundation Inc.",
-                'uploader_id': 'thecjf',
+                'uploader_id': '@CJFIofficial',
                 'view_count': int,
                 'channel_id': 'UCgzCNQ11TmR9V97ECnhi3gw',
                 'availability': 'public',
@@ -193,7 +196,7 @@ class VKIE(VKBaseIE):
                 'live_status': 'not_live',
                 'playable_in_embed': True,
                 'channel': 'Children\'s Joy Foundation Inc.',
-                'uploader_url': 'http://www.youtube.com/user/thecjf',
+                'uploader_url': 'https://www.youtube.com/@CJFIofficial',
                 'thumbnail': r're:https?://.+\.jpg$',
                 'tags': 'count:27',
                 'start_time': 0.0,
@@ -201,6 +204,7 @@ class VKIE(VKBaseIE):
                 'channel_url': 'https://www.youtube.com/channel/UCgzCNQ11TmR9V97ECnhi3gw',
                 'channel_follower_count': int,
                 'age_limit': 0,
+                'timestamp': 1358394935,
             },
         },
         {
@@ -220,8 +224,9 @@ class VKIE(VKBaseIE):
                 'like_count': int,
                 'view_count': int,
                 'thumbnail': r're:https?://.+x1080$',
-                'tags': list
+                'tags': list,
             },
+            'skip': 'This video has been deleted and is no longer available.',
         },
         {
             'url': 'https://vk.com/clips-74006511?z=clip-74006511_456247211',
@@ -235,13 +240,14 @@ class VKIE(VKBaseIE):
                 'timestamp': 1664995597,
                 'title': 'Clip by @madempress',
                 'upload_date': '20221005',
-                'uploader': 'Шальная императрица',
+                'uploader': 'Шальная Императрица',
                 'uploader_id': '-74006511',
+                'description': 'md5:f9315f7786fa0e84e75e4f824a48b056',
             },
         },
         {
             # video key is extra_data not url\d+
-            'url': 'http://vk.com/video-110305615_171782105',
+            'url': 'https://vk.com/video-110305615_171782105',
             'md5': 'e13fcda136f99764872e739d13fac1d1',
             'info_dict': {
                 'id': '-110305615_171782105',
@@ -273,6 +279,44 @@ class VKIE(VKBaseIE):
             'params': {
                 'skip_download': True,
             },
+            'skip': 'No formats found',
+        },
+        {
+            'note': 'video has chapters',
+            'url': 'https://vkvideo.ru/video-18403220_456239696',
+            'info_dict': {
+                'id': '-18403220_456239696',
+                'ext': 'mp4',
+                'title': 'Трамп отменяет гранты // DeepSeek - Революция в ИИ // Илон Маск читер',
+                'description': 'md5:b112ea9de53683b6d03d29076f62eec2',
+                'uploader': 'Руслан Усачев',
+                'uploader_id': '-18403220',
+                'comment_count': int,
+                'like_count': int,
+                'duration': 1983,
+                'thumbnail': r're:https?://.+\.jpg',
+                'chapters': 'count:21',
+                'timestamp': 1738252883,
+                'upload_date': '20250130',
+            },
+        },
+        {
+            'url': 'https://vkvideo.ru/video-50883936_456244102',
+            'info_dict': {
+                'id': '-50883936_456244102',
+                'ext': 'mp4',
+                'title': 'Добивание Украины // Техник в коме // МОЯ ЗЛОСТЬ №140',
+                'description': 'md5:a9bc46181e9ebd0fdd82cef6c0191140',
+                'uploader': 'Стас Ай, Как Просто!',
+                'uploader_id': '-50883936',
+                'comment_count': int,
+                'like_count': int,
+                'duration': 4651,
+                'thumbnail': r're:https?://.+\.jpg',
+                'chapters': 'count:59',
+                'timestamp': 1743333869,
+                'upload_date': '20250330',
+            },
         },
         {
             # live stream, hls and rtmp links, most likely already finished live
@@ -312,7 +356,16 @@ class VKIE(VKBaseIE):
         {
             'url': 'https://vk.com/clip30014565_456240946',
             'only_matching': True,
-        }]
+        },
+        {
+            'url': 'https://vkvideo.ru/video-127553155_456242961',
+            'only_matching': True,
+        },
+        {
+            'url': 'https://vk.ru/video-220754053_456242564',
+            'only_matching': True,
+        },
+    ]
 
     def _real_extract(self, url):
         mobj = self._match_valid_url(url)
@@ -335,10 +388,10 @@ class VKIE(VKBaseIE):
             mv_data = opts.get('mvData') or {}
             player = opts.get('player') or {}
         else:
-            video_id = '%s_%s' % (mobj.group('oid'), mobj.group('id'))
+            video_id = '{}_{}'.format(mobj.group('oid'), mobj.group('id'))
 
             info_page = self._download_webpage(
-                'http://vk.com/video_ext.php?' + mobj.group('embed_query'), video_id)
+                'https://vk.com/video_ext.php?' + mobj.group('embed_query'), video_id)
 
             error_message = self._html_search_regex(
                 [r'(?s)<!><div[^>]+class="video_layer_message"[^>]*>(.+?)</div>',
@@ -432,11 +485,10 @@ class VKIE(VKBaseIE):
             if m_opts_url:
                 opts_url = m_opts_url.group(1)
                 if opts_url.startswith('//'):
-                    opts_url = 'http:' + opts_url
+                    opts_url = 'https:' + opts_url
                 return self.url_result(opts_url)
 
         data = player['params'][0]
-        title = unescapeHTML(data['md_title'])
 
         # 2 = live
         # 3 = post live (finished live)
@@ -451,6 +503,7 @@ class VKIE(VKBaseIE):
             info_page, 'view count', default=None))
 
         formats = []
+        subtitles = {}
         for format_id, format_url in data.items():
             format_url = url_or_none(format_url)
             if not format_url or not format_url.startswith(('http', '//', 'rtmp')):
@@ -462,12 +515,21 @@ class VKIE(VKBaseIE):
                 formats.append({
                     'format_id': format_id,
                     'url': format_url,
+                    'ext': 'mp4',
+                    'source_preference': 1,
                     'height': height,
                 })
-            elif format_id == 'hls':
-                formats.extend(self._extract_m3u8_formats(
+            elif format_id.startswith('hls') and format_id != 'hls_live_playback':
+                fmts, subs = self._extract_m3u8_formats_and_subtitles(
                     format_url, video_id, 'mp4', 'm3u8_native',
-                    m3u8_id=format_id, fatal=False, live=is_live))
+                    m3u8_id=format_id, fatal=False, live=is_live)
+                formats.extend(fmts)
+                self._merge_subtitles(subs, target=subtitles)
+            elif format_id.startswith('dash') and format_id not in ('dash_live_playback', 'dash_uni'):
+                fmts, subs = self._extract_mpd_formats_and_subtitles(
+                    format_url, video_id, mpd_id=format_id, fatal=False)
+                formats.extend(fmts)
+                self._merge_subtitles(subs, target=subtitles)
             elif format_id == 'rtmp':
                 formats.append({
                     'format_id': format_id,
@@ -475,7 +537,6 @@ class VKIE(VKBaseIE):
                     'ext': 'flv',
                 })
 
-        subtitles = {}
         for sub in data.get('subs') or {}:
             subtitles.setdefault(sub.get('lang', 'en'), []).append({
                 'ext': sub.get('title', '.srt').split('.')[-1],
@@ -485,25 +546,41 @@ class VKIE(VKBaseIE):
         return {
             'id': video_id,
             'formats': formats,
-            'title': title,
-            'thumbnail': data.get('jpg'),
-            'uploader': data.get('md_author'),
-            'uploader_id': str_or_none(data.get('author_id') or mv_data.get('authorId')),
-            'duration': int_or_none(data.get('duration') or mv_data.get('duration')),
+            'subtitles': subtitles,
+            **traverse_obj(mv_data, {
+                'title': ('title', {unescapeHTML}),
+                'description': ('desc', {clean_html}, filter),
+                'duration': ('duration', {int_or_none}),
+                'like_count': ('likes', {int_or_none}),
+                'comment_count': ('commcount', {int_or_none}),
+            }),
+            **traverse_obj(data, {
+                'title': ('md_title', {unescapeHTML}),
+                'description': ('description', {clean_html}, filter),
+                'thumbnail': ('jpg', {url_or_none}),
+                'uploader': ('md_author', {unescapeHTML}),
+                'uploader_id': (('author_id', 'authorId'), {str_or_none}, any),
+                'duration': ('duration', {int_or_none}),
+                'chapters': ('time_codes', lambda _, v: isinstance(v['time'], int), {
+                    'title': ('text', {unescapeHTML}),
+                    'start_time': 'time',
+                }),
+            }),
             'timestamp': timestamp,
             'view_count': view_count,
-            'like_count': int_or_none(mv_data.get('likes')),
-            'comment_count': int_or_none(mv_data.get('commcount')),
             'is_live': is_live,
-            'subtitles': subtitles,
+            '_format_sort_fields': ('res', 'source'),
         }
 
 
 class VKUserVideosIE(VKBaseIE):
     IE_NAME = 'vk:uservideos'
     IE_DESC = "VK - User's Videos"
-    _VALID_URL = r'https?://(?:(?:m|new)\.)?vk\.com/video/(?:playlist/)?(?P<id>[^?$#/&]+)(?!\?.*\bz=video)(?:[/?#&](?:.*?\bsection=(?P<section>\w+))?|$)'
-    _TEMPLATE_URL = 'https://vk.com/videos'
+    _BASE_URL_RE = r'https?://(?:(?:m|new)\.)?vk(?:video\.ru|\.com/video)'
+    _VALID_URL = [
+        rf'{_BASE_URL_RE}/playlist/(?P<id>-?\d+_\d+)',
+        rf'{_BASE_URL_RE}/(?P<id>@[^/?#]+)(?:/all)?/?(?!\?.*\bz=video)(?:[?#]|$)',
+    ]
     _TESTS = [{
         'url': 'https://vk.com/video/@mobidevices',
         'info_dict': {
@@ -517,12 +594,20 @@ class VKUserVideosIE(VKBaseIE):
         },
         'playlist_mincount': 182,
     }, {
-        'url': 'https://vk.com/video/playlist/-174476437_2',
+        'url': 'https://vkvideo.ru/playlist/-204353299_426',
         'info_dict': {
-            'id': '-174476437_playlist_2',
-            'title': 'Анонсы'
+            'id': '-204353299_playlist_426',
         },
-        'playlist_mincount': 108,
+        'playlist_mincount': 33,
+    }, {
+        'url': 'https://vk.com/video/@gorkyfilmstudio/all',
+        'only_matching': True,
+    }, {
+        'url': 'https://vkvideo.ru/@mobidevices',
+        'only_matching': True,
+    }, {
+        'url': 'https://vk.com/video/playlist/-174476437_2',
+        'only_matching': True,
     }]
     _VIDEO = collections.namedtuple('Video', ['owner_id', 'id'])
 
@@ -542,7 +627,7 @@ class VKUserVideosIE(VKBaseIE):
                 v = self._VIDEO._make(video[:2])
                 video_id = '%d_%d' % (v.owner_id, v.id)
                 yield self.url_result(
-                    'http://vk.com/video' + video_id, VKIE.ie_key(), video_id)
+                    'https://vk.com/video' + video_id, VKIE.ie_key(), video_id)
             if count >= total:
                 break
             video_list_json = self._download_payload('al_video', page_id, {
@@ -551,26 +636,28 @@ class VKUserVideosIE(VKBaseIE):
                 'oid': page_id,
                 'section': section,
             })[0][section]
-            count += video_list_json['count']
+            new_count = video_list_json['count']
+            if not new_count:
+                self.to_screen(f'{page_id}: Skipping {total - count} unavailable videos')
+                break
+            count += new_count
             video_list = video_list_json['list']
 
     def _real_extract(self, url):
-        u_id, section = self._match_valid_url(url).groups()
+        u_id = self._match_id(url)
         webpage = self._download_webpage(url, u_id)
 
         if u_id.startswith('@'):
-            page_id = self._search_regex(r'data-owner-id\s?=\s?"([^"]+)"', webpage, 'page_id')
-        elif '_' in u_id:
-            page_id, section = u_id.split('_', 1)
-            section = f'playlist_{section}'
+            page_id = traverse_obj(
+                self._search_json(r'\bvar newCur\s*=', webpage, 'cursor data', u_id),
+                ('oid', {int}, {str_or_none}, {require('page id')}))
+            section = traverse_obj(parse_qs(url), ('section', 0)) or 'all'
         else:
-            raise ExtractorError('Invalid URL', expected=True)
-
-        if not section:
-            section = 'all'
+            page_id, _, section = u_id.partition('_')
+            section = f'playlist_{section}'
 
         playlist_title = clean_html(get_element_by_class('VideoInfoPanel__title', webpage))
-        return self.playlist_result(self._entries(page_id, section), '%s_%s' % (page_id, section), playlist_title)
+        return self.playlist_result(self._entries(page_id, section), f'{page_id}_{section}', playlist_title)
 
 
 class VKWallPostIE(VKBaseIE):
@@ -707,6 +794,7 @@ class VKWallPostIE(VKBaseIE):
 
 
 class VKPlayBaseIE(InfoExtractor):
+    _BASE_URL_RE = r'https?://(?:vkplay\.live|live\.vk(?:play|video)\.ru)/'
     _RESOLUTIONS = {
         'tiny': '256x144',
         'lowest': '426x240',
@@ -765,7 +853,7 @@ class VKPlayBaseIE(InfoExtractor):
 
 
 class VKPlayIE(VKPlayBaseIE):
-    _VALID_URL = r'https?://vkplay\.live/(?P<username>[^/#?]+)/record/(?P<id>[a-f0-9-]+)'
+    _VALID_URL = rf'{VKPlayBaseIE._BASE_URL_RE}(?P<username>[^/#?]+)/record/(?P<id>[\da-f-]+)'
     _TESTS = [{
         'url': 'https://vkplay.live/zitsmann/record/f5e6e3b5-dc52-4d14-965d-0680dd2882da',
         'info_dict': {
@@ -776,13 +864,19 @@ class VKPlayIE(VKPlayBaseIE):
             'uploader_id': '13159830',
             'release_timestamp': 1683461378,
             'release_date': '20230507',
-            'thumbnail': r're:https://images.vkplay.live/public_video_stream/record/f5e6e3b5-dc52-4d14-965d-0680dd2882da/preview\?change_time=\d+',
+            'thumbnail': r're:https://[^/]+/public_video_stream/record/f5e6e3b5-dc52-4d14-965d-0680dd2882da/preview',
             'duration': 10608,
             'view_count': int,
             'like_count': int,
             'categories': ['Atomic Heart'],
         },
         'params': {'skip_download': 'm3u8'},
+    }, {
+        'url': 'https://live.vkplay.ru/lebwa/record/33a4e4ce-e3ef-49db-bb14-f006cc6fabc9/records',
+        'only_matching': True,
+    }, {
+        'url': 'https://live.vkvideo.ru/lebwa/record/33a4e4ce-e3ef-49db-bb14-f006cc6fabc9/records',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
@@ -802,7 +896,7 @@ class VKPlayIE(VKPlayBaseIE):
 
 
 class VKPlayLiveIE(VKPlayBaseIE):
-    _VALID_URL = r'https?://vkplay\.live/(?P<id>[^/#?]+)/?(?:[#?]|$)'
+    _VALID_URL = rf'{VKPlayBaseIE._BASE_URL_RE}(?P<id>[^/#?]+)/?(?:[#?]|$)'
     _TESTS = [{
         'url': 'https://vkplay.live/bayda',
         'info_dict': {
@@ -810,10 +904,10 @@ class VKPlayLiveIE(VKPlayBaseIE):
             'ext': 'mp4',
             'title': r're:эскапизм крута .*',
             'uploader': 'Bayda',
-            'uploader_id': 12279401,
+            'uploader_id': '12279401',
             'release_timestamp': 1687209962,
             'release_date': '20230619',
-            'thumbnail': r're:https://images.vkplay.live/public_video_stream/12279401/preview\?change_time=\d+',
+            'thumbnail': r're:https://[^/]+/public_video_stream/12279401/preview',
             'view_count': int,
             'concurrent_view_count': int,
             'like_count': int,
@@ -822,6 +916,12 @@ class VKPlayLiveIE(VKPlayBaseIE):
         },
         'skip': 'livestream',
         'params': {'skip_download': True},
+    }, {
+        'url': 'https://live.vkplay.ru/lebwa',
+        'only_matching': True,
+    }, {
+        'url': 'https://live.vkvideo.ru/panterka',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/vocaroo.py b/plugins/youtube_download/yt_dlp/extractor/vocaroo.py
index d98fbfd..e30c959 100644
--- a/plugins/youtube_download/yt_dlp/extractor/vocaroo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/vocaroo.py
@@ -57,7 +57,7 @@ class VocarooIE(InfoExtractor):
             'title': '',
             'url': url,
             'ext': 'mp3',
-            'timestamp': float_or_none(resp.getheader('x-bz-upload-timestamp'), scale=1000),
+            'timestamp': float_or_none(resp.headers.get('x-bz-upload-timestamp'), scale=1000),
             'vcodec': 'none',
             'http_headers': http_headers,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/vodlocker.py b/plugins/youtube_download/yt_dlp/extractor/vodlocker.py
deleted file mode 100644
index b215d6c..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/vodlocker.py
+++ /dev/null
@@ -1,73 +0,0 @@
-from .common import InfoExtractor
-from ..networking import Request
-from ..utils import NO_DEFAULT, ExtractorError, urlencode_postdata
-
-
-class VodlockerIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?vodlocker\.(?:com|city)/(?:embed-)?(?P<id>[0-9a-zA-Z]+)(?:\..*?)?'
-
-    _TESTS = [{
-        'url': 'http://vodlocker.com/e8wvyzz4sl42',
-        'md5': 'ce0c2d18fa0735f1bd91b69b0e54aacf',
-        'info_dict': {
-            'id': 'e8wvyzz4sl42',
-            'ext': 'mp4',
-            'title': 'Germany vs Brazil',
-            'thumbnail': r're:http://.*\.jpg',
-        },
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-
-        if any(p in webpage for p in (
-                '>THIS FILE WAS DELETED<',
-                '>File Not Found<',
-                'The file you were looking for could not be found, sorry for any inconvenience.<',
-                '>The file was removed')):
-            raise ExtractorError('Video %s does not exist' % video_id, expected=True)
-
-        fields = self._hidden_inputs(webpage)
-
-        if fields['op'] == 'download1':
-            self._sleep(3, video_id)  # they do detect when requests happen too fast!
-            post = urlencode_postdata(fields)
-            req = Request(url, post)
-            req.headers['Content-type'] = 'application/x-www-form-urlencoded'
-            webpage = self._download_webpage(
-                req, video_id, 'Downloading video page')
-
-        def extract_file_url(html, default=NO_DEFAULT):
-            return self._search_regex(
-                r'file:\s*"(http[^\"]+)",', html, 'file url', default=default)
-
-        video_url = extract_file_url(webpage, default=None)
-
-        if not video_url:
-            embed_url = self._search_regex(
-                r'<iframe[^>]+src=(["\'])(?P<url>(?:https?://)?vodlocker\.(?:com|city)/embed-.+?)\1',
-                webpage, 'embed url', group='url')
-            embed_webpage = self._download_webpage(
-                embed_url, video_id, 'Downloading embed webpage')
-            video_url = extract_file_url(embed_webpage)
-            thumbnail_webpage = embed_webpage
-        else:
-            thumbnail_webpage = webpage
-
-        title = self._search_regex(
-            r'id="file_title".*?>\s*(.*?)\s*<(?:br|span)', webpage, 'title')
-        thumbnail = self._search_regex(
-            r'image:\s*"(http[^\"]+)",', thumbnail_webpage, 'thumbnail', fatal=False)
-
-        formats = [{
-            'format_id': 'sd',
-            'url': video_url,
-        }]
-
-        return {
-            'id': video_id,
-            'title': title,
-            'thumbnail': thumbnail,
-            'formats': formats,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/vodplatform.py b/plugins/youtube_download/yt_dlp/extractor/vodplatform.py
index 5ff0500..703854b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/vodplatform.py
+++ b/plugins/youtube_download/yt_dlp/extractor/vodplatform.py
@@ -13,7 +13,7 @@ class VODPlatformIE(InfoExtractor):
             'id': 'RufMcytHDolTH1MuKHY9Fw',
             'ext': 'mp4',
             'title': 'LBCi News_ النصرة في ضيافة الـ "سي.أن.أن"',
-        }
+        },
     }, {
         'url': 'http://embed.kwikmotion.com/embed/RufMcytHDolTH1MuKHY9Fw',
         'only_matching': True,
diff --git a/plugins/youtube_download/yt_dlp/extractor/voicerepublic.py b/plugins/youtube_download/yt_dlp/extractor/voicerepublic.py
deleted file mode 100644
index 47502af..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/voicerepublic.py
+++ /dev/null
@@ -1,59 +0,0 @@
-from .common import InfoExtractor
-from ..compat import compat_str
-from ..utils import (
-    ExtractorError,
-    determine_ext,
-    int_or_none,
-    urljoin,
-)
-
-
-class VoiceRepublicIE(InfoExtractor):
-    _VALID_URL = r'https?://voicerepublic\.com/(?:talks|embed)/(?P<id>[0-9a-z-]+)'
-    _TESTS = [{
-        'url': 'http://voicerepublic.com/talks/watching-the-watchers-building-a-sousveillance-state',
-        'md5': 'b9174d651323f17783000876347116e3',
-        'info_dict': {
-            'id': '2296',
-            'display_id': 'watching-the-watchers-building-a-sousveillance-state',
-            'ext': 'm4a',
-            'title': 'Watching the Watchers: Building a Sousveillance State',
-            'description': 'Secret surveillance programs have metadata too. The people and companies that operate secret surveillance programs can be surveilled.',
-            'duration': 1556,
-            'view_count': int,
-        }
-    }, {
-        'url': 'http://voicerepublic.com/embed/watching-the-watchers-building-a-sousveillance-state',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        display_id = self._match_id(url)
-
-        webpage = self._download_webpage(url, display_id)
-
-        if '>Queued for processing, please stand by...<' in webpage:
-            raise ExtractorError(
-                'Audio is still queued for processing', expected=True)
-
-        talk = self._parse_json(self._search_regex(
-            r'initialSnapshot\s*=\s*({.+?});',
-            webpage, 'talk'), display_id)['talk']
-        title = talk['title']
-        formats = [{
-            'url': urljoin(url, talk_url),
-            'format_id': format_id,
-            'ext': determine_ext(talk_url) or format_id,
-            'vcodec': 'none',
-        } for format_id, talk_url in talk['media_links'].items()]
-
-        return {
-            'id': compat_str(talk.get('id') or display_id),
-            'display_id': display_id,
-            'title': title,
-            'description': talk.get('teaser'),
-            'thumbnail': talk.get('image_url'),
-            'duration': int_or_none(talk.get('archived_duration')),
-            'view_count': int_or_none(talk.get('play_count')),
-            'formats': formats,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/voicy.py b/plugins/youtube_download/yt_dlp/extractor/voicy.py
index 7438b49..f83c3f9 100644
--- a/plugins/youtube_download/yt_dlp/extractor/voicy.py
+++ b/plugins/youtube_download/yt_dlp/extractor/voicy.py
@@ -1,7 +1,6 @@
 import itertools
 
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     ExtractorError,
     smuggle_url,
@@ -14,14 +13,14 @@ from ..utils import (
 
 class VoicyBaseIE(InfoExtractor):
     def _extract_from_playlist_data(self, value):
-        voice_id = compat_str(value.get('PlaylistId'))
+        voice_id = str(value.get('PlaylistId'))
         upload_date = unified_strdate(value.get('Published'), False)
         items = [self._extract_single_article(voice_data) for voice_data in value['VoiceData']]
         return {
             '_type': 'multi_video',
             'entries': items,
             'id': voice_id,
-            'title': compat_str(value.get('PlaylistName')),
+            'title': str(value.get('PlaylistName')),
             'uploader': value.get('SpeakerName'),
             'uploader_id': str_or_none(value.get('SpeakerId')),
             'channel': value.get('ChannelName'),
@@ -45,7 +44,7 @@ class VoicyBaseIE(InfoExtractor):
             'vcodec': 'none',
         }]
         return {
-            'id': compat_str(entry.get('ArticleId')),
+            'id': str(entry.get('ArticleId')),
             'title': entry.get('ArticleTitle'),
             'description': entry.get('MediaName'),
             'formats': formats,
@@ -54,7 +53,7 @@ class VoicyBaseIE(InfoExtractor):
     def _call_api(self, url, video_id, **kwargs):
         response = self._download_json(url, video_id, **kwargs)
         if response.get('Status') != 0:
-            message = traverse_obj(response, ('Value', 'Error', 'Message'), expected_type=compat_str)
+            message = traverse_obj(response, ('Value', 'Error', 'Message'), expected_type=str)
             if not message:
                 message = 'There was a error in the response: %d' % response.get('Status')
             raise ExtractorError(message, expected=False)
@@ -62,6 +61,7 @@ class VoicyBaseIE(InfoExtractor):
 
 
 class VoicyIE(VoicyBaseIE):
+    _WORKING = False
     IE_NAME = 'voicy'
     _VALID_URL = r'https?://voicy\.jp/channel/(?P<channel_id>\d+)/(?P<id>\d+)'
     ARTICLE_LIST_API_URL = 'https://vmw.api.voicy.jp/articles_list?channel_id=%s&pid=%s'
@@ -88,6 +88,7 @@ class VoicyIE(VoicyBaseIE):
 
 
 class VoicyChannelIE(VoicyBaseIE):
+    _WORKING = False
     IE_NAME = 'voicy:channel'
     _VALID_URL = r'https?://voicy\.jp/channel/(?P<id>\d+)'
     PROGRAM_LIST_API_URL = 'https://vmw.api.voicy.jp/program_list/all?channel_id=%s&limit=20&public_type=3%s'
@@ -109,7 +110,7 @@ class VoicyChannelIE(VoicyBaseIE):
     def _entries(self, channel_id):
         pager = ''
         for count in itertools.count(1):
-            article_list = self._call_api(self.PROGRAM_LIST_API_URL % (channel_id, pager), channel_id, note='Paging #%d' % count)
+            article_list = self._call_api(self.PROGRAM_LIST_API_URL % (channel_id, pager), channel_id, note=f'Paging #{count}')
             playlist_data = article_list.get('PlaylistData')
             if not playlist_data:
                 break
@@ -122,12 +123,12 @@ class VoicyChannelIE(VoicyBaseIE):
         articles = self._entries(channel_id)
 
         first_article = next(articles, None)
-        title = traverse_obj(first_article, ('ChannelName', ), expected_type=compat_str)
-        speaker_name = traverse_obj(first_article, ('SpeakerName', ), expected_type=compat_str)
+        title = traverse_obj(first_article, ('ChannelName', ), expected_type=str)
+        speaker_name = traverse_obj(first_article, ('SpeakerName', ), expected_type=str)
         if not title and speaker_name:
-            title = 'Uploads from %s' % speaker_name
+            title = f'Uploads from {speaker_name}'
         if not title:
-            title = 'Uploads from channel ID %s' % channel_id
+            title = f'Uploads from channel ID {channel_id}'
 
         articles = itertools.chain([first_article], articles) if first_article else articles
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/volejtv.py b/plugins/youtube_download/yt_dlp/extractor/volejtv.py
index 622d841..42ef9b1 100644
--- a/plugins/youtube_download/yt_dlp/extractor/volejtv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/volejtv.py
@@ -11,7 +11,7 @@ class VolejTVIE(InfoExtractor):
             'description': 'Zápas VK Královo Pole vs VK Prostějov 10.12.2022 v 19:00 na Volej.TV',
             'thumbnail': 'https://volej.tv/images/og/16/17186/og.png',
             'title': 'VK Královo Pole vs VK Prostějov',
-        }
+        },
     }, {
         'url': 'https://volej.tv/video/725605/',
         'info_dict': {
@@ -20,7 +20,7 @@ class VolejTVIE(InfoExtractor):
             'thumbnail': 'https://volej.tv/images/og/15/17185/og.png',
             'title': 'VK Lvi Praha vs VK Euro Sitex Příbram',
             'description': 'Zápas VK Lvi Praha vs VK Euro Sitex Příbram 11.12.2022 v 19:00 na Volej.TV',
-        }
+        },
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/voot.py b/plugins/youtube_download/yt_dlp/extractor/voot.py
deleted file mode 100644
index b19a279..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/voot.py
+++ /dev/null
@@ -1,210 +0,0 @@
-import json
-import time
-import uuid
-
-from .common import InfoExtractor
-from ..compat import compat_str
-from ..networking.exceptions import HTTPError
-from ..utils import (
-    ExtractorError,
-    float_or_none,
-    int_or_none,
-    jwt_decode_hs256,
-    parse_age_limit,
-    traverse_obj,
-    try_call,
-    try_get,
-    unified_strdate,
-)
-
-
-class VootBaseIE(InfoExtractor):
-    _NETRC_MACHINE = 'voot'
-    _GEO_BYPASS = False
-    _LOGIN_HINT = 'Log in with "-u <email_address> -p <password>", or use "-u token -p <auth_token>" to login with auth token.'
-    _TOKEN = None
-    _EXPIRY = 0
-    _API_HEADERS = {'Origin': 'https://www.voot.com', 'Referer': 'https://www.voot.com/'}
-
-    def _perform_login(self, username, password):
-        if self._TOKEN and self._EXPIRY:
-            return
-
-        if username.lower() == 'token' and try_call(lambda: jwt_decode_hs256(password)):
-            VootBaseIE._TOKEN = password
-            VootBaseIE._EXPIRY = jwt_decode_hs256(password)['exp']
-            self.report_login()
-
-        # Mobile number as username is not supported
-        elif not username.isdigit():
-            check_username = self._download_json(
-                'https://userauth.voot.com/usersV3/v3/checkUser', None, data=json.dumps({
-                    'type': 'email',
-                    'email': username
-                }, separators=(',', ':')).encode(), headers={
-                    **self._API_HEADERS,
-                    'Content-Type': 'application/json;charset=utf-8',
-                }, note='Checking username', expected_status=403)
-            if not traverse_obj(check_username, ('isExist', {bool})):
-                if traverse_obj(check_username, ('status', 'code', {int})) == 9999:
-                    self.raise_geo_restricted(countries=['IN'])
-                raise ExtractorError('Incorrect username', expected=True)
-            auth_token = traverse_obj(self._download_json(
-                'https://userauth.voot.com/usersV3/v3/login', None, data=json.dumps({
-                    'type': 'traditional',
-                    'deviceId': str(uuid.uuid4()),
-                    'deviceBrand': 'PC/MAC',
-                    'data': {
-                        'email': username,
-                        'password': password
-                    }
-                }, separators=(',', ':')).encode(), headers={
-                    **self._API_HEADERS,
-                    'Content-Type': 'application/json;charset=utf-8',
-                }, note='Logging in', expected_status=400), ('data', 'authToken', {dict}))
-            if not auth_token:
-                raise ExtractorError('Incorrect password', expected=True)
-            VootBaseIE._TOKEN = auth_token['accessToken']
-            VootBaseIE._EXPIRY = auth_token['expirationTime']
-
-        else:
-            raise ExtractorError(self._LOGIN_HINT, expected=True)
-
-    def _check_token_expiry(self):
-        if int(time.time()) >= self._EXPIRY:
-            raise ExtractorError('Access token has expired', expected=True)
-
-    def _real_initialize(self):
-        if not self._TOKEN:
-            self.raise_login_required(self._LOGIN_HINT, method=None)
-        self._check_token_expiry()
-
-
-class VootIE(VootBaseIE):
-    _VALID_URL = r'''(?x)
-                    (?:
-                        voot:|
-                        https?://(?:www\.)?voot\.com/?
-                        (?:
-                            movies?/[^/]+/|
-                            (?:shows|kids)/(?:[^/]+/){4}
-                        )
-                     )
-                    (?P<id>\d{3,})
-                    '''
-    _TESTS = [{
-        'url': 'https://www.voot.com/shows/ishq-ka-rang-safed/1/360558/is-this-the-end-of-kamini-/441353',
-        'info_dict': {
-            'id': '441353',
-            'ext': 'mp4',
-            'title': 'Is this the end of Kamini?',
-            'description': 'md5:06291fbbbc4dcbe21235c40c262507c1',
-            'timestamp': 1472103000,
-            'upload_date': '20160825',
-            'series': 'Ishq Ka Rang Safed',
-            'season_number': 1,
-            'episode': 'Is this the end of Kamini?',
-            'episode_number': 340,
-            'release_date': '20160825',
-            'season': 'Season 1',
-            'age_limit': 13,
-            'duration': 1146.0,
-        },
-        'params': {'skip_download': 'm3u8'},
-    }, {
-        'url': 'https://www.voot.com/kids/characters/mighty-cat-masked-niyander-e-/400478/school-bag-disappears/440925',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.voot.com/movies/pandavas-5/424627',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.voot.com/movie/fight-club/621842',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        media_info = self._download_json(
-            'https://psapi.voot.com/jio/voot/v1/voot-web/content/query/asset-details', video_id,
-            query={'ids': f'include:{video_id}', 'responseType': 'common'}, headers={'accesstoken': self._TOKEN})
-
-        try:
-            m3u8_url = self._download_json(
-                'https://vootapi.media.jio.com/playback/v1/playbackrights', video_id,
-                'Downloading playback JSON', data=b'{}', headers={
-                    **self.geo_verification_headers(),
-                    **self._API_HEADERS,
-                    'Content-Type': 'application/json;charset=utf-8',
-                    'platform': 'androidwebdesktop',
-                    'vootid': video_id,
-                    'voottoken': self._TOKEN,
-                })['m3u8']
-        except ExtractorError as e:
-            if isinstance(e.cause, HTTPError) and e.cause.status == 400:
-                self._check_token_expiry()
-            raise
-
-        formats = self._extract_m3u8_formats(m3u8_url, video_id, 'mp4', m3u8_id='hls')
-        self._remove_duplicate_formats(formats)
-
-        return {
-            'id': video_id,
-            # '/_definst_/smil:vod/' m3u8 manifests claim to have 720p+ formats but max out at 480p
-            'formats': traverse_obj(formats, (
-                lambda _, v: '/_definst_/smil:vod/' not in v['url'] or v['height'] <= 480)),
-            'http_headers': self._API_HEADERS,
-            **traverse_obj(media_info, ('result', 0, {
-                'title': ('fullTitle', {str}),
-                'description': ('fullSynopsis', {str}),
-                'series': ('showName', {str}),
-                'season_number': ('season', {int_or_none}),
-                'episode': ('fullTitle', {str}),
-                'episode_number': ('episode', {int_or_none}),
-                'timestamp': ('uploadTime', {int_or_none}),
-                'release_date': ('telecastDate', {unified_strdate}),
-                'age_limit': ('ageNemonic', {parse_age_limit}),
-                'duration': ('duration', {float_or_none}),
-            })),
-        }
-
-
-class VootSeriesIE(VootBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?voot\.com/shows/[^/]+/(?P<id>\d{3,})'
-    _TESTS = [{
-        'url': 'https://www.voot.com/shows/chakravartin-ashoka-samrat/100002',
-        'playlist_mincount': 442,
-        'info_dict': {
-            'id': '100002',
-        },
-    }, {
-        'url': 'https://www.voot.com/shows/ishq-ka-rang-safed/100003',
-        'playlist_mincount': 341,
-        'info_dict': {
-            'id': '100003',
-        },
-    }]
-    _SHOW_API = 'https://psapi.voot.com/media/voot/v1/voot-web/content/generic/season-by-show?sort=season%3Aasc&id={}&responseType=common'
-    _SEASON_API = 'https://psapi.voot.com/media/voot/v1/voot-web/content/generic/series-wise-episode?sort=episode%3Aasc&id={}&responseType=common&page={:d}'
-
-    def _entries(self, show_id):
-        show_json = self._download_json(self._SHOW_API.format(show_id), video_id=show_id)
-        for season in show_json.get('result', []):
-            page_num = 1
-            season_id = try_get(season, lambda x: x['id'], compat_str)
-            season_json = self._download_json(self._SEASON_API.format(season_id, page_num),
-                                              video_id=season_id,
-                                              note='Downloading JSON metadata page %d' % page_num)
-            episodes_json = season_json.get('result', [])
-            while episodes_json:
-                page_num += 1
-                for episode in episodes_json:
-                    video_id = episode.get('id')
-                    yield self.url_result(
-                        'voot:%s' % video_id, ie=VootIE.ie_key(), video_id=video_id)
-                episodes_json = self._download_json(self._SEASON_API.format(season_id, page_num),
-                                                    video_id=season_id,
-                                                    note='Downloading JSON metadata page %d' % page_num)['result']
-
-    def _real_extract(self, url):
-        show_id = self._match_id(url)
-        return self.playlist_result(self._entries(show_id), playlist_id=show_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/voxmedia.py b/plugins/youtube_download/yt_dlp/extractor/voxmedia.py
index f936200..e9b0047 100644
--- a/plugins/youtube_download/yt_dlp/extractor/voxmedia.py
+++ b/plugins/youtube_download/yt_dlp/extractor/voxmedia.py
@@ -1,6 +1,7 @@
+import urllib.parse
+
 from .common import InfoExtractor
 from .once import OnceIE
-from ..compat import compat_urllib_parse_unquote
 from ..utils import (
     ExtractorError,
     int_or_none,
@@ -51,8 +52,8 @@ class VoxMediaVolumeIE(OnceIE):
             info['duration'] = int_or_none(asset.get('duration'))
             return info
 
-        for provider_video_type in ('ooyala', 'youtube', 'brightcove'):
-            provider_video_id = video_data.get('%s_id' % provider_video_type)
+        for provider_video_type in ('youtube', 'brightcove'):
+            provider_video_id = video_data.get(f'{provider_video_type}_id')
             if not provider_video_id:
                 continue
             if provider_video_type == 'brightcove':
@@ -60,7 +61,7 @@ class VoxMediaVolumeIE(OnceIE):
             else:
                 info.update({
                     '_type': 'url_transparent',
-                    'url': provider_video_id if provider_video_type == 'youtube' else '%s:%s' % (provider_video_type, provider_video_id),
+                    'url': provider_video_id if provider_video_type == 'youtube' else f'{provider_video_type}:{provider_video_id}',
                     'ie_key': provider_video_type.capitalize(),
                 })
             return info
@@ -172,12 +173,11 @@ class VoxMediaIE(InfoExtractor):
 
     def _real_extract(self, url):
         display_id = self._match_id(url)
-        webpage = compat_urllib_parse_unquote(self._download_webpage(url, display_id))
+        webpage = urllib.parse.unquote(self._download_webpage(url, display_id))
 
         def create_entry(provider_video_id, provider_video_type, title=None, description=None):
             video_url = {
                 'youtube': '%s',
-                'ooyala': 'ooyala:%s',
                 'volume': 'http://volume.vox-cdn.com/embed/%s',
             }[provider_video_type] % provider_video_id
             return {
@@ -205,11 +205,6 @@ class VoxMediaIE(InfoExtractor):
                         provider_video_id, provider_video_type,
                         video_data.get('title'), video_data.get('description')))
 
-        provider_video_id = self._search_regex(
-            r'data-ooyala-id="([^"]+)"', webpage, 'ooyala id', default=None)
-        if provider_video_id:
-            entries.append(create_entry(provider_video_id, 'ooyala'))
-
         volume_uuid = self._search_regex(
             r'data-volume-uuid="([^"]+)"', webpage, 'volume uuid', default=None)
         if volume_uuid:
diff --git a/plugins/youtube_download/yt_dlp/extractor/vrak.py b/plugins/youtube_download/yt_dlp/extractor/vrak.py
deleted file mode 100644
index 198c0a2..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/vrak.py
+++ /dev/null
@@ -1,77 +0,0 @@
-import re
-
-from .common import InfoExtractor
-from .brightcove import BrightcoveNewIE
-from ..utils import (
-    int_or_none,
-    parse_age_limit,
-    smuggle_url,
-    unescapeHTML,
-)
-
-
-class VrakIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?vrak\.tv/videos\?.*?\btarget=(?P<id>[\d.]+)'
-    _TEST = {
-        'url': 'http://www.vrak.tv/videos?target=1.2306782&filtre=emission&id=1.1806721',
-        'info_dict': {
-            'id': '5345661243001',
-            'ext': 'mp4',
-            'title': 'Obésité, film de hockey et Roseline Filion',
-            'timestamp': 1488492126,
-            'upload_date': '20170302',
-            'uploader_id': '2890187628001',
-            'creator': 'VRAK.TV',
-            'age_limit': 8,
-            'series': 'ALT (Actualité Légèrement Tordue)',
-            'episode': 'Obésité, film de hockey et Roseline Filion',
-            'tags': list,
-        },
-        'params': {
-            'skip_download': True,
-        },
-    }
-    BRIGHTCOVE_URL_TEMPLATE = 'http://players.brightcove.net/2890187628001/default_default/index.html?videoId=%s'
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        webpage = self._download_webpage(url, video_id)
-
-        title = self._html_search_regex(
-            r'<h\d\b[^>]+\bclass=["\']videoTitle["\'][^>]*>([^<]+)',
-            webpage, 'title', default=None) or self._og_search_title(webpage)
-
-        content = self._parse_json(
-            self._search_regex(
-                r'data-player-options-content=(["\'])(?P<content>{.+?})\1',
-                webpage, 'content', default='{}', group='content'),
-            video_id, transform_source=unescapeHTML)
-
-        ref_id = content.get('refId') or self._search_regex(
-            r'refId&quot;:&quot;([^&]+)&quot;', webpage, 'ref id')
-
-        brightcove_id = self._search_regex(
-            r'''(?x)
-                java\.lang\.String\s+value\s*=\s*["']brightcove\.article\.\d+\.%s
-                [^>]*
-                java\.lang\.String\s+value\s*=\s*["'](\d+)
-            ''' % re.escape(ref_id), webpage, 'brightcove id')
-
-        return {
-            '_type': 'url_transparent',
-            'ie_key': BrightcoveNewIE.ie_key(),
-            'url': smuggle_url(
-                self.BRIGHTCOVE_URL_TEMPLATE % brightcove_id,
-                {'geo_countries': ['CA']}),
-            'id': brightcove_id,
-            'description': content.get('description'),
-            'creator': content.get('brand'),
-            'age_limit': parse_age_limit(content.get('rating')),
-            'series': content.get('showName') or content.get(
-                'episodeName'),  # this is intentional
-            'season_number': int_or_none(content.get('seasonNumber')),
-            'episode': title,
-            'episode_number': int_or_none(content.get('episodeNumber')),
-            'tags': content.get('tags', []),
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/vrsquare.py b/plugins/youtube_download/yt_dlp/extractor/vrsquare.py
new file mode 100644
index 0000000..9e8740b
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/vrsquare.py
@@ -0,0 +1,185 @@
+import itertools
+
+from .common import InfoExtractor
+from ..networking.exceptions import HTTPError
+from ..utils import (
+    ExtractorError,
+    clean_html,
+    extract_attributes,
+    parse_duration,
+    parse_qs,
+)
+from ..utils.traversal import (
+    find_element,
+    find_elements,
+    traverse_obj,
+)
+
+
+class VrSquareIE(InfoExtractor):
+    IE_NAME = 'vrsquare'
+    IE_DESC = 'VR SQUARE'
+
+    _BASE_URL = 'https://livr.jp'
+    _VALID_URL = r'https?://livr\.jp/contents/(?P<id>[\w-]+)'
+    _TESTS = [{
+        'url': 'https://livr.jp/contents/P470896661',
+        'info_dict': {
+            'id': 'P470896661',
+            'ext': 'mp4',
+            'title': 'そこ曲がったら、櫻坂？ ７年間お疲れ様！菅井友香の卒業を祝う会！前半 2022年11月6日放送分',
+            'description': 'md5:523726dc835aa8014dfe1e2b38d36cd1',
+            'duration': 1515.0,
+            'tags': 'count:2',
+            'thumbnail': r're:https?://media\.livr\.jp/vod/img/.+\.jpg',
+        },
+    }, {
+        'url': 'https://livr.jp/contents/P589523973',
+        'info_dict': {
+            'id': 'P589523973',
+            'ext': 'mp4',
+            'title': '薄闇に仰ぐ しだれ桜の妖艶',
+            'description': 'md5:a042f517b2cbb4ed6746707afec4d306',
+            'duration': 1084.0,
+            'tags': list,
+            'thumbnail': r're:https?://media\.livr\.jp/vod/img/.+\.jpg',
+        },
+        'skip': 'Paid video',
+    }, {
+        'url': 'https://livr.jp/contents/P316939908',
+        'info_dict': {
+            'id': 'P316939908',
+            'ext': 'mp4',
+            'title': '2024年5月16日（木） 「今日は誰に恋をする？」公演 小栗有以 生誕祭',
+            'description': 'md5:2110bdcf947f28bd7d06ec420e51b619',
+            'duration': 8559.0,
+            'tags': list,
+            'thumbnail': r're:https?://media\.livr\.jp/vod/img/.+\.jpg',
+        },
+        'skip': 'Premium channel subscribers only',
+    }, {
+        # Accessible only in the VR SQUARE app
+        'url': 'https://livr.jp/contents/P126481458',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+        status = self._download_json(
+            f'{self._BASE_URL}/webApi/contentsStatus/{video_id}',
+            video_id, 'Checking contents status', fatal=False)
+        if traverse_obj(status, 'result_code') == '40407':
+            self.raise_login_required('Unable to access this video')
+
+        try:
+            web_api = self._download_json(
+                f'{self._BASE_URL}/webApi/play/url/{video_id}', video_id)
+        except ExtractorError as e:
+            if isinstance(e.cause, HTTPError) and e.cause.status == 500:
+                raise ExtractorError('VR SQUARE app-only videos are not supported', expected=True)
+            raise
+
+        return {
+            'id': video_id,
+            'title': self._html_search_meta(['og:title', 'twitter:title'], webpage),
+            'description': self._html_search_meta('description', webpage),
+            'formats': self._extract_m3u8_formats(traverse_obj(web_api, (
+                'urls', ..., 'url', any)), video_id, 'mp4', fatal=False),
+            'thumbnail': self._html_search_meta('og:image', webpage),
+            **traverse_obj(webpage, {
+                'duration': ({find_element(cls='layout-product-data-time')}, {parse_duration}),
+                'tags': ({find_elements(cls='search-tag')}, ..., {clean_html}),
+            }),
+        }
+
+
+class VrSquarePlaylistBaseIE(InfoExtractor):
+    _BASE_URL = 'https://livr.jp'
+
+    def _fetch_vids(self, source, keys=()):
+        for url_path in traverse_obj(source, (
+            *keys, {find_elements(cls='video', html=True)}, ...,
+            {extract_attributes}, 'data-url', {str}, filter),
+        ):
+            yield self.url_result(
+                f'{self._BASE_URL}/contents/{url_path.removeprefix("/contents/")}', VrSquareIE)
+
+    def _entries(self, path, display_id, query=None):
+        for page in itertools.count(1):
+            ajax = self._download_json(
+                f'{self._BASE_URL}{path}', display_id,
+                f'Downloading playlist JSON page {page}',
+                query={'p': page, **(query or {})})
+            yield from self._fetch_vids(ajax, ('contents_render_list', ...))
+            if not traverse_obj(ajax, (('has_next', 'hasNext'), {bool}, any)):
+                break
+
+
+class VrSquareChannelIE(VrSquarePlaylistBaseIE):
+    IE_NAME = 'vrsquare:channel'
+
+    _VALID_URL = r'https?://livr\.jp/channel/(?P<id>\w+)'
+    _TESTS = [{
+        'url': 'https://livr.jp/channel/H372648599',
+        'info_dict': {
+            'id': 'H372648599',
+            'title': 'AKB48＋チャンネル',
+        },
+        'playlist_mincount': 502,
+    }]
+
+    def _real_extract(self, url):
+        playlist_id = self._match_id(url)
+        webpage = self._download_webpage(url, playlist_id)
+
+        return self.playlist_result(
+            self._entries(f'/ajax/channel/{playlist_id}', playlist_id),
+            playlist_id, self._html_search_meta('og:title', webpage))
+
+
+class VrSquareSearchIE(VrSquarePlaylistBaseIE):
+    IE_NAME = 'vrsquare:search'
+
+    _VALID_URL = r'https?://livr\.jp/web-search/?\?(?:[^#]+&)?w=[^#]+'
+    _TESTS = [{
+        'url': 'https://livr.jp/web-search?w=%23%E5%B0%8F%E6%A0%97%E6%9C%89%E4%BB%A5',
+        'info_dict': {
+            'id': '#小栗有以',
+        },
+        'playlist_mincount': 60,
+    }]
+
+    def _real_extract(self, url):
+        search_query = parse_qs(url)['w'][0]
+
+        return self.playlist_result(
+            self._entries('/ajax/web-search', search_query, {'w': search_query}), search_query)
+
+
+class VrSquareSectionIE(VrSquarePlaylistBaseIE):
+    IE_NAME = 'vrsquare:section'
+
+    _VALID_URL = r'https?://livr\.jp/(?:category|headline)/(?P<id>\w+)'
+    _TESTS = [{
+        'url': 'https://livr.jp/category/C133936275',
+        'info_dict': {
+            'id': 'C133936275',
+            'title': 'そこ曲がったら、櫻坂？VR',
+        },
+        'playlist_mincount': 308,
+    }, {
+        'url': 'https://livr.jp/headline/A296449604',
+        'info_dict': {
+            'id': 'A296449604',
+            'title': 'AKB48 アフターVR',
+        },
+        'playlist_mincount': 22,
+    }]
+
+    def _real_extract(self, url):
+        playlist_id = self._match_id(url)
+        webpage = self._download_webpage(url, playlist_id)
+
+        return self.playlist_result(
+            self._fetch_vids(webpage), playlist_id, self._html_search_meta('og:title', webpage))
diff --git a/plugins/youtube_download/yt_dlp/extractor/vrt.py b/plugins/youtube_download/yt_dlp/extractor/vrt.py
index 497233d..6e5514e 100644
--- a/plugins/youtube_download/yt_dlp/extractor/vrt.py
+++ b/plugins/youtube_download/yt_dlp/extractor/vrt.py
@@ -1,32 +1,34 @@
-import functools
 import json
 import time
 import urllib.parse
 
-from .gigya import GigyaBaseIE
+from .common import InfoExtractor
 from ..networking.exceptions import HTTPError
 from ..utils import (
     ExtractorError,
     clean_html,
     extract_attributes,
+    filter_dict,
     float_or_none,
     get_element_by_class,
     get_element_html_by_class,
     int_or_none,
-    join_nonempty,
+    jwt_decode_hs256,
     jwt_encode_hs256,
     make_archive_id,
+    merge_dicts,
     parse_age_limit,
+    parse_duration,
     parse_iso8601,
     str_or_none,
     strip_or_none,
     traverse_obj,
+    try_call,
     url_or_none,
-    urlencode_postdata,
 )
 
 
-class VRTBaseIE(GigyaBaseIE):
+class VRTBaseIE(InfoExtractor):
     _GEO_BYPASS = False
     _PLAYER_INFO = {
         'platform': 'desktop',
@@ -37,12 +39,12 @@ class VRTBaseIE(GigyaBaseIE):
         'device': 'undefined (undefined)',
         'os': {
             'name': 'Windows',
-            'version': 'x86_64'
+            'version': '10',
         },
         'player': {
             'name': 'VRT web player',
-            'version': '2.7.4-prod-2023-04-19T06:05:45'
-        }
+            'version': '5.1.1-prod-2025-02-14T08:44:16"',
+        },
     }
     # From https://player.vrt.be/vrtnws/js/main.js & https://player.vrt.be/ketnet/js/main.8cdb11341bcb79e4cd44.js
     _JWT_KEY_ID = '0-0Fp51UZykfaiCJrfTE3+oMI8zvDteYfPtR+2n1R+z8w='
@@ -90,20 +92,21 @@ class VRTBaseIE(GigyaBaseIE):
     def _call_api(self, video_id, client='null', id_token=None, version='v2'):
         player_info = {'exp': (round(time.time(), 3) + 900), **self._PLAYER_INFO}
         player_token = self._download_json(
-            'https://media-services-public.vrt.be/vualto-video-aggregator-web/rest/external/v2/tokens',
-            video_id, 'Downloading player token', headers={
+            f'https://media-services-public.vrt.be/vualto-video-aggregator-web/rest/external/{version}/tokens',
+            video_id, 'Downloading player token', 'Failed to download player token', headers={
                 **self.geo_verification_headers(),
                 'Content-Type': 'application/json',
             }, data=json.dumps({
-                'identityToken': id_token or {},
+                'identityToken': id_token or '',
                 'playerInfo': jwt_encode_hs256(player_info, self._JWT_SIGNING_KEY, headers={
-                    'kid': self._JWT_KEY_ID
-                }).decode()
+                    'kid': self._JWT_KEY_ID,
+                }).decode(),
             }, separators=(',', ':')).encode())['vrtPlayerToken']
 
         return self._download_json(
-            f'https://media-services-public.vrt.be/media-aggregator/{version}/media-items/{video_id}',
-            video_id, 'Downloading API JSON', query={
+            # The URL below redirects to https://media-services-public.vrt.be/media-aggregator/{version}/media-items/{video_id}
+            f'https://media-services-public.vrt.be/vualto-video-aggregator-web/rest/external/{version}/videos/{video_id}',
+            video_id, 'Downloading API JSON', 'Failed to download API JSON', query={
                 'vrtPlayerToken': player_token,
                 'client': client,
             }, expected_status=400)
@@ -170,222 +173,293 @@ class VRTIE(VRTBaseIE):
             **traverse_obj(data, {
                 'title': ('title', {str}),
                 'description': ('shortDescription', {str}),
-                'duration': ('duration', {functools.partial(float_or_none, scale=1000)}),
+                'duration': ('duration', {float_or_none(scale=1000)}),
                 'thumbnail': ('posterImageUrl', {url_or_none}),
             }),
         }
 
 
 class VrtNUIE(VRTBaseIE):
-    IE_DESC = 'VRT MAX'
-    _VALID_URL = r'https?://(?:www\.)?vrt\.be/vrtnu/a-z/(?:[^/]+/){2}(?P<id>[^/?#&]+)'
+    IE_NAME = 'vrtmax'
+    IE_DESC = 'VRT MAX (formerly VRT NU)'
+    _VALID_URL = r'https?://(?:www\.)?vrt\.be/(?:vrtnu|vrtmax)/a-z/(?:[^/]+/){2}(?P<id>[^/?#&]+)'
     _TESTS = [{
-        # CONTENT_IS_AGE_RESTRICTED
-        'url': 'https://www.vrt.be/vrtnu/a-z/de-ideale-wereld/2023-vj/de-ideale-wereld-d20230116/',
+        'url': 'https://www.vrt.be/vrtmax/a-z/ket---doc/trailer/ket---doc-trailer-s6/',
         'info_dict': {
-            'id': 'pbs-pub-855b00a8-6ce2-4032-ac4f-1fcf3ae78524$vid-d2243aa1-ec46-4e34-a55b-92568459906f',
+            'id': 'pbs-pub-c8a78645-5d3e-468a-89ec-6f3ed5534bd5$vid-242ddfe9-18f5-4e16-ab45-09b122a19251',
             'ext': 'mp4',
-            'title': 'Tom Waes',
-            'description': 'Satirisch actualiteitenmagazine met Ella Leyers. Tom Waes is te gast.',
-            'timestamp': 1673905125,
-            'release_timestamp': 1673905125,
-            'series': 'De ideale wereld',
-            'season_id': '1672830988794',
-            'episode': 'Aflevering 1',
-            'episode_number': 1,
-            'episode_id': '1672830988861',
-            'display_id': 'de-ideale-wereld-d20230116',
-            'channel': 'VRT',
-            'duration': 1939.0,
-            'thumbnail': 'https://images.vrt.be/orig/2023/01/10/1bb39cb3-9115-11ed-b07d-02b7b76bf47f.jpg',
-            'release_date': '20230116',
-            'upload_date': '20230116',
-            'age_limit': 12,
+            'channel': 'ketnet',
+            'description': 'Neem een kijkje in de bijzondere wereld van deze Ketnetters.',
+            'display_id': 'ket---doc-trailer-s6',
+            'duration': 30.0,
+            'episode': 'Reeks 6 volledig vanaf 3 maart',
+            'episode_id': '1739450401467',
+            'season': 'Trailer',
+            'season_id': '1739450401467',
+            'series': 'Ket & Doc',
+            'thumbnail': 'https://images.vrt.be/orig/2025/02/21/63f07122-5bbd-4ca1-b42e-8565c6cd95df.jpg',
+            'timestamp': 1740373200,
+            'title': 'Reeks 6 volledig vanaf 3 maart',
+            'upload_date': '20250224',
+            '_old_archive_ids': [
+                'canvas pbs-pub-c8a78645-5d3e-468a-89ec-6f3ed5534bd5$vid-242ddfe9-18f5-4e16-ab45-09b122a19251',
+                'ketnet pbs-pub-c8a78645-5d3e-468a-89ec-6f3ed5534bd5$vid-242ddfe9-18f5-4e16-ab45-09b122a19251',
+            ],
         },
     }, {
-        'url': 'https://www.vrt.be/vrtnu/a-z/buurman--wat-doet-u-nu-/6/buurman--wat-doet-u-nu--s6-trailer/',
+        'url': 'https://www.vrt.be/vrtmax/a-z/meisjes/6/meisjes-s6a5/',
         'info_dict': {
-            'id': 'pbs-pub-ad4050eb-d9e5-48c2-9ec8-b6c355032361$vid-0465537a-34a8-4617-8352-4d8d983b4eee',
+            'id': 'pbs-pub-97b541ab-e05c-43b9-9a40-445702ef7189$vid-5e306921-a9aa-4fa9-9f39-5b82c8f1028e',
             'ext': 'mp4',
-            'title': 'Trailer seizoen 6 \'Buurman, wat doet u nu?\'',
-            'description': 'md5:197424726c61384b4e5c519f16c0cf02',
-            'timestamp': 1652940000,
-            'release_timestamp': 1652940000,
-            'series': 'Buurman, wat doet u nu?',
-            'season': 'Seizoen 6',
+            'channel': 'ketnet',
+            'description': 'md5:713793f15cbf677f66200b36b7b1ec5a',
+            'display_id': 'meisjes-s6a5',
+            'duration': 1336.02,
+            'episode': 'Week 5',
+            'episode_id': '1684157692901',
+            'episode_number': 5,
+            'season': '6',
+            'season_id': '1684157692901',
             'season_number': 6,
-            'season_id': '1652344200907',
-            'episode': 'Aflevering 0',
-            'episode_number': 0,
-            'episode_id': '1652951873524',
-            'display_id': 'buurman--wat-doet-u-nu--s6-trailer',
-            'channel': 'VRT',
-            'duration': 33.13,
-            'thumbnail': 'https://images.vrt.be/orig/2022/05/23/3c234d21-da83-11ec-b07d-02b7b76bf47f.jpg',
-            'release_date': '20220519',
-            'upload_date': '20220519',
+            'series': 'Meisjes',
+            'thumbnail': 'https://images.vrt.be/orig/2023/05/14/bf526ae0-f1d9-11ed-91d7-02b7b76bf47f.jpg',
+            'timestamp': 1685251800,
+            'title': 'Week 5',
+            'upload_date': '20230528',
+            '_old_archive_ids': [
+                'canvas pbs-pub-97b541ab-e05c-43b9-9a40-445702ef7189$vid-5e306921-a9aa-4fa9-9f39-5b82c8f1028e',
+                'ketnet pbs-pub-97b541ab-e05c-43b9-9a40-445702ef7189$vid-5e306921-a9aa-4fa9-9f39-5b82c8f1028e',
+            ],
+        },
+    }, {
+        'url': 'https://www.vrt.be/vrtnu/a-z/taboe/3/taboe-s3a4/',
+        'info_dict': {
+            'id': 'pbs-pub-f50faa3a-1778-46b6-9117-4ba85f197703$vid-547507fe-1c8b-4394-b361-21e627cbd0fd',
+            'ext': 'mp4',
+            'channel': 'een',
+            'description': 'md5:bf61345a95eca9393a95de4a7a54b5c6',
+            'display_id': 'taboe-s3a4',
+            'duration': 2882.02,
+            'episode': 'Mensen met het syndroom van Gilles de la Tourette',
+            'episode_id': '1739055911734',
+            'episode_number': 4,
+            'season': '3',
+            'season_id': '1739055911734',
+            'season_number': 3,
+            'series': 'Taboe',
+            'thumbnail': 'https://images.vrt.be/orig/2025/02/19/8198496c-d1ae-4bca-9a48-761cf3ea3ff2.jpg',
+            'timestamp': 1740286800,
+            'title': 'Mensen met het syndroom van Gilles de la Tourette',
+            'upload_date': '20250223',
+            '_old_archive_ids': [
+                'canvas pbs-pub-f50faa3a-1778-46b6-9117-4ba85f197703$vid-547507fe-1c8b-4394-b361-21e627cbd0fd',
+                'ketnet pbs-pub-f50faa3a-1778-46b6-9117-4ba85f197703$vid-547507fe-1c8b-4394-b361-21e627cbd0fd',
+            ],
         },
-        'params': {'skip_download': 'm3u8'},
     }]
     _NETRC_MACHINE = 'vrtnu'
-    _authenticated = False
+
+    _TOKEN_COOKIE_DOMAIN = '.www.vrt.be'
+    _ACCESS_TOKEN_COOKIE_NAME = 'vrtnu-site_profile_at'
+    _REFRESH_TOKEN_COOKIE_NAME = 'vrtnu-site_profile_rt'
+    _VIDEO_TOKEN_COOKIE_NAME = 'vrtnu-site_profile_vt'
+    _VIDEO_PAGE_QUERY = '''
+    query VideoPage($pageId: ID!) {
+        page(id: $pageId) {
+            ... on EpisodePage {
+                episode {
+                    ageRaw
+                    description
+                    durationRaw
+                    episodeNumberRaw
+                    id
+                    name
+                    onTimeRaw
+                    program {
+                        title
+                    }
+                    season {
+                        id
+                        titleRaw
+                    }
+                    title
+                    brand
+                }
+                ldjson
+                player {
+                    image {
+                        templateUrl
+                    }
+                    modes {
+                        streamId
+                    }
+                }
+            }
+        }
+    }
+    '''
+
+    def _fetch_tokens(self):
+        has_credentials = self._get_login_info()[0]
+        access_token = self._get_vrt_cookie(self._ACCESS_TOKEN_COOKIE_NAME)
+        video_token = self._get_vrt_cookie(self._VIDEO_TOKEN_COOKIE_NAME)
+
+        if (access_token and not self._is_jwt_token_expired(access_token)
+                and video_token and not self._is_jwt_token_expired(video_token)):
+            return access_token, video_token
+
+        if has_credentials:
+            access_token, video_token = self.cache.load(self._NETRC_MACHINE, 'token_data', default=(None, None))
+
+            if (access_token and not self._is_jwt_token_expired(access_token)
+                    and video_token and not self._is_jwt_token_expired(video_token)):
+                self.write_debug('Restored tokens from cache')
+                self._set_cookie(self._TOKEN_COOKIE_DOMAIN, self._ACCESS_TOKEN_COOKIE_NAME, access_token)
+                self._set_cookie(self._TOKEN_COOKIE_DOMAIN, self._VIDEO_TOKEN_COOKIE_NAME, video_token)
+                return access_token, video_token
+
+        if not self._get_vrt_cookie(self._REFRESH_TOKEN_COOKIE_NAME):
+            return None, None
+
+        self._request_webpage(
+            'https://www.vrt.be/vrtmax/sso/refresh', None,
+            note='Refreshing tokens', errnote='Failed to refresh tokens', fatal=False)
+
+        access_token = self._get_vrt_cookie(self._ACCESS_TOKEN_COOKIE_NAME)
+        video_token = self._get_vrt_cookie(self._VIDEO_TOKEN_COOKIE_NAME)
+
+        if not access_token or not video_token:
+            self.cache.store(self._NETRC_MACHINE, 'refresh_token', None)
+            self.cookiejar.clear(self._TOKEN_COOKIE_DOMAIN, '/vrtmax/sso', self._REFRESH_TOKEN_COOKIE_NAME)
+            msg = 'Refreshing of tokens failed'
+            if not has_credentials:
+                self.report_warning(msg)
+                return None, None
+            self.report_warning(f'{msg}. Re-logging in')
+            return self._perform_login(*self._get_login_info())
+
+        if has_credentials:
+            self.cache.store(self._NETRC_MACHINE, 'token_data', (access_token, video_token))
+
+        return access_token, video_token
+
+    def _get_vrt_cookie(self, cookie_name):
+        # Refresh token cookie is scoped to /vrtmax/sso, others are scoped to /
+        return try_call(lambda: self._get_cookies('https://www.vrt.be/vrtmax/sso')[cookie_name].value)
+
+    @staticmethod
+    def _is_jwt_token_expired(token):
+        return jwt_decode_hs256(token)['exp'] - time.time() < 300
 
     def _perform_login(self, username, password):
-        auth_info = self._gigya_login({
-            'APIKey': '3_0Z2HujMtiWq_pkAjgnS2Md2E11a1AwZjYiBETtwNE-EoEHDINgtnvcAOpNgmrVGy',
-            'targetEnv': 'jssdk',
-            'loginID': username,
-            'password': password,
-            'authMode': 'cookie',
-        })
+        refresh_token = self._get_vrt_cookie(self._REFRESH_TOKEN_COOKIE_NAME)
+        if refresh_token and not self._is_jwt_token_expired(refresh_token):
+            self.write_debug('Using refresh token from logged-in cookies; skipping login with credentials')
+            return
 
-        if auth_info.get('errorDetails'):
-            raise ExtractorError(f'Unable to login. VrtNU said: {auth_info["errorDetails"]}', expected=True)
+        refresh_token = self.cache.load(self._NETRC_MACHINE, 'refresh_token', default=None)
+        if refresh_token and not self._is_jwt_token_expired(refresh_token):
+            self.write_debug('Restored refresh token from cache')
+            self._set_cookie(self._TOKEN_COOKIE_DOMAIN, self._REFRESH_TOKEN_COOKIE_NAME, refresh_token, path='/vrtmax/sso')
+            return
 
-        # Sometimes authentication fails for no good reason, retry
-        for retry in self.RetryManager():
-            if retry.attempt > 1:
-                self._sleep(1, None)
-            try:
-                self._request_webpage(
-                    'https://token.vrt.be/vrtnuinitlogin', None, note='Requesting XSRF Token',
-                    errnote='Could not get XSRF Token', query={
-                        'provider': 'site',
-                        'destination': 'https://www.vrt.be/vrtnu/',
-                    })
-                self._request_webpage(
-                    'https://login.vrt.be/perform_login', None,
-                    note='Performing login', errnote='Login failed',
-                    query={'client_id': 'vrtnu-site'}, data=urlencode_postdata({
-                        'UID': auth_info['UID'],
-                        'UIDSignature': auth_info['UIDSignature'],
-                        'signatureTimestamp': auth_info['signatureTimestamp'],
-                        '_csrf': self._get_cookies('https://login.vrt.be').get('OIDCXSRF').value,
-                    }))
-            except ExtractorError as e:
-                if isinstance(e.cause, HTTPError) and e.cause.status == 401:
-                    retry.error = e
-                    continue
-                raise
+        self._request_webpage(
+            'https://www.vrt.be/vrtmax/sso/login', None,
+            note='Getting session cookies', errnote='Failed to get session cookies')
 
-        self._authenticated = True
+        login_data = self._download_json(
+            'https://login.vrt.be/perform_login', None, data=json.dumps({
+                'clientId': 'vrtnu-site',
+                'loginID': username,
+                'password': password,
+            }).encode(), headers={
+                'Content-Type': 'application/json',
+                'Oidcxsrf': self._get_cookies('https://login.vrt.be')['OIDCXSRF'].value,
+            }, note='Logging in', errnote='Login failed', expected_status=403)
+        if login_data.get('errorCode'):
+            raise ExtractorError(f'Login failed: {login_data.get("errorMessage")}', expected=True)
+
+        self._request_webpage(
+            login_data['redirectUrl'], None,
+            note='Getting access token', errnote='Failed to get access token')
+
+        access_token = self._get_vrt_cookie(self._ACCESS_TOKEN_COOKIE_NAME)
+        video_token = self._get_vrt_cookie(self._VIDEO_TOKEN_COOKIE_NAME)
+        refresh_token = self._get_vrt_cookie(self._REFRESH_TOKEN_COOKIE_NAME)
+
+        if not all((access_token, video_token, refresh_token)):
+            raise ExtractorError('Unable to extract token cookie values')
+
+        self.cache.store(self._NETRC_MACHINE, 'token_data', (access_token, video_token))
+        self.cache.store(self._NETRC_MACHINE, 'refresh_token', refresh_token)
+
+        return access_token, video_token
 
     def _real_extract(self, url):
         display_id = self._match_id(url)
-        parsed_url = urllib.parse.urlparse(url)
-        details = self._download_json(
-            f'{parsed_url.scheme}://{parsed_url.netloc}{parsed_url.path.rstrip("/")}.model.json',
-            display_id, 'Downloading asset JSON', 'Unable to download asset JSON')['details']
+        access_token, video_token = self._fetch_tokens()
 
-        watch_info = traverse_obj(details, (
-            'actions', lambda _, v: v['type'] == 'watch-episode', {dict}), get_all=False) or {}
-        video_id = join_nonempty(
-            'episodePublicationId', 'episodeVideoId', delim='$', from_dict=watch_info)
-        if '$' not in video_id:
-            raise ExtractorError('Unable to extract video ID')
+        metadata = self._download_json(
+            f'https://www.vrt.be/vrtnu-api/graphql{"" if access_token else "/public"}/v1',
+            display_id, 'Downloading asset JSON', 'Unable to download asset JSON',
+            data=json.dumps({
+                'operationName': 'VideoPage',
+                'query': self._VIDEO_PAGE_QUERY,
+                'variables': {'pageId': urllib.parse.urlparse(url).path},
+            }).encode(),
+            headers=filter_dict({
+                'Authorization': f'Bearer {access_token}' if access_token else None,
+                'Content-Type': 'application/json',
+                'x-vrt-client-name': 'WEB',
+                'x-vrt-client-version': '1.5.9',
+                'x-vrt-zone': 'default',
+            }))['data']['page']
 
-        vrtnutoken = self._download_json(
-            'https://token.vrt.be/refreshtoken', video_id, note='Retrieving vrtnutoken',
-            errnote='Token refresh failed')['vrtnutoken'] if self._authenticated else None
+        video_id = metadata['player']['modes'][0]['streamId']
 
-        video_info = self._call_api(video_id, 'vrtnu-web@PROD', vrtnutoken)
+        try:
+            streaming_info = self._call_api(video_id, 'vrtnu-web@PROD', id_token=video_token)
+        except ExtractorError as e:
+            if not video_token and isinstance(e.cause, HTTPError) and e.cause.status == 404:
+                self.raise_login_required()
+            raise
 
-        if 'title' not in video_info:
-            code = video_info.get('code')
-            if code in ('AUTHENTICATION_REQUIRED', 'CONTENT_IS_AGE_RESTRICTED'):
-                self.raise_login_required(code, method='password')
-            elif code in ('INVALID_LOCATION', 'CONTENT_AVAILABLE_ONLY_IN_BE'):
+        formats, subtitles = self._extract_formats_and_subtitles(streaming_info, video_id)
+
+        code = traverse_obj(streaming_info, ('code', {str}))
+        if not formats and code:
+            if code in ('CONTENT_AVAILABLE_ONLY_FOR_BE_RESIDENTS', 'CONTENT_AVAILABLE_ONLY_IN_BE', 'CONTENT_UNAVAILABLE_VIA_PROXY'):
                 self.raise_geo_restricted(countries=['BE'])
-            elif code == 'CONTENT_AVAILABLE_ONLY_FOR_BE_RESIDENTS_AND_EXPATS':
-                if not self._authenticated:
-                    self.raise_login_required(code, method='password')
-                self.raise_geo_restricted(countries=['BE'])
-            raise ExtractorError(code, expected=True)
-
-        formats, subtitles = self._extract_formats_and_subtitles(video_info, video_id)
+            elif code in ('CONTENT_AVAILABLE_ONLY_FOR_BE_RESIDENTS_AND_EXPATS', 'CONTENT_IS_AGE_RESTRICTED', 'CONTENT_REQUIRES_AUTHENTICATION'):
+                self.raise_login_required()
+            else:
+                self.raise_no_formats(f'Unable to extract formats: {code}')
 
         return {
-            **traverse_obj(details, {
-                'title': 'title',
-                'description': ('description', {clean_html}),
-                'timestamp': ('data', 'episode', 'onTime', 'raw', {parse_iso8601}),
-                'release_timestamp': ('data', 'episode', 'onTime', 'raw', {parse_iso8601}),
-                'series': ('data', 'program', 'title'),
-                'season': ('data', 'season', 'title', 'value'),
-                'season_number': ('data', 'season', 'title', 'raw', {int_or_none}),
-                'season_id': ('data', 'season', 'id', {str_or_none}),
-                'episode': ('data', 'episode', 'number', 'value', {str_or_none}),
-                'episode_number': ('data', 'episode', 'number', 'raw', {int_or_none}),
-                'episode_id': ('data', 'episode', 'id', {str_or_none}),
-                'age_limit': ('data', 'episode', 'age', 'raw', {parse_age_limit}),
-            }),
+            'duration': float_or_none(streaming_info.get('duration'), 1000),
+            'thumbnail': url_or_none(streaming_info.get('posterImageUrl')),
+            **self._json_ld(traverse_obj(metadata, ('ldjson', ..., {json.loads})), video_id, fatal=False),
+            **traverse_obj(metadata, ('episode', {
+                'title': ('title', {str}),
+                'description': ('description', {str}),
+                'timestamp': ('onTimeRaw', {parse_iso8601}),
+                'series': ('program', 'title', {str}),
+                'season': ('season', 'titleRaw', {str}),
+                'season_number': ('season', 'titleRaw', {int_or_none}),
+                'season_id': ('id', {str_or_none}),
+                'episode': ('title', {str}),
+                'episode_number': ('episodeNumberRaw', {int_or_none}),
+                'episode_id': ('id', {str_or_none}),
+                'age_limit': ('ageRaw', {parse_age_limit}),
+                'channel': ('brand', {str}),
+                'duration': ('durationRaw', {parse_duration}),
+            })),
             'id': video_id,
             'display_id': display_id,
-            'channel': 'VRT',
-            'formats': formats,
-            'duration': float_or_none(video_info.get('duration'), 1000),
-            'thumbnail': url_or_none(video_info.get('posterImageUrl')),
-            'subtitles': subtitles,
-            '_old_archive_ids': [make_archive_id('Canvas', video_id)],
-        }
-
-
-class KetnetIE(VRTBaseIE):
-    _VALID_URL = r'https?://(?:www\.)?ketnet\.be/(?P<id>(?:[^/]+/)*[^/?#&]+)'
-    _TESTS = [{
-        'url': 'https://www.ketnet.be/kijken/m/meisjes/6/meisjes-s6a5',
-        'info_dict': {
-            'id': 'pbs-pub-39f8351c-a0a0-43e6-8394-205d597d6162$vid-5e306921-a9aa-4fa9-9f39-5b82c8f1028e',
-            'ext': 'mp4',
-            'title': 'Meisjes',
-            'episode': 'Reeks 6: Week 5',
-            'season': 'Reeks 6',
-            'series': 'Meisjes',
-            'timestamp': 1685251800,
-            'upload_date': '20230528',
-        },
-        'params': {'skip_download': 'm3u8'},
-    }]
-
-    def _real_extract(self, url):
-        display_id = self._match_id(url)
-
-        video = self._download_json(
-            'https://senior-bff.ketnet.be/graphql', display_id, query={
-                'query': '''{
-  video(id: "content/ketnet/nl/%s.model.json") {
-    description
-    episodeNr
-    imageUrl
-    mediaReference
-    programTitle
-    publicationDate
-    seasonTitle
-    subtitleVideodetail
-    titleVideodetail
-  }
-}''' % display_id,
-            })['data']['video']
-
-        video_id = urllib.parse.unquote(video['mediaReference'])
-        data = self._call_api(video_id, 'ketnet@PROD', version='v1')
-        formats, subtitles = self._extract_formats_and_subtitles(data, video_id)
-
-        return {
-            'id': video_id,
             'formats': formats,
             'subtitles': subtitles,
-            '_old_archive_ids': [make_archive_id('Canvas', video_id)],
-            **traverse_obj(video, {
-                'title': ('titleVideodetail', {str}),
-                'description': ('description', {str}),
-                'thumbnail': ('thumbnail', {url_or_none}),
-                'timestamp': ('publicationDate', {parse_iso8601}),
-                'series': ('programTitle', {str}),
-                'season': ('seasonTitle', {str}),
-                'episode': ('subtitleVideodetail', {str}),
-                'episode_number': ('episodeNr', {int_or_none}),
-            }),
+            '_old_archive_ids': [make_archive_id('Canvas', video_id),
+                                 make_archive_id('Ketnet', video_id)],
         }
 
 
@@ -425,3 +499,64 @@ class DagelijkseKostIE(VRTBaseIE):
                 ['description', 'twitter:description', 'og:description'], webpage),
             '_old_archive_ids': [make_archive_id('Canvas', video_id)],
         }
+
+
+class Radio1BeIE(VRTBaseIE):
+    _VALID_URL = r'https?://radio1\.be/(?:lees|luister/select)/(?P<id>[\w/-]+)'
+    _TESTS = [{
+        'url': 'https://radio1.be/luister/select/de-ochtend/komt-n-va-volgend-jaar-op-in-wallonie',
+        'info_dict': {
+            'id': 'eb6c22e9-544f-44f4-af39-cf8cccd29e22',
+            'title': 'Komt N-VA volgend jaar op in Wallonië?',
+            'display_id': 'de-ochtend/komt-n-va-volgend-jaar-op-in-wallonie',
+            'description': 'md5:b374ea1c9302f38362df9dea1931468e',
+            'thumbnail': r're:https?://cds\.vrt\.radio/[^/#\?&]+',
+        },
+        'playlist_mincount': 1,
+    }, {
+        'url': 'https://radio1.be/lees/europese-unie-wil-onmiddellijke-humanitaire-pauze-en-duurzaam-staakt-het-vuren-in-gaza?view=web',
+        'info_dict': {
+            'id': '5d47f102-dbdb-4fa0-832b-26c1870311f2',
+            'title': 'Europese Unie wil "onmiddellijke humanitaire pauze" en "duurzaam staakt-het-vuren" in Gaza',
+            'description': 'md5:1aad1fae7d39edeffde5d3e67d276b64',
+            'thumbnail': r're:https?://cds\.vrt\.radio/[^/#\?&]+',
+            'display_id': 'europese-unie-wil-onmiddellijke-humanitaire-pauze-en-duurzaam-staakt-het-vuren-in-gaza',
+        },
+        'playlist_mincount': 1,
+    }]
+
+    def _extract_video_entries(self, next_js_data, display_id):
+        video_data = traverse_obj(
+            next_js_data, ((None, ('paragraphs', ...)), {lambda x: x if x['mediaReference'] else None}))
+        for data in video_data:
+            media_reference = data['mediaReference']
+            formats, subtitles = self._extract_formats_and_subtitles(
+                self._call_api(media_reference), display_id)
+
+            yield {
+                'id': media_reference,
+                'formats': formats,
+                'subtitles': subtitles,
+                **traverse_obj(data, {
+                    'title': ('title', {str}),
+                    'description': ('body', {clean_html}),
+                }),
+            }
+
+    def _real_extract(self, url):
+        display_id = self._match_id(url)
+        webpage = self._download_webpage(url, display_id)
+        next_js_data = self._search_nextjs_data(webpage, display_id)['props']['pageProps']['item']
+
+        return self.playlist_result(
+            self._extract_video_entries(next_js_data, display_id), **merge_dicts(traverse_obj(
+                next_js_data, ({
+                    'id': ('id', {str}),
+                    'title': ('title', {str}),
+                    'description': (('description', 'content'), {clean_html}),
+                }), get_all=False), {
+                    'display_id': display_id,
+                    'title': self._html_search_meta(['name', 'og:title', 'twitter:title'], webpage),
+                    'description': self._html_search_meta(['description', 'og:description', 'twitter:description'], webpage),
+                    'thumbnail': self._html_search_meta(['og:image', 'twitter:image'], webpage),
+            }))
diff --git a/plugins/youtube_download/yt_dlp/extractor/vrv.py b/plugins/youtube_download/yt_dlp/extractor/vrv.py
deleted file mode 100644
index 523c442..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/vrv.py
+++ /dev/null
@@ -1,269 +0,0 @@
-import base64
-import hashlib
-import hmac
-import json
-import random
-import string
-import time
-import urllib.parse
-
-from .common import InfoExtractor
-from ..compat import compat_urllib_parse_urlencode
-from ..networking.exceptions import HTTPError
-from ..utils import (
-    ExtractorError,
-    float_or_none,
-    int_or_none,
-    join_nonempty,
-    traverse_obj,
-)
-
-
-class VRVBaseIE(InfoExtractor):
-    _API_DOMAIN = None
-    _API_PARAMS = {}
-    _CMS_SIGNING = {}
-    _TOKEN = None
-    _TOKEN_SECRET = ''
-
-    def _call_api(self, path, video_id, note, data=None):
-        # https://tools.ietf.org/html/rfc5849#section-3
-        base_url = self._API_DOMAIN + '/core/' + path
-        query = [
-            ('oauth_consumer_key', self._API_PARAMS['oAuthKey']),
-            ('oauth_nonce', ''.join(random.choices(string.ascii_letters, k=32))),
-            ('oauth_signature_method', 'HMAC-SHA1'),
-            ('oauth_timestamp', int(time.time())),
-        ]
-        if self._TOKEN:
-            query.append(('oauth_token', self._TOKEN))
-        encoded_query = compat_urllib_parse_urlencode(query)
-        headers = self.geo_verification_headers()
-        if data:
-            data = json.dumps(data).encode()
-            headers['Content-Type'] = 'application/json'
-        base_string = '&'.join([
-            'POST' if data else 'GET',
-            urllib.parse.quote(base_url, ''),
-            urllib.parse.quote(encoded_query, '')])
-        oauth_signature = base64.b64encode(hmac.new(
-            (self._API_PARAMS['oAuthSecret'] + '&' + self._TOKEN_SECRET).encode('ascii'),
-            base_string.encode(), hashlib.sha1).digest()).decode()
-        encoded_query += '&oauth_signature=' + urllib.parse.quote(oauth_signature, '')
-        try:
-            return self._download_json(
-                '?'.join([base_url, encoded_query]), video_id,
-                note='Downloading %s JSON metadata' % note, headers=headers, data=data)
-        except ExtractorError as e:
-            if isinstance(e.cause, HTTPError) and e.cause.status == 401:
-                raise ExtractorError(json.loads(e.cause.response.read().decode())['message'], expected=True)
-            raise
-
-    def _call_cms(self, path, video_id, note):
-        if not self._CMS_SIGNING:
-            index = self._call_api('index', video_id, 'CMS Signing')
-            self._CMS_SIGNING = index.get('cms_signing') or {}
-            if not self._CMS_SIGNING:
-                for signing_policy in index.get('signing_policies', []):
-                    signing_path = signing_policy.get('path')
-                    if signing_path and signing_path.startswith('/cms/'):
-                        name, value = signing_policy.get('name'), signing_policy.get('value')
-                        if name and value:
-                            self._CMS_SIGNING[name] = value
-        return self._download_json(
-            self._API_DOMAIN + path, video_id, query=self._CMS_SIGNING,
-            note='Downloading %s JSON metadata' % note, headers=self.geo_verification_headers())
-
-    def _get_cms_resource(self, resource_key, video_id):
-        return self._call_api(
-            'cms_resource', video_id, 'resource path', data={
-                'resource_key': resource_key,
-            })['__links__']['cms_resource']['href']
-
-    def _extract_vrv_formats(self, url, video_id, stream_format, audio_lang, hardsub_lang):
-        if not url or stream_format not in ('hls', 'dash', 'adaptive_hls'):
-            return []
-        format_id = join_nonempty(
-            stream_format,
-            audio_lang and 'audio-%s' % audio_lang,
-            hardsub_lang and 'hardsub-%s' % hardsub_lang)
-        if 'hls' in stream_format:
-            adaptive_formats = self._extract_m3u8_formats(
-                url, video_id, 'mp4', m3u8_id=format_id,
-                note='Downloading %s information' % format_id,
-                fatal=False)
-        elif stream_format == 'dash':
-            adaptive_formats = self._extract_mpd_formats(
-                url, video_id, mpd_id=format_id,
-                note='Downloading %s information' % format_id,
-                fatal=False)
-        if audio_lang:
-            for f in adaptive_formats:
-                if f.get('acodec') != 'none':
-                    f['language'] = audio_lang
-        return adaptive_formats
-
-    def _set_api_params(self):
-        webpage = self._download_webpage(
-            'https://vrv.co/', None, headers=self.geo_verification_headers())
-        self._API_PARAMS = self._parse_json(self._search_regex(
-            [
-                r'window\.__APP_CONFIG__\s*=\s*({.+?})(?:</script>|;)',
-                r'window\.__APP_CONFIG__\s*=\s*({.+})'
-            ], webpage, 'app config'), None)['cxApiParams']
-        self._API_DOMAIN = self._API_PARAMS.get('apiDomain', 'https://api.vrv.co')
-
-
-class VRVIE(VRVBaseIE):
-    IE_NAME = 'vrv'
-    _VALID_URL = r'https?://(?:www\.)?vrv\.co/watch/(?P<id>[A-Z0-9]+)'
-    _TESTS = [{
-        'url': 'https://vrv.co/watch/GR9PNZ396/Hidden-America-with-Jonah-Ray:BOSTON-WHERE-THE-PAST-IS-THE-PRESENT',
-        'info_dict': {
-            'id': 'GR9PNZ396',
-            'ext': 'mp4',
-            'title': 'BOSTON: WHERE THE PAST IS THE PRESENT',
-            'description': 'md5:4ec8844ac262ca2df9e67c0983c6b83f',
-            'uploader_id': 'seeso',
-        },
-        'params': {
-            # m3u8 download
-            'skip_download': True,
-        },
-    }, {
-        # movie listing
-        'url': 'https://vrv.co/watch/G6NQXZ1J6/Lily-CAT',
-        'info_dict': {
-            'id': 'G6NQXZ1J6',
-            'title': 'Lily C.A.T',
-            'description': 'md5:988b031e7809a6aeb60968be4af7db07',
-        },
-        'playlist_count': 2,
-    }]
-    _NETRC_MACHINE = 'vrv'
-
-    def _perform_login(self, username, password):
-        token_credentials = self._call_api(
-            'authenticate/by:credentials', None, 'Token Credentials', data={
-                'email': username,
-                'password': password,
-            })
-        self._TOKEN = token_credentials['oauth_token']
-        self._TOKEN_SECRET = token_credentials['oauth_token_secret']
-
-    def _initialize_pre_login(self):
-        return self._set_api_params()
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        object_data = self._call_cms(self._get_cms_resource(
-            'cms:/objects/' + video_id, video_id), video_id, 'object')['items'][0]
-        resource_path = object_data['__links__']['resource']['href']
-        video_data = self._call_cms(resource_path, video_id, 'video')
-        title = video_data['title']
-        description = video_data.get('description')
-
-        if video_data.get('__class__') == 'movie_listing':
-            items = self._call_cms(
-                video_data['__links__']['movie_listing/movies']['href'],
-                video_id, 'movie listing').get('items') or []
-            if len(items) != 1:
-                entries = []
-                for item in items:
-                    item_id = item.get('id')
-                    if not item_id:
-                        continue
-                    entries.append(self.url_result(
-                        'https://vrv.co/watch/' + item_id,
-                        self.ie_key(), item_id, item.get('title')))
-                return self.playlist_result(entries, video_id, title, description)
-            video_data = items[0]
-
-        streams_path = video_data['__links__'].get('streams', {}).get('href')
-        if not streams_path:
-            self.raise_login_required()
-        streams_json = self._call_cms(streams_path, video_id, 'streams')
-
-        audio_locale = streams_json.get('audio_locale')
-        formats = []
-        for stream_type, streams in streams_json.get('streams', {}).items():
-            if stream_type in ('adaptive_hls', 'adaptive_dash'):
-                for stream in streams.values():
-                    formats.extend(self._extract_vrv_formats(
-                        stream.get('url'), video_id, stream_type.split('_')[1],
-                        audio_locale, stream.get('hardsub_locale')))
-
-        subtitles = {}
-        for k in ('captions', 'subtitles'):
-            for subtitle in streams_json.get(k, {}).values():
-                subtitle_url = subtitle.get('url')
-                if not subtitle_url:
-                    continue
-                subtitles.setdefault(subtitle.get('locale', 'en-US'), []).append({
-                    'url': subtitle_url,
-                    'ext': subtitle.get('format', 'ass'),
-                })
-
-        thumbnails = []
-        for thumbnail in traverse_obj(video_data, ('images', 'thumbnail', ..., ...)) or []:
-            thumbnail_url = thumbnail.get('source')
-            if not thumbnail_url:
-                continue
-            thumbnails.append({
-                'url': thumbnail_url,
-                'width': int_or_none(thumbnail.get('width')),
-                'height': int_or_none(thumbnail.get('height')),
-            })
-
-        return {
-            'id': video_id,
-            'title': title,
-            'formats': formats,
-            'subtitles': subtitles,
-            'thumbnails': thumbnails,
-            'description': description,
-            'duration': float_or_none(video_data.get('duration_ms'), 1000),
-            'uploader_id': video_data.get('channel_id'),
-            'series': video_data.get('series_title'),
-            'season': video_data.get('season_title'),
-            'season_number': int_or_none(video_data.get('season_number')),
-            'season_id': video_data.get('season_id'),
-            'episode': title,
-            'episode_number': int_or_none(video_data.get('episode_number')),
-            'episode_id': video_data.get('production_episode_id'),
-        }
-
-
-class VRVSeriesIE(VRVBaseIE):
-    IE_NAME = 'vrv:series'
-    _VALID_URL = r'https?://(?:www\.)?vrv\.co/series/(?P<id>[A-Z0-9]+)'
-    _TEST = {
-        'url': 'https://vrv.co/series/G68VXG3G6/The-Perfect-Insider',
-        'info_dict': {
-            'id': 'G68VXG3G6',
-        },
-        'playlist_mincount': 11,
-    }
-
-    def _initialize_pre_login(self):
-        return self._set_api_params()
-
-    def _real_extract(self, url):
-        series_id = self._match_id(url)
-
-        seasons_path = self._get_cms_resource(
-            'cms:/seasons?series_id=' + series_id, series_id)
-        seasons_data = self._call_cms(seasons_path, series_id, 'seasons')
-
-        entries = []
-        for season in seasons_data.get('items', []):
-            episodes_path = season['__links__']['season/episodes']['href']
-            episodes = self._call_cms(episodes_path, series_id, 'episodes')
-            for episode in episodes.get('items', []):
-                episode_id = episode['id']
-                entries.append(self.url_result(
-                    'https://vrv.co/watch/' + episode_id,
-                    'VRV', episode_id, episode.get('title')))
-
-        return self.playlist_result(entries, series_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/vshare.py b/plugins/youtube_download/yt_dlp/extractor/vshare.py
deleted file mode 100644
index 443ed43..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/vshare.py
+++ /dev/null
@@ -1,57 +0,0 @@
-from .common import InfoExtractor
-from ..utils import ExtractorError, decode_packed_codes
-
-
-class VShareIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?vshare\.io/[dv]/(?P<id>[^/?#&]+)'
-    _EMBED_REGEX = [r'<iframe[^>]+?src=["\'](?P<url>(?:https?:)?//(?:www\.)?vshare\.io/v/[^/?#&]+)']
-    _TESTS = [{
-        'url': 'https://vshare.io/d/0f64ce6',
-        'md5': '17b39f55b5497ae8b59f5fbce8e35886',
-        'info_dict': {
-            'id': '0f64ce6',
-            'title': 'vl14062007715967',
-            'ext': 'mp4',
-        }
-    }, {
-        'url': 'https://vshare.io/v/0f64ce6/width-650/height-430/1',
-        'only_matching': True,
-    }]
-
-    def _extract_packed(self, webpage):
-        packed = self._search_regex(
-            r'(eval\(function.+)', webpage, 'packed code')
-        unpacked = decode_packed_codes(packed)
-        digits = self._search_regex(r'\[([\d,]+)\]', unpacked, 'digits')
-        digits = [int(digit) for digit in digits.split(',')]
-        key_digit = self._search_regex(
-            r'fromCharCode\(.+?(\d+)\)}', unpacked, 'key digit')
-        chars = [chr(d - int(key_digit)) for d in digits]
-        return ''.join(chars)
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        webpage = self._download_webpage(
-            'https://vshare.io/v/%s/width-650/height-430/1' % video_id,
-            video_id, headers={'Referer': url})
-
-        title = self._html_extract_title(webpage)
-        title = title.split(' - ')[0]
-
-        error = self._html_search_regex(
-            r'(?s)<div[^>]+\bclass=["\']xxx-error[^>]+>(.+?)</div', webpage,
-            'error', default=None)
-        if error:
-            raise ExtractorError(error, expected=True)
-
-        info = self._parse_html5_media_entries(
-            url, '<video>%s</video>' % self._extract_packed(webpage),
-            video_id)[0]
-
-        info.update({
-            'id': video_id,
-            'title': title,
-        })
-
-        return info
diff --git a/plugins/youtube_download/yt_dlp/extractor/vtm.py b/plugins/youtube_download/yt_dlp/extractor/vtm.py
index 6381fd3..41b41ec 100644
--- a/plugins/youtube_download/yt_dlp/extractor/vtm.py
+++ b/plugins/youtube_download/yt_dlp/extractor/vtm.py
@@ -7,6 +7,7 @@ from ..utils import (
 
 
 class VTMIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?vtm\.be/([^/?&#]+)~v(?P<id>[0-9a-f]{8}(?:-[0-9a-f]{4}){3}-[0-9a-f]{12})'
     _TEST = {
         'url': 'https://vtm.be/gast-vernielt-genkse-hotelkamer~ve7534523-279f-4b4d-a5c9-a33ffdbe23e1',
@@ -20,7 +21,7 @@ class VTMIE(InfoExtractor):
             'duration': 74,
             # TODO: fix url _type result processing
             # 'series': 'Op Interventie',
-        }
+        },
     }
 
     def _real_extract(self, url):
@@ -41,7 +42,7 @@ class VTMIE(InfoExtractor):
       title
     }
   }
-}''' % uuid,
+}''' % uuid,  # noqa: UP031
             }, headers={
                 'x-api-key': 'da2-lz2cab4tfnah3mve6wiye4n77e',
             })['data']['getComponent']
diff --git a/plugins/youtube_download/yt_dlp/extractor/vtv.py b/plugins/youtube_download/yt_dlp/extractor/vtv.py
new file mode 100644
index 0000000..97134ee
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/vtv.py
@@ -0,0 +1,108 @@
+from .common import InfoExtractor
+from ..utils import extract_attributes, get_element_html_by_class, remove_start
+
+
+class VTVGoIE(InfoExtractor):
+    _VALID_URL = [
+        r'https?://(?:www\.)?vtvgo\.vn/(kho-video|tin-tuc)/[\w.-]*?(?P<id>\d+)(?:\.[a-z]+|/)?(?:$|[?#])',
+        r'https?://(?:www\.)?vtvgo\.vn/digital/detail\.php\?(?:[^#]+&)?content_id=(?P<id>\d+)',
+    ]
+    _TESTS = [{
+        'url': 'https://vtvgo.vn/kho-video/bep-vtv-vit-chao-rieng-so-24-888456.html',
+        'info_dict': {
+            'id': '888456',
+            'ext': 'mp4',
+            'title': 'Bếp VTV | Vịt chao riềng | Số 24',
+            'description': 'md5:2b4e93ec2b954304170d32be288ce2c8',
+            'thumbnail': 'https://vtvgo-images.vtvdigital.vn/images/20230201/VIT-CHAO-RIENG_VTV_638108894672812459.jpg',
+        },
+    }, {
+        'url': 'https://vtvgo.vn/tin-tuc/hot-search-1-zlife-khong-ngo-toi-phai-khong-862074',
+        'info_dict': {
+            'id': '862074',
+            'ext': 'mp4',
+            'title': 'Hot Search #1 | Zlife | Không ngờ tới phải không? ',
+            'description': 'md5:e967d0e2efbbebbee8814a55799b4d0f',
+            'thumbnail': 'https://vtvgo-images.vtvdigital.vn/images/20220504/6b9a8552-e71c-46ce-bc9d-50c9bb506f9c.jpeg',
+        },
+    }, {
+        'url': 'https://vtvgo.vn/kho-video/918311.html',
+        'info_dict': {
+            'id': '918311',
+            'title': 'Cà phê sáng | 05/02/2024 | Tái hiện hình ảnh Hà Nội xưa tại ngôi nhà di sản',
+            'ext': 'mp4',
+            'thumbnail': 'https://vtvgo-images.vtvdigital.vn/images/20240205/0506_ca_phe_sang_638427226021318322.jpg',
+            'description': 'md5:b121c67948f1ce58e6a036042fc14c1b',
+        },
+    }, {
+        'url': 'https://vtvgo.vn/digital/detail.php?digital_id=168&content_id=918634',
+        'info_dict': {
+            'id': '918634',
+            'ext': 'mp4',
+            'title': 'Gặp nhau cuối năm | Táo quân 2024',
+            'description': 'md5:a1c221e78e5954d29d49b2a11c20513c',
+            'thumbnail': 'https://vtvgo-images.vtvdigital.vn/images/20240210/d0f73369-8f03-4108-9edd-83d4bc3997b2.png',
+        },
+    }, {
+        'url': 'https://vtvgo.vn/digital/detail.php?content_id=919358',
+        'info_dict': {
+            'id': '919358',
+            'ext': 'mp4',
+            'title': 'Chúng ta của 8 năm sau | Tập 45 | Dương có bằng chứng, nhân chứng vạch mặt ông Khiêm',
+            'description': 'md5:16ff5208cac6585137f554472a4677f3',
+            'thumbnail': 'https://vtvgo-images.vtvdigital.vn/images/20240221/550deff9-7736-4a0e-8b5d-33274d97cd7d.jpg',
+        },
+    }, {
+        'url': 'https://vtvgo.vn/kho-video/888456',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+        m3u8_url = self._search_regex(
+            r'(?:var\s+link\s*=\s*|addPlayer\()["\'](https://[^"\']+/index\.m3u8)["\']', webpage, 'm3u8 url')
+        return {
+            'id': video_id,
+            'title': self._og_search_title(webpage, default=None),
+            'description': self._og_search_description(webpage, default=None),
+            'thumbnail': self._og_search_thumbnail(webpage, default=None),
+            'formats': self._extract_m3u8_formats(m3u8_url, video_id, 'mp4'),
+        }
+
+
+class VTVIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?vtv\.vn/video/[\w-]*?(?P<id>\d+)\.htm'
+    _TESTS = [{
+        'url': 'https://vtv.vn/video/thoi-su-20h-vtv1-12-6-2024-680411.htm',
+        'info_dict': {
+            'id': '680411',
+            'ext': 'mp4',
+            'title': 'Thời sự 20h VTV1 - 12/6/2024 - Video đã phát trên VTV1 | VTV.VN',
+            'thumbnail': 'https://cdn-images.vtv.vn/zoom/600_315/66349b6076cb4dee98746cf1/2024/06/12/thumb/1206-ts-20h-02929741475480320806760.mp4/thumb0.jpg',
+        },
+    }, {
+        'url': 'https://vtv.vn/video/zlife-1-khong-ngo-toi-phai-khong-vtv24-560248.htm',
+        'info_dict': {
+            'id': '560248',
+            'ext': 'mp4',
+            'title': 'ZLife #1: Không ngờ tới phải không? | VTV24 - Video đã phát trên VTV-NEWS | VTV.VN',
+            'description': 'Ai đứng sau vụ việc thay đổi ảnh đại diện trên các trang mạng xã hội của VTV Digital tối 2/5?',
+            'thumbnail': 'https://video-thumbs.mediacdn.vn/zoom/600_315/vtv/2022/5/13/t67s6btf3ji-16524555726231894427334.jpg',
+        },
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
+        data_vid = extract_attributes(get_element_html_by_class(
+            'VCSortableInPreviewMode', get_element_html_by_class(
+                'video-highlight-box', webpage)))['data-vid']
+        m3u8_url = f'https://cdn-videos.vtv.vn/{remove_start(data_vid, "vtv.mediacdn.vn/")}/master.m3u8'
+        return {
+            'id': video_id,
+            'title': self._og_search_title(webpage, default=None),
+            'description': self._og_search_description(webpage, default=None),
+            'thumbnail': self._og_search_thumbnail(webpage, default=None),
+            'formats': self._extract_m3u8_formats(m3u8_url, video_id, 'mp4'),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/vuclip.py b/plugins/youtube_download/yt_dlp/extractor/vuclip.py
index 0e56298..ad7eab3 100644
--- a/plugins/youtube_download/yt_dlp/extractor/vuclip.py
+++ b/plugins/youtube_download/yt_dlp/extractor/vuclip.py
@@ -1,9 +1,7 @@
 import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_urllib_parse_urlparse,
-)
 from ..utils import (
     ExtractorError,
     parse_duration,
@@ -21,7 +19,7 @@ class VuClipIE(InfoExtractor):
             'ext': '3gp',
             'title': 'Top 10 TV Convicts',
             'duration': 733,
-        }
+        },
     }
 
     def _real_extract(self, url):
@@ -31,7 +29,7 @@ class VuClipIE(InfoExtractor):
         ad_m = re.search(
             r'''value="No.*?" onClick="location.href='([^"']+)'"''', webpage)
         if ad_m:
-            urlr = compat_urllib_parse_urlparse(url)
+            urlr = urllib.parse.urlparse(url)
             adfree_url = urlr.scheme + '://' + urlr.netloc + ad_m.group(1)
             webpage = self._download_webpage(
                 adfree_url, video_id, note='Download post-ad page')
@@ -41,7 +39,7 @@ class VuClipIE(InfoExtractor):
             default=None)
         if error_msg:
             raise ExtractorError(
-                '%s said: %s' % (self.IE_NAME, error_msg), expected=True)
+                f'{self.IE_NAME} said: {error_msg}', expected=True)
 
         # These clowns alternate between two page types
         video_url = self._search_regex(
diff --git a/plugins/youtube_download/yt_dlp/extractor/vupload.py b/plugins/youtube_download/yt_dlp/extractor/vupload.py
deleted file mode 100644
index 23ea70c..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/vupload.py
+++ /dev/null
@@ -1,52 +0,0 @@
-from .common import InfoExtractor
-from ..utils import (
-    parse_duration,
-    parse_filesize,
-    extract_attributes,
-    int_or_none,
-    js_to_json
-)
-
-
-class VuploadIE(InfoExtractor):
-    _VALID_URL = r'https://vupload\.com/v/(?P<id>[a-z0-9]+)'
-    _TESTS = [{
-        'url': 'https://vupload.com/v/u28d0pl2tphy',
-        'md5': '9b42a4a193cca64d80248e58527d83c8',
-        'info_dict': {
-            'id': 'u28d0pl2tphy',
-            'ext': 'mp4',
-            'description': 'md5:e9e6c0045c78cbf0d5bb19a55ce199fb',
-            'title': 'md5:e9e6c0045c78cbf0d5bb19a55ce199fb',
-        }
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-
-        title = self._html_extract_title(webpage)
-        video_json = self._parse_json(self._html_search_regex(r'sources:\s*(.+?]),', webpage, 'video'), video_id, transform_source=js_to_json)
-        formats = []
-        for source in video_json:
-            if source['src'].endswith('.m3u8'):
-                formats.extend(self._extract_m3u8_formats(source['src'], video_id, m3u8_id='hls'))
-        duration = parse_duration(self._html_search_regex(
-            r'<i\s*class=["\']fad\s*fa-clock["\']></i>\s*([\d:]+)\s*</div>', webpage, 'duration', fatal=False))
-        filesize_approx = parse_filesize(self._html_search_regex(
-            r'<i\s*class=["\']fad\s*fa-save["\']></i>\s*([^<]+)\s*</div>', webpage, 'filesize', fatal=False))
-        extra_video_info = extract_attributes(self._html_search_regex(
-            r'(<video[^>]+>)', webpage, 'video_info', fatal=False))
-        description = self._html_search_meta('description', webpage)
-
-        return {
-            'id': video_id,
-            'formats': formats,
-            'duration': duration,
-            'filesize_approx': filesize_approx,
-            'width': int_or_none(extra_video_info.get('width')),
-            'height': int_or_none(extra_video_info.get('height')),
-            'format_id': extra_video_info.get('height', '') + 'p',
-            'title': title,
-            'description': description,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/vvvvid.py b/plugins/youtube_download/yt_dlp/extractor/vvvvid.py
index ed725a5..4671bcd 100644
--- a/plugins/youtube_download/yt_dlp/extractor/vvvvid.py
+++ b/plugins/youtube_download/yt_dlp/extractor/vvvvid.py
@@ -1,3 +1,4 @@
+import functools
 import re
 
 from .common import InfoExtractor
@@ -11,24 +12,23 @@ from ..utils import (
 
 class VVVVIDIE(InfoExtractor):
     _VALID_URL_BASE = r'https?://(?:www\.)?vvvvid\.it/(?:#!)?(?:show|anime|film|series)/'
-    _VALID_URL = r'%s(?P<show_id>\d+)/[^/]+/(?P<season_id>\d+)/(?P<id>[0-9]+)' % _VALID_URL_BASE
+    _VALID_URL = rf'{_VALID_URL_BASE}(?P<show_id>\d+)/[^/]+/(?P<season_id>\d+)/(?P<id>[0-9]+)'
     _TESTS = [{
         # video_type == 'video/vvvvid'
-        'url': 'https://www.vvvvid.it/#!show/434/perche-dovrei-guardarlo-di-dario-moccia/437/489048/ping-pong',
-        'md5': 'b8d3cecc2e981adc3835adf07f6df91b',
+        'url': 'https://www.vvvvid.it/show/498/the-power-of-computing/518/505692/playstation-vr-cambiera-il-nostro-modo-di-giocare',
         'info_dict': {
-            'id': '489048',
+            'id': '505692',
             'ext': 'mp4',
-            'title': 'Ping Pong',
-            'duration': 239,
-            'series': '"Perché dovrei guardarlo?" di Dario Moccia',
-            'season_id': '437',
-            'episode': 'Ping Pong',
-            'episode_number': 1,
-            'episode_id': '3334',
+            'title': 'Playstation VR cambierà il nostro modo di giocare',
+            'duration': 93,
+            'series': 'The Power of Computing',
+            'season_id': '518',
+            'episode': 'Playstation VR cambierà il nostro modo di giocare',
+            'episode_id': '4747',
             'view_count': int,
             'like_count': int,
             'repost_count': int,
+            'thumbnail': 'https://static.vvvvid.it/img/zoomin/28CA2409-E663-34F0-2B02E72356556EA3_500k.jpg',
         },
         'params': {
             'skip_download': True,
@@ -36,7 +36,6 @@ class VVVVIDIE(InfoExtractor):
     }, {
         # video_type == 'video/rcs'
         'url': 'https://www.vvvvid.it/#!show/376/death-note-live-action/377/482493/episodio-01',
-        'md5': '33e0edfba720ad73a8782157fdebc648',
         'info_dict': {
             'id': '482493',
             'ext': 'mp4',
@@ -45,6 +44,7 @@ class VVVVIDIE(InfoExtractor):
         'params': {
             'skip_download': True,
         },
+        'skip': 'Every video/rcs is not working even in real website',
     }, {
         # video_type == 'video/youtube'
         'url': 'https://www.vvvvid.it/show/404/one-punch-man/406/486683/trailer',
@@ -55,19 +55,53 @@ class VVVVIDIE(InfoExtractor):
             'title': 'Trailer',
             'upload_date': '20150906',
             'description': 'md5:a5e802558d35247fee285875328c0b80',
-            'uploader_id': 'BandaiVisual',
-            'uploader': 'BANDAI NAMCO Arts Channel',
+            'uploader_id': '@EMOTIONLabelChannel',
+            'uploader': 'EMOTION Label Channel',
+            'episode_id': '3115',
+            'view_count': int,
+            'like_count': int,
+            'repost_count': int,
+            'availability': str,
+            'categories': list,
+            'age_limit': 0,
+            'channel': 'EMOTION Label Channel',
+            'channel_follower_count': int,
+            'channel_id': 'UCQ5URCSs1f5Cz9rh-cDGxNQ',
+            'channel_url': 'https://www.youtube.com/channel/UCQ5URCSs1f5Cz9rh-cDGxNQ',
+            'comment_count': int,
+            'duration': 133,
+            'episode': 'Trailer',
+            'heatmap': list,
+            'live_status': 'not_live',
+            'playable_in_embed': True,
+            'season_id': '406',
+            'series': 'One-Punch Man',
+            'tags': list,
+            'uploader_url': 'https://www.youtube.com/@EMOTIONLabelChannel',
+            'thumbnail': 'https://i.ytimg.com/vi/RzmFKUDOUgw/maxresdefault.jpg',
         },
         'params': {
             'skip_download': True,
         },
     }, {
         # video_type == 'video/dash'
-        'url': 'https://www.vvvvid.it/show/683/made-in-abyss/1542/693786/nanachi',
+        'url': 'https://www.vvvvid.it/show/844/le-bizzarre-avventure-di-jojo-vento-aureo/938/527551/golden-wind',
         'info_dict': {
-            'id': '693786',
+            'id': '527551',
             'ext': 'mp4',
-            'title': 'Nanachi',
+            'title': 'Golden Wind',
+            'duration': 1430,
+            'series': 'Le bizzarre avventure di Jojo - Vento Aureo',
+            'season_id': '938',
+            'episode': 'Golden Wind',
+            'episode_number': 1,
+            'episode_id': '9089',
+            'view_count': int,
+            'like_count': int,
+            'repost_count': int,
+            'thumbnail': 'https://static.vvvvid.it/img/thumbs/Dynit/Jojo/Jojo_S05Ep01-t.jpg',
+            'season': 'Season 5',
+            'season_number': 5,
         },
         'params': {
             'skip_download': True,
@@ -75,14 +109,21 @@ class VVVVIDIE(InfoExtractor):
         },
     }, {
         'url': 'https://www.vvvvid.it/show/434/perche-dovrei-guardarlo-di-dario-moccia/437/489048',
-        'only_matching': True
+        'only_matching': True,
     }]
     _conn_id = None
 
+    @functools.cached_property
+    def _headers(self):
+        return {
+            **self.geo_verification_headers(),
+            'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.50 Safari/537.37',
+        }
+
     def _real_initialize(self):
         self._conn_id = self._download_json(
             'https://www.vvvvid.it/user/login',
-            None, headers=self.geo_verification_headers())['data']['conn_id']
+            None, headers=self._headers)['data']['conn_id']
 
     def _download_info(self, show_id, path, video_id, fatal=True, query=None):
         q = {
@@ -91,12 +132,12 @@ class VVVVIDIE(InfoExtractor):
         if query:
             q.update(query)
         response = self._download_json(
-            'https://www.vvvvid.it/vvvvid/ondemand/%s/%s' % (show_id, path),
-            video_id, headers=self.geo_verification_headers(), query=q, fatal=fatal)
+            f'https://www.vvvvid.it/vvvvid/ondemand/{show_id}/{path}',
+            video_id, headers=self._headers, query=q, fatal=fatal)
         if not (response or fatal):
             return
         if response.get('result') == 'error':
-            raise ExtractorError('%s said: %s' % (
+            raise ExtractorError('{} said: {}'.format(
                 self.IE_NAME, response['message']), expected=True)
         return response['data']
 
@@ -110,18 +151,18 @@ class VVVVIDIE(InfoExtractor):
         show_id, season_id, video_id = self._match_valid_url(url).groups()
 
         response = self._download_info(
-            show_id, 'season/%s' % season_id,
+            show_id, f'season/{season_id}',
             video_id, query={'video_id': video_id})
 
         vid = int(video_id)
-        video_data = list(filter(
-            lambda episode: episode.get('video_id') == vid, response))[0]
+        video_data = next(filter(
+            lambda episode: episode.get('video_id') == vid, response))
         title = video_data['title']
         formats = []
 
         # vvvvid embed_info decryption algorithm is reverse engineered from function $ds(h) at vvvvid.js
         def ds(h):
-            g = "MNOPIJKL89+/4567UVWXQRSTEFGHABCDcdefYZabstuvopqr0123wxyzklmnghij"
+            g = 'MNOPIJKL89+/4567UVWXQRSTEFGHABCDcdefYZabstuvopqr0123wxyzklmnghij'
 
             def f(m):
                 l = []
@@ -219,7 +260,7 @@ class VVVVIDIE(InfoExtractor):
                     embed_code, video_id, 'mp4', m3u8_id='hls', fatal=False))
             else:
                 formats.extend(self._extract_wowza_formats(
-                    'http://sb.top-ix.org/videomg/_definst_/mp4:%s/playlist.m3u8' % embed_code, video_id))
+                    f'http://sb.top-ix.org/videomg/_definst_/mp4:{embed_code}/playlist.m3u8', video_id, skip_protocols=['f4m']))
             metadata_from_url(embed_code)
 
         if not is_youtube:
@@ -242,7 +283,7 @@ class VVVVIDIE(InfoExtractor):
 
 
 class VVVVIDShowIE(VVVVIDIE):  # XXX: Do not subclass from concrete IE
-    _VALID_URL = r'(?P<base_url>%s(?P<id>\d+)(?:/(?P<show_title>[^/?&#]+))?)/?(?:[?#&]|$)' % VVVVIDIE._VALID_URL_BASE
+    _VALID_URL = rf'(?P<base_url>{VVVVIDIE._VALID_URL_BASE}(?P<id>\d+)(?:/(?P<show_title>[^/?&#]+))?)/?(?:[?#&]|$)'
     _TESTS = [{
         'url': 'https://www.vvvvid.it/show/156/psyco-pass',
         'info_dict': {
@@ -266,7 +307,7 @@ class VVVVIDShowIE(VVVVIDIE):  # XXX: Do not subclass from concrete IE
             show_id, 'info/', show_title, fatal=False)
 
         if not show_title:
-            base_url += "/title"
+            base_url += '/title'
 
         entries = []
         for season in (seasons or []):
diff --git a/plugins/youtube_download/yt_dlp/extractor/vyborymos.py b/plugins/youtube_download/yt_dlp/extractor/vyborymos.py
deleted file mode 100644
index 3865187..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/vyborymos.py
+++ /dev/null
@@ -1,52 +0,0 @@
-from .common import InfoExtractor
-from ..compat import compat_str
-
-
-class VyboryMosIE(InfoExtractor):
-    _VALID_URL = r'https?://vybory\.mos\.ru/(?:#precinct/|account/channels\?.*?\bstation_id=)(?P<id>\d+)'
-    _TESTS = [{
-        'url': 'http://vybory.mos.ru/#precinct/13636',
-        'info_dict': {
-            'id': '13636',
-            'ext': 'mp4',
-            'title': 're:^Участковая избирательная комиссия №2231 [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
-            'description': 'Россия, Москва, улица Введенского, 32А',
-            'is_live': True,
-        },
-        'params': {
-            'skip_download': True,
-        }
-    }, {
-        'url': 'http://vybory.mos.ru/account/channels?station_id=13636',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        station_id = self._match_id(url)
-
-        channels = self._download_json(
-            'http://vybory.mos.ru/account/channels?station_id=%s' % station_id,
-            station_id, 'Downloading channels JSON')
-
-        formats = []
-        for cam_num, (sid, hosts, name, _) in enumerate(channels, 1):
-            for num, host in enumerate(hosts, 1):
-                formats.append({
-                    'url': 'http://%s/master.m3u8?sid=%s' % (host, sid),
-                    'ext': 'mp4',
-                    'format_id': 'camera%d-host%d' % (cam_num, num),
-                    'format_note': '%s, %s' % (name, host),
-                })
-
-        info = self._download_json(
-            'http://vybory.mos.ru/json/voting_stations/%s/%s.json'
-            % (compat_str(station_id)[:3], station_id),
-            station_id, 'Downloading station JSON', fatal=False) or {}
-
-        return {
-            'id': station_id,
-            'title': info.get('name') or station_id,
-            'description': info.get('address'),
-            'is_live': True,
-            'formats': formats,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/vzaar.py b/plugins/youtube_download/yt_dlp/extractor/vzaar.py
deleted file mode 100644
index 19908a9..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/vzaar.py
+++ /dev/null
@@ -1,100 +0,0 @@
-from .common import InfoExtractor
-from ..compat import compat_str
-from ..utils import (
-    int_or_none,
-    float_or_none,
-    unified_timestamp,
-    url_or_none,
-)
-
-
-class VzaarIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:(?:www|view)\.)?vzaar\.com/(?:videos/)?(?P<id>\d+)'
-    _EMBED_REGEX = [r'<iframe[^>]+src=["\'](?P<url>(?:https?:)?//(?:view\.vzaar\.com)/[0-9]+)']
-    _TESTS = [{
-        # HTTP and HLS
-        'url': 'https://vzaar.com/videos/1152805',
-        'md5': 'bde5ddfeb104a6c56a93a06b04901dbf',
-        'info_dict': {
-            'id': '1152805',
-            'ext': 'mp4',
-            'title': 'sample video (public)',
-        },
-    }, {
-        'url': 'https://view.vzaar.com/27272/player',
-        'md5': '3b50012ac9bbce7f445550d54e0508f2',
-        'info_dict': {
-            'id': '27272',
-            'ext': 'mp3',
-            'title': 'MP3',
-        },
-    }, {
-        # hlsAes = true
-        'url': 'https://view.vzaar.com/11379930/player',
-        'info_dict': {
-            'id': '11379930',
-            'ext': 'mp4',
-            'title': 'Videoaula',
-        },
-        'params': {
-            # m3u8 download
-            'skip_download': True,
-        },
-    }, {
-        # with null videoTitle
-        'url': 'https://view.vzaar.com/20313539/download',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        video_data = self._download_json(
-            'http://view.vzaar.com/v2/%s/video' % video_id, video_id)
-
-        title = video_data.get('videoTitle') or video_id
-
-        formats = []
-
-        source_url = url_or_none(video_data.get('sourceUrl'))
-        if source_url:
-            f = {
-                'url': source_url,
-                'format_id': 'http',
-                'quality': 1,
-            }
-            if 'audio' in source_url:
-                f.update({
-                    'vcodec': 'none',
-                    'ext': 'mp3',
-                })
-            else:
-                f.update({
-                    'width': int_or_none(video_data.get('width')),
-                    'height': int_or_none(video_data.get('height')),
-                    'ext': 'mp4',
-                    'fps': float_or_none(video_data.get('fps')),
-                })
-            formats.append(f)
-
-        video_guid = video_data.get('guid')
-        usp = video_data.get('usp')
-        if video_data.get('uspEnabled') and isinstance(video_guid, compat_str) and isinstance(usp, dict):
-            hls_aes = video_data.get('hlsAes')
-            qs = '&'.join('%s=%s' % (k, v) for k, v in usp.items())
-            url_templ = 'http://%%s.vzaar.com/v5/usp%s/%s/%s.ism%%s?' % ('aes' if hls_aes else '', video_guid, video_id)
-            m3u8_formats = self._extract_m3u8_formats(
-                url_templ % ('fable', '/.m3u8') + qs, video_id, 'mp4', 'm3u8_native',
-                m3u8_id='hls', fatal=False)
-            if hls_aes:
-                for f in m3u8_formats:
-                    f['hls_aes'] = {'uri': url_templ % ('goose', '') + qs}
-            formats.extend(m3u8_formats)
-
-        return {
-            'id': video_id,
-            'title': title,
-            'thumbnail': self._proto_relative_url(video_data.get('poster')),
-            'duration': float_or_none(video_data.get('videoDuration')),
-            'timestamp': unified_timestamp(video_data.get('ts')),
-            'formats': formats,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/wakanim.py b/plugins/youtube_download/yt_dlp/extractor/wakanim.py
deleted file mode 100644
index 155008f..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/wakanim.py
+++ /dev/null
@@ -1,75 +0,0 @@
-from urllib.parse import unquote
-
-from .common import InfoExtractor
-from ..utils import (
-    merge_dicts,
-    urljoin,
-)
-
-
-class WakanimIE(InfoExtractor):
-    _VALID_URL = r'https://(?:www\.)?wakanim\.tv/[^/]+/v2/catalogue/episode/(?P<id>\d+)'
-    _TESTS = [{
-        'url': 'https://www.wakanim.tv/de/v2/catalogue/episode/2997/the-asterisk-war-omu-staffel-1-episode-02-omu',
-        'info_dict': {
-            'id': '2997',
-            'ext': 'mp4',
-            'title': 'Episode 02',
-            'description': 'md5:2927701ea2f7e901de8bfa8d39b2852d',
-            'series': 'The Asterisk War  (OmU.)',
-            'season_number': 1,
-            'episode': 'Episode 02',
-            'episode_number': 2,
-        },
-        'params': {
-            'skip_download': True,
-        },
-    }, {
-        # DRM Protected
-        'url': 'https://www.wakanim.tv/de/v2/catalogue/episode/7843/sword-art-online-alicization-omu-arc-2-folge-15-omu',
-        'only_matching': True,
-    }]
-    _GEO_BYPASS = False
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        webpage = self._download_webpage(url, video_id)
-
-        if 'Geoblocking' in webpage:
-            if '/de/' in url:
-                self.raise_geo_restricted(countries=['DE', 'AT', 'CH'])
-            else:
-                self.raise_geo_restricted(countries=['RU'])
-
-        manifest_url = urljoin(url, self._search_regex(
-            r'file\s*:\s*(["\'])(?P<url>(?:(?!\1).)+)\1', webpage, 'manifest url',
-            group='url'))
-        if not self.get_param('allow_unplayable_formats'):
-            # https://docs.microsoft.com/en-us/azure/media-services/previous/media-services-content-protection-overview#streaming-urls
-            encryption = self._search_regex(
-                r'encryption%3D(c(?:enc|bc(?:s-aapl)?))',
-                manifest_url, 'encryption', default=None)
-            if encryption in ('cenc', 'cbcs-aapl'):
-                self.report_drm(video_id)
-
-        if 'format=mpd-time-cmaf' in unquote(manifest_url):
-            formats = self._extract_mpd_formats(
-                manifest_url, video_id, mpd_id='dash')
-        else:
-            formats = self._extract_m3u8_formats(
-                manifest_url, video_id, 'mp4', entry_protocol='m3u8_native',
-                m3u8_id='hls')
-
-        info = self._search_json_ld(webpage, video_id, default={})
-
-        title = self._search_regex(
-            (r'<h1[^>]+\bclass=["\']episode_h1[^>]+\btitle=(["\'])(?P<title>(?:(?!\1).)+)\1',
-             r'<span[^>]+\bclass=["\']episode_title["\'][^>]*>(?P<title>[^<]+)'),
-            webpage, 'title', default=None, group='title')
-
-        return merge_dicts(info, {
-            'id': video_id,
-            'title': title,
-            'formats': formats,
-        })
diff --git a/plugins/youtube_download/yt_dlp/extractor/walla.py b/plugins/youtube_download/yt_dlp/extractor/walla.py
index a1a9c17..442a9bc 100644
--- a/plugins/youtube_download/yt_dlp/extractor/walla.py
+++ b/plugins/youtube_download/yt_dlp/extractor/walla.py
@@ -2,8 +2,8 @@ import re
 
 from .common import InfoExtractor
 from ..utils import (
-    xpath_text,
     int_or_none,
+    xpath_text,
 )
 
 
@@ -23,7 +23,7 @@ class WallaIE(InfoExtractor):
         'params': {
             # rtmp download
             'skip_download': True,
-        }
+        },
     }
 
     _SUBTITLE_LANGS = {
@@ -36,7 +36,7 @@ class WallaIE(InfoExtractor):
         display_id = mobj.group('display_id')
 
         video = self._download_xml(
-            'http://video2.walla.co.il/?w=null/null/%s/@@/video/flv_pl' % video_id,
+            f'http://video2.walla.co.il/?w=null/null/{video_id}/@@/video/flv_pl',
             display_id)
 
         item = video.find('./items/item')
diff --git a/plugins/youtube_download/yt_dlp/extractor/wasdtv.py b/plugins/youtube_download/yt_dlp/extractor/wasdtv.py
deleted file mode 100644
index f57c619..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/wasdtv.py
+++ /dev/null
@@ -1,159 +0,0 @@
-from .common import InfoExtractor
-from ..utils import (
-    ExtractorError,
-    int_or_none,
-    parse_iso8601,
-    traverse_obj,
-    try_get,
-)
-
-
-class WASDTVBaseIE(InfoExtractor):
-
-    def _fetch(self, path, video_id, description, query={}):
-        response = self._download_json(
-            f'https://wasd.tv/api/{path}', video_id, query=query,
-            note=f'Downloading {description} metadata',
-            errnote=f'Unable to download {description} metadata')
-        error = response.get('error')
-        if error:
-            raise ExtractorError(f'{self.IE_NAME} returned error: {error}', expected=True)
-        return response.get('result')
-
-    def _extract_thumbnails(self, thumbnails_dict):
-        return [{
-            'url': url,
-            'preference': index,
-        } for index, url in enumerate(
-            traverse_obj(thumbnails_dict, (('small', 'medium', 'large'),))) if url]
-
-    def _real_extract(self, url):
-        container = self._get_container(url)
-        stream = traverse_obj(container, ('media_container_streams', 0))
-        media = try_get(stream, lambda x: x['stream_media'][0])
-        if not media:
-            raise ExtractorError('Can not extract media data.', expected=True)
-        media_meta = media.get('media_meta')
-        media_url, is_live = self._get_media_url(media_meta)
-        video_id = media.get('media_id') or container.get('media_container_id')
-        formats, subtitles = self._extract_m3u8_formats_and_subtitles(media_url, video_id, 'mp4')
-        return {
-            'id': str(video_id),
-            'title': container.get('media_container_name') or self._og_search_title(self._download_webpage(url, video_id)),
-            'description': container.get('media_container_description'),
-            'thumbnails': self._extract_thumbnails(media_meta.get('media_preview_images')),
-            'timestamp': parse_iso8601(container.get('created_at')),
-            'view_count': int_or_none(stream.get('stream_current_viewers' if is_live else 'stream_total_viewers')),
-            'is_live': is_live,
-            'formats': formats,
-            'subtitles': subtitles,
-        }
-
-    def _get_container(self, url):
-        raise NotImplementedError('Subclass for get media container')
-
-    def _get_media_url(self, media_meta):
-        raise NotImplementedError('Subclass for get media url')
-
-
-class WASDTVStreamIE(WASDTVBaseIE):
-    IE_NAME = 'wasdtv:stream'
-    _VALID_URL = r'https?://wasd\.tv/(?P<id>[^/#?]+)$'
-    _TESTS = [{
-        'url': 'https://wasd.tv/24_7',
-        'info_dict': {
-            'id': '559738',
-            'ext': 'mp4',
-            'title': 'Live 24/7 Music',
-            'description': '24&#x2F;7 Music',
-            'timestamp': int,
-            'upload_date': r're:^\d{8}$',
-            'is_live': True,
-            'view_count': int,
-        },
-    }]
-
-    def _get_container(self, url):
-        nickname = self._match_id(url)
-        channel = self._fetch(f'channels/nicknames/{nickname}', video_id=nickname, description='channel')
-        channel_id = channel.get('channel_id')
-        containers = self._fetch(
-            'v2/media-containers', channel_id, 'running media containers',
-            query={
-                'channel_id': channel_id,
-                'media_container_type': 'SINGLE',
-                'media_container_status': 'RUNNING',
-            })
-        if not containers:
-            raise ExtractorError(f'{nickname} is offline', expected=True)
-        return containers[0]
-
-    def _get_media_url(self, media_meta):
-        return media_meta['media_url'], True
-
-
-class WASDTVRecordIE(WASDTVBaseIE):
-    IE_NAME = 'wasdtv:record'
-    _VALID_URL = r'https?://wasd\.tv/[^/#?]+(?:/videos)?\?record=(?P<id>\d+)$'
-    _TESTS = [{
-        'url': 'https://wasd.tv/spacemita/videos?record=907755',
-        'md5': 'c9899dd85be4cc997816ff9f9ca516ce',
-        'info_dict': {
-            'id': '906825',
-            'ext': 'mp4',
-            'title': 'Музыкальный',
-            'description': 'md5:f510388d929ff60ae61d4c3cab3137cc',
-            'timestamp': 1645812079,
-            'upload_date': '20220225',
-            'thumbnail': r're:^https?://.+\.jpg',
-            'is_live': False,
-            'view_count': int,
-        },
-    }, {
-        'url': 'https://wasd.tv/spacemita?record=907755',
-        'only_matching': True,
-    }]
-
-    def _get_container(self, url):
-        container_id = self._match_id(url)
-        return self._fetch(
-            f'v2/media-containers/{container_id}', container_id, 'media container')
-
-    def _get_media_url(self, media_meta):
-        media_archive_url = media_meta.get('media_archive_url')
-        if media_archive_url:
-            return media_archive_url, False
-        return media_meta['media_url'], True
-
-
-class WASDTVClipIE(WASDTVBaseIE):
-    IE_NAME = 'wasdtv:clip'
-    _VALID_URL = r'https?://wasd\.tv/[^/#?]+/clips\?clip=(?P<id>\d+)$'
-    _TESTS = [{
-        'url': 'https://wasd.tv/spacemita/clips?clip=26804',
-        'md5': '818885e720143d7a4e776ff66fcff148',
-        'info_dict': {
-            'id': '26804',
-            'ext': 'mp4',
-            'title': 'Пуш флексит на голове стримера',
-            'timestamp': 1646682908,
-            'upload_date': '20220307',
-            'thumbnail': r're:^https?://.+\.jpg',
-            'view_count': int,
-        },
-    }]
-
-    def _real_extract(self, url):
-        clip_id = self._match_id(url)
-        clip = self._fetch(f'v2/clips/{clip_id}', video_id=clip_id, description='clip')
-        clip_data = clip.get('clip_data')
-        formats, subtitles = self._extract_m3u8_formats_and_subtitles(clip_data.get('url'), video_id=clip_id, ext='mp4')
-        return {
-            'id': clip_id,
-            'title': clip.get('clip_title') or self._og_search_title(self._download_webpage(url, clip_id, fatal=False)),
-            'thumbnails': self._extract_thumbnails(clip_data.get('preview')),
-            'timestamp': parse_iso8601(clip.get('created_at')),
-            'view_count': int_or_none(clip.get('clip_views_count')),
-            'formats': formats,
-            'subtitles': subtitles,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/washingtonpost.py b/plugins/youtube_download/yt_dlp/extractor/washingtonpost.py
index 74501b1..36e1f30 100644
--- a/plugins/youtube_download/yt_dlp/extractor/washingtonpost.py
+++ b/plugins/youtube_download/yt_dlp/extractor/washingtonpost.py
@@ -1,7 +1,6 @@
 import re
 
 from .common import InfoExtractor
-
 from ..utils import traverse_obj
 
 
@@ -83,7 +82,7 @@ class WashingtonPostArticleIE(InfoExtractor):
                 'upload_date': '20141230',
                 'timestamp': 1419972442,
                 'title': 'Why black boxes don’t transmit data in real time',
-            }
+            },
         }],
         'skip': 'Doesnt have a video anymore',
     }, {
@@ -93,7 +92,7 @@ class WashingtonPostArticleIE(InfoExtractor):
 
     @classmethod
     def suitable(cls, url):
-        return False if WashingtonPostIE.suitable(url) else super(WashingtonPostArticleIE, cls).suitable(url)
+        return False if WashingtonPostIE.suitable(url) else super().suitable(url)
 
     def _real_extract(self, url):
         page_id = self._match_id(url)
@@ -113,7 +112,7 @@ class WashingtonPostArticleIE(InfoExtractor):
                 if content_element.get('type') == 'video':
                     uuids.append(content_element.get('_id'))
 
-        entries = [self.url_result('washingtonpost:%s' % uuid, 'WashingtonPost', uuid) for uuid in uuids]
+        entries = [self.url_result(f'washingtonpost:{uuid}', 'WashingtonPost', uuid) for uuid in uuids]
 
         return {
             '_type': 'playlist',
diff --git a/plugins/youtube_download/yt_dlp/extractor/wat.py b/plugins/youtube_download/yt_dlp/extractor/wat.py
index 7c62d28..03bac66 100644
--- a/plugins/youtube_download/yt_dlp/extractor/wat.py
+++ b/plugins/youtube_download/yt_dlp/extractor/wat.py
@@ -1,5 +1,4 @@
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     ExtractorError,
     int_or_none,
@@ -41,12 +40,24 @@ class WatIE(InfoExtractor):
             'expected_warnings': ["Ce contenu n'est pas disponible pour l'instant."],
             'skip': 'This content is no longer available',
         },
+        {
+            'url': 'wat:14010600',
+            'info_dict': {
+                'id': '14010600',
+                'title': 'Burger Quiz - S03 EP21 avec Eye Haidara, Anne Depétrini, Jonathan Zaccaï et Pio Marmaï',
+                'thumbnail': 'https://photos.tf1.fr/1280/720/burger-quiz-11-9adb79-0@1x.jpg',
+                'upload_date': '20230819',
+                'duration': 2312,
+                'ext': 'mp4',
+            },
+            'params': {'skip_download': 'm3u8'},
+        },
     ]
     _GEO_BYPASS = False
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        video_id = video_id if video_id.isdigit() and len(video_id) > 6 else compat_str(int(video_id, 36))
+        video_id = video_id if video_id.isdigit() and len(video_id) > 6 else str(int(video_id, 36))
 
         # 'contentv4' is used in the website, but it also returns the related
         # videos, we don't need them
@@ -54,7 +65,7 @@ class WatIE(InfoExtractor):
         #     'http://www.wat.tv/interface/contentv4s/' + video_id, video_id)
         video_data = self._download_json(
             'https://mediainfo.tf1.fr/mediainfocombo/' + video_id,
-            video_id, query={'context': 'MYTF1', 'pver': '4020003'})
+            video_id, query={'pver': '5010000'})
         video_info = video_data['media']
 
         error_desc = video_info.get('error_desc')
diff --git a/plugins/youtube_download/yt_dlp/extractor/watchbox.py b/plugins/youtube_download/yt_dlp/extractor/watchbox.py
deleted file mode 100644
index c973ca9..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/watchbox.py
+++ /dev/null
@@ -1,153 +0,0 @@
-from .common import InfoExtractor
-from ..compat import compat_str
-from ..utils import (
-    int_or_none,
-    js_to_json,
-    strip_or_none,
-    try_get,
-    unescapeHTML,
-    unified_timestamp,
-)
-
-
-class WatchBoxIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?watchbox\.de/(?P<kind>serien|filme)/(?:[^/]+/)*[^/]+-(?P<id>\d+)'
-    _TESTS = [{
-        # film
-        'url': 'https://www.watchbox.de/filme/free-jimmy-12325.html',
-        'info_dict': {
-            'id': '341368',
-            'ext': 'mp4',
-            'title': 'Free Jimmy',
-            'description': 'md5:bcd8bafbbf9dc0ef98063d344d7cc5f6',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'duration': 4890,
-            'age_limit': 16,
-            'release_year': 2009,
-        },
-        'params': {
-            'skip_download': True,
-        },
-        'expected_warnings': ['Failed to download m3u8 information'],
-    }, {
-        # episode
-        'url': 'https://www.watchbox.de/serien/ugly-americans-12231/staffel-1/date-in-der-hoelle-328286.html',
-        'info_dict': {
-            'id': '328286',
-            'ext': 'mp4',
-            'title': 'S01 E01 - Date in der Hölle',
-            'description': 'md5:2f31c74a8186899f33cb5114491dae2b',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'duration': 1291,
-            'age_limit': 12,
-            'release_year': 2010,
-            'series': 'Ugly Americans',
-            'season_number': 1,
-            'episode': 'Date in der Hölle',
-            'episode_number': 1,
-        },
-        'params': {
-            'skip_download': True,
-        },
-        'expected_warnings': ['Failed to download m3u8 information'],
-    }, {
-        'url': 'https://www.watchbox.de/serien/ugly-americans-12231/staffel-2/der-ring-des-powers-328270',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        mobj = self._match_valid_url(url)
-        kind, video_id = mobj.group('kind', 'id')
-
-        webpage = self._download_webpage(url, video_id)
-
-        player_config = self._parse_json(
-            self._search_regex(
-                r'data-player-conf=(["\'])(?P<data>{.+?})\1', webpage,
-                'player config', default='{}', group='data'),
-            video_id, transform_source=unescapeHTML, fatal=False)
-
-        if not player_config:
-            player_config = self._parse_json(
-                self._search_regex(
-                    r'playerConf\s*=\s*({.+?})\s*;', webpage, 'player config',
-                    default='{}'),
-                video_id, transform_source=js_to_json, fatal=False) or {}
-
-        source = player_config.get('source') or {}
-
-        video_id = compat_str(source.get('videoId') or video_id)
-
-        devapi = self._download_json(
-            'http://api.watchbox.de/devapi/id/%s' % video_id, video_id, query={
-                'format': 'json',
-                'apikey': 'hbbtv',
-            }, fatal=False)
-
-        item = try_get(devapi, lambda x: x['items'][0], dict) or {}
-
-        title = item.get('title') or try_get(
-            item, lambda x: x['movie']['headline_movie'],
-            compat_str) or source['title']
-
-        formats = []
-        hls_url = item.get('media_videourl_hls') or source.get('hls')
-        if hls_url:
-            formats.extend(self._extract_m3u8_formats(
-                hls_url, video_id, 'mp4', entry_protocol='m3u8_native',
-                m3u8_id='hls', fatal=False))
-        dash_url = item.get('media_videourl_wv') or source.get('dash')
-        if dash_url:
-            formats.extend(self._extract_mpd_formats(
-                dash_url, video_id, mpd_id='dash', fatal=False))
-        mp4_url = item.get('media_videourl')
-        if mp4_url:
-            formats.append({
-                'url': mp4_url,
-                'format_id': 'mp4',
-                'width': int_or_none(item.get('width')),
-                'height': int_or_none(item.get('height')),
-                'tbr': int_or_none(item.get('bitrate')),
-            })
-
-        description = strip_or_none(item.get('descr'))
-        thumbnail = item.get('media_content_thumbnail_large') or source.get('poster') or item.get('media_thumbnail')
-        duration = int_or_none(item.get('media_length') or source.get('length'))
-        timestamp = unified_timestamp(item.get('pubDate'))
-        view_count = int_or_none(item.get('media_views'))
-        age_limit = int_or_none(try_get(item, lambda x: x['movie']['fsk']))
-        release_year = int_or_none(try_get(item, lambda x: x['movie']['rel_year']))
-
-        info = {
-            'id': video_id,
-            'title': title,
-            'description': description,
-            'thumbnail': thumbnail,
-            'duration': duration,
-            'timestamp': timestamp,
-            'view_count': view_count,
-            'age_limit': age_limit,
-            'release_year': release_year,
-            'formats': formats,
-        }
-
-        if kind.lower() == 'serien':
-            series = try_get(
-                item, lambda x: x['special']['title'],
-                compat_str) or source.get('format')
-            season_number = int_or_none(self._search_regex(
-                r'^S(\d{1,2})\s*E\d{1,2}', title, 'season number',
-                default=None) or self._search_regex(
-                    r'/staffel-(\d+)/', url, 'season number', default=None))
-            episode = source.get('title')
-            episode_number = int_or_none(self._search_regex(
-                r'^S\d{1,2}\s*E(\d{1,2})', title, 'episode number',
-                default=None))
-            info.update({
-                'series': series,
-                'season_number': season_number,
-                'episode': episode,
-                'episode_number': episode_number,
-            })
-
-        return info
diff --git a/plugins/youtube_download/yt_dlp/extractor/watchindianporn.py b/plugins/youtube_download/yt_dlp/extractor/watchindianporn.py
deleted file mode 100644
index 3ded2d1..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/watchindianporn.py
+++ /dev/null
@@ -1,65 +0,0 @@
-import re
-
-from .common import InfoExtractor
-from ..utils import parse_duration
-
-
-class WatchIndianPornIE(InfoExtractor):
-    IE_DESC = 'Watch Indian Porn'
-    _VALID_URL = r'https?://(?:www\.)?watchindianporn\.net/(?:[^/]+/)*video/(?P<display_id>[^/]+)-(?P<id>[a-zA-Z0-9]+)\.html'
-    _TEST = {
-        'url': 'http://www.watchindianporn.net/video/hot-milf-from-kerala-shows-off-her-gorgeous-large-breasts-on-camera-RZa2avywNPa.html',
-        'md5': '249589a164dde236ec65832bfce17440',
-        'info_dict': {
-            'id': 'RZa2avywNPa',
-            'display_id': 'hot-milf-from-kerala-shows-off-her-gorgeous-large-breasts-on-camera',
-            'ext': 'mp4',
-            'title': 'Hot milf from kerala shows off her gorgeous large breasts on camera',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'duration': 226,
-            'view_count': int,
-            'categories': list,
-            'age_limit': 18,
-        }
-    }
-
-    def _real_extract(self, url):
-        mobj = self._match_valid_url(url)
-        video_id = mobj.group('id')
-        display_id = mobj.group('display_id')
-
-        webpage = self._download_webpage(url, display_id)
-
-        info_dict = self._parse_html5_media_entries(url, webpage, video_id)[0]
-
-        title = self._html_search_regex((
-            r'<title>(.+?)\s*-\s*Indian\s+Porn</title>',
-            r'<h4>(.+?)</h4>'
-        ), webpage, 'title')
-
-        duration = parse_duration(self._search_regex(
-            r'Time:\s*<strong>\s*(.+?)\s*</strong>',
-            webpage, 'duration', fatal=False))
-
-        view_count = int(self._search_regex(
-            r'(?s)Time:\s*<strong>.*?</strong>.*?<strong>\s*(\d+)\s*</strong>',
-            webpage, 'view count', fatal=False))
-
-        categories = re.findall(
-            r'<a[^>]+class=[\'"]categories[\'"][^>]*>\s*([^<]+)\s*</a>',
-            webpage)
-
-        info_dict.update({
-            'id': video_id,
-            'display_id': display_id,
-            'http_headers': {
-                'Referer': url,
-            },
-            'title': title,
-            'duration': duration,
-            'view_count': view_count,
-            'categories': categories,
-            'age_limit': 18,
-        })
-
-        return info_dict
diff --git a/plugins/youtube_download/yt_dlp/extractor/wdr.py b/plugins/youtube_download/yt_dlp/extractor/wdr.py
index de5dc26..1c1f0ed 100644
--- a/plugins/youtube_download/yt_dlp/extractor/wdr.py
+++ b/plugins/youtube_download/yt_dlp/extractor/wdr.py
@@ -1,21 +1,18 @@
 import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import (
-    compat_str,
-    compat_urlparse,
-)
 from ..utils import (
+    ExtractorError,
     determine_ext,
     dict_get,
-    ExtractorError,
     js_to_json,
     strip_jsonp,
     try_get,
     unified_strdate,
     update_url_query,
-    urlhandle_detect_ext,
     url_or_none,
+    urlhandle_detect_ext,
 )
 
 
@@ -39,7 +36,7 @@ class WDRIE(InfoExtractor):
 
     def _asset_url(self, wdr_id):
         id_len = max(len(wdr_id), 5)
-        return ''.join(('https:', self.__API_URL_TPL % (wdr_id[:id_len - 4], wdr_id, ), '.js'))
+        return ''.join(('https:', self.__API_URL_TPL % (wdr_id[:id_len - 4], wdr_id), '.js'))
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
@@ -94,7 +91,7 @@ class WDRIE(InfoExtractor):
                         medium_url, 'stream', fatal=False))
                 else:
                     a_format = {
-                        'url': medium_url
+                        'url': medium_url,
                     }
                     if ext == 'unknown_video':
                         urlh = self._request_webpage(
@@ -168,11 +165,12 @@ class WDRPageIE(WDRIE):  # XXX: Do not subclass from concrete IE
                 'upload_date': '20160312',
                 'description': 'md5:e127d320bc2b1f149be697ce044a3dd7',
                 'is_live': False,
-                'subtitles': {}
+                'subtitles': {},
             },
             'skip': 'HTTP Error 404: Not Found',
         },
         {
+            # FIXME: Asset JSON is directly embedded in webpage
             'url': 'http://www1.wdr.de/mediathek/video/live/index.html',
             'info_dict': {
                 'id': 'mdb-2296252',
@@ -201,7 +199,7 @@ class WDRPageIE(WDRIE):  # XXX: Do not subclass from concrete IE
                 'upload_date': 're:^[0-9]{8}$',
                 'title': 're:^Die Sendung (?:mit der Maus )?vom [0-9.]{10}$',
             },
-            'skip': 'The id changes from week to week because of the new episode'
+            'skip': 'The id changes from week to week because of the new episode',
         },
         {
             'url': 'http://www.wdrmaus.de/filme/sachgeschichten/achterbahn.php5',
@@ -221,11 +219,13 @@ class WDRPageIE(WDRIE):  # XXX: Do not subclass from concrete IE
                 'id': 'mdb-869971',
                 'ext': 'mp4',
                 'title': r're:^COSMO Livestream [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
+                'alt_title': 'COSMO Livestream',
+                'live_status': 'is_live',
                 'upload_date': '20160101',
             },
             'params': {
                 'skip_download': True,  # m3u8 download
-            }
+            },
         },
         {
             'url': 'http://www.sportschau.de/handballem2018/handball-nationalmannschaft-em-stolperstein-vorrunde-100.html',
@@ -248,6 +248,16 @@ class WDRPageIE(WDRIE):  # XXX: Do not subclass from concrete IE
             'url': 'https://kinder.wdr.de/tv/die-sendung-mit-dem-elefanten/av/video-folge---astronaut-100.html',
             'only_matching': True,
         },
+        {
+            'url': 'https://www1.wdr.de/mediathek/video/sendungen/rockpalast/video-baroness---freak-valley-festival--100.html',
+            'info_dict': {
+                'id': 'mdb-2741028',
+                'ext': 'mp4',
+                'title': 'Baroness - Freak Valley Festival 2022',
+                'alt_title': 'Rockpalast',
+                'upload_date': '20220725',
+            },
+        },
     ]
 
     def _real_extract(self, url):
@@ -259,7 +269,7 @@ class WDRPageIE(WDRIE):  # XXX: Do not subclass from concrete IE
 
         # Article with several videos
 
-        # for wdr.de the data-extension is in a tag with the class "mediaLink"
+        # for wdr.de the data-extension-ard is in a tag with the class "mediaLink"
         # for wdr.de radio players, in a tag with the class "wdrrPlayerPlayBtn"
         # for wdrmaus, in a tag with the class "videoButton" (previously a link
         # to the page in a multiline "videoLink"-tag)
@@ -268,7 +278,7 @@ class WDRPageIE(WDRIE):  # XXX: Do not subclass from concrete IE
                     (?:
                         (["\'])(?:mediaLink|wdrrPlayerPlayBtn|videoButton)\b.*?\1[^>]+|
                         (["\'])videoLink\b.*?\2[\s]*>\n[^\n]*
-                    )data-extension=(["\'])(?P<data>(?:(?!\3).)+)\3
+                    )data-extension(?:-ard)?=(["\'])(?P<data>(?:(?!\3).)+)\3
                     ''', webpage):
             media_link_obj = self._parse_json(
                 mobj.group('data'), display_id, transform_source=js_to_json,
@@ -276,14 +286,14 @@ class WDRPageIE(WDRIE):  # XXX: Do not subclass from concrete IE
             if not media_link_obj:
                 continue
             jsonp_url = try_get(
-                media_link_obj, lambda x: x['mediaObj']['url'], compat_str)
+                media_link_obj, lambda x: x['mediaObj']['url'], str)
             if jsonp_url:
                 # metadata, or player JS with ['ref'] giving WDR id, or just media, perhaps
                 clip_id = media_link_obj['mediaObj'].get('ref')
                 if jsonp_url.endswith('.assetjsonp'):
                     asset = self._download_json(
                         jsonp_url, display_id, fatal=False, transform_source=strip_jsonp)
-                    clip_id = try_get(asset, lambda x: x['trackerData']['trackerClipId'], compat_str)
+                    clip_id = try_get(asset, lambda x: x['trackerData']['trackerClipId'], str)
                 if clip_id:
                     jsonp_url = self._asset_url(clip_id[4:])
                 entries.append(self.url_result(jsonp_url, ie=WDRIE.ie_key()))
@@ -292,10 +302,10 @@ class WDRPageIE(WDRIE):  # XXX: Do not subclass from concrete IE
         if not entries:
             entries = [
                 self.url_result(
-                    compat_urlparse.urljoin(url, mobj.group('href')),
+                    urllib.parse.urljoin(url, mobj.group('href')),
                     ie=WDRPageIE.ie_key())
                 for mobj in re.finditer(
-                    r'<a[^>]+\bhref=(["\'])(?P<href>(?:(?!\1).)+)\1[^>]+\bdata-extension=',
+                    r'<a[^>]+\bhref=(["\'])(?P<href>(?:(?!\1).)+)\1[^>]+\bdata-extension(?:-ard)?=',
                     webpage) if re.match(self._PAGE_REGEX, mobj.group('href'))
             ]
 
@@ -311,8 +321,7 @@ class WDRElefantIE(InfoExtractor):
             'title': 'Wippe',
             'id': 'mdb-1198320',
             'ext': 'mp4',
-            'age_limit': None,
-            'upload_date': '20071003'
+            'upload_date': '20071003',
         },
     }
 
@@ -336,7 +345,7 @@ class WDRElefantIE(InfoExtractor):
         zmdb_url_element = xml_metadata.find('./movie/zmdb_url')
         if zmdb_url_element is None:
             raise ExtractorError(
-                '%s is not a video' % display_id, expected=True)
+                f'{display_id} is not a video', expected=True)
         return self.url_result(zmdb_url_element.text, ie=WDRIE.ie_key())
 
 
@@ -356,7 +365,7 @@ class WDRMobileIE(InfoExtractor):
             'ext': 'mp4',
             'age_limit': 0,
         },
-        'skip': 'Problems with loading data.'
+        'skip': 'Problems with loading data.',
     }
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/webcamerapl.py b/plugins/youtube_download/yt_dlp/extractor/webcamerapl.py
index a02d951..e0ee17c 100644
--- a/plugins/youtube_download/yt_dlp/extractor/webcamerapl.py
+++ b/plugins/youtube_download/yt_dlp/extractor/webcamerapl.py
@@ -12,7 +12,7 @@ class WebcameraplIE(InfoExtractor):
             'ext': 'mp4',
             'title': r're:WIDOK NA PLAC ZAMKOWY W WARSZAWIE \d{4}-\d{2}-\d{2} \d{2}:\d{2}$',
             'live_status': 'is_live',
-        }
+        },
     }, {
         'url': 'https://gdansk-stare-miasto.webcamera.pl/',
         'info_dict': {
@@ -20,7 +20,7 @@ class WebcameraplIE(InfoExtractor):
             'ext': 'mp4',
             'title': r're:GDAŃSK - widok na Stare Miasto \d{4}-\d{2}-\d{2} \d{2}:\d{2}$',
             'live_status': 'is_live',
-        }
+        },
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/webcaster.py b/plugins/youtube_download/yt_dlp/extractor/webcaster.py
index 43eeca0..b0865e3 100644
--- a/plugins/youtube_download/yt_dlp/extractor/webcaster.py
+++ b/plugins/youtube_download/yt_dlp/extractor/webcaster.py
@@ -35,7 +35,7 @@ class WebcasterIE(InfoExtractor):
         formats = []
         for format_id in (None, 'noise'):
             track_tag = join_nonempty('track', format_id, delim='_')
-            for track in video.findall('.//iphone/%s' % track_tag):
+            for track in video.findall(f'.//iphone/{track_tag}'):
                 track_url = track.text
                 if not track_url:
                     continue
diff --git a/plugins/youtube_download/yt_dlp/extractor/webofstories.py b/plugins/youtube_download/yt_dlp/extractor/webofstories.py
index 65f48f3..24befe7 100644
--- a/plugins/youtube_download/yt_dlp/extractor/webofstories.py
+++ b/plugins/youtube_download/yt_dlp/extractor/webofstories.py
@@ -22,7 +22,7 @@ class WebOfStoriesIE(InfoExtractor):
             'thumbnail': r're:^https?://.*\.jpg$',
             'description': 'Hans Bethe talks about calculating the temperature of the sun',
             'duration': 238,
-        }
+        },
     }, {
         'url': 'http://www.webofstories.com/play/55908',
         'md5': '2985a698e1fe3211022422c4b5ed962c',
@@ -79,19 +79,15 @@ class WebOfStoriesIE(InfoExtractor):
             ms_prefix = 'mini_sites/'
 
         if is_great_life_series:
-            mp4_url = '{0:}lives/{1:}/{2:}.mp4'.format(
-                self._VIDEO_DOMAIN, speaker_id, story_filename)
+            mp4_url = f'{self._VIDEO_DOMAIN}lives/{speaker_id}/{story_filename}.mp4'
             rtmp_ext = 'flv'
             streamer = self._GREAT_LIFE_STREAMER
-            play_path = 'stories/{0:}/{1:}'.format(
-                speaker_id, story_filename)
+            play_path = f'stories/{speaker_id}/{story_filename}'
         else:
-            mp4_url = '{0:}{1:}{2:}/{3:}.mp4'.format(
-                self._VIDEO_DOMAIN, ms_prefix, speaker_id, story_filename)
+            mp4_url = f'{self._VIDEO_DOMAIN}{ms_prefix}{speaker_id}/{story_filename}.mp4'
             rtmp_ext = 'mp4'
             streamer = self._USER_STREAMER
-            play_path = 'mp4:{0:}{1:}/{2}.mp4'.format(
-                ms_prefix, speaker_id, story_filename)
+            play_path = f'mp4:{ms_prefix}{speaker_id}/{story_filename}.mp4'
 
         formats = [{
             'format_id': 'mp4_sd',
@@ -132,7 +128,7 @@ class WebOfStoriesPlaylistIE(InfoExtractor):
 
         entries = [
             self.url_result(
-                'http://www.webofstories.com/play/%s' % video_id,
+                f'http://www.webofstories.com/play/{video_id}',
                 'WebOfStories', video_id=video_id)
             for video_id in orderedSet(re.findall(r'\bid=["\']td_(\d+)', webpage))
         ]
@@ -145,7 +141,7 @@ class WebOfStoriesPlaylistIE(InfoExtractor):
                 r'<span id="primaryField">([^<]+)</span>',
                 webpage, 'field', default=None)
             if field:
-                title += ' (%s)' % field
+                title += f' ({field})'
 
         if not title:
             title = self._search_regex(
diff --git a/plugins/youtube_download/yt_dlp/extractor/weibo.py b/plugins/youtube_download/yt_dlp/extractor/weibo.py
index bc9a71a..420ac38 100644
--- a/plugins/youtube_download/yt_dlp/extractor/weibo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/weibo.py
@@ -1,134 +1,281 @@
-from .common import InfoExtractor
-
+import itertools
 import json
 import random
-import re
+import urllib.parse
 
-from ..compat import (
-    compat_parse_qs,
-    compat_str,
-)
+from .common import InfoExtractor
 from ..utils import (
-    js_to_json,
+    int_or_none,
+    make_archive_id,
+    mimetype2ext,
+    parse_resolution,
+    str_or_none,
     strip_jsonp,
+    traverse_obj,
+    truncate_string,
+    url_or_none,
     urlencode_postdata,
+    urljoin,
 )
 
 
-class WeiboIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?weibo\.com/[0-9]+/(?P<id>[a-zA-Z0-9]+)'
-    _TEST = {
-        'url': 'https://weibo.com/6275294458/Fp6RGfbff?type=comment',
-        'info_dict': {
-            'id': 'Fp6RGfbff',
-            'ext': 'mp4',
-            'title': 'You should have servants to massage you,... 来自Hosico_猫 - 微博',
-        }
-    }
+class WeiboBaseIE(InfoExtractor):
+    def _update_visitor_cookies(self, visitor_url, video_id):
+        headers = {'Referer': visitor_url}
+        chrome_ver = self._search_regex(
+            r'Chrome/(\d+)', self.get_param('http_headers')['User-Agent'], 'user agent version', default='90')
+        visitor_data = self._download_json(
+            'https://passport.weibo.com/visitor/genvisitor', video_id,
+            note='Generating first-visit guest request',
+            headers=headers, transform_source=strip_jsonp,
+            data=urlencode_postdata({
+                'cb': 'gen_callback',
+                'fp': json.dumps({
+                    'os': '1',
+                    'browser': f'Chrome{chrome_ver},0,0,0',
+                    'fonts': 'undefined',
+                    'screenInfo': '1920*1080*24',
+                    'plugins': '',
+                }, separators=(',', ':'))}))['data']
 
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        # to get Referer url for genvisitor
-        webpage, urlh = self._download_webpage_handle(url, video_id)
-
-        visitor_url = urlh.url
-
-        if 'passport.weibo.com' in visitor_url:
-            # first visit
-            visitor_data = self._download_json(
-                'https://passport.weibo.com/visitor/genvisitor', video_id,
-                note='Generating first-visit data',
-                transform_source=strip_jsonp,
-                headers={'Referer': visitor_url},
-                data=urlencode_postdata({
-                    'cb': 'gen_callback',
-                    'fp': json.dumps({
-                        'os': '2',
-                        'browser': 'Gecko57,0,0,0',
-                        'fonts': 'undefined',
-                        'screenInfo': '1440*900*24',
-                        'plugins': '',
-                    }),
-                }))
-
-            tid = visitor_data['data']['tid']
-            cnfd = '%03d' % visitor_data['data']['confidence']
-
-            self._download_webpage(
-                'https://passport.weibo.com/visitor/visitor', video_id,
-                note='Running first-visit callback',
-                query={
-                    'a': 'incarnate',
-                    't': tid,
-                    'w': 2,
-                    'c': cnfd,
-                    'cb': 'cross_domain',
-                    'from': 'weibo',
-                    '_rand': random.random(),
-                })
-
-            webpage = self._download_webpage(
-                url, video_id, note='Revisiting webpage')
-
-        title = self._html_extract_title(webpage)
-
-        video_formats = compat_parse_qs(self._search_regex(
-            r'video-sources=\\\"(.+?)\"', webpage, 'video_sources'))
-
-        formats = []
-        supported_resolutions = (480, 720)
-        for res in supported_resolutions:
-            vid_urls = video_formats.get(compat_str(res))
-            if not vid_urls or not isinstance(vid_urls, list):
-                continue
-
-            vid_url = vid_urls[0]
-            formats.append({
-                'url': vid_url,
-                'height': res,
+        self._download_webpage(
+            'https://passport.weibo.com/visitor/visitor', video_id,
+            note='Running first-visit callback to get guest cookies',
+            headers=headers, query={
+                'a': 'incarnate',
+                't': visitor_data['tid'],
+                'w': 3 if visitor_data.get('new_tid') else 2,
+                'c': f'{visitor_data.get("confidence", 100):03d}',
+                'gc': '',
+                'cb': 'cross_domain',
+                'from': 'weibo',
+                '_rand': random.random(),
             })
 
-        uploader = self._og_search_property(
-            'nick-name', webpage, 'uploader', default=None)
+    def _weibo_download_json(self, url, video_id, *args, fatal=True, note='Downloading JSON metadata', **kwargs):
+        # XXX: Always fatal; _download_webpage_handle only returns False (not a tuple) on error
+        webpage, urlh = self._download_webpage_handle(url, video_id, *args, fatal=fatal, note=note, **kwargs)
+        if urllib.parse.urlparse(urlh.url).netloc == 'passport.weibo.com':
+            self._update_visitor_cookies(urlh.url, video_id)
+            webpage = self._download_webpage(url, video_id, *args, fatal=fatal, note=note, **kwargs)
+        return self._parse_json(webpage, video_id, fatal=fatal)
 
+    def _extract_formats(self, video_info):
+        media_info = traverse_obj(video_info, ('page_info', 'media_info'))
+        formats = traverse_obj(media_info, (
+            'playback_list', lambda _, v: url_or_none(v['play_info']['url']), 'play_info', {
+                'url': 'url',
+                'format': ('quality_desc', {str}),
+                'format_id': ('label', {str}),
+                'ext': ('mime', {mimetype2ext}),
+                'tbr': ('bitrate', {int_or_none}, filter),
+                'vcodec': ('video_codecs', {str}),
+                'fps': ('fps', {int_or_none}),
+                'width': ('width', {int_or_none}),
+                'height': ('height', {int_or_none}),
+                'filesize': ('size', {int_or_none}),
+                'acodec': ('audio_codecs', {str}),
+                'asr': ('audio_sample_rate', {int_or_none}),
+                'audio_channels': ('audio_channels', {int_or_none}),
+            }))
+        if not formats:  # fallback, should be barely used
+            for url in set(traverse_obj(media_info, (..., {url_or_none}))):
+                if 'label=' in url:  # filter out non-video urls
+                    format_id, resolution = self._search_regex(
+                        r'label=(\w+)&template=(\d+x\d+)', url, 'format info',
+                        group=(1, 2), default=(None, None))
+                    formats.append({
+                        'url': url,
+                        'format_id': format_id,
+                        **parse_resolution(resolution),
+                        **traverse_obj(media_info, (
+                            'video_details', lambda _, v: v['label'].startswith(format_id), {
+                                'size': ('size', {int_or_none}),
+                                'tbr': ('bitrate', {int_or_none}),
+                            },
+                        ), get_all=False),
+                    })
+        return formats
+
+    def _parse_video_info(self, video_info):
+        video_id = traverse_obj(video_info, (('id', 'id_str', 'mid'), {str_or_none}, any))
         return {
             'id': video_id,
-            'title': title,
-            'uploader': uploader,
-            'formats': formats
+            'extractor_key': WeiboIE.ie_key(),
+            'extractor': WeiboIE.IE_NAME,
+            'formats': self._extract_formats(video_info),
+            'http_headers': {'Referer': 'https://weibo.com/'},
+            '_old_archive_ids': [make_archive_id('WeiboMobile', video_id)],
+            **traverse_obj(video_info, {
+                'display_id': ('mblogid', {str_or_none}),
+                'title': ('page_info', 'media_info', ('video_title', 'kol_title', 'name'),
+                          {lambda x: x.replace('\n', ' ')}, {truncate_string(left=72)}, filter),
+                'alt_title': ('page_info', 'media_info', ('video_title', 'kol_title', 'name'), {str}, filter),
+                'description': ('text_raw', {str}),
+                'duration': ('page_info', 'media_info', 'duration', {int_or_none}),
+                'timestamp': ('page_info', 'media_info', 'video_publish_time', {int_or_none}),
+                'thumbnail': ('page_info', 'page_pic', {url_or_none}),
+                'uploader': ('user', 'screen_name', {str}),
+                'uploader_id': ('user', ('id', 'id_str'), {str_or_none}),
+                'uploader_url': ('user', 'profile_url', {urljoin('https://weibo.com/')}),
+                'view_count': ('page_info', 'media_info', 'online_users_number', {int_or_none}),
+                'like_count': ('attitudes_count', {int_or_none}),
+                'repost_count': ('reposts_count', {int_or_none}),
+            }, get_all=False),
+            'tags': traverse_obj(video_info, ('topic_struct', ..., 'topic_title', {str})) or None,
         }
 
 
-class WeiboMobileIE(InfoExtractor):
-    _VALID_URL = r'https?://m\.weibo\.cn/status/(?P<id>[0-9]+)(\?.+)?'
-    _TEST = {
-        'url': 'https://m.weibo.cn/status/4189191225395228?wm=3333_2001&sourcetype=weixin&featurecode=newtitle&from=singlemessage&isappinstalled=0',
+class WeiboIE(WeiboBaseIE):
+    _VALID_URL = r'https?://(?:m\.weibo\.cn/(?:status|detail)|(?:www\.)?weibo\.com/\d+)/(?P<id>[a-zA-Z0-9]+)'
+    _TESTS = [{
+        'url': 'https://weibo.com/7827771738/N4xlMvjhI',
+        'info_dict': {
+            'id': '4910815147462302',
+            '_old_archive_ids': ['weibomobile 4910815147462302'],
+            'ext': 'mp4',
+            'display_id': 'N4xlMvjhI',
+            'title': '【睡前消息暑假版第一期：拉泰国一把  对中国有好处】',
+            'alt_title': '【睡前消息暑假版第一期：拉泰国一把  对中国有好处】',
+            'description': 'md5:e2637a7673980d68694ea7c43cf12a5f',
+            'duration': 918,
+            'timestamp': 1686312819,
+            'upload_date': '20230609',
+            'thumbnail': r're:https://.*\.jpg',
+            'uploader': '睡前视频基地',
+            'uploader_id': '7827771738',
+            'uploader_url': 'https://weibo.com/u/7827771738',
+            'view_count': int,
+            'like_count': int,
+            'repost_count': int,
+            'tags': ['泰国大选远进党获胜', '睡前消息', '暑期版'],
+        },
+    }, {
+        'url': 'https://m.weibo.cn/status/4189191225395228',
         'info_dict': {
             'id': '4189191225395228',
+            '_old_archive_ids': ['weibomobile 4189191225395228'],
             'ext': 'mp4',
-            'title': '午睡当然是要甜甜蜜蜜的啦',
-            'uploader': '柴犬柴犬'
-        }
-    }
+            'display_id': 'FBqgOmDxO',
+            'title': '柴犬柴犬的秒拍视频',
+            'alt_title': '柴犬柴犬的秒拍视频',
+            'description': 'md5:80f461ab5cdae6bbdb70efbf5a1db24f',
+            'duration': 53,
+            'timestamp': 1514264429,
+            'upload_date': '20171226',
+            'thumbnail': r're:https://.*\.jpg',
+            'uploader': '柴犬柴犬',
+            'uploader_id': '5926682210',
+            'uploader_url': 'https://weibo.com/u/5926682210',
+            'view_count': int,
+            'like_count': int,
+            'repost_count': int,
+        },
+    }, {
+        'url': 'https://m.weibo.cn/detail/4189191225395228',
+        'only_matching': True,
+    }, {
+        'url': 'https://weibo.com/0/4224132150961381',
+        'note': 'no playback_list example',
+        'only_matching': True,
+    }, {
+        'url': 'https://m.weibo.cn/detail/5120561132606436',
+        'info_dict': {
+            'id': '5120561132606436',
+        },
+        'playlist_count': 9,
+    }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        # to get Referer url for genvisitor
-        webpage = self._download_webpage(url, video_id, note='visit the page')
 
-        weibo_info = self._parse_json(self._search_regex(
-            r'var\s+\$render_data\s*=\s*\[({.*})\]\[0\]\s*\|\|\s*{};',
-            webpage, 'js_code', flags=re.DOTALL),
-            video_id, transform_source=js_to_json)
+        meta = self._weibo_download_json(f'https://weibo.com/ajax/statuses/show?id={video_id}', video_id)
+        mix_media_info = traverse_obj(meta, ('mix_media_info', 'items', ...))
+        if not mix_media_info:
+            return self._parse_video_info(meta)
 
-        status_data = weibo_info.get('status', {})
-        page_info = status_data.get('page_info')
-        title = status_data['status_title']
-        uploader = status_data.get('user', {}).get('screen_name')
+        return self.playlist_result(self._entries(mix_media_info), video_id)
 
-        return {
-            'id': video_id,
-            'title': title,
+    def _entries(self, mix_media_info):
+        for media_info in traverse_obj(mix_media_info, lambda _, v: v['type'] != 'pic'):
+            yield self._parse_video_info(traverse_obj(media_info, {
+                'id': ('data', 'object_id'),
+                'page_info': {'media_info': ('data', 'media_info', {dict})},
+            }))
+
+
+class WeiboVideoIE(WeiboBaseIE):
+    _VALID_URL = r'https?://(?:www\.)?weibo\.com/tv/show/(?P<id>\d+:\d+)'
+    _TESTS = [{
+        'url': 'https://weibo.com/tv/show/1034:4797699866951785?from=old_pc_videoshow',
+        'info_dict': {
+            'id': '4797700463137878',
+            'ext': 'mp4',
+            'display_id': 'LEZDodaiW',
+            'title': '呃，稍微了解了一下靡烟miya，感觉这东西也太二了',
+            'alt_title': '呃，稍微了解了一下靡烟miya，感觉这东西也太二了',
+            'description': '呃，稍微了解了一下靡烟miya，感觉这东西也太二了 http://t.cn/A6aerGsM \u200b\u200b\u200b',
+            'duration': 76,
+            'timestamp': 1659344278,
+            'upload_date': '20220801',
+            'thumbnail': r're:https://.*\.jpg',
+            'uploader': '君子爱财陈平安',
+            'uploader_id': '3905382233',
+            'uploader_url': 'https://weibo.com/u/3905382233',
+            'view_count': int,
+            'like_count': int,
+            'repost_count': int,
+            '_old_archive_ids': ['weibomobile 4797700463137878'],
+        },
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+
+        post_data = f'data={{"Component_Play_Playinfo":{{"oid":"{video_id}"}}}}'.encode()
+        video_info = self._weibo_download_json(
+            f'https://weibo.com/tv/api/component?page=%2Ftv%2Fshow%2F{video_id.replace(":", "%3A")}',
+            video_id, headers={'Referer': url}, data=post_data)['data']['Component_Play_Playinfo']
+        return self.url_result(f'https://weibo.com/0/{video_info["mid"]}', WeiboIE)
+
+
+class WeiboUserIE(WeiboBaseIE):
+    _VALID_URL = r'https?://(?:www\.)?weibo\.com/u/(?P<id>\d+)'
+    _TESTS = [{
+        'url': 'https://weibo.com/u/2066652961?tabtype=video',
+        'info_dict': {
+            'id': '2066652961',
+            'title': '萧影殿下的视频',
+            'description': '萧影殿下的全部视频',
+            'uploader': '萧影殿下',
+        },
+        'playlist_mincount': 195,
+    }]
+
+    def _fetch_page(self, uid, cursor=0, page=1):
+        return self._weibo_download_json(
+            'https://weibo.com/ajax/profile/getWaterFallContent',
+            uid, note=f'Downloading videos page {page}',
+            query={'uid': uid, 'cursor': cursor})['data']
+
+    def _entries(self, uid, first_page):
+        cursor = 0
+        for page in itertools.count(1):
+            response = first_page if page == 1 else self._fetch_page(uid, cursor, page)
+            for video_info in traverse_obj(response, ('list', ..., {dict})):
+                yield self._parse_video_info(video_info)
+            cursor = response.get('next_cursor')
+            if (int_or_none(cursor) or -1) < 0:
+                break
+
+    def _real_extract(self, url):
+        uid = self._match_id(url)
+        first_page = self._fetch_page(uid)
+        uploader = traverse_obj(first_page, ('list', ..., 'user', 'screen_name', {str}), get_all=False)
+        metainfo = {
+            'title': f'{uploader}的视频',
+            'description': f'{uploader}的全部视频',
             'uploader': uploader,
-            'url': page_info['media_info']['stream_url']
-        }
+        } if uploader else {}
+
+        return self.playlist_result(self._entries(uid, first_page), uid, **metainfo)
diff --git a/plugins/youtube_download/yt_dlp/extractor/weiqitv.py b/plugins/youtube_download/yt_dlp/extractor/weiqitv.py
index c9ff641..89e4856 100644
--- a/plugins/youtube_download/yt_dlp/extractor/weiqitv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/weiqitv.py
@@ -2,6 +2,7 @@ from .common import InfoExtractor
 
 
 class WeiqiTVIE(InfoExtractor):
+    _WORKING = False
     IE_DESC = 'WQTV'
     _VALID_URL = r'https?://(?:www\.)?weiqitv\.com/index/video_play\?videoId=(?P<id>[A-Za-z0-9]+)'
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/weverse.py b/plugins/youtube_download/yt_dlp/extractor/weverse.py
index 9a08b8e..53ad110 100644
--- a/plugins/youtube_download/yt_dlp/extractor/weverse.py
+++ b/plugins/youtube_download/yt_dlp/extractor/weverse.py
@@ -27,8 +27,9 @@ from ..utils import (
 
 class WeverseBaseIE(InfoExtractor):
     _NETRC_MACHINE = 'weverse'
-    _ACCOUNT_API_BASE = 'https://accountapi.weverse.io/web/api/v2'
+    _ACCOUNT_API_BASE = 'https://accountapi.weverse.io/web/api'
     _API_HEADERS = {
+        'Accept': 'application/json',
         'Referer': 'https://weverse.io/',
         'WEV-device-Id': str(uuid.uuid4()),
     }
@@ -39,23 +40,24 @@ class WeverseBaseIE(InfoExtractor):
 
         headers = {
             'x-acc-app-secret': '5419526f1c624b38b10787e5c10b2a7a',
-            'x-acc-app-version': '2.2.6',
+            'x-acc-app-version': '3.3.6',
             'x-acc-language': 'en',
             'x-acc-service-id': 'weverse',
             'x-acc-trace-id': str(uuid.uuid4()),
             'x-clog-user-device-id': str(uuid.uuid4()),
         }
-        check_username = self._download_json(
-            f'{self._ACCOUNT_API_BASE}/signup/email/status', None,
-            note='Checking username', query={'email': username}, headers=headers)
-        if not check_username.get('hasPassword'):
+        valid_username = traverse_obj(self._download_json(
+            f'{self._ACCOUNT_API_BASE}/v2/signup/email/status', None, note='Checking username',
+            query={'email': username}, headers=headers, expected_status=(400, 404)), 'hasPassword')
+        if not valid_username:
             raise ExtractorError('Invalid username provided', expected=True)
 
         headers['content-type'] = 'application/json'
         try:
             auth = self._download_json(
-                f'{self._ACCOUNT_API_BASE}/auth/token/by-credentials', None, data=json.dumps({
+                f'{self._ACCOUNT_API_BASE}/v3/auth/token/by-credentials', None, data=json.dumps({
                     'email': username,
+                    'otpSessionId': 'BY_PASS',
                     'password': password,
                 }, separators=(',', ':')).encode(), headers=headers, note='Logging in')
         except ExtractorError as e:
@@ -70,18 +72,18 @@ class WeverseBaseIE(InfoExtractor):
             return
 
         token = try_call(lambda: self._get_cookies('https://weverse.io/')['we2_access_token'].value)
-        if not token:
-            self.raise_login_required()
-
-        WeverseBaseIE._API_HEADERS['Authorization'] = f'Bearer {token}'
+        if token:
+            WeverseBaseIE._API_HEADERS['Authorization'] = f'Bearer {token}'
 
     def _call_api(self, ep, video_id, data=None, note='Downloading API JSON'):
         # Ref: https://ssl.pstatic.net/static/wevweb/2_3_2_11101725/public/static/js/2488.a09b41ff.chunk.js
         # From https://ssl.pstatic.net/static/wevweb/2_3_2_11101725/public/static/js/main.e206f7c1.js:
         key = b'1b9cb6378d959b45714bec49971ade22e6e24e42'
         api_path = update_url_query(ep, {
+            # 'gcc': 'US',
             'appId': 'be4d79eb8fc7bd008ee82c8ec4ff6fd4',
             'language': 'en',
+            'os': 'WEB',
             'platform': 'WEB',
             'wpf': 'pc',
         })
@@ -101,11 +103,14 @@ class WeverseBaseIE(InfoExtractor):
                 self.raise_login_required(
                     'Session token has expired. Log in again or refresh cookies in browser')
             elif isinstance(e.cause, HTTPError) and e.cause.status == 403:
-                raise ExtractorError('Your account does not have access to this content', expected=True)
+                if 'Authorization' in self._API_HEADERS:
+                    raise ExtractorError('Your account does not have access to this content', expected=True)
+                self.raise_login_required()
             raise
 
     def _call_post_api(self, video_id):
-        return self._call_api(f'/post/v1.0/post-{video_id}?fieldSet=postV1', video_id)
+        path = '' if 'Authorization' in self._API_HEADERS else '/preview'
+        return self._call_api(f'/post/v1.0/post-{video_id}{path}?fieldSet=postV1', video_id)
 
     def _get_community_id(self, channel):
         return str(self._call_api(
@@ -151,11 +156,11 @@ class WeverseBaseIE(InfoExtractor):
             'description': ((('extension', 'mediaInfo', 'body'), 'body'), {str}),
             'uploader': ('author', 'profileName', {str}),
             'uploader_id': ('author', 'memberId', {str}),
-            'creator': ('community', 'communityName', {str}),
+            'creators': ('community', 'communityName', {str}, all),
             'channel_id': (('community', 'author'), 'communityId', {str_or_none}),
             'duration': ('extension', 'video', 'playTime', {float_or_none}),
-            'timestamp': ('publishedAt', {lambda x: int_or_none(x, 1000)}),
-            'release_timestamp': ('extension', 'video', 'onAirStartAt', {lambda x: int_or_none(x, 1000)}),
+            'timestamp': ('publishedAt', {int_or_none(scale=1000)}),
+            'release_timestamp': ('extension', 'video', 'onAirStartAt', {int_or_none(scale=1000)}),
             'thumbnail': ('extension', (('mediaInfo', 'thumbnail', 'url'), ('video', 'thumb')), {url_or_none}),
             'view_count': ('extension', 'video', 'playCount', {int_or_none}),
             'like_count': ('extension', 'video', 'likeCount', {int_or_none}),
@@ -181,7 +186,7 @@ class WeverseBaseIE(InfoExtractor):
 
 
 class WeverseIE(WeverseBaseIE):
-    _VALID_URL = r'https?://(?:www\.|m\.)?weverse.io/(?P<artist>[^/?#]+)/live/(?P<id>[\d-]+)'
+    _VALID_URL = r'https?://(?:www\.|m\.)?weverse\.io/(?P<artist>[^/?#]+)/live/(?P<id>[\d-]+)'
     _TESTS = [{
         'url': 'https://weverse.io/billlie/live/0-107323480',
         'md5': '1fa849f00181eef9100d3c8254c47979',
@@ -195,7 +200,7 @@ class WeverseIE(WeverseBaseIE):
             'channel': 'billlie',
             'channel_id': '72',
             'channel_url': 'https://weverse.io/billlie',
-            'creator': 'Billlie',
+            'creators': ['Billlie'],
             'timestamp': 1666262062,
             'upload_date': '20221020',
             'release_timestamp': 1666262058,
@@ -221,7 +226,7 @@ class WeverseIE(WeverseBaseIE):
             'channel': 'lesserafim',
             'channel_id': '47',
             'channel_url': 'https://weverse.io/lesserafim',
-            'creator': 'LE SSERAFIM',
+            'creators': ['LE SSERAFIM'],
             'timestamp': 1659353400,
             'upload_date': '20220801',
             'release_timestamp': 1659353400,
@@ -285,7 +290,7 @@ class WeverseIE(WeverseBaseIE):
 
         elif live_status == 'is_live':
             video_info = self._call_api(
-                f'/video/v1.0/lives/{api_video_id}/playInfo?preview.format=json&preview.version=v2',
+                f'/video/v1.2/lives/{api_video_id}/playInfo?preview.format=json&preview.version=v2',
                 video_id, note='Downloading live JSON')
             playback = self._parse_json(video_info['lipPlayback'], video_id)
             m3u8_url = traverse_obj(playback, (
@@ -301,7 +306,7 @@ class WeverseIE(WeverseBaseIE):
         else:
             infra_video_id = post['extension']['video']['infraVideoId']
             in_key = self._call_api(
-                f'/video/v1.0/vod/{api_video_id}/inKey?preview=false', video_id,
+                f'/video/v1.1/vod/{api_video_id}/inKey?preview=false', video_id,
                 data=b'{}', note='Downloading VOD API key')['inKey']
 
             video_info = self._download_json(
@@ -343,10 +348,9 @@ class WeverseIE(WeverseBaseIE):
 
 
 class WeverseMediaIE(WeverseBaseIE):
-    _VALID_URL = r'https?://(?:www\.|m\.)?weverse.io/(?P<artist>[^/?#]+)/media/(?P<id>[\d-]+)'
+    _VALID_URL = r'https?://(?:www\.|m\.)?weverse\.io/(?P<artist>[^/?#]+)/media/(?P<id>[\d-]+)'
     _TESTS = [{
         'url': 'https://weverse.io/billlie/media/4-116372884',
-        'md5': '8efc9cfd61b2f25209eb1a5326314d28',
         'info_dict': {
             'id': 'e-C9wLSQs6o',
             'ext': 'mp4',
@@ -357,8 +361,9 @@ class WeverseMediaIE(WeverseBaseIE):
             'channel_url': 'https://www.youtube.com/channel/UCyc9sUCxELTDK9vELO5Fzeg',
             'uploader': 'Billlie',
             'uploader_id': '@Billlie',
-            'uploader_url': 'http://www.youtube.com/@Billlie',
+            'uploader_url': 'https://www.youtube.com/@Billlie',
             'upload_date': '20230403',
+            'timestamp': 1680533992,
             'duration': 211,
             'age_limit': 0,
             'playable_in_embed': True,
@@ -371,6 +376,8 @@ class WeverseMediaIE(WeverseBaseIE):
             'thumbnail': 'https://i.ytimg.com/vi/e-C9wLSQs6o/maxresdefault.jpg',
             'categories': ['Entertainment'],
             'tags': 'count:7',
+            'channel_is_verified': True,
+            'heatmap': 'count:100',
         },
     }, {
         'url': 'https://weverse.io/billlie/media/3-102914520',
@@ -385,7 +392,7 @@ class WeverseMediaIE(WeverseBaseIE):
             'channel': 'billlie',
             'channel_id': '72',
             'channel_url': 'https://weverse.io/billlie',
-            'creator': 'Billlie',
+            'creators': ['Billlie'],
             'timestamp': 1662174000,
             'upload_date': '20220903',
             'release_timestamp': 1662174000,
@@ -419,7 +426,7 @@ class WeverseMediaIE(WeverseBaseIE):
 
 
 class WeverseMomentIE(WeverseBaseIE):
-    _VALID_URL = r'https?://(?:www\.|m\.)?weverse.io/(?P<artist>[^/?#]+)/moment/(?P<uid>[\da-f]+)/post/(?P<id>[\d-]+)'
+    _VALID_URL = r'https?://(?:www\.|m\.)?weverse\.io/(?P<artist>[^/?#]+)/moment/(?P<uid>[\da-f]+)/post/(?P<id>[\d-]+)'
     _TESTS = [{
         'url': 'https://weverse.io/secretnumber/moment/66a07e164b56a696ee71c99315ffe27b/post/1-117229444',
         'md5': '87733ac19a54081b7dfc2442036d282b',
@@ -431,7 +438,7 @@ class WeverseMomentIE(WeverseBaseIE):
             'uploader_id': '66a07e164b56a696ee71c99315ffe27b',
             'channel': 'secretnumber',
             'channel_id': '56',
-            'creator': 'SECRET NUMBER',
+            'creators': ['SECRET NUMBER'],
             'duration': 10,
             'upload_date': '20230405',
             'timestamp': 1680653968,
@@ -440,7 +447,6 @@ class WeverseMomentIE(WeverseBaseIE):
             'comment_count': int,
             'availability': 'needs_auth',
         },
-        'skip': 'Moment has expired',
     }]
 
     def _real_extract(self, url):
@@ -463,7 +469,7 @@ class WeverseMomentIE(WeverseBaseIE):
                 'creator': (('community', 'author'), 'communityName', {str}),
                 'channel_id': (('community', 'author'), 'communityId', {str_or_none}),
                 'duration': ('extension', 'moment', 'video', 'uploadInfo', 'playTime', {float_or_none}),
-                'timestamp': ('publishedAt', {lambda x: int_or_none(x, 1000)}),
+                'timestamp': ('publishedAt', {int_or_none(scale=1000)}),
                 'thumbnail': ('extension', 'moment', 'video', 'uploadInfo', 'imageUrl', {url_or_none}),
                 'like_count': ('emotionCount', {int_or_none}),
                 'comment_count': ('commentCount', {int_or_none}),
@@ -515,7 +521,7 @@ class WeverseTabBaseIE(WeverseBaseIE):
 
 
 class WeverseLiveTabIE(WeverseTabBaseIE):
-    _VALID_URL = r'https?://(?:www\.|m\.)?weverse.io/(?P<id>[^/?#]+)/live/?(?:[?#]|$)'
+    _VALID_URL = r'https?://(?:www\.|m\.)?weverse\.io/(?P<id>[^/?#]+)/live/?(?:[?#]|$)'
     _TESTS = [{
         'url': 'https://weverse.io/billlie/live/',
         'playlist_mincount': 55,
@@ -533,7 +539,7 @@ class WeverseLiveTabIE(WeverseTabBaseIE):
 
 
 class WeverseMediaTabIE(WeverseTabBaseIE):
-    _VALID_URL = r'https?://(?:www\.|m\.)?weverse.io/(?P<id>[^/?#]+)/media(?:/|/all|/new)?(?:[?#]|$)'
+    _VALID_URL = r'https?://(?:www\.|m\.)?weverse\.io/(?P<id>[^/?#]+)/media(?:/|/all|/new)?(?:[?#]|$)'
     _TESTS = [{
         'url': 'https://weverse.io/billlie/media/',
         'playlist_mincount': 231,
@@ -557,7 +563,7 @@ class WeverseMediaTabIE(WeverseTabBaseIE):
 
 
 class WeverseLiveIE(WeverseBaseIE):
-    _VALID_URL = r'https?://(?:www\.|m\.)?weverse.io/(?P<id>[^/?#]+)/?(?:[?#]|$)'
+    _VALID_URL = r'https?://(?:www\.|m\.)?weverse\.io/(?P<id>[^/?#]+)/?(?:[?#]|$)'
     _TESTS = [{
         'url': 'https://weverse.io/purplekiss',
         'info_dict': {
@@ -570,7 +576,7 @@ class WeverseLiveIE(WeverseBaseIE):
             'channel': 'purplekiss',
             'channel_id': '35',
             'channel_url': 'https://weverse.io/purplekiss',
-            'creator': 'PURPLE KISS',
+            'creators': ['PURPLE KISS'],
             'timestamp': 1680780892,
             'upload_date': '20230406',
             'release_timestamp': 1680780883,
@@ -583,6 +589,31 @@ class WeverseLiveIE(WeverseBaseIE):
             'live_status': 'is_live',
         },
         'skip': 'Livestream has ended',
+    }, {
+        'url': 'https://weverse.io/lesserafim',
+        'info_dict': {
+            'id': '4-181521628',
+            'ext': 'mp4',
+            'title': r're:심심해서요',
+            'description': '',
+            'uploader': '채채🤎',
+            'uploader_id': 'd49b8b06f3cc1d92d655b25ab27ac2e7',
+            'channel': 'lesserafim',
+            'channel_id': '47',
+            'creators': ['LE SSERAFIM'],
+            'channel_url': 'https://weverse.io/lesserafim',
+            'timestamp': 1728570273,
+            'upload_date': '20241010',
+            'release_timestamp': 1728570264,
+            'release_date': '20241010',
+            'thumbnail': r're:https://phinf\.wevpstatic\.net/.+\.png',
+            'view_count': int,
+            'like_count': int,
+            'comment_count': int,
+            'availability': 'needs_auth',
+            'live_status': 'is_live',
+        },
+        'skip': 'Livestream has ended',
     }, {
         'url': 'https://weverse.io/billlie/',
         'only_matching': True,
diff --git a/plugins/youtube_download/yt_dlp/extractor/wevidi.py b/plugins/youtube_download/yt_dlp/extractor/wevidi.py
index 3b6d032..88b394f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/wevidi.py
+++ b/plugins/youtube_download/yt_dlp/extractor/wevidi.py
@@ -15,7 +15,7 @@ class WeVidiIE(InfoExtractor):
             'description': 'md5:73a27d0a87d49fbcc5584566326ebeed',
             'uploader': 'eclecRC',
             'duration': 932.098,
-        }
+        },
     }, {
         'url': 'https://wevidi.net/watch/ievRuuQHbPS',
         'md5': 'ce8a94989a959bff9003fa27ee572935',
@@ -27,7 +27,7 @@ class WeVidiIE(InfoExtractor):
             'description': 'md5:32cdfca272687390d9bd9b0c9c6153ee',
             'uploader': 'WeVidi',
             'duration': 36.1999,
-        }
+        },
     }, {
         'url': 'https://wevidi.net/watch/PcMzDWaQSWb',
         'md5': '55ee0d3434be5d9e5cc76b83f2bb57ec',
@@ -39,7 +39,7 @@ class WeVidiIE(InfoExtractor):
             'description': 'md5:e2c9e2b54b8bb424cc64937c8fdc068f',
             'uploader': 'WeVidi',
             'duration': 41.972,
-        }
+        },
     }, {
         'url': 'https://wevidi.net/watch/wJnRqDHNe_u',
         'md5': 'c8f263dd47e66cc17546b3abf47b5a77',
@@ -51,7 +51,7 @@ class WeVidiIE(InfoExtractor):
             'description': 'md5:e65036f0d4af80e0af191bd11af5195e',
             'uploader': 'GissyEva',
             'duration': 630.451,
-        }
+        },
     }, {
         'url': 'https://wevidi.net/watch/4m1c4yJR_yc',
         'md5': 'c63ce5ca6990dce86855fc02ca5bc1ed',
@@ -63,7 +63,7 @@ class WeVidiIE(InfoExtractor):
             'description': 'md5:96af99dd63468b2dfab3020560e3e9b2',
             'uploader': 'eclecRC',
             'duration': 6.804,
-        }
+        },
     }]
 
     def _extract_formats(self, wvplayer_props):
@@ -74,11 +74,11 @@ class WeVidiIE(InfoExtractor):
             3: 360,
             4: 480,
             5: 720,
-            6: 1080
+            6: 1080,
         }
 
         src_path = f'{wvplayer_props["srcVID"]}/{wvplayer_props["srcUID"]}/{wvplayer_props["srcNAME"]}'
-        for res in traverse_obj(wvplayer_props, ('resolutions', ..., {int}, {lambda x: x or None})):
+        for res in traverse_obj(wvplayer_props, ('resolutions', ..., {int}, filter)):
             format_id = str(-(res // -2) - 1)
             yield {
                 'acodec': 'mp4a.40.2',
diff --git a/plugins/youtube_download/yt_dlp/extractor/whowatch.py b/plugins/youtube_download/yt_dlp/extractor/whowatch.py
index f2808cd..9ca5c3b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/whowatch.py
+++ b/plugins/youtube_download/yt_dlp/extractor/whowatch.py
@@ -1,12 +1,11 @@
 from .common import InfoExtractor
 from ..utils import (
+    ExtractorError,
     int_or_none,
     qualities,
     try_call,
     try_get,
-    ExtractorError,
 )
-from ..compat import compat_str
 
 
 class WhoWatchIE(InfoExtractor):
@@ -21,8 +20,8 @@ class WhoWatchIE(InfoExtractor):
     def _real_extract(self, url):
         video_id = self._match_id(url)
         self._download_webpage(url, video_id)
-        metadata = self._download_json('https://api.whowatch.tv/lives/%s' % video_id, video_id)
-        live_data = self._download_json('https://api.whowatch.tv/lives/%s/play' % video_id, video_id)
+        metadata = self._download_json(f'https://api.whowatch.tv/lives/{video_id}', video_id)
+        live_data = self._download_json(f'https://api.whowatch.tv/lives/{video_id}/play', video_id)
 
         title = try_call(
             lambda: live_data['share_info']['live_title'][1:-1],
@@ -37,7 +36,7 @@ class WhoWatchIE(InfoExtractor):
         formats = []
 
         for i, fmt in enumerate(live_data.get('streams') or []):
-            name = fmt.get('quality') or fmt.get('name') or compat_str(i)
+            name = fmt.get('quality') or fmt.get('name') or str(i)
             hls_url = fmt.get('hls_url')
             rtmp_url = fmt.get('rtmp_url')
             audio_only = fmt.get('audio_only')
@@ -45,7 +44,7 @@ class WhoWatchIE(InfoExtractor):
 
             if hls_url:
                 hls_fmts = self._extract_m3u8_formats(
-                    hls_url, video_id, ext='mp4', m3u8_id='hls-%s' % name, quality=quality)
+                    hls_url, video_id, ext='mp4', m3u8_id=f'hls-{name}', quality=quality)
                 formats.extend(hls_fmts)
             else:
                 hls_fmts = []
@@ -54,7 +53,7 @@ class WhoWatchIE(InfoExtractor):
             if rtmp_url and not audio_only:
                 formats.append({
                     'url': rtmp_url,
-                    'format_id': 'rtmp-%s' % name,
+                    'format_id': f'rtmp-{name}',
                     'ext': 'mp4',
                     'protocol': 'rtmp_ffmpeg',  # ffmpeg can, while rtmpdump can't
                     'vcodec': 'h264',
@@ -71,12 +70,12 @@ class WhoWatchIE(InfoExtractor):
             hls_url, video_id, ext='mp4', m3u8_id='hls'))
         self._remove_duplicate_formats(formats)
 
-        uploader_url = try_get(metadata, lambda x: x['live']['user']['user_path'], compat_str)
+        uploader_url = try_get(metadata, lambda x: x['live']['user']['user_path'], str)
         if uploader_url:
-            uploader_url = 'https://whowatch.tv/profile/%s' % uploader_url
-        uploader_id = compat_str(try_get(metadata, lambda x: x['live']['user']['id'], int))
-        uploader = try_get(metadata, lambda x: x['live']['user']['name'], compat_str)
-        thumbnail = try_get(metadata, lambda x: x['live']['latest_thumbnail_url'], compat_str)
+            uploader_url = f'https://whowatch.tv/profile/{uploader_url}'
+        uploader_id = str(try_get(metadata, lambda x: x['live']['user']['id'], int))
+        uploader = try_get(metadata, lambda x: x['live']['user']['name'], str)
+        thumbnail = try_get(metadata, lambda x: x['live']['latest_thumbnail_url'], str)
         timestamp = int_or_none(try_get(metadata, lambda x: x['live']['started_at'], int), scale=1000)
         view_count = try_get(metadata, lambda x: x['live']['total_view_count'], int)
         comment_count = try_get(metadata, lambda x: x['live']['comment_count'], int)
diff --git a/plugins/youtube_download/yt_dlp/extractor/wikimedia.py b/plugins/youtube_download/yt_dlp/extractor/wikimedia.py
index 11c801f..6326930 100644
--- a/plugins/youtube_download/yt_dlp/extractor/wikimedia.py
+++ b/plugins/youtube_download/yt_dlp/extractor/wikimedia.py
@@ -24,8 +24,8 @@ class WikimediaIE(InfoExtractor):
             'description': 'md5:7cd84f76e7081f1be033d0b155b4a460',
             'license': 'Creative Commons Attribution 4.0 International',
             'uploader': 'ZDF/Terra X/Gruppe 5/Luise Wagner, Jonas Sichert, Andreas Hougardy',
-            'subtitles': 'count:4'
-        }
+            'subtitles': 'count:4',
+        },
     }]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/willow.py b/plugins/youtube_download/yt_dlp/extractor/willow.py
deleted file mode 100644
index 0ec9c9d..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/willow.py
+++ /dev/null
@@ -1,56 +0,0 @@
-from ..utils import ExtractorError
-from .common import InfoExtractor
-
-
-class WillowIE(InfoExtractor):
-    _VALID_URL = r'https?://(www\.)?willow\.tv/videos/(?P<id>[0-9a-z-_]+)'
-    _GEO_COUNTRIES = ['US']
-
-    _TESTS = [{
-        'url': 'http://willow.tv/videos/d5winning-moment-eng-vs-ind-streaming-online-4th-test-india-tour-of-england-2021',
-        'info_dict': {
-            'id': '169662',
-            'display_id': 'd5winning-moment-eng-vs-ind-streaming-online-4th-test-india-tour-of-england-2021',
-            'ext': 'mp4',
-            'title': 'Winning Moment: 4th Test, England vs India',
-            'thumbnail': 'https://aimages.willow.tv/ytThumbnails/6748_D5winning_moment.jpg',
-            'duration': 233,
-            'timestamp': 1630947954,
-            'upload_date': '20210906',
-            'location': 'Kennington Oval, London',
-            'series': 'India tour of England 2021',
-        },
-        'params': {
-            'skip_download': True,  # AES-encrypted m3u8
-        },
-    }, {
-        'url': 'http://willow.tv/videos/highlights-short-ind-vs-nz-streaming-online-2nd-t20i-new-zealand-tour-of-india-2021',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-        video_data = self._parse_json(self._html_search_regex(
-            r'var\s+data_js\s*=\s*JSON\.parse\(\'(.+)\'\)', webpage,
-            'data_js'), video_id)
-
-        video = next((v for v in video_data.get('trending_videos') or []
-                      if v.get('secureurl')), None)
-        if not video:
-            raise ExtractorError('No videos found')
-
-        formats = self._extract_m3u8_formats(video['secureurl'], video_id, 'mp4')
-
-        return {
-            'id': str(video.get('content_id')),
-            'display_id': video.get('video_slug'),
-            'title': video.get('video_name') or self._html_search_meta('twitter:title', webpage),
-            'formats': formats,
-            'thumbnail': video.get('yt_thumb_url') or self._html_search_meta(
-                'twitter:image', webpage, default=None),
-            'duration': video.get('duration_seconds'),
-            'timestamp': video.get('created_date'),
-            'location': video.get('venue'),
-            'series': video.get('series_name'),
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/wimtv.py b/plugins/youtube_download/yt_dlp/extractor/wimtv.py
index 5711123..000d143 100644
--- a/plugins/youtube_download/yt_dlp/extractor/wimtv.py
+++ b/plugins/youtube_download/yt_dlp/extractor/wimtv.py
@@ -1,23 +1,23 @@
 from .common import InfoExtractor
 from ..utils import (
+    ExtractorError,
     determine_ext,
     parse_duration,
     urlencode_postdata,
-    ExtractorError,
 )
 
 
 class WimTVIE(InfoExtractor):
     _player = None
     _UUID_RE = r'[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}'
-    _VALID_URL = r'''(?x:
-        https?://platform.wim.tv/
+    _VALID_URL = rf'''(?x:
+        https?://platform\.wim\.tv/
         (?:
             (?:embed/)?\?
             |\#/webtv/.+?/
         )
         (?P<type>vod|live|cast)[=/]
-        (?P<id>%s).*?)''' % _UUID_RE
+        (?P<id>{_UUID_RE}).*?)'''
     _EMBED_REGEX = [rf'<iframe[^>]+src=["\'](?P<url>{_VALID_URL})']
     _TESTS = [{
         # vod stream
@@ -28,7 +28,7 @@ class WimTVIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'AMA SUPERCROSS 2020 - R2 ST. LOUIS',
             'duration': 6481,
-            'thumbnail': r're:https?://.+?/thumbnail/.+?/720$'
+            'thumbnail': r're:https?://.+?/thumbnail/.+?/720$',
         },
         'params': {
             'skip_download': True,
@@ -66,7 +66,7 @@ class WimTVIE(InfoExtractor):
             'vars': [{
                 'regex': r'appAuth = "(.+?)"',
                 'variable': 'app_auth',
-            }]
+            }],
         }, {
             'url': 'https://platform.wim.tv/common/config/endpointconfig.js',
             'vars': [{
@@ -75,7 +75,7 @@ class WimTVIE(InfoExtractor):
             }, {
                 'regex': r'PRODUCTION_HOSTNAME_THUMB\s*\+\s*"(.+?)"',
                 'variable': 'thumb_server_path',
-            }]
+            }],
         }]
 
         for data in datas:
@@ -83,13 +83,13 @@ class WimTVIE(InfoExtractor):
             for var in data['vars']:
                 val = self._search_regex(var['regex'], temp, msg_id)
                 if not val:
-                    raise ExtractorError('%s not found' % var['variable'])
+                    raise ExtractorError('{} not found'.format(var['variable']))
                 self._player[var['variable']] = val
 
     def _generate_token(self):
         json = self._download_json(
             'https://platform.wim.tv/wimtv-server/oauth/token', 'Token generation',
-            headers={'Authorization': 'Basic %s' % self._player['app_auth']},
+            headers={'Authorization': 'Basic {}'.format(self._player['app_auth'])},
             data=urlencode_postdata({'grant_type': 'client_credentials'}))
         token = json.get('access_token')
         if not token:
@@ -101,7 +101,7 @@ class WimTVIE(InfoExtractor):
             return None
         if not self._player.get('thumb_server_path'):
             self._player['thumb_server_path'] = ''
-        return '%s%s/asset/thumbnail/%s/%s' % (
+        return '{}{}/asset/thumbnail/{}/{}'.format(
             self._player['thumb_server'],
             self._player['thumb_server_path'],
             thumb_id, width)
@@ -118,11 +118,11 @@ class WimTVIE(InfoExtractor):
             is_live = False
         token = self._generate_token()
         json = self._download_json(
-            'https://platform.wim.tv/wimtv-server/api/public/%s/%s/play' % (
-                stream_type, video_id), video_id,
-            headers={'Authorization': 'Bearer %s' % token,
-                     'Content-Type': 'application/json'},
-            data=bytes('{}', 'utf-8'))
+            f'https://platform.wim.tv/wimtv-server/api/public/{stream_type}/{video_id}/play',
+            video_id, headers={
+                'Authorization': f'Bearer {token}',
+                'Content-Type': 'application/json',
+            }, data=b'{}')
 
         formats = []
         for src in json.get('srcs') or []:
diff --git a/plugins/youtube_download/yt_dlp/extractor/wistia.py b/plugins/youtube_download/yt_dlp/extractor/wistia.py
index bce5e83..df7ecb3 100644
--- a/plugins/youtube_download/yt_dlp/extractor/wistia.py
+++ b/plugins/youtube_download/yt_dlp/extractor/wistia.py
@@ -1,6 +1,6 @@
+import base64
 import re
 import urllib.parse
-from base64 import b64decode
 
 from .common import InfoExtractor
 from ..networking import HEADRequest
@@ -8,6 +8,7 @@ from ..networking.exceptions import HTTPError
 from ..utils import (
     ExtractorError,
     determine_ext,
+    filter_dict,
     float_or_none,
     int_or_none,
     parse_qs,
@@ -24,17 +25,26 @@ class WistiaBaseIE(InfoExtractor):
     _EMBED_BASE_URL = 'http://fast.wistia.net/embed/'
 
     def _download_embed_config(self, config_type, config_id, referer):
-        base_url = self._EMBED_BASE_URL + '%s/%s' % (config_type, config_id)
+        base_url = self._EMBED_BASE_URL + f'{config_type}/{config_id}'
+        video_password = self.get_param('videopassword')
         embed_config = self._download_json(
             base_url + '.json', config_id, headers={
                 'Referer': referer if referer.startswith('http') else base_url,  # Some videos require this.
-            })
+            }, query=filter_dict({'password': video_password}))
 
         error = traverse_obj(embed_config, 'error')
         if error:
             raise ExtractorError(
                 f'Error while getting the playlist: {error}', expected=True)
 
+        if traverse_obj(embed_config, (
+                'media', ('embed_options', 'embedOptions'), 'plugin',
+                'passwordProtectedVideo', 'on', any)) == 'true':
+            if video_password:
+                raise ExtractorError('Invalid video password', expected=True)
+            raise ExtractorError(
+                'This content is password-protected. Use the --video-password option', expected=True)
+
         return embed_config
 
     def _get_real_ext(self, url):
@@ -74,7 +84,7 @@ class WistiaBaseIE(InfoExtractor):
                 display_name = a.get('display_name')
                 format_id = atype
                 if atype and atype.endswith('_video') and display_name:
-                    format_id = '%s-%s' % (atype[:-6], display_name)
+                    format_id = f'{atype[:-6]}-{display_name}'
                 f = {
                     'format_id': format_id,
                     'url': aurl,
@@ -157,7 +167,7 @@ class WistiaBaseIE(InfoExtractor):
 
 
 class WistiaIE(WistiaBaseIE):
-    _VALID_URL = r'(?:wistia:|%s(?:iframe|medias)/)%s' % (WistiaBaseIE._VALID_URL_BASE, WistiaBaseIE._VALID_ID_REGEX)
+    _VALID_URL = rf'(?:wistia:|{WistiaBaseIE._VALID_URL_BASE}(?:iframe|medias)/){WistiaBaseIE._VALID_ID_REGEX}'
     _EMBED_REGEX = [
         r'''(?x)
             <(?:meta[^>]+?content|(?:iframe|script)[^>]+?src)=["\']
@@ -189,7 +199,7 @@ class WistiaIE(WistiaBaseIE):
             'duration': 966.0,
             'timestamp': 1616614369,
             'thumbnail': 'https://embed-ssl.wistia.com/deliveries/53dc60239348dc9b9fba3755173ea4c2.png',
-        }
+        },
     }, {
         'url': 'wistia:5vd7p4bct5',
         'md5': 'b9676d24bf30945d97060638fbfe77f0',
@@ -228,7 +238,7 @@ class WistiaIE(WistiaBaseIE):
             'description': 'md5:27abc99a758573560be72600ef95cece',
             'upload_date': '20210421',
             'thumbnail': 'https://embed-ssl.wistia.com/deliveries/6c551820ae950cdee2306d6cbe9ef742.jpg',
-        }
+        },
     }, {
         'url': 'https://study.com/academy/lesson/north-american-exploration-failed-colonies-of-spain-france-england.html#lesson',
         'md5': 'b9676d24bf30945d97060638fbfe77f0',
@@ -254,19 +264,19 @@ class WistiaIE(WistiaBaseIE):
         urls = list(super()._extract_embed_urls(url, webpage))
         for match in cls._extract_wistia_async_embed(webpage):
             if match.group('type') != 'wistia_channel':
-                urls.append('wistia:%s' % match.group('id'))
+                urls.append('wistia:{}'.format(match.group('id')))
         for match in re.finditer(r'(?:data-wistia-?id=["\']|Wistia\.embed\(["\']|id=["\']wistia_)(?P<id>[a-z0-9]{10})',
                                  webpage):
-            urls.append('wistia:%s' % match.group('id'))
+            urls.append('wistia:{}'.format(match.group('id')))
         if not WistiaChannelIE._extract_embed_urls(url, webpage):  # Fallback
             media_id = cls._extract_url_media_id(url)
             if media_id:
-                urls.append('wistia:%s' % match.group('id'))
+                urls.append('wistia:{}'.format(match.group('id')))
         return urls
 
 
 class WistiaPlaylistIE(WistiaBaseIE):
-    _VALID_URL = r'%splaylists/%s' % (WistiaBaseIE._VALID_URL_BASE, WistiaBaseIE._VALID_ID_REGEX)
+    _VALID_URL = rf'{WistiaBaseIE._VALID_URL_BASE}playlists/{WistiaBaseIE._VALID_ID_REGEX}'
 
     _TEST = {
         'url': 'https://fast.wistia.net/embed/playlists/aodt9etokc',
@@ -291,7 +301,7 @@ class WistiaPlaylistIE(WistiaBaseIE):
 
 
 class WistiaChannelIE(WistiaBaseIE):
-    _VALID_URL = r'(?:wistiachannel:|%schannel/)%s' % (WistiaBaseIE._VALID_URL_BASE, WistiaBaseIE._VALID_ID_REGEX)
+    _VALID_URL = rf'(?:wistiachannel:|{WistiaBaseIE._VALID_URL_BASE}channel/){WistiaBaseIE._VALID_ID_REGEX}'
 
     _TESTS = [{
         # JSON Embed API returns 403, should fall back to webpage
@@ -299,7 +309,7 @@ class WistiaChannelIE(WistiaBaseIE):
         'info_dict': {
             'id': 'yvyvu7wjbg',
             'title': 'Copysmith Tutorials and Education!',
-            'description': 'Learn all things Copysmith via short and informative videos!'
+            'description': 'Learn all things Copysmith via short and informative videos!',
         },
         'playlist_mincount': 7,
         'expected_warnings': ['falling back to webpage'],
@@ -370,8 +380,8 @@ class WistiaChannelIE(WistiaBaseIE):
             self.report_warning('Failed to download channel data from API, falling back to webpage.')
             webpage = self._download_webpage(f'https://fast.wistia.net/embed/channel/{channel_id}', channel_id)
             data = self._parse_json(
-                self._search_regex(r'wchanneljsonp-%s\'\]\s*=[^\"]*\"([A-Za-z0-9=/]*)' % channel_id, webpage, 'jsonp', channel_id),
-                channel_id, transform_source=lambda x: urllib.parse.unquote_plus(b64decode(x).decode('utf-8')))
+                self._search_regex(rf'wchanneljsonp-{channel_id}\'\]\s*=[^\"]*\"([A-Za-z0-9=/]*)', webpage, 'jsonp', channel_id),
+                channel_id, transform_source=lambda x: urllib.parse.unquote_plus(base64.b64decode(x).decode('utf-8')))
 
         # XXX: can there be more than one series?
         series = traverse_obj(data, ('series', 0), default={})
diff --git a/plugins/youtube_download/yt_dlp/extractor/wordpress.py b/plugins/youtube_download/yt_dlp/extractor/wordpress.py
index 53820b5..a0a3194 100644
--- a/plugins/youtube_download/yt_dlp/extractor/wordpress.py
+++ b/plugins/youtube_download/yt_dlp/extractor/wordpress.py
@@ -44,10 +44,10 @@ class WordpressPlaylistEmbedIE(InfoExtractor):
                 'duration': 49.0,
                 'artist': 'Nancy and Randall Faber',
                 'description': 'md5:a9f8e9aeabbd2912bc13cc0fab1a4ce8',
-            }
+            },
         }],
         'playlist_count': 6,
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }]
 
     def _extract_from_webpage(self, url, webpage):
@@ -70,7 +70,7 @@ class WordpressPlaylistEmbedIE(InfoExtractor):
                 'height': int_or_none(traverse_obj(track, ('dimensions', 'original', 'height'))),
                 'width': int_or_none(traverse_obj(track, ('dimensions', 'original', 'width'))),
             } for track in traverse_obj(playlist_json, ('tracks', ...), expected_type=dict)]
-            yield self.playlist_result(entries, self._generic_id(url) + f'-wp-playlist-{i+1}', 'Wordpress Playlist')
+            yield self.playlist_result(entries, self._generic_id(url) + f'-wp-playlist-{i + 1}', 'Wordpress Playlist')
 
 
 class WordpressMiniAudioPlayerEmbedIE(InfoExtractor):
@@ -94,11 +94,11 @@ class WordpressMiniAudioPlayerEmbedIE(InfoExtractor):
                 'id': 'over_the_horizon_2013',
                 'ext': 'mp3',
                 'title': 'Over the Horizon 2013',
-                'url': 'http://news.samsung.com/global/wp-content/uploads/ringtones/over_the_horizon_2013.mp3'
-            }
+                'url': 'http://news.samsung.com/global/wp-content/uploads/ringtones/over_the_horizon_2013.mp3',
+            },
         }],
         'playlist_count': 6,
-        'params': {'skip_download': True}
+        'params': {'skip_download': True},
     }, {
         # Version 1.9.3: https://plugins.trac.wordpress.org/browser/wp-miniaudioplayer/tags/1.9.3
         'url': 'https://www.booksontape.com/collections/audiobooks-with-teacher-guides/',
@@ -108,7 +108,7 @@ class WordpressMiniAudioPlayerEmbedIE(InfoExtractor):
             'age_limit': 0,
             'thumbnail': 'https://www.booksontape.com/wp-content/uploads/2016/09/bot-logo-1200x630.jpg',
         },
-        'playlist_mincount': 12
+        'playlist_mincount': 12,
     }, {
         # Version 1.9.7: https://plugins.trac.wordpress.org/browser/wp-miniaudioplayer/tags/1.9.7
         # But has spaces around href filter
@@ -122,7 +122,7 @@ class WordpressMiniAudioPlayerEmbedIE(InfoExtractor):
             'thumbnail': 'https://www.estudiords.com.br/wp-content/uploads/2021/03/LOGO-TEMAS.png',
             'description': 'md5:ab24d6a7ed0312ad2d466e721679f5a0',
         },
-        'playlist_mincount': 30
+        'playlist_mincount': 30,
     }]
 
     def _extract_from_webpage(self, url, webpage):
diff --git a/plugins/youtube_download/yt_dlp/extractor/worldstarhiphop.py b/plugins/youtube_download/yt_dlp/extractor/worldstarhiphop.py
index c6948a1..3af4bd4 100644
--- a/plugins/youtube_download/yt_dlp/extractor/worldstarhiphop.py
+++ b/plugins/youtube_download/yt_dlp/extractor/worldstarhiphop.py
@@ -9,8 +9,8 @@ class WorldStarHipHopIE(InfoExtractor):
         'info_dict': {
             'id': 'wshh6a7q1ny0G34ZwuIO',
             'ext': 'mp4',
-            'title': 'KO Of The Week: MMA Fighter Gets Knocked Out By Swift Head Kick!'
-        }
+            'title': 'KO Of The Week: MMA Fighter Gets Knocked Out By Swift Head Kick!',
+        },
     }, {
         'url': 'http://m.worldstarhiphop.com/android/video.php?v=wshh6a7q1ny0G34ZwuIO',
         'only_matching': True,
diff --git a/plugins/youtube_download/yt_dlp/extractor/wppilot.py b/plugins/youtube_download/yt_dlp/extractor/wppilot.py
index 5e590e2..b4cc1ab 100644
--- a/plugins/youtube_download/yt_dlp/extractor/wppilot.py
+++ b/plugins/youtube_download/yt_dlp/extractor/wppilot.py
@@ -1,13 +1,13 @@
-from .common import InfoExtractor
-from ..utils import (
-    try_get,
-    ExtractorError,
-)
-
 import json
 import random
 import re
 
+from .common import InfoExtractor
+from ..utils import (
+    ExtractorError,
+    try_get,
+)
+
 
 class WPPilotBaseIE(InfoExtractor):
     _VIDEO_URL = 'https://pilot.wp.pl/api/v1/channel/%s'
@@ -103,7 +103,7 @@ class WPPilotIE(WPPilotBaseIE):
 
         is_authorized = next((c for c in self.cookiejar if c.name == 'netviapisessid'), None)
         # cookies starting with "g:" are assigned to guests
-        is_authorized = True if is_authorized is not None and not is_authorized.value.startswith('g:') else False
+        is_authorized = is_authorized is not None and not is_authorized.value.startswith('g:')
 
         video = self._download_json(
             (self._VIDEO_URL if is_authorized else self._VIDEO_GUEST_URL) % video_id,
@@ -120,7 +120,7 @@ class WPPilotIE(WPPilotBaseIE):
                 data=json.dumps({
                     'channelId': video_id,
                     't': stream_token,
-                }).encode('utf-8'))
+                }).encode())
             if try_get(close, lambda x: x['data']['status']) == 'ok':
                 return self.url_result(url, ie=WPPilotIE.ie_key())
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/wrestleuniverse.py b/plugins/youtube_download/yt_dlp/extractor/wrestleuniverse.py
index dd12804..d401d6d 100644
--- a/plugins/youtube_download/yt_dlp/extractor/wrestleuniverse.py
+++ b/plugins/youtube_download/yt_dlp/extractor/wrestleuniverse.py
@@ -12,6 +12,7 @@ from ..utils import (
     jwt_decode_hs256,
     traverse_obj,
     try_call,
+    url_basename,
     url_or_none,
     urlencode_postdata,
     variadic,
@@ -147,7 +148,7 @@ class WrestleUniverseBaseIE(InfoExtractor):
         metadata = self._call_api(video_id, msg='metadata', query={'al': lang or 'ja'}, auth=False, fatal=False)
         if not metadata:
             webpage = self._download_webpage(url, video_id)
-            nextjs_data = self._search_nextjs_data(webpage, video_id)
+            nextjs_data = self._search_nextjs_data(webpage, video_id, fatal=False)
             metadata = traverse_obj(nextjs_data, (
                 'props', 'pageProps', *variadic(props_keys, (str, bytes, dict, set)), {dict})) or {}
         return metadata
@@ -190,15 +191,11 @@ class WrestleUniverseVODIE(WrestleUniverseBaseIE):
     def _real_extract(self, url):
         lang, video_id = self._match_valid_url(url).group('lang', 'id')
         metadata = self._download_metadata(url, video_id, lang, 'videoEpisodeFallbackData')
-        video_data = self._call_api(video_id, ':watch', 'watch', data={
-            # 'deviceId' is required if ignoreDeviceRestriction is False
-            'ignoreDeviceRestriction': True,
-        })
+        video_data = self._call_api(video_id, ':watch', 'watch', data={'deviceId': self._DEVICE_ID})
 
         return {
             'id': video_id,
-            'formats': self._get_formats(video_data, (
-                (('protocolHls', 'url'), ('chromecastUrls', ...)), {url_or_none}), video_id),
+            'formats': self._get_formats(video_data, ('protocolHls', 'url', {url_or_none}), video_id),
             **traverse_obj(metadata, {
                 'title': ('displayName', {str}),
                 'description': ('description', {str}),
@@ -262,6 +259,10 @@ class WrestleUniversePPVIE(WrestleUniverseBaseIE):
         'params': {
             'skip_download': 'm3u8',
         },
+    }, {
+        'note': 'manifest provides live-a (partial) and live-b (full) streams',
+        'url': 'https://www.wrestle-universe.com/en/lives/umc99R9XsexXrxr9VjTo9g',
+        'only_matching': True,
     }]
 
     _API_PATH = 'events'
@@ -288,12 +289,16 @@ class WrestleUniversePPVIE(WrestleUniverseBaseIE):
 
         video_data, decrypt = self._call_encrypted_api(
             video_id, ':watchArchive', 'watch archive', data={'method': 1})
-        info['formats'] = self._get_formats(video_data, (
-            ('hls', None), ('urls', 'chromecastUrls'), ..., {url_or_none}), video_id)
+        # 'chromecastUrls' can be only partial videos, avoid
+        info['formats'] = self._get_formats(video_data, ('hls', (('urls', ...), 'url'), {url_or_none}), video_id)
         for f in info['formats']:
             # bitrates are exaggerated in PPV playlists, so avoid wrong/huge filesize_approx values
             if f.get('tbr'):
                 f['tbr'] = int(f['tbr'] / 2.5)
+            # prefer variants with the same basename as the master playlist to avoid partial streams
+            f['format_id'] = url_basename(f['url']).partition('.')[0]
+            if not f['format_id'].startswith(url_basename(f['manifest_url']).partition('.')[0]):
+                f['preference'] = -10
 
         hls_aes_key = traverse_obj(video_data, ('hls', 'key', {decrypt}))
         if hls_aes_key:
diff --git a/plugins/youtube_download/yt_dlp/extractor/wsj.py b/plugins/youtube_download/yt_dlp/extractor/wsj.py
index 86e2646..7cf4614 100644
--- a/plugins/youtube_download/yt_dlp/extractor/wsj.py
+++ b/plugins/youtube_download/yt_dlp/extractor/wsj.py
@@ -1,7 +1,8 @@
 from .common import InfoExtractor
 from ..utils import (
-    int_or_none,
     float_or_none,
+    int_or_none,
+    join_nonempty,
     unified_strdate,
 )
 
@@ -76,7 +77,7 @@ class WSJIE(InfoExtractor):
             tbr = int_or_none(v.get('bitrate'))
             formats.append({
                 'url': mp4_url,
-                'format_id': 'http' + ('-%d' % tbr if tbr else ''),
+                'format_id': join_nonempty('http', tbr),
                 'tbr': tbr,
                 'width': int_or_none(v.get('width')),
                 'height': int_or_none(v.get('height')),
@@ -99,8 +100,8 @@ class WSJIE(InfoExtractor):
 
 
 class WSJArticleIE(InfoExtractor):
-    _VALID_URL = r'(?i)https?://(?:www\.)?wsj\.com/articles/(?P<id>[^/?#&]+)'
-    _TEST = {
+    _VALID_URL = r'(?i)https?://(?:www\.)?wsj\.com/(?:articles|opinion)/(?P<id>[^/?#&]+)'
+    _TESTS = [{
         'url': 'https://www.wsj.com/articles/dont-like-china-no-pandas-for-you-1490366939?',
         'info_dict': {
             'id': '4B13FA62-1D8C-45DB-8EA1-4105CB20B362',
@@ -108,13 +109,22 @@ class WSJArticleIE(InfoExtractor):
             'upload_date': '20170221',
             'uploader_id': 'ralcaraz',
             'title': 'Bao Bao the Panda Leaves for China',
-        }
-    }
+        },
+    }, {
+        'url': 'https://www.wsj.com/opinion/hamas-hostages-caskets-bibas-family-israel-gaza-29da083b',
+        'info_dict': {
+            'id': 'CE68D629-8DB8-4CD3-B30A-92112C102054',
+            'ext': 'mp4',
+            'upload_date': '20241007',
+            'uploader_id': 'Tinnes, David',
+            'title': 'WSJ Opinion: "Get the Jew": The Crown Heights Riot Revisited',
+        },
+    }]
 
     def _real_extract(self, url):
         article_id = self._match_id(url)
-        webpage = self._download_webpage(url, article_id)
+        webpage = self._download_webpage(url, article_id, impersonate=True)
         video_id = self._search_regex(
             r'(?:id=["\']video|video-|iframe\.html\?guid=|data-src=["\'])([a-fA-F0-9-]{36})',
             webpage, 'video id')
-        return self.url_result('wsj:%s' % video_id, WSJIE.ie_key(), video_id)
+        return self.url_result(f'wsj:{video_id}', WSJIE.ie_key(), video_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/wwe.py b/plugins/youtube_download/yt_dlp/extractor/wwe.py
index 9bbd477..3b8197a 100644
--- a/plugins/youtube_download/yt_dlp/extractor/wwe.py
+++ b/plugins/youtube_download/yt_dlp/extractor/wwe.py
@@ -1,7 +1,6 @@
 import re
 
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     try_get,
     unescapeHTML,
@@ -17,7 +16,7 @@ class WWEBaseIE(InfoExtractor):
     }
 
     def _extract_entry(self, data, url, video_id=None):
-        video_id = compat_str(video_id or data['nid'])
+        video_id = str(video_id or data['nid'])
         title = data['title']
 
         formats = self._extract_m3u8_formats(
@@ -69,7 +68,7 @@ class WWEIE(WWEBaseIE):
             'title': 'Daniel Bryan vs. Andrade "Cien" Almas: SmackDown LIVE, Sept. 4, 2018',
             'description': 'md5:2d7424dbc6755c61a0e649d2a8677f67',
             'thumbnail': r're:^https?://.*\.jpg$',
-        }
+        },
     }, {
         'url': 'https://de.wwe.com/videos/gran-metalik-vs-tony-nese-wwe-205-live-sept-4-2018',
         'only_matching': True,
@@ -111,7 +110,7 @@ class WWEPlaylistIE(WWEBaseIE):
 
     @classmethod
     def suitable(cls, url):
-        return False if WWEIE.suitable(url) else super(WWEPlaylistIE, cls).suitable(url)
+        return False if WWEIE.suitable(url) else super().suitable(url)
 
     def _real_extract(self, url):
         display_id = self._match_id(url)
diff --git a/plugins/youtube_download/yt_dlp/extractor/wykop.py b/plugins/youtube_download/yt_dlp/extractor/wykop.py
index 1d29cc8..08cad1f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/wykop.py
+++ b/plugins/youtube_download/yt_dlp/extractor/wykop.py
@@ -11,7 +11,7 @@ from ..utils import (
 )
 
 
-class WykopBaseExtractor(InfoExtractor):
+class WykopBaseIE(InfoExtractor):
     def _get_token(self, force_refresh=False):
         if not force_refresh:
             maybe_cached = self.cache.load('wykop', 'bearer')
@@ -72,7 +72,7 @@ class WykopBaseExtractor(InfoExtractor):
         }
 
 
-class WykopDigIE(WykopBaseExtractor):
+class WykopDigIE(WykopBaseIE):
     IE_NAME = 'wykop:dig'
     _VALID_URL = r'https?://(?:www\.)?wykop\.pl/link/(?P<id>\d+)'
 
@@ -128,7 +128,7 @@ class WykopDigIE(WykopBaseExtractor):
         }
 
 
-class WykopDigCommentIE(WykopBaseExtractor):
+class WykopDigCommentIE(WykopBaseIE):
     IE_NAME = 'wykop:dig:comment'
     _VALID_URL = r'https?://(?:www\.)?wykop\.pl/link/(?P<dig_id>\d+)/[^/]+/komentarz/(?P<id>\d+)'
 
@@ -177,7 +177,7 @@ class WykopDigCommentIE(WykopBaseExtractor):
         }
 
 
-class WykopPostIE(WykopBaseExtractor):
+class WykopPostIE(WykopBaseIE):
     IE_NAME = 'wykop:post'
     _VALID_URL = r'https?://(?:www\.)?wykop\.pl/wpis/(?P<id>\d+)'
 
@@ -209,7 +209,7 @@ class WykopPostIE(WykopBaseExtractor):
         'playlist_mincount': 15,
         'params': {
             'flat_playlist': True,
-        }
+        },
     }]
 
     @classmethod
@@ -228,7 +228,7 @@ class WykopPostIE(WykopBaseExtractor):
         }
 
 
-class WykopPostCommentIE(WykopBaseExtractor):
+class WykopPostCommentIE(WykopBaseIE):
     IE_NAME = 'wykop:post:comment'
     _VALID_URL = r'https?://(?:www\.)?wykop\.pl/wpis/(?P<post_id>\d+)/[^/#]+#(?P<id>\d+)'
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/xanimu.py b/plugins/youtube_download/yt_dlp/extractor/xanimu.py
index e0b7bf9..b489358 100644
--- a/plugins/youtube_download/yt_dlp/extractor/xanimu.py
+++ b/plugins/youtube_download/yt_dlp/extractor/xanimu.py
@@ -16,11 +16,11 @@ class XanimuIE(InfoExtractor):
             'thumbnail': 'https://xanimu.com/storage/2020/09/the-princess-and-the-frog-hentai.jpg',
             'description': r're:^Enjoy The Princess \+ The Frog Hentai',
             'duration': 207.0,
-            'age_limit': 18
-        }
+            'age_limit': 18,
+        },
     }, {
         'url': 'https://xanimu.com/huge-expansion/',
-        'only_matching': True
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
@@ -28,14 +28,15 @@ class XanimuIE(InfoExtractor):
         webpage = self._download_webpage(url, video_id)
 
         formats = []
-        for format in ['videoHigh', 'videoLow']:
-            format_url = self._search_json(r'var\s+%s\s*=' % re.escape(format), webpage, format,
-                                           video_id, default=None, contains_pattern=r'[\'"]([^\'"]+)[\'"]')
+        for format_id in ['videoHigh', 'videoLow']:
+            format_url = self._search_json(
+                rf'var\s+{re.escape(format_id)}\s*=', webpage, format_id,
+                video_id, default=None, contains_pattern=r'[\'"]([^\'"]+)[\'"]')
             if format_url:
                 formats.append({
                     'url': format_url,
-                    'format_id': format,
-                    'quality': -2 if format.endswith('Low') else None,
+                    'format_id': format_id,
+                    'quality': -2 if format_id.endswith('Low') else None,
                 })
 
         return {
@@ -47,5 +48,5 @@ class XanimuIE(InfoExtractor):
             'description': self._html_search_meta('description', webpage, default=None),
             'duration': int_or_none(self._search_regex(r'duration:\s*[\'"]([^\'"]+?)[\'"]',
                                     webpage, 'duration', fatal=False)),
-            'age_limit': 18
+            'age_limit': 18,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/xbef.py b/plugins/youtube_download/yt_dlp/extractor/xbef.py
deleted file mode 100644
index ac69528..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/xbef.py
+++ /dev/null
@@ -1,42 +0,0 @@
-from .common import InfoExtractor
-from ..compat import compat_urllib_parse_unquote
-
-
-class XBefIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?xbef\.com/video/(?P<id>[0-9]+)'
-    _TEST = {
-        'url': 'http://xbef.com/video/5119-glamourous-lesbians-smoking-drinking-and-fucking',
-        'md5': 'a478b565baff61634a98f5e5338be995',
-        'info_dict': {
-            'id': '5119',
-            'ext': 'mp4',
-            'title': 'md5:7358a9faef8b7b57acda7c04816f170e',
-            'age_limit': 18,
-            'thumbnail': r're:^http://.*\.jpg',
-        }
-    }
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-
-        title = self._html_search_regex(
-            r'<h1[^>]*>(.*?)</h1>', webpage, 'title')
-
-        config_url_enc = self._download_webpage(
-            'http://xbef.com/Main/GetVideoURLEncoded/%s' % video_id, video_id,
-            note='Retrieving config URL')
-        config_url = compat_urllib_parse_unquote(config_url_enc)
-        config = self._download_xml(
-            config_url, video_id, note='Retrieving config')
-
-        video_url = config.find('./file').text
-        thumbnail = config.find('./image').text
-
-        return {
-            'id': video_id,
-            'url': video_url,
-            'title': title,
-            'thumbnail': thumbnail,
-            'age_limit': 18,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/xboxclips.py b/plugins/youtube_download/yt_dlp/extractor/xboxclips.py
index 235b567..d726e62 100644
--- a/plugins/youtube_download/yt_dlp/extractor/xboxclips.py
+++ b/plugins/youtube_download/yt_dlp/extractor/xboxclips.py
@@ -21,7 +21,7 @@ class XboxClipsIE(InfoExtractor):
             'filesize_approx': 26800000,
             'upload_date': '20140807',
             'duration': 56,
-        }
+        },
     }, {
         'url': 'https://gameclips.io/iAbdulElah/074a69a9-5faf-46aa-b93b-9909c1720325',
         'only_matching': True,
@@ -32,7 +32,7 @@ class XboxClipsIE(InfoExtractor):
 
         if '/video.php' in url:
             qs = parse_qs(url)
-            url = 'https://gameclips.io/%s/%s' % (qs['gamertag'][0], qs['vid'][0])
+            url = 'https://gameclips.io/{}/{}'.format(qs['gamertag'][0], qs['vid'][0])
 
         webpage = self._download_webpage(url, video_id)
         info = self._parse_html5_media_entries(url, webpage, video_id)[0]
diff --git a/plugins/youtube_download/yt_dlp/extractor/xfileshare.py b/plugins/youtube_download/yt_dlp/extractor/xfileshare.py
deleted file mode 100644
index 08c6d6c..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/xfileshare.py
+++ /dev/null
@@ -1,198 +0,0 @@
-import re
-
-from .common import InfoExtractor
-from ..utils import (
-    ExtractorError,
-    decode_packed_codes,
-    determine_ext,
-    int_or_none,
-    js_to_json,
-    urlencode_postdata,
-)
-
-
-# based on openload_decode from 2bfeee69b976fe049761dd3012e30b637ee05a58
-def aa_decode(aa_code):
-    symbol_table = [
-        ('7', '((ﾟｰﾟ) + (o^_^o))'),
-        ('6', '((o^_^o) +(o^_^o))'),
-        ('5', '((ﾟｰﾟ) + (ﾟΘﾟ))'),
-        ('2', '((o^_^o) - (ﾟΘﾟ))'),
-        ('4', '(ﾟｰﾟ)'),
-        ('3', '(o^_^o)'),
-        ('1', '(ﾟΘﾟ)'),
-        ('0', '(c^_^o)'),
-    ]
-    delim = '(ﾟДﾟ)[ﾟεﾟ]+'
-    ret = ''
-    for aa_char in aa_code.split(delim):
-        for val, pat in symbol_table:
-            aa_char = aa_char.replace(pat, val)
-        aa_char = aa_char.replace('+ ', '')
-        m = re.match(r'^\d+', aa_char)
-        if m:
-            ret += chr(int(m.group(0), 8))
-        else:
-            m = re.match(r'^u([\da-f]+)', aa_char)
-            if m:
-                ret += chr(int(m.group(1), 16))
-    return ret
-
-
-class XFileShareIE(InfoExtractor):
-    _SITES = (
-        (r'aparat\.cam', 'Aparat'),
-        (r'clipwatching\.com', 'ClipWatching'),
-        (r'gounlimited\.to', 'GoUnlimited'),
-        (r'govid\.me', 'GoVid'),
-        (r'holavid\.com', 'HolaVid'),
-        (r'streamty\.com', 'Streamty'),
-        (r'thevideobee\.to', 'TheVideoBee'),
-        (r'uqload\.com', 'Uqload'),
-        (r'vidbom\.com', 'VidBom'),
-        (r'vidlo\.us', 'vidlo'),
-        (r'vidlocker\.xyz', 'VidLocker'),
-        (r'vidshare\.tv', 'VidShare'),
-        (r'vup\.to', 'VUp'),
-        (r'wolfstream\.tv', 'WolfStream'),
-        (r'xvideosharing\.com', 'XVideoSharing'),
-    )
-
-    IE_DESC = 'XFileShare based sites: %s' % ', '.join(list(zip(*_SITES))[1])
-    _VALID_URL = (r'https?://(?:www\.)?(?P<host>%s)/(?:embed-)?(?P<id>[0-9a-zA-Z]+)'
-                  % '|'.join(site for site in list(zip(*_SITES))[0]))
-    _EMBED_REGEX = [r'<iframe\b[^>]+\bsrc=(["\'])(?P<url>(?:https?:)?//(?:%s)/embed-[0-9a-zA-Z]+.*?)\1' % '|'.join(site for site in list(zip(*_SITES))[0])]
-
-    _FILE_NOT_FOUND_REGEXES = (
-        r'>(?:404 - )?File Not Found<',
-        r'>The file was removed by administrator<',
-    )
-
-    _TESTS = [{
-        'url': 'https://uqload.com/dltx1wztngdz',
-        'md5': '3cfbb65e4c90e93d7b37bcb65a595557',
-        'info_dict': {
-            'id': 'dltx1wztngdz',
-            'ext': 'mp4',
-            'title': 'Rick Astley Never Gonna Give You mp4',
-            'thumbnail': r're:https://.*\.jpg'
-        }
-    }, {
-        'url': 'http://xvideosharing.com/fq65f94nd2ve',
-        'md5': '4181f63957e8fe90ac836fa58dc3c8a6',
-        'info_dict': {
-            'id': 'fq65f94nd2ve',
-            'ext': 'mp4',
-            'title': 'sample',
-            'thumbnail': r're:http://.*\.jpg',
-        },
-    }, {
-        'url': 'https://aparat.cam/n4d6dh0wvlpr',
-        'only_matching': True,
-    }, {
-        'url': 'https://wolfstream.tv/nthme29v9u2x',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        host, video_id = self._match_valid_url(url).groups()
-
-        url = 'https://%s/' % host + ('embed-%s.html' % video_id if host in ('govid.me', 'vidlo.us') else video_id)
-        webpage = self._download_webpage(url, video_id)
-
-        if any(re.search(p, webpage) for p in self._FILE_NOT_FOUND_REGEXES):
-            raise ExtractorError('Video %s does not exist' % video_id, expected=True)
-
-        fields = self._hidden_inputs(webpage)
-
-        if fields.get('op') == 'download1':
-            countdown = int_or_none(self._search_regex(
-                r'<span id="countdown_str">(?:[Ww]ait)?\s*<span id="cxc">(\d+)</span>\s*(?:seconds?)?</span>',
-                webpage, 'countdown', default=None))
-            if countdown:
-                self._sleep(countdown, video_id)
-
-            webpage = self._download_webpage(
-                url, video_id, 'Downloading video page',
-                data=urlencode_postdata(fields), headers={
-                    'Referer': url,
-                    'Content-type': 'application/x-www-form-urlencoded',
-                })
-
-        title = (self._search_regex(
-            (r'style="z-index: [0-9]+;">([^<]+)</span>',
-             r'<td nowrap>([^<]+)</td>',
-             r'h4-fine[^>]*>([^<]+)<',
-             r'>Watch (.+)[ <]',
-             r'<h2 class="video-page-head">([^<]+)</h2>',
-             r'<h2 style="[^"]*color:#403f3d[^"]*"[^>]*>([^<]+)<',  # streamin.to
-             r'title\s*:\s*"([^"]+)"'),  # govid.me
-            webpage, 'title', default=None) or self._og_search_title(
-            webpage, default=None) or video_id).strip()
-
-        for regex, func in (
-                (r'(eval\(function\(p,a,c,k,e,d\){.+)', decode_packed_codes),
-                (r'(ﾟ.+)', aa_decode)):
-            obf_code = self._search_regex(regex, webpage, 'obfuscated code', default=None)
-            if obf_code:
-                webpage = webpage.replace(obf_code, func(obf_code))
-
-        formats = []
-
-        jwplayer_data = self._search_regex(
-            [
-                r'jwplayer\("[^"]+"\)\.load\(\[({.+?})\]\);',
-                r'jwplayer\("[^"]+"\)\.setup\(({.+?})\);',
-            ], webpage,
-            'jwplayer data', default=None)
-        if jwplayer_data:
-            jwplayer_data = self._parse_json(
-                jwplayer_data.replace(r"\'", "'"), video_id, js_to_json)
-            if jwplayer_data:
-                formats = self._parse_jwplayer_data(
-                    jwplayer_data, video_id, False,
-                    m3u8_id='hls', mpd_id='dash')['formats']
-
-        if not formats:
-            urls = []
-            for regex in (
-                    r'(?:file|src)\s*:\s*(["\'])(?P<url>http(?:(?!\1).)+\.(?:m3u8|mp4|flv)(?:(?!\1).)*)\1',
-                    r'file_link\s*=\s*(["\'])(?P<url>http(?:(?!\1).)+)\1',
-                    r'addVariable\((\\?["\'])file\1\s*,\s*(\\?["\'])(?P<url>http(?:(?!\2).)+)\2\)',
-                    r'<embed[^>]+src=(["\'])(?P<url>http(?:(?!\1).)+\.(?:m3u8|mp4|flv)(?:(?!\1).)*)\1'):
-                for mobj in re.finditer(regex, webpage):
-                    video_url = mobj.group('url')
-                    if video_url not in urls:
-                        urls.append(video_url)
-
-            sources = self._search_regex(
-                r'sources\s*:\s*(\[(?!{)[^\]]+\])', webpage, 'sources', default=None)
-            if sources:
-                urls.extend(self._parse_json(sources, video_id))
-
-            formats = []
-            for video_url in urls:
-                if determine_ext(video_url) == 'm3u8':
-                    formats.extend(self._extract_m3u8_formats(
-                        video_url, video_id, 'mp4',
-                        entry_protocol='m3u8_native', m3u8_id='hls',
-                        fatal=False))
-                else:
-                    formats.append({
-                        'url': video_url,
-                        'format_id': 'sd',
-                    })
-
-        thumbnail = self._search_regex(
-            [
-                r'<video[^>]+poster="([^"]+)"',
-                r'(?:image|poster)\s*:\s*["\'](http[^"\']+)["\'],',
-            ], webpage, 'thumbnail', default=None)
-
-        return {
-            'id': video_id,
-            'title': title,
-            'thumbnail': thumbnail,
-            'formats': formats,
-            'http_headers': {'Referer': url}
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/xhamster.py b/plugins/youtube_download/yt_dlp/extractor/xhamster.py
index 3722479..3cbe27f 100644
--- a/plugins/youtube_download/yt_dlp/extractor/xhamster.py
+++ b/plugins/youtube_download/yt_dlp/extractor/xhamster.py
@@ -2,13 +2,12 @@ import itertools
 import re
 
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
+    ExtractorError,
     clean_html,
     determine_ext,
     dict_get,
     extract_attributes,
-    ExtractorError,
     float_or_none,
     int_or_none,
     parse_duration,
@@ -21,18 +20,18 @@ from ..utils import (
 
 
 class XHamsterIE(InfoExtractor):
-    _DOMAINS = r'(?:xhamster\.(?:com|one|desi)|xhms\.pro|xhamster\d+\.com|xhday\.com|xhvid\.com)'
-    _VALID_URL = r'''(?x)
+    _DOMAINS = r'(?:xhamster\.(?:com|one|desi)|xhms\.pro|xhamster\d+\.(?:com|desi)|xhday\.com|xhvid\.com)'
+    _VALID_URL = rf'''(?x)
                     https?://
-                        (?:.+?\.)?%s/
+                        (?:[^/?#]+\.)?{_DOMAINS}/
                         (?:
                             movies/(?P<id>[\dA-Za-z]+)/(?P<display_id>[^/]*)\.html|
                             videos/(?P<display_id_2>[^/]*)-(?P<id_2>[\dA-Za-z]+)
                         )
-                    ''' % _DOMAINS
+                    '''
     _TESTS = [{
         'url': 'https://xhamster.com/videos/femaleagent-shy-beauty-takes-the-bait-1509445',
-        'md5': '34e1ab926db5dc2750fed9e1f34304bb',
+        'md5': 'e009ea6b849b129e3bebaeb9cf0dee51',
         'info_dict': {
             'id': '1509445',
             'display_id': 'femaleagent-shy-beauty-takes-the-bait',
@@ -44,6 +43,11 @@ class XHamsterIE(InfoExtractor):
             'uploader_id': 'ruseful2011',
             'duration': 893,
             'age_limit': 18,
+            'thumbnail': 'https://thumb-nss.xhcdn.com/a/u3Vr5F2vvcU3yK59_jJqVA/001/509/445/1280x720.8.jpg',
+            'uploader_url': 'https://xhamster.com/users/ruseful2011',
+            'description': '',
+            'view_count': int,
+            'comment_count': int,
         },
     }, {
         'url': 'https://xhamster.com/videos/britney-spears-sexy-booty-2221348?hd=',
@@ -57,6 +61,10 @@ class XHamsterIE(InfoExtractor):
             'uploader': 'jojo747400',
             'duration': 200,
             'age_limit': 18,
+            'description': '',
+            'view_count': int,
+            'thumbnail': 'https://thumb-nss.xhcdn.com/a/kk5nio_iR-h4Z3frfVtoDw/002/221/348/1280x720.4.jpg',
+            'comment_count': int,
         },
         'params': {
             'skip_download': True,
@@ -74,6 +82,11 @@ class XHamsterIE(InfoExtractor):
             'uploader_id': 'parejafree',
             'duration': 72,
             'age_limit': 18,
+            'comment_count': int,
+            'uploader_url': 'https://xhamster.com/users/parejafree',
+            'description': '',
+            'view_count': int,
+            'thumbnail': 'https://thumb-nss.xhcdn.com/a/xc8MSwVKcsQeRRiTT-saMQ/005/667/973/1280x720.2.jpg',
         },
         'params': {
             'skip_download': True,
@@ -123,6 +136,9 @@ class XHamsterIE(InfoExtractor):
     }, {
         'url': 'https://xhvid.com/videos/lk-mm-xhc6wn6',
         'only_matching': True,
+    }, {
+        'url': 'https://xhamster20.desi/videos/my-verification-video-scottishmistress23-11937369',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
@@ -177,7 +193,7 @@ class XHamsterIE(InfoExtractor):
                         continue
                     format_urls.add(format_url)
                     formats.append({
-                        'format_id': '%s-%s' % (format_id, quality),
+                        'format_id': f'{format_id}-{quality}',
                         'url': format_url,
                         'ext': determine_ext(format_url, 'mp4'),
                         'height': get_height(quality),
@@ -228,7 +244,7 @@ class XHamsterIE(InfoExtractor):
                                            or str_or_none(standard_format.get('label'))
                                            or '')
                                 formats.append({
-                                    'format_id': '%s-%s' % (format_id, quality),
+                                    'format_id': f'{format_id}-{quality}',
                                     'url': standard_url,
                                     'ext': ext,
                                     'height': get_height(quality),
@@ -245,7 +261,7 @@ class XHamsterIE(InfoExtractor):
                     if not isinstance(c, dict):
                         continue
                     c_name = c.get('name')
-                    if isinstance(c_name, compat_str):
+                    if isinstance(c_name, str):
                         categories.append(c_name)
             else:
                 categories = None
@@ -258,7 +274,7 @@ class XHamsterIE(InfoExtractor):
                 'description': video.get('description'),
                 'timestamp': int_or_none(video.get('created')),
                 'uploader': try_get(
-                    video, lambda x: x['author']['name'], compat_str),
+                    video, lambda x: x['author']['name'], str),
                 'uploader_url': uploader_url,
                 'uploader_id': uploader_url.split('/')[-1] if uploader_url else None,
                 'thumbnail': video.get('thumbURL'),
@@ -268,7 +284,7 @@ class XHamsterIE(InfoExtractor):
                     video, lambda x: x['rating']['likes'], int)),
                 'dislike_count': int_or_none(try_get(
                     video, lambda x: x['rating']['dislikes'], int)),
-                'comment_count': int_or_none(video.get('views')),
+                'comment_count': int_or_none(video.get('comments')),
                 'age_limit': age_limit if age_limit is not None else 18,
                 'categories': categories,
                 'formats': formats,
@@ -372,7 +388,7 @@ class XHamsterIE(InfoExtractor):
 
 
 class XHamsterEmbedIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:.+?\.)?%s/xembed\.php\?video=(?P<id>\d+)' % XHamsterIE._DOMAINS
+    _VALID_URL = rf'https?://(?:[^/?#]+\.)?{XHamsterIE._DOMAINS}/xembed\.php\?video=(?P<id>\d+)'
     _EMBED_REGEX = [r'<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//(?:www\.)?xhamster\.com/xembed\.php\?video=\d+)\1']
     _TEST = {
         'url': 'http://xhamster.com/xembed.php?video=3328539',
@@ -385,7 +401,7 @@ class XHamsterEmbedIE(InfoExtractor):
             'uploader': 'ManyakisArt',
             'duration': 5,
             'age_limit': 18,
-        }
+        },
     }
 
     def _real_extract(self, url):
@@ -394,20 +410,20 @@ class XHamsterEmbedIE(InfoExtractor):
         webpage = self._download_webpage(url, video_id)
 
         video_url = self._search_regex(
-            r'href="(https?://xhamster\.com/(?:movies/{0}/[^"]*\.html|videos/[^/]*-{0})[^"]*)"'.format(video_id),
+            rf'href="(https?://xhamster\.com/(?:movies/{video_id}/[^"]*\.html|videos/[^/]*-{video_id})[^"]*)"',
             webpage, 'xhamster url', default=None)
 
         if not video_url:
-            vars = self._parse_json(
+            player_vars = self._parse_json(
                 self._search_regex(r'vars\s*:\s*({.+?})\s*,\s*\n', webpage, 'vars'),
                 video_id)
-            video_url = dict_get(vars, ('downloadLink', 'homepageLink', 'commentsLink', 'shareUrl'))
+            video_url = dict_get(player_vars, ('downloadLink', 'homepageLink', 'commentsLink', 'shareUrl'))
 
         return self.url_result(video_url, 'XHamster')
 
 
 class XHamsterUserIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:.+?\.)?%s/users/(?P<id>[^/?#&]+)' % XHamsterIE._DOMAINS
+    _VALID_URL = rf'https?://(?:[^/?#]+\.)?{XHamsterIE._DOMAINS}/(?:(?P<user>users)|creators)/(?P<id>[^/?#&]+)'
     _TESTS = [{
         # Paginated user profile
         'url': 'https://xhamster.com/users/netvideogirls/videos',
@@ -422,6 +438,12 @@ class XHamsterUserIE(InfoExtractor):
             'id': 'firatkaan',
         },
         'playlist_mincount': 1,
+    }, {
+        'url': 'https://xhamster.com/creators/squirt-orgasm-69',
+        'info_dict': {
+            'id': 'squirt-orgasm-69',
+        },
+        'playlist_mincount': 150,
     }, {
         'url': 'https://xhday.com/users/mobhunter',
         'only_matching': True,
@@ -430,11 +452,12 @@ class XHamsterUserIE(InfoExtractor):
         'only_matching': True,
     }]
 
-    def _entries(self, user_id):
-        next_page_url = 'https://xhamster.com/users/%s/videos/1' % user_id
+    def _entries(self, user_id, is_user):
+        prefix, suffix = ('users', 'videos') if is_user else ('creators', 'exclusive')
+        next_page_url = f'https://xhamster.com/{prefix}/{user_id}/{suffix}/1'
         for pagenum in itertools.count(1):
             page = self._download_webpage(
-                next_page_url, user_id, 'Downloading page %s' % pagenum)
+                next_page_url, user_id, f'Downloading page {pagenum}')
             for video_tag in re.findall(
                     r'(<a[^>]+class=["\'].*?\bvideo-thumb__image-container[^>]+>)',
                     page):
@@ -454,5 +477,5 @@ class XHamsterUserIE(InfoExtractor):
                 break
 
     def _real_extract(self, url):
-        user_id = self._match_id(url)
-        return self.playlist_result(self._entries(user_id), user_id)
+        user, user_id = self._match_valid_url(url).group('user', 'id')
+        return self.playlist_result(self._entries(user_id, bool(user)), user_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/xiaohongshu.py b/plugins/youtube_download/yt_dlp/extractor/xiaohongshu.py
new file mode 100644
index 0000000..4a6129b
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/xiaohongshu.py
@@ -0,0 +1,109 @@
+
+from .common import InfoExtractor
+from ..utils import (
+    float_or_none,
+    int_or_none,
+    js_to_json,
+    url_or_none,
+    urlhandle_detect_ext,
+)
+from ..utils.traversal import traverse_obj
+
+
+class XiaoHongShuIE(InfoExtractor):
+    _VALID_URL = r'https?://www\.xiaohongshu\.com/(?:explore|discovery/item)/(?P<id>[\da-f]+)'
+    IE_DESC = '小红书'
+    _TESTS = [{
+        'url': 'https://www.xiaohongshu.com/explore/6411cf99000000001300b6d9',
+        'md5': '2a87a77ddbedcaeeda8d7eae61b61228',
+        'info_dict': {
+            'id': '6411cf99000000001300b6d9',
+            'ext': 'mp4',
+            'uploader_id': '5c31698d0000000007018a31',
+            'description': '#今日快乐今日发[话题]# #吃货薯看这里[话题]# #香妃蛋糕[话题]# #小五卷蛋糕[话题]# #新手蛋糕卷[话题]#',
+            'title': '香妃蛋糕也太香了吧🔥不需要卷❗️绝对的友好',
+            'tags': ['今日快乐今日发', '吃货薯看这里', '香妃蛋糕', '小五卷蛋糕', '新手蛋糕卷'],
+            'duration': 101.726,
+            'thumbnail': r're:https?://sns-webpic-qc\.xhscdn\.com/\d+/[a-z0-9]+/[\w]+',
+        },
+    }, {
+        'url': 'https://www.xiaohongshu.com/discovery/item/674051740000000007027a15?xsec_token=CBgeL8Dxd1ZWBhwqRd568gAZ_iwG-9JIf9tnApNmteU2E=',
+        'info_dict': {
+            'id': '674051740000000007027a15',
+            'ext': 'mp4',
+            'title': '相互喜欢就可以了',
+            'uploader_id': '63439913000000001901f49a',
+            'duration': 28.073,
+            'description': '#广州[话题]# #深圳[话题]# #香港[话题]# #街头采访[话题]# #是你喜欢的类型[话题]#',
+            'thumbnail': r're:https?://sns-webpic-qc\.xhscdn\.com/\d+/[\da-f]+/[^/]+',
+            'tags': ['广州', '深圳', '香港', '街头采访', '是你喜欢的类型'],
+        },
+    }]
+
+    def _real_extract(self, url):
+        display_id = self._match_id(url)
+        webpage = self._download_webpage(url, display_id)
+        initial_state = self._search_json(
+            r'window\.__INITIAL_STATE__\s*=', webpage, 'initial state', display_id, transform_source=js_to_json)
+
+        note_info = traverse_obj(initial_state, ('note', 'noteDetailMap', display_id, 'note'))
+        video_info = traverse_obj(note_info, ('video', 'media', 'stream', ..., ...))
+
+        formats = []
+        for info in video_info:
+            format_info = traverse_obj(info, {
+                'fps': ('fps', {int_or_none}),
+                'width': ('width', {int_or_none}),
+                'height': ('height', {int_or_none}),
+                'vcodec': ('videoCodec', {str}),
+                'acodec': ('audioCodec', {str}),
+                'abr': ('audioBitrate', {int_or_none(scale=1000)}),
+                'vbr': ('videoBitrate', {int_or_none(scale=1000)}),
+                'audio_channels': ('audioChannels', {int_or_none}),
+                'tbr': ('avgBitrate', {int_or_none(scale=1000)}),
+                'format': ('qualityType', {str}),
+                'filesize': ('size', {int_or_none}),
+                'duration': ('duration', {float_or_none(scale=1000)}),
+            })
+
+            formats.extend(traverse_obj(info, (('masterUrl', ('backupUrls', ...)), {
+                lambda u: url_or_none(u) and {'url': u, **format_info}})))
+
+        if origin_key := traverse_obj(note_info, ('video', 'consumer', 'originVideoKey', {str})):
+            # Not using a head request because of false negatives
+            urlh = self._request_webpage(
+                f'https://sns-video-bd.xhscdn.com/{origin_key}', display_id,
+                'Checking original video availability', 'Original video is not available', fatal=False)
+            if urlh:
+                formats.append({
+                    'format_id': 'direct',
+                    'ext': urlhandle_detect_ext(urlh, default='mp4'),
+                    'filesize': int_or_none(urlh.get_header('Content-Length')),
+                    'url': urlh.url,
+                    'quality': 1,
+                })
+
+        thumbnails = []
+        for image_info in traverse_obj(note_info, ('imageList', ...)):
+            thumbnail_info = traverse_obj(image_info, {
+                'height': ('height', {int_or_none}),
+                'width': ('width', {int_or_none}),
+            })
+            for thumb_url in traverse_obj(image_info, (('urlDefault', 'urlPre'), {url_or_none})):
+                thumbnails.append({
+                    'url': thumb_url,
+                    **thumbnail_info,
+                })
+
+        return {
+            'id': display_id,
+            'formats': formats,
+            'thumbnails': thumbnails,
+            'title': self._html_search_meta(['og:title'], webpage, default=None),
+            **traverse_obj(note_info, {
+                'title': ('title', {str}),
+                'description': ('desc', {str}),
+                'tags': ('tagList', ..., 'name', {str}),
+                'uploader_id': ('user', 'userId', {str}),
+            }),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/ximalaya.py b/plugins/youtube_download/yt_dlp/extractor/ximalaya.py
index 3d5e6cf..02bf6a7 100644
--- a/plugins/youtube_download/yt_dlp/extractor/ximalaya.py
+++ b/plugins/youtube_download/yt_dlp/extractor/ximalaya.py
@@ -1,7 +1,17 @@
+import base64
 import math
+import time
 
 from .common import InfoExtractor
-from ..utils import traverse_obj, try_call, InAdvancePagedList
+from .videa import VideaIE
+from ..utils import (
+    InAdvancePagedList,
+    int_or_none,
+    str_or_none,
+    traverse_obj,
+    try_call,
+    update_url_query,
+)
 
 
 class XimalayaBaseIE(InfoExtractor):
@@ -11,7 +21,7 @@ class XimalayaBaseIE(InfoExtractor):
 class XimalayaIE(XimalayaBaseIE):
     IE_NAME = 'ximalaya'
     IE_DESC = '喜马拉雅FM'
-    _VALID_URL = r'https?://(?:www\.|m\.)?ximalaya\.com/(:?(?P<uid>\d+)/)?sound/(?P<id>[0-9]+)'
+    _VALID_URL = r'https?://(?:www\.|m\.)?ximalaya\.com/(?:(?P<uid>\d+)/)?sound/(?P<id>[0-9]+)'
     _TESTS = [
         {
             'url': 'http://www.ximalaya.com/sound/47740352/',
@@ -19,10 +29,10 @@ class XimalayaIE(XimalayaBaseIE):
                 'id': '47740352',
                 'ext': 'm4a',
                 'uploader': '小彬彬爱听书',
-                'uploader_id': 61425525,
+                'uploader_id': '61425525',
                 'uploader_url': 'http://www.ximalaya.com/zhubo/61425525/',
                 'title': '261.唐诗三百首.卷八.送孟浩然之广陵.李白',
-                'description': "contains:《送孟浩然之广陵》\n作者：李白\n故人西辞黄鹤楼，烟花三月下扬州。\n孤帆远影碧空尽，惟见长江天际流。",
+                'description': 'contains:《送孟浩然之广陵》\n作者：李白\n故人西辞黄鹤楼，烟花三月下扬州。\n孤帆远影碧空尽，惟见长江天际流。',
                 'thumbnail': r're:^https?://.*\.jpg',
                 'thumbnails': [
                     {
@@ -33,14 +43,14 @@ class XimalayaIE(XimalayaBaseIE):
                         'name': 'cover_url_142',
                         'url': r're:^https?://.*\.jpg',
                         'width': 180,
-                        'height': 180
-                    }
+                        'height': 180,
+                    },
                 ],
                 'categories': ['其他'],
                 'duration': 93,
                 'view_count': int,
                 'like_count': int,
-            }
+            },
         },
         {
             'url': 'http://m.ximalaya.com/61425525/sound/47740352/',
@@ -48,10 +58,10 @@ class XimalayaIE(XimalayaBaseIE):
                 'id': '47740352',
                 'ext': 'm4a',
                 'uploader': '小彬彬爱听书',
-                'uploader_id': 61425525,
+                'uploader_id': '61425525',
                 'uploader_url': 'http://www.ximalaya.com/zhubo/61425525/',
                 'title': '261.唐诗三百首.卷八.送孟浩然之广陵.李白',
-                'description': "contains:《送孟浩然之广陵》\n作者：李白\n故人西辞黄鹤楼，烟花三月下扬州。\n孤帆远影碧空尽，惟见长江天际流。",
+                'description': 'contains:《送孟浩然之广陵》\n作者：李白\n故人西辞黄鹤楼，烟花三月下扬州。\n孤帆远影碧空尽，惟见长江天际流。',
                 'thumbnail': r're:^https?://.*\.jpg',
                 'thumbnails': [
                     {
@@ -62,35 +72,104 @@ class XimalayaIE(XimalayaBaseIE):
                         'name': 'cover_url_142',
                         'url': r're:^https?://.*\.jpg',
                         'width': 180,
-                        'height': 180
-                    }
+                        'height': 180,
+                    },
                 ],
                 'categories': ['人文'],
                 'duration': 93,
                 'view_count': int,
                 'like_count': int,
-            }
-        }
+            },
+        },
+        {
+            # VIP-restricted audio
+            'url': 'https://www.ximalaya.com/sound/562111701',
+            'only_matching': True,
+        },
     ]
 
+    @staticmethod
+    def _decrypt_filename(file_id, seed):
+        cgstr = ''
+        key = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/\\:._-1234567890'
+        for _ in key:
+            seed = float(int(211 * seed + 30031) % 65536)
+            r = int(seed / 65536 * len(key))
+            cgstr += key[r]
+            key = key.replace(key[r], '')
+        parts = file_id.split('*')
+        filename = ''.join(cgstr[int(part)] for part in parts if part.isdecimal())
+        if not filename.startswith('/'):
+            filename = '/' + filename
+        return filename
+
+    @staticmethod
+    def _decrypt_url_params(encrypted_params):
+        params = VideaIE.rc4(
+            base64.b64decode(encrypted_params), 'xkt3a41psizxrh9l').split('-')
+        # sign, token, timestamp
+        return params[1], params[2], params[3]
+
     def _real_extract(self, url):
         scheme = 'https' if url.startswith('https') else 'http'
 
         audio_id = self._match_id(url)
-        audio_info_file = '%s://m.ximalaya.com/tracks/%s.json' % (scheme, audio_id)
-        audio_info = self._download_json(audio_info_file, audio_id,
-                                         'Downloading info json %s' % audio_info_file,
-                                         'Unable to download info file')
+        audio_info = self._download_json(
+            f'{scheme}://m.ximalaya.com/tracks/{audio_id}.json', audio_id,
+            'Downloading info json', 'Unable to download info file')
 
-        formats = [{
+        formats = []
+        # NOTE: VIP-restricted audio
+        if audio_info.get('is_paid'):
+            ts = int(time.time())
+            vip_info = self._download_json(
+                f'{scheme}://mpay.ximalaya.com/mobile/track/pay/{audio_id}/{ts}',
+                audio_id, 'Downloading VIP info json', 'Unable to download VIP info file',
+                query={'device': 'pc', 'isBackend': 'true', '_': ts})
+            filename = self._decrypt_filename(vip_info['fileId'], vip_info['seed'])
+            sign, token, timestamp = self._decrypt_url_params(vip_info['ep'])
+            vip_url = update_url_query(
+                f'{vip_info["domain"]}/download/{vip_info["apiVersion"]}{filename}', {
+                    'sign': sign,
+                    'token': token,
+                    'timestamp': timestamp,
+                    'buy_key': vip_info['buyKey'],
+                    'duration': vip_info['duration'],
+                })
+            fmt = {
+                'format_id': 'vip',
+                'url': vip_url,
+                'vcodec': 'none',
+            }
+            if '_preview_' in vip_url:
+                self.report_warning(
+                    f'This tracks requires a VIP account. Using a sample instead. {self._login_hint()}')
+                fmt.update({
+                    'format_note': 'Sample',
+                    'preference': -10,
+                    **traverse_obj(vip_info, {
+                        'filesize': ('sampleLength', {int_or_none}),
+                        'duration': ('sampleDuration', {int_or_none}),
+                    }),
+                })
+            else:
+                fmt.update(traverse_obj(vip_info, {
+                    'filesize': ('totalLength', {int_or_none}),
+                    'duration': ('duration', {int_or_none}),
+                }))
+
+            fmt['abr'] = try_call(lambda: fmt['filesize'] * 8 / fmt['duration'] / 1024)
+            formats.append(fmt)
+
+        formats.extend([{
             'format_id': f'{bps}k',
             'url': audio_info[k],
             'abr': bps,
-            'vcodec': 'none'
-        } for bps, k in ((24, 'play_path_32'), (64, 'play_path_64')) if audio_info.get(k)]
+            'vcodec': 'none',
+        } for bps, k in ((24, 'play_path_32'), (64, 'play_path_64')) if audio_info.get(k)])
 
         thumbnails = []
-        for k in audio_info.keys():
+        for k in audio_info:
             # cover pics kyes like: cover_url', 'cover_url_142'
             if k.startswith('cover_url'):
                 thumbnail = {'name': k, 'url': audio_info[k]}
@@ -107,7 +186,7 @@ class XimalayaIE(XimalayaBaseIE):
         return {
             'id': audio_id,
             'uploader': audio_info.get('nickname'),
-            'uploader_id': audio_uploader_id,
+            'uploader_id': str_or_none(audio_uploader_id),
             'uploader_url': f'{scheme}://www.ximalaya.com/zhubo/{audio_uploader_id}/' if audio_uploader_id else None,
             'title': audio_info['title'],
             'thumbnails': thumbnails,
diff --git a/plugins/youtube_download/yt_dlp/extractor/xinpianchang.py b/plugins/youtube_download/yt_dlp/extractor/xinpianchang.py
index ddc1d0b..23ed927 100644
--- a/plugins/youtube_download/yt_dlp/extractor/xinpianchang.py
+++ b/plugins/youtube_download/yt_dlp/extractor/xinpianchang.py
@@ -1,16 +1,15 @@
 from .common import InfoExtractor
 from ..utils import (
     int_or_none,
+    str_or_none,
     try_get,
-    update_url_query,
     url_or_none,
 )
 
 
 class XinpianchangIE(InfoExtractor):
-    _VALID_URL = r'https?://www\.xinpianchang\.com/(?P<id>[^/]+?)(?:\D|$)'
-    IE_NAME = 'xinpianchang'
-    IE_DESC = 'xinpianchang.com'
+    _VALID_URL = r'https?://(www\.)?xinpianchang\.com/(?P<id>a\d+)'
+    IE_DESC = '新片场'
     _TESTS = [{
         'url': 'https://www.xinpianchang.com/a11766551',
         'info_dict': {
@@ -21,9 +20,9 @@ class XinpianchangIE(InfoExtractor):
             'duration': 151,
             'thumbnail': r're:^https?://oss-xpc0\.xpccdn\.com.+/assets/',
             'uploader': '正时文创',
-            'uploader_id': 10357277,
+            'uploader_id': '10357277',
             'categories': ['宣传片', '国家城市', '广告', '其他'],
-            'keywords': ['北京冬奥会', '冰墩墩', '再见', '告别', '冰墩墩哭了', '感动', '闭幕式', '熄火']
+            'tags': ['北京冬奥会', '冰墩墩', '再见', '告别', '冰墩墩哭了', '感动', '闭幕式', '熄火'],
         },
     }, {
         'url': 'https://www.xinpianchang.com/a11762904',
@@ -35,9 +34,9 @@ class XinpianchangIE(InfoExtractor):
             'duration': 136,
             'thumbnail': r're:^https?://oss-xpc0\.xpccdn\.com.+/assets/',
             'uploader': '精品动画',
-            'uploader_id': 10858927,
+            'uploader_id': '10858927',
             'categories': ['动画', '三维CG'],
-            'keywords': ['France Télévisions', '法国3台', '蠢萌', '冬奥会']
+            'tags': ['France Télévisions', '法国3台', '蠢萌', '冬奥会'],
         },
     }, {
         'url': 'https://www.xinpianchang.com/a11779743?from=IndexPick&part=%E7%BC%96%E8%BE%91%E7%B2%BE%E9%80%89&index=2',
@@ -47,11 +46,11 @@ class XinpianchangIE(InfoExtractor):
     def _real_extract(self, url):
         video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id=video_id)
-        domain = self.find_value_with_regex(var='requireNewDomain', webpage=webpage)
-        vid = self.find_value_with_regex(var='vid', webpage=webpage)
-        app_key = self.find_value_with_regex(var='modeServerAppKey', webpage=webpage)
-        api = update_url_query(f'{domain}/mod/api/v2/media/{vid}', {'appKey': app_key})
-        data = self._download_json(api, video_id=video_id)['data']
+        video_data = self._search_nextjs_data(webpage, video_id)['props']['pageProps']['detail']['video']
+
+        data = self._download_json(
+            f'https://mod-api.xinpianchang.com/mod/api/v2/media/{video_data["vid"]}', video_id,
+            query={'appKey': video_data['appKey']})['data']
         formats, subtitles = [], {}
         for k, v in data.get('resource').items():
             if k in ('dash', 'hls'):
@@ -70,6 +69,10 @@ class XinpianchangIE(InfoExtractor):
                     'width': int_or_none(prog.get('width')),
                     'height': int_or_none(prog.get('height')),
                     'ext': 'mp4',
+                    'http_headers': {
+                        # NB: Server returns 403 without the Range header
+                        'Range': 'bytes=0-',
+                    },
                 } for prog in v if prog.get('url') or []])
 
         return {
@@ -78,13 +81,10 @@ class XinpianchangIE(InfoExtractor):
             'description': data.get('description'),
             'duration': int_or_none(data.get('duration')),
             'categories': data.get('categories'),
-            'keywords': data.get('keywords'),
+            'tags': data.get('keywords'),
             'thumbnail': data.get('cover'),
             'uploader': try_get(data, lambda x: x['owner']['username']),
-            'uploader_id': try_get(data, lambda x: x['owner']['id']),
+            'uploader_id': str_or_none(try_get(data, lambda x: x['owner']['id'])),
             'formats': formats,
             'subtitles': subtitles,
         }
-
-    def find_value_with_regex(self, var, webpage):
-        return self._search_regex(rf'var\s{var}\s=\s\"(?P<vid>[^\"]+)\"', webpage, name=var)
diff --git a/plugins/youtube_download/yt_dlp/extractor/xminus.py b/plugins/youtube_download/yt_dlp/extractor/xminus.py
index 5f11381..af9cf40 100644
--- a/plugins/youtube_download/yt_dlp/extractor/xminus.py
+++ b/plugins/youtube_download/yt_dlp/extractor/xminus.py
@@ -12,6 +12,7 @@ from ..utils import (
 
 
 class XMinusIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://(?:www\.)?x-minus\.org/track/(?P<id>[0-9]+)'
     _TEST = {
         'url': 'http://x-minus.org/track/4542/%D0%BF%D0%B5%D1%81%D0%B5%D0%BD%D0%BA%D0%B0-%D1%88%D0%BE%D1%84%D0%B5%D1%80%D0%B0.html',
@@ -25,7 +26,7 @@ class XMinusIE(InfoExtractor):
             'filesize_approx': 5900000,
             'view_count': int,
             'description': 'md5:03238c5b663810bc79cf42ef3c03e371',
-        }
+        },
     }
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/xnxx.py b/plugins/youtube_download/yt_dlp/extractor/xnxx.py
index 1452aae..a1b7e75 100644
--- a/plugins/youtube_download/yt_dlp/extractor/xnxx.py
+++ b/plugins/youtube_download/yt_dlp/extractor/xnxx.py
@@ -2,9 +2,9 @@ import re
 
 from .common import InfoExtractor
 from ..utils import (
+    NO_DEFAULT,
     determine_ext,
     int_or_none,
-    NO_DEFAULT,
     str_to_int,
 )
 
@@ -41,7 +41,7 @@ class XNXXIE(InfoExtractor):
 
         def get(meta, default=NO_DEFAULT, fatal=True):
             return self._search_regex(
-                r'set%s\s*\(\s*(["\'])(?P<value>(?:(?!\1).)+)\1' % meta,
+                rf'set{meta}\s*\(\s*(["\'])(?P<value>(?:(?!\1).)+)\1',
                 webpage, meta, default=default, fatal=fatal, group='value')
 
         title = self._og_search_title(
diff --git a/plugins/youtube_download/yt_dlp/extractor/xstream.py b/plugins/youtube_download/yt_dlp/extractor/xstream.py
index 8dd1cd9..f7b4832 100644
--- a/plugins/youtube_download/yt_dlp/extractor/xstream.py
+++ b/plugins/youtube_download/yt_dlp/extractor/xstream.py
@@ -2,11 +2,11 @@ import re
 
 from .common import InfoExtractor
 from ..utils import (
+    find_xpath_attr,
     int_or_none,
     parse_iso8601,
-    xpath_with_ns,
     xpath_text,
-    find_xpath_attr,
+    xpath_with_ns,
 )
 
 
@@ -41,8 +41,7 @@ class XstreamIE(InfoExtractor):
 
     def _extract_video_info(self, partner_id, video_id):
         data = self._download_xml(
-            'http://frontend.xstream.dk/%s/feed/video/?platform=web&id=%s'
-            % (partner_id, video_id),
+            f'http://frontend.xstream.dk/{partner_id}/feed/video/?platform=web&id={video_id}',
             video_id)
 
         NS_MAP = {
@@ -71,7 +70,7 @@ class XstreamIE(InfoExtractor):
             if mobj:
                 formats.append({
                     'url': mobj.group('url'),
-                    'play_path': 'mp4:%s' % mobj.group('playpath'),
+                    'play_path': 'mp4:{}'.format(mobj.group('playpath')),
                     'app': mobj.group('app'),
                     'ext': 'flv',
                     'tbr': tbr,
diff --git a/plugins/youtube_download/yt_dlp/extractor/xtube.py b/plugins/youtube_download/yt_dlp/extractor/xtube.py
deleted file mode 100644
index db82925..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/xtube.py
+++ /dev/null
@@ -1,214 +0,0 @@
-import itertools
-import re
-
-from .common import InfoExtractor
-from ..networking import Request
-from ..utils import (
-    int_or_none,
-    js_to_json,
-    orderedSet,
-    parse_duration,
-    str_to_int,
-    url_or_none,
-)
-
-
-class XTubeIE(InfoExtractor):
-    _VALID_URL = r'''(?x)
-                        (?:
-                            xtube:|
-                            https?://(?:www\.)?xtube\.com/(?:watch\.php\?.*\bv=|video-watch/(?:embedded/)?(?P<display_id>[^/]+)-)
-                        )
-                        (?P<id>[^/?&#]+)
-                    '''
-
-    _TESTS = [{
-        # old URL schema
-        'url': 'http://www.xtube.com/watch.php?v=kVTUy_G222_',
-        'md5': '092fbdd3cbe292c920ef6fc6a8a9cdab',
-        'info_dict': {
-            'id': 'kVTUy_G222_',
-            'ext': 'mp4',
-            'title': 'strange erotica',
-            'description': 'contains:an ET kind of thing',
-            'uploader': 'greenshowers',
-            'duration': 450,
-            'view_count': int,
-            'comment_count': int,
-            'age_limit': 18,
-        }
-    }, {
-        # new URL schema
-        'url': 'http://www.xtube.com/video-watch/strange-erotica-625837',
-        'only_matching': True,
-    }, {
-        'url': 'xtube:625837',
-        'only_matching': True,
-    }, {
-        'url': 'xtube:kVTUy_G222_',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.xtube.com/video-watch/embedded/milf-tara-and-teen-shared-and-cum-covered-extreme-bukkake-32203482?embedsize=big',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        mobj = self._match_valid_url(url)
-        video_id = mobj.group('id')
-        display_id = mobj.group('display_id')
-
-        if not display_id:
-            display_id = video_id
-
-        if video_id.isdigit() and len(video_id) < 11:
-            url_pattern = 'http://www.xtube.com/video-watch/-%s'
-        else:
-            url_pattern = 'http://www.xtube.com/watch.php?v=%s'
-
-        webpage = self._download_webpage(
-            url_pattern % video_id, display_id, headers={
-                'Cookie': 'age_verified=1; cookiesAccepted=1',
-            })
-
-        title, thumbnail, duration, sources, media_definition = [None] * 5
-
-        config = self._parse_json(self._search_regex(
-            r'playerConf\s*=\s*({.+?})\s*,\s*(?:\n|loaderConf|playerWrapper)', webpage, 'config',
-            default='{}'), video_id, transform_source=js_to_json, fatal=False)
-        if config:
-            config = config.get('mainRoll')
-            if isinstance(config, dict):
-                title = config.get('title')
-                thumbnail = config.get('poster')
-                duration = int_or_none(config.get('duration'))
-                sources = config.get('sources') or config.get('format')
-                media_definition = config.get('mediaDefinition')
-
-        if not isinstance(sources, dict) and not media_definition:
-            sources = self._parse_json(self._search_regex(
-                r'(["\'])?sources\1?\s*:\s*(?P<sources>{.+?}),',
-                webpage, 'sources', group='sources'), video_id,
-                transform_source=js_to_json)
-
-        formats = []
-        format_urls = set()
-
-        if isinstance(sources, dict):
-            for format_id, format_url in sources.items():
-                format_url = url_or_none(format_url)
-                if not format_url:
-                    continue
-                if format_url in format_urls:
-                    continue
-                format_urls.add(format_url)
-                formats.append({
-                    'url': format_url,
-                    'format_id': format_id,
-                    'height': int_or_none(format_id),
-                })
-
-        if isinstance(media_definition, list):
-            for media in media_definition:
-                video_url = url_or_none(media.get('videoUrl'))
-                if not video_url:
-                    continue
-                if video_url in format_urls:
-                    continue
-                format_urls.add(video_url)
-                format_id = media.get('format')
-                if format_id == 'hls':
-                    formats.extend(self._extract_m3u8_formats(
-                        video_url, video_id, 'mp4', entry_protocol='m3u8_native',
-                        m3u8_id='hls', fatal=False))
-                elif format_id == 'mp4':
-                    height = int_or_none(media.get('quality'))
-                    formats.append({
-                        'url': video_url,
-                        'format_id': '%s-%d' % (format_id, height) if height else format_id,
-                        'height': height,
-                    })
-
-        self._remove_duplicate_formats(formats)
-
-        if not title:
-            title = self._search_regex(
-                (r'<h1>\s*(?P<title>[^<]+?)\s*</h1>', r'videoTitle\s*:\s*(["\'])(?P<title>.+?)\1'),
-                webpage, 'title', group='title')
-        description = self._og_search_description(
-            webpage, default=None) or self._html_search_meta(
-            'twitter:description', webpage, default=None) or self._search_regex(
-            r'</h1>\s*<p>([^<]+)', webpage, 'description', fatal=False)
-        uploader = self._search_regex(
-            (r'<input[^>]+name="contentOwnerId"[^>]+value="([^"]+)"',
-             r'<span[^>]+class="nickname"[^>]*>([^<]+)'),
-            webpage, 'uploader', fatal=False)
-        if not duration:
-            duration = parse_duration(self._search_regex(
-                r'<dt>Runtime:?</dt>\s*<dd>([^<]+)</dd>',
-                webpage, 'duration', fatal=False))
-        view_count = str_to_int(self._search_regex(
-            (r'["\']viewsCount["\'][^>]*>(\d+)\s+views',
-             r'<dt>Views:?</dt>\s*<dd>([\d,\.]+)</dd>'),
-            webpage, 'view count', fatal=False))
-        comment_count = str_to_int(self._html_search_regex(
-            r'>Comments? \(([\d,\.]+)\)<',
-            webpage, 'comment count', fatal=False))
-
-        return {
-            'id': video_id,
-            'display_id': display_id,
-            'title': title,
-            'description': description,
-            'thumbnail': thumbnail,
-            'uploader': uploader,
-            'duration': duration,
-            'view_count': view_count,
-            'comment_count': comment_count,
-            'age_limit': 18,
-            'formats': formats,
-        }
-
-
-class XTubeUserIE(InfoExtractor):
-    IE_DESC = 'XTube user profile'
-    _VALID_URL = r'https?://(?:www\.)?xtube\.com/profile/(?P<id>[^/]+-\d+)'
-    _TEST = {
-        'url': 'http://www.xtube.com/profile/greenshowers-4056496',
-        'info_dict': {
-            'id': 'greenshowers-4056496',
-            'age_limit': 18,
-        },
-        'playlist_mincount': 154,
-    }
-
-    def _real_extract(self, url):
-        user_id = self._match_id(url)
-
-        entries = []
-        for pagenum in itertools.count(1):
-            request = Request(
-                'http://www.xtube.com/profile/%s/videos/%d' % (user_id, pagenum),
-                headers={
-                    'Cookie': 'popunder=4',
-                    'X-Requested-With': 'XMLHttpRequest',
-                    'Referer': url,
-                })
-
-            page = self._download_json(
-                request, user_id, 'Downloading videos JSON page %d' % pagenum)
-
-            html = page.get('html')
-            if not html:
-                break
-
-            for video_id in orderedSet([video_id for _, video_id in re.findall(
-                    r'data-plid=(["\'])(.+?)\1', html)]):
-                entries.append(self.url_result('xtube:%s' % video_id, XTubeIE.ie_key()))
-
-            page_count = int_or_none(page.get('pageCount'))
-            if not page_count or pagenum == page_count:
-                break
-
-        playlist = self.playlist_result(entries, user_id)
-        playlist['age_limit'] = 18
-        return playlist
diff --git a/plugins/youtube_download/yt_dlp/extractor/xuite.py b/plugins/youtube_download/yt_dlp/extractor/xuite.py
deleted file mode 100644
index 71ddadd..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/xuite.py
+++ /dev/null
@@ -1,149 +0,0 @@
-from .common import InfoExtractor
-from ..utils import (
-    ExtractorError,
-    float_or_none,
-    get_element_by_attribute,
-    parse_iso8601,
-    remove_end,
-)
-
-
-class XuiteIE(InfoExtractor):
-    IE_DESC = '隨意窩Xuite影音'
-    _REGEX_BASE64 = r'(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?'
-    _VALID_URL = r'https?://vlog\.xuite\.net/(?:play|embed)/(?P<id>%s)' % _REGEX_BASE64
-    _TESTS = [{
-        # Audio
-        'url': 'http://vlog.xuite.net/play/RGkzc1ZULTM4NjA5MTQuZmx2',
-        'md5': 'e79284c87b371424885448d11f6398c8',
-        'info_dict': {
-            'id': '3860914',
-            'ext': 'mp3',
-            'title': '孤單南半球-歐德陽',
-            'description': '孤單南半球-歐德陽',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'duration': 247.246,
-            'timestamp': 1314932940,
-            'upload_date': '20110902',
-            'uploader': '阿能',
-            'uploader_id': '15973816',
-            'categories': ['個人短片'],
-        },
-    }, {
-        # Video with only one format
-        'url': 'http://vlog.xuite.net/play/WUxxR2xCLTI1OTI1MDk5LmZsdg==',
-        'md5': '21f7b39c009b5a4615b4463df6eb7a46',
-        'info_dict': {
-            'id': '25925099',
-            'ext': 'mp4',
-            'title': 'BigBuckBunny_320x180',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'duration': 596.458,
-            'timestamp': 1454242500,
-            'upload_date': '20160131',
-            'uploader': '屁姥',
-            'uploader_id': '12158353',
-            'categories': ['個人短片'],
-            'description': 'http://download.blender.org/peach/bigbuckbunny_movies/BigBuckBunny_320x180.mp4',
-        },
-    }, {
-        # Video with two formats
-        'url': 'http://vlog.xuite.net/play/bWo1N1pLLTIxMzAxMTcwLmZsdg==',
-        'md5': '1166e0f461efe55b62e26a2d2a68e6de',
-        'info_dict': {
-            'id': '21301170',
-            'ext': 'mp4',
-            'title': '暗殺教室 02',
-            'description': '字幕:【極影字幕社】',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'duration': 1384.907,
-            'timestamp': 1421481240,
-            'upload_date': '20150117',
-            'uploader': '我只是想認真點',
-            'uploader_id': '242127761',
-            'categories': ['電玩動漫'],
-        },
-        'skip': 'Video removed',
-    }, {
-        # Video with encoded media id
-        # from http://forgetfulbc.blogspot.com/2016/06/date.html
-        'url': 'http://vlog.xuite.net/embed/cE1xbENoLTI3NDQ3MzM2LmZsdg==?ar=0&as=0',
-        'info_dict': {
-            'id': '27447336',
-            'ext': 'mp4',
-            'title': '男女平權只是口號？專家解釋約會時男生是否該幫女生付錢 (中字)',
-            'description': 'md5:1223810fa123b179083a3aed53574706',
-            'timestamp': 1466160960,
-            'upload_date': '20160617',
-            'uploader': 'B.C. & Lowy',
-            'uploader_id': '232279340',
-        },
-    }, {
-        'url': 'http://vlog.xuite.net/play/S1dDUjdyLTMyOTc3NjcuZmx2/%E5%AD%AB%E7%87%95%E5%A7%BF-%E7%9C%BC%E6%B7%9A%E6%88%90%E8%A9%A9',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        # /play/ URLs provide embedded video URL and more metadata
-        url = url.replace('/embed/', '/play/')
-        video_id = self._match_id(url)
-
-        webpage = self._download_webpage(url, video_id)
-
-        error_msg = self._search_regex(
-            r'<div id="error-message-content">([^<]+)',
-            webpage, 'error message', default=None)
-        if error_msg:
-            raise ExtractorError(
-                '%s returned error: %s' % (self.IE_NAME, error_msg),
-                expected=True)
-
-        media_info = self._parse_json(self._search_regex(
-            r'var\s+mediaInfo\s*=\s*({.*});', webpage, 'media info'), video_id)
-
-        video_id = media_info['MEDIA_ID']
-
-        formats = []
-        for key in ('html5Url', 'html5HQUrl'):
-            video_url = media_info.get(key)
-            if not video_url:
-                continue
-            format_id = self._search_regex(
-                r'\bq=(.+?)\b', video_url, 'format id', default=None)
-            formats.append({
-                'url': video_url,
-                'ext': 'mp4' if format_id.isnumeric() else format_id,
-                'format_id': format_id,
-                'height': int(format_id) if format_id.isnumeric() else None,
-            })
-
-        timestamp = media_info.get('PUBLISH_DATETIME')
-        if timestamp:
-            timestamp = parse_iso8601(timestamp + ' +0800', ' ')
-
-        category = media_info.get('catName')
-        categories = [category] if category else []
-
-        uploader = media_info.get('NICKNAME')
-        uploader_url = None
-
-        author_div = get_element_by_attribute('itemprop', 'author', webpage)
-        if author_div:
-            uploader = uploader or self._html_search_meta('name', author_div)
-            uploader_url = self._html_search_regex(
-                r'<link[^>]+itemprop="url"[^>]+href="([^"]+)"', author_div,
-                'uploader URL', fatal=False)
-
-        return {
-            'id': video_id,
-            'title': media_info['TITLE'],
-            'description': remove_end(media_info.get('metaDesc'), ' (Xuite 影音)'),
-            'thumbnail': media_info.get('ogImageUrl'),
-            'timestamp': timestamp,
-            'uploader': uploader,
-            'uploader_id': media_info.get('MEMBER_ID'),
-            'uploader_url': uploader_url,
-            'duration': float_or_none(media_info.get('MEDIA_DURATION'), 1000000),
-            'categories': categories,
-            'formats': formats,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/xvideos.py b/plugins/youtube_download/yt_dlp/extractor/xvideos.py
index 5df0715..e7d43ba 100644
--- a/plugins/youtube_download/yt_dlp/extractor/xvideos.py
+++ b/plugins/youtube_download/yt_dlp/extractor/xvideos.py
@@ -1,11 +1,11 @@
 import re
+import urllib.parse
 
 from .common import InfoExtractor
-from ..compat import compat_urllib_parse_unquote
 from ..utils import (
+    ExtractorError,
     clean_html,
     determine_ext,
-    ExtractorError,
     int_or_none,
     parse_duration,
 )
@@ -15,36 +15,36 @@ class XVideosIE(InfoExtractor):
     _VALID_URL = r'''(?x)
                     https?://
                         (?:
-                            (?:[^/]+\.)?xvideos2?\.com/video|
-                            (?:www\.)?xvideos\.es/video|
+                            (?:[^/]+\.)?xvideos2?\.com/video\.?|
+                            (?:www\.)?xvideos\.es/video\.?|
                             (?:www|flashservice)\.xvideos\.com/embedframe/|
                             static-hw\.xvideos\.com/swf/xv-player\.swf\?.*?\bid_video=
                         )
-                        (?P<id>[0-9]+)
+                        (?P<id>[0-9a-z]+)
                     '''
     _TESTS = [{
-        'url': 'https://www.xvideos.com/video4588838/motorcycle_guy_cucks_influencer_steals_his_gf',
-        'md5': '14cea69fcb84db54293b1e971466c2e1',
+        'url': 'http://xvideos.com/video.ucuvbkfda4e/a_beautiful_red-haired_stranger_was_refused_but_still_came_to_my_room_for_sex',
+        'md5': '396255a900a6bddb3e98985f0b86c3fd',
         'info_dict': {
-            'id': '4588838',
+            'id': 'ucuvbkfda4e',
             'ext': 'mp4',
-            'title': 'Motorcycle Guy Cucks Influencer, Steals his GF',
-            'duration': 108,
+            'title': 'A Beautiful Red-Haired Stranger Was Refused, But Still Came To My Room For Sex',
+            'duration': 1238,
             'age_limit': 18,
-            'thumbnail': r're:^https://img-hw.xvideos-cdn.com/.+\.jpg',
-        }
+            'thumbnail': r're:^https://cdn\d+-pic.xvideos-cdn.com/.+\.jpg',
+        },
     }, {
         # Broken HLS formats
         'url': 'https://www.xvideos.com/video65982001/what_s_her_name',
-        'md5': 'b82d7d7ef7d65a84b1fa6965f81f95a5',
+        'md5': '56742808292c8fa1418e4538c262c58b',
         'info_dict': {
             'id': '65982001',
             'ext': 'mp4',
             'title': 'what\'s her name?',
             'duration': 120,
             'age_limit': 18,
-            'thumbnail': r're:^https://img-hw.xvideos-cdn.com/.+\.jpg',
-        }
+            'thumbnail': r're:^https://cdn\d+-pic.xvideos-cdn.com/.+\.jpg',
+        },
     }, {
         'url': 'https://flashservice.xvideos.com/embedframe/4588838',
         'only_matching': True,
@@ -56,40 +56,52 @@ class XVideosIE(InfoExtractor):
         'only_matching': True,
     }, {
         'url': 'http://xvideos.com/video4588838/biker_takes_his_girl',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://xvideos.com/video4588838/biker_takes_his_girl',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://xvideos.es/video4588838/biker_takes_his_girl',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.xvideos.es/video4588838/biker_takes_his_girl',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'http://xvideos.es/video4588838/biker_takes_his_girl',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'http://www.xvideos.es/video4588838/biker_takes_his_girl',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'http://fr.xvideos.com/video4588838/biker_takes_his_girl',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://fr.xvideos.com/video4588838/biker_takes_his_girl',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'http://it.xvideos.com/video4588838/biker_takes_his_girl',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://it.xvideos.com/video4588838/biker_takes_his_girl',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'http://de.xvideos.com/video4588838/biker_takes_his_girl',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://de.xvideos.com/video4588838/biker_takes_his_girl',
-        'only_matching': True
+        'only_matching': True,
+    }, {
+        'url': 'https://flashservice.xvideos.com/embedframe/ucuvbkfda4e',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.xvideos.com/embedframe/ucuvbkfda4e',
+        'only_matching': True,
+    }, {
+        'url': 'http://static-hw.xvideos.com/swf/xv-player.swf?id_video=ucuvbkfda4e',
+        'only_matching': True,
+    }, {
+        'url': 'https://xvideos.es/video.ucuvbkfda4e/a_beautiful_red-haired_stranger_was_refused_but_still_came_to_my_room_for_sex',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
@@ -98,7 +110,7 @@ class XVideosIE(InfoExtractor):
 
         mobj = re.search(r'<h1 class="inlineError">(.+?)</h1>', webpage)
         if mobj:
-            raise ExtractorError('%s said: %s' % (self.IE_NAME, clean_html(mobj.group(1))), expected=True)
+            raise ExtractorError(f'{self.IE_NAME} said: {clean_html(mobj.group(1))}', expected=True)
 
         title = self._html_search_regex(
             (r'<title>(?P<title>.+?)\s+-\s+XVID',
@@ -109,7 +121,7 @@ class XVideosIE(InfoExtractor):
         thumbnails = []
         for preference, thumbnail in enumerate(('', '169')):
             thumbnail_url = self._search_regex(
-                r'setThumbUrl%s\(\s*(["\'])(?P<thumbnail>(?:(?!\1).)+)\1' % thumbnail,
+                rf'setThumbUrl{thumbnail}\(\s*(["\'])(?P<thumbnail>(?:(?!\1).)+)\1',
                 webpage, 'thumbnail', default=None, group='thumbnail')
             if thumbnail_url:
                 thumbnails.append({
@@ -125,7 +137,7 @@ class XVideosIE(InfoExtractor):
 
         formats = []
 
-        video_url = compat_urllib_parse_unquote(self._search_regex(
+        video_url = urllib.parse.unquote(self._search_regex(
             r'flv_url=(.+?)&', webpage, 'video URL', default=''))
         if video_url:
             formats.append({
@@ -145,7 +157,7 @@ class XVideosIE(InfoExtractor):
             elif format_id in ('urllow', 'urlhigh'):
                 formats.append({
                     'url': format_url,
-                    'format_id': '%s-%s' % (determine_ext(format_url, 'mp4'), format_id[3:]),
+                    'format_id': '{}-{}'.format(determine_ext(format_url, 'mp4'), format_id[3:]),
                     'quality': -2 if format_id.endswith('low') else None,
                 })
 
@@ -161,8 +173,41 @@ class XVideosIE(InfoExtractor):
 
 class XVideosQuickiesIE(InfoExtractor):
     IE_NAME = 'xvideos:quickies'
-    _VALID_URL = r'https?://(?P<domain>(?:[^/]+\.)?xvideos2?\.com)/amateur-channels/[^#]+#quickies/a/(?P<id>\d+)'
+    _VALID_URL = r'https?://(?P<domain>(?:[^/?#]+\.)?xvideos2?\.com)/(?:profiles/|amateur-channels/)?[^/?#]+#quickies/a/(?P<id>\w+)'
     _TESTS = [{
+        'url': 'https://www.xvideos.com/lili_love#quickies/a/ipdtikh1a4c',
+        'md5': 'f9e4f518ff1de14b99a400bbd0fc5ee0',
+        'info_dict': {
+            'id': 'ipdtikh1a4c',
+            'ext': 'mp4',
+            'title': 'Mexican chichóna putisima',
+            'age_limit': 18,
+            'duration': 81,
+            'thumbnail': r're:^https://cdn.*-pic.xvideos-cdn.com/.+\.jpg',
+        },
+    }, {
+        'url': 'https://www.xvideos.com/profiles/lili_love#quickies/a/ipphaob6fd1',
+        'md5': '5340938aac6b46e19ebdd1d84535862e',
+        'info_dict': {
+            'id': 'ipphaob6fd1',
+            'ext': 'mp4',
+            'title': 'Puta chichona mexicana squirting',
+            'age_limit': 18,
+            'duration': 56,
+            'thumbnail': r're:^https://cdn.*-pic.xvideos-cdn.com/.+\.jpg',
+        },
+    }, {
+        'url': 'https://www.xvideos.com/amateur-channels/lili_love#quickies/a/hfmffmd7661',
+        'md5': '92428518bbabcb4c513e55922e022491',
+        'info_dict': {
+            'id': 'hfmffmd7661',
+            'ext': 'mp4',
+            'title': 'Chichona mexican slut',
+            'age_limit': 18,
+            'duration': 9,
+            'thumbnail': r're:^https://cdn.*-pic.xvideos-cdn.com/.+\.jpg',
+        },
+    }, {
         'url': 'https://www.xvideos.com/amateur-channels/wifeluna#quickies/a/47258683',
         'md5': '16e322a93282667f1963915568f782c1',
         'info_dict': {
@@ -172,9 +217,9 @@ class XVideosQuickiesIE(InfoExtractor):
             'age_limit': 18,
             'duration': 16,
             'thumbnail': r're:^https://cdn.*-pic.xvideos-cdn.com/.+\.jpg',
-        }
+        },
     }]
 
     def _real_extract(self, url):
         domain, id_ = self._match_valid_url(url).group('domain', 'id')
-        return self.url_result(f'https://{domain}/video{id_}/_', XVideosIE, id_)
+        return self.url_result(f'https://{domain}/video{"" if id_.isdecimal() else "."}{id_}/_', XVideosIE, id_)
diff --git a/plugins/youtube_download/yt_dlp/extractor/xxxymovies.py b/plugins/youtube_download/yt_dlp/extractor/xxxymovies.py
index e3e3a9f..003af1d 100644
--- a/plugins/youtube_download/yt_dlp/extractor/xxxymovies.py
+++ b/plugins/youtube_download/yt_dlp/extractor/xxxymovies.py
@@ -1,7 +1,7 @@
 from .common import InfoExtractor
 from ..utils import (
-    parse_duration,
     int_or_none,
+    parse_duration,
 )
 
 
@@ -21,7 +21,7 @@ class XXXYMoviesIE(InfoExtractor):
             'like_count': int,
             'dislike_count': int,
             'age_limit': 18,
-        }
+        },
     }
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/yahoo.py b/plugins/youtube_download/yt_dlp/extractor/yahoo.py
index 24148a0..35e7120 100644
--- a/plugins/youtube_download/yt_dlp/extractor/yahoo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/yahoo.py
@@ -8,6 +8,7 @@ from ..utils import (
     ExtractorError,
     clean_html,
     int_or_none,
+    join_nonempty,
     mimetype2ext,
     parse_iso8601,
     traverse_obj,
@@ -70,7 +71,7 @@ class YahooIE(InfoExtractor):
             'duration': 128,
             'timestamp': 1385722202,
             'upload_date': '20131129',
-        }
+        },
     }, {
         'url': 'https://www.yahoo.com/movies/v/true-story-trailer-173000497.html',
         'md5': '2a9752f74cb898af5d1083ea9f661b58',
@@ -177,7 +178,7 @@ class YahooIE(InfoExtractor):
 
     def _extract_yahoo_video(self, video_id, country):
         video = self._download_json(
-            'https://%s.yahoo.com/_td/api/resource/VideoService.videos;view=full;video_ids=["%s"]' % (country, video_id),
+            f'https://{country}.yahoo.com/_td/api/resource/VideoService.videos;view=full;video_ids=["{video_id}"]',
             video_id, 'Downloading video JSON metadata')[0]
         title = video['title']
 
@@ -193,7 +194,7 @@ class YahooIE(InfoExtractor):
         for fmt in fmts:
             media_obj = self._download_json(
                 'https://video-api.yql.yahoo.com/v1/video/sapi/streams/' + video_id,
-                video_id, 'Downloading %s JSON metadata' % fmt,
+                video_id, f'Downloading {fmt} JSON metadata',
                 headers=self.geo_verification_headers(), query={
                     'format': fmt,
                     'region': country.upper(),
@@ -213,7 +214,7 @@ class YahooIE(InfoExtractor):
                 tbr = int_or_none(s.get('bitrate'))
                 formats.append({
                     'url': s_url,
-                    'format_id': fmt + ('-%d' % tbr if tbr else ''),
+                    'format_id': join_nonempty(fmt, tbr),
                     'width': int_or_none(s.get('width')),
                     'height': int_or_none(s.get('height')),
                     'tbr': tbr,
@@ -277,9 +278,9 @@ class YahooIE(InfoExtractor):
             country = country.split('-')[0]
 
         items = self._download_json(
-            'https://%s.yahoo.com/caas/content/article' % country, display_id,
+            f'https://{country}.yahoo.com/caas/content/article', display_id,
             'Downloading content JSON metadata', query={
-                'url': url
+                'url': url,
             })['items'][0]
 
         item = items['data']['partnerData']
@@ -327,7 +328,7 @@ class YahooSearchIE(SearchInfoExtractor):
 
     def _search_results(self, query):
         for pagenum in itertools.count(0):
-            result_url = 'http://video.search.yahoo.com/search/?p=%s&fr=screen&o=js&gs=0&b=%d' % (urllib.parse.quote_plus(query), pagenum * 30)
+            result_url = f'http://video.search.yahoo.com/search/?p={urllib.parse.quote_plus(query)}&fr=screen&o=js&gs=0&b={pagenum * 30}'
             info = self._download_json(result_url, query,
                                        note='Downloading results page ' + str(pagenum + 1))
             yield from (self.url_result(result['rurl']) for result in info['results'])
@@ -354,7 +355,7 @@ class YahooJapanNewsIE(InfoExtractor):
         },
     }, {
         'url': 'https://news.yahoo.co.jp/feature/1356',
-        'only_matching': True
+        'only_matching': True,
     }]
 
     def _extract_formats(self, json_data, content_id):
@@ -371,12 +372,13 @@ class YahooJapanNewsIE(InfoExtractor):
                         url, content_id, 'mp4', 'm3u8_native',
                         m3u8_id='hls', fatal=False))
             else:
+                bitrate = int_or_none(vid.get('bitrate'))
                 formats.append({
                     'url': url,
-                    'format_id': f'http-{vid.get("bitrate")}',
+                    'format_id': join_nonempty('http', bitrate),
                     'height': int_or_none(vid.get('height')),
                     'width': int_or_none(vid.get('width')),
-                    'tbr': int_or_none(vid.get('bitrate')),
+                    'tbr': bitrate,
                 })
         self._remove_duplicate_formats(formats)
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/yandexdisk.py b/plugins/youtube_download/yt_dlp/extractor/yandexdisk.py
index d5eecbd..3214816 100644
--- a/plugins/youtube_download/yt_dlp/extractor/yandexdisk.py
+++ b/plugins/youtube_download/yt_dlp/extractor/yandexdisk.py
@@ -5,6 +5,7 @@ from ..utils import (
     determine_ext,
     float_or_none,
     int_or_none,
+    join_nonempty,
     mimetype2ext,
     try_get,
     urljoin,
@@ -102,7 +103,7 @@ class YandexDiskIE(InfoExtractor):
                 'format_id': 'source',
                 'ext': determine_ext(title, meta.get('ext') or mimetype2ext(meta.get('mime_type')) or 'mp4'),
                 'quality': 1,
-                'filesize': int_or_none(meta.get('size'))
+                'filesize': int_or_none(meta.get('size')),
             })
 
         for video in (video_streams.get('videos') or []):
@@ -116,12 +117,9 @@ class YandexDiskIE(InfoExtractor):
             else:
                 size = video.get('size') or {}
                 height = int_or_none(size.get('height'))
-                format_id = 'hls'
-                if height:
-                    format_id += '-%dp' % height
                 formats.append({
                     'ext': 'mp4',
-                    'format_id': format_id,
+                    'format_id': join_nonempty('hls', height and f'{height}p'),
                     'height': height,
                     'protocol': 'm3u8_native',
                     'url': format_url,
diff --git a/plugins/youtube_download/yt_dlp/extractor/yandexmusic.py b/plugins/youtube_download/yt_dlp/extractor/yandexmusic.py
index 794dc3e..12cc5ca 100644
--- a/plugins/youtube_download/yt_dlp/extractor/yandexmusic.py
+++ b/plugins/youtube_download/yt_dlp/extractor/yandexmusic.py
@@ -2,11 +2,10 @@ import hashlib
 import itertools
 
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     ExtractorError,
-    int_or_none,
     float_or_none,
+    int_or_none,
     try_get,
 )
 
@@ -35,19 +34,19 @@ class YandexMusicBaseIE(InfoExtractor):
             expected=True)
 
     def _download_webpage_handle(self, *args, **kwargs):
-        webpage = super(YandexMusicBaseIE, self)._download_webpage_handle(*args, **kwargs)
+        webpage = super()._download_webpage_handle(*args, **kwargs)
         if 'Нам очень жаль, но&nbsp;запросы, поступившие с&nbsp;вашего IP-адреса, похожи на&nbsp;автоматические.' in webpage:
             self._raise_captcha()
         return webpage
 
     def _download_json(self, *args, **kwargs):
-        response = super(YandexMusicBaseIE, self)._download_json(*args, **kwargs)
+        response = super()._download_json(*args, **kwargs)
         self._handle_error(response)
         return response
 
     def _call_api(self, ep, tld, url, item_id, note, query):
         return self._download_json(
-            'https://music.yandex.%s/handlers/%s.jsx' % (tld, ep),
+            f'https://music.yandex.{tld}/handlers/{ep}.jsx',
             item_id, note,
             fatal=False,
             headers={
@@ -61,7 +60,7 @@ class YandexMusicBaseIE(InfoExtractor):
 class YandexMusicTrackIE(YandexMusicBaseIE):
     IE_NAME = 'yandexmusic:track'
     IE_DESC = 'Яндекс.Музыка - Трек'
-    _VALID_URL = r'%s/album/(?P<album_id>\d+)/track/(?P<id>\d+)' % YandexMusicBaseIE._VALID_URL_BASE
+    _VALID_URL = rf'{YandexMusicBaseIE._VALID_URL_BASE}/album/(?P<album_id>\d+)/track/(?P<id>\d+)'
 
     _TESTS = [{
         'url': 'http://music.yandex.ru/album/540508/track/4878838',
@@ -110,19 +109,19 @@ class YandexMusicTrackIE(YandexMusicBaseIE):
 
         track = self._call_api(
             'track', tld, url, track_id, 'Downloading track JSON',
-            {'track': '%s:%s' % (track_id, album_id)})['track']
+            {'track': f'{track_id}:{album_id}'})['track']
         track_title = track['title']
 
         download_data = self._download_json(
-            'https://music.yandex.ru/api/v2.1/handlers/track/%s:%s/web-album_track-track-track-main/download/m' % (track_id, album_id),
+            f'https://music.yandex.ru/api/v2.1/handlers/track/{track_id}:{album_id}/web-album_track-track-track-main/download/m',
             track_id, 'Downloading track location url JSON', query={'hq': 1}, headers={'X-Retpath-Y': url})
 
         fd_data = self._download_json(
             download_data['src'], track_id,
             'Downloading track location JSON',
             query={'format': 'json'})
-        key = hashlib.md5(('XGRlBW9FXlekgbPrRHuSiA' + fd_data['path'][1:] + fd_data['s']).encode('utf-8')).hexdigest()
-        f_url = 'http://%s/get-mp3/%s/%s?track-id=%s ' % (fd_data['host'], key, fd_data['ts'] + fd_data['path'], track['id'])
+        key = hashlib.md5(('XGRlBW9FXlekgbPrRHuSiA' + fd_data['path'][1:] + fd_data['s']).encode()).hexdigest()
+        f_url = 'http://{}/get-mp3/{}/{}?track-id={} '.format(fd_data['host'], key, fd_data['ts'] + fd_data['path'], track['id'])
 
         thumbnail = None
         cover_uri = track.get('albums', [{}])[0].get('coverUri')
@@ -151,7 +150,7 @@ class YandexMusicTrackIE(YandexMusicBaseIE):
             for element in decomposed:
                 if isinstance(element, dict) and element.get('name'):
                     parts.append(element['name'])
-                elif isinstance(element, compat_str):
+                elif isinstance(element, str):
                     parts.append(element)
             return ''.join(parts)
 
@@ -183,7 +182,7 @@ class YandexMusicTrackIE(YandexMusicBaseIE):
         if track_artist:
             track_info.update({
                 'artist': track_artist,
-                'title': '%s - %s' % (track_artist, track_title),
+                'title': f'{track_artist} - {track_title}',
             })
         else:
             track_info['title'] = track_title
@@ -194,14 +193,14 @@ class YandexMusicTrackIE(YandexMusicBaseIE):
 class YandexMusicPlaylistBaseIE(YandexMusicBaseIE):
     def _extract_tracks(self, source, item_id, url, tld):
         tracks = source['tracks']
-        track_ids = [compat_str(track_id) for track_id in source['trackIds']]
+        track_ids = [str(track_id) for track_id in source['trackIds']]
 
         # tracks dictionary shipped with playlist.jsx API is limited to 150 tracks,
         # missing tracks should be retrieved manually.
         if len(tracks) < len(track_ids):
-            present_track_ids = set([
-                compat_str(track['id'])
-                for track in tracks if track.get('id')])
+            present_track_ids = {
+                str(track['id'])
+                for track in tracks if track.get('id')}
             missing_track_ids = [
                 track_id for track_id in track_ids
                 if track_id not in present_track_ids]
@@ -215,10 +214,10 @@ class YandexMusicPlaylistBaseIE(YandexMusicBaseIE):
                 assert missing_track_ids_req
                 missing_tracks = self._call_api(
                     'track-entries', tld, url, item_id,
-                    'Downloading missing tracks JSON chunk %d' % (chunk_num + 1), {
+                    f'Downloading missing tracks JSON chunk {chunk_num + 1}', {
                         'entries': ','.join(missing_track_ids_req),
                         'lang': tld,
-                        'external-domain': 'music.yandex.%s' % tld,
+                        'external-domain': f'music.yandex.{tld}',
                         'overembed': 'false',
                         'strict': 'true',
                     })
@@ -245,7 +244,7 @@ class YandexMusicPlaylistBaseIE(YandexMusicBaseIE):
             if not album_id:
                 continue
             entries.append(self.url_result(
-                'http://music.yandex.ru/album/%s/track/%s' % (album_id, track_id),
+                f'http://music.yandex.ru/album/{album_id}/track/{track_id}',
                 ie=YandexMusicTrackIE.ie_key(), video_id=track_id))
         return entries
 
@@ -253,7 +252,7 @@ class YandexMusicPlaylistBaseIE(YandexMusicBaseIE):
 class YandexMusicAlbumIE(YandexMusicPlaylistBaseIE):
     IE_NAME = 'yandexmusic:album'
     IE_DESC = 'Яндекс.Музыка - Альбом'
-    _VALID_URL = r'%s/album/(?P<id>\d+)' % YandexMusicBaseIE._VALID_URL_BASE
+    _VALID_URL = rf'{YandexMusicBaseIE._VALID_URL_BASE}/album/(?P<id>\d+)'
 
     _TESTS = [{
         'url': 'http://music.yandex.ru/album/540508',
@@ -283,7 +282,7 @@ class YandexMusicAlbumIE(YandexMusicPlaylistBaseIE):
 
     @classmethod
     def suitable(cls, url):
-        return False if YandexMusicTrackIE.suitable(url) else super(YandexMusicAlbumIE, cls).suitable(url)
+        return False if YandexMusicTrackIE.suitable(url) else super().suitable(url)
 
     def _real_extract(self, url):
         mobj = self._match_valid_url(url)
@@ -297,20 +296,20 @@ class YandexMusicAlbumIE(YandexMusicPlaylistBaseIE):
         entries = self._build_playlist([track for volume in album['volumes'] for track in volume])
 
         title = album['title']
-        artist = try_get(album, lambda x: x['artists'][0]['name'], compat_str)
+        artist = try_get(album, lambda x: x['artists'][0]['name'], str)
         if artist:
-            title = '%s - %s' % (artist, title)
+            title = f'{artist} - {title}'
         year = album.get('year')
         if year:
-            title += ' (%s)' % year
+            title += f' ({year})'
 
-        return self.playlist_result(entries, compat_str(album['id']), title)
+        return self.playlist_result(entries, str(album['id']), title)
 
 
 class YandexMusicPlaylistIE(YandexMusicPlaylistBaseIE):
     IE_NAME = 'yandexmusic:playlist'
     IE_DESC = 'Яндекс.Музыка - Плейлист'
-    _VALID_URL = r'%s/users/(?P<user>[^/]+)/playlists/(?P<id>\d+)' % YandexMusicBaseIE._VALID_URL_BASE
+    _VALID_URL = rf'{YandexMusicBaseIE._VALID_URL_BASE}/users/(?P<user>[^/]+)/playlists/(?P<id>\d+)'
 
     _TESTS = [{
         'url': 'http://music.yandex.ru/users/music.partners/playlists/1245',
@@ -348,7 +347,7 @@ class YandexMusicPlaylistIE(YandexMusicPlaylistBaseIE):
                 'kinds': playlist_id,
                 'light': 'true',
                 'lang': tld,
-                'external-domain': 'music.yandex.%s' % tld,
+                'external-domain': f'music.yandex.{tld}',
                 'overembed': 'false',
             })['playlist']
 
@@ -356,7 +355,7 @@ class YandexMusicPlaylistIE(YandexMusicPlaylistBaseIE):
 
         return self.playlist_result(
             self._build_playlist(tracks),
-            compat_str(playlist_id),
+            str(playlist_id),
             playlist.get('title'), playlist.get('description'))
 
 
@@ -364,14 +363,14 @@ class YandexMusicArtistBaseIE(YandexMusicPlaylistBaseIE):
     def _call_artist(self, tld, url, artist_id):
         return self._call_api(
             'artist', tld, url, artist_id,
-            'Downloading artist %s JSON' % self._ARTIST_WHAT, {
+            f'Downloading artist {self._ARTIST_WHAT} JSON', {
                 'artist': artist_id,
                 'what': self._ARTIST_WHAT,
                 'sort': self._ARTIST_SORT or '',
                 'dir': '',
                 'period': '',
                 'lang': tld,
-                'external-domain': 'music.yandex.%s' % tld,
+                'external-domain': f'music.yandex.{tld}',
                 'overembed': 'false',
             })
 
@@ -381,7 +380,7 @@ class YandexMusicArtistBaseIE(YandexMusicPlaylistBaseIE):
         artist_id = mobj.group('id')
         data = self._call_artist(tld, url, artist_id)
         tracks = self._extract_tracks(data, artist_id, url, tld)
-        title = try_get(data, lambda x: x['artist']['name'], compat_str)
+        title = try_get(data, lambda x: x['artist']['name'], str)
         return self.playlist_result(
             self._build_playlist(tracks), artist_id, title)
 
@@ -389,7 +388,7 @@ class YandexMusicArtistBaseIE(YandexMusicPlaylistBaseIE):
 class YandexMusicArtistTracksIE(YandexMusicArtistBaseIE):
     IE_NAME = 'yandexmusic:artist:tracks'
     IE_DESC = 'Яндекс.Музыка - Артист - Треки'
-    _VALID_URL = r'%s/artist/(?P<id>\d+)/tracks' % YandexMusicBaseIE._VALID_URL_BASE
+    _VALID_URL = rf'{YandexMusicBaseIE._VALID_URL_BASE}/artist/(?P<id>\d+)/tracks'
 
     _TESTS = [{
         'url': 'https://music.yandex.ru/artist/617526/tracks',
@@ -410,8 +409,8 @@ class YandexMusicArtistTracksIE(YandexMusicArtistBaseIE):
         artist_id = mobj.group('id')
         data = self._call_artist(tld, url, artist_id)
         tracks = self._extract_tracks(data, artist_id, url, tld)
-        artist = try_get(data, lambda x: x['artist']['name'], compat_str)
-        title = '%s - %s' % (artist or artist_id, 'Треки')
+        artist = try_get(data, lambda x: x['artist']['name'], str)
+        title = '{} - {}'.format(artist or artist_id, 'Треки')
         return self.playlist_result(
             self._build_playlist(tracks), artist_id, title)
 
@@ -419,7 +418,7 @@ class YandexMusicArtistTracksIE(YandexMusicArtistBaseIE):
 class YandexMusicArtistAlbumsIE(YandexMusicArtistBaseIE):
     IE_NAME = 'yandexmusic:artist:albums'
     IE_DESC = 'Яндекс.Музыка - Артист - Альбомы'
-    _VALID_URL = r'%s/artist/(?P<id>\d+)/albums' % YandexMusicBaseIE._VALID_URL_BASE
+    _VALID_URL = rf'{YandexMusicBaseIE._VALID_URL_BASE}/artist/(?P<id>\d+)/albums'
 
     _TESTS = [{
         'url': 'https://music.yandex.ru/artist/617526/albums',
@@ -447,8 +446,8 @@ class YandexMusicArtistAlbumsIE(YandexMusicArtistBaseIE):
             if not album_id:
                 continue
             entries.append(self.url_result(
-                'http://music.yandex.ru/album/%s' % album_id,
+                f'http://music.yandex.ru/album/{album_id}',
                 ie=YandexMusicAlbumIE.ie_key(), video_id=album_id))
-        artist = try_get(data, lambda x: x['artist']['name'], compat_str)
-        title = '%s - %s' % (artist or artist_id, 'Альбомы')
+        artist = try_get(data, lambda x: x['artist']['name'], str)
+        title = '{} - {}'.format(artist or artist_id, 'Альбомы')
         return self.playlist_result(entries, artist_id, title)
diff --git a/plugins/youtube_download/yt_dlp/extractor/yandexvideo.py b/plugins/youtube_download/yt_dlp/extractor/yandexvideo.py
index 727250e..09e7c98 100644
--- a/plugins/youtube_download/yt_dlp/extractor/yandexvideo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/yandexvideo.py
@@ -2,15 +2,17 @@ import itertools
 
 from .common import InfoExtractor
 from ..utils import (
+    bug_reports_message,
     determine_ext,
-    extract_attributes,
     int_or_none,
     lowercase_escape,
     parse_qs,
-    traverse_obj,
+    qualities,
     try_get,
+    update_url_query,
     url_or_none,
 )
+from ..utils.traversal import traverse_obj
 
 
 class YandexVideoIE(InfoExtractor):
@@ -89,10 +91,10 @@ class YandexVideoIE(InfoExtractor):
     title
     views_count
   }
-}''' % video_id).encode(), fatal=False)), lambda x: x['player']['content'])
+}''' % video_id).encode(), fatal=False)), lambda x: x['player']['content'])  # noqa: UP031
         if not player or player.get('error'):
             player = self._download_json(
-                'https://frontend.vh.yandex.ru/v23/player/%s.json' % video_id,
+                f'https://frontend.vh.yandex.ru/v23/player/{video_id}.json',
                 video_id, query={
                     'stream_options': 'hires',
                     'disable_trackings': 1,
@@ -179,14 +181,29 @@ class YandexVideoPreviewIE(InfoExtractor):
     }]
 
     def _real_extract(self, url):
-        id = self._match_id(url)
-        webpage = self._download_webpage(url, id)
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(url, video_id)
         data_raw = self._search_regex(r'window.Ya.__inline_params__\s*=\s*JSON.parse\(\'([^"]+?\\u0022video\\u0022:[^"]+?})\'\);', webpage, 'data_raw')
-        data_json = self._parse_json(data_raw, id, transform_source=lowercase_escape)
+        data_json = self._parse_json(data_raw, video_id, transform_source=lowercase_escape)
         return self.url_result(data_json['video']['url'])
 
 
-class ZenYandexIE(InfoExtractor):
+class ZenYandexBaseIE(InfoExtractor):
+    def _fetch_ssr_data(self, url, video_id):
+        webpage = self._download_webpage(url, video_id)
+        redirect = self._search_json(
+            r'(?:var|let|const)\s+it\s*=', webpage, 'redirect', video_id, default={}).get('retpath')
+        if redirect:
+            video_id = self._match_id(redirect)
+            webpage = self._download_webpage(redirect, video_id, note='Redirecting')
+        return video_id, self._search_json(
+            r'(?:var|let|const)\s+_params\s*=\s*\(', webpage, 'metadata', video_id,
+            contains_pattern=r'{["\']ssrData.+}')['ssrData']
+
+
+class ZenYandexIE(ZenYandexBaseIE):
+    IE_NAME = 'dzen.ru'
+    IE_DESC = 'Дзен (dzen) formerly Яндекс.Дзен (Yandex Zen)'
     _VALID_URL = r'https?://(zen\.yandex|dzen)\.ru(?:/video)?/(media|watch)/(?:(?:id/[^/]+/|[^/]+/)(?:[a-z0-9-]+)-)?(?P<id>[a-z0-9-]+)'
     _TESTS = [{
         'url': 'https://zen.yandex.ru/media/id/606fd806cc13cb3c58c05cf5/vot-eto-focus-dedy-morozy-na-gidrociklah-60c7c443da18892ebfe85ed7',
@@ -194,9 +211,9 @@ class ZenYandexIE(InfoExtractor):
             'id': '60c7c443da18892ebfe85ed7',
             'ext': 'mp4',
             'title': 'ВОТ ЭТО Focus. Деды Морозы на гидроциклах',
-            'description': 'md5:f3db3d995763b9bbb7b56d4ccdedea89',
+            'description': 'md5:8684912f6086f298f8078d4af0e8a600',
             'thumbnail': 're:^https://avatars.dzeninfra.ru/',
-            'uploader': 'AcademeG DailyStream'
+            'uploader': 'AcademeG DailyStream',
         },
         'params': {
             'skip_download': 'm3u8',
@@ -209,13 +226,14 @@ class ZenYandexIE(InfoExtractor):
             'id': '60c7c443da18892ebfe85ed7',
             'ext': 'mp4',
             'title': 'ВОТ ЭТО Focus. Деды Морозы на гидроциклах',
-            'description': 'md5:f3db3d995763b9bbb7b56d4ccdedea89',
+            'description': 'md5:8684912f6086f298f8078d4af0e8a600',
             'thumbnail': r're:^https://avatars\.dzeninfra\.ru/',
             'uploader': 'AcademeG DailyStream',
             'upload_date': '20191111',
             'timestamp': 1573465585,
         },
         'params': {'skip_download': 'm3u8'},
+        'skip': 'The page does not exist',
     }, {
         'url': 'https://zen.yandex.ru/video/watch/6002240ff8b1af50bb2da5e3',
         'info_dict': {
@@ -227,6 +245,9 @@ class ZenYandexIE(InfoExtractor):
             'uploader': 'TechInsider',
             'timestamp': 1611378221,
             'upload_date': '20210123',
+            'view_count': int,
+            'duration': 243,
+            'tags': ['опыт', 'эксперимент', 'огонь'],
         },
         'params': {'skip_download': 'm3u8'},
     }, {
@@ -240,6 +261,9 @@ class ZenYandexIE(InfoExtractor):
             'uploader': 'TechInsider',
             'upload_date': '20210123',
             'timestamp': 1611378221,
+            'view_count': int,
+            'duration': 243,
+            'tags': ['опыт', 'эксперимент', 'огонь'],
         },
         'params': {'skip_download': 'm3u8'},
     }, {
@@ -252,41 +276,56 @@ class ZenYandexIE(InfoExtractor):
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-        redirect = self._search_json(r'var it\s*=', webpage, 'redirect', id, default={}).get('retpath')
-        if redirect:
-            video_id = self._match_id(redirect)
-            webpage = self._download_webpage(redirect, video_id, note='Redirecting')
-        data_json = self._search_json(
-            r'data\s*=', webpage, 'metadata', video_id, contains_pattern=r'{["\']_*serverState_*video.+}')
-        serverstate = self._search_regex(r'(_+serverState_+video-site_[^_]+_+)',
-                                         webpage, 'server state').replace('State', 'Settings')
-        uploader = self._search_regex(r'(<a\s*class=["\']card-channel-link[^"\']+["\'][^>]+>)',
-                                      webpage, 'uploader', default='<a>')
-        uploader_name = extract_attributes(uploader).get('aria-label')
-        video_json = try_get(data_json, lambda x: x[serverstate]['exportData']['video'], dict)
-        stream_urls = try_get(video_json, lambda x: x['video']['streams'])
-        formats = []
+        video_id, ssr_data = self._fetch_ssr_data(url, video_id)
+        video_data = ssr_data['videoMetaResponse']
+
+        formats, subtitles = [], {}
+        quality = qualities(('4', '0', '1', '2', '3', '5', '6', '7'))
+        # Deduplicate stream URLs. The "dzen_dash" query parameter is present in some URLs but can be omitted
+        stream_urls = set(traverse_obj(video_data, (
+            'video', ('id', ('streams', ...), ('mp4Streams', ..., 'url'), ('oneVideoStreams', ..., 'url')),
+            {url_or_none}, {update_url_query(query={'dzen_dash': []})})))
         for s_url in stream_urls:
             ext = determine_ext(s_url)
-            if ext == 'mpd':
-                formats.extend(self._extract_mpd_formats(s_url, video_id, mpd_id='dash'))
-            elif ext == 'm3u8':
-                formats.extend(self._extract_m3u8_formats(s_url, video_id, 'mp4'))
+            content_type = traverse_obj(parse_qs(s_url), ('ct', 0))
+            if ext == 'mpd' or content_type == '6':
+                fmts, subs = self._extract_mpd_formats_and_subtitles(s_url, video_id, mpd_id='dash', fatal=False)
+            elif ext == 'm3u8' or content_type == '8':
+                fmts, subs = self._extract_m3u8_formats_and_subtitles(s_url, video_id, 'mp4', m3u8_id='hls', fatal=False)
+            elif content_type == '0':
+                format_type = traverse_obj(parse_qs(s_url), ('type', 0))
+                formats.append({
+                    'url': s_url,
+                    'format_id': format_type,
+                    'ext': 'mp4',
+                    'quality': quality(format_type),
+                })
+                continue
+            else:
+                self.report_warning(f'Unsupported stream URL: {s_url}{bug_reports_message()}')
+                continue
+            formats.extend(fmts)
+            self._merge_subtitles(subs, target=subtitles)
+
         return {
             'id': video_id,
-            'title': video_json.get('title') or self._og_search_title(webpage),
             'formats': formats,
-            'duration': int_or_none(video_json.get('duration')),
-            'view_count': int_or_none(video_json.get('views')),
-            'timestamp': int_or_none(video_json.get('publicationDate')),
-            'uploader': uploader_name or data_json.get('authorName') or try_get(data_json, lambda x: x['publisher']['name']),
-            'description': self._og_search_description(webpage) or try_get(data_json, lambda x: x['og']['description']),
-            'thumbnail': self._og_search_thumbnail(webpage) or try_get(data_json, lambda x: x['og']['imageUrl']),
+            'subtitles': subtitles,
+            **traverse_obj(video_data, {
+                'title': ('title', {str}),
+                'description': ('description', {str}),
+                'thumbnail': ('image', {url_or_none}),
+                'duration': ('video', 'duration', {int_or_none}),
+                'view_count': ('video', 'views', {int_or_none}),
+                'timestamp': ('publicationDate', {int_or_none}),
+                'tags': ('tags', ..., {str}),
+                'uploader': ('source', 'title', {str}),
+            }),
         }
 
 
-class ZenYandexChannelIE(InfoExtractor):
+class ZenYandexChannelIE(ZenYandexBaseIE):
+    IE_NAME = 'dzen.ru:channel'
     _VALID_URL = r'https?://(zen\.yandex|dzen)\.ru/(?!media|video)(?:id/)?(?P<id>[a-z0-9-_]+)'
     _TESTS = [{
         'url': 'https://zen.yandex.ru/tok_media',
@@ -296,6 +335,7 @@ class ZenYandexChannelIE(InfoExtractor):
             'description': 'md5:a9e5b3c247b7fe29fd21371a428bcf56',
         },
         'playlist_mincount': 169,
+        'skip': 'The page does not exist',
     }, {
         'url': 'https://dzen.ru/tok_media',
         'info_dict': {
@@ -304,6 +344,7 @@ class ZenYandexChannelIE(InfoExtractor):
             'description': 'md5:a9e5b3c247b7fe29fd21371a428bcf56',
         },
         'playlist_mincount': 169,
+        'skip': 'The page does not exist',
     }, {
         'url': 'https://zen.yandex.ru/id/606fd806cc13cb3c58c05cf5',
         'info_dict': {
@@ -318,21 +359,20 @@ class ZenYandexChannelIE(InfoExtractor):
         'url': 'https://zen.yandex.ru/jony_me',
         'info_dict': {
             'id': 'jony_me',
-            'description': 'md5:a2c62b4ef5cf3e3efb13d25f61f739e1',
-            'title': 'JONY ',
+            'description': 'md5:7c30d11dc005faba8826feae99da3113',
+            'title': 'JONY',
         },
-        'playlist_count': 20,
+        'playlist_count': 18,
     }, {
         # Test that the playlist extractor finishes extracting when the
         # channel has more than one page of entries
         'url': 'https://zen.yandex.ru/tatyanareva',
         'info_dict': {
             'id': 'tatyanareva',
-            'description': 'md5:296b588d60841c3756c9105f237b70c6',
+            'description': 'md5:92e56fa730a932ca2483ba5c2186ad96',
             'title': 'Татьяна Рева',
-            'entries': 'maxcount:200',
         },
-        'playlist_count': 46,
+        'playlist_mincount': 46,
     }, {
         'url': 'https://dzen.ru/id/606fd806cc13cb3c58c05cf5',
         'info_dict': {
@@ -343,43 +383,31 @@ class ZenYandexChannelIE(InfoExtractor):
         'playlist_mincount': 657,
     }]
 
-    def _entries(self, item_id, server_state_json, server_settings_json):
-        items = (traverse_obj(server_state_json, ('feed', 'items', ...))
-                 or traverse_obj(server_settings_json, ('exportData', 'items', ...)))
-
-        more = (traverse_obj(server_state_json, ('links', 'more'))
-                or traverse_obj(server_settings_json, ('exportData', 'more', 'link')))
-
+    def _entries(self, feed_data, channel_id):
         next_page_id = None
         for page in itertools.count(1):
-            for item in items or []:
-                if item.get('type') != 'gif':
-                    continue
-                video_id = traverse_obj(item, 'publication_id', 'publicationId') or ''
-                yield self.url_result(item['link'], ZenYandexIE, video_id.split(':')[-1])
+            for item in traverse_obj(feed_data, (
+                (None, ('items', lambda _, v: v['tab'] in ('shorts', 'longs'))),
+                'items', lambda _, v: url_or_none(v['link']),
+            )):
+                yield self.url_result(item['link'], ZenYandexIE, item.get('id'), title=item.get('title'))
 
+            more = traverse_obj(feed_data, ('more', 'link', {url_or_none}))
             current_page_id = next_page_id
             next_page_id = traverse_obj(parse_qs(more), ('next_page_id', -1))
-            if not all((more, items, next_page_id, next_page_id != current_page_id)):
+            if not all((more, next_page_id, next_page_id != current_page_id)):
                 break
 
-            data = self._download_json(more, item_id, note=f'Downloading Page {page}')
-            items, more = data.get('items'), traverse_obj(data, ('more', 'link'))
+            feed_data = self._download_json(more, channel_id, note=f'Downloading Page {page}')
 
     def _real_extract(self, url):
-        item_id = self._match_id(url)
-        webpage = self._download_webpage(url, item_id)
-        redirect = self._search_json(
-            r'var it\s*=', webpage, 'redirect', item_id, default={}).get('retpath')
-        if redirect:
-            item_id = self._match_id(redirect)
-            webpage = self._download_webpage(redirect, item_id, note='Redirecting')
-        data = self._search_json(
-            r'var\s+data\s*=', webpage, 'channel data', item_id, contains_pattern=r'{\"__serverState__.+}')
-        server_state_json = traverse_obj(data, lambda k, _: k.startswith('__serverState__'), get_all=False)
-        server_settings_json = traverse_obj(data, lambda k, _: k.startswith('__serverSettings__'), get_all=False)
+        channel_id = self._match_id(url)
+        channel_id, ssr_data = self._fetch_ssr_data(url, channel_id)
+        channel_data = ssr_data['exportResponse']
 
         return self.playlist_result(
-            self._entries(item_id, server_state_json, server_settings_json),
-            item_id, traverse_obj(server_state_json, ('channel', 'source', 'title')),
-            traverse_obj(server_state_json, ('channel', 'source', 'description')))
+            self._entries(channel_data['feedData'], channel_id),
+            channel_id, **traverse_obj(channel_data, ('channel', 'source', {
+                'title': ('title', {str}),
+                'description': ('description', {str}),
+            })))
diff --git a/plugins/youtube_download/yt_dlp/extractor/yapfiles.py b/plugins/youtube_download/yt_dlp/extractor/yapfiles.py
index 19812ba..8d89d1d 100644
--- a/plugins/youtube_download/yt_dlp/extractor/yapfiles.py
+++ b/plugins/youtube_download/yt_dlp/extractor/yapfiles.py
@@ -8,8 +8,9 @@ from ..utils import (
 
 
 class YapFilesIE(InfoExtractor):
+    _WORKING = False
     _YAPFILES_URL = r'//(?:(?:www|api)\.)?yapfiles\.ru/get_player/*\?.*?\bv=(?P<id>\w+)'
-    _VALID_URL = r'https?:%s' % _YAPFILES_URL
+    _VALID_URL = rf'https?:{_YAPFILES_URL}'
     _EMBED_REGEX = [rf'<iframe\b[^>]+\bsrc=(["\'])(?P<url>(?:https?:)?{_YAPFILES_URL}.*?)\1']
     _TESTS = [{
         # with hd
@@ -41,7 +42,7 @@ class YapFilesIE(InfoExtractor):
                 'player url', default=None, group='url')
 
         if not player_url:
-            player_url = 'http://api.yapfiles.ru/load/%s/' % video_id
+            player_url = f'http://api.yapfiles.ru/load/{video_id}/'
             query = {
                 'md5': 'ded5f369be61b8ae5f88e2eeb2f3caff',
                 'type': 'json',
@@ -57,7 +58,7 @@ class YapFilesIE(InfoExtractor):
 
         if title == 'Ролик удален' or 'deleted.jpg' in (thumbnail or ''):
             raise ExtractorError(
-                'Video %s has been removed' % video_id, expected=True)
+                f'Video {video_id} has been removed', expected=True)
 
         playlist = self._download_json(
             playlist_url, video_id)['player']['main']
diff --git a/plugins/youtube_download/yt_dlp/extractor/yappy.py b/plugins/youtube_download/yt_dlp/extractor/yappy.py
index 7b3d0cb..171e0f1 100644
--- a/plugins/youtube_download/yt_dlp/extractor/yappy.py
+++ b/plugins/youtube_download/yt_dlp/extractor/yappy.py
@@ -9,6 +9,7 @@ from ..utils import (
 
 
 class YappyIE(InfoExtractor):
+    _WORKING = False
     _VALID_URL = r'https?://yappy\.media/video/(?P<id>\w+)'
     _TESTS = [{
         'url': 'https://yappy.media/video/47fea6d8586f48d1a0cf96a7342aabd2',
@@ -26,7 +27,7 @@ class YappyIE(InfoExtractor):
             'categories': ['Образование и наука', 'Лайфхак', 'Технологии', 'Арт/искусство'],
             'repost_count': int,
             'uploader': 'YAPPY',
-        }
+        },
     }, {
         'url': 'https://yappy.media/video/3862451954ad4bd58ae2ccefddb0bd33',
         'info_dict': {
@@ -42,7 +43,7 @@ class YappyIE(InfoExtractor):
             'uploader': 'LENA SHTURMAN',
             'upload_date': '20230126',
             'thumbnail': 'https://cdn-st.ritm.media/static/pic/user_thumbnails/6e76bb4bbad640b6/9ec84c115b2b1967/1674716171.jpg',
-        }
+        },
     }]
 
     def _real_extract(self, url):
@@ -63,13 +64,13 @@ class YappyIE(InfoExtractor):
             'url': media_url,
             'ext': 'mp4',
             'format_note': 'Watermarked' if has_watermark else None,
-            'preference': -10 if has_watermark else None
+            'preference': -10 if has_watermark else None,
         }] if media_url else []
 
         if has_watermark:
             formats.append({
                 'url': media_url.replace('-wm.mp4', '.mp4'),
-                'ext': 'mp4'
+                'ext': 'mp4',
             })
 
         audio_link = traverse_obj(media_data, ('audio', 'link'))
@@ -78,7 +79,7 @@ class YappyIE(InfoExtractor):
                 'url': audio_link,
                 'ext': 'mp3',
                 'acodec': 'mp3',
-                'vcodec': 'none'
+                'vcodec': 'none',
             })
 
         return {
@@ -96,7 +97,7 @@ class YappyIE(InfoExtractor):
             'uploader': traverse_obj(media_data, ('creator', 'firstName')),
             'uploader_id': traverse_obj(media_data, ('creator', ('uuid', 'nickname')), get_all=False),
             'categories': traverse_obj(media_data, ('categories', ..., 'name')) or None,
-            'repost_count': int_or_none(media_data.get('sharingCount'))
+            'repost_count': int_or_none(media_data.get('sharingCount')),
         }
 
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/yesjapan.py b/plugins/youtube_download/yt_dlp/extractor/yesjapan.py
deleted file mode 100644
index 94e4166..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/yesjapan.py
+++ /dev/null
@@ -1,56 +0,0 @@
-from .common import InfoExtractor
-from ..networking import HEADRequest
-from ..utils import get_element_by_attribute, parse_iso8601
-
-
-class YesJapanIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?yesjapan\.com/video/(?P<slug>[A-Za-z0-9\-]*)_(?P<id>[A-Za-z0-9]+)\.html'
-    _TEST = {
-        'url': 'http://www.yesjapan.com/video/japanese-in-5-20-wa-and-ga-particle-usages_726497834.html',
-        'md5': 'f0be416314e5be21a12b499b330c21cf',
-        'info_dict': {
-            'id': '726497834',
-            'title': 'Japanese in 5! #20 - WA And GA Particle Usages',
-            'description': 'This should clear up some issues most students of Japanese encounter with WA and GA....',
-            'ext': 'mp4',
-            'timestamp': 1416391590,
-            'upload_date': '20141119',
-            'thumbnail': r're:^https?://.*\.jpg$',
-        }
-    }
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        webpage = self._download_webpage(url, video_id)
-        title = self._og_search_title(webpage)
-        video_url = self._og_search_video_url(webpage)
-        description = self._og_search_description(webpage)
-        thumbnail = self._og_search_thumbnail(webpage)
-
-        timestamp = None
-        submit_info = get_element_by_attribute('class', 'pm-submit-data', webpage)
-        if submit_info:
-            timestamp = parse_iso8601(self._search_regex(
-                r'datetime="([^"]+)"', submit_info, 'upload date', fatal=False, default=None))
-
-        # attempt to resolve the final URL in order to get a proper extension
-        redirect_req = HEADRequest(video_url)
-        req = self._request_webpage(
-            redirect_req, video_id, note='Resolving final URL', errnote='Could not resolve final URL', fatal=False)
-        if req:
-            video_url = req.url
-
-        formats = [{
-            'format_id': 'sd',
-            'url': video_url,
-        }]
-
-        return {
-            'id': video_id,
-            'title': title,
-            'formats': formats,
-            'description': description,
-            'timestamp': timestamp,
-            'thumbnail': thumbnail,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/yinyuetai.py b/plugins/youtube_download/yt_dlp/extractor/yinyuetai.py
deleted file mode 100644
index b2e3172..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/yinyuetai.py
+++ /dev/null
@@ -1,52 +0,0 @@
-from .common import InfoExtractor
-from ..utils import ExtractorError
-
-
-class YinYueTaiIE(InfoExtractor):
-    IE_NAME = 'yinyuetai:video'
-    IE_DESC = '音悦Tai'
-    _VALID_URL = r'https?://v\.yinyuetai\.com/video(?:/h5)?/(?P<id>[0-9]+)'
-    _TESTS = [{
-        'url': 'http://v.yinyuetai.com/video/2322376',
-        'md5': '6e3abe28d38e3a54b591f9f040595ce0',
-        'info_dict': {
-            'id': '2322376',
-            'ext': 'mp4',
-            'title': '少女时代_PARTY_Music Video Teaser',
-            'creator': '少女时代',
-            'duration': 25,
-            'thumbnail': r're:^https?://.*\.jpg$',
-        },
-    }, {
-        'url': 'http://v.yinyuetai.com/video/h5/2322376',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        info = self._download_json(
-            'http://ext.yinyuetai.com/main/get-h-mv-info?json=true&videoId=%s' % video_id, video_id,
-            'Downloading mv info')['videoInfo']['coreVideoInfo']
-
-        if info['error']:
-            raise ExtractorError(info['errorMsg'], expected=True)
-
-        formats = [{
-            'url': format_info['videoUrl'],
-            'format_id': format_info['qualityLevel'],
-            'format': format_info.get('qualityLevelName'),
-            'filesize': format_info.get('fileSize'),
-            # though URLs ends with .flv, the downloaded files are in fact mp4
-            'ext': 'mp4',
-            'tbr': format_info.get('bitrate'),
-        } for format_info in info['videoUrlModels']]
-
-        return {
-            'id': video_id,
-            'title': info['videoName'],
-            'thumbnail': info.get('bigHeadImage'),
-            'creator': info.get('artistNames'),
-            'duration': info.get('duration'),
-            'formats': formats,
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/yle_areena.py b/plugins/youtube_download/yt_dlp/extractor/yle_areena.py
index c5b45f0..c2daddf 100644
--- a/plugins/youtube_download/yt_dlp/extractor/yle_areena.py
+++ b/plugins/youtube_download/yt_dlp/extractor/yle_areena.py
@@ -1,66 +1,54 @@
 from .common import InfoExtractor
 from .kaltura import KalturaIE
 from ..utils import (
+    ExtractorError,
     int_or_none,
+    parse_iso8601,
     smuggle_url,
-    traverse_obj,
-    unified_strdate,
     url_or_none,
 )
+from ..utils.traversal import traverse_obj
 
 
 class YleAreenaIE(InfoExtractor):
-    _VALID_URL = r'https?://areena\.yle\.fi/(?P<id>[\d-]+)'
+    _VALID_URL = r'https?://areena\.yle\.fi/(?P<podcast>podcastit/)?(?P<id>[\d-]+)'
+    _GEO_COUNTRIES = ['FI']
     _TESTS = [
         {
             'url': 'https://areena.yle.fi/1-4371942',
-            'md5': '932edda0ecf5dfd6423804182d32f8ac',
+            'md5': 'd87e9a1e74e67e009990ddd413e426b4',
             'info_dict': {
-                'id': '0_a3tjk92c',
+                'id': '1-4371942',
                 'ext': 'mp4',
                 'title': 'Pouchit',
-                'description': 'md5:d487309c3abbe5650265bbd1742d2f82',
+                'description': 'md5:01071d7056ceec375f63960f90c35366',
                 'series': 'Modernit miehet',
                 'season': 'Season 1',
                 'season_number': 1,
                 'episode': 'Episode 2',
                 'episode_number': 2,
-                'thumbnail': 'http://cfvod.kaltura.com/p/1955031/sp/195503100/thumbnail/entry_id/0_a3tjk92c/version/100061',
-                'uploader_id': 'ovp@yle.fi',
-                'duration': 1435,
-                'view_count': int,
-                'upload_date': '20181204',
-                'release_date': '20190106',
-                'timestamp': 1543916210,
-                'subtitles': {'fin': [{'url': r're:^https?://', 'ext': 'srt'}]},
+                'thumbnail': r're:https://images\.cdn\.yle\.fi/image/upload/.+\.jpg',
                 'age_limit': 7,
-                'webpage_url': 'https://areena.yle.fi/1-4371942'
-            }
+                'release_date': '20190105',
+                'release_timestamp': 1546725660,
+                'duration': 1435,
+            },
         },
         {
             'url': 'https://areena.yle.fi/1-2158940',
-            'md5': 'cecb603661004e36af8c5188b5212b12',
+            'md5': '6369ddc5e07b5fdaeda27a495184143c',
             'info_dict': {
-                'id': '1_l38iz9ur',
+                'id': '1-2158940',
                 'ext': 'mp4',
                 'title': 'Albi haluaa vessan',
-                'description': 'md5:15236d810c837bed861fae0e88663c33',
+                'description': 'Albi haluaa vessan.',
                 'series': 'Albi Lumiukko',
-                'season': None,
-                'season_number': None,
-                'episode': None,
-                'episode_number': None,
-                'thumbnail': 'http://cfvod.kaltura.com/p/1955031/sp/195503100/thumbnail/entry_id/1_l38iz9ur/version/100021',
-                'uploader_id': 'ovp@yle.fi',
-                'duration': 319,
-                'view_count': int,
-                'upload_date': '20211202',
-                'release_date': '20211215',
-                'timestamp': 1638448202,
-                'subtitles': {},
+                'thumbnail': r're:https://images\.cdn\.yle\.fi/image/upload/.+\.jpg',
                 'age_limit': 0,
-                'webpage_url': 'https://areena.yle.fi/1-2158940'
-            }
+                'release_date': '20211215',
+                'release_timestamp': 1639555200,
+                'duration': 319,
+            },
         },
         {
             'url': 'https://areena.yle.fi/1-64829589',
@@ -70,69 +58,125 @@ class YleAreenaIE(InfoExtractor):
                 'title': 'HKO & Mälkki & Tanner',
                 'description': 'md5:b4f1b1af2c6569b33f75179a86eea156',
                 'series': 'Helsingin kaupunginorkesterin konsertteja',
-                'thumbnail': r're:^https?://.+\.jpg$',
+                'thumbnail': r're:https://images\.cdn\.yle\.fi/image/upload/.+\.jpg',
                 'release_date': '20230120',
+                'release_timestamp': 1674242079,
+                'duration': 8004,
             },
             'params': {
                 'skip_download': 'm3u8',
             },
         },
+        {
+            'url': 'https://areena.yle.fi/1-72251830',
+            'info_dict': {
+                'id': '1-72251830',
+                'ext': 'mp4',
+                'title': r're:Pentulive 2024 | Pentulive \d{4}-\d{2}-\d{2} \d{2}:\d{2}',
+                'description': 'md5:1f118707d9093bf894a34fbbc865397b',
+                'series': 'Pentulive',
+                'thumbnail': r're:https://images\.cdn\.yle\.fi/image/upload/.+\.jpg',
+                'live_status': 'is_live',
+                'release_date': '20241025',
+                'release_timestamp': 1729875600,
+            },
+            'params': {
+                'skip_download': 'livestream',
+            },
+        },
+        {
+            'url': 'https://areena.yle.fi/podcastit/1-71022852',
+            'info_dict': {
+                'id': '1-71022852',
+                'ext': 'mp3',
+                'title': 'Värityspäivä',
+                'description': 'md5:c3a02b0455ec71d32cbe09d32ec161e2',
+                'series': 'Murun ja Paukun ikioma kaupunki',
+                'episode': 'Episode 1',
+                'episode_number': 1,
+                'release_date': '20240607',
+                'release_timestamp': 1717736400,
+                'duration': 442,
+            },
+        },
     ]
 
     def _real_extract(self, url):
-        video_id = self._match_id(url)
-        info = self._search_json_ld(self._download_webpage(url, video_id), video_id, default={})
+        video_id, is_podcast = self._match_valid_url(url).group('id', 'podcast')
+        json_ld = self._search_json_ld(self._download_webpage(url, video_id), video_id, default={})
         video_data = self._download_json(
             f'https://player.api.yle.fi/v1/preview/{video_id}.json?app_id=player_static_prod&app_key=8930d72170e48303cf5f3867780d549b',
             video_id, headers={
                 'origin': 'https://areena.yle.fi',
                 'referer': 'https://areena.yle.fi/',
-                'content-type': 'application/json'
-            })
+                'content-type': 'application/json',
+            })['data']
 
         # Example title: 'K1, J2: Pouchit | Modernit miehet'
-        series, season_number, episode_number, episode = self._search_regex(
-            r'K(?P<season_no>[\d]+),\s*J(?P<episode_no>[\d]+):?\s*\b(?P<episode>[^|]+)\s*|\s*(?P<series>.+)',
-            info.get('title') or '', 'episode metadata', group=('season_no', 'episode_no', 'episode', 'series'),
+        season_number, episode_number, episode, series = self._search_regex(
+            r'K(?P<season_no>\d+),\s*J(?P<episode_no>\d+):?\s*\b(?P<episode>[^|]+)\s*|\s*(?P<series>.+)',
+            json_ld.get('title') or '', 'episode metadata', group=('season_no', 'episode_no', 'episode', 'series'),
             default=(None, None, None, None))
-        description = traverse_obj(video_data, ('data', 'ongoing_ondemand', 'description', 'fin'), expected_type=str)
+        description = traverse_obj(video_data, ('ongoing_ondemand', 'description', 'fin', {str}))
 
         subtitles = {}
-        for sub in traverse_obj(video_data, ('data', 'ongoing_ondemand', 'subtitles', ...)):
-            if url_or_none(sub.get('uri')):
-                subtitles.setdefault(sub.get('language') or 'und', []).append({
-                    'url': sub['uri'],
-                    'ext': 'srt',
-                    'name': sub.get('kind'),
-                })
+        for sub in traverse_obj(video_data, ('ongoing_ondemand', 'subtitles', lambda _, v: url_or_none(v['uri']))):
+            subtitles.setdefault(sub.get('language') or 'und', []).append({
+                'url': sub['uri'],
+                'ext': 'srt',
+                'name': sub.get('kind'),
+            })
 
-        kaltura_id = traverse_obj(video_data, ('data', 'ongoing_ondemand', 'kaltura', 'id'), expected_type=str)
-        if kaltura_id:
-            info_dict = {
+        info_dict, metadata = {}, {}
+        if is_podcast and traverse_obj(video_data, ('ongoing_ondemand', 'media_url', {url_or_none})):
+            metadata = video_data['ongoing_ondemand']
+            info_dict['url'] = metadata['media_url']
+        elif traverse_obj(video_data, ('ongoing_event', 'manifest_url', {url_or_none})):
+            metadata = video_data['ongoing_event']
+            metadata.pop('duration', None)  # Duration is not accurate for livestreams
+            info_dict['live_status'] = 'is_live'
+        elif traverse_obj(video_data, ('ongoing_ondemand', 'manifest_url', {url_or_none})):
+            metadata = video_data['ongoing_ondemand']
+        # XXX: Has all externally-hosted Kaltura content been moved to native hosting?
+        elif kaltura_id := traverse_obj(video_data, ('ongoing_ondemand', 'kaltura', 'id', {str})):
+            metadata = video_data['ongoing_ondemand']
+            info_dict.update({
                 '_type': 'url_transparent',
                 'url': smuggle_url(f'kaltura:1955031:{kaltura_id}', {'source_url': url}),
                 'ie_key': KalturaIE.ie_key(),
-            }
+            })
+        elif traverse_obj(video_data, ('gone', {dict})):
+            self.raise_no_formats('The content is no longer available', expected=True, video_id=video_id)
+            metadata = video_data['gone']
         else:
-            info_dict = {
-                'id': video_id,
-                'formats': self._extract_m3u8_formats(
-                    video_data['data']['ongoing_ondemand']['manifest_url'], video_id, 'mp4', m3u8_id='hls'),
-            }
+            raise ExtractorError('Unable to extract content')
+
+        if not info_dict.get('url') and metadata.get('manifest_url'):
+            info_dict['formats'], subs = self._extract_m3u8_formats_and_subtitles(
+                metadata['manifest_url'], video_id, 'mp4', m3u8_id='hls')
+            self._merge_subtitles(subs, target=subtitles)
 
         return {
-            **info_dict,
-            'title': (traverse_obj(video_data, ('data', 'ongoing_ondemand', 'title', 'fin'), expected_type=str)
-                      or episode or info.get('title')),
+            **traverse_obj(json_ld, {
+                'title': 'title',
+                'thumbnails': ('thumbnails', ..., {'url': 'url'}),
+            }),
+            'id': video_id,
+            'title': episode,
             'description': description,
-            'series': (traverse_obj(video_data, ('data', 'ongoing_ondemand', 'series', 'title', 'fin'), expected_type=str)
-                       or series),
+            'series': series,
             'season_number': (int_or_none(self._search_regex(r'Kausi (\d+)', description, 'season number', default=None))
                               or int_or_none(season_number)),
-            'episode_number': (traverse_obj(video_data, ('data', 'ongoing_ondemand', 'episode_number'), expected_type=int_or_none)
-                               or int_or_none(episode_number)),
-            'thumbnails': traverse_obj(info, ('thumbnails', ..., {'url': 'url'})),
-            'age_limit': traverse_obj(video_data, ('data', 'ongoing_ondemand', 'content_rating', 'age_restriction'), expected_type=int_or_none),
-            'subtitles': subtitles,
-            'release_date': unified_strdate(traverse_obj(video_data, ('data', 'ongoing_ondemand', 'start_time'), expected_type=str)),
+            'episode_number': int_or_none(episode_number),
+            'subtitles': subtitles or None,
+            **traverse_obj(metadata, {
+                'title': ('title', 'fin', {str}),
+                'description': ('description', 'fin', {str}),
+                'series': ('series', 'title', 'fin', {str}),
+                'episode_number': ('episode_number', {int_or_none}),
+                'age_limit': ('content_rating', 'age_restriction', {int_or_none}),
+                'release_timestamp': ('start_time', {parse_iso8601}),
+                'duration': ('duration', 'duration_in_seconds', {int_or_none}),
+            }),
+            **info_dict,
         }
diff --git a/plugins/youtube_download/yt_dlp/extractor/ynet.py b/plugins/youtube_download/yt_dlp/extractor/ynet.py
deleted file mode 100644
index a7d7371..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/ynet.py
+++ /dev/null
@@ -1,48 +0,0 @@
-import json
-import re
-import urllib.parse
-
-from .common import InfoExtractor
-
-
-class YnetIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:.+?\.)?ynet\.co\.il/(?:.+?/)?0,7340,(?P<id>L(?:-[0-9]+)+),00\.html'
-    _TESTS = [
-        {
-            'url': 'http://hot.ynet.co.il/home/0,7340,L-11659-99244,00.html',
-            'info_dict': {
-                'id': 'L-11659-99244',
-                'ext': 'flv',
-                'title': 'איש לא יודע מאיפה באנו',
-                'thumbnail': r're:^https?://.*\.jpg',
-            }
-        }, {
-            'url': 'http://hot.ynet.co.il/home/0,7340,L-8859-84418,00.html',
-            'info_dict': {
-                'id': 'L-8859-84418',
-                'ext': 'flv',
-                'title': "צפו: הנשיקה הלוהטת של תורגי' ויוליה פלוטקין",
-                'thumbnail': r're:^https?://.*\.jpg',
-            }
-        }
-    ]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        webpage = self._download_webpage(url, video_id)
-
-        content = urllib.parse.unquote_plus(self._og_search_video_url(webpage))
-        config = json.loads(self._search_regex(r'config=({.+?})$', content, 'video config'))
-        f4m_url = config['clip']['url']
-        title = self._og_search_title(webpage)
-        m = re.search(r'ynet - HOT -- (["\']+)(?P<title>.+?)\1', title)
-        if m:
-            title = m.group('title')
-        formats = self._extract_f4m_formats(f4m_url, video_id)
-
-        return {
-            'id': video_id,
-            'title': title,
-            'formats': formats,
-            'thumbnail': self._og_search_thumbnail(webpage),
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/youjizz.py b/plugins/youtube_download/yt_dlp/extractor/youjizz.py
index cd12be5..f7ef222 100644
--- a/plugins/youtube_download/yt_dlp/extractor/youjizz.py
+++ b/plugins/youtube_download/yt_dlp/extractor/youjizz.py
@@ -18,7 +18,7 @@ class YouJizzIE(InfoExtractor):
             'title': 'Zeichentrick 1',
             'age_limit': 18,
             'duration': 2874,
-        }
+        },
     }, {
         'url': 'http://www.youjizz.com/videos/-2189178.html',
         'only_matching': True,
diff --git a/plugins/youtube_download/yt_dlp/extractor/youku.py b/plugins/youtube_download/yt_dlp/extractor/youku.py
index 7ecd9f1..3bdfa6c 100644
--- a/plugins/youtube_download/yt_dlp/extractor/youku.py
+++ b/plugins/youtube_download/yt_dlp/extractor/youku.py
@@ -20,7 +20,7 @@ class YoukuIE(InfoExtractor):
     _VALID_URL = r'''(?x)
         (?:
             https?://(
-                (?:v|player)\.youku\.com/(?:v_show/id_|player\.php/sid/)|
+                (?:v|play(?:er)?)\.(?:youku|tudou)\.com/(?:v_show/id_|player\.php/sid/)|
                 video\.tudou\.com/v/)|
             youku:)
         (?P<id>[A-Za-z0-9]+)(?:\.html|/v\.swf|)
@@ -42,11 +42,11 @@ class YoukuIE(InfoExtractor):
             'uploader_id': '322014285',
             'uploader_url': 'http://i.youku.com/u/UMTI4ODA1NzE0MA==',
             'tags': list,
-            'skip': '404',
         },
         'params': {
             'videopassword': '100600',
         },
+        'skip': '404',
     }, {
         # /play/get.json contains streams with "channel_type":"tail"
         'url': 'http://v.youku.com/v_show/id_XOTUxMzg4NDMy.html',
@@ -87,11 +87,24 @@ class YoukuIE(InfoExtractor):
             'uploader_url': 'https://www.youku.com/profile/index/?uid=UNjU2MzY1MzM1Ng==',
             'tags': list,
         },
+    }, {
+        'url': 'https://play.tudou.com/v_show/id_XNjAxNjI2OTU3Ng==.html?',
+        'info_dict': {
+            'id': 'XNjAxNjI2OTU3Ng',
+            'ext': 'mp4',
+            'title': '阿斯塔意识到哈里杀了人，自己被骗了',
+            'thumbnail': 'https://m.ykimg.com/0541010164F732752794D4D7B70331D1',
+            'uploader_id': '88758207',
+            'tags': [],
+            'uploader_url': 'https://www.youku.com/profile/index/?uid=UMzU1MDMyODI4',
+            'uploader': '英美剧场',
+            'duration': 72.91,
+        },
     }]
 
     @staticmethod
     def get_ysuid():
-        return '%d%s' % (int(time.time()), ''.join(
+        return '{}{}'.format(int(time.time()), ''.join(
             random.choices(string.ascii_letters, k=3)))
 
     def get_format_name(self, fm):
@@ -123,7 +136,7 @@ class YoukuIE(InfoExtractor):
         # request basic data
         basic_data_params = {
             'vid': video_id,
-            'ccode': '0524',
+            'ccode': '0564',
             'client_ip': '192.168.1.1',
             'utid': cna,
             'client_ts': time.time() / 1000,
@@ -260,7 +273,7 @@ class YoukuShowIE(InfoExtractor):
                 continue
             _, new_entries = self._extract_entries(
                 'http://list.youku.com/show/episode', show_id,
-                note='Downloading playlist data page %d' % (idx + 1),
+                note=f'Downloading playlist data page {idx + 1}',
                 query={
                     'id': page_config['showid'],
                     'stage': reload_id,
diff --git a/plugins/youtube_download/yt_dlp/extractor/younow.py b/plugins/youtube_download/yt_dlp/extractor/younow.py
index 18112ba..409ee75 100644
--- a/plugins/youtube_download/yt_dlp/extractor/younow.py
+++ b/plugins/youtube_download/yt_dlp/extractor/younow.py
@@ -1,16 +1,16 @@
 import itertools
 
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     ExtractorError,
     format_field,
     int_or_none,
+    str_or_none,
     try_get,
 )
 
 CDN_API_BASE = 'https://cdn.younow.com/php/api'
-MOMENT_URL_FORMAT = '%s/moment/fetch/id=%%s' % CDN_API_BASE
+MOMENT_URL_FORMAT = f'{CDN_API_BASE}/moment/fetch/id=%s'
 
 
 class YouNowLiveIE(InfoExtractor):
@@ -37,21 +37,20 @@ class YouNowLiveIE(InfoExtractor):
     def suitable(cls, url):
         return (False
                 if YouNowChannelIE.suitable(url) or YouNowMomentIE.suitable(url)
-                else super(YouNowLiveIE, cls).suitable(url))
+                else super().suitable(url))
 
     def _real_extract(self, url):
         username = self._match_id(url)
 
         data = self._download_json(
-            'https://api.younow.com/php/api/broadcast/info/curId=0/user=%s'
-            % username, username)
+            f'https://api.younow.com/php/api/broadcast/info/curId=0/user={username}', username)
 
         if data.get('errorCode') != 0:
             raise ExtractorError(data['errorMsg'], expected=True)
 
         uploader = try_get(
             data, lambda x: x['user']['profileUrlString'],
-            compat_str) or username
+            str) or username
 
         return {
             'id': uploader,
@@ -62,13 +61,12 @@ class YouNowLiveIE(InfoExtractor):
             'categories': data.get('tags'),
             'uploader': uploader,
             'uploader_id': data.get('userId'),
-            'uploader_url': 'https://www.younow.com/%s' % username,
+            'uploader_url': f'https://www.younow.com/{username}',
             'creator': uploader,
             'view_count': int_or_none(data.get('viewers')),
             'like_count': int_or_none(data.get('likes')),
             'formats': [{
-                'url': '%s/broadcast/videoPath/hls=1/broadcastId=%s/channelId=%s'
-                       % (CDN_API_BASE, data['broadcastId'], data['userId']),
+                'url': '{}/broadcast/videoPath/hls=1/broadcastId={}/channelId={}'.format(CDN_API_BASE, data['broadcastId'], data['userId']),
                 'ext': 'mp4',
                 'protocol': 'm3u8',
             }],
@@ -82,18 +80,18 @@ def _extract_moment(item, fatal=True):
             return
         raise ExtractorError('Unable to extract moment id')
 
-    moment_id = compat_str(moment_id)
+    moment_id = str(moment_id)
 
     title = item.get('text')
     if not title:
         title = 'YouNow %s' % (
             item.get('momentType') or item.get('titleType') or 'moment')
 
-    uploader = try_get(item, lambda x: x['owner']['name'], compat_str)
+    uploader = try_get(item, lambda x: x['owner']['name'], str)
     uploader_id = try_get(item, lambda x: x['owner']['userId'])
     uploader_url = format_field(uploader, None, 'https://www.younow.com/%s')
 
-    entry = {
+    return {
         'extractor_key': 'YouNowMoment',
         'id': moment_id,
         'title': title,
@@ -102,18 +100,15 @@ def _extract_moment(item, fatal=True):
         'timestamp': int_or_none(item.get('created')),
         'creator': uploader,
         'uploader': uploader,
-        'uploader_id': uploader_id,
+        'uploader_id': str_or_none(uploader_id),
         'uploader_url': uploader_url,
         'formats': [{
-            'url': 'https://hls.younow.com/momentsplaylists/live/%s/%s.m3u8'
-                   % (moment_id, moment_id),
+            'url': f'https://hls.younow.com/momentsplaylists/live/{moment_id}/{moment_id}.m3u8',
             'ext': 'mp4',
             'protocol': 'm3u8_native',
         }],
     }
 
-    return entry
-
 
 class YouNowChannelIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?younow\.com/(?P<id>[^/]+)/channel'
@@ -121,7 +116,7 @@ class YouNowChannelIE(InfoExtractor):
         'url': 'https://www.younow.com/its_Kateee_/channel',
         'info_dict': {
             'id': '14629760',
-            'title': 'its_Kateee_ moments'
+            'title': 'its_Kateee_ moments',
         },
         'playlist_mincount': 8,
     }
@@ -132,9 +127,8 @@ class YouNowChannelIE(InfoExtractor):
             if created_before is None:
                 break
             info = self._download_json(
-                '%s/moment/profile/channelId=%s/createdBefore=%d/records=20'
-                % (CDN_API_BASE, channel_id, created_before), username,
-                note='Downloading moments page %d' % page_num)
+                f'{CDN_API_BASE}/moment/profile/channelId={channel_id}/createdBefore={created_before}/records=20',
+                username, note=f'Downloading moments page {page_num}')
             items = info.get('items')
             if not items or not isinstance(items, list):
                 break
@@ -152,7 +146,7 @@ class YouNowChannelIE(InfoExtractor):
                         for moment_id in moments:
                             m = self._download_json(
                                 MOMENT_URL_FORMAT % moment_id, username,
-                                note='Downloading %s moment JSON' % moment_id,
+                                note=f'Downloading {moment_id} moment JSON',
                                 fatal=False)
                             if m and isinstance(m, dict) and m.get('item'):
                                 entry = _extract_moment(m['item'])
@@ -162,12 +156,12 @@ class YouNowChannelIE(InfoExtractor):
 
     def _real_extract(self, url):
         username = self._match_id(url)
-        channel_id = compat_str(self._download_json(
-            'https://api.younow.com/php/api/broadcast/info/curId=0/user=%s'
-            % username, username, note='Downloading user information')['userId'])
+        channel_id = str(self._download_json(
+            f'https://api.younow.com/php/api/broadcast/info/curId=0/user={username}',
+            username, note='Downloading user information')['userId'])
         return self.playlist_result(
             self._entries(username, channel_id), channel_id,
-            '%s moments' % username)
+            f'{username} moments')
 
 
 class YouNowMomentIE(InfoExtractor):
@@ -184,7 +178,7 @@ class YouNowMomentIE(InfoExtractor):
             'timestamp': 1490432040,
             'upload_date': '20170325',
             'uploader': 'GABO...',
-            'uploader_id': 35917228,
+            'uploader_id': '35917228',
         },
     }
 
@@ -192,7 +186,7 @@ class YouNowMomentIE(InfoExtractor):
     def suitable(cls, url):
         return (False
                 if YouNowChannelIE.suitable(url)
-                else super(YouNowMomentIE, cls).suitable(url))
+                else super().suitable(url))
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
diff --git a/plugins/youtube_download/yt_dlp/extractor/youporn.py b/plugins/youtube_download/yt_dlp/extractor/youporn.py
index 6ee0abc..b3c4b76 100644
--- a/plugins/youtube_download/yt_dlp/extractor/youporn.py
+++ b/plugins/youtube_download/yt_dlp/extractor/youporn.py
@@ -1,19 +1,27 @@
+import itertools
 import re
 
 from .common import InfoExtractor
 from ..utils import (
+    ExtractorError,
+    clean_html,
     extract_attributes,
+    get_element_by_class,
+    get_element_by_id,
+    get_elements_html_by_class,
     int_or_none,
     merge_dicts,
-    str_to_int,
+    parse_count,
+    parse_qs,
     traverse_obj,
     unified_strdate,
     url_or_none,
+    urljoin,
 )
 
 
 class YouPornIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?youporn\.com/(?:watch|embed)/(?P<id>\d+)(?:/(?P<display_id>[^/?#&]+))?'
+    _VALID_URL = r'https?://(?:www\.)?youporn\.com/(?:watch|embed)/(?P<id>\d+)(?:/(?P<display_id>[^/?#&]+))?/?(?:[#?]|$)'
     _EMBED_REGEX = [r'<iframe[^>]+\bsrc=["\'](?P<url>(?:https?:)?//(?:www\.)?youporn\.com/embed/\d+)']
     _TESTS = [{
         'url': 'http://www.youporn.com/watch/505835/sex-ed-is-it-safe-to-masturbate-daily/',
@@ -34,7 +42,7 @@ class YouPornIE(InfoExtractor):
             'tags': list,
             'age_limit': 18,
         },
-        'skip': 'This video has been disabled',
+        'skip': 'This video has been deactivated',
     }, {
         # Unknown uploader
         'url': 'http://www.youporn.com/watch/561726/big-tits-awesome-brunette-on-amazing-webcam-show/?from=related3&al=2&from_id=561726&pos=4',
@@ -72,27 +80,42 @@ class YouPornIE(InfoExtractor):
             'id': '16290308',
             'age_limit': 18,
             'categories': [],
-            'description': 'md5:00ea70f642f431c379763c17c2f396bc',
             'display_id': 'tinderspecial-trailer1',
             'duration': 298.0,
             'ext': 'mp4',
             'upload_date': '20201123',
             'uploader': 'Ersties',
             'tags': [],
-            'thumbnail': 'https://fi1.ypncdn.com/202011/23/16290308/original/8/tinderspecial-trailer1-8(m=eaAaaEPbaaaa).jpg',
-            'timestamp': 1606089600,
+            'thumbnail': r're:https://.+\.jpg',
+            'timestamp': 1606147564,
             'title': 'Tinder In Real Life',
             'view_count': int,
-        }
+        },
     }]
 
     def _real_extract(self, url):
         video_id, display_id = self._match_valid_url(url).group('id', 'display_id')
-        definitions = self._download_json(
-            f'https://www.youporn.com/api/video/media_definitions/{video_id}/', display_id or video_id)
+        self._set_cookie('.youporn.com', 'age_verified', '1')
+        webpage = self._download_webpage(f'https://www.youporn.com/watch/{video_id}', video_id)
 
-        def get_format_data(data, f):
-            return traverse_obj(data, lambda _, v: v['format'] == f and url_or_none(v['videoUrl']))
+        watchable = self._search_regex(
+            r'''(<div\s[^>]*\bid\s*=\s*('|")?watch-container(?(2)\2|(?!-)\b)[^>]*>)''',
+            webpage, 'watchability', default=None)
+        if not watchable:
+            msg = re.split(r'\s{2}', clean_html(get_element_by_id('mainContent', webpage)) or '')[0]
+            raise ExtractorError(
+                f'{self.IE_NAME} says: {msg}' if msg else 'Video unavailable', expected=True)
+
+        player_vars = self._search_json(r'\bplayervars\s*:', webpage, 'player vars', video_id)
+        definitions = player_vars['mediaDefinitions']
+
+        def get_format_data(data, stream_type):
+            info_url = traverse_obj(data, (lambda _, v: v['format'] == stream_type, 'videoUrl', {url_or_none}, any))
+            if not info_url:
+                return []
+            return traverse_obj(
+                self._download_json(info_url, video_id, f'Downloading {stream_type} info JSON', fatal=False),
+                lambda _, v: v['format'] == stream_type and url_or_none(v['videoUrl']))
 
         formats = []
         # Try to extract only the actual master m3u8 first, avoiding the duplicate single resolution "master" m3u8s
@@ -103,7 +126,7 @@ class YouPornIE(InfoExtractor):
         for definition in get_format_data(definitions, 'mp4'):
             f = traverse_obj(definition, {
                 'url': 'videoUrl',
-                'filesize': ('videoSize', {int_or_none})
+                'filesize': ('videoSize', {int_or_none}),
             })
             height = int_or_none(definition.get('quality'))
             # Video URL's path looks like this:
@@ -117,16 +140,12 @@ class YouPornIE(InfoExtractor):
                     height = int(mobj.group('height'))
                 bitrate = int(mobj.group('bitrate'))
                 f.update({
-                    'format_id': '%dp-%dk' % (height, bitrate),
+                    'format_id': f'{height}p-{bitrate}k',
                     'tbr': bitrate,
                 })
             f['height'] = height
             formats.append(f)
 
-        webpage = self._download_webpage(
-            'http://www.youporn.com/watch/%s' % video_id, display_id,
-            headers={'Cookie': 'age_verified=1'})
-
         title = self._html_search_regex(
             r'(?s)<div[^>]+class=["\']watchVideoTitle[^>]+>(.+?)</div>',
             webpage, 'title', default=None) or self._og_search_title(
@@ -141,8 +160,10 @@ class YouPornIE(InfoExtractor):
         thumbnail = self._search_regex(
             r'(?:imageurl\s*=|poster\s*:)\s*(["\'])(?P<thumbnail>.+?)\1',
             webpage, 'thumbnail', fatal=False, group='thumbnail')
-        duration = int_or_none(self._html_search_meta(
-            'video:duration', webpage, 'duration', fatal=False))
+        duration = traverse_obj(player_vars, ('duration', {int_or_none}))
+        if duration is None:
+            duration = int_or_none(self._html_search_meta(
+                'video:duration', webpage, 'duration', fatal=False))
 
         uploader = self._html_search_regex(
             r'(?s)<div[^>]+class=["\']submitByLink["\'][^>]*>(.+?)</div>',
@@ -158,11 +179,11 @@ class YouPornIE(InfoExtractor):
 
         view_count = None
         views = self._search_regex(
-            r'(<div[^>]+\bclass=["\']js_videoInfoViews["\']>)', webpage,
-            'views', default=None)
+            r'(<div [^>]*\bdata-value\s*=[^>]+>)\s*<label>Views:</label>',
+            webpage, 'views', default=None)
         if views:
-            view_count = str_to_int(extract_attributes(views).get('data-value'))
-        comment_count = str_to_int(self._search_regex(
+            view_count = parse_count(extract_attributes(views).get('data-value'))
+        comment_count = parse_count(self._search_regex(
             r'>All [Cc]omments? \(([\d,.]+)\)',
             webpage, 'comment count', default=None))
 
@@ -180,7 +201,8 @@ class YouPornIE(InfoExtractor):
 
         data = self._search_json_ld(webpage, video_id, expected_type='VideoObject', fatal=False)
         data.pop('url', None)
-        return merge_dicts(data, {
+
+        result = merge_dicts(data, {
             'id': video_id,
             'display_id': display_id,
             'title': title,
@@ -196,3 +218,350 @@ class YouPornIE(InfoExtractor):
             'age_limit': age_limit,
             'formats': formats,
         })
+
+        # Remove SEO spam "description"
+        description = result.get('description')
+        if description and description.startswith(f'Watch {result.get("title")} online'):
+            del result['description']
+
+        return result
+
+
+class YouPornListBaseIE(InfoExtractor):
+    def _get_next_url(self, url, pl_id, html):
+        return urljoin(url, self._search_regex(
+            r'''<a [^>]*?\bhref\s*=\s*("|')(?P<url>(?:(?!\1)[^>])+)\1''',
+            get_element_by_id('next', html) or '', 'next page',
+            group='url', default=None))
+
+    @classmethod
+    def _get_title_from_slug(cls, title_slug):
+        return re.sub(r'[_-]', ' ', title_slug)
+
+    def _entries(self, url, pl_id, html=None, page_num=None):
+        start = page_num or 1
+        for page in itertools.count(start):
+            if not html:
+                html = self._download_webpage(
+                    url, pl_id, note=f'Downloading page {page}', fatal=page == start)
+            if not html:
+                return
+            for element in get_elements_html_by_class('video-title', html):
+                if video_url := traverse_obj(element, ({extract_attributes}, 'href', {urljoin(url)})):
+                    yield self.url_result(video_url)
+
+            if page_num is not None:
+                return
+            next_url = self._get_next_url(url, pl_id, html)
+            if not next_url or next_url == url:
+                return
+            url = next_url
+            html = None
+
+    def _real_extract(self, url, html=None):
+        m_dict = self._match_valid_url(url).groupdict()
+        pl_id, page_type, sort = (m_dict.get(k) for k in ('id', 'type', 'sort'))
+        qs = {k: v[-1] for k, v in parse_qs(url).items() if v}
+
+        base_id = pl_id or 'YouPorn'
+        title = self._get_title_from_slug(base_id)
+        if page_type:
+            title = f'{page_type.capitalize()} {title}'
+        base_id = [base_id.lower()]
+        if sort is None:
+            title += ' videos'
+        else:
+            title = f'{title} videos by {re.sub(r"[_-]", " ", sort)}'
+            base_id.append(sort)
+        if qs:
+            filters = list(map('='.join, sorted(qs.items())))
+            title += f' ({",".join(filters)})'
+            base_id.extend(filters)
+        pl_id = '/'.join(base_id)
+
+        return self.playlist_result(
+            self._entries(url, pl_id, html=html, page_num=int_or_none(qs.get('page'))),
+            playlist_id=pl_id, playlist_title=title)
+
+
+class YouPornCategoryIE(YouPornListBaseIE):
+    IE_DESC = 'YouPorn category, with sorting, filtering and pagination'
+    _VALID_URL = r'''(?x)
+        https?://(?:www\.)?youporn\.com/
+        (?P<type>category)/(?P<id>[^/?#&]+)
+        (?:/(?P<sort>popular|views|rating|time|duration))?/?(?:[#?]|$)
+    '''
+    _TESTS = [{
+        'note': 'Full list with pagination',
+        'url': 'https://www.youporn.com/category/popular-with-women/popular/',
+        'info_dict': {
+            'id': 'popular-with-women/popular',
+            'title': 'Category popular with women videos by popular',
+        },
+        'playlist_mincount': 39,
+    }, {
+        'note': 'Filtered paginated list with single page result',
+        'url': 'https://www.youporn.com/category/popular-with-women/duration/?min_minutes=10',
+        'info_dict': {
+            'id': 'popular-with-women/duration/min_minutes=10',
+            'title': 'Category popular with women videos by duration (min_minutes=10)',
+        },
+        'playlist_mincount': 2,
+        # 'playlist_maxcount': 30,
+    }, {
+        'note': 'Single page of full list',
+        'url': 'https://www.youporn.com/category/popular-with-women/popular?page=1',
+        'info_dict': {
+            'id': 'popular-with-women/popular/page=1',
+            'title': 'Category popular with women videos by popular (page=1)',
+        },
+        'playlist_count': 36,
+    }]
+
+
+class YouPornChannelIE(YouPornListBaseIE):
+    IE_DESC = 'YouPorn channel, with sorting and pagination'
+    _VALID_URL = r'''(?x)
+        https?://(?:www\.)?youporn\.com/
+        (?P<type>channel)/(?P<id>[^/?#&]+)
+        (?:/(?P<sort>rating|views|duration))?/?(?:[#?]|$)
+    '''
+    _TESTS = [{
+        'note': 'Full list with pagination',
+        'url': 'https://www.youporn.com/channel/x-feeds/',
+        'info_dict': {
+            'id': 'x-feeds',
+            'title': 'Channel X-Feeds videos',
+        },
+        'playlist_mincount': 37,
+    }, {
+        'note': 'Single page of full list (no filters here)',
+        'url': 'https://www.youporn.com/channel/x-feeds/duration?page=1',
+        'info_dict': {
+            'id': 'x-feeds/duration/page=1',
+            'title': 'Channel X-Feeds videos by duration (page=1)',
+        },
+        'playlist_count': 24,
+    }]
+
+    @staticmethod
+    def _get_title_from_slug(title_slug):
+        return re.sub(r'_', ' ', title_slug).title()
+
+
+class YouPornCollectionIE(YouPornListBaseIE):
+    IE_DESC = 'YouPorn collection (user playlist), with sorting and pagination'
+    _VALID_URL = r'''(?x)
+        https?://(?:www\.)?youporn\.com/
+        (?P<type>collection)s/videos/(?P<id>\d+)
+        (?:/(?P<sort>rating|views|time|duration))?/?(?:[#?]|$)
+    '''
+    _TESTS = [{
+        'note': 'Full list with pagination',
+        'url': 'https://www.youporn.com/collections/videos/33044251/',
+        'info_dict': {
+            'id': '33044251',
+            'title': 'Collection Sexy Lips videos',
+            'uploader': 'ph-littlewillyb',
+        },
+        'playlist_mincount': 50,
+    }, {
+        'note': 'Single page of full list (no filters here)',
+        'url': 'https://www.youporn.com/collections/videos/33044251/time?page=1',
+        'info_dict': {
+            'id': '33044251/time/page=1',
+            'title': 'Collection Sexy Lips videos by time (page=1)',
+            'uploader': 'ph-littlewillyb',
+        },
+        'playlist_count': 20,
+    }]
+
+    def _real_extract(self, url):
+        pl_id = self._match_id(url)
+        html = self._download_webpage(url, pl_id)
+        playlist = super()._real_extract(url, html=html)
+        infos = re.sub(r'\s+', ' ', clean_html(get_element_by_class(
+            'collection-infos', html)) or '')
+        title, uploader = self._search_regex(
+            r'^\s*Collection: (?P<title>.+?) \d+ VIDEOS \d+ VIEWS \d+ days LAST UPDATED From: (?P<uploader>[\w_-]+)',
+            infos, 'title/uploader', group=('title', 'uploader'), default=(None, None))
+        if title:
+            playlist.update({
+                'title': playlist['title'].replace(playlist['id'].split('/')[0], title),
+                'uploader': uploader,
+            })
+
+        return playlist
+
+
+class YouPornTagIE(YouPornListBaseIE):
+    IE_DESC = 'YouPorn tag (porntags), with sorting, filtering and pagination'
+    _VALID_URL = r'''(?x)
+        https?://(?:www\.)?youporn\.com/
+        porn(?P<type>tag)s/(?P<id>[^/?#&]+)
+        (?:/(?P<sort>views|rating|time|duration))?/?(?:[#?]|$)
+    '''
+    _TESTS = [{
+        'note': 'Full list with pagination',
+        'url': 'https://www.youporn.com/porntags/austrian',
+        'info_dict': {
+            'id': 'austrian',
+            'title': 'Tag austrian videos',
+        },
+        'playlist_mincount': 33,
+        'expected_warnings': ['YouPorn tag pages are not correctly cached'],
+    }, {
+        'note': 'Filtered paginated list with single page result',
+        'url': 'https://www.youporn.com/porntags/austrian/duration/?min_minutes=10',
+        'info_dict': {
+            'id': 'austrian/duration/min_minutes=10',
+            'title': 'Tag austrian videos by duration (min_minutes=10)',
+        },
+        'playlist_mincount': 10,
+        # number of videos per page is (row x col) 2x3 + 6x4 + 2, or + 3,
+        # or more, varying with number of ads; let's set max as 9x4
+        # NB col 1 may not be shown in non-JS page with site CSS and zoom 100%
+        # 'playlist_maxcount': 32,
+        'expected_warnings': ['YouPorn tag pages are not correctly cached'],
+    }, {
+        'note': 'Single page of full list',
+        'url': 'https://www.youporn.com/porntags/austrian/?page=1',
+        'info_dict': {
+            'id': 'austrian/page=1',
+            'title': 'Tag austrian videos (page=1)',
+        },
+        'playlist_mincount': 32,
+        # 'playlist_maxcount': 34,
+        'expected_warnings': ['YouPorn tag pages are not correctly cached'],
+    }]
+
+    def _real_extract(self, url):
+        self.report_warning(
+            'YouPorn tag pages are not correctly cached and '
+            'often return incorrect results', only_once=True)
+        return super()._real_extract(url)
+
+
+class YouPornStarIE(YouPornListBaseIE):
+    IE_DESC = 'YouPorn Pornstar, with description, sorting and pagination'
+    _VALID_URL = r'''(?x)
+        https?://(?:www\.)?youporn\.com/
+        (?P<type>pornstar)/(?P<id>[^/?#&]+)
+        (?:/(?P<sort>rating|views|duration))?/?(?:[#?]|$)
+    '''
+    _TESTS = [{
+        'note': 'Full list with pagination',
+        'url': 'https://www.youporn.com/pornstar/daynia/',
+        'info_dict': {
+            'id': 'daynia',
+            'title': 'Pornstar Daynia videos',
+            'description': r're:Daynia Rank \d+ Videos \d+ Views [\d,.]+ .+ Subscribers \d+',
+        },
+        'playlist_mincount': 40,
+    }, {
+        'note': 'Single page of full list (no filters here)',
+        'url': 'https://www.youporn.com/pornstar/daynia/?page=1',
+        'info_dict': {
+            'id': 'daynia/page=1',
+            'title': 'Pornstar Daynia videos (page=1)',
+            'description': 're:.{180,}',
+        },
+        'playlist_count': 26,
+    }]
+
+    @staticmethod
+    def _get_title_from_slug(title_slug):
+        return re.sub(r'_', ' ', title_slug).title()
+
+    def _real_extract(self, url):
+        pl_id = self._match_id(url)
+        html = self._download_webpage(url, pl_id)
+        playlist = super()._real_extract(url, html=html)
+        INFO_ELEMENT_RE = r'''(?x)
+            <div [^>]*\bclass\s*=\s*('|")(?:[\w$-]+\s+|\s)*?pornstar-info-wrapper(?:\s+[\w$-]+|\s)*\1[^>]*>
+            (?P<info>[\s\S]+?)(?:</div>\s*){6,}
+        '''
+
+        if infos := self._search_regex(INFO_ELEMENT_RE, html, 'infos', group='info', default=''):
+            infos = re.sub(
+                r'(?:\s*nl=nl)+\s*', ' ',
+                re.sub(r'(?u)\s+', ' ', clean_html(re.sub('\n', 'nl=nl', infos)))).replace('ribe Subsc', '')
+
+        return {
+            **playlist,
+            'description': infos.strip() or None,
+        }
+
+
+class YouPornVideosIE(YouPornListBaseIE):
+    IE_DESC = 'YouPorn video (browse) playlists, with sorting, filtering and pagination'
+    _VALID_URL = r'''(?x)
+        https?://(?:www\.)?youporn\.com/
+            (?:(?P<id>browse)/)?
+            (?P<sort>(?(id)
+                (?:duration|rating|time|views)|
+                (?:most_(?:favou?rit|view)ed|recommended|top_rated)?))
+            (?:[/#?]|$)
+    '''
+    _TESTS = [{
+        'note': 'Full list with pagination (too long for test)',
+        'url': 'https://www.youporn.com/',
+        'info_dict': {
+            'id': 'youporn',
+            'title': 'YouPorn videos',
+        },
+        'only_matching': True,
+    }, {
+        'note': 'Full list with pagination (too long for test)',
+        'url': 'https://www.youporn.com/recommended',
+        'info_dict': {
+            'id': 'youporn/recommended',
+            'title': 'YouPorn videos by recommended',
+        },
+        'only_matching': True,
+    }, {
+        'note': 'Full list with pagination (too long for test)',
+        'url': 'https://www.youporn.com/top_rated',
+        'info_dict': {
+            'id': 'youporn/top_rated',
+            'title': 'YouPorn videos by top rated',
+        },
+        'only_matching': True,
+    }, {
+        'note': 'Full list with pagination (too long for test)',
+        'url': 'https://www.youporn.com/browse/time',
+        'info_dict': {
+            'id': 'browse/time',
+            'title': 'YouPorn videos by time',
+        },
+        'only_matching': True,
+    }, {
+        'note': 'Filtered paginated list with single page result',
+        'url': 'https://www.youporn.com/most_favorited/?res=VR&max_minutes=2',
+        'info_dict': {
+            'id': 'youporn/most_favorited/max_minutes=2/res=VR',
+            'title': 'YouPorn videos by most favorited (max_minutes=2,res=VR)',
+        },
+        'playlist_mincount': 10,
+        # 'playlist_maxcount': 28,
+    }, {
+        'note': 'Filtered paginated list with several pages',
+        'url': 'https://www.youporn.com/most_favorited/?res=VR&max_minutes=5',
+        'info_dict': {
+            'id': 'youporn/most_favorited/max_minutes=5/res=VR',
+            'title': 'YouPorn videos by most favorited (max_minutes=5,res=VR)',
+        },
+        'playlist_mincount': 45,
+    }, {
+        'note': 'Single page of full list',
+        'url': 'https://www.youporn.com/browse/time?page=1',
+        'info_dict': {
+            'id': 'browse/time/page=1',
+            'title': 'YouPorn videos by time (page=1)',
+        },
+        'playlist_count': 36,
+    }]
+
+    @staticmethod
+    def _get_title_from_slug(title_slug):
+        return 'YouPorn' if title_slug == 'browse' else title_slug
diff --git a/plugins/youtube_download/yt_dlp/extractor/yourporn.py b/plugins/youtube_download/yt_dlp/extractor/yourporn.py
deleted file mode 100644
index 38f42a9..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/yourporn.py
+++ /dev/null
@@ -1,65 +0,0 @@
-from .common import InfoExtractor
-from ..compat import compat_str
-from ..utils import (
-    parse_duration,
-    urljoin,
-)
-
-
-class YourPornIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?sxyprn\.com/post/(?P<id>[^/?#&.]+)'
-    _TESTS = [{
-        'url': 'https://sxyprn.com/post/57ffcb2e1179b.html',
-        'md5': '6f8682b6464033d87acaa7a8ff0c092e',
-        'info_dict': {
-            'id': '57ffcb2e1179b',
-            'ext': 'mp4',
-            'title': 'md5:c9f43630bd968267672651ba905a7d35',
-            'thumbnail': r're:^https?://.*\.jpg$',
-            'duration': 165,
-            'age_limit': 18,
-        },
-        'params': {
-            'skip_download': True,
-        },
-    }, {
-        'url': 'https://sxyprn.com/post/57ffcb2e1179b.html',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        webpage = self._download_webpage(url, video_id)
-
-        parts = self._parse_json(
-            self._search_regex(
-                r'data-vnfo=(["\'])(?P<data>{.+?})\1', webpage, 'data info',
-                group='data'),
-            video_id)[video_id].split('/')
-
-        num = 0
-        for c in parts[6] + parts[7]:
-            if c.isnumeric():
-                num += int(c)
-        parts[5] = compat_str(int(parts[5]) - num)
-        parts[1] += '8'
-        video_url = urljoin(url, '/'.join(parts))
-
-        title = (self._search_regex(
-            r'<[^>]+\bclass=["\']PostEditTA[^>]+>([^<]+)', webpage, 'title',
-            default=None) or self._og_search_description(webpage)).strip()
-        thumbnail = self._og_search_thumbnail(webpage)
-        duration = parse_duration(self._search_regex(
-            r'duration\s*:\s*<[^>]+>([\d:]+)', webpage, 'duration',
-            default=None))
-
-        return {
-            'id': video_id,
-            'url': video_url,
-            'title': title,
-            'thumbnail': thumbnail,
-            'duration': duration,
-            'age_limit': 18,
-            'ext': 'mp4',
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/yourupload.py b/plugins/youtube_download/yt_dlp/extractor/yourupload.py
deleted file mode 100644
index def6329..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/yourupload.py
+++ /dev/null
@@ -1,43 +0,0 @@
-from .common import InfoExtractor
-from ..utils import urljoin
-
-
-class YourUploadIE(InfoExtractor):
-    _VALID_URL = r'https?://(?:www\.)?(?:yourupload\.com/(?:watch|embed)|embed\.yourupload\.com)/(?P<id>[A-Za-z0-9]+)'
-    _TESTS = [{
-        'url': 'http://yourupload.com/watch/14i14h',
-        'md5': '5e2c63385454c557f97c4c4131a393cd',
-        'info_dict': {
-            'id': '14i14h',
-            'ext': 'mp4',
-            'title': 'BigBuckBunny_320x180.mp4',
-            'thumbnail': r're:^https?://.*\.jpe?g',
-        }
-    }, {
-        'url': 'http://www.yourupload.com/embed/14i14h',
-        'only_matching': True,
-    }, {
-        'url': 'http://embed.yourupload.com/14i14h',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-
-        embed_url = 'http://www.yourupload.com/embed/%s' % video_id
-
-        webpage = self._download_webpage(embed_url, video_id)
-
-        title = self._og_search_title(webpage)
-        video_url = urljoin(embed_url, self._og_search_video_url(webpage))
-        thumbnail = self._og_search_thumbnail(webpage, default=None)
-
-        return {
-            'id': video_id,
-            'title': title,
-            'url': video_url,
-            'thumbnail': thumbnail,
-            'http_headers': {
-                'Referer': embed_url,
-            },
-        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/youtube.py b/plugins/youtube_download/yt_dlp/extractor/youtube.py
deleted file mode 100644
index 023d8fd..0000000
--- a/plugins/youtube_download/yt_dlp/extractor/youtube.py
+++ /dev/null
@@ -1,7332 +0,0 @@
-import base64
-import calendar
-import collections
-import copy
-import datetime
-import enum
-import hashlib
-import itertools
-import json
-import math
-import os.path
-import random
-import re
-import sys
-import threading
-import time
-import traceback
-import urllib.parse
-
-from .common import InfoExtractor, SearchInfoExtractor
-from .openload import PhantomJSwrapper
-from ..compat import functools
-from ..jsinterp import JSInterpreter
-from ..networking.exceptions import HTTPError, network_exceptions
-from ..utils import (
-    NO_DEFAULT,
-    ExtractorError,
-    LazyList,
-    UserNotLive,
-    bug_reports_message,
-    classproperty,
-    clean_html,
-    datetime_from_str,
-    dict_get,
-    filter_dict,
-    float_or_none,
-    format_field,
-    get_first,
-    int_or_none,
-    is_html,
-    join_nonempty,
-    js_to_json,
-    mimetype2ext,
-    orderedSet,
-    parse_codecs,
-    parse_count,
-    parse_duration,
-    parse_iso8601,
-    parse_qs,
-    qualities,
-    remove_start,
-    smuggle_url,
-    str_or_none,
-    str_to_int,
-    strftime_or_none,
-    traverse_obj,
-    try_get,
-    unescapeHTML,
-    unified_strdate,
-    unified_timestamp,
-    unsmuggle_url,
-    update_url_query,
-    url_or_none,
-    urljoin,
-    variadic,
-)
-
-STREAMING_DATA_CLIENT_NAME = '__yt_dlp_client'
-# any clients starting with _ cannot be explicitly requested by the user
-INNERTUBE_CLIENTS = {
-    'web': {
-        'INNERTUBE_API_KEY': 'AIzaSyAO_FJ2SlqU8Q4STEHLGCilw_Y9_11qcW8',
-        'INNERTUBE_CONTEXT': {
-            'client': {
-                'clientName': 'WEB',
-                'clientVersion': '2.20220801.00.00',
-            }
-        },
-        'INNERTUBE_CONTEXT_CLIENT_NAME': 1
-    },
-    'web_embedded': {
-        'INNERTUBE_API_KEY': 'AIzaSyAO_FJ2SlqU8Q4STEHLGCilw_Y9_11qcW8',
-        'INNERTUBE_CONTEXT': {
-            'client': {
-                'clientName': 'WEB_EMBEDDED_PLAYER',
-                'clientVersion': '1.20220731.00.00',
-            },
-        },
-        'INNERTUBE_CONTEXT_CLIENT_NAME': 56
-    },
-    'web_music': {
-        'INNERTUBE_API_KEY': 'AIzaSyC9XL3ZjWddXya6X74dJoCTL-WEYFDNX30',
-        'INNERTUBE_HOST': 'music.youtube.com',
-        'INNERTUBE_CONTEXT': {
-            'client': {
-                'clientName': 'WEB_REMIX',
-                'clientVersion': '1.20220727.01.00',
-            }
-        },
-        'INNERTUBE_CONTEXT_CLIENT_NAME': 67,
-    },
-    'web_creator': {
-        'INNERTUBE_API_KEY': 'AIzaSyBUPetSUmoZL-OhlxA7wSac5XinrygCqMo',
-        'INNERTUBE_CONTEXT': {
-            'client': {
-                'clientName': 'WEB_CREATOR',
-                'clientVersion': '1.20220726.00.00',
-            }
-        },
-        'INNERTUBE_CONTEXT_CLIENT_NAME': 62,
-    },
-    'android': {
-        'INNERTUBE_API_KEY': 'AIzaSyA8eiZmM1FaDVjRy-df2KTyQ_vz_yYM39w',
-        'INNERTUBE_CONTEXT': {
-            'client': {
-                'clientName': 'ANDROID',
-                'clientVersion': '17.31.35',
-                'androidSdkVersion': 30,
-                'userAgent': 'com.google.android.youtube/17.31.35 (Linux; U; Android 11) gzip'
-            }
-        },
-        'INNERTUBE_CONTEXT_CLIENT_NAME': 3,
-        'REQUIRE_JS_PLAYER': False
-    },
-    'android_embedded': {
-        'INNERTUBE_API_KEY': 'AIzaSyCjc_pVEDi4qsv5MtC2dMXzpIaDoRFLsxw',
-        'INNERTUBE_CONTEXT': {
-            'client': {
-                'clientName': 'ANDROID_EMBEDDED_PLAYER',
-                'clientVersion': '17.31.35',
-                'androidSdkVersion': 30,
-                'userAgent': 'com.google.android.youtube/17.31.35 (Linux; U; Android 11) gzip'
-            },
-        },
-        'INNERTUBE_CONTEXT_CLIENT_NAME': 55,
-        'REQUIRE_JS_PLAYER': False
-    },
-    'android_music': {
-        'INNERTUBE_API_KEY': 'AIzaSyAOghZGza2MQSZkY_zfZ370N-PUdXEo8AI',
-        'INNERTUBE_CONTEXT': {
-            'client': {
-                'clientName': 'ANDROID_MUSIC',
-                'clientVersion': '5.16.51',
-                'androidSdkVersion': 30,
-                'userAgent': 'com.google.android.apps.youtube.music/5.16.51 (Linux; U; Android 11) gzip'
-            }
-        },
-        'INNERTUBE_CONTEXT_CLIENT_NAME': 21,
-        'REQUIRE_JS_PLAYER': False
-    },
-    'android_creator': {
-        'INNERTUBE_API_KEY': 'AIzaSyD_qjV8zaaUMehtLkrKFgVeSX_Iqbtyws8',
-        'INNERTUBE_CONTEXT': {
-            'client': {
-                'clientName': 'ANDROID_CREATOR',
-                'clientVersion': '22.30.100',
-                'androidSdkVersion': 30,
-                'userAgent': 'com.google.android.apps.youtube.creator/22.30.100 (Linux; U; Android 11) gzip'
-            },
-        },
-        'INNERTUBE_CONTEXT_CLIENT_NAME': 14,
-        'REQUIRE_JS_PLAYER': False
-    },
-    # iOS clients have HLS live streams. Setting device model to get 60fps formats.
-    # See: https://github.com/TeamNewPipe/NewPipeExtractor/issues/680#issuecomment-1002724558
-    'ios': {
-        'INNERTUBE_API_KEY': 'AIzaSyB-63vPrdThhKuerbB2N_l7Kwwcxj6yUAc',
-        'INNERTUBE_CONTEXT': {
-            'client': {
-                'clientName': 'IOS',
-                'clientVersion': '17.33.2',
-                'deviceModel': 'iPhone14,3',
-                'userAgent': 'com.google.ios.youtube/17.33.2 (iPhone14,3; U; CPU iOS 15_6 like Mac OS X)'
-            }
-        },
-        'INNERTUBE_CONTEXT_CLIENT_NAME': 5,
-        'REQUIRE_JS_PLAYER': False
-    },
-    'ios_embedded': {
-        'INNERTUBE_CONTEXT': {
-            'client': {
-                'clientName': 'IOS_MESSAGES_EXTENSION',
-                'clientVersion': '17.33.2',
-                'deviceModel': 'iPhone14,3',
-                'userAgent': 'com.google.ios.youtube/17.33.2 (iPhone14,3; U; CPU iOS 15_6 like Mac OS X)'
-            },
-        },
-        'INNERTUBE_CONTEXT_CLIENT_NAME': 66,
-        'REQUIRE_JS_PLAYER': False
-    },
-    'ios_music': {
-        'INNERTUBE_API_KEY': 'AIzaSyBAETezhkwP0ZWA02RsqT1zu78Fpt0bC_s',
-        'INNERTUBE_CONTEXT': {
-            'client': {
-                'clientName': 'IOS_MUSIC',
-                'clientVersion': '5.21',
-                'deviceModel': 'iPhone14,3',
-                'userAgent': 'com.google.ios.youtubemusic/5.21 (iPhone14,3; U; CPU iOS 15_6 like Mac OS X)'
-            },
-        },
-        'INNERTUBE_CONTEXT_CLIENT_NAME': 26,
-        'REQUIRE_JS_PLAYER': False
-    },
-    'ios_creator': {
-        'INNERTUBE_CONTEXT': {
-            'client': {
-                'clientName': 'IOS_CREATOR',
-                'clientVersion': '22.33.101',
-                'deviceModel': 'iPhone14,3',
-                'userAgent': 'com.google.ios.ytcreator/22.33.101 (iPhone14,3; U; CPU iOS 15_6 like Mac OS X)'
-            },
-        },
-        'INNERTUBE_CONTEXT_CLIENT_NAME': 15,
-        'REQUIRE_JS_PLAYER': False
-    },
-    # mweb has 'ultralow' formats
-    # See: https://github.com/yt-dlp/yt-dlp/pull/557
-    'mweb': {
-        'INNERTUBE_API_KEY': 'AIzaSyAO_FJ2SlqU8Q4STEHLGCilw_Y9_11qcW8',
-        'INNERTUBE_CONTEXT': {
-            'client': {
-                'clientName': 'MWEB',
-                'clientVersion': '2.20220801.00.00',
-            }
-        },
-        'INNERTUBE_CONTEXT_CLIENT_NAME': 2
-    },
-    # This client can access age restricted videos (unless the uploader has disabled the 'allow embedding' option)
-    # See: https://github.com/zerodytrash/YouTube-Internal-Clients
-    'tv_embedded': {
-        'INNERTUBE_API_KEY': 'AIzaSyAO_FJ2SlqU8Q4STEHLGCilw_Y9_11qcW8',
-        'INNERTUBE_CONTEXT': {
-            'client': {
-                'clientName': 'TVHTML5_SIMPLY_EMBEDDED_PLAYER',
-                'clientVersion': '2.0',
-            },
-        },
-        'INNERTUBE_CONTEXT_CLIENT_NAME': 85
-    },
-}
-
-
-def _split_innertube_client(client_name):
-    variant, *base = client_name.rsplit('.', 1)
-    if base:
-        return variant, base[0], variant
-    base, *variant = client_name.split('_', 1)
-    return client_name, base, variant[0] if variant else None
-
-
-def short_client_name(client_name):
-    main, *parts = _split_innertube_client(client_name)[0].replace('embedscreen', 'e_s').split('_')
-    return join_nonempty(main[:4], ''.join(x[0] for x in parts)).upper()
-
-
-def build_innertube_clients():
-    THIRD_PARTY = {
-        'embedUrl': 'https://www.youtube.com/',  # Can be any valid URL
-    }
-    BASE_CLIENTS = ('ios', 'android', 'web', 'tv', 'mweb')
-    priority = qualities(BASE_CLIENTS[::-1])
-
-    for client, ytcfg in tuple(INNERTUBE_CLIENTS.items()):
-        ytcfg.setdefault('INNERTUBE_API_KEY', 'AIzaSyDCU8hByM-4DrUqRUYnGn-3llEO78bcxq8')
-        ytcfg.setdefault('INNERTUBE_HOST', 'www.youtube.com')
-        ytcfg.setdefault('REQUIRE_JS_PLAYER', True)
-        ytcfg['INNERTUBE_CONTEXT']['client'].setdefault('hl', 'en')
-
-        _, base_client, variant = _split_innertube_client(client)
-        ytcfg['priority'] = 10 * priority(base_client)
-
-        if not variant:
-            INNERTUBE_CLIENTS[f'{client}_embedscreen'] = embedscreen = copy.deepcopy(ytcfg)
-            embedscreen['INNERTUBE_CONTEXT']['client']['clientScreen'] = 'EMBED'
-            embedscreen['INNERTUBE_CONTEXT']['thirdParty'] = THIRD_PARTY
-            embedscreen['priority'] -= 3
-        elif variant == 'embedded':
-            ytcfg['INNERTUBE_CONTEXT']['thirdParty'] = THIRD_PARTY
-            ytcfg['priority'] -= 2
-        else:
-            ytcfg['priority'] -= 3
-
-
-build_innertube_clients()
-
-
-class BadgeType(enum.Enum):
-    AVAILABILITY_UNLISTED = enum.auto()
-    AVAILABILITY_PRIVATE = enum.auto()
-    AVAILABILITY_PUBLIC = enum.auto()
-    AVAILABILITY_PREMIUM = enum.auto()
-    AVAILABILITY_SUBSCRIPTION = enum.auto()
-    LIVE_NOW = enum.auto()
-    VERIFIED = enum.auto()
-
-
-class YoutubeBaseInfoExtractor(InfoExtractor):
-    """Provide base functions for Youtube extractors"""
-
-    _RESERVED_NAMES = (
-        r'channel|c|user|playlist|watch|w|v|embed|e|live|watch_popup|clip|'
-        r'shorts|movies|results|search|shared|hashtag|trending|explore|feed|feeds|'
-        r'browse|oembed|get_video_info|iframe_api|s/player|source|'
-        r'storefront|oops|index|account|t/terms|about|upload|signin|logout')
-
-    _PLAYLIST_ID_RE = r'(?:(?:PL|LL|EC|UU|FL|RD|UL|TL|PU|OLAK5uy_)[0-9A-Za-z-_]{10,}|RDMM|WL|LL|LM)'
-
-    # _NETRC_MACHINE = 'youtube'
-
-    # If True it will raise an error if no login info is provided
-    _LOGIN_REQUIRED = False
-
-    _INVIDIOUS_SITES = (
-        # invidious-redirect websites
-        r'(?:www\.)?redirect\.invidious\.io',
-        r'(?:(?:www|dev)\.)?invidio\.us',
-        # Invidious instances taken from https://github.com/iv-org/documentation/blob/master/docs/instances.md
-        r'(?:www\.)?invidious\.pussthecat\.org',
-        r'(?:www\.)?invidious\.zee\.li',
-        r'(?:www\.)?invidious\.ethibox\.fr',
-        r'(?:www\.)?iv\.ggtyler\.dev',
-        r'(?:www\.)?inv\.vern\.i2p',
-        r'(?:www\.)?am74vkcrjp2d5v36lcdqgsj2m6x36tbrkhsruoegwfcizzabnfgf5zyd\.onion',
-        r'(?:www\.)?inv\.riverside\.rocks',
-        r'(?:www\.)?invidious\.silur\.me',
-        r'(?:www\.)?inv\.bp\.projectsegfau\.lt',
-        r'(?:www\.)?invidious\.g4c3eya4clenolymqbpgwz3q3tawoxw56yhzk4vugqrl6dtu3ejvhjid\.onion',
-        r'(?:www\.)?invidious\.slipfox\.xyz',
-        r'(?:www\.)?invidious\.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd\.onion',
-        r'(?:www\.)?inv\.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad\.onion',
-        r'(?:www\.)?invidious\.tiekoetter\.com',
-        r'(?:www\.)?iv\.odysfvr23q5wgt7i456o5t3trw2cw5dgn56vbjfbq2m7xsc5vqbqpcyd\.onion',
-        r'(?:www\.)?invidious\.nerdvpn\.de',
-        r'(?:www\.)?invidious\.weblibre\.org',
-        r'(?:www\.)?inv\.odyssey346\.dev',
-        r'(?:www\.)?invidious\.dhusch\.de',
-        r'(?:www\.)?iv\.melmac\.space',
-        r'(?:www\.)?watch\.thekitty\.zone',
-        r'(?:www\.)?invidious\.privacydev\.net',
-        r'(?:www\.)?ng27owmagn5amdm7l5s3rsqxwscl5ynppnis5dqcasogkyxcfqn7psid\.onion',
-        r'(?:www\.)?invidious\.drivet\.xyz',
-        r'(?:www\.)?vid\.priv\.au',
-        r'(?:www\.)?euxxcnhsynwmfidvhjf6uzptsmh4dipkmgdmcmxxuo7tunp3ad2jrwyd\.onion',
-        r'(?:www\.)?inv\.vern\.cc',
-        r'(?:www\.)?invidious\.esmailelbob\.xyz',
-        r'(?:www\.)?invidious\.sethforprivacy\.com',
-        r'(?:www\.)?yt\.oelrichsgarcia\.de',
-        r'(?:www\.)?yt\.artemislena\.eu',
-        r'(?:www\.)?invidious\.flokinet\.to',
-        r'(?:www\.)?invidious\.baczek\.me',
-        r'(?:www\.)?y\.com\.sb',
-        r'(?:www\.)?invidious\.epicsite\.xyz',
-        r'(?:www\.)?invidious\.lidarshield\.cloud',
-        r'(?:www\.)?yt\.funami\.tech',
-        r'(?:www\.)?invidious\.3o7z6yfxhbw7n3za4rss6l434kmv55cgw2vuziwuigpwegswvwzqipyd\.onion',
-        r'(?:www\.)?osbivz6guyeahrwp2lnwyjk2xos342h4ocsxyqrlaopqjuhwn2djiiyd\.onion',
-        r'(?:www\.)?u2cvlit75owumwpy4dj2hsmvkq7nvrclkpht7xgyye2pyoxhpmclkrad\.onion',
-        # youtube-dl invidious instances list
-        r'(?:(?:www|no)\.)?invidiou\.sh',
-        r'(?:(?:www|fi)\.)?invidious\.snopyta\.org',
-        r'(?:www\.)?invidious\.kabi\.tk',
-        r'(?:www\.)?invidious\.mastodon\.host',
-        r'(?:www\.)?invidious\.zapashcanon\.fr',
-        r'(?:www\.)?(?:invidious(?:-us)?|piped)\.kavin\.rocks',
-        r'(?:www\.)?invidious\.tinfoil-hat\.net',
-        r'(?:www\.)?invidious\.himiko\.cloud',
-        r'(?:www\.)?invidious\.reallyancient\.tech',
-        r'(?:www\.)?invidious\.tube',
-        r'(?:www\.)?invidiou\.site',
-        r'(?:www\.)?invidious\.site',
-        r'(?:www\.)?invidious\.xyz',
-        r'(?:www\.)?invidious\.nixnet\.xyz',
-        r'(?:www\.)?invidious\.048596\.xyz',
-        r'(?:www\.)?invidious\.drycat\.fr',
-        r'(?:www\.)?inv\.skyn3t\.in',
-        r'(?:www\.)?tube\.poal\.co',
-        r'(?:www\.)?tube\.connect\.cafe',
-        r'(?:www\.)?vid\.wxzm\.sx',
-        r'(?:www\.)?vid\.mint\.lgbt',
-        r'(?:www\.)?vid\.puffyan\.us',
-        r'(?:www\.)?yewtu\.be',
-        r'(?:www\.)?yt\.elukerio\.org',
-        r'(?:www\.)?yt\.lelux\.fi',
-        r'(?:www\.)?invidious\.ggc-project\.de',
-        r'(?:www\.)?yt\.maisputain\.ovh',
-        r'(?:www\.)?ytprivate\.com',
-        r'(?:www\.)?invidious\.13ad\.de',
-        r'(?:www\.)?invidious\.toot\.koeln',
-        r'(?:www\.)?invidious\.fdn\.fr',
-        r'(?:www\.)?watch\.nettohikari\.com',
-        r'(?:www\.)?invidious\.namazso\.eu',
-        r'(?:www\.)?invidious\.silkky\.cloud',
-        r'(?:www\.)?invidious\.exonip\.de',
-        r'(?:www\.)?invidious\.riverside\.rocks',
-        r'(?:www\.)?invidious\.blamefran\.net',
-        r'(?:www\.)?invidious\.moomoo\.de',
-        r'(?:www\.)?ytb\.trom\.tf',
-        r'(?:www\.)?yt\.cyberhost\.uk',
-        r'(?:www\.)?kgg2m7yk5aybusll\.onion',
-        r'(?:www\.)?qklhadlycap4cnod\.onion',
-        r'(?:www\.)?axqzx4s6s54s32yentfqojs3x5i7faxza6xo3ehd4bzzsg2ii4fv2iid\.onion',
-        r'(?:www\.)?c7hqkpkpemu6e7emz5b4vyz7idjgdvgaaa3dyimmeojqbgpea3xqjoid\.onion',
-        r'(?:www\.)?fz253lmuao3strwbfbmx46yu7acac2jz27iwtorgmbqlkurlclmancad\.onion',
-        r'(?:www\.)?invidious\.l4qlywnpwqsluw65ts7md3khrivpirse744un3x7mlskqauz5pyuzgqd\.onion',
-        r'(?:www\.)?owxfohz4kjyv25fvlqilyxast7inivgiktls3th44jhk3ej3i7ya\.b32\.i2p',
-        r'(?:www\.)?4l2dgddgsrkf2ous66i6seeyi6etzfgrue332grh2n7madpwopotugyd\.onion',
-        r'(?:www\.)?w6ijuptxiku4xpnnaetxvnkc5vqcdu7mgns2u77qefoixi63vbvnpnqd\.onion',
-        r'(?:www\.)?kbjggqkzv65ivcqj6bumvp337z6264huv5kpkwuv6gu5yjiskvan7fad\.onion',
-        r'(?:www\.)?grwp24hodrefzvjjuccrkw3mjq4tzhaaq32amf33dzpmuxe7ilepcmad\.onion',
-        r'(?:www\.)?hpniueoejy4opn7bc4ftgazyqjoeqwlvh2uiku2xqku6zpoa4bf5ruid\.onion',
-        # piped instances from https://github.com/TeamPiped/Piped/wiki/Instances
-        r'(?:www\.)?piped\.kavin\.rocks',
-        r'(?:www\.)?piped\.tokhmi\.xyz',
-        r'(?:www\.)?piped\.syncpundit\.io',
-        r'(?:www\.)?piped\.mha\.fi',
-        r'(?:www\.)?watch\.whatever\.social',
-        r'(?:www\.)?piped\.garudalinux\.org',
-        r'(?:www\.)?piped\.rivo\.lol',
-        r'(?:www\.)?piped-libre\.kavin\.rocks',
-        r'(?:www\.)?yt\.jae\.fi',
-        r'(?:www\.)?piped\.mint\.lgbt',
-        r'(?:www\.)?il\.ax',
-        r'(?:www\.)?piped\.esmailelbob\.xyz',
-        r'(?:www\.)?piped\.projectsegfau\.lt',
-        r'(?:www\.)?piped\.privacydev\.net',
-        r'(?:www\.)?piped\.palveluntarjoaja\.eu',
-        r'(?:www\.)?piped\.smnz\.de',
-        r'(?:www\.)?piped\.adminforge\.de',
-        r'(?:www\.)?watch\.whatevertinfoil\.de',
-        r'(?:www\.)?piped\.qdi\.fi',
-        r'(?:www\.)?piped\.video',
-        r'(?:www\.)?piped\.aeong\.one',
-        r'(?:www\.)?piped\.moomoo\.me',
-        r'(?:www\.)?piped\.chauvet\.pro',
-        r'(?:www\.)?watch\.leptons\.xyz',
-        r'(?:www\.)?pd\.vern\.cc',
-        r'(?:www\.)?piped\.hostux\.net',
-        r'(?:www\.)?piped\.lunar\.icu',
-        # Hyperpipe instances from https://hyperpipe.codeberg.page/
-        r'(?:www\.)?hyperpipe\.surge\.sh',
-        r'(?:www\.)?hyperpipe\.esmailelbob\.xyz',
-        r'(?:www\.)?listen\.whatever\.social',
-        r'(?:www\.)?music\.adminforge\.de',
-    )
-
-    # extracted from account/account_menu ep
-    # XXX: These are the supported YouTube UI and API languages,
-    # which is slightly different from languages supported for translation in YouTube studio
-    _SUPPORTED_LANG_CODES = [
-        'af', 'az', 'id', 'ms', 'bs', 'ca', 'cs', 'da', 'de', 'et', 'en-IN', 'en-GB', 'en', 'es',
-        'es-419', 'es-US', 'eu', 'fil', 'fr', 'fr-CA', 'gl', 'hr', 'zu', 'is', 'it', 'sw', 'lv',
-        'lt', 'hu', 'nl', 'no', 'uz', 'pl', 'pt-PT', 'pt', 'ro', 'sq', 'sk', 'sl', 'sr-Latn', 'fi',
-        'sv', 'vi', 'tr', 'be', 'bg', 'ky', 'kk', 'mk', 'mn', 'ru', 'sr', 'uk', 'el', 'hy', 'iw',
-        'ur', 'ar', 'fa', 'ne', 'mr', 'hi', 'as', 'bn', 'pa', 'gu', 'or', 'ta', 'te', 'kn', 'ml',
-        'si', 'th', 'lo', 'my', 'ka', 'am', 'km', 'zh-CN', 'zh-TW', 'zh-HK', 'ja', 'ko'
-    ]
-
-    _IGNORED_WARNINGS = {'Unavailable videos will be hidden during playback'}
-
-    _YT_HANDLE_RE = r'@[\w.-]{3,30}'  # https://support.google.com/youtube/answer/11585688?hl=en
-    _YT_CHANNEL_UCID_RE = r'UC[\w-]{22}'
-
-    def ucid_or_none(self, ucid):
-        return self._search_regex(rf'^({self._YT_CHANNEL_UCID_RE})$', ucid, 'UC-id', default=None)
-
-    def handle_or_none(self, handle):
-        return self._search_regex(rf'^({self._YT_HANDLE_RE})$', handle, '@-handle', default=None)
-
-    def handle_from_url(self, url):
-        return self._search_regex(rf'^(?:https?://(?:www\.)?youtube\.com)?/({self._YT_HANDLE_RE})',
-                                  url, 'channel handle', default=None)
-
-    def ucid_from_url(self, url):
-        return self._search_regex(rf'^(?:https?://(?:www\.)?youtube\.com)?/({self._YT_CHANNEL_UCID_RE})',
-                                  url, 'channel id', default=None)
-
-    @functools.cached_property
-    def _preferred_lang(self):
-        """
-        Returns a language code supported by YouTube for the user preferred language.
-        Returns None if no preferred language set.
-        """
-        preferred_lang = self._configuration_arg('lang', ie_key='Youtube', casesense=True, default=[''])[0]
-        if not preferred_lang:
-            return
-        if preferred_lang not in self._SUPPORTED_LANG_CODES:
-            raise ExtractorError(
-                f'Unsupported language code: {preferred_lang}. Supported language codes (case-sensitive): {join_nonempty(*self._SUPPORTED_LANG_CODES, delim=", ")}.',
-                expected=True)
-        elif preferred_lang != 'en':
-            self.report_warning(
-                f'Preferring "{preferred_lang}" translated fields. Note that some metadata extraction may fail or be incorrect.')
-        return preferred_lang
-
-    def _initialize_consent(self):
-        cookies = self._get_cookies('https://www.youtube.com/')
-        if cookies.get('__Secure-3PSID'):
-            return
-        socs = cookies.get('SOCS')
-        if socs and not socs.value.startswith('CAA'):  # not consented
-            return
-        self._set_cookie('.youtube.com', 'SOCS', 'CAI', secure=True)  # accept all (required for mixes)
-
-    def _initialize_pref(self):
-        cookies = self._get_cookies('https://www.youtube.com/')
-        pref_cookie = cookies.get('PREF')
-        pref = {}
-        if pref_cookie:
-            try:
-                pref = dict(urllib.parse.parse_qsl(pref_cookie.value))
-            except ValueError:
-                self.report_warning('Failed to parse user PREF cookie' + bug_reports_message())
-        pref.update({'hl': self._preferred_lang or 'en', 'tz': 'UTC'})
-        self._set_cookie('.youtube.com', name='PREF', value=urllib.parse.urlencode(pref))
-
-    def _real_initialize(self):
-        self._initialize_pref()
-        self._initialize_consent()
-        self._check_login_required()
-
-    def _check_login_required(self):
-        if self._LOGIN_REQUIRED and not self._cookies_passed:
-            self.raise_login_required('Login details are needed to download this content', method='cookies')
-
-    _YT_INITIAL_DATA_RE = r'(?:window\s*\[\s*["\']ytInitialData["\']\s*\]|ytInitialData)\s*='
-    _YT_INITIAL_PLAYER_RESPONSE_RE = r'ytInitialPlayerResponse\s*='
-
-    def _get_default_ytcfg(self, client='web'):
-        return copy.deepcopy(INNERTUBE_CLIENTS[client])
-
-    def _get_innertube_host(self, client='web'):
-        return INNERTUBE_CLIENTS[client]['INNERTUBE_HOST']
-
-    def _ytcfg_get_safe(self, ytcfg, getter, expected_type=None, default_client='web'):
-        # try_get but with fallback to default ytcfg client values when present
-        _func = lambda y: try_get(y, getter, expected_type)
-        return _func(ytcfg) or _func(self._get_default_ytcfg(default_client))
-
-    def _extract_client_name(self, ytcfg, default_client='web'):
-        return self._ytcfg_get_safe(
-            ytcfg, (lambda x: x['INNERTUBE_CLIENT_NAME'],
-                    lambda x: x['INNERTUBE_CONTEXT']['client']['clientName']), str, default_client)
-
-    def _extract_client_version(self, ytcfg, default_client='web'):
-        return self._ytcfg_get_safe(
-            ytcfg, (lambda x: x['INNERTUBE_CLIENT_VERSION'],
-                    lambda x: x['INNERTUBE_CONTEXT']['client']['clientVersion']), str, default_client)
-
-    def _select_api_hostname(self, req_api_hostname, default_client=None):
-        return (self._configuration_arg('innertube_host', [''], ie_key=YoutubeIE.ie_key())[0]
-                or req_api_hostname or self._get_innertube_host(default_client or 'web'))
-
-    def _extract_api_key(self, ytcfg=None, default_client='web'):
-        return self._ytcfg_get_safe(ytcfg, lambda x: x['INNERTUBE_API_KEY'], str, default_client)
-
-    def _extract_context(self, ytcfg=None, default_client='web'):
-        context = get_first(
-            (ytcfg, self._get_default_ytcfg(default_client)), 'INNERTUBE_CONTEXT', expected_type=dict)
-        # Enforce language and tz for extraction
-        client_context = traverse_obj(context, 'client', expected_type=dict, default={})
-        client_context.update({'hl': self._preferred_lang or 'en', 'timeZone': 'UTC', 'utcOffsetMinutes': 0})
-        return context
-
-    _SAPISID = None
-
-    def _generate_sapisidhash_header(self, origin='https://www.youtube.com'):
-        time_now = round(time.time())
-        if self._SAPISID is None:
-            yt_cookies = self._get_cookies('https://www.youtube.com')
-            # Sometimes SAPISID cookie isn't present but __Secure-3PAPISID is.
-            # See: https://github.com/yt-dlp/yt-dlp/issues/393
-            sapisid_cookie = dict_get(
-                yt_cookies, ('__Secure-3PAPISID', 'SAPISID'))
-            if sapisid_cookie and sapisid_cookie.value:
-                self._SAPISID = sapisid_cookie.value
-                self.write_debug('Extracted SAPISID cookie')
-                # SAPISID cookie is required if not already present
-                if not yt_cookies.get('SAPISID'):
-                    self.write_debug('Copying __Secure-3PAPISID cookie to SAPISID cookie')
-                    self._set_cookie(
-                        '.youtube.com', 'SAPISID', self._SAPISID, secure=True, expire_time=time_now + 3600)
-            else:
-                self._SAPISID = False
-        if not self._SAPISID:
-            return None
-        # SAPISIDHASH algorithm from https://stackoverflow.com/a/32065323
-        sapisidhash = hashlib.sha1(
-            f'{time_now} {self._SAPISID} {origin}'.encode()).hexdigest()
-        return f'SAPISIDHASH {time_now}_{sapisidhash}'
-
-    def _call_api(self, ep, query, video_id, fatal=True, headers=None,
-                  note='Downloading API JSON', errnote='Unable to download API page',
-                  context=None, api_key=None, api_hostname=None, default_client='web'):
-
-        data = {'context': context} if context else {'context': self._extract_context(default_client=default_client)}
-        data.update(query)
-        real_headers = self.generate_api_headers(default_client=default_client)
-        real_headers.update({'content-type': 'application/json'})
-        if headers:
-            real_headers.update(headers)
-        api_key = (self._configuration_arg('innertube_key', [''], ie_key=YoutubeIE.ie_key(), casesense=True)[0]
-                   or api_key or self._extract_api_key(default_client=default_client))
-        return self._download_json(
-            f'https://{self._select_api_hostname(api_hostname, default_client)}/youtubei/v1/{ep}',
-            video_id=video_id, fatal=fatal, note=note, errnote=errnote,
-            data=json.dumps(data).encode('utf8'), headers=real_headers,
-            query={'key': api_key, 'prettyPrint': 'false'})
-
-    def extract_yt_initial_data(self, item_id, webpage, fatal=True):
-        return self._search_json(self._YT_INITIAL_DATA_RE, webpage, 'yt initial data', item_id, fatal=fatal)
-
-    @staticmethod
-    def _extract_session_index(*data):
-        """
-        Index of current account in account list.
-        See: https://github.com/yt-dlp/yt-dlp/pull/519
-        """
-        for ytcfg in data:
-            session_index = int_or_none(try_get(ytcfg, lambda x: x['SESSION_INDEX']))
-            if session_index is not None:
-                return session_index
-
-    # Deprecated?
-    def _extract_identity_token(self, ytcfg=None, webpage=None):
-        if ytcfg:
-            token = try_get(ytcfg, lambda x: x['ID_TOKEN'], str)
-            if token:
-                return token
-        if webpage:
-            return self._search_regex(
-                r'\bID_TOKEN["\']\s*:\s*["\'](.+?)["\']', webpage,
-                'identity token', default=None, fatal=False)
-
-    @staticmethod
-    def _extract_account_syncid(*args):
-        """
-        Extract syncId required to download private playlists of secondary channels
-        @params response and/or ytcfg
-        """
-        for data in args:
-            # ytcfg includes channel_syncid if on secondary channel
-            delegated_sid = try_get(data, lambda x: x['DELEGATED_SESSION_ID'], str)
-            if delegated_sid:
-                return delegated_sid
-            sync_ids = (try_get(
-                data, (lambda x: x['responseContext']['mainAppWebResponseContext']['datasyncId'],
-                       lambda x: x['DATASYNC_ID']), str) or '').split('||')
-            if len(sync_ids) >= 2 and sync_ids[1]:
-                # datasyncid is of the form "channel_syncid||user_syncid" for secondary channel
-                # and just "user_syncid||" for primary channel. We only want the channel_syncid
-                return sync_ids[0]
-
-    @staticmethod
-    def _extract_visitor_data(*args):
-        """
-        Extracts visitorData from an API response or ytcfg
-        Appears to be used to track session state
-        """
-        return get_first(
-            args, [('VISITOR_DATA', ('INNERTUBE_CONTEXT', 'client', 'visitorData'), ('responseContext', 'visitorData'))],
-            expected_type=str)
-
-    @functools.cached_property
-    def is_authenticated(self):
-        return bool(self._generate_sapisidhash_header())
-
-    def extract_ytcfg(self, video_id, webpage):
-        if not webpage:
-            return {}
-        return self._parse_json(
-            self._search_regex(
-                r'ytcfg\.set\s*\(\s*({.+?})\s*\)\s*;', webpage, 'ytcfg',
-                default='{}'), video_id, fatal=False) or {}
-
-    def generate_api_headers(
-            self, *, ytcfg=None, account_syncid=None, session_index=None,
-            visitor_data=None, identity_token=None, api_hostname=None, default_client='web'):
-
-        origin = 'https://' + (self._select_api_hostname(api_hostname, default_client))
-        headers = {
-            'X-YouTube-Client-Name': str(
-                self._ytcfg_get_safe(ytcfg, lambda x: x['INNERTUBE_CONTEXT_CLIENT_NAME'], default_client=default_client)),
-            'X-YouTube-Client-Version': self._extract_client_version(ytcfg, default_client),
-            'Origin': origin,
-            'X-Youtube-Identity-Token': identity_token or self._extract_identity_token(ytcfg),
-            'X-Goog-PageId': account_syncid or self._extract_account_syncid(ytcfg),
-            'X-Goog-Visitor-Id': visitor_data or self._extract_visitor_data(ytcfg),
-            'User-Agent': self._ytcfg_get_safe(ytcfg, lambda x: x['INNERTUBE_CONTEXT']['client']['userAgent'], default_client=default_client)
-        }
-        if session_index is None:
-            session_index = self._extract_session_index(ytcfg)
-        if account_syncid or session_index is not None:
-            headers['X-Goog-AuthUser'] = session_index if session_index is not None else 0
-
-        auth = self._generate_sapisidhash_header(origin)
-        if auth is not None:
-            headers['Authorization'] = auth
-            headers['X-Origin'] = origin
-        return filter_dict(headers)
-
-    def _download_ytcfg(self, client, video_id):
-        url = {
-            'web': 'https://www.youtube.com',
-            'web_music': 'https://music.youtube.com',
-            'web_embedded': f'https://www.youtube.com/embed/{video_id}?html5=1'
-        }.get(client)
-        if not url:
-            return {}
-        webpage = self._download_webpage(
-            url, video_id, fatal=False, note=f'Downloading {client.replace("_", " ").strip()} client config')
-        return self.extract_ytcfg(video_id, webpage) or {}
-
-    @staticmethod
-    def _build_api_continuation_query(continuation, ctp=None):
-        query = {
-            'continuation': continuation
-        }
-        # TODO: Inconsistency with clickTrackingParams.
-        # Currently we have a fixed ctp contained within context (from ytcfg)
-        # and a ctp in root query for continuation.
-        if ctp:
-            query['clickTracking'] = {'clickTrackingParams': ctp}
-        return query
-
-    @classmethod
-    def _extract_next_continuation_data(cls, renderer):
-        next_continuation = try_get(
-            renderer, (lambda x: x['continuations'][0]['nextContinuationData'],
-                       lambda x: x['continuation']['reloadContinuationData']), dict)
-        if not next_continuation:
-            return
-        continuation = next_continuation.get('continuation')
-        if not continuation:
-            return
-        ctp = next_continuation.get('clickTrackingParams')
-        return cls._build_api_continuation_query(continuation, ctp)
-
-    @classmethod
-    def _extract_continuation_ep_data(cls, continuation_ep: dict):
-        if isinstance(continuation_ep, dict):
-            continuation = try_get(
-                continuation_ep, lambda x: x['continuationCommand']['token'], str)
-            if not continuation:
-                return
-            ctp = continuation_ep.get('clickTrackingParams')
-            return cls._build_api_continuation_query(continuation, ctp)
-
-    @classmethod
-    def _extract_continuation(cls, renderer):
-        next_continuation = cls._extract_next_continuation_data(renderer)
-        if next_continuation:
-            return next_continuation
-
-        return traverse_obj(renderer, (
-            ('contents', 'items', 'rows'), ..., 'continuationItemRenderer',
-            ('continuationEndpoint', ('button', 'buttonRenderer', 'command'))
-        ), get_all=False, expected_type=cls._extract_continuation_ep_data)
-
-    @classmethod
-    def _extract_alerts(cls, data):
-        for alert_dict in try_get(data, lambda x: x['alerts'], list) or []:
-            if not isinstance(alert_dict, dict):
-                continue
-            for alert in alert_dict.values():
-                alert_type = alert.get('type')
-                if not alert_type:
-                    continue
-                message = cls._get_text(alert, 'text')
-                if message:
-                    yield alert_type, message
-
-    def _report_alerts(self, alerts, expected=True, fatal=True, only_once=False):
-        errors, warnings = [], []
-        for alert_type, alert_message in alerts:
-            if alert_type.lower() == 'error' and fatal:
-                errors.append([alert_type, alert_message])
-            elif alert_message not in self._IGNORED_WARNINGS:
-                warnings.append([alert_type, alert_message])
-
-        for alert_type, alert_message in (warnings + errors[:-1]):
-            self.report_warning(f'YouTube said: {alert_type} - {alert_message}', only_once=only_once)
-        if errors:
-            raise ExtractorError('YouTube said: %s' % errors[-1][1], expected=expected)
-
-    def _extract_and_report_alerts(self, data, *args, **kwargs):
-        return self._report_alerts(self._extract_alerts(data), *args, **kwargs)
-
-    def _extract_badges(self, badge_list: list):
-        """
-        Extract known BadgeType's from a list of badge renderers.
-        @returns [{'type': BadgeType}]
-        """
-        icon_type_map = {
-            'PRIVACY_UNLISTED': BadgeType.AVAILABILITY_UNLISTED,
-            'PRIVACY_PRIVATE': BadgeType.AVAILABILITY_PRIVATE,
-            'PRIVACY_PUBLIC': BadgeType.AVAILABILITY_PUBLIC,
-            'CHECK_CIRCLE_THICK': BadgeType.VERIFIED,
-            'OFFICIAL_ARTIST_BADGE': BadgeType.VERIFIED,
-            'CHECK': BadgeType.VERIFIED,
-        }
-
-        badge_style_map = {
-            'BADGE_STYLE_TYPE_MEMBERS_ONLY': BadgeType.AVAILABILITY_SUBSCRIPTION,
-            'BADGE_STYLE_TYPE_PREMIUM': BadgeType.AVAILABILITY_PREMIUM,
-            'BADGE_STYLE_TYPE_LIVE_NOW': BadgeType.LIVE_NOW,
-            'BADGE_STYLE_TYPE_VERIFIED': BadgeType.VERIFIED,
-            'BADGE_STYLE_TYPE_VERIFIED_ARTIST': BadgeType.VERIFIED,
-        }
-
-        label_map = {
-            'unlisted': BadgeType.AVAILABILITY_UNLISTED,
-            'private': BadgeType.AVAILABILITY_PRIVATE,
-            'members only': BadgeType.AVAILABILITY_SUBSCRIPTION,
-            'live': BadgeType.LIVE_NOW,
-            'premium': BadgeType.AVAILABILITY_PREMIUM,
-            'verified': BadgeType.VERIFIED,
-            'official artist channel': BadgeType.VERIFIED,
-        }
-
-        badges = []
-        for badge in traverse_obj(badge_list, (..., lambda key, _: re.search(r'[bB]adgeRenderer$', key))):
-            badge_type = (
-                icon_type_map.get(traverse_obj(badge, ('icon', 'iconType'), expected_type=str))
-                or badge_style_map.get(traverse_obj(badge, 'style'))
-            )
-            if badge_type:
-                badges.append({'type': badge_type})
-                continue
-
-            # fallback, won't work in some languages
-            label = traverse_obj(
-                badge, 'label', ('accessibilityData', 'label'), 'tooltip', 'iconTooltip', get_all=False, expected_type=str, default='')
-            for match, label_badge_type in label_map.items():
-                if match in label.lower():
-                    badges.append({'type': label_badge_type})
-                    break
-
-        return badges
-
-    @staticmethod
-    def _has_badge(badges, badge_type):
-        return bool(traverse_obj(badges, lambda _, v: v['type'] == badge_type))
-
-    @staticmethod
-    def _get_text(data, *path_list, max_runs=None):
-        for path in path_list or [None]:
-            if path is None:
-                obj = [data]
-            else:
-                obj = traverse_obj(data, path, default=[])
-                if not any(key is ... or isinstance(key, (list, tuple)) for key in variadic(path)):
-                    obj = [obj]
-            for item in obj:
-                text = try_get(item, lambda x: x['simpleText'], str)
-                if text:
-                    return text
-                runs = try_get(item, lambda x: x['runs'], list) or []
-                if not runs and isinstance(item, list):
-                    runs = item
-
-                runs = runs[:min(len(runs), max_runs or len(runs))]
-                text = ''.join(traverse_obj(runs, (..., 'text'), expected_type=str))
-                if text:
-                    return text
-
-    def _get_count(self, data, *path_list):
-        count_text = self._get_text(data, *path_list) or ''
-        count = parse_count(count_text)
-        if count is None:
-            count = str_to_int(
-                self._search_regex(r'^([\d,]+)', re.sub(r'\s', '', count_text), 'count', default=None))
-        return count
-
-    @staticmethod
-    def _extract_thumbnails(data, *path_list):
-        """
-        Extract thumbnails from thumbnails dict
-        @param path_list: path list to level that contains 'thumbnails' key
-        """
-        thumbnails = []
-        for path in path_list or [()]:
-            for thumbnail in traverse_obj(data, (*variadic(path), 'thumbnails', ...)):
-                thumbnail_url = url_or_none(thumbnail.get('url'))
-                if not thumbnail_url:
-                    continue
-                # Sometimes youtube gives a wrong thumbnail URL. See:
-                # https://github.com/yt-dlp/yt-dlp/issues/233
-                # https://github.com/ytdl-org/youtube-dl/issues/28023
-                if 'maxresdefault' in thumbnail_url:
-                    thumbnail_url = thumbnail_url.split('?')[0]
-                thumbnails.append({
-                    'url': thumbnail_url,
-                    'height': int_or_none(thumbnail.get('height')),
-                    'width': int_or_none(thumbnail.get('width')),
-                })
-        return thumbnails
-
-    @staticmethod
-    def extract_relative_time(relative_time_text):
-        """
-        Extracts a relative time from string and converts to dt object
-        e.g. 'streamed 6 days ago', '5 seconds ago (edited)', 'updated today', '8 yr ago'
-        """
-
-        # XXX: this could be moved to a general function in utils.py
-        # The relative time text strings are roughly the same as what
-        # Javascript's Intl.RelativeTimeFormat function generates.
-        # See: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/RelativeTimeFormat
-        mobj = re.search(
-            r'(?P<start>today|yesterday|now)|(?P<time>\d+)\s*(?P<unit>sec(?:ond)?|s|min(?:ute)?|h(?:our|r)?|d(?:ay)?|w(?:eek|k)?|mo(?:nth)?|y(?:ear|r)?)s?\s*ago',
-            relative_time_text)
-        if mobj:
-            start = mobj.group('start')
-            if start:
-                return datetime_from_str(start)
-            try:
-                return datetime_from_str('now-%s%s' % (mobj.group('time'), mobj.group('unit')))
-            except ValueError:
-                return None
-
-    def _parse_time_text(self, text):
-        if not text:
-            return
-        dt = self.extract_relative_time(text)
-        timestamp = None
-        if isinstance(dt, datetime.datetime):
-            timestamp = calendar.timegm(dt.timetuple())
-
-        if timestamp is None:
-            timestamp = (
-                unified_timestamp(text) or unified_timestamp(
-                    self._search_regex(
-                        (r'([a-z]+\s*\d{1,2},?\s*20\d{2})', r'(?:.+|^)(?:live|premieres|ed|ing)(?:\s*(?:on|for))?\s*(.+\d)'),
-                        text.lower(), 'time text', default=None)))
-
-        if text and timestamp is None and self._preferred_lang in (None, 'en'):
-            self.report_warning(
-                f'Cannot parse localized time text "{text}"', only_once=True)
-        return timestamp
-
-    def _extract_response(self, item_id, query, note='Downloading API JSON', headers=None,
-                          ytcfg=None, check_get_keys=None, ep='browse', fatal=True, api_hostname=None,
-                          default_client='web'):
-        for retry in self.RetryManager():
-            try:
-                response = self._call_api(
-                    ep=ep, fatal=True, headers=headers,
-                    video_id=item_id, query=query, note=note,
-                    context=self._extract_context(ytcfg, default_client),
-                    api_key=self._extract_api_key(ytcfg, default_client),
-                    api_hostname=api_hostname, default_client=default_client)
-            except ExtractorError as e:
-                if not isinstance(e.cause, network_exceptions):
-                    return self._error_or_warning(e, fatal=fatal)
-                elif not isinstance(e.cause, HTTPError):
-                    retry.error = e
-                    continue
-
-                first_bytes = e.cause.response.read(512)
-                if not is_html(first_bytes):
-                    yt_error = try_get(
-                        self._parse_json(
-                            self._webpage_read_content(e.cause.response, None, item_id, prefix=first_bytes) or '{}', item_id, fatal=False),
-                        lambda x: x['error']['message'], str)
-                    if yt_error:
-                        self._report_alerts([('ERROR', yt_error)], fatal=False)
-                # Downloading page may result in intermittent 5xx HTTP error
-                # Sometimes a 404 is also recieved. See: https://github.com/ytdl-org/youtube-dl/issues/28289
-                # We also want to catch all other network exceptions since errors in later pages can be troublesome
-                # See https://github.com/yt-dlp/yt-dlp/issues/507#issuecomment-880188210
-                if e.cause.status not in (403, 429):
-                    retry.error = e
-                    continue
-                return self._error_or_warning(e, fatal=fatal)
-
-            try:
-                self._extract_and_report_alerts(response, only_once=True)
-            except ExtractorError as e:
-                # YouTube servers may return errors we want to retry on in a 200 OK response
-                # See: https://github.com/yt-dlp/yt-dlp/issues/839
-                if 'unknown error' in e.msg.lower():
-                    retry.error = e
-                    continue
-                return self._error_or_warning(e, fatal=fatal)
-            # Youtube sometimes sends incomplete data
-            # See: https://github.com/ytdl-org/youtube-dl/issues/28194
-            if not traverse_obj(response, *variadic(check_get_keys)):
-                retry.error = ExtractorError('Incomplete data received', expected=True)
-                continue
-
-            return response
-
-    @staticmethod
-    def is_music_url(url):
-        return re.match(r'(https?://)?music\.youtube\.com/', url) is not None
-
-    def _extract_video(self, renderer):
-        video_id = renderer.get('videoId')
-
-        reel_header_renderer = traverse_obj(renderer, (
-            'navigationEndpoint', 'reelWatchEndpoint', 'overlay', 'reelPlayerOverlayRenderer',
-            'reelPlayerHeaderSupportedRenderers', 'reelPlayerHeaderRenderer'))
-
-        title = self._get_text(renderer, 'title', 'headline') or self._get_text(reel_header_renderer, 'reelTitleText')
-        description = self._get_text(renderer, 'descriptionSnippet')
-
-        duration = int_or_none(renderer.get('lengthSeconds'))
-        if duration is None:
-            duration = parse_duration(self._get_text(
-                renderer, 'lengthText', ('thumbnailOverlays', ..., 'thumbnailOverlayTimeStatusRenderer', 'text')))
-        if duration is None:
-            # XXX: should write a parser to be more general to support more cases (e.g. shorts in shorts tab)
-            duration = parse_duration(self._search_regex(
-                r'(?i)(ago)(?!.*\1)\s+(?P<duration>[a-z0-9 ,]+?)(?:\s+[\d,]+\s+views)?(?:\s+-\s+play\s+short)?$',
-                traverse_obj(renderer, ('title', 'accessibility', 'accessibilityData', 'label'), default='', expected_type=str),
-                video_id, default=None, group='duration'))
-
-        channel_id = traverse_obj(
-            renderer, ('shortBylineText', 'runs', ..., 'navigationEndpoint', 'browseEndpoint', 'browseId'),
-            expected_type=str, get_all=False)
-        if not channel_id:
-            channel_id = traverse_obj(reel_header_renderer, ('channelNavigationEndpoint', 'browseEndpoint', 'browseId'))
-
-        channel_id = self.ucid_or_none(channel_id)
-
-        overlay_style = traverse_obj(
-            renderer, ('thumbnailOverlays', ..., 'thumbnailOverlayTimeStatusRenderer', 'style'),
-            get_all=False, expected_type=str)
-        badges = self._extract_badges(traverse_obj(renderer, 'badges'))
-        owner_badges = self._extract_badges(traverse_obj(renderer, 'ownerBadges'))
-        navigation_url = urljoin('https://www.youtube.com/', traverse_obj(
-            renderer, ('navigationEndpoint', 'commandMetadata', 'webCommandMetadata', 'url'),
-            expected_type=str)) or ''
-        url = f'https://www.youtube.com/watch?v={video_id}'
-        if overlay_style == 'SHORTS' or '/shorts/' in navigation_url:
-            url = f'https://www.youtube.com/shorts/{video_id}'
-
-        time_text = (self._get_text(renderer, 'publishedTimeText', 'videoInfo')
-                     or self._get_text(reel_header_renderer, 'timestampText') or '')
-        scheduled_timestamp = str_to_int(traverse_obj(renderer, ('upcomingEventData', 'startTime'), get_all=False))
-
-        live_status = (
-            'is_upcoming' if scheduled_timestamp is not None
-            else 'was_live' if 'streamed' in time_text.lower()
-            else 'is_live' if overlay_style == 'LIVE' or self._has_badge(badges, BadgeType.LIVE_NOW)
-            else None)
-
-        # videoInfo is a string like '50K views • 10 years ago'.
-        view_count_text = self._get_text(renderer, 'viewCountText', 'shortViewCountText', 'videoInfo') or ''
-        view_count = (0 if 'no views' in view_count_text.lower()
-                      else self._get_count({'simpleText': view_count_text}))
-        view_count_field = 'concurrent_view_count' if live_status in ('is_live', 'is_upcoming') else 'view_count'
-
-        channel = (self._get_text(renderer, 'ownerText', 'shortBylineText')
-                   or self._get_text(reel_header_renderer, 'channelTitleText'))
-
-        channel_handle = traverse_obj(renderer, (
-            'shortBylineText', 'runs', ..., 'navigationEndpoint',
-            (('commandMetadata', 'webCommandMetadata', 'url'), ('browseEndpoint', 'canonicalBaseUrl'))),
-            expected_type=self.handle_from_url, get_all=False)
-        return {
-            '_type': 'url',
-            'ie_key': YoutubeIE.ie_key(),
-            'id': video_id,
-            'url': url,
-            'title': title,
-            'description': description,
-            'duration': duration,
-            'channel_id': channel_id,
-            'channel': channel,
-            'channel_url': f'https://www.youtube.com/channel/{channel_id}' if channel_id else None,
-            'uploader': channel,
-            'uploader_id': channel_handle,
-            'uploader_url': format_field(channel_handle, None, 'https://www.youtube.com/%s', default=None),
-            'thumbnails': self._extract_thumbnails(renderer, 'thumbnail'),
-            'timestamp': (self._parse_time_text(time_text)
-                          if self._configuration_arg('approximate_date', ie_key=YoutubeTabIE)
-                          else None),
-            'release_timestamp': scheduled_timestamp,
-            'availability':
-                'public' if self._has_badge(badges, BadgeType.AVAILABILITY_PUBLIC)
-                else self._availability(
-                    is_private=self._has_badge(badges, BadgeType.AVAILABILITY_PRIVATE) or None,
-                    needs_premium=self._has_badge(badges, BadgeType.AVAILABILITY_PREMIUM) or None,
-                    needs_subscription=self._has_badge(badges, BadgeType.AVAILABILITY_SUBSCRIPTION) or None,
-                    is_unlisted=self._has_badge(badges, BadgeType.AVAILABILITY_UNLISTED) or None),
-            view_count_field: view_count,
-            'live_status': live_status,
-            'channel_is_verified': True if self._has_badge(owner_badges, BadgeType.VERIFIED) else None
-        }
-
-
-class YoutubeIE(YoutubeBaseInfoExtractor):
-    IE_DESC = 'YouTube'
-    _VALID_URL = r"""(?x)^
-                     (
-                         (?:https?://|//)                                    # http(s):// or protocol-independent URL
-                         (?:(?:(?:(?:\w+\.)?[yY][oO][uU][tT][uU][bB][eE](?:-nocookie|kids)?\.com|
-                            (?:www\.)?deturl\.com/www\.youtube\.com|
-                            (?:www\.)?pwnyoutube\.com|
-                            (?:www\.)?hooktube\.com|
-                            (?:www\.)?yourepeat\.com|
-                            tube\.majestyc\.net|
-                            %(invidious)s|
-                            youtube\.googleapis\.com)/                        # the various hostnames, with wildcard subdomains
-                         (?:.*?\#/)?                                          # handle anchor (#/) redirect urls
-                         (?:                                                  # the various things that can precede the ID:
-                             (?:(?:v|embed|e|shorts|live)/(?!videoseries|live_stream))  # v/ or embed/ or e/ or shorts/
-                             |(?:                                             # or the v= param in all its forms
-                                 (?:(?:watch|movie)(?:_popup)?(?:\.php)?/?)?  # preceding watch(_popup|.php) or nothing (like /?v=xxxx)
-                                 (?:\?|\#!?)                                  # the params delimiter ? or # or #!
-                                 (?:.*?[&;])??                                # any other preceding param (like /?s=tuff&v=xxxx or ?s=tuff&amp;v=V36LpHqtcDY)
-                                 v=
-                             )
-                         ))
-                         |(?:
-                            youtu\.be|                                        # just youtu.be/xxxx
-                            vid\.plus|                                        # or vid.plus/xxxx
-                            zwearz\.com/watch|                                # or zwearz.com/watch/xxxx
-                            %(invidious)s
-                         )/
-                         |(?:www\.)?cleanvideosearch\.com/media/action/yt/watch\?videoId=
-                         )
-                     )?                                                       # all until now is optional -> you can pass the naked ID
-                     (?P<id>[0-9A-Za-z_-]{11})                                # here is it! the YouTube video ID
-                     (?(1).+)?                                                # if we found the ID, everything can follow
-                     (?:\#|$)""" % {
-        'invidious': '|'.join(YoutubeBaseInfoExtractor._INVIDIOUS_SITES),
-    }
-    _EMBED_REGEX = [
-        r'''(?x)
-            (?:
-                <(?:[0-9A-Za-z-]+?)?iframe[^>]+?src=|
-                data-video-url=|
-                <embed[^>]+?src=|
-                embedSWF\(?:\s*|
-                <object[^>]+data=|
-                new\s+SWFObject\(
-            )
-            (["\'])
-                (?P<url>(?:https?:)?//(?:www\.)?youtube(?:-nocookie)?\.com/
-                (?:embed|v|p)/[0-9A-Za-z_-]{11}.*?)
-            \1''',
-        # https://wordpress.org/plugins/lazy-load-for-videos/
-        r'''(?xs)
-            <a\s[^>]*\bhref="(?P<url>https://www\.youtube\.com/watch\?v=[0-9A-Za-z_-]{11})"
-            \s[^>]*\bclass="[^"]*\blazy-load-youtube''',
-    ]
-    _RETURN_TYPE = 'video'  # XXX: How to handle multifeed?
-
-    _PLAYER_INFO_RE = (
-        r'/s/player/(?P<id>[a-zA-Z0-9_-]{8,})/player',
-        r'/(?P<id>[a-zA-Z0-9_-]{8,})/player(?:_ias\.vflset(?:/[a-zA-Z]{2,3}_[a-zA-Z]{2,3})?|-plasma-ias-(?:phone|tablet)-[a-z]{2}_[A-Z]{2}\.vflset)/base\.js$',
-        r'\b(?P<id>vfl[a-zA-Z0-9_-]+)\b.*?\.js$',
-    )
-    _formats = {
-        '5': {'ext': 'flv', 'width': 400, 'height': 240, 'acodec': 'mp3', 'abr': 64, 'vcodec': 'h263'},
-        '6': {'ext': 'flv', 'width': 450, 'height': 270, 'acodec': 'mp3', 'abr': 64, 'vcodec': 'h263'},
-        '13': {'ext': '3gp', 'acodec': 'aac', 'vcodec': 'mp4v'},
-        '17': {'ext': '3gp', 'width': 176, 'height': 144, 'acodec': 'aac', 'abr': 24, 'vcodec': 'mp4v'},
-        '18': {'ext': 'mp4', 'width': 640, 'height': 360, 'acodec': 'aac', 'abr': 96, 'vcodec': 'h264'},
-        '22': {'ext': 'mp4', 'width': 1280, 'height': 720, 'acodec': 'aac', 'abr': 192, 'vcodec': 'h264'},
-        '34': {'ext': 'flv', 'width': 640, 'height': 360, 'acodec': 'aac', 'abr': 128, 'vcodec': 'h264'},
-        '35': {'ext': 'flv', 'width': 854, 'height': 480, 'acodec': 'aac', 'abr': 128, 'vcodec': 'h264'},
-        # itag 36 videos are either 320x180 (BaW_jenozKc) or 320x240 (__2ABJjxzNo), abr varies as well
-        '36': {'ext': '3gp', 'width': 320, 'acodec': 'aac', 'vcodec': 'mp4v'},
-        '37': {'ext': 'mp4', 'width': 1920, 'height': 1080, 'acodec': 'aac', 'abr': 192, 'vcodec': 'h264'},
-        '38': {'ext': 'mp4', 'width': 4096, 'height': 3072, 'acodec': 'aac', 'abr': 192, 'vcodec': 'h264'},
-        '43': {'ext': 'webm', 'width': 640, 'height': 360, 'acodec': 'vorbis', 'abr': 128, 'vcodec': 'vp8'},
-        '44': {'ext': 'webm', 'width': 854, 'height': 480, 'acodec': 'vorbis', 'abr': 128, 'vcodec': 'vp8'},
-        '45': {'ext': 'webm', 'width': 1280, 'height': 720, 'acodec': 'vorbis', 'abr': 192, 'vcodec': 'vp8'},
-        '46': {'ext': 'webm', 'width': 1920, 'height': 1080, 'acodec': 'vorbis', 'abr': 192, 'vcodec': 'vp8'},
-        '59': {'ext': 'mp4', 'width': 854, 'height': 480, 'acodec': 'aac', 'abr': 128, 'vcodec': 'h264'},
-        '78': {'ext': 'mp4', 'width': 854, 'height': 480, 'acodec': 'aac', 'abr': 128, 'vcodec': 'h264'},
-
-
-        # 3D videos
-        '82': {'ext': 'mp4', 'height': 360, 'format_note': '3D', 'acodec': 'aac', 'abr': 128, 'vcodec': 'h264', 'preference': -20},
-        '83': {'ext': 'mp4', 'height': 480, 'format_note': '3D', 'acodec': 'aac', 'abr': 128, 'vcodec': 'h264', 'preference': -20},
-        '84': {'ext': 'mp4', 'height': 720, 'format_note': '3D', 'acodec': 'aac', 'abr': 192, 'vcodec': 'h264', 'preference': -20},
-        '85': {'ext': 'mp4', 'height': 1080, 'format_note': '3D', 'acodec': 'aac', 'abr': 192, 'vcodec': 'h264', 'preference': -20},
-        '100': {'ext': 'webm', 'height': 360, 'format_note': '3D', 'acodec': 'vorbis', 'abr': 128, 'vcodec': 'vp8', 'preference': -20},
-        '101': {'ext': 'webm', 'height': 480, 'format_note': '3D', 'acodec': 'vorbis', 'abr': 192, 'vcodec': 'vp8', 'preference': -20},
-        '102': {'ext': 'webm', 'height': 720, 'format_note': '3D', 'acodec': 'vorbis', 'abr': 192, 'vcodec': 'vp8', 'preference': -20},
-
-        # Apple HTTP Live Streaming
-        '91': {'ext': 'mp4', 'height': 144, 'format_note': 'HLS', 'acodec': 'aac', 'abr': 48, 'vcodec': 'h264', 'preference': -10},
-        '92': {'ext': 'mp4', 'height': 240, 'format_note': 'HLS', 'acodec': 'aac', 'abr': 48, 'vcodec': 'h264', 'preference': -10},
-        '93': {'ext': 'mp4', 'height': 360, 'format_note': 'HLS', 'acodec': 'aac', 'abr': 128, 'vcodec': 'h264', 'preference': -10},
-        '94': {'ext': 'mp4', 'height': 480, 'format_note': 'HLS', 'acodec': 'aac', 'abr': 128, 'vcodec': 'h264', 'preference': -10},
-        '95': {'ext': 'mp4', 'height': 720, 'format_note': 'HLS', 'acodec': 'aac', 'abr': 256, 'vcodec': 'h264', 'preference': -10},
-        '96': {'ext': 'mp4', 'height': 1080, 'format_note': 'HLS', 'acodec': 'aac', 'abr': 256, 'vcodec': 'h264', 'preference': -10},
-        '132': {'ext': 'mp4', 'height': 240, 'format_note': 'HLS', 'acodec': 'aac', 'abr': 48, 'vcodec': 'h264', 'preference': -10},
-        '151': {'ext': 'mp4', 'height': 72, 'format_note': 'HLS', 'acodec': 'aac', 'abr': 24, 'vcodec': 'h264', 'preference': -10},
-
-        # DASH mp4 video
-        '133': {'ext': 'mp4', 'height': 240, 'format_note': 'DASH video', 'vcodec': 'h264'},
-        '134': {'ext': 'mp4', 'height': 360, 'format_note': 'DASH video', 'vcodec': 'h264'},
-        '135': {'ext': 'mp4', 'height': 480, 'format_note': 'DASH video', 'vcodec': 'h264'},
-        '136': {'ext': 'mp4', 'height': 720, 'format_note': 'DASH video', 'vcodec': 'h264'},
-        '137': {'ext': 'mp4', 'height': 1080, 'format_note': 'DASH video', 'vcodec': 'h264'},
-        '138': {'ext': 'mp4', 'format_note': 'DASH video', 'vcodec': 'h264'},  # Height can vary (https://github.com/ytdl-org/youtube-dl/issues/4559)
-        '160': {'ext': 'mp4', 'height': 144, 'format_note': 'DASH video', 'vcodec': 'h264'},
-        '212': {'ext': 'mp4', 'height': 480, 'format_note': 'DASH video', 'vcodec': 'h264'},
-        '264': {'ext': 'mp4', 'height': 1440, 'format_note': 'DASH video', 'vcodec': 'h264'},
-        '298': {'ext': 'mp4', 'height': 720, 'format_note': 'DASH video', 'vcodec': 'h264', 'fps': 60},
-        '299': {'ext': 'mp4', 'height': 1080, 'format_note': 'DASH video', 'vcodec': 'h264', 'fps': 60},
-        '266': {'ext': 'mp4', 'height': 2160, 'format_note': 'DASH video', 'vcodec': 'h264'},
-
-        # Dash mp4 audio
-        '139': {'ext': 'm4a', 'format_note': 'DASH audio', 'acodec': 'aac', 'abr': 48, 'container': 'm4a_dash'},
-        '140': {'ext': 'm4a', 'format_note': 'DASH audio', 'acodec': 'aac', 'abr': 128, 'container': 'm4a_dash'},
-        '141': {'ext': 'm4a', 'format_note': 'DASH audio', 'acodec': 'aac', 'abr': 256, 'container': 'm4a_dash'},
-        '256': {'ext': 'm4a', 'format_note': 'DASH audio', 'acodec': 'aac', 'container': 'm4a_dash'},
-        '258': {'ext': 'm4a', 'format_note': 'DASH audio', 'acodec': 'aac', 'container': 'm4a_dash'},
-        '325': {'ext': 'm4a', 'format_note': 'DASH audio', 'acodec': 'dtse', 'container': 'm4a_dash'},
-        '328': {'ext': 'm4a', 'format_note': 'DASH audio', 'acodec': 'ec-3', 'container': 'm4a_dash'},
-
-        # Dash webm
-        '167': {'ext': 'webm', 'height': 360, 'width': 640, 'format_note': 'DASH video', 'container': 'webm', 'vcodec': 'vp8'},
-        '168': {'ext': 'webm', 'height': 480, 'width': 854, 'format_note': 'DASH video', 'container': 'webm', 'vcodec': 'vp8'},
-        '169': {'ext': 'webm', 'height': 720, 'width': 1280, 'format_note': 'DASH video', 'container': 'webm', 'vcodec': 'vp8'},
-        '170': {'ext': 'webm', 'height': 1080, 'width': 1920, 'format_note': 'DASH video', 'container': 'webm', 'vcodec': 'vp8'},
-        '218': {'ext': 'webm', 'height': 480, 'width': 854, 'format_note': 'DASH video', 'container': 'webm', 'vcodec': 'vp8'},
-        '219': {'ext': 'webm', 'height': 480, 'width': 854, 'format_note': 'DASH video', 'container': 'webm', 'vcodec': 'vp8'},
-        '278': {'ext': 'webm', 'height': 144, 'format_note': 'DASH video', 'container': 'webm', 'vcodec': 'vp9'},
-        '242': {'ext': 'webm', 'height': 240, 'format_note': 'DASH video', 'vcodec': 'vp9'},
-        '243': {'ext': 'webm', 'height': 360, 'format_note': 'DASH video', 'vcodec': 'vp9'},
-        '244': {'ext': 'webm', 'height': 480, 'format_note': 'DASH video', 'vcodec': 'vp9'},
-        '245': {'ext': 'webm', 'height': 480, 'format_note': 'DASH video', 'vcodec': 'vp9'},
-        '246': {'ext': 'webm', 'height': 480, 'format_note': 'DASH video', 'vcodec': 'vp9'},
-        '247': {'ext': 'webm', 'height': 720, 'format_note': 'DASH video', 'vcodec': 'vp9'},
-        '248': {'ext': 'webm', 'height': 1080, 'format_note': 'DASH video', 'vcodec': 'vp9'},
-        '271': {'ext': 'webm', 'height': 1440, 'format_note': 'DASH video', 'vcodec': 'vp9'},
-        # itag 272 videos are either 3840x2160 (e.g. RtoitU2A-3E) or 7680x4320 (sLprVF6d7Ug)
-        '272': {'ext': 'webm', 'height': 2160, 'format_note': 'DASH video', 'vcodec': 'vp9'},
-        '302': {'ext': 'webm', 'height': 720, 'format_note': 'DASH video', 'vcodec': 'vp9', 'fps': 60},
-        '303': {'ext': 'webm', 'height': 1080, 'format_note': 'DASH video', 'vcodec': 'vp9', 'fps': 60},
-        '308': {'ext': 'webm', 'height': 1440, 'format_note': 'DASH video', 'vcodec': 'vp9', 'fps': 60},
-        '313': {'ext': 'webm', 'height': 2160, 'format_note': 'DASH video', 'vcodec': 'vp9'},
-        '315': {'ext': 'webm', 'height': 2160, 'format_note': 'DASH video', 'vcodec': 'vp9', 'fps': 60},
-
-        # Dash webm audio
-        '171': {'ext': 'webm', 'acodec': 'vorbis', 'format_note': 'DASH audio', 'abr': 128},
-        '172': {'ext': 'webm', 'acodec': 'vorbis', 'format_note': 'DASH audio', 'abr': 256},
-
-        # Dash webm audio with opus inside
-        '249': {'ext': 'webm', 'format_note': 'DASH audio', 'acodec': 'opus', 'abr': 50},
-        '250': {'ext': 'webm', 'format_note': 'DASH audio', 'acodec': 'opus', 'abr': 70},
-        '251': {'ext': 'webm', 'format_note': 'DASH audio', 'acodec': 'opus', 'abr': 160},
-
-        # RTMP (unnamed)
-        '_rtmp': {'protocol': 'rtmp'},
-
-        # av01 video only formats sometimes served with "unknown" codecs
-        '394': {'ext': 'mp4', 'height': 144, 'format_note': 'DASH video', 'vcodec': 'av01.0.00M.08'},
-        '395': {'ext': 'mp4', 'height': 240, 'format_note': 'DASH video', 'vcodec': 'av01.0.00M.08'},
-        '396': {'ext': 'mp4', 'height': 360, 'format_note': 'DASH video', 'vcodec': 'av01.0.01M.08'},
-        '397': {'ext': 'mp4', 'height': 480, 'format_note': 'DASH video', 'vcodec': 'av01.0.04M.08'},
-        '398': {'ext': 'mp4', 'height': 720, 'format_note': 'DASH video', 'vcodec': 'av01.0.05M.08'},
-        '399': {'ext': 'mp4', 'height': 1080, 'format_note': 'DASH video', 'vcodec': 'av01.0.08M.08'},
-        '400': {'ext': 'mp4', 'height': 1440, 'format_note': 'DASH video', 'vcodec': 'av01.0.12M.08'},
-        '401': {'ext': 'mp4', 'height': 2160, 'format_note': 'DASH video', 'vcodec': 'av01.0.12M.08'},
-    }
-    _SUBTITLE_FORMATS = ('json3', 'srv1', 'srv2', 'srv3', 'ttml', 'vtt')
-
-    _GEO_BYPASS = False
-
-    IE_NAME = 'youtube'
-    _TESTS = [
-        {
-            'url': 'https://www.youtube.com/watch?v=BaW_jenozKc&t=1s&end=9',
-            'info_dict': {
-                'id': 'BaW_jenozKc',
-                'ext': 'mp4',
-                'title': 'youtube-dl test video "\'/\\ä↭𝕐',
-                'channel': 'Philipp Hagemeister',
-                'channel_id': 'UCLqxVugv74EIW3VWh2NOa3Q',
-                'channel_url': r're:https?://(?:www\.)?youtube\.com/channel/UCLqxVugv74EIW3VWh2NOa3Q',
-                'upload_date': '20121002',
-                'description': 'md5:8fb536f4877b8a7455c2ec23794dbc22',
-                'categories': ['Science & Technology'],
-                'tags': ['youtube-dl'],
-                'duration': 10,
-                'view_count': int,
-                'like_count': int,
-                'availability': 'public',
-                'playable_in_embed': True,
-                'thumbnail': 'https://i.ytimg.com/vi/BaW_jenozKc/maxresdefault.jpg',
-                'live_status': 'not_live',
-                'age_limit': 0,
-                'start_time': 1,
-                'end_time': 9,
-                'comment_count': int,
-                'channel_follower_count': int,
-                'uploader': 'Philipp Hagemeister',
-                'uploader_url': 'https://www.youtube.com/@PhilippHagemeister',
-                'uploader_id': '@PhilippHagemeister',
-                'heatmap': 'count:100',
-            }
-        },
-        {
-            'url': '//www.YouTube.com/watch?v=yZIXLfi8CZQ',
-            'note': 'Embed-only video (#1746)',
-            'info_dict': {
-                'id': 'yZIXLfi8CZQ',
-                'ext': 'mp4',
-                'upload_date': '20120608',
-                'title': 'Principal Sexually Assaults A Teacher - Episode 117 - 8th June 2012',
-                'description': 'md5:09b78bd971f1e3e289601dfba15ca4f7',
-                'age_limit': 18,
-            },
-            'skip': 'Private video',
-        },
-        {
-            'url': 'https://www.youtube.com/watch?v=BaW_jenozKc&v=yZIXLfi8CZQ',
-            'note': 'Use the first video ID in the URL',
-            'info_dict': {
-                'id': 'BaW_jenozKc',
-                'ext': 'mp4',
-                'title': 'youtube-dl test video "\'/\\ä↭𝕐',
-                'channel': 'Philipp Hagemeister',
-                'channel_id': 'UCLqxVugv74EIW3VWh2NOa3Q',
-                'channel_url': r're:https?://(?:www\.)?youtube\.com/channel/UCLqxVugv74EIW3VWh2NOa3Q',
-                'upload_date': '20121002',
-                'description': 'md5:8fb536f4877b8a7455c2ec23794dbc22',
-                'categories': ['Science & Technology'],
-                'tags': ['youtube-dl'],
-                'duration': 10,
-                'view_count': int,
-                'like_count': int,
-                'availability': 'public',
-                'playable_in_embed': True,
-                'thumbnail': 'https://i.ytimg.com/vi/BaW_jenozKc/maxresdefault.jpg',
-                'live_status': 'not_live',
-                'age_limit': 0,
-                'comment_count': int,
-                'channel_follower_count': int,
-                'uploader': 'Philipp Hagemeister',
-                'uploader_url': 'https://www.youtube.com/@PhilippHagemeister',
-                'uploader_id': '@PhilippHagemeister',
-                'heatmap': 'count:100',
-            },
-            'params': {
-                'skip_download': True,
-            },
-        },
-        {
-            'url': 'https://www.youtube.com/watch?v=a9LDPn-MO4I',
-            'note': '256k DASH audio (format 141) via DASH manifest',
-            'info_dict': {
-                'id': 'a9LDPn-MO4I',
-                'ext': 'm4a',
-                'upload_date': '20121002',
-                'description': '',
-                'title': 'UHDTV TEST 8K VIDEO.mp4'
-            },
-            'params': {
-                'youtube_include_dash_manifest': True,
-                'format': '141',
-            },
-            'skip': 'format 141 not served anymore',
-        },
-        # DASH manifest with encrypted signature
-        {
-            'url': 'https://www.youtube.com/watch?v=IB3lcPjvWLA',
-            'info_dict': {
-                'id': 'IB3lcPjvWLA',
-                'ext': 'm4a',
-                'title': 'Afrojack, Spree Wilson - The Spark (Official Music Video) ft. Spree Wilson',
-                'description': 'md5:8f5e2b82460520b619ccac1f509d43bf',
-                'duration': 244,
-                'upload_date': '20131011',
-                'abr': 129.495,
-                'like_count': int,
-                'channel_id': 'UChuZAo1RKL85gev3Eal9_zg',
-                'playable_in_embed': True,
-                'channel_url': 'https://www.youtube.com/channel/UChuZAo1RKL85gev3Eal9_zg',
-                'view_count': int,
-                'track': 'The Spark',
-                'live_status': 'not_live',
-                'thumbnail': 'https://i.ytimg.com/vi_webp/IB3lcPjvWLA/maxresdefault.webp',
-                'channel': 'Afrojack',
-                'tags': 'count:19',
-                'availability': 'public',
-                'categories': ['Music'],
-                'age_limit': 0,
-                'alt_title': 'The Spark',
-                'channel_follower_count': int,
-                'uploader': 'Afrojack',
-                'uploader_url': 'https://www.youtube.com/@Afrojack',
-                'uploader_id': '@Afrojack',
-            },
-            'params': {
-                'youtube_include_dash_manifest': True,
-                'format': '141/bestaudio[ext=m4a]',
-            },
-        },
-        # Age-gate videos. See https://github.com/yt-dlp/yt-dlp/pull/575#issuecomment-888837000
-        {
-            'note': 'Embed allowed age-gate video',
-            'url': 'https://youtube.com/watch?v=HtVdAasjOgU',
-            'info_dict': {
-                'id': 'HtVdAasjOgU',
-                'ext': 'mp4',
-                'title': 'The Witcher 3: Wild Hunt - The Sword Of Destiny Trailer',
-                'description': r're:(?s).{100,}About the Game\n.*?The Witcher 3: Wild Hunt.{100,}',
-                'duration': 142,
-                'upload_date': '20140605',
-                'age_limit': 18,
-                'categories': ['Gaming'],
-                'thumbnail': 'https://i.ytimg.com/vi_webp/HtVdAasjOgU/maxresdefault.webp',
-                'availability': 'needs_auth',
-                'channel_url': 'https://www.youtube.com/channel/UCzybXLxv08IApdjdN0mJhEg',
-                'like_count': int,
-                'channel': 'The Witcher',
-                'live_status': 'not_live',
-                'tags': 'count:17',
-                'channel_id': 'UCzybXLxv08IApdjdN0mJhEg',
-                'playable_in_embed': True,
-                'view_count': int,
-                'channel_follower_count': int,
-                'uploader': 'The Witcher',
-                'uploader_url': 'https://www.youtube.com/@thewitcher',
-                'uploader_id': '@thewitcher',
-                'comment_count': int,
-                'channel_is_verified': True,
-                'heatmap': 'count:100',
-            },
-        },
-        {
-            'note': 'Age-gate video with embed allowed in public site',
-            'url': 'https://youtube.com/watch?v=HsUATh_Nc2U',
-            'info_dict': {
-                'id': 'HsUATh_Nc2U',
-                'ext': 'mp4',
-                'title': 'Godzilla 2 (Official Video)',
-                'description': 'md5:bf77e03fcae5529475e500129b05668a',
-                'upload_date': '20200408',
-                'age_limit': 18,
-                'availability': 'needs_auth',
-                'channel_id': 'UCYQT13AtrJC0gsM1far_zJg',
-                'channel': 'FlyingKitty',
-                'channel_url': 'https://www.youtube.com/channel/UCYQT13AtrJC0gsM1far_zJg',
-                'view_count': int,
-                'categories': ['Entertainment'],
-                'live_status': 'not_live',
-                'tags': ['Flyingkitty', 'godzilla 2'],
-                'thumbnail': 'https://i.ytimg.com/vi/HsUATh_Nc2U/maxresdefault.jpg',
-                'like_count': int,
-                'duration': 177,
-                'playable_in_embed': True,
-                'channel_follower_count': int,
-                'uploader': 'FlyingKitty',
-                'uploader_url': 'https://www.youtube.com/@FlyingKitty900',
-                'uploader_id': '@FlyingKitty900',
-                'comment_count': int,
-                'channel_is_verified': True,
-            },
-        },
-        {
-            'note': 'Age-gate video embedable only with clientScreen=EMBED',
-            'url': 'https://youtube.com/watch?v=Tq92D6wQ1mg',
-            'info_dict': {
-                'id': 'Tq92D6wQ1mg',
-                'title': '[MMD] Adios - EVERGLOW [+Motion DL]',
-                'ext': 'mp4',
-                'upload_date': '20191228',
-                'description': 'md5:17eccca93a786d51bc67646756894066',
-                'age_limit': 18,
-                'like_count': int,
-                'availability': 'needs_auth',
-                'channel_id': 'UC1yoRdFoFJaCY-AGfD9W0wQ',
-                'view_count': int,
-                'thumbnail': 'https://i.ytimg.com/vi_webp/Tq92D6wQ1mg/sddefault.webp',
-                'channel': 'Projekt Melody',
-                'live_status': 'not_live',
-                'tags': ['mmd', 'dance', 'mikumikudance', 'kpop', 'vtuber'],
-                'playable_in_embed': True,
-                'categories': ['Entertainment'],
-                'duration': 106,
-                'channel_url': 'https://www.youtube.com/channel/UC1yoRdFoFJaCY-AGfD9W0wQ',
-                'comment_count': int,
-                'channel_follower_count': int,
-                'uploader': 'Projekt Melody',
-                'uploader_url': 'https://www.youtube.com/@ProjektMelody',
-                'uploader_id': '@ProjektMelody',
-            },
-        },
-        {
-            'note': 'Non-Agegated non-embeddable video',
-            'url': 'https://youtube.com/watch?v=MeJVWBSsPAY',
-            'info_dict': {
-                'id': 'MeJVWBSsPAY',
-                'ext': 'mp4',
-                'title': 'OOMPH! - Such Mich Find Mich (Lyrics)',
-                'description': 'Fan Video. Music & Lyrics by OOMPH!.',
-                'upload_date': '20130730',
-                'track': 'Such mich find mich',
-                'age_limit': 0,
-                'tags': ['oomph', 'such mich find mich', 'lyrics', 'german industrial', 'musica industrial'],
-                'like_count': int,
-                'playable_in_embed': False,
-                'creator': 'OOMPH!',
-                'thumbnail': 'https://i.ytimg.com/vi/MeJVWBSsPAY/sddefault.jpg',
-                'view_count': int,
-                'alt_title': 'Such mich find mich',
-                'duration': 210,
-                'channel': 'Herr Lurik',
-                'channel_id': 'UCdR3RSDPqub28LjZx0v9-aA',
-                'categories': ['Music'],
-                'availability': 'public',
-                'channel_url': 'https://www.youtube.com/channel/UCdR3RSDPqub28LjZx0v9-aA',
-                'live_status': 'not_live',
-                'artist': 'OOMPH!',
-                'channel_follower_count': int,
-                'uploader': 'Herr Lurik',
-                'uploader_url': 'https://www.youtube.com/@HerrLurik',
-                'uploader_id': '@HerrLurik',
-            },
-        },
-        {
-            'note': 'Non-bypassable age-gated video',
-            'url': 'https://youtube.com/watch?v=Cr381pDsSsA',
-            'only_matching': True,
-        },
-        # video_info is None (https://github.com/ytdl-org/youtube-dl/issues/4421)
-        # YouTube Red ad is not captured for creator
-        {
-            'url': '__2ABJjxzNo',
-            'info_dict': {
-                'id': '__2ABJjxzNo',
-                'ext': 'mp4',
-                'duration': 266,
-                'upload_date': '20100430',
-                'creator': 'deadmau5',
-                'description': 'md5:6cbcd3a92ce1bc676fc4d6ab4ace2336',
-                'title': 'Deadmau5 - Some Chords (HD)',
-                'alt_title': 'Some Chords',
-                'availability': 'public',
-                'tags': 'count:14',
-                'channel_id': 'UCYEK6xds6eo-3tr4xRdflmQ',
-                'view_count': int,
-                'live_status': 'not_live',
-                'channel': 'deadmau5',
-                'thumbnail': 'https://i.ytimg.com/vi_webp/__2ABJjxzNo/maxresdefault.webp',
-                'like_count': int,
-                'track': 'Some Chords',
-                'artist': 'deadmau5',
-                'playable_in_embed': True,
-                'age_limit': 0,
-                'channel_url': 'https://www.youtube.com/channel/UCYEK6xds6eo-3tr4xRdflmQ',
-                'categories': ['Music'],
-                'album': 'Some Chords',
-                'channel_follower_count': int,
-                'uploader': 'deadmau5',
-                'uploader_url': 'https://www.youtube.com/@deadmau5',
-                'uploader_id': '@deadmau5',
-            },
-            'expected_warnings': [
-                'DASH manifest missing',
-            ]
-        },
-        # Olympics (https://github.com/ytdl-org/youtube-dl/issues/4431)
-        {
-            'url': 'lqQg6PlCWgI',
-            'info_dict': {
-                'id': 'lqQg6PlCWgI',
-                'ext': 'mp4',
-                'duration': 6085,
-                'upload_date': '20150827',
-                'description': 'md5:04bbbf3ccceb6795947572ca36f45904',
-                'title': 'Hockey - Women -  GER-AUS - London 2012 Olympic Games',
-                'like_count': int,
-                'release_timestamp': 1343767800,
-                'playable_in_embed': True,
-                'categories': ['Sports'],
-                'release_date': '20120731',
-                'channel': 'Olympics',
-                'tags': ['Hockey', '2012-07-31', '31 July 2012', 'Riverbank Arena', 'Session', 'Olympics', 'Olympic Games', 'London 2012', '2012 Summer Olympics', 'Summer Games'],
-                'channel_id': 'UCTl3QQTvqHFjurroKxexy2Q',
-                'thumbnail': 'https://i.ytimg.com/vi/lqQg6PlCWgI/maxresdefault.jpg',
-                'age_limit': 0,
-                'availability': 'public',
-                'live_status': 'was_live',
-                'view_count': int,
-                'channel_url': 'https://www.youtube.com/channel/UCTl3QQTvqHFjurroKxexy2Q',
-                'channel_follower_count': int,
-                'uploader': 'Olympics',
-                'uploader_url': 'https://www.youtube.com/@Olympics',
-                'uploader_id': '@Olympics',
-                'channel_is_verified': True,
-            },
-            'params': {
-                'skip_download': 'requires avconv',
-            }
-        },
-        # Non-square pixels
-        {
-            'url': 'https://www.youtube.com/watch?v=_b-2C3KPAM0',
-            'info_dict': {
-                'id': '_b-2C3KPAM0',
-                'ext': 'mp4',
-                'stretched_ratio': 16 / 9.,
-                'duration': 85,
-                'upload_date': '20110310',
-                'description': 'made by Wacom from Korea | 字幕&加油添醋 by TY\'s Allen | 感謝heylisa00cavey1001同學熱情提供梗及翻譯',
-                'title': '[A-made] 變態妍字幕版 太妍 我就是這樣的人',
-                'playable_in_embed': True,
-                'channel': '孫ᄋᄅ',
-                'age_limit': 0,
-                'tags': 'count:11',
-                'channel_url': 'https://www.youtube.com/channel/UCS-xxCmRaA6BFdmgDPA_BIw',
-                'channel_id': 'UCS-xxCmRaA6BFdmgDPA_BIw',
-                'thumbnail': 'https://i.ytimg.com/vi/_b-2C3KPAM0/maxresdefault.jpg',
-                'view_count': int,
-                'categories': ['People & Blogs'],
-                'like_count': int,
-                'live_status': 'not_live',
-                'availability': 'unlisted',
-                'comment_count': int,
-                'channel_follower_count': int,
-                'uploader': '孫ᄋᄅ',
-                'uploader_url': 'https://www.youtube.com/@AllenMeow',
-                'uploader_id': '@AllenMeow',
-            },
-        },
-        # url_encoded_fmt_stream_map is empty string
-        {
-            'url': 'qEJwOuvDf7I',
-            'info_dict': {
-                'id': 'qEJwOuvDf7I',
-                'ext': 'webm',
-                'title': 'Обсуждение судебной практики по выборам 14 сентября 2014 года в Санкт-Петербурге',
-                'description': '',
-                'upload_date': '20150404',
-            },
-            'params': {
-                'skip_download': 'requires avconv',
-            },
-            'skip': 'This live event has ended.',
-        },
-        # Extraction from multiple DASH manifests (https://github.com/ytdl-org/youtube-dl/pull/6097)
-        {
-            'url': 'https://www.youtube.com/watch?v=FIl7x6_3R5Y',
-            'info_dict': {
-                'id': 'FIl7x6_3R5Y',
-                'ext': 'webm',
-                'title': 'md5:7b81415841e02ecd4313668cde88737a',
-                'description': 'md5:116377fd2963b81ec4ce64b542173306',
-                'duration': 220,
-                'upload_date': '20150625',
-                'formats': 'mincount:31',
-            },
-            'skip': 'not actual anymore',
-        },
-        # DASH manifest with segment_list
-        {
-            'url': 'https://www.youtube.com/embed/CsmdDsKjzN8',
-            'md5': '8ce563a1d667b599d21064e982ab9e31',
-            'info_dict': {
-                'id': 'CsmdDsKjzN8',
-                'ext': 'mp4',
-                'upload_date': '20150501',  # According to '<meta itemprop="datePublished"', but in other places it's 20150510
-                'description': 'Retransmisión en directo de la XVIII media maratón de Zaragoza.',
-                'title': 'Retransmisión XVIII Media maratón Zaragoza 2015',
-            },
-            'params': {
-                'youtube_include_dash_manifest': True,
-                'format': '135',  # bestvideo
-            },
-            'skip': 'This live event has ended.',
-        },
-        {
-            # Multifeed videos (multiple cameras), URL can be of any Camera
-            # TODO: fix multifeed titles
-            'url': 'https://www.youtube.com/watch?v=zaPI8MvL8pg',
-            'info_dict': {
-                'id': 'zaPI8MvL8pg',
-                'title': 'Terraria 1.2 Live Stream | Let\'s Play - Part 04',
-                'description': 'md5:563ccbc698b39298481ca3c571169519',
-            },
-            'playlist': [{
-                'info_dict': {
-                    'id': 'j5yGuxZ8lLU',
-                    'ext': 'mp4',
-                    'title': 'Terraria 1.2 Live Stream | Let\'s Play - Part 04 (Chris)',
-                    'description': 'md5:563ccbc698b39298481ca3c571169519',
-                    'duration': 10120,
-                    'channel_follower_count': int,
-                    'channel_url': 'https://www.youtube.com/channel/UCN2XePorRokPB9TEgRZpddg',
-                    'availability': 'public',
-                    'playable_in_embed': True,
-                    'upload_date': '20131105',
-                    'categories': ['Gaming'],
-                    'live_status': 'was_live',
-                    'tags': 'count:24',
-                    'release_timestamp': 1383701910,
-                    'thumbnail': 'https://i.ytimg.com/vi/j5yGuxZ8lLU/maxresdefault.jpg',
-                    'comment_count': int,
-                    'age_limit': 0,
-                    'like_count': int,
-                    'channel_id': 'UCN2XePorRokPB9TEgRZpddg',
-                    'channel': 'WiiLikeToPlay',
-                    'view_count': int,
-                    'release_date': '20131106',
-                    'uploader': 'WiiLikeToPlay',
-                    'uploader_id': '@WLTP',
-                    'uploader_url': 'https://www.youtube.com/@WLTP',
-                },
-            }, {
-                'info_dict': {
-                    'id': 'zaPI8MvL8pg',
-                    'ext': 'mp4',
-                    'title': 'Terraria 1.2 Live Stream | Let\'s Play - Part 04 (Tyson)',
-                    'availability': 'public',
-                    'channel_url': 'https://www.youtube.com/channel/UCN2XePorRokPB9TEgRZpddg',
-                    'channel': 'WiiLikeToPlay',
-                    'channel_follower_count': int,
-                    'description': 'md5:563ccbc698b39298481ca3c571169519',
-                    'duration': 10108,
-                    'age_limit': 0,
-                    'like_count': int,
-                    'tags': 'count:24',
-                    'channel_id': 'UCN2XePorRokPB9TEgRZpddg',
-                    'release_timestamp': 1383701915,
-                    'comment_count': int,
-                    'upload_date': '20131105',
-                    'thumbnail': 'https://i.ytimg.com/vi/zaPI8MvL8pg/maxresdefault.jpg',
-                    'release_date': '20131106',
-                    'playable_in_embed': True,
-                    'live_status': 'was_live',
-                    'categories': ['Gaming'],
-                    'view_count': int,
-                    'uploader': 'WiiLikeToPlay',
-                    'uploader_id': '@WLTP',
-                    'uploader_url': 'https://www.youtube.com/@WLTP',
-                },
-            }, {
-                'info_dict': {
-                    'id': 'R7r3vfO7Hao',
-                    'ext': 'mp4',
-                    'title': 'Terraria 1.2 Live Stream | Let\'s Play - Part 04 (Spencer)',
-                    'thumbnail': 'https://i.ytimg.com/vi/R7r3vfO7Hao/maxresdefault.jpg',
-                    'channel_id': 'UCN2XePorRokPB9TEgRZpddg',
-                    'like_count': int,
-                    'availability': 'public',
-                    'playable_in_embed': True,
-                    'upload_date': '20131105',
-                    'description': 'md5:563ccbc698b39298481ca3c571169519',
-                    'channel_follower_count': int,
-                    'tags': 'count:24',
-                    'release_date': '20131106',
-                    'comment_count': int,
-                    'channel_url': 'https://www.youtube.com/channel/UCN2XePorRokPB9TEgRZpddg',
-                    'channel': 'WiiLikeToPlay',
-                    'categories': ['Gaming'],
-                    'release_timestamp': 1383701914,
-                    'live_status': 'was_live',
-                    'age_limit': 0,
-                    'duration': 10128,
-                    'view_count': int,
-                    'uploader': 'WiiLikeToPlay',
-                    'uploader_id': '@WLTP',
-                    'uploader_url': 'https://www.youtube.com/@WLTP',
-                },
-            }],
-            'params': {'skip_download': True},
-        },
-        {
-            # Multifeed video with comma in title (see https://github.com/ytdl-org/youtube-dl/issues/8536)
-            'url': 'https://www.youtube.com/watch?v=gVfLd0zydlo',
-            'info_dict': {
-                'id': 'gVfLd0zydlo',
-                'title': 'DevConf.cz 2016 Day 2 Workshops 1 14:00 - 15:30',
-            },
-            'playlist_count': 2,
-            'skip': 'Not multifeed anymore',
-        },
-        {
-            'url': 'https://vid.plus/FlRa-iH7PGw',
-            'only_matching': True,
-        },
-        {
-            'url': 'https://zwearz.com/watch/9lWxNJF-ufM/electra-woman-dyna-girl-official-trailer-grace-helbig.html',
-            'only_matching': True,
-        },
-        {
-            # Title with JS-like syntax "};" (see https://github.com/ytdl-org/youtube-dl/issues/7468)
-            # Also tests cut-off URL expansion in video description (see
-            # https://github.com/ytdl-org/youtube-dl/issues/1892,
-            # https://github.com/ytdl-org/youtube-dl/issues/8164)
-            'url': 'https://www.youtube.com/watch?v=lsguqyKfVQg',
-            'info_dict': {
-                'id': 'lsguqyKfVQg',
-                'ext': 'mp4',
-                'title': '{dark walk}; Loki/AC/Dishonored; collab w/Elflover21',
-                'alt_title': 'Dark Walk',
-                'description': 'md5:8085699c11dc3f597ce0410b0dcbb34a',
-                'duration': 133,
-                'upload_date': '20151119',
-                'creator': 'Todd Haberman;\nDaniel Law Heath and Aaron Kaplan',
-                'track': 'Dark Walk',
-                'artist': 'Todd Haberman;\nDaniel Law Heath and Aaron Kaplan',
-                'album': 'Position Music - Production Music Vol. 143 - Dark Walk',
-                'thumbnail': 'https://i.ytimg.com/vi_webp/lsguqyKfVQg/maxresdefault.webp',
-                'categories': ['Film & Animation'],
-                'view_count': int,
-                'live_status': 'not_live',
-                'channel_url': 'https://www.youtube.com/channel/UCTSRgz5jylBvFt_S7wnsqLQ',
-                'channel_id': 'UCTSRgz5jylBvFt_S7wnsqLQ',
-                'tags': 'count:13',
-                'availability': 'public',
-                'channel': 'IronSoulElf',
-                'playable_in_embed': True,
-                'like_count': int,
-                'age_limit': 0,
-                'channel_follower_count': int
-            },
-            'params': {
-                'skip_download': True,
-            },
-        },
-        {
-            # Tags with '};' (see https://github.com/ytdl-org/youtube-dl/issues/7468)
-            'url': 'https://www.youtube.com/watch?v=Ms7iBXnlUO8',
-            'only_matching': True,
-        },
-        {
-            # Video with yt:stretch=17:0
-            'url': 'https://www.youtube.com/watch?v=Q39EVAstoRM',
-            'info_dict': {
-                'id': 'Q39EVAstoRM',
-                'ext': 'mp4',
-                'title': 'Clash Of Clans#14 Dicas De Ataque Para CV 4',
-                'description': 'md5:ee18a25c350637c8faff806845bddee9',
-                'upload_date': '20151107',
-            },
-            'params': {
-                'skip_download': True,
-            },
-            'skip': 'This video does not exist.',
-        },
-        {
-            # Video with incomplete 'yt:stretch=16:'
-            'url': 'https://www.youtube.com/watch?v=FRhJzUSJbGI',
-            'only_matching': True,
-        },
-        {
-            # Video licensed under Creative Commons
-            'url': 'https://www.youtube.com/watch?v=M4gD1WSo5mA',
-            'info_dict': {
-                'id': 'M4gD1WSo5mA',
-                'ext': 'mp4',
-                'title': 'md5:e41008789470fc2533a3252216f1c1d1',
-                'description': 'md5:a677553cf0840649b731a3024aeff4cc',
-                'duration': 721,
-                'upload_date': '20150128',
-                'license': 'Creative Commons Attribution license (reuse allowed)',
-                'channel_id': 'UCuLGmD72gJDBwmLw06X58SA',
-                'channel_url': 'https://www.youtube.com/channel/UCuLGmD72gJDBwmLw06X58SA',
-                'like_count': int,
-                'age_limit': 0,
-                'tags': ['Copyright (Legal Subject)', 'Law (Industry)', 'William W. Fisher (Author)'],
-                'channel': 'The Berkman Klein Center for Internet & Society',
-                'availability': 'public',
-                'view_count': int,
-                'categories': ['Education'],
-                'thumbnail': 'https://i.ytimg.com/vi_webp/M4gD1WSo5mA/maxresdefault.webp',
-                'live_status': 'not_live',
-                'playable_in_embed': True,
-                'channel_follower_count': int,
-                'chapters': list,
-                'uploader': 'The Berkman Klein Center for Internet & Society',
-                'uploader_id': '@BKCHarvard',
-                'uploader_url': 'https://www.youtube.com/@BKCHarvard',
-            },
-            'params': {
-                'skip_download': True,
-            },
-        },
-        {
-            'url': 'https://www.youtube.com/watch?v=eQcmzGIKrzg',
-            'info_dict': {
-                'id': 'eQcmzGIKrzg',
-                'ext': 'mp4',
-                'title': 'Democratic Socialism and Foreign Policy | Bernie Sanders',
-                'description': 'md5:13a2503d7b5904ef4b223aa101628f39',
-                'duration': 4060,
-                'upload_date': '20151120',
-                'license': 'Creative Commons Attribution license (reuse allowed)',
-                'playable_in_embed': True,
-                'tags': 'count:12',
-                'like_count': int,
-                'channel_id': 'UCH1dpzjCEiGAt8CXkryhkZg',
-                'age_limit': 0,
-                'availability': 'public',
-                'categories': ['News & Politics'],
-                'channel': 'Bernie Sanders',
-                'thumbnail': 'https://i.ytimg.com/vi_webp/eQcmzGIKrzg/maxresdefault.webp',
-                'view_count': int,
-                'live_status': 'not_live',
-                'channel_url': 'https://www.youtube.com/channel/UCH1dpzjCEiGAt8CXkryhkZg',
-                'comment_count': int,
-                'channel_follower_count': int,
-                'chapters': list,
-                'uploader': 'Bernie Sanders',
-                'uploader_url': 'https://www.youtube.com/@BernieSanders',
-                'uploader_id': '@BernieSanders',
-                'channel_is_verified': True,
-                'heatmap': 'count:100',
-            },
-            'params': {
-                'skip_download': True,
-            },
-        },
-        {
-            'url': 'https://www.youtube.com/watch?feature=player_embedded&amp;amp;v=V36LpHqtcDY',
-            'only_matching': True,
-        },
-        {
-            # YouTube Red paid video (https://github.com/ytdl-org/youtube-dl/issues/10059)
-            'url': 'https://www.youtube.com/watch?v=i1Ko8UG-Tdo',
-            'only_matching': True,
-        },
-        {
-            # Rental video preview
-            'url': 'https://www.youtube.com/watch?v=yYr8q0y5Jfg',
-            'info_dict': {
-                'id': 'uGpuVWrhIzE',
-                'ext': 'mp4',
-                'title': 'Piku - Trailer',
-                'description': 'md5:c36bd60c3fd6f1954086c083c72092eb',
-                'upload_date': '20150811',
-                'license': 'Standard YouTube License',
-            },
-            'params': {
-                'skip_download': True,
-            },
-            'skip': 'This video is not available.',
-        },
-        {
-            # YouTube Red video with episode data
-            'url': 'https://www.youtube.com/watch?v=iqKdEhx-dD4',
-            'info_dict': {
-                'id': 'iqKdEhx-dD4',
-                'ext': 'mp4',
-                'title': 'Isolation - Mind Field (Ep 1)',
-                'description': 'md5:f540112edec5d09fc8cc752d3d4ba3cd',
-                'duration': 2085,
-                'upload_date': '20170118',
-                'series': 'Mind Field',
-                'season_number': 1,
-                'episode_number': 1,
-                'thumbnail': 'https://i.ytimg.com/vi_webp/iqKdEhx-dD4/maxresdefault.webp',
-                'tags': 'count:12',
-                'view_count': int,
-                'availability': 'public',
-                'age_limit': 0,
-                'channel': 'Vsauce',
-                'episode': 'Episode 1',
-                'categories': ['Entertainment'],
-                'season': 'Season 1',
-                'channel_id': 'UC6nSFpj9HTCZ5t-N3Rm3-HA',
-                'channel_url': 'https://www.youtube.com/channel/UC6nSFpj9HTCZ5t-N3Rm3-HA',
-                'like_count': int,
-                'playable_in_embed': True,
-                'live_status': 'not_live',
-                'channel_follower_count': int,
-                'uploader': 'Vsauce',
-                'uploader_url': 'https://www.youtube.com/@Vsauce',
-                'uploader_id': '@Vsauce',
-                'comment_count': int,
-                'channel_is_verified': True,
-            },
-            'params': {
-                'skip_download': True,
-            },
-            'expected_warnings': [
-                'Skipping DASH manifest',
-            ],
-        },
-        {
-            # The following content has been identified by the YouTube community
-            # as inappropriate or offensive to some audiences.
-            'url': 'https://www.youtube.com/watch?v=6SJNVb0GnPI',
-            'info_dict': {
-                'id': '6SJNVb0GnPI',
-                'ext': 'mp4',
-                'title': 'Race Differences in Intelligence',
-                'description': 'md5:5d161533167390427a1f8ee89a1fc6f1',
-                'duration': 965,
-                'upload_date': '20140124',
-            },
-            'params': {
-                'skip_download': True,
-            },
-            'skip': 'This video has been removed for violating YouTube\'s policy on hate speech.',
-        },
-        {
-            # itag 212
-            'url': '1t24XAntNCY',
-            'only_matching': True,
-        },
-        {
-            # geo restricted to JP
-            'url': 'sJL6WA-aGkQ',
-            'only_matching': True,
-        },
-        {
-            'url': 'https://invidio.us/watch?v=BaW_jenozKc',
-            'only_matching': True,
-        },
-        {
-            'url': 'https://redirect.invidious.io/watch?v=BaW_jenozKc',
-            'only_matching': True,
-        },
-        {
-            # from https://nitter.pussthecat.org/YouTube/status/1360363141947944964#m
-            'url': 'https://redirect.invidious.io/Yh0AhrY9GjA',
-            'only_matching': True,
-        },
-        {
-            # DRM protected
-            'url': 'https://www.youtube.com/watch?v=s7_qI6_mIXc',
-            'only_matching': True,
-        },
-        {
-            # Video with unsupported adaptive stream type formats
-            'url': 'https://www.youtube.com/watch?v=Z4Vy8R84T1U',
-            'info_dict': {
-                'id': 'Z4Vy8R84T1U',
-                'ext': 'mp4',
-                'title': 'saman SMAN 53 Jakarta(Sancety) opening COFFEE4th at SMAN 53 Jakarta',
-                'description': 'md5:d41d8cd98f00b204e9800998ecf8427e',
-                'duration': 433,
-                'upload_date': '20130923',
-                'formats': 'maxcount:10',
-            },
-            'params': {
-                'skip_download': True,
-                'youtube_include_dash_manifest': False,
-            },
-            'skip': 'not actual anymore',
-        },
-        {
-            # Youtube Music Auto-generated description
-            # TODO: fix metadata extraction
-            'url': 'https://music.youtube.com/watch?v=MgNrAu2pzNs',
-            'info_dict': {
-                'id': 'MgNrAu2pzNs',
-                'ext': 'mp4',
-                'title': 'Voyeur Girl',
-                'description': 'md5:7ae382a65843d6df2685993e90a8628f',
-                'upload_date': '20190312',
-                'artist': 'Stephen',
-                'track': 'Voyeur Girl',
-                'album': 'it\'s too much love to know my dear',
-                'release_date': '20190313',
-                'release_year': 2019,
-                'alt_title': 'Voyeur Girl',
-                'view_count': int,
-                'playable_in_embed': True,
-                'like_count': int,
-                'categories': ['Music'],
-                'channel_url': 'https://www.youtube.com/channel/UC-pWHpBjdGG69N9mM2auIAA',
-                'channel': 'Stephen',  # TODO: should be "Stephen - Topic"
-                'uploader': 'Stephen',
-                'availability': 'public',
-                'creator': 'Stephen',
-                'duration': 169,
-                'thumbnail': 'https://i.ytimg.com/vi_webp/MgNrAu2pzNs/maxresdefault.webp',
-                'age_limit': 0,
-                'channel_id': 'UC-pWHpBjdGG69N9mM2auIAA',
-                'tags': 'count:11',
-                'live_status': 'not_live',
-                'channel_follower_count': int
-            },
-            'params': {
-                'skip_download': True,
-            },
-        },
-        {
-            'url': 'https://www.youtubekids.com/watch?v=3b8nCWDgZ6Q',
-            'only_matching': True,
-        },
-        {
-            # invalid -> valid video id redirection
-            'url': 'DJztXj2GPfl',
-            'info_dict': {
-                'id': 'DJztXj2GPfk',
-                'ext': 'mp4',
-                'title': 'Panjabi MC - Mundian To Bach Ke (The Dictator Soundtrack)',
-                'description': 'md5:bf577a41da97918e94fa9798d9228825',
-                'upload_date': '20090125',
-                'artist': 'Panjabi MC',
-                'track': 'Beware of the Boys (Mundian to Bach Ke) - Motivo Hi-Lectro Remix',
-                'album': 'Beware of the Boys (Mundian To Bach Ke)',
-            },
-            'params': {
-                'skip_download': True,
-            },
-            'skip': 'Video unavailable',
-        },
-        {
-            # empty description results in an empty string
-            'url': 'https://www.youtube.com/watch?v=x41yOUIvK2k',
-            'info_dict': {
-                'id': 'x41yOUIvK2k',
-                'ext': 'mp4',
-                'title': 'IMG 3456',
-                'description': '',
-                'upload_date': '20170613',
-                'view_count': int,
-                'thumbnail': 'https://i.ytimg.com/vi_webp/x41yOUIvK2k/maxresdefault.webp',
-                'like_count': int,
-                'channel_id': 'UCo03ZQPBW5U4UC3regpt1nw',
-                'tags': [],
-                'channel_url': 'https://www.youtube.com/channel/UCo03ZQPBW5U4UC3regpt1nw',
-                'availability': 'public',
-                'age_limit': 0,
-                'categories': ['Pets & Animals'],
-                'duration': 7,
-                'playable_in_embed': True,
-                'live_status': 'not_live',
-                'channel': 'l\'Or Vert asbl',
-                'channel_follower_count': int,
-                'uploader': 'l\'Or Vert asbl',
-                'uploader_url': 'https://www.youtube.com/@ElevageOrVert',
-                'uploader_id': '@ElevageOrVert',
-            },
-            'params': {
-                'skip_download': True,
-            },
-        },
-        {
-            # with '};' inside yt initial data (see [1])
-            # see [2] for an example with '};' inside ytInitialPlayerResponse
-            # 1. https://github.com/ytdl-org/youtube-dl/issues/27093
-            # 2. https://github.com/ytdl-org/youtube-dl/issues/27216
-            'url': 'https://www.youtube.com/watch?v=CHqg6qOn4no',
-            'info_dict': {
-                'id': 'CHqg6qOn4no',
-                'ext': 'mp4',
-                'title': 'Part 77   Sort a list of simple types in c#',
-                'description': 'md5:b8746fa52e10cdbf47997903f13b20dc',
-                'upload_date': '20130831',
-                'channel_id': 'UCCTVrRB5KpIiK6V2GGVsR1Q',
-                'like_count': int,
-                'channel_url': 'https://www.youtube.com/channel/UCCTVrRB5KpIiK6V2GGVsR1Q',
-                'live_status': 'not_live',
-                'categories': ['Education'],
-                'availability': 'public',
-                'thumbnail': 'https://i.ytimg.com/vi/CHqg6qOn4no/sddefault.jpg',
-                'tags': 'count:12',
-                'playable_in_embed': True,
-                'age_limit': 0,
-                'view_count': int,
-                'duration': 522,
-                'channel': 'kudvenkat',
-                'comment_count': int,
-                'channel_follower_count': int,
-                'chapters': list,
-                'uploader': 'kudvenkat',
-                'uploader_url': 'https://www.youtube.com/@Csharp-video-tutorialsBlogspot',
-                'uploader_id': '@Csharp-video-tutorialsBlogspot',
-                'channel_is_verified': True,
-                'heatmap': 'count:100',
-            },
-            'params': {
-                'skip_download': True,
-            },
-        },
-        {
-            # another example of '};' in ytInitialData
-            'url': 'https://www.youtube.com/watch?v=gVfgbahppCY',
-            'only_matching': True,
-        },
-        {
-            'url': 'https://www.youtube.com/watch_popup?v=63RmMXCd_bQ',
-            'only_matching': True,
-        },
-        {
-            # https://github.com/ytdl-org/youtube-dl/pull/28094
-            'url': 'OtqTfy26tG0',
-            'info_dict': {
-                'id': 'OtqTfy26tG0',
-                'ext': 'mp4',
-                'title': 'Burn Out',
-                'description': 'md5:8d07b84dcbcbfb34bc12a56d968b6131',
-                'upload_date': '20141120',
-                'artist': 'The Cinematic Orchestra',
-                'track': 'Burn Out',
-                'album': 'Every Day',
-                'like_count': int,
-                'live_status': 'not_live',
-                'alt_title': 'Burn Out',
-                'duration': 614,
-                'age_limit': 0,
-                'view_count': int,
-                'channel_url': 'https://www.youtube.com/channel/UCIzsJBIyo8hhpFm1NK0uLgw',
-                'creator': 'The Cinematic Orchestra',
-                'channel': 'The Cinematic Orchestra',
-                'tags': ['The Cinematic Orchestra', 'Every Day', 'Burn Out'],
-                'channel_id': 'UCIzsJBIyo8hhpFm1NK0uLgw',
-                'availability': 'public',
-                'thumbnail': 'https://i.ytimg.com/vi/OtqTfy26tG0/maxresdefault.jpg',
-                'categories': ['Music'],
-                'playable_in_embed': True,
-                'channel_follower_count': int,
-                'uploader': 'The Cinematic Orchestra',
-                'comment_count': int,
-            },
-            'params': {
-                'skip_download': True,
-            },
-        },
-        {
-            # controversial video, only works with bpctr when authenticated with cookies
-            'url': 'https://www.youtube.com/watch?v=nGC3D_FkCmg',
-            'only_matching': True,
-        },
-        {
-            # controversial video, requires bpctr/contentCheckOk
-            'url': 'https://www.youtube.com/watch?v=SZJvDhaSDnc',
-            'info_dict': {
-                'id': 'SZJvDhaSDnc',
-                'ext': 'mp4',
-                'title': 'San Diego teen commits suicide after bullying over embarrassing video',
-                'channel_id': 'UC-SJ6nODDmufqBzPBwCvYvQ',
-                'upload_date': '20140716',
-                'description': 'md5:acde3a73d3f133fc97e837a9f76b53b7',
-                'duration': 170,
-                'categories': ['News & Politics'],
-                'view_count': int,
-                'channel': 'CBS Mornings',
-                'tags': ['suicide', 'bullying', 'video', 'cbs', 'news'],
-                'thumbnail': 'https://i.ytimg.com/vi/SZJvDhaSDnc/hqdefault.jpg',
-                'age_limit': 18,
-                'availability': 'needs_auth',
-                'channel_url': 'https://www.youtube.com/channel/UC-SJ6nODDmufqBzPBwCvYvQ',
-                'like_count': int,
-                'live_status': 'not_live',
-                'playable_in_embed': True,
-                'channel_follower_count': int,
-                'uploader': 'CBS Mornings',
-                'uploader_url': 'https://www.youtube.com/@CBSMornings',
-                'uploader_id': '@CBSMornings',
-                'comment_count': int,
-                'channel_is_verified': True,
-            }
-        },
-        {
-            # restricted location, https://github.com/ytdl-org/youtube-dl/issues/28685
-            'url': 'cBvYw8_A0vQ',
-            'info_dict': {
-                'id': 'cBvYw8_A0vQ',
-                'ext': 'mp4',
-                'title': '4K Ueno Okachimachi  Street  Scenes  上野御徒町歩き',
-                'description': 'md5:ea770e474b7cd6722b4c95b833c03630',
-                'upload_date': '20201120',
-                'duration': 1456,
-                'categories': ['Travel & Events'],
-                'channel_id': 'UC3o_t8PzBmXf5S9b7GLx1Mw',
-                'view_count': int,
-                'channel': 'Walk around Japan',
-                'tags': ['Ueno Tokyo', 'Okachimachi Tokyo', 'Ameyoko Street', 'Tokyo attraction', 'Travel in Tokyo'],
-                'thumbnail': 'https://i.ytimg.com/vi_webp/cBvYw8_A0vQ/hqdefault.webp',
-                'age_limit': 0,
-                'availability': 'public',
-                'channel_url': 'https://www.youtube.com/channel/UC3o_t8PzBmXf5S9b7GLx1Mw',
-                'live_status': 'not_live',
-                'playable_in_embed': True,
-                'channel_follower_count': int,
-                'uploader': 'Walk around Japan',
-                'uploader_url': 'https://www.youtube.com/@walkaroundjapan7124',
-                'uploader_id': '@walkaroundjapan7124',
-            },
-            'params': {
-                'skip_download': True,
-            },
-        }, {
-            # Has multiple audio streams
-            'url': 'WaOKSUlf4TM',
-            'only_matching': True
-        }, {
-            # Requires Premium: has format 141 when requested using YTM url
-            'url': 'https://music.youtube.com/watch?v=XclachpHxis',
-            'only_matching': True
-        }, {
-            # multiple subtitles with same lang_code
-            'url': 'https://www.youtube.com/watch?v=wsQiKKfKxug',
-            'only_matching': True,
-        }, {
-            # Force use android client fallback
-            'url': 'https://www.youtube.com/watch?v=YOelRv7fMxY',
-            'info_dict': {
-                'id': 'YOelRv7fMxY',
-                'title': 'DIGGING A SECRET TUNNEL Part 1',
-                'ext': '3gp',
-                'upload_date': '20210624',
-                'channel_id': 'UCp68_FLety0O-n9QU6phsgw',
-                'channel_url': r're:https?://(?:www\.)?youtube\.com/channel/UCp68_FLety0O-n9QU6phsgw',
-                'description': 'md5:5d5991195d599b56cd0c4148907eec50',
-                'duration': 596,
-                'categories': ['Entertainment'],
-                'view_count': int,
-                'channel': 'colinfurze',
-                'tags': ['Colin', 'furze', 'Terry', 'tunnel', 'underground', 'bunker'],
-                'thumbnail': 'https://i.ytimg.com/vi/YOelRv7fMxY/maxresdefault.jpg',
-                'age_limit': 0,
-                'availability': 'public',
-                'like_count': int,
-                'live_status': 'not_live',
-                'playable_in_embed': True,
-                'channel_follower_count': int,
-                'chapters': list,
-                'uploader': 'colinfurze',
-                'uploader_url': 'https://www.youtube.com/@colinfurze',
-                'uploader_id': '@colinfurze',
-                'comment_count': int,
-                'channel_is_verified': True,
-                'heatmap': 'count:100',
-            },
-            'params': {
-                'format': '17',  # 3gp format available on android
-                'extractor_args': {'youtube': {'player_client': ['android']}},
-            },
-        },
-        {
-            # Skip download of additional client configs (remix client config in this case)
-            'url': 'https://music.youtube.com/watch?v=MgNrAu2pzNs',
-            'only_matching': True,
-            'params': {
-                'extractor_args': {'youtube': {'player_skip': ['configs']}},
-            },
-        }, {
-            # shorts
-            'url': 'https://www.youtube.com/shorts/BGQWPY4IigY',
-            'only_matching': True,
-        }, {
-            'note': 'Storyboards',
-            'url': 'https://www.youtube.com/watch?v=5KLPxDtMqe8',
-            'info_dict': {
-                'id': '5KLPxDtMqe8',
-                'ext': 'mhtml',
-                'format_id': 'sb0',
-                'title': 'Your Brain is Plastic',
-                'description': 'md5:89cd86034bdb5466cd87c6ba206cd2bc',
-                'upload_date': '20140324',
-                'like_count': int,
-                'channel_id': 'UCZYTClx2T1of7BRZ86-8fow',
-                'channel_url': 'https://www.youtube.com/channel/UCZYTClx2T1of7BRZ86-8fow',
-                'view_count': int,
-                'thumbnail': 'https://i.ytimg.com/vi/5KLPxDtMqe8/maxresdefault.jpg',
-                'playable_in_embed': True,
-                'tags': 'count:12',
-                'availability': 'public',
-                'channel': 'SciShow',
-                'live_status': 'not_live',
-                'duration': 248,
-                'categories': ['Education'],
-                'age_limit': 0,
-                'channel_follower_count': int,
-                'chapters': list,
-                'uploader': 'SciShow',
-                'uploader_url': 'https://www.youtube.com/@SciShow',
-                'uploader_id': '@SciShow',
-                'comment_count': int,
-                'channel_is_verified': True,
-                'heatmap': 'count:100',
-            }, 'params': {'format': 'mhtml', 'skip_download': True}
-        }, {
-            # Ensure video upload_date is in UTC timezone (video was uploaded 1641170939)
-            'url': 'https://www.youtube.com/watch?v=2NUZ8W2llS4',
-            'info_dict': {
-                'id': '2NUZ8W2llS4',
-                'ext': 'mp4',
-                'title': 'The NP that test your phone performance 🙂',
-                'description': 'md5:144494b24d4f9dfacb97c1bbef5de84d',
-                'channel_id': 'UCRqNBSOHgilHfAczlUmlWHA',
-                'channel_url': 'https://www.youtube.com/channel/UCRqNBSOHgilHfAczlUmlWHA',
-                'duration': 21,
-                'view_count': int,
-                'age_limit': 0,
-                'categories': ['Gaming'],
-                'tags': 'count:23',
-                'playable_in_embed': True,
-                'live_status': 'not_live',
-                'upload_date': '20220103',
-                'like_count': int,
-                'availability': 'public',
-                'channel': 'Leon Nguyen',
-                'thumbnail': 'https://i.ytimg.com/vi_webp/2NUZ8W2llS4/maxresdefault.webp',
-                'comment_count': int,
-                'channel_follower_count': int,
-                'uploader': 'Leon Nguyen',
-                'uploader_url': 'https://www.youtube.com/@LeonNguyen',
-                'uploader_id': '@LeonNguyen',
-                'heatmap': 'count:100',
-            }
-        }, {
-            # Same video as above, but with --compat-opt no-youtube-prefer-utc-upload-date
-            'url': 'https://www.youtube.com/watch?v=2NUZ8W2llS4',
-            'info_dict': {
-                'id': '2NUZ8W2llS4',
-                'ext': 'mp4',
-                'title': 'The NP that test your phone performance 🙂',
-                'description': 'md5:144494b24d4f9dfacb97c1bbef5de84d',
-                'channel_id': 'UCRqNBSOHgilHfAczlUmlWHA',
-                'channel_url': 'https://www.youtube.com/channel/UCRqNBSOHgilHfAczlUmlWHA',
-                'duration': 21,
-                'view_count': int,
-                'age_limit': 0,
-                'categories': ['Gaming'],
-                'tags': 'count:23',
-                'playable_in_embed': True,
-                'live_status': 'not_live',
-                'upload_date': '20220102',
-                'like_count': int,
-                'availability': 'public',
-                'channel': 'Leon Nguyen',
-                'thumbnail': 'https://i.ytimg.com/vi_webp/2NUZ8W2llS4/maxresdefault.webp',
-                'comment_count': int,
-                'channel_follower_count': int,
-                'uploader': 'Leon Nguyen',
-                'uploader_url': 'https://www.youtube.com/@LeonNguyen',
-                'uploader_id': '@LeonNguyen',
-                'heatmap': 'count:100',
-            },
-            'params': {'compat_opts': ['no-youtube-prefer-utc-upload-date']}
-        }, {
-            # date text is premiered video, ensure upload date in UTC (published 1641172509)
-            'url': 'https://www.youtube.com/watch?v=mzZzzBU6lrM',
-            'info_dict': {
-                'id': 'mzZzzBU6lrM',
-                'ext': 'mp4',
-                'title': 'I Met GeorgeNotFound In Real Life...',
-                'description': 'md5:978296ec9783a031738b684d4ebf302d',
-                'channel_id': 'UC_8NknAFiyhOUaZqHR3lq3Q',
-                'channel_url': 'https://www.youtube.com/channel/UC_8NknAFiyhOUaZqHR3lq3Q',
-                'duration': 955,
-                'view_count': int,
-                'age_limit': 0,
-                'categories': ['Entertainment'],
-                'tags': 'count:26',
-                'playable_in_embed': True,
-                'live_status': 'not_live',
-                'release_timestamp': 1641172509,
-                'release_date': '20220103',
-                'upload_date': '20220103',
-                'like_count': int,
-                'availability': 'public',
-                'channel': 'Quackity',
-                'thumbnail': 'https://i.ytimg.com/vi/mzZzzBU6lrM/maxresdefault.jpg',
-                'channel_follower_count': int,
-                'uploader': 'Quackity',
-                'uploader_id': '@Quackity',
-                'uploader_url': 'https://www.youtube.com/@Quackity',
-                'comment_count': int,
-                'channel_is_verified': True,
-                'heatmap': 'count:100',
-            }
-        },
-        {   # continuous livestream. Microformat upload date should be preferred.
-            # Upload date was 2021-06-19 (not UTC), while stream start is 2021-11-27
-            'url': 'https://www.youtube.com/watch?v=kgx4WGK0oNU',
-            'info_dict': {
-                'id': 'kgx4WGK0oNU',
-                'title': r're:jazz\/lofi hip hop radio🌱chill beats to relax\/study to \[LIVE 24\/7\] \d{4}-\d{2}-\d{2} \d{2}:\d{2}',
-                'ext': 'mp4',
-                'channel_id': 'UC84whx2xxsiA1gXHXXqKGOA',
-                'availability': 'public',
-                'age_limit': 0,
-                'release_timestamp': 1637975704,
-                'upload_date': '20210619',
-                'channel_url': 'https://www.youtube.com/channel/UC84whx2xxsiA1gXHXXqKGOA',
-                'live_status': 'is_live',
-                'thumbnail': 'https://i.ytimg.com/vi/kgx4WGK0oNU/maxresdefault.jpg',
-                'channel': 'Abao in Tokyo',
-                'channel_follower_count': int,
-                'release_date': '20211127',
-                'tags': 'count:39',
-                'categories': ['People & Blogs'],
-                'like_count': int,
-                'view_count': int,
-                'playable_in_embed': True,
-                'description': 'md5:2ef1d002cad520f65825346e2084e49d',
-                'concurrent_view_count': int,
-                'uploader': 'Abao in Tokyo',
-                'uploader_url': 'https://www.youtube.com/@abaointokyo',
-                'uploader_id': '@abaointokyo',
-            },
-            'params': {'skip_download': True}
-        }, {
-            'url': 'https://www.youtube.com/watch?v=tjjjtzRLHvA',
-            'info_dict': {
-                'id': 'tjjjtzRLHvA',
-                'ext': 'mp4',
-                'title': 'ハッシュタグ無し };if window.ytcsi',
-                'upload_date': '20220323',
-                'like_count': int,
-                'availability': 'unlisted',
-                'channel': 'Lesmiscore',
-                'thumbnail': r're:^https?://.*\.jpg',
-                'age_limit': 0,
-                'categories': ['Music'],
-                'view_count': int,
-                'description': '',
-                'channel_url': 'https://www.youtube.com/channel/UCdqltm_7iv1Vs6kp6Syke5A',
-                'channel_id': 'UCdqltm_7iv1Vs6kp6Syke5A',
-                'live_status': 'not_live',
-                'playable_in_embed': True,
-                'channel_follower_count': int,
-                'duration': 6,
-                'tags': [],
-                'uploader_id': '@lesmiscore',
-                'uploader': 'Lesmiscore',
-                'uploader_url': 'https://www.youtube.com/@lesmiscore',
-            }
-        }, {
-            # Prefer primary title+description language metadata by default
-            # Do not prefer translated description if primary is empty
-            'url': 'https://www.youtube.com/watch?v=el3E4MbxRqQ',
-            'info_dict': {
-                'id': 'el3E4MbxRqQ',
-                'ext': 'mp4',
-                'title': 'dlp test video 2 - primary sv no desc',
-                'description': '',
-                'channel': 'cole-dlp-test-acc',
-                'tags': [],
-                'view_count': int,
-                'channel_url': 'https://www.youtube.com/channel/UCiu-3thuViMebBjw_5nWYrA',
-                'like_count': int,
-                'playable_in_embed': True,
-                'availability': 'unlisted',
-                'thumbnail': r're:^https?://.*\.jpg',
-                'age_limit': 0,
-                'duration': 5,
-                'live_status': 'not_live',
-                'upload_date': '20220908',
-                'categories': ['People & Blogs'],
-                'channel_id': 'UCiu-3thuViMebBjw_5nWYrA',
-                'uploader_url': 'https://www.youtube.com/@coletdjnz',
-                'uploader_id': '@coletdjnz',
-                'uploader': 'cole-dlp-test-acc',
-            },
-            'params': {'skip_download': True}
-        }, {
-            # Extractor argument: prefer translated title+description
-            'url': 'https://www.youtube.com/watch?v=gHKT4uU8Zng',
-            'info_dict': {
-                'id': 'gHKT4uU8Zng',
-                'ext': 'mp4',
-                'channel': 'cole-dlp-test-acc',
-                'tags': [],
-                'duration': 5,
-                'live_status': 'not_live',
-                'channel_id': 'UCiu-3thuViMebBjw_5nWYrA',
-                'upload_date': '20220728',
-                'view_count': int,
-                'categories': ['People & Blogs'],
-                'thumbnail': r're:^https?://.*\.jpg',
-                'title': 'dlp test video title translated (fr)',
-                'availability': 'public',
-                'age_limit': 0,
-                'description': 'dlp test video description translated (fr)',
-                'playable_in_embed': True,
-                'channel_url': 'https://www.youtube.com/channel/UCiu-3thuViMebBjw_5nWYrA',
-                'uploader_url': 'https://www.youtube.com/@coletdjnz',
-                'uploader_id': '@coletdjnz',
-                'uploader': 'cole-dlp-test-acc',
-            },
-            'params': {'skip_download': True, 'extractor_args': {'youtube': {'lang': ['fr']}}},
-            'expected_warnings': [r'Preferring "fr" translated fields'],
-        }, {
-            'note': '6 channel audio',
-            'url': 'https://www.youtube.com/watch?v=zgdo7-RRjgo',
-            'only_matching': True,
-        }, {
-            'note': 'Multiple HLS formats with same itag',
-            'url': 'https://www.youtube.com/watch?v=kX3nB4PpJko',
-            'info_dict': {
-                'id': 'kX3nB4PpJko',
-                'ext': 'mp4',
-                'categories': ['Entertainment'],
-                'description': 'md5:e8031ff6e426cdb6a77670c9b81f6fa6',
-                'live_status': 'not_live',
-                'duration': 937,
-                'channel_follower_count': int,
-                'thumbnail': 'https://i.ytimg.com/vi_webp/kX3nB4PpJko/maxresdefault.webp',
-                'title': 'Last To Take Hand Off Jet, Keeps It!',
-                'channel': 'MrBeast',
-                'playable_in_embed': True,
-                'view_count': int,
-                'upload_date': '20221112',
-                'channel_url': 'https://www.youtube.com/channel/UCX6OQ3DkcsbYNE6H8uQQuVA',
-                'age_limit': 0,
-                'availability': 'public',
-                'channel_id': 'UCX6OQ3DkcsbYNE6H8uQQuVA',
-                'like_count': int,
-                'tags': [],
-                'uploader': 'MrBeast',
-                'uploader_url': 'https://www.youtube.com/@MrBeast',
-                'uploader_id': '@MrBeast',
-                'comment_count': int,
-                'channel_is_verified': True,
-                'heatmap': 'count:100',
-            },
-            'params': {'extractor_args': {'youtube': {'player_client': ['ios']}}, 'format': '233-1'},
-        }, {
-            'note': 'Audio formats with Dynamic Range Compression',
-            'url': 'https://www.youtube.com/watch?v=Tq92D6wQ1mg',
-            'info_dict': {
-                'id': 'Tq92D6wQ1mg',
-                'ext': 'webm',
-                'title': '[MMD] Adios - EVERGLOW [+Motion DL]',
-                'channel_url': 'https://www.youtube.com/channel/UC1yoRdFoFJaCY-AGfD9W0wQ',
-                'channel_id': 'UC1yoRdFoFJaCY-AGfD9W0wQ',
-                'channel_follower_count': int,
-                'description': 'md5:17eccca93a786d51bc67646756894066',
-                'upload_date': '20191228',
-                'tags': ['mmd', 'dance', 'mikumikudance', 'kpop', 'vtuber'],
-                'playable_in_embed': True,
-                'like_count': int,
-                'categories': ['Entertainment'],
-                'thumbnail': 'https://i.ytimg.com/vi/Tq92D6wQ1mg/sddefault.jpg',
-                'age_limit': 18,
-                'channel': 'Projekt Melody',
-                'view_count': int,
-                'availability': 'needs_auth',
-                'comment_count': int,
-                'live_status': 'not_live',
-                'duration': 106,
-                'uploader': 'Projekt Melody',
-                'uploader_id': '@ProjektMelody',
-                'uploader_url': 'https://www.youtube.com/@ProjektMelody',
-            },
-            'params': {'extractor_args': {'youtube': {'player_client': ['tv_embedded']}}, 'format': '251-drc'},
-        },
-        {
-            'url': 'https://www.youtube.com/live/qVv6vCqciTM',
-            'info_dict': {
-                'id': 'qVv6vCqciTM',
-                'ext': 'mp4',
-                'age_limit': 0,
-                'comment_count': int,
-                'chapters': 'count:13',
-                'upload_date': '20221223',
-                'thumbnail': 'https://i.ytimg.com/vi/qVv6vCqciTM/maxresdefault.jpg',
-                'channel_url': 'https://www.youtube.com/channel/UCIdEIHpS0TdkqRkHL5OkLtA',
-                'like_count': int,
-                'release_date': '20221223',
-                'tags': ['Vtuber', '月ノ美兎', '名取さな', 'にじさんじ', 'クリスマス', '3D配信'],
-                'title': '【 #インターネット女クリスマス 】3Dで歌ってはしゃぐインターネットの女たち【月ノ美兎/名取さな】',
-                'view_count': int,
-                'playable_in_embed': True,
-                'duration': 4438,
-                'availability': 'public',
-                'channel_follower_count': int,
-                'channel_id': 'UCIdEIHpS0TdkqRkHL5OkLtA',
-                'categories': ['Entertainment'],
-                'live_status': 'was_live',
-                'release_timestamp': 1671793345,
-                'channel': 'さなちゃんねる',
-                'description': 'md5:6aebf95cc4a1d731aebc01ad6cc9806d',
-                'uploader': 'さなちゃんねる',
-                'uploader_url': 'https://www.youtube.com/@sana_natori',
-                'uploader_id': '@sana_natori',
-                'channel_is_verified': True,
-                'heatmap': 'count:100',
-            },
-        },
-        {
-            # Fallbacks when webpage and web client is unavailable
-            'url': 'https://www.youtube.com/watch?v=wSSmNUl9Snw',
-            'info_dict': {
-                'id': 'wSSmNUl9Snw',
-                'ext': 'mp4',
-                # 'categories': ['Science & Technology'],
-                'view_count': int,
-                'chapters': 'count:2',
-                'channel': 'Scott Manley',
-                'like_count': int,
-                'age_limit': 0,
-                # 'availability': 'public',
-                'channel_follower_count': int,
-                'live_status': 'not_live',
-                'upload_date': '20170831',
-                'duration': 682,
-                'tags': 'count:8',
-                'uploader_url': 'https://www.youtube.com/@scottmanley',
-                'description': 'md5:f4bed7b200404b72a394c2f97b782c02',
-                'uploader': 'Scott Manley',
-                'uploader_id': '@scottmanley',
-                'title': 'The Computer Hack That Saved Apollo 14',
-                'channel_id': 'UCxzC4EngIsMrPmbm6Nxvb-A',
-                'thumbnail': r're:^https?://.*\.webp',
-                'channel_url': 'https://www.youtube.com/channel/UCxzC4EngIsMrPmbm6Nxvb-A',
-                'playable_in_embed': True,
-                'comment_count': int,
-                'channel_is_verified': True,
-                'heatmap': 'count:100',
-            },
-            'params': {
-                'extractor_args': {'youtube': {'player_client': ['android'], 'player_skip': ['webpage']}},
-            },
-        },
-    ]
-
-    _WEBPAGE_TESTS = [
-        # YouTube <object> embed
-        {
-            'url': 'http://www.improbable.com/2017/04/03/untrained-modern-youths-and-ancient-masters-in-selfie-portraits/',
-            'md5': '873c81d308b979f0e23ee7e620b312a3',
-            'info_dict': {
-                'id': 'msN87y-iEx0',
-                'ext': 'mp4',
-                'title': 'Feynman: Mirrors FUN TO IMAGINE 6',
-                'upload_date': '20080526',
-                'description': 'md5:873c81d308b979f0e23ee7e620b312a3',
-                'age_limit': 0,
-                'tags': ['feynman', 'mirror', 'science', 'physics', 'imagination', 'fun', 'cool', 'puzzle'],
-                'channel_id': 'UCCeo--lls1vna5YJABWAcVA',
-                'playable_in_embed': True,
-                'thumbnail': 'https://i.ytimg.com/vi/msN87y-iEx0/hqdefault.jpg',
-                'like_count': int,
-                'comment_count': int,
-                'channel': 'Christopher Sykes',
-                'live_status': 'not_live',
-                'channel_url': 'https://www.youtube.com/channel/UCCeo--lls1vna5YJABWAcVA',
-                'availability': 'public',
-                'duration': 195,
-                'view_count': int,
-                'categories': ['Science & Technology'],
-                'channel_follower_count': int,
-                'uploader': 'Christopher Sykes',
-                'uploader_url': 'https://www.youtube.com/@ChristopherSykesDocumentaries',
-                'uploader_id': '@ChristopherSykesDocumentaries',
-                'heatmap': 'count:100',
-            },
-            'params': {
-                'skip_download': True,
-            }
-        },
-    ]
-
-    @classmethod
-    def suitable(cls, url):
-        from ..utils import parse_qs
-
-        qs = parse_qs(url)
-        if qs.get('list', [None])[0]:
-            return False
-        return super().suitable(url)
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self._code_cache = {}
-        self._player_cache = {}
-
-    def _prepare_live_from_start_formats(self, formats, video_id, live_start_time, url, webpage_url, smuggled_data, is_live):
-        lock = threading.Lock()
-        start_time = time.time()
-        formats = [f for f in formats if f.get('is_from_start')]
-
-        def refetch_manifest(format_id, delay):
-            nonlocal formats, start_time, is_live
-            if time.time() <= start_time + delay:
-                return
-
-            _, _, prs, player_url = self._download_player_responses(url, smuggled_data, video_id, webpage_url)
-            video_details = traverse_obj(prs, (..., 'videoDetails'), expected_type=dict)
-            microformats = traverse_obj(
-                prs, (..., 'microformat', 'playerMicroformatRenderer'),
-                expected_type=dict)
-            _, live_status, _, formats, _ = self._list_formats(video_id, microformats, video_details, prs, player_url)
-            is_live = live_status == 'is_live'
-            start_time = time.time()
-
-        def mpd_feed(format_id, delay):
-            """
-            @returns (manifest_url, manifest_stream_number, is_live) or None
-            """
-            for retry in self.RetryManager(fatal=False):
-                with lock:
-                    refetch_manifest(format_id, delay)
-
-                f = next((f for f in formats if f['format_id'] == format_id), None)
-                if not f:
-                    if not is_live:
-                        retry.error = f'{video_id}: Video is no longer live'
-                    else:
-                        retry.error = f'Cannot find refreshed manifest for format {format_id}{bug_reports_message()}'
-                    continue
-                return f['manifest_url'], f['manifest_stream_number'], is_live
-            return None
-
-        for f in formats:
-            f['is_live'] = is_live
-            gen = functools.partial(self._live_dash_fragments, video_id, f['format_id'],
-                                    live_start_time, mpd_feed, not is_live and f.copy())
-            if is_live:
-                f['fragments'] = gen
-                f['protocol'] = 'http_dash_segments_generator'
-            else:
-                f['fragments'] = LazyList(gen({}))
-                del f['is_from_start']
-
-    def _live_dash_fragments(self, video_id, format_id, live_start_time, mpd_feed, manifestless_orig_fmt, ctx):
-        FETCH_SPAN, MAX_DURATION = 5, 432000
-
-        mpd_url, stream_number, is_live = None, None, True
-
-        begin_index = 0
-        download_start_time = ctx.get('start') or time.time()
-
-        lack_early_segments = download_start_time - (live_start_time or download_start_time) > MAX_DURATION
-        if lack_early_segments:
-            self.report_warning(bug_reports_message(
-                'Starting download from the last 120 hours of the live stream since '
-                'YouTube does not have data before that. If you think this is wrong,'), only_once=True)
-            lack_early_segments = True
-
-        known_idx, no_fragment_score, last_segment_url = begin_index, 0, None
-        fragments, fragment_base_url = None, None
-
-        def _extract_sequence_from_mpd(refresh_sequence, immediate):
-            nonlocal mpd_url, stream_number, is_live, no_fragment_score, fragments, fragment_base_url
-            # Obtain from MPD's maximum seq value
-            old_mpd_url = mpd_url
-            last_error = ctx.pop('last_error', None)
-            expire_fast = immediate or last_error and isinstance(last_error, HTTPError) and last_error.status == 403
-            mpd_url, stream_number, is_live = (mpd_feed(format_id, 5 if expire_fast else 18000)
-                                               or (mpd_url, stream_number, False))
-            if not refresh_sequence:
-                if expire_fast and not is_live:
-                    return False, last_seq
-                elif old_mpd_url == mpd_url:
-                    return True, last_seq
-            if manifestless_orig_fmt:
-                fmt_info = manifestless_orig_fmt
-            else:
-                try:
-                    fmts, _ = self._extract_mpd_formats_and_subtitles(
-                        mpd_url, None, note=False, errnote=False, fatal=False)
-                except ExtractorError:
-                    fmts = None
-                if not fmts:
-                    no_fragment_score += 2
-                    return False, last_seq
-                fmt_info = next(x for x in fmts if x['manifest_stream_number'] == stream_number)
-            fragments = fmt_info['fragments']
-            fragment_base_url = fmt_info['fragment_base_url']
-            assert fragment_base_url
-
-            _last_seq = int(re.search(r'(?:/|^)sq/(\d+)', fragments[-1]['path']).group(1))
-            return True, _last_seq
-
-        self.write_debug(f'[{video_id}] Generating fragments for format {format_id}')
-        while is_live:
-            fetch_time = time.time()
-            if no_fragment_score > 30:
-                return
-            if last_segment_url:
-                # Obtain from "X-Head-Seqnum" header value from each segment
-                try:
-                    urlh = self._request_webpage(
-                        last_segment_url, None, note=False, errnote=False, fatal=False)
-                except ExtractorError:
-                    urlh = None
-                last_seq = try_get(urlh, lambda x: int_or_none(x.headers['X-Head-Seqnum']))
-                if last_seq is None:
-                    no_fragment_score += 2
-                    last_segment_url = None
-                    continue
-            else:
-                should_continue, last_seq = _extract_sequence_from_mpd(True, no_fragment_score > 15)
-                no_fragment_score += 2
-                if not should_continue:
-                    continue
-
-            if known_idx > last_seq:
-                last_segment_url = None
-                continue
-
-            last_seq += 1
-
-            if begin_index < 0 and known_idx < 0:
-                # skip from the start when it's negative value
-                known_idx = last_seq + begin_index
-            if lack_early_segments:
-                known_idx = max(known_idx, last_seq - int(MAX_DURATION // fragments[-1]['duration']))
-            try:
-                for idx in range(known_idx, last_seq):
-                    # do not update sequence here or you'll get skipped some part of it
-                    should_continue, _ = _extract_sequence_from_mpd(False, False)
-                    if not should_continue:
-                        known_idx = idx - 1
-                        raise ExtractorError('breaking out of outer loop')
-                    last_segment_url = urljoin(fragment_base_url, 'sq/%d' % idx)
-                    yield {
-                        'url': last_segment_url,
-                        'fragment_count': last_seq,
-                    }
-                if known_idx == last_seq:
-                    no_fragment_score += 5
-                else:
-                    no_fragment_score = 0
-                known_idx = last_seq
-            except ExtractorError:
-                continue
-
-            if manifestless_orig_fmt:
-                # Stop at the first iteration if running for post-live manifestless;
-                # fragment count no longer increase since it starts
-                break
-
-            time.sleep(max(0, FETCH_SPAN + fetch_time - time.time()))
-
-    def _extract_player_url(self, *ytcfgs, webpage=None):
-        player_url = traverse_obj(
-            ytcfgs, (..., 'PLAYER_JS_URL'), (..., 'WEB_PLAYER_CONTEXT_CONFIGS', ..., 'jsUrl'),
-            get_all=False, expected_type=str)
-        if not player_url:
-            return
-        return urljoin('https://www.youtube.com', player_url)
-
-    def _download_player_url(self, video_id, fatal=False):
-        res = self._download_webpage(
-            'https://www.youtube.com/iframe_api',
-            note='Downloading iframe API JS', video_id=video_id, fatal=fatal)
-        if res:
-            player_version = self._search_regex(
-                r'player\\?/([0-9a-fA-F]{8})\\?/', res, 'player version', fatal=fatal)
-            if player_version:
-                return f'https://www.youtube.com/s/player/{player_version}/player_ias.vflset/en_US/base.js'
-
-    def _signature_cache_id(self, example_sig):
-        """ Return a string representation of a signature """
-        return '.'.join(str(len(part)) for part in example_sig.split('.'))
-
-    @classmethod
-    def _extract_player_info(cls, player_url):
-        for player_re in cls._PLAYER_INFO_RE:
-            id_m = re.search(player_re, player_url)
-            if id_m:
-                break
-        else:
-            raise ExtractorError('Cannot identify player %r' % player_url)
-        return id_m.group('id')
-
-    def _load_player(self, video_id, player_url, fatal=True):
-        player_id = self._extract_player_info(player_url)
-        if player_id not in self._code_cache:
-            code = self._download_webpage(
-                player_url, video_id, fatal=fatal,
-                note='Downloading player ' + player_id,
-                errnote='Download of %s failed' % player_url)
-            if code:
-                self._code_cache[player_id] = code
-        return self._code_cache.get(player_id)
-
-    def _extract_signature_function(self, video_id, player_url, example_sig):
-        player_id = self._extract_player_info(player_url)
-
-        # Read from filesystem cache
-        func_id = f'js_{player_id}_{self._signature_cache_id(example_sig)}'
-        assert os.path.basename(func_id) == func_id
-
-        self.write_debug(f'Extracting signature function {func_id}')
-        cache_spec, code = self.cache.load('youtube-sigfuncs', func_id), None
-
-        if not cache_spec:
-            code = self._load_player(video_id, player_url)
-        if code:
-            res = self._parse_sig_js(code)
-            test_string = ''.join(map(chr, range(len(example_sig))))
-            cache_spec = [ord(c) for c in res(test_string)]
-            self.cache.store('youtube-sigfuncs', func_id, cache_spec)
-
-        return lambda s: ''.join(s[i] for i in cache_spec)
-
-    def _print_sig_code(self, func, example_sig):
-        if not self.get_param('youtube_print_sig_code'):
-            return
-
-        def gen_sig_code(idxs):
-            def _genslice(start, end, step):
-                starts = '' if start == 0 else str(start)
-                ends = (':%d' % (end + step)) if end + step >= 0 else ':'
-                steps = '' if step == 1 else (':%d' % step)
-                return f's[{starts}{ends}{steps}]'
-
-            step = None
-            # Quelch pyflakes warnings - start will be set when step is set
-            start = '(Never used)'
-            for i, prev in zip(idxs[1:], idxs[:-1]):
-                if step is not None:
-                    if i - prev == step:
-                        continue
-                    yield _genslice(start, prev, step)
-                    step = None
-                    continue
-                if i - prev in [-1, 1]:
-                    step = i - prev
-                    start = prev
-                    continue
-                else:
-                    yield 's[%d]' % prev
-            if step is None:
-                yield 's[%d]' % i
-            else:
-                yield _genslice(start, i, step)
-
-        test_string = ''.join(map(chr, range(len(example_sig))))
-        cache_res = func(test_string)
-        cache_spec = [ord(c) for c in cache_res]
-        expr_code = ' + '.join(gen_sig_code(cache_spec))
-        signature_id_tuple = '(%s)' % (
-            ', '.join(str(len(p)) for p in example_sig.split('.')))
-        code = ('if tuple(len(p) for p in s.split(\'.\')) == %s:\n'
-                '    return %s\n') % (signature_id_tuple, expr_code)
-        self.to_screen('Extracted signature function:\n' + code)
-
-    def _parse_sig_js(self, jscode):
-        funcname = self._search_regex(
-            (r'\b[cs]\s*&&\s*[adf]\.set\([^,]+\s*,\s*encodeURIComponent\s*\(\s*(?P<sig>[a-zA-Z0-9$]+)\(',
-             r'\b[a-zA-Z0-9]+\s*&&\s*[a-zA-Z0-9]+\.set\([^,]+\s*,\s*encodeURIComponent\s*\(\s*(?P<sig>[a-zA-Z0-9$]+)\(',
-             r'\bm=(?P<sig>[a-zA-Z0-9$]{2,})\(decodeURIComponent\(h\.s\)\)',
-             r'\bc&&\(c=(?P<sig>[a-zA-Z0-9$]{2,})\(decodeURIComponent\(c\)\)',
-             r'(?:\b|[^a-zA-Z0-9$])(?P<sig>[a-zA-Z0-9$]{2,})\s*=\s*function\(\s*a\s*\)\s*{\s*a\s*=\s*a\.split\(\s*""\s*\)(?:;[a-zA-Z0-9$]{2}\.[a-zA-Z0-9$]{2}\(a,\d+\))?',
-             r'(?P<sig>[a-zA-Z0-9$]+)\s*=\s*function\(\s*a\s*\)\s*{\s*a\s*=\s*a\.split\(\s*""\s*\)',
-             # Obsolete patterns
-             r'("|\')signature\1\s*,\s*(?P<sig>[a-zA-Z0-9$]+)\(',
-             r'\.sig\|\|(?P<sig>[a-zA-Z0-9$]+)\(',
-             r'yt\.akamaized\.net/\)\s*\|\|\s*.*?\s*[cs]\s*&&\s*[adf]\.set\([^,]+\s*,\s*(?:encodeURIComponent\s*\()?\s*(?P<sig>[a-zA-Z0-9$]+)\(',
-             r'\b[cs]\s*&&\s*[adf]\.set\([^,]+\s*,\s*(?P<sig>[a-zA-Z0-9$]+)\(',
-             r'\b[a-zA-Z0-9]+\s*&&\s*[a-zA-Z0-9]+\.set\([^,]+\s*,\s*(?P<sig>[a-zA-Z0-9$]+)\(',
-             r'\bc\s*&&\s*[a-zA-Z0-9]+\.set\([^,]+\s*,\s*\([^)]*\)\s*\(\s*(?P<sig>[a-zA-Z0-9$]+)\('),
-            jscode, 'Initial JS player signature function name', group='sig')
-
-        jsi = JSInterpreter(jscode)
-        initial_function = jsi.extract_function(funcname)
-        return lambda s: initial_function([s])
-
-    def _cached(self, func, *cache_id):
-        def inner(*args, **kwargs):
-            if cache_id not in self._player_cache:
-                try:
-                    self._player_cache[cache_id] = func(*args, **kwargs)
-                except ExtractorError as e:
-                    self._player_cache[cache_id] = e
-                except Exception as e:
-                    self._player_cache[cache_id] = ExtractorError(traceback.format_exc(), cause=e)
-
-            ret = self._player_cache[cache_id]
-            if isinstance(ret, Exception):
-                raise ret
-            return ret
-        return inner
-
-    def _decrypt_signature(self, s, video_id, player_url):
-        """Turn the encrypted s field into a working signature"""
-        extract_sig = self._cached(
-            self._extract_signature_function, 'sig', player_url, self._signature_cache_id(s))
-        func = extract_sig(video_id, player_url, s)
-        self._print_sig_code(func, s)
-        return func(s)
-
-    def _decrypt_nsig(self, s, video_id, player_url):
-        """Turn the encrypted n field into a working signature"""
-        if player_url is None:
-            raise ExtractorError('Cannot decrypt nsig without player_url')
-        player_url = urljoin('https://www.youtube.com', player_url)
-
-        try:
-            jsi, player_id, func_code = self._extract_n_function_code(video_id, player_url)
-        except ExtractorError as e:
-            raise ExtractorError('Unable to extract nsig function code', cause=e)
-        if self.get_param('youtube_print_sig_code'):
-            self.to_screen(f'Extracted nsig function from {player_id}:\n{func_code[1]}\n')
-
-        try:
-            extract_nsig = self._cached(self._extract_n_function_from_code, 'nsig func', player_url)
-            ret = extract_nsig(jsi, func_code)(s)
-        except JSInterpreter.Exception as e:
-            try:
-                jsi = PhantomJSwrapper(self, timeout=5000)
-            except ExtractorError:
-                raise e
-            self.report_warning(
-                f'Native nsig extraction failed: Trying with PhantomJS\n'
-                f'         n = {s} ; player = {player_url}', video_id)
-            self.write_debug(e, only_once=True)
-
-            args, func_body = func_code
-            ret = jsi.execute(
-                f'console.log(function({", ".join(args)}) {{ {func_body} }}({s!r}));',
-                video_id=video_id, note='Executing signature code').strip()
-
-        self.write_debug(f'Decrypted nsig {s} => {ret}')
-        return ret
-
-    def _extract_n_function_name(self, jscode):
-        funcname, idx = self._search_regex(
-            r'\.get\("n"\)\)&&\(b=(?P<nfunc>[a-zA-Z0-9$]+)(?:\[(?P<idx>\d+)\])?\([a-zA-Z0-9]\)',
-            jscode, 'Initial JS player n function name', group=('nfunc', 'idx'))
-        if not idx:
-            return funcname
-
-        return json.loads(js_to_json(self._search_regex(
-            rf'var {re.escape(funcname)}\s*=\s*(\[.+?\])\s*[,;]', jscode,
-            f'Initial JS player n function list ({funcname}.{idx})')))[int(idx)]
-
-    def _extract_n_function_code(self, video_id, player_url):
-        player_id = self._extract_player_info(player_url)
-        func_code = self.cache.load('youtube-nsig', player_id, min_ver='2022.09.1')
-        jscode = func_code or self._load_player(video_id, player_url)
-        jsi = JSInterpreter(jscode)
-
-        if func_code:
-            return jsi, player_id, func_code
-
-        func_name = self._extract_n_function_name(jscode)
-
-        # For redundancy
-        func_code = self._search_regex(
-            r'''(?xs)%s\s*=\s*function\s*\((?P<var>[\w$]+)\)\s*
-                     # NB: The end of the regex is intentionally kept strict
-                     {(?P<code>.+?}\s*return\ [\w$]+.join\(""\))};''' % func_name,
-            jscode, 'nsig function', group=('var', 'code'), default=None)
-        if func_code:
-            func_code = ([func_code[0]], func_code[1])
-        else:
-            self.write_debug('Extracting nsig function with jsinterp')
-            func_code = jsi.extract_function_code(func_name)
-
-        self.cache.store('youtube-nsig', player_id, func_code)
-        return jsi, player_id, func_code
-
-    def _extract_n_function_from_code(self, jsi, func_code):
-        func = jsi.extract_function_from_code(*func_code)
-
-        def extract_nsig(s):
-            try:
-                ret = func([s])
-            except JSInterpreter.Exception:
-                raise
-            except Exception as e:
-                raise JSInterpreter.Exception(traceback.format_exc(), cause=e)
-
-            if ret.startswith('enhanced_except_'):
-                raise JSInterpreter.Exception('Signature function returned an exception')
-            return ret
-
-        return extract_nsig
-
-    def _extract_signature_timestamp(self, video_id, player_url, ytcfg=None, fatal=False):
-        """
-        Extract signatureTimestamp (sts)
-        Required to tell API what sig/player version is in use.
-        """
-        sts = None
-        if isinstance(ytcfg, dict):
-            sts = int_or_none(ytcfg.get('STS'))
-
-        if not sts:
-            # Attempt to extract from player
-            if player_url is None:
-                error_msg = 'Cannot extract signature timestamp without player_url.'
-                if fatal:
-                    raise ExtractorError(error_msg)
-                self.report_warning(error_msg)
-                return
-            code = self._load_player(video_id, player_url, fatal=fatal)
-            if code:
-                sts = int_or_none(self._search_regex(
-                    r'(?:signatureTimestamp|sts)\s*:\s*(?P<sts>[0-9]{5})', code,
-                    'JS player signature timestamp', group='sts', fatal=fatal))
-        return sts
-
-    def _mark_watched(self, video_id, player_responses):
-        for is_full, key in enumerate(('videostatsPlaybackUrl', 'videostatsWatchtimeUrl')):
-            label = 'fully ' if is_full else ''
-            url = get_first(player_responses, ('playbackTracking', key, 'baseUrl'),
-                            expected_type=url_or_none)
-            if not url:
-                self.report_warning(f'Unable to mark {label}watched')
-                return
-            parsed_url = urllib.parse.urlparse(url)
-            qs = urllib.parse.parse_qs(parsed_url.query)
-
-            # cpn generation algorithm is reverse engineered from base.js.
-            # In fact it works even with dummy cpn.
-            CPN_ALPHABET = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_'
-            cpn = ''.join(CPN_ALPHABET[random.randint(0, 256) & 63] for _ in range(0, 16))
-
-            # # more consistent results setting it to right before the end
-            video_length = [str(float((qs.get('len') or ['1.5'])[0]) - 1)]
-
-            qs.update({
-                'ver': ['2'],
-                'cpn': [cpn],
-                'cmt': video_length,
-                'el': 'detailpage',  # otherwise defaults to "shorts"
-            })
-
-            if is_full:
-                # these seem to mark watchtime "history" in the real world
-                # they're required, so send in a single value
-                qs.update({
-                    'st': 0,
-                    'et': video_length,
-                })
-
-            url = urllib.parse.urlunparse(
-                parsed_url._replace(query=urllib.parse.urlencode(qs, True)))
-
-            self._download_webpage(
-                url, video_id, f'Marking {label}watched',
-                'Unable to mark watched', fatal=False)
-
-    @classmethod
-    def _extract_from_webpage(cls, url, webpage):
-        # Invidious Instances
-        # https://github.com/yt-dlp/yt-dlp/issues/195
-        # https://github.com/iv-org/invidious/pull/1730
-        mobj = re.search(
-            r'<link rel="alternate" href="(?P<url>https://www\.youtube\.com/watch\?v=[0-9A-Za-z_-]{11})"',
-            webpage)
-        if mobj:
-            yield cls.url_result(mobj.group('url'), cls)
-            raise cls.StopExtraction()
-
-        yield from super()._extract_from_webpage(url, webpage)
-
-        # lazyYT YouTube embed
-        for id_ in re.findall(r'class="lazyYT" data-youtube-id="([^"]+)"', webpage):
-            yield cls.url_result(unescapeHTML(id_), cls, id_)
-
-        # Wordpress "YouTube Video Importer" plugin
-        for m in re.findall(r'''(?x)<div[^>]+
-                class=(?P<q1>[\'"])[^\'"]*\byvii_single_video_player\b[^\'"]*(?P=q1)[^>]+
-                data-video_id=(?P<q2>[\'"])([^\'"]+)(?P=q2)''', webpage):
-            yield cls.url_result(m[-1], cls, m[-1])
-
-    @classmethod
-    def extract_id(cls, url):
-        video_id = cls.get_temp_id(url)
-        if not video_id:
-            raise ExtractorError(f'Invalid URL: {url}')
-        return video_id
-
-    def _extract_chapters_from_json(self, data, duration):
-        chapter_list = traverse_obj(
-            data, (
-                'playerOverlays', 'playerOverlayRenderer', 'decoratedPlayerBarRenderer',
-                'decoratedPlayerBarRenderer', 'playerBar', 'chapteredPlayerBarRenderer', 'chapters'
-            ), expected_type=list)
-
-        return self._extract_chapters_helper(
-            chapter_list,
-            start_function=lambda chapter: float_or_none(
-                traverse_obj(chapter, ('chapterRenderer', 'timeRangeStartMillis')), scale=1000),
-            title_function=lambda chapter: traverse_obj(
-                chapter, ('chapterRenderer', 'title', 'simpleText'), expected_type=str),
-            duration=duration)
-
-    def _extract_chapters_from_engagement_panel(self, data, duration):
-        content_list = traverse_obj(
-            data,
-            ('engagementPanels', ..., 'engagementPanelSectionListRenderer', 'content', 'macroMarkersListRenderer', 'contents'),
-            expected_type=list)
-        chapter_time = lambda chapter: parse_duration(self._get_text(chapter, 'timeDescription'))
-        chapter_title = lambda chapter: self._get_text(chapter, 'title')
-
-        return next(filter(None, (
-            self._extract_chapters_helper(traverse_obj(contents, (..., 'macroMarkersListItemRenderer')),
-                                          chapter_time, chapter_title, duration)
-            for contents in content_list)), [])
-
-    def _extract_heatmap_from_player_overlay(self, data):
-        content_list = traverse_obj(data, (
-            'playerOverlays', 'playerOverlayRenderer', 'decoratedPlayerBarRenderer', 'decoratedPlayerBarRenderer', 'playerBar',
-            'multiMarkersPlayerBarRenderer', 'markersMap', ..., 'value', 'heatmap', 'heatmapRenderer', 'heatMarkers', {list}))
-        return next(filter(None, (
-            traverse_obj(contents, (..., 'heatMarkerRenderer', {
-                'start_time': ('timeRangeStartMillis', {functools.partial(float_or_none, scale=1000)}),
-                'end_time': {lambda x: (x['timeRangeStartMillis'] + x['markerDurationMillis']) / 1000},
-                'value': ('heatMarkerIntensityScoreNormalized', {float_or_none}),
-            })) for contents in content_list)), None)
-
-    def _extract_comment(self, comment_renderer, parent=None):
-        comment_id = comment_renderer.get('commentId')
-        if not comment_id:
-            return
-
-        info = {
-            'id': comment_id,
-            'text': self._get_text(comment_renderer, 'contentText'),
-            'like_count': self._get_count(comment_renderer, 'voteCount'),
-            'author_id': traverse_obj(comment_renderer, ('authorEndpoint', 'browseEndpoint', 'browseId', {self.ucid_or_none})),
-            'author': self._get_text(comment_renderer, 'authorText'),
-            'author_thumbnail': traverse_obj(comment_renderer, ('authorThumbnail', 'thumbnails', -1, 'url', {url_or_none})),
-            'parent': parent or 'root',
-        }
-
-        # Timestamp is an estimate calculated from the current time and time_text
-        time_text = self._get_text(comment_renderer, 'publishedTimeText') or ''
-        timestamp = self._parse_time_text(time_text)
-
-        info.update({
-            # FIXME: non-standard, but we need a way of showing that it is an estimate.
-            '_time_text': time_text,
-            'timestamp': timestamp,
-        })
-
-        info['author_url'] = urljoin(
-            'https://www.youtube.com', traverse_obj(comment_renderer, ('authorEndpoint', (
-                ('browseEndpoint', 'canonicalBaseUrl'), ('commandMetadata', 'webCommandMetadata', 'url'))),
-                expected_type=str, get_all=False))
-
-        author_is_uploader = traverse_obj(comment_renderer, 'authorIsChannelOwner')
-        if author_is_uploader is not None:
-            info['author_is_uploader'] = author_is_uploader
-
-        comment_abr = traverse_obj(
-            comment_renderer, ('actionButtons', 'commentActionButtonsRenderer'), expected_type=dict)
-        if comment_abr is not None:
-            info['is_favorited'] = 'creatorHeart' in comment_abr
-
-        badges = self._extract_badges([traverse_obj(comment_renderer, 'authorCommentBadge')])
-        if self._has_badge(badges, BadgeType.VERIFIED):
-            info['author_is_verified'] = True
-
-        is_pinned = traverse_obj(comment_renderer, 'pinnedCommentBadge')
-        if is_pinned:
-            info['is_pinned'] = True
-
-        return info
-
-    def _comment_entries(self, root_continuation_data, ytcfg, video_id, parent=None, tracker=None):
-
-        get_single_config_arg = lambda c: self._configuration_arg(c, [''])[0]
-
-        def extract_header(contents):
-            _continuation = None
-            for content in contents:
-                comments_header_renderer = traverse_obj(content, 'commentsHeaderRenderer')
-                expected_comment_count = self._get_count(
-                    comments_header_renderer, 'countText', 'commentsCount')
-
-                if expected_comment_count is not None:
-                    tracker['est_total'] = expected_comment_count
-                    self.to_screen(f'Downloading ~{expected_comment_count} comments')
-                comment_sort_index = int(get_single_config_arg('comment_sort') != 'top')  # 1 = new, 0 = top
-
-                sort_menu_item = try_get(
-                    comments_header_renderer,
-                    lambda x: x['sortMenu']['sortFilterSubMenuRenderer']['subMenuItems'][comment_sort_index], dict) or {}
-                sort_continuation_ep = sort_menu_item.get('serviceEndpoint') or {}
-
-                _continuation = self._extract_continuation_ep_data(sort_continuation_ep) or self._extract_continuation(sort_menu_item)
-                if not _continuation:
-                    continue
-
-                sort_text = str_or_none(sort_menu_item.get('title'))
-                if not sort_text:
-                    sort_text = 'top comments' if comment_sort_index == 0 else 'newest first'
-                self.to_screen('Sorting comments by %s' % sort_text.lower())
-                break
-            return _continuation
-
-        def extract_thread(contents):
-            if not parent:
-                tracker['current_page_thread'] = 0
-            for content in contents:
-                if not parent and tracker['total_parent_comments'] >= max_parents:
-                    yield
-                comment_thread_renderer = try_get(content, lambda x: x['commentThreadRenderer'])
-                comment_renderer = get_first(
-                    (comment_thread_renderer, content), [['commentRenderer', ('comment', 'commentRenderer')]],
-                    expected_type=dict, default={})
-
-                comment = self._extract_comment(comment_renderer, parent)
-                if not comment:
-                    continue
-                comment_id = comment['id']
-                if comment.get('is_pinned'):
-                    tracker['pinned_comment_ids'].add(comment_id)
-                # Sometimes YouTube may break and give us infinite looping comments.
-                # See: https://github.com/yt-dlp/yt-dlp/issues/6290
-                if comment_id in tracker['seen_comment_ids']:
-                    if comment_id in tracker['pinned_comment_ids'] and not comment.get('is_pinned'):
-                        # Pinned comments may appear a second time in newest first sort
-                        # See: https://github.com/yt-dlp/yt-dlp/issues/6712
-                        continue
-                    self.report_warning(
-                        'Detected YouTube comments looping. Stopping comment extraction '
-                        f'{"for this thread" if parent else ""} as we probably cannot get any more.')
-                    yield
-                else:
-                    tracker['seen_comment_ids'].add(comment['id'])
-
-                tracker['running_total'] += 1
-                tracker['total_reply_comments' if parent else 'total_parent_comments'] += 1
-                yield comment
-
-                # Attempt to get the replies
-                comment_replies_renderer = try_get(
-                    comment_thread_renderer, lambda x: x['replies']['commentRepliesRenderer'], dict)
-
-                if comment_replies_renderer:
-                    tracker['current_page_thread'] += 1
-                    comment_entries_iter = self._comment_entries(
-                        comment_replies_renderer, ytcfg, video_id,
-                        parent=comment.get('id'), tracker=tracker)
-                    yield from itertools.islice(comment_entries_iter, min(
-                        max_replies_per_thread, max(0, max_replies - tracker['total_reply_comments'])))
-
-        # Keeps track of counts across recursive calls
-        if not tracker:
-            tracker = dict(
-                running_total=0,
-                est_total=None,
-                current_page_thread=0,
-                total_parent_comments=0,
-                total_reply_comments=0,
-                seen_comment_ids=set(),
-                pinned_comment_ids=set()
-            )
-
-        # TODO: Deprecated
-        # YouTube comments have a max depth of 2
-        max_depth = int_or_none(get_single_config_arg('max_comment_depth'))
-        if max_depth:
-            self._downloader.deprecated_feature('[youtube] max_comment_depth extractor argument is deprecated. '
-                                                'Set max replies in the max-comments extractor argument instead')
-        if max_depth == 1 and parent:
-            return
-
-        max_comments, max_parents, max_replies, max_replies_per_thread, *_ = map(
-            lambda p: int_or_none(p, default=sys.maxsize), self._configuration_arg('max_comments', ) + [''] * 4)
-
-        continuation = self._extract_continuation(root_continuation_data)
-
-        response = None
-        is_forced_continuation = False
-        is_first_continuation = parent is None
-        if is_first_continuation and not continuation:
-            # Sometimes you can get comments by generating the continuation yourself,
-            # even if YouTube initially reports them being disabled - e.g. stories comments.
-            # Note: if the comment section is actually disabled, YouTube may return a response with
-            # required check_get_keys missing. So we will disable that check initially in this case.
-            continuation = self._build_api_continuation_query(self._generate_comment_continuation(video_id))
-            is_forced_continuation = True
-
-        continuation_items_path = (
-            'onResponseReceivedEndpoints', ..., ('reloadContinuationItemsCommand', 'appendContinuationItemsAction'), 'continuationItems')
-        for page_num in itertools.count(0):
-            if not continuation:
-                break
-            headers = self.generate_api_headers(ytcfg=ytcfg, visitor_data=self._extract_visitor_data(response))
-            comment_prog_str = f"({tracker['running_total']}/~{tracker['est_total']})"
-            if page_num == 0:
-                if is_first_continuation:
-                    note_prefix = 'Downloading comment section API JSON'
-                else:
-                    note_prefix = '    Downloading comment API JSON reply thread %d %s' % (
-                        tracker['current_page_thread'], comment_prog_str)
-            else:
-                note_prefix = '%sDownloading comment%s API JSON page %d %s' % (
-                    '       ' if parent else '', ' replies' if parent else '',
-                    page_num, comment_prog_str)
-
-            # Do a deep check for incomplete data as sometimes YouTube may return no comments for a continuation
-            # Ignore check if YouTube says the comment count is 0.
-            check_get_keys = None
-            if not is_forced_continuation and not (tracker['est_total'] == 0 and tracker['running_total'] == 0):
-                check_get_keys = [[*continuation_items_path, ..., (
-                    'commentsHeaderRenderer' if is_first_continuation else ('commentThreadRenderer', 'commentRenderer'))]]
-            try:
-                response = self._extract_response(
-                    item_id=None, query=continuation,
-                    ep='next', ytcfg=ytcfg, headers=headers, note=note_prefix,
-                    check_get_keys=check_get_keys)
-            except ExtractorError as e:
-                # Ignore incomplete data error for replies if retries didn't work.
-                # This is to allow any other parent comments and comment threads to be downloaded.
-                # See: https://github.com/yt-dlp/yt-dlp/issues/4669
-                if 'incomplete data' in str(e).lower() and parent:
-                    if self.get_param('ignoreerrors') in (True, 'only_download'):
-                        self.report_warning(
-                            'Received incomplete data for a comment reply thread and retrying did not help. '
-                            'Ignoring to let other comments be downloaded. Pass --no-ignore-errors to not ignore.')
-                        return
-                    else:
-                        raise ExtractorError(
-                            'Incomplete data received for comment reply thread. '
-                            'Pass --ignore-errors to ignore and allow rest of comments to download.',
-                            expected=True)
-                raise
-            is_forced_continuation = False
-            continuation = None
-            for continuation_items in traverse_obj(response, continuation_items_path, expected_type=list, default=[]):
-                if is_first_continuation:
-                    continuation = extract_header(continuation_items)
-                    is_first_continuation = False
-                    if continuation:
-                        break
-                    continue
-
-                for entry in extract_thread(continuation_items):
-                    if not entry:
-                        return
-                    yield entry
-                continuation = self._extract_continuation({'contents': continuation_items})
-                if continuation:
-                    break
-
-        message = self._get_text(root_continuation_data, ('contents', ..., 'messageRenderer', 'text'), max_runs=1)
-        if message and not parent and tracker['running_total'] == 0:
-            self.report_warning(f'Youtube said: {message}', video_id=video_id, only_once=True)
-            raise self.CommentsDisabled
-
-    @staticmethod
-    def _generate_comment_continuation(video_id):
-        """
-        Generates initial comment section continuation token from given video id
-        """
-        token = f'\x12\r\x12\x0b{video_id}\x18\x062\'"\x11"\x0b{video_id}0\x00x\x020\x00B\x10comments-section'
-        return base64.b64encode(token.encode()).decode()
-
-    def _get_comments(self, ytcfg, video_id, contents, webpage):
-        """Entry for comment extraction"""
-        def _real_comment_extract(contents):
-            renderer = next((
-                item for item in traverse_obj(contents, (..., 'itemSectionRenderer'), default={})
-                if item.get('sectionIdentifier') == 'comment-item-section'), None)
-            yield from self._comment_entries(renderer, ytcfg, video_id)
-
-        max_comments = int_or_none(self._configuration_arg('max_comments', [''])[0])
-        return itertools.islice(_real_comment_extract(contents), 0, max_comments)
-
-    @staticmethod
-    def _get_checkok_params():
-        return {'contentCheckOk': True, 'racyCheckOk': True}
-
-    @classmethod
-    def _generate_player_context(cls, sts=None):
-        context = {
-            'html5Preference': 'HTML5_PREF_WANTS',
-        }
-        if sts is not None:
-            context['signatureTimestamp'] = sts
-        return {
-            'playbackContext': {
-                'contentPlaybackContext': context
-            },
-            **cls._get_checkok_params()
-        }
-
-    @staticmethod
-    def _is_agegated(player_response):
-        if traverse_obj(player_response, ('playabilityStatus', 'desktopLegacyAgeGateReason')):
-            return True
-
-        reasons = traverse_obj(player_response, ('playabilityStatus', ('status', 'reason')))
-        AGE_GATE_REASONS = (
-            'confirm your age', 'age-restricted', 'inappropriate',  # reason
-            'age_verification_required', 'age_check_required',  # status
-        )
-        return any(expected in reason for expected in AGE_GATE_REASONS for reason in reasons)
-
-    @staticmethod
-    def _is_unplayable(player_response):
-        return traverse_obj(player_response, ('playabilityStatus', 'status')) == 'UNPLAYABLE'
-
-    def _extract_player_response(self, client, video_id, master_ytcfg, player_ytcfg, player_url, initial_pr, smuggled_data):
-
-        session_index = self._extract_session_index(player_ytcfg, master_ytcfg)
-        syncid = self._extract_account_syncid(player_ytcfg, master_ytcfg, initial_pr)
-        sts = self._extract_signature_timestamp(video_id, player_url, master_ytcfg, fatal=False) if player_url else None
-        headers = self.generate_api_headers(
-            ytcfg=player_ytcfg, account_syncid=syncid, session_index=session_index, default_client=client)
-
-        yt_query = {
-            'videoId': video_id,
-        }
-        if _split_innertube_client(client)[0] == 'android':
-            yt_query['params'] = 'CgIQBg=='
-
-        pp_arg = self._configuration_arg('player_params', [None], casesense=True)[0]
-        if pp_arg:
-            yt_query['params'] = pp_arg
-
-        yt_query.update(self._generate_player_context(sts))
-        return self._extract_response(
-            item_id=video_id, ep='player', query=yt_query,
-            ytcfg=player_ytcfg, headers=headers, fatal=True,
-            default_client=client,
-            note='Downloading %s player API JSON' % client.replace('_', ' ').strip()
-        ) or None
-
-    def _get_requested_clients(self, url, smuggled_data):
-        requested_clients = []
-        default = ['ios', 'android', 'web']
-        allowed_clients = sorted(
-            (client for client in INNERTUBE_CLIENTS.keys() if client[:1] != '_'),
-            key=lambda client: INNERTUBE_CLIENTS[client]['priority'], reverse=True)
-        for client in self._configuration_arg('player_client'):
-            if client in allowed_clients:
-                requested_clients.append(client)
-            elif client == 'default':
-                requested_clients.extend(default)
-            elif client == 'all':
-                requested_clients.extend(allowed_clients)
-            else:
-                self.report_warning(f'Skipping unsupported client {client}')
-        if not requested_clients:
-            requested_clients = default
-
-        if smuggled_data.get('is_music_url') or self.is_music_url(url):
-            requested_clients.extend(
-                f'{client}_music' for client in requested_clients if f'{client}_music' in INNERTUBE_CLIENTS)
-
-        return orderedSet(requested_clients)
-
-    def _extract_player_responses(self, clients, video_id, webpage, master_ytcfg, smuggled_data):
-        initial_pr = None
-        if webpage:
-            initial_pr = self._search_json(
-                self._YT_INITIAL_PLAYER_RESPONSE_RE, webpage, 'initial player response', video_id, fatal=False)
-
-        all_clients = set(clients)
-        clients = clients[::-1]
-        prs = []
-
-        def append_client(*client_names):
-            """ Append the first client name that exists but not already used """
-            for client_name in client_names:
-                actual_client = _split_innertube_client(client_name)[0]
-                if actual_client in INNERTUBE_CLIENTS:
-                    if actual_client not in all_clients:
-                        clients.append(client_name)
-                        all_clients.add(actual_client)
-                        return
-
-        # Android player_response does not have microFormats which are needed for
-        # extraction of some data. So we return the initial_pr with formats
-        # stripped out even if not requested by the user
-        # See: https://github.com/yt-dlp/yt-dlp/issues/501
-        if initial_pr:
-            pr = dict(initial_pr)
-            pr['streamingData'] = None
-            prs.append(pr)
-
-        last_error = None
-        tried_iframe_fallback = False
-        player_url = None
-        while clients:
-            client, base_client, variant = _split_innertube_client(clients.pop())
-            player_ytcfg = master_ytcfg if client == 'web' else {}
-            if 'configs' not in self._configuration_arg('player_skip') and client != 'web':
-                player_ytcfg = self._download_ytcfg(client, video_id) or player_ytcfg
-
-            player_url = player_url or self._extract_player_url(master_ytcfg, player_ytcfg, webpage=webpage)
-            require_js_player = self._get_default_ytcfg(client).get('REQUIRE_JS_PLAYER')
-            if 'js' in self._configuration_arg('player_skip'):
-                require_js_player = False
-                player_url = None
-
-            if not player_url and not tried_iframe_fallback and require_js_player:
-                player_url = self._download_player_url(video_id)
-                tried_iframe_fallback = True
-
-            try:
-                pr = initial_pr if client == 'web' and initial_pr else self._extract_player_response(
-                    client, video_id, player_ytcfg or master_ytcfg, player_ytcfg, player_url if require_js_player else None, initial_pr, smuggled_data)
-            except ExtractorError as e:
-                if last_error:
-                    self.report_warning(last_error)
-                last_error = e
-                continue
-
-            if pr:
-                # YouTube may return a different video player response than expected.
-                # See: https://github.com/TeamNewPipe/NewPipe/issues/8713
-                pr_video_id = traverse_obj(pr, ('videoDetails', 'videoId'))
-                if pr_video_id and pr_video_id != video_id:
-                    self.report_warning(
-                        f'Skipping player response from {client} client (got player response for video "{pr_video_id}" instead of "{video_id}")' + bug_reports_message())
-                else:
-                    # Save client name for introspection later
-                    name = short_client_name(client)
-                    sd = traverse_obj(pr, ('streamingData', {dict})) or {}
-                    sd[STREAMING_DATA_CLIENT_NAME] = name
-                    for f in traverse_obj(sd, (('formats', 'adaptiveFormats'), ..., {dict})):
-                        f[STREAMING_DATA_CLIENT_NAME] = name
-                    prs.append(pr)
-
-            # creator clients can bypass AGE_VERIFICATION_REQUIRED if logged in
-            if variant == 'embedded' and self._is_unplayable(pr) and self.is_authenticated:
-                append_client(f'{base_client}_creator')
-            elif self._is_agegated(pr):
-                if variant == 'tv_embedded':
-                    append_client(f'{base_client}_embedded')
-                elif not variant:
-                    append_client(f'tv_embedded.{base_client}', f'{base_client}_embedded')
-
-        if last_error:
-            if not len(prs):
-                raise last_error
-            self.report_warning(last_error)
-        return prs, player_url
-
-    def _needs_live_processing(self, live_status, duration):
-        if (live_status == 'is_live' and self.get_param('live_from_start')
-                or live_status == 'post_live' and (duration or 0) > 2 * 3600):
-            return live_status
-
-    def _extract_formats_and_subtitles(self, streaming_data, video_id, player_url, live_status, duration):
-        CHUNK_SIZE = 10 << 20
-        itags, stream_ids = collections.defaultdict(set), []
-        itag_qualities, res_qualities = {}, {0: None}
-        q = qualities([
-            # Normally tiny is the smallest video-only formats. But
-            # audio-only formats with unknown quality may get tagged as tiny
-            'tiny',
-            'audio_quality_ultralow', 'audio_quality_low', 'audio_quality_medium', 'audio_quality_high',  # Audio only formats
-            'small', 'medium', 'large', 'hd720', 'hd1080', 'hd1440', 'hd2160', 'hd2880', 'highres'
-        ])
-        streaming_formats = traverse_obj(streaming_data, (..., ('formats', 'adaptiveFormats'), ...))
-        format_types = self._configuration_arg('formats')
-        all_formats = 'duplicate' in format_types
-        if self._configuration_arg('include_duplicate_formats'):
-            all_formats = True
-            self._downloader.deprecated_feature('[youtube] include_duplicate_formats extractor argument is deprecated. '
-                                                'Use formats=duplicate extractor argument instead')
-
-        def build_fragments(f):
-            return LazyList({
-                'url': update_url_query(f['url'], {
-                    'range': f'{range_start}-{min(range_start + CHUNK_SIZE - 1, f["filesize"])}'
-                })
-            } for range_start in range(0, f['filesize'], CHUNK_SIZE))
-
-        for fmt in streaming_formats:
-            if fmt.get('targetDurationSec'):
-                continue
-
-            itag = str_or_none(fmt.get('itag'))
-            audio_track = fmt.get('audioTrack') or {}
-            stream_id = (itag, audio_track.get('id'), fmt.get('isDrc'))
-            if not all_formats:
-                if stream_id in stream_ids:
-                    continue
-
-            quality = fmt.get('quality')
-            height = int_or_none(fmt.get('height'))
-            if quality == 'tiny' or not quality:
-                quality = fmt.get('audioQuality', '').lower() or quality
-            # The 3gp format (17) in android client has a quality of "small",
-            # but is actually worse than other formats
-            if itag == '17':
-                quality = 'tiny'
-            if quality:
-                if itag:
-                    itag_qualities[itag] = quality
-                if height:
-                    res_qualities[height] = quality
-            # FORMAT_STREAM_TYPE_OTF(otf=1) requires downloading the init fragment
-            # (adding `&sq=0` to the URL) and parsing emsg box to determine the
-            # number of fragment that would subsequently requested with (`&sq=N`)
-            if fmt.get('type') == 'FORMAT_STREAM_TYPE_OTF':
-                continue
-
-            fmt_url = fmt.get('url')
-            if not fmt_url:
-                sc = urllib.parse.parse_qs(fmt.get('signatureCipher'))
-                fmt_url = url_or_none(try_get(sc, lambda x: x['url'][0]))
-                encrypted_sig = try_get(sc, lambda x: x['s'][0])
-                if not all((sc, fmt_url, player_url, encrypted_sig)):
-                    continue
-                try:
-                    fmt_url += '&%s=%s' % (
-                        traverse_obj(sc, ('sp', -1)) or 'signature',
-                        self._decrypt_signature(encrypted_sig, video_id, player_url)
-                    )
-                except ExtractorError as e:
-                    self.report_warning('Signature extraction failed: Some formats may be missing',
-                                        video_id=video_id, only_once=True)
-                    self.write_debug(e, only_once=True)
-                    continue
-
-            query = parse_qs(fmt_url)
-            throttled = False
-            if query.get('n'):
-                try:
-                    decrypt_nsig = self._cached(self._decrypt_nsig, 'nsig', query['n'][0])
-                    fmt_url = update_url_query(fmt_url, {
-                        'n': decrypt_nsig(query['n'][0], video_id, player_url)
-                    })
-                except ExtractorError as e:
-                    phantomjs_hint = ''
-                    if isinstance(e, JSInterpreter.Exception):
-                        phantomjs_hint = (f'         Install {self._downloader._format_err("PhantomJS", self._downloader.Styles.EMPHASIS)} '
-                                          f'to workaround the issue. {PhantomJSwrapper.INSTALL_HINT}\n')
-                    if player_url:
-                        self.report_warning(
-                            f'nsig extraction failed: You may experience throttling for some formats\n{phantomjs_hint}'
-                            f'         n = {query["n"][0]} ; player = {player_url}', video_id=video_id, only_once=True)
-                        self.write_debug(e, only_once=True)
-                    else:
-                        self.report_warning(
-                            'Cannot decrypt nsig without player_url: You may experience throttling for some formats',
-                            video_id=video_id, only_once=True)
-                    throttled = True
-
-            tbr = float_or_none(fmt.get('averageBitrate') or fmt.get('bitrate'), 1000)
-            language_preference = (
-                10 if audio_track.get('audioIsDefault') and 10
-                else -10 if 'descriptive' in (audio_track.get('displayName') or '').lower() and -10
-                else -1)
-            # Some formats may have much smaller duration than others (possibly damaged during encoding)
-            # E.g. 2-nOtRESiUc Ref: https://github.com/yt-dlp/yt-dlp/issues/2823
-            # Make sure to avoid false positives with small duration differences.
-            # E.g. __2ABJjxzNo, ySuUZEjARPY
-            is_damaged = try_get(fmt, lambda x: float(x['approxDurationMs']) / duration < 500)
-            if is_damaged:
-                self.report_warning(
-                    f'{video_id}: Some formats are possibly damaged. They will be deprioritized', only_once=True)
-
-            client_name = fmt.get(STREAMING_DATA_CLIENT_NAME)
-            name = fmt.get('qualityLabel') or quality.replace('audio_quality_', '') or ''
-            fps = int_or_none(fmt.get('fps')) or 0
-            dct = {
-                'asr': int_or_none(fmt.get('audioSampleRate')),
-                'filesize': int_or_none(fmt.get('contentLength')),
-                'format_id': f'{itag}{"-drc" if fmt.get("isDrc") else ""}',
-                'format_note': join_nonempty(
-                    join_nonempty(audio_track.get('displayName'),
-                                  language_preference > 0 and ' (default)', delim=''),
-                    name, fmt.get('isDrc') and 'DRC',
-                    try_get(fmt, lambda x: x['projectionType'].replace('RECTANGULAR', '').lower()),
-                    try_get(fmt, lambda x: x['spatialAudioType'].replace('SPATIAL_AUDIO_TYPE_', '').lower()),
-                    throttled and 'THROTTLED', is_damaged and 'DAMAGED',
-                    (self.get_param('verbose') or all_formats) and client_name,
-                    delim=', '),
-                # Format 22 is likely to be damaged. See https://github.com/yt-dlp/yt-dlp/issues/3372
-                'source_preference': ((-10 if throttled else -5 if itag == '22' else -1)
-                                      + (100 if 'Premium' in name else 0)),
-                'fps': fps if fps > 1 else None,  # For some formats, fps is wrongly returned as 1
-                'audio_channels': fmt.get('audioChannels'),
-                'height': height,
-                'quality': q(quality) - bool(fmt.get('isDrc')) / 2,
-                'has_drm': bool(fmt.get('drmFamilies')),
-                'tbr': tbr,
-                'url': fmt_url,
-                'width': int_or_none(fmt.get('width')),
-                'language': join_nonempty(audio_track.get('id', '').split('.')[0],
-                                          'desc' if language_preference < -1 else '') or None,
-                'language_preference': language_preference,
-                # Strictly de-prioritize damaged and 3gp formats
-                'preference': -10 if is_damaged else -2 if itag == '17' else None,
-            }
-            mime_mobj = re.match(
-                r'((?:[^/]+)/(?:[^;]+))(?:;\s*codecs="([^"]+)")?', fmt.get('mimeType') or '')
-            if mime_mobj:
-                dct['ext'] = mimetype2ext(mime_mobj.group(1))
-                dct.update(parse_codecs(mime_mobj.group(2)))
-            if itag:
-                itags[itag].add(('https', dct.get('language')))
-                stream_ids.append(stream_id)
-            single_stream = 'none' in (dct.get('acodec'), dct.get('vcodec'))
-            if single_stream and dct.get('ext'):
-                dct['container'] = dct['ext'] + '_dash'
-
-            if (all_formats or 'dashy' in format_types) and dct['filesize']:
-                yield {
-                    **dct,
-                    'format_id': f'{dct["format_id"]}-dashy' if all_formats else dct['format_id'],
-                    'protocol': 'http_dash_segments',
-                    'fragments': build_fragments(dct),
-                }
-            if all_formats or 'dashy' not in format_types:
-                dct['downloader_options'] = {'http_chunk_size': CHUNK_SIZE}
-                yield dct
-
-        needs_live_processing = self._needs_live_processing(live_status, duration)
-        skip_bad_formats = 'incomplete' not in format_types
-        if self._configuration_arg('include_incomplete_formats'):
-            skip_bad_formats = False
-            self._downloader.deprecated_feature('[youtube] include_incomplete_formats extractor argument is deprecated. '
-                                                'Use formats=incomplete extractor argument instead')
-
-        skip_manifests = set(self._configuration_arg('skip'))
-        if (not self.get_param('youtube_include_hls_manifest', True)
-                or needs_live_processing == 'is_live'  # These will be filtered out by YoutubeDL anyway
-                or needs_live_processing and skip_bad_formats):
-            skip_manifests.add('hls')
-
-        if not self.get_param('youtube_include_dash_manifest', True):
-            skip_manifests.add('dash')
-        if self._configuration_arg('include_live_dash'):
-            self._downloader.deprecated_feature('[youtube] include_live_dash extractor argument is deprecated. '
-                                                'Use formats=incomplete extractor argument instead')
-        elif skip_bad_formats and live_status == 'is_live' and needs_live_processing != 'is_live':
-            skip_manifests.add('dash')
-
-        def process_manifest_format(f, proto, client_name, itag):
-            key = (proto, f.get('language'))
-            if not all_formats and key in itags[itag]:
-                return False
-            itags[itag].add(key)
-
-            if itag and all_formats:
-                f['format_id'] = f'{itag}-{proto}'
-            elif any(p != proto for p, _ in itags[itag]):
-                f['format_id'] = f'{itag}-{proto}'
-            elif itag:
-                f['format_id'] = itag
-
-            if f.get('source_preference') is None:
-                f['source_preference'] = -1
-
-            if itag in ('616', '235'):
-                f['format_note'] = join_nonempty(f.get('format_note'), 'Premium', delim=' ')
-                f['source_preference'] += 100
-
-            f['quality'] = q(itag_qualities.get(try_get(f, lambda f: f['format_id'].split('-')[0]), -1))
-            if f['quality'] == -1 and f.get('height'):
-                f['quality'] = q(res_qualities[min(res_qualities, key=lambda x: abs(x - f['height']))])
-            if self.get_param('verbose') or all_formats:
-                f['format_note'] = join_nonempty(f.get('format_note'), client_name, delim=', ')
-            if f.get('fps') and f['fps'] <= 1:
-                del f['fps']
-
-            if proto == 'hls' and f.get('has_drm'):
-                f['has_drm'] = 'maybe'
-                f['source_preference'] -= 5
-            return True
-
-        subtitles = {}
-        for sd in streaming_data:
-            client_name = sd.get(STREAMING_DATA_CLIENT_NAME)
-
-            hls_manifest_url = 'hls' not in skip_manifests and sd.get('hlsManifestUrl')
-            if hls_manifest_url:
-                fmts, subs = self._extract_m3u8_formats_and_subtitles(
-                    hls_manifest_url, video_id, 'mp4', fatal=False, live=live_status == 'is_live')
-                subtitles = self._merge_subtitles(subs, subtitles)
-                for f in fmts:
-                    if process_manifest_format(f, 'hls', client_name, self._search_regex(
-                            r'/itag/(\d+)', f['url'], 'itag', default=None)):
-                        yield f
-
-            dash_manifest_url = 'dash' not in skip_manifests and sd.get('dashManifestUrl')
-            if dash_manifest_url:
-                formats, subs = self._extract_mpd_formats_and_subtitles(dash_manifest_url, video_id, fatal=False)
-                subtitles = self._merge_subtitles(subs, subtitles)  # Prioritize HLS subs over DASH
-                for f in formats:
-                    if process_manifest_format(f, 'dash', client_name, f['format_id']):
-                        f['filesize'] = int_or_none(self._search_regex(
-                            r'/clen/(\d+)', f.get('fragment_base_url') or f['url'], 'file size', default=None))
-                        if needs_live_processing:
-                            f['is_from_start'] = True
-
-                        yield f
-        yield subtitles
-
-    def _extract_storyboard(self, player_responses, duration):
-        spec = get_first(
-            player_responses, ('storyboards', 'playerStoryboardSpecRenderer', 'spec'), default='').split('|')[::-1]
-        base_url = url_or_none(urljoin('https://i.ytimg.com/', spec.pop() or None))
-        if not base_url:
-            return
-        L = len(spec) - 1
-        for i, args in enumerate(spec):
-            args = args.split('#')
-            counts = list(map(int_or_none, args[:5]))
-            if len(args) != 8 or not all(counts):
-                self.report_warning(f'Malformed storyboard {i}: {"#".join(args)}{bug_reports_message()}')
-                continue
-            width, height, frame_count, cols, rows = counts
-            N, sigh = args[6:]
-
-            url = base_url.replace('$L', str(L - i)).replace('$N', N) + f'&sigh={sigh}'
-            fragment_count = frame_count / (cols * rows)
-            fragment_duration = duration / fragment_count
-            yield {
-                'format_id': f'sb{i}',
-                'format_note': 'storyboard',
-                'ext': 'mhtml',
-                'protocol': 'mhtml',
-                'acodec': 'none',
-                'vcodec': 'none',
-                'url': url,
-                'width': width,
-                'height': height,
-                'fps': frame_count / duration,
-                'rows': rows,
-                'columns': cols,
-                'fragments': [{
-                    'url': url.replace('$M', str(j)),
-                    'duration': min(fragment_duration, duration - (j * fragment_duration)),
-                } for j in range(math.ceil(fragment_count))],
-            }
-
-    def _download_player_responses(self, url, smuggled_data, video_id, webpage_url):
-        webpage = None
-        if 'webpage' not in self._configuration_arg('player_skip'):
-            query = {'bpctr': '9999999999', 'has_verified': '1'}
-            pp = self._configuration_arg('player_params', [None], casesense=True)[0]
-            if pp:
-                query['pp'] = pp
-            webpage = self._download_webpage(
-                webpage_url, video_id, fatal=False, query=query)
-
-        master_ytcfg = self.extract_ytcfg(video_id, webpage) or self._get_default_ytcfg()
-
-        player_responses, player_url = self._extract_player_responses(
-            self._get_requested_clients(url, smuggled_data),
-            video_id, webpage, master_ytcfg, smuggled_data)
-
-        return webpage, master_ytcfg, player_responses, player_url
-
-    def _list_formats(self, video_id, microformats, video_details, player_responses, player_url, duration=None):
-        live_broadcast_details = traverse_obj(microformats, (..., 'liveBroadcastDetails'))
-        is_live = get_first(video_details, 'isLive')
-        if is_live is None:
-            is_live = get_first(live_broadcast_details, 'isLiveNow')
-        live_content = get_first(video_details, 'isLiveContent')
-        is_upcoming = get_first(video_details, 'isUpcoming')
-        post_live = get_first(video_details, 'isPostLiveDvr')
-        live_status = ('post_live' if post_live
-                       else 'is_live' if is_live
-                       else 'is_upcoming' if is_upcoming
-                       else 'was_live' if live_content
-                       else 'not_live' if False in (is_live, live_content)
-                       else None)
-        streaming_data = traverse_obj(player_responses, (..., 'streamingData'))
-        *formats, subtitles = self._extract_formats_and_subtitles(streaming_data, video_id, player_url, live_status, duration)
-        if all(f.get('has_drm') for f in formats):
-            # If there are no formats that definitely don't have DRM, all have DRM
-            for f in formats:
-                f['has_drm'] = True
-
-        return live_broadcast_details, live_status, streaming_data, formats, subtitles
-
-    def _real_extract(self, url):
-        url, smuggled_data = unsmuggle_url(url, {})
-        video_id = self._match_id(url)
-
-        base_url = self.http_scheme() + '//www.youtube.com/'
-        webpage_url = base_url + 'watch?v=' + video_id
-
-        webpage, master_ytcfg, player_responses, player_url = self._download_player_responses(url, smuggled_data, video_id, webpage_url)
-
-        playability_statuses = traverse_obj(
-            player_responses, (..., 'playabilityStatus'), expected_type=dict)
-
-        trailer_video_id = get_first(
-            playability_statuses,
-            ('errorScreen', 'playerLegacyDesktopYpcTrailerRenderer', 'trailerVideoId'),
-            expected_type=str)
-        if trailer_video_id:
-            return self.url_result(
-                trailer_video_id, self.ie_key(), trailer_video_id)
-
-        search_meta = ((lambda x: self._html_search_meta(x, webpage, default=None))
-                       if webpage else (lambda x: None))
-
-        video_details = traverse_obj(player_responses, (..., 'videoDetails'), expected_type=dict)
-        microformats = traverse_obj(
-            player_responses, (..., 'microformat', 'playerMicroformatRenderer'),
-            expected_type=dict)
-
-        translated_title = self._get_text(microformats, (..., 'title'))
-        video_title = (self._preferred_lang and translated_title
-                       or get_first(video_details, 'title')  # primary
-                       or translated_title
-                       or search_meta(['og:title', 'twitter:title', 'title']))
-        translated_description = self._get_text(microformats, (..., 'description'))
-        original_description = get_first(video_details, 'shortDescription')
-        video_description = (
-            self._preferred_lang and translated_description
-            # If original description is blank, it will be an empty string.
-            # Do not prefer translated description in this case.
-            or original_description if original_description is not None else translated_description)
-
-        multifeed_metadata_list = get_first(
-            player_responses,
-            ('multicamera', 'playerLegacyMulticameraRenderer', 'metadataList'),
-            expected_type=str)
-        if multifeed_metadata_list and not smuggled_data.get('force_singlefeed'):
-            if self.get_param('noplaylist'):
-                self.to_screen('Downloading just video %s because of --no-playlist' % video_id)
-            else:
-                entries = []
-                feed_ids = []
-                for feed in multifeed_metadata_list.split(','):
-                    # Unquote should take place before split on comma (,) since textual
-                    # fields may contain comma as well (see
-                    # https://github.com/ytdl-org/youtube-dl/issues/8536)
-                    feed_data = urllib.parse.parse_qs(
-                        urllib.parse.unquote_plus(feed))
-
-                    def feed_entry(name):
-                        return try_get(
-                            feed_data, lambda x: x[name][0], str)
-
-                    feed_id = feed_entry('id')
-                    if not feed_id:
-                        continue
-                    feed_title = feed_entry('title')
-                    title = video_title
-                    if feed_title:
-                        title += ' (%s)' % feed_title
-                    entries.append({
-                        '_type': 'url_transparent',
-                        'ie_key': 'Youtube',
-                        'url': smuggle_url(
-                            '%swatch?v=%s' % (base_url, feed_data['id'][0]),
-                            {'force_singlefeed': True}),
-                        'title': title,
-                    })
-                    feed_ids.append(feed_id)
-                self.to_screen(
-                    'Downloading multifeed video (%s) - add --no-playlist to just download video %s'
-                    % (', '.join(feed_ids), video_id))
-                return self.playlist_result(
-                    entries, video_id, video_title, video_description)
-
-        duration = (int_or_none(get_first(video_details, 'lengthSeconds'))
-                    or int_or_none(get_first(microformats, 'lengthSeconds'))
-                    or parse_duration(search_meta('duration')) or None)
-
-        live_broadcast_details, live_status, streaming_data, formats, automatic_captions = \
-            self._list_formats(video_id, microformats, video_details, player_responses, player_url, duration)
-        if live_status == 'post_live':
-            self.write_debug(f'{video_id}: Video is in Post-Live Manifestless mode')
-
-        if not formats:
-            if not self.get_param('allow_unplayable_formats') and traverse_obj(streaming_data, (..., 'licenseInfos')):
-                self.report_drm(video_id)
-            pemr = get_first(
-                playability_statuses,
-                ('errorScreen', 'playerErrorMessageRenderer'), expected_type=dict) or {}
-            reason = self._get_text(pemr, 'reason') or get_first(playability_statuses, 'reason')
-            subreason = clean_html(self._get_text(pemr, 'subreason') or '')
-            if subreason:
-                if subreason == 'The uploader has not made this video available in your country.':
-                    countries = get_first(microformats, 'availableCountries')
-                    if not countries:
-                        regions_allowed = search_meta('regionsAllowed')
-                        countries = regions_allowed.split(',') if regions_allowed else None
-                    self.raise_geo_restricted(subreason, countries, metadata_available=True)
-                reason += f'. {subreason}'
-            if reason:
-                self.raise_no_formats(reason, expected=True)
-
-        keywords = get_first(video_details, 'keywords', expected_type=list) or []
-        if not keywords and webpage:
-            keywords = [
-                unescapeHTML(m.group('content'))
-                for m in re.finditer(self._meta_regex('og:video:tag'), webpage)]
-        for keyword in keywords:
-            if keyword.startswith('yt:stretch='):
-                mobj = re.search(r'(\d+)\s*:\s*(\d+)', keyword)
-                if mobj:
-                    # NB: float is intentional for forcing float division
-                    w, h = (float(v) for v in mobj.groups())
-                    if w > 0 and h > 0:
-                        ratio = w / h
-                        for f in formats:
-                            if f.get('vcodec') != 'none':
-                                f['stretched_ratio'] = ratio
-                        break
-        thumbnails = self._extract_thumbnails((video_details, microformats), (..., ..., 'thumbnail'))
-        thumbnail_url = search_meta(['og:image', 'twitter:image'])
-        if thumbnail_url:
-            thumbnails.append({
-                'url': thumbnail_url,
-            })
-        original_thumbnails = thumbnails.copy()
-
-        # The best resolution thumbnails sometimes does not appear in the webpage
-        # See: https://github.com/yt-dlp/yt-dlp/issues/340
-        # List of possible thumbnails - Ref: <https://stackoverflow.com/a/20542029>
-        thumbnail_names = [
-            # While the *1,*2,*3 thumbnails are just below their corresponding "*default" variants
-            # in resolution, these are not the custom thumbnail. So de-prioritize them
-            'maxresdefault', 'hq720', 'sddefault', 'hqdefault', '0', 'mqdefault', 'default',
-            'sd1', 'sd2', 'sd3', 'hq1', 'hq2', 'hq3', 'mq1', 'mq2', 'mq3', '1', '2', '3'
-        ]
-        n_thumbnail_names = len(thumbnail_names)
-        thumbnails.extend({
-            'url': 'https://i.ytimg.com/vi{webp}/{video_id}/{name}{live}.{ext}'.format(
-                video_id=video_id, name=name, ext=ext,
-                webp='_webp' if ext == 'webp' else '', live='_live' if live_status == 'is_live' else ''),
-        } for name in thumbnail_names for ext in ('webp', 'jpg'))
-        for thumb in thumbnails:
-            i = next((i for i, t in enumerate(thumbnail_names) if f'/{video_id}/{t}' in thumb['url']), n_thumbnail_names)
-            thumb['preference'] = (0 if '.webp' in thumb['url'] else -1) - (2 * i)
-        self._remove_duplicate_formats(thumbnails)
-        self._downloader._sort_thumbnails(original_thumbnails)
-
-        category = get_first(microformats, 'category') or search_meta('genre')
-        channel_id = self.ucid_or_none(str_or_none(
-            get_first(video_details, 'channelId')
-            or get_first(microformats, 'externalChannelId')
-            or search_meta('channelId')))
-        owner_profile_url = get_first(microformats, 'ownerProfileUrl')
-
-        live_start_time = parse_iso8601(get_first(live_broadcast_details, 'startTimestamp'))
-        live_end_time = parse_iso8601(get_first(live_broadcast_details, 'endTimestamp'))
-        if not duration and live_end_time and live_start_time:
-            duration = live_end_time - live_start_time
-
-        needs_live_processing = self._needs_live_processing(live_status, duration)
-
-        def is_bad_format(fmt):
-            if needs_live_processing and not fmt.get('is_from_start'):
-                return True
-            elif (live_status == 'is_live' and needs_live_processing != 'is_live'
-                    and fmt.get('protocol') == 'http_dash_segments'):
-                return True
-
-        for fmt in filter(is_bad_format, formats):
-            fmt['preference'] = (fmt.get('preference') or -1) - 10
-            fmt['format_note'] = join_nonempty(fmt.get('format_note'), '(Last 2 hours)', delim=' ')
-
-        if needs_live_processing:
-            self._prepare_live_from_start_formats(
-                formats, video_id, live_start_time, url, webpage_url, smuggled_data, live_status == 'is_live')
-
-        formats.extend(self._extract_storyboard(player_responses, duration))
-
-        channel_handle = self.handle_from_url(owner_profile_url)
-
-        info = {
-            'id': video_id,
-            'title': video_title,
-            'formats': formats,
-            'thumbnails': thumbnails,
-            # The best thumbnail that we are sure exists. Prevents unnecessary
-            # URL checking if user don't care about getting the best possible thumbnail
-            'thumbnail': traverse_obj(original_thumbnails, (-1, 'url')),
-            'description': video_description,
-            'channel_id': channel_id,
-            'channel_url': format_field(channel_id, None, 'https://www.youtube.com/channel/%s', default=None),
-            'duration': duration,
-            'view_count': int_or_none(
-                get_first((video_details, microformats), (..., 'viewCount'))
-                or search_meta('interactionCount')),
-            'average_rating': float_or_none(get_first(video_details, 'averageRating')),
-            'age_limit': 18 if (
-                get_first(microformats, 'isFamilySafe') is False
-                or search_meta('isFamilyFriendly') == 'false'
-                or search_meta('og:restrictions:age') == '18+') else 0,
-            'webpage_url': webpage_url,
-            'categories': [category] if category else None,
-            'tags': keywords,
-            'playable_in_embed': get_first(playability_statuses, 'playableInEmbed'),
-            'live_status': live_status,
-            'release_timestamp': live_start_time,
-            '_format_sort_fields': (  # source_preference is lower for throttled/potentially damaged formats
-                'quality', 'res', 'fps', 'hdr:12', 'source', 'vcodec:vp9.2', 'channels', 'acodec', 'lang', 'proto')
-        }
-
-        subtitles = {}
-        pctr = traverse_obj(player_responses, (..., 'captions', 'playerCaptionsTracklistRenderer'), expected_type=dict)
-        if pctr:
-            def get_lang_code(track):
-                return (remove_start(track.get('vssId') or '', '.').replace('.', '-')
-                        or track.get('languageCode'))
-
-            # Converted into dicts to remove duplicates
-            captions = {
-                get_lang_code(sub): sub
-                for sub in traverse_obj(pctr, (..., 'captionTracks', ...))}
-            translation_languages = {
-                lang.get('languageCode'): self._get_text(lang.get('languageName'), max_runs=1)
-                for lang in traverse_obj(pctr, (..., 'translationLanguages', ...))}
-
-            def process_language(container, base_url, lang_code, sub_name, query):
-                lang_subs = container.setdefault(lang_code, [])
-                for fmt in self._SUBTITLE_FORMATS:
-                    query.update({
-                        'fmt': fmt,
-                    })
-                    lang_subs.append({
-                        'ext': fmt,
-                        'url': urljoin('https://www.youtube.com', update_url_query(base_url, query)),
-                        'name': sub_name,
-                    })
-
-            # NB: Constructing the full subtitle dictionary is slow
-            get_translated_subs = 'translated_subs' not in self._configuration_arg('skip') and (
-                self.get_param('writeautomaticsub', False) or self.get_param('listsubtitles'))
-            for lang_code, caption_track in captions.items():
-                base_url = caption_track.get('baseUrl')
-                orig_lang = parse_qs(base_url).get('lang', [None])[-1]
-                if not base_url:
-                    continue
-                lang_name = self._get_text(caption_track, 'name', max_runs=1)
-                if caption_track.get('kind') != 'asr':
-                    if not lang_code:
-                        continue
-                    process_language(
-                        subtitles, base_url, lang_code, lang_name, {})
-                    if not caption_track.get('isTranslatable'):
-                        continue
-                for trans_code, trans_name in translation_languages.items():
-                    if not trans_code:
-                        continue
-                    orig_trans_code = trans_code
-                    if caption_track.get('kind') != 'asr' and trans_code != 'und':
-                        if not get_translated_subs:
-                            continue
-                        trans_code += f'-{lang_code}'
-                        trans_name += format_field(lang_name, None, ' from %s')
-                    if lang_code == f'a-{orig_trans_code}':
-                        # Set audio language based on original subtitles
-                        for f in formats:
-                            if f.get('acodec') != 'none' and not f.get('language'):
-                                f['language'] = orig_trans_code
-                        # Add an "-orig" label to the original language so that it can be distinguished.
-                        # The subs are returned without "-orig" as well for compatibility
-                        process_language(
-                            automatic_captions, base_url, f'{trans_code}-orig', f'{trans_name} (Original)', {})
-                    # Setting tlang=lang returns damaged subtitles.
-                    process_language(automatic_captions, base_url, trans_code, trans_name,
-                                     {} if orig_lang == orig_trans_code else {'tlang': trans_code})
-
-        info['automatic_captions'] = automatic_captions
-        info['subtitles'] = subtitles
-
-        parsed_url = urllib.parse.urlparse(url)
-        for component in [parsed_url.fragment, parsed_url.query]:
-            query = urllib.parse.parse_qs(component)
-            for k, v in query.items():
-                for d_k, s_ks in [('start', ('start', 't')), ('end', ('end',))]:
-                    d_k += '_time'
-                    if d_k not in info and k in s_ks:
-                        info[d_k] = parse_duration(query[k][0])
-
-        # Youtube Music Auto-generated description
-        if (video_description or '').strip().endswith('\nAuto-generated by YouTube.'):
-            # XXX: Causes catastrophic backtracking if description has "·"
-            # E.g. https://www.youtube.com/watch?v=DoPaAxMQoiI
-            # Simulating atomic groups:  (?P<a>[^xy]+)x  =>  (?=(?P<a>[^xy]+))(?P=a)x
-            # reduces it, but does not fully fix it. https://regex101.com/r/8Ssf2h/2
-            mobj = re.search(
-                r'''(?xs)
-                    (?=(?P<track>[^\n·]+))(?P=track)·
-                    (?=(?P<artist>[^\n]+))(?P=artist)\n+
-                    (?=(?P<album>[^\n]+))(?P=album)\n
-                    (?:.+?℗\s*(?P<release_year>\d{4})(?!\d))?
-                    (?:.+?Released on\s*:\s*(?P<release_date>\d{4}-\d{2}-\d{2}))?
-                    (.+?\nArtist\s*:\s*
-                        (?=(?P<clean_artist>[^\n]+))(?P=clean_artist)\n
-                    )?.+\nAuto-generated\ by\ YouTube\.\s*$
-                ''', video_description)
-            if mobj:
-                release_year = mobj.group('release_year')
-                release_date = mobj.group('release_date')
-                if release_date:
-                    release_date = release_date.replace('-', '')
-                    if not release_year:
-                        release_year = release_date[:4]
-                info.update({
-                    'album': mobj.group('album'.strip()),
-                    'artist': mobj.group('clean_artist') or ', '.join(a.strip() for a in mobj.group('artist').split('·')),
-                    'track': mobj.group('track').strip(),
-                    'release_date': release_date,
-                    'release_year': int_or_none(release_year),
-                })
-
-        initial_data = None
-        if webpage:
-            initial_data = self.extract_yt_initial_data(video_id, webpage, fatal=False)
-            if not traverse_obj(initial_data, 'contents'):
-                self.report_warning('Incomplete data received in embedded initial data; re-fetching using API.')
-                initial_data = None
-        if not initial_data:
-            query = {'videoId': video_id}
-            query.update(self._get_checkok_params())
-            initial_data = self._extract_response(
-                item_id=video_id, ep='next', fatal=False,
-                ytcfg=master_ytcfg, query=query, check_get_keys='contents',
-                headers=self.generate_api_headers(ytcfg=master_ytcfg),
-                note='Downloading initial data API JSON')
-
-        info['comment_count'] = traverse_obj(initial_data, (
-            'contents', 'twoColumnWatchNextResults', 'results', 'results', 'contents', ..., 'itemSectionRenderer',
-            'contents', ..., 'commentsEntryPointHeaderRenderer', 'commentCount'
-        ), (
-            'engagementPanels', lambda _, v: v['engagementPanelSectionListRenderer']['panelIdentifier'] == 'comment-item-section',
-            'engagementPanelSectionListRenderer', 'header', 'engagementPanelTitleHeaderRenderer', 'contextualInfo'
-        ), expected_type=self._get_count, get_all=False)
-
-        try:  # This will error if there is no livechat
-            initial_data['contents']['twoColumnWatchNextResults']['conversationBar']['liveChatRenderer']['continuations'][0]['reloadContinuationData']['continuation']
-        except (KeyError, IndexError, TypeError):
-            pass
-        else:
-            info.setdefault('subtitles', {})['live_chat'] = [{
-                # url is needed to set cookies
-                'url': f'https://www.youtube.com/watch?v={video_id}&bpctr=9999999999&has_verified=1',
-                'video_id': video_id,
-                'ext': 'json',
-                'protocol': ('youtube_live_chat' if live_status in ('is_live', 'is_upcoming')
-                             else 'youtube_live_chat_replay'),
-            }]
-
-        if initial_data:
-            info['chapters'] = (
-                self._extract_chapters_from_json(initial_data, duration)
-                or self._extract_chapters_from_engagement_panel(initial_data, duration)
-                or self._extract_chapters_from_description(video_description, duration)
-                or None)
-
-            info['heatmap'] = self._extract_heatmap_from_player_overlay(initial_data)
-
-        contents = traverse_obj(
-            initial_data, ('contents', 'twoColumnWatchNextResults', 'results', 'results', 'contents'),
-            expected_type=list, default=[])
-
-        vpir = get_first(contents, 'videoPrimaryInfoRenderer')
-        if vpir:
-            stl = vpir.get('superTitleLink')
-            if stl:
-                stl = self._get_text(stl)
-                if try_get(
-                        vpir,
-                        lambda x: x['superTitleIcon']['iconType']) == 'LOCATION_PIN':
-                    info['location'] = stl
-                else:
-                    mobj = re.search(r'(.+?)\s*S(\d+)\s*•?\s*E(\d+)', stl)
-                    if mobj:
-                        info.update({
-                            'series': mobj.group(1),
-                            'season_number': int(mobj.group(2)),
-                            'episode_number': int(mobj.group(3)),
-                        })
-            for tlb in (try_get(
-                    vpir,
-                    lambda x: x['videoActions']['menuRenderer']['topLevelButtons'],
-                    list) or []):
-                tbrs = variadic(
-                    traverse_obj(
-                        tlb, ('toggleButtonRenderer', ...),
-                        ('segmentedLikeDislikeButtonRenderer', ..., 'toggleButtonRenderer')))
-                for tbr in tbrs:
-                    for getter, regex in [(
-                            lambda x: x['defaultText']['accessibility']['accessibilityData'],
-                            r'(?P<count>[\d,]+)\s*(?P<type>(?:dis)?like)'), ([
-                                lambda x: x['accessibility'],
-                                lambda x: x['accessibilityData']['accessibilityData'],
-                            ], r'(?P<type>(?:dis)?like) this video along with (?P<count>[\d,]+) other people')]:
-                        label = (try_get(tbr, getter, dict) or {}).get('label')
-                        if label:
-                            mobj = re.match(regex, label)
-                            if mobj:
-                                info[mobj.group('type') + '_count'] = str_to_int(mobj.group('count'))
-                                break
-            sbr_tooltip = try_get(
-                vpir, lambda x: x['sentimentBar']['sentimentBarRenderer']['tooltip'])
-            if sbr_tooltip:
-                like_count, dislike_count = sbr_tooltip.split(' / ')
-                info.update({
-                    'like_count': str_to_int(like_count),
-                    'dislike_count': str_to_int(dislike_count),
-                })
-            vcr = traverse_obj(vpir, ('viewCount', 'videoViewCountRenderer'))
-            if vcr:
-                vc = self._get_count(vcr, 'viewCount')
-                # Upcoming premieres with waiting count are treated as live here
-                if vcr.get('isLive'):
-                    info['concurrent_view_count'] = vc
-                elif info.get('view_count') is None:
-                    info['view_count'] = vc
-
-        vsir = get_first(contents, 'videoSecondaryInfoRenderer')
-        if vsir:
-            vor = traverse_obj(vsir, ('owner', 'videoOwnerRenderer'))
-            info.update({
-                'channel': self._get_text(vor, 'title'),
-                'channel_follower_count': self._get_count(vor, 'subscriberCountText')})
-
-            if not channel_handle:
-                channel_handle = self.handle_from_url(
-                    traverse_obj(vor, (
-                        ('navigationEndpoint', ('title', 'runs', ..., 'navigationEndpoint')),
-                        (('commandMetadata', 'webCommandMetadata', 'url'), ('browseEndpoint', 'canonicalBaseUrl')),
-                        {str}), get_all=False))
-
-            rows = try_get(
-                vsir,
-                lambda x: x['metadataRowContainer']['metadataRowContainerRenderer']['rows'],
-                list) or []
-            multiple_songs = False
-            for row in rows:
-                if try_get(row, lambda x: x['metadataRowRenderer']['hasDividerLine']) is True:
-                    multiple_songs = True
-                    break
-            for row in rows:
-                mrr = row.get('metadataRowRenderer') or {}
-                mrr_title = mrr.get('title')
-                if not mrr_title:
-                    continue
-                mrr_title = self._get_text(mrr, 'title')
-                mrr_contents_text = self._get_text(mrr, ('contents', 0))
-                if mrr_title == 'License':
-                    info['license'] = mrr_contents_text
-                elif not multiple_songs:
-                    if mrr_title == 'Album':
-                        info['album'] = mrr_contents_text
-                    elif mrr_title == 'Artist':
-                        info['artist'] = mrr_contents_text
-                    elif mrr_title == 'Song':
-                        info['track'] = mrr_contents_text
-            owner_badges = self._extract_badges(traverse_obj(vsir, ('owner', 'videoOwnerRenderer', 'badges')))
-            if self._has_badge(owner_badges, BadgeType.VERIFIED):
-                info['channel_is_verified'] = True
-
-        info.update({
-            'uploader': info.get('channel'),
-            'uploader_id': channel_handle,
-            'uploader_url': format_field(channel_handle, None, 'https://www.youtube.com/%s', default=None),
-        })
-        # The upload date for scheduled, live and past live streams / premieres in microformats
-        # may be different from the stream date. Although not in UTC, we will prefer it in this case.
-        # See: https://github.com/yt-dlp/yt-dlp/pull/2223#issuecomment-1008485139
-        upload_date = (
-            unified_strdate(get_first(microformats, 'uploadDate'))
-            or unified_strdate(search_meta('uploadDate')))
-        if not upload_date or (
-            live_status in ('not_live', None)
-            and 'no-youtube-prefer-utc-upload-date' not in self.get_param('compat_opts', [])
-        ):
-            upload_date = strftime_or_none(
-                self._parse_time_text(self._get_text(vpir, 'dateText'))) or upload_date
-        info['upload_date'] = upload_date
-
-        for s_k, d_k in [('artist', 'creator'), ('track', 'alt_title')]:
-            v = info.get(s_k)
-            if v:
-                info[d_k] = v
-
-        badges = self._extract_badges(traverse_obj(vpir, 'badges'))
-
-        is_private = (self._has_badge(badges, BadgeType.AVAILABILITY_PRIVATE)
-                      or get_first(video_details, 'isPrivate', expected_type=bool))
-
-        info['availability'] = (
-            'public' if self._has_badge(badges, BadgeType.AVAILABILITY_PUBLIC)
-            else self._availability(
-                is_private=is_private,
-                needs_premium=(
-                    self._has_badge(badges, BadgeType.AVAILABILITY_PREMIUM)
-                    or False if initial_data and is_private is not None else None),
-                needs_subscription=(
-                    self._has_badge(badges, BadgeType.AVAILABILITY_SUBSCRIPTION)
-                    or False if initial_data and is_private is not None else None),
-                needs_auth=info['age_limit'] >= 18,
-                is_unlisted=None if is_private is None else (
-                    self._has_badge(badges, BadgeType.AVAILABILITY_UNLISTED)
-                    or get_first(microformats, 'isUnlisted', expected_type=bool))))
-
-        info['__post_extractor'] = self.extract_comments(master_ytcfg, video_id, contents, webpage)
-
-        self.mark_watched(video_id, player_responses)
-
-        return info
-
-
-class YoutubeTabBaseInfoExtractor(YoutubeBaseInfoExtractor):
-    @staticmethod
-    def passthrough_smuggled_data(func):
-        def _smuggle(info, smuggled_data):
-            if info.get('_type') not in ('url', 'url_transparent'):
-                return info
-            if smuggled_data.get('is_music_url'):
-                parsed_url = urllib.parse.urlparse(info['url'])
-                if parsed_url.netloc in ('www.youtube.com', 'music.youtube.com'):
-                    smuggled_data.pop('is_music_url')
-                    info['url'] = urllib.parse.urlunparse(parsed_url._replace(netloc='music.youtube.com'))
-            if smuggled_data:
-                info['url'] = smuggle_url(info['url'], smuggled_data)
-            return info
-
-        @functools.wraps(func)
-        def wrapper(self, url):
-            url, smuggled_data = unsmuggle_url(url, {})
-            if self.is_music_url(url):
-                smuggled_data['is_music_url'] = True
-            info_dict = func(self, url, smuggled_data)
-            if smuggled_data:
-                _smuggle(info_dict, smuggled_data)
-                if info_dict.get('entries'):
-                    info_dict['entries'] = (_smuggle(i, smuggled_data.copy()) for i in info_dict['entries'])
-            return info_dict
-        return wrapper
-
-    @staticmethod
-    def _extract_basic_item_renderer(item):
-        # Modified from _extract_grid_item_renderer
-        known_basic_renderers = (
-            'playlistRenderer', 'videoRenderer', 'channelRenderer', 'showRenderer', 'reelItemRenderer'
-        )
-        for key, renderer in item.items():
-            if not isinstance(renderer, dict):
-                continue
-            elif key in known_basic_renderers:
-                return renderer
-            elif key.startswith('grid') and key.endswith('Renderer'):
-                return renderer
-
-    def _extract_channel_renderer(self, renderer):
-        channel_id = self.ucid_or_none(renderer['channelId'])
-        title = self._get_text(renderer, 'title')
-        channel_url = format_field(channel_id, None, 'https://www.youtube.com/channel/%s', default=None)
-        channel_handle = self.handle_from_url(
-            traverse_obj(renderer, (
-                'navigationEndpoint', (('commandMetadata', 'webCommandMetadata', 'url'),
-                                       ('browseEndpoint', 'canonicalBaseUrl')),
-                {str}), get_all=False))
-        if not channel_handle:
-            # As of 2023-06-01, YouTube sets subscriberCountText to the handle in search
-            channel_handle = self.handle_or_none(self._get_text(renderer, 'subscriberCountText'))
-        return {
-            '_type': 'url',
-            'url': channel_url,
-            'id': channel_id,
-            'ie_key': YoutubeTabIE.ie_key(),
-            'channel': title,
-            'uploader': title,
-            'channel_id': channel_id,
-            'channel_url': channel_url,
-            'title': title,
-            'uploader_id': channel_handle,
-            'uploader_url': format_field(channel_handle, None, 'https://www.youtube.com/%s', default=None),
-            # See above. YouTube sets videoCountText to the subscriber text in search channel renderers.
-            # However, in feed/channels this is set correctly to the subscriber count
-            'channel_follower_count': traverse_obj(
-                renderer, 'subscriberCountText', 'videoCountText', expected_type=self._get_count),
-            'thumbnails': self._extract_thumbnails(renderer, 'thumbnail'),
-            'playlist_count': (
-                # videoCountText may be the subscriber count
-                self._get_count(renderer, 'videoCountText')
-                if self._get_count(renderer, 'subscriberCountText') is not None else None),
-            'description': self._get_text(renderer, 'descriptionSnippet'),
-            'channel_is_verified': True if self._has_badge(
-                self._extract_badges(traverse_obj(renderer, 'ownerBadges')), BadgeType.VERIFIED) else None,
-        }
-
-    def _grid_entries(self, grid_renderer):
-        for item in grid_renderer['items']:
-            if not isinstance(item, dict):
-                continue
-            renderer = self._extract_basic_item_renderer(item)
-            if not isinstance(renderer, dict):
-                continue
-            title = self._get_text(renderer, 'title')
-
-            # playlist
-            playlist_id = renderer.get('playlistId')
-            if playlist_id:
-                yield self.url_result(
-                    'https://www.youtube.com/playlist?list=%s' % playlist_id,
-                    ie=YoutubeTabIE.ie_key(), video_id=playlist_id,
-                    video_title=title)
-                continue
-            # video
-            video_id = renderer.get('videoId')
-            if video_id:
-                yield self._extract_video(renderer)
-                continue
-            # channel
-            channel_id = renderer.get('channelId')
-            if channel_id:
-                yield self._extract_channel_renderer(renderer)
-                continue
-            # generic endpoint URL support
-            ep_url = urljoin('https://www.youtube.com/', try_get(
-                renderer, lambda x: x['navigationEndpoint']['commandMetadata']['webCommandMetadata']['url'],
-                str))
-            if ep_url:
-                for ie in (YoutubeTabIE, YoutubePlaylistIE, YoutubeIE):
-                    if ie.suitable(ep_url):
-                        yield self.url_result(
-                            ep_url, ie=ie.ie_key(), video_id=ie._match_id(ep_url), video_title=title)
-                        break
-
-    def _music_reponsive_list_entry(self, renderer):
-        video_id = traverse_obj(renderer, ('playlistItemData', 'videoId'))
-        if video_id:
-            title = traverse_obj(renderer, (
-                'flexColumns', 0, 'musicResponsiveListItemFlexColumnRenderer',
-                'text', 'runs', 0, 'text'))
-            return self.url_result(f'https://music.youtube.com/watch?v={video_id}',
-                                   ie=YoutubeIE.ie_key(), video_id=video_id, title=title)
-        playlist_id = traverse_obj(renderer, ('navigationEndpoint', 'watchEndpoint', 'playlistId'))
-        if playlist_id:
-            video_id = traverse_obj(renderer, ('navigationEndpoint', 'watchEndpoint', 'videoId'))
-            if video_id:
-                return self.url_result(f'https://music.youtube.com/watch?v={video_id}&list={playlist_id}',
-                                       ie=YoutubeTabIE.ie_key(), video_id=playlist_id)
-            return self.url_result(f'https://music.youtube.com/playlist?list={playlist_id}',
-                                   ie=YoutubeTabIE.ie_key(), video_id=playlist_id)
-        browse_id = traverse_obj(renderer, ('navigationEndpoint', 'browseEndpoint', 'browseId'))
-        if browse_id:
-            return self.url_result(f'https://music.youtube.com/browse/{browse_id}',
-                                   ie=YoutubeTabIE.ie_key(), video_id=browse_id)
-
-    def _shelf_entries_from_content(self, shelf_renderer):
-        content = shelf_renderer.get('content')
-        if not isinstance(content, dict):
-            return
-        renderer = content.get('gridRenderer') or content.get('expandedShelfContentsRenderer')
-        if renderer:
-            # TODO: add support for nested playlists so each shelf is processed
-            # as separate playlist
-            # TODO: this includes only first N items
-            yield from self._grid_entries(renderer)
-        renderer = content.get('horizontalListRenderer')
-        if renderer:
-            # TODO
-            pass
-
-    def _shelf_entries(self, shelf_renderer, skip_channels=False):
-        ep = try_get(
-            shelf_renderer, lambda x: x['endpoint']['commandMetadata']['webCommandMetadata']['url'],
-            str)
-        shelf_url = urljoin('https://www.youtube.com', ep)
-        if shelf_url:
-            # Skipping links to another channels, note that checking for
-            # endpoint.commandMetadata.webCommandMetadata.webPageTypwebPageType == WEB_PAGE_TYPE_CHANNEL
-            # will not work
-            if skip_channels and '/channels?' in shelf_url:
-                return
-            title = self._get_text(shelf_renderer, 'title')
-            yield self.url_result(shelf_url, video_title=title)
-        # Shelf may not contain shelf URL, fallback to extraction from content
-        yield from self._shelf_entries_from_content(shelf_renderer)
-
-    def _playlist_entries(self, video_list_renderer):
-        for content in video_list_renderer['contents']:
-            if not isinstance(content, dict):
-                continue
-            renderer = content.get('playlistVideoRenderer') or content.get('playlistPanelVideoRenderer')
-            if not isinstance(renderer, dict):
-                continue
-            video_id = renderer.get('videoId')
-            if not video_id:
-                continue
-            yield self._extract_video(renderer)
-
-    def _rich_entries(self, rich_grid_renderer):
-        renderer = traverse_obj(
-            rich_grid_renderer,
-            ('content', ('videoRenderer', 'reelItemRenderer', 'playlistRenderer')), get_all=False) or {}
-        video_id = renderer.get('videoId')
-        if video_id:
-            yield self._extract_video(renderer)
-            return
-        playlist_id = renderer.get('playlistId')
-        if playlist_id:
-            yield self.url_result(
-                f'https://www.youtube.com/playlist?list={playlist_id}',
-                ie=YoutubeTabIE.ie_key(), video_id=playlist_id,
-                video_title=self._get_text(renderer, 'title'))
-            return
-
-    def _video_entry(self, video_renderer):
-        video_id = video_renderer.get('videoId')
-        if video_id:
-            return self._extract_video(video_renderer)
-
-    def _hashtag_tile_entry(self, hashtag_tile_renderer):
-        url = urljoin('https://youtube.com', traverse_obj(
-            hashtag_tile_renderer, ('onTapCommand', 'commandMetadata', 'webCommandMetadata', 'url')))
-        if url:
-            return self.url_result(
-                url, ie=YoutubeTabIE.ie_key(), title=self._get_text(hashtag_tile_renderer, 'hashtag'))
-
-    def _post_thread_entries(self, post_thread_renderer):
-        post_renderer = try_get(
-            post_thread_renderer, lambda x: x['post']['backstagePostRenderer'], dict)
-        if not post_renderer:
-            return
-        # video attachment
-        video_renderer = try_get(
-            post_renderer, lambda x: x['backstageAttachment']['videoRenderer'], dict) or {}
-        video_id = video_renderer.get('videoId')
-        if video_id:
-            entry = self._extract_video(video_renderer)
-            if entry:
-                yield entry
-        # playlist attachment
-        playlist_id = try_get(
-            post_renderer, lambda x: x['backstageAttachment']['playlistRenderer']['playlistId'], str)
-        if playlist_id:
-            yield self.url_result(
-                'https://www.youtube.com/playlist?list=%s' % playlist_id,
-                ie=YoutubeTabIE.ie_key(), video_id=playlist_id)
-        # inline video links
-        runs = try_get(post_renderer, lambda x: x['contentText']['runs'], list) or []
-        for run in runs:
-            if not isinstance(run, dict):
-                continue
-            ep_url = try_get(
-                run, lambda x: x['navigationEndpoint']['urlEndpoint']['url'], str)
-            if not ep_url:
-                continue
-            if not YoutubeIE.suitable(ep_url):
-                continue
-            ep_video_id = YoutubeIE._match_id(ep_url)
-            if video_id == ep_video_id:
-                continue
-            yield self.url_result(ep_url, ie=YoutubeIE.ie_key(), video_id=ep_video_id)
-
-    def _post_thread_continuation_entries(self, post_thread_continuation):
-        contents = post_thread_continuation.get('contents')
-        if not isinstance(contents, list):
-            return
-        for content in contents:
-            renderer = content.get('backstagePostThreadRenderer')
-            if isinstance(renderer, dict):
-                yield from self._post_thread_entries(renderer)
-                continue
-            renderer = content.get('videoRenderer')
-            if isinstance(renderer, dict):
-                yield self._video_entry(renderer)
-
-    r''' # unused
-    def _rich_grid_entries(self, contents):
-        for content in contents:
-            video_renderer = try_get(content, lambda x: x['richItemRenderer']['content']['videoRenderer'], dict)
-            if video_renderer:
-                entry = self._video_entry(video_renderer)
-                if entry:
-                    yield entry
-    '''
-
-    def _report_history_entries(self, renderer):
-        for url in traverse_obj(renderer, (
-                'rows', ..., 'reportHistoryTableRowRenderer', 'cells', ...,
-                'reportHistoryTableCellRenderer', 'cell', 'reportHistoryTableTextCellRenderer', 'text', 'runs', ...,
-                'navigationEndpoint', 'commandMetadata', 'webCommandMetadata', 'url')):
-            yield self.url_result(urljoin('https://www.youtube.com', url), YoutubeIE)
-
-    def _extract_entries(self, parent_renderer, continuation_list):
-        # continuation_list is modified in-place with continuation_list = [continuation_token]
-        continuation_list[:] = [None]
-        contents = try_get(parent_renderer, lambda x: x['contents'], list) or []
-        for content in contents:
-            if not isinstance(content, dict):
-                continue
-            is_renderer = traverse_obj(
-                content, 'itemSectionRenderer', 'musicShelfRenderer', 'musicShelfContinuation',
-                expected_type=dict)
-            if not is_renderer:
-                if content.get('richItemRenderer'):
-                    for entry in self._rich_entries(content['richItemRenderer']):
-                        yield entry
-                    continuation_list[0] = self._extract_continuation(parent_renderer)
-                elif content.get('reportHistorySectionRenderer'):  # https://www.youtube.com/reporthistory
-                    table = traverse_obj(content, ('reportHistorySectionRenderer', 'table', 'tableRenderer'))
-                    yield from self._report_history_entries(table)
-                    continuation_list[0] = self._extract_continuation(table)
-                continue
-
-            isr_contents = try_get(is_renderer, lambda x: x['contents'], list) or []
-            for isr_content in isr_contents:
-                if not isinstance(isr_content, dict):
-                    continue
-
-                known_renderers = {
-                    'playlistVideoListRenderer': self._playlist_entries,
-                    'gridRenderer': self._grid_entries,
-                    'reelShelfRenderer': self._grid_entries,
-                    'shelfRenderer': self._shelf_entries,
-                    'musicResponsiveListItemRenderer': lambda x: [self._music_reponsive_list_entry(x)],
-                    'backstagePostThreadRenderer': self._post_thread_entries,
-                    'videoRenderer': lambda x: [self._video_entry(x)],
-                    'playlistRenderer': lambda x: self._grid_entries({'items': [{'playlistRenderer': x}]}),
-                    'channelRenderer': lambda x: self._grid_entries({'items': [{'channelRenderer': x}]}),
-                    'hashtagTileRenderer': lambda x: [self._hashtag_tile_entry(x)],
-                    'richGridRenderer': lambda x: self._extract_entries(x, continuation_list),
-                }
-                for key, renderer in isr_content.items():
-                    if key not in known_renderers:
-                        continue
-                    for entry in known_renderers[key](renderer):
-                        if entry:
-                            yield entry
-                    continuation_list[0] = self._extract_continuation(renderer)
-                    break
-
-            if not continuation_list[0]:
-                continuation_list[0] = self._extract_continuation(is_renderer)
-
-        if not continuation_list[0]:
-            continuation_list[0] = self._extract_continuation(parent_renderer)
-
-    def _entries(self, tab, item_id, ytcfg, account_syncid, visitor_data):
-        continuation_list = [None]
-        extract_entries = lambda x: self._extract_entries(x, continuation_list)
-        tab_content = try_get(tab, lambda x: x['content'], dict)
-        if not tab_content:
-            return
-        parent_renderer = (
-            try_get(tab_content, lambda x: x['sectionListRenderer'], dict)
-            or try_get(tab_content, lambda x: x['richGridRenderer'], dict) or {})
-        yield from extract_entries(parent_renderer)
-        continuation = continuation_list[0]
-        seen_continuations = set()
-        for page_num in itertools.count(1):
-            if not continuation:
-                break
-            continuation_token = continuation.get('continuation')
-            if continuation_token is not None and continuation_token in seen_continuations:
-                self.write_debug('Detected YouTube feed looping - assuming end of feed.')
-                break
-            seen_continuations.add(continuation_token)
-            headers = self.generate_api_headers(
-                ytcfg=ytcfg, account_syncid=account_syncid, visitor_data=visitor_data)
-            response = self._extract_response(
-                item_id=f'{item_id} page {page_num}',
-                query=continuation, headers=headers, ytcfg=ytcfg,
-                check_get_keys=('continuationContents', 'onResponseReceivedActions', 'onResponseReceivedEndpoints'))
-
-            if not response:
-                break
-            # Extracting updated visitor data is required to prevent an infinite extraction loop in some cases
-            # See: https://github.com/ytdl-org/youtube-dl/issues/28702
-            visitor_data = self._extract_visitor_data(response) or visitor_data
-
-            known_renderers = {
-                'videoRenderer': (self._grid_entries, 'items'),  # for membership tab
-                'gridPlaylistRenderer': (self._grid_entries, 'items'),
-                'gridVideoRenderer': (self._grid_entries, 'items'),
-                'gridChannelRenderer': (self._grid_entries, 'items'),
-                'playlistVideoRenderer': (self._playlist_entries, 'contents'),
-                'itemSectionRenderer': (extract_entries, 'contents'),  # for feeds
-                'richItemRenderer': (extract_entries, 'contents'),  # for hashtag
-                'backstagePostThreadRenderer': (self._post_thread_continuation_entries, 'contents'),
-                'reportHistoryTableRowRenderer': (self._report_history_entries, 'rows'),
-                'playlistVideoListContinuation': (self._playlist_entries, None),
-                'gridContinuation': (self._grid_entries, None),
-                'itemSectionContinuation': (self._post_thread_continuation_entries, None),
-                'sectionListContinuation': (extract_entries, None),  # for feeds
-            }
-
-            continuation_items = traverse_obj(response, (
-                ('onResponseReceivedActions', 'onResponseReceivedEndpoints'), ...,
-                'appendContinuationItemsAction', 'continuationItems'
-            ), 'continuationContents', get_all=False)
-            continuation_item = traverse_obj(continuation_items, 0, None, expected_type=dict, default={})
-
-            video_items_renderer = None
-            for key in continuation_item.keys():
-                if key not in known_renderers:
-                    continue
-                func, parent_key = known_renderers[key]
-                video_items_renderer = {parent_key: continuation_items} if parent_key else continuation_items
-                continuation_list = [None]
-                yield from func(video_items_renderer)
-                continuation = continuation_list[0] or self._extract_continuation(video_items_renderer)
-
-            if not video_items_renderer:
-                break
-
-    @staticmethod
-    def _extract_selected_tab(tabs, fatal=True):
-        for tab_renderer in tabs:
-            if tab_renderer.get('selected'):
-                return tab_renderer
-        if fatal:
-            raise ExtractorError('Unable to find selected tab')
-
-    @staticmethod
-    def _extract_tab_renderers(response):
-        return traverse_obj(
-            response, ('contents', 'twoColumnBrowseResultsRenderer', 'tabs', ..., ('tabRenderer', 'expandableTabRenderer')), expected_type=dict)
-
-    def _extract_from_tabs(self, item_id, ytcfg, data, tabs):
-        metadata = self._extract_metadata_from_tabs(item_id, data)
-
-        selected_tab = self._extract_selected_tab(tabs)
-        metadata['title'] += format_field(selected_tab, 'title', ' - %s')
-        metadata['title'] += format_field(selected_tab, 'expandedText', ' - %s')
-
-        return self.playlist_result(
-            self._entries(
-                selected_tab, metadata['id'], ytcfg,
-                self._extract_account_syncid(ytcfg, data),
-                self._extract_visitor_data(data, ytcfg)),
-            **metadata)
-
-    def _extract_metadata_from_tabs(self, item_id, data):
-        info = {'id': item_id}
-
-        metadata_renderer = traverse_obj(data, ('metadata', 'channelMetadataRenderer'), expected_type=dict)
-        if metadata_renderer:
-            channel_id = traverse_obj(metadata_renderer, ('externalId', {self.ucid_or_none}),
-                                      ('channelUrl', {self.ucid_from_url}))
-            info.update({
-                'channel': metadata_renderer.get('title'),
-                'channel_id': channel_id,
-            })
-            if info['channel_id']:
-                info['id'] = info['channel_id']
-        else:
-            metadata_renderer = traverse_obj(data, ('metadata', 'playlistMetadataRenderer'), expected_type=dict)
-
-        # We can get the uncropped banner/avatar by replacing the crop params with '=s0'
-        # See: https://github.com/yt-dlp/yt-dlp/issues/2237#issuecomment-1013694714
-        def _get_uncropped(url):
-            return url_or_none((url or '').split('=')[0] + '=s0')
-
-        avatar_thumbnails = self._extract_thumbnails(metadata_renderer, 'avatar')
-        if avatar_thumbnails:
-            uncropped_avatar = _get_uncropped(avatar_thumbnails[0]['url'])
-            if uncropped_avatar:
-                avatar_thumbnails.append({
-                    'url': uncropped_avatar,
-                    'id': 'avatar_uncropped',
-                    'preference': 1
-                })
-
-        channel_banners = self._extract_thumbnails(
-            data, ('header', ..., ('banner', 'mobileBanner', 'tvBanner')))
-        for banner in channel_banners:
-            banner['preference'] = -10
-
-        if channel_banners:
-            uncropped_banner = _get_uncropped(channel_banners[0]['url'])
-            if uncropped_banner:
-                channel_banners.append({
-                    'url': uncropped_banner,
-                    'id': 'banner_uncropped',
-                    'preference': -5
-                })
-
-        # Deprecated - remove primary_sidebar_renderer when layout discontinued
-        primary_sidebar_renderer = self._extract_sidebar_info_renderer(data, 'playlistSidebarPrimaryInfoRenderer')
-        playlist_header_renderer = traverse_obj(data, ('header', 'playlistHeaderRenderer'), expected_type=dict)
-
-        primary_thumbnails = self._extract_thumbnails(
-            primary_sidebar_renderer, ('thumbnailRenderer', ('playlistVideoThumbnailRenderer', 'playlistCustomThumbnailRenderer'), 'thumbnail'))
-        playlist_thumbnails = self._extract_thumbnails(
-            playlist_header_renderer, ('playlistHeaderBanner', 'heroPlaylistThumbnailRenderer', 'thumbnail'))
-
-        info.update({
-            'title': (traverse_obj(metadata_renderer, 'title')
-                      or self._get_text(data, ('header', 'hashtagHeaderRenderer', 'hashtag'))
-                      or info['id']),
-            'availability': self._extract_availability(data),
-            'channel_follower_count': self._get_count(data, ('header', ..., 'subscriberCountText')),
-            'description': try_get(metadata_renderer, lambda x: x.get('description', '')),
-            'tags': try_get(metadata_renderer or {}, lambda x: x.get('keywords', '').split()),
-            'thumbnails': (primary_thumbnails or playlist_thumbnails) + avatar_thumbnails + channel_banners,
-        })
-
-        channel_handle = (
-            traverse_obj(metadata_renderer, (('vanityChannelUrl', ('ownerUrls', ...)), {self.handle_from_url}), get_all=False)
-            or traverse_obj(data, ('header', ..., 'channelHandleText', {self.handle_or_none}), get_all=False))
-
-        if channel_handle:
-            info.update({
-                'uploader_id': channel_handle,
-                'uploader_url': format_field(channel_handle, None, 'https://www.youtube.com/%s', default=None),
-            })
-
-        channel_badges = self._extract_badges(traverse_obj(data, ('header', ..., 'badges'), get_all=False))
-        if self._has_badge(channel_badges, BadgeType.VERIFIED):
-            info['channel_is_verified'] = True
-        # Playlist stats is a text runs array containing [video count, view count, last updated].
-        # last updated or (view count and last updated) may be missing.
-        playlist_stats = get_first(
-            (primary_sidebar_renderer, playlist_header_renderer), (('stats', 'briefStats', 'numVideosText'), ))
-
-        last_updated_unix = self._parse_time_text(
-            self._get_text(playlist_stats, 2)  # deprecated, remove when old layout discontinued
-            or self._get_text(playlist_header_renderer, ('byline', 1, 'playlistBylineRenderer', 'text')))
-        info['modified_date'] = strftime_or_none(last_updated_unix)
-
-        info['view_count'] = self._get_count(playlist_stats, 1)
-        if info['view_count'] is None:  # 0 is allowed
-            info['view_count'] = self._get_count(playlist_header_renderer, 'viewCountText')
-        if info['view_count'] is None:
-            info['view_count'] = self._get_count(data, (
-                'contents', 'twoColumnBrowseResultsRenderer', 'tabs', ..., 'tabRenderer', 'content', 'sectionListRenderer',
-                'contents', ..., 'itemSectionRenderer', 'contents', ..., 'channelAboutFullMetadataRenderer', 'viewCountText'))
-
-        info['playlist_count'] = self._get_count(playlist_stats, 0)
-        if info['playlist_count'] is None:  # 0 is allowed
-            info['playlist_count'] = self._get_count(playlist_header_renderer, ('byline', 0, 'playlistBylineRenderer', 'text'))
-
-        if not info.get('channel_id'):
-            owner = traverse_obj(playlist_header_renderer, 'ownerText')
-            if not owner:  # Deprecated
-                owner = traverse_obj(
-                    self._extract_sidebar_info_renderer(data, 'playlistSidebarSecondaryInfoRenderer'),
-                    ('videoOwner', 'videoOwnerRenderer', 'title'))
-            owner_text = self._get_text(owner)
-            browse_ep = traverse_obj(owner, ('runs', 0, 'navigationEndpoint', 'browseEndpoint')) or {}
-            info.update({
-                'channel': self._search_regex(r'^by (.+) and \d+ others?$', owner_text, 'uploader', default=owner_text),
-                'channel_id': self.ucid_or_none(browse_ep.get('browseId')),
-                'uploader_id': self.handle_from_url(urljoin('https://www.youtube.com', browse_ep.get('canonicalBaseUrl')))
-            })
-
-        info.update({
-            'uploader': info['channel'],
-            'channel_url': format_field(info.get('channel_id'), None, 'https://www.youtube.com/channel/%s', default=None),
-            'uploader_url': format_field(info.get('uploader_id'), None, 'https://www.youtube.com/%s', default=None),
-        })
-
-        return info
-
-    def _extract_inline_playlist(self, playlist, playlist_id, data, ytcfg):
-        first_id = last_id = response = None
-        for page_num in itertools.count(1):
-            videos = list(self._playlist_entries(playlist))
-            if not videos:
-                return
-            start = next((i for i, v in enumerate(videos) if v['id'] == last_id), -1) + 1
-            if start >= len(videos):
-                return
-            yield from videos[start:]
-            first_id = first_id or videos[0]['id']
-            last_id = videos[-1]['id']
-            watch_endpoint = try_get(
-                playlist, lambda x: x['contents'][-1]['playlistPanelVideoRenderer']['navigationEndpoint']['watchEndpoint'])
-            headers = self.generate_api_headers(
-                ytcfg=ytcfg, account_syncid=self._extract_account_syncid(ytcfg, data),
-                visitor_data=self._extract_visitor_data(response, data, ytcfg))
-            query = {
-                'playlistId': playlist_id,
-                'videoId': watch_endpoint.get('videoId') or last_id,
-                'index': watch_endpoint.get('index') or len(videos),
-                'params': watch_endpoint.get('params') or 'OAE%3D'
-            }
-            response = self._extract_response(
-                item_id='%s page %d' % (playlist_id, page_num),
-                query=query, ep='next', headers=headers, ytcfg=ytcfg,
-                check_get_keys='contents'
-            )
-            playlist = try_get(
-                response, lambda x: x['contents']['twoColumnWatchNextResults']['playlist']['playlist'], dict)
-
-    def _extract_from_playlist(self, item_id, url, data, playlist, ytcfg):
-        title = playlist.get('title') or try_get(
-            data, lambda x: x['titleText']['simpleText'], str)
-        playlist_id = playlist.get('playlistId') or item_id
-
-        # Delegating everything except mix playlists to regular tab-based playlist URL
-        playlist_url = urljoin(url, try_get(
-            playlist, lambda x: x['endpoint']['commandMetadata']['webCommandMetadata']['url'],
-            str))
-
-        # Some playlists are unviewable but YouTube still provides a link to the (broken) playlist page [1]
-        # [1] MLCT, RLTDwFCb4jeqaKWnciAYM-ZVHg
-        is_known_unviewable = re.fullmatch(r'MLCT|RLTD[\w-]{22}', playlist_id)
-
-        if playlist_url and playlist_url != url and not is_known_unviewable:
-            return self.url_result(
-                playlist_url, ie=YoutubeTabIE.ie_key(), video_id=playlist_id,
-                video_title=title)
-
-        return self.playlist_result(
-            self._extract_inline_playlist(playlist, playlist_id, data, ytcfg),
-            playlist_id=playlist_id, playlist_title=title)
-
-    def _extract_availability(self, data):
-        """
-        Gets the availability of a given playlist/tab.
-        Note: Unless YouTube tells us explicitly, we do not assume it is public
-        @param data: response
-        """
-        sidebar_renderer = self._extract_sidebar_info_renderer(data, 'playlistSidebarPrimaryInfoRenderer') or {}
-        playlist_header_renderer = traverse_obj(data, ('header', 'playlistHeaderRenderer')) or {}
-        player_header_privacy = playlist_header_renderer.get('privacy')
-
-        badges = self._extract_badges(traverse_obj(sidebar_renderer, 'badges'))
-
-        # Personal playlists, when authenticated, have a dropdown visibility selector instead of a badge
-        privacy_setting_icon = get_first(
-            (playlist_header_renderer, sidebar_renderer),
-            ('privacyForm', 'dropdownFormFieldRenderer', 'dropdown', 'dropdownRenderer', 'entries',
-             lambda _, v: v['privacyDropdownItemRenderer']['isSelected'], 'privacyDropdownItemRenderer', 'icon', 'iconType'),
-            expected_type=str)
-
-        microformats_is_unlisted = traverse_obj(
-            data, ('microformat', 'microformatDataRenderer', 'unlisted'), expected_type=bool)
-
-        return (
-            'public' if (
-                self._has_badge(badges, BadgeType.AVAILABILITY_PUBLIC)
-                or player_header_privacy == 'PUBLIC'
-                or privacy_setting_icon == 'PRIVACY_PUBLIC')
-            else self._availability(
-                is_private=(
-                    self._has_badge(badges, BadgeType.AVAILABILITY_PRIVATE)
-                    or player_header_privacy == 'PRIVATE' if player_header_privacy is not None
-                    else privacy_setting_icon == 'PRIVACY_PRIVATE' if privacy_setting_icon is not None else None),
-                is_unlisted=(
-                    self._has_badge(badges, BadgeType.AVAILABILITY_UNLISTED)
-                    or player_header_privacy == 'UNLISTED' if player_header_privacy is not None
-                    else privacy_setting_icon == 'PRIVACY_UNLISTED' if privacy_setting_icon is not None
-                    else microformats_is_unlisted if microformats_is_unlisted is not None else None),
-                needs_subscription=self._has_badge(badges, BadgeType.AVAILABILITY_SUBSCRIPTION) or None,
-                needs_premium=self._has_badge(badges, BadgeType.AVAILABILITY_PREMIUM) or None,
-                needs_auth=False))
-
-    @staticmethod
-    def _extract_sidebar_info_renderer(data, info_renderer, expected_type=dict):
-        sidebar_renderer = try_get(
-            data, lambda x: x['sidebar']['playlistSidebarRenderer']['items'], list) or []
-        for item in sidebar_renderer:
-            renderer = try_get(item, lambda x: x[info_renderer], expected_type)
-            if renderer:
-                return renderer
-
-    def _reload_with_unavailable_videos(self, item_id, data, ytcfg):
-        """
-        Reload playlists with unavailable videos (e.g. private videos, region blocked, etc.)
-        """
-        is_playlist = bool(traverse_obj(
-            data, ('metadata', 'playlistMetadataRenderer'), ('header', 'playlistHeaderRenderer')))
-        if not is_playlist:
-            return
-        headers = self.generate_api_headers(
-            ytcfg=ytcfg, account_syncid=self._extract_account_syncid(ytcfg, data),
-            visitor_data=self._extract_visitor_data(data, ytcfg))
-        query = {
-            'params': 'wgYCCAA=',
-            'browseId': f'VL{item_id}'
-        }
-        return self._extract_response(
-            item_id=item_id, headers=headers, query=query,
-            check_get_keys='contents', fatal=False, ytcfg=ytcfg,
-            note='Redownloading playlist API JSON with unavailable videos')
-
-    @functools.cached_property
-    def skip_webpage(self):
-        return 'webpage' in self._configuration_arg('skip', ie_key=YoutubeTabIE.ie_key())
-
-    def _extract_webpage(self, url, item_id, fatal=True):
-        webpage, data = None, None
-        for retry in self.RetryManager(fatal=fatal):
-            try:
-                webpage = self._download_webpage(url, item_id, note='Downloading webpage')
-                data = self.extract_yt_initial_data(item_id, webpage or '', fatal=fatal) or {}
-            except ExtractorError as e:
-                if isinstance(e.cause, network_exceptions):
-                    if not isinstance(e.cause, HTTPError) or e.cause.status not in (403, 429):
-                        retry.error = e
-                        continue
-                self._error_or_warning(e, fatal=fatal)
-                break
-
-            try:
-                self._extract_and_report_alerts(data)
-            except ExtractorError as e:
-                self._error_or_warning(e, fatal=fatal)
-                break
-
-            # Sometimes youtube returns a webpage with incomplete ytInitialData
-            # See: https://github.com/yt-dlp/yt-dlp/issues/116
-            if not traverse_obj(data, 'contents', 'currentVideoEndpoint', 'onResponseReceivedActions'):
-                retry.error = ExtractorError('Incomplete yt initial data received')
-                continue
-
-        return webpage, data
-
-    def _report_playlist_authcheck(self, ytcfg, fatal=True):
-        """Use if failed to extract ytcfg (and data) from initial webpage"""
-        if not ytcfg and self.is_authenticated:
-            msg = 'Playlists that require authentication may not extract correctly without a successful webpage download'
-            if 'authcheck' not in self._configuration_arg('skip', ie_key=YoutubeTabIE.ie_key()) and fatal:
-                raise ExtractorError(
-                    f'{msg}. If you are not downloading private content, or '
-                    'your cookies are only for the first account and channel,'
-                    ' pass "--extractor-args youtubetab:skip=authcheck" to skip this check',
-                    expected=True)
-            self.report_warning(msg, only_once=True)
-
-    def _extract_data(self, url, item_id, ytcfg=None, fatal=True, webpage_fatal=False, default_client='web'):
-        data = None
-        if not self.skip_webpage:
-            webpage, data = self._extract_webpage(url, item_id, fatal=webpage_fatal)
-            ytcfg = ytcfg or self.extract_ytcfg(item_id, webpage)
-            # Reject webpage data if redirected to home page without explicitly requesting
-            selected_tab = self._extract_selected_tab(self._extract_tab_renderers(data), fatal=False) or {}
-            if (url != 'https://www.youtube.com/feed/recommended'
-                    and selected_tab.get('tabIdentifier') == 'FEwhat_to_watch'  # Home page
-                    and 'no-youtube-channel-redirect' not in self.get_param('compat_opts', [])):
-                msg = 'The channel/playlist does not exist and the URL redirected to youtube.com home page'
-                if fatal:
-                    raise ExtractorError(msg, expected=True)
-                self.report_warning(msg, only_once=True)
-        if not data:
-            self._report_playlist_authcheck(ytcfg, fatal=fatal)
-            data = self._extract_tab_endpoint(url, item_id, ytcfg, fatal=fatal, default_client=default_client)
-        return data, ytcfg
-
-    def _extract_tab_endpoint(self, url, item_id, ytcfg=None, fatal=True, default_client='web'):
-        headers = self.generate_api_headers(ytcfg=ytcfg, default_client=default_client)
-        resolve_response = self._extract_response(
-            item_id=item_id, query={'url': url}, check_get_keys='endpoint', headers=headers, ytcfg=ytcfg, fatal=fatal,
-            ep='navigation/resolve_url', note='Downloading API parameters API JSON', default_client=default_client)
-        endpoints = {'browseEndpoint': 'browse', 'watchEndpoint': 'next'}
-        for ep_key, ep in endpoints.items():
-            params = try_get(resolve_response, lambda x: x['endpoint'][ep_key], dict)
-            if params:
-                return self._extract_response(
-                    item_id=item_id, query=params, ep=ep, headers=headers,
-                    ytcfg=ytcfg, fatal=fatal, default_client=default_client,
-                    check_get_keys=('contents', 'currentVideoEndpoint', 'onResponseReceivedActions'))
-        err_note = 'Failed to resolve url (does the playlist exist?)'
-        if fatal:
-            raise ExtractorError(err_note, expected=True)
-        self.report_warning(err_note, item_id)
-
-    _SEARCH_PARAMS = None
-
-    def _search_results(self, query, params=NO_DEFAULT, default_client='web'):
-        data = {'query': query}
-        if params is NO_DEFAULT:
-            params = self._SEARCH_PARAMS
-        if params:
-            data['params'] = params
-
-        content_keys = (
-            ('contents', 'twoColumnSearchResultsRenderer', 'primaryContents', 'sectionListRenderer', 'contents'),
-            ('onResponseReceivedCommands', 0, 'appendContinuationItemsAction', 'continuationItems'),
-            # ytmusic search
-            ('contents', 'tabbedSearchResultsRenderer', 'tabs', 0, 'tabRenderer', 'content', 'sectionListRenderer', 'contents'),
-            ('continuationContents', ),
-        )
-        display_id = f'query "{query}"'
-        check_get_keys = tuple({keys[0] for keys in content_keys})
-        ytcfg = self._download_ytcfg(default_client, display_id) if not self.skip_webpage else {}
-        self._report_playlist_authcheck(ytcfg, fatal=False)
-
-        continuation_list = [None]
-        search = None
-        for page_num in itertools.count(1):
-            data.update(continuation_list[0] or {})
-            headers = self.generate_api_headers(
-                ytcfg=ytcfg, visitor_data=self._extract_visitor_data(search), default_client=default_client)
-            search = self._extract_response(
-                item_id=f'{display_id} page {page_num}', ep='search', query=data,
-                default_client=default_client, check_get_keys=check_get_keys, ytcfg=ytcfg, headers=headers)
-            slr_contents = traverse_obj(search, *content_keys)
-            yield from self._extract_entries({'contents': list(variadic(slr_contents))}, continuation_list)
-            if not continuation_list[0]:
-                break
-
-
-class YoutubeTabIE(YoutubeTabBaseInfoExtractor):
-    IE_DESC = 'YouTube Tabs'
-    _VALID_URL = r'''(?x:
-        https?://
-            (?!consent\.)(?:\w+\.)?
-            (?:
-                youtube(?:kids)?\.com|
-                %(invidious)s
-            )/
-            (?:
-                (?P<channel_type>channel|c|user|browse)/|
-                (?P<not_channel>
-                    feed/|hashtag/|
-                    (?:playlist|watch)\?.*?\blist=
-                )|
-                (?!(?:%(reserved_names)s)\b)  # Direct URLs
-            )
-            (?P<id>[^/?\#&]+)
-    )''' % {
-        'reserved_names': YoutubeBaseInfoExtractor._RESERVED_NAMES,
-        'invidious': '|'.join(YoutubeBaseInfoExtractor._INVIDIOUS_SITES),
-    }
-    IE_NAME = 'youtube:tab'
-
-    _TESTS = [{
-        'note': 'playlists, multipage',
-        'url': 'https://www.youtube.com/c/ИгорьКлейнер/playlists?view=1&flow=grid',
-        'playlist_mincount': 94,
-        'info_dict': {
-            'id': 'UCqj7Cz7revf5maW9g5pgNcg',
-            'title': 'Igor Kleiner - Playlists',
-            'description': 'md5:be97ee0f14ee314f1f002cf187166ee2',
-            'uploader': 'Igor Kleiner',
-            'uploader_id': '@IgorDataScience',
-            'uploader_url': 'https://www.youtube.com/@IgorDataScience',
-            'channel': 'Igor Kleiner',
-            'channel_id': 'UCqj7Cz7revf5maW9g5pgNcg',
-            'tags': ['"критическое', 'мышление"', '"наука', 'просто"', 'математика', '"анализ', 'данных"'],
-            'channel_url': 'https://www.youtube.com/channel/UCqj7Cz7revf5maW9g5pgNcg',
-            'channel_follower_count': int
-        },
-    }, {
-        'note': 'playlists, multipage, different order',
-        'url': 'https://www.youtube.com/user/igorkle1/playlists?view=1&sort=dd',
-        'playlist_mincount': 94,
-        'info_dict': {
-            'id': 'UCqj7Cz7revf5maW9g5pgNcg',
-            'title': 'Igor Kleiner - Playlists',
-            'description': 'md5:be97ee0f14ee314f1f002cf187166ee2',
-            'uploader': 'Igor Kleiner',
-            'uploader_id': '@IgorDataScience',
-            'uploader_url': 'https://www.youtube.com/@IgorDataScience',
-            'tags': ['"критическое', 'мышление"', '"наука', 'просто"', 'математика', '"анализ', 'данных"'],
-            'channel_id': 'UCqj7Cz7revf5maW9g5pgNcg',
-            'channel': 'Igor Kleiner',
-            'channel_url': 'https://www.youtube.com/channel/UCqj7Cz7revf5maW9g5pgNcg',
-            'channel_follower_count': int
-        },
-    }, {
-        'note': 'playlists, series',
-        'url': 'https://www.youtube.com/c/3blue1brown/playlists?view=50&sort=dd&shelf_id=3',
-        'playlist_mincount': 5,
-        'info_dict': {
-            'id': 'UCYO_jab_esuFRV4b17AJtAw',
-            'title': '3Blue1Brown - Playlists',
-            'description': 'md5:e1384e8a133307dd10edee76e875d62f',
-            'channel_url': 'https://www.youtube.com/channel/UCYO_jab_esuFRV4b17AJtAw',
-            'channel': '3Blue1Brown',
-            'channel_id': 'UCYO_jab_esuFRV4b17AJtAw',
-            'uploader_id': '@3blue1brown',
-            'uploader_url': 'https://www.youtube.com/@3blue1brown',
-            'uploader': '3Blue1Brown',
-            'tags': ['Mathematics'],
-            'channel_follower_count': int,
-            'channel_is_verified': True,
-        },
-    }, {
-        'note': 'playlists, singlepage',
-        'url': 'https://www.youtube.com/user/ThirstForScience/playlists',
-        'playlist_mincount': 4,
-        'info_dict': {
-            'id': 'UCAEtajcuhQ6an9WEzY9LEMQ',
-            'title': 'ThirstForScience - Playlists',
-            'description': 'md5:609399d937ea957b0f53cbffb747a14c',
-            'uploader': 'ThirstForScience',
-            'uploader_url': 'https://www.youtube.com/@ThirstForScience',
-            'uploader_id': '@ThirstForScience',
-            'channel_id': 'UCAEtajcuhQ6an9WEzY9LEMQ',
-            'channel_url': 'https://www.youtube.com/channel/UCAEtajcuhQ6an9WEzY9LEMQ',
-            'tags': 'count:13',
-            'channel': 'ThirstForScience',
-            'channel_follower_count': int
-        }
-    }, {
-        'url': 'https://www.youtube.com/c/ChristophLaimer/playlists',
-        'only_matching': True,
-    }, {
-        'note': 'basic, single video playlist',
-        'url': 'https://www.youtube.com/playlist?list=PL4lCao7KL_QFVb7Iudeipvc2BCavECqzc',
-        'info_dict': {
-            'id': 'PL4lCao7KL_QFVb7Iudeipvc2BCavECqzc',
-            'title': 'youtube-dl public playlist',
-            'description': '',
-            'tags': [],
-            'view_count': int,
-            'modified_date': '20201130',
-            'channel': 'Sergey M.',
-            'channel_id': 'UCmlqkdCBesrv2Lak1mF_MxA',
-            'channel_url': 'https://www.youtube.com/channel/UCmlqkdCBesrv2Lak1mF_MxA',
-            'availability': 'public',
-            'uploader': 'Sergey M.',
-            'uploader_url': 'https://www.youtube.com/@sergeym.6173',
-            'uploader_id': '@sergeym.6173',
-        },
-        'playlist_count': 1,
-    }, {
-        'note': 'empty playlist',
-        'url': 'https://www.youtube.com/playlist?list=PL4lCao7KL_QFodcLWhDpGCYnngnHtQ-Xf',
-        'info_dict': {
-            'id': 'PL4lCao7KL_QFodcLWhDpGCYnngnHtQ-Xf',
-            'title': 'youtube-dl empty playlist',
-            'tags': [],
-            'channel': 'Sergey M.',
-            'description': '',
-            'modified_date': '20160902',
-            'channel_id': 'UCmlqkdCBesrv2Lak1mF_MxA',
-            'channel_url': 'https://www.youtube.com/channel/UCmlqkdCBesrv2Lak1mF_MxA',
-            'availability': 'public',
-            'uploader_url': 'https://www.youtube.com/@sergeym.6173',
-            'uploader_id': '@sergeym.6173',
-            'uploader': 'Sergey M.',
-        },
-        'playlist_count': 0,
-    }, {
-        'note': 'Home tab',
-        'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/featured',
-        'info_dict': {
-            'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',
-            'title': 'lex will - Home',
-            'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',
-            'uploader': 'lex will',
-            'uploader_id': '@lexwill718',
-            'channel': 'lex will',
-            'tags': ['bible', 'history', 'prophesy'],
-            'uploader_url': 'https://www.youtube.com/@lexwill718',
-            'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',
-            'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',
-            'channel_follower_count': int
-        },
-        'playlist_mincount': 2,
-    }, {
-        'note': 'Videos tab',
-        'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/videos',
-        'info_dict': {
-            'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',
-            'title': 'lex will - Videos',
-            'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',
-            'uploader': 'lex will',
-            'uploader_id': '@lexwill718',
-            'tags': ['bible', 'history', 'prophesy'],
-            'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',
-            'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',
-            'uploader_url': 'https://www.youtube.com/@lexwill718',
-            'channel': 'lex will',
-            'channel_follower_count': int
-        },
-        'playlist_mincount': 975,
-    }, {
-        'note': 'Videos tab, sorted by popular',
-        'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/videos?view=0&sort=p&flow=grid',
-        'info_dict': {
-            'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',
-            'title': 'lex will - Videos',
-            'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',
-            'uploader': 'lex will',
-            'uploader_id': '@lexwill718',
-            'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',
-            'uploader_url': 'https://www.youtube.com/@lexwill718',
-            'channel': 'lex will',
-            'tags': ['bible', 'history', 'prophesy'],
-            'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',
-            'channel_follower_count': int
-        },
-        'playlist_mincount': 199,
-    }, {
-        'note': 'Playlists tab',
-        'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/playlists',
-        'info_dict': {
-            'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',
-            'title': 'lex will - Playlists',
-            'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',
-            'uploader': 'lex will',
-            'uploader_id': '@lexwill718',
-            'uploader_url': 'https://www.youtube.com/@lexwill718',
-            'channel': 'lex will',
-            'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',
-            'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',
-            'tags': ['bible', 'history', 'prophesy'],
-            'channel_follower_count': int
-        },
-        'playlist_mincount': 17,
-    }, {
-        'note': 'Community tab',
-        'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/community',
-        'info_dict': {
-            'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',
-            'title': 'lex will - Community',
-            'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',
-            'channel': 'lex will',
-            'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',
-            'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',
-            'tags': ['bible', 'history', 'prophesy'],
-            'channel_follower_count': int,
-            'uploader_url': 'https://www.youtube.com/@lexwill718',
-            'uploader_id': '@lexwill718',
-            'uploader': 'lex will',
-        },
-        'playlist_mincount': 18,
-    }, {
-        'note': 'Channels tab',
-        'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/channels',
-        'info_dict': {
-            'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',
-            'title': 'lex will - Channels',
-            'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',
-            'channel': 'lex will',
-            'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',
-            'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',
-            'tags': ['bible', 'history', 'prophesy'],
-            'channel_follower_count': int,
-            'uploader_url': 'https://www.youtube.com/@lexwill718',
-            'uploader_id': '@lexwill718',
-            'uploader': 'lex will',
-        },
-        'playlist_mincount': 12,
-    }, {
-        'note': 'Search tab',
-        'url': 'https://www.youtube.com/c/3blue1brown/search?query=linear%20algebra',
-        'playlist_mincount': 40,
-        'info_dict': {
-            'id': 'UCYO_jab_esuFRV4b17AJtAw',
-            'title': '3Blue1Brown - Search - linear algebra',
-            'description': 'md5:e1384e8a133307dd10edee76e875d62f',
-            'channel_url': 'https://www.youtube.com/channel/UCYO_jab_esuFRV4b17AJtAw',
-            'tags': ['Mathematics'],
-            'channel': '3Blue1Brown',
-            'channel_id': 'UCYO_jab_esuFRV4b17AJtAw',
-            'channel_follower_count': int,
-            'uploader_url': 'https://www.youtube.com/@3blue1brown',
-            'uploader_id': '@3blue1brown',
-            'uploader': '3Blue1Brown',
-            'channel_is_verified': True,
-        },
-    }, {
-        'url': 'https://invidio.us/channel/UCmlqkdCBesrv2Lak1mF_MxA',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.youtubekids.com/channel/UCmlqkdCBesrv2Lak1mF_MxA',
-        'only_matching': True,
-    }, {
-        'url': 'https://music.youtube.com/channel/UCmlqkdCBesrv2Lak1mF_MxA',
-        'only_matching': True,
-    }, {
-        'note': 'Playlist with deleted videos (#651). As a bonus, the video #51 is also twice in this list.',
-        'url': 'https://www.youtube.com/playlist?list=PLwP_SiAcdui0KVebT0mU9Apz359a4ubsC',
-        'info_dict': {
-            'title': '29C3: Not my department',
-            'id': 'PLwP_SiAcdui0KVebT0mU9Apz359a4ubsC',
-            'description': 'md5:a14dc1a8ef8307a9807fe136a0660268',
-            'tags': [],
-            'view_count': int,
-            'modified_date': '20150605',
-            'channel_id': 'UCEPzS1rYsrkqzSLNp76nrcg',
-            'channel_url': 'https://www.youtube.com/channel/UCEPzS1rYsrkqzSLNp76nrcg',
-            'channel': 'Christiaan008',
-            'availability': 'public',
-            'uploader_id': '@ChRiStIaAn008',
-            'uploader': 'Christiaan008',
-            'uploader_url': 'https://www.youtube.com/@ChRiStIaAn008',
-        },
-        'playlist_count': 96,
-    }, {
-        'note': 'Large playlist',
-        'url': 'https://www.youtube.com/playlist?list=UUBABnxM4Ar9ten8Mdjj1j0Q',
-        'info_dict': {
-            'title': 'Uploads from Cauchemar',
-            'id': 'UUBABnxM4Ar9ten8Mdjj1j0Q',
-            'channel_url': 'https://www.youtube.com/channel/UCBABnxM4Ar9ten8Mdjj1j0Q',
-            'tags': [],
-            'modified_date': r're:\d{8}',
-            'channel': 'Cauchemar',
-            'view_count': int,
-            'description': '',
-            'channel_id': 'UCBABnxM4Ar9ten8Mdjj1j0Q',
-            'availability': 'public',
-            'uploader_id': '@Cauchemar89',
-            'uploader': 'Cauchemar',
-            'uploader_url': 'https://www.youtube.com/@Cauchemar89',
-        },
-        'playlist_mincount': 1123,
-        'expected_warnings': [r'[Uu]navailable videos (are|will be) hidden'],
-    }, {
-        'note': 'even larger playlist, 8832 videos',
-        'url': 'http://www.youtube.com/user/NASAgovVideo/videos',
-        'only_matching': True,
-    }, {
-        'note': 'Buggy playlist: the webpage has a "Load more" button but it doesn\'t have more videos',
-        'url': 'https://www.youtube.com/playlist?list=UUXw-G3eDE9trcvY2sBMM_aA',
-        'info_dict': {
-            'title': 'Uploads from Interstellar Movie',
-            'id': 'UUXw-G3eDE9trcvY2sBMM_aA',
-            'tags': [],
-            'view_count': int,
-            'channel_id': 'UCXw-G3eDE9trcvY2sBMM_aA',
-            'channel_url': 'https://www.youtube.com/channel/UCXw-G3eDE9trcvY2sBMM_aA',
-            'channel': 'Interstellar Movie',
-            'description': '',
-            'modified_date': r're:\d{8}',
-            'availability': 'public',
-            'uploader_id': '@InterstellarMovie',
-            'uploader': 'Interstellar Movie',
-            'uploader_url': 'https://www.youtube.com/@InterstellarMovie',
-        },
-        'playlist_mincount': 21,
-    }, {
-        'note': 'Playlist with "show unavailable videos" button',
-        'url': 'https://www.youtube.com/playlist?list=UUTYLiWFZy8xtPwxFwX9rV7Q',
-        'info_dict': {
-            'title': 'Uploads from Phim Siêu Nhân Nhật Bản',
-            'id': 'UUTYLiWFZy8xtPwxFwX9rV7Q',
-            'view_count': int,
-            'channel': 'Phim Siêu Nhân Nhật Bản',
-            'tags': [],
-            'description': '',
-            'channel_url': 'https://www.youtube.com/channel/UCTYLiWFZy8xtPwxFwX9rV7Q',
-            'channel_id': 'UCTYLiWFZy8xtPwxFwX9rV7Q',
-            'modified_date': r're:\d{8}',
-            'availability': 'public',
-            'uploader_url': 'https://www.youtube.com/@phimsieunhannhatban',
-            'uploader_id': '@phimsieunhannhatban',
-            'uploader': 'Phim Siêu Nhân Nhật Bản',
-        },
-        'playlist_mincount': 200,
-        'expected_warnings': [r'[Uu]navailable videos (are|will be) hidden'],
-    }, {
-        'note': 'Playlist with unavailable videos in page 7',
-        'url': 'https://www.youtube.com/playlist?list=UU8l9frL61Yl5KFOl87nIm2w',
-        'info_dict': {
-            'title': 'Uploads from BlankTV',
-            'id': 'UU8l9frL61Yl5KFOl87nIm2w',
-            'channel': 'BlankTV',
-            'channel_url': 'https://www.youtube.com/channel/UC8l9frL61Yl5KFOl87nIm2w',
-            'channel_id': 'UC8l9frL61Yl5KFOl87nIm2w',
-            'view_count': int,
-            'tags': [],
-            'modified_date': r're:\d{8}',
-            'description': '',
-            'availability': 'public',
-            'uploader_id': '@blanktv',
-            'uploader': 'BlankTV',
-            'uploader_url': 'https://www.youtube.com/@blanktv',
-        },
-        'playlist_mincount': 1000,
-        'expected_warnings': [r'[Uu]navailable videos (are|will be) hidden'],
-    }, {
-        'note': 'https://github.com/ytdl-org/youtube-dl/issues/21844',
-        'url': 'https://www.youtube.com/playlist?list=PLzH6n4zXuckpfMu_4Ff8E7Z1behQks5ba',
-        'info_dict': {
-            'title': 'Data Analysis with Dr Mike Pound',
-            'id': 'PLzH6n4zXuckpfMu_4Ff8E7Z1behQks5ba',
-            'description': 'md5:7f567c574d13d3f8c0954d9ffee4e487',
-            'tags': [],
-            'view_count': int,
-            'channel_id': 'UC9-y-6csu5WGm29I7JiwpnA',
-            'channel_url': 'https://www.youtube.com/channel/UC9-y-6csu5WGm29I7JiwpnA',
-            'channel': 'Computerphile',
-            'availability': 'public',
-            'modified_date': '20190712',
-            'uploader_id': '@Computerphile',
-            'uploader': 'Computerphile',
-            'uploader_url': 'https://www.youtube.com/@Computerphile',
-        },
-        'playlist_mincount': 11,
-    }, {
-        'url': 'https://invidio.us/playlist?list=PL4lCao7KL_QFVb7Iudeipvc2BCavECqzc',
-        'only_matching': True,
-    }, {
-        'note': 'Playlist URL that does not actually serve a playlist',
-        'url': 'https://www.youtube.com/watch?v=FqZTN594JQw&list=PLMYEtVRpaqY00V9W81Cwmzp6N6vZqfUKD4',
-        'info_dict': {
-            'id': 'FqZTN594JQw',
-            'ext': 'webm',
-            'title': "Smiley's People 01 detective, Adventure Series, Action",
-            'upload_date': '20150526',
-            'license': 'Standard YouTube License',
-            'description': 'md5:507cdcb5a49ac0da37a920ece610be80',
-            'categories': ['People & Blogs'],
-            'tags': list,
-            'view_count': int,
-            'like_count': int,
-        },
-        'params': {
-            'skip_download': True,
-        },
-        'skip': 'This video is not available.',
-        'add_ie': [YoutubeIE.ie_key()],
-    }, {
-        'url': 'https://www.youtubekids.com/watch?v=Agk7R8I8o5U&list=PUZ6jURNr1WQZCNHF0ao-c0g',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.youtube.com/watch?v=MuAGGZNfUkU&list=RDMM',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.youtube.com/channel/UCoMdktPbSTixAyNGwb-UYkQ/live',
-        'info_dict': {
-            'id': 'hGkQjiJLjWQ',  # This will keep changing
-            'ext': 'mp4',
-            'title': str,
-            'upload_date': r're:\d{8}',
-            'description': str,
-            'categories': ['News & Politics'],
-            'tags': list,
-            'like_count': int,
-            'release_timestamp': int,
-            'channel': 'Sky News',
-            'channel_id': 'UCoMdktPbSTixAyNGwb-UYkQ',
-            'age_limit': 0,
-            'view_count': int,
-            'thumbnail': r're:https?://i\.ytimg\.com/vi/[^/]+/maxresdefault(?:_live)?\.jpg',
-            'playable_in_embed': True,
-            'release_date': r're:\d+',
-            'availability': 'public',
-            'live_status': 'is_live',
-            'channel_url': 'https://www.youtube.com/channel/UCoMdktPbSTixAyNGwb-UYkQ',
-            'channel_follower_count': int,
-            'concurrent_view_count': int,
-            'uploader_url': 'https://www.youtube.com/@SkyNews',
-            'uploader_id': '@SkyNews',
-            'uploader': 'Sky News',
-            'channel_is_verified': True,
-        },
-        'params': {
-            'skip_download': True,
-        },
-        'expected_warnings': ['Ignoring subtitle tracks found in '],
-    }, {
-        'url': 'https://www.youtube.com/user/TheYoungTurks/live',
-        'info_dict': {
-            'id': 'a48o2S1cPoo',
-            'ext': 'mp4',
-            'title': 'The Young Turks - Live Main Show',
-            'upload_date': '20150715',
-            'license': 'Standard YouTube License',
-            'description': 'md5:438179573adcdff3c97ebb1ee632b891',
-            'categories': ['News & Politics'],
-            'tags': ['Cenk Uygur (TV Program Creator)', 'The Young Turks (Award-Winning Work)', 'Talk Show (TV Genre)'],
-            'like_count': int,
-        },
-        'params': {
-            'skip_download': True,
-        },
-        'only_matching': True,
-    }, {
-        'url': 'https://www.youtube.com/channel/UC1yBKRuGpC1tSM73A0ZjYjQ/live',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.youtube.com/c/CommanderVideoHq/live',
-        'only_matching': True,
-    }, {
-        'note': 'A channel that is not live. Should raise error',
-        'url': 'https://www.youtube.com/user/numberphile/live',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.youtube.com/feed/trending',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.youtube.com/feed/library',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.youtube.com/feed/history',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.youtube.com/feed/subscriptions',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.youtube.com/feed/watch_later',
-        'only_matching': True,
-    }, {
-        'note': 'Recommended - redirects to home page.',
-        'url': 'https://www.youtube.com/feed/recommended',
-        'only_matching': True,
-    }, {
-        'note': 'inline playlist with not always working continuations',
-        'url': 'https://www.youtube.com/watch?v=UC6u0Tct-Fo&list=PL36D642111D65BE7C',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.youtube.com/course',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.youtube.com/zsecurity',
-        'only_matching': True,
-    }, {
-        'url': 'http://www.youtube.com/NASAgovVideo/videos',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.youtube.com/TheYoungTurks/live',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.youtube.com/hashtag/cctv9',
-        'info_dict': {
-            'id': 'cctv9',
-            'title': '#cctv9',
-            'tags': [],
-        },
-        'playlist_mincount': 300,  # not consistent but should be over 300
-    }, {
-        'url': 'https://www.youtube.com/watch?list=PLW4dVinRY435CBE_JD3t-0SRXKfnZHS1P&feature=youtu.be&v=M9cJMXmQ_ZU',
-        'only_matching': True,
-    }, {
-        'note': 'Requires Premium: should request additional YTM-info webpage (and have format 141) for videos in playlist',
-        'url': 'https://music.youtube.com/playlist?list=PLRBp0Fe2GpgmgoscNFLxNyBVSFVdYmFkq',
-        'only_matching': True
-    }, {
-        'note': '/browse/ should redirect to /channel/',
-        'url': 'https://music.youtube.com/browse/UC1a8OFewdjuLq6KlF8M_8Ng',
-        'only_matching': True
-    }, {
-        'note': 'VLPL, should redirect to playlist?list=PL...',
-        'url': 'https://music.youtube.com/browse/VLPLRBp0Fe2GpgmgoscNFLxNyBVSFVdYmFkq',
-        'info_dict': {
-            'id': 'PLRBp0Fe2GpgmgoscNFLxNyBVSFVdYmFkq',
-            'description': 'Providing you with copyright free / safe music for gaming, live streaming, studying and more!',
-            'title': 'NCS : All Releases 💿',
-            'channel_url': 'https://www.youtube.com/channel/UC_aEa8K-EOJ3D6gOs7HcyNg',
-            'modified_date': r're:\d{8}',
-            'view_count': int,
-            'channel_id': 'UC_aEa8K-EOJ3D6gOs7HcyNg',
-            'tags': [],
-            'channel': 'NoCopyrightSounds',
-            'availability': 'public',
-            'uploader_url': 'https://www.youtube.com/@NoCopyrightSounds',
-            'uploader': 'NoCopyrightSounds',
-            'uploader_id': '@NoCopyrightSounds',
-        },
-        'playlist_mincount': 166,
-        'expected_warnings': [r'[Uu]navailable videos (are|will be) hidden', 'YouTube Music is not directly supported'],
-    }, {
-        # TODO: fix 'unviewable' issue with this playlist when reloading with unavailable videos
-        'note': 'Topic, should redirect to playlist?list=UU...',
-        'url': 'https://music.youtube.com/browse/UC9ALqqC4aIeG5iDs7i90Bfw',
-        'info_dict': {
-            'id': 'UU9ALqqC4aIeG5iDs7i90Bfw',
-            'title': 'Uploads from Royalty Free Music - Topic',
-            'tags': [],
-            'channel_id': 'UC9ALqqC4aIeG5iDs7i90Bfw',
-            'channel': 'Royalty Free Music - Topic',
-            'view_count': int,
-            'channel_url': 'https://www.youtube.com/channel/UC9ALqqC4aIeG5iDs7i90Bfw',
-            'modified_date': r're:\d{8}',
-            'description': '',
-            'availability': 'public',
-            'uploader': 'Royalty Free Music - Topic',
-        },
-        'playlist_mincount': 101,
-        'expected_warnings': ['YouTube Music is not directly supported', r'[Uu]navailable videos (are|will be) hidden'],
-    }, {
-        # Destination channel with only a hidden self tab (tab id is UCtFRv9O2AHqOZjjynzrv-xg)
-        # Treat as a general feed
-        'url': 'https://www.youtube.com/channel/UCtFRv9O2AHqOZjjynzrv-xg',
-        'info_dict': {
-            'id': 'UCtFRv9O2AHqOZjjynzrv-xg',
-            'title': 'UCtFRv9O2AHqOZjjynzrv-xg',
-            'tags': [],
-        },
-        'playlist_mincount': 9,
-    }, {
-        'note': 'Youtube music Album',
-        'url': 'https://music.youtube.com/browse/MPREb_gTAcphH99wE',
-        'info_dict': {
-            'id': 'OLAK5uy_l1m0thk3g31NmIIz_vMIbWtyv7eZixlH0',
-            'title': 'Album - Royalty Free Music Library V2 (50 Songs)',
-            'tags': [],
-            'view_count': int,
-            'description': '',
-            'availability': 'unlisted',
-            'modified_date': r're:\d{8}',
-        },
-        'playlist_count': 50,
-        'expected_warnings': ['YouTube Music is not directly supported'],
-    }, {
-        'note': 'unlisted single video playlist',
-        'url': 'https://www.youtube.com/playlist?list=PLwL24UFy54GrB3s2KMMfjZscDi1x5Dajf',
-        'info_dict': {
-            'id': 'PLwL24UFy54GrB3s2KMMfjZscDi1x5Dajf',
-            'title': 'yt-dlp unlisted playlist test',
-            'availability': 'unlisted',
-            'tags': [],
-            'modified_date': '20220418',
-            'channel': 'colethedj',
-            'view_count': int,
-            'description': '',
-            'channel_id': 'UC9zHu_mHU96r19o-wV5Qs1Q',
-            'channel_url': 'https://www.youtube.com/channel/UC9zHu_mHU96r19o-wV5Qs1Q',
-            'uploader_url': 'https://www.youtube.com/@colethedj1894',
-            'uploader_id': '@colethedj1894',
-            'uploader': 'colethedj',
-        },
-        'playlist': [{
-            'info_dict': {
-                'title': 'youtube-dl test video "\'/\\ä↭𝕐',
-                'id': 'BaW_jenozKc',
-                '_type': 'url',
-                'ie_key': 'Youtube',
-                'duration': 10,
-                'channel_id': 'UCLqxVugv74EIW3VWh2NOa3Q',
-                'channel_url': 'https://www.youtube.com/channel/UCLqxVugv74EIW3VWh2NOa3Q',
-                'view_count': int,
-                'url': 'https://www.youtube.com/watch?v=BaW_jenozKc',
-                'channel': 'Philipp Hagemeister',
-                'uploader_id': '@PhilippHagemeister',
-                'uploader_url': 'https://www.youtube.com/@PhilippHagemeister',
-                'uploader': 'Philipp Hagemeister',
-            }
-        }],
-        'playlist_count': 1,
-        'params': {'extract_flat': True},
-    }, {
-        'note': 'API Fallback: Recommended - redirects to home page. Requires visitorData',
-        'url': 'https://www.youtube.com/feed/recommended',
-        'info_dict': {
-            'id': 'recommended',
-            'title': 'recommended',
-            'tags': [],
-        },
-        'playlist_mincount': 50,
-        'params': {
-            'skip_download': True,
-            'extractor_args': {'youtubetab': {'skip': ['webpage']}}
-        },
-    }, {
-        'note': 'API Fallback: /videos tab, sorted by oldest first',
-        'url': 'https://www.youtube.com/user/theCodyReeder/videos?view=0&sort=da&flow=grid',
-        'info_dict': {
-            'id': 'UCu6mSoMNzHQiBIOCkHUa2Aw',
-            'title': 'Cody\'sLab - Videos',
-            'description': 'md5:d083b7c2f0c67ee7a6c74c3e9b4243fa',
-            'channel': 'Cody\'sLab',
-            'channel_id': 'UCu6mSoMNzHQiBIOCkHUa2Aw',
-            'tags': [],
-            'channel_url': 'https://www.youtube.com/channel/UCu6mSoMNzHQiBIOCkHUa2Aw',
-            'channel_follower_count': int
-        },
-        'playlist_mincount': 650,
-        'params': {
-            'skip_download': True,
-            'extractor_args': {'youtubetab': {'skip': ['webpage']}}
-        },
-        'skip': 'Query for sorting no longer works',
-    }, {
-        'note': 'API Fallback: Topic, should redirect to playlist?list=UU...',
-        'url': 'https://music.youtube.com/browse/UC9ALqqC4aIeG5iDs7i90Bfw',
-        'info_dict': {
-            'id': 'UU9ALqqC4aIeG5iDs7i90Bfw',
-            'title': 'Uploads from Royalty Free Music - Topic',
-            'modified_date': r're:\d{8}',
-            'channel_id': 'UC9ALqqC4aIeG5iDs7i90Bfw',
-            'description': '',
-            'channel_url': 'https://www.youtube.com/channel/UC9ALqqC4aIeG5iDs7i90Bfw',
-            'tags': [],
-            'channel': 'Royalty Free Music - Topic',
-            'view_count': int,
-            'availability': 'public',
-            'uploader': 'Royalty Free Music - Topic',
-        },
-        'playlist_mincount': 101,
-        'params': {
-            'skip_download': True,
-            'extractor_args': {'youtubetab': {'skip': ['webpage']}}
-        },
-        'expected_warnings': ['YouTube Music is not directly supported', r'[Uu]navailable videos (are|will be) hidden'],
-    }, {
-        'note': 'non-standard redirect to regional channel',
-        'url': 'https://www.youtube.com/channel/UCwVVpHQ2Cs9iGJfpdFngePQ',
-        'only_matching': True
-    }, {
-        'note': 'collaborative playlist (uploader name in the form "by <uploader> and x other(s)")',
-        'url': 'https://www.youtube.com/playlist?list=PLx-_-Kk4c89oOHEDQAojOXzEzemXxoqx6',
-        'info_dict': {
-            'id': 'PLx-_-Kk4c89oOHEDQAojOXzEzemXxoqx6',
-            'modified_date': '20220407',
-            'channel_url': 'https://www.youtube.com/channel/UCKcqXmCcyqnhgpA5P0oHH_Q',
-            'tags': [],
-            'availability': 'unlisted',
-            'channel_id': 'UCKcqXmCcyqnhgpA5P0oHH_Q',
-            'channel': 'pukkandan',
-            'description': 'Test for collaborative playlist',
-            'title': 'yt-dlp test - collaborative playlist',
-            'view_count': int,
-            'uploader_url': 'https://www.youtube.com/@pukkandan',
-            'uploader_id': '@pukkandan',
-            'uploader': 'pukkandan',
-        },
-        'playlist_mincount': 2
-    }, {
-        'note': 'translated tab name',
-        'url': 'https://www.youtube.com/channel/UCiu-3thuViMebBjw_5nWYrA/playlists',
-        'info_dict': {
-            'id': 'UCiu-3thuViMebBjw_5nWYrA',
-            'tags': [],
-            'channel_url': 'https://www.youtube.com/channel/UCiu-3thuViMebBjw_5nWYrA',
-            'description': 'test description',
-            'title': 'cole-dlp-test-acc - 再生リスト',
-            'channel_id': 'UCiu-3thuViMebBjw_5nWYrA',
-            'channel': 'cole-dlp-test-acc',
-            'uploader_url': 'https://www.youtube.com/@coletdjnz',
-            'uploader_id': '@coletdjnz',
-            'uploader': 'cole-dlp-test-acc',
-        },
-        'playlist_mincount': 1,
-        'params': {'extractor_args': {'youtube': {'lang': ['ja']}}},
-        'expected_warnings': ['Preferring "ja"'],
-    }, {
-        # XXX: this should really check flat playlist entries, but the test suite doesn't support that
-        'note': 'preferred lang set with playlist with translated video titles',
-        'url': 'https://www.youtube.com/playlist?list=PLt5yu3-wZAlQAaPZ5Z-rJoTdbT-45Q7c0',
-        'info_dict': {
-            'id': 'PLt5yu3-wZAlQAaPZ5Z-rJoTdbT-45Q7c0',
-            'tags': [],
-            'view_count': int,
-            'channel_url': 'https://www.youtube.com/channel/UCiu-3thuViMebBjw_5nWYrA',
-            'channel': 'cole-dlp-test-acc',
-            'channel_id': 'UCiu-3thuViMebBjw_5nWYrA',
-            'description': 'test',
-            'title': 'dlp test playlist',
-            'availability': 'public',
-            'uploader_url': 'https://www.youtube.com/@coletdjnz',
-            'uploader_id': '@coletdjnz',
-            'uploader': 'cole-dlp-test-acc',
-        },
-        'playlist_mincount': 1,
-        'params': {'extractor_args': {'youtube': {'lang': ['ja']}}},
-        'expected_warnings': ['Preferring "ja"'],
-    }, {
-        # shorts audio pivot for 2GtVksBMYFM.
-        'url': 'https://www.youtube.com/feed/sfv_audio_pivot?bp=8gUrCikSJwoLMkd0VmtzQk1ZRk0SCzJHdFZrc0JNWUZNGgsyR3RWa3NCTVlGTQ==',
-        'info_dict': {
-            'id': 'sfv_audio_pivot',
-            'title': 'sfv_audio_pivot',
-            'tags': [],
-        },
-        'playlist_mincount': 50,
-
-    }, {
-        # Channel with a real live tab (not to be mistaken with streams tab)
-        # Do not treat like it should redirect to live stream
-        'url': 'https://www.youtube.com/channel/UCEH7P7kyJIkS_gJf93VYbmg/live',
-        'info_dict': {
-            'id': 'UCEH7P7kyJIkS_gJf93VYbmg',
-            'title': 'UCEH7P7kyJIkS_gJf93VYbmg - Live',
-            'tags': [],
-        },
-        'playlist_mincount': 20,
-    }, {
-        # Tab name is not the same as tab id
-        'url': 'https://www.youtube.com/channel/UCQvWX73GQygcwXOTSf_VDVg/letsplay',
-        'info_dict': {
-            'id': 'UCQvWX73GQygcwXOTSf_VDVg',
-            'title': 'UCQvWX73GQygcwXOTSf_VDVg - Let\'s play',
-            'tags': [],
-        },
-        'playlist_mincount': 8,
-    }, {
-        # Home tab id is literally home. Not to get mistaken with featured
-        'url': 'https://www.youtube.com/channel/UCQvWX73GQygcwXOTSf_VDVg/home',
-        'info_dict': {
-            'id': 'UCQvWX73GQygcwXOTSf_VDVg',
-            'title': 'UCQvWX73GQygcwXOTSf_VDVg - Home',
-            'tags': [],
-        },
-        'playlist_mincount': 8,
-    }, {
-        # Should get three playlists for videos, shorts and streams tabs
-        'url': 'https://www.youtube.com/channel/UCK9V2B22uJYu3N7eR_BT9QA',
-        'info_dict': {
-            'id': 'UCK9V2B22uJYu3N7eR_BT9QA',
-            'title': 'Polka Ch. 尾丸ポルカ',
-            'channel_follower_count': int,
-            'channel_id': 'UCK9V2B22uJYu3N7eR_BT9QA',
-            'channel_url': 'https://www.youtube.com/channel/UCK9V2B22uJYu3N7eR_BT9QA',
-            'description': 'md5:e56b74b5bb7e9c701522162e9abfb822',
-            'channel': 'Polka Ch. 尾丸ポルカ',
-            'tags': 'count:35',
-            'uploader_url': 'https://www.youtube.com/@OmaruPolka',
-            'uploader': 'Polka Ch. 尾丸ポルカ',
-            'uploader_id': '@OmaruPolka',
-        },
-        'playlist_count': 3,
-    }, {
-        # Shorts tab with channel with handle
-        # TODO: fix channel description
-        'url': 'https://www.youtube.com/@NotJustBikes/shorts',
-        'info_dict': {
-            'id': 'UC0intLFzLaudFG-xAvUEO-A',
-            'title': 'Not Just Bikes - Shorts',
-            'tags': 'count:12',
-            'channel_url': 'https://www.youtube.com/channel/UC0intLFzLaudFG-xAvUEO-A',
-            'description': 'md5:26bc55af26855a608a5cf89dfa595c8d',
-            'channel_follower_count': int,
-            'channel_id': 'UC0intLFzLaudFG-xAvUEO-A',
-            'channel': 'Not Just Bikes',
-            'uploader_url': 'https://www.youtube.com/@NotJustBikes',
-            'uploader': 'Not Just Bikes',
-            'uploader_id': '@NotJustBikes',
-        },
-        'playlist_mincount': 10,
-    }, {
-        # Streams tab
-        'url': 'https://www.youtube.com/channel/UC3eYAvjCVwNHgkaGbXX3sig/streams',
-        'info_dict': {
-            'id': 'UC3eYAvjCVwNHgkaGbXX3sig',
-            'title': '中村悠一 - Live',
-            'tags': 'count:7',
-            'channel_id': 'UC3eYAvjCVwNHgkaGbXX3sig',
-            'channel_url': 'https://www.youtube.com/channel/UC3eYAvjCVwNHgkaGbXX3sig',
-            'channel': '中村悠一',
-            'channel_follower_count': int,
-            'description': 'md5:e744f6c93dafa7a03c0c6deecb157300',
-            'uploader_url': 'https://www.youtube.com/@Yuichi-Nakamura',
-            'uploader_id': '@Yuichi-Nakamura',
-            'uploader': '中村悠一',
-        },
-        'playlist_mincount': 60,
-    }, {
-        # Channel with no uploads and hence no videos, streams, shorts tabs or uploads playlist. This should fail.
-        # See test_youtube_lists
-        'url': 'https://www.youtube.com/channel/UC2yXPzFejc422buOIzn_0CA',
-        'only_matching': True,
-    }, {
-        # No uploads and no UCID given. Should fail with no uploads error
-        # See test_youtube_lists
-        'url': 'https://www.youtube.com/news',
-        'only_matching': True
-    }, {
-        # No videos tab but has a shorts tab
-        'url': 'https://www.youtube.com/c/TKFShorts',
-        'info_dict': {
-            'id': 'UCgJ5_1F6yJhYLnyMszUdmUg',
-            'title': 'Shorts Break - Shorts',
-            'tags': 'count:48',
-            'channel_id': 'UCgJ5_1F6yJhYLnyMszUdmUg',
-            'channel': 'Shorts Break',
-            'description': 'md5:6de33c5e7ba686e5f3efd4e19c7ef499',
-            'channel_follower_count': int,
-            'channel_url': 'https://www.youtube.com/channel/UCgJ5_1F6yJhYLnyMszUdmUg',
-            'uploader_url': 'https://www.youtube.com/@ShortsBreak_Official',
-            'uploader': 'Shorts Break',
-            'uploader_id': '@ShortsBreak_Official',
-        },
-        'playlist_mincount': 30,
-    }, {
-        # Trending Now Tab. tab id is empty
-        'url': 'https://www.youtube.com/feed/trending',
-        'info_dict': {
-            'id': 'trending',
-            'title': 'trending - Now',
-            'tags': [],
-        },
-        'playlist_mincount': 30,
-    }, {
-        # Trending Gaming Tab. tab id is empty
-        'url': 'https://www.youtube.com/feed/trending?bp=4gIcGhpnYW1pbmdfY29ycHVzX21vc3RfcG9wdWxhcg%3D%3D',
-        'info_dict': {
-            'id': 'trending',
-            'title': 'trending - Gaming',
-            'tags': [],
-        },
-        'playlist_mincount': 30,
-    }, {
-        # Shorts url result in shorts tab
-        # TODO: Fix channel id extraction
-        'url': 'https://www.youtube.com/channel/UCiu-3thuViMebBjw_5nWYrA/shorts',
-        'info_dict': {
-            'id': 'UCiu-3thuViMebBjw_5nWYrA',
-            'title': 'cole-dlp-test-acc - Shorts',
-            'channel': 'cole-dlp-test-acc',
-            'description': 'test description',
-            'channel_id': 'UCiu-3thuViMebBjw_5nWYrA',
-            'channel_url': 'https://www.youtube.com/channel/UCiu-3thuViMebBjw_5nWYrA',
-            'tags': [],
-            'uploader_url': 'https://www.youtube.com/@coletdjnz',
-            'uploader_id': '@coletdjnz',
-            'uploader': 'cole-dlp-test-acc',
-        },
-        'playlist': [{
-            'info_dict': {
-                # Channel data is not currently available for short renderers (as of 2023-03-01)
-                '_type': 'url',
-                'ie_key': 'Youtube',
-                'url': 'https://www.youtube.com/shorts/sSM9J5YH_60',
-                'id': 'sSM9J5YH_60',
-                'title': 'SHORT short',
-                'view_count': int,
-                'thumbnails': list,
-            }
-        }],
-        'params': {'extract_flat': True},
-    }, {
-        # Live video status should be extracted
-        'url': 'https://www.youtube.com/channel/UCQvWX73GQygcwXOTSf_VDVg/live',
-        'info_dict': {
-            'id': 'UCQvWX73GQygcwXOTSf_VDVg',
-            'title': 'UCQvWX73GQygcwXOTSf_VDVg - Live',  # TODO, should be Minecraft - Live or Minecraft - Topic - Live
-            'tags': []
-        },
-        'playlist': [{
-            'info_dict': {
-                '_type': 'url',
-                'ie_key': 'Youtube',
-                'url': 'startswith:https://www.youtube.com/watch?v=',
-                'id': str,
-                'title': str,
-                'live_status': 'is_live',
-                'channel_id': str,
-                'channel_url': str,
-                'concurrent_view_count': int,
-                'channel': str,
-                'uploader': str,
-                'uploader_url': str,
-                'uploader_id': str,
-                'channel_is_verified': bool,  # this will keep changing
-            }
-        }],
-        'params': {'extract_flat': True, 'playlist_items': '1'},
-        'playlist_mincount': 1
-    }, {
-        # Channel renderer metadata. Contains number of videos on the channel
-        'url': 'https://www.youtube.com/channel/UCiu-3thuViMebBjw_5nWYrA/channels',
-        'info_dict': {
-            'id': 'UCiu-3thuViMebBjw_5nWYrA',
-            'title': 'cole-dlp-test-acc - Channels',
-            'channel': 'cole-dlp-test-acc',
-            'description': 'test description',
-            'channel_id': 'UCiu-3thuViMebBjw_5nWYrA',
-            'channel_url': 'https://www.youtube.com/channel/UCiu-3thuViMebBjw_5nWYrA',
-            'tags': [],
-            'uploader_url': 'https://www.youtube.com/@coletdjnz',
-            'uploader_id': '@coletdjnz',
-            'uploader': 'cole-dlp-test-acc',
-        },
-        'playlist': [{
-            'info_dict': {
-                '_type': 'url',
-                'ie_key': 'YoutubeTab',
-                'url': 'https://www.youtube.com/channel/UC-lHJZR3Gqxm24_Vd_AJ5Yw',
-                'id': 'UC-lHJZR3Gqxm24_Vd_AJ5Yw',
-                'channel_id': 'UC-lHJZR3Gqxm24_Vd_AJ5Yw',
-                'title': 'PewDiePie',
-                'channel': 'PewDiePie',
-                'channel_url': 'https://www.youtube.com/channel/UC-lHJZR3Gqxm24_Vd_AJ5Yw',
-                'thumbnails': list,
-                'channel_follower_count': int,
-                'playlist_count': int,
-                'uploader': 'PewDiePie',
-                'uploader_url': 'https://www.youtube.com/@PewDiePie',
-                'uploader_id': '@PewDiePie',
-                'channel_is_verified': True,
-            }
-        }],
-        'params': {'extract_flat': True},
-    }, {
-        'url': 'https://www.youtube.com/@3blue1brown/about',
-        'info_dict': {
-            'id': 'UCYO_jab_esuFRV4b17AJtAw',
-            'tags': ['Mathematics'],
-            'title': '3Blue1Brown - About',
-            'channel_follower_count': int,
-            'channel_id': 'UCYO_jab_esuFRV4b17AJtAw',
-            'channel': '3Blue1Brown',
-            'view_count': int,
-            'channel_url': 'https://www.youtube.com/channel/UCYO_jab_esuFRV4b17AJtAw',
-            'description': 'md5:e1384e8a133307dd10edee76e875d62f',
-            'uploader_url': 'https://www.youtube.com/@3blue1brown',
-            'uploader_id': '@3blue1brown',
-            'uploader': '3Blue1Brown',
-            'channel_is_verified': True,
-        },
-        'playlist_count': 0,
-    }, {
-        # Podcasts tab, with rich entry playlistRenderers
-        'url': 'https://www.youtube.com/@99percentinvisiblepodcast/podcasts',
-        'info_dict': {
-            'id': 'UCVMF2HD4ZgC0QHpU9Yq5Xrw',
-            'channel_id': 'UCVMF2HD4ZgC0QHpU9Yq5Xrw',
-            'uploader_url': 'https://www.youtube.com/@99percentinvisiblepodcast',
-            'description': 'md5:3a0ed38f1ad42a68ef0428c04a15695c',
-            'title': '99 Percent Invisible - Podcasts',
-            'uploader': '99 Percent Invisible',
-            'channel_follower_count': int,
-            'channel_url': 'https://www.youtube.com/channel/UCVMF2HD4ZgC0QHpU9Yq5Xrw',
-            'tags': [],
-            'channel': '99 Percent Invisible',
-            'uploader_id': '@99percentinvisiblepodcast',
-        },
-        'playlist_count': 1,
-    }, {
-        # Releases tab, with rich entry playlistRenderers (same as Podcasts tab)
-        'url': 'https://www.youtube.com/@AHimitsu/releases',
-        'info_dict': {
-            'id': 'UCgFwu-j5-xNJml2FtTrrB3A',
-            'channel': 'A Himitsu',
-            'uploader_url': 'https://www.youtube.com/@AHimitsu',
-            'title': 'A Himitsu - Releases',
-            'uploader_id': '@AHimitsu',
-            'uploader': 'A Himitsu',
-            'channel_id': 'UCgFwu-j5-xNJml2FtTrrB3A',
-            'tags': 'count:16',
-            'description': 'I make music',
-            'channel_url': 'https://www.youtube.com/channel/UCgFwu-j5-xNJml2FtTrrB3A',
-            'channel_follower_count': int,
-            'channel_is_verified': True,
-        },
-        'playlist_mincount': 10,
-    }, {
-        # Playlist with only shorts, shown as reel renderers
-        # FIXME: future: YouTube currently doesn't give continuation for this,
-        # may do in future.
-        'url': 'https://www.youtube.com/playlist?list=UUxqPAgubo4coVn9Lx1FuKcg',
-        'info_dict': {
-            'id': 'UUxqPAgubo4coVn9Lx1FuKcg',
-            'channel_url': 'https://www.youtube.com/channel/UCxqPAgubo4coVn9Lx1FuKcg',
-            'view_count': int,
-            'uploader_id': '@BangyShorts',
-            'description': '',
-            'uploader_url': 'https://www.youtube.com/@BangyShorts',
-            'channel_id': 'UCxqPAgubo4coVn9Lx1FuKcg',
-            'channel': 'Bangy Shorts',
-            'uploader': 'Bangy Shorts',
-            'tags': [],
-            'availability': 'public',
-            'modified_date': '20230626',
-            'title': 'Uploads from Bangy Shorts',
-        },
-        'playlist_mincount': 100,
-        'expected_warnings': [r'[Uu]navailable videos (are|will be) hidden'],
-    }]
-
-    @classmethod
-    def suitable(cls, url):
-        return False if YoutubeIE.suitable(url) else super().suitable(url)
-
-    _URL_RE = re.compile(rf'(?P<pre>{_VALID_URL})(?(not_channel)|(?P<tab>/[^?#/]+))?(?P<post>.*)$')
-
-    def _get_url_mobj(self, url):
-        mobj = self._URL_RE.match(url).groupdict()
-        mobj.update((k, '') for k, v in mobj.items() if v is None)
-        return mobj
-
-    def _extract_tab_id_and_name(self, tab, base_url='https://www.youtube.com'):
-        tab_name = (tab.get('title') or '').lower()
-        tab_url = urljoin(base_url, traverse_obj(
-            tab, ('endpoint', 'commandMetadata', 'webCommandMetadata', 'url')))
-
-        tab_id = (tab_url and self._get_url_mobj(tab_url)['tab'][1:]
-                  or traverse_obj(tab, 'tabIdentifier', expected_type=str))
-        if tab_id:
-            return {
-                'TAB_ID_SPONSORSHIPS': 'membership',
-            }.get(tab_id, tab_id), tab_name
-
-        # Fallback to tab name if we cannot get the tab id.
-        # XXX: should we strip non-ascii letters? e.g. in case of 'let's play' tab example on special gaming channel
-        # Note that in the case of translated tab name this may result in an empty string, which we don't want.
-        if tab_name:
-            self.write_debug(f'Falling back to selected tab name: {tab_name}')
-        return {
-            'home': 'featured',
-            'live': 'streams',
-        }.get(tab_name, tab_name), tab_name
-
-    def _has_tab(self, tabs, tab_id):
-        return any(self._extract_tab_id_and_name(tab)[0] == tab_id for tab in tabs)
-
-    @YoutubeTabBaseInfoExtractor.passthrough_smuggled_data
-    def _real_extract(self, url, smuggled_data):
-        item_id = self._match_id(url)
-        url = urllib.parse.urlunparse(
-            urllib.parse.urlparse(url)._replace(netloc='www.youtube.com'))
-        compat_opts = self.get_param('compat_opts', [])
-
-        mobj = self._get_url_mobj(url)
-        pre, tab, post, is_channel = mobj['pre'], mobj['tab'], mobj['post'], not mobj['not_channel']
-        if is_channel and smuggled_data.get('is_music_url'):
-            if item_id[:2] == 'VL':  # Youtube music VL channels have an equivalent playlist
-                return self.url_result(
-                    f'https://music.youtube.com/playlist?list={item_id[2:]}', YoutubeTabIE, item_id[2:])
-            elif item_id[:2] == 'MP':  # Resolve albums (/[channel/browse]/MP...) to their equivalent playlist
-                mdata = self._extract_tab_endpoint(
-                    f'https://music.youtube.com/channel/{item_id}', item_id, default_client='web_music')
-                murl = traverse_obj(mdata, ('microformat', 'microformatDataRenderer', 'urlCanonical'),
-                                    get_all=False, expected_type=str)
-                if not murl:
-                    raise ExtractorError('Failed to resolve album to playlist')
-                return self.url_result(murl, YoutubeTabIE)
-            elif mobj['channel_type'] == 'browse':  # Youtube music /browse/ should be changed to /channel/
-                return self.url_result(
-                    f'https://music.youtube.com/channel/{item_id}{tab}{post}', YoutubeTabIE, item_id)
-
-        original_tab_id, display_id = tab[1:], f'{item_id}{tab}'
-        if is_channel and not tab and 'no-youtube-channel-redirect' not in compat_opts:
-            url = f'{pre}/videos{post}'
-        if smuggled_data.get('is_music_url'):
-            self.report_warning(f'YouTube Music is not directly supported. Redirecting to {url}')
-
-        # Handle both video/playlist URLs
-        qs = parse_qs(url)
-        video_id, playlist_id = [traverse_obj(qs, (key, 0)) for key in ('v', 'list')]
-        if not video_id and mobj['not_channel'].startswith('watch'):
-            if not playlist_id:
-                # If there is neither video or playlist ids, youtube redirects to home page, which is undesirable
-                raise ExtractorError('A video URL was given without video ID', expected=True)
-            # Common mistake: https://www.youtube.com/watch?list=playlist_id
-            self.report_warning(f'A video URL was given without video ID. Trying to download playlist {playlist_id}')
-            return self.url_result(
-                f'https://www.youtube.com/playlist?list={playlist_id}', YoutubeTabIE, playlist_id)
-
-        if not self._yes_playlist(playlist_id, video_id):
-            return self.url_result(
-                f'https://www.youtube.com/watch?v={video_id}', YoutubeIE, video_id)
-
-        data, ytcfg = self._extract_data(url, display_id)
-
-        # YouTube may provide a non-standard redirect to the regional channel
-        # See: https://github.com/yt-dlp/yt-dlp/issues/2694
-        # https://support.google.com/youtube/answer/2976814#zippy=,conditional-redirects
-        redirect_url = traverse_obj(
-            data, ('onResponseReceivedActions', ..., 'navigateAction', 'endpoint', 'commandMetadata', 'webCommandMetadata', 'url'), get_all=False)
-        if redirect_url and 'no-youtube-channel-redirect' not in compat_opts:
-            redirect_url = ''.join((urljoin('https://www.youtube.com', redirect_url), tab, post))
-            self.to_screen(f'This playlist is likely not available in your region. Following conditional redirect to {redirect_url}')
-            return self.url_result(redirect_url, YoutubeTabIE)
-
-        tabs, extra_tabs = self._extract_tab_renderers(data), []
-        if is_channel and tabs and 'no-youtube-channel-redirect' not in compat_opts:
-            selected_tab = self._extract_selected_tab(tabs)
-            selected_tab_id, selected_tab_name = self._extract_tab_id_and_name(selected_tab, url)  # NB: Name may be translated
-            self.write_debug(f'Selected tab: {selected_tab_id!r} ({selected_tab_name}), Requested tab: {original_tab_id!r}')
-
-            if not original_tab_id and selected_tab_name:
-                self.to_screen('Downloading all uploads of the channel. '
-                               'To download only the videos in a specific tab, pass the tab\'s URL')
-                if self._has_tab(tabs, 'streams'):
-                    extra_tabs.append(''.join((pre, '/streams', post)))
-                if self._has_tab(tabs, 'shorts'):
-                    extra_tabs.append(''.join((pre, '/shorts', post)))
-                # XXX: Members-only tab should also be extracted
-
-                if not extra_tabs and selected_tab_id != 'videos':
-                    # Channel does not have streams, shorts or videos tabs
-                    if item_id[:2] != 'UC':
-                        raise ExtractorError('This channel has no uploads', expected=True)
-
-                    # Topic channels don't have /videos. Use the equivalent playlist instead
-                    pl_id = f'UU{item_id[2:]}'
-                    pl_url = f'https://www.youtube.com/playlist?list={pl_id}'
-                    try:
-                        data, ytcfg = self._extract_data(pl_url, pl_id, ytcfg=ytcfg, fatal=True, webpage_fatal=True)
-                    except ExtractorError:
-                        raise ExtractorError('This channel has no uploads', expected=True)
-                    else:
-                        item_id, url = pl_id, pl_url
-                        self.to_screen(
-                            f'The channel does not have a videos, shorts, or live tab. Redirecting to playlist {pl_id} instead')
-
-                elif extra_tabs and selected_tab_id != 'videos':
-                    # When there are shorts/live tabs but not videos tab
-                    url, data = f'{pre}{post}', None
-
-            elif (original_tab_id or 'videos') != selected_tab_id:
-                if original_tab_id == 'live':
-                    # Live tab should have redirected to the video
-                    # Except in the case the channel has an actual live tab
-                    # Example: https://www.youtube.com/channel/UCEH7P7kyJIkS_gJf93VYbmg/live
-                    raise UserNotLive(video_id=item_id)
-                elif selected_tab_name:
-                    raise ExtractorError(f'This channel does not have a {original_tab_id} tab', expected=True)
-
-                # For channels such as https://www.youtube.com/channel/UCtFRv9O2AHqOZjjynzrv-xg
-                url = f'{pre}{post}'
-
-        # YouTube sometimes provides a button to reload playlist with unavailable videos.
-        if 'no-youtube-unavailable-videos' not in compat_opts:
-            data = self._reload_with_unavailable_videos(display_id, data, ytcfg) or data
-        self._extract_and_report_alerts(data, only_once=True)
-
-        tabs, entries = self._extract_tab_renderers(data), []
-        if tabs:
-            entries = [self._extract_from_tabs(item_id, ytcfg, data, tabs)]
-            entries[0].update({
-                'extractor_key': YoutubeTabIE.ie_key(),
-                'extractor': YoutubeTabIE.IE_NAME,
-                'webpage_url': url,
-            })
-        if self.get_param('playlist_items') == '0':
-            entries.extend(self.url_result(u, YoutubeTabIE) for u in extra_tabs)
-        else:  # Users expect to get all `video_id`s even with `--flat-playlist`. So don't return `url_result`
-            entries.extend(map(self._real_extract, extra_tabs))
-
-        if len(entries) == 1:
-            return entries[0]
-        elif entries:
-            metadata = self._extract_metadata_from_tabs(item_id, data)
-            uploads_url = 'the Uploads (UU) playlist URL'
-            if try_get(metadata, lambda x: x['channel_id'].startswith('UC')):
-                uploads_url = f'https://www.youtube.com/playlist?list=UU{metadata["channel_id"][2:]}'
-            self.to_screen(
-                'Downloading as multiple playlists, separated by tabs. '
-                f'To download as a single playlist instead, pass {uploads_url}')
-            return self.playlist_result(entries, item_id, **metadata)
-
-        # Inline playlist
-        playlist = traverse_obj(
-            data, ('contents', 'twoColumnWatchNextResults', 'playlist', 'playlist'), expected_type=dict)
-        if playlist:
-            return self._extract_from_playlist(item_id, url, data, playlist, ytcfg)
-
-        video_id = traverse_obj(
-            data, ('currentVideoEndpoint', 'watchEndpoint', 'videoId'), expected_type=str) or video_id
-        if video_id:
-            if tab != '/live':  # live tab is expected to redirect to video
-                self.report_warning(f'Unable to recognize playlist. Downloading just video {video_id}')
-            return self.url_result(f'https://www.youtube.com/watch?v={video_id}', YoutubeIE, video_id)
-
-        raise ExtractorError('Unable to recognize tab page')
-
-
-class YoutubePlaylistIE(InfoExtractor):
-    IE_DESC = 'YouTube playlists'
-    _VALID_URL = r'''(?x)(?:
-                        (?:https?://)?
-                        (?:\w+\.)?
-                        (?:
-                            (?:
-                                youtube(?:kids)?\.com|
-                                %(invidious)s
-                            )
-                            /.*?\?.*?\blist=
-                        )?
-                        (?P<id>%(playlist_id)s)
-                     )''' % {
-        'playlist_id': YoutubeBaseInfoExtractor._PLAYLIST_ID_RE,
-        'invidious': '|'.join(YoutubeBaseInfoExtractor._INVIDIOUS_SITES),
-    }
-    IE_NAME = 'youtube:playlist'
-    _TESTS = [{
-        'note': 'issue #673',
-        'url': 'PLBB231211A4F62143',
-        'info_dict': {
-            'title': '[OLD]Team Fortress 2 (Class-based LP)',
-            'id': 'PLBB231211A4F62143',
-            'uploader': 'Wickman',
-            'uploader_id': '@WickmanVT',
-            'description': 'md5:8fa6f52abb47a9552002fa3ddfc57fc2',
-            'view_count': int,
-            'uploader_url': 'https://www.youtube.com/@WickmanVT',
-            'modified_date': r're:\d{8}',
-            'channel_id': 'UCKSpbfbl5kRQpTdL7kMc-1Q',
-            'channel': 'Wickman',
-            'tags': [],
-            'channel_url': 'https://www.youtube.com/channel/UCKSpbfbl5kRQpTdL7kMc-1Q',
-            'availability': 'public',
-        },
-        'playlist_mincount': 29,
-    }, {
-        'url': 'PLtPgu7CB4gbY9oDN3drwC3cMbJggS7dKl',
-        'info_dict': {
-            'title': 'YDL_safe_search',
-            'id': 'PLtPgu7CB4gbY9oDN3drwC3cMbJggS7dKl',
-        },
-        'playlist_count': 2,
-        'skip': 'This playlist is private',
-    }, {
-        'note': 'embedded',
-        'url': 'https://www.youtube.com/embed/videoseries?list=PL6IaIsEjSbf96XFRuNccS_RuEXwNdsoEu',
-        'playlist_count': 4,
-        'info_dict': {
-            'title': 'JODA15',
-            'id': 'PL6IaIsEjSbf96XFRuNccS_RuEXwNdsoEu',
-            'uploader': 'milan',
-            'uploader_id': '@milan5503',
-            'description': '',
-            'channel_url': 'https://www.youtube.com/channel/UCEI1-PVPcYXjB73Hfelbmaw',
-            'tags': [],
-            'modified_date': '20140919',
-            'view_count': int,
-            'channel': 'milan',
-            'channel_id': 'UCEI1-PVPcYXjB73Hfelbmaw',
-            'uploader_url': 'https://www.youtube.com/@milan5503',
-            'availability': 'public',
-        },
-        'expected_warnings': [r'[Uu]navailable videos? (is|are|will be) hidden'],
-    }, {
-        'url': 'http://www.youtube.com/embed/_xDOZElKyNU?list=PLsyOSbh5bs16vubvKePAQ1x3PhKavfBIl',
-        'playlist_mincount': 455,
-        'info_dict': {
-            'title': '2018 Chinese New Singles (11/6 updated)',
-            'id': 'PLsyOSbh5bs16vubvKePAQ1x3PhKavfBIl',
-            'uploader': 'LBK',
-            'uploader_id': '@music_king',
-            'description': 'md5:da521864744d60a198e3a88af4db0d9d',
-            'channel': 'LBK',
-            'view_count': int,
-            'channel_url': 'https://www.youtube.com/channel/UC21nz3_MesPLqtDqwdvnoxA',
-            'tags': [],
-            'uploader_url': 'https://www.youtube.com/@music_king',
-            'channel_id': 'UC21nz3_MesPLqtDqwdvnoxA',
-            'modified_date': r're:\d{8}',
-            'availability': 'public',
-        },
-        'expected_warnings': [r'[Uu]navailable videos (are|will be) hidden'],
-    }, {
-        'url': 'TLGGrESM50VT6acwMjAyMjAxNw',
-        'only_matching': True,
-    }, {
-        # music album playlist
-        'url': 'OLAK5uy_m4xAFdmMC5rX3Ji3g93pQe3hqLZw_9LhM',
-        'only_matching': True,
-    }]
-
-    @classmethod
-    def suitable(cls, url):
-        if YoutubeTabIE.suitable(url):
-            return False
-        from ..utils import parse_qs
-        qs = parse_qs(url)
-        if qs.get('v', [None])[0]:
-            return False
-        return super().suitable(url)
-
-    def _real_extract(self, url):
-        playlist_id = self._match_id(url)
-        is_music_url = YoutubeBaseInfoExtractor.is_music_url(url)
-        url = update_url_query(
-            'https://www.youtube.com/playlist',
-            parse_qs(url) or {'list': playlist_id})
-        if is_music_url:
-            url = smuggle_url(url, {'is_music_url': True})
-        return self.url_result(url, ie=YoutubeTabIE.ie_key(), video_id=playlist_id)
-
-
-class YoutubeYtBeIE(InfoExtractor):
-    IE_DESC = 'youtu.be'
-    _VALID_URL = r'https?://youtu\.be/(?P<id>[0-9A-Za-z_-]{11})/*?.*?\blist=(?P<playlist_id>%(playlist_id)s)' % {'playlist_id': YoutubeBaseInfoExtractor._PLAYLIST_ID_RE}
-    _TESTS = [{
-        'url': 'https://youtu.be/yeWKywCrFtk?list=PL2qgrgXsNUG5ig9cat4ohreBjYLAPC0J5',
-        'info_dict': {
-            'id': 'yeWKywCrFtk',
-            'ext': 'mp4',
-            'title': 'Small Scale Baler and Braiding Rugs',
-            'uploader': 'Backus-Page House Museum',
-            'uploader_id': '@backuspagemuseum',
-            'uploader_url': r're:https?://(?:www\.)?youtube\.com/@backuspagemuseum',
-            'upload_date': '20161008',
-            'description': 'md5:800c0c78d5eb128500bffd4f0b4f2e8a',
-            'categories': ['Nonprofits & Activism'],
-            'tags': list,
-            'like_count': int,
-            'age_limit': 0,
-            'playable_in_embed': True,
-            'thumbnail': r're:^https?://.*\.webp',
-            'channel': 'Backus-Page House Museum',
-            'channel_id': 'UCEfMCQ9bs3tjvjy1s451zaw',
-            'live_status': 'not_live',
-            'view_count': int,
-            'channel_url': 'https://www.youtube.com/channel/UCEfMCQ9bs3tjvjy1s451zaw',
-            'availability': 'public',
-            'duration': 59,
-            'comment_count': int,
-            'channel_follower_count': int
-        },
-        'params': {
-            'noplaylist': True,
-            'skip_download': True,
-        },
-    }, {
-        'url': 'https://youtu.be/uWyaPkt-VOI?list=PL9D9FC436B881BA21',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        mobj = self._match_valid_url(url)
-        video_id = mobj.group('id')
-        playlist_id = mobj.group('playlist_id')
-        return self.url_result(
-            update_url_query('https://www.youtube.com/watch', {
-                'v': video_id,
-                'list': playlist_id,
-                'feature': 'youtu.be',
-            }), ie=YoutubeTabIE.ie_key(), video_id=playlist_id)
-
-
-class YoutubeLivestreamEmbedIE(InfoExtractor):
-    IE_DESC = 'YouTube livestream embeds'
-    _VALID_URL = r'https?://(?:\w+\.)?youtube\.com/embed/live_stream/?\?(?:[^#]+&)?channel=(?P<id>[^&#]+)'
-    _TESTS = [{
-        'url': 'https://www.youtube.com/embed/live_stream?channel=UC2_KI6RB__jGdlnK6dvFEZA',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        channel_id = self._match_id(url)
-        return self.url_result(
-            f'https://www.youtube.com/channel/{channel_id}/live',
-            ie=YoutubeTabIE.ie_key(), video_id=channel_id)
-
-
-class YoutubeYtUserIE(InfoExtractor):
-    IE_DESC = 'YouTube user videos; "ytuser:" prefix'
-    IE_NAME = 'youtube:user'
-    _VALID_URL = r'ytuser:(?P<id>.+)'
-    _TESTS = [{
-        'url': 'ytuser:phihag',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        user_id = self._match_id(url)
-        return self.url_result(f'https://www.youtube.com/user/{user_id}', YoutubeTabIE, user_id)
-
-
-class YoutubeFavouritesIE(YoutubeBaseInfoExtractor):
-    IE_NAME = 'youtube:favorites'
-    IE_DESC = 'YouTube liked videos; ":ytfav" keyword (requires cookies)'
-    _VALID_URL = r':ytfav(?:ou?rite)?s?'
-    _LOGIN_REQUIRED = True
-    _TESTS = [{
-        'url': ':ytfav',
-        'only_matching': True,
-    }, {
-        'url': ':ytfavorites',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        return self.url_result(
-            'https://www.youtube.com/playlist?list=LL',
-            ie=YoutubeTabIE.ie_key())
-
-
-class YoutubeNotificationsIE(YoutubeTabBaseInfoExtractor):
-    IE_NAME = 'youtube:notif'
-    IE_DESC = 'YouTube notifications; ":ytnotif" keyword (requires cookies)'
-    _VALID_URL = r':ytnotif(?:ication)?s?'
-    _LOGIN_REQUIRED = True
-    _TESTS = [{
-        'url': ':ytnotif',
-        'only_matching': True,
-    }, {
-        'url': ':ytnotifications',
-        'only_matching': True,
-    }]
-
-    def _extract_notification_menu(self, response, continuation_list):
-        notification_list = traverse_obj(
-            response,
-            ('actions', 0, 'openPopupAction', 'popup', 'multiPageMenuRenderer', 'sections', 0, 'multiPageMenuNotificationSectionRenderer', 'items'),
-            ('actions', 0, 'appendContinuationItemsAction', 'continuationItems'),
-            expected_type=list) or []
-        continuation_list[0] = None
-        for item in notification_list:
-            entry = self._extract_notification_renderer(item.get('notificationRenderer'))
-            if entry:
-                yield entry
-            continuation = item.get('continuationItemRenderer')
-            if continuation:
-                continuation_list[0] = continuation
-
-    def _extract_notification_renderer(self, notification):
-        video_id = traverse_obj(
-            notification, ('navigationEndpoint', 'watchEndpoint', 'videoId'), expected_type=str)
-        url = f'https://www.youtube.com/watch?v={video_id}'
-        channel_id = None
-        if not video_id:
-            browse_ep = traverse_obj(
-                notification, ('navigationEndpoint', 'browseEndpoint'), expected_type=dict)
-            channel_id = self.ucid_or_none(traverse_obj(browse_ep, 'browseId', expected_type=str))
-            post_id = self._search_regex(
-                r'/post/(.+)', traverse_obj(browse_ep, 'canonicalBaseUrl', expected_type=str),
-                'post id', default=None)
-            if not channel_id or not post_id:
-                return
-            # The direct /post url redirects to this in the browser
-            url = f'https://www.youtube.com/channel/{channel_id}/community?lb={post_id}'
-
-        channel = traverse_obj(
-            notification, ('contextualMenu', 'menuRenderer', 'items', 1, 'menuServiceItemRenderer', 'text', 'runs', 1, 'text'),
-            expected_type=str)
-        notification_title = self._get_text(notification, 'shortMessage')
-        if notification_title:
-            notification_title = notification_title.replace('\xad', '')  # remove soft hyphens
-        # TODO: handle recommended videos
-        title = self._search_regex(
-            rf'{re.escape(channel or "")}[^:]+: (.+)', notification_title,
-            'video title', default=None)
-        timestamp = (self._parse_time_text(self._get_text(notification, 'sentTimeText'))
-                     if self._configuration_arg('approximate_date', ie_key=YoutubeTabIE)
-                     else None)
-        return {
-            '_type': 'url',
-            'url': url,
-            'ie_key': (YoutubeIE if video_id else YoutubeTabIE).ie_key(),
-            'video_id': video_id,
-            'title': title,
-            'channel_id': channel_id,
-            'channel': channel,
-            'uploader': channel,
-            'thumbnails': self._extract_thumbnails(notification, 'videoThumbnail'),
-            'timestamp': timestamp,
-        }
-
-    def _notification_menu_entries(self, ytcfg):
-        continuation_list = [None]
-        response = None
-        for page in itertools.count(1):
-            ctoken = traverse_obj(
-                continuation_list, (0, 'continuationEndpoint', 'getNotificationMenuEndpoint', 'ctoken'), expected_type=str)
-            response = self._extract_response(
-                item_id=f'page {page}', query={'ctoken': ctoken} if ctoken else {}, ytcfg=ytcfg,
-                ep='notification/get_notification_menu', check_get_keys='actions',
-                headers=self.generate_api_headers(ytcfg=ytcfg, visitor_data=self._extract_visitor_data(response)))
-            yield from self._extract_notification_menu(response, continuation_list)
-            if not continuation_list[0]:
-                break
-
-    def _real_extract(self, url):
-        display_id = 'notifications'
-        ytcfg = self._download_ytcfg('web', display_id) if not self.skip_webpage else {}
-        self._report_playlist_authcheck(ytcfg)
-        return self.playlist_result(self._notification_menu_entries(ytcfg), display_id, display_id)
-
-
-class YoutubeSearchIE(YoutubeTabBaseInfoExtractor, SearchInfoExtractor):
-    IE_DESC = 'YouTube search'
-    IE_NAME = 'youtube:search'
-    _SEARCH_KEY = 'ytsearch'
-    _SEARCH_PARAMS = 'EgIQAQ%3D%3D'  # Videos only
-    _TESTS = [{
-        'url': 'ytsearch5:youtube-dl test video',
-        'playlist_count': 5,
-        'info_dict': {
-            'id': 'youtube-dl test video',
-            'title': 'youtube-dl test video',
-        }
-    }]
-
-
-class YoutubeSearchDateIE(YoutubeTabBaseInfoExtractor, SearchInfoExtractor):
-    IE_NAME = YoutubeSearchIE.IE_NAME + ':date'
-    _SEARCH_KEY = 'ytsearchdate'
-    IE_DESC = 'YouTube search, newest videos first'
-    _SEARCH_PARAMS = 'CAISAhAB'  # Videos only, sorted by date
-    _TESTS = [{
-        'url': 'ytsearchdate5:youtube-dl test video',
-        'playlist_count': 5,
-        'info_dict': {
-            'id': 'youtube-dl test video',
-            'title': 'youtube-dl test video',
-        }
-    }]
-
-
-class YoutubeSearchURLIE(YoutubeTabBaseInfoExtractor):
-    IE_DESC = 'YouTube search URLs with sorting and filter support'
-    IE_NAME = YoutubeSearchIE.IE_NAME + '_url'
-    _VALID_URL = r'https?://(?:www\.)?youtube\.com/(?:results|search)\?([^#]+&)?(?:search_query|q)=(?:[^&]+)(?:[&#]|$)'
-    _TESTS = [{
-        'url': 'https://www.youtube.com/results?baz=bar&search_query=youtube-dl+test+video&filters=video&lclk=video',
-        'playlist_mincount': 5,
-        'info_dict': {
-            'id': 'youtube-dl test video',
-            'title': 'youtube-dl test video',
-        }
-    }, {
-        'url': 'https://www.youtube.com/results?search_query=python&sp=EgIQAg%253D%253D',
-        'playlist_mincount': 5,
-        'info_dict': {
-            'id': 'python',
-            'title': 'python',
-        }
-    }, {
-        'url': 'https://www.youtube.com/results?search_query=%23cats',
-        'playlist_mincount': 1,
-        'info_dict': {
-            'id': '#cats',
-            'title': '#cats',
-            # The test suite does not have support for nested playlists
-            # 'entries': [{
-            #     'url': r're:https://(www\.)?youtube\.com/hashtag/cats',
-            #     'title': '#cats',
-            # }],
-        },
-    }, {
-        # Channel results
-        'url': 'https://www.youtube.com/results?search_query=kurzgesagt&sp=EgIQAg%253D%253D',
-        'info_dict': {
-            'id': 'kurzgesagt',
-            'title': 'kurzgesagt',
-        },
-        'playlist': [{
-            'info_dict': {
-                '_type': 'url',
-                'id': 'UCsXVk37bltHxD1rDPwtNM8Q',
-                'url': 'https://www.youtube.com/channel/UCsXVk37bltHxD1rDPwtNM8Q',
-                'ie_key': 'YoutubeTab',
-                'channel': 'Kurzgesagt – In a Nutshell',
-                'description': 'md5:4ae48dfa9505ffc307dad26342d06bfc',
-                'title': 'Kurzgesagt – In a Nutshell',
-                'channel_id': 'UCsXVk37bltHxD1rDPwtNM8Q',
-                # No longer available for search as it is set to the handle.
-                # 'playlist_count': int,
-                'channel_url': 'https://www.youtube.com/channel/UCsXVk37bltHxD1rDPwtNM8Q',
-                'thumbnails': list,
-                'uploader_id': '@kurzgesagt',
-                'uploader_url': 'https://www.youtube.com/@kurzgesagt',
-                'uploader': 'Kurzgesagt – In a Nutshell',
-                'channel_is_verified': True,
-                'channel_follower_count': int,
-            }
-        }],
-        'params': {'extract_flat': True, 'playlist_items': '1'},
-        'playlist_mincount': 1,
-    }, {
-        'url': 'https://www.youtube.com/results?q=test&sp=EgQIBBgB',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        qs = parse_qs(url)
-        query = (qs.get('search_query') or qs.get('q'))[0]
-        return self.playlist_result(self._search_results(query, qs.get('sp', (None,))[0]), query, query)
-
-
-class YoutubeMusicSearchURLIE(YoutubeTabBaseInfoExtractor):
-    IE_DESC = 'YouTube music search URLs with selectable sections, e.g. #songs'
-    IE_NAME = 'youtube:music:search_url'
-    _VALID_URL = r'https?://music\.youtube\.com/search\?([^#]+&)?(?:search_query|q)=(?:[^&]+)(?:[&#]|$)'
-    _TESTS = [{
-        'url': 'https://music.youtube.com/search?q=royalty+free+music',
-        'playlist_count': 16,
-        'info_dict': {
-            'id': 'royalty free music',
-            'title': 'royalty free music',
-        }
-    }, {
-        'url': 'https://music.youtube.com/search?q=royalty+free+music&sp=EgWKAQIIAWoKEAoQAxAEEAkQBQ%3D%3D',
-        'playlist_mincount': 30,
-        'info_dict': {
-            'id': 'royalty free music - songs',
-            'title': 'royalty free music - songs',
-        },
-        'params': {'extract_flat': 'in_playlist'}
-    }, {
-        'url': 'https://music.youtube.com/search?q=royalty+free+music#community+playlists',
-        'playlist_mincount': 30,
-        'info_dict': {
-            'id': 'royalty free music - community playlists',
-            'title': 'royalty free music - community playlists',
-        },
-        'params': {'extract_flat': 'in_playlist'}
-    }]
-
-    _SECTIONS = {
-        'albums': 'EgWKAQIYAWoKEAoQAxAEEAkQBQ==',
-        'artists': 'EgWKAQIgAWoKEAoQAxAEEAkQBQ==',
-        'community playlists': 'EgeKAQQoAEABagoQChADEAQQCRAF',
-        'featured playlists': 'EgeKAQQoADgBagwQAxAJEAQQDhAKEAU==',
-        'songs': 'EgWKAQIIAWoKEAoQAxAEEAkQBQ==',
-        'videos': 'EgWKAQIQAWoKEAoQAxAEEAkQBQ==',
-    }
-
-    def _real_extract(self, url):
-        qs = parse_qs(url)
-        query = (qs.get('search_query') or qs.get('q'))[0]
-        params = qs.get('sp', (None,))[0]
-        if params:
-            section = next((k for k, v in self._SECTIONS.items() if v == params), params)
-        else:
-            section = urllib.parse.unquote_plus((url.split('#') + [''])[1]).lower()
-            params = self._SECTIONS.get(section)
-            if not params:
-                section = None
-        title = join_nonempty(query, section, delim=' - ')
-        return self.playlist_result(self._search_results(query, params, default_client='web_music'), title, title)
-
-
-class YoutubeFeedsInfoExtractor(InfoExtractor):
-    """
-    Base class for feed extractors
-    Subclasses must re-define the _FEED_NAME property.
-    """
-    _LOGIN_REQUIRED = True
-    _FEED_NAME = 'feeds'
-
-    def _real_initialize(self):
-        YoutubeBaseInfoExtractor._check_login_required(self)
-
-    @classproperty
-    def IE_NAME(self):
-        return f'youtube:{self._FEED_NAME}'
-
-    def _real_extract(self, url):
-        return self.url_result(
-            f'https://www.youtube.com/feed/{self._FEED_NAME}', ie=YoutubeTabIE.ie_key())
-
-
-class YoutubeWatchLaterIE(InfoExtractor):
-    IE_NAME = 'youtube:watchlater'
-    IE_DESC = 'Youtube watch later list; ":ytwatchlater" keyword (requires cookies)'
-    _VALID_URL = r':ytwatchlater'
-    _TESTS = [{
-        'url': ':ytwatchlater',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        return self.url_result(
-            'https://www.youtube.com/playlist?list=WL', ie=YoutubeTabIE.ie_key())
-
-
-class YoutubeRecommendedIE(YoutubeFeedsInfoExtractor):
-    IE_DESC = 'YouTube recommended videos; ":ytrec" keyword'
-    _VALID_URL = r'https?://(?:www\.)?youtube\.com/?(?:[?#]|$)|:ytrec(?:ommended)?'
-    _FEED_NAME = 'recommended'
-    _LOGIN_REQUIRED = False
-    _TESTS = [{
-        'url': ':ytrec',
-        'only_matching': True,
-    }, {
-        'url': ':ytrecommended',
-        'only_matching': True,
-    }, {
-        'url': 'https://youtube.com',
-        'only_matching': True,
-    }]
-
-
-class YoutubeSubscriptionsIE(YoutubeFeedsInfoExtractor):
-    IE_DESC = 'YouTube subscriptions feed; ":ytsubs" keyword (requires cookies)'
-    _VALID_URL = r':ytsub(?:scription)?s?'
-    _FEED_NAME = 'subscriptions'
-    _TESTS = [{
-        'url': ':ytsubs',
-        'only_matching': True,
-    }, {
-        'url': ':ytsubscriptions',
-        'only_matching': True,
-    }]
-
-
-class YoutubeHistoryIE(YoutubeFeedsInfoExtractor):
-    IE_DESC = 'Youtube watch history; ":ythis" keyword (requires cookies)'
-    _VALID_URL = r':ythis(?:tory)?'
-    _FEED_NAME = 'history'
-    _TESTS = [{
-        'url': ':ythistory',
-        'only_matching': True,
-    }]
-
-
-class YoutubeShortsAudioPivotIE(InfoExtractor):
-    IE_DESC = 'YouTube Shorts audio pivot (Shorts using audio of a given video)'
-    IE_NAME = 'youtube:shorts:pivot:audio'
-    _VALID_URL = r'https?://(?:www\.)?youtube\.com/source/(?P<id>[\w-]{11})/shorts'
-    _TESTS = [{
-        'url': 'https://www.youtube.com/source/Lyj-MZSAA9o/shorts',
-        'only_matching': True,
-    }]
-
-    @staticmethod
-    def _generate_audio_pivot_params(video_id):
-        """
-        Generates sfv_audio_pivot browse params for this video id
-        """
-        pb_params = b'\xf2\x05+\n)\x12\'\n\x0b%b\x12\x0b%b\x1a\x0b%b' % ((video_id.encode(),) * 3)
-        return urllib.parse.quote(base64.b64encode(pb_params).decode())
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        return self.url_result(
-            f'https://www.youtube.com/feed/sfv_audio_pivot?bp={self._generate_audio_pivot_params(video_id)}',
-            ie=YoutubeTabIE)
-
-
-class YoutubeTruncatedURLIE(InfoExtractor):
-    IE_NAME = 'youtube:truncated_url'
-    IE_DESC = False  # Do not list
-    _VALID_URL = r'''(?x)
-        (?:https?://)?
-        (?:\w+\.)?[yY][oO][uU][tT][uU][bB][eE](?:-nocookie)?\.com/
-        (?:watch\?(?:
-            feature=[a-z_]+|
-            annotation_id=annotation_[^&]+|
-            x-yt-cl=[0-9]+|
-            hl=[^&]*|
-            t=[0-9]+
-        )?
-        |
-            attribution_link\?a=[^&]+
-        )
-        $
-    '''
-
-    _TESTS = [{
-        'url': 'https://www.youtube.com/watch?annotation_id=annotation_3951667041',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.youtube.com/watch?',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.youtube.com/watch?x-yt-cl=84503534',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.youtube.com/watch?feature=foo',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.youtube.com/watch?hl=en-GB',
-        'only_matching': True,
-    }, {
-        'url': 'https://www.youtube.com/watch?t=2372',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        raise ExtractorError(
-            'Did you forget to quote the URL? Remember that & is a meta '
-            'character in most shells, so you want to put the URL in quotes, '
-            'like  youtube-dl '
-            '"https://www.youtube.com/watch?feature=foo&v=BaW_jenozKc" '
-            ' or simply  youtube-dl BaW_jenozKc  .',
-            expected=True)
-
-
-class YoutubeClipIE(YoutubeTabBaseInfoExtractor):
-    IE_NAME = 'youtube:clip'
-    _VALID_URL = r'https?://(?:www\.)?youtube\.com/clip/(?P<id>[^/?#]+)'
-    _TESTS = [{
-        # FIXME: Other metadata should be extracted from the clip, not from the base video
-        'url': 'https://www.youtube.com/clip/UgytZKpehg-hEMBSn3F4AaABCQ',
-        'info_dict': {
-            'id': 'UgytZKpehg-hEMBSn3F4AaABCQ',
-            'ext': 'mp4',
-            'section_start': 29.0,
-            'section_end': 39.7,
-            'duration': 10.7,
-            'age_limit': 0,
-            'availability': 'public',
-            'categories': ['Gaming'],
-            'channel': 'Scott The Woz',
-            'channel_id': 'UC4rqhyiTs7XyuODcECvuiiQ',
-            'channel_url': 'https://www.youtube.com/channel/UC4rqhyiTs7XyuODcECvuiiQ',
-            'description': 'md5:7a4517a17ea9b4bd98996399d8bb36e7',
-            'like_count': int,
-            'playable_in_embed': True,
-            'tags': 'count:17',
-            'thumbnail': 'https://i.ytimg.com/vi_webp/ScPX26pdQik/maxresdefault.webp',
-            'title': 'Mobile Games on Console - Scott The Woz',
-            'upload_date': '20210920',
-            'uploader': 'Scott The Woz',
-            'uploader_id': '@ScottTheWoz',
-            'uploader_url': 'https://www.youtube.com/@ScottTheWoz',
-            'view_count': int,
-            'live_status': 'not_live',
-            'channel_follower_count': int,
-            'chapters': 'count:20',
-            'comment_count': int,
-            'heatmap': 'count:100',
-        }
-    }]
-
-    def _real_extract(self, url):
-        clip_id = self._match_id(url)
-        _, data = self._extract_webpage(url, clip_id)
-
-        video_id = traverse_obj(data, ('currentVideoEndpoint', 'watchEndpoint', 'videoId'))
-        if not video_id:
-            raise ExtractorError('Unable to find video ID')
-
-        clip_data = traverse_obj(data, (
-            'engagementPanels', ..., 'engagementPanelSectionListRenderer', 'content', 'clipSectionRenderer',
-            'contents', ..., 'clipAttributionRenderer', 'onScrubExit', 'commandExecutorCommand', 'commands', ...,
-            'openPopupAction', 'popup', 'notificationActionRenderer', 'actionButton', 'buttonRenderer', 'command',
-            'commandExecutorCommand', 'commands', ..., 'loopCommand'), get_all=False)
-
-        return {
-            '_type': 'url_transparent',
-            'url': f'https://www.youtube.com/watch?v={video_id}',
-            'ie_key': YoutubeIE.ie_key(),
-            'id': clip_id,
-            'section_start': int(clip_data['startTimeMs']) / 1000,
-            'section_end': int(clip_data['endTimeMs']) / 1000,
-        }
-
-
-class YoutubeConsentRedirectIE(YoutubeBaseInfoExtractor):
-    IE_NAME = 'youtube:consent'
-    IE_DESC = False  # Do not list
-    _VALID_URL = r'https?://consent\.youtube\.com/m\?'
-    _TESTS = [{
-        'url': 'https://consent.youtube.com/m?continue=https%3A%2F%2Fwww.youtube.com%2Flive%2FqVv6vCqciTM%3Fcbrd%3D1&gl=NL&m=0&pc=yt&hl=en&src=1',
-        'info_dict': {
-            'id': 'qVv6vCqciTM',
-            'ext': 'mp4',
-            'age_limit': 0,
-            'uploader_id': '@sana_natori',
-            'comment_count': int,
-            'chapters': 'count:13',
-            'upload_date': '20221223',
-            'thumbnail': 'https://i.ytimg.com/vi/qVv6vCqciTM/maxresdefault.jpg',
-            'channel_url': 'https://www.youtube.com/channel/UCIdEIHpS0TdkqRkHL5OkLtA',
-            'uploader_url': 'https://www.youtube.com/@sana_natori',
-            'like_count': int,
-            'release_date': '20221223',
-            'tags': ['Vtuber', '月ノ美兎', '名取さな', 'にじさんじ', 'クリスマス', '3D配信'],
-            'title': '【 #インターネット女クリスマス 】3Dで歌ってはしゃぐインターネットの女たち【月ノ美兎/名取さな】',
-            'view_count': int,
-            'playable_in_embed': True,
-            'duration': 4438,
-            'availability': 'public',
-            'channel_follower_count': int,
-            'channel_id': 'UCIdEIHpS0TdkqRkHL5OkLtA',
-            'categories': ['Entertainment'],
-            'live_status': 'was_live',
-            'release_timestamp': 1671793345,
-            'channel': 'さなちゃんねる',
-            'description': 'md5:6aebf95cc4a1d731aebc01ad6cc9806d',
-            'uploader': 'さなちゃんねる',
-            'channel_is_verified': True,
-            'heatmap': 'count:100',
-        },
-        'add_ie': ['Youtube'],
-        'params': {'skip_download': 'Youtube'},
-    }]
-
-    def _real_extract(self, url):
-        redirect_url = url_or_none(parse_qs(url).get('continue', [None])[-1])
-        if not redirect_url:
-            raise ExtractorError('Invalid cookie consent redirect URL', expected=True)
-        return self.url_result(redirect_url)
-
-
-class YoutubeTruncatedIDIE(InfoExtractor):
-    IE_NAME = 'youtube:truncated_id'
-    IE_DESC = False  # Do not list
-    _VALID_URL = r'https?://(?:www\.)?youtube\.com/watch\?v=(?P<id>[0-9A-Za-z_-]{1,10})$'
-
-    _TESTS = [{
-        'url': 'https://www.youtube.com/watch?v=N_708QY7Ob',
-        'only_matching': True,
-    }]
-
-    def _real_extract(self, url):
-        video_id = self._match_id(url)
-        raise ExtractorError(
-            f'Incomplete YouTube ID {video_id}. URL {url} looks truncated.',
-            expected=True)
diff --git a/plugins/youtube_download/yt_dlp/extractor/youtube/__init__.py b/plugins/youtube_download/yt_dlp/extractor/youtube/__init__.py
new file mode 100644
index 0000000..892d860
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/youtube/__init__.py
@@ -0,0 +1,50 @@
+# flake8: noqa: F401
+from ._base import YoutubeBaseInfoExtractor
+from ._clip import YoutubeClipIE
+from ._mistakes import YoutubeTruncatedIDIE, YoutubeTruncatedURLIE
+from ._notifications import YoutubeNotificationsIE
+from ._redirect import (
+    YoutubeConsentRedirectIE,
+    YoutubeFavouritesIE,
+    YoutubeFeedsInfoExtractor,
+    YoutubeHistoryIE,
+    YoutubeLivestreamEmbedIE,
+    YoutubeRecommendedIE,
+    YoutubeShortsAudioPivotIE,
+    YoutubeSubscriptionsIE,
+    YoutubeWatchLaterIE,
+    YoutubeYtBeIE,
+    YoutubeYtUserIE,
+)
+from ._search import YoutubeMusicSearchURLIE, YoutubeSearchDateIE, YoutubeSearchIE, YoutubeSearchURLIE
+from ._tab import YoutubePlaylistIE, YoutubeTabBaseInfoExtractor, YoutubeTabIE
+from ._video import YoutubeIE
+
+# Hack to allow plugin overrides work
+for _cls in [
+    YoutubeBaseInfoExtractor,
+    YoutubeClipIE,
+    YoutubeTruncatedIDIE,
+    YoutubeTruncatedURLIE,
+    YoutubeNotificationsIE,
+    YoutubeConsentRedirectIE,
+    YoutubeFavouritesIE,
+    YoutubeFeedsInfoExtractor,
+    YoutubeHistoryIE,
+    YoutubeLivestreamEmbedIE,
+    YoutubeRecommendedIE,
+    YoutubeShortsAudioPivotIE,
+    YoutubeSubscriptionsIE,
+    YoutubeWatchLaterIE,
+    YoutubeYtBeIE,
+    YoutubeYtUserIE,
+    YoutubeMusicSearchURLIE,
+    YoutubeSearchDateIE,
+    YoutubeSearchIE,
+    YoutubeSearchURLIE,
+    YoutubePlaylistIE,
+    YoutubeTabBaseInfoExtractor,
+    YoutubeTabIE,
+    YoutubeIE,
+]:
+    _cls.__module__ = 'yt_dlp.extractor.youtube'
diff --git a/plugins/youtube_download/yt_dlp/extractor/youtube/_base.py b/plugins/youtube_download/yt_dlp/extractor/youtube/_base.py
new file mode 100644
index 0000000..4194e1c
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/youtube/_base.py
@@ -0,0 +1,1102 @@
+import calendar
+import copy
+import datetime as dt
+import enum
+import functools
+import hashlib
+import json
+import re
+import time
+import urllib.parse
+
+from ..common import InfoExtractor
+from ...networking.exceptions import HTTPError, network_exceptions
+from ...utils import (
+    ExtractorError,
+    bug_reports_message,
+    datetime_from_str,
+    filter_dict,
+    get_first,
+    int_or_none,
+    is_html,
+    join_nonempty,
+    parse_count,
+    qualities,
+    str_to_int,
+    traverse_obj,
+    try_call,
+    try_get,
+    unified_timestamp,
+    url_or_none,
+    variadic,
+)
+
+
+class _PoTokenContext(enum.Enum):
+    PLAYER = 'player'
+    GVS = 'gvs'
+
+
+# any clients starting with _ cannot be explicitly requested by the user
+INNERTUBE_CLIENTS = {
+    'web': {
+        'INNERTUBE_CONTEXT': {
+            'client': {
+                'clientName': 'WEB',
+                'clientVersion': '2.20250312.04.00',
+            },
+        },
+        'INNERTUBE_CONTEXT_CLIENT_NAME': 1,
+        'PO_TOKEN_REQUIRED_CONTEXTS': [_PoTokenContext.GVS],
+        'SUPPORTS_COOKIES': True,
+    },
+    # Safari UA returns pre-merged video+audio 144p/240p/360p/720p/1080p HLS formats
+    'web_safari': {
+        'INNERTUBE_CONTEXT': {
+            'client': {
+                'clientName': 'WEB',
+                'clientVersion': '2.20250312.04.00',
+                'userAgent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.5 Safari/605.1.15,gzip(gfe)',
+            },
+        },
+        'INNERTUBE_CONTEXT_CLIENT_NAME': 1,
+        'PO_TOKEN_REQUIRED_CONTEXTS': [_PoTokenContext.GVS],
+        'SUPPORTS_COOKIES': True,
+    },
+    'web_embedded': {
+        'INNERTUBE_CONTEXT': {
+            'client': {
+                'clientName': 'WEB_EMBEDDED_PLAYER',
+                'clientVersion': '1.20250310.01.00',
+            },
+        },
+        'INNERTUBE_CONTEXT_CLIENT_NAME': 56,
+        'SUPPORTS_COOKIES': True,
+    },
+    'web_music': {
+        'INNERTUBE_HOST': 'music.youtube.com',
+        'INNERTUBE_CONTEXT': {
+            'client': {
+                'clientName': 'WEB_REMIX',
+                'clientVersion': '1.20250310.01.00',
+            },
+        },
+        'INNERTUBE_CONTEXT_CLIENT_NAME': 67,
+        'PO_TOKEN_REQUIRED_CONTEXTS': [_PoTokenContext.GVS],
+        'SUPPORTS_COOKIES': True,
+    },
+    # This client now requires sign-in for every video
+    'web_creator': {
+        'INNERTUBE_CONTEXT': {
+            'client': {
+                'clientName': 'WEB_CREATOR',
+                'clientVersion': '1.20250312.03.01',
+            },
+        },
+        'INNERTUBE_CONTEXT_CLIENT_NAME': 62,
+        'PO_TOKEN_REQUIRED_CONTEXTS': [_PoTokenContext.GVS],
+        'REQUIRE_AUTH': True,
+        'SUPPORTS_COOKIES': True,
+    },
+    'android': {
+        'INNERTUBE_CONTEXT': {
+            'client': {
+                'clientName': 'ANDROID',
+                'clientVersion': '20.10.38',
+                'androidSdkVersion': 30,
+                'userAgent': 'com.google.android.youtube/20.10.38 (Linux; U; Android 11) gzip',
+                'osName': 'Android',
+                'osVersion': '11',
+            },
+        },
+        'INNERTUBE_CONTEXT_CLIENT_NAME': 3,
+        'REQUIRE_JS_PLAYER': False,
+        'PO_TOKEN_REQUIRED_CONTEXTS': [_PoTokenContext.GVS],
+    },
+    # YouTube Kids videos aren't returned on this client for some reason
+    'android_vr': {
+        'INNERTUBE_CONTEXT': {
+            'client': {
+                'clientName': 'ANDROID_VR',
+                'clientVersion': '1.62.27',
+                'deviceMake': 'Oculus',
+                'deviceModel': 'Quest 3',
+                'androidSdkVersion': 32,
+                'userAgent': 'com.google.android.apps.youtube.vr.oculus/1.62.27 (Linux; U; Android 12L; eureka-user Build/SQ3A.220605.009.A1) gzip',
+                'osName': 'Android',
+                'osVersion': '12L',
+            },
+        },
+        'INNERTUBE_CONTEXT_CLIENT_NAME': 28,
+        'REQUIRE_JS_PLAYER': False,
+    },
+    # iOS clients have HLS live streams. Setting device model to get 60fps formats.
+    # See: https://github.com/TeamNewPipe/NewPipeExtractor/issues/680#issuecomment-1002724558
+    'ios': {
+        'INNERTUBE_CONTEXT': {
+            'client': {
+                'clientName': 'IOS',
+                'clientVersion': '20.10.4',
+                'deviceMake': 'Apple',
+                'deviceModel': 'iPhone16,2',
+                'userAgent': 'com.google.ios.youtube/20.10.4 (iPhone16,2; U; CPU iOS 18_3_2 like Mac OS X;)',
+                'osName': 'iPhone',
+                'osVersion': '18.3.2.22D82',
+            },
+        },
+        'INNERTUBE_CONTEXT_CLIENT_NAME': 5,
+        'PO_TOKEN_REQUIRED_CONTEXTS': [_PoTokenContext.GVS],
+        'REQUIRE_JS_PLAYER': False,
+    },
+    # mweb has 'ultralow' formats
+    # See: https://github.com/yt-dlp/yt-dlp/pull/557
+    'mweb': {
+        'INNERTUBE_CONTEXT': {
+            'client': {
+                'clientName': 'MWEB',
+                'clientVersion': '2.20250311.03.00',
+                # mweb previously did not require PO Token with this UA
+                'userAgent': 'Mozilla/5.0 (iPad; CPU OS 16_7_10 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1,gzip(gfe)',
+            },
+        },
+        'INNERTUBE_CONTEXT_CLIENT_NAME': 2,
+        'PO_TOKEN_REQUIRED_CONTEXTS': [_PoTokenContext.GVS],
+        'SUPPORTS_COOKIES': True,
+    },
+    'tv': {
+        'INNERTUBE_CONTEXT': {
+            'client': {
+                'clientName': 'TVHTML5',
+                'clientVersion': '7.20250312.16.00',
+                'userAgent': 'Mozilla/5.0 (ChromiumStylePlatform) Cobalt/Version',
+            },
+        },
+        'INNERTUBE_CONTEXT_CLIENT_NAME': 7,
+        'SUPPORTS_COOKIES': True,
+    },
+    # This client now requires sign-in for every video
+    # It was previously an age-gate workaround for videos that were `playable_in_embed`
+    # It may still be useful if signed into an EU account that is not age-verified
+    'tv_embedded': {
+        'INNERTUBE_CONTEXT': {
+            'client': {
+                'clientName': 'TVHTML5_SIMPLY_EMBEDDED_PLAYER',
+                'clientVersion': '2.0',
+            },
+        },
+        'INNERTUBE_CONTEXT_CLIENT_NAME': 85,
+        'REQUIRE_AUTH': True,
+        'SUPPORTS_COOKIES': True,
+    },
+}
+
+
+def _split_innertube_client(client_name):
+    variant, *base = client_name.rsplit('.', 1)
+    if base:
+        return variant, base[0], variant
+    base, *variant = client_name.split('_', 1)
+    return client_name, base, variant[0] if variant else None
+
+
+def short_client_name(client_name):
+    main, *parts = _split_innertube_client(client_name)[0].split('_')
+    return join_nonempty(main[:4], ''.join(x[0] for x in parts)).upper()
+
+
+def build_innertube_clients():
+    THIRD_PARTY = {
+        'embedUrl': 'https://www.youtube.com/',  # Can be any valid URL
+    }
+    BASE_CLIENTS = ('ios', 'web', 'tv', 'mweb', 'android')
+    priority = qualities(BASE_CLIENTS[::-1])
+
+    for client, ytcfg in tuple(INNERTUBE_CLIENTS.items()):
+        ytcfg.setdefault('INNERTUBE_HOST', 'www.youtube.com')
+        ytcfg.setdefault('REQUIRE_JS_PLAYER', True)
+        ytcfg.setdefault('PO_TOKEN_REQUIRED_CONTEXTS', [])
+        ytcfg.setdefault('REQUIRE_AUTH', False)
+        ytcfg.setdefault('SUPPORTS_COOKIES', False)
+        ytcfg.setdefault('PLAYER_PARAMS', None)
+        ytcfg['INNERTUBE_CONTEXT']['client'].setdefault('hl', 'en')
+
+        _, base_client, variant = _split_innertube_client(client)
+        ytcfg['priority'] = 10 * priority(base_client)
+
+        if variant == 'embedded':
+            ytcfg['INNERTUBE_CONTEXT']['thirdParty'] = THIRD_PARTY
+            ytcfg['priority'] -= 2
+        elif variant:
+            ytcfg['priority'] -= 3
+
+
+build_innertube_clients()
+
+
+class BadgeType(enum.Enum):
+    AVAILABILITY_UNLISTED = enum.auto()
+    AVAILABILITY_PRIVATE = enum.auto()
+    AVAILABILITY_PUBLIC = enum.auto()
+    AVAILABILITY_PREMIUM = enum.auto()
+    AVAILABILITY_SUBSCRIPTION = enum.auto()
+    LIVE_NOW = enum.auto()
+    VERIFIED = enum.auto()
+
+
+CONFIGURATION_ARG_KEY = 'youtube'
+
+
+class YoutubeBaseInfoExtractor(InfoExtractor):
+    """Provide base functions for Youtube extractors"""
+
+    _RESERVED_NAMES = (
+        r'channel|c|user|playlist|watch|w|v|embed|e|live|watch_popup|clip|'
+        r'shorts|movies|results|search|shared|hashtag|trending|explore|feed|feeds|'
+        r'browse|oembed|get_video_info|iframe_api|s/player|source|'
+        r'storefront|oops|index|account|t/terms|about|upload|signin|logout')
+
+    _PLAYLIST_ID_RE = r'(?:(?:PL|LL|EC|UU|FL|RD|UL|TL|PU|OLAK5uy_)[0-9A-Za-z-_]{10,}|RDMM|WL|LL|LM)'
+
+    # _NETRC_MACHINE = 'youtube'
+
+    # If True it will raise an error if no login info is provided
+    _LOGIN_REQUIRED = False
+
+    _INVIDIOUS_SITES = (
+        # invidious-redirect websites
+        r'(?:www\.)?redirect\.invidious\.io',
+        r'(?:(?:www|dev)\.)?invidio\.us',
+        # Invidious instances taken from https://github.com/iv-org/documentation/blob/master/docs/instances.md
+        r'(?:www\.)?invidious\.pussthecat\.org',
+        r'(?:www\.)?invidious\.zee\.li',
+        r'(?:www\.)?invidious\.ethibox\.fr',
+        r'(?:www\.)?iv\.ggtyler\.dev',
+        r'(?:www\.)?inv\.vern\.i2p',
+        r'(?:www\.)?am74vkcrjp2d5v36lcdqgsj2m6x36tbrkhsruoegwfcizzabnfgf5zyd\.onion',
+        r'(?:www\.)?inv\.riverside\.rocks',
+        r'(?:www\.)?invidious\.silur\.me',
+        r'(?:www\.)?inv\.bp\.projectsegfau\.lt',
+        r'(?:www\.)?invidious\.g4c3eya4clenolymqbpgwz3q3tawoxw56yhzk4vugqrl6dtu3ejvhjid\.onion',
+        r'(?:www\.)?invidious\.slipfox\.xyz',
+        r'(?:www\.)?invidious\.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd\.onion',
+        r'(?:www\.)?inv\.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad\.onion',
+        r'(?:www\.)?invidious\.tiekoetter\.com',
+        r'(?:www\.)?iv\.odysfvr23q5wgt7i456o5t3trw2cw5dgn56vbjfbq2m7xsc5vqbqpcyd\.onion',
+        r'(?:www\.)?invidious\.nerdvpn\.de',
+        r'(?:www\.)?invidious\.weblibre\.org',
+        r'(?:www\.)?inv\.odyssey346\.dev',
+        r'(?:www\.)?invidious\.dhusch\.de',
+        r'(?:www\.)?iv\.melmac\.space',
+        r'(?:www\.)?watch\.thekitty\.zone',
+        r'(?:www\.)?invidious\.privacydev\.net',
+        r'(?:www\.)?ng27owmagn5amdm7l5s3rsqxwscl5ynppnis5dqcasogkyxcfqn7psid\.onion',
+        r'(?:www\.)?invidious\.drivet\.xyz',
+        r'(?:www\.)?vid\.priv\.au',
+        r'(?:www\.)?euxxcnhsynwmfidvhjf6uzptsmh4dipkmgdmcmxxuo7tunp3ad2jrwyd\.onion',
+        r'(?:www\.)?inv\.vern\.cc',
+        r'(?:www\.)?invidious\.esmailelbob\.xyz',
+        r'(?:www\.)?invidious\.sethforprivacy\.com',
+        r'(?:www\.)?yt\.oelrichsgarcia\.de',
+        r'(?:www\.)?yt\.artemislena\.eu',
+        r'(?:www\.)?invidious\.flokinet\.to',
+        r'(?:www\.)?invidious\.baczek\.me',
+        r'(?:www\.)?y\.com\.sb',
+        r'(?:www\.)?invidious\.epicsite\.xyz',
+        r'(?:www\.)?invidious\.lidarshield\.cloud',
+        r'(?:www\.)?yt\.funami\.tech',
+        r'(?:www\.)?invidious\.3o7z6yfxhbw7n3za4rss6l434kmv55cgw2vuziwuigpwegswvwzqipyd\.onion',
+        r'(?:www\.)?osbivz6guyeahrwp2lnwyjk2xos342h4ocsxyqrlaopqjuhwn2djiiyd\.onion',
+        r'(?:www\.)?u2cvlit75owumwpy4dj2hsmvkq7nvrclkpht7xgyye2pyoxhpmclkrad\.onion',
+        # youtube-dl invidious instances list
+        r'(?:(?:www|no)\.)?invidiou\.sh',
+        r'(?:(?:www|fi)\.)?invidious\.snopyta\.org',
+        r'(?:www\.)?invidious\.kabi\.tk',
+        r'(?:www\.)?invidious\.mastodon\.host',
+        r'(?:www\.)?invidious\.zapashcanon\.fr',
+        r'(?:www\.)?(?:invidious(?:-us)?|piped)\.kavin\.rocks',
+        r'(?:www\.)?invidious\.tinfoil-hat\.net',
+        r'(?:www\.)?invidious\.himiko\.cloud',
+        r'(?:www\.)?invidious\.reallyancient\.tech',
+        r'(?:www\.)?invidious\.tube',
+        r'(?:www\.)?invidiou\.site',
+        r'(?:www\.)?invidious\.site',
+        r'(?:www\.)?invidious\.xyz',
+        r'(?:www\.)?invidious\.nixnet\.xyz',
+        r'(?:www\.)?invidious\.048596\.xyz',
+        r'(?:www\.)?invidious\.drycat\.fr',
+        r'(?:www\.)?inv\.skyn3t\.in',
+        r'(?:www\.)?tube\.poal\.co',
+        r'(?:www\.)?tube\.connect\.cafe',
+        r'(?:www\.)?vid\.wxzm\.sx',
+        r'(?:www\.)?vid\.mint\.lgbt',
+        r'(?:www\.)?vid\.puffyan\.us',
+        r'(?:www\.)?yewtu\.be',
+        r'(?:www\.)?yt\.elukerio\.org',
+        r'(?:www\.)?yt\.lelux\.fi',
+        r'(?:www\.)?invidious\.ggc-project\.de',
+        r'(?:www\.)?yt\.maisputain\.ovh',
+        r'(?:www\.)?ytprivate\.com',
+        r'(?:www\.)?invidious\.13ad\.de',
+        r'(?:www\.)?invidious\.toot\.koeln',
+        r'(?:www\.)?invidious\.fdn\.fr',
+        r'(?:www\.)?watch\.nettohikari\.com',
+        r'(?:www\.)?invidious\.namazso\.eu',
+        r'(?:www\.)?invidious\.silkky\.cloud',
+        r'(?:www\.)?invidious\.exonip\.de',
+        r'(?:www\.)?invidious\.riverside\.rocks',
+        r'(?:www\.)?invidious\.blamefran\.net',
+        r'(?:www\.)?invidious\.moomoo\.de',
+        r'(?:www\.)?ytb\.trom\.tf',
+        r'(?:www\.)?yt\.cyberhost\.uk',
+        r'(?:www\.)?kgg2m7yk5aybusll\.onion',
+        r'(?:www\.)?qklhadlycap4cnod\.onion',
+        r'(?:www\.)?axqzx4s6s54s32yentfqojs3x5i7faxza6xo3ehd4bzzsg2ii4fv2iid\.onion',
+        r'(?:www\.)?c7hqkpkpemu6e7emz5b4vyz7idjgdvgaaa3dyimmeojqbgpea3xqjoid\.onion',
+        r'(?:www\.)?fz253lmuao3strwbfbmx46yu7acac2jz27iwtorgmbqlkurlclmancad\.onion',
+        r'(?:www\.)?invidious\.l4qlywnpwqsluw65ts7md3khrivpirse744un3x7mlskqauz5pyuzgqd\.onion',
+        r'(?:www\.)?owxfohz4kjyv25fvlqilyxast7inivgiktls3th44jhk3ej3i7ya\.b32\.i2p',
+        r'(?:www\.)?4l2dgddgsrkf2ous66i6seeyi6etzfgrue332grh2n7madpwopotugyd\.onion',
+        r'(?:www\.)?w6ijuptxiku4xpnnaetxvnkc5vqcdu7mgns2u77qefoixi63vbvnpnqd\.onion',
+        r'(?:www\.)?kbjggqkzv65ivcqj6bumvp337z6264huv5kpkwuv6gu5yjiskvan7fad\.onion',
+        r'(?:www\.)?grwp24hodrefzvjjuccrkw3mjq4tzhaaq32amf33dzpmuxe7ilepcmad\.onion',
+        r'(?:www\.)?hpniueoejy4opn7bc4ftgazyqjoeqwlvh2uiku2xqku6zpoa4bf5ruid\.onion',
+        # piped instances from https://github.com/TeamPiped/Piped/wiki/Instances
+        r'(?:www\.)?piped\.kavin\.rocks',
+        r'(?:www\.)?piped\.tokhmi\.xyz',
+        r'(?:www\.)?piped\.syncpundit\.io',
+        r'(?:www\.)?piped\.mha\.fi',
+        r'(?:www\.)?watch\.whatever\.social',
+        r'(?:www\.)?piped\.garudalinux\.org',
+        r'(?:www\.)?piped\.rivo\.lol',
+        r'(?:www\.)?piped-libre\.kavin\.rocks',
+        r'(?:www\.)?yt\.jae\.fi',
+        r'(?:www\.)?piped\.mint\.lgbt',
+        r'(?:www\.)?il\.ax',
+        r'(?:www\.)?piped\.esmailelbob\.xyz',
+        r'(?:www\.)?piped\.projectsegfau\.lt',
+        r'(?:www\.)?piped\.privacydev\.net',
+        r'(?:www\.)?piped\.palveluntarjoaja\.eu',
+        r'(?:www\.)?piped\.smnz\.de',
+        r'(?:www\.)?piped\.adminforge\.de',
+        r'(?:www\.)?watch\.whatevertinfoil\.de',
+        r'(?:www\.)?piped\.qdi\.fi',
+        r'(?:(?:www|cf)\.)?piped\.video',
+        r'(?:www\.)?piped\.aeong\.one',
+        r'(?:www\.)?piped\.moomoo\.me',
+        r'(?:www\.)?piped\.chauvet\.pro',
+        r'(?:www\.)?watch\.leptons\.xyz',
+        r'(?:www\.)?pd\.vern\.cc',
+        r'(?:www\.)?piped\.hostux\.net',
+        r'(?:www\.)?piped\.lunar\.icu',
+        # Hyperpipe instances from https://hyperpipe.codeberg.page/
+        r'(?:www\.)?hyperpipe\.surge\.sh',
+        r'(?:www\.)?hyperpipe\.esmailelbob\.xyz',
+        r'(?:www\.)?listen\.whatever\.social',
+        r'(?:www\.)?music\.adminforge\.de',
+    )
+
+    # extracted from account/account_menu ep
+    # XXX: These are the supported YouTube UI and API languages,
+    # which is slightly different from languages supported for translation in YouTube studio
+    _SUPPORTED_LANG_CODES = [
+        'af', 'az', 'id', 'ms', 'bs', 'ca', 'cs', 'da', 'de', 'et', 'en-IN', 'en-GB', 'en', 'es',
+        'es-419', 'es-US', 'eu', 'fil', 'fr', 'fr-CA', 'gl', 'hr', 'zu', 'is', 'it', 'sw', 'lv',
+        'lt', 'hu', 'nl', 'no', 'uz', 'pl', 'pt-PT', 'pt', 'ro', 'sq', 'sk', 'sl', 'sr-Latn', 'fi',
+        'sv', 'vi', 'tr', 'be', 'bg', 'ky', 'kk', 'mk', 'mn', 'ru', 'sr', 'uk', 'el', 'hy', 'iw',
+        'ur', 'ar', 'fa', 'ne', 'mr', 'hi', 'as', 'bn', 'pa', 'gu', 'or', 'ta', 'te', 'kn', 'ml',
+        'si', 'th', 'lo', 'my', 'ka', 'am', 'km', 'zh-CN', 'zh-TW', 'zh-HK', 'ja', 'ko',
+    ]
+
+    _IGNORED_WARNINGS = {
+        'Unavailable videos will be hidden during playback',
+        'Unavailable videos are hidden',
+    }
+
+    _YT_HANDLE_RE = r'@[\w.-]{3,30}'  # https://support.google.com/youtube/answer/11585688?hl=en
+    _YT_CHANNEL_UCID_RE = r'UC[\w-]{22}'
+
+    _NETRC_MACHINE = 'youtube'
+
+    _COOKIE_HOWTO_WIKI_URL = 'https://github.com/yt-dlp/yt-dlp/wiki/Extractors#exporting-youtube-cookies'
+
+    def ucid_or_none(self, ucid):
+        return self._search_regex(rf'^({self._YT_CHANNEL_UCID_RE})$', ucid, 'UC-id', default=None)
+
+    def handle_or_none(self, handle):
+        return self._search_regex(rf'^({self._YT_HANDLE_RE})$', urllib.parse.unquote(handle or ''),
+                                  '@-handle', default=None)
+
+    def handle_from_url(self, url):
+        return self._search_regex(rf'^(?:https?://(?:www\.)?youtube\.com)?/({self._YT_HANDLE_RE})',
+                                  urllib.parse.unquote(url or ''), 'channel handle', default=None)
+
+    def ucid_from_url(self, url):
+        return self._search_regex(rf'^(?:https?://(?:www\.)?youtube\.com)?/({self._YT_CHANNEL_UCID_RE})',
+                                  url, 'channel id', default=None)
+
+    @functools.cached_property
+    def _preferred_lang(self):
+        """
+        Returns a language code supported by YouTube for the user preferred language.
+        Returns None if no preferred language set.
+        """
+        preferred_lang = self._configuration_arg('lang', ie_key='Youtube', casesense=True, default=[''])[0]
+        if not preferred_lang:
+            return
+        if preferred_lang not in self._SUPPORTED_LANG_CODES:
+            raise ExtractorError(
+                f'Unsupported language code: {preferred_lang}. Supported language codes (case-sensitive): {join_nonempty(*self._SUPPORTED_LANG_CODES, delim=", ")}.',
+                expected=True)
+        elif preferred_lang != 'en':
+            self.report_warning(
+                f'Preferring "{preferred_lang}" translated fields. Note that some metadata extraction may fail or be incorrect.')
+        return preferred_lang
+
+    def _initialize_consent(self):
+        if self._has_auth_cookies:
+            return
+        socs = self._youtube_cookies.get('SOCS')
+        if socs and not socs.value.startswith('CAA'):  # not consented
+            return
+        self._set_cookie('.youtube.com', 'SOCS', 'CAI', secure=True)  # accept all (required for mixes)
+
+    def _initialize_pref(self):
+        pref_cookie = self._youtube_cookies.get('PREF')
+        pref = {}
+        if pref_cookie:
+            try:
+                pref = dict(urllib.parse.parse_qsl(pref_cookie.value))
+            except ValueError:
+                self.report_warning('Failed to parse user PREF cookie' + bug_reports_message())
+        pref.update({'hl': self._preferred_lang or 'en', 'tz': 'UTC'})
+        self._set_cookie('.youtube.com', name='PREF', value=urllib.parse.urlencode(pref))
+
+    def _initialize_cookie_auth(self):
+        self._passed_auth_cookies = False
+        if self._has_auth_cookies:
+            self._passed_auth_cookies = True
+            self.write_debug('Found YouTube account cookies')
+
+    def _real_initialize(self):
+        self._initialize_pref()
+        self._initialize_consent()
+        self._initialize_cookie_auth()
+        self._check_login_required()
+
+    def _perform_login(self, username, password):
+        if username.startswith('oauth'):
+            raise ExtractorError(
+                f'Login with OAuth is no longer supported. {self._youtube_login_hint}', expected=True)
+
+        self.report_warning(
+            f'Login with password is not supported for YouTube. {self._youtube_login_hint}')
+
+    @property
+    def _youtube_login_hint(self):
+        return (f'{self._login_hint(method="cookies")}. Also see  {self._COOKIE_HOWTO_WIKI_URL}  '
+                'for tips on effectively exporting YouTube cookies')
+
+    def _check_login_required(self):
+        if self._LOGIN_REQUIRED and not self.is_authenticated:
+            self.raise_login_required(
+                f'Login details are needed to download this content. {self._youtube_login_hint}', method=None)
+
+    _YT_INITIAL_DATA_RE = r'(?:window\s*\[\s*["\']ytInitialData["\']\s*\]|ytInitialData)\s*='
+    _YT_INITIAL_PLAYER_RESPONSE_RE = r'ytInitialPlayerResponse\s*='
+
+    def _get_default_ytcfg(self, client='web'):
+        return copy.deepcopy(INNERTUBE_CLIENTS[client])
+
+    def _get_innertube_host(self, client='web'):
+        return INNERTUBE_CLIENTS[client]['INNERTUBE_HOST']
+
+    def _ytcfg_get_safe(self, ytcfg, getter, expected_type=None, default_client='web'):
+        # try_get but with fallback to default ytcfg client values when present
+        _func = lambda y: try_get(y, getter, expected_type)
+        return _func(ytcfg) or _func(self._get_default_ytcfg(default_client))
+
+    def _extract_client_name(self, ytcfg, default_client='web'):
+        return self._ytcfg_get_safe(
+            ytcfg, (lambda x: x['INNERTUBE_CLIENT_NAME'],
+                    lambda x: x['INNERTUBE_CONTEXT']['client']['clientName']), str, default_client)
+
+    def _extract_client_version(self, ytcfg, default_client='web'):
+        return self._ytcfg_get_safe(
+            ytcfg, (lambda x: x['INNERTUBE_CLIENT_VERSION'],
+                    lambda x: x['INNERTUBE_CONTEXT']['client']['clientVersion']), str, default_client)
+
+    def _select_api_hostname(self, req_api_hostname, default_client=None):
+        return (self._configuration_arg('innertube_host', [''], ie_key=CONFIGURATION_ARG_KEY)[0]
+                or req_api_hostname or self._get_innertube_host(default_client or 'web'))
+
+    def _extract_context(self, ytcfg=None, default_client='web'):
+        context = get_first(
+            (ytcfg, self._get_default_ytcfg(default_client)), 'INNERTUBE_CONTEXT', expected_type=dict)
+        # Enforce language and tz for extraction
+        client_context = traverse_obj(context, 'client', expected_type=dict, default={})
+        client_context.update({'hl': self._preferred_lang or 'en', 'timeZone': 'UTC', 'utcOffsetMinutes': 0})
+        return context
+
+    @staticmethod
+    def _make_sid_authorization(scheme, sid, origin, additional_parts):
+        timestamp = str(round(time.time()))
+
+        hash_parts = []
+        if additional_parts:
+            hash_parts.append(':'.join(additional_parts.values()))
+        hash_parts.extend([timestamp, sid, origin])
+        sidhash = hashlib.sha1(' '.join(hash_parts).encode()).hexdigest()
+
+        parts = [timestamp, sidhash]
+        if additional_parts:
+            parts.append(''.join(additional_parts))
+
+        return f'{scheme} {"_".join(parts)}'
+
+    @property
+    def _youtube_cookies(self):
+        return self._get_cookies('https://www.youtube.com')
+
+    def _get_sid_cookies(self):
+        """
+        Get SAPISID, 1PSAPISID, 3PSAPISID cookie values
+        @returns sapisid, 1psapisid, 3psapisid
+        """
+        yt_cookies = self._youtube_cookies
+        yt_sapisid = try_call(lambda: yt_cookies['SAPISID'].value)
+        yt_3papisid = try_call(lambda: yt_cookies['__Secure-3PAPISID'].value)
+        yt_1papisid = try_call(lambda: yt_cookies['__Secure-1PAPISID'].value)
+
+        # Sometimes SAPISID cookie isn't present but __Secure-3PAPISID is.
+        # YouTube also falls back to __Secure-3PAPISID if SAPISID is missing.
+        # See: https://github.com/yt-dlp/yt-dlp/issues/393
+
+        return yt_sapisid or yt_3papisid, yt_1papisid, yt_3papisid
+
+    def _get_sid_authorization_header(self, origin='https://www.youtube.com', user_session_id=None):
+        """
+        Generate API Session ID Authorization for Innertube requests. Assumes all requests are secure (https).
+        @param origin: Origin URL
+        @param user_session_id: Optional User Session ID
+        @return: Authorization header value
+        """
+
+        authorizations = []
+        additional_parts = {}
+        if user_session_id:
+            additional_parts['u'] = user_session_id
+
+        yt_sapisid, yt_1psapisid, yt_3psapisid = self._get_sid_cookies()
+
+        for scheme, sid in (('SAPISIDHASH', yt_sapisid),
+                            ('SAPISID1PHASH', yt_1psapisid),
+                            ('SAPISID3PHASH', yt_3psapisid)):
+            if sid:
+                authorizations.append(self._make_sid_authorization(scheme, sid, origin, additional_parts))
+
+        if not authorizations:
+            return None
+
+        return ' '.join(authorizations)
+
+    @property
+    def is_authenticated(self):
+        return self._has_auth_cookies
+
+    @property
+    def _has_auth_cookies(self):
+        yt_sapisid, yt_1psapisid, yt_3psapisid = self._get_sid_cookies()
+        # YouTube doesn't appear to clear 3PSAPISID when rotating cookies (as of 2025-04-26)
+        # But LOGIN_INFO is cleared and should exist if logged in
+        has_login_info = 'LOGIN_INFO' in self._youtube_cookies
+        return bool(has_login_info and (yt_sapisid or yt_1psapisid or yt_3psapisid))
+
+    def _request_webpage(self, *args, **kwargs):
+        response = super()._request_webpage(*args, **kwargs)
+
+        # Check that we are still logged-in and cookies have not rotated after every request
+        if getattr(self, '_passed_auth_cookies', None) and not self._has_auth_cookies:
+            self.report_warning(
+                'The provided YouTube account cookies are no longer valid. '
+                'They have likely been rotated in the browser as a security measure. '
+                f'For tips on how to effectively export YouTube cookies, refer to  {self._COOKIE_HOWTO_WIKI_URL} .',
+                only_once=False)
+
+        return response
+
+    def _call_api(self, ep, query, video_id, fatal=True, headers=None,
+                  note='Downloading API JSON', errnote='Unable to download API page',
+                  context=None, api_key=None, api_hostname=None, default_client='web'):
+
+        data = {'context': context} if context else {'context': self._extract_context(default_client=default_client)}
+        data.update(query)
+        real_headers = self.generate_api_headers(default_client=default_client)
+        real_headers.update({'content-type': 'application/json'})
+        if headers:
+            real_headers.update(headers)
+        return self._download_json(
+            f'https://{self._select_api_hostname(api_hostname, default_client)}/youtubei/v1/{ep}',
+            video_id=video_id, fatal=fatal, note=note, errnote=errnote,
+            data=json.dumps(data).encode('utf8'), headers=real_headers,
+            query=filter_dict({
+                'key': self._configuration_arg(
+                    'innertube_key', [api_key], ie_key=CONFIGURATION_ARG_KEY, casesense=True)[0],
+                'prettyPrint': 'false',
+            }, cndn=lambda _, v: v))
+
+    def extract_yt_initial_data(self, item_id, webpage, fatal=True):
+        return self._search_json(self._YT_INITIAL_DATA_RE, webpage, 'yt initial data', item_id, fatal=fatal)
+
+    @staticmethod
+    def _extract_session_index(*data):
+        """
+        Index of current account in account list.
+        See: https://github.com/yt-dlp/yt-dlp/pull/519
+        """
+        for ytcfg in data:
+            session_index = int_or_none(try_get(ytcfg, lambda x: x['SESSION_INDEX']))
+            if session_index is not None:
+                return session_index
+
+    @staticmethod
+    def _parse_data_sync_id(data_sync_id):
+        """
+        Parse data_sync_id into delegated_session_id and user_session_id.
+
+        data_sync_id is of the form "delegated_session_id||user_session_id" for secondary channel
+        and just "user_session_id||" for primary channel.
+
+        @param data_sync_id: data_sync_id string
+        @return: Tuple of (delegated_session_id, user_session_id)
+        """
+        if not data_sync_id:
+            return None, None
+        first, _, second = data_sync_id.partition('||')
+        if second:
+            return first, second
+        return None, first
+
+    def _extract_delegated_session_id(self, *args):
+        """
+        Extract current delegated session ID required to download private playlists of secondary channels
+        @params response and/or ytcfg
+        @return: delegated session ID
+        """
+        # ytcfg includes channel_syncid if on secondary channel
+        if delegated_sid := traverse_obj(args, (..., 'DELEGATED_SESSION_ID', {str}, any)):
+            return delegated_sid
+
+        data_sync_id = self._extract_data_sync_id(*args)
+        return self._parse_data_sync_id(data_sync_id)[0]
+
+    def _extract_user_session_id(self, *args):
+        """
+        Extract current user session ID
+        @params response and/or ytcfg
+        @return: user session ID
+        """
+        if user_sid := traverse_obj(args, (..., 'USER_SESSION_ID', {str}, any)):
+            return user_sid
+
+        data_sync_id = self._extract_data_sync_id(*args)
+        return self._parse_data_sync_id(data_sync_id)[1]
+
+    def _extract_data_sync_id(self, *args):
+        """
+        Extract current account dataSyncId.
+        In the format DELEGATED_SESSION_ID||USER_SESSION_ID or USER_SESSION_ID||
+        @params response and/or ytcfg
+        """
+        if data_sync_id := self._configuration_arg('data_sync_id', [None], ie_key=CONFIGURATION_ARG_KEY, casesense=True)[0]:
+            return data_sync_id
+
+        return traverse_obj(
+            args, (..., ('DATASYNC_ID', ('responseContext', 'mainAppWebResponseContext', 'datasyncId')), {str}, any))
+
+    def _extract_visitor_data(self, *args):
+        """
+        Extracts visitorData from an API response or ytcfg
+        Appears to be used to track session state
+        """
+        if visitor_data := self._configuration_arg('visitor_data', [None], ie_key=CONFIGURATION_ARG_KEY, casesense=True)[0]:
+            return visitor_data
+        return get_first(
+            args, [('VISITOR_DATA', ('INNERTUBE_CONTEXT', 'client', 'visitorData'), ('responseContext', 'visitorData'))],
+            expected_type=str)
+
+    def extract_ytcfg(self, video_id, webpage):
+        if not webpage:
+            return {}
+        return self._parse_json(
+            self._search_regex(
+                r'ytcfg\.set\s*\(\s*({.+?})\s*\)\s*;', webpage, 'ytcfg',
+                default='{}'), video_id, fatal=False) or {}
+
+    def _generate_cookie_auth_headers(self, *, ytcfg=None, delegated_session_id=None, user_session_id=None, session_index=None, origin=None, **kwargs):
+        headers = {}
+        delegated_session_id = delegated_session_id or self._extract_delegated_session_id(ytcfg)
+        if delegated_session_id:
+            headers['X-Goog-PageId'] = delegated_session_id
+        if session_index is None:
+            session_index = self._extract_session_index(ytcfg)
+        if delegated_session_id or session_index is not None:
+            headers['X-Goog-AuthUser'] = session_index if session_index is not None else 0
+
+        auth = self._get_sid_authorization_header(origin, user_session_id=user_session_id or self._extract_user_session_id(ytcfg))
+        if auth is not None:
+            headers['Authorization'] = auth
+            headers['X-Origin'] = origin
+
+        if traverse_obj(ytcfg, 'LOGGED_IN', expected_type=bool):
+            headers['X-Youtube-Bootstrap-Logged-In'] = 'true'
+
+        return headers
+
+    def generate_api_headers(
+            self, *, ytcfg=None, delegated_session_id=None, user_session_id=None, session_index=None,
+            visitor_data=None, api_hostname=None, default_client='web', **kwargs):
+
+        origin = 'https://' + (self._select_api_hostname(api_hostname, default_client))
+        headers = {
+            'X-YouTube-Client-Name': str(
+                self._ytcfg_get_safe(ytcfg, lambda x: x['INNERTUBE_CONTEXT_CLIENT_NAME'], default_client=default_client)),
+            'X-YouTube-Client-Version': self._extract_client_version(ytcfg, default_client),
+            'Origin': origin,
+            'X-Goog-Visitor-Id': visitor_data or self._extract_visitor_data(ytcfg),
+            'User-Agent': self._ytcfg_get_safe(ytcfg, lambda x: x['INNERTUBE_CONTEXT']['client']['userAgent'], default_client=default_client),
+            **self._generate_cookie_auth_headers(
+                ytcfg=ytcfg,
+                delegated_session_id=delegated_session_id,
+                user_session_id=user_session_id,
+                session_index=session_index,
+                origin=origin),
+        }
+        return filter_dict(headers)
+
+    def _download_webpage_with_retries(self, *args, retry_fatal=False, retry_on_status=None, **kwargs):
+        for retry in self.RetryManager(fatal=retry_fatal):
+            try:
+                return self._download_webpage(*args, **kwargs)
+            except ExtractorError as e:
+                if isinstance(e.cause, network_exceptions):
+                    if not isinstance(e.cause, HTTPError) or e.cause.status not in (retry_on_status or (403, 429)):
+                        retry.error = e
+                        continue
+                self._error_or_warning(e, fatal=retry_fatal)
+                break
+
+    def _download_ytcfg(self, client, video_id):
+        url = {
+            'web': 'https://www.youtube.com',
+            'web_music': 'https://music.youtube.com',
+            'web_embedded': f'https://www.youtube.com/embed/{video_id}?html5=1',
+            'tv': 'https://www.youtube.com/tv',
+        }.get(client)
+        if not url:
+            return {}
+        webpage = self._download_webpage_with_retries(
+            url, video_id, note=f'Downloading {client.replace("_", " ").strip()} client config',
+            headers=traverse_obj(self._get_default_ytcfg(client), {
+                'User-Agent': ('INNERTUBE_CONTEXT', 'client', 'userAgent', {str}),
+            }))
+        return self.extract_ytcfg(video_id, webpage) or {}
+
+    @staticmethod
+    def _build_api_continuation_query(continuation, ctp=None):
+        query = {
+            'continuation': continuation,
+        }
+        # TODO: Inconsistency with clickTrackingParams.
+        # Currently we have a fixed ctp contained within context (from ytcfg)
+        # and a ctp in root query for continuation.
+        if ctp:
+            query['clickTracking'] = {'clickTrackingParams': ctp}
+        return query
+
+    @classmethod
+    def _extract_next_continuation_data(cls, renderer):
+        next_continuation = try_get(
+            renderer, (lambda x: x['continuations'][0]['nextContinuationData'],
+                       lambda x: x['continuation']['reloadContinuationData']), dict)
+        if not next_continuation:
+            return
+        continuation = next_continuation.get('continuation')
+        if not continuation:
+            return
+        ctp = next_continuation.get('clickTrackingParams')
+        return cls._build_api_continuation_query(continuation, ctp)
+
+    @classmethod
+    def _extract_continuation_ep_data(cls, continuation_ep: dict):
+        continuation_commands = traverse_obj(
+            continuation_ep, ('commandExecutorCommand', 'commands', ..., {dict}))
+        continuation_commands.append(continuation_ep)
+        for command in continuation_commands:
+            continuation = traverse_obj(command, ('continuationCommand', 'token', {str}))
+            if not continuation:
+                continue
+            ctp = command.get('clickTrackingParams')
+            return cls._build_api_continuation_query(continuation, ctp)
+
+    @classmethod
+    def _extract_continuation(cls, renderer):
+        next_continuation = cls._extract_next_continuation_data(renderer)
+        if next_continuation:
+            return next_continuation
+
+        return traverse_obj(renderer, (
+            ('contents', 'items', 'rows'), ..., 'continuationItemRenderer',
+            ('continuationEndpoint', ('button', 'buttonRenderer', 'command')),
+        ), get_all=False, expected_type=cls._extract_continuation_ep_data)
+
+    @classmethod
+    def _extract_alerts(cls, data):
+        for alert_dict in try_get(data, lambda x: x['alerts'], list) or []:
+            if not isinstance(alert_dict, dict):
+                continue
+            for alert in alert_dict.values():
+                alert_type = alert.get('type')
+                if not alert_type:
+                    continue
+                message = cls._get_text(alert, 'text')
+                if message:
+                    yield alert_type, message
+
+    def _report_alerts(self, alerts, expected=True, fatal=True, only_once=False):
+        errors, warnings = [], []
+        for alert_type, alert_message in alerts:
+            if alert_type.lower() == 'error' and fatal:
+                errors.append([alert_type, alert_message])
+            elif alert_message not in self._IGNORED_WARNINGS:
+                warnings.append([alert_type, alert_message])
+
+        for alert_type, alert_message in (warnings + errors[:-1]):
+            self.report_warning(f'YouTube said: {alert_type} - {alert_message}', only_once=only_once)
+        if errors:
+            raise ExtractorError(f'YouTube said: {errors[-1][1]}', expected=expected)
+
+    def _extract_and_report_alerts(self, data, *args, **kwargs):
+        return self._report_alerts(self._extract_alerts(data), *args, **kwargs)
+
+    def _extract_badges(self, badge_list: list):
+        """
+        Extract known BadgeType's from a list of badge renderers.
+        @returns [{'type': BadgeType}]
+        """
+        icon_type_map = {
+            'PRIVACY_UNLISTED': BadgeType.AVAILABILITY_UNLISTED,
+            'PRIVACY_PRIVATE': BadgeType.AVAILABILITY_PRIVATE,
+            'PRIVACY_PUBLIC': BadgeType.AVAILABILITY_PUBLIC,
+            'CHECK_CIRCLE_THICK': BadgeType.VERIFIED,
+            'OFFICIAL_ARTIST_BADGE': BadgeType.VERIFIED,
+            'CHECK': BadgeType.VERIFIED,
+        }
+
+        badge_style_map = {
+            'BADGE_STYLE_TYPE_MEMBERS_ONLY': BadgeType.AVAILABILITY_SUBSCRIPTION,
+            'BADGE_STYLE_TYPE_PREMIUM': BadgeType.AVAILABILITY_PREMIUM,
+            'BADGE_STYLE_TYPE_LIVE_NOW': BadgeType.LIVE_NOW,
+            'BADGE_STYLE_TYPE_VERIFIED': BadgeType.VERIFIED,
+            'BADGE_STYLE_TYPE_VERIFIED_ARTIST': BadgeType.VERIFIED,
+        }
+
+        label_map = {
+            'unlisted': BadgeType.AVAILABILITY_UNLISTED,
+            'private': BadgeType.AVAILABILITY_PRIVATE,
+            'members only': BadgeType.AVAILABILITY_SUBSCRIPTION,
+            'live': BadgeType.LIVE_NOW,
+            'premium': BadgeType.AVAILABILITY_PREMIUM,
+            'verified': BadgeType.VERIFIED,
+            'official artist channel': BadgeType.VERIFIED,
+        }
+
+        badges = []
+        for badge in traverse_obj(badge_list, (..., lambda key, _: re.search(r'[bB]adgeRenderer$', key))):
+            badge_type = (
+                icon_type_map.get(traverse_obj(badge, ('icon', 'iconType'), expected_type=str))
+                or badge_style_map.get(traverse_obj(badge, 'style'))
+            )
+            if badge_type:
+                badges.append({'type': badge_type})
+                continue
+
+            # fallback, won't work in some languages
+            label = traverse_obj(
+                badge, 'label', ('accessibilityData', 'label'), 'tooltip', 'iconTooltip', get_all=False, expected_type=str, default='')
+            for match, label_badge_type in label_map.items():
+                if match in label.lower():
+                    badges.append({'type': label_badge_type})
+                    break
+
+        return badges
+
+    @staticmethod
+    def _has_badge(badges, badge_type):
+        return bool(traverse_obj(badges, lambda _, v: v['type'] == badge_type))
+
+    @staticmethod
+    def _get_text(data, *path_list, max_runs=None):
+        for path in path_list or [None]:
+            if path is None:
+                obj = [data]
+            else:
+                obj = traverse_obj(data, path, default=[])
+                if not any(key is ... or isinstance(key, (list, tuple)) for key in variadic(path)):
+                    obj = [obj]
+            for item in obj:
+                text = try_get(item, lambda x: x['simpleText'], str)
+                if text:
+                    return text
+                runs = try_get(item, lambda x: x['runs'], list) or []
+                if not runs and isinstance(item, list):
+                    runs = item
+
+                runs = runs[:min(len(runs), max_runs or len(runs))]
+                text = ''.join(traverse_obj(runs, (..., 'text'), expected_type=str))
+                if text:
+                    return text
+
+    def _get_count(self, data, *path_list):
+        count_text = self._get_text(data, *path_list) or ''
+        count = parse_count(count_text)
+        if count is None:
+            count = str_to_int(
+                self._search_regex(r'^([\d,]+)', re.sub(r'\s', '', count_text), 'count', default=None))
+        return count
+
+    @staticmethod
+    def _extract_thumbnails(data, *path_list, final_key='thumbnails'):
+        """
+        Extract thumbnails from thumbnails dict
+        @param path_list: path list to level that contains 'thumbnails' key
+        """
+        thumbnails = []
+        for path in path_list or [()]:
+            for thumbnail in traverse_obj(data, (*variadic(path), final_key, ...)):
+                thumbnail_url = url_or_none(thumbnail.get('url'))
+                if not thumbnail_url:
+                    continue
+                # Sometimes youtube gives a wrong thumbnail URL. See:
+                # https://github.com/yt-dlp/yt-dlp/issues/233
+                # https://github.com/ytdl-org/youtube-dl/issues/28023
+                if 'maxresdefault' in thumbnail_url:
+                    thumbnail_url = thumbnail_url.split('?')[0]
+                thumbnails.append({
+                    'url': thumbnail_url,
+                    'height': int_or_none(thumbnail.get('height')),
+                    'width': int_or_none(thumbnail.get('width')),
+                })
+        return thumbnails
+
+    @staticmethod
+    def extract_relative_time(relative_time_text):
+        """
+        Extracts a relative time from string and converts to dt object
+        e.g. 'streamed 6 days ago', '5 seconds ago (edited)', 'updated today', '8 yr ago'
+        """
+
+        # XXX: this could be moved to a general function in utils/_utils.py
+        # The relative time text strings are roughly the same as what
+        # Javascript's Intl.RelativeTimeFormat function generates.
+        # See: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/RelativeTimeFormat
+        mobj = re.search(
+            r'(?P<start>today|yesterday|now)|(?P<time>\d+)\s*(?P<unit>sec(?:ond)?|s|min(?:ute)?|h(?:our|r)?|d(?:ay)?|w(?:eek|k)?|mo(?:nth)?|y(?:ear|r)?)s?\s*ago',
+            relative_time_text)
+        if mobj:
+            start = mobj.group('start')
+            if start:
+                return datetime_from_str(start)
+            try:
+                return datetime_from_str('now-{}{}'.format(mobj.group('time'), mobj.group('unit')))
+            except ValueError:
+                return None
+
+    def _parse_time_text(self, text):
+        if not text:
+            return
+        dt_ = self.extract_relative_time(text)
+        timestamp = None
+        if isinstance(dt_, dt.datetime):
+            timestamp = calendar.timegm(dt_.timetuple())
+
+        if timestamp is None:
+            timestamp = (
+                unified_timestamp(text) or unified_timestamp(
+                    self._search_regex(
+                        (r'([a-z]+\s*\d{1,2},?\s*20\d{2})', r'(?:.+|^)(?:live|premieres|ed|ing)(?:\s*(?:on|for))?\s*(.+\d)'),
+                        text.lower(), 'time text', default=None)))
+
+        if text and timestamp is None and self._preferred_lang in (None, 'en'):
+            self.report_warning(
+                f'Cannot parse localized time text "{text}"', only_once=True)
+        return timestamp
+
+    def _extract_response(self, item_id, query, note='Downloading API JSON', headers=None,
+                          ytcfg=None, check_get_keys=None, ep='browse', fatal=True, api_hostname=None,
+                          default_client='web'):
+        raise_for_incomplete = bool(self._configuration_arg('raise_incomplete_data', ie_key=CONFIGURATION_ARG_KEY))
+        # Incomplete Data should be a warning by default when retries are exhausted, while other errors should be fatal.
+        icd_retries = iter(self.RetryManager(fatal=raise_for_incomplete))
+        icd_rm = next(icd_retries)
+        main_retries = iter(self.RetryManager())
+        main_rm = next(main_retries)
+        # Manual retry loop for multiple RetryManagers
+        # The proper RetryManager MUST be advanced after an error
+        # and its result MUST be checked if the manager is non fatal
+        while True:
+            try:
+                response = self._call_api(
+                    ep=ep, fatal=True, headers=headers,
+                    video_id=item_id, query=query, note=note,
+                    context=self._extract_context(ytcfg, default_client),
+                    api_hostname=api_hostname, default_client=default_client)
+            except ExtractorError as e:
+                if not isinstance(e.cause, network_exceptions):
+                    return self._error_or_warning(e, fatal=fatal)
+                elif not isinstance(e.cause, HTTPError):
+                    main_rm.error = e
+                    next(main_retries)
+                    continue
+
+                first_bytes = e.cause.response.read(512)
+                if not is_html(first_bytes):
+                    yt_error = try_get(
+                        self._parse_json(
+                            self._webpage_read_content(e.cause.response, None, item_id, prefix=first_bytes) or '{}', item_id, fatal=False),
+                        lambda x: x['error']['message'], str)
+                    if yt_error:
+                        self._report_alerts([('ERROR', yt_error)], fatal=False)
+                # Downloading page may result in intermittent 5xx HTTP error
+                # Sometimes a 404 is also received. See: https://github.com/ytdl-org/youtube-dl/issues/28289
+                # We also want to catch all other network exceptions since errors in later pages can be troublesome
+                # See https://github.com/yt-dlp/yt-dlp/issues/507#issuecomment-880188210
+                if e.cause.status not in (403, 429):
+                    main_rm.error = e
+                    next(main_retries)
+                    continue
+                return self._error_or_warning(e, fatal=fatal)
+
+            try:
+                self._extract_and_report_alerts(response, only_once=True)
+            except ExtractorError as e:
+                # YouTube's servers may return errors we want to retry on in a 200 OK response
+                # See: https://github.com/yt-dlp/yt-dlp/issues/839
+                if 'unknown error' in e.msg.lower():
+                    main_rm.error = e
+                    next(main_retries)
+                    continue
+                return self._error_or_warning(e, fatal=fatal)
+            # Youtube sometimes sends incomplete data
+            # See: https://github.com/ytdl-org/youtube-dl/issues/28194
+            if not traverse_obj(response, *variadic(check_get_keys)):
+                icd_rm.error = ExtractorError('Incomplete data received', expected=True)
+                should_retry = next(icd_retries, None)
+                if not should_retry:
+                    return None
+                continue
+
+            return response
+
+    @staticmethod
+    def is_music_url(url):
+        return re.match(r'(https?://)?music\.youtube\.com/', url) is not None
diff --git a/plugins/youtube_download/yt_dlp/extractor/youtube/_clip.py b/plugins/youtube_download/yt_dlp/extractor/youtube/_clip.py
new file mode 100644
index 0000000..7d06370
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/youtube/_clip.py
@@ -0,0 +1,66 @@
+from ._tab import YoutubeTabBaseInfoExtractor
+from ._video import YoutubeIE
+from ...utils import ExtractorError, traverse_obj
+
+
+class YoutubeClipIE(YoutubeTabBaseInfoExtractor):
+    IE_NAME = 'youtube:clip'
+    _VALID_URL = r'https?://(?:www\.)?youtube\.com/clip/(?P<id>[^/?#]+)'
+    _TESTS = [{
+        # FIXME: Other metadata should be extracted from the clip, not from the base video
+        'url': 'https://www.youtube.com/clip/UgytZKpehg-hEMBSn3F4AaABCQ',
+        'info_dict': {
+            'id': 'UgytZKpehg-hEMBSn3F4AaABCQ',
+            'ext': 'mp4',
+            'section_start': 29.0,
+            'section_end': 39.7,
+            'duration': 10.7,
+            'age_limit': 0,
+            'availability': 'public',
+            'categories': ['Gaming'],
+            'channel': 'Scott The Woz',
+            'channel_id': 'UC4rqhyiTs7XyuODcECvuiiQ',
+            'channel_url': 'https://www.youtube.com/channel/UC4rqhyiTs7XyuODcECvuiiQ',
+            'description': 'md5:7a4517a17ea9b4bd98996399d8bb36e7',
+            'like_count': int,
+            'playable_in_embed': True,
+            'tags': 'count:17',
+            'thumbnail': 'https://i.ytimg.com/vi_webp/ScPX26pdQik/maxresdefault.webp',
+            'title': 'Mobile Games on Console - Scott The Woz',
+            'upload_date': '20210920',
+            'uploader': 'Scott The Woz',
+            'uploader_id': '@ScottTheWoz',
+            'uploader_url': 'https://www.youtube.com/@ScottTheWoz',
+            'view_count': int,
+            'live_status': 'not_live',
+            'channel_follower_count': int,
+            'chapters': 'count:20',
+            'comment_count': int,
+            'heatmap': 'count:100',
+        },
+    }]
+
+    def _real_extract(self, url):
+        clip_id = self._match_id(url)
+        _, data = self._extract_webpage(url, clip_id)
+
+        video_id = traverse_obj(data, ('currentVideoEndpoint', 'watchEndpoint', 'videoId'))
+        if not video_id:
+            raise ExtractorError('Unable to find video ID')
+
+        clip_data = traverse_obj(data, (
+            'engagementPanels', ..., 'engagementPanelSectionListRenderer', 'content', 'clipSectionRenderer',
+            'contents', ..., 'clipAttributionRenderer', 'onScrubExit', 'commandExecutorCommand', 'commands', ...,
+            'openPopupAction', 'popup', 'notificationActionRenderer', 'actionButton', 'buttonRenderer', 'command',
+            'commandExecutorCommand', 'commands', ..., 'loopCommand'), get_all=False)
+
+        return {
+            '_type': 'url_transparent',
+            'url': f'https://www.youtube.com/watch?v={video_id}',
+            'ie_key': YoutubeIE.ie_key(),
+            'id': clip_id,
+            'section_start': int(clip_data['startTimeMs']) / 1000,
+            'section_end': int(clip_data['endTimeMs']) / 1000,
+            '_format_sort_fields': (  # https protocol is prioritized for ffmpeg compatibility
+                'proto:https', 'quality', 'res', 'fps', 'hdr:12', 'source', 'vcodec', 'channels', 'acodec', 'lang'),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/youtube/_mistakes.py b/plugins/youtube_download/yt_dlp/extractor/youtube/_mistakes.py
new file mode 100644
index 0000000..c5eb516
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/youtube/_mistakes.py
@@ -0,0 +1,69 @@
+
+from ._base import YoutubeBaseInfoExtractor
+from ...utils import ExtractorError
+
+
+class YoutubeTruncatedURLIE(YoutubeBaseInfoExtractor):
+    IE_NAME = 'youtube:truncated_url'
+    IE_DESC = False  # Do not list
+    _VALID_URL = r'''(?x)
+        (?:https?://)?
+        (?:\w+\.)?[yY][oO][uU][tT][uU][bB][eE](?:-nocookie)?\.com/
+        (?:watch\?(?:
+            feature=[a-z_]+|
+            annotation_id=annotation_[^&]+|
+            x-yt-cl=[0-9]+|
+            hl=[^&]*|
+            t=[0-9]+
+        )?
+        |
+            attribution_link\?a=[^&]+
+        )
+        $
+    '''
+
+    _TESTS = [{
+        'url': 'https://www.youtube.com/watch?annotation_id=annotation_3951667041',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.youtube.com/watch?',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.youtube.com/watch?x-yt-cl=84503534',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.youtube.com/watch?feature=foo',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.youtube.com/watch?hl=en-GB',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.youtube.com/watch?t=2372',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        raise ExtractorError(
+            'Did you forget to quote the URL? Remember that & is a meta '
+            'character in most shells, so you want to put the URL in quotes, '
+            'like  yt-dlp '
+            '"https://www.youtube.com/watch?feature=foo&v=BaW_jenozKc" '
+            ' or simply  yt-dlp BaW_jenozKc  .',
+            expected=True)
+
+
+class YoutubeTruncatedIDIE(YoutubeBaseInfoExtractor):
+    IE_NAME = 'youtube:truncated_id'
+    IE_DESC = False  # Do not list
+    _VALID_URL = r'https?://(?:www\.)?youtube\.com/watch\?v=(?P<id>[0-9A-Za-z_-]{1,10})$'
+
+    _TESTS = [{
+        'url': 'https://www.youtube.com/watch?v=N_708QY7Ob',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        raise ExtractorError(
+            f'Incomplete YouTube ID {video_id}. URL {url} looks truncated.',
+            expected=True)
diff --git a/plugins/youtube_download/yt_dlp/extractor/youtube/_notifications.py b/plugins/youtube_download/yt_dlp/extractor/youtube/_notifications.py
new file mode 100644
index 0000000..ae55528
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/youtube/_notifications.py
@@ -0,0 +1,98 @@
+import itertools
+import re
+
+from ._tab import YoutubeTabBaseInfoExtractor, YoutubeTabIE
+from ._video import YoutubeIE
+from ...utils import traverse_obj
+
+
+class YoutubeNotificationsIE(YoutubeTabBaseInfoExtractor):
+    IE_NAME = 'youtube:notif'
+    IE_DESC = 'YouTube notifications; ":ytnotif" keyword (requires cookies)'
+    _VALID_URL = r':ytnotif(?:ication)?s?'
+    _LOGIN_REQUIRED = True
+    _TESTS = [{
+        'url': ':ytnotif',
+        'only_matching': True,
+    }, {
+        'url': ':ytnotifications',
+        'only_matching': True,
+    }]
+
+    def _extract_notification_menu(self, response, continuation_list):
+        notification_list = traverse_obj(
+            response,
+            ('actions', 0, 'openPopupAction', 'popup', 'multiPageMenuRenderer', 'sections', 0, 'multiPageMenuNotificationSectionRenderer', 'items'),
+            ('actions', 0, 'appendContinuationItemsAction', 'continuationItems'),
+            expected_type=list) or []
+        continuation_list[0] = None
+        for item in notification_list:
+            entry = self._extract_notification_renderer(item.get('notificationRenderer'))
+            if entry:
+                yield entry
+            continuation = item.get('continuationItemRenderer')
+            if continuation:
+                continuation_list[0] = continuation
+
+    def _extract_notification_renderer(self, notification):
+        video_id = traverse_obj(
+            notification, ('navigationEndpoint', 'watchEndpoint', 'videoId'), expected_type=str)
+        url = f'https://www.youtube.com/watch?v={video_id}'
+        channel_id = None
+        if not video_id:
+            browse_ep = traverse_obj(
+                notification, ('navigationEndpoint', 'browseEndpoint'), expected_type=dict)
+            channel_id = self.ucid_or_none(traverse_obj(browse_ep, 'browseId', expected_type=str))
+            post_id = self._search_regex(
+                r'/post/(.+)', traverse_obj(browse_ep, 'canonicalBaseUrl', expected_type=str),
+                'post id', default=None)
+            if not channel_id or not post_id:
+                return
+            # The direct /post url redirects to this in the browser
+            url = f'https://www.youtube.com/channel/{channel_id}/community?lb={post_id}'
+
+        channel = traverse_obj(
+            notification, ('contextualMenu', 'menuRenderer', 'items', 1, 'menuServiceItemRenderer', 'text', 'runs', 1, 'text'),
+            expected_type=str)
+        notification_title = self._get_text(notification, 'shortMessage')
+        if notification_title:
+            notification_title = notification_title.replace('\xad', '')  # remove soft hyphens
+        # TODO: handle recommended videos
+        title = self._search_regex(
+            rf'{re.escape(channel or "")}[^:]+: (.+)', notification_title,
+            'video title', default=None)
+        timestamp = (self._parse_time_text(self._get_text(notification, 'sentTimeText'))
+                     if self._configuration_arg('approximate_date', ie_key=YoutubeTabIE)
+                     else None)
+        return {
+            '_type': 'url',
+            'url': url,
+            'ie_key': (YoutubeIE if video_id else YoutubeTabIE).ie_key(),
+            'video_id': video_id,
+            'title': title,
+            'channel_id': channel_id,
+            'channel': channel,
+            'uploader': channel,
+            'thumbnails': self._extract_thumbnails(notification, 'videoThumbnail'),
+            'timestamp': timestamp,
+        }
+
+    def _notification_menu_entries(self, ytcfg):
+        continuation_list = [None]
+        response = None
+        for page in itertools.count(1):
+            ctoken = traverse_obj(
+                continuation_list, (0, 'continuationEndpoint', 'getNotificationMenuEndpoint', 'ctoken'), expected_type=str)
+            response = self._extract_response(
+                item_id=f'page {page}', query={'ctoken': ctoken} if ctoken else {}, ytcfg=ytcfg,
+                ep='notification/get_notification_menu', check_get_keys='actions',
+                headers=self.generate_api_headers(ytcfg=ytcfg, visitor_data=self._extract_visitor_data(response)))
+            yield from self._extract_notification_menu(response, continuation_list)
+            if not continuation_list[0]:
+                break
+
+    def _real_extract(self, url):
+        display_id = 'notifications'
+        ytcfg = self._download_ytcfg('web', display_id) if not self.skip_webpage else {}
+        self._report_playlist_authcheck(ytcfg)
+        return self.playlist_result(self._notification_menu_entries(ytcfg), display_id, display_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/youtube/_redirect.py b/plugins/youtube_download/yt_dlp/extractor/youtube/_redirect.py
new file mode 100644
index 0000000..1908df1
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/youtube/_redirect.py
@@ -0,0 +1,247 @@
+import base64
+import urllib.parse
+
+from ._base import YoutubeBaseInfoExtractor
+from ._tab import YoutubeTabIE
+from ...utils import ExtractorError, classproperty, parse_qs, update_url_query, url_or_none
+
+
+class YoutubeYtBeIE(YoutubeBaseInfoExtractor):
+    IE_DESC = 'youtu.be'
+    _VALID_URL = rf'https?://youtu\.be/(?P<id>[0-9A-Za-z_-]{{11}})/*?.*?\blist=(?P<playlist_id>{YoutubeBaseInfoExtractor._PLAYLIST_ID_RE})'
+    _TESTS = [{
+        'url': 'https://youtu.be/yeWKywCrFtk?list=PL2qgrgXsNUG5ig9cat4ohreBjYLAPC0J5',
+        'info_dict': {
+            'id': 'yeWKywCrFtk',
+            'ext': 'mp4',
+            'title': 'Small Scale Baler and Braiding Rugs',
+            'uploader': 'Backus-Page House Museum',
+            'uploader_id': '@backuspagemuseum',
+            'uploader_url': r're:https?://(?:www\.)?youtube\.com/@backuspagemuseum',
+            'upload_date': '20161008',
+            'description': 'md5:800c0c78d5eb128500bffd4f0b4f2e8a',
+            'categories': ['Nonprofits & Activism'],
+            'tags': list,
+            'like_count': int,
+            'age_limit': 0,
+            'playable_in_embed': True,
+            'thumbnail': r're:^https?://.*\.webp',
+            'channel': 'Backus-Page House Museum',
+            'channel_id': 'UCEfMCQ9bs3tjvjy1s451zaw',
+            'live_status': 'not_live',
+            'view_count': int,
+            'channel_url': 'https://www.youtube.com/channel/UCEfMCQ9bs3tjvjy1s451zaw',
+            'availability': 'public',
+            'duration': 59,
+            'comment_count': int,
+            'channel_follower_count': int,
+        },
+        'params': {
+            'noplaylist': True,
+            'skip_download': True,
+        },
+    }, {
+        'url': 'https://youtu.be/uWyaPkt-VOI?list=PL9D9FC436B881BA21',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        mobj = self._match_valid_url(url)
+        video_id = mobj.group('id')
+        playlist_id = mobj.group('playlist_id')
+        return self.url_result(
+            update_url_query('https://www.youtube.com/watch', {
+                'v': video_id,
+                'list': playlist_id,
+                'feature': 'youtu.be',
+            }), ie=YoutubeTabIE.ie_key(), video_id=playlist_id)
+
+
+class YoutubeLivestreamEmbedIE(YoutubeBaseInfoExtractor):
+    IE_DESC = 'YouTube livestream embeds'
+    _VALID_URL = r'https?://(?:\w+\.)?youtube\.com/embed/live_stream/?\?(?:[^#]+&)?channel=(?P<id>[^&#]+)'
+    _TESTS = [{
+        'url': 'https://www.youtube.com/embed/live_stream?channel=UC2_KI6RB__jGdlnK6dvFEZA',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        channel_id = self._match_id(url)
+        return self.url_result(
+            f'https://www.youtube.com/channel/{channel_id}/live',
+            ie=YoutubeTabIE.ie_key(), video_id=channel_id)
+
+
+class YoutubeYtUserIE(YoutubeBaseInfoExtractor):
+    IE_DESC = 'YouTube user videos; "ytuser:" prefix'
+    IE_NAME = 'youtube:user'
+    _VALID_URL = r'ytuser:(?P<id>.+)'
+    _TESTS = [{
+        'url': 'ytuser:phihag',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        user_id = self._match_id(url)
+        return self.url_result(f'https://www.youtube.com/user/{user_id}', YoutubeTabIE, user_id)
+
+
+class YoutubeFavouritesIE(YoutubeBaseInfoExtractor):
+    IE_NAME = 'youtube:favorites'
+    IE_DESC = 'YouTube liked videos; ":ytfav" keyword (requires cookies)'
+    _VALID_URL = r':ytfav(?:ou?rite)?s?'
+    _LOGIN_REQUIRED = True
+    _TESTS = [{
+        'url': ':ytfav',
+        'only_matching': True,
+    }, {
+        'url': ':ytfavorites',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        return self.url_result(
+            'https://www.youtube.com/playlist?list=LL',
+            ie=YoutubeTabIE.ie_key())
+
+
+class YoutubeFeedsInfoExtractor(YoutubeBaseInfoExtractor):
+    """
+    Base class for feed extractors
+    Subclasses must re-define the _FEED_NAME property.
+    """
+    _LOGIN_REQUIRED = True
+    _FEED_NAME = 'feeds'
+
+    @classproperty
+    def IE_NAME(cls):
+        return f'youtube:{cls._FEED_NAME}'
+
+    def _real_extract(self, url):
+        return self.url_result(
+            f'https://www.youtube.com/feed/{self._FEED_NAME}', ie=YoutubeTabIE.ie_key())
+
+
+class YoutubeWatchLaterIE(YoutubeBaseInfoExtractor):
+    IE_NAME = 'youtube:watchlater'
+    IE_DESC = 'Youtube watch later list; ":ytwatchlater" keyword (requires cookies)'
+    _VALID_URL = r':ytwatchlater'
+    _TESTS = [{
+        'url': ':ytwatchlater',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        return self.url_result(
+            'https://www.youtube.com/playlist?list=WL', ie=YoutubeTabIE.ie_key())
+
+
+class YoutubeRecommendedIE(YoutubeFeedsInfoExtractor):
+    IE_DESC = 'YouTube recommended videos; ":ytrec" keyword'
+    _VALID_URL = r'https?://(?:www\.)?youtube\.com/?(?:[?#]|$)|:ytrec(?:ommended)?'
+    _FEED_NAME = 'recommended'
+    _LOGIN_REQUIRED = False
+    _TESTS = [{
+        'url': ':ytrec',
+        'only_matching': True,
+    }, {
+        'url': ':ytrecommended',
+        'only_matching': True,
+    }, {
+        'url': 'https://youtube.com',
+        'only_matching': True,
+    }]
+
+
+class YoutubeSubscriptionsIE(YoutubeFeedsInfoExtractor):
+    IE_DESC = 'YouTube subscriptions feed; ":ytsubs" keyword (requires cookies)'
+    _VALID_URL = r':ytsub(?:scription)?s?'
+    _FEED_NAME = 'subscriptions'
+    _TESTS = [{
+        'url': ':ytsubs',
+        'only_matching': True,
+    }, {
+        'url': ':ytsubscriptions',
+        'only_matching': True,
+    }]
+
+
+class YoutubeHistoryIE(YoutubeFeedsInfoExtractor):
+    IE_DESC = 'Youtube watch history; ":ythis" keyword (requires cookies)'
+    _VALID_URL = r':ythis(?:tory)?'
+    _FEED_NAME = 'history'
+    _TESTS = [{
+        'url': ':ythistory',
+        'only_matching': True,
+    }]
+
+
+class YoutubeShortsAudioPivotIE(YoutubeBaseInfoExtractor):
+    IE_DESC = 'YouTube Shorts audio pivot (Shorts using audio of a given video)'
+    IE_NAME = 'youtube:shorts:pivot:audio'
+    _VALID_URL = r'https?://(?:www\.)?youtube\.com/source/(?P<id>[\w-]{11})/shorts'
+    _TESTS = [{
+        'url': 'https://www.youtube.com/source/Lyj-MZSAA9o/shorts',
+        'only_matching': True,
+    }]
+
+    @staticmethod
+    def _generate_audio_pivot_params(video_id):
+        """
+        Generates sfv_audio_pivot browse params for this video id
+        """
+        pb_params = b'\xf2\x05+\n)\x12\'\n\x0b%b\x12\x0b%b\x1a\x0b%b' % ((video_id.encode(),) * 3)
+        return urllib.parse.quote(base64.b64encode(pb_params).decode())
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        return self.url_result(
+            f'https://www.youtube.com/feed/sfv_audio_pivot?bp={self._generate_audio_pivot_params(video_id)}',
+            ie=YoutubeTabIE)
+
+
+class YoutubeConsentRedirectIE(YoutubeBaseInfoExtractor):
+    IE_NAME = 'youtube:consent'
+    IE_DESC = False  # Do not list
+    _VALID_URL = r'https?://consent\.youtube\.com/m\?'
+    _TESTS = [{
+        'url': 'https://consent.youtube.com/m?continue=https%3A%2F%2Fwww.youtube.com%2Flive%2FqVv6vCqciTM%3Fcbrd%3D1&gl=NL&m=0&pc=yt&hl=en&src=1',
+        'info_dict': {
+            'id': 'qVv6vCqciTM',
+            'ext': 'mp4',
+            'age_limit': 0,
+            'uploader_id': '@sana_natori',
+            'comment_count': int,
+            'chapters': 'count:13',
+            'upload_date': '20221223',
+            'thumbnail': 'https://i.ytimg.com/vi/qVv6vCqciTM/maxresdefault.jpg',
+            'channel_url': 'https://www.youtube.com/channel/UCIdEIHpS0TdkqRkHL5OkLtA',
+            'uploader_url': 'https://www.youtube.com/@sana_natori',
+            'like_count': int,
+            'release_date': '20221223',
+            'tags': ['Vtuber', '月ノ美兎', '名取さな', 'にじさんじ', 'クリスマス', '3D配信'],
+            'title': '【 #インターネット女クリスマス 】3Dで歌ってはしゃぐインターネットの女たち【月ノ美兎/名取さな】',
+            'view_count': int,
+            'playable_in_embed': True,
+            'duration': 4438,
+            'availability': 'public',
+            'channel_follower_count': int,
+            'channel_id': 'UCIdEIHpS0TdkqRkHL5OkLtA',
+            'categories': ['Entertainment'],
+            'live_status': 'was_live',
+            'release_timestamp': 1671793345,
+            'channel': 'さなちゃんねる',
+            'description': 'md5:6aebf95cc4a1d731aebc01ad6cc9806d',
+            'uploader': 'さなちゃんねる',
+            'channel_is_verified': True,
+            'heatmap': 'count:100',
+        },
+        'add_ie': ['Youtube'],
+        'params': {'skip_download': 'Youtube'},
+    }]
+
+    def _real_extract(self, url):
+        redirect_url = url_or_none(parse_qs(url).get('continue', [None])[-1])
+        if not redirect_url:
+            raise ExtractorError('Invalid cookie consent redirect URL', expected=True)
+        return self.url_result(redirect_url)
diff --git a/plugins/youtube_download/yt_dlp/extractor/youtube/_search.py b/plugins/youtube_download/yt_dlp/extractor/youtube/_search.py
new file mode 100644
index 0000000..be10a20
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/youtube/_search.py
@@ -0,0 +1,167 @@
+import urllib.parse
+
+from ._tab import YoutubeTabBaseInfoExtractor
+from ..common import SearchInfoExtractor
+from ...utils import join_nonempty, parse_qs
+
+
+class YoutubeSearchIE(YoutubeTabBaseInfoExtractor, SearchInfoExtractor):
+    IE_DESC = 'YouTube search'
+    IE_NAME = 'youtube:search'
+    _SEARCH_KEY = 'ytsearch'
+    _SEARCH_PARAMS = 'EgIQAfABAQ=='  # Videos only
+    _TESTS = [{
+        'url': 'ytsearch5:youtube-dl test video',
+        'playlist_count': 5,
+        'info_dict': {
+            'id': 'youtube-dl test video',
+            'title': 'youtube-dl test video',
+        },
+    }, {
+        'note': 'Suicide/self-harm search warning',
+        'url': 'ytsearch1:i hate myself and i wanna die',
+        'playlist_count': 1,
+        'info_dict': {
+            'id': 'i hate myself and i wanna die',
+            'title': 'i hate myself and i wanna die',
+        },
+    }]
+
+
+class YoutubeSearchDateIE(YoutubeTabBaseInfoExtractor, SearchInfoExtractor):
+    IE_NAME = YoutubeSearchIE.IE_NAME + ':date'
+    _SEARCH_KEY = 'ytsearchdate'
+    IE_DESC = 'YouTube search, newest videos first'
+    _SEARCH_PARAMS = 'CAISAhAB8AEB'  # Videos only, sorted by date
+    _TESTS = [{
+        'url': 'ytsearchdate5:youtube-dl test video',
+        'playlist_count': 5,
+        'info_dict': {
+            'id': 'youtube-dl test video',
+            'title': 'youtube-dl test video',
+        },
+    }]
+
+
+class YoutubeSearchURLIE(YoutubeTabBaseInfoExtractor):
+    IE_DESC = 'YouTube search URLs with sorting and filter support'
+    IE_NAME = YoutubeSearchIE.IE_NAME + '_url'
+    _VALID_URL = r'https?://(?:www\.)?youtube\.com/(?:results|search)\?([^#]+&)?(?:search_query|q)=(?:[^&]+)(?:[&#]|$)'
+    _TESTS = [{
+        'url': 'https://www.youtube.com/results?baz=bar&search_query=youtube-dl+test+video&filters=video&lclk=video',
+        'playlist_mincount': 5,
+        'info_dict': {
+            'id': 'youtube-dl test video',
+            'title': 'youtube-dl test video',
+        },
+    }, {
+        'url': 'https://www.youtube.com/results?search_query=python&sp=EgIQAg%253D%253D',
+        'playlist_mincount': 5,
+        'info_dict': {
+            'id': 'python',
+            'title': 'python',
+        },
+    }, {
+        'url': 'https://www.youtube.com/results?search_query=%23cats',
+        'playlist_mincount': 1,
+        'info_dict': {
+            'id': '#cats',
+            'title': '#cats',
+            # The test suite does not have support for nested playlists
+            # 'entries': [{
+            #     'url': r're:https://(www\.)?youtube\.com/hashtag/cats',
+            #     'title': '#cats',
+            # }],
+        },
+    }, {
+        # Channel results
+        'url': 'https://www.youtube.com/results?search_query=kurzgesagt&sp=EgIQAg%253D%253D',
+        'info_dict': {
+            'id': 'kurzgesagt',
+            'title': 'kurzgesagt',
+        },
+        'playlist': [{
+            'info_dict': {
+                '_type': 'url',
+                'id': 'UCsXVk37bltHxD1rDPwtNM8Q',
+                'url': 'https://www.youtube.com/channel/UCsXVk37bltHxD1rDPwtNM8Q',
+                'ie_key': 'YoutubeTab',
+                'channel': 'Kurzgesagt – In a Nutshell',
+                'description': 'md5:4ae48dfa9505ffc307dad26342d06bfc',
+                'title': 'Kurzgesagt – In a Nutshell',
+                'channel_id': 'UCsXVk37bltHxD1rDPwtNM8Q',
+                # No longer available for search as it is set to the handle.
+                # 'playlist_count': int,
+                'channel_url': 'https://www.youtube.com/channel/UCsXVk37bltHxD1rDPwtNM8Q',
+                'thumbnails': list,
+                'uploader_id': '@kurzgesagt',
+                'uploader_url': 'https://www.youtube.com/@kurzgesagt',
+                'uploader': 'Kurzgesagt – In a Nutshell',
+                'channel_is_verified': True,
+                'channel_follower_count': int,
+            },
+        }],
+        'params': {'extract_flat': True, 'playlist_items': '1'},
+        'playlist_mincount': 1,
+    }, {
+        'url': 'https://www.youtube.com/results?q=test&sp=EgQIBBgB',
+        'only_matching': True,
+    }]
+
+    def _real_extract(self, url):
+        qs = parse_qs(url)
+        query = (qs.get('search_query') or qs.get('q'))[0]
+        return self.playlist_result(self._search_results(query, qs.get('sp', (None,))[0]), query, query)
+
+
+class YoutubeMusicSearchURLIE(YoutubeTabBaseInfoExtractor):
+    IE_DESC = 'YouTube music search URLs with selectable sections, e.g. #songs'
+    IE_NAME = 'youtube:music:search_url'
+    _VALID_URL = r'https?://music\.youtube\.com/search\?([^#]+&)?(?:search_query|q)=(?:[^&]+)(?:[&#]|$)'
+    _TESTS = [{
+        'url': 'https://music.youtube.com/search?q=royalty+free+music',
+        'playlist_count': 16,
+        'info_dict': {
+            'id': 'royalty free music',
+            'title': 'royalty free music',
+        },
+    }, {
+        'url': 'https://music.youtube.com/search?q=royalty+free+music&sp=EgWKAQIIAWoKEAoQAxAEEAkQBQ%3D%3D',
+        'playlist_mincount': 30,
+        'info_dict': {
+            'id': 'royalty free music - songs',
+            'title': 'royalty free music - songs',
+        },
+        'params': {'extract_flat': 'in_playlist'},
+    }, {
+        'url': 'https://music.youtube.com/search?q=royalty+free+music#community+playlists',
+        'playlist_mincount': 30,
+        'info_dict': {
+            'id': 'royalty free music - community playlists',
+            'title': 'royalty free music - community playlists',
+        },
+        'params': {'extract_flat': 'in_playlist'},
+    }]
+
+    _SECTIONS = {
+        'albums': 'EgWKAQIYAWoKEAoQAxAEEAkQBQ==',
+        'artists': 'EgWKAQIgAWoKEAoQAxAEEAkQBQ==',
+        'community playlists': 'EgeKAQQoAEABagoQChADEAQQCRAF',
+        'featured playlists': 'EgeKAQQoADgBagwQAxAJEAQQDhAKEAU==',
+        'songs': 'EgWKAQIIAWoKEAoQAxAEEAkQBQ==',
+        'videos': 'EgWKAQIQAWoKEAoQAxAEEAkQBQ==',
+    }
+
+    def _real_extract(self, url):
+        qs = parse_qs(url)
+        query = (qs.get('search_query') or qs.get('q'))[0]
+        params = qs.get('sp', (None,))[0]
+        if params:
+            section = next((k for k, v in self._SECTIONS.items() if v == params), params)
+        else:
+            section = urllib.parse.unquote_plus(([*url.split('#'), ''])[1]).lower()
+            params = self._SECTIONS.get(section)
+            if not params:
+                section = None
+        title = join_nonempty(query, section, delim=' - ')
+        return self.playlist_result(self._search_results(query, params, default_client='web_music'), title, title)
diff --git a/plugins/youtube_download/yt_dlp/extractor/youtube/_tab.py b/plugins/youtube_download/yt_dlp/extractor/youtube/_tab.py
new file mode 100644
index 0000000..c018ee8
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/youtube/_tab.py
@@ -0,0 +1,2385 @@
+import functools
+import itertools
+import re
+import shlex
+import urllib.parse
+
+from ._base import BadgeType, YoutubeBaseInfoExtractor
+from ._video import YoutubeIE
+from ...networking.exceptions import HTTPError, network_exceptions
+from ...utils import (
+    NO_DEFAULT,
+    ExtractorError,
+    UserNotLive,
+    bug_reports_message,
+    format_field,
+    get_first,
+    int_or_none,
+    parse_count,
+    parse_duration,
+    parse_qs,
+    smuggle_url,
+    str_to_int,
+    strftime_or_none,
+    traverse_obj,
+    try_get,
+    unsmuggle_url,
+    update_url_query,
+    url_or_none,
+    urljoin,
+    variadic,
+)
+
+
+class YoutubeTabBaseInfoExtractor(YoutubeBaseInfoExtractor):
+    @staticmethod
+    def passthrough_smuggled_data(func):
+        def _smuggle(info, smuggled_data):
+            if info.get('_type') not in ('url', 'url_transparent'):
+                return info
+            if smuggled_data.get('is_music_url'):
+                parsed_url = urllib.parse.urlparse(info['url'])
+                if parsed_url.netloc in ('www.youtube.com', 'music.youtube.com'):
+                    smuggled_data.pop('is_music_url')
+                    info['url'] = urllib.parse.urlunparse(parsed_url._replace(netloc='music.youtube.com'))
+            if smuggled_data:
+                info['url'] = smuggle_url(info['url'], smuggled_data)
+            return info
+
+        @functools.wraps(func)
+        def wrapper(self, url):
+            url, smuggled_data = unsmuggle_url(url, {})
+            if self.is_music_url(url):
+                smuggled_data['is_music_url'] = True
+            info_dict = func(self, url, smuggled_data)
+            if smuggled_data:
+                _smuggle(info_dict, smuggled_data)
+                if info_dict.get('entries'):
+                    info_dict['entries'] = (_smuggle(i, smuggled_data.copy()) for i in info_dict['entries'])
+            return info_dict
+        return wrapper
+
+    @staticmethod
+    def _extract_basic_item_renderer(item):
+        # Modified from _extract_grid_item_renderer
+        known_basic_renderers = (
+            'playlistRenderer', 'videoRenderer', 'channelRenderer', 'showRenderer', 'reelItemRenderer',
+        )
+        for key, renderer in item.items():
+            if not isinstance(renderer, dict):
+                continue
+            elif key in known_basic_renderers:
+                return renderer
+            elif key.startswith('grid') and key.endswith('Renderer'):
+                return renderer
+
+    def _extract_video(self, renderer):
+        video_id = renderer.get('videoId')
+
+        reel_header_renderer = traverse_obj(renderer, (
+            'navigationEndpoint', 'reelWatchEndpoint', 'overlay', 'reelPlayerOverlayRenderer',
+            'reelPlayerHeaderSupportedRenderers', 'reelPlayerHeaderRenderer'))
+
+        title = self._get_text(renderer, 'title', 'headline') or self._get_text(reel_header_renderer, 'reelTitleText')
+        description = self._get_text(renderer, 'descriptionSnippet')
+
+        duration = int_or_none(renderer.get('lengthSeconds'))
+        if duration is None:
+            duration = parse_duration(self._get_text(
+                renderer, 'lengthText', ('thumbnailOverlays', ..., 'thumbnailOverlayTimeStatusRenderer', 'text')))
+        if duration is None:
+            # XXX: should write a parser to be more general to support more cases (e.g. shorts in shorts tab)
+            duration = parse_duration(self._search_regex(
+                r'(?i)(ago)(?!.*\1)\s+(?P<duration>[a-z0-9 ,]+?)(?:\s+[\d,]+\s+views)?(?:\s+-\s+play\s+short)?$',
+                traverse_obj(renderer, ('title', 'accessibility', 'accessibilityData', 'label'), default='', expected_type=str),
+                video_id, default=None, group='duration'))
+
+        channel_id = traverse_obj(
+            renderer, ('shortBylineText', 'runs', ..., 'navigationEndpoint', 'browseEndpoint', 'browseId'),
+            expected_type=str, get_all=False)
+        if not channel_id:
+            channel_id = traverse_obj(reel_header_renderer, ('channelNavigationEndpoint', 'browseEndpoint', 'browseId'))
+
+        channel_id = self.ucid_or_none(channel_id)
+
+        overlay_style = traverse_obj(
+            renderer, ('thumbnailOverlays', ..., 'thumbnailOverlayTimeStatusRenderer', 'style'),
+            get_all=False, expected_type=str)
+        badges = self._extract_badges(traverse_obj(renderer, 'badges'))
+        owner_badges = self._extract_badges(traverse_obj(renderer, 'ownerBadges'))
+        navigation_url = urljoin('https://www.youtube.com/', traverse_obj(
+            renderer, ('navigationEndpoint', 'commandMetadata', 'webCommandMetadata', 'url'),
+            expected_type=str)) or ''
+        url = f'https://www.youtube.com/watch?v={video_id}'
+        if overlay_style == 'SHORTS' or '/shorts/' in navigation_url:
+            url = f'https://www.youtube.com/shorts/{video_id}'
+
+        time_text = (self._get_text(renderer, 'publishedTimeText', 'videoInfo')
+                     or self._get_text(reel_header_renderer, 'timestampText') or '')
+        scheduled_timestamp = str_to_int(traverse_obj(renderer, ('upcomingEventData', 'startTime'), get_all=False))
+
+        live_status = (
+            'is_upcoming' if scheduled_timestamp is not None
+            else 'was_live' if 'streamed' in time_text.lower()
+            else 'is_live' if overlay_style == 'LIVE' or self._has_badge(badges, BadgeType.LIVE_NOW)
+            else None)
+
+        # videoInfo is a string like '50K views • 10 years ago'.
+        view_count_text = self._get_text(renderer, 'viewCountText', 'shortViewCountText', 'videoInfo') or ''
+        view_count = (0 if 'no views' in view_count_text.lower()
+                      else self._get_count({'simpleText': view_count_text}))
+        view_count_field = 'concurrent_view_count' if live_status in ('is_live', 'is_upcoming') else 'view_count'
+
+        channel = (self._get_text(renderer, 'ownerText', 'shortBylineText')
+                   or self._get_text(reel_header_renderer, 'channelTitleText'))
+
+        channel_handle = traverse_obj(renderer, (
+            'shortBylineText', 'runs', ..., 'navigationEndpoint',
+            (('commandMetadata', 'webCommandMetadata', 'url'), ('browseEndpoint', 'canonicalBaseUrl'))),
+            expected_type=self.handle_from_url, get_all=False)
+        return {
+            '_type': 'url',
+            'ie_key': YoutubeIE.ie_key(),
+            'id': video_id,
+            'url': url,
+            'title': title,
+            'description': description,
+            'duration': duration,
+            'channel_id': channel_id,
+            'channel': channel,
+            'channel_url': f'https://www.youtube.com/channel/{channel_id}' if channel_id else None,
+            'uploader': channel,
+            'uploader_id': channel_handle,
+            'uploader_url': format_field(channel_handle, None, 'https://www.youtube.com/%s', default=None),
+            'thumbnails': self._extract_thumbnails(renderer, 'thumbnail'),
+            'timestamp': (self._parse_time_text(time_text)
+                          if self._configuration_arg('approximate_date', ie_key=YoutubeTabIE)
+                          else None),
+            'release_timestamp': scheduled_timestamp,
+            'availability':
+                'public' if self._has_badge(badges, BadgeType.AVAILABILITY_PUBLIC)
+                else self._availability(
+                    is_private=self._has_badge(badges, BadgeType.AVAILABILITY_PRIVATE) or None,
+                    needs_premium=self._has_badge(badges, BadgeType.AVAILABILITY_PREMIUM) or None,
+                    needs_subscription=self._has_badge(badges, BadgeType.AVAILABILITY_SUBSCRIPTION) or None,
+                    is_unlisted=self._has_badge(badges, BadgeType.AVAILABILITY_UNLISTED) or None),
+            view_count_field: view_count,
+            'live_status': live_status,
+            'channel_is_verified': True if self._has_badge(owner_badges, BadgeType.VERIFIED) else None,
+        }
+
+    def _extract_channel_renderer(self, renderer):
+        channel_id = self.ucid_or_none(renderer['channelId'])
+        title = self._get_text(renderer, 'title')
+        channel_url = format_field(channel_id, None, 'https://www.youtube.com/channel/%s', default=None)
+        channel_handle = self.handle_from_url(
+            traverse_obj(renderer, (
+                'navigationEndpoint', (('commandMetadata', 'webCommandMetadata', 'url'),
+                                       ('browseEndpoint', 'canonicalBaseUrl')),
+                {str}), get_all=False))
+        if not channel_handle:
+            # As of 2023-06-01, YouTube sets subscriberCountText to the handle in search
+            channel_handle = self.handle_or_none(self._get_text(renderer, 'subscriberCountText'))
+        return {
+            '_type': 'url',
+            'url': channel_url,
+            'id': channel_id,
+            'ie_key': YoutubeTabIE.ie_key(),
+            'channel': title,
+            'uploader': title,
+            'channel_id': channel_id,
+            'channel_url': channel_url,
+            'title': title,
+            'uploader_id': channel_handle,
+            'uploader_url': format_field(channel_handle, None, 'https://www.youtube.com/%s', default=None),
+            # See above. YouTube sets videoCountText to the subscriber text in search channel renderers.
+            # However, in feed/channels this is set correctly to the subscriber count
+            'channel_follower_count': traverse_obj(
+                renderer, 'subscriberCountText', 'videoCountText', expected_type=self._get_count),
+            'thumbnails': self._extract_thumbnails(renderer, 'thumbnail'),
+            'playlist_count': (
+                # videoCountText may be the subscriber count
+                self._get_count(renderer, 'videoCountText')
+                if self._get_count(renderer, 'subscriberCountText') is not None else None),
+            'description': self._get_text(renderer, 'descriptionSnippet'),
+            'channel_is_verified': True if self._has_badge(
+                self._extract_badges(traverse_obj(renderer, 'ownerBadges')), BadgeType.VERIFIED) else None,
+        }
+
+    def _grid_entries(self, grid_renderer):
+        for item in grid_renderer['items']:
+            if not isinstance(item, dict):
+                continue
+            if lockup_view_model := traverse_obj(item, ('lockupViewModel', {dict})):
+                if entry := self._extract_lockup_view_model(lockup_view_model):
+                    yield entry
+                continue
+            renderer = self._extract_basic_item_renderer(item)
+            if not isinstance(renderer, dict):
+                continue
+            title = self._get_text(renderer, 'title')
+
+            # playlist
+            playlist_id = renderer.get('playlistId')
+            if playlist_id:
+                yield self.url_result(
+                    f'https://www.youtube.com/playlist?list={playlist_id}',
+                    ie=YoutubeTabIE.ie_key(), video_id=playlist_id,
+                    video_title=title)
+                continue
+            # video
+            video_id = renderer.get('videoId')
+            if video_id:
+                yield self._extract_video(renderer)
+                continue
+            # channel
+            channel_id = renderer.get('channelId')
+            if channel_id:
+                yield self._extract_channel_renderer(renderer)
+                continue
+            # generic endpoint URL support
+            ep_url = urljoin('https://www.youtube.com/', try_get(
+                renderer, lambda x: x['navigationEndpoint']['commandMetadata']['webCommandMetadata']['url'],
+                str))
+            if ep_url:
+
+                for ie in (YoutubeTabIE, YoutubePlaylistIE, YoutubeIE):
+                    if ie.suitable(ep_url):
+                        yield self.url_result(
+                            ep_url, ie=ie.ie_key(), video_id=ie._match_id(ep_url), video_title=title)
+                        break
+
+    def _music_reponsive_list_entry(self, renderer):
+        video_id = traverse_obj(renderer, ('playlistItemData', 'videoId'))
+        if video_id:
+            title = traverse_obj(renderer, (
+                'flexColumns', 0, 'musicResponsiveListItemFlexColumnRenderer',
+                'text', 'runs', 0, 'text'))
+            return self.url_result(f'https://music.youtube.com/watch?v={video_id}',
+                                   ie=YoutubeIE.ie_key(), video_id=video_id, title=title)
+        playlist_id = traverse_obj(renderer, ('navigationEndpoint', 'watchEndpoint', 'playlistId'))
+        if playlist_id:
+            video_id = traverse_obj(renderer, ('navigationEndpoint', 'watchEndpoint', 'videoId'))
+            if video_id:
+                return self.url_result(f'https://music.youtube.com/watch?v={video_id}&list={playlist_id}',
+                                       ie=YoutubeTabIE.ie_key(), video_id=playlist_id)
+            return self.url_result(f'https://music.youtube.com/playlist?list={playlist_id}',
+                                   ie=YoutubeTabIE.ie_key(), video_id=playlist_id)
+        browse_id = traverse_obj(renderer, ('navigationEndpoint', 'browseEndpoint', 'browseId'))
+        if browse_id:
+            return self.url_result(f'https://music.youtube.com/browse/{browse_id}',
+                                   ie=YoutubeTabIE.ie_key(), video_id=browse_id)
+
+    def _shelf_entries_from_content(self, shelf_renderer):
+        content = shelf_renderer.get('content')
+        if not isinstance(content, dict):
+            return
+        renderer = content.get('gridRenderer') or content.get('expandedShelfContentsRenderer')
+        if renderer:
+            # TODO: add support for nested playlists so each shelf is processed
+            # as separate playlist
+            # TODO: this includes only first N items
+            yield from self._grid_entries(renderer)
+        renderer = content.get('horizontalListRenderer')
+        if renderer:
+            # TODO: handle case
+            pass
+
+    def _shelf_entries(self, shelf_renderer, skip_channels=False):
+        ep = try_get(
+            shelf_renderer, lambda x: x['endpoint']['commandMetadata']['webCommandMetadata']['url'],
+            str)
+        shelf_url = urljoin('https://www.youtube.com', ep)
+        if shelf_url:
+            # Skipping links to another channels, note that checking for
+            # endpoint.commandMetadata.webCommandMetadata.webPageTypwebPageType == WEB_PAGE_TYPE_CHANNEL
+            # will not work
+            if skip_channels and '/channels?' in shelf_url:
+                return
+            title = self._get_text(shelf_renderer, 'title')
+            yield self.url_result(shelf_url, video_title=title)
+        # Shelf may not contain shelf URL, fallback to extraction from content
+        yield from self._shelf_entries_from_content(shelf_renderer)
+
+    def _playlist_entries(self, video_list_renderer):
+        for content in video_list_renderer['contents']:
+            if not isinstance(content, dict):
+                continue
+            renderer = content.get('playlistVideoRenderer') or content.get('playlistPanelVideoRenderer')
+            if not isinstance(renderer, dict):
+                continue
+            video_id = renderer.get('videoId')
+            if not video_id:
+                continue
+            yield self._extract_video(renderer)
+
+    def _extract_lockup_view_model(self, view_model):
+        content_id = view_model.get('contentId')
+        if not content_id:
+            return
+        content_type = view_model.get('contentType')
+        if content_type not in ('LOCKUP_CONTENT_TYPE_PLAYLIST', 'LOCKUP_CONTENT_TYPE_PODCAST'):
+            self.report_warning(
+                f'Unsupported lockup view model content type "{content_type}"{bug_reports_message()}', only_once=True)
+            return
+        return self.url_result(
+            f'https://www.youtube.com/playlist?list={content_id}', ie=YoutubeTabIE, video_id=content_id,
+            title=traverse_obj(view_model, (
+                'metadata', 'lockupMetadataViewModel', 'title', 'content', {str})),
+            thumbnails=self._extract_thumbnails(view_model, (
+                'contentImage', 'collectionThumbnailViewModel', 'primaryThumbnail', 'thumbnailViewModel', 'image'), final_key='sources'))
+
+    def _rich_entries(self, rich_grid_renderer):
+        if lockup_view_model := traverse_obj(rich_grid_renderer, ('content', 'lockupViewModel', {dict})):
+            if entry := self._extract_lockup_view_model(lockup_view_model):
+                yield entry
+            return
+        renderer = traverse_obj(
+            rich_grid_renderer,
+            ('content', ('videoRenderer', 'reelItemRenderer', 'playlistRenderer', 'shortsLockupViewModel'), any)) or {}
+        video_id = renderer.get('videoId')
+        if video_id:
+            yield self._extract_video(renderer)
+            return
+        playlist_id = renderer.get('playlistId')
+        if playlist_id:
+            yield self.url_result(
+                f'https://www.youtube.com/playlist?list={playlist_id}',
+                ie=YoutubeTabIE.ie_key(), video_id=playlist_id,
+                video_title=self._get_text(renderer, 'title'))
+            return
+        # shortsLockupViewModel extraction
+        entity_id = renderer.get('entityId')
+        if entity_id:
+            video_id = traverse_obj(renderer, ('onTap', 'innertubeCommand', 'reelWatchEndpoint', 'videoId', {str}))
+            if not video_id:
+                return
+            yield self.url_result(
+                f'https://www.youtube.com/shorts/{video_id}',
+                ie=YoutubeIE, video_id=video_id,
+                **traverse_obj(renderer, {
+                    'title': ((
+                        ('overlayMetadata', 'primaryText', 'content', {str}),
+                        ('accessibilityText', {lambda x: re.fullmatch(r'(.+), (?:[\d,.]+(?:[KM]| million)?|No) views? - play Short', x)}, 1)), any),
+                    'view_count': ('overlayMetadata', 'secondaryText', 'content', {parse_count}),
+                }),
+                thumbnails=self._extract_thumbnails(renderer, 'thumbnail', final_key='sources'))
+            return
+
+    def _video_entry(self, video_renderer):
+        video_id = video_renderer.get('videoId')
+        if video_id:
+            return self._extract_video(video_renderer)
+
+    def _hashtag_tile_entry(self, hashtag_tile_renderer):
+        url = urljoin('https://youtube.com', traverse_obj(
+            hashtag_tile_renderer, ('onTapCommand', 'commandMetadata', 'webCommandMetadata', 'url')))
+        if url:
+            return self.url_result(
+                url, ie=YoutubeTabIE.ie_key(), title=self._get_text(hashtag_tile_renderer, 'hashtag'))
+
+    def _post_thread_entries(self, post_thread_renderer):
+        post_renderer = try_get(
+            post_thread_renderer, lambda x: x['post']['backstagePostRenderer'], dict)
+        if not post_renderer:
+            return
+        # video attachment
+        video_renderer = try_get(
+            post_renderer, lambda x: x['backstageAttachment']['videoRenderer'], dict) or {}
+        video_id = video_renderer.get('videoId')
+        if video_id:
+            entry = self._extract_video(video_renderer)
+            if entry:
+                yield entry
+        # playlist attachment
+        playlist_id = try_get(
+            post_renderer, lambda x: x['backstageAttachment']['playlistRenderer']['playlistId'], str)
+        if playlist_id:
+            yield self.url_result(
+                f'https://www.youtube.com/playlist?list={playlist_id}',
+                ie=YoutubeTabIE.ie_key(), video_id=playlist_id)
+        # inline video links
+        runs = try_get(post_renderer, lambda x: x['contentText']['runs'], list) or []
+        for run in runs:
+            if not isinstance(run, dict):
+                continue
+            ep_url = try_get(
+                run, lambda x: x['navigationEndpoint']['urlEndpoint']['url'], str)
+            if not ep_url:
+                continue
+            if not YoutubeIE.suitable(ep_url):
+                continue
+            ep_video_id = YoutubeIE._match_id(ep_url)
+            if video_id == ep_video_id:
+                continue
+            yield self.url_result(ep_url, ie=YoutubeIE.ie_key(), video_id=ep_video_id)
+
+    def _post_thread_continuation_entries(self, post_thread_continuation):
+        contents = post_thread_continuation.get('contents')
+        if not isinstance(contents, list):
+            return
+        for content in contents:
+            renderer = content.get('backstagePostThreadRenderer')
+            if isinstance(renderer, dict):
+                yield from self._post_thread_entries(renderer)
+                continue
+            renderer = content.get('videoRenderer')
+            if isinstance(renderer, dict):
+                yield self._video_entry(renderer)
+
+    r''' # unused
+    def _rich_grid_entries(self, contents):
+        for content in contents:
+            video_renderer = try_get(content, lambda x: x['richItemRenderer']['content']['videoRenderer'], dict)
+            if video_renderer:
+                entry = self._video_entry(video_renderer)
+                if entry:
+                    yield entry
+    '''
+
+    def _report_history_entries(self, renderer):
+        for url in traverse_obj(renderer, (
+                'rows', ..., 'reportHistoryTableRowRenderer', 'cells', ...,
+                'reportHistoryTableCellRenderer', 'cell', 'reportHistoryTableTextCellRenderer', 'text', 'runs', ...,
+                'navigationEndpoint', 'commandMetadata', 'webCommandMetadata', 'url')):
+            yield self.url_result(urljoin('https://www.youtube.com', url), YoutubeIE)
+
+    def _extract_entries(self, parent_renderer, continuation_list):
+        # continuation_list is modified in-place with continuation_list = [continuation_token]
+        continuation_list[:] = [None]
+        contents = try_get(parent_renderer, lambda x: x['contents'], list) or []
+        for content in contents:
+            if not isinstance(content, dict):
+                continue
+            is_renderer = traverse_obj(
+                content, 'itemSectionRenderer', 'musicShelfRenderer', 'musicShelfContinuation',
+                expected_type=dict)
+            if not is_renderer:
+                if content.get('richItemRenderer'):
+                    for entry in self._rich_entries(content['richItemRenderer']):
+                        yield entry
+                    continuation_list[0] = self._extract_continuation(parent_renderer)
+                elif content.get('reportHistorySectionRenderer'):  # https://www.youtube.com/reporthistory
+                    table = traverse_obj(content, ('reportHistorySectionRenderer', 'table', 'tableRenderer'))
+                    yield from self._report_history_entries(table)
+                    continuation_list[0] = self._extract_continuation(table)
+                continue
+
+            isr_contents = try_get(is_renderer, lambda x: x['contents'], list) or []
+            for isr_content in isr_contents:
+                if not isinstance(isr_content, dict):
+                    continue
+
+                known_renderers = {
+                    'playlistVideoListRenderer': self._playlist_entries,
+                    'gridRenderer': self._grid_entries,
+                    'reelShelfRenderer': self._grid_entries,
+                    'shelfRenderer': self._shelf_entries,
+                    'musicResponsiveListItemRenderer': lambda x: [self._music_reponsive_list_entry(x)],
+                    'backstagePostThreadRenderer': self._post_thread_entries,
+                    'videoRenderer': lambda x: [self._video_entry(x)],
+                    'playlistRenderer': lambda x: self._grid_entries({'items': [{'playlistRenderer': x}]}),
+                    'channelRenderer': lambda x: self._grid_entries({'items': [{'channelRenderer': x}]}),
+                    'hashtagTileRenderer': lambda x: [self._hashtag_tile_entry(x)],
+                    'richGridRenderer': lambda x: self._extract_entries(x, continuation_list),
+                    'lockupViewModel': lambda x: [self._extract_lockup_view_model(x)],
+                }
+                for key, renderer in isr_content.items():
+                    if key not in known_renderers:
+                        continue
+                    for entry in known_renderers[key](renderer):
+                        if entry:
+                            yield entry
+                    continuation_list[0] = self._extract_continuation(renderer)
+                    break
+
+            if not continuation_list[0]:
+                continuation_list[0] = self._extract_continuation(is_renderer)
+
+        if not continuation_list[0]:
+            continuation_list[0] = self._extract_continuation(parent_renderer)
+
+    def _entries(self, tab, item_id, ytcfg, delegated_session_id, visitor_data):
+        continuation_list = [None]
+        extract_entries = lambda x: self._extract_entries(x, continuation_list)
+        tab_content = try_get(tab, lambda x: x['content'], dict)
+        if not tab_content:
+            return
+        parent_renderer = (
+            try_get(tab_content, lambda x: x['sectionListRenderer'], dict)
+            or try_get(tab_content, lambda x: x['richGridRenderer'], dict) or {})
+        yield from extract_entries(parent_renderer)
+        continuation = continuation_list[0]
+        seen_continuations = set()
+        for page_num in itertools.count(1):
+            if not continuation:
+                break
+            continuation_token = continuation.get('continuation')
+            if continuation_token is not None and continuation_token in seen_continuations:
+                self.write_debug('Detected YouTube feed looping - assuming end of feed.')
+                break
+            seen_continuations.add(continuation_token)
+            headers = self.generate_api_headers(
+                ytcfg=ytcfg, delegated_session_id=delegated_session_id, visitor_data=visitor_data)
+            response = self._extract_response(
+                item_id=f'{item_id} page {page_num}',
+                query=continuation, headers=headers, ytcfg=ytcfg,
+                check_get_keys=(
+                    'continuationContents', 'onResponseReceivedActions', 'onResponseReceivedEndpoints',
+                    # Playlist recommendations may return with no data - ignore
+                    ('responseContext', 'serviceTrackingParams', ..., 'params', ..., lambda k, v: k == 'key' and v == 'GetRecommendedMusicPlaylists_rid'),
+                ))
+
+            if not response:
+                break
+
+            continuation = None
+            # Extracting updated visitor data is required to prevent an infinite extraction loop in some cases
+            # See: https://github.com/ytdl-org/youtube-dl/issues/28702
+            visitor_data = self._extract_visitor_data(response) or visitor_data
+
+            known_renderers = {
+                'videoRenderer': (self._grid_entries, 'items'),  # for membership tab
+                'gridPlaylistRenderer': (self._grid_entries, 'items'),
+                'gridVideoRenderer': (self._grid_entries, 'items'),
+                'gridChannelRenderer': (self._grid_entries, 'items'),
+                'playlistVideoRenderer': (self._playlist_entries, 'contents'),
+                'itemSectionRenderer': (extract_entries, 'contents'),  # for feeds
+                'richItemRenderer': (extract_entries, 'contents'),  # for hashtag
+                'backstagePostThreadRenderer': (self._post_thread_continuation_entries, 'contents'),
+                'reportHistoryTableRowRenderer': (self._report_history_entries, 'rows'),
+                'playlistVideoListContinuation': (self._playlist_entries, None),
+                'gridContinuation': (self._grid_entries, None),
+                'itemSectionContinuation': (self._post_thread_continuation_entries, None),
+                'sectionListContinuation': (extract_entries, None),  # for feeds
+            }
+
+            continuation_items = traverse_obj(response, (
+                ('onResponseReceivedActions', 'onResponseReceivedEndpoints'), ...,
+                'appendContinuationItemsAction', 'continuationItems',
+            ), 'continuationContents', get_all=False)
+            continuation_item = traverse_obj(continuation_items, 0, None, expected_type=dict, default={})
+
+            video_items_renderer = None
+            for key in continuation_item:
+                if key not in known_renderers:
+                    continue
+                func, parent_key = known_renderers[key]
+                video_items_renderer = {parent_key: continuation_items} if parent_key else continuation_items
+                continuation_list = [None]
+                yield from func(video_items_renderer)
+                continuation = continuation_list[0] or self._extract_continuation(video_items_renderer)
+
+            # In the case only a continuation is returned, try to follow it.
+            # We extract this after trying to extract non-continuation items as otherwise this
+            # may be prioritized over other continuations.
+            # see: https://github.com/yt-dlp/yt-dlp/issues/12933
+            continuation = continuation or self._extract_continuation({'contents': [continuation_item]})
+
+            if not continuation and not video_items_renderer:
+                break
+
+    @staticmethod
+    def _extract_selected_tab(tabs, fatal=True):
+        for tab_renderer in tabs:
+            if tab_renderer.get('selected'):
+                return tab_renderer
+        if fatal:
+            raise ExtractorError('Unable to find selected tab')
+
+    @staticmethod
+    def _extract_tab_renderers(response):
+        return traverse_obj(
+            response, ('contents', 'twoColumnBrowseResultsRenderer', 'tabs', ..., ('tabRenderer', 'expandableTabRenderer')), expected_type=dict)
+
+    def _extract_from_tabs(self, item_id, ytcfg, data, tabs):
+        metadata = self._extract_metadata_from_tabs(item_id, data)
+
+        selected_tab = self._extract_selected_tab(tabs)
+        metadata['title'] += format_field(selected_tab, 'title', ' - %s')
+        metadata['title'] += format_field(selected_tab, 'expandedText', ' - %s')
+
+        return self.playlist_result(
+            self._entries(
+                selected_tab, metadata['id'], ytcfg,
+                self._extract_delegated_session_id(ytcfg, data),
+                self._extract_visitor_data(data, ytcfg)),
+            **metadata)
+
+    def _extract_metadata_from_tabs(self, item_id, data):
+        info = {'id': item_id}
+
+        metadata_renderer = traverse_obj(data, ('metadata', 'channelMetadataRenderer'), expected_type=dict)
+        if metadata_renderer:
+            channel_id = traverse_obj(metadata_renderer, ('externalId', {self.ucid_or_none}),
+                                      ('channelUrl', {self.ucid_from_url}))
+            info.update({
+                'channel': metadata_renderer.get('title'),
+                'channel_id': channel_id,
+            })
+            if info['channel_id']:
+                info['id'] = info['channel_id']
+        else:
+            metadata_renderer = traverse_obj(data, ('metadata', 'playlistMetadataRenderer'), expected_type=dict)
+
+        # pageHeaderViewModel slow rollout began April 2024
+        page_header_view_model = traverse_obj(data, (
+            'header', 'pageHeaderRenderer', 'content', 'pageHeaderViewModel', {dict}))
+
+        # We can get the uncropped banner/avatar by replacing the crop params with '=s0'
+        # See: https://github.com/yt-dlp/yt-dlp/issues/2237#issuecomment-1013694714
+        def _get_uncropped(url):
+            return url_or_none((url or '').split('=')[0] + '=s0')
+
+        avatar_thumbnails = self._extract_thumbnails(metadata_renderer, 'avatar')
+        if avatar_thumbnails:
+            uncropped_avatar = _get_uncropped(avatar_thumbnails[0]['url'])
+            if uncropped_avatar:
+                avatar_thumbnails.append({
+                    'url': uncropped_avatar,
+                    'id': 'avatar_uncropped',
+                    'preference': 1,
+                })
+
+        channel_banners = (
+            self._extract_thumbnails(data, ('header', ..., ('banner', 'mobileBanner', 'tvBanner')))
+            or self._extract_thumbnails(
+                page_header_view_model, ('banner', 'imageBannerViewModel', 'image'), final_key='sources'))
+        for banner in channel_banners:
+            banner['preference'] = -10
+
+        if channel_banners:
+            uncropped_banner = _get_uncropped(channel_banners[0]['url'])
+            if uncropped_banner:
+                channel_banners.append({
+                    'url': uncropped_banner,
+                    'id': 'banner_uncropped',
+                    'preference': -5,
+                })
+
+        # Deprecated - remove primary_sidebar_renderer when layout discontinued
+        primary_sidebar_renderer = self._extract_sidebar_info_renderer(data, 'playlistSidebarPrimaryInfoRenderer')
+        playlist_header_renderer = traverse_obj(data, ('header', 'playlistHeaderRenderer'), expected_type=dict)
+
+        primary_thumbnails = self._extract_thumbnails(
+            primary_sidebar_renderer, ('thumbnailRenderer', ('playlistVideoThumbnailRenderer', 'playlistCustomThumbnailRenderer'), 'thumbnail'))
+        playlist_thumbnails = self._extract_thumbnails(
+            playlist_header_renderer, ('playlistHeaderBanner', 'heroPlaylistThumbnailRenderer', 'thumbnail'))
+
+        info.update({
+            'title': (traverse_obj(metadata_renderer, 'title')
+                      or self._get_text(data, ('header', 'hashtagHeaderRenderer', 'hashtag'))
+                      or info['id']),
+            'availability': self._extract_availability(data),
+            'channel_follower_count': (
+                self._get_count(data, ('header', ..., 'subscriberCountText'))
+                or traverse_obj(page_header_view_model, (
+                    'metadata', 'contentMetadataViewModel', 'metadataRows', ..., 'metadataParts',
+                    lambda _, v: 'subscribers' in v['text']['content'], 'text', 'content', {parse_count}, any))),
+            'description': try_get(metadata_renderer, lambda x: x.get('description', '')),
+            'tags': (traverse_obj(data, ('microformat', 'microformatDataRenderer', 'tags', ..., {str}))
+                     or traverse_obj(metadata_renderer, ('keywords', {lambda x: x and shlex.split(x)}, ...))),
+            'thumbnails': (primary_thumbnails or playlist_thumbnails) + avatar_thumbnails + channel_banners,
+        })
+
+        channel_handle = (
+            traverse_obj(metadata_renderer, (('vanityChannelUrl', ('ownerUrls', ...)), {self.handle_from_url}), get_all=False)
+            or traverse_obj(data, ('header', ..., 'channelHandleText', {self.handle_or_none}), get_all=False))
+
+        if channel_handle:
+            info.update({
+                'uploader_id': channel_handle,
+                'uploader_url': format_field(channel_handle, None, 'https://www.youtube.com/%s', default=None),
+            })
+
+        channel_badges = self._extract_badges(traverse_obj(data, ('header', ..., 'badges'), get_all=False))
+        if self._has_badge(channel_badges, BadgeType.VERIFIED):
+            info['channel_is_verified'] = True
+        # Playlist stats is a text runs array containing [video count, view count, last updated].
+        # last updated or (view count and last updated) may be missing.
+        playlist_stats = get_first(
+            (primary_sidebar_renderer, playlist_header_renderer), (('stats', 'briefStats', 'numVideosText'), ))
+
+        last_updated_unix = self._parse_time_text(
+            self._get_text(playlist_stats, 2)  # deprecated, remove when old layout discontinued
+            or self._get_text(playlist_header_renderer, ('byline', 1, 'playlistBylineRenderer', 'text')))
+        info['modified_date'] = strftime_or_none(last_updated_unix)
+
+        info['view_count'] = self._get_count(playlist_stats, 1)
+        if info['view_count'] is None:  # 0 is allowed
+            info['view_count'] = self._get_count(playlist_header_renderer, 'viewCountText')
+        if info['view_count'] is None:
+            info['view_count'] = self._get_count(data, (
+                'contents', 'twoColumnBrowseResultsRenderer', 'tabs', ..., 'tabRenderer', 'content', 'sectionListRenderer',
+                'contents', ..., 'itemSectionRenderer', 'contents', ..., 'channelAboutFullMetadataRenderer', 'viewCountText'))
+
+        info['playlist_count'] = self._get_count(playlist_stats, 0)
+        if info['playlist_count'] is None:  # 0 is allowed
+            info['playlist_count'] = self._get_count(playlist_header_renderer, ('byline', 0, 'playlistBylineRenderer', 'text'))
+
+        if not info.get('channel_id'):
+            owner = traverse_obj(playlist_header_renderer, 'ownerText')
+            if not owner:  # Deprecated
+                owner = traverse_obj(
+                    self._extract_sidebar_info_renderer(data, 'playlistSidebarSecondaryInfoRenderer'),
+                    ('videoOwner', 'videoOwnerRenderer', 'title'))
+            owner_text = self._get_text(owner)
+            browse_ep = traverse_obj(owner, ('runs', 0, 'navigationEndpoint', 'browseEndpoint')) or {}
+            info.update({
+                'channel': self._search_regex(r'^by (.+) and \d+ others?$', owner_text, 'uploader', default=owner_text),
+                'channel_id': self.ucid_or_none(browse_ep.get('browseId')),
+                'uploader_id': self.handle_from_url(urljoin('https://www.youtube.com', browse_ep.get('canonicalBaseUrl'))),
+            })
+
+        info.update({
+            'uploader': info['channel'],
+            'channel_url': format_field(info.get('channel_id'), None, 'https://www.youtube.com/channel/%s', default=None),
+            'uploader_url': format_field(info.get('uploader_id'), None, 'https://www.youtube.com/%s', default=None),
+        })
+
+        return info
+
+    def _extract_inline_playlist(self, playlist, playlist_id, data, ytcfg):
+        first_id = last_id = response = None
+        for page_num in itertools.count(1):
+            videos = list(self._playlist_entries(playlist))
+            if not videos:
+                return
+            start = next((i for i, v in enumerate(videos) if v['id'] == last_id), -1) + 1
+            if start >= len(videos):
+                return
+            yield from videos[start:]
+            first_id = first_id or videos[0]['id']
+            last_id = videos[-1]['id']
+            watch_endpoint = try_get(
+                playlist, lambda x: x['contents'][-1]['playlistPanelVideoRenderer']['navigationEndpoint']['watchEndpoint'])
+            headers = self.generate_api_headers(
+                ytcfg=ytcfg, delegated_session_id=self._extract_delegated_session_id(ytcfg, data),
+                visitor_data=self._extract_visitor_data(response, data, ytcfg))
+            query = {
+                'playlistId': playlist_id,
+                'videoId': watch_endpoint.get('videoId') or last_id,
+                'index': watch_endpoint.get('index') or len(videos),
+                'params': watch_endpoint.get('params') or 'OAE%3D',
+            }
+            response = self._extract_response(
+                item_id=f'{playlist_id} page {page_num}',
+                query=query, ep='next', headers=headers, ytcfg=ytcfg,
+                check_get_keys='contents',
+            )
+            playlist = try_get(
+                response, lambda x: x['contents']['twoColumnWatchNextResults']['playlist']['playlist'], dict)
+
+    def _extract_from_playlist(self, item_id, url, data, playlist, ytcfg):
+        title = playlist.get('title') or try_get(
+            data, lambda x: x['titleText']['simpleText'], str)
+        playlist_id = playlist.get('playlistId') or item_id
+
+        # Delegating everything except mix playlists to regular tab-based playlist URL
+        playlist_url = urljoin(url, try_get(
+            playlist, lambda x: x['endpoint']['commandMetadata']['webCommandMetadata']['url'],
+            str))
+
+        # Some playlists are unviewable but YouTube still provides a link to the (broken) playlist page [1]
+        # [1] MLCT, RLTDwFCb4jeqaKWnciAYM-ZVHg
+        is_known_unviewable = re.fullmatch(r'MLCT|RLTD[\w-]{22}', playlist_id)
+
+        if playlist_url and playlist_url != url and not is_known_unviewable:
+            return self.url_result(
+                playlist_url, ie=YoutubeTabIE.ie_key(), video_id=playlist_id,
+                video_title=title)
+
+        return self.playlist_result(
+            self._extract_inline_playlist(playlist, playlist_id, data, ytcfg),
+            playlist_id=playlist_id, playlist_title=title)
+
+    def _extract_availability(self, data):
+        """
+        Gets the availability of a given playlist/tab.
+        Note: Unless YouTube tells us explicitly, we do not assume it is public
+        @param data: response
+        """
+        sidebar_renderer = self._extract_sidebar_info_renderer(data, 'playlistSidebarPrimaryInfoRenderer') or {}
+        playlist_header_renderer = traverse_obj(data, ('header', 'playlistHeaderRenderer')) or {}
+        player_header_privacy = playlist_header_renderer.get('privacy')
+
+        badges = self._extract_badges(traverse_obj(sidebar_renderer, 'badges'))
+
+        # Personal playlists, when authenticated, have a dropdown visibility selector instead of a badge
+        privacy_setting_icon = get_first(
+            (playlist_header_renderer, sidebar_renderer),
+            ('privacyForm', 'dropdownFormFieldRenderer', 'dropdown', 'dropdownRenderer', 'entries',
+             lambda _, v: v['privacyDropdownItemRenderer']['isSelected'], 'privacyDropdownItemRenderer', 'icon', 'iconType'),
+            expected_type=str)
+
+        microformats_is_unlisted = traverse_obj(
+            data, ('microformat', 'microformatDataRenderer', 'unlisted'), expected_type=bool)
+
+        return (
+            'public' if (
+                self._has_badge(badges, BadgeType.AVAILABILITY_PUBLIC)
+                or player_header_privacy == 'PUBLIC'
+                or privacy_setting_icon == 'PRIVACY_PUBLIC')
+            else self._availability(
+                is_private=(
+                    self._has_badge(badges, BadgeType.AVAILABILITY_PRIVATE)
+                    or player_header_privacy == 'PRIVATE' if player_header_privacy is not None
+                    else privacy_setting_icon == 'PRIVACY_PRIVATE' if privacy_setting_icon is not None else None),
+                is_unlisted=(
+                    self._has_badge(badges, BadgeType.AVAILABILITY_UNLISTED)
+                    or player_header_privacy == 'UNLISTED' if player_header_privacy is not None
+                    else privacy_setting_icon == 'PRIVACY_UNLISTED' if privacy_setting_icon is not None
+                    else microformats_is_unlisted if microformats_is_unlisted is not None else None),
+                needs_subscription=self._has_badge(badges, BadgeType.AVAILABILITY_SUBSCRIPTION) or None,
+                needs_premium=self._has_badge(badges, BadgeType.AVAILABILITY_PREMIUM) or None,
+                needs_auth=False))
+
+    @staticmethod
+    def _extract_sidebar_info_renderer(data, info_renderer, expected_type=dict):
+        sidebar_renderer = try_get(
+            data, lambda x: x['sidebar']['playlistSidebarRenderer']['items'], list) or []
+        for item in sidebar_renderer:
+            renderer = try_get(item, lambda x: x[info_renderer], expected_type)
+            if renderer:
+                return renderer
+
+    def _reload_with_unavailable_videos(self, item_id, data, ytcfg):
+        """
+        Reload playlists with unavailable videos (e.g. private videos, region blocked, etc.)
+        """
+        is_playlist = bool(traverse_obj(
+            data, ('metadata', 'playlistMetadataRenderer'), ('header', 'playlistHeaderRenderer')))
+        if not is_playlist:
+            return
+        headers = self.generate_api_headers(
+            ytcfg=ytcfg, delegated_session_id=self._extract_delegated_session_id(ytcfg, data),
+            visitor_data=self._extract_visitor_data(data, ytcfg))
+        query = {
+            'params': 'wgYCCAA=',
+            'browseId': f'VL{item_id}',
+        }
+        return self._extract_response(
+            item_id=item_id, headers=headers, query=query,
+            check_get_keys='contents', fatal=False, ytcfg=ytcfg,
+            note='Redownloading playlist API JSON with unavailable videos')
+
+    @functools.cached_property
+    def skip_webpage(self):
+        return 'webpage' in self._configuration_arg('skip', ie_key=YoutubeTabIE.ie_key())
+
+    def _extract_webpage(self, url, item_id, fatal=True):
+        webpage, data = None, None
+        for retry in self.RetryManager(fatal=fatal):
+            try:
+                webpage = self._download_webpage(url, item_id, note='Downloading webpage')
+                data = self.extract_yt_initial_data(item_id, webpage or '', fatal=fatal) or {}
+            except ExtractorError as e:
+                if isinstance(e.cause, network_exceptions):
+                    if not isinstance(e.cause, HTTPError) or e.cause.status not in (403, 429):
+                        retry.error = e
+                        continue
+                self._error_or_warning(e, fatal=fatal)
+                break
+
+            try:
+                self._extract_and_report_alerts(data)
+            except ExtractorError as e:
+                self._error_or_warning(e, fatal=fatal)
+                break
+
+            # Sometimes youtube returns a webpage with incomplete ytInitialData
+            # See: https://github.com/yt-dlp/yt-dlp/issues/116
+            if not traverse_obj(data, 'contents', 'currentVideoEndpoint', 'onResponseReceivedActions'):
+                retry.error = ExtractorError('Incomplete yt initial data received')
+                data = None
+                continue
+
+        return webpage, data
+
+    def _report_playlist_authcheck(self, ytcfg, fatal=True):
+        """Use if failed to extract ytcfg (and data) from initial webpage"""
+        if not ytcfg and self.is_authenticated:
+            msg = 'Playlists that require authentication may not extract correctly without a successful webpage download'
+            if 'authcheck' not in self._configuration_arg('skip', ie_key=YoutubeTabIE.ie_key()) and fatal:
+                raise ExtractorError(
+                    f'{msg}. If you are not downloading private content, or '
+                    'your cookies are only for the first account and channel,'
+                    ' pass "--extractor-args youtubetab:skip=authcheck" to skip this check',
+                    expected=True)
+            self.report_warning(msg, only_once=True)
+
+    def _extract_data(self, url, item_id, ytcfg=None, fatal=True, webpage_fatal=False, default_client='web'):
+        data = None
+        if not self.skip_webpage:
+            webpage, data = self._extract_webpage(url, item_id, fatal=webpage_fatal)
+            ytcfg = ytcfg or self.extract_ytcfg(item_id, webpage)
+            # Reject webpage data if redirected to home page without explicitly requesting
+            selected_tab = self._extract_selected_tab(self._extract_tab_renderers(data), fatal=False) or {}
+            if (url != 'https://www.youtube.com/feed/recommended'
+                    and selected_tab.get('tabIdentifier') == 'FEwhat_to_watch'  # Home page
+                    and 'no-youtube-channel-redirect' not in self.get_param('compat_opts', [])):
+                msg = 'The channel/playlist does not exist and the URL redirected to youtube.com home page'
+                if fatal:
+                    raise ExtractorError(msg, expected=True)
+                self.report_warning(msg, only_once=True)
+        if not data:
+            self._report_playlist_authcheck(ytcfg, fatal=fatal)
+            data = self._extract_tab_endpoint(url, item_id, ytcfg, fatal=fatal, default_client=default_client)
+        return data, ytcfg
+
+    def _extract_tab_endpoint(self, url, item_id, ytcfg=None, fatal=True, default_client='web'):
+        headers = self.generate_api_headers(ytcfg=ytcfg, default_client=default_client)
+        resolve_response = self._extract_response(
+            item_id=item_id, query={'url': url}, check_get_keys='endpoint', headers=headers, ytcfg=ytcfg, fatal=fatal,
+            ep='navigation/resolve_url', note='Downloading API parameters API JSON', default_client=default_client)
+        endpoints = {'browseEndpoint': 'browse', 'watchEndpoint': 'next'}
+        for ep_key, ep in endpoints.items():
+            params = try_get(resolve_response, lambda x: x['endpoint'][ep_key], dict)
+            if params:
+                return self._extract_response(
+                    item_id=item_id, query=params, ep=ep, headers=headers,
+                    ytcfg=ytcfg, fatal=fatal, default_client=default_client,
+                    check_get_keys=('contents', 'currentVideoEndpoint', 'onResponseReceivedActions'))
+        err_note = 'Failed to resolve url (does the playlist exist?)'
+        if fatal:
+            raise ExtractorError(err_note, expected=True)
+        self.report_warning(err_note, item_id)
+
+    _SEARCH_PARAMS = None
+
+    def _search_results(self, query, params=NO_DEFAULT, default_client='web'):
+        data = {'query': query}
+        if params is NO_DEFAULT:
+            params = self._SEARCH_PARAMS
+        if params:
+            data['params'] = params
+
+        content_keys = (
+            ('contents', 'twoColumnSearchResultsRenderer', 'primaryContents', 'sectionListRenderer', 'contents'),
+            ('onResponseReceivedCommands', 0, 'appendContinuationItemsAction', 'continuationItems'),
+            # ytmusic search
+            ('contents', 'tabbedSearchResultsRenderer', 'tabs', 0, 'tabRenderer', 'content', 'sectionListRenderer', 'contents'),
+            ('continuationContents', ),
+        )
+        display_id = f'query "{query}"'
+        check_get_keys = tuple({keys[0] for keys in content_keys})
+        ytcfg = self._download_ytcfg(default_client, display_id) if not self.skip_webpage else {}
+        self._report_playlist_authcheck(ytcfg, fatal=False)
+
+        continuation_list = [None]
+        search = None
+        for page_num in itertools.count(1):
+            data.update(continuation_list[0] or {})
+            headers = self.generate_api_headers(
+                ytcfg=ytcfg, visitor_data=self._extract_visitor_data(search), default_client=default_client)
+            search = self._extract_response(
+                item_id=f'{display_id} page {page_num}', ep='search', query=data,
+                default_client=default_client, check_get_keys=check_get_keys, ytcfg=ytcfg, headers=headers)
+            slr_contents = traverse_obj(search, *content_keys)
+            yield from self._extract_entries({'contents': list(variadic(slr_contents))}, continuation_list)
+            if not continuation_list[0]:
+                break
+
+
+class YoutubeTabIE(YoutubeTabBaseInfoExtractor):
+    IE_DESC = 'YouTube Tabs'
+    _VALID_URL = r'''(?x:
+        https?://
+            (?!consent\.)(?:\w+\.)?
+            (?:
+                youtube(?:kids)?\.com|
+                {invidious}
+            )/
+            (?:
+                (?P<channel_type>channel|c|user|browse)/|
+                (?P<not_channel>
+                    feed/|hashtag/|
+                    (?:playlist|watch)\?.*?\blist=
+                )|
+                (?!(?:{reserved_names})\b)  # Direct URLs
+            )
+            (?P<id>[^/?\#&]+)
+    )'''.format(
+        reserved_names=YoutubeBaseInfoExtractor._RESERVED_NAMES,
+        invidious='|'.join(YoutubeBaseInfoExtractor._INVIDIOUS_SITES),
+    )
+    IE_NAME = 'youtube:tab'
+
+    _TESTS = [{
+        'note': 'playlists, multipage',
+        'url': 'https://www.youtube.com/c/ИгорьКлейнер/playlists?view=1&flow=grid',
+        'playlist_mincount': 94,
+        'info_dict': {
+            'id': 'UCqj7Cz7revf5maW9g5pgNcg',
+            'title': 'Igor Kleiner  - Playlists',
+            'description': 'md5:15d7dd9e333cb987907fcb0d604b233a',
+            'uploader': 'Igor Kleiner ',
+            'uploader_id': '@IgorDataScience',
+            'uploader_url': 'https://www.youtube.com/@IgorDataScience',
+            'channel': 'Igor Kleiner ',
+            'channel_id': 'UCqj7Cz7revf5maW9g5pgNcg',
+            'tags': 'count:23',
+            'channel_url': 'https://www.youtube.com/channel/UCqj7Cz7revf5maW9g5pgNcg',
+            'channel_follower_count': int,
+        },
+    }, {
+        'note': 'playlists, multipage, different order',
+        'url': 'https://www.youtube.com/user/igorkle1/playlists?view=1&sort=dd',
+        'playlist_mincount': 94,
+        'info_dict': {
+            'id': 'UCqj7Cz7revf5maW9g5pgNcg',
+            'title': 'Igor Kleiner  - Playlists',
+            'description': 'md5:15d7dd9e333cb987907fcb0d604b233a',
+            'uploader': 'Igor Kleiner ',
+            'uploader_id': '@IgorDataScience',
+            'uploader_url': 'https://www.youtube.com/@IgorDataScience',
+            'tags': 'count:23',
+            'channel_id': 'UCqj7Cz7revf5maW9g5pgNcg',
+            'channel': 'Igor Kleiner ',
+            'channel_url': 'https://www.youtube.com/channel/UCqj7Cz7revf5maW9g5pgNcg',
+            'channel_follower_count': int,
+        },
+    }, {
+        # TODO: fix channel_is_verified extraction
+        'note': 'playlists, series',
+        'url': 'https://www.youtube.com/c/3blue1brown/playlists?view=50&sort=dd&shelf_id=3',
+        'playlist_mincount': 5,
+        'info_dict': {
+            'id': 'UCYO_jab_esuFRV4b17AJtAw',
+            'title': '3Blue1Brown - Playlists',
+            'description': 'md5:602e3789e6a0cb7d9d352186b720e395',
+            'channel_url': 'https://www.youtube.com/channel/UCYO_jab_esuFRV4b17AJtAw',
+            'channel': '3Blue1Brown',
+            'channel_id': 'UCYO_jab_esuFRV4b17AJtAw',
+            'uploader_id': '@3blue1brown',
+            'uploader_url': 'https://www.youtube.com/@3blue1brown',
+            'uploader': '3Blue1Brown',
+            'tags': ['Mathematics'],
+            'channel_follower_count': int,
+            'channel_is_verified': True,
+        },
+    }, {
+        'note': 'playlists, singlepage',
+        'url': 'https://www.youtube.com/user/ThirstForScience/playlists',
+        'playlist_mincount': 4,
+        'info_dict': {
+            'id': 'UCAEtajcuhQ6an9WEzY9LEMQ',
+            'title': 'ThirstForScience - Playlists',
+            'description': 'md5:609399d937ea957b0f53cbffb747a14c',
+            'uploader': 'ThirstForScience',
+            'uploader_url': 'https://www.youtube.com/@ThirstForScience',
+            'uploader_id': '@ThirstForScience',
+            'channel_id': 'UCAEtajcuhQ6an9WEzY9LEMQ',
+            'channel_url': 'https://www.youtube.com/channel/UCAEtajcuhQ6an9WEzY9LEMQ',
+            'tags': 'count:12',
+            'channel': 'ThirstForScience',
+            'channel_follower_count': int,
+        },
+    }, {
+        'url': 'https://www.youtube.com/c/ChristophLaimer/playlists',
+        'only_matching': True,
+    }, {
+        # TODO: fix availability extraction
+        'note': 'basic, single video playlist',
+        'url': 'https://www.youtube.com/playlist?list=PLt5yu3-wZAlSLRHmI1qNm0wjyVNWw1pCU',
+        'info_dict': {
+            'id': 'PLt5yu3-wZAlSLRHmI1qNm0wjyVNWw1pCU',
+            'title': 'single video playlist',
+            'description': '',
+            'tags': [],
+            'view_count': int,
+            'modified_date': '20250417',
+            'channel': 'cole-dlp-test-acc',
+            'channel_id': 'UCiu-3thuViMebBjw_5nWYrA',
+            'channel_url': 'https://www.youtube.com/channel/UCiu-3thuViMebBjw_5nWYrA',
+            'availability': 'public',
+            'uploader': 'cole-dlp-test-acc',
+            'uploader_url': 'https://www.youtube.com/@coletdjnz',
+            'uploader_id': '@coletdjnz',
+        },
+        'playlist_count': 1,
+    }, {
+        'note': 'empty playlist',
+        'url': 'https://www.youtube.com/playlist?list=PL4lCao7KL_QFodcLWhDpGCYnngnHtQ-Xf',
+        'info_dict': {
+            'id': 'PL4lCao7KL_QFodcLWhDpGCYnngnHtQ-Xf',
+            'title': 'youtube-dl empty playlist',
+            'tags': [],
+            'channel': 'Sergey M.',
+            'description': '',
+            'modified_date': '20230921',
+            'channel_id': 'UCmlqkdCBesrv2Lak1mF_MxA',
+            'channel_url': 'https://www.youtube.com/channel/UCmlqkdCBesrv2Lak1mF_MxA',
+            'availability': 'unlisted',
+            'uploader_url': 'https://www.youtube.com/@sergeym.6173',
+            'uploader_id': '@sergeym.6173',
+            'uploader': 'Sergey M.',
+        },
+        'playlist_count': 0,
+    }, {
+        'note': 'Home tab',
+        'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/featured',
+        'info_dict': {
+            'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',
+            'title': 'lex will - Home',
+            'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',
+            'uploader': 'lex will',
+            'uploader_id': '@lexwill718',
+            'channel': 'lex will',
+            'tags': ['bible', 'history', 'prophesy'],
+            'uploader_url': 'https://www.youtube.com/@lexwill718',
+            'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',
+            'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',
+            'channel_follower_count': int,
+        },
+        'playlist_mincount': 2,
+    }, {
+        'note': 'Videos tab',
+        'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/videos',
+        'info_dict': {
+            'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',
+            'title': 'lex will - Videos',
+            'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',
+            'uploader': 'lex will',
+            'uploader_id': '@lexwill718',
+            'tags': ['bible', 'history', 'prophesy'],
+            'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',
+            'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',
+            'uploader_url': 'https://www.youtube.com/@lexwill718',
+            'channel': 'lex will',
+            'channel_follower_count': int,
+        },
+        'playlist_mincount': 975,
+    }, {
+        'note': 'Videos tab, sorted by popular',
+        'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/videos?view=0&sort=p&flow=grid',
+        'info_dict': {
+            'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',
+            'title': 'lex will - Videos',
+            'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',
+            'uploader': 'lex will',
+            'uploader_id': '@lexwill718',
+            'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',
+            'uploader_url': 'https://www.youtube.com/@lexwill718',
+            'channel': 'lex will',
+            'tags': ['bible', 'history', 'prophesy'],
+            'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',
+            'channel_follower_count': int,
+        },
+        'playlist_mincount': 199,
+    }, {
+        'note': 'Playlists tab',
+        'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/playlists',
+        'info_dict': {
+            'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',
+            'title': 'lex will - Playlists',
+            'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',
+            'uploader': 'lex will',
+            'uploader_id': '@lexwill718',
+            'uploader_url': 'https://www.youtube.com/@lexwill718',
+            'channel': 'lex will',
+            'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',
+            'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',
+            'tags': ['bible', 'history', 'prophesy'],
+            'channel_follower_count': int,
+        },
+        'playlist_mincount': 17,
+    }, {
+        'note': 'Posts tab',
+        'url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w/community',
+        'info_dict': {
+            'id': 'UCKfVa3S1e4PHvxWcwyMMg8w',
+            'title': 'lex will - Posts',
+            'description': 'md5:2163c5d0ff54ed5f598d6a7e6211e488',
+            'channel': 'lex will',
+            'channel_url': 'https://www.youtube.com/channel/UCKfVa3S1e4PHvxWcwyMMg8w',
+            'channel_id': 'UCKfVa3S1e4PHvxWcwyMMg8w',
+            'tags': ['bible', 'history', 'prophesy'],
+            'channel_follower_count': int,
+            'uploader_url': 'https://www.youtube.com/@lexwill718',
+            'uploader_id': '@lexwill718',
+            'uploader': 'lex will',
+        },
+        'playlist_mincount': 18,
+    }, {
+        # TODO: fix channel_is_verified extraction
+        'note': 'Search tab',
+        'url': 'https://www.youtube.com/c/3blue1brown/search?query=linear%20algebra',
+        'playlist_mincount': 40,
+        'info_dict': {
+            'id': 'UCYO_jab_esuFRV4b17AJtAw',
+            'title': '3Blue1Brown - Search - linear algebra',
+            'description': 'md5:602e3789e6a0cb7d9d352186b720e395',
+            'channel_url': 'https://www.youtube.com/channel/UCYO_jab_esuFRV4b17AJtAw',
+            'tags': ['Mathematics'],
+            'channel': '3Blue1Brown',
+            'channel_id': 'UCYO_jab_esuFRV4b17AJtAw',
+            'channel_follower_count': int,
+            'uploader_url': 'https://www.youtube.com/@3blue1brown',
+            'uploader_id': '@3blue1brown',
+            'uploader': '3Blue1Brown',
+            'channel_is_verified': True,
+        },
+    }, {
+        'url': 'https://invidio.us/channel/UCmlqkdCBesrv2Lak1mF_MxA',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.youtubekids.com/channel/UCmlqkdCBesrv2Lak1mF_MxA',
+        'only_matching': True,
+    }, {
+        'url': 'https://music.youtube.com/channel/UCmlqkdCBesrv2Lak1mF_MxA',
+        'only_matching': True,
+    }, {
+        # TODO: fix availability extraction
+        'note': 'Playlist with deleted videos (#651). As a bonus, the video #51 is also twice in this list.',
+        'url': 'https://www.youtube.com/playlist?list=PLwP_SiAcdui0KVebT0mU9Apz359a4ubsC',
+        'info_dict': {
+            'title': '29C3: Not my department',
+            'id': 'PLwP_SiAcdui0KVebT0mU9Apz359a4ubsC',
+            'description': 'md5:a14dc1a8ef8307a9807fe136a0660268',
+            'tags': [],
+            'view_count': int,
+            'modified_date': '20150605',
+            'channel_id': 'UCEPzS1rYsrkqzSLNp76nrcg',
+            'channel_url': 'https://www.youtube.com/channel/UCEPzS1rYsrkqzSLNp76nrcg',
+            'channel': 'Christiaan008',
+            'availability': 'public',
+            'uploader_id': '@ChRiStIaAn008',
+            'uploader': 'Christiaan008',
+            'uploader_url': 'https://www.youtube.com/@ChRiStIaAn008',
+        },
+        'playlist_count': 96,
+    }, {
+        'note': 'Large playlist',
+        'url': 'https://www.youtube.com/playlist?list=UUBABnxM4Ar9ten8Mdjj1j0Q',
+        'info_dict': {
+            'title': 'Uploads from Cauchemar',
+            'id': 'UUBABnxM4Ar9ten8Mdjj1j0Q',
+            'channel_url': 'https://www.youtube.com/channel/UCBABnxM4Ar9ten8Mdjj1j0Q',
+            'tags': [],
+            'modified_date': r're:\d{8}',
+            'channel': 'Cauchemar',
+            'view_count': int,
+            'description': '',
+            'channel_id': 'UCBABnxM4Ar9ten8Mdjj1j0Q',
+            'availability': 'public',
+            'uploader_id': '@Cauchemar89',
+            'uploader': 'Cauchemar',
+            'uploader_url': 'https://www.youtube.com/@Cauchemar89',
+        },
+        'playlist_mincount': 1123,
+        'expected_warnings': [r'[Uu]navailable videos (are|will be) hidden'],
+    }, {
+        'note': 'even larger playlist, 8832 videos',
+        'url': 'http://www.youtube.com/user/NASAgovVideo/videos',
+        'only_matching': True,
+    }, {
+        'note': 'Buggy playlist: the webpage has a "Load more" button but it doesn\'t have more videos',
+        'url': 'https://www.youtube.com/playlist?list=UUXw-G3eDE9trcvY2sBMM_aA',
+        'info_dict': {
+            'title': 'Uploads from Interstellar Movie',
+            'id': 'UUXw-G3eDE9trcvY2sBMM_aA',
+            'tags': [],
+            'view_count': int,
+            'channel_id': 'UCXw-G3eDE9trcvY2sBMM_aA',
+            'channel_url': 'https://www.youtube.com/channel/UCXw-G3eDE9trcvY2sBMM_aA',
+            'channel': 'Interstellar Movie',
+            'description': '',
+            'modified_date': r're:\d{8}',
+            'availability': 'public',
+            'uploader_id': '@InterstellarMovie',
+            'uploader': 'Interstellar Movie',
+            'uploader_url': 'https://www.youtube.com/@InterstellarMovie',
+        },
+        'playlist_mincount': 21,
+    }, {
+        # TODO: fix availability extraction
+        'note': 'Playlist with "show unavailable videos" button',
+        'url': 'https://www.youtube.com/playlist?list=PLYwq8WOe86_xGmR7FrcJq8Sb7VW8K3Tt2',
+        'info_dict': {
+            'title': 'The Memes Of 2010s.....',
+            'id': 'PLYwq8WOe86_xGmR7FrcJq8Sb7VW8K3Tt2',
+            'view_count': int,
+            'channel': "I'm Not JiNxEd",
+            'tags': [],
+            'description': 'md5:44dc3b315ba69394feaafa2f40e7b2a1',
+            'channel_url': 'https://www.youtube.com/channel/UC5H5H85D1QE5-fuWWQ1hdNg',
+            'channel_id': 'UC5H5H85D1QE5-fuWWQ1hdNg',
+            'modified_date': r're:\d{8}',
+            'availability': 'public',
+            'uploader_url': 'https://www.youtube.com/@imnotjinxed1998',
+            'uploader_id': '@imnotjinxed1998',
+            'uploader': "I'm Not JiNxEd",
+        },
+        'playlist_mincount': 150,
+        'expected_warnings': [r'[Uu]navailable videos (are|will be) hidden'],
+    }, {
+        'note': 'Playlist with unavailable videos in page 7',
+        'url': 'https://www.youtube.com/playlist?list=UU8l9frL61Yl5KFOl87nIm2w',
+        'info_dict': {
+            'title': 'Uploads from BlankTV',
+            'id': 'UU8l9frL61Yl5KFOl87nIm2w',
+            'channel': 'BlankTV',
+            'channel_url': 'https://www.youtube.com/channel/UC8l9frL61Yl5KFOl87nIm2w',
+            'channel_id': 'UC8l9frL61Yl5KFOl87nIm2w',
+            'view_count': int,
+            'tags': [],
+            'modified_date': r're:\d{8}',
+            'description': '',
+            'availability': 'public',
+            'uploader_id': '@blanktv',
+            'uploader': 'BlankTV',
+            'uploader_url': 'https://www.youtube.com/@blanktv',
+        },
+        'playlist_mincount': 1000,
+        'expected_warnings': [r'[Uu]navailable videos (are|will be) hidden'],
+    }, {
+        # TODO: fix availability extraction
+        'note': 'https://github.com/ytdl-org/youtube-dl/issues/21844',
+        'url': 'https://www.youtube.com/playlist?list=PLzH6n4zXuckpfMu_4Ff8E7Z1behQks5ba',
+        'info_dict': {
+            'title': 'Data Analysis with Dr Mike Pound',
+            'id': 'PLzH6n4zXuckpfMu_4Ff8E7Z1behQks5ba',
+            'description': 'md5:7f567c574d13d3f8c0954d9ffee4e487',
+            'tags': [],
+            'view_count': int,
+            'channel_id': 'UC9-y-6csu5WGm29I7JiwpnA',
+            'channel_url': 'https://www.youtube.com/channel/UC9-y-6csu5WGm29I7JiwpnA',
+            'channel': 'Computerphile',
+            'availability': 'public',
+            'modified_date': '20190712',
+            'uploader_id': '@Computerphile',
+            'uploader': 'Computerphile',
+            'uploader_url': 'https://www.youtube.com/@Computerphile',
+        },
+        'playlist_mincount': 11,
+    }, {
+        'url': 'https://invidio.us/playlist?list=PL4lCao7KL_QFVb7Iudeipvc2BCavECqzc',
+        'only_matching': True,
+    }, {
+        'note': 'Playlist URL that does not actually serve a playlist',
+        'url': 'https://www.youtube.com/watch?v=FqZTN594JQw&list=PLMYEtVRpaqY00V9W81Cwmzp6N6vZqfUKD4',
+        'info_dict': {
+            'id': 'FqZTN594JQw',
+            'ext': 'webm',
+            'title': "Smiley's People 01 detective, Adventure Series, Action",
+            'upload_date': '20150526',
+            'license': 'Standard YouTube License',
+            'description': 'md5:507cdcb5a49ac0da37a920ece610be80',
+            'categories': ['People & Blogs'],
+            'tags': list,
+            'view_count': int,
+            'like_count': int,
+        },
+        'params': {
+            'skip_download': True,
+        },
+        'skip': 'This video is not available.',
+        'add_ie': [YoutubeIE.ie_key()],
+    }, {
+        'url': 'https://www.youtubekids.com/watch?v=Agk7R8I8o5U&list=PUZ6jURNr1WQZCNHF0ao-c0g',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.youtube.com/watch?v=MuAGGZNfUkU&list=RDMM',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.youtube.com/channel/UCoMdktPbSTixAyNGwb-UYkQ/live',
+        'info_dict': {
+            'id': 'YDvsBbKfLPA',  # This will keep changing
+            'ext': 'mp4',
+            'title': str,
+            'upload_date': r're:\d{8}',
+            'description': str,
+            'categories': ['News & Politics'],
+            'tags': list,
+            'like_count': int,
+            'release_timestamp': int,
+            'channel': 'Sky News',
+            'channel_id': 'UCoMdktPbSTixAyNGwb-UYkQ',
+            'age_limit': 0,
+            'view_count': int,
+            'thumbnail': r're:https?://i\.ytimg\.com/vi/[^/]+/maxresdefault(?:_live)?\.jpg',
+            'playable_in_embed': True,
+            'release_date': r're:\d+',
+            'availability': 'public',
+            'live_status': 'is_live',
+            'channel_url': 'https://www.youtube.com/channel/UCoMdktPbSTixAyNGwb-UYkQ',
+            'channel_follower_count': int,
+            'concurrent_view_count': int,
+            'uploader_url': 'https://www.youtube.com/@SkyNews',
+            'uploader_id': '@SkyNews',
+            'uploader': 'Sky News',
+            'channel_is_verified': True,
+            'media_type': 'livestream',
+            'timestamp': int,
+        },
+        'params': {
+            'skip_download': True,
+        },
+        'expected_warnings': ['Ignoring subtitle tracks found in '],
+    }, {
+        'url': 'https://www.youtube.com/user/TheYoungTurks/live',
+        'info_dict': {
+            'id': 'a48o2S1cPoo',
+            'ext': 'mp4',
+            'title': 'The Young Turks - Live Main Show',
+            'upload_date': '20150715',
+            'license': 'Standard YouTube License',
+            'description': 'md5:438179573adcdff3c97ebb1ee632b891',
+            'categories': ['News & Politics'],
+            'tags': ['Cenk Uygur (TV Program Creator)', 'The Young Turks (Award-Winning Work)', 'Talk Show (TV Genre)'],
+            'like_count': int,
+        },
+        'params': {
+            'skip_download': True,
+        },
+        'only_matching': True,
+    }, {
+        'url': 'https://www.youtube.com/channel/UC1yBKRuGpC1tSM73A0ZjYjQ/live',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.youtube.com/c/CommanderVideoHq/live',
+        'only_matching': True,
+    }, {
+        'note': 'A channel that is not live. Should raise error',
+        'url': 'https://www.youtube.com/user/numberphile/live',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.youtube.com/feed/trending',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.youtube.com/feed/library',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.youtube.com/feed/history',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.youtube.com/feed/subscriptions',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.youtube.com/feed/watch_later',
+        'only_matching': True,
+    }, {
+        'note': 'Recommended - redirects to home page.',
+        'url': 'https://www.youtube.com/feed/recommended',
+        'only_matching': True,
+    }, {
+        'note': 'inline playlist with not always working continuations',
+        'url': 'https://www.youtube.com/watch?v=UC6u0Tct-Fo&list=PL36D642111D65BE7C',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.youtube.com/course',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.youtube.com/zsecurity',
+        'only_matching': True,
+    }, {
+        'url': 'http://www.youtube.com/NASAgovVideo/videos',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.youtube.com/TheYoungTurks/live',
+        'only_matching': True,
+    }, {
+        'url': 'https://www.youtube.com/hashtag/cctv9',
+        'info_dict': {
+            'id': 'cctv9',
+            'title': 'cctv9 - All',
+            'tags': [],
+        },
+        'playlist_mincount': 300,  # not consistent but should be over 300
+    }, {
+        'url': 'https://www.youtube.com/watch?list=PLW4dVinRY435CBE_JD3t-0SRXKfnZHS1P&feature=youtu.be&v=M9cJMXmQ_ZU',
+        'only_matching': True,
+    }, {
+        'note': 'Requires Premium: should request additional YTM-info webpage (and have format 141) for videos in playlist',
+        'url': 'https://music.youtube.com/playlist?list=PLRBp0Fe2GpgmgoscNFLxNyBVSFVdYmFkq',
+        'only_matching': True,
+    }, {
+        'note': '/browse/ should redirect to /channel/',
+        'url': 'https://music.youtube.com/browse/UC1a8OFewdjuLq6KlF8M_8Ng',
+        'only_matching': True,
+    }, {
+        # TODO: fix availability extraction
+        'note': 'VLPL, should redirect to playlist?list=PL...',
+        'url': 'https://music.youtube.com/browse/VLPLRBp0Fe2GpgmgoscNFLxNyBVSFVdYmFkq',
+        'info_dict': {
+            'id': 'PLRBp0Fe2GpgmgoscNFLxNyBVSFVdYmFkq',
+            'description': 'Providing you with copyright free / safe music for gaming, live streaming, studying and more!',
+            'title': 'NCS : All Releases 💿',
+            'channel_url': 'https://www.youtube.com/channel/UC_aEa8K-EOJ3D6gOs7HcyNg',
+            'modified_date': r're:\d{8}',
+            'view_count': int,
+            'channel_id': 'UC_aEa8K-EOJ3D6gOs7HcyNg',
+            'tags': [],
+            'channel': 'NoCopyrightSounds',
+            'availability': 'public',
+            'uploader_url': 'https://www.youtube.com/@NoCopyrightSounds',
+            'uploader': 'NoCopyrightSounds',
+            'uploader_id': '@NoCopyrightSounds',
+        },
+        'playlist_mincount': 166,
+        'expected_warnings': [r'[Uu]navailable videos (are|will be) hidden', 'YouTube Music is not directly supported'],
+    }, {
+        # TODO: fix 'unviewable' issue with this playlist when reloading with unavailable videos
+        'note': 'Topic, should redirect to playlist?list=UU...',
+        'url': 'https://music.youtube.com/browse/UC9ALqqC4aIeG5iDs7i90Bfw',
+        'info_dict': {
+            'id': 'UU9ALqqC4aIeG5iDs7i90Bfw',
+            'title': 'Uploads from Royalty Free Music - Topic',
+            'tags': [],
+            'channel_id': 'UC9ALqqC4aIeG5iDs7i90Bfw',
+            'channel': 'Royalty Free Music - Topic',
+            'view_count': int,
+            'channel_url': 'https://www.youtube.com/channel/UC9ALqqC4aIeG5iDs7i90Bfw',
+            'modified_date': r're:\d{8}',
+            'description': '',
+            'availability': 'public',
+            'uploader': 'Royalty Free Music - Topic',
+        },
+        'playlist_mincount': 101,
+        'expected_warnings': ['YouTube Music is not directly supported', r'[Uu]navailable videos (are|will be) hidden'],
+    }, {
+        # Destination channel with only a hidden self tab (tab id is UCtFRv9O2AHqOZjjynzrv-xg)
+        # Treat as a general feed
+        # TODO: fix extraction
+        'url': 'https://www.youtube.com/channel/UCtFRv9O2AHqOZjjynzrv-xg',
+        'info_dict': {
+            'id': 'UCtFRv9O2AHqOZjjynzrv-xg',
+            'title': 'UCtFRv9O2AHqOZjjynzrv-xg',
+            'tags': [],
+        },
+        'playlist_mincount': 9,
+    }, {
+        'note': 'Youtube music Album',
+        'url': 'https://music.youtube.com/browse/MPREb_gTAcphH99wE',
+        'info_dict': {
+            'id': 'OLAK5uy_l1m0thk3g31NmIIz_vMIbWtyv7eZixlH0',
+            'title': 'Album - Royalty Free Music Library V2 (50 Songs)',
+            'tags': [],
+            'view_count': int,
+            'description': '',
+            'availability': 'unlisted',
+            'modified_date': r're:\d{8}',
+        },
+        'playlist_count': 50,
+        'expected_warnings': ['YouTube Music is not directly supported'],
+    }, {
+        'note': 'unlisted single video playlist',
+        'url': 'https://www.youtube.com/playlist?list=PLt5yu3-wZAlQLfIN0MMgp0wVV6MP3bM4_',
+        'info_dict': {
+            'id': 'PLt5yu3-wZAlQLfIN0MMgp0wVV6MP3bM4_',
+            'title': 'unlisted playlist',
+            'availability': 'unlisted',
+            'tags': [],
+            'modified_date': '20250417',
+            'channel': 'cole-dlp-test-acc',
+            'view_count': int,
+            'description': '',
+            'channel_id': 'UCiu-3thuViMebBjw_5nWYrA',
+            'channel_url': 'https://www.youtube.com/channel/UCiu-3thuViMebBjw_5nWYrA',
+            'uploader_url': 'https://www.youtube.com/@coletdjnz',
+            'uploader_id': '@coletdjnz',
+            'uploader': 'cole-dlp-test-acc',
+        },
+        'playlist': [{
+            'info_dict': {
+                'title': 'youtube-dl test video "\'/\\ä↭𝕐',
+                'id': 'BaW_jenozKc',
+                '_type': 'url',
+                'ie_key': 'Youtube',
+                'duration': 10,
+                'channel_id': 'UCLqxVugv74EIW3VWh2NOa3Q',
+                'channel_url': 'https://www.youtube.com/channel/UCLqxVugv74EIW3VWh2NOa3Q',
+                'view_count': int,
+                'url': 'https://www.youtube.com/watch?v=BaW_jenozKc',
+                'channel': 'Philipp Hagemeister',
+                'uploader_id': '@PhilippHagemeister',
+                'uploader_url': 'https://www.youtube.com/@PhilippHagemeister',
+                'uploader': 'Philipp Hagemeister',
+            },
+        }],
+        'playlist_count': 1,
+        'params': {'extract_flat': True},
+    }, {
+        # By default, recommended is always empty.
+        'note': 'API Fallback: Recommended - redirects to home page. Requires visitorData',
+        'url': 'https://www.youtube.com/feed/recommended',
+        'info_dict': {
+            'id': 'recommended',
+            'title': 'recommended',
+            'tags': [],
+        },
+        'playlist_count': 0,
+        'params': {
+            'skip_download': True,
+            'extractor_args': {'youtubetab': {'skip': ['webpage']}},
+        },
+    }, {
+        'note': 'API Fallback: /videos tab, sorted by oldest first',
+        'url': 'https://www.youtube.com/user/theCodyReeder/videos?view=0&sort=da&flow=grid',
+        'info_dict': {
+            'id': 'UCu6mSoMNzHQiBIOCkHUa2Aw',
+            'title': 'Cody\'sLab - Videos',
+            'description': 'md5:d083b7c2f0c67ee7a6c74c3e9b4243fa',
+            'channel': 'Cody\'sLab',
+            'channel_id': 'UCu6mSoMNzHQiBIOCkHUa2Aw',
+            'tags': [],
+            'channel_url': 'https://www.youtube.com/channel/UCu6mSoMNzHQiBIOCkHUa2Aw',
+            'channel_follower_count': int,
+        },
+        'playlist_mincount': 650,
+        'params': {
+            'skip_download': True,
+            'extractor_args': {'youtubetab': {'skip': ['webpage']}},
+        },
+        'skip': 'Query for sorting no longer works',
+    }, {
+        # TODO: fix 'unviewable' issue with this playlist when reloading with unavailable videos
+        'note': 'API Fallback: Topic, should redirect to playlist?list=UU...',
+        'url': 'https://music.youtube.com/browse/UC9ALqqC4aIeG5iDs7i90Bfw',
+        'info_dict': {
+            'id': 'UU9ALqqC4aIeG5iDs7i90Bfw',
+            'title': 'Uploads from Royalty Free Music - Topic',
+            'modified_date': r're:\d{8}',
+            'channel_id': 'UC9ALqqC4aIeG5iDs7i90Bfw',
+            'description': '',
+            'channel_url': 'https://www.youtube.com/channel/UC9ALqqC4aIeG5iDs7i90Bfw',
+            'tags': [],
+            'channel': 'Royalty Free Music - Topic',
+            'view_count': int,
+            'availability': 'public',
+            'uploader': 'Royalty Free Music - Topic',
+        },
+        'playlist_mincount': 101,
+        'params': {
+            'skip_download': True,
+            'extractor_args': {'youtubetab': {'skip': ['webpage']}},
+        },
+        'expected_warnings': ['YouTube Music is not directly supported', r'[Uu]navailable videos (are|will be) hidden'],
+    }, {
+        'note': 'non-standard redirect to regional channel',
+        'url': 'https://www.youtube.com/channel/UCwVVpHQ2Cs9iGJfpdFngePQ',
+        'only_matching': True,
+    }, {
+        # TODO: fix metadata extraction
+        'note': 'collaborative playlist (uploader name in the form "by <uploader> and x other(s)")',
+        'url': 'https://www.youtube.com/playlist?list=PLx-_-Kk4c89oOHEDQAojOXzEzemXxoqx6',
+        'info_dict': {
+            'id': 'PLx-_-Kk4c89oOHEDQAojOXzEzemXxoqx6',
+            'modified_date': '20250115',
+            'channel_url': 'https://www.youtube.com/channel/UCKcqXmCcyqnhgpA5P0oHH_Q',
+            'tags': [],
+            'availability': 'unlisted',
+            'channel_id': 'UCKcqXmCcyqnhgpA5P0oHH_Q',
+            'channel': 'pukkandan',
+            'description': 'Test for collaborative playlist',
+            'title': 'yt-dlp test - collaborative playlist',
+            'view_count': int,
+            'uploader_url': 'https://www.youtube.com/@pukkandan',
+            'uploader_id': '@pukkandan',
+            'uploader': 'pukkandan',
+        },
+        'playlist_mincount': 2,
+    }, {
+        'note': 'translated tab name',
+        'url': 'https://www.youtube.com/channel/UCiu-3thuViMebBjw_5nWYrA/playlists',
+        'info_dict': {
+            'id': 'UCiu-3thuViMebBjw_5nWYrA',
+            'tags': [],
+            'channel_url': 'https://www.youtube.com/channel/UCiu-3thuViMebBjw_5nWYrA',
+            'description': 'test description',
+            'title': 'cole-dlp-test-acc - 再生リスト',
+            'channel_id': 'UCiu-3thuViMebBjw_5nWYrA',
+            'channel': 'cole-dlp-test-acc',
+            'uploader_url': 'https://www.youtube.com/@coletdjnz',
+            'uploader_id': '@coletdjnz',
+            'uploader': 'cole-dlp-test-acc',
+        },
+        'playlist_mincount': 1,
+        'params': {'extractor_args': {'youtube': {'lang': ['ja']}}},
+        'expected_warnings': ['Preferring "ja"'],
+    }, {
+        # XXX: this should really check flat playlist entries, but the test suite doesn't support that
+        # TODO: fix availability extraction
+        'note': 'preferred lang set with playlist with translated video titles',
+        'url': 'https://www.youtube.com/playlist?list=PLt5yu3-wZAlQAaPZ5Z-rJoTdbT-45Q7c0',
+        'info_dict': {
+            'id': 'PLt5yu3-wZAlQAaPZ5Z-rJoTdbT-45Q7c0',
+            'tags': [],
+            'view_count': int,
+            'channel_url': 'https://www.youtube.com/channel/UCiu-3thuViMebBjw_5nWYrA',
+            'channel': 'cole-dlp-test-acc',
+            'channel_id': 'UCiu-3thuViMebBjw_5nWYrA',
+            'description': 'test',
+            'title': 'dlp test playlist',
+            'availability': 'public',
+            'uploader_url': 'https://www.youtube.com/@coletdjnz',
+            'uploader_id': '@coletdjnz',
+            'uploader': 'cole-dlp-test-acc',
+        },
+        'playlist_mincount': 1,
+        'params': {'extractor_args': {'youtube': {'lang': ['ja']}}},
+        'expected_warnings': ['Preferring "ja"'],
+    }, {
+        # shorts audio pivot for 2GtVksBMYFM.
+        'url': 'https://www.youtube.com/feed/sfv_audio_pivot?bp=8gUrCikSJwoLMkd0VmtzQk1ZRk0SCzJHdFZrc0JNWUZNGgsyR3RWa3NCTVlGTQ==',
+        # TODO: fix extraction
+        'info_dict': {
+            'id': 'sfv_audio_pivot',
+            'title': 'sfv_audio_pivot',
+            'tags': [],
+        },
+        'playlist_mincount': 50,
+
+    }, {
+        # Channel with a real live tab (not to be mistaken with streams tab)
+        # Do not treat like it should redirect to live stream
+        'url': 'https://www.youtube.com/channel/UCEH7P7kyJIkS_gJf93VYbmg/live',
+        'info_dict': {
+            'id': 'UCEH7P7kyJIkS_gJf93VYbmg',
+            'title': 'UCEH7P7kyJIkS_gJf93VYbmg - Live',
+            'tags': [],
+        },
+        'playlist_mincount': 20,
+    }, {
+        # Tab name is not the same as tab id
+        'url': 'https://www.youtube.com/channel/UCQvWX73GQygcwXOTSf_VDVg/letsplay',
+        'info_dict': {
+            'id': 'UCQvWX73GQygcwXOTSf_VDVg',
+            'title': 'UCQvWX73GQygcwXOTSf_VDVg - Let\'s play',
+            'tags': [],
+        },
+        'playlist_mincount': 8,
+    }, {
+        # Home tab id is literally home. Not to get mistaken with featured
+        'url': 'https://www.youtube.com/channel/UCQvWX73GQygcwXOTSf_VDVg/home',
+        'info_dict': {
+            'id': 'UCQvWX73GQygcwXOTSf_VDVg',
+            'title': 'UCQvWX73GQygcwXOTSf_VDVg - Home',
+            'tags': [],
+        },
+        'playlist_mincount': 8,
+    }, {
+        # Should get three playlists for videos, shorts and streams tabs
+        # TODO: fix channel_is_verified extraction
+        'url': 'https://www.youtube.com/channel/UCK9V2B22uJYu3N7eR_BT9QA',
+        'info_dict': {
+            'id': 'UCK9V2B22uJYu3N7eR_BT9QA',
+            'title': 'Polka Ch. 尾丸ポルカ',
+            'channel_follower_count': int,
+            'channel_id': 'UCK9V2B22uJYu3N7eR_BT9QA',
+            'channel_url': 'https://www.youtube.com/channel/UCK9V2B22uJYu3N7eR_BT9QA',
+            'description': 'md5:01e53f350ab8ad6fcf7c4fedb3c1b99f',
+            'channel': 'Polka Ch. 尾丸ポルカ',
+            'tags': 'count:35',
+            'uploader_url': 'https://www.youtube.com/@OmaruPolka',
+            'uploader': 'Polka Ch. 尾丸ポルカ',
+            'uploader_id': '@OmaruPolka',
+            'channel_is_verified': True,
+        },
+        'playlist_count': 3,
+    }, {
+        # Shorts tab with channel with handle
+        # TODO: fix channel_is_verified extraction
+        'url': 'https://www.youtube.com/@NotJustBikes/shorts',
+        'info_dict': {
+            'id': 'UC0intLFzLaudFG-xAvUEO-A',
+            'title': 'Not Just Bikes - Shorts',
+            'tags': 'count:10',
+            'channel_url': 'https://www.youtube.com/channel/UC0intLFzLaudFG-xAvUEO-A',
+            'description': 'md5:1d9fc1bad7f13a487299d1fe1712e031',
+            'channel_follower_count': int,
+            'channel_id': 'UC0intLFzLaudFG-xAvUEO-A',
+            'channel': 'Not Just Bikes',
+            'uploader_url': 'https://www.youtube.com/@NotJustBikes',
+            'uploader': 'Not Just Bikes',
+            'uploader_id': '@NotJustBikes',
+            'channel_is_verified': True,
+        },
+        'playlist_mincount': 10,
+    }, {
+        # Streams tab
+        'url': 'https://www.youtube.com/channel/UC3eYAvjCVwNHgkaGbXX3sig/streams',
+        'info_dict': {
+            'id': 'UC3eYAvjCVwNHgkaGbXX3sig',
+            'title': '中村悠一 - Live',
+            'tags': 'count:7',
+            'channel_id': 'UC3eYAvjCVwNHgkaGbXX3sig',
+            'channel_url': 'https://www.youtube.com/channel/UC3eYAvjCVwNHgkaGbXX3sig',
+            'channel': '中村悠一',
+            'channel_follower_count': int,
+            'description': 'md5:e8fd705073a594f27d6d6d020da560dc',
+            'uploader_url': 'https://www.youtube.com/@Yuichi-Nakamura',
+            'uploader_id': '@Yuichi-Nakamura',
+            'uploader': '中村悠一',
+        },
+        'playlist_mincount': 60,
+    }, {
+        # Channel with no uploads and hence no videos, streams, shorts tabs or uploads playlist. This should fail.
+        # See test_youtube_lists
+        'url': 'https://www.youtube.com/channel/UC2yXPzFejc422buOIzn_0CA',
+        'only_matching': True,
+    }, {
+        # No uploads and no UCID given. Should fail with no uploads error
+        # See test_youtube_lists
+        'url': 'https://www.youtube.com/news',
+        'only_matching': True,
+    }, {
+        # No videos tab but has a shorts tab
+        # TODO: fix metadata extraction
+        'url': 'https://www.youtube.com/c/TKFShorts',
+        'info_dict': {
+            'id': 'UCgJ5_1F6yJhYLnyMszUdmUg',
+            'title': 'Shorts Break - Shorts',
+            'tags': 'count:48',
+            'channel_id': 'UCgJ5_1F6yJhYLnyMszUdmUg',
+            'channel': 'Shorts Break',
+            'description': 'md5:6de33c5e7ba686e5f3efd4e19c7ef499',
+            'channel_follower_count': int,
+            'channel_url': 'https://www.youtube.com/channel/UCgJ5_1F6yJhYLnyMszUdmUg',
+            'uploader_url': 'https://www.youtube.com/@ShortsBreak_Official',
+            'uploader': 'Shorts Break',
+            'uploader_id': '@ShortsBreak_Official',
+        },
+        'playlist_mincount': 30,
+    }, {
+        # Trending Now Tab. tab id is empty
+        'url': 'https://www.youtube.com/feed/trending',
+        'info_dict': {
+            'id': 'trending',
+            'title': 'trending - Now',
+            'tags': [],
+        },
+        'playlist_mincount': 30,
+    }, {
+        # Trending Gaming Tab. tab id is empty
+        'url': 'https://www.youtube.com/feed/trending?bp=4gIcGhpnYW1pbmdfY29ycHVzX21vc3RfcG9wdWxhcg%3D%3D',
+        'info_dict': {
+            'id': 'trending',
+            'title': 'trending - Gaming',
+            'tags': [],
+        },
+        'playlist_mincount': 30,
+    }, {
+        # Shorts url result in shorts tab
+        # TODO: Fix channel id extraction
+        # TODO: fix test suite, 208163447408c78673b08c172beafe5c310fb167 broke this test
+        'url': 'https://www.youtube.com/channel/UCiu-3thuViMebBjw_5nWYrA/shorts',
+        'info_dict': {
+            'id': 'UCiu-3thuViMebBjw_5nWYrA',
+            'title': 'cole-dlp-test-acc - Shorts',
+            'channel': 'cole-dlp-test-acc',
+            'description': 'test description',
+            'channel_id': 'UCiu-3thuViMebBjw_5nWYrA',
+            'channel_url': 'https://www.youtube.com/channel/UCiu-3thuViMebBjw_5nWYrA',
+            'tags': [],
+            'uploader_url': 'https://www.youtube.com/@coletdjnz',
+            'uploader_id': '@coletdjnz',
+            'uploader': 'cole-dlp-test-acc',
+        },
+        'playlist': [{
+            'info_dict': {
+                # Channel data is not currently available for short renderers (as of 2023-03-01)
+                '_type': 'url',
+                'ie_key': 'Youtube',
+                'url': 'https://www.youtube.com/shorts/sSM9J5YH_60',
+                'id': 'sSM9J5YH_60',
+                'title': 'SHORT short',
+                'view_count': int,
+                'thumbnails': list,
+            },
+        }],
+        'params': {'extract_flat': True},
+    }, {
+        # Live video status should be extracted
+        # TODO: fix test suite, 208163447408c78673b08c172beafe5c310fb167 broke this test
+        'url': 'https://www.youtube.com/channel/UCQvWX73GQygcwXOTSf_VDVg/live',
+        'info_dict': {
+            'id': 'UCQvWX73GQygcwXOTSf_VDVg',
+            'title': 'UCQvWX73GQygcwXOTSf_VDVg - Live',  # TODO: should be Minecraft - Live or Minecraft - Topic - Live
+            'tags': [],
+        },
+        'playlist': [{
+            'info_dict': {
+                '_type': 'url',
+                'ie_key': 'Youtube',
+                'url': 'startswith:https://www.youtube.com/watch?v=',
+                'id': str,
+                'title': str,
+                'live_status': 'is_live',
+                'channel_id': str,
+                'channel_url': str,
+                'concurrent_view_count': int,
+                'channel': str,
+                'uploader': str,
+                'uploader_url': str,
+                'uploader_id': str,
+                'channel_is_verified': bool,  # this will keep changing
+            },
+        }],
+        'params': {'extract_flat': True, 'playlist_items': '1'},
+        'playlist_mincount': 1,
+    }, {
+        # Channel renderer metadata. Contains number of videos on the channel
+        # TODO: channels tab removed, change this test to use another page with channel renderer
+        'url': 'https://www.youtube.com/channel/UCiu-3thuViMebBjw_5nWYrA/channels',
+        'info_dict': {
+            'id': 'UCiu-3thuViMebBjw_5nWYrA',
+            'title': 'cole-dlp-test-acc - Channels',
+            'channel': 'cole-dlp-test-acc',
+            'description': 'test description',
+            'channel_id': 'UCiu-3thuViMebBjw_5nWYrA',
+            'channel_url': 'https://www.youtube.com/channel/UCiu-3thuViMebBjw_5nWYrA',
+            'tags': [],
+            'uploader_url': 'https://www.youtube.com/@coletdjnz',
+            'uploader_id': '@coletdjnz',
+            'uploader': 'cole-dlp-test-acc',
+        },
+        'playlist': [{
+            'info_dict': {
+                '_type': 'url',
+                'ie_key': 'YoutubeTab',
+                'url': 'https://www.youtube.com/channel/UC-lHJZR3Gqxm24_Vd_AJ5Yw',
+                'id': 'UC-lHJZR3Gqxm24_Vd_AJ5Yw',
+                'channel_id': 'UC-lHJZR3Gqxm24_Vd_AJ5Yw',
+                'title': 'PewDiePie',
+                'channel': 'PewDiePie',
+                'channel_url': 'https://www.youtube.com/channel/UC-lHJZR3Gqxm24_Vd_AJ5Yw',
+                'thumbnails': list,
+                'channel_follower_count': int,
+                'playlist_count': int,
+                'uploader': 'PewDiePie',
+                'uploader_url': 'https://www.youtube.com/@PewDiePie',
+                'uploader_id': '@PewDiePie',
+                'channel_is_verified': True,
+            },
+        }],
+        'params': {'extract_flat': True},
+        'skip': 'channels tab removed',
+    }, {
+        # TODO: fix channel_is_verified extraction
+        'url': 'https://www.youtube.com/@3blue1brown/about',
+        'info_dict': {
+            'id': '@3blue1brown',
+            'tags': ['Mathematics'],
+            'title': '3Blue1Brown',
+            'channel_follower_count': int,
+            'channel_id': 'UCYO_jab_esuFRV4b17AJtAw',
+            'channel': '3Blue1Brown',
+            'channel_url': 'https://www.youtube.com/channel/UCYO_jab_esuFRV4b17AJtAw',
+            'description': 'md5:602e3789e6a0cb7d9d352186b720e395',
+            'uploader_url': 'https://www.youtube.com/@3blue1brown',
+            'uploader_id': '@3blue1brown',
+            'uploader': '3Blue1Brown',
+            'channel_is_verified': True,
+        },
+        'playlist_count': 0,
+    }, {
+        # Podcasts tab, with rich entry lockupViewModel
+        'url': 'https://www.youtube.com/@99percentinvisiblepodcast/podcasts',
+        'info_dict': {
+            'id': 'UCVMF2HD4ZgC0QHpU9Yq5Xrw',
+            'channel_id': 'UCVMF2HD4ZgC0QHpU9Yq5Xrw',
+            'uploader_url': 'https://www.youtube.com/@99percentinvisiblepodcast',
+            'description': 'md5:3a0ed38f1ad42a68ef0428c04a15695c',
+            'title': '99% Invisible - Podcasts',
+            'uploader': '99% Invisible',
+            'channel_follower_count': int,
+            'channel_url': 'https://www.youtube.com/channel/UCVMF2HD4ZgC0QHpU9Yq5Xrw',
+            'tags': [],
+            'channel': '99% Invisible',
+            'uploader_id': '@99percentinvisiblepodcast',
+        },
+        'playlist_count': 5,
+    }, {
+        # Releases tab, with rich entry playlistRenderers (same as Podcasts tab)
+        # TODO: fix channel_is_verified extraction
+        'url': 'https://www.youtube.com/@AHimitsu/releases',
+        'info_dict': {
+            'id': 'UCgFwu-j5-xNJml2FtTrrB3A',
+            'channel': 'A Himitsu',
+            'uploader_url': 'https://www.youtube.com/@AHimitsu',
+            'title': 'A Himitsu - Releases',
+            'uploader_id': '@AHimitsu',
+            'uploader': 'A Himitsu',
+            'channel_id': 'UCgFwu-j5-xNJml2FtTrrB3A',
+            'tags': 'count:12',
+            'description': 'I make music',
+            'channel_url': 'https://www.youtube.com/channel/UCgFwu-j5-xNJml2FtTrrB3A',
+            'channel_follower_count': int,
+            'channel_is_verified': True,
+        },
+        'playlist_mincount': 10,
+    }, {
+        # Playlist with only shorts, shown as reel renderers
+        # FIXME: future: YouTube currently doesn't give continuation for this,
+        # may do in future.
+        'url': 'https://www.youtube.com/playlist?list=UUxqPAgubo4coVn9Lx1FuKcg',
+        'info_dict': {
+            'id': 'UUxqPAgubo4coVn9Lx1FuKcg',
+            'channel_url': 'https://www.youtube.com/channel/UCxqPAgubo4coVn9Lx1FuKcg',
+            'view_count': int,
+            'uploader_id': '@BangyShorts',
+            'description': '',
+            'uploader_url': 'https://www.youtube.com/@BangyShorts',
+            'channel_id': 'UCxqPAgubo4coVn9Lx1FuKcg',
+            'channel': 'Bangy Shorts',
+            'uploader': 'Bangy Shorts',
+            'tags': [],
+            'availability': 'public',
+            'modified_date': r're:\d{8}',
+            'title': 'Uploads from Bangy Shorts',
+        },
+        'playlist_mincount': 100,
+        'expected_warnings': [r'[Uu]navailable videos (are|will be) hidden'],
+    }, {
+        # TODO: fix channel_is_verified extraction
+        'note': 'Tags containing spaces',
+        'url': 'https://www.youtube.com/channel/UC7_YxT-KID8kRbqZo7MyscQ',
+        'playlist_count': 3,
+        'info_dict': {
+            'id': 'UC7_YxT-KID8kRbqZo7MyscQ',
+            'channel': 'Markiplier',
+            'channel_id': 'UC7_YxT-KID8kRbqZo7MyscQ',
+            'title': 'Markiplier',
+            'channel_follower_count': int,
+            'description': 'md5:0c010910558658824402809750dc5d97',
+            'uploader_id': '@markiplier',
+            'uploader_url': 'https://www.youtube.com/@markiplier',
+            'uploader': 'Markiplier',
+            'channel_url': 'https://www.youtube.com/channel/UC7_YxT-KID8kRbqZo7MyscQ',
+            'channel_is_verified': True,
+            'tags': ['markiplier', 'comedy', 'gaming', 'funny videos', 'funny moments',
+                     'sketch comedy', 'laughing', 'lets play', 'challenge videos', 'hilarious',
+                     'challenges', 'sketches', 'scary games', 'funny games', 'rage games',
+                     'mark fischbach'],
+        },
+    }, {
+        # https://github.com/yt-dlp/yt-dlp/issues/12933
+        'note': 'streams tab, some scheduled streams. Empty intermediate response with only continuation - must follow',
+        'url': 'https://www.youtube.com/@sbcitygov/streams',
+        'playlist_mincount': 150,
+        'info_dict': {
+            'id': 'UCH6-qfQwlUgz9SAf05jvc_w',
+            'channel': 'sbcitygov',
+            'channel_id': 'UCH6-qfQwlUgz9SAf05jvc_w',
+            'title': 'sbcitygov - Live',
+            'channel_follower_count': int,
+            'description': 'md5:ca1a92059835c071e33b3db52f4a6d67',
+            'uploader_id': '@sbcitygov',
+            'uploader_url': 'https://www.youtube.com/@sbcitygov',
+            'uploader': 'sbcitygov',
+            'channel_url': 'https://www.youtube.com/channel/UCH6-qfQwlUgz9SAf05jvc_w',
+            'tags': [],
+        },
+    }]
+
+    @classmethod
+    def suitable(cls, url):
+        return False if YoutubeIE.suitable(url) else super().suitable(url)
+
+    _URL_RE = re.compile(rf'(?P<pre>{_VALID_URL})(?(not_channel)|(?P<tab>/[^?#/]+))?(?P<post>.*)$')
+
+    def _get_url_mobj(self, url):
+        mobj = self._URL_RE.match(url).groupdict()
+        mobj.update((k, '') for k, v in mobj.items() if v is None)
+        return mobj
+
+    def _extract_tab_id_and_name(self, tab, base_url='https://www.youtube.com'):
+        tab_name = (tab.get('title') or '').lower()
+        tab_url = urljoin(base_url, traverse_obj(
+            tab, ('endpoint', 'commandMetadata', 'webCommandMetadata', 'url')))
+
+        tab_id = ((tab_url and self._get_url_mobj(tab_url)['tab'][1:])
+                  or traverse_obj(tab, 'tabIdentifier', expected_type=str))
+        if tab_id:
+            return {
+                'TAB_ID_SPONSORSHIPS': 'membership',
+            }.get(tab_id, tab_id), tab_name
+
+        # Fallback to tab name if we cannot get the tab id.
+        # XXX: should we strip non-ascii letters? e.g. in case of 'let's play' tab example on special gaming channel
+        # Note that in the case of translated tab name this may result in an empty string, which we don't want.
+        if tab_name:
+            self.write_debug(f'Falling back to selected tab name: {tab_name}')
+        return {
+            'home': 'featured',
+            'live': 'streams',
+        }.get(tab_name, tab_name), tab_name
+
+    def _has_tab(self, tabs, tab_id):
+        return any(self._extract_tab_id_and_name(tab)[0] == tab_id for tab in tabs)
+
+    def _empty_playlist(self, item_id, data):
+        return self.playlist_result([], item_id, **self._extract_metadata_from_tabs(item_id, data))
+
+    @YoutubeTabBaseInfoExtractor.passthrough_smuggled_data
+    def _real_extract(self, url, smuggled_data):
+        item_id = self._match_id(url)
+        url = urllib.parse.urlunparse(
+            urllib.parse.urlparse(url)._replace(netloc='www.youtube.com'))
+        compat_opts = self.get_param('compat_opts', [])
+
+        mobj = self._get_url_mobj(url)
+        pre, tab, post, is_channel = mobj['pre'], mobj['tab'], mobj['post'], not mobj['not_channel']
+        if is_channel and smuggled_data.get('is_music_url'):
+            if item_id[:2] == 'VL':  # Youtube music VL channels have an equivalent playlist
+                return self.url_result(
+                    f'https://music.youtube.com/playlist?list={item_id[2:]}', YoutubeTabIE, item_id[2:])
+            elif item_id[:2] == 'MP':  # Resolve albums (/[channel/browse]/MP...) to their equivalent playlist
+                mdata = self._extract_tab_endpoint(
+                    f'https://music.youtube.com/channel/{item_id}', item_id, default_client='web_music')
+                murl = traverse_obj(mdata, ('microformat', 'microformatDataRenderer', 'urlCanonical'),
+                                    get_all=False, expected_type=str)
+                if not murl:
+                    raise ExtractorError('Failed to resolve album to playlist')
+                return self.url_result(murl, YoutubeTabIE)
+            elif mobj['channel_type'] == 'browse':  # Youtube music /browse/ should be changed to /channel/
+                return self.url_result(
+                    f'https://music.youtube.com/channel/{item_id}{tab}{post}', YoutubeTabIE, item_id)
+
+        original_tab_id, display_id = tab[1:], f'{item_id}{tab}'
+        if is_channel and not tab and 'no-youtube-channel-redirect' not in compat_opts:
+            url = f'{pre}/videos{post}'
+        if smuggled_data.get('is_music_url'):
+            self.report_warning(f'YouTube Music is not directly supported. Redirecting to {url}')
+
+        # Handle both video/playlist URLs
+        qs = parse_qs(url)
+        video_id, playlist_id = (traverse_obj(qs, (key, 0)) for key in ('v', 'list'))
+        if not video_id and mobj['not_channel'].startswith('watch'):
+            if not playlist_id:
+                # If there is neither video or playlist ids, youtube redirects to home page, which is undesirable
+                raise ExtractorError('A video URL was given without video ID', expected=True)
+            # Common mistake: https://www.youtube.com/watch?list=playlist_id
+            self.report_warning(f'A video URL was given without video ID. Trying to download playlist {playlist_id}')
+            return self.url_result(
+                f'https://www.youtube.com/playlist?list={playlist_id}', YoutubeTabIE, playlist_id)
+
+        if not self._yes_playlist(playlist_id, video_id):
+            return self.url_result(
+                f'https://www.youtube.com/watch?v={video_id}', YoutubeIE, video_id)
+
+        data, ytcfg = self._extract_data(url, display_id)
+
+        # YouTube may provide a non-standard redirect to the regional channel
+        # See: https://github.com/yt-dlp/yt-dlp/issues/2694
+        # https://support.google.com/youtube/answer/2976814#zippy=,conditional-redirects
+        redirect_url = traverse_obj(
+            data, ('onResponseReceivedActions', ..., 'navigateAction', 'endpoint', 'commandMetadata', 'webCommandMetadata', 'url'), get_all=False)
+        if redirect_url and 'no-youtube-channel-redirect' not in compat_opts:
+            redirect_url = ''.join((urljoin('https://www.youtube.com', redirect_url), tab, post))
+            self.to_screen(f'This playlist is likely not available in your region. Following conditional redirect to {redirect_url}')
+            return self.url_result(redirect_url, YoutubeTabIE)
+
+        tabs, extra_tabs = self._extract_tab_renderers(data), []
+        if is_channel and tabs and 'no-youtube-channel-redirect' not in compat_opts:
+            selected_tab = self._extract_selected_tab(tabs)
+            selected_tab_id, selected_tab_name = self._extract_tab_id_and_name(selected_tab, url)  # NB: Name may be translated
+            self.write_debug(f'Selected tab: {selected_tab_id!r} ({selected_tab_name}), Requested tab: {original_tab_id!r}')
+
+            # /about is no longer a tab
+            if original_tab_id == 'about':
+                return self._empty_playlist(item_id, data)
+
+            if not original_tab_id and selected_tab_name:
+                self.to_screen('Downloading all uploads of the channel. '
+                               'To download only the videos in a specific tab, pass the tab\'s URL')
+                if self._has_tab(tabs, 'streams'):
+                    extra_tabs.append(''.join((pre, '/streams', post)))
+                if self._has_tab(tabs, 'shorts'):
+                    extra_tabs.append(''.join((pre, '/shorts', post)))
+                # XXX: Members-only tab should also be extracted
+
+                if not extra_tabs and selected_tab_id != 'videos':
+                    # Channel does not have streams, shorts or videos tabs
+                    if item_id[:2] != 'UC':
+                        return self._empty_playlist(item_id, data)
+
+                    # Topic channels don't have /videos. Use the equivalent playlist instead
+                    pl_id = f'UU{item_id[2:]}'
+                    pl_url = f'https://www.youtube.com/playlist?list={pl_id}'
+                    try:
+                        data, ytcfg = self._extract_data(pl_url, pl_id, ytcfg=ytcfg, fatal=True, webpage_fatal=True)
+                    except ExtractorError:
+                        return self._empty_playlist(item_id, data)
+                    else:
+                        item_id, url = pl_id, pl_url
+                        self.to_screen(
+                            f'The channel does not have a videos, shorts, or live tab. Redirecting to playlist {pl_id} instead')
+
+                elif extra_tabs and selected_tab_id != 'videos':
+                    # When there are shorts/live tabs but not videos tab
+                    url, data = f'{pre}{post}', None
+
+            elif (original_tab_id or 'videos') != selected_tab_id:
+                if original_tab_id == 'live':
+                    # Live tab should have redirected to the video
+                    # Except in the case the channel has an actual live tab
+                    # Example: https://www.youtube.com/channel/UCEH7P7kyJIkS_gJf93VYbmg/live
+                    raise UserNotLive(video_id=item_id)
+                elif selected_tab_name:
+                    raise ExtractorError(f'This channel does not have a {original_tab_id} tab', expected=True)
+
+                # For channels such as https://www.youtube.com/channel/UCtFRv9O2AHqOZjjynzrv-xg
+                url = f'{pre}{post}'
+
+        # YouTube sometimes provides a button to reload playlist with unavailable videos.
+        if 'no-youtube-unavailable-videos' not in compat_opts:
+            data = self._reload_with_unavailable_videos(display_id, data, ytcfg) or data
+        self._extract_and_report_alerts(data, only_once=True)
+
+        tabs, entries = self._extract_tab_renderers(data), []
+        if tabs:
+            entries = [self._extract_from_tabs(item_id, ytcfg, data, tabs)]
+            entries[0].update({
+                'extractor_key': YoutubeTabIE.ie_key(),
+                'extractor': YoutubeTabIE.IE_NAME,
+                'webpage_url': url,
+            })
+        if self.get_param('playlist_items') == '0':
+            entries.extend(self.url_result(u, YoutubeTabIE) for u in extra_tabs)
+        else:  # Users expect to get all `video_id`s even with `--flat-playlist`. So don't return `url_result`
+            entries.extend(map(self._real_extract, extra_tabs))
+
+        if len(entries) == 1:
+            return entries[0]
+        elif entries:
+            metadata = self._extract_metadata_from_tabs(item_id, data)
+            uploads_url = 'the Uploads (UU) playlist URL'
+            if try_get(metadata, lambda x: x['channel_id'].startswith('UC')):
+                uploads_url = f'https://www.youtube.com/playlist?list=UU{metadata["channel_id"][2:]}'
+            self.to_screen(
+                'Downloading as multiple playlists, separated by tabs. '
+                f'To download as a single playlist instead, pass {uploads_url}')
+            return self.playlist_result(entries, item_id, **metadata)
+
+        # Inline playlist
+        playlist = traverse_obj(
+            data, ('contents', 'twoColumnWatchNextResults', 'playlist', 'playlist'), expected_type=dict)
+        if playlist:
+            return self._extract_from_playlist(item_id, url, data, playlist, ytcfg)
+
+        video_id = traverse_obj(
+            data, ('currentVideoEndpoint', 'watchEndpoint', 'videoId'), expected_type=str) or video_id
+        if video_id:
+            if tab != '/live':  # live tab is expected to redirect to video
+                self.report_warning(f'Unable to recognize playlist. Downloading just video {video_id}')
+            return self.url_result(f'https://www.youtube.com/watch?v={video_id}', YoutubeIE, video_id)
+
+        raise ExtractorError('Unable to recognize tab page')
+
+
+# xxx: This is tightly coupled to YoutubeTabBaseInfoExtractor. Should be decoupled at some point
+class YoutubePlaylistIE(YoutubeBaseInfoExtractor):
+    IE_DESC = 'YouTube playlists'
+    _VALID_URL = r'''(?x)(?:
+                        (?:https?://)?
+                        (?:\w+\.)?
+                        (?:
+                            (?:
+                                youtube(?:kids)?\.com|
+                                {invidious}
+                            )
+                            /.*?\?.*?\blist=
+                        )?
+                        (?P<id>{playlist_id})
+                     )'''.format(
+        playlist_id=YoutubeBaseInfoExtractor._PLAYLIST_ID_RE,
+        invidious='|'.join(YoutubeBaseInfoExtractor._INVIDIOUS_SITES),
+    )
+    IE_NAME = 'youtube:playlist'
+    _TESTS = [{
+        'note': 'issue #673',
+        'url': 'PLBB231211A4F62143',
+        'info_dict': {
+            'title': '[OLD]Team Fortress 2 (Class-based LP)',
+            'id': 'PLBB231211A4F62143',
+            'uploader': 'Wickman',
+            'uploader_id': '@WickmanVT',
+            'description': 'md5:8fa6f52abb47a9552002fa3ddfc57fc2',
+            'view_count': int,
+            'uploader_url': 'https://www.youtube.com/@WickmanVT',
+            'modified_date': r're:\d{8}',
+            'channel_id': 'UCKSpbfbl5kRQpTdL7kMc-1Q',
+            'channel': 'Wickman',
+            'tags': [],
+            'channel_url': 'https://www.youtube.com/channel/UCKSpbfbl5kRQpTdL7kMc-1Q',
+            'availability': 'public',
+        },
+        'playlist_mincount': 29,
+    }, {
+        'url': 'PLtPgu7CB4gbY9oDN3drwC3cMbJggS7dKl',
+        'info_dict': {
+            'title': 'YDL_safe_search',
+            'id': 'PLtPgu7CB4gbY9oDN3drwC3cMbJggS7dKl',
+        },
+        'playlist_count': 2,
+        'skip': 'This playlist is private',
+    }, {
+        'note': 'embedded',
+        'url': 'https://www.youtube.com/embed/videoseries?list=PL6IaIsEjSbf96XFRuNccS_RuEXwNdsoEu',
+        'playlist_count': 4,
+        'info_dict': {
+            'title': 'JODA15',
+            'id': 'PL6IaIsEjSbf96XFRuNccS_RuEXwNdsoEu',
+            'uploader': 'milan',
+            'uploader_id': '@milan5503',
+            'description': '',
+            'channel_url': 'https://www.youtube.com/channel/UCEI1-PVPcYXjB73Hfelbmaw',
+            'tags': [],
+            'modified_date': '20140919',
+            'view_count': int,
+            'channel': 'milan',
+            'channel_id': 'UCEI1-PVPcYXjB73Hfelbmaw',
+            'uploader_url': 'https://www.youtube.com/@milan5503',
+            'availability': 'public',
+        },
+        'expected_warnings': [r'[Uu]navailable videos? (is|are|will be) hidden', 'Retrying', 'Giving up'],
+    }, {
+        'url': 'http://www.youtube.com/embed/_xDOZElKyNU?list=PLsyOSbh5bs16vubvKePAQ1x3PhKavfBIl',
+        'playlist_mincount': 455,
+        'info_dict': {
+            'title': '2018 Chinese New Singles (11/6 updated)',
+            'id': 'PLsyOSbh5bs16vubvKePAQ1x3PhKavfBIl',
+            'uploader': 'LBK',
+            'uploader_id': '@music_king',
+            'description': 'md5:da521864744d60a198e3a88af4db0d9d',
+            'channel': 'LBK',
+            'view_count': int,
+            'channel_url': 'https://www.youtube.com/channel/UC21nz3_MesPLqtDqwdvnoxA',
+            'tags': [],
+            'uploader_url': 'https://www.youtube.com/@music_king',
+            'channel_id': 'UC21nz3_MesPLqtDqwdvnoxA',
+            'modified_date': r're:\d{8}',
+            'availability': 'public',
+        },
+        'expected_warnings': [r'[Uu]navailable videos (are|will be) hidden'],
+    }, {
+        'url': 'TLGGrESM50VT6acwMjAyMjAxNw',
+        'only_matching': True,
+    }, {
+        # music album playlist
+        'url': 'OLAK5uy_m4xAFdmMC5rX3Ji3g93pQe3hqLZw_9LhM',
+        'only_matching': True,
+    }]
+
+    @classmethod
+    def suitable(cls, url):
+        if YoutubeTabIE.suitable(url):
+            return False
+        from yt_dlp.utils import parse_qs
+        qs = parse_qs(url)
+        if qs.get('v', [None])[0]:
+            return False
+        return super().suitable(url)
+
+    def _real_extract(self, url):
+        playlist_id = self._match_id(url)
+        is_music_url = YoutubeBaseInfoExtractor.is_music_url(url)
+        url = update_url_query(
+            'https://www.youtube.com/playlist',
+            parse_qs(url) or {'list': playlist_id})
+        if is_music_url:
+            url = smuggle_url(url, {'is_music_url': True})
+        return self.url_result(url, ie=YoutubeTabIE.ie_key(), video_id=playlist_id)
diff --git a/plugins/youtube_download/yt_dlp/extractor/youtube/_video.py b/plugins/youtube_download/yt_dlp/extractor/youtube/_video.py
new file mode 100644
index 0000000..b3340e8
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/youtube/_video.py
@@ -0,0 +1,4106 @@
+import base64
+import binascii
+import collections
+import datetime as dt
+import functools
+import itertools
+import json
+import math
+import os.path
+import random
+import re
+import sys
+import threading
+import time
+import traceback
+import urllib.parse
+
+from ._base import (
+    INNERTUBE_CLIENTS,
+    BadgeType,
+    YoutubeBaseInfoExtractor,
+    _PoTokenContext,
+    _split_innertube_client,
+    short_client_name,
+)
+from ..openload import PhantomJSwrapper
+from ...jsinterp import JSInterpreter
+from ...networking.exceptions import HTTPError
+from ...utils import (
+    NO_DEFAULT,
+    ExtractorError,
+    LazyList,
+    bug_reports_message,
+    clean_html,
+    datetime_from_str,
+    filesize_from_tbr,
+    filter_dict,
+    float_or_none,
+    format_field,
+    get_first,
+    int_or_none,
+    join_nonempty,
+    js_to_json,
+    mimetype2ext,
+    orderedSet,
+    parse_codecs,
+    parse_count,
+    parse_duration,
+    parse_iso8601,
+    parse_qs,
+    qualities,
+    remove_end,
+    remove_start,
+    smuggle_url,
+    str_or_none,
+    str_to_int,
+    strftime_or_none,
+    traverse_obj,
+    try_call,
+    try_get,
+    unescapeHTML,
+    unified_strdate,
+    unsmuggle_url,
+    update_url_query,
+    url_or_none,
+    urljoin,
+    variadic,
+)
+
+STREAMING_DATA_CLIENT_NAME = '__yt_dlp_client'
+STREAMING_DATA_INITIAL_PO_TOKEN = '__yt_dlp_po_token'
+PO_TOKEN_GUIDE_URL = 'https://github.com/yt-dlp/yt-dlp/wiki/PO-Token-Guide'
+
+
+class YoutubeIE(YoutubeBaseInfoExtractor):
+    IE_DESC = 'YouTube'
+    _VALID_URL = r'''(?x)^
+                     (
+                         (?:https?://|//)                                    # http(s):// or protocol-independent URL
+                         (?:(?:(?:(?:\w+\.)?[yY][oO][uU][tT][uU][bB][eE](?:-nocookie|kids)?\.com|
+                            (?:www\.)?deturl\.com/www\.youtube\.com|
+                            (?:www\.)?pwnyoutube\.com|
+                            (?:www\.)?hooktube\.com|
+                            (?:www\.)?yourepeat\.com|
+                            tube\.majestyc\.net|
+                            {invidious}|
+                            youtube\.googleapis\.com)/                        # the various hostnames, with wildcard subdomains
+                         (?:.*?\#/)?                                          # handle anchor (#/) redirect urls
+                         (?:                                                  # the various things that can precede the ID:
+                             (?:(?:v|embed|e|shorts|live)/(?!videoseries|live_stream))  # v/ or embed/ or e/ or shorts/
+                             |(?:                                             # or the v= param in all its forms
+                                 (?:(?:watch|movie)(?:_popup)?(?:\.php)?/?)?  # preceding watch(_popup|.php) or nothing (like /?v=xxxx)
+                                 (?:\?|\#!?)                                  # the params delimiter ? or # or #!
+                                 (?:.*?[&;])??                                # any other preceding param (like /?s=tuff&v=xxxx or ?s=tuff&amp;v=V36LpHqtcDY)
+                                 v=
+                             )
+                         ))
+                         |(?:
+                            youtu\.be|                                        # just youtu.be/xxxx
+                            vid\.plus|                                        # or vid.plus/xxxx
+                            zwearz\.com/watch|                                # or zwearz.com/watch/xxxx
+                            {invidious}
+                         )/
+                         |(?:www\.)?cleanvideosearch\.com/media/action/yt/watch\?videoId=
+                         )
+                     )?                                                       # all until now is optional -> you can pass the naked ID
+                     (?P<id>[0-9A-Za-z_-]{{11}})                              # here is it! the YouTube video ID
+                     (?(1).+)?                                                # if we found the ID, everything can follow
+                     (?:\#|$)'''.format(
+        invidious='|'.join(YoutubeBaseInfoExtractor._INVIDIOUS_SITES),
+    )
+    _EMBED_REGEX = [
+        r'''(?x)
+            (?:
+                <(?:[0-9A-Za-z-]+?)?iframe[^>]+?src=|
+                data-video-url=|
+                <embed[^>]+?src=|
+                embedSWF\(?:\s*|
+                <object[^>]+data=|
+                new\s+SWFObject\(
+            )
+            (["\'])
+                (?P<url>(?:https?:)?//(?:www\.)?youtube(?:-nocookie)?\.com/
+                (?:embed|v|p)/[0-9A-Za-z_-]{11}.*?)
+            \1''',
+        # https://wordpress.org/plugins/lazy-load-for-videos/
+        r'''(?xs)
+            <a\s[^>]*\bhref="(?P<url>https://www\.youtube\.com/watch\?v=[0-9A-Za-z_-]{11})"
+            \s[^>]*\bclass="[^"]*\blazy-load-youtube''',
+    ]
+    _RETURN_TYPE = 'video'  # XXX: How to handle multifeed?
+
+    _PLAYER_INFO_RE = (
+        r'/s/player/(?P<id>[a-zA-Z0-9_-]{8,})/(?:tv-)?player',
+        r'/(?P<id>[a-zA-Z0-9_-]{8,})/player(?:_ias\.vflset(?:/[a-zA-Z]{2,3}_[a-zA-Z]{2,3})?|-plasma-ias-(?:phone|tablet)-[a-z]{2}_[A-Z]{2}\.vflset)/base\.js$',
+        r'\b(?P<id>vfl[a-zA-Z0-9_-]+)\b.*?\.js$',
+    )
+    _formats = {  # NB: Used in YoutubeWebArchiveIE and GoogleDriveIE
+        '5': {'ext': 'flv', 'width': 400, 'height': 240, 'acodec': 'mp3', 'abr': 64, 'vcodec': 'h263'},
+        '6': {'ext': 'flv', 'width': 450, 'height': 270, 'acodec': 'mp3', 'abr': 64, 'vcodec': 'h263'},
+        '13': {'ext': '3gp', 'acodec': 'aac', 'vcodec': 'mp4v'},
+        '17': {'ext': '3gp', 'width': 176, 'height': 144, 'acodec': 'aac', 'abr': 24, 'vcodec': 'mp4v'},
+        '18': {'ext': 'mp4', 'width': 640, 'height': 360, 'acodec': 'aac', 'abr': 96, 'vcodec': 'h264'},
+        '22': {'ext': 'mp4', 'width': 1280, 'height': 720, 'acodec': 'aac', 'abr': 192, 'vcodec': 'h264'},
+        '34': {'ext': 'flv', 'width': 640, 'height': 360, 'acodec': 'aac', 'abr': 128, 'vcodec': 'h264'},
+        '35': {'ext': 'flv', 'width': 854, 'height': 480, 'acodec': 'aac', 'abr': 128, 'vcodec': 'h264'},
+        # itag 36 videos are either 320x180 (BaW_jenozKc) or 320x240 (__2ABJjxzNo), abr varies as well
+        '36': {'ext': '3gp', 'width': 320, 'acodec': 'aac', 'vcodec': 'mp4v'},
+        '37': {'ext': 'mp4', 'width': 1920, 'height': 1080, 'acodec': 'aac', 'abr': 192, 'vcodec': 'h264'},
+        '38': {'ext': 'mp4', 'width': 4096, 'height': 3072, 'acodec': 'aac', 'abr': 192, 'vcodec': 'h264'},
+        '43': {'ext': 'webm', 'width': 640, 'height': 360, 'acodec': 'vorbis', 'abr': 128, 'vcodec': 'vp8'},
+        '44': {'ext': 'webm', 'width': 854, 'height': 480, 'acodec': 'vorbis', 'abr': 128, 'vcodec': 'vp8'},
+        '45': {'ext': 'webm', 'width': 1280, 'height': 720, 'acodec': 'vorbis', 'abr': 192, 'vcodec': 'vp8'},
+        '46': {'ext': 'webm', 'width': 1920, 'height': 1080, 'acodec': 'vorbis', 'abr': 192, 'vcodec': 'vp8'},
+        '59': {'ext': 'mp4', 'width': 854, 'height': 480, 'acodec': 'aac', 'abr': 128, 'vcodec': 'h264'},
+        '78': {'ext': 'mp4', 'width': 854, 'height': 480, 'acodec': 'aac', 'abr': 128, 'vcodec': 'h264'},
+
+
+        # 3D videos
+        '82': {'ext': 'mp4', 'height': 360, 'format_note': '3D', 'acodec': 'aac', 'abr': 128, 'vcodec': 'h264', 'preference': -20},
+        '83': {'ext': 'mp4', 'height': 480, 'format_note': '3D', 'acodec': 'aac', 'abr': 128, 'vcodec': 'h264', 'preference': -20},
+        '84': {'ext': 'mp4', 'height': 720, 'format_note': '3D', 'acodec': 'aac', 'abr': 192, 'vcodec': 'h264', 'preference': -20},
+        '85': {'ext': 'mp4', 'height': 1080, 'format_note': '3D', 'acodec': 'aac', 'abr': 192, 'vcodec': 'h264', 'preference': -20},
+        '100': {'ext': 'webm', 'height': 360, 'format_note': '3D', 'acodec': 'vorbis', 'abr': 128, 'vcodec': 'vp8', 'preference': -20},
+        '101': {'ext': 'webm', 'height': 480, 'format_note': '3D', 'acodec': 'vorbis', 'abr': 192, 'vcodec': 'vp8', 'preference': -20},
+        '102': {'ext': 'webm', 'height': 720, 'format_note': '3D', 'acodec': 'vorbis', 'abr': 192, 'vcodec': 'vp8', 'preference': -20},
+
+        # Apple HTTP Live Streaming
+        '91': {'ext': 'mp4', 'height': 144, 'format_note': 'HLS', 'acodec': 'aac', 'abr': 48, 'vcodec': 'h264', 'preference': -10},
+        '92': {'ext': 'mp4', 'height': 240, 'format_note': 'HLS', 'acodec': 'aac', 'abr': 48, 'vcodec': 'h264', 'preference': -10},
+        '93': {'ext': 'mp4', 'height': 360, 'format_note': 'HLS', 'acodec': 'aac', 'abr': 128, 'vcodec': 'h264', 'preference': -10},
+        '94': {'ext': 'mp4', 'height': 480, 'format_note': 'HLS', 'acodec': 'aac', 'abr': 128, 'vcodec': 'h264', 'preference': -10},
+        '95': {'ext': 'mp4', 'height': 720, 'format_note': 'HLS', 'acodec': 'aac', 'abr': 256, 'vcodec': 'h264', 'preference': -10},
+        '96': {'ext': 'mp4', 'height': 1080, 'format_note': 'HLS', 'acodec': 'aac', 'abr': 256, 'vcodec': 'h264', 'preference': -10},
+        '132': {'ext': 'mp4', 'height': 240, 'format_note': 'HLS', 'acodec': 'aac', 'abr': 48, 'vcodec': 'h264', 'preference': -10},
+        '151': {'ext': 'mp4', 'height': 72, 'format_note': 'HLS', 'acodec': 'aac', 'abr': 24, 'vcodec': 'h264', 'preference': -10},
+
+        # DASH mp4 video
+        '133': {'ext': 'mp4', 'height': 240, 'format_note': 'DASH video', 'vcodec': 'h264'},
+        '134': {'ext': 'mp4', 'height': 360, 'format_note': 'DASH video', 'vcodec': 'h264'},
+        '135': {'ext': 'mp4', 'height': 480, 'format_note': 'DASH video', 'vcodec': 'h264'},
+        '136': {'ext': 'mp4', 'height': 720, 'format_note': 'DASH video', 'vcodec': 'h264'},
+        '137': {'ext': 'mp4', 'height': 1080, 'format_note': 'DASH video', 'vcodec': 'h264'},
+        '138': {'ext': 'mp4', 'format_note': 'DASH video', 'vcodec': 'h264'},  # Height can vary (https://github.com/ytdl-org/youtube-dl/issues/4559)
+        '160': {'ext': 'mp4', 'height': 144, 'format_note': 'DASH video', 'vcodec': 'h264'},
+        '212': {'ext': 'mp4', 'height': 480, 'format_note': 'DASH video', 'vcodec': 'h264'},
+        '264': {'ext': 'mp4', 'height': 1440, 'format_note': 'DASH video', 'vcodec': 'h264'},
+        '298': {'ext': 'mp4', 'height': 720, 'format_note': 'DASH video', 'vcodec': 'h264', 'fps': 60},
+        '299': {'ext': 'mp4', 'height': 1080, 'format_note': 'DASH video', 'vcodec': 'h264', 'fps': 60},
+        '266': {'ext': 'mp4', 'height': 2160, 'format_note': 'DASH video', 'vcodec': 'h264'},
+
+        # Dash mp4 audio
+        '139': {'ext': 'm4a', 'format_note': 'DASH audio', 'acodec': 'aac', 'abr': 48, 'container': 'm4a_dash'},
+        '140': {'ext': 'm4a', 'format_note': 'DASH audio', 'acodec': 'aac', 'abr': 128, 'container': 'm4a_dash'},
+        '141': {'ext': 'm4a', 'format_note': 'DASH audio', 'acodec': 'aac', 'abr': 256, 'container': 'm4a_dash'},
+        '256': {'ext': 'm4a', 'format_note': 'DASH audio', 'acodec': 'aac', 'container': 'm4a_dash'},
+        '258': {'ext': 'm4a', 'format_note': 'DASH audio', 'acodec': 'aac', 'container': 'm4a_dash'},
+        '325': {'ext': 'm4a', 'format_note': 'DASH audio', 'acodec': 'dtse', 'container': 'm4a_dash'},
+        '328': {'ext': 'm4a', 'format_note': 'DASH audio', 'acodec': 'ec-3', 'container': 'm4a_dash'},
+
+        # Dash webm
+        '167': {'ext': 'webm', 'height': 360, 'width': 640, 'format_note': 'DASH video', 'container': 'webm', 'vcodec': 'vp8'},
+        '168': {'ext': 'webm', 'height': 480, 'width': 854, 'format_note': 'DASH video', 'container': 'webm', 'vcodec': 'vp8'},
+        '169': {'ext': 'webm', 'height': 720, 'width': 1280, 'format_note': 'DASH video', 'container': 'webm', 'vcodec': 'vp8'},
+        '170': {'ext': 'webm', 'height': 1080, 'width': 1920, 'format_note': 'DASH video', 'container': 'webm', 'vcodec': 'vp8'},
+        '218': {'ext': 'webm', 'height': 480, 'width': 854, 'format_note': 'DASH video', 'container': 'webm', 'vcodec': 'vp8'},
+        '219': {'ext': 'webm', 'height': 480, 'width': 854, 'format_note': 'DASH video', 'container': 'webm', 'vcodec': 'vp8'},
+        '278': {'ext': 'webm', 'height': 144, 'format_note': 'DASH video', 'container': 'webm', 'vcodec': 'vp9'},
+        '242': {'ext': 'webm', 'height': 240, 'format_note': 'DASH video', 'vcodec': 'vp9'},
+        '243': {'ext': 'webm', 'height': 360, 'format_note': 'DASH video', 'vcodec': 'vp9'},
+        '244': {'ext': 'webm', 'height': 480, 'format_note': 'DASH video', 'vcodec': 'vp9'},
+        '245': {'ext': 'webm', 'height': 480, 'format_note': 'DASH video', 'vcodec': 'vp9'},
+        '246': {'ext': 'webm', 'height': 480, 'format_note': 'DASH video', 'vcodec': 'vp9'},
+        '247': {'ext': 'webm', 'height': 720, 'format_note': 'DASH video', 'vcodec': 'vp9'},
+        '248': {'ext': 'webm', 'height': 1080, 'format_note': 'DASH video', 'vcodec': 'vp9'},
+        '271': {'ext': 'webm', 'height': 1440, 'format_note': 'DASH video', 'vcodec': 'vp9'},
+        # itag 272 videos are either 3840x2160 (e.g. RtoitU2A-3E) or 7680x4320 (sLprVF6d7Ug)
+        '272': {'ext': 'webm', 'height': 2160, 'format_note': 'DASH video', 'vcodec': 'vp9'},
+        '302': {'ext': 'webm', 'height': 720, 'format_note': 'DASH video', 'vcodec': 'vp9', 'fps': 60},
+        '303': {'ext': 'webm', 'height': 1080, 'format_note': 'DASH video', 'vcodec': 'vp9', 'fps': 60},
+        '308': {'ext': 'webm', 'height': 1440, 'format_note': 'DASH video', 'vcodec': 'vp9', 'fps': 60},
+        '313': {'ext': 'webm', 'height': 2160, 'format_note': 'DASH video', 'vcodec': 'vp9'},
+        '315': {'ext': 'webm', 'height': 2160, 'format_note': 'DASH video', 'vcodec': 'vp9', 'fps': 60},
+
+        # Dash webm audio
+        '171': {'ext': 'webm', 'acodec': 'vorbis', 'format_note': 'DASH audio', 'abr': 128},
+        '172': {'ext': 'webm', 'acodec': 'vorbis', 'format_note': 'DASH audio', 'abr': 256},
+
+        # Dash webm audio with opus inside
+        '249': {'ext': 'webm', 'format_note': 'DASH audio', 'acodec': 'opus', 'abr': 50},
+        '250': {'ext': 'webm', 'format_note': 'DASH audio', 'acodec': 'opus', 'abr': 70},
+        '251': {'ext': 'webm', 'format_note': 'DASH audio', 'acodec': 'opus', 'abr': 160},
+
+        # RTMP (unnamed)
+        '_rtmp': {'protocol': 'rtmp'},
+
+        # av01 video only formats sometimes served with "unknown" codecs
+        '394': {'ext': 'mp4', 'height': 144, 'format_note': 'DASH video', 'vcodec': 'av01.0.00M.08'},
+        '395': {'ext': 'mp4', 'height': 240, 'format_note': 'DASH video', 'vcodec': 'av01.0.00M.08'},
+        '396': {'ext': 'mp4', 'height': 360, 'format_note': 'DASH video', 'vcodec': 'av01.0.01M.08'},
+        '397': {'ext': 'mp4', 'height': 480, 'format_note': 'DASH video', 'vcodec': 'av01.0.04M.08'},
+        '398': {'ext': 'mp4', 'height': 720, 'format_note': 'DASH video', 'vcodec': 'av01.0.05M.08'},
+        '399': {'ext': 'mp4', 'height': 1080, 'format_note': 'DASH video', 'vcodec': 'av01.0.08M.08'},
+        '400': {'ext': 'mp4', 'height': 1440, 'format_note': 'DASH video', 'vcodec': 'av01.0.12M.08'},
+        '401': {'ext': 'mp4', 'height': 2160, 'format_note': 'DASH video', 'vcodec': 'av01.0.12M.08'},
+    }
+    _SUBTITLE_FORMATS = ('json3', 'srv1', 'srv2', 'srv3', 'ttml', 'vtt')
+    _DEFAULT_CLIENTS = ('tv', 'ios', 'web')
+    _DEFAULT_AUTHED_CLIENTS = ('tv', 'web')
+
+    _GEO_BYPASS = False
+
+    IE_NAME = 'youtube'
+    _TESTS = [
+        {
+            'url': 'https://www.youtube.com/watch?v=BaW_jenozKc&t=1s&end=9',
+            'info_dict': {
+                'id': 'BaW_jenozKc',
+                'ext': 'mp4',
+                'title': 'youtube-dl test video "\'/\\ä↭𝕐',
+                'channel': 'Philipp Hagemeister',
+                'channel_id': 'UCLqxVugv74EIW3VWh2NOa3Q',
+                'channel_url': r're:https?://(?:www\.)?youtube\.com/channel/UCLqxVugv74EIW3VWh2NOa3Q',
+                'upload_date': '20121002',
+                'description': 'md5:8fb536f4877b8a7455c2ec23794dbc22',
+                'categories': ['Science & Technology'],
+                'tags': ['youtube-dl'],
+                'duration': 10,
+                'view_count': int,
+                'like_count': int,
+                'availability': 'public',
+                'playable_in_embed': True,
+                'thumbnail': 'https://i.ytimg.com/vi/BaW_jenozKc/maxresdefault.jpg',
+                'live_status': 'not_live',
+                'age_limit': 0,
+                'start_time': 1,
+                'end_time': 9,
+                'comment_count': int,
+                'channel_follower_count': int,
+                'uploader': 'Philipp Hagemeister',
+                'uploader_url': 'https://www.youtube.com/@PhilippHagemeister',
+                'uploader_id': '@PhilippHagemeister',
+                'heatmap': 'count:100',
+                'timestamp': 1349198244,
+            },
+        },
+        {
+            'url': '//www.YouTube.com/watch?v=yZIXLfi8CZQ',
+            'note': 'Embed-only video (#1746)',
+            'info_dict': {
+                'id': 'yZIXLfi8CZQ',
+                'ext': 'mp4',
+                'upload_date': '20120608',
+                'title': 'Principal Sexually Assaults A Teacher - Episode 117 - 8th June 2012',
+                'description': 'md5:09b78bd971f1e3e289601dfba15ca4f7',
+                'age_limit': 18,
+            },
+            'skip': 'Private video',
+        },
+        {
+            'url': 'https://www.youtube.com/watch?v=BaW_jenozKc&v=yZIXLfi8CZQ',
+            'note': 'Use the first video ID in the URL',
+            'info_dict': {
+                'id': 'BaW_jenozKc',
+                'ext': 'mp4',
+                'title': 'youtube-dl test video "\'/\\ä↭𝕐',
+                'channel': 'Philipp Hagemeister',
+                'channel_id': 'UCLqxVugv74EIW3VWh2NOa3Q',
+                'channel_url': r're:https?://(?:www\.)?youtube\.com/channel/UCLqxVugv74EIW3VWh2NOa3Q',
+                'upload_date': '20121002',
+                'description': 'md5:8fb536f4877b8a7455c2ec23794dbc22',
+                'categories': ['Science & Technology'],
+                'tags': ['youtube-dl'],
+                'duration': 10,
+                'view_count': int,
+                'like_count': int,
+                'availability': 'public',
+                'playable_in_embed': True,
+                'thumbnail': 'https://i.ytimg.com/vi/BaW_jenozKc/maxresdefault.jpg',
+                'live_status': 'not_live',
+                'age_limit': 0,
+                'comment_count': int,
+                'channel_follower_count': int,
+                'uploader': 'Philipp Hagemeister',
+                'uploader_url': 'https://www.youtube.com/@PhilippHagemeister',
+                'uploader_id': '@PhilippHagemeister',
+                'heatmap': 'count:100',
+                'timestamp': 1349198244,
+            },
+            'params': {
+                'skip_download': True,
+            },
+        },
+        {
+            'url': 'https://www.youtube.com/watch?v=a9LDPn-MO4I',
+            'note': '256k DASH audio (format 141) via DASH manifest',
+            'info_dict': {
+                'id': 'a9LDPn-MO4I',
+                'ext': 'm4a',
+                'upload_date': '20121002',
+                'description': '',
+                'title': 'UHDTV TEST 8K VIDEO.mp4',
+            },
+            'params': {
+                'youtube_include_dash_manifest': True,
+                'format': '141',
+            },
+            'skip': 'format 141 not served anymore',
+        },
+        # DASH manifest with encrypted signature
+        {
+            'url': 'https://www.youtube.com/watch?v=IB3lcPjvWLA',
+            'info_dict': {
+                'id': 'IB3lcPjvWLA',
+                'ext': 'm4a',
+                'title': 'Afrojack, Spree Wilson - The Spark (Official Music Video) ft. Spree Wilson',
+                'description': 'md5:8f5e2b82460520b619ccac1f509d43bf',
+                'duration': 244,
+                'upload_date': '20131011',
+                'abr': 129.495,
+                'like_count': int,
+                'channel_id': 'UChuZAo1RKL85gev3Eal9_zg',
+                'playable_in_embed': True,
+                'channel_url': 'https://www.youtube.com/channel/UChuZAo1RKL85gev3Eal9_zg',
+                'view_count': int,
+                'track': 'The Spark',
+                'live_status': 'not_live',
+                'thumbnail': 'https://i.ytimg.com/vi_webp/IB3lcPjvWLA/maxresdefault.webp',
+                'channel': 'Afrojack',
+                'tags': 'count:19',
+                'availability': 'public',
+                'categories': ['Music'],
+                'age_limit': 0,
+                'alt_title': 'The Spark',
+                'channel_follower_count': int,
+                'uploader': 'Afrojack',
+                'uploader_url': 'https://www.youtube.com/@Afrojack',
+                'uploader_id': '@Afrojack',
+            },
+            'params': {
+                'youtube_include_dash_manifest': True,
+                'format': '141/bestaudio[ext=m4a]',
+            },
+        },
+        # Age-gate videos. See https://github.com/yt-dlp/yt-dlp/pull/575#issuecomment-888837000
+        {
+            'note': 'Embed allowed age-gate video; works with web_embedded',
+            'url': 'https://youtube.com/watch?v=HtVdAasjOgU',
+            'info_dict': {
+                'id': 'HtVdAasjOgU',
+                'ext': 'mp4',
+                'title': 'The Witcher 3: Wild Hunt - The Sword Of Destiny Trailer',
+                'description': r're:(?s).{100,}About the Game\n.*?The Witcher 3: Wild Hunt.{100,}',
+                'duration': 142,
+                'upload_date': '20140605',
+                'age_limit': 18,
+                'categories': ['Gaming'],
+                'thumbnail': 'https://i.ytimg.com/vi_webp/HtVdAasjOgU/maxresdefault.webp',
+                'availability': 'needs_auth',
+                'channel_url': 'https://www.youtube.com/channel/UCzybXLxv08IApdjdN0mJhEg',
+                'like_count': int,
+                'channel': 'The Witcher',
+                'live_status': 'not_live',
+                'tags': 'count:17',
+                'channel_id': 'UCzybXLxv08IApdjdN0mJhEg',
+                'playable_in_embed': True,
+                'view_count': int,
+                'channel_follower_count': int,
+                'uploader': 'The Witcher',
+                'uploader_url': 'https://www.youtube.com/@thewitcher',
+                'uploader_id': '@thewitcher',
+                'comment_count': int,
+                'channel_is_verified': True,
+                'heatmap': 'count:100',
+                'timestamp': 1401991663,
+            },
+        },
+        {
+            'note': 'Age-gate video with embed allowed in public site',
+            'url': 'https://youtube.com/watch?v=HsUATh_Nc2U',
+            'info_dict': {
+                'id': 'HsUATh_Nc2U',
+                'ext': 'mp4',
+                'title': 'Godzilla 2 (Official Video)',
+                'description': 'md5:bf77e03fcae5529475e500129b05668a',
+                'upload_date': '20200408',
+                'age_limit': 18,
+                'availability': 'needs_auth',
+                'channel_id': 'UCYQT13AtrJC0gsM1far_zJg',
+                'channel': 'FlyingKitty',
+                'channel_url': 'https://www.youtube.com/channel/UCYQT13AtrJC0gsM1far_zJg',
+                'view_count': int,
+                'categories': ['Entertainment'],
+                'live_status': 'not_live',
+                'tags': ['Flyingkitty', 'godzilla 2'],
+                'thumbnail': 'https://i.ytimg.com/vi/HsUATh_Nc2U/maxresdefault.jpg',
+                'like_count': int,
+                'duration': 177,
+                'playable_in_embed': True,
+                'channel_follower_count': int,
+                'uploader': 'FlyingKitty',
+                'uploader_url': 'https://www.youtube.com/@FlyingKitty900',
+                'uploader_id': '@FlyingKitty900',
+                'comment_count': int,
+                'channel_is_verified': True,
+            },
+            'skip': 'Age-restricted; requires authentication',
+        },
+        {
+            'note': 'Age-gate video embedable only with clientScreen=EMBED',
+            'url': 'https://youtube.com/watch?v=Tq92D6wQ1mg',
+            'info_dict': {
+                'id': 'Tq92D6wQ1mg',
+                'title': '[MMD] Adios - EVERGLOW [+Motion DL]',
+                'ext': 'mp4',
+                'upload_date': '20191228',
+                'description': 'md5:17eccca93a786d51bc67646756894066',
+                'age_limit': 18,
+                'like_count': int,
+                'availability': 'needs_auth',
+                'channel_id': 'UC1yoRdFoFJaCY-AGfD9W0wQ',
+                'view_count': int,
+                'thumbnail': 'https://i.ytimg.com/vi_webp/Tq92D6wQ1mg/sddefault.webp',
+                'channel': 'Projekt Melody',
+                'live_status': 'not_live',
+                'tags': ['mmd', 'dance', 'mikumikudance', 'kpop', 'vtuber'],
+                'playable_in_embed': True,
+                'categories': ['Entertainment'],
+                'duration': 106,
+                'channel_url': 'https://www.youtube.com/channel/UC1yoRdFoFJaCY-AGfD9W0wQ',
+                'comment_count': int,
+                'channel_follower_count': int,
+                'uploader': 'Projekt Melody',
+                'uploader_url': 'https://www.youtube.com/@ProjektMelody',
+                'uploader_id': '@ProjektMelody',
+                'timestamp': 1577508724,
+            },
+            'skip': 'Age-restricted; requires authentication',
+        },
+        {
+            'note': 'Non-Agegated non-embeddable video',
+            'url': 'https://youtube.com/watch?v=MeJVWBSsPAY',
+            'info_dict': {
+                'id': 'MeJVWBSsPAY',
+                'ext': 'mp4',
+                'title': 'OOMPH! - Such Mich Find Mich (Lyrics)',
+                'description': 'Fan Video. Music & Lyrics by OOMPH!.',
+                'upload_date': '20130730',
+                'track': 'Such mich find mich',
+                'age_limit': 0,
+                'tags': ['oomph', 'such mich find mich', 'lyrics', 'german industrial', 'musica industrial'],
+                'like_count': int,
+                'playable_in_embed': False,
+                'creator': 'OOMPH!',
+                'thumbnail': 'https://i.ytimg.com/vi/MeJVWBSsPAY/sddefault.jpg',
+                'view_count': int,
+                'alt_title': 'Such mich find mich',
+                'duration': 210,
+                'channel': 'Herr Lurik',
+                'channel_id': 'UCdR3RSDPqub28LjZx0v9-aA',
+                'categories': ['Music'],
+                'availability': 'public',
+                'channel_url': 'https://www.youtube.com/channel/UCdR3RSDPqub28LjZx0v9-aA',
+                'live_status': 'not_live',
+                'artist': 'OOMPH!',
+                'channel_follower_count': int,
+                'uploader': 'Herr Lurik',
+                'uploader_url': 'https://www.youtube.com/@HerrLurik',
+                'uploader_id': '@HerrLurik',
+            },
+        },
+        {
+            'note': 'Non-bypassable age-gated video',
+            'url': 'https://youtube.com/watch?v=Cr381pDsSsA',
+            'only_matching': True,
+        },
+        # video_info is None (https://github.com/ytdl-org/youtube-dl/issues/4421)
+        # YouTube Red ad is not captured for creator
+        {
+            'url': '__2ABJjxzNo',
+            'info_dict': {
+                'id': '__2ABJjxzNo',
+                'ext': 'mp4',
+                'duration': 266,
+                'upload_date': '20100430',
+                'creator': 'deadmau5',
+                'description': 'md5:6cbcd3a92ce1bc676fc4d6ab4ace2336',
+                'title': 'Deadmau5 - Some Chords (HD)',
+                'alt_title': 'Some Chords',
+                'availability': 'public',
+                'tags': 'count:14',
+                'channel_id': 'UCYEK6xds6eo-3tr4xRdflmQ',
+                'view_count': int,
+                'live_status': 'not_live',
+                'channel': 'deadmau5',
+                'thumbnail': 'https://i.ytimg.com/vi_webp/__2ABJjxzNo/maxresdefault.webp',
+                'like_count': int,
+                'track': 'Some Chords',
+                'artist': 'deadmau5',
+                'playable_in_embed': True,
+                'age_limit': 0,
+                'channel_url': 'https://www.youtube.com/channel/UCYEK6xds6eo-3tr4xRdflmQ',
+                'categories': ['Music'],
+                'album': 'Some Chords',
+                'channel_follower_count': int,
+                'uploader': 'deadmau5',
+                'uploader_url': 'https://www.youtube.com/@deadmau5',
+                'uploader_id': '@deadmau5',
+            },
+            'expected_warnings': [
+                'DASH manifest missing',
+            ],
+        },
+        # Olympics (https://github.com/ytdl-org/youtube-dl/issues/4431)
+        {
+            'url': 'lqQg6PlCWgI',
+            'info_dict': {
+                'id': 'lqQg6PlCWgI',
+                'ext': 'mp4',
+                'duration': 6085,
+                'upload_date': '20150827',
+                'description': 'md5:04bbbf3ccceb6795947572ca36f45904',
+                'title': 'Hockey - Women -  GER-AUS - London 2012 Olympic Games',
+                'like_count': int,
+                'release_timestamp': 1343767800,
+                'playable_in_embed': True,
+                'categories': ['Sports'],
+                'release_date': '20120731',
+                'channel': 'Olympics',
+                'tags': ['Hockey', '2012-07-31', '31 July 2012', 'Riverbank Arena', 'Session', 'Olympics', 'Olympic Games', 'London 2012', '2012 Summer Olympics', 'Summer Games'],
+                'channel_id': 'UCTl3QQTvqHFjurroKxexy2Q',
+                'thumbnail': 'https://i.ytimg.com/vi/lqQg6PlCWgI/maxresdefault.jpg',
+                'age_limit': 0,
+                'availability': 'public',
+                'live_status': 'was_live',
+                'view_count': int,
+                'channel_url': 'https://www.youtube.com/channel/UCTl3QQTvqHFjurroKxexy2Q',
+                'channel_follower_count': int,
+                'uploader': 'Olympics',
+                'uploader_url': 'https://www.youtube.com/@Olympics',
+                'uploader_id': '@Olympics',
+                'channel_is_verified': True,
+                'timestamp': 1440707674,
+            },
+            'params': {
+                'skip_download': 'requires avconv',
+            },
+        },
+        # Non-square pixels
+        {
+            'url': 'https://www.youtube.com/watch?v=_b-2C3KPAM0',
+            'info_dict': {
+                'id': '_b-2C3KPAM0',
+                'ext': 'mp4',
+                'stretched_ratio': 16 / 9.,
+                'duration': 85,
+                'upload_date': '20110310',
+                'description': 'made by Wacom from Korea | 字幕&加油添醋 by TY\'s Allen | 感謝heylisa00cavey1001同學熱情提供梗及翻譯',
+                'title': '[A-made] 變態妍字幕版 太妍 我就是這樣的人',
+                'playable_in_embed': True,
+                'channel': '孫ᄋᄅ',
+                'age_limit': 0,
+                'tags': 'count:11',
+                'channel_url': 'https://www.youtube.com/channel/UCS-xxCmRaA6BFdmgDPA_BIw',
+                'channel_id': 'UCS-xxCmRaA6BFdmgDPA_BIw',
+                'thumbnail': 'https://i.ytimg.com/vi/_b-2C3KPAM0/maxresdefault.jpg',
+                'view_count': int,
+                'categories': ['People & Blogs'],
+                'like_count': int,
+                'live_status': 'not_live',
+                'availability': 'unlisted',
+                'comment_count': int,
+                'channel_follower_count': int,
+                'uploader': '孫ᄋᄅ',
+                'uploader_url': 'https://www.youtube.com/@AllenMeow',
+                'uploader_id': '@AllenMeow',
+                'timestamp': 1299776999,
+            },
+        },
+        # url_encoded_fmt_stream_map is empty string
+        {
+            'url': 'qEJwOuvDf7I',
+            'info_dict': {
+                'id': 'qEJwOuvDf7I',
+                'ext': 'webm',
+                'title': 'Обсуждение судебной практики по выборам 14 сентября 2014 года в Санкт-Петербурге',
+                'description': '',
+                'upload_date': '20150404',
+            },
+            'params': {
+                'skip_download': 'requires avconv',
+            },
+            'skip': 'This live event has ended.',
+        },
+        # Extraction from multiple DASH manifests (https://github.com/ytdl-org/youtube-dl/pull/6097)
+        {
+            'url': 'https://www.youtube.com/watch?v=FIl7x6_3R5Y',
+            'info_dict': {
+                'id': 'FIl7x6_3R5Y',
+                'ext': 'webm',
+                'title': 'md5:7b81415841e02ecd4313668cde88737a',
+                'description': 'md5:116377fd2963b81ec4ce64b542173306',
+                'duration': 220,
+                'upload_date': '20150625',
+                'formats': 'mincount:31',
+            },
+            'skip': 'not actual anymore',
+        },
+        # DASH manifest with segment_list
+        {
+            'url': 'https://www.youtube.com/embed/CsmdDsKjzN8',
+            'md5': '8ce563a1d667b599d21064e982ab9e31',
+            'info_dict': {
+                'id': 'CsmdDsKjzN8',
+                'ext': 'mp4',
+                'upload_date': '20150501',  # According to '<meta itemprop="datePublished"', but in other places it's 20150510
+                'description': 'Retransmisión en directo de la XVIII media maratón de Zaragoza.',
+                'title': 'Retransmisión XVIII Media maratón Zaragoza 2015',
+            },
+            'params': {
+                'youtube_include_dash_manifest': True,
+                'format': '135',  # bestvideo
+            },
+            'skip': 'This live event has ended.',
+        },
+        {
+            # Multifeed videos (multiple cameras), URL can be of any Camera
+            # TODO: fix multifeed titles
+            'url': 'https://www.youtube.com/watch?v=zaPI8MvL8pg',
+            'info_dict': {
+                'id': 'zaPI8MvL8pg',
+                'title': 'Terraria 1.2 Live Stream | Let\'s Play - Part 04',
+                'description': 'md5:563ccbc698b39298481ca3c571169519',
+            },
+            'playlist': [{
+                'info_dict': {
+                    'id': 'j5yGuxZ8lLU',
+                    'ext': 'mp4',
+                    'title': 'Terraria 1.2 Live Stream | Let\'s Play - Part 04 (Chris)',
+                    'description': 'md5:563ccbc698b39298481ca3c571169519',
+                    'duration': 10120,
+                    'channel_follower_count': int,
+                    'channel_url': 'https://www.youtube.com/channel/UCN2XePorRokPB9TEgRZpddg',
+                    'availability': 'public',
+                    'playable_in_embed': True,
+                    'upload_date': '20131105',
+                    'categories': ['Gaming'],
+                    'live_status': 'was_live',
+                    'tags': 'count:24',
+                    'release_timestamp': 1383701910,
+                    'thumbnail': 'https://i.ytimg.com/vi/j5yGuxZ8lLU/maxresdefault.jpg',
+                    'comment_count': int,
+                    'age_limit': 0,
+                    'like_count': int,
+                    'channel_id': 'UCN2XePorRokPB9TEgRZpddg',
+                    'channel': 'WiiLikeToPlay',
+                    'view_count': int,
+                    'release_date': '20131106',
+                    'uploader': 'WiiLikeToPlay',
+                    'uploader_id': '@WLTP',
+                    'uploader_url': 'https://www.youtube.com/@WLTP',
+                },
+            }, {
+                'info_dict': {
+                    'id': 'zaPI8MvL8pg',
+                    'ext': 'mp4',
+                    'title': 'Terraria 1.2 Live Stream | Let\'s Play - Part 04 (Tyson)',
+                    'availability': 'public',
+                    'channel_url': 'https://www.youtube.com/channel/UCN2XePorRokPB9TEgRZpddg',
+                    'channel': 'WiiLikeToPlay',
+                    'channel_follower_count': int,
+                    'description': 'md5:563ccbc698b39298481ca3c571169519',
+                    'duration': 10108,
+                    'age_limit': 0,
+                    'like_count': int,
+                    'tags': 'count:24',
+                    'channel_id': 'UCN2XePorRokPB9TEgRZpddg',
+                    'release_timestamp': 1383701915,
+                    'comment_count': int,
+                    'upload_date': '20131105',
+                    'thumbnail': 'https://i.ytimg.com/vi/zaPI8MvL8pg/maxresdefault.jpg',
+                    'release_date': '20131106',
+                    'playable_in_embed': True,
+                    'live_status': 'was_live',
+                    'categories': ['Gaming'],
+                    'view_count': int,
+                    'uploader': 'WiiLikeToPlay',
+                    'uploader_id': '@WLTP',
+                    'uploader_url': 'https://www.youtube.com/@WLTP',
+                },
+            }, {
+                'info_dict': {
+                    'id': 'R7r3vfO7Hao',
+                    'ext': 'mp4',
+                    'title': 'Terraria 1.2 Live Stream | Let\'s Play - Part 04 (Spencer)',
+                    'thumbnail': 'https://i.ytimg.com/vi/R7r3vfO7Hao/maxresdefault.jpg',
+                    'channel_id': 'UCN2XePorRokPB9TEgRZpddg',
+                    'like_count': int,
+                    'availability': 'public',
+                    'playable_in_embed': True,
+                    'upload_date': '20131105',
+                    'description': 'md5:563ccbc698b39298481ca3c571169519',
+                    'channel_follower_count': int,
+                    'tags': 'count:24',
+                    'release_date': '20131106',
+                    'comment_count': int,
+                    'channel_url': 'https://www.youtube.com/channel/UCN2XePorRokPB9TEgRZpddg',
+                    'channel': 'WiiLikeToPlay',
+                    'categories': ['Gaming'],
+                    'release_timestamp': 1383701914,
+                    'live_status': 'was_live',
+                    'age_limit': 0,
+                    'duration': 10128,
+                    'view_count': int,
+                    'uploader': 'WiiLikeToPlay',
+                    'uploader_id': '@WLTP',
+                    'uploader_url': 'https://www.youtube.com/@WLTP',
+                },
+            }],
+            'params': {'skip_download': True},
+            'skip': 'Not multifeed anymore',
+        },
+        {
+            # Multifeed video with comma in title (see https://github.com/ytdl-org/youtube-dl/issues/8536)
+            'url': 'https://www.youtube.com/watch?v=gVfLd0zydlo',
+            'info_dict': {
+                'id': 'gVfLd0zydlo',
+                'title': 'DevConf.cz 2016 Day 2 Workshops 1 14:00 - 15:30',
+            },
+            'playlist_count': 2,
+            'skip': 'Not multifeed anymore',
+        },
+        {
+            'url': 'https://vid.plus/FlRa-iH7PGw',
+            'only_matching': True,
+        },
+        {
+            'url': 'https://zwearz.com/watch/9lWxNJF-ufM/electra-woman-dyna-girl-official-trailer-grace-helbig.html',
+            'only_matching': True,
+        },
+        {
+            # Title with JS-like syntax "};" (see https://github.com/ytdl-org/youtube-dl/issues/7468)
+            # Also tests cut-off URL expansion in video description (see
+            # https://github.com/ytdl-org/youtube-dl/issues/1892,
+            # https://github.com/ytdl-org/youtube-dl/issues/8164)
+            'url': 'https://www.youtube.com/watch?v=lsguqyKfVQg',
+            'info_dict': {
+                'id': 'lsguqyKfVQg',
+                'ext': 'mp4',
+                'title': '{dark walk}; Loki/AC/Dishonored; collab w/Elflover21',
+                'alt_title': 'Dark Walk',
+                'description': 'md5:8085699c11dc3f597ce0410b0dcbb34a',
+                'duration': 133,
+                'upload_date': '20151119',
+                'creator': 'Todd Haberman;\nDaniel Law Heath and Aaron Kaplan',
+                'track': 'Dark Walk',
+                'artist': 'Todd Haberman;\nDaniel Law Heath and Aaron Kaplan',
+                'album': 'Position Music - Production Music Vol. 143 - Dark Walk',
+                'thumbnail': 'https://i.ytimg.com/vi_webp/lsguqyKfVQg/maxresdefault.webp',
+                'categories': ['Film & Animation'],
+                'view_count': int,
+                'live_status': 'not_live',
+                'channel_url': 'https://www.youtube.com/channel/UCTSRgz5jylBvFt_S7wnsqLQ',
+                'channel_id': 'UCTSRgz5jylBvFt_S7wnsqLQ',
+                'tags': 'count:13',
+                'availability': 'public',
+                'channel': 'IronSoulElf',
+                'playable_in_embed': True,
+                'like_count': int,
+                'age_limit': 0,
+                'channel_follower_count': int,
+            },
+            'params': {
+                'skip_download': True,
+            },
+        },
+        {
+            # Tags with '};' (see https://github.com/ytdl-org/youtube-dl/issues/7468)
+            'url': 'https://www.youtube.com/watch?v=Ms7iBXnlUO8',
+            'only_matching': True,
+        },
+        {
+            # Video with yt:stretch=17:0
+            'url': 'https://www.youtube.com/watch?v=Q39EVAstoRM',
+            'info_dict': {
+                'id': 'Q39EVAstoRM',
+                'ext': 'mp4',
+                'title': 'Clash Of Clans#14 Dicas De Ataque Para CV 4',
+                'description': 'md5:ee18a25c350637c8faff806845bddee9',
+                'upload_date': '20151107',
+            },
+            'params': {
+                'skip_download': True,
+            },
+            'skip': 'This video does not exist.',
+        },
+        {
+            # Video with incomplete 'yt:stretch=16:'
+            'url': 'https://www.youtube.com/watch?v=FRhJzUSJbGI',
+            'only_matching': True,
+        },
+        {
+            # Video licensed under Creative Commons
+            'url': 'https://www.youtube.com/watch?v=M4gD1WSo5mA',
+            'info_dict': {
+                'id': 'M4gD1WSo5mA',
+                'ext': 'mp4',
+                'title': 'md5:e41008789470fc2533a3252216f1c1d1',
+                'description': 'md5:a677553cf0840649b731a3024aeff4cc',
+                'duration': 721,
+                'upload_date': '20150128',
+                'license': 'Creative Commons Attribution license (reuse allowed)',
+                'channel_id': 'UCuLGmD72gJDBwmLw06X58SA',
+                'channel_url': 'https://www.youtube.com/channel/UCuLGmD72gJDBwmLw06X58SA',
+                'like_count': int,
+                'age_limit': 0,
+                'tags': ['Copyright (Legal Subject)', 'Law (Industry)', 'William W. Fisher (Author)'],
+                'channel': 'The Berkman Klein Center for Internet & Society',
+                'availability': 'public',
+                'view_count': int,
+                'categories': ['Education'],
+                'thumbnail': 'https://i.ytimg.com/vi_webp/M4gD1WSo5mA/maxresdefault.webp',
+                'live_status': 'not_live',
+                'playable_in_embed': True,
+                'channel_follower_count': int,
+                'chapters': list,
+                'uploader': 'The Berkman Klein Center for Internet & Society',
+                'uploader_id': '@BKCHarvard',
+                'uploader_url': 'https://www.youtube.com/@BKCHarvard',
+                'timestamp': 1422422076,
+            },
+            'params': {
+                'skip_download': True,
+            },
+        },
+        {
+            'url': 'https://www.youtube.com/watch?v=eQcmzGIKrzg',
+            'info_dict': {
+                'id': 'eQcmzGIKrzg',
+                'ext': 'mp4',
+                'title': 'Democratic Socialism and Foreign Policy | Bernie Sanders',
+                'description': 'md5:13a2503d7b5904ef4b223aa101628f39',
+                'duration': 4060,
+                'upload_date': '20151120',
+                'license': 'Creative Commons Attribution license (reuse allowed)',
+                'playable_in_embed': True,
+                'tags': 'count:12',
+                'like_count': int,
+                'channel_id': 'UCH1dpzjCEiGAt8CXkryhkZg',
+                'age_limit': 0,
+                'availability': 'public',
+                'categories': ['News & Politics'],
+                'channel': 'Bernie Sanders',
+                'thumbnail': 'https://i.ytimg.com/vi_webp/eQcmzGIKrzg/maxresdefault.webp',
+                'view_count': int,
+                'live_status': 'not_live',
+                'channel_url': 'https://www.youtube.com/channel/UCH1dpzjCEiGAt8CXkryhkZg',
+                'comment_count': int,
+                'channel_follower_count': int,
+                'chapters': list,
+                'uploader': 'Bernie Sanders',
+                'uploader_url': 'https://www.youtube.com/@BernieSanders',
+                'uploader_id': '@BernieSanders',
+                'channel_is_verified': True,
+                'heatmap': 'count:100',
+                'timestamp': 1447987198,
+            },
+            'params': {
+                'skip_download': True,
+            },
+        },
+        {
+            'url': 'https://www.youtube.com/watch?feature=player_embedded&amp;amp;v=V36LpHqtcDY',
+            'only_matching': True,
+        },
+        {
+            # YouTube Red paid video (https://github.com/ytdl-org/youtube-dl/issues/10059)
+            'url': 'https://www.youtube.com/watch?v=i1Ko8UG-Tdo',
+            'only_matching': True,
+        },
+        {
+            # Rental video preview
+            'url': 'https://www.youtube.com/watch?v=yYr8q0y5Jfg',
+            'info_dict': {
+                'id': 'uGpuVWrhIzE',
+                'ext': 'mp4',
+                'title': 'Piku - Trailer',
+                'description': 'md5:c36bd60c3fd6f1954086c083c72092eb',
+                'upload_date': '20150811',
+                'license': 'Standard YouTube License',
+            },
+            'params': {
+                'skip_download': True,
+            },
+            'skip': 'This video is not available.',
+        },
+        {
+            # YouTube Red video with episode data
+            'url': 'https://www.youtube.com/watch?v=iqKdEhx-dD4',
+            'info_dict': {
+                'id': 'iqKdEhx-dD4',
+                'ext': 'mp4',
+                'title': 'Isolation - Mind Field (Ep 1)',
+                'description': 'md5:f540112edec5d09fc8cc752d3d4ba3cd',
+                'duration': 2085,
+                'upload_date': '20170118',
+                'series': 'Mind Field',
+                'season_number': 1,
+                'episode_number': 1,
+                'thumbnail': 'https://i.ytimg.com/vi_webp/iqKdEhx-dD4/maxresdefault.webp',
+                'tags': 'count:12',
+                'view_count': int,
+                'availability': 'public',
+                'age_limit': 0,
+                'channel': 'Vsauce',
+                'episode': 'Episode 1',
+                'categories': ['Entertainment'],
+                'season': 'Season 1',
+                'channel_id': 'UC6nSFpj9HTCZ5t-N3Rm3-HA',
+                'channel_url': 'https://www.youtube.com/channel/UC6nSFpj9HTCZ5t-N3Rm3-HA',
+                'like_count': int,
+                'playable_in_embed': True,
+                'live_status': 'not_live',
+                'channel_follower_count': int,
+                'uploader': 'Vsauce',
+                'uploader_url': 'https://www.youtube.com/@Vsauce',
+                'uploader_id': '@Vsauce',
+                'comment_count': int,
+                'channel_is_verified': True,
+                'timestamp': 1484761047,
+            },
+            'params': {
+                'skip_download': True,
+            },
+            'expected_warnings': [
+                'Skipping DASH manifest',
+            ],
+        },
+        {
+            # The following content has been identified by the YouTube community
+            # as inappropriate or offensive to some audiences.
+            'url': 'https://www.youtube.com/watch?v=6SJNVb0GnPI',
+            'info_dict': {
+                'id': '6SJNVb0GnPI',
+                'ext': 'mp4',
+                'title': 'Race Differences in Intelligence',
+                'description': 'md5:5d161533167390427a1f8ee89a1fc6f1',
+                'duration': 965,
+                'upload_date': '20140124',
+            },
+            'params': {
+                'skip_download': True,
+            },
+            'skip': 'This video has been removed for violating YouTube\'s policy on hate speech.',
+        },
+        {
+            # itag 212
+            'url': '1t24XAntNCY',
+            'only_matching': True,
+        },
+        {
+            # geo restricted to JP
+            'url': 'sJL6WA-aGkQ',
+            'only_matching': True,
+        },
+        {
+            'url': 'https://invidio.us/watch?v=BaW_jenozKc',
+            'only_matching': True,
+        },
+        {
+            'url': 'https://redirect.invidious.io/watch?v=BaW_jenozKc',
+            'only_matching': True,
+        },
+        {
+            # from https://nitter.pussthecat.org/YouTube/status/1360363141947944964#m
+            'url': 'https://redirect.invidious.io/Yh0AhrY9GjA',
+            'only_matching': True,
+        },
+        {
+            # DRM protected
+            'url': 'https://www.youtube.com/watch?v=s7_qI6_mIXc',
+            'only_matching': True,
+        },
+        {
+            # Video with unsupported adaptive stream type formats
+            'url': 'https://www.youtube.com/watch?v=Z4Vy8R84T1U',
+            'info_dict': {
+                'id': 'Z4Vy8R84T1U',
+                'ext': 'mp4',
+                'title': 'saman SMAN 53 Jakarta(Sancety) opening COFFEE4th at SMAN 53 Jakarta',
+                'description': 'md5:d41d8cd98f00b204e9800998ecf8427e',
+                'duration': 433,
+                'upload_date': '20130923',
+                'formats': 'maxcount:10',
+            },
+            'params': {
+                'skip_download': True,
+                'youtube_include_dash_manifest': False,
+            },
+            'skip': 'not actual anymore',
+        },
+        {
+            # Youtube Music Auto-generated description
+            # TODO: fix metadata extraction
+            'url': 'https://music.youtube.com/watch?v=MgNrAu2pzNs',
+            'info_dict': {
+                'id': 'MgNrAu2pzNs',
+                'ext': 'mp4',
+                'title': 'Voyeur Girl',
+                'description': 'md5:7ae382a65843d6df2685993e90a8628f',
+                'upload_date': '20190312',
+                'artists': ['Stephen'],
+                'creators': ['Stephen'],
+                'track': 'Voyeur Girl',
+                'album': 'it\'s too much love to know my dear',
+                'release_date': '20190313',
+                'alt_title': 'Voyeur Girl',
+                'view_count': int,
+                'playable_in_embed': True,
+                'like_count': int,
+                'categories': ['Music'],
+                'channel_url': 'https://www.youtube.com/channel/UC-pWHpBjdGG69N9mM2auIAA',
+                'channel': 'Stephen',  # TODO: should be "Stephen - Topic"
+                'uploader': 'Stephen',
+                'availability': 'public',
+                'duration': 169,
+                'thumbnail': 'https://i.ytimg.com/vi_webp/MgNrAu2pzNs/maxresdefault.webp',
+                'age_limit': 0,
+                'channel_id': 'UC-pWHpBjdGG69N9mM2auIAA',
+                'tags': 'count:11',
+                'live_status': 'not_live',
+                'channel_follower_count': int,
+            },
+            'params': {
+                'skip_download': True,
+            },
+        },
+        {
+            'url': 'https://www.youtubekids.com/watch?v=3b8nCWDgZ6Q',
+            'only_matching': True,
+        },
+        {
+            # invalid -> valid video id redirection
+            'url': 'DJztXj2GPfl',
+            'info_dict': {
+                'id': 'DJztXj2GPfk',
+                'ext': 'mp4',
+                'title': 'Panjabi MC - Mundian To Bach Ke (The Dictator Soundtrack)',
+                'description': 'md5:bf577a41da97918e94fa9798d9228825',
+                'upload_date': '20090125',
+                'artist': 'Panjabi MC',
+                'track': 'Beware of the Boys (Mundian to Bach Ke) - Motivo Hi-Lectro Remix',
+                'album': 'Beware of the Boys (Mundian To Bach Ke)',
+            },
+            'params': {
+                'skip_download': True,
+            },
+            'skip': 'Video unavailable',
+        },
+        {
+            # empty description results in an empty string
+            'url': 'https://www.youtube.com/watch?v=x41yOUIvK2k',
+            'info_dict': {
+                'id': 'x41yOUIvK2k',
+                'ext': 'mp4',
+                'title': 'IMG 3456',
+                'description': '',
+                'upload_date': '20170613',
+                'view_count': int,
+                'thumbnail': 'https://i.ytimg.com/vi_webp/x41yOUIvK2k/maxresdefault.webp',
+                'like_count': int,
+                'channel_id': 'UCo03ZQPBW5U4UC3regpt1nw',
+                'tags': [],
+                'channel_url': 'https://www.youtube.com/channel/UCo03ZQPBW5U4UC3regpt1nw',
+                'availability': 'public',
+                'age_limit': 0,
+                'categories': ['Pets & Animals'],
+                'duration': 7,
+                'playable_in_embed': True,
+                'live_status': 'not_live',
+                'channel': 'l\'Or Vert asbl',
+                'channel_follower_count': int,
+                'uploader': 'l\'Or Vert asbl',
+                'uploader_url': 'https://www.youtube.com/@ElevageOrVert',
+                'uploader_id': '@ElevageOrVert',
+                'timestamp': 1497343210,
+            },
+            'params': {
+                'skip_download': True,
+            },
+        },
+        {
+            # with '};' inside yt initial data (see [1])
+            # see [2] for an example with '};' inside ytInitialPlayerResponse
+            # 1. https://github.com/ytdl-org/youtube-dl/issues/27093
+            # 2. https://github.com/ytdl-org/youtube-dl/issues/27216
+            'url': 'https://www.youtube.com/watch?v=CHqg6qOn4no',
+            'info_dict': {
+                'id': 'CHqg6qOn4no',
+                'ext': 'mp4',
+                'title': 'Part 77   Sort a list of simple types in c#',
+                'description': 'md5:b8746fa52e10cdbf47997903f13b20dc',
+                'upload_date': '20130831',
+                'channel_id': 'UCCTVrRB5KpIiK6V2GGVsR1Q',
+                'like_count': int,
+                'channel_url': 'https://www.youtube.com/channel/UCCTVrRB5KpIiK6V2GGVsR1Q',
+                'live_status': 'not_live',
+                'categories': ['Education'],
+                'availability': 'public',
+                'thumbnail': 'https://i.ytimg.com/vi/CHqg6qOn4no/sddefault.jpg',
+                'tags': 'count:12',
+                'playable_in_embed': True,
+                'age_limit': 0,
+                'view_count': int,
+                'duration': 522,
+                'channel': 'kudvenkat',
+                'comment_count': int,
+                'channel_follower_count': int,
+                'chapters': list,
+                'uploader': 'kudvenkat',
+                'uploader_url': 'https://www.youtube.com/@Csharp-video-tutorialsBlogspot',
+                'uploader_id': '@Csharp-video-tutorialsBlogspot',
+                'channel_is_verified': True,
+                'heatmap': 'count:100',
+                'timestamp': 1377976349,
+            },
+            'params': {
+                'skip_download': True,
+            },
+        },
+        {
+            # another example of '};' in ytInitialData
+            'url': 'https://www.youtube.com/watch?v=gVfgbahppCY',
+            'only_matching': True,
+        },
+        {
+            'url': 'https://www.youtube.com/watch_popup?v=63RmMXCd_bQ',
+            'only_matching': True,
+        },
+        {
+            # https://github.com/ytdl-org/youtube-dl/pull/28094
+            'url': 'OtqTfy26tG0',
+            'info_dict': {
+                'id': 'OtqTfy26tG0',
+                'ext': 'mp4',
+                'title': 'Burn Out',
+                'description': 'md5:8d07b84dcbcbfb34bc12a56d968b6131',
+                'upload_date': '20141120',
+                'artist': 'The Cinematic Orchestra',
+                'track': 'Burn Out',
+                'album': 'Every Day',
+                'like_count': int,
+                'live_status': 'not_live',
+                'alt_title': 'Burn Out',
+                'duration': 614,
+                'age_limit': 0,
+                'view_count': int,
+                'channel_url': 'https://www.youtube.com/channel/UCIzsJBIyo8hhpFm1NK0uLgw',
+                'creator': 'The Cinematic Orchestra',
+                'channel': 'The Cinematic Orchestra',
+                'tags': ['The Cinematic Orchestra', 'Every Day', 'Burn Out'],
+                'channel_id': 'UCIzsJBIyo8hhpFm1NK0uLgw',
+                'availability': 'public',
+                'thumbnail': 'https://i.ytimg.com/vi/OtqTfy26tG0/maxresdefault.jpg',
+                'categories': ['Music'],
+                'playable_in_embed': True,
+                'channel_follower_count': int,
+                'uploader': 'The Cinematic Orchestra',
+                'comment_count': int,
+            },
+            'params': {
+                'skip_download': True,
+            },
+        },
+        {
+            # controversial video, only works with bpctr when authenticated with cookies
+            'url': 'https://www.youtube.com/watch?v=nGC3D_FkCmg',
+            'only_matching': True,
+        },
+        {
+            # controversial video, requires bpctr/contentCheckOk
+            'url': 'https://www.youtube.com/watch?v=SZJvDhaSDnc',
+            'info_dict': {
+                'id': 'SZJvDhaSDnc',
+                'ext': 'mp4',
+                'title': 'San Diego teen commits suicide after bullying over embarrassing video',
+                'channel_id': 'UC-SJ6nODDmufqBzPBwCvYvQ',
+                'upload_date': '20140716',
+                'description': 'md5:acde3a73d3f133fc97e837a9f76b53b7',
+                'duration': 170,
+                'categories': ['News & Politics'],
+                'view_count': int,
+                'channel': 'CBS Mornings',
+                'tags': ['suicide', 'bullying', 'video', 'cbs', 'news'],
+                'thumbnail': 'https://i.ytimg.com/vi/SZJvDhaSDnc/hqdefault.jpg',
+                'age_limit': 18,
+                'availability': 'needs_auth',
+                'channel_url': 'https://www.youtube.com/channel/UC-SJ6nODDmufqBzPBwCvYvQ',
+                'like_count': int,
+                'live_status': 'not_live',
+                'playable_in_embed': True,
+                'channel_follower_count': int,
+                'uploader': 'CBS Mornings',
+                'uploader_url': 'https://www.youtube.com/@CBSMornings',
+                'uploader_id': '@CBSMornings',
+                'comment_count': int,
+                'channel_is_verified': True,
+                'timestamp': 1405513526,
+            },
+            'skip': 'Age-restricted; requires authentication',
+        },
+        {
+            # restricted location, https://github.com/ytdl-org/youtube-dl/issues/28685
+            'url': 'cBvYw8_A0vQ',
+            'info_dict': {
+                'id': 'cBvYw8_A0vQ',
+                'ext': 'mp4',
+                'title': '4K Ueno Okachimachi  Street  Scenes  上野御徒町歩き',
+                'description': 'md5:ea770e474b7cd6722b4c95b833c03630',
+                'upload_date': '20201120',
+                'duration': 1456,
+                'categories': ['Travel & Events'],
+                'channel_id': 'UC3o_t8PzBmXf5S9b7GLx1Mw',
+                'view_count': int,
+                'channel': 'Walk around Japan',
+                'tags': ['Ueno Tokyo', 'Okachimachi Tokyo', 'Ameyoko Street', 'Tokyo attraction', 'Travel in Tokyo'],
+                'thumbnail': 'https://i.ytimg.com/vi/cBvYw8_A0vQ/hqdefault.jpg',
+                'age_limit': 0,
+                'availability': 'public',
+                'channel_url': 'https://www.youtube.com/channel/UC3o_t8PzBmXf5S9b7GLx1Mw',
+                'live_status': 'not_live',
+                'playable_in_embed': True,
+                'channel_follower_count': int,
+                'uploader': 'Walk around Japan',
+                'uploader_url': 'https://www.youtube.com/@walkaroundjapan7124',
+                'uploader_id': '@walkaroundjapan7124',
+                'timestamp': 1605884416,
+            },
+            'params': {
+                'skip_download': True,
+            },
+        }, {
+            # Has multiple audio streams
+            'url': 'WaOKSUlf4TM',
+            'only_matching': True,
+        }, {
+            # Requires Premium: has format 141 when requested using YTM url
+            'url': 'https://music.youtube.com/watch?v=XclachpHxis',
+            'only_matching': True,
+        }, {
+            # multiple subtitles with same lang_code
+            'url': 'https://www.youtube.com/watch?v=wsQiKKfKxug',
+            'only_matching': True,
+        }, {
+            # Force use android client fallback
+            'url': 'https://www.youtube.com/watch?v=YOelRv7fMxY',
+            'info_dict': {
+                'id': 'YOelRv7fMxY',
+                'title': 'DIGGING A SECRET TUNNEL Part 1',
+                'ext': '3gp',
+                'upload_date': '20210624',
+                'channel_id': 'UCp68_FLety0O-n9QU6phsgw',
+                'channel_url': r're:https?://(?:www\.)?youtube\.com/channel/UCp68_FLety0O-n9QU6phsgw',
+                'description': 'md5:5d5991195d599b56cd0c4148907eec50',
+                'duration': 596,
+                'categories': ['Entertainment'],
+                'view_count': int,
+                'channel': 'colinfurze',
+                'tags': ['Colin', 'furze', 'Terry', 'tunnel', 'underground', 'bunker'],
+                'thumbnail': 'https://i.ytimg.com/vi/YOelRv7fMxY/maxresdefault.jpg',
+                'age_limit': 0,
+                'availability': 'public',
+                'like_count': int,
+                'live_status': 'not_live',
+                'playable_in_embed': True,
+                'channel_follower_count': int,
+                'chapters': list,
+                'uploader': 'colinfurze',
+                'uploader_url': 'https://www.youtube.com/@colinfurze',
+                'uploader_id': '@colinfurze',
+                'comment_count': int,
+                'channel_is_verified': True,
+                'heatmap': 'count:100',
+            },
+            'params': {
+                'format': '17',  # 3gp format available on android
+                'extractor_args': {'youtube': {'player_client': ['android']}},
+            },
+            'skip': 'android client broken',
+        },
+        {
+            # Skip download of additional client configs (remix client config in this case)
+            'url': 'https://music.youtube.com/watch?v=MgNrAu2pzNs',
+            'only_matching': True,
+            'params': {
+                'extractor_args': {'youtube': {'player_skip': ['configs']}},
+            },
+        }, {
+            # shorts
+            'url': 'https://www.youtube.com/shorts/BGQWPY4IigY',
+            'only_matching': True,
+        }, {
+            'note': 'Storyboards',
+            'url': 'https://www.youtube.com/watch?v=5KLPxDtMqe8',
+            'info_dict': {
+                'id': '5KLPxDtMqe8',
+                'ext': 'mhtml',
+                'format_id': 'sb0',
+                'title': 'Your Brain is Plastic',
+                'description': 'md5:89cd86034bdb5466cd87c6ba206cd2bc',
+                'upload_date': '20140324',
+                'like_count': int,
+                'channel_id': 'UCZYTClx2T1of7BRZ86-8fow',
+                'channel_url': 'https://www.youtube.com/channel/UCZYTClx2T1of7BRZ86-8fow',
+                'view_count': int,
+                'thumbnail': 'https://i.ytimg.com/vi/5KLPxDtMqe8/maxresdefault.jpg',
+                'playable_in_embed': True,
+                'tags': 'count:12',
+                'availability': 'public',
+                'channel': 'SciShow',
+                'live_status': 'not_live',
+                'duration': 248,
+                'categories': ['Education'],
+                'age_limit': 0,
+                'channel_follower_count': int,
+                'chapters': list,
+                'uploader': 'SciShow',
+                'uploader_url': 'https://www.youtube.com/@SciShow',
+                'uploader_id': '@SciShow',
+                'comment_count': int,
+                'channel_is_verified': True,
+                'heatmap': 'count:100',
+                'timestamp': 1395685455,
+            }, 'params': {'format': 'mhtml', 'skip_download': True},
+        }, {
+            # Ensure video upload_date is in UTC timezone (video was uploaded 1641170939)
+            'url': 'https://www.youtube.com/watch?v=2NUZ8W2llS4',
+            'info_dict': {
+                'id': '2NUZ8W2llS4',
+                'ext': 'mp4',
+                'title': 'The NP that test your phone performance 🙂',
+                'description': 'md5:144494b24d4f9dfacb97c1bbef5de84d',
+                'channel_id': 'UCRqNBSOHgilHfAczlUmlWHA',
+                'channel_url': 'https://www.youtube.com/channel/UCRqNBSOHgilHfAczlUmlWHA',
+                'duration': 21,
+                'view_count': int,
+                'age_limit': 0,
+                'categories': ['Gaming'],
+                'tags': 'count:23',
+                'playable_in_embed': True,
+                'live_status': 'not_live',
+                'upload_date': '20220103',
+                'like_count': int,
+                'availability': 'public',
+                'channel': 'Leon Nguyen',
+                'thumbnail': 'https://i.ytimg.com/vi_webp/2NUZ8W2llS4/maxresdefault.webp',
+                'comment_count': int,
+                'channel_follower_count': int,
+                'uploader': 'Leon Nguyen',
+                'uploader_url': 'https://www.youtube.com/@LeonNguyen',
+                'uploader_id': '@LeonNguyen',
+                'heatmap': 'count:100',
+                'timestamp': 1641170939,
+            },
+        }, {
+            # date text is premiered video, ensure upload date in UTC (published 1641172509)
+            'url': 'https://www.youtube.com/watch?v=mzZzzBU6lrM',
+            'info_dict': {
+                'id': 'mzZzzBU6lrM',
+                'ext': 'mp4',
+                'title': 'I Met GeorgeNotFound In Real Life...',
+                'description': 'md5:978296ec9783a031738b684d4ebf302d',
+                'channel_id': 'UC_8NknAFiyhOUaZqHR3lq3Q',
+                'channel_url': 'https://www.youtube.com/channel/UC_8NknAFiyhOUaZqHR3lq3Q',
+                'duration': 955,
+                'view_count': int,
+                'age_limit': 0,
+                'categories': ['Entertainment'],
+                'tags': 'count:26',
+                'playable_in_embed': True,
+                'live_status': 'not_live',
+                'release_timestamp': 1641172509,
+                'release_date': '20220103',
+                'upload_date': '20220103',
+                'like_count': int,
+                'availability': 'public',
+                'channel': 'Quackity',
+                'thumbnail': 'https://i.ytimg.com/vi/mzZzzBU6lrM/maxresdefault.jpg',
+                'channel_follower_count': int,
+                'uploader': 'Quackity',
+                'uploader_id': '@Quackity',
+                'uploader_url': 'https://www.youtube.com/@Quackity',
+                'comment_count': int,
+                'channel_is_verified': True,
+                'heatmap': 'count:100',
+                'timestamp': 1641172509,
+            },
+        },
+        {   # continuous livestream.
+            # Upload date was 2022-07-12T05:12:29-07:00, while stream start is 2022-07-12T15:59:30+00:00
+            'url': 'https://www.youtube.com/watch?v=jfKfPfyJRdk',
+            'info_dict': {
+                'id': 'jfKfPfyJRdk',
+                'ext': 'mp4',
+                'channel_id': 'UCSJ4gkVC6NrvII8umztf0Ow',
+                'like_count': int,
+                'uploader': 'Lofi Girl',
+                'categories': ['Music'],
+                'concurrent_view_count': int,
+                'playable_in_embed': True,
+                'timestamp': 1657627949,
+                'release_date': '20220712',
+                'channel_url': 'https://www.youtube.com/channel/UCSJ4gkVC6NrvII8umztf0Ow',
+                'description': 'md5:452d5c82f72bb7e62a4e0297c3f01c23',
+                'age_limit': 0,
+                'thumbnail': 'https://i.ytimg.com/vi/jfKfPfyJRdk/maxresdefault.jpg',
+                'release_timestamp': 1657641570,
+                'uploader_url': 'https://www.youtube.com/@LofiGirl',
+                'channel_follower_count': int,
+                'channel_is_verified': True,
+                'title': r're:^lofi hip hop radio 📚 beats to relax/study to',
+                'view_count': int,
+                'live_status': 'is_live',
+                'media_type': 'livestream',
+                'tags': 'count:32',
+                'channel': 'Lofi Girl',
+                'availability': 'public',
+                'upload_date': '20220712',
+                'uploader_id': '@LofiGirl',
+            },
+            'params': {'skip_download': True},
+        }, {
+            'url': 'https://www.youtube.com/watch?v=tjjjtzRLHvA',
+            'info_dict': {
+                'id': 'tjjjtzRLHvA',
+                'ext': 'mp4',
+                'title': 'ハッシュタグ無し };if window.ytcsi',
+                'upload_date': '20220323',
+                'like_count': int,
+                'availability': 'unlisted',
+                'channel': 'Lesmiscore',
+                'thumbnail': r're:^https?://.*\.jpg',
+                'age_limit': 0,
+                'categories': ['Music'],
+                'view_count': int,
+                'description': '',
+                'channel_url': 'https://www.youtube.com/channel/UCdqltm_7iv1Vs6kp6Syke5A',
+                'channel_id': 'UCdqltm_7iv1Vs6kp6Syke5A',
+                'live_status': 'not_live',
+                'playable_in_embed': True,
+                'channel_follower_count': int,
+                'duration': 6,
+                'tags': [],
+                'uploader_id': '@lesmiscore',
+                'uploader': 'Lesmiscore',
+                'uploader_url': 'https://www.youtube.com/@lesmiscore',
+                'timestamp': 1648005313,
+            },
+        }, {
+            # Prefer primary title+description language metadata by default
+            # Do not prefer translated description if primary is empty
+            'url': 'https://www.youtube.com/watch?v=el3E4MbxRqQ',
+            'info_dict': {
+                'id': 'el3E4MbxRqQ',
+                'ext': 'mp4',
+                'title': 'dlp test video 2 - primary sv no desc',
+                'description': '',
+                'channel': 'cole-dlp-test-acc',
+                'tags': [],
+                'view_count': int,
+                'channel_url': 'https://www.youtube.com/channel/UCiu-3thuViMebBjw_5nWYrA',
+                'like_count': int,
+                'playable_in_embed': True,
+                'availability': 'unlisted',
+                'thumbnail': r're:^https?://.*\.jpg',
+                'age_limit': 0,
+                'duration': 5,
+                'live_status': 'not_live',
+                'upload_date': '20220908',
+                'categories': ['People & Blogs'],
+                'channel_id': 'UCiu-3thuViMebBjw_5nWYrA',
+                'uploader_url': 'https://www.youtube.com/@coletdjnz',
+                'uploader_id': '@coletdjnz',
+                'uploader': 'cole-dlp-test-acc',
+                'timestamp': 1662677394,
+            },
+            'params': {'skip_download': True},
+        }, {
+            # Extractor argument: prefer translated title+description
+            'url': 'https://www.youtube.com/watch?v=gHKT4uU8Zng',
+            'info_dict': {
+                'id': 'gHKT4uU8Zng',
+                'ext': 'mp4',
+                'channel': 'cole-dlp-test-acc',
+                'tags': [],
+                'duration': 5,
+                'live_status': 'not_live',
+                'channel_id': 'UCiu-3thuViMebBjw_5nWYrA',
+                'upload_date': '20220729',
+                'view_count': int,
+                'categories': ['People & Blogs'],
+                'thumbnail': r're:^https?://.*\.jpg',
+                'title': 'dlp test video title translated (fr)',
+                'availability': 'public',
+                'age_limit': 0,
+                'description': 'dlp test video description translated (fr)',
+                'playable_in_embed': True,
+                'channel_url': 'https://www.youtube.com/channel/UCiu-3thuViMebBjw_5nWYrA',
+                'uploader_url': 'https://www.youtube.com/@coletdjnz',
+                'uploader_id': '@coletdjnz',
+                'uploader': 'cole-dlp-test-acc',
+                'timestamp': 1659073275,
+                'like_count': int,
+            },
+            'params': {'skip_download': True, 'extractor_args': {'youtube': {'lang': ['fr']}}},
+            'expected_warnings': [r'Preferring "fr" translated fields'],
+        }, {
+            'note': '6 channel audio',
+            'url': 'https://www.youtube.com/watch?v=zgdo7-RRjgo',
+            'only_matching': True,
+        }, {
+            'note': 'Multiple HLS formats with same itag',
+            'url': 'https://www.youtube.com/watch?v=kX3nB4PpJko',
+            'info_dict': {
+                'id': 'kX3nB4PpJko',
+                'ext': 'mp4',
+                'categories': ['Entertainment'],
+                'description': 'md5:e8031ff6e426cdb6a77670c9b81f6fa6',
+                'live_status': 'not_live',
+                'duration': 937,
+                'channel_follower_count': int,
+                'thumbnail': 'https://i.ytimg.com/vi_webp/kX3nB4PpJko/maxresdefault.webp',
+                'title': 'Last To Take Hand Off Jet, Keeps It!',
+                'channel': 'MrBeast',
+                'playable_in_embed': True,
+                'view_count': int,
+                'upload_date': '20221112',
+                'channel_url': 'https://www.youtube.com/channel/UCX6OQ3DkcsbYNE6H8uQQuVA',
+                'age_limit': 0,
+                'availability': 'public',
+                'channel_id': 'UCX6OQ3DkcsbYNE6H8uQQuVA',
+                'like_count': int,
+                'tags': [],
+                'uploader': 'MrBeast',
+                'uploader_url': 'https://www.youtube.com/@MrBeast',
+                'uploader_id': '@MrBeast',
+                'comment_count': int,
+                'channel_is_verified': True,
+                'heatmap': 'count:100',
+            },
+            'params': {'extractor_args': {'youtube': {'player_client': ['ios']}}, 'format': '233-1'},
+        }, {
+            'note': 'Audio formats with Dynamic Range Compression',
+            'url': 'https://www.youtube.com/watch?v=Tq92D6wQ1mg',
+            'info_dict': {
+                'id': 'Tq92D6wQ1mg',
+                'ext': 'webm',
+                'title': '[MMD] Adios - EVERGLOW [+Motion DL]',
+                'channel_url': 'https://www.youtube.com/channel/UC1yoRdFoFJaCY-AGfD9W0wQ',
+                'channel_id': 'UC1yoRdFoFJaCY-AGfD9W0wQ',
+                'channel_follower_count': int,
+                'description': 'md5:17eccca93a786d51bc67646756894066',
+                'upload_date': '20191228',
+                'tags': ['mmd', 'dance', 'mikumikudance', 'kpop', 'vtuber'],
+                'playable_in_embed': True,
+                'like_count': int,
+                'categories': ['Entertainment'],
+                'thumbnail': 'https://i.ytimg.com/vi/Tq92D6wQ1mg/sddefault.jpg',
+                'age_limit': 18,
+                'channel': 'Projekt Melody',
+                'view_count': int,
+                'availability': 'needs_auth',
+                'comment_count': int,
+                'live_status': 'not_live',
+                'duration': 106,
+                'uploader': 'Projekt Melody',
+                'uploader_id': '@ProjektMelody',
+                'uploader_url': 'https://www.youtube.com/@ProjektMelody',
+                'timestamp': 1577508724,
+            },
+            'params': {'extractor_args': {'youtube': {'player_client': ['tv_embedded']}}, 'format': '251-drc'},
+            'skip': 'Age-restricted; requires authentication',
+        },
+        {
+            'note': 'Support /live/ URL + media type for post-live content',
+            'url': 'https://www.youtube.com/live/qVv6vCqciTM',
+            'info_dict': {
+                'id': 'qVv6vCqciTM',
+                'ext': 'mp4',
+                'age_limit': 0,
+                'comment_count': int,
+                'chapters': 'count:13',
+                'upload_date': '20221223',
+                'thumbnail': 'https://i.ytimg.com/vi/qVv6vCqciTM/maxresdefault.jpg',
+                'channel_url': 'https://www.youtube.com/channel/UCIdEIHpS0TdkqRkHL5OkLtA',
+                'like_count': int,
+                'release_date': '20221223',
+                'tags': ['Vtuber', '月ノ美兎', '名取さな', 'にじさんじ', 'クリスマス', '3D配信'],
+                'title': '【 #インターネット女クリスマス 】3Dで歌ってはしゃぐインターネットの女たち【月ノ美兎/名取さな】',
+                'view_count': int,
+                'playable_in_embed': True,
+                'duration': 4438,
+                'availability': 'public',
+                'channel_follower_count': int,
+                'channel_id': 'UCIdEIHpS0TdkqRkHL5OkLtA',
+                'categories': ['Entertainment'],
+                'live_status': 'was_live',
+                'media_type': 'livestream',
+                'release_timestamp': 1671793345,
+                'channel': 'さなちゃんねる',
+                'description': 'md5:6aebf95cc4a1d731aebc01ad6cc9806d',
+                'uploader': 'さなちゃんねる',
+                'uploader_url': 'https://www.youtube.com/@sana_natori',
+                'uploader_id': '@sana_natori',
+                'channel_is_verified': True,
+                'heatmap': 'count:100',
+                'timestamp': 1671798112,
+            },
+        },
+        {
+            # Fallbacks when webpage and web client is unavailable
+            'url': 'https://www.youtube.com/watch?v=wSSmNUl9Snw',
+            'info_dict': {
+                'id': 'wSSmNUl9Snw',
+                'ext': 'mp4',
+                # 'categories': ['Science & Technology'],
+                'view_count': int,
+                'chapters': 'count:2',
+                'channel': 'Scott Manley',
+                'like_count': int,
+                'age_limit': 0,
+                # 'availability': 'public',
+                'channel_follower_count': int,
+                'live_status': 'not_live',
+                'upload_date': '20170831',
+                'duration': 682,
+                'tags': 'count:8',
+                'uploader_url': 'https://www.youtube.com/@scottmanley',
+                'description': 'md5:f4bed7b200404b72a394c2f97b782c02',
+                'uploader': 'Scott Manley',
+                'uploader_id': '@scottmanley',
+                'title': 'The Computer Hack That Saved Apollo 14',
+                'channel_id': 'UCxzC4EngIsMrPmbm6Nxvb-A',
+                'thumbnail': r're:^https?://.*\.webp',
+                'channel_url': 'https://www.youtube.com/channel/UCxzC4EngIsMrPmbm6Nxvb-A',
+                'playable_in_embed': True,
+                'comment_count': int,
+                'channel_is_verified': True,
+                'heatmap': 'count:100',
+            },
+            'params': {
+                'extractor_args': {'youtube': {'player_client': ['ios'], 'player_skip': ['webpage']}},
+            },
+        },
+        {
+            # uploader_id has non-ASCII characters that are percent-encoded in YT's JSON
+            'url': 'https://www.youtube.com/shorts/18NGQq7p3LY',
+            'info_dict': {
+                'id': '18NGQq7p3LY',
+                'ext': 'mp4',
+                'title': '아이브 이서 장원영 리즈 삐끼삐끼 챌린지',
+                'description': '',
+                'uploader': 'ㅇㅇ',
+                'uploader_id': '@으아-v1k',
+                'uploader_url': 'https://www.youtube.com/@으아-v1k',
+                'channel': 'ㅇㅇ',
+                'channel_id': 'UCC25oTm2J7ZVoi5TngOHg9g',
+                'channel_url': 'https://www.youtube.com/channel/UCC25oTm2J7ZVoi5TngOHg9g',
+                'thumbnail': r're:https?://.+/.+\.jpg',
+                'playable_in_embed': True,
+                'age_limit': 0,
+                'duration': 3,
+                'timestamp': 1724306170,
+                'upload_date': '20240822',
+                'availability': 'public',
+                'live_status': 'not_live',
+                'view_count': int,
+                'like_count': int,
+                'channel_follower_count': int,
+                'categories': ['People & Blogs'],
+                'tags': [],
+            },
+        },
+    ]
+
+    _WEBPAGE_TESTS = [
+        # YouTube <object> embed
+        {
+            'url': 'http://www.improbable.com/2017/04/03/untrained-modern-youths-and-ancient-masters-in-selfie-portraits/',
+            'md5': '873c81d308b979f0e23ee7e620b312a3',
+            'info_dict': {
+                'id': 'msN87y-iEx0',
+                'ext': 'mp4',
+                'title': 'Feynman: Mirrors FUN TO IMAGINE 6',
+                'upload_date': '20080526',
+                'description': 'md5:873c81d308b979f0e23ee7e620b312a3',
+                'age_limit': 0,
+                'tags': ['feynman', 'mirror', 'science', 'physics', 'imagination', 'fun', 'cool', 'puzzle'],
+                'channel_id': 'UCCeo--lls1vna5YJABWAcVA',
+                'playable_in_embed': True,
+                'thumbnail': 'https://i.ytimg.com/vi/msN87y-iEx0/hqdefault.jpg',
+                'like_count': int,
+                'comment_count': int,
+                'channel': 'Christopher Sykes',
+                'live_status': 'not_live',
+                'channel_url': 'https://www.youtube.com/channel/UCCeo--lls1vna5YJABWAcVA',
+                'availability': 'public',
+                'duration': 195,
+                'view_count': int,
+                'categories': ['Science & Technology'],
+                'channel_follower_count': int,
+                'uploader': 'Christopher Sykes',
+                'uploader_url': 'https://www.youtube.com/@ChristopherSykesDocumentaries',
+                'uploader_id': '@ChristopherSykesDocumentaries',
+                'heatmap': 'count:100',
+                'timestamp': 1211825920,
+            },
+            'params': {
+                'skip_download': True,
+            },
+        },
+    ]
+
+    _PLAYER_JS_VARIANT_MAP = {
+        'main': 'player_ias.vflset/en_US/base.js',
+        'tce': 'player_ias_tce.vflset/en_US/base.js',
+        'tv': 'tv-player-ias.vflset/tv-player-ias.js',
+        'tv_es6': 'tv-player-es6.vflset/tv-player-es6.js',
+        'phone': 'player-plasma-ias-phone-en_US.vflset/base.js',
+        'tablet': 'player-plasma-ias-tablet-en_US.vflset/base.js',
+    }
+    _INVERSE_PLAYER_JS_VARIANT_MAP = {v: k for k, v in _PLAYER_JS_VARIANT_MAP.items()}
+
+    @classmethod
+    def suitable(cls, url):
+        from yt_dlp.utils import parse_qs
+
+        qs = parse_qs(url)
+        if qs.get('list', [None])[0]:
+            return False
+        return super().suitable(url)
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._code_cache = {}
+        self._player_cache = {}
+
+    def _prepare_live_from_start_formats(self, formats, video_id, live_start_time, url, webpage_url, smuggled_data, is_live):
+        lock = threading.Lock()
+        start_time = time.time()
+        formats = [f for f in formats if f.get('is_from_start')]
+
+        def refetch_manifest(format_id, delay):
+            nonlocal formats, start_time, is_live
+            if time.time() <= start_time + delay:
+                return
+
+            _, _, prs, player_url = self._download_player_responses(url, smuggled_data, video_id, webpage_url)
+            video_details = traverse_obj(prs, (..., 'videoDetails'), expected_type=dict)
+            microformats = traverse_obj(
+                prs, (..., 'microformat', 'playerMicroformatRenderer'),
+                expected_type=dict)
+            _, live_status, _, formats, _ = self._list_formats(video_id, microformats, video_details, prs, player_url)
+            is_live = live_status == 'is_live'
+            start_time = time.time()
+
+        def mpd_feed(format_id, delay):
+            """
+            @returns (manifest_url, manifest_stream_number, is_live) or None
+            """
+            for retry in self.RetryManager(fatal=False):
+                with lock:
+                    refetch_manifest(format_id, delay)
+
+                f = next((f for f in formats if f['format_id'] == format_id), None)
+                if not f:
+                    if not is_live:
+                        retry.error = f'{video_id}: Video is no longer live'
+                    else:
+                        retry.error = f'Cannot find refreshed manifest for format {format_id}{bug_reports_message()}'
+                    continue
+                return f['manifest_url'], f['manifest_stream_number'], is_live
+            return None
+
+        for f in formats:
+            f['is_live'] = is_live
+            gen = functools.partial(self._live_dash_fragments, video_id, f['format_id'],
+                                    live_start_time, mpd_feed, not is_live and f.copy())
+            if is_live:
+                f['fragments'] = gen
+                f['protocol'] = 'http_dash_segments_generator'
+            else:
+                f['fragments'] = LazyList(gen({}))
+                del f['is_from_start']
+
+    def _live_dash_fragments(self, video_id, format_id, live_start_time, mpd_feed, manifestless_orig_fmt, ctx):
+        FETCH_SPAN, MAX_DURATION = 5, 432000
+
+        mpd_url, stream_number, is_live = None, None, True
+
+        begin_index = 0
+        download_start_time = ctx.get('start') or time.time()
+
+        lack_early_segments = download_start_time - (live_start_time or download_start_time) > MAX_DURATION
+        if lack_early_segments:
+            self.report_warning(bug_reports_message(
+                'Starting download from the last 120 hours of the live stream since '
+                'YouTube does not have data before that. If you think this is wrong,'), only_once=True)
+            lack_early_segments = True
+
+        known_idx, no_fragment_score, last_segment_url = begin_index, 0, None
+        fragments, fragment_base_url = None, None
+
+        def _extract_sequence_from_mpd(refresh_sequence, immediate):
+            nonlocal mpd_url, stream_number, is_live, no_fragment_score, fragments, fragment_base_url
+            # Obtain from MPD's maximum seq value
+            old_mpd_url = mpd_url
+            last_error = ctx.pop('last_error', None)
+            expire_fast = immediate or (last_error and isinstance(last_error, HTTPError) and last_error.status == 403)
+            mpd_url, stream_number, is_live = (mpd_feed(format_id, 5 if expire_fast else 18000)
+                                               or (mpd_url, stream_number, False))
+            if not refresh_sequence:
+                if expire_fast and not is_live:
+                    return False, last_seq
+                elif old_mpd_url == mpd_url:
+                    return True, last_seq
+            if manifestless_orig_fmt:
+                fmt_info = manifestless_orig_fmt
+            else:
+                try:
+                    fmts, _ = self._extract_mpd_formats_and_subtitles(
+                        mpd_url, None, note=False, errnote=False, fatal=False)
+                except ExtractorError:
+                    fmts = None
+                if not fmts:
+                    no_fragment_score += 2
+                    return False, last_seq
+                fmt_info = next(x for x in fmts if x['manifest_stream_number'] == stream_number)
+            fragments = fmt_info['fragments']
+            fragment_base_url = fmt_info['fragment_base_url']
+            assert fragment_base_url
+
+            _last_seq = int(re.search(r'(?:/|^)sq/(\d+)', fragments[-1]['path']).group(1))
+            return True, _last_seq
+
+        self.write_debug(f'[{video_id}] Generating fragments for format {format_id}')
+        while is_live:
+            fetch_time = time.time()
+            if no_fragment_score > 30:
+                return
+            if last_segment_url:
+                # Obtain from "X-Head-Seqnum" header value from each segment
+                try:
+                    urlh = self._request_webpage(
+                        last_segment_url, None, note=False, errnote=False, fatal=False)
+                except ExtractorError:
+                    urlh = None
+                last_seq = try_get(urlh, lambda x: int_or_none(x.headers['X-Head-Seqnum']))
+                if last_seq is None:
+                    no_fragment_score += 2
+                    last_segment_url = None
+                    continue
+            else:
+                should_continue, last_seq = _extract_sequence_from_mpd(True, no_fragment_score > 15)
+                no_fragment_score += 2
+                if not should_continue:
+                    continue
+
+            if known_idx > last_seq:
+                last_segment_url = None
+                continue
+
+            last_seq += 1
+
+            if begin_index < 0 and known_idx < 0:
+                # skip from the start when it's negative value
+                known_idx = last_seq + begin_index
+            if lack_early_segments:
+                known_idx = max(known_idx, last_seq - int(MAX_DURATION // fragments[-1]['duration']))
+            try:
+                for idx in range(known_idx, last_seq):
+                    # do not update sequence here or you'll get skipped some part of it
+                    should_continue, _ = _extract_sequence_from_mpd(False, False)
+                    if not should_continue:
+                        known_idx = idx - 1
+                        raise ExtractorError('breaking out of outer loop')
+                    last_segment_url = urljoin(fragment_base_url, f'sq/{idx}')
+                    yield {
+                        'url': last_segment_url,
+                        'fragment_count': last_seq,
+                    }
+                if known_idx == last_seq:
+                    no_fragment_score += 5
+                else:
+                    no_fragment_score = 0
+                known_idx = last_seq
+            except ExtractorError:
+                continue
+
+            if manifestless_orig_fmt:
+                # Stop at the first iteration if running for post-live manifestless;
+                # fragment count no longer increase since it starts
+                break
+
+            time.sleep(max(0, FETCH_SPAN + fetch_time - time.time()))
+
+    def _extract_player_url(self, *ytcfgs, webpage=None):
+        player_url = traverse_obj(
+            ytcfgs, (..., 'PLAYER_JS_URL'), (..., 'WEB_PLAYER_CONTEXT_CONFIGS', ..., 'jsUrl'),
+            get_all=False, expected_type=str)
+        if not player_url:
+            return
+
+        requested_js_variant = self._configuration_arg('player_js_variant', [''])[0] or 'actual'
+        if requested_js_variant in self._PLAYER_JS_VARIANT_MAP:
+            player_id = self._extract_player_info(player_url)
+            original_url = player_url
+            player_url = f'/s/player/{player_id}/{self._PLAYER_JS_VARIANT_MAP[requested_js_variant]}'
+            if original_url != player_url:
+                self.write_debug(
+                    f'Forcing "{requested_js_variant}" player JS variant for player {player_id}\n'
+                    f'        original url = {original_url}', only_once=True)
+        elif requested_js_variant != 'actual':
+            self.report_warning(
+                f'Invalid player JS variant name "{requested_js_variant}" requested. '
+                f'Valid choices are: {", ".join(self._PLAYER_JS_VARIANT_MAP)}', only_once=True)
+
+        return urljoin('https://www.youtube.com', player_url)
+
+    def _download_player_url(self, video_id, fatal=False):
+        iframe_webpage = self._download_webpage_with_retries(
+            'https://www.youtube.com/iframe_api',
+            note='Downloading iframe API JS',
+            video_id=video_id, retry_fatal=fatal)
+
+        if iframe_webpage:
+            player_version = self._search_regex(
+                r'player\\?/([0-9a-fA-F]{8})\\?/', iframe_webpage, 'player version', fatal=fatal)
+            if player_version:
+                return f'https://www.youtube.com/s/player/{player_version}/player_ias.vflset/en_US/base.js'
+
+    def _player_js_cache_key(self, player_url):
+        player_id = self._extract_player_info(player_url)
+        player_path = remove_start(urllib.parse.urlparse(player_url).path, f'/s/player/{player_id}/')
+        variant = self._INVERSE_PLAYER_JS_VARIANT_MAP.get(player_path) or next((
+            v for k, v in self._INVERSE_PLAYER_JS_VARIANT_MAP.items()
+            if re.fullmatch(re.escape(k).replace('en_US', r'[a-zA-Z0-9_]+'), player_path)), None)
+        if not variant:
+            self.write_debug(
+                f'Unable to determine player JS variant\n'
+                f'        player = {player_url}', only_once=True)
+            variant = re.sub(r'[^a-zA-Z0-9]', '_', remove_end(player_path, '.js'))
+        return join_nonempty(player_id, variant)
+
+    def _signature_cache_id(self, example_sig):
+        """ Return a string representation of a signature """
+        return '.'.join(str(len(part)) for part in example_sig.split('.'))
+
+    @classmethod
+    def _extract_player_info(cls, player_url):
+        for player_re in cls._PLAYER_INFO_RE:
+            id_m = re.search(player_re, player_url)
+            if id_m:
+                break
+        else:
+            raise ExtractorError(f'Cannot identify player {player_url!r}')
+        return id_m.group('id')
+
+    def _load_player(self, video_id, player_url, fatal=True):
+        player_js_key = self._player_js_cache_key(player_url)
+        if player_js_key not in self._code_cache:
+            code = self._download_webpage(
+                player_url, video_id, fatal=fatal,
+                note=f'Downloading player {player_js_key}',
+                errnote=f'Download of {player_js_key} failed')
+            if code:
+                self._code_cache[player_js_key] = code
+        return self._code_cache.get(player_js_key)
+
+    def _extract_signature_function(self, video_id, player_url, example_sig):
+        # Read from filesystem cache
+        func_id = join_nonempty(
+            self._player_js_cache_key(player_url), self._signature_cache_id(example_sig))
+        assert os.path.basename(func_id) == func_id
+
+        self.write_debug(f'Extracting signature function {func_id}')
+        cache_spec, code = self.cache.load('youtube-sigfuncs', func_id, min_ver='2025.03.31'), None
+
+        if not cache_spec:
+            code = self._load_player(video_id, player_url)
+        if code:
+            res = self._parse_sig_js(code, player_url)
+            test_string = ''.join(map(chr, range(len(example_sig))))
+            cache_spec = [ord(c) for c in res(test_string)]
+            self.cache.store('youtube-sigfuncs', func_id, cache_spec)
+
+        return lambda s: ''.join(s[i] for i in cache_spec)
+
+    def _print_sig_code(self, func, example_sig):
+        if not self.get_param('youtube_print_sig_code'):
+            return
+
+        def gen_sig_code(idxs):
+            def _genslice(start, end, step):
+                starts = '' if start == 0 else str(start)
+                ends = (':%d' % (end + step)) if end + step >= 0 else ':'
+                steps = '' if step == 1 else (':%d' % step)
+                return f's[{starts}{ends}{steps}]'
+
+            step = None
+            # Quelch pyflakes warnings - start will be set when step is set
+            start = '(Never used)'
+            for i, prev in zip(idxs[1:], idxs[:-1]):
+                if step is not None:
+                    if i - prev == step:
+                        continue
+                    yield _genslice(start, prev, step)
+                    step = None
+                    continue
+                if i - prev in [-1, 1]:
+                    step = i - prev
+                    start = prev
+                    continue
+                else:
+                    yield 's[%d]' % prev
+            if step is None:
+                yield 's[%d]' % i
+            else:
+                yield _genslice(start, i, step)
+
+        test_string = ''.join(map(chr, range(len(example_sig))))
+        cache_res = func(test_string)
+        cache_spec = [ord(c) for c in cache_res]
+        expr_code = ' + '.join(gen_sig_code(cache_spec))
+        signature_id_tuple = '({})'.format(', '.join(str(len(p)) for p in example_sig.split('.')))
+        code = (f'if tuple(len(p) for p in s.split(\'.\')) == {signature_id_tuple}:\n'
+                f'    return {expr_code}\n')
+        self.to_screen('Extracted signature function:\n' + code)
+
+    def _parse_sig_js(self, jscode, player_url):
+        # Examples where `sig` is funcname:
+        # sig=function(a){a=a.split(""); ... ;return a.join("")};
+        # ;c&&(c=sig(decodeURIComponent(c)),a.set(b,encodeURIComponent(c)));return a};
+        # {var l=f,m=h.sp,n=sig(decodeURIComponent(h.s));l.set(m,encodeURIComponent(n))}
+        # sig=function(J){J=J.split(""); ... ;return J.join("")};
+        # ;N&&(N=sig(decodeURIComponent(N)),J.set(R,encodeURIComponent(N)));return J};
+        # {var H=u,k=f.sp,v=sig(decodeURIComponent(f.s));H.set(k,encodeURIComponent(v))}
+        funcname = self._search_regex(
+            (r'\b(?P<var>[a-zA-Z0-9_$]+)&&\((?P=var)=(?P<sig>[a-zA-Z0-9_$]{2,})\(decodeURIComponent\((?P=var)\)\)',
+             r'(?P<sig>[a-zA-Z0-9_$]+)\s*=\s*function\(\s*(?P<arg>[a-zA-Z0-9_$]+)\s*\)\s*{\s*(?P=arg)\s*=\s*(?P=arg)\.split\(\s*""\s*\)\s*;\s*[^}]+;\s*return\s+(?P=arg)\.join\(\s*""\s*\)',
+             r'(?:\b|[^a-zA-Z0-9_$])(?P<sig>[a-zA-Z0-9_$]{2,})\s*=\s*function\(\s*a\s*\)\s*{\s*a\s*=\s*a\.split\(\s*""\s*\)(?:;[a-zA-Z0-9_$]{2}\.[a-zA-Z0-9_$]{2}\(a,\d+\))?',
+             # Old patterns
+             r'\b[cs]\s*&&\s*[adf]\.set\([^,]+\s*,\s*encodeURIComponent\s*\(\s*(?P<sig>[a-zA-Z0-9$]+)\(',
+             r'\b[a-zA-Z0-9]+\s*&&\s*[a-zA-Z0-9]+\.set\([^,]+\s*,\s*encodeURIComponent\s*\(\s*(?P<sig>[a-zA-Z0-9$]+)\(',
+             r'\bm=(?P<sig>[a-zA-Z0-9$]{2,})\(decodeURIComponent\(h\.s\)\)',
+             # Obsolete patterns
+             r'("|\')signature\1\s*,\s*(?P<sig>[a-zA-Z0-9$]+)\(',
+             r'\.sig\|\|(?P<sig>[a-zA-Z0-9$]+)\(',
+             r'yt\.akamaized\.net/\)\s*\|\|\s*.*?\s*[cs]\s*&&\s*[adf]\.set\([^,]+\s*,\s*(?:encodeURIComponent\s*\()?\s*(?P<sig>[a-zA-Z0-9$]+)\(',
+             r'\b[cs]\s*&&\s*[adf]\.set\([^,]+\s*,\s*(?P<sig>[a-zA-Z0-9$]+)\(',
+             r'\bc\s*&&\s*[a-zA-Z0-9]+\.set\([^,]+\s*,\s*\([^)]*\)\s*\(\s*(?P<sig>[a-zA-Z0-9$]+)\('),
+            jscode, 'Initial JS player signature function name', group='sig')
+
+        varname, global_list = self._interpret_player_js_global_var(jscode, player_url)
+        jsi = JSInterpreter(jscode)
+        initial_function = jsi.extract_function(funcname, filter_dict({varname: global_list}))
+        return lambda s: initial_function([s])
+
+    def _cached(self, func, *cache_id):
+        def inner(*args, **kwargs):
+            if cache_id not in self._player_cache:
+                try:
+                    self._player_cache[cache_id] = func(*args, **kwargs)
+                except ExtractorError as e:
+                    self._player_cache[cache_id] = e
+                except Exception as e:
+                    self._player_cache[cache_id] = ExtractorError(traceback.format_exc(), cause=e)
+
+            ret = self._player_cache[cache_id]
+            if isinstance(ret, Exception):
+                raise ret
+            return ret
+        return inner
+
+    def _load_player_data_from_cache(self, name, player_url):
+        cache_id = (f'youtube-{name}', self._player_js_cache_key(player_url))
+
+        if data := self._player_cache.get(cache_id):
+            return data
+
+        data = self.cache.load(*cache_id, min_ver='2025.03.31')
+        if data:
+            self._player_cache[cache_id] = data
+
+        return data
+
+    def _store_player_data_to_cache(self, name, player_url, data):
+        cache_id = (f'youtube-{name}', self._player_js_cache_key(player_url))
+        if cache_id not in self._player_cache:
+            self.cache.store(*cache_id, data)
+            self._player_cache[cache_id] = data
+
+    def _decrypt_signature(self, s, video_id, player_url):
+        """Turn the encrypted s field into a working signature"""
+        extract_sig = self._cached(
+            self._extract_signature_function, 'sig', player_url, self._signature_cache_id(s))
+        func = extract_sig(video_id, player_url, s)
+        self._print_sig_code(func, s)
+        return func(s)
+
+    def _decrypt_nsig(self, s, video_id, player_url):
+        """Turn the encrypted n field into a working signature"""
+        if player_url is None:
+            raise ExtractorError('Cannot decrypt nsig without player_url')
+        player_url = urljoin('https://www.youtube.com', player_url)
+
+        try:
+            jsi, player_id, func_code = self._extract_n_function_code(video_id, player_url)
+        except ExtractorError as e:
+            raise ExtractorError('Unable to extract nsig function code', cause=e)
+        if self.get_param('youtube_print_sig_code'):
+            self.to_screen(f'Extracted nsig function from {player_id}:\n{func_code[1]}\n')
+
+        try:
+            extract_nsig = self._cached(self._extract_n_function_from_code, 'nsig func', player_url)
+            ret = extract_nsig(jsi, func_code)(s)
+        except JSInterpreter.Exception as e:
+            try:
+                jsi = PhantomJSwrapper(self, timeout=5000)
+            except ExtractorError:
+                raise e
+            self.report_warning(
+                f'Native nsig extraction failed: Trying with PhantomJS\n'
+                f'         n = {s} ; player = {player_url}', video_id)
+            self.write_debug(e, only_once=True)
+
+            args, func_body = func_code
+            ret = jsi.execute(
+                f'console.log(function({", ".join(args)}) {{ {func_body} }}({s!r}));',
+                video_id=video_id, note='Executing signature code').strip()
+
+        self.write_debug(f'Decrypted nsig {s} => {ret}')
+        # Only cache nsig func JS code to disk if successful, and only once
+        self._store_player_data_to_cache('nsig', player_url, func_code)
+        return ret
+
+    def _extract_n_function_name(self, jscode, player_url=None):
+        varname, global_list = self._interpret_player_js_global_var(jscode, player_url)
+        if debug_str := traverse_obj(global_list, (lambda _, v: v.endswith('_w8_'), any)):
+            funcname = self._search_regex(
+                r'''(?xs)
+                    [;\n](?:
+                        (?P<f>function\s+)|
+                        (?:var\s+)?
+                    )(?P<funcname>[a-zA-Z0-9_$]+)\s*(?(f)|=\s*function\s*)
+                    \((?P<argname>[a-zA-Z0-9_$]+)\)\s*\{
+                    (?:(?!\}[;\n]).)+
+                    \}\s*catch\(\s*[a-zA-Z0-9_$]+\s*\)\s*
+                    \{\s*return\s+%s\[%d\]\s*\+\s*(?P=argname)\s*\}\s*return\s+[^}]+\}[;\n]
+                ''' % (re.escape(varname), global_list.index(debug_str)),
+                jscode, 'nsig function name', group='funcname', default=None)
+            if funcname:
+                return funcname
+            self.write_debug(join_nonempty(
+                'Initial search was unable to find nsig function name',
+                player_url and f'        player = {player_url}', delim='\n'), only_once=True)
+
+        # Examples (with placeholders nfunc, narray, idx):
+        # *  .get("n"))&&(b=nfunc(b)
+        # *  .get("n"))&&(b=narray[idx](b)
+        # *  b=String.fromCharCode(110),c=a.get(b))&&c=narray[idx](c)
+        # *  a.D&&(b="nn"[+a.D],c=a.get(b))&&(c=narray[idx](c),a.set(b,c),narray.length||nfunc("")
+        # *  a.D&&(PL(a),b=a.j.n||null)&&(b=narray[0](b),a.set("n",b),narray.length||nfunc("")
+        # *  a.D&&(b="nn"[+a.D],vL(a),c=a.j[b]||null)&&(c=narray[idx](c),a.set(b,c),narray.length||nfunc("")
+        # *  J.J="";J.url="";J.Z&&(R="nn"[+J.Z],mW(J),N=J.K[R]||null)&&(N=narray[idx](N),J.set(R,N))}};
+        funcname, idx = self._search_regex(
+            r'''(?x)
+            (?:
+                \.get\("n"\)\)&&\(b=|
+                (?:
+                    b=String\.fromCharCode\(110\)|
+                    (?P<str_idx>[a-zA-Z0-9_$.]+)&&\(b="nn"\[\+(?P=str_idx)\]
+                )
+                (?:
+                    ,[a-zA-Z0-9_$]+\(a\))?,c=a\.
+                    (?:
+                        get\(b\)|
+                        [a-zA-Z0-9_$]+\[b\]\|\|null
+                    )\)&&\(c=|
+                \b(?P<var>[a-zA-Z0-9_$]+)=
+            )(?P<nfunc>[a-zA-Z0-9_$]+)(?:\[(?P<idx>\d+)\])?\([a-zA-Z]\)
+            (?(var),[a-zA-Z0-9_$]+\.set\((?:"n+"|[a-zA-Z0-9_$]+)\,(?P=var)\))''',
+            jscode, 'n function name', group=('nfunc', 'idx'), default=(None, None))
+        if not funcname:
+            self.report_warning(join_nonempty(
+                'Falling back to generic n function search',
+                player_url and f'         player = {player_url}', delim='\n'), only_once=True)
+            return self._search_regex(
+                r'''(?xs)
+                ;\s*(?P<name>[a-zA-Z0-9_$]+)\s*=\s*function\([a-zA-Z0-9_$]+\)
+                \s*\{(?:(?!};).)+?return\s*(?P<q>["'])[\w-]+_w8_(?P=q)\s*\+\s*[a-zA-Z0-9_$]+''',
+                jscode, 'Initial JS player n function name', group='name')
+        elif not idx:
+            return funcname
+
+        return json.loads(js_to_json(self._search_regex(
+            rf'var {re.escape(funcname)}\s*=\s*(\[.+?\])\s*[,;]', jscode,
+            f'Initial JS player n function list ({funcname}.{idx})')))[int(idx)]
+
+    def _extract_player_js_global_var(self, jscode, player_url):
+        """Returns tuple of strings: variable assignment code, variable name, variable value code"""
+        extract_global_var = self._cached(self._search_regex, 'js global array', player_url)
+        varcode, varname, varvalue = extract_global_var(
+            r'''(?x)
+                (?P<q1>["\'])use\s+strict(?P=q1);\s*
+                (?P<code>
+                    var\s+(?P<name>[a-zA-Z0-9_$]+)\s*=\s*
+                    (?P<value>
+                        (?P<q2>["\'])(?:(?!(?P=q2)).|\\.)+(?P=q2)
+                        \.split\((?P<q3>["\'])(?:(?!(?P=q3)).)+(?P=q3)\)
+                        |\[\s*(?:(?P<q4>["\'])(?:(?!(?P=q4)).|\\.)*(?P=q4)\s*,?\s*)+\]
+                    )
+                )[;,]
+            ''', jscode, 'global variable', group=('code', 'name', 'value'), default=(None, None, None))
+        if not varcode:
+            self.write_debug(join_nonempty(
+                'No global array variable found in player JS',
+                player_url and f'        player = {player_url}', delim='\n'), only_once=True)
+        return varcode, varname, varvalue
+
+    def _interpret_player_js_global_var(self, jscode, player_url):
+        """Returns tuple of: variable name string, variable value list"""
+        _, varname, array_code = self._extract_player_js_global_var(jscode, player_url)
+        jsi = JSInterpreter(array_code)
+        interpret_global_var = self._cached(jsi.interpret_expression, 'js global list', player_url)
+        return varname, interpret_global_var(array_code, {}, allow_recursion=10)
+
+    def _fixup_n_function_code(self, argnames, nsig_code, jscode, player_url):
+        varcode, varname, _ = self._extract_player_js_global_var(jscode, player_url)
+        if varcode and varname:
+            nsig_code = varcode + '; ' + nsig_code
+            _, global_list = self._interpret_player_js_global_var(jscode, player_url)
+        else:
+            varname = 'dlp_wins'
+            global_list = []
+
+        undefined_idx = global_list.index('undefined') if 'undefined' in global_list else r'\d+'
+        fixed_code = re.sub(
+            rf'''(?x)
+                ;\s*if\s*\(\s*typeof\s+[a-zA-Z0-9_$]+\s*===?\s*(?:
+                    (["\'])undefined\1|
+                    {re.escape(varname)}\[{undefined_idx}\]
+                )\s*\)\s*return\s+{re.escape(argnames[0])};
+            ''', ';', nsig_code)
+        if fixed_code == nsig_code:
+            self.write_debug(join_nonempty(
+                'No typeof statement found in nsig function code',
+                player_url and f'        player = {player_url}', delim='\n'), only_once=True)
+        return argnames, fixed_code
+
+    def _extract_n_function_code(self, video_id, player_url):
+        player_id = self._extract_player_info(player_url)
+        func_code = self._load_player_data_from_cache('nsig', player_url)
+        jscode = func_code or self._load_player(video_id, player_url)
+        jsi = JSInterpreter(jscode)
+
+        if func_code:
+            return jsi, player_id, func_code
+
+        func_name = self._extract_n_function_name(jscode, player_url=player_url)
+
+        # XXX: Workaround for the global array variable and lack of `typeof` implementation
+        func_code = self._fixup_n_function_code(*jsi.extract_function_code(func_name), jscode, player_url)
+
+        return jsi, player_id, func_code
+
+    def _extract_n_function_from_code(self, jsi, func_code):
+        func = jsi.extract_function_from_code(*func_code)
+
+        def extract_nsig(s):
+            try:
+                ret = func([s])
+            except JSInterpreter.Exception:
+                raise
+            except Exception as e:
+                raise JSInterpreter.Exception(traceback.format_exc(), cause=e)
+
+            if ret.startswith('enhanced_except_') or ret.endswith(s):
+                raise JSInterpreter.Exception('Signature function returned an exception')
+            return ret
+
+        return extract_nsig
+
+    def _extract_signature_timestamp(self, video_id, player_url, ytcfg=None, fatal=False):
+        """
+        Extract signatureTimestamp (sts)
+        Required to tell API what sig/player version is in use.
+        """
+        if sts := traverse_obj(ytcfg, ('STS', {int_or_none})):
+            return sts
+
+        if not player_url:
+            error_msg = 'Cannot extract signature timestamp without player url'
+            if fatal:
+                raise ExtractorError(error_msg)
+            self.report_warning(error_msg)
+            return None
+
+        sts = self._load_player_data_from_cache('sts', player_url)
+        if sts:
+            return sts
+
+        if code := self._load_player(video_id, player_url, fatal=fatal):
+            sts = int_or_none(self._search_regex(
+                r'(?:signatureTimestamp|sts)\s*:\s*(?P<sts>[0-9]{5})', code,
+                'JS player signature timestamp', group='sts', fatal=fatal))
+            if sts:
+                self._store_player_data_to_cache('sts', player_url, sts)
+
+        return sts
+
+    def _mark_watched(self, video_id, player_responses):
+        for is_full, key in enumerate(('videostatsPlaybackUrl', 'videostatsWatchtimeUrl')):
+            label = 'fully ' if is_full else ''
+            url = get_first(player_responses, ('playbackTracking', key, 'baseUrl'),
+                            expected_type=url_or_none)
+            if not url:
+                self.report_warning(f'Unable to mark {label}watched')
+                return
+            parsed_url = urllib.parse.urlparse(url)
+            qs = urllib.parse.parse_qs(parsed_url.query)
+
+            # cpn generation algorithm is reverse engineered from base.js.
+            # In fact it works even with dummy cpn.
+            CPN_ALPHABET = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_'
+            cpn = ''.join(CPN_ALPHABET[random.randint(0, 256) & 63] for _ in range(16))
+
+            # # more consistent results setting it to right before the end
+            video_length = [str(float((qs.get('len') or ['1.5'])[0]) - 1)]
+
+            qs.update({
+                'ver': ['2'],
+                'cpn': [cpn],
+                'cmt': video_length,
+                'el': 'detailpage',  # otherwise defaults to "shorts"
+            })
+
+            if is_full:
+                # these seem to mark watchtime "history" in the real world
+                # they're required, so send in a single value
+                qs.update({
+                    'st': 0,
+                    'et': video_length,
+                })
+
+            url = urllib.parse.urlunparse(
+                parsed_url._replace(query=urllib.parse.urlencode(qs, True)))
+
+            self._download_webpage(
+                url, video_id, f'Marking {label}watched',
+                'Unable to mark watched', fatal=False)
+
+    @classmethod
+    def _extract_from_webpage(cls, url, webpage):
+        # Invidious Instances
+        # https://github.com/yt-dlp/yt-dlp/issues/195
+        # https://github.com/iv-org/invidious/pull/1730
+        mobj = re.search(
+            r'<link rel="alternate" href="(?P<url>https://www\.youtube\.com/watch\?v=[0-9A-Za-z_-]{11})"',
+            webpage)
+        if mobj:
+            yield cls.url_result(mobj.group('url'), cls)
+            raise cls.StopExtraction
+
+        yield from super()._extract_from_webpage(url, webpage)
+
+        # lazyYT YouTube embed
+        for id_ in re.findall(r'class="lazyYT" data-youtube-id="([^"]+)"', webpage):
+            yield cls.url_result(unescapeHTML(id_), cls, id_)
+
+        # Wordpress "YouTube Video Importer" plugin
+        for m in re.findall(r'''(?x)<div[^>]+
+                class=(?P<q1>[\'"])[^\'"]*\byvii_single_video_player\b[^\'"]*(?P=q1)[^>]+
+                data-video_id=(?P<q2>[\'"])([^\'"]+)(?P=q2)''', webpage):
+            yield cls.url_result(m[-1], cls, m[-1])
+
+    @classmethod
+    def extract_id(cls, url):
+        video_id = cls.get_temp_id(url)
+        if not video_id:
+            raise ExtractorError(f'Invalid URL: {url}')
+        return video_id
+
+    def _extract_chapters_from_json(self, data, duration):
+        chapter_list = traverse_obj(
+            data, (
+                'playerOverlays', 'playerOverlayRenderer', 'decoratedPlayerBarRenderer',
+                'decoratedPlayerBarRenderer', 'playerBar', 'chapteredPlayerBarRenderer', 'chapters',
+            ), expected_type=list)
+
+        return self._extract_chapters_helper(
+            chapter_list,
+            start_function=lambda chapter: float_or_none(
+                traverse_obj(chapter, ('chapterRenderer', 'timeRangeStartMillis')), scale=1000),
+            title_function=lambda chapter: traverse_obj(
+                chapter, ('chapterRenderer', 'title', 'simpleText'), expected_type=str),
+            duration=duration)
+
+    def _extract_chapters_from_engagement_panel(self, data, duration):
+        content_list = traverse_obj(
+            data,
+            ('engagementPanels', ..., 'engagementPanelSectionListRenderer', 'content', 'macroMarkersListRenderer', 'contents'),
+            expected_type=list)
+        chapter_time = lambda chapter: parse_duration(self._get_text(chapter, 'timeDescription'))
+        chapter_title = lambda chapter: self._get_text(chapter, 'title')
+
+        return next(filter(None, (
+            self._extract_chapters_helper(traverse_obj(contents, (..., 'macroMarkersListItemRenderer')),
+                                          chapter_time, chapter_title, duration)
+            for contents in content_list)), [])
+
+    def _extract_heatmap(self, data):
+        return traverse_obj(data, (
+            'frameworkUpdates', 'entityBatchUpdate', 'mutations',
+            lambda _, v: v['payload']['macroMarkersListEntity']['markersList']['markerType'] == 'MARKER_TYPE_HEATMAP',
+            'payload', 'macroMarkersListEntity', 'markersList', 'markers', ..., {
+                'start_time': ('startMillis', {float_or_none(scale=1000)}),
+                'end_time': {lambda x: (int(x['startMillis']) + int(x['durationMillis'])) / 1000},
+                'value': ('intensityScoreNormalized', {float_or_none}),
+            })) or None
+
+    def _extract_comment(self, entities, parent=None):
+        comment_entity_payload = get_first(entities, ('payload', 'commentEntityPayload', {dict}))
+        if not (comment_id := traverse_obj(comment_entity_payload, ('properties', 'commentId', {str}))):
+            return
+
+        toolbar_entity_payload = get_first(entities, ('payload', 'engagementToolbarStateEntityPayload', {dict}))
+        time_text = traverse_obj(comment_entity_payload, ('properties', 'publishedTime', {str})) or ''
+
+        return {
+            'id': comment_id,
+            'parent': parent or 'root',
+            **traverse_obj(comment_entity_payload, {
+                'text': ('properties', 'content', 'content', {str}),
+                'like_count': ('toolbar', 'likeCountA11y', {parse_count}),
+                'author_id': ('author', 'channelId', {self.ucid_or_none}),
+                'author': ('author', 'displayName', {str}),
+                'author_thumbnail': ('author', 'avatarThumbnailUrl', {url_or_none}),
+                'author_is_uploader': ('author', 'isCreator', {bool}),
+                'author_is_verified': ('author', 'isVerified', {bool}),
+                'author_url': ('author', 'channelCommand', 'innertubeCommand', (
+                    ('browseEndpoint', 'canonicalBaseUrl'), ('commandMetadata', 'webCommandMetadata', 'url'),
+                ), {urljoin('https://www.youtube.com')}),
+            }, get_all=False),
+            'is_favorited': (None if toolbar_entity_payload is None else
+                             toolbar_entity_payload.get('heartState') == 'TOOLBAR_HEART_STATE_HEARTED'),
+            '_time_text': time_text,  # FIXME: non-standard, but we need a way of showing that it is an estimate.
+            'timestamp': self._parse_time_text(time_text),
+        }
+
+    def _extract_comment_old(self, comment_renderer, parent=None):
+        comment_id = comment_renderer.get('commentId')
+        if not comment_id:
+            return
+
+        info = {
+            'id': comment_id,
+            'text': self._get_text(comment_renderer, 'contentText'),
+            'like_count': self._get_count(comment_renderer, 'voteCount'),
+            'author_id': traverse_obj(comment_renderer, ('authorEndpoint', 'browseEndpoint', 'browseId', {self.ucid_or_none})),
+            'author': self._get_text(comment_renderer, 'authorText'),
+            'author_thumbnail': traverse_obj(comment_renderer, ('authorThumbnail', 'thumbnails', -1, 'url', {url_or_none})),
+            'parent': parent or 'root',
+        }
+
+        # Timestamp is an estimate calculated from the current time and time_text
+        time_text = self._get_text(comment_renderer, 'publishedTimeText') or ''
+        timestamp = self._parse_time_text(time_text)
+
+        info.update({
+            # FIXME: non-standard, but we need a way of showing that it is an estimate.
+            '_time_text': time_text,
+            'timestamp': timestamp,
+        })
+
+        info['author_url'] = urljoin(
+            'https://www.youtube.com', traverse_obj(comment_renderer, ('authorEndpoint', (
+                ('browseEndpoint', 'canonicalBaseUrl'), ('commandMetadata', 'webCommandMetadata', 'url'))),
+                expected_type=str, get_all=False))
+
+        author_is_uploader = traverse_obj(comment_renderer, 'authorIsChannelOwner')
+        if author_is_uploader is not None:
+            info['author_is_uploader'] = author_is_uploader
+
+        comment_abr = traverse_obj(
+            comment_renderer, ('actionButtons', 'commentActionButtonsRenderer'), expected_type=dict)
+        if comment_abr is not None:
+            info['is_favorited'] = 'creatorHeart' in comment_abr
+
+        badges = self._extract_badges([traverse_obj(comment_renderer, 'authorCommentBadge')])
+        if self._has_badge(badges, BadgeType.VERIFIED):
+            info['author_is_verified'] = True
+
+        is_pinned = traverse_obj(comment_renderer, 'pinnedCommentBadge')
+        if is_pinned:
+            info['is_pinned'] = True
+
+        return info
+
+    def _comment_entries(self, root_continuation_data, ytcfg, video_id, parent=None, tracker=None):
+
+        get_single_config_arg = lambda c: self._configuration_arg(c, [''])[0]
+
+        def extract_header(contents):
+            _continuation = None
+            for content in contents:
+                comments_header_renderer = traverse_obj(content, 'commentsHeaderRenderer')
+                expected_comment_count = self._get_count(
+                    comments_header_renderer, 'countText', 'commentsCount')
+
+                if expected_comment_count is not None:
+                    tracker['est_total'] = expected_comment_count
+                    self.to_screen(f'Downloading ~{expected_comment_count} comments')
+                comment_sort_index = int(get_single_config_arg('comment_sort') != 'top')  # 1 = new, 0 = top
+
+                sort_menu_item = try_get(
+                    comments_header_renderer,
+                    lambda x: x['sortMenu']['sortFilterSubMenuRenderer']['subMenuItems'][comment_sort_index], dict) or {}
+                sort_continuation_ep = sort_menu_item.get('serviceEndpoint') or {}
+
+                _continuation = self._extract_continuation_ep_data(sort_continuation_ep) or self._extract_continuation(sort_menu_item)
+                if not _continuation:
+                    continue
+
+                sort_text = str_or_none(sort_menu_item.get('title'))
+                if not sort_text:
+                    sort_text = 'top comments' if comment_sort_index == 0 else 'newest first'
+                self.to_screen(f'Sorting comments by {sort_text.lower()}')
+                break
+            return _continuation
+
+        def extract_thread(contents, entity_payloads):
+            if not parent:
+                tracker['current_page_thread'] = 0
+            for content in contents:
+                if not parent and tracker['total_parent_comments'] >= max_parents:
+                    yield
+                comment_thread_renderer = try_get(content, lambda x: x['commentThreadRenderer'])
+
+                # old comment format
+                if not entity_payloads:
+                    comment_renderer = get_first(
+                        (comment_thread_renderer, content), [['commentRenderer', ('comment', 'commentRenderer')]],
+                        expected_type=dict, default={})
+
+                    comment = self._extract_comment_old(comment_renderer, parent)
+
+                # new comment format
+                else:
+                    view_model = (
+                        traverse_obj(comment_thread_renderer, ('commentViewModel', 'commentViewModel', {dict}))
+                        or traverse_obj(content, ('commentViewModel', {dict})))
+                    comment_keys = traverse_obj(view_model, (('commentKey', 'toolbarStateKey'), {str}))
+                    if not comment_keys:
+                        continue
+                    entities = traverse_obj(entity_payloads, lambda _, v: v['entityKey'] in comment_keys)
+                    comment = self._extract_comment(entities, parent)
+                    if comment:
+                        comment['is_pinned'] = traverse_obj(view_model, ('pinnedText', {str})) is not None
+
+                if not comment:
+                    continue
+                comment_id = comment['id']
+
+                if comment.get('is_pinned'):
+                    tracker['pinned_comment_ids'].add(comment_id)
+                # Sometimes YouTube may break and give us infinite looping comments.
+                # See: https://github.com/yt-dlp/yt-dlp/issues/6290
+                if comment_id in tracker['seen_comment_ids']:
+                    if comment_id in tracker['pinned_comment_ids'] and not comment.get('is_pinned'):
+                        # Pinned comments may appear a second time in newest first sort
+                        # See: https://github.com/yt-dlp/yt-dlp/issues/6712
+                        continue
+                    self.report_warning(
+                        'Detected YouTube comments looping. Stopping comment extraction '
+                        f'{"for this thread" if parent else ""} as we probably cannot get any more.')
+                    yield
+                else:
+                    tracker['seen_comment_ids'].add(comment['id'])
+
+                tracker['running_total'] += 1
+                tracker['total_reply_comments' if parent else 'total_parent_comments'] += 1
+                yield comment
+
+                # Attempt to get the replies
+                comment_replies_renderer = try_get(
+                    comment_thread_renderer, lambda x: x['replies']['commentRepliesRenderer'], dict)
+
+                if comment_replies_renderer:
+                    tracker['current_page_thread'] += 1
+                    comment_entries_iter = self._comment_entries(
+                        comment_replies_renderer, ytcfg, video_id,
+                        parent=comment.get('id'), tracker=tracker)
+                    yield from itertools.islice(comment_entries_iter, min(
+                        max_replies_per_thread, max(0, max_replies - tracker['total_reply_comments'])))
+
+        # Keeps track of counts across recursive calls
+        if not tracker:
+            tracker = {
+                'running_total': 0,
+                'est_total': None,
+                'current_page_thread': 0,
+                'total_parent_comments': 0,
+                'total_reply_comments': 0,
+                'seen_comment_ids': set(),
+                'pinned_comment_ids': set(),
+            }
+
+        # TODO: Deprecated
+        # YouTube comments have a max depth of 2
+        max_depth = int_or_none(get_single_config_arg('max_comment_depth'))
+        if max_depth:
+            self._downloader.deprecated_feature('[youtube] max_comment_depth extractor argument is deprecated. '
+                                                'Set max replies in the max-comments extractor argument instead')
+        if max_depth == 1 and parent:
+            return
+
+        max_comments, max_parents, max_replies, max_replies_per_thread, *_ = (
+            int_or_none(p, default=sys.maxsize) for p in self._configuration_arg('max_comments') + [''] * 4)
+
+        continuation = self._extract_continuation(root_continuation_data)
+
+        response = None
+        is_forced_continuation = False
+        is_first_continuation = parent is None
+        if is_first_continuation and not continuation:
+            # Sometimes you can get comments by generating the continuation yourself,
+            # even if YouTube initially reports them being disabled - e.g. stories comments.
+            # Note: if the comment section is actually disabled, YouTube may return a response with
+            # required check_get_keys missing. So we will disable that check initially in this case.
+            continuation = self._build_api_continuation_query(self._generate_comment_continuation(video_id))
+            is_forced_continuation = True
+
+        continuation_items_path = (
+            'onResponseReceivedEndpoints', ..., ('reloadContinuationItemsCommand', 'appendContinuationItemsAction'), 'continuationItems')
+        for page_num in itertools.count(0):
+            if not continuation:
+                break
+            headers = self.generate_api_headers(ytcfg=ytcfg, visitor_data=self._extract_visitor_data(response))
+            comment_prog_str = f"({tracker['running_total']}/~{tracker['est_total']})"
+            if page_num == 0:
+                if is_first_continuation:
+                    note_prefix = 'Downloading comment section API JSON'
+                else:
+                    note_prefix = '    Downloading comment API JSON reply thread %d %s' % (
+                        tracker['current_page_thread'], comment_prog_str)
+            else:
+                note_prefix = '{}Downloading comment{} API JSON page {} {}'.format(
+                    '       ' if parent else '', ' replies' if parent else '',
+                    page_num, comment_prog_str)
+
+            # Do a deep check for incomplete data as sometimes YouTube may return no comments for a continuation
+            # Ignore check if YouTube says the comment count is 0.
+            check_get_keys = None
+            if not is_forced_continuation and not (tracker['est_total'] == 0 and tracker['running_total'] == 0):
+                check_get_keys = [[*continuation_items_path, ..., (
+                    'commentsHeaderRenderer' if is_first_continuation else ('commentThreadRenderer', 'commentViewModel', 'commentRenderer'))]]
+            try:
+                response = self._extract_response(
+                    item_id=None, query=continuation,
+                    ep='next', ytcfg=ytcfg, headers=headers, note=note_prefix,
+                    check_get_keys=check_get_keys)
+            except ExtractorError as e:
+                # Ignore incomplete data error for replies if retries didn't work.
+                # This is to allow any other parent comments and comment threads to be downloaded.
+                # See: https://github.com/yt-dlp/yt-dlp/issues/4669
+                if 'incomplete data' in str(e).lower() and parent:
+                    if self.get_param('ignoreerrors') in (True, 'only_download'):
+                        self.report_warning(
+                            'Received incomplete data for a comment reply thread and retrying did not help. '
+                            'Ignoring to let other comments be downloaded. Pass --no-ignore-errors to not ignore.')
+                        return
+                    else:
+                        raise ExtractorError(
+                            'Incomplete data received for comment reply thread. '
+                            'Pass --ignore-errors to ignore and allow rest of comments to download.',
+                            expected=True)
+                raise
+            is_forced_continuation = False
+            continuation = None
+            mutations = traverse_obj(response, ('frameworkUpdates', 'entityBatchUpdate', 'mutations', ..., {dict}))
+            for continuation_items in traverse_obj(response, continuation_items_path, expected_type=list, default=[]):
+                if is_first_continuation:
+                    continuation = extract_header(continuation_items)
+                    is_first_continuation = False
+                    if continuation:
+                        break
+                    continue
+
+                for entry in extract_thread(continuation_items, mutations):
+                    if not entry:
+                        return
+                    yield entry
+                continuation = self._extract_continuation({'contents': continuation_items})
+                if continuation:
+                    break
+
+        message = self._get_text(root_continuation_data, ('contents', ..., 'messageRenderer', 'text'), max_runs=1)
+        if message and not parent and tracker['running_total'] == 0:
+            self.report_warning(f'Youtube said: {message}', video_id=video_id, only_once=True)
+            raise self.CommentsDisabled
+
+    @staticmethod
+    def _generate_comment_continuation(video_id):
+        """
+        Generates initial comment section continuation token from given video id
+        """
+        token = f'\x12\r\x12\x0b{video_id}\x18\x062\'"\x11"\x0b{video_id}0\x00x\x020\x00B\x10comments-section'
+        return base64.b64encode(token.encode()).decode()
+
+    def _get_comments(self, ytcfg, video_id, contents, webpage):
+        """Entry for comment extraction"""
+        def _real_comment_extract(contents):
+            renderer = next((
+                item for item in traverse_obj(contents, (..., 'itemSectionRenderer'), default={})
+                if item.get('sectionIdentifier') == 'comment-item-section'), None)
+            yield from self._comment_entries(renderer, ytcfg, video_id)
+
+        max_comments = int_or_none(self._configuration_arg('max_comments', [''])[0])
+        return itertools.islice(_real_comment_extract(contents), 0, max_comments)
+
+    @staticmethod
+    def _get_checkok_params():
+        return {'contentCheckOk': True, 'racyCheckOk': True}
+
+    @classmethod
+    def _generate_player_context(cls, sts=None):
+        context = {
+            'html5Preference': 'HTML5_PREF_WANTS',
+        }
+        if sts is not None:
+            context['signatureTimestamp'] = sts
+        return {
+            'playbackContext': {
+                'contentPlaybackContext': context,
+            },
+            **cls._get_checkok_params(),
+        }
+
+    def _get_config_po_token(self, client: str, context: _PoTokenContext):
+        po_token_strs = self._configuration_arg('po_token', [], ie_key=YoutubeIE, casesense=True)
+        for token_str in po_token_strs:
+            po_token_meta, sep, po_token = token_str.partition('+')
+            if not sep:
+                self.report_warning(
+                    f'Invalid po_token configuration format. '
+                    f'Expected "CLIENT.CONTEXT+PO_TOKEN", got "{token_str}"', only_once=True)
+                continue
+
+            po_token_client, sep, po_token_context = po_token_meta.partition('.')
+            if po_token_client.lower() != client:
+                continue
+
+            if not sep:
+                # TODO(future): deprecate the old format?
+                self.write_debug(
+                    f'po_token configuration for {client} client is missing a context; assuming GVS. '
+                    'You can provide a context with the format "CLIENT.CONTEXT+PO_TOKEN"',
+                    only_once=True)
+                po_token_context = _PoTokenContext.GVS.value
+
+            if po_token_context.lower() != context.value:
+                continue
+
+            # Clean and validate the PO Token. This will strip invalid characters off
+            # (e.g. additional url params the user may accidentally include)
+            try:
+                return base64.urlsafe_b64encode(base64.urlsafe_b64decode(urllib.parse.unquote(po_token))).decode()
+            except (binascii.Error, ValueError):
+                self.report_warning(
+                    f'Invalid po_token configuration for {client} client: '
+                    f'{po_token_context} PO Token should be a base64url-encoded string.',
+                    only_once=True)
+                continue
+
+    def fetch_po_token(self, client='web', context=_PoTokenContext.GVS, ytcfg=None, visitor_data=None,
+                       data_sync_id=None, session_index=None, player_url=None, video_id=None, **kwargs):
+        """
+        Fetch a PO Token for a given client and context. This function will validate required parameters for a given context and client.
+
+        EXPERIMENTAL: This method is unstable and may change or be removed without notice.
+
+        @param client: The client to fetch the PO Token for.
+        @param context: The context in which the PO Token is used.
+        @param ytcfg: The ytcfg for the client.
+        @param visitor_data: visitor data.
+        @param data_sync_id: data sync ID.
+        @param session_index: session index.
+        @param player_url: player URL.
+        @param video_id: video ID.
+        @param kwargs: Additional arguments to pass down. May be more added in the future.
+        @return: The fetched PO Token. None if it could not be fetched.
+        """
+
+        # GVS WebPO Token is bound to visitor_data / Visitor ID when logged out.
+        # Must have visitor_data for it to function.
+        if player_url and context == _PoTokenContext.GVS and not visitor_data and not self.is_authenticated:
+            self.report_warning(
+                f'Unable to fetch GVS PO Token for {client} client: Missing required Visitor Data. '
+                f'You may need to pass Visitor Data with --extractor-args "youtube:visitor_data=XXX"')
+            return
+
+        if context == _PoTokenContext.PLAYER and not video_id:
+            self.report_warning(
+                f'Unable to fetch Player PO Token for {client} client: Missing required Video ID')
+            return
+
+        config_po_token = self._get_config_po_token(client, context)
+        if config_po_token:
+            # GVS WebPO token is bound to data_sync_id / account Session ID when logged in.
+            if player_url and context == _PoTokenContext.GVS and not data_sync_id and self.is_authenticated:
+                self.report_warning(
+                    f'Got a GVS PO Token for {client} client, but missing Data Sync ID for account. Formats may not work.'
+                    f'You may need to pass a Data Sync ID with --extractor-args "youtube:data_sync_id=XXX"')
+
+            return config_po_token
+
+        # Require GVS WebPO Token if logged in for external fetching
+        if player_url and context == _PoTokenContext.GVS and not data_sync_id and self.is_authenticated:
+            self.report_warning(
+                f'Unable to fetch GVS PO Token for {client} client: Missing required Data Sync ID for account. '
+                f'You may need to pass a Data Sync ID with --extractor-args "youtube:data_sync_id=XXX"')
+            return
+
+        return self._fetch_po_token(
+            client=client,
+            context=context.value,
+            ytcfg=ytcfg,
+            visitor_data=visitor_data,
+            data_sync_id=data_sync_id,
+            session_index=session_index,
+            player_url=player_url,
+            video_id=video_id,
+            **kwargs,
+        )
+
+    def _fetch_po_token(self, client, **kwargs):
+        """(Unstable) External PO Token fetch stub"""
+
+    @staticmethod
+    def _is_agegated(player_response):
+        if traverse_obj(player_response, ('playabilityStatus', 'desktopLegacyAgeGateReason')):
+            return True
+
+        reasons = traverse_obj(player_response, ('playabilityStatus', ('status', 'reason')))
+        AGE_GATE_REASONS = (
+            'confirm your age', 'age-restricted', 'inappropriate',  # reason
+            'age_verification_required', 'age_check_required',  # status
+        )
+        return any(expected in reason for expected in AGE_GATE_REASONS for reason in reasons)
+
+    @staticmethod
+    def _is_unplayable(player_response):
+        return traverse_obj(player_response, ('playabilityStatus', 'status')) == 'UNPLAYABLE'
+
+    def _extract_player_response(self, client, video_id, master_ytcfg, player_ytcfg, player_url, initial_pr, visitor_data, data_sync_id, po_token):
+        headers = self.generate_api_headers(
+            ytcfg=player_ytcfg,
+            default_client=client,
+            visitor_data=visitor_data,
+            session_index=self._extract_session_index(master_ytcfg, player_ytcfg),
+            delegated_session_id=(
+                self._parse_data_sync_id(data_sync_id)[0]
+                or self._extract_delegated_session_id(master_ytcfg, initial_pr, player_ytcfg)
+            ),
+            user_session_id=(
+                self._parse_data_sync_id(data_sync_id)[1]
+                or self._extract_user_session_id(master_ytcfg, initial_pr, player_ytcfg)
+            ),
+        )
+
+        yt_query = {
+            'videoId': video_id,
+        }
+
+        default_pp = traverse_obj(
+            INNERTUBE_CLIENTS, (_split_innertube_client(client)[0], 'PLAYER_PARAMS', {str}))
+        if player_params := self._configuration_arg('player_params', [default_pp], casesense=True)[0]:
+            yt_query['params'] = player_params
+
+        if po_token:
+            yt_query['serviceIntegrityDimensions'] = {'poToken': po_token}
+
+        sts = self._extract_signature_timestamp(video_id, player_url, master_ytcfg, fatal=False) if player_url else None
+        yt_query.update(self._generate_player_context(sts))
+        return self._extract_response(
+            item_id=video_id, ep='player', query=yt_query,
+            ytcfg=player_ytcfg, headers=headers, fatal=True,
+            default_client=client,
+            note='Downloading {} player API JSON'.format(client.replace('_', ' ').strip()),
+        ) or None
+
+    def _get_requested_clients(self, url, smuggled_data):
+        requested_clients = []
+        excluded_clients = []
+        default_clients = self._DEFAULT_AUTHED_CLIENTS if self.is_authenticated else self._DEFAULT_CLIENTS
+        allowed_clients = sorted(
+            (client for client in INNERTUBE_CLIENTS if client[:1] != '_'),
+            key=lambda client: INNERTUBE_CLIENTS[client]['priority'], reverse=True)
+        for client in self._configuration_arg('player_client'):
+            if client == 'default':
+                requested_clients.extend(default_clients)
+            elif client == 'all':
+                requested_clients.extend(allowed_clients)
+            elif client.startswith('-'):
+                excluded_clients.append(client[1:])
+            elif client not in allowed_clients:
+                self.report_warning(f'Skipping unsupported client "{client}"')
+            else:
+                requested_clients.append(client)
+        if not requested_clients:
+            requested_clients.extend(default_clients)
+        for excluded_client in excluded_clients:
+            if excluded_client in requested_clients:
+                requested_clients.remove(excluded_client)
+        if not requested_clients:
+            raise ExtractorError('No player clients have been requested', expected=True)
+
+        if self.is_authenticated:
+            if (smuggled_data.get('is_music_url') or self.is_music_url(url)) and 'web_music' not in requested_clients:
+                requested_clients.append('web_music')
+
+            unsupported_clients = [
+                client for client in requested_clients if not INNERTUBE_CLIENTS[client]['SUPPORTS_COOKIES']
+            ]
+            for client in unsupported_clients:
+                self.report_warning(f'Skipping client "{client}" since it does not support cookies', only_once=True)
+                requested_clients.remove(client)
+
+        return orderedSet(requested_clients)
+
+    def _invalid_player_response(self, pr, video_id):
+        # YouTube may return a different video player response than expected.
+        # See: https://github.com/TeamNewPipe/NewPipe/issues/8713
+        if (pr_id := traverse_obj(pr, ('videoDetails', 'videoId'))) != video_id:
+            return pr_id
+
+    def _extract_player_responses(self, clients, video_id, webpage, master_ytcfg, smuggled_data):
+        initial_pr = None
+        if webpage:
+            initial_pr = self._search_json(
+                self._YT_INITIAL_PLAYER_RESPONSE_RE, webpage, 'initial player response', video_id, fatal=False)
+
+        prs = []
+        deprioritized_prs = []
+
+        if initial_pr and not self._invalid_player_response(initial_pr, video_id):
+            # Android player_response does not have microFormats which are needed for
+            # extraction of some data. So we return the initial_pr with formats
+            # stripped out even if not requested by the user
+            # See: https://github.com/yt-dlp/yt-dlp/issues/501
+            prs.append({**initial_pr, 'streamingData': None})
+
+        all_clients = set(clients)
+        clients = clients[::-1]
+
+        def append_client(*client_names):
+            """ Append the first client name that exists but not already used """
+            for client_name in client_names:
+                actual_client = _split_innertube_client(client_name)[0]
+                if actual_client in INNERTUBE_CLIENTS:
+                    if actual_client not in all_clients:
+                        clients.append(client_name)
+                        all_clients.add(actual_client)
+                        return
+
+        tried_iframe_fallback = False
+        player_url = visitor_data = data_sync_id = None
+        skipped_clients = {}
+        while clients:
+            deprioritize_pr = False
+            client, base_client, variant = _split_innertube_client(clients.pop())
+            player_ytcfg = master_ytcfg if client == 'web' else {}
+            if 'configs' not in self._configuration_arg('player_skip') and client != 'web':
+                player_ytcfg = self._download_ytcfg(client, video_id) or player_ytcfg
+
+            player_url = player_url or self._extract_player_url(master_ytcfg, player_ytcfg, webpage=webpage)
+            require_js_player = self._get_default_ytcfg(client).get('REQUIRE_JS_PLAYER')
+            if 'js' in self._configuration_arg('player_skip'):
+                require_js_player = False
+                player_url = None
+
+            if not player_url and not tried_iframe_fallback and require_js_player:
+                player_url = self._download_player_url(video_id)
+                tried_iframe_fallback = True
+
+            visitor_data = visitor_data or self._extract_visitor_data(master_ytcfg, initial_pr, player_ytcfg)
+            data_sync_id = data_sync_id or self._extract_data_sync_id(master_ytcfg, initial_pr, player_ytcfg)
+
+            fetch_po_token_args = {
+                'client': client,
+                'visitor_data': visitor_data,
+                'video_id': video_id,
+                'data_sync_id': data_sync_id if self.is_authenticated else None,
+                'player_url': player_url if require_js_player else None,
+                'session_index': self._extract_session_index(master_ytcfg, player_ytcfg),
+                'ytcfg': player_ytcfg,
+            }
+
+            player_po_token = self.fetch_po_token(
+                context=_PoTokenContext.PLAYER, **fetch_po_token_args)
+
+            gvs_po_token = self.fetch_po_token(
+                context=_PoTokenContext.GVS, **fetch_po_token_args)
+
+            required_pot_contexts = self._get_default_ytcfg(client)['PO_TOKEN_REQUIRED_CONTEXTS']
+
+            if (
+                not player_po_token
+                and _PoTokenContext.PLAYER in required_pot_contexts
+            ):
+                # TODO: may need to skip player response request. Unsure yet..
+                self.report_warning(
+                    f'No Player PO Token provided for {client} client, '
+                    f'which may be required for working {client} formats. This client will be deprioritized'
+                    f'You can manually pass a Player PO Token for this client with --extractor-args "youtube:po_token={client}.player+XXX". '
+                    f'For more information, refer to {PO_TOKEN_GUIDE_URL} .', only_once=True)
+                deprioritize_pr = True
+
+            if (
+                not gvs_po_token
+                and _PoTokenContext.GVS in required_pot_contexts
+                and 'missing_pot' in self._configuration_arg('formats')
+            ):
+                # note: warning with help message is provided later during format processing
+                self.report_warning(
+                    f'No GVS PO Token provided for {client} client, '
+                    f'which may be required for working {client} formats. This client will be deprioritized',
+                    only_once=True)
+                deprioritize_pr = True
+
+            pr = initial_pr if client == 'web' else None
+            try:
+                pr = pr or self._extract_player_response(
+                    client, video_id,
+                    master_ytcfg=player_ytcfg or master_ytcfg,
+                    player_ytcfg=player_ytcfg,
+                    player_url=player_url,
+                    initial_pr=initial_pr,
+                    visitor_data=visitor_data,
+                    data_sync_id=data_sync_id,
+                    po_token=player_po_token)
+            except ExtractorError as e:
+                self.report_warning(e)
+                continue
+
+            if pr_id := self._invalid_player_response(pr, video_id):
+                skipped_clients[client] = pr_id
+            elif pr:
+                # Save client name for introspection later
+                sd = traverse_obj(pr, ('streamingData', {dict})) or {}
+                sd[STREAMING_DATA_CLIENT_NAME] = client
+                sd[STREAMING_DATA_INITIAL_PO_TOKEN] = gvs_po_token
+                for f in traverse_obj(sd, (('formats', 'adaptiveFormats'), ..., {dict})):
+                    f[STREAMING_DATA_CLIENT_NAME] = client
+                    f[STREAMING_DATA_INITIAL_PO_TOKEN] = gvs_po_token
+                if deprioritize_pr:
+                    deprioritized_prs.append(pr)
+                else:
+                    prs.append(pr)
+
+            # EU countries require age-verification for accounts to access age-restricted videos
+            # If account is not age-verified, _is_agegated() will be truthy for non-embedded clients
+            if self.is_authenticated and self._is_agegated(pr):
+                self.to_screen(
+                    f'{video_id}: This video is age-restricted and YouTube is requiring '
+                    'account age-verification; some formats may be missing', only_once=True)
+                # tv_embedded can work around the age-verification requirement for embeddable videos
+                # web_creator may work around age-verification for all videos but requires PO token
+                append_client('tv_embedded', 'web_creator')
+
+        prs.extend(deprioritized_prs)
+
+        if skipped_clients:
+            self.report_warning(
+                f'Skipping player responses from {"/".join(skipped_clients)} clients '
+                f'(got player responses for video "{"/".join(set(skipped_clients.values()))}" instead of "{video_id}")')
+            if not prs:
+                raise ExtractorError(
+                    'All player responses are invalid. Your IP is likely being blocked by Youtube', expected=True)
+        elif not prs:
+            raise ExtractorError('Failed to extract any player response')
+        return prs, player_url
+
+    def _needs_live_processing(self, live_status, duration):
+        if ((live_status == 'is_live' and self.get_param('live_from_start'))
+                or (live_status == 'post_live' and (duration or 0) > 2 * 3600)):
+            return live_status
+
+    def _report_pot_format_skipped(self, video_id, client_name, proto):
+        msg = (
+            f'{video_id}: {client_name} client {proto} formats require a GVS PO Token which was not provided. '
+            'They will be skipped as they may yield HTTP Error 403. '
+            f'You can manually pass a GVS PO Token for this client with --extractor-args "youtube:po_token={client_name}.gvs+XXX". '
+            f'For more information, refer to  {PO_TOKEN_GUIDE_URL} . '
+            'To enable these broken formats anyway, pass --extractor-args "youtube:formats=missing_pot"')
+
+        # Only raise a warning for non-default clients, to not confuse users.
+        # iOS HLS formats still work without PO Token, so we don't need to warn about them.
+        if client_name in (*self._DEFAULT_CLIENTS, *self._DEFAULT_AUTHED_CLIENTS):
+            self.write_debug(msg, only_once=True)
+        else:
+            self.report_warning(msg, only_once=True)
+
+    def _extract_formats_and_subtitles(self, streaming_data, video_id, player_url, live_status, duration):
+        CHUNK_SIZE = 10 << 20
+        PREFERRED_LANG_VALUE = 10
+        original_language = None
+        itags, stream_ids = collections.defaultdict(set), []
+        itag_qualities, res_qualities = {}, {0: None}
+        q = qualities([
+            # Normally tiny is the smallest video-only formats. But
+            # audio-only formats with unknown quality may get tagged as tiny
+            'tiny',
+            'audio_quality_ultralow', 'audio_quality_low', 'audio_quality_medium', 'audio_quality_high',  # Audio only formats
+            'small', 'medium', 'large', 'hd720', 'hd1080', 'hd1440', 'hd2160', 'hd2880', 'highres',
+        ])
+        streaming_formats = traverse_obj(streaming_data, (..., ('formats', 'adaptiveFormats'), ...))
+        format_types = self._configuration_arg('formats')
+        all_formats = 'duplicate' in format_types
+        if self._configuration_arg('include_duplicate_formats'):
+            all_formats = True
+            self._downloader.deprecated_feature('[youtube] include_duplicate_formats extractor argument is deprecated. '
+                                                'Use formats=duplicate extractor argument instead')
+
+        def build_fragments(f):
+            return LazyList({
+                'url': update_url_query(f['url'], {
+                    'range': f'{range_start}-{min(range_start + CHUNK_SIZE - 1, f["filesize"])}',
+                }),
+            } for range_start in range(0, f['filesize'], CHUNK_SIZE))
+
+        for fmt in streaming_formats:
+            client_name = fmt[STREAMING_DATA_CLIENT_NAME]
+            if fmt.get('targetDurationSec'):
+                continue
+
+            itag = str_or_none(fmt.get('itag'))
+            audio_track = fmt.get('audioTrack') or {}
+            stream_id = (itag, audio_track.get('id'), fmt.get('isDrc'))
+            if not all_formats:
+                if stream_id in stream_ids:
+                    continue
+
+            quality = fmt.get('quality')
+            height = int_or_none(fmt.get('height'))
+            if quality == 'tiny' or not quality:
+                quality = fmt.get('audioQuality', '').lower() or quality
+            # The 3gp format (17) in android client has a quality of "small",
+            # but is actually worse than other formats
+            if itag == '17':
+                quality = 'tiny'
+            if quality:
+                if itag:
+                    itag_qualities[itag] = quality
+                if height:
+                    res_qualities[height] = quality
+
+            display_name = audio_track.get('displayName') or ''
+            is_original = 'original' in display_name.lower()
+            is_descriptive = 'descriptive' in display_name.lower()
+            is_default = audio_track.get('audioIsDefault')
+            language_code = audio_track.get('id', '').split('.')[0]
+            if language_code and (is_original or (is_default and not original_language)):
+                original_language = language_code
+
+            has_drm = bool(fmt.get('drmFamilies'))
+
+            # FORMAT_STREAM_TYPE_OTF(otf=1) requires downloading the init fragment
+            # (adding `&sq=0` to the URL) and parsing emsg box to determine the
+            # number of fragment that would subsequently requested with (`&sq=N`)
+            if fmt.get('type') == 'FORMAT_STREAM_TYPE_OTF' and not has_drm:
+                continue
+
+            if has_drm:
+                msg = f'Some {client_name} client https formats have been skipped as they are DRM protected. '
+                if client_name == 'tv':
+                    msg += (
+                        f'{"Your account" if self.is_authenticated else "The current session"} may have '
+                        f'an experiment that applies DRM to all videos on the tv client. '
+                        f'See  https://github.com/yt-dlp/yt-dlp/issues/12563  for more details.'
+                    )
+                self.report_warning(msg, video_id, only_once=True)
+
+            fmt_url = fmt.get('url')
+            if not fmt_url:
+                sc = urllib.parse.parse_qs(fmt.get('signatureCipher'))
+                fmt_url = url_or_none(try_get(sc, lambda x: x['url'][0]))
+                encrypted_sig = try_get(sc, lambda x: x['s'][0])
+                if not all((sc, fmt_url, player_url, encrypted_sig)):
+                    msg = f'Some {client_name} client https formats have been skipped as they are missing a url. '
+                    if client_name == 'web':
+                        msg += 'YouTube is forcing SABR streaming for this client. '
+                    else:
+                        msg += (
+                            f'YouTube may have enabled the SABR-only or Server-Side Ad Placement experiment for '
+                            f'{"your account" if self.is_authenticated else "the current session"}. '
+                        )
+                    msg += 'See  https://github.com/yt-dlp/yt-dlp/issues/12482  for more details'
+                    self.report_warning(msg, video_id, only_once=True)
+                    continue
+                try:
+                    fmt_url += '&{}={}'.format(
+                        traverse_obj(sc, ('sp', -1)) or 'signature',
+                        self._decrypt_signature(encrypted_sig, video_id, player_url),
+                    )
+                except ExtractorError as e:
+                    self.report_warning('Signature extraction failed: Some formats may be missing',
+                                        video_id=video_id, only_once=True)
+                    self.write_debug(e, only_once=True)
+                    continue
+
+            query = parse_qs(fmt_url)
+            if query.get('n'):
+                try:
+                    decrypt_nsig = self._cached(self._decrypt_nsig, 'nsig', query['n'][0])
+                    fmt_url = update_url_query(fmt_url, {
+                        'n': decrypt_nsig(query['n'][0], video_id, player_url),
+                    })
+                except ExtractorError as e:
+                    if player_url:
+                        self.report_warning(
+                            f'nsig extraction failed: Some formats may be missing\n'
+                            f'         n = {query["n"][0]} ; player = {player_url}\n'
+                            f'         {bug_reports_message(before="")}',
+                            video_id=video_id, only_once=True)
+                        self.write_debug(e, only_once=True)
+                    else:
+                        self.report_warning(
+                            'Cannot decrypt nsig without player_url: Some formats may be missing',
+                            video_id=video_id, only_once=True)
+                    continue
+
+            tbr = float_or_none(fmt.get('averageBitrate') or fmt.get('bitrate'), 1000)
+            format_duration = traverse_obj(fmt, ('approxDurationMs', {float_or_none(scale=1000)}))
+            # Some formats may have much smaller duration than others (possibly damaged during encoding)
+            # E.g. 2-nOtRESiUc Ref: https://github.com/yt-dlp/yt-dlp/issues/2823
+            # Make sure to avoid false positives with small duration differences.
+            # E.g. __2ABJjxzNo, ySuUZEjARPY
+            is_damaged = try_call(lambda: format_duration < duration // 2)
+            if is_damaged:
+                self.report_warning(
+                    'Some formats are possibly damaged. They will be deprioritized', video_id, only_once=True)
+
+            po_token = fmt.get(STREAMING_DATA_INITIAL_PO_TOKEN)
+
+            if po_token:
+                fmt_url = update_url_query(fmt_url, {'pot': po_token})
+
+            # Clients that require PO Token return videoplayback URLs that may return 403
+            require_po_token = (
+                not po_token
+                and _PoTokenContext.GVS in self._get_default_ytcfg(client_name)['PO_TOKEN_REQUIRED_CONTEXTS']
+                and itag not in ['18'])  # these formats do not require PO Token
+
+            if require_po_token and 'missing_pot' not in self._configuration_arg('formats'):
+                self._report_pot_format_skipped(video_id, client_name, 'https')
+                continue
+
+            name = fmt.get('qualityLabel') or quality.replace('audio_quality_', '') or ''
+            fps = int_or_none(fmt.get('fps')) or 0
+            dct = {
+                'asr': int_or_none(fmt.get('audioSampleRate')),
+                'filesize': int_or_none(fmt.get('contentLength')),
+                'format_id': f'{itag}{"-drc" if fmt.get("isDrc") else ""}',
+                'format_note': join_nonempty(
+                    join_nonempty(display_name, is_default and ' (default)', delim=''),
+                    name, fmt.get('isDrc') and 'DRC',
+                    try_get(fmt, lambda x: x['projectionType'].replace('RECTANGULAR', '').lower()),
+                    try_get(fmt, lambda x: x['spatialAudioType'].replace('SPATIAL_AUDIO_TYPE_', '').lower()),
+                    is_damaged and 'DAMAGED', require_po_token and 'MISSING POT',
+                    (self.get_param('verbose') or all_formats) and short_client_name(client_name),
+                    delim=', '),
+                # Format 22 is likely to be damaged. See https://github.com/yt-dlp/yt-dlp/issues/3372
+                'source_preference': (-5 if itag == '22' else -1) + (100 if 'Premium' in name else 0),
+                'fps': fps if fps > 1 else None,  # For some formats, fps is wrongly returned as 1
+                'audio_channels': fmt.get('audioChannels'),
+                'height': height,
+                'quality': q(quality) - bool(fmt.get('isDrc')) / 2,
+                'has_drm': has_drm,
+                'tbr': tbr,
+                'filesize_approx': filesize_from_tbr(tbr, format_duration),
+                'url': fmt_url,
+                'width': int_or_none(fmt.get('width')),
+                'language': join_nonempty(language_code, 'desc' if is_descriptive else '') or None,
+                'language_preference': PREFERRED_LANG_VALUE if is_original else 5 if is_default else -10 if is_descriptive else -1,
+                # Strictly de-prioritize damaged and 3gp formats
+                'preference': -10 if is_damaged else -2 if itag == '17' else None,
+            }
+            mime_mobj = re.match(
+                r'((?:[^/]+)/(?:[^;]+))(?:;\s*codecs="([^"]+)")?', fmt.get('mimeType') or '')
+            if mime_mobj:
+                dct['ext'] = mimetype2ext(mime_mobj.group(1))
+                dct.update(parse_codecs(mime_mobj.group(2)))
+            if itag:
+                itags[itag].add(('https', dct.get('language')))
+                stream_ids.append(stream_id)
+            single_stream = 'none' in (dct.get('acodec'), dct.get('vcodec'))
+            if single_stream and dct.get('ext'):
+                dct['container'] = dct['ext'] + '_dash'
+
+            if (all_formats or 'dashy' in format_types) and dct['filesize']:
+                yield {
+                    **dct,
+                    'format_id': f'{dct["format_id"]}-dashy' if all_formats else dct['format_id'],
+                    'protocol': 'http_dash_segments',
+                    'fragments': build_fragments(dct),
+                }
+            if all_formats or 'dashy' not in format_types:
+                dct['downloader_options'] = {'http_chunk_size': CHUNK_SIZE}
+                yield dct
+
+        needs_live_processing = self._needs_live_processing(live_status, duration)
+        skip_bad_formats = 'incomplete' not in format_types
+        if self._configuration_arg('include_incomplete_formats'):
+            skip_bad_formats = False
+            self._downloader.deprecated_feature('[youtube] include_incomplete_formats extractor argument is deprecated. '
+                                                'Use formats=incomplete extractor argument instead')
+
+        skip_manifests = set(self._configuration_arg('skip'))
+        if (not self.get_param('youtube_include_hls_manifest', True)
+                or needs_live_processing == 'is_live'  # These will be filtered out by YoutubeDL anyway
+                or (needs_live_processing and skip_bad_formats)):
+            skip_manifests.add('hls')
+
+        if not self.get_param('youtube_include_dash_manifest', True):
+            skip_manifests.add('dash')
+        if self._configuration_arg('include_live_dash'):
+            self._downloader.deprecated_feature('[youtube] include_live_dash extractor argument is deprecated. '
+                                                'Use formats=incomplete extractor argument instead')
+        elif skip_bad_formats and live_status == 'is_live' and needs_live_processing != 'is_live':
+            skip_manifests.add('dash')
+
+        def process_manifest_format(f, proto, client_name, itag, po_token):
+            key = (proto, f.get('language'))
+            if not all_formats and key in itags[itag]:
+                return False
+
+            if f.get('source_preference') is None:
+                f['source_preference'] = -1
+
+            # Clients that require PO Token return videoplayback URLs that may return 403
+            # hls does not currently require PO Token
+            if (
+                not po_token
+                and _PoTokenContext.GVS in self._get_default_ytcfg(client_name)['PO_TOKEN_REQUIRED_CONTEXTS']
+                and proto != 'hls'
+            ):
+                if 'missing_pot' not in self._configuration_arg('formats'):
+                    self._report_pot_format_skipped(video_id, client_name, proto)
+                    return False
+                f['format_note'] = join_nonempty(f.get('format_note'), 'MISSING POT', delim=' ')
+                f['source_preference'] -= 20
+
+            itags[itag].add(key)
+
+            if itag and all_formats:
+                f['format_id'] = f'{itag}-{proto}'
+            elif any(p != proto for p, _ in itags[itag]):
+                f['format_id'] = f'{itag}-{proto}'
+            elif itag:
+                f['format_id'] = itag
+
+            if original_language and f.get('language') == original_language:
+                f['format_note'] = join_nonempty(f.get('format_note'), '(default)', delim=' ')
+                f['language_preference'] = PREFERRED_LANG_VALUE
+
+            if itag in ('616', '235'):
+                f['format_note'] = join_nonempty(f.get('format_note'), 'Premium', delim=' ')
+                f['source_preference'] += 100
+
+            f['quality'] = q(itag_qualities.get(try_get(f, lambda f: f['format_id'].split('-')[0]), -1))
+            if f['quality'] == -1 and f.get('height'):
+                f['quality'] = q(res_qualities[min(res_qualities, key=lambda x: abs(x - f['height']))])
+            if self.get_param('verbose') or all_formats:
+                f['format_note'] = join_nonempty(
+                    f.get('format_note'), short_client_name(client_name), delim=', ')
+            if f.get('fps') and f['fps'] <= 1:
+                del f['fps']
+
+            if proto == 'hls' and f.get('has_drm'):
+                f['has_drm'] = 'maybe'
+                f['source_preference'] -= 5
+            return True
+
+        subtitles = {}
+        for sd in streaming_data:
+            client_name = sd[STREAMING_DATA_CLIENT_NAME]
+            po_token = sd.get(STREAMING_DATA_INITIAL_PO_TOKEN)
+            hls_manifest_url = 'hls' not in skip_manifests and sd.get('hlsManifestUrl')
+            if hls_manifest_url:
+                if po_token:
+                    hls_manifest_url = hls_manifest_url.rstrip('/') + f'/pot/{po_token}'
+                fmts, subs = self._extract_m3u8_formats_and_subtitles(
+                    hls_manifest_url, video_id, 'mp4', fatal=False, live=live_status == 'is_live')
+                subtitles = self._merge_subtitles(subs, subtitles)
+                for f in fmts:
+                    if process_manifest_format(f, 'hls', client_name, self._search_regex(
+                            r'/itag/(\d+)', f['url'], 'itag', default=None), po_token):
+                        yield f
+
+            dash_manifest_url = 'dash' not in skip_manifests and sd.get('dashManifestUrl')
+            if dash_manifest_url:
+                if po_token:
+                    dash_manifest_url = dash_manifest_url.rstrip('/') + f'/pot/{po_token}'
+                formats, subs = self._extract_mpd_formats_and_subtitles(dash_manifest_url, video_id, fatal=False)
+                subtitles = self._merge_subtitles(subs, subtitles)  # Prioritize HLS subs over DASH
+                for f in formats:
+                    if process_manifest_format(f, 'dash', client_name, f['format_id'], po_token):
+                        f['filesize'] = int_or_none(self._search_regex(
+                            r'/clen/(\d+)', f.get('fragment_base_url') or f['url'], 'file size', default=None))
+                        if needs_live_processing:
+                            f['is_from_start'] = True
+
+                        yield f
+        yield subtitles
+
+    def _extract_storyboard(self, player_responses, duration):
+        spec = get_first(
+            player_responses, ('storyboards', 'playerStoryboardSpecRenderer', 'spec'), default='').split('|')[::-1]
+        base_url = url_or_none(urljoin('https://i.ytimg.com/', spec.pop() or None))
+        if not base_url:
+            return
+        L = len(spec) - 1
+        for i, args in enumerate(spec):
+            args = args.split('#')
+            counts = list(map(int_or_none, args[:5]))
+            if len(args) != 8 or not all(counts):
+                self.report_warning(f'Malformed storyboard {i}: {"#".join(args)}{bug_reports_message()}')
+                continue
+            width, height, frame_count, cols, rows = counts
+            N, sigh = args[6:]
+
+            url = base_url.replace('$L', str(L - i)).replace('$N', N) + f'&sigh={sigh}'
+            fragment_count = frame_count / (cols * rows)
+            fragment_duration = duration / fragment_count
+            yield {
+                'format_id': f'sb{i}',
+                'format_note': 'storyboard',
+                'ext': 'mhtml',
+                'protocol': 'mhtml',
+                'acodec': 'none',
+                'vcodec': 'none',
+                'url': url,
+                'width': width,
+                'height': height,
+                'fps': frame_count / duration,
+                'rows': rows,
+                'columns': cols,
+                'fragments': [{
+                    'url': url.replace('$M', str(j)),
+                    'duration': min(fragment_duration, duration - (j * fragment_duration)),
+                } for j in range(math.ceil(fragment_count))],
+            }
+
+    def _download_player_responses(self, url, smuggled_data, video_id, webpage_url):
+        webpage = None
+        if 'webpage' not in self._configuration_arg('player_skip'):
+            query = {'bpctr': '9999999999', 'has_verified': '1'}
+            pp = self._configuration_arg('player_params', [None], casesense=True)[0]
+            if pp:
+                query['pp'] = pp
+            webpage = self._download_webpage_with_retries(webpage_url, video_id, query=query)
+
+        master_ytcfg = self.extract_ytcfg(video_id, webpage) or self._get_default_ytcfg()
+
+        player_responses, player_url = self._extract_player_responses(
+            self._get_requested_clients(url, smuggled_data),
+            video_id, webpage, master_ytcfg, smuggled_data)
+
+        return webpage, master_ytcfg, player_responses, player_url
+
+    def _list_formats(self, video_id, microformats, video_details, player_responses, player_url, duration=None):
+        live_broadcast_details = traverse_obj(microformats, (..., 'liveBroadcastDetails'))
+        is_live = get_first(video_details, 'isLive')
+        if is_live is None:
+            is_live = get_first(live_broadcast_details, 'isLiveNow')
+        live_content = get_first(video_details, 'isLiveContent')
+        is_upcoming = get_first(video_details, 'isUpcoming')
+        post_live = get_first(video_details, 'isPostLiveDvr')
+        live_status = ('post_live' if post_live
+                       else 'is_live' if is_live
+                       else 'is_upcoming' if is_upcoming
+                       else 'was_live' if live_content
+                       else 'not_live' if False in (is_live, live_content)
+                       else None)
+        streaming_data = traverse_obj(player_responses, (..., 'streamingData'))
+        *formats, subtitles = self._extract_formats_and_subtitles(streaming_data, video_id, player_url, live_status, duration)
+        if all(f.get('has_drm') for f in formats):
+            # If there are no formats that definitely don't have DRM, all have DRM
+            for f in formats:
+                f['has_drm'] = True
+
+        return live_broadcast_details, live_status, streaming_data, formats, subtitles
+
+    def _real_extract(self, url):
+        url, smuggled_data = unsmuggle_url(url, {})
+        video_id = self._match_id(url)
+
+        base_url = self.http_scheme() + '//www.youtube.com/'
+        webpage_url = base_url + 'watch?v=' + video_id
+
+        webpage, master_ytcfg, player_responses, player_url = self._download_player_responses(url, smuggled_data, video_id, webpage_url)
+
+        playability_statuses = traverse_obj(
+            player_responses, (..., 'playabilityStatus'), expected_type=dict)
+
+        trailer_video_id = get_first(
+            playability_statuses,
+            ('errorScreen', 'playerLegacyDesktopYpcTrailerRenderer', 'trailerVideoId'),
+            expected_type=str)
+        if trailer_video_id:
+            return self.url_result(
+                trailer_video_id, self.ie_key(), trailer_video_id)
+
+        search_meta = ((lambda x: self._html_search_meta(x, webpage, default=None))
+                       if webpage else (lambda x: None))
+
+        video_details = traverse_obj(player_responses, (..., 'videoDetails'), expected_type=dict)
+        microformats = traverse_obj(
+            player_responses, (..., 'microformat', 'playerMicroformatRenderer'),
+            expected_type=dict)
+
+        translated_title = self._get_text(microformats, (..., 'title'))
+        video_title = ((self._preferred_lang and translated_title)
+                       or get_first(video_details, 'title')  # primary
+                       or translated_title
+                       or search_meta(['og:title', 'twitter:title', 'title']))
+        translated_description = self._get_text(microformats, (..., 'description'))
+        original_description = get_first(video_details, 'shortDescription')
+        video_description = (
+            (self._preferred_lang and translated_description)
+            # If original description is blank, it will be an empty string.
+            # Do not prefer translated description in this case.
+            or original_description if original_description is not None else translated_description)
+
+        multifeed_metadata_list = get_first(
+            player_responses,
+            ('multicamera', 'playerLegacyMulticameraRenderer', 'metadataList'),
+            expected_type=str)
+        if multifeed_metadata_list and not smuggled_data.get('force_singlefeed'):
+            if self.get_param('noplaylist'):
+                self.to_screen(f'Downloading just video {video_id} because of --no-playlist')
+            else:
+                entries = []
+                feed_ids = []
+                for feed in multifeed_metadata_list.split(','):
+                    # Unquote should take place before split on comma (,) since textual
+                    # fields may contain comma as well (see
+                    # https://github.com/ytdl-org/youtube-dl/issues/8536)
+                    feed_data = urllib.parse.parse_qs(
+                        urllib.parse.unquote_plus(feed))
+
+                    def feed_entry(name):
+                        return try_get(
+                            feed_data, lambda x: x[name][0], str)
+
+                    feed_id = feed_entry('id')
+                    if not feed_id:
+                        continue
+                    feed_title = feed_entry('title')
+                    title = video_title
+                    if feed_title:
+                        title += f' ({feed_title})'
+                    entries.append({
+                        '_type': 'url_transparent',
+                        'ie_key': 'Youtube',
+                        'url': smuggle_url(
+                            '{}watch?v={}'.format(base_url, feed_data['id'][0]),
+                            {'force_singlefeed': True}),
+                        'title': title,
+                    })
+                    feed_ids.append(feed_id)
+                self.to_screen(
+                    'Downloading multifeed video ({}) - add --no-playlist to just download video {}'.format(
+                        ', '.join(feed_ids), video_id))
+                return self.playlist_result(
+                    entries, video_id, video_title, video_description)
+
+        duration = (int_or_none(get_first(video_details, 'lengthSeconds'))
+                    or int_or_none(get_first(microformats, 'lengthSeconds'))
+                    or parse_duration(search_meta('duration')) or None)
+
+        live_broadcast_details, live_status, streaming_data, formats, automatic_captions = \
+            self._list_formats(video_id, microformats, video_details, player_responses, player_url, duration)
+        if live_status == 'post_live':
+            self.write_debug(f'{video_id}: Video is in Post-Live Manifestless mode')
+
+        if not formats:
+            if not self.get_param('allow_unplayable_formats') and traverse_obj(streaming_data, (..., 'licenseInfos')):
+                self.report_drm(video_id)
+            pemr = get_first(
+                playability_statuses,
+                ('errorScreen', 'playerErrorMessageRenderer'), expected_type=dict) or {}
+            reason = self._get_text(pemr, 'reason') or get_first(playability_statuses, 'reason')
+            subreason = clean_html(self._get_text(pemr, 'subreason') or '')
+            if subreason:
+                if subreason == 'The uploader has not made this video available in your country.':
+                    countries = get_first(microformats, 'availableCountries')
+                    if not countries:
+                        regions_allowed = search_meta('regionsAllowed')
+                        countries = regions_allowed.split(',') if regions_allowed else None
+                    self.raise_geo_restricted(subreason, countries, metadata_available=True)
+                reason += f'. {subreason}'
+            if reason:
+                if 'sign in' in reason.lower():
+                    reason = remove_end(reason, 'This helps protect our community. Learn more')
+                    reason = f'{remove_end(reason.strip(), ".")}. {self._youtube_login_hint}'
+                elif get_first(playability_statuses, ('errorScreen', 'playerCaptchaViewModel', {dict})):
+                    reason += '. YouTube is requiring a captcha challenge before playback'
+                elif "This content isn't available, try again later" in reason:
+                    reason = (
+                        f'{remove_end(reason.strip(), ".")}. {"Your account" if self.is_authenticated else "The current session"} '
+                        f'has been rate-limited by YouTube for up to an hour. It is recommended to use `-t sleep` to add a delay '
+                        f'between video requests to avoid exceeding the rate limit. For more information, refer to  '
+                        f'https://github.com/yt-dlp/yt-dlp/wiki/Extractors#this-content-isnt-available-try-again-later'
+                    )
+                self.raise_no_formats(reason, expected=True)
+
+        keywords = get_first(video_details, 'keywords', expected_type=list) or []
+        if not keywords and webpage:
+            keywords = [
+                unescapeHTML(m.group('content'))
+                for m in re.finditer(self._meta_regex('og:video:tag'), webpage)]
+        for keyword in keywords:
+            if keyword.startswith('yt:stretch='):
+                mobj = re.search(r'(\d+)\s*:\s*(\d+)', keyword)
+                if mobj:
+                    # NB: float is intentional for forcing float division
+                    w, h = (float(v) for v in mobj.groups())
+                    if w > 0 and h > 0:
+                        ratio = w / h
+                        for f in formats:
+                            if f.get('vcodec') != 'none':
+                                f['stretched_ratio'] = ratio
+                        break
+        thumbnails = self._extract_thumbnails((video_details, microformats), (..., ..., 'thumbnail'))
+        thumbnail_url = search_meta(['og:image', 'twitter:image'])
+        if thumbnail_url:
+            thumbnails.append({
+                'url': thumbnail_url,
+            })
+        original_thumbnails = thumbnails.copy()
+
+        # The best resolution thumbnails sometimes does not appear in the webpage
+        # See: https://github.com/yt-dlp/yt-dlp/issues/340
+        # List of possible thumbnails - Ref: <https://stackoverflow.com/a/20542029>
+        thumbnail_names = [
+            # While the *1,*2,*3 thumbnails are just below their corresponding "*default" variants
+            # in resolution, these are not the custom thumbnail. So de-prioritize them
+            'maxresdefault', 'hq720', 'sddefault', 'hqdefault', '0', 'mqdefault', 'default',
+            'sd1', 'sd2', 'sd3', 'hq1', 'hq2', 'hq3', 'mq1', 'mq2', 'mq3', '1', '2', '3',
+        ]
+        n_thumbnail_names = len(thumbnail_names)
+        thumbnails.extend({
+            'url': 'https://i.ytimg.com/vi{webp}/{video_id}/{name}{live}.{ext}'.format(
+                video_id=video_id, name=name, ext=ext,
+                webp='_webp' if ext == 'webp' else '', live='_live' if live_status == 'is_live' else ''),
+        } for name in thumbnail_names for ext in ('webp', 'jpg'))
+        for thumb in thumbnails:
+            i = next((i for i, t in enumerate(thumbnail_names) if f'/{video_id}/{t}' in thumb['url']), n_thumbnail_names)
+            thumb['preference'] = (0 if '.webp' in thumb['url'] else -1) - (2 * i)
+        self._remove_duplicate_formats(thumbnails)
+        self._downloader._sort_thumbnails(original_thumbnails)
+
+        category = get_first(microformats, 'category') or search_meta('genre')
+        channel_id = self.ucid_or_none(str_or_none(
+            get_first(video_details, 'channelId')
+            or get_first(microformats, 'externalChannelId')
+            or search_meta('channelId')))
+        owner_profile_url = get_first(microformats, 'ownerProfileUrl')
+
+        live_start_time = parse_iso8601(get_first(live_broadcast_details, 'startTimestamp'))
+        live_end_time = parse_iso8601(get_first(live_broadcast_details, 'endTimestamp'))
+        if not duration and live_end_time and live_start_time:
+            duration = live_end_time - live_start_time
+
+        needs_live_processing = self._needs_live_processing(live_status, duration)
+
+        def is_bad_format(fmt):
+            if needs_live_processing and not fmt.get('is_from_start'):
+                return True
+            elif (live_status == 'is_live' and needs_live_processing != 'is_live'
+                    and fmt.get('protocol') == 'http_dash_segments'):
+                return True
+
+        for fmt in filter(is_bad_format, formats):
+            fmt['preference'] = (fmt.get('preference') or -1) - 10
+            fmt['format_note'] = join_nonempty(fmt.get('format_note'), '(Last 2 hours)', delim=' ')
+
+        if needs_live_processing:
+            self._prepare_live_from_start_formats(
+                formats, video_id, live_start_time, url, webpage_url, smuggled_data, live_status == 'is_live')
+
+        formats.extend(self._extract_storyboard(player_responses, duration))
+
+        channel_handle = self.handle_from_url(owner_profile_url)
+
+        info = {
+            'id': video_id,
+            'title': video_title,
+            'formats': formats,
+            'thumbnails': thumbnails,
+            # The best thumbnail that we are sure exists. Prevents unnecessary
+            # URL checking if user don't care about getting the best possible thumbnail
+            'thumbnail': traverse_obj(original_thumbnails, (-1, 'url')),
+            'description': video_description,
+            'channel_id': channel_id,
+            'channel_url': format_field(channel_id, None, 'https://www.youtube.com/channel/%s', default=None),
+            'duration': duration,
+            'view_count': int_or_none(
+                get_first((video_details, microformats), (..., 'viewCount'))
+                or search_meta('interactionCount')),
+            'average_rating': float_or_none(get_first(video_details, 'averageRating')),
+            'age_limit': 18 if (
+                get_first(microformats, 'isFamilySafe') is False
+                or search_meta('isFamilyFriendly') == 'false'
+                or search_meta('og:restrictions:age') == '18+') else 0,
+            'webpage_url': webpage_url,
+            'categories': [category] if category else None,
+            'tags': keywords,
+            'playable_in_embed': get_first(playability_statuses, 'playableInEmbed'),
+            'live_status': live_status,
+            'media_type': 'livestream' if get_first(video_details, 'isLiveContent') else None,
+            'release_timestamp': live_start_time,
+            '_format_sort_fields': (  # source_preference is lower for potentially damaged formats
+                'quality', 'res', 'fps', 'hdr:12', 'source', 'vcodec', 'channels', 'acodec', 'lang', 'proto'),
+        }
+
+        subtitles = {}
+        pctr = traverse_obj(player_responses, (..., 'captions', 'playerCaptionsTracklistRenderer'), expected_type=dict)
+        if pctr:
+            def get_lang_code(track):
+                return (remove_start(track.get('vssId') or '', '.').replace('.', '-')
+                        or track.get('languageCode'))
+
+            # Converted into dicts to remove duplicates
+            captions = {
+                get_lang_code(sub): sub
+                for sub in traverse_obj(pctr, (..., 'captionTracks', ...))}
+            translation_languages = {
+                lang.get('languageCode'): self._get_text(lang.get('languageName'), max_runs=1)
+                for lang in traverse_obj(pctr, (..., 'translationLanguages', ...))}
+
+            def process_language(container, base_url, lang_code, sub_name, query):
+                lang_subs = container.setdefault(lang_code, [])
+                for fmt in self._SUBTITLE_FORMATS:
+                    query.update({
+                        'fmt': fmt,
+                    })
+                    lang_subs.append({
+                        'ext': fmt,
+                        'url': urljoin('https://www.youtube.com', update_url_query(base_url, query)),
+                        'name': sub_name,
+                    })
+
+            # NB: Constructing the full subtitle dictionary is slow
+            get_translated_subs = 'translated_subs' not in self._configuration_arg('skip') and (
+                self.get_param('writeautomaticsub', False) or self.get_param('listsubtitles'))
+            for lang_code, caption_track in captions.items():
+                base_url = caption_track.get('baseUrl')
+                orig_lang = parse_qs(base_url).get('lang', [None])[-1]
+                if not base_url:
+                    continue
+                lang_name = self._get_text(caption_track, 'name', max_runs=1)
+                if caption_track.get('kind') != 'asr':
+                    if not lang_code:
+                        continue
+                    process_language(
+                        subtitles, base_url, lang_code, lang_name, {})
+                    if not caption_track.get('isTranslatable'):
+                        continue
+                for trans_code, trans_name in translation_languages.items():
+                    if not trans_code:
+                        continue
+                    orig_trans_code = trans_code
+                    if caption_track.get('kind') != 'asr' and trans_code != 'und':
+                        if not get_translated_subs:
+                            continue
+                        trans_code += f'-{lang_code}'
+                        trans_name += format_field(lang_name, None, ' from %s')
+                    if lang_code == f'a-{orig_trans_code}':
+                        # Set audio language based on original subtitles
+                        for f in formats:
+                            if f.get('acodec') != 'none' and not f.get('language'):
+                                f['language'] = orig_trans_code
+                        # Add an "-orig" label to the original language so that it can be distinguished.
+                        # The subs are returned without "-orig" as well for compatibility
+                        process_language(
+                            automatic_captions, base_url, f'{trans_code}-orig', f'{trans_name} (Original)', {})
+                    # Setting tlang=lang returns damaged subtitles.
+                    process_language(automatic_captions, base_url, trans_code, trans_name,
+                                     {} if orig_lang == orig_trans_code else {'tlang': trans_code})
+
+        info['automatic_captions'] = automatic_captions
+        info['subtitles'] = subtitles
+
+        parsed_url = urllib.parse.urlparse(url)
+        for component in [parsed_url.fragment, parsed_url.query]:
+            query = urllib.parse.parse_qs(component)
+            for k, v in query.items():
+                for d_k, s_ks in [('start', ('start', 't')), ('end', ('end',))]:
+                    d_k += '_time'
+                    if d_k not in info and k in s_ks:
+                        info[d_k] = parse_duration(v[0])
+
+        # Youtube Music Auto-generated description
+        if (video_description or '').strip().endswith('\nAuto-generated by YouTube.'):
+            # XXX: Causes catastrophic backtracking if description has "·"
+            # E.g. https://www.youtube.com/watch?v=DoPaAxMQoiI
+            # Simulating atomic groups:  (?P<a>[^xy]+)x  =>  (?=(?P<a>[^xy]+))(?P=a)x
+            # reduces it, but does not fully fix it. https://regex101.com/r/8Ssf2h/2
+            mobj = re.search(
+                r'''(?xs)
+                    (?=(?P<track>[^\n·]+))(?P=track)·
+                    (?=(?P<artist>[^\n]+))(?P=artist)\n+
+                    (?=(?P<album>[^\n]+))(?P=album)\n
+                    (?:.+?℗\s*(?P<release_year>\d{4})(?!\d))?
+                    (?:.+?Released\ on\s*:\s*(?P<release_date>\d{4}-\d{2}-\d{2}))?
+                    (.+?\nArtist\s*:\s*
+                        (?=(?P<clean_artist>[^\n]+))(?P=clean_artist)\n
+                    )?.+\nAuto-generated\ by\ YouTube\.\s*$
+                ''', video_description)
+            if mobj:
+                release_year = mobj.group('release_year')
+                release_date = mobj.group('release_date')
+                if release_date:
+                    release_date = release_date.replace('-', '')
+                    if not release_year:
+                        release_year = release_date[:4]
+                info.update({
+                    'album': mobj.group('album'.strip()),
+                    'artists': ([a] if (a := mobj.group('clean_artist'))
+                                else [a.strip() for a in mobj.group('artist').split('·')]),
+                    'track': mobj.group('track').strip(),
+                    'release_date': release_date,
+                    'release_year': int_or_none(release_year),
+                })
+
+        initial_data = None
+        if webpage:
+            initial_data = self.extract_yt_initial_data(video_id, webpage, fatal=False)
+            if not traverse_obj(initial_data, 'contents'):
+                self.report_warning('Incomplete data received in embedded initial data; re-fetching using API.')
+                initial_data = None
+        if not initial_data and 'initial_data' not in self._configuration_arg('player_skip'):
+            query = {'videoId': video_id}
+            query.update(self._get_checkok_params())
+            initial_data = self._extract_response(
+                item_id=video_id, ep='next', fatal=False,
+                ytcfg=master_ytcfg, query=query, check_get_keys='contents',
+                headers=self.generate_api_headers(ytcfg=master_ytcfg),
+                note='Downloading initial data API JSON')
+
+        COMMENTS_SECTION_IDS = ('comment-item-section', 'engagement-panel-comments-section')
+        info['comment_count'] = traverse_obj(initial_data, (
+            'contents', 'twoColumnWatchNextResults', 'results', 'results', 'contents', ..., 'itemSectionRenderer',
+            'contents', ..., 'commentsEntryPointHeaderRenderer', 'commentCount',
+        ), (
+            'engagementPanels', lambda _, v: v['engagementPanelSectionListRenderer']['panelIdentifier'] in COMMENTS_SECTION_IDS,
+            'engagementPanelSectionListRenderer', 'header', 'engagementPanelTitleHeaderRenderer', 'contextualInfo',
+        ), expected_type=self._get_count, get_all=False)
+
+        try:  # This will error if there is no livechat
+            initial_data['contents']['twoColumnWatchNextResults']['conversationBar']['liveChatRenderer']['continuations'][0]['reloadContinuationData']['continuation']
+        except (KeyError, IndexError, TypeError):
+            pass
+        else:
+            info.setdefault('subtitles', {})['live_chat'] = [{
+                # url is needed to set cookies
+                'url': f'https://www.youtube.com/watch?v={video_id}&bpctr=9999999999&has_verified=1',
+                'video_id': video_id,
+                'ext': 'json',
+                'protocol': ('youtube_live_chat' if live_status in ('is_live', 'is_upcoming')
+                             else 'youtube_live_chat_replay'),
+            }]
+
+        if initial_data:
+            info['chapters'] = (
+                self._extract_chapters_from_json(initial_data, duration)
+                or self._extract_chapters_from_engagement_panel(initial_data, duration)
+                or self._extract_chapters_from_description(video_description, duration)
+                or None)
+
+            info['heatmap'] = self._extract_heatmap(initial_data)
+
+        contents = traverse_obj(
+            initial_data, ('contents', 'twoColumnWatchNextResults', 'results', 'results', 'contents'),
+            expected_type=list, default=[])
+
+        vpir = get_first(contents, 'videoPrimaryInfoRenderer')
+        if vpir:
+            stl = vpir.get('superTitleLink')
+            if stl:
+                stl = self._get_text(stl)
+                if try_get(
+                        vpir,
+                        lambda x: x['superTitleIcon']['iconType']) == 'LOCATION_PIN':
+                    info['location'] = stl
+                else:
+                    mobj = re.search(r'(.+?)\s*S(\d+)\s*•?\s*E(\d+)', stl)
+                    if mobj:
+                        info.update({
+                            'series': mobj.group(1),
+                            'season_number': int(mobj.group(2)),
+                            'episode_number': int(mobj.group(3)),
+                        })
+            for tlb in (try_get(
+                    vpir,
+                    lambda x: x['videoActions']['menuRenderer']['topLevelButtons'],
+                    list) or []):
+                tbrs = variadic(
+                    traverse_obj(
+                        tlb, ('toggleButtonRenderer', ...),
+                        ('segmentedLikeDislikeButtonRenderer', ..., 'toggleButtonRenderer')))
+                for tbr in tbrs:
+                    for getter, regex in [(
+                            lambda x: x['defaultText']['accessibility']['accessibilityData'],
+                            r'(?P<count>[\d,]+)\s*(?P<type>(?:dis)?like)'), ([
+                                lambda x: x['accessibility'],
+                                lambda x: x['accessibilityData']['accessibilityData'],
+                            ], r'(?P<type>(?:dis)?like) this video along with (?P<count>[\d,]+) other people')]:
+                        label = (try_get(tbr, getter, dict) or {}).get('label')
+                        if label:
+                            mobj = re.match(regex, label)
+                            if mobj:
+                                info[mobj.group('type') + '_count'] = str_to_int(mobj.group('count'))
+                                break
+
+            info['like_count'] = traverse_obj(vpir, (
+                'videoActions', 'menuRenderer', 'topLevelButtons', ...,
+                'segmentedLikeDislikeButtonViewModel', 'likeButtonViewModel', 'likeButtonViewModel',
+                'toggleButtonViewModel', 'toggleButtonViewModel', 'defaultButtonViewModel',
+                'buttonViewModel', 'accessibilityText', {parse_count}), get_all=False)
+
+            vcr = traverse_obj(vpir, ('viewCount', 'videoViewCountRenderer'))
+            if vcr:
+                vc = self._get_count(vcr, 'viewCount')
+                # Upcoming premieres with waiting count are treated as live here
+                if vcr.get('isLive'):
+                    info['concurrent_view_count'] = vc
+                elif info.get('view_count') is None:
+                    info['view_count'] = vc
+
+        vsir = get_first(contents, 'videoSecondaryInfoRenderer')
+        if vsir:
+            vor = traverse_obj(vsir, ('owner', 'videoOwnerRenderer'))
+            info.update({
+                'channel': self._get_text(vor, 'title'),
+                'channel_follower_count': self._get_count(vor, 'subscriberCountText')})
+
+            if not channel_handle:
+                channel_handle = self.handle_from_url(
+                    traverse_obj(vor, (
+                        ('navigationEndpoint', ('title', 'runs', ..., 'navigationEndpoint')),
+                        (('commandMetadata', 'webCommandMetadata', 'url'), ('browseEndpoint', 'canonicalBaseUrl')),
+                        {str}), get_all=False))
+
+            rows = try_get(
+                vsir,
+                lambda x: x['metadataRowContainer']['metadataRowContainerRenderer']['rows'],
+                list) or []
+            multiple_songs = False
+            for row in rows:
+                if try_get(row, lambda x: x['metadataRowRenderer']['hasDividerLine']) is True:
+                    multiple_songs = True
+                    break
+            for row in rows:
+                mrr = row.get('metadataRowRenderer') or {}
+                mrr_title = mrr.get('title')
+                if not mrr_title:
+                    continue
+                mrr_title = self._get_text(mrr, 'title')
+                mrr_contents_text = self._get_text(mrr, ('contents', 0))
+                if mrr_title == 'License':
+                    info['license'] = mrr_contents_text
+                elif not multiple_songs:
+                    if mrr_title == 'Album':
+                        info['album'] = mrr_contents_text
+                    elif mrr_title == 'Artist':
+                        info['artists'] = [mrr_contents_text] if mrr_contents_text else None
+                    elif mrr_title == 'Song':
+                        info['track'] = mrr_contents_text
+            owner_badges = self._extract_badges(traverse_obj(vsir, ('owner', 'videoOwnerRenderer', 'badges')))
+            if self._has_badge(owner_badges, BadgeType.VERIFIED):
+                info['channel_is_verified'] = True
+
+        info.update({
+            'uploader': info.get('channel'),
+            'uploader_id': channel_handle,
+            'uploader_url': format_field(channel_handle, None, 'https://www.youtube.com/%s', default=None),
+        })
+
+        # We only want timestamp IF it has time precision AND a timezone
+        # Currently the uploadDate in microformats appears to be in US/Pacific timezone.
+        timestamp = (
+            parse_iso8601(get_first(microformats, 'uploadDate'), timezone=NO_DEFAULT)
+            or parse_iso8601(search_meta('uploadDate'), timezone=NO_DEFAULT)
+        )
+        upload_date = (
+            dt.datetime.fromtimestamp(timestamp, dt.timezone.utc).strftime('%Y%m%d') if timestamp else
+            (
+                unified_strdate(get_first(microformats, 'uploadDate'))
+                or unified_strdate(search_meta('uploadDate'))
+            ))
+
+        # In the case we cannot get the timestamp:
+        # The upload date for scheduled, live and past live streams / premieres in microformats
+        # may be different from the stream date. Although not in UTC, we will prefer it in this case.
+        # See: https://github.com/yt-dlp/yt-dlp/pull/2223#issuecomment-1008485139
+        if not upload_date or (not timestamp and live_status in ('not_live', None)):
+            # this should be in UTC, as configured in the cookie/client context
+            upload_date = strftime_or_none(
+                self._parse_time_text(self._get_text(vpir, 'dateText'))) or upload_date
+
+        info['upload_date'] = upload_date
+        info['timestamp'] = timestamp
+
+        if upload_date and live_status not in ('is_live', 'post_live', 'is_upcoming'):
+            # Newly uploaded videos' HLS formats are potentially problematic and need to be checked
+            upload_datetime = datetime_from_str(upload_date).replace(tzinfo=dt.timezone.utc)
+            if upload_datetime >= datetime_from_str('today-2days'):
+                for fmt in info['formats']:
+                    if fmt.get('protocol') == 'm3u8_native':
+                        fmt['__needs_testing'] = True
+
+        for s_k, d_k in [('artists', 'creators'), ('track', 'alt_title')]:
+            v = info.get(s_k)
+            if v:
+                info[d_k] = v
+
+        badges = self._extract_badges(traverse_obj(vpir, 'badges'))
+
+        is_private = (self._has_badge(badges, BadgeType.AVAILABILITY_PRIVATE)
+                      or get_first(video_details, 'isPrivate', expected_type=bool))
+
+        info['availability'] = (
+            'public' if self._has_badge(badges, BadgeType.AVAILABILITY_PUBLIC)
+            else self._availability(
+                is_private=is_private,
+                needs_premium=(
+                    self._has_badge(badges, BadgeType.AVAILABILITY_PREMIUM)
+                    or False if initial_data and is_private is not None else None),
+                needs_subscription=(
+                    self._has_badge(badges, BadgeType.AVAILABILITY_SUBSCRIPTION)
+                    or False if initial_data and is_private is not None else None),
+                needs_auth=info['age_limit'] >= 18,
+                is_unlisted=None if is_private is None else (
+                    self._has_badge(badges, BadgeType.AVAILABILITY_UNLISTED)
+                    or get_first(microformats, 'isUnlisted', expected_type=bool))))
+
+        info['__post_extractor'] = self.extract_comments(master_ytcfg, video_id, contents, webpage)
+
+        self.mark_watched(video_id, player_responses)
+
+        return info
diff --git a/plugins/youtube_download/yt_dlp/extractor/zaiko.py b/plugins/youtube_download/yt_dlp/extractor/zaiko.py
index 0ccacbb..13ce5de 100644
--- a/plugins/youtube_download/yt_dlp/extractor/zaiko.py
+++ b/plugins/youtube_download/yt_dlp/extractor/zaiko.py
@@ -9,6 +9,7 @@ from ..utils import (
     traverse_obj,
     try_call,
     unescapeHTML,
+    url_basename,
     url_or_none,
 )
 
@@ -45,12 +46,14 @@ class ZaikoIE(ZaikoBaseIE):
             'uploader_id': '454',
             'uploader': 'ZAIKO ZERO',
             'release_timestamp': 1583809200,
-            'thumbnail': r're:https://[a-z0-9]+.cloudfront.net/[a-z0-9_]+/[a-z0-9_]+',
+            'thumbnail': r're:^https://[\w.-]+/\w+/\w+',
+            'thumbnails': 'maxcount:2',
             'release_date': '20200310',
             'categories': ['Tech House'],
             'live_status': 'was_live',
         },
         'params': {'skip_download': 'm3u8'},
+        'skip': 'Your account does not have tickets to this event',
     }]
 
     def _real_extract(self, url):
@@ -63,7 +66,9 @@ class ZaikoIE(ZaikoBaseIE):
             stream_meta['stream-access']['video_source'], video_id,
             'Downloading player page', headers={'referer': 'https://zaiko.io/'})
         player_meta = self._parse_vue_element_attr('player', player_page, video_id)
-        status = traverse_obj(player_meta, ('initial_event_info', 'status', {str}))
+        initial_event_info = traverse_obj(player_meta, ('initial_event_info', {dict})) or {}
+
+        status = traverse_obj(initial_event_info, ('status', {str}))
         live_status, msg, expected = {
             'vod': ('was_live', 'No VOD stream URL was found', False),
             'archiving': ('post_live', 'Event VOD is still being processed', True),
@@ -77,12 +82,24 @@ class ZaikoIE(ZaikoBaseIE):
             'cancelled': ('not_live', 'Event has been cancelled', True),
         }.get(status) or ('not_live', f'Unknown event status "{status}"', False)
 
-        stream_url = traverse_obj(player_meta, ('initial_event_info', 'endpoint', {url_or_none}))
+        if traverse_obj(initial_event_info, ('is_jwt_protected', {bool})):
+            stream_url = self._download_json(
+                initial_event_info['jwt_token_url'], video_id, 'Downloading JWT-protected stream URL',
+                'Failed to download JWT-protected stream URL')['playback_url']
+        else:
+            stream_url = traverse_obj(initial_event_info, ('endpoint', {url_or_none}))
+
         formats = self._extract_m3u8_formats(
             stream_url, video_id, live=True, fatal=False) if stream_url else []
         if not formats:
             self.raise_no_formats(msg, expected=expected)
 
+        thumbnail_urls = [
+            traverse_obj(initial_event_info, ('poster_url', {url_or_none})),
+            self._og_search_thumbnail(self._download_webpage(
+                f'https://zaiko.io/event/{video_id}', video_id, 'Downloading event page', fatal=False) or ''),
+        ]
+
         return {
             'id': video_id,
             'formats': formats,
@@ -92,12 +109,10 @@ class ZaikoIE(ZaikoBaseIE):
                 'uploader': ('profile', 'name', {str}),
                 'uploader_id': ('profile', 'id', {str_or_none}),
                 'release_timestamp': ('stream', 'start', 'timestamp', {int_or_none}),
-                'categories': ('event', 'genres', ..., {lambda x: x or None}),
+                'categories': ('event', 'genres', ..., filter),
             }),
-            **traverse_obj(player_meta, ('initial_event_info', {
-                'alt_title': ('title', {str}),
-                'thumbnail': ('poster_url', {url_or_none}),
-            })),
+            'alt_title': traverse_obj(initial_event_info, ('title', {str})),
+            'thumbnails': [{'url': url, 'id': url_basename(url)} for url in thumbnail_urls if url_or_none(url)],
         }
 
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/zapiks.py b/plugins/youtube_download/yt_dlp/extractor/zapiks.py
index 88f526b..2916367 100644
--- a/plugins/youtube_download/yt_dlp/extractor/zapiks.py
+++ b/plugins/youtube_download/yt_dlp/extractor/zapiks.py
@@ -2,11 +2,11 @@ import re
 
 from .common import InfoExtractor
 from ..utils import (
+    int_or_none,
     parse_duration,
     parse_iso8601,
-    xpath_with_ns,
     xpath_text,
-    int_or_none,
+    xpath_with_ns,
 )
 
 
@@ -55,11 +55,11 @@ class ZapiksIE(InfoExtractor):
                 r'data-media-id="(\d+)"', webpage, 'video id')
 
         playlist = self._download_xml(
-            'http://www.zapiks.fr/view/index.php?action=playlist&media_id=%s&lang=en' % video_id,
+            f'http://www.zapiks.fr/view/index.php?action=playlist&media_id={video_id}&lang=en',
             display_id)
 
         NS_MAP = {
-            'jwplayer': 'http://rss.jwpcdn.com/'
+            'jwplayer': 'http://rss.jwpcdn.com/',
         }
 
         def ns(path):
diff --git a/plugins/youtube_download/yt_dlp/extractor/zattoo.py b/plugins/youtube_download/yt_dlp/extractor/zattoo.py
index 6bd9ea0..161804b 100644
--- a/plugins/youtube_download/yt_dlp/extractor/zattoo.py
+++ b/plugins/youtube_download/yt_dlp/extractor/zattoo.py
@@ -1,8 +1,7 @@
 import re
-from uuid import uuid4
+import uuid
 
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..networking.exceptions import HTTPError
 from ..utils import (
     ExtractorError,
@@ -27,13 +26,13 @@ class ZattooPlatformBaseIE(InfoExtractor):
     def _perform_login(self, username, password):
         try:
             data = self._download_json(
-                '%s/zapi/v2/account/login' % self._host_url(), None, 'Logging in',
+                f'{self._host_url()}/zapi/v2/account/login', None, 'Logging in',
                 data=urlencode_postdata({
                     'login': username,
                     'password': password,
                     'remember': 'true',
                 }), headers={
-                    'Referer': '%s/login' % self._host_url(),
+                    'Referer': f'{self._host_url()}/login',
                     'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
                 })
         except ExtractorError as e:
@@ -51,9 +50,9 @@ class ZattooPlatformBaseIE(InfoExtractor):
 
         # Will setup appropriate cookies
         self._request_webpage(
-            '%s/zapi/v3/session/hello' % self._host_url(), None,
+            f'{self._host_url()}/zapi/v3/session/hello', None,
             'Opening session', data=urlencode_postdata({
-                'uuid': compat_str(uuid4()),
+                'uuid': str(uuid.uuid4()),
                 'lang': 'en',
                 'app_version': '1.8.2',
                 'format': 'json',
@@ -72,8 +71,7 @@ class ZattooPlatformBaseIE(InfoExtractor):
 
     def _extract_cid(self, video_id, channel_name):
         channel_groups = self._download_json(
-            '%s/zapi/v2/cached/channels/%s' % (self._host_url(),
-                                               self._power_guide_hash),
+            f'{self._host_url()}/zapi/v2/cached/channels/{self._power_guide_hash}',
             video_id, 'Downloading channel list',
             query={'details': False})['channel_groups']
         channel_list = []
@@ -90,8 +88,7 @@ class ZattooPlatformBaseIE(InfoExtractor):
 
     def _extract_cid_and_video_info(self, video_id):
         data = self._download_json(
-            '%s/zapi/v2/cached/program/power_details/%s' % (
-                self._host_url(), self._power_guide_hash),
+            f'{self._host_url()}/zapi/v2/cached/program/power_details/{self._power_guide_hash}',
             video_id,
             'Downloading video information',
             query={
@@ -113,7 +110,7 @@ class ZattooPlatformBaseIE(InfoExtractor):
             'season_number': int_or_none(p.get('s_no')),
             'release_year': int_or_none(p.get('year')),
             'categories': try_get(p, lambda x: x['c'], list),
-            'tags': try_get(p, lambda x: x['g'], list)
+            'tags': try_get(p, lambda x: x['g'], list),
         }
 
         return cid, info_dict
@@ -123,7 +120,7 @@ class ZattooPlatformBaseIE(InfoExtractor):
         @returns    (ondemand_token, ondemand_type, info_dict)
         """
         data = self._download_json(
-            '%s/zapi/vod/movies/%s' % (self._host_url(), ondemand_id),
+            f'{self._host_url()}/zapi/vod/movies/{ondemand_id}',
             ondemand_id, 'Downloading ondemand information')
         info_dict = {
             'id': ondemand_id,
@@ -144,18 +141,18 @@ class ZattooPlatformBaseIE(InfoExtractor):
 
         if is_live:
             postdata_common.update({'timeshift': 10800})
-            url = '%s/zapi/watch/live/%s' % (self._host_url(), cid)
+            url = f'{self._host_url()}/zapi/watch/live/{cid}'
         elif record_id:
-            url = '%s/zapi/watch/recording/%s' % (self._host_url(), record_id)
+            url = f'{self._host_url()}/zapi/watch/recording/{record_id}'
         elif ondemand_id:
             postdata_common.update({
                 'teasable_id': ondemand_id,
                 'term_token': ondemand_termtoken,
-                'teasable_type': ondemand_type
+                'teasable_type': ondemand_type,
             })
-            url = '%s/zapi/watch/vod/video' % self._host_url()
+            url = f'{self._host_url()}/zapi/watch/vod/video'
         else:
-            url = '%s/zapi/v3/watch/replay/%s/%s' % (self._host_url(), cid, video_id)
+            url = f'{self._host_url()}/zapi/v3/watch/replay/{cid}/{video_id}'
         formats = []
         subtitles = {}
         for stream_type in ('dash', 'hls7'):
@@ -163,7 +160,7 @@ class ZattooPlatformBaseIE(InfoExtractor):
             postdata['stream_type'] = stream_type
 
             data = self._download_json(
-                url, video_id, 'Downloading %s formats' % stream_type.upper(),
+                url, video_id, f'Downloading {stream_type.upper()} formats',
                 data=urlencode_postdata(postdata), fatal=False)
             if not data:
                 continue
@@ -218,7 +215,7 @@ class ZattooPlatformBaseIE(InfoExtractor):
             'title': channel_name,
             'is_live': True,
             'formats': formats,
-            'subtitles': subtitles
+            'subtitles': subtitles,
         }
 
     def _extract_record(self, record_id):
@@ -267,9 +264,9 @@ class ZattooIE(ZattooBaseIE):
             'release_year': 2022,
             'episode': 'Folge 1655',
             'categories': 'count:1',
-            'tags': 'count:2'
+            'tags': 'count:2',
         },
-        'params': {'skip_download': 'm3u8'}
+        'params': {'skip_download': 'm3u8'},
     }, {
         'url': 'https://zattoo.com/program/daserste/210177916',
         'only_matching': True,
@@ -322,7 +319,7 @@ class ZattooRecordingsIE(ZattooBaseIE):
 class NetPlusTVBaseIE(ZattooPlatformBaseIE):
     _NETRC_MACHINE = 'netplus'
     _HOST = 'netplus.tv'
-    _API_HOST = 'www.%s' % _HOST
+    _API_HOST = f'www.{_HOST}'
 
 
 class NetPlusTVIE(NetPlusTVBaseIE):
@@ -458,7 +455,7 @@ class WalyTVRecordingsIE(WalyTVBaseIE):
 class BBVTVBaseIE(ZattooPlatformBaseIE):
     _NETRC_MACHINE = 'bbvtv'
     _HOST = 'bbv-tv.net'
-    _API_HOST = 'www.%s' % _HOST
+    _API_HOST = f'www.{_HOST}'
 
 
 class BBVTVIE(BBVTVBaseIE):
@@ -504,7 +501,7 @@ class BBVTVRecordingsIE(BBVTVBaseIE):
 class VTXTVBaseIE(ZattooPlatformBaseIE):
     _NETRC_MACHINE = 'vtxtv'
     _HOST = 'vtxtv.ch'
-    _API_HOST = 'www.%s' % _HOST
+    _API_HOST = f'www.{_HOST}'
 
 
 class VTXTVIE(VTXTVBaseIE):
@@ -595,7 +592,7 @@ class GlattvisionTVRecordingsIE(GlattvisionTVBaseIE):
 class SAKTVBaseIE(ZattooPlatformBaseIE):
     _NETRC_MACHINE = 'saktv'
     _HOST = 'saktv.ch'
-    _API_HOST = 'www.%s' % _HOST
+    _API_HOST = f'www.{_HOST}'
 
 
 class SAKTVIE(SAKTVBaseIE):
@@ -686,7 +683,7 @@ class EWETVRecordingsIE(EWETVBaseIE):
 class QuantumTVBaseIE(ZattooPlatformBaseIE):
     _NETRC_MACHINE = 'quantumtv'
     _HOST = 'quantum-tv.com'
-    _API_HOST = 'www.%s' % _HOST
+    _API_HOST = f'www.{_HOST}'
 
 
 class QuantumTVIE(QuantumTVBaseIE):
@@ -777,7 +774,7 @@ class OsnatelTVRecordingsIE(OsnatelTVBaseIE):
 class EinsUndEinsTVBaseIE(ZattooPlatformBaseIE):
     _NETRC_MACHINE = '1und1tv'
     _HOST = '1und1.tv'
-    _API_HOST = 'www.%s' % _HOST
+    _API_HOST = f'www.{_HOST}'
 
 
 class EinsUndEinsTVIE(EinsUndEinsTVBaseIE):
diff --git a/plugins/youtube_download/yt_dlp/extractor/zdf.py b/plugins/youtube_download/yt_dlp/extractor/zdf.py
index c04d51b..10be582 100644
--- a/plugins/youtube_download/yt_dlp/extractor/zdf.py
+++ b/plugins/youtube_download/yt_dlp/extractor/zdf.py
@@ -1,209 +1,410 @@
+import itertools
+import json
 import re
+import time
 
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
-    NO_DEFAULT,
     ExtractorError,
     determine_ext,
-    extract_attributes,
+    filter_dict,
     float_or_none,
     int_or_none,
     join_nonempty,
-    merge_dicts,
+    make_archive_id,
     parse_codecs,
-    qualities,
-    traverse_obj,
-    try_get,
+    parse_iso8601,
+    parse_qs,
+    smuggle_url,
     unified_timestamp,
-    update_url_query,
+    unsmuggle_url,
     url_or_none,
     urljoin,
+    variadic,
 )
+from ..utils.traversal import require, traverse_obj
 
 
 class ZDFBaseIE(InfoExtractor):
     _GEO_COUNTRIES = ['DE']
-    _QUALITIES = ('auto', 'low', 'med', 'high', 'veryhigh', 'hd', 'fhd', 'uhd')
+    _TOKEN_CACHE_PARAMS = ('zdf', 'api-token')
+    _token_cache = {}
 
-    def _call_api(self, url, video_id, item, api_token=None, referrer=None):
-        headers = {}
-        if api_token:
-            headers['Api-Auth'] = 'Bearer %s' % api_token
-        if referrer:
-            headers['Referer'] = referrer
+    def _get_api_token(self):
+        # As of 2025-03, this API is used by the Android app for getting tokens.
+        # An equivalent token could be extracted from the webpage should the API become unavailable.
+        # For now this allows the extractor to avoid dealing with Next.js hydration data.
+        if not self._token_cache:
+            self._token_cache.update(self.cache.load(*self._TOKEN_CACHE_PARAMS, default={}))
+
+        if traverse_obj(self._token_cache, ('expires', {int_or_none}), default=0) < int(time.time()):
+            self._token_cache.update(self._download_json(
+                'https://zdf-prod-futura.zdf.de/mediathekV2/token', None,
+                'Downloading API token', 'Failed to download API token'))
+            self.cache.store(*self._TOKEN_CACHE_PARAMS, self._token_cache)
+
+        return f'{self._token_cache["type"]} {self._token_cache["token"]}'
+
+    def _call_api(self, url, video_id, item, api_token=None):
         return self._download_json(
-            url, video_id, 'Downloading JSON %s' % item, headers=headers)
+            url, video_id, f'Downloading {item}', f'Failed to download {item}',
+            headers=filter_dict({'Api-Auth': api_token}))
+
+    def _parse_aspect_ratio(self, aspect_ratio):
+        if not aspect_ratio or not isinstance(aspect_ratio, str):
+            return None
+        mobj = re.match(r'(?P<width>\d+):(?P<height>\d+)', aspect_ratio)
+        return int(mobj.group('width')) / int(mobj.group('height')) if mobj else None
+
+    def _extract_chapters(self, data):
+        return traverse_obj(data, (lambda _, v: v['anchorOffset'], {
+            'start_time': ('anchorOffset', {float_or_none}),
+            'title': ('anchorLabel', {str}),
+        })) or None
 
     @staticmethod
     def _extract_subtitles(src):
+        seen_urls = set()
         subtitles = {}
-        for caption in try_get(src, lambda x: x['captions'], list) or []:
+        for caption in src:
             subtitle_url = url_or_none(caption.get('uri'))
-            if subtitle_url:
-                lang = caption.get('language', 'deu')
-                subtitles.setdefault(lang, []).append({
-                    'url': subtitle_url,
-                })
+            if not subtitle_url or subtitle_url in seen_urls:
+                continue
+            seen_urls.add(subtitle_url)
+            lang = caption.get('language') or 'deu'
+            subtitles.setdefault(lang, []).append({
+                'url': subtitle_url,
+            })
         return subtitles
 
-    def _extract_format(self, video_id, formats, format_urls, meta):
-        format_url = url_or_none(meta.get('url'))
-        if not format_url or format_url in format_urls:
-            return
-        format_urls.add(format_url)
+    def _expand_ptmd_template(self, api_base_url, template):
+        return urljoin(api_base_url, template.replace('{playerId}', 'android_native_6'))
 
-        mime_type, ext = meta.get('mimeType'), determine_ext(format_url)
-        if mime_type == 'application/x-mpegURL' or ext == 'm3u8':
-            new_formats = self._extract_m3u8_formats(
-                format_url, video_id, 'mp4', m3u8_id='hls',
-                entry_protocol='m3u8_native', fatal=False)
-        elif mime_type == 'application/f4m+xml' or ext == 'f4m':
-            new_formats = self._extract_f4m_formats(
-                update_url_query(format_url, {'hdcore': '3.7.0'}), video_id, f4m_id='hds', fatal=False)
-        elif ext == 'mpd':
-            new_formats = self._extract_mpd_formats(
-                format_url, video_id, mpd_id='dash', fatal=False)
-        else:
-            f = parse_codecs(meta.get('mimeCodec'))
-            if not f and meta.get('type'):
-                data = meta['type'].split('_')
-                if try_get(data, lambda x: x[2]) == ext:
-                    f = {'vcodec': data[0], 'acodec': data[1]}
-            f.update({
-                'url': format_url,
-                'format_id': join_nonempty('http', meta.get('type'), meta.get('quality')),
-                'tbr': int_or_none(self._search_regex(r'_(\d+)k_', format_url, 'tbr', default=None))
-            })
-            new_formats = [f]
-        formats.extend(merge_dicts(f, {
-            'format_note': join_nonempty('quality', 'class', from_dict=meta, delim=', '),
-            'language': meta.get('language'),
-            'language_preference': 10 if meta.get('class') == 'main' else -10 if meta.get('class') == 'ad' else -1,
-            'quality': qualities(self._QUALITIES)(meta.get('quality')),
-        }) for f in new_formats)
+    def _extract_ptmd(self, ptmd_urls, video_id, api_token=None, aspect_ratio=None):
+        content_id = None
+        duration = None
+        formats, src_captions = [], []
+        seen_urls = set()
 
-    def _extract_ptmd(self, ptmd_url, video_id, api_token, referrer):
-        ptmd = self._call_api(
-            ptmd_url, video_id, 'metadata', api_token, referrer)
+        for ptmd_url in variadic(ptmd_urls):
+            ptmd_url, smuggled_data = unsmuggle_url(ptmd_url, {})
+            # Is it a DGS variant? (*D*eutsche *G*ebärden*s*prache' / German Sign Language)
+            is_dgs = smuggled_data.get('vod_media_type') == 'DGS'
+            ptmd = self._call_api(ptmd_url, video_id, 'PTMD data', api_token)
 
-        content_id = ptmd.get('basename') or ptmd_url.split('/')[-1]
+            basename = (
+                ptmd.get('basename')
+                # ptmd_url examples:
+                # https://api.zdf.de/tmd/2/android_native_6/vod/ptmd/mediathek/250328_sendung_hsh/3
+                # https://tmd.phoenix.de/tmd/2/android_native_6/vod/ptmd/phoenix/221215_phx_spitzbergen
+                or self._search_regex(r'/vod/ptmd/[^/?#]+/(\w+)', ptmd_url, 'content ID', default=None))
+            # If this is_dgs, then it's from ZDFIE and it only uses content_id for _old_archive_ids,
+            # and the old version of the extractor didn't extract DGS variants, so ignore basename
+            if not content_id and not is_dgs:
+                content_id = basename
 
-        formats = []
-        track_uris = set()
-        for p in ptmd['priorityList']:
-            formitaeten = p.get('formitaeten')
-            if not isinstance(formitaeten, list):
-                continue
-            for f in formitaeten:
-                f_qualities = f.get('qualities')
-                if not isinstance(f_qualities, list):
-                    continue
-                for quality in f_qualities:
-                    tracks = try_get(quality, lambda x: x['audio']['tracks'], list)
-                    if not tracks:
-                        continue
-                    for track in tracks:
-                        self._extract_format(
-                            content_id, formats, track_uris, {
-                                'url': track.get('uri'),
-                                'type': f.get('type'),
-                                'mimeType': f.get('mimeType'),
-                                'quality': quality.get('quality'),
-                                'class': track.get('class'),
-                                'language': track.get('language'),
+            if not duration:
+                duration = traverse_obj(ptmd, ('attributes', 'duration', 'value', {float_or_none(scale=1000)}))
+            src_captions += traverse_obj(ptmd, ('captions', ..., {dict}))
+
+            for stream in traverse_obj(ptmd, ('priorityList', ..., 'formitaeten', ..., {dict})):
+                for quality in traverse_obj(stream, ('qualities', ..., {dict})):
+                    for variant in traverse_obj(quality, ('audio', 'tracks', lambda _, v: url_or_none(v['uri']))):
+                        format_url = variant['uri']
+                        if format_url in seen_urls:
+                            continue
+                        seen_urls.add(format_url)
+                        ext = determine_ext(format_url)
+                        if ext == 'm3u8':
+                            fmts = self._extract_m3u8_formats(
+                                format_url, video_id, 'mp4', m3u8_id='hls', fatal=False)
+                        elif ext == 'mpd':
+                            fmts = self._extract_mpd_formats(
+                                format_url, video_id, mpd_id='dash', fatal=False)
+                        else:
+                            height = int_or_none(quality.get('highestVerticalResolution'))
+                            width = round(aspect_ratio * height) if aspect_ratio and height else None
+                            fmts = [{
+                                'url': format_url,
+                                **parse_codecs(quality.get('mimeCodec')),
+                                'height': height,
+                                'width': width,
+                                'format_id': join_nonempty('http', stream.get('type')),
+                                'tbr': int_or_none(self._search_regex(r'_(\d+)k_', format_url, 'tbr', default=None)),
+                            }]
+                        f_class = variant.get('class')
+                        for f in fmts:
+                            formats.append({
+                                **f,
+                                'format_id': join_nonempty(f.get('format_id'), is_dgs and 'dgs'),
+                                'format_note': join_nonempty(
+                                    f_class, is_dgs and 'German Sign Language', f.get('format_note'), delim=', '),
+                                'language': variant.get('language') or f.get('language'),
+                                'preference': -2 if is_dgs else -1,
+                                'language_preference': 10 if f_class == 'main' else -10 if f_class == 'ad' else -1,
                             })
 
-        duration = float_or_none(try_get(
-            ptmd, lambda x: x['attributes']['duration']['value']), scale=1000)
-
         return {
-            'extractor_key': ZDFIE.ie_key(),
-            'id': content_id,
+            'id': content_id or video_id,
             'duration': duration,
             'formats': formats,
-            'subtitles': self._extract_subtitles(ptmd),
-            '_format_sort_fields': ('tbr', 'res', 'quality', 'language_preference'),
+            'subtitles': self._extract_subtitles(src_captions),
         }
 
-    def _extract_player(self, webpage, video_id, fatal=True):
-        return self._parse_json(
-            self._search_regex(
-                r'(?s)data-zdfplayer-jsb=(["\'])(?P<json>{.+?})\1', webpage,
-                'player JSON', default='{}' if not fatal else NO_DEFAULT,
-                group='json'),
-            video_id)
+    def _download_graphql(self, item_id, data_desc, query=None, body=None):
+        assert query or body, 'One of query or body is required'
+
+        return self._download_json(
+            'https://api.zdf.de/graphql', item_id,
+            f'Downloading {data_desc}', f'Failed to download {data_desc}',
+            query=query, data=json.dumps(body).encode() if body else None,
+            headers=filter_dict({
+                'Api-Auth': self._get_api_token(),
+                'Apollo-Require-Preflight': True,
+                'Content-Type': 'application/json' if body else None,
+            }))
+
+    @staticmethod
+    def _extract_thumbnails(source):
+        return [{
+            'id': str(format_id),
+            'url': url,
+            'preference': 1 if format_id == 'original' else 0,
+            **traverse_obj(re.search(r'(?P<width>\d+|auto)[Xx](?P<height>\d+|auto)', str(format_id)), {
+                'width': ('width', {int_or_none}),
+                'height': ('height', {int_or_none}),
+            }),
+        } for format_id, url in traverse_obj(source, ({dict.items}, lambda _, v: url_or_none(v[1])))]
 
 
 class ZDFIE(ZDFBaseIE):
-    _VALID_URL = r'https?://www\.zdf\.de/(?:[^/]+/)*(?P<id>[^/?#&]+)\.html'
+    _VALID_URL = [
+        r'https?://(?:www\.)?zdf\.de/(?:video|play)/(?:[^/?#]+/)*(?P<id>[^/?#]+)',
+        # /nachrichten/ sub-site URLs and legacy redirects from before the redesign in 2025-03
+        r'https?://(?:www\.)?zdf\.de/(?:[^/?#]+/)*(?P<id>[^/?#]+)\.html',
+    ]
+    IE_NAME = 'zdf'
     _TESTS = [{
-        # Same as https://www.phoenix.de/sendungen/ereignisse/corona-nachgehakt/wohin-fuehrt-der-protest-in-der-pandemie-a-2050630.html
-        'url': 'https://www.zdf.de/politik/phoenix-sendungen/wohin-fuehrt-der-protest-in-der-pandemie-100.html',
-        'md5': '34ec321e7eb34231fd88616c65c92db0',
+        # Standalone video (i.e. not part of a playlist), video URL
+        'url': 'https://www.zdf.de/video/dokus/sylt---deutschlands-edles-nordlicht-movie-100/sylt-deutschlands-edles-nordlicht-100',
         'info_dict': {
-            'id': '210222_phx_nachgehakt_corona_protest',
+            'id': 'sylt-deutschlands-edles-nordlicht-100',
             'ext': 'mp4',
-            'title': 'Wohin führt der Protest in der Pandemie?',
-            'description': 'md5:7d643fe7f565e53a24aac036b2122fbd',
-            'duration': 1691,
-            'timestamp': 1613948400,
-            'upload_date': '20210221',
+            'title': 'Sylt - Deutschlands edles Nordlicht',
+            'description': 'md5:35407b810c2e1e33efbe15ef6e4c06c3',
+            'duration': 810.0,
+            'thumbnail': 'https://www.zdf.de/assets/sylt-118~original?cb=1613992485011',
+            'series': 'Sylt - Deutschlands edles Nordlicht',
+            'series_id': 'sylt---deutschlands-edles-nordlicht-movie-100',
+            'timestamp': 1612462500,
+            'upload_date': '20210204',
+            '_old_archive_ids': ['zdf 210402_1915_sendung_dok'],
         },
-        'skip': 'No longer available: "Diese Seite wurde leider nicht gefunden"',
     }, {
-        # Same as https://www.3sat.de/film/ab-18/10-wochen-sommer-108.html
-        'url': 'https://www.zdf.de/dokumentation/ab-18/10-wochen-sommer-102.html',
-        'md5': '0aff3e7bc72c8813f5e0fae333316a1d',
+        # Standalone video (i.e. not part of a playlist), play URL
+        'url': 'https://www.zdf.de/play/dokus/sylt---deutschlands-edles-nordlicht-movie-100/sylt-deutschlands-edles-nordlicht-100',
         'info_dict': {
-            'id': '141007_ab18_10wochensommer_film',
+            'id': 'sylt-deutschlands-edles-nordlicht-100',
             'ext': 'mp4',
-            'title': 'Ab 18! - 10 Wochen Sommer',
-            'description': 'md5:8253f41dc99ce2c3ff892dac2d65fe26',
-            'duration': 2660,
-            'timestamp': 1608604200,
-            'upload_date': '20201222',
+            'title': 'Sylt - Deutschlands edles Nordlicht',
+            'description': 'md5:35407b810c2e1e33efbe15ef6e4c06c3',
+            'duration': 810.0,
+            'thumbnail': 'https://www.zdf.de/assets/sylt-118~original?cb=1613992485011',
+            'series': 'Sylt - Deutschlands edles Nordlicht',
+            'series_id': 'sylt---deutschlands-edles-nordlicht-movie-100',
+            'timestamp': 1612462500,
+            'upload_date': '20210204',
+            '_old_archive_ids': ['zdf 210402_1915_sendung_dok'],
         },
-        'skip': 'No longer available: "Diese Seite wurde leider nicht gefunden"',
+        'params': {'skip_download': True},
     }, {
-        'url': 'https://www.zdf.de/nachrichten/heute-journal/heute-journal-vom-30-12-2021-100.html',
+        # Standalone video (i.e. not part of a playlist), legacy URL before website redesign in 2025-03
+        'url': 'https://www.zdf.de/dokumentation/dokumentation-sonstige/sylt-deutschlands-edles-nordlicht-100.html',
         'info_dict': {
-            'id': '211230_sendung_hjo',
+            'id': 'sylt-deutschlands-edles-nordlicht-100',
             'ext': 'mp4',
-            'description': 'md5:47dff85977bde9fb8cba9e9c9b929839',
-            'duration': 1890.0,
-            'upload_date': '20211230',
-            'chapters': list,
-            'thumbnail': 'md5:e65f459f741be5455c952cd820eb188e',
-            'title': 'heute journal vom 30.12.2021',
-            'timestamp': 1640897100,
+            'title': 'Sylt - Deutschlands edles Nordlicht',
+            'description': 'md5:35407b810c2e1e33efbe15ef6e4c06c3',
+            'duration': 810.0,
+            'thumbnail': 'https://www.zdf.de/assets/sylt-118~original?cb=1613992485011',
+            'series': 'Sylt - Deutschlands edles Nordlicht',
+            'series_id': 'sylt---deutschlands-edles-nordlicht-movie-100',
+            'timestamp': 1612462500,
+            'upload_date': '20210204',
+            '_old_archive_ids': ['zdf 210402_1915_sendung_dok'],
         },
-        'skip': 'No longer available: "Diese Seite wurde leider nicht gefunden"',
+        'params': {'skip_download': True},
     }, {
-        'url': 'https://www.zdf.de/dokumentation/terra-x/die-magie-der-farben-von-koenigspurpur-und-jeansblau-100.html',
+        # Video belongs to a playlist, video URL
+        'url': 'https://www.zdf.de/video/dokus/die-magie-der-farben-116/die-magie-der-farben-von-koenigspurpur-und-jeansblau-100',
+        'md5': '1eda17eb40a9ead3046326e10b9c5973',
         'info_dict': {
-            'id': '151025_magie_farben2_tex',
+            'id': 'die-magie-der-farben-von-koenigspurpur-und-jeansblau-100',
             'ext': 'mp4',
-            'title': 'Die Magie der Farben (2/2)',
+            'title': 'Von Königspurpur bis Jeansblau',
             'description': 'md5:a89da10c928c6235401066b60a6d5c1a',
-            'duration': 2615,
-            'timestamp': 1465021200,
-            'upload_date': '20160604',
-            'thumbnail': 'https://www.zdf.de/assets/mauve-im-labor-100~768x432?cb=1464909117806',
+            'duration': 2615.0,
+            'thumbnail': 'https://www.zdf.de/assets/koenigspurpur-bis-jeansblau-100~original?cb=1741857765971',
+            'series': 'Die Magie der Farben',
+            'series_id': 'die-magie-der-farben-116',
+            'season': 'Season 1',
+            'season_number': 1,
+            'episode': 'Episode 2',
+            'episode_number': 2,
+            'timestamp': 1445797800,
+            'upload_date': '20151025',
+            '_old_archive_ids': ['zdf 151025_magie_farben2_tex'],
+        },
+    }, {
+        # Video belongs to a playlist, play URL
+        'url': 'https://www.zdf.de/play/dokus/die-magie-der-farben-116/die-magie-der-farben-von-koenigspurpur-und-jeansblau-100',
+        'md5': '1eda17eb40a9ead3046326e10b9c5973',
+        'info_dict': {
+            'id': 'die-magie-der-farben-von-koenigspurpur-und-jeansblau-100',
+            'ext': 'mp4',
+            'title': 'Von Königspurpur bis Jeansblau',
+            'description': 'md5:a89da10c928c6235401066b60a6d5c1a',
+            'duration': 2615.0,
+            'thumbnail': 'https://www.zdf.de/assets/koenigspurpur-bis-jeansblau-100~original?cb=1741857765971',
+            'series': 'Die Magie der Farben',
+            'series_id': 'die-magie-der-farben-116',
+            'season': 'Season 1',
+            'season_number': 1,
+            'episode': 'Episode 2',
+            'episode_number': 2,
+            'timestamp': 1445797800,
+            'upload_date': '20151025',
+            '_old_archive_ids': ['zdf 151025_magie_farben2_tex'],
+        },
+        'params': {'skip_download': True},
+    }, {
+        # Video belongs to a playlist, legacy URL before website redesign in 2025-03
+        'url': 'https://www.zdf.de/dokumentation/terra-x/die-magie-der-farben-von-koenigspurpur-und-jeansblau-100.html',
+        'md5': '1eda17eb40a9ead3046326e10b9c5973',
+        'info_dict': {
+            'id': 'die-magie-der-farben-von-koenigspurpur-und-jeansblau-100',
+            'ext': 'mp4',
+            'title': 'Von Königspurpur bis Jeansblau',
+            'description': 'md5:a89da10c928c6235401066b60a6d5c1a',
+            'duration': 2615.0,
+            'thumbnail': 'https://www.zdf.de/assets/koenigspurpur-bis-jeansblau-100~original?cb=1741857765971',
+            'series': 'Die Magie der Farben',
+            'series_id': 'die-magie-der-farben-116',
+            'season': 'Season 1',
+            'season_number': 1,
+            'episode': 'Episode 2',
+            'episode_number': 2,
+            'timestamp': 1445797800,
+            'upload_date': '20151025',
+            '_old_archive_ids': ['zdf 151025_magie_farben2_tex'],
+        },
+        'params': {'skip_download': True},
+    }, {
+        # Video with chapters
+        # Also: video with sign-language variant
+        'url': 'https://www.zdf.de/video/magazine/heute-journal-104/heute-journal-vom-19-12-2021-100',
+        'md5': '6ada39465497a84fb98d48ffff69e7b7',
+        'info_dict': {
+            'id': 'heute-journal-vom-19-12-2021-100',
+            'ext': 'mp4',
+            'title': 'heute journal vom 19.12.2021',
+            'description': 'md5:02504cf3b03777ff32fcc927d260c5dd',
+            'duration': 1770.0,
+            'thumbnail': 'https://epg-image.zdf.de/fotobase-webdelivery/images/273e5545-16e7-4ca3-898e-52fe9e06d964?layout=1920x1080',
+            'chapters': 'count:11',
+            'series': 'heute journal',
+            'series_id': 'heute-journal-104',
+            'season': 'Season 2021',
+            'season_number': 2021,
+            'episode': 'Episode 370',
+            'episode_number': 370,
+            'timestamp': 1639946700,
+            'upload_date': '20211219',
+            # Videos with sign language variants must not have a 'dgs' suffix on their old archive IDs.
+            '_old_archive_ids': ['zdf 211219_sendung_hjo'],
+        },
+    }, {
+        # Video that requires fallback extraction
+        'url': 'https://www.zdf.de/nachrichten/politik/deutschland/koalitionsverhandlungen-spd-cdu-csu-dobrindt-100.html',
+        'md5': 'c3a78514dd993a5781aa3afe50db51e2',
+        'info_dict': {
+            'id': 'koalitionsverhandlungen-spd-cdu-csu-dobrindt-100',
+            'ext': 'mp4',
+            'title': 'Dobrindt schließt Steuererhöhungen aus',
+            'description': 'md5:9a117646d7b8df6bc902eb543a9c9023',
+            'duration': 325,
+            'thumbnail': 'https://www.zdf.de/assets/dobrindt-csu-berlin-direkt-100~1920x1080?cb=1743357653736',
+            'timestamp': 1743374520,
+            'upload_date': '20250330',
+            '_old_archive_ids': ['zdf 250330_clip_2_bdi'],
         },
     }, {
         'url': 'https://www.zdf.de/funk/druck-11790/funk-alles-ist-verzaubert-102.html',
         'md5': '57af4423db0455a3975d2dc4578536bc',
         'info_dict': {
+            'id': 'funk-alles-ist-verzaubert-102',
             'ext': 'mp4',
-            'id': 'video_funk_1770473',
-            'duration': 1278,
-            'description': 'Die Neue an der Schule verdreht Ismail den Kopf.',
             'title': 'Alles ist verzaubert',
+            'description': 'Die Neue an der Schule verdreht Ismail den Kopf.',
+            'duration': 1278.0,
+            'thumbnail': 'https://www.zdf.de/assets/teaser-funk-alles-ist-verzaubert-102~original?cb=1663848412907',
+            'series': 'DRUCK',
+            'series_id': 'funk-collection-funk-11790-1590',
+            'season': 'Season 7',
+            'season_number': 7,
+            'episode': 'Episode 1',
+            'episode_number': 1,
             'timestamp': 1635520560,
             'upload_date': '20211029',
-            'thumbnail': 'https://www.zdf.de/assets/teaser-funk-alles-ist-verzaubert-102~1920x1080?cb=1663848412907',
+            '_old_archive_ids': ['zdf video_funk_1770473'],
         },
+    }, {
+        'url': 'https://www.zdf.de/serien/soko-stuttgart/das-geld-anderer-leute-100.html',
+        'info_dict': {
+            'id': 'das-geld-anderer-leute-100',
+            'ext': 'mp4',
+            'title': 'Das Geld anderer Leute',
+            'description': 'md5:cb6f660850dc5eb7d1ab776ea094959d',
+            'duration': 2581.0,
+            'thumbnail': 'https://epg-image.zdf.de/fotobase-webdelivery/images/e2d7e55a-09f0-424e-ac73-6cac4dd65f35?layout=1920x1080',
+            'series': 'SOKO Stuttgart',
+            'series_id': 'soko-stuttgart-104',
+            'season': 'Season 11',
+            'season_number': 11,
+            'episode': 'Episode 10',
+            'episode_number': 10,
+            'timestamp': 1728983700,
+            'upload_date': '20241015',
+            '_old_archive_ids': ['zdf 191205_1800_sendung_sok8'],
+        },
+    }, {
+        'url': 'https://www.zdf.de/serien/northern-lights/begegnung-auf-der-bruecke-100.html',
+        'info_dict': {
+            'id': 'begegnung-auf-der-bruecke-100',
+            'ext': 'webm',
+            'title': 'Begegnung auf der Brücke',
+            'description': 'md5:e53a555da87447f7f1207f10353f8e45',
+            'duration': 3083.0,
+            'thumbnail': 'https://epg-image.zdf.de/fotobase-webdelivery/images/c5ff1d1f-f5c8-4468-86ac-1b2f1dbecc76?layout=1920x1080',
+            'series': 'Northern Lights',
+            'series_id': 'northern-lights-100',
+            'season': 'Season 1',
+            'season_number': 1,
+            'episode': 'Episode 1',
+            'episode_number': 1,
+            'timestamp': 1738546500,
+            'upload_date': '20250203',
+            '_old_archive_ids': ['zdf 240319_2310_sendung_not'],
+        },
+        'params': {'skip_download': 'geo-restricted http format'},
+    }, {
+        # Same as https://www.phoenix.de/sendungen/ereignisse/corona-nachgehakt/wohin-fuehrt-der-protest-in-der-pandemie-a-2050630.html
+        'url': 'https://www.zdf.de/politik/phoenix-sendungen/wohin-fuehrt-der-protest-in-der-pandemie-100.html',
+        'only_matching': True,
+    }, {
+        # Same as https://www.3sat.de/film/ab-18/10-wochen-sommer-108.html
+        'url': 'https://www.zdf.de/dokumentation/ab-18/10-wochen-sommer-102.html',
+        'only_matching': True,
     }, {
         # Same as https://www.phoenix.de/sendungen/dokumentationen/gesten-der-maechtigen-i-a-89468.html?ref=suche
         'url': 'https://www.zdf.de/politik/phoenix-sendungen/die-gesten-der-maechtigen-100.html',
@@ -227,216 +428,323 @@ class ZDFIE(ZDFBaseIE):
         'only_matching': True,
     }, {
         'url': 'https://www.zdf.de/arte/todliche-flucht/page-video-artede-toedliche-flucht-16-100.html',
-        'info_dict': {
-            'id': 'video_artede_083871-001-A',
-            'ext': 'mp4',
-            'title': 'Tödliche Flucht (1/6)',
-            'description': 'md5:e34f96a9a5f8abd839ccfcebad3d5315',
-            'duration': 3193.0,
-            'timestamp': 1641355200,
-            'upload_date': '20220105',
-        },
-        'skip': 'No longer available "Diese Seite wurde leider nicht gefunden"'
-    }, {
-        'url': 'https://www.zdf.de/serien/soko-stuttgart/das-geld-anderer-leute-100.html',
-        'info_dict': {
-            'id': '191205_1800_sendung_sok8',
-            'ext': 'mp4',
-            'title': 'Das Geld anderer Leute',
-            'description': 'md5:cb6f660850dc5eb7d1ab776ea094959d',
-            'duration': 2581.0,
-            'timestamp': 1675160100,
-            'upload_date': '20230131',
-            'thumbnail': 'https://epg-image.zdf.de/fotobase-webdelivery/images/e2d7e55a-09f0-424e-ac73-6cac4dd65f35?layout=2400x1350',
-        },
+        'only_matching': True,
     }, {
         'url': 'https://www.zdf.de/dokumentation/terra-x/unser-gruener-planet-wuesten-doku-100.html',
-        'info_dict': {
-            'id': '220605_dk_gruener_planet_wuesten_tex',
-            'ext': 'mp4',
-            'title': 'Unser grüner Planet - Wüsten',
-            'description': 'md5:4fc647b6f9c3796eea66f4a0baea2862',
-            'duration': 2613.0,
-            'timestamp': 1654450200,
-            'upload_date': '20220605',
-            'format_note': 'uhd, main',
-            'thumbnail': 'https://www.zdf.de/assets/saguaro-kakteen-102~3840x2160?cb=1655910690796',
-        },
+        'only_matching': True,
     }]
 
-    def _extract_entry(self, url, player, content, video_id):
-        title = content.get('title') or content['teaserHeadline']
+    _GRAPHQL_QUERY = '''
+query VideoByCanonical($canonical: String!) {
+  videoByCanonical(canonical: $canonical) {
+    canonical
+    title
+    leadParagraph
+    editorialDate
+    teaser {
+      description
+      image {
+        list
+      }
+    }
+    episodeInfo {
+      episodeNumber
+      seasonNumber
+    }
+    smartCollection {
+      canonical
+      title
+    }
+    currentMedia {
+      nodes {
+        ptmdTemplate
+        ... on VodMedia {
+          duration
+          aspectRatio
+          streamAnchorTags {
+            nodes {
+              anchorOffset
+              anchorLabel
+            }
+          }
+          vodMediaType
+          label
+        }
+        ... on LiveMedia {
+          start
+          stop
+          encryption
+          liveMediaType
+          label
+        }
+        id
+      }
+    }
+  }
+}
+    '''
 
-        t = content['mainVideoContent']['http://zdf.de/rels/target']
-        ptmd_path = traverse_obj(t, (
-            (('streams', 'default'), None),
-            ('http://zdf.de/rels/streams/ptmd', 'http://zdf.de/rels/streams/ptmd-template')
-        ), get_all=False)
-        if not ptmd_path:
-            raise ExtractorError('Could not extract ptmd_path')
+    def _extract_ptmd(self, *args, **kwargs):
+        ptmd_data = super()._extract_ptmd(*args, **kwargs)
+        # This was the video id before the graphql redesign, other extractors still use it as such
+        old_archive_id = ptmd_data.pop('id')
+        ptmd_data['_old_archive_ids'] = [make_archive_id(self, old_archive_id)]
+        return ptmd_data
 
-        info = self._extract_ptmd(
-            urljoin(url, ptmd_path.replace('{playerId}', 'android_native_5')), video_id, player['apiToken'], url)
-
-        thumbnails = []
-        layouts = try_get(
-            content, lambda x: x['teaserImageRef']['layouts'], dict)
-        if layouts:
-            for layout_key, layout_url in layouts.items():
-                layout_url = url_or_none(layout_url)
-                if not layout_url:
-                    continue
-                thumbnail = {
-                    'url': layout_url,
-                    'format_id': layout_key,
-                }
-                mobj = re.search(r'(?P<width>\d+)x(?P<height>\d+)', layout_key)
-                if mobj:
-                    thumbnail.update({
-                        'width': int(mobj.group('width')),
-                        'height': int(mobj.group('height')),
-                    })
-                thumbnails.append(thumbnail)
-
-        chapter_marks = t.get('streamAnchorTag') or []
-        chapter_marks.append({'anchorOffset': int_or_none(t.get('duration'))})
-        chapters = [{
-            'start_time': chap.get('anchorOffset'),
-            'end_time': next_chap.get('anchorOffset'),
-            'title': chap.get('anchorLabel')
-        } for chap, next_chap in zip(chapter_marks, chapter_marks[1:])]
-
-        return merge_dicts(info, {
-            'title': title,
-            'description': content.get('leadParagraph') or content.get('teasertext'),
-            'duration': int_or_none(t.get('duration')),
-            'timestamp': unified_timestamp(content.get('editorialDate')),
-            'thumbnails': thumbnails,
-            'chapters': chapters or None
-        })
-
-    def _extract_regular(self, url, player, video_id):
-        content = self._call_api(
-            player['content'], video_id, 'content', player['apiToken'], url)
-        return self._extract_entry(player['content'], player, content, video_id)
-
-    def _extract_mobile(self, video_id):
+    # This fallback should generally only happen for pages under `zdf.de/nachrichten`.
+    # They are on a separate website for which GraphQL often doesn't return results.
+    # The API used here is no longer in use by official clients and likely deprecated.
+    # Long-term, news documents probably should use the API used by the mobile apps:
+    # https://zdf-prod-futura.zdf.de/news/documents/ (note 'news' vs 'mediathekV2')
+    def _extract_fallback(self, document_id):
         video = self._download_json(
-            'https://zdf-cdn.live.cellular.de/mediathekV2/document/%s' % video_id,
-            video_id)
+            f'https://zdf-prod-futura.zdf.de/mediathekV2/document/{document_id}',
+            document_id, note='Downloading fallback metadata',
+            errnote='Failed to download fallback metadata')
+        document = video['document']
 
-        formats = []
-        formitaeten = try_get(video, lambda x: x['document']['formitaeten'], list)
-        document = formitaeten and video['document']
-        if formitaeten:
-            title = document['titel']
-            content_id = document['basename']
-
-            format_urls = set()
-            for f in formitaeten or []:
-                self._extract_format(content_id, formats, format_urls, f)
+        ptmd_url = traverse_obj(document, (
+            ('streamApiUrlAndroid', ('streams', 0, 'streamApiUrlAndroid')),
+            {url_or_none}, any, {require('PTMD URL')}))
 
         thumbnails = []
-        teaser_bild = document.get('teaserBild')
-        if isinstance(teaser_bild, dict):
-            for thumbnail_key, thumbnail in teaser_bild.items():
-                thumbnail_url = try_get(
-                    thumbnail, lambda x: x['url'], compat_str)
-                if thumbnail_url:
-                    thumbnails.append({
-                        'url': thumbnail_url,
-                        'id': thumbnail_key,
-                        'width': int_or_none(thumbnail.get('width')),
-                        'height': int_or_none(thumbnail.get('height')),
-                    })
+        for thumbnail_key, thumbnail in traverse_obj(document, ('teaserBild', {dict.items}, ...)):
+            thumbnail_url = traverse_obj(thumbnail, ('url', {url_or_none}))
+            if not thumbnail_url:
+                continue
+            thumbnails.append({
+                'url': thumbnail_url,
+                'id': thumbnail_key,
+                'width': int_or_none(thumbnail.get('width')),
+                'height': int_or_none(thumbnail.get('height')),
+            })
 
         return {
-            'id': content_id,
-            'title': title,
-            'description': document.get('beschreibung'),
-            'duration': int_or_none(document.get('length')),
-            'timestamp': unified_timestamp(document.get('date')) or unified_timestamp(
-                try_get(video, lambda x: x['meta']['editorialDate'], compat_str)),
             'thumbnails': thumbnails,
-            'subtitles': self._extract_subtitles(document),
-            'formats': formats,
+            **traverse_obj(video, {
+                'title': ('document', 'titel', {str}),
+                'description': ('document', 'beschreibung', {str}),
+                'timestamp': (
+                    (('document', 'date'), ('meta', 'editorialDate')),
+                    {unified_timestamp}, any),
+                'subtitles': ('document', 'captions', {self._extract_subtitles}),
+            }),
+            **self._extract_ptmd(ptmd_url, document_id, self._get_api_token()),
+            'id': document_id,
         }
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
+        video_data = self._download_graphql(video_id, 'video metadata', body={
+            'operationName': 'VideoByCanonical',
+            'query': self._GRAPHQL_QUERY,
+            'variables': {'canonical': video_id},
+        })['data']['videoByCanonical']
 
-        webpage = self._download_webpage(url, video_id, fatal=False)
-        if webpage:
-            player = self._extract_player(webpage, url, fatal=False)
-            if player:
-                return self._extract_regular(url, player, video_id)
+        if not video_data:
+            return self._extract_fallback(video_id)
 
-        return self._extract_mobile(video_id)
+        aspect_ratio = None
+        ptmd_urls = []
+        for node in traverse_obj(video_data, ('currentMedia', 'nodes', lambda _, v: v['ptmdTemplate'])):
+            ptmd_url = self._expand_ptmd_template('https://api.zdf.de', node['ptmdTemplate'])
+            # Smuggle vod_media_type so that _extract_ptmd is aware of 'DGS' variants
+            if vod_media_type := node.get('vodMediaType'):
+                ptmd_url = smuggle_url(ptmd_url, {'vod_media_type': vod_media_type})
+            ptmd_urls.append(ptmd_url)
+            if not aspect_ratio:
+                aspect_ratio = self._parse_aspect_ratio(node.get('aspectRatio'))
+
+        return {
+            **traverse_obj(video_data, {
+                'title': ('title', {str}),
+                'description': (('leadParagraph', ('teaser', 'description')), any, {str}),
+                'timestamp': ('editorialDate', {parse_iso8601}),
+                'thumbnails': ('teaser', 'image', 'list', {self._extract_thumbnails}),
+                'episode_number': ('episodeInfo', 'episodeNumber', {int_or_none}),
+                'season_number': ('episodeInfo', 'seasonNumber', {int_or_none}),
+                'series': ('smartCollection', 'title', {str}),
+                'series_id': ('smartCollection', 'canonical', {str}),
+                'chapters': ('currentMedia', 'nodes', 0, 'streamAnchorTags', 'nodes', {self._extract_chapters}),
+            }),
+            **self._extract_ptmd(ptmd_urls, video_id, self._get_api_token(), aspect_ratio),
+            'id': video_id,
+        }
 
 
 class ZDFChannelIE(ZDFBaseIE):
-    _VALID_URL = r'https?://www\.zdf\.de/(?:[^/]+/)*(?P<id>[^/?#&]+)'
+    _VALID_URL = r'https?://www\.zdf\.de/(?:[^/?#]+/)*(?P<id>[^/?#]+)'
+    IE_NAME = 'zdf:channel'
     _TESTS = [{
+        # Playlist, legacy URL before website redesign in 2025-03
         'url': 'https://www.zdf.de/sport/das-aktuelle-sportstudio',
         'info_dict': {
-            'id': 'das-aktuelle-sportstudio',
+            'id': 'das-aktuelle-sportstudio-220',
             'title': 'das aktuelle sportstudio',
+            'description': 'md5:e46c785324238a03edcf8b301c5fd5dc',
         },
-        'playlist_mincount': 18,
+        'playlist_mincount': 25,
     }, {
-        'url': 'https://www.zdf.de/dokumentation/planet-e',
+        # Playlist, current URL
+        'url': 'https://www.zdf.de/sport/das-aktuelle-sportstudio-220',
         'info_dict': {
-            'id': 'planet-e',
-            'title': 'planet e.',
+            'id': 'das-aktuelle-sportstudio-220',
+            'title': 'das aktuelle sportstudio',
+            'description': 'md5:e46c785324238a03edcf8b301c5fd5dc',
         },
-        'playlist_mincount': 50,
+        'playlist_mincount': 25,
+    }, {
+        # Standalone video (i.e. not part of a playlist), collection URL
+        'add_ie': [ZDFIE.ie_key()],
+        'url': 'https://www.zdf.de/dokus/sylt---deutschlands-edles-nordlicht-movie-100',
+        'info_dict': {
+            'id': 'sylt-deutschlands-edles-nordlicht-100',
+            'ext': 'mp4',
+            'title': 'Sylt - Deutschlands edles Nordlicht',
+            'description': 'md5:35407b810c2e1e33efbe15ef6e4c06c3',
+            'duration': 810.0,
+            'thumbnail': 'https://www.zdf.de/assets/sylt-118~original?cb=1613992485011',
+            'series': 'Sylt - Deutschlands edles Nordlicht',
+            'series_id': 'sylt---deutschlands-edles-nordlicht-movie-100',
+            'timestamp': 1612462500,
+            'upload_date': '20210204',
+            '_old_archive_ids': ['zdf 210402_1915_sendung_dok'],
+        },
+        'params': {'skip_download': True},
     }, {
         'url': 'https://www.zdf.de/gesellschaft/aktenzeichen-xy-ungeloest',
         'info_dict': {
-            'id': 'aktenzeichen-xy-ungeloest',
-            'title': 'Aktenzeichen XY... ungelöst',
-            'entries': "lambda x: not any('xy580-fall1-kindermoerder-gesucht-100' in e['url'] for e in x)",
+            'id': 'aktenzeichen-xy-ungeloest-110',
+            'title': 'Aktenzeichen XY... Ungelöst',
+            'description': 'md5:b79ac0d64b979e53cbe510c0ca9cb7be',
         },
         'playlist_mincount': 2,
     }, {
-        'url': 'https://www.zdf.de/filme/taunuskrimi/',
-        'only_matching': True,
+        'url': 'https://www.zdf.de/serien/taunuskrimi/',
+        'info_dict': {
+            'id': 'taunuskrimi-100',
+            'title': 'Taunuskrimi',
+            'description': 'md5:ee7204e9c625c3b611d1274f9d0e3070',
+        },
+        'playlist_mincount': 8,
+    }, {
+        'url': 'https://www.zdf.de/serien/taunuskrimi/?staffel=1',
+        'info_dict': {
+            'id': 'taunuskrimi-100-s1',
+            'title': 'Taunuskrimi - Season 1',
+            'description': 'md5:ee7204e9c625c3b611d1274f9d0e3070',
+        },
+        'playlist_count': 7,
+    }, {
+        'url': 'https://www.zdf.de/magazine/heute-journal-104',
+        'info_dict': {
+            'id': 'heute-journal-104',
+            'title': 'heute journal',
+            'description': 'md5:6edad39189abf8431795d3d6d7f986b3',
+        },
+        'playlist_mincount': 500,
+    }, {
+        'url': 'https://www.zdf.de/magazine/heute-journal-104?staffel=2024',
+        'info_dict': {
+            'id': 'heute-journal-104-s2024',
+            'title': 'heute journal - Season 2024',
+            'description': 'md5:6edad39189abf8431795d3d6d7f986b3',
+        },
+        'playlist_count': 242,
     }]
 
+    _PAGE_SIZE = 24
+
     @classmethod
     def suitable(cls, url):
-        return False if ZDFIE.suitable(url) else super(ZDFChannelIE, cls).suitable(url)
+        return False if ZDFIE.suitable(url) else super().suitable(url)
 
-    def _og_search_title(self, webpage, fatal=False):
-        title = super(ZDFChannelIE, self)._og_search_title(webpage, fatal=fatal)
-        return re.split(r'\s+[-|]\s+ZDF(?:mediathek)?$', title or '')[0] or None
+    def _fetch_page(self, playlist_id, canonical_id, season_idx, season_number, page_number, cursor=None):
+        return self._download_graphql(
+            playlist_id, f'season {season_number} page {page_number} JSON', query={
+                'operationName': 'seasonByCanonical',
+                'variables': json.dumps(filter_dict({
+                    'seasonIndex': season_idx,
+                    'canonical': canonical_id,
+                    'episodesPageSize': self._PAGE_SIZE,
+                    'episodesAfter': cursor,
+                })),
+                'extensions': json.dumps({
+                    'persistedQuery': {
+                        'version': 1,
+                        'sha256Hash': '9412a0f4ac55dc37d46975d461ec64bfd14380d815df843a1492348f77b5c99a',
+                    },
+                }),
+            })['data']['smartCollectionByCanonical']
+
+    def _entries(self, playlist_id, canonical_id, season_numbers, requested_season_number):
+        for season_idx, season_number in enumerate(season_numbers):
+            if requested_season_number is not None and requested_season_number != season_number:
+                continue
+
+            cursor = None
+            for page_number in itertools.count(1):
+                page = self._fetch_page(
+                    playlist_id, canonical_id, season_idx, season_number, page_number, cursor)
+
+                nodes = traverse_obj(page, ('seasons', 'nodes', ...))
+
+                for episode in traverse_obj(nodes, (
+                    ..., 'episodes', 'nodes', lambda _, v: url_or_none(v['sharingUrl']),
+                )):
+                    yield self.url_result(
+                        episode['sharingUrl'], ZDFIE,
+                        **traverse_obj(episode, {
+                            'id': ('canonical', {str}),
+                            'title': ('teaser', 'title', {str}),
+                            'description': (('leadParagraph', ('teaser', 'description')), any, {str}),
+                            'timestamp': ('editorialDate', {parse_iso8601}),
+                            'episode_number': ('episodeInfo', 'episodeNumber', {int_or_none}),
+                            'season_number': ('episodeInfo', 'seasonNumber', {int_or_none}),
+                        }))
+
+                page_info = traverse_obj(nodes, (-1, 'episodes', 'pageInfo', {dict})) or {}
+                if not page_info.get('hasNextPage') or not page_info.get('endCursor'):
+                    break
+                cursor = page_info['endCursor']
 
     def _real_extract(self, url):
-        channel_id = self._match_id(url)
+        canonical_id = self._match_id(url)
+        # Make sure to get the correct ID in case of redirects
+        urlh = self._request_webpage(url, canonical_id)
+        canonical_id = self._search_regex(self._VALID_URL, urlh.url, 'channel id', group='id')
+        season_number = traverse_obj(parse_qs(url), ('staffel', -1, {int_or_none}))
+        playlist_id = join_nonempty(canonical_id, season_number and f's{season_number}')
 
-        webpage = self._download_webpage(url, channel_id)
+        collection_data = self._download_graphql(
+            playlist_id, 'smart collection data', query={
+                'operationName': 'GetSmartCollectionByCanonical',
+                'variables': json.dumps({
+                    'canonical': canonical_id,
+                    'videoPageSize': 100,  # Use max page size to get episodes from all seasons
+                }),
+                'extensions': json.dumps({
+                    'persistedQuery': {
+                        'version': 1,
+                        'sha256Hash': 'cb49420e133bd668ad895a8cea0e65cba6aa11ac1cacb02341ff5cf32a17cd02',
+                    },
+                }),
+            })['data']['smartCollectionByCanonical']
+        video_data = traverse_obj(collection_data, ('video', {dict})) or {}
+        season_numbers = traverse_obj(collection_data, ('seasons', 'seasons', ..., 'number', {int_or_none}))
 
-        matches = re.finditer(
-            r'''<div\b[^>]*?\sdata-plusbar-id\s*=\s*(["'])(?P<p_id>[\w-]+)\1[^>]*?\sdata-plusbar-url=\1(?P<url>%s)\1''' % ZDFIE._VALID_URL,
-            webpage)
+        if not self._yes_playlist(
+            season_numbers and playlist_id,
+            url_or_none(video_data.get('sharingUrl')) and video_data.get('canonical'),
+        ):
+            return self.url_result(video_data['sharingUrl'], ZDFIE, video_data['canonical'])
 
-        if self._downloader.params.get('noplaylist', False):
-            entry = next(
-                (self.url_result(m.group('url'), ie=ZDFIE.ie_key()) for m in matches),
-                None)
-            self.to_screen('Downloading just the main video because of --no-playlist')
-            if entry:
-                return entry
-        else:
-            self.to_screen('Downloading playlist %s - add --no-playlist to download just the main video' % (channel_id, ))
+        if season_number is not None and season_number not in season_numbers:
+            raise ExtractorError(f'Season {season_number} was not found in the collection data')
 
-        def check_video(m):
-            v_ref = self._search_regex(
-                r'''(<a\b[^>]*?\shref\s*=[^>]+?\sdata-target-id\s*=\s*(["'])%s\2[^>]*>)''' % (m.group('p_id'), ),
-                webpage, 'check id', default='')
-            v_ref = extract_attributes(v_ref)
-            return v_ref.get('data-target-video-type') != 'novideo'
-
-        return self.playlist_from_matches(
-            (m.group('url') for m in matches if check_video(m)),
-            channel_id, self._og_search_title(webpage, fatal=False))
+        return self.playlist_result(
+            self._entries(playlist_id, canonical_id, season_numbers, season_number),
+            playlist_id, join_nonempty(
+                traverse_obj(collection_data, ('title', {str})),
+                season_number and f'Season {season_number}', delim=' - '),
+            traverse_obj(collection_data, ('infoText', {str})))
diff --git a/plugins/youtube_download/yt_dlp/extractor/zee5.py b/plugins/youtube_download/yt_dlp/extractor/zee5.py
index b4734cc..fb523de 100644
--- a/plugins/youtube_download/yt_dlp/extractor/zee5.py
+++ b/plugins/youtube_download/yt_dlp/extractor/zee5.py
@@ -3,7 +3,6 @@ import time
 import uuid
 
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     ExtractorError,
     int_or_none,
@@ -38,7 +37,7 @@ class Zee5IE(InfoExtractor):
             'display_id': 'adavari-matalaku-ardhale-verule',
             'title': 'Adavari Matalaku Ardhale Verule',
             'duration': 9360,
-            'description': compat_str,
+            'description': str,
             'alt_title': 'Adavari Matalaku Ardhale Verule',
             'uploader': 'Zee Entertainment Enterprises Ltd',
             'release_date': '20070427',
@@ -47,7 +46,7 @@ class Zee5IE(InfoExtractor):
             'thumbnail': r're:^https?://.*\.jpg$',
             'episode_number': 0,
             'episode': 'Episode 0',
-            'tags': list
+            'tags': list,
         },
         'params': {
             'format': 'bv',
@@ -60,7 +59,7 @@ class Zee5IE(InfoExtractor):
             'display_id': 'yoga-se-hoga-bandbudh-aur-budbak',
             'title': 'Yoga Se Hoga-Bandbudh aur Budbak',
             'duration': 659,
-            'description': compat_str,
+            'description': str,
             'alt_title': 'Yoga Se Hoga-Bandbudh aur Budbak',
             'uploader': 'Zee Entertainment Enterprises Ltd',
             'release_date': '20150101',
@@ -79,22 +78,22 @@ class Zee5IE(InfoExtractor):
         },
     }, {
         'url': 'https://www.zee5.com/hi/tv-shows/details/kundali-bhagya/0-6-366/kundali-bhagya-march-08-2021/0-1-manual_7g9jv1os7730?country=IN',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.zee5.com/global/hi/tv-shows/details/kundali-bhagya/0-6-366/kundali-bhagya-march-08-2021/0-1-manual_7g9jv1os7730',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.zee5.com/web-series/details/mithya/0-6-4z587408/maine-dekhi-hai-uski-mrityu/0-1-6z587412',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.zee5.com/kids/kids-movies/maya-bommalu/0-0-movie_1040370005',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.zee5.com/news/details/jana-sena-chief-pawan-kalyan-shows-slippers-to-ysrcp-leaders/0-0-newsauto_6ettj4242oo0',
-        'only_matching': True
+        'only_matching': True,
     }, {
         'url': 'https://www.zee5.com/music-videos/details/adhento-gaani-vunnapaatuga-jersey-nani-shraddha-srinath/0-0-56973',
-        'only_matching': True
+        'only_matching': True,
     }]
     _DEVICE_ID = str(uuid.uuid4())
     _USER_TOKEN = None
@@ -133,13 +132,13 @@ class Zee5IE(InfoExtractor):
     def _real_extract(self, url):
         video_id, display_id = self._match_valid_url(url).group('id', 'display_id')
         access_token_request = self._download_json(
-            'https://useraction.zee5.com/token/platform_tokens.php?platform_name=web_app',
-            video_id, note='Downloading access token')
+            'https://launchapi.zee5.com/launch?platform_name=web_app',
+            video_id, note='Downloading access token')['platform_token']
         data = {
-            'x-access-token': access_token_request['token']
+            'x-access-token': access_token_request['token'],
         }
         if self._USER_TOKEN:
-            data['Authorization'] = 'bearer %s' % self._USER_TOKEN
+            data['Authorization'] = f'bearer {self._USER_TOKEN}'
         else:
             data['X-Z5-Guest-Token'] = self._DEVICE_ID
 
@@ -150,7 +149,7 @@ class Zee5IE(InfoExtractor):
                 'platform_name': 'desktop_web',
                 'country': self._USER_COUNTRY or self.get_param('geo_bypass_country') or 'IN',
                 'check_parental_control': False,
-            }, headers={'content-type': 'application/json'}, data=json.dumps(data).encode('utf-8'))
+            }, headers={'content-type': 'application/json'}, data=json.dumps(data).encode())
         asset_data = json_data['assetDetails']
         show_data = json_data.get('showDetails', {})
         if 'premium' in asset_data['business_type']:
@@ -186,7 +185,7 @@ class Zee5IE(InfoExtractor):
             'season': try_get(show_data, lambda x: x['seasons']['title'], str),
             'season_number': int_or_none(try_get(show_data, lambda x: x['seasons'][0]['orderid'])),
             'episode_number': int_or_none(try_get(asset_data, lambda x: x['orderid'])),
-            'tags': try_get(asset_data, lambda x: x['tags'], list)
+            'tags': try_get(asset_data, lambda x: x['tags'], list),
         }
 
 
@@ -240,8 +239,8 @@ class Zee5SeriesIE(InfoExtractor):
 
     def _entries(self, show_id):
         access_token_request = self._download_json(
-            'https://useraction.zee5.com/token/platform_tokens.php?platform_name=web_app',
-            show_id, note='Downloading access token')
+            'https://launchapi.zee5.com/launch?platform_name=web_app',
+            show_id, note='Downloading access token')['platform_token']
         headers = {
             'X-Access-Token': access_token_request['token'],
             'Referer': 'https://www.zee5.com/',
@@ -251,17 +250,17 @@ class Zee5SeriesIE(InfoExtractor):
         page_num = 0
         show_json = self._download_json(show_url, video_id=show_id, headers=headers)
         for season in show_json.get('seasons') or []:
-            season_id = try_get(season, lambda x: x['id'], compat_str)
+            season_id = try_get(season, lambda x: x['id'], str)
             next_url = f'https://gwapi.zee5.com/content/tvshow/?season_id={season_id}&type=episode&translation=en&country=IN&on_air=false&asset_subtype=tvshow&page=1&limit=100'
             while next_url:
                 page_num += 1
                 episodes_json = self._download_json(
                     next_url, video_id=show_id, headers=headers,
-                    note='Downloading JSON metadata page %d' % page_num)
+                    note=f'Downloading JSON metadata page {page_num}')
                 for episode in try_get(episodes_json, lambda x: x['episode'], list) or []:
                     video_id = episode.get('id')
                     yield self.url_result(
-                        'zee5:%s' % video_id,
+                        f'zee5:{video_id}',
                         ie=Zee5IE.ie_key(), video_id=video_id)
                 next_url = url_or_none(episodes_json.get('next_episode_api'))
 
diff --git a/plugins/youtube_download/yt_dlp/extractor/zeenews.py b/plugins/youtube_download/yt_dlp/extractor/zeenews.py
index 1616dbf..cbe0031 100644
--- a/plugins/youtube_download/yt_dlp/extractor/zeenews.py
+++ b/plugins/youtube_download/yt_dlp/extractor/zeenews.py
@@ -3,6 +3,8 @@ from ..utils import ExtractorError, traverse_obj
 
 
 class ZeeNewsIE(InfoExtractor):
+    _WORKING = False
+    _ENABLED = None  # XXX: pass through to GenericIE
     _VALID_URL = r'https?://zeenews\.india\.com/[^#?]+/video/(?P<display_id>[^#/?]+)/(?P<id>\d+)'
     _TESTS = [
         {
@@ -18,7 +20,7 @@ class ZeeNewsIE(InfoExtractor):
                 'view_count': int,
                 'duration': 97,
                 'description': 'ग्रेटर नोएडा जारचा थाना क्षेत्र के प्याबली में दिनदहाड़े दुकान में घुसकर अज्ञात हमलावरों ने हमला कर',
-            }
+            },
         },
         {
             'url': 'https://zeenews.india.com/hindi/india/video/videsh-superfast-queen-elizabeth-iis-funeral-today/1357710',
@@ -33,8 +35,8 @@ class ZeeNewsIE(InfoExtractor):
                 'view_count': int,
                 'duration': 133,
                 'description': 'सेगमेंट विदेश सुपराफास्ट में देखिए देश और दुनिया की सभी बड़ी खबरें, वो भी हर खबर फटाफट अंदाज में.',
-            }
-        }
+            },
+        },
     ]
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/zenporn.py b/plugins/youtube_download/yt_dlp/extractor/zenporn.py
new file mode 100644
index 0000000..084c1fc
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/zenporn.py
@@ -0,0 +1,118 @@
+import base64
+import binascii
+
+from .common import InfoExtractor
+from ..utils import ExtractorError, determine_ext, unified_strdate, url_or_none
+from ..utils.traversal import traverse_obj
+
+
+class ZenPornIE(InfoExtractor):
+    _VALID_URL = r'https?://(?:www\.)?zenporn\.com/video/(?P<id>\d+)'
+    _TESTS = [{
+        'url': 'https://zenporn.com/video/15627016/desi-bhabi-ki-chudai',
+        'md5': '07bd576b5920714d74975c054ca28dee',
+        'info_dict': {
+            'id': '9563799',
+            'display_id': '15627016',
+            'ext': 'mp4',
+            'title': 'md5:669eafd3bbc688aa29770553b738ada2',
+            'description': '',
+            'thumbnail': 'md5:2fc044a19bab450fef8f1931e7920a18',
+            'upload_date': '20230925',
+            'uploader': 'md5:9fae59847f1f58d1da8f2772016c12f3',
+            'age_limit': 18,
+        },
+    }, {
+        'url': 'https://zenporn.com/video/15570701',
+        'md5': 'acba0d080d692664fcc8c4e5502b1a67',
+        'info_dict': {
+            'id': '2297875',
+            'display_id': '15570701',
+            'ext': 'mp4',
+            'title': 'md5:47aebdf87644ec91e8b1a844bc832451',
+            'description': '',
+            'thumbnail': 'https://mstn.nv7s.com/contents/videos_screenshots/2297000/2297875/480x270/1.jpg',
+            'upload_date': '20230921',
+            'uploader': 'Lois Clarke',
+            'age_limit': 18,
+        },
+    }, {
+        'url': 'https://zenporn.com/video/8531117/amateur-students-having-a-fuck-fest-at-club/',
+        'md5': '67411256aa9451449e4d29f3be525541',
+        'info_dict': {
+            'id': '12791908',
+            'display_id': '8531117',
+            'ext': 'mp4',
+            'title': 'Amateur students having a fuck fest at club',
+            'description': '',
+            'thumbnail': 'https://tn.txxx.tube/contents/videos_screenshots/12791000/12791908/288x162/1.jpg',
+            'upload_date': '20191005',
+            'uploader': 'Jackopenass',
+            'age_limit': 18,
+        },
+    }, {
+        'url': 'https://zenporn.com/video/15872038/glad-you-came/',
+        'md5': '296ccab437f5bac6099433768449d8e1',
+        'info_dict': {
+            'id': '111585',
+            'display_id': '15872038',
+            'ext': 'mp4',
+            'title': 'Glad You Came',
+            'description': '',
+            'thumbnail': 'https://vpim.m3pd.com/contents/videos_screenshots/111000/111585/480x270/1.jpg',
+            'upload_date': '20231024',
+            'uploader': 'Martin Rudenko',
+            'age_limit': 18,
+        },
+    }]
+
+    def _gen_info_url(self, ext_domain, extr_id, lifetime=86400):
+        """ This function is a reverse engineering from the website javascript """
+        result = '/'.join(str(int(extr_id) // i * i) for i in (1_000_000, 1_000, 1))
+        return f'https://{ext_domain}/api/json/video/{lifetime}/{result}.json'
+
+    @staticmethod
+    def _decode_video_url(encoded_url):
+        """ This function is a reverse engineering from the website javascript """
+        # Replace lookalike characters and standardize map
+        translation = str.maketrans('АВСЕМ.,~', 'ABCEM+/=')
+        try:
+            return base64.b64decode(encoded_url.translate(translation), validate=True).decode()
+        except (binascii.Error, ValueError):
+            return None
+
+    def _real_extract(self, url):
+        display_id = self._match_id(url)
+        webpage = self._download_webpage(url, display_id)
+
+        ext_domain, video_id = self._search_regex(
+            r'https://(?P<ext_domain>[\w.-]+\.\w{3})/embed/(?P<extr_id>\d+)/',
+            webpage, 'embed info', group=('ext_domain', 'extr_id'))
+
+        info_json = self._download_json(
+            self._gen_info_url(ext_domain, video_id), video_id, fatal=False)
+
+        video_json = self._download_json(
+            f'https://{ext_domain}/api/videofile.php', video_id, query={
+                'video_id': video_id,
+                'lifetime': 8640000,
+            }, note='Downloading video file JSON', errnote='Failed to download video file JSON')
+
+        decoded_url = self._decode_video_url(video_json[0]['video_url'])
+        if not decoded_url:
+            raise ExtractorError('Unable to decode the video url')
+
+        return {
+            'id': video_id,
+            'display_id': display_id,
+            'ext': traverse_obj(video_json, (0, 'format', {determine_ext})),
+            'url': f'https://{ext_domain}{decoded_url}',
+            'age_limit': 18,
+            **traverse_obj(info_json, ('video', {
+                'title': ('title', {str}),
+                'description': ('description', {str}),
+                'thumbnail': ('thumb', {url_or_none}),
+                'upload_date': ('post_date', {unified_strdate}),
+                'uploader': ('user', 'username', {str}),
+            })),
+        }
diff --git a/plugins/youtube_download/yt_dlp/extractor/zetland.py b/plugins/youtube_download/yt_dlp/extractor/zetland.py
new file mode 100644
index 0000000..2b9df00
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/extractor/zetland.py
@@ -0,0 +1,71 @@
+from .common import InfoExtractor
+from ..utils import merge_dicts, unified_timestamp, url_or_none
+from ..utils.traversal import traverse_obj
+
+
+class ZetlandDKArticleIE(InfoExtractor):
+    _VALID_URL = r'https?://www\.zetland\.dk/\w+/(?P<id>(?P<story_id>\w{8})-(?P<uploader_id>\w{8})-(?:\w{5}))'
+    _TESTS = [{
+        'url': 'https://www.zetland.dk/historie/sO9aq2MY-a81VP3BY-66e69?utm_source=instagram&utm_medium=linkibio&utm_campaign=artikel',
+        'info_dict': {
+            'id': 'sO9aq2MY-a81VP3BY-66e69',
+            'ext': 'mp3',
+            'modified_date': '20240118',
+            'title': 'Afsnit 1: “Det føltes som en kidnapning.” ',
+            'upload_date': '20240116',
+            'uploader_id': 'a81VP3BY',
+            'modified_timestamp': 1705568739,
+            'release_timestamp': 1705377592,
+            'uploader_url': 'https://www.zetland.dk/skribent/a81VP3BY',
+            'uploader': 'Helle Fuusager',
+            'release_date': '20240116',
+            'thumbnail': r're:https://zetland\.imgix\.net/2aafe500-b14e-11ee-bf83-65d5e1283a57/Zetland_Image_1\.jpg',
+            'description': 'md5:9619d426772c133f5abb26db27f26a01',
+            'timestamp': 1705377592,
+            'series_id': '62d54630-e87b-4ab1-a255-8de58dbe1b14',
+        },
+
+    }]
+
+    def _real_extract(self, url):
+        display_id, uploader_id = self._match_valid_url(url).group('id', 'uploader_id')
+        webpage = self._download_webpage(url, display_id)
+
+        next_js_data = self._search_nextjs_data(webpage, display_id)['props']['pageProps']
+        story_data = traverse_obj(next_js_data, ('initialState', 'consume', 'story', 'story'))
+
+        formats = []
+        for audio_url in traverse_obj(story_data, ('story_content', 'meta', 'audioFiles', ..., {url_or_none})):
+            formats.append({
+                'url': audio_url,
+                'vcodec': 'none',
+            })
+
+        return merge_dicts({
+            'id': display_id,
+            'formats': formats,
+            'uploader_id': uploader_id,
+        }, traverse_obj(story_data, {
+            'title': ((('story_content', 'content', 'title'), 'title'), {str}),
+            'uploader': ('sharer', 'name'),
+            'uploader_id': ('sharer', 'sharer_id'),
+            'description': ('story_content', 'content', 'socialDescription'),
+            'series_id': ('story_content', 'meta', 'seriesId'),
+            'release_timestamp': ('published_at', {unified_timestamp}),
+            'modified_timestamp': ('revised_at', {unified_timestamp}),
+        }, get_all=False), traverse_obj(next_js_data, ('metaInfo', {
+            'title': ((('meta', 'title'), ('ld', 'headline'), ('og', 'og:title'), ('og', 'twitter:title')), {str}),
+            'description': ((('meta', 'description'), ('ld', 'description'), ('og', 'og:description'), ('og', 'twitter:description')), {str}),
+            'uploader': ((('meta', 'author'), ('ld', 'author', 'name')), {str}),
+            'uploader_url': ('ld', 'author', 'url', {url_or_none}),
+            'thumbnail': ((('ld', 'image'), ('og', 'og:image'), ('og', 'twitter:image')), {url_or_none}),
+            'modified_timestamp': ('ld', 'dateModified', {unified_timestamp}),
+            'release_timestamp': ('ld', 'datePublished', {unified_timestamp}),
+            'timestamp': ('ld', 'dateCreated', {unified_timestamp}),
+        }), get_all=False), {
+            'title': self._html_search_meta(['title', 'og:title', 'twitter:title'], webpage),
+            'description': self._html_search_meta(['description', 'og:description', 'twitter:description'], webpage),
+            'thumbnail': self._html_search_meta(['og:image', 'twitter:image'], webpage),
+            'uploader': self._html_search_meta(['author'], webpage),
+            'release_timestamp': unified_timestamp(self._html_search_meta(['article:published_time'], webpage)),
+        }, self._search_json_ld(webpage, display_id, fatal=False))
diff --git a/plugins/youtube_download/yt_dlp/extractor/zhihu.py b/plugins/youtube_download/yt_dlp/extractor/zhihu.py
index c24b338..c1a5bf6 100644
--- a/plugins/youtube_download/yt_dlp/extractor/zhihu.py
+++ b/plugins/youtube_download/yt_dlp/extractor/zhihu.py
@@ -1,5 +1,5 @@
 from .common import InfoExtractor
-from ..utils import format_field, float_or_none, int_or_none
+from ..utils import float_or_none, format_field, int_or_none
 
 
 class ZhihuIE(InfoExtractor):
@@ -20,7 +20,7 @@ class ZhihuIE(InfoExtractor):
             'view_count': int,
             'like_count': int,
             'comment_count': int,
-        }
+        },
     }
 
     def _real_extract(self, url):
diff --git a/plugins/youtube_download/yt_dlp/extractor/zingmp3.py b/plugins/youtube_download/yt_dlp/extractor/zingmp3.py
index 007658c..1685edb 100644
--- a/plugins/youtube_download/yt_dlp/extractor/zingmp3.py
+++ b/plugins/youtube_download/yt_dlp/extractor/zingmp3.py
@@ -5,7 +5,15 @@ import json
 import urllib.parse
 
 from .common import InfoExtractor
-from ..utils import int_or_none, traverse_obj, try_call, urljoin
+from ..utils import (
+    ExtractorError,
+    int_or_none,
+    join_nonempty,
+    try_call,
+    url_or_none,
+    urljoin,
+)
+from ..utils.traversal import traverse_obj
 
 
 class ZingMp3BaseIE(InfoExtractor):
@@ -20,9 +28,17 @@ class ZingMp3BaseIE(InfoExtractor):
         'video-clip': '/api/v2/page/get/video',
         'lyric': '/api/v2/lyric/get/lyric',
         'song-streaming': '/api/v2/song/get/streaming',
+        'liveradio': '/api/v2/livestream/get/info',
+        'eps': '/api/v2/page/get/podcast-episode',
+        'episode-streaming': '/api/v2/podcast/episode/get/streaming',
         # Playlist
         'playlist': '/api/v2/page/get/playlist',
         'album': '/api/v2/page/get/playlist',
+        'pgr': '/api/v2/page/get/podcast-program',
+        'pgr-list': '/api/v2/podcast/episode/get/list',
+        'cgr': '/api/v2/page/get/podcast-category',
+        'cgr-list': '/api/v2/podcast/program/get/list-by-cate',
+        'cgrs': '/api/v2/page/get/podcast-categories',
         # Chart
         'zing-chart': '/api/v2/page/get/chart-home',
         'zing-chart-tuan': '/api/v2/page/get/week-chart',
@@ -33,6 +49,10 @@ class ZingMp3BaseIE(InfoExtractor):
         'user-list-song': '/api/v2/song/get/list',
         'user-list-video': '/api/v2/video/get/list',
         'hub': '/api/v2/page/get/hub-detail',
+        'new-release': '/api/v2/chart/get/new-release',
+        'top100': '/api/v2/page/get/top-100',
+        'podcast-new': '/api/v2/podcast/program/get/list-by-type',
+        'top-podcast': '/api/v2/podcast/program/get/top-episode',
     }
 
     def _api_url(self, url_type, params):
@@ -78,7 +98,7 @@ class ZingMp3BaseIE(InfoExtractor):
 
 
 class ZingMp3IE(ZingMp3BaseIE):
-    _VALID_URL = ZingMp3BaseIE._VALID_URL_TMPL % 'bai-hat|video-clip|embed'
+    _VALID_URL = ZingMp3BaseIE._VALID_URL_TMPL % 'bai-hat|video-clip|embed|eps'
     IE_NAME = 'zingmp3'
     IE_DESC = 'zingmp3.vn'
     _TESTS = [{
@@ -92,7 +112,7 @@ class ZingMp3IE(ZingMp3BaseIE):
             'subtitles': {
                 'origin': [{
                     'ext': 'lrc',
-                }]
+                }],
             },
             'duration': 255,
             'track': 'Xa Mãi Xa',
@@ -102,7 +122,7 @@ class ZingMp3IE(ZingMp3BaseIE):
         },
     }, {
         'url': 'https://zingmp3.vn/video-clip/Suong-Hoa-Dua-Loi-K-ICM-RYO/ZO8ZF7C7.html',
-        'md5': '3c2081e79471a2f4a3edd90b70b185ea',
+        'md5': '92c6e7a019f06b4682a6c35ae5785fab',
         'info_dict': {
             'id': 'ZO8ZF7C7',
             'title': 'Sương Hoa Đưa Lối',
@@ -128,6 +148,20 @@ class ZingMp3IE(ZingMp3BaseIE):
             'album': 'Người Yêu Tôi Lạnh Lùng Sắt Đá (Single)',
             'album_artist': 'Mr. Siro',
         },
+    }, {
+        'url': 'https://zingmp3.vn/eps/Cham-x-Ban-Noi-Goi-La-Nha/ZZD9ACWI.html',
+        'md5': 'd52f9f63e2631e004e4f15188eedcf80',
+        'info_dict': {
+            'id': 'ZZD9ACWI',
+            'title': 'Chạm x Bạn - Nơi Gọi Là Nhà',
+            'ext': 'mp3',
+            'duration': 3716,
+            'thumbnail': r're:^https?://.+\.jpg',
+            'track': 'Chạm x Bạn - Nơi Gọi Là Nhà',
+            'artist': 'On Air',
+            'album': 'Top Podcast',
+            'album_artist': 'On Air',
+        },
     }, {
         'url': 'https://zingmp3.vn/embed/song/ZWZEI76B?start=false',
         'only_matching': True,
@@ -147,6 +181,8 @@ class ZingMp3IE(ZingMp3BaseIE):
                 'http://api.mp3.zing.vn/api/mobile/video/getvideoinfo', item_id,
                 query={'requestdata': json.dumps({'id': item_id})},
                 note='Downloading mp4 JSON metadata').get('source')
+        elif url_type == 'eps':
+            source = self._call_api('episode-streaming', {'id': item_id})
         else:
             source = self._call_api('song-streaming', {'id': item_id})
 
@@ -189,9 +225,10 @@ class ZingMp3IE(ZingMp3BaseIE):
             'thumbnail': traverse_obj(item, 'thumbnail', 'thumbnailM'),
             'duration': int_or_none(item.get('duration')),
             'track': traverse_obj(item, 'title', 'alias'),
-            'artist': traverse_obj(item, 'artistsNames', 'artists_names'),
-            'album': traverse_obj(item, ('album', ('name', 'title')), get_all=False),
-            'album_artist': traverse_obj(item, ('album', ('artistsNames', 'artists_names')), get_all=False),
+            'artist': traverse_obj(item, 'artistsNames', 'artists_names', ('artists', 0, 'name')),
+            'album': traverse_obj(item, ('album', ('name', 'title')), ('genres', 0, 'name'), get_all=False),
+            'album_artist': traverse_obj(item, ('album', ('artistsNames', 'artists_names')),
+                                         ('artists', 0, 'name'), get_all=False),
             'formats': formats,
             'subtitles': {'origin': [{'url': lyric}]} if lyric else None,
         }
@@ -200,12 +237,12 @@ class ZingMp3IE(ZingMp3BaseIE):
 class ZingMp3AlbumIE(ZingMp3BaseIE):
     _VALID_URL = ZingMp3BaseIE._VALID_URL_TMPL % 'album|playlist'
     _TESTS = [{
-        'url': 'http://mp3.zing.vn/album/Lau-Dai-Tinh-Ai-Bang-Kieu-Minh-Tuyet/ZWZBWDAF.html',
+        'url': 'https://zingmp3.vn/album/Ca-Phe-Quan-Quen-Hoang-Dung-My-Anh-Da-LAB-Thinh-Suy/ZOC7WUZC.html',
         'info_dict': {
-            'id': 'ZWZBWDAF',
-            'title': 'Lâu Đài Tình Ái',
+            'id': 'ZOC7WUZC',
+            'title': 'Cà Phê Quán Quen',
         },
-        'playlist_mincount': 9,
+        'playlist_mincount': 10,
     }, {
         'url': 'https://zingmp3.vn/album/Nhung-Bai-Hat-Hay-Nhat-Cua-Mr-Siro-Mr-Siro/ZWZAEZZD.html',
         'info_dict': {
@@ -231,7 +268,7 @@ class ZingMp3AlbumIE(ZingMp3BaseIE):
 
 
 class ZingMp3ChartHomeIE(ZingMp3BaseIE):
-    _VALID_URL = r'https?://(?:mp3\.zing|zingmp3)\.vn/(?P<id>(?:zing-chart|moi-phat-hanh))/?(?:[#?]|$)'
+    _VALID_URL = r'https?://(?:mp3\.zing|zingmp3)\.vn/(?P<id>(?:zing-chart|moi-phat-hanh|top100|podcast-discover))/?(?:[#?]|$)'
     _TESTS = [{
         'url': 'https://zingmp3.vn/zing-chart',
         'info_dict': {
@@ -244,13 +281,34 @@ class ZingMp3ChartHomeIE(ZingMp3BaseIE):
             'id': 'moi-phat-hanh',
         },
         'playlist_mincount': 100,
+    }, {
+        'url': 'https://zingmp3.vn/top100',
+        'info_dict': {
+            'id': 'top100',
+        },
+        'playlist_mincount': 50,
+    }, {
+        'url': 'https://zingmp3.vn/podcast-discover',
+        'info_dict': {
+            'id': 'podcast-discover',
+        },
+        'playlist_mincount': 4,
     }]
     IE_NAME = 'zingmp3:chart-home'
 
     def _real_extract(self, url):
         url_type = self._match_id(url)
-        data = self._call_api(url_type, {'id': url_type})
-        items = traverse_obj(data, ('RTChart', 'items') if url_type == 'zing-chart' else 'items')
+        params = {'id': url_type}
+        if url_type == 'podcast-discover':
+            params['type'] = 'discover'
+        data = self._call_api(url_type, params)
+        items = []
+        if url_type == 'top100':
+            items.extend(traverse_obj(data, (..., 'items', ..., {dict})))
+        elif url_type == 'zing-chart':
+            items.extend(traverse_obj(data, ('RTChart', 'items', ..., {dict})))
+        else:
+            items.extend(traverse_obj(data, ('items', ..., {dict})))
         return self.playlist_result(self._parse_items(items), url_type)
 
 
@@ -325,7 +383,7 @@ class ZingMp3ChartMusicVideoIE(ZingMp3BaseIE):
             'id': song_id,
             'type': 'genre',
             'page': page,
-            'count': self._PER_PAGE
+            'count': self._PER_PAGE,
         })
 
     def _real_extract(self, url):
@@ -334,7 +392,7 @@ class ZingMp3ChartMusicVideoIE(ZingMp3BaseIE):
 
 
 class ZingMp3UserIE(ZingMp3BaseIE):
-    _VALID_URL = r'https?://(?:mp3\.zing|zingmp3)\.vn/(?P<user>[^/]+)/(?P<type>bai-hat|single|album|video)/?(?:[?#]|$)'
+    _VALID_URL = r'https?://(?:mp3\.zing|zingmp3)\.vn/(?P<user>[^/]+)/(?P<type>bai-hat|single|album|video|song)/?(?:[?#]|$)'
     IE_NAME = 'zingmp3:user'
     _TESTS = [{
         'url': 'https://zingmp3.vn/Mr-Siro/bai-hat',
@@ -368,6 +426,18 @@ class ZingMp3UserIE(ZingMp3BaseIE):
             'description': 'md5:5bdcf45e955dc1b8d7f518f322ffef36',
         },
         'playlist_mincount': 15,
+    }, {
+        'url': 'https://zingmp3.vn/new-release/song',
+        'info_dict': {
+            'id': 'new-release-song',
+        },
+        'playlist_mincount': 50,
+    }, {
+        'url': 'https://zingmp3.vn/new-release/album',
+        'info_dict': {
+            'id': 'new-release-album',
+        },
+        'playlist_mincount': 20,
     }]
 
     def _fetch_page(self, user_id, url_type, page):
@@ -376,24 +446,32 @@ class ZingMp3UserIE(ZingMp3BaseIE):
             'id': user_id,
             'type': 'artist',
             'page': page,
-            'count': self._PER_PAGE
+            'count': self._PER_PAGE,
         })
 
     def _real_extract(self, url):
-        user_alias, url_type = self._match_valid_url(url).group('user', 'type')
+        alias, url_type = self._match_valid_url(url).group('user', 'type')
         if not url_type:
             url_type = 'bai-hat'
 
-        user_info = self._call_api('info-artist', {}, user_alias, query={'alias': user_alias})
-        if url_type in ('bai-hat', 'video'):
-            entries = self._paged_list(user_info['id'], url_type)
+        user_info = self._call_api('info-artist', {}, alias, query={'alias': alias})
+
+        # Handle for new-release
+        if alias == 'new-release' and url_type in ('song', 'album'):
+            _id = f'{alias}-{url_type}'
+            return self.playlist_result(self._parse_items(
+                self._call_api('new-release', params={'type': url_type}, display_id=_id)), _id)
         else:
-            entries = self._parse_items(traverse_obj(user_info, (
-                'sections',
-                lambda _, v: v['sectionId'] == 'aAlbum' if url_type == 'album' else v['sectionId'] == 'aSingle',
-                'items', ...)))
-        return self.playlist_result(
-            entries, user_info['id'], f'{user_info.get("name")} - {url_type}', user_info.get('biography'))
+            # Handle for user/artist
+            if url_type in ('bai-hat', 'video'):
+                entries = self._paged_list(user_info['id'], url_type)
+            else:
+                section_id = 'aAlbum' if url_type == 'album' else 'aSingle'
+                entries = self._parse_items(traverse_obj(user_info, (
+                    'sections', lambda _, v: v['sectionId'] == section_id, 'items', ...)))
+            return self.playlist_result(
+                entries, user_info['id'], join_nonempty(user_info.get('name'), url_type, delim=' - '),
+                user_info.get('biography'))
 
 
 class ZingMp3HubIE(ZingMp3BaseIE):
@@ -403,7 +481,7 @@ class ZingMp3HubIE(ZingMp3BaseIE):
         'url': 'https://zingmp3.vn/hub/Nhac-Moi/IWZ9Z0CA.html',
         'info_dict': {
             'id': 'IWZ9Z0CA',
-            'title': 'Nhạc Mới',
+            'title': 'BXH Nhạc Mới',
             'description': 'md5:1cc31b68a6f746427b07b2756c22a558',
         },
         'playlist_mincount': 20,
@@ -424,3 +502,127 @@ class ZingMp3HubIE(ZingMp3BaseIE):
             'sections', lambda _, v: v['sectionId'] == 'hub', 'items', ...)))
         return self.playlist_result(
             entries, song_id, hub_detail.get('title'), hub_detail.get('description'))
+
+
+class ZingMp3LiveRadioIE(ZingMp3BaseIE):
+    IE_NAME = 'zingmp3:liveradio'
+    _VALID_URL = r'https?://(?:mp3\.zing|zingmp3)\.vn/(?P<type>(?:liveradio))/(?P<id>\w+)(?:\.html|\?)'
+    _TESTS = [{
+        'url': 'https://zingmp3.vn/liveradio/IWZ979UB.html',
+        'info_dict': {
+            'id': 'IWZ979UB',
+            'title': r're:^V\-POP',
+            'description': 'md5:aa857f8a91dc9ce69e862a809e4bdc10',
+            'ext': 'mp4',
+            'view_count': int,
+            'thumbnail': r're:^https?://.*\.jpg',
+            'like_count': int,
+            'live_status': 'is_live',
+        },
+        'params': {
+            'skip_download': True,
+        },
+    }, {
+        'url': 'https://zingmp3.vn/liveradio/IWZ97CWB.html',
+        'info_dict': {
+            'id': 'IWZ97CWB',
+            'title': r're:^Live\s247',
+            'description': 'md5:d41d8cd98f00b204e9800998ecf8427e',
+            'ext': 'm4a',
+            'view_count': int,
+            'thumbnail': r're:^https?://.*\.jpg',
+            'like_count': int,
+            'live_status': 'is_live',
+        },
+        'params': {
+            'skip_download': True,
+        },
+    }]
+
+    def _real_extract(self, url):
+        url_type, live_radio_id = self._match_valid_url(url).group('type', 'id')
+        info = self._call_api(url_type, {'id': live_radio_id})
+        manifest_url = info.get('streaming')
+        if not manifest_url:
+            raise ExtractorError('This radio is offline.', expected=True)
+        fmts, subtitles = self._extract_m3u8_formats_and_subtitles(manifest_url, live_radio_id, fatal=False)
+        return {
+            'id': live_radio_id,
+            'is_live': True,
+            'formats': fmts,
+            'subtitles': subtitles,
+            **traverse_obj(info, {
+                'title': 'title',
+                'thumbnail': (('thumbnail', 'thumbnailM', 'thumbnailV', 'thumbnailH'), {url_or_none}),
+                'view_count': ('activeUsers', {int_or_none}),
+                'like_count': ('totalReaction', {int_or_none}),
+                'description': 'description',
+            }, get_all=False),
+        }
+
+
+class ZingMp3PodcastEpisodeIE(ZingMp3BaseIE):
+    IE_NAME = 'zingmp3:podcast-episode'
+    _VALID_URL = ZingMp3BaseIE._VALID_URL_TMPL % 'pgr|cgr'
+    _TESTS = [{
+        'url': 'https://zingmp3.vn/pgr/Nhac-Moi-Moi-Ngay/68Z9W66B.html',
+        'info_dict': {
+            'id': '68Z9W66B',
+            'title': 'Nhạc Mới Mỗi Ngày',
+            'description': 'md5:2875dfa951f8e5356742f1610cf20691',
+        },
+        'playlist_mincount': 20,
+    }, {
+        'url': 'https://zingmp3.vn/cgr/Am-nhac/IWZ980AO.html',
+        'info_dict': {
+            'id': 'IWZ980AO',
+            'title': 'Âm nhạc',
+        },
+        'playlist_mincount': 2,
+    }]
+
+    def _fetch_page(self, eps_id, url_type, page):
+        return self._call_api(url_type, {
+            'id': eps_id,
+            'page': page,
+            'count': self._PER_PAGE,
+        })
+
+    def _real_extract(self, url):
+        podcast_id, url_type = self._match_valid_url(url).group('id', 'type')
+        podcast_info = self._call_api(url_type, {'id': podcast_id})
+        entries = self._paged_list(podcast_id, 'pgr-list' if url_type == 'pgr' else 'cgr-list')
+        return self.playlist_result(
+            entries, podcast_id, podcast_info.get('title'), podcast_info.get('description'))
+
+
+class ZingMp3PodcastIE(ZingMp3BaseIE):
+    IE_NAME = 'zingmp3:podcast'
+    _VALID_URL = r'https?://(?:mp3\.zing|zingmp3)\.vn/(?P<id>(?:cgr|top-podcast|podcast-new))/?(?:[#?]|$)'
+    _TESTS = [{
+        'url': 'https://zingmp3.vn/cgr',
+        'info_dict': {
+            'id': 'cgr',
+        },
+        'playlist_mincount': 5,
+    }, {
+        'url': 'https://zingmp3.vn/top-podcast',
+        'info_dict': {
+            'id': 'top-podcast',
+        },
+        'playlist_mincount': 7,
+    }, {
+        'url': 'https://zingmp3.vn/podcast-new',
+        'info_dict': {
+            'id': 'podcast-new',
+        },
+        'playlist_mincount': 4,
+    }]
+
+    def _real_extract(self, url):
+        url_type = self._match_id(url)
+        params = {'id': url_type}
+        if url_type == 'podcast-new':
+            params['type'] = 'new'
+        items = self._call_api('cgrs' if url_type == 'cgr' else url_type, params)['items']
+        return self.playlist_result(self._parse_items(items), url_type)
diff --git a/plugins/youtube_download/yt_dlp/extractor/zoom.py b/plugins/youtube_download/yt_dlp/extractor/zoom.py
index 3d7ccca..fe2db84 100644
--- a/plugins/youtube_download/yt_dlp/extractor/zoom.py
+++ b/plugins/youtube_download/yt_dlp/extractor/zoom.py
@@ -2,10 +2,12 @@ from .common import InfoExtractor
 from ..utils import (
     ExtractorError,
     int_or_none,
-    str_or_none,
     js_to_json,
     parse_filesize,
+    parse_resolution,
+    str_or_none,
     traverse_obj,
+    url_basename,
     urlencode_postdata,
     urljoin,
 )
@@ -13,7 +15,7 @@ from ..utils import (
 
 class ZoomIE(InfoExtractor):
     IE_NAME = 'zoom'
-    _VALID_URL = r'(?P<base_url>https?://(?:[^.]+\.)?zoom.us/)rec(?:ording)?/(?P<type>play|share)/(?P<id>[A-Za-z0-9_.-]+)'
+    _VALID_URL = r'(?P<base_url>https?://(?:[^.]+\.)?zoom\.us/)rec(?:ording)?/(?P<type>play|share)/(?P<id>[\w.-]+)'
     _TESTS = [{
         'url': 'https://economist.zoom.us/rec/play/dUk_CNBETmZ5VA2BwEl-jjakPpJ3M1pcfVYAPRsoIbEByGsLjUZtaa4yCATQuOL3der8BlTwxQePl_j0.EImBkXzTIaPvdZO5',
         'md5': 'ab445e8c911fddc4f9adc842c2c5d434',
@@ -41,6 +43,18 @@ class ZoomIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'Timea Andrea Lelik\'s Personal Meeting Room',
         },
+        'skip': 'This recording has expired',
+    }, {
+        # view_with_share URL
+        'url': 'https://cityofdetroit.zoom.us/rec/share/VjE-5kW3xmgbEYqR5KzRgZ1OFZvtMtiXk5HyRJo5kK4m5PYE6RF4rF_oiiO_9qaM.UTAg1MI7JSnF3ZjX',
+        'md5': 'bdc7867a5934c151957fb81321b3c024',
+        'info_dict': {
+            'id': 'VjE-5kW3xmgbEYqR5KzRgZ1OFZvtMtiXk5HyRJo5kK4m5PYE6RF4rF_oiiO_9qaM.UTAg1MI7JSnF3ZjX',
+            'ext': 'mp4',
+            'title': 'February 2022 Detroit Revenue Estimating Conference',
+            'duration': 7299,
+            'formats': 'mincount:3',
+        },
     }]
 
     def _get_page_data(self, webpage, video_id):
@@ -72,6 +86,7 @@ class ZoomIE(InfoExtractor):
 
     def _real_extract(self, url):
         base_url, url_type, video_id = self._match_valid_url(url).group('base_url', 'type', 'id')
+        query = {}
 
         if url_type == 'share':
             webpage = self._get_real_webpage(url, base_url, video_id, 'share')
@@ -80,6 +95,7 @@ class ZoomIE(InfoExtractor):
                 f'{base_url}nws/recording/1.0/play/share-info/{meeting_id}',
                 video_id, note='Downloading share info JSON')['result']['redirectUrl']
             url = urljoin(base_url, redirect_path)
+            query['continueMode'] = 'true'
 
         webpage = self._get_real_webpage(url, base_url, video_id, 'play')
         file_id = self._get_page_data(webpage, video_id)['fileId']
@@ -88,14 +104,14 @@ class ZoomIE(InfoExtractor):
             raise ExtractorError('Unable to extract file ID')
 
         data = self._download_json(
-            f'{base_url}nws/recording/1.0/play/info/{file_id}', video_id,
+            f'{base_url}nws/recording/1.0/play/info/{file_id}', video_id, query=query,
             note='Downloading play info JSON')['result']
 
         subtitles = {}
         for _type in ('transcript', 'cc', 'chapter'):
-            if data.get('%sUrl' % _type):
+            if data.get(f'{_type}Url'):
                 subtitles[_type] = [{
-                    'url': urljoin(base_url, data['%sUrl' % _type]),
+                    'url': urljoin(base_url, data[f'{_type}Url']),
                     'ext': 'vtt',
                 }]
 
@@ -104,29 +120,42 @@ class ZoomIE(InfoExtractor):
         if data.get('viewMp4Url'):
             formats.append({
                 'format_note': 'Camera stream',
-                'url': str_or_none(data.get('viewMp4Url')),
+                'url': data['viewMp4Url'],
                 'width': int_or_none(traverse_obj(data, ('viewResolvtions', 0))),
                 'height': int_or_none(traverse_obj(data, ('viewResolvtions', 1))),
-                'format_id': str_or_none(traverse_obj(data, ('recording', 'id'))),
+                'format_id': 'view',
                 'ext': 'mp4',
                 'filesize_approx': parse_filesize(str_or_none(traverse_obj(data, ('recording', 'fileSizeInMB')))),
-                'preference': 0
+                'preference': 0,
             })
 
         if data.get('shareMp4Url'):
             formats.append({
                 'format_note': 'Screen share stream',
-                'url': str_or_none(data.get('shareMp4Url')),
+                'url': data['shareMp4Url'],
                 'width': int_or_none(traverse_obj(data, ('shareResolvtions', 0))),
                 'height': int_or_none(traverse_obj(data, ('shareResolvtions', 1))),
-                'format_id': str_or_none(traverse_obj(data, ('shareVideo', 'id'))),
+                'format_id': 'share',
                 'ext': 'mp4',
-                'preference': -1
+                'preference': -1,
+            })
+
+        view_with_share_url = data.get('viewMp4WithshareUrl')
+        if view_with_share_url:
+            formats.append({
+                **parse_resolution(self._search_regex(
+                    r'_(\d+x\d+)\.mp4', url_basename(view_with_share_url), 'resolution', default=None)),
+                'format_note': 'Screen share with camera',
+                'url': view_with_share_url,
+                'format_id': 'view_with_share',
+                'ext': 'mp4',
+                'preference': 1,
             })
 
         return {
             'id': video_id,
             'title': str_or_none(traverse_obj(data, ('meet', 'topic'))),
+            'duration': int_or_none(data.get('duration')),
             'subtitles': subtitles,
             'formats': formats,
             'http_headers': {
diff --git a/plugins/youtube_download/yt_dlp/extractor/zype.py b/plugins/youtube_download/yt_dlp/extractor/zype.py
index 2f3b4c4..bfa3fc4 100644
--- a/plugins/youtube_download/yt_dlp/extractor/zype.py
+++ b/plugins/youtube_download/yt_dlp/extractor/zype.py
@@ -3,8 +3,8 @@ import re
 from .common import InfoExtractor
 from ..networking.exceptions import HTTPError
 from ..utils import (
-    dict_get,
     ExtractorError,
+    dict_get,
     int_or_none,
     js_to_json,
     parse_iso8601,
@@ -14,7 +14,7 @@ from ..utils import (
 class ZypeIE(InfoExtractor):
     _ID_RE = r'[\da-fA-F]+'
     _COMMON_RE = r'//player\.zype\.com/embed/%s\.(?:js|json|html)\?.*?(?:access_token|(?:ap[ip]|player)_key)='
-    _VALID_URL = r'https?:%s[^&]+' % (_COMMON_RE % ('(?P<id>%s)' % _ID_RE))
+    _VALID_URL = r'https?:%s[^&]+' % (_COMMON_RE % (f'(?P<id>{_ID_RE})'))
     _EMBED_REGEX = [fr'<script[^>]+\bsrc=(["\'])(?P<url>(?:https?:)?{_COMMON_RE % _ID_RE}.+?)\1']
     _TEST = {
         'url': 'https://player.zype.com/embed/5b400b834b32992a310622b9.js?api_key=jZ9GUhRmxcPvX7M3SlfejB6Hle9jyHTdk2jVxG7wOHPLODgncEKVdPYBhuz9iWXQ&autoplay=false&controls=true&da=false',
@@ -84,11 +84,11 @@ class ZypeIE(InfoExtractor):
 
                 def get_attr(key):
                     return self._search_regex(
-                        r'\b%s\s*:\s*([\'"])(?P<val>(?:(?!\1).)+)\1' % key,
+                        rf'\b{key}\s*:\s*([\'"])(?P<val>(?:(?!\1).)+)\1',
                         source, key, group='val')
 
                 if get_attr('integration') == 'verizon-media':
-                    m3u8_url = 'https://content.uplynk.com/%s.m3u8' % get_attr('id')
+                    m3u8_url = 'https://content.uplynk.com/{}.m3u8'.format(get_attr('id'))
             formats, subtitles = self._extract_m3u8_formats_and_subtitles(
                 m3u8_url, video_id, 'mp4', 'm3u8_native', m3u8_id='hls')
             text_tracks = self._search_regex(
diff --git a/plugins/youtube_download/yt_dlp/globals.py b/plugins/youtube_download/yt_dlp/globals.py
new file mode 100644
index 0000000..0cf276c
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/globals.py
@@ -0,0 +1,30 @@
+from collections import defaultdict
+
+# Please Note: Due to necessary changes and the complex nature involved in the plugin/globals system,
+# no backwards compatibility is guaranteed for the plugin system API.
+# However, we will still try our best.
+
+
+class Indirect:
+    def __init__(self, initial, /):
+        self.value = initial
+
+    def __repr__(self, /):
+        return f'{type(self).__name__}({self.value!r})'
+
+
+postprocessors = Indirect({})
+extractors = Indirect({})
+
+# Plugins
+all_plugins_loaded = Indirect(False)
+plugin_specs = Indirect({})
+plugin_dirs = Indirect(['default'])
+
+plugin_ies = Indirect({})
+plugin_pps = Indirect({})
+plugin_ies_overrides = Indirect(defaultdict(list))
+
+# Misc
+IN_CLI = Indirect(False)
+LAZY_EXTRACTORS = Indirect(None)  # `False`=force, `None`=disabled, `True`=enabled
diff --git a/plugins/youtube_download/yt_dlp/jsinterp.py b/plugins/youtube_download/yt_dlp/jsinterp.py
index bda3fb4..b59fb2c 100644
--- a/plugins/youtube_download/yt_dlp/jsinterp.py
+++ b/plugins/youtube_download/yt_dlp/jsinterp.py
@@ -25,7 +25,7 @@ def _js_bit_op(op):
         with contextlib.suppress(TypeError):
             if math.isnan(x):  # NB: NaN cannot be checked by membership
                 return 0
-        return x
+        return int(float(x))
 
     def wrapped(a, b):
         return op(zeroise(a), zeroise(b)) & 0xffffffff
@@ -95,6 +95,61 @@ def _js_ternary(cndn, if_true=True, if_false=False):
     return if_true
 
 
+# Ref: https://es5.github.io/#x9.8.1
+def js_number_to_string(val: float, radix: int = 10):
+    if radix in (JS_Undefined, None):
+        radix = 10
+    assert radix in range(2, 37), 'radix must be an integer at least 2 and no greater than 36'
+
+    if math.isnan(val):
+        return 'NaN'
+    if val == 0:
+        return '0'
+    if math.isinf(val):
+        return '-Infinity' if val < 0 else 'Infinity'
+    if radix == 10:
+        # TODO: implement special cases
+        ...
+
+    ALPHABET = b'0123456789abcdefghijklmnopqrstuvwxyz.-'
+
+    result = collections.deque()
+    sign = val < 0
+    val = abs(val)
+    fraction, integer = math.modf(val)
+    delta = max(math.nextafter(.0, math.inf), math.ulp(val) / 2)
+
+    if fraction >= delta:
+        result.append(-2)  # `.`
+    while fraction >= delta:
+        delta *= radix
+        fraction, digit = math.modf(fraction * radix)
+        result.append(int(digit))
+        # if we need to round, propagate potential carry through fractional part
+        needs_rounding = fraction > 0.5 or (fraction == 0.5 and int(digit) & 1)
+        if needs_rounding and fraction + delta > 1:
+            for index in reversed(range(1, len(result))):
+                if result[index] + 1 < radix:
+                    result[index] += 1
+                    break
+                result.pop()
+
+            else:
+                integer += 1
+            break
+
+    integer, digit = divmod(int(integer), radix)
+    result.appendleft(digit)
+    while integer > 0:
+        integer, digit = divmod(integer, radix)
+        result.appendleft(digit)
+
+    if sign:
+        result.appendleft(-1)  # `-`
+
+    return bytes(ALPHABET[digit] for digit in result).decode('ascii')
+
+
 # Ref: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Operator_Precedence
 _OPERATORS = {  # None => Defined in JSInterpreter._operator
     '?': None,
@@ -133,6 +188,7 @@ _COMP_OPERATORS = {'===', '!==', '==', '!=', '<=', '>=', '<', '>'}
 _NAME_RE = r'[a-zA-Z_$][\w$]*'
 _MATCHING_PARENS = dict(zip(*zip('()', '{}', '[]')))
 _QUOTES = '\'"/'
+_NESTED_BRACKETS = r'[^[\]]+(?:\[[^[\]]+(?:\[[^\]]+\])?\])?'
 
 
 class JS_Undefined:
@@ -190,7 +246,7 @@ class Debugger:
                     cls.write('=> Raises:', e, '<-|', stmt, level=allow_recursion)
                 raise
             if cls.ENABLED and stmt.strip():
-                if should_ret or not repr(ret) == stmt:
+                if should_ret or repr(ret) != stmt:
                     cls.write(['->', '=>'][should_ret], repr(ret), '<-|', stmt, level=allow_recursion)
             return ret, should_ret
         return interpret_statement
@@ -216,7 +272,7 @@ class JSInterpreter:
         self.code, self._functions = code, {}
         self._objects = {} if objects is None else objects
 
-    class Exception(ExtractorError):
+    class Exception(ExtractorError):  # noqa: A001
         def __init__(self, msg, expr=None, *args, **kwargs):
             if expr is not None:
                 msg = f'{msg.rstrip()} in: {truncate_string(expr, 50, 50)}'
@@ -235,7 +291,7 @@ class JSInterpreter:
         flags = 0
         if not expr:
             return flags, expr
-        for idx, ch in enumerate(expr):
+        for idx, ch in enumerate(expr):  # noqa: B007
             if ch not in cls._RE_FLAGS:
                 break
             flags |= cls._RE_FLAGS[ch]
@@ -246,7 +302,7 @@ class JSInterpreter:
         OP_CHARS = '+-*/%&|^=<>!,;{}:['
         if not expr:
             return
-        counters = {k: 0 for k in _MATCHING_PARENS.values()}
+        counters = dict.fromkeys(_MATCHING_PARENS.values(), 0)
         start, splits, pos, delim_len = 0, 0, 0, len(delim) - 1
         in_quote, escaping, after_op, in_regex_char_group = None, False, True, False
         for idx, char in enumerate(expr):
@@ -474,7 +530,7 @@ class JSInterpreter:
             if remaining.startswith('{'):
                 body, expr = self._separate_at_paren(remaining)
             else:
-                switch_m = re.match(r'switch\s*\(', remaining)  # FIXME
+                switch_m = re.match(r'switch\s*\(', remaining)  # FIXME: ?
                 if switch_m:
                     switch_val, remaining = self._separate_at_paren(remaining[switch_m.end() - 1:])
                     body, expr = self._separate_at_paren(remaining, '}')
@@ -551,15 +607,18 @@ class JSInterpreter:
 
         m = re.match(fr'''(?x)
             (?P<assign>
-                (?P<out>{_NAME_RE})(?:\[(?P<index>[^\]]+?)\])?\s*
+                (?P<out>{_NAME_RE})(?:\[(?P<index>{_NESTED_BRACKETS})\])?\s*
                 (?P<op>{"|".join(map(re.escape, set(_OPERATORS) - _COMP_OPERATORS))})?
                 =(?!=)(?P<expr>.*)$
             )|(?P<return>
                 (?!if|return|true|false|null|undefined|NaN)(?P<name>{_NAME_RE})$
+            )|(?P<attribute>
+                (?P<var>{_NAME_RE})(?:
+                    (?P<nullish>\?)?\.(?P<member>[^(]+)|
+                    \[(?P<member2>{_NESTED_BRACKETS})\]
+                )\s*
             )|(?P<indexing>
                 (?P<in>{_NAME_RE})\[(?P<idx>.+)\]$
-            )|(?P<attribute>
-                (?P<var>{_NAME_RE})(?:(?P<nullish>\?)?\.(?P<member>[^(]+)|\[(?P<member2>[^\]]+)\])\s*
             )|(?P<function>
                 (?P<fname>{_NAME_RE})\((?P<args>.*)\)$
             )''', expr)
@@ -585,9 +644,9 @@ class JSInterpreter:
             return int(expr), should_return
 
         elif expr == 'break':
-            raise JS_Break()
+            raise JS_Break
         elif expr == 'continue':
-            raise JS_Continue()
+            raise JS_Continue
         elif expr == 'undefined':
             return JS_Undefined, should_return
         elif expr == 'NaN':
@@ -636,6 +695,8 @@ class JSInterpreter:
                     raise self.Exception(f'{member} {msg}', expr)
 
             def eval_method():
+                nonlocal member
+
                 if (variable, member) == ('console', 'debug'):
                     if Debugger.ENABLED:
                         Debugger.write(self.interpret_expression(f'[{arg_str}]', local_vars, allow_recursion))
@@ -644,12 +705,13 @@ class JSInterpreter:
                 types = {
                     'String': str,
                     'Math': float,
+                    'Array': list,
                 }
                 obj = local_vars.get(variable, types.get(variable, NO_DEFAULT))
                 if obj is NO_DEFAULT:
                     if variable not in self._objects:
                         try:
-                            self._objects[variable] = self.extract_object(variable)
+                            self._objects[variable] = self.extract_object(variable, local_vars)
                         except self.Exception:
                             if not nullish:
                                 raise
@@ -667,12 +729,27 @@ class JSInterpreter:
                     self.interpret_expression(v, local_vars, allow_recursion)
                     for v in self._separate(arg_str)]
 
-                if obj == str:
+                # Fixup prototype call
+                if isinstance(obj, type) and member.startswith('prototype.'):
+                    new_member, _, func_prototype = member.partition('.')[2].partition('.')
+                    assertion(argvals, 'takes one or more arguments')
+                    assertion(isinstance(argvals[0], obj), f'needs binding to type {obj}')
+                    if func_prototype == 'call':
+                        obj, *argvals = argvals
+                    elif func_prototype == 'apply':
+                        assertion(len(argvals) == 2, 'takes two arguments')
+                        obj, argvals = argvals
+                        assertion(isinstance(argvals, list), 'second argument needs to be a list')
+                    else:
+                        raise self.Exception(f'Unsupported Function method {func_prototype}', expr)
+                    member = new_member
+
+                if obj is str:
                     if member == 'fromCharCode':
                         assertion(argvals, 'takes one or more arguments')
                         return ''.join(map(chr, argvals))
                     raise self.Exception(f'Unsupported String method {member}', expr)
-                elif obj == float:
+                elif obj is float:
                     if member == 'pow':
                         assertion(len(argvals) == 2, 'takes two arguments')
                         return argvals[0] ** argvals[1]
@@ -691,18 +768,18 @@ class JSInterpreter:
                     obj.reverse()
                     return obj
                 elif member == 'slice':
-                    assertion(isinstance(obj, list), 'must be applied on a list')
-                    assertion(len(argvals) == 1, 'takes exactly one argument')
-                    return obj[argvals[0]:]
+                    assertion(isinstance(obj, (list, str)), 'must be applied on a list or string')
+                    assertion(len(argvals) <= 2, 'takes between 0 and 2 arguments')
+                    return obj[slice(*argvals, None)]
                 elif member == 'splice':
                     assertion(isinstance(obj, list), 'must be applied on a list')
                     assertion(argvals, 'takes one or more arguments')
-                    index, howMany = map(int, (argvals + [len(obj)])[:2])
+                    index, how_many = map(int, ([*argvals, len(obj)])[:2])
                     if index < 0:
                         index += len(obj)
                     add_items = argvals[2:]
                     res = []
-                    for i in range(index, min(index + howMany, len(obj))):
+                    for _ in range(index, min(index + how_many, len(obj))):
                         res.append(obj.pop(index))
                     for i, item in enumerate(add_items):
                         obj.insert(index + i, item)
@@ -726,12 +803,12 @@ class JSInterpreter:
                 elif member == 'forEach':
                     assertion(argvals, 'takes one or more arguments')
                     assertion(len(argvals) <= 2, 'takes at-most 2 arguments')
-                    f, this = (argvals + [''])[:2]
+                    f, this = ([*argvals, ''])[:2]
                     return [f((item, idx, obj), {'this': this}, allow_recursion) for idx, item in enumerate(obj)]
                 elif member == 'indexOf':
                     assertion(argvals, 'takes one or more arguments')
                     assertion(len(argvals) <= 2, 'takes at-most 2 arguments')
-                    idx, start = (argvals + [0])[:2]
+                    idx, start = ([*argvals, 0])[:2]
                     try:
                         return obj.index(idx, start)
                     except ValueError:
@@ -774,7 +851,7 @@ class JSInterpreter:
             raise self.Exception('Cannot return from an expression', expr)
         return ret
 
-    def extract_object(self, objname):
+    def extract_object(self, objname, *global_stack):
         _FUNC_NAME_RE = r'''(?:[a-zA-Z$0-9]+|"[a-zA-Z$0-9]+"|'[a-zA-Z$0-9]+')'''
         obj = {}
         obj_m = re.search(
@@ -796,7 +873,8 @@ class JSInterpreter:
         for f in fields_m:
             argnames = f.group('args').split(',')
             name = remove_quotes(f.group('key'))
-            obj[name] = function_with_repr(self.build_function(argnames, f.group('code')), f'F<{name}>')
+            obj[name] = function_with_repr(
+                self.build_function(argnames, f.group('code'), *global_stack), f'F<{name}>')
 
         return obj
 
@@ -817,9 +895,9 @@ class JSInterpreter:
         code, _ = self._separate_at_paren(func_m.group('code'))
         return [x.strip() for x in func_m.group('args').split(',')], code
 
-    def extract_function(self, funcname):
+    def extract_function(self, funcname, *global_stack):
         return function_with_repr(
-            self.extract_function_from_code(*self.extract_function_code(funcname)),
+            self.extract_function_from_code(*self.extract_function_code(funcname), *global_stack),
             f'F<{funcname}>')
 
     def extract_function_from_code(self, argnames, code, *global_stack):
diff --git a/plugins/youtube_download/yt_dlp/networking/__init__.py b/plugins/youtube_download/yt_dlp/networking/__init__.py
index 5e88764..39158a8 100644
--- a/plugins/youtube_download/yt_dlp/networking/__init__.py
+++ b/plugins/youtube_download/yt_dlp/networking/__init__.py
@@ -1,6 +1,9 @@
-# flake8: noqa: 401
+# flake8: noqa: F401
+import warnings
+
 from .common import (
     HEADRequest,
+    PATCHRequest,
     PUTRequest,
     Request,
     RequestDirector,
@@ -11,3 +14,25 @@ from .common import (
 # isort: split
 # TODO: all request handlers should be safely imported
 from . import _urllib
+from ..utils import bug_reports_message
+
+try:
+    from . import _requests
+except ImportError:
+    pass
+except Exception as e:
+    warnings.warn(f'Failed to import "requests" request handler: {e}' + bug_reports_message())
+
+try:
+    from . import _websockets
+except ImportError:
+    pass
+except Exception as e:
+    warnings.warn(f'Failed to import "websockets" request handler: {e}' + bug_reports_message())
+
+try:
+    from . import _curlcffi
+except ImportError:
+    pass
+except Exception as e:
+    warnings.warn(f'Failed to import "curl_cffi" request handler: {e}' + bug_reports_message())
diff --git a/plugins/youtube_download/yt_dlp/networking/_curlcffi.py b/plugins/youtube_download/yt_dlp/networking/_curlcffi.py
new file mode 100644
index 0000000..c800f2c
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/networking/_curlcffi.py
@@ -0,0 +1,296 @@
+from __future__ import annotations
+
+import io
+import itertools
+import math
+import re
+import urllib.parse
+
+from ._helper import InstanceStoreMixin, select_proxy
+from .common import (
+    Features,
+    Request,
+    Response,
+    register_preference,
+    register_rh,
+)
+from .exceptions import (
+    CertificateVerifyError,
+    HTTPError,
+    IncompleteRead,
+    ProxyError,
+    SSLError,
+    TransportError,
+)
+from .impersonate import ImpersonateRequestHandler, ImpersonateTarget
+from ..dependencies import curl_cffi, certifi
+from ..utils import int_or_none
+
+if curl_cffi is None:
+    raise ImportError('curl_cffi is not installed')
+
+
+curl_cffi_version = tuple(map(int, re.split(r'[^\d]+', curl_cffi.__version__)[:3]))
+
+if curl_cffi_version != (0, 5, 10) and not (0, 10) <= curl_cffi_version:
+    curl_cffi._yt_dlp__version = f'{curl_cffi.__version__} (unsupported)'
+    raise ImportError('Only curl_cffi versions 0.5.10 and 0.10.x are supported')
+
+import curl_cffi.requests
+from curl_cffi.const import CurlECode, CurlOpt
+
+
+class CurlCFFIResponseReader(io.IOBase):
+    def __init__(self, response: curl_cffi.requests.Response):
+        self._response = response
+        self._iterator = response.iter_content()
+        self._buffer = b''
+        self.bytes_read = 0
+
+    def readable(self):
+        return True
+
+    def read(self, size=None):
+        exception_raised = True
+        try:
+            while self._iterator and (size is None or len(self._buffer) < size):
+                chunk = next(self._iterator, None)
+                if chunk is None:
+                    self._iterator = None
+                    break
+                self._buffer += chunk
+                self.bytes_read += len(chunk)
+
+            if size is None:
+                size = len(self._buffer)
+            data = self._buffer[:size]
+            self._buffer = self._buffer[size:]
+
+            # "free" the curl instance if the response is fully read.
+            # curl_cffi doesn't do this automatically and only allows one open response per thread
+            if not self._iterator and not self._buffer:
+                self.close()
+            exception_raised = False
+            return data
+        finally:
+            if exception_raised:
+                self.close()
+
+    def close(self):
+        if not self.closed:
+            self._response.close()
+            self._buffer = b''
+        super().close()
+
+
+class CurlCFFIResponseAdapter(Response):
+    fp: CurlCFFIResponseReader
+
+    def __init__(self, response: curl_cffi.requests.Response):
+        super().__init__(
+            fp=CurlCFFIResponseReader(response),
+            headers=response.headers,
+            url=response.url,
+            status=response.status_code)
+
+    def read(self, amt=None):
+        try:
+            return self.fp.read(amt)
+        except curl_cffi.requests.errors.RequestsError as e:
+            if e.code == CurlECode.PARTIAL_FILE:
+                content_length = e.response and int_or_none(e.response.headers.get('Content-Length'))
+                raise IncompleteRead(
+                    partial=self.fp.bytes_read,
+                    expected=content_length - self.fp.bytes_read if content_length is not None else None,
+                    cause=e) from e
+            raise TransportError(cause=e) from e
+
+
+# See: https://github.com/lexiforest/curl_cffi?tab=readme-ov-file#supported-impersonate-browsers
+#      https://github.com/lexiforest/curl-impersonate?tab=readme-ov-file#supported-browsers
+BROWSER_TARGETS: dict[tuple[int, ...], dict[str, ImpersonateTarget]] = {
+    (0, 5): {
+        'chrome99': ImpersonateTarget('chrome', '99', 'windows', '10'),
+        'chrome99_android': ImpersonateTarget('chrome', '99', 'android', '12'),
+        'chrome100': ImpersonateTarget('chrome', '100', 'windows', '10'),
+        'chrome101': ImpersonateTarget('chrome', '101', 'windows', '10'),
+        'chrome104': ImpersonateTarget('chrome', '104', 'windows', '10'),
+        'chrome107': ImpersonateTarget('chrome', '107', 'windows', '10'),
+        'chrome110': ImpersonateTarget('chrome', '110', 'windows', '10'),
+        'edge99': ImpersonateTarget('edge', '99', 'windows', '10'),
+        'edge101': ImpersonateTarget('edge', '101', 'windows', '10'),
+        'safari15_3': ImpersonateTarget('safari', '15.3', 'macos', '11'),
+        'safari15_5': ImpersonateTarget('safari', '15.5', 'macos', '12'),
+    },
+    (0, 7): {
+        'chrome116': ImpersonateTarget('chrome', '116', 'windows', '10'),
+        'chrome119': ImpersonateTarget('chrome', '119', 'macos', '14'),
+        'chrome120': ImpersonateTarget('chrome', '120', 'macos', '14'),
+        'chrome123': ImpersonateTarget('chrome', '123', 'macos', '14'),
+        'chrome124': ImpersonateTarget('chrome', '124', 'macos', '14'),
+        'safari17_0': ImpersonateTarget('safari', '17.0', 'macos', '14'),
+        'safari17_2_ios': ImpersonateTarget('safari', '17.2', 'ios', '17.2'),
+    },
+    (0, 9): {
+        'safari15_3': ImpersonateTarget('safari', '15.3', 'macos', '14'),
+        'safari15_5': ImpersonateTarget('safari', '15.5', 'macos', '14'),
+        'chrome119': ImpersonateTarget('chrome', '119', 'macos', '14'),
+        'chrome120': ImpersonateTarget('chrome', '120', 'macos', '14'),
+        'chrome123': ImpersonateTarget('chrome', '123', 'macos', '14'),
+        'chrome124': ImpersonateTarget('chrome', '124', 'macos', '14'),
+        'chrome131': ImpersonateTarget('chrome', '131', 'macos', '14'),
+        'chrome131_android': ImpersonateTarget('chrome', '131', 'android', '14'),
+        'chrome133a': ImpersonateTarget('chrome', '133', 'macos', '15'),
+        'firefox133': ImpersonateTarget('firefox', '133', 'macos', '14'),
+        'safari18_0': ImpersonateTarget('safari', '18.0', 'macos', '15'),
+        'safari18_0_ios': ImpersonateTarget('safari', '18.0', 'ios', '18.0'),
+    },
+    (0, 10): {
+        'firefox135': ImpersonateTarget('firefox', '135', 'macos', '14'),
+    },
+}
+
+
+@register_rh
+class CurlCFFIRH(ImpersonateRequestHandler, InstanceStoreMixin):
+    RH_NAME = 'curl_cffi'
+    _SUPPORTED_URL_SCHEMES = ('http', 'https')
+    _SUPPORTED_FEATURES = (Features.NO_PROXY, Features.ALL_PROXY)
+    _SUPPORTED_PROXY_SCHEMES = ('http', 'https', 'socks4', 'socks4a', 'socks5', 'socks5h')
+    _SUPPORTED_IMPERSONATE_TARGET_MAP = {
+        target: name if curl_cffi_version >= (0, 9) else curl_cffi.requests.BrowserType[name]
+        for name, target in dict(sorted(itertools.chain.from_iterable(
+            targets.items()
+            for version, targets in BROWSER_TARGETS.items()
+            if curl_cffi_version >= version
+        ), key=lambda x: (
+            # deprioritize mobile targets since they give very different behavior
+            x[1].os not in ('ios', 'android'),
+            # prioritize edge < firefox < safari < chrome
+            ('edge', 'firefox', 'safari', 'chrome').index(x[1].client),
+            # prioritize newest version
+            float(x[1].version) if x[1].version else 0,
+            # group by os name
+            x[1].os,
+        ), reverse=True)).items()
+    }
+
+    def _create_instance(self, cookiejar=None):
+        return curl_cffi.requests.Session(cookies=cookiejar)
+
+    def _check_extensions(self, extensions):
+        super()._check_extensions(extensions)
+        extensions.pop('impersonate', None)
+        extensions.pop('cookiejar', None)
+        extensions.pop('timeout', None)
+        # CurlCFFIRH ignores legacy ssl options currently.
+        # Impersonation generally uses a looser SSL configuration than urllib/requests.
+        extensions.pop('legacy_ssl', None)
+
+    def send(self, request: Request) -> Response:
+        target = self._get_request_target(request)
+        try:
+            response = super().send(request)
+        except HTTPError as e:
+            e.response.extensions['impersonate'] = target
+            raise
+        response.extensions['impersonate'] = target
+        return response
+
+    def _send(self, request: Request):
+        max_redirects_exceeded = False
+        session: curl_cffi.requests.Session = self._get_instance(
+            cookiejar=self._get_cookiejar(request) if 'cookie' not in request.headers else None)
+
+        if self.verbose:
+            session.curl.setopt(CurlOpt.VERBOSE, 1)
+
+        proxies = self._get_proxies(request)
+        if 'no' in proxies:
+            session.curl.setopt(CurlOpt.NOPROXY, proxies['no'])
+            proxies.pop('no', None)
+
+        # curl doesn't support per protocol proxies, so we select the one that matches the request protocol
+        proxy = select_proxy(request.url, proxies=proxies)
+        if proxy:
+            session.curl.setopt(CurlOpt.PROXY, proxy)
+            scheme = urllib.parse.urlparse(request.url).scheme.lower()
+            if scheme != 'http':
+                # Enable HTTP CONNECT for HTTPS urls.
+                # Don't use CONNECT for http for compatibility with urllib behaviour.
+                # See: https://curl.se/libcurl/c/CURLOPT_HTTPPROXYTUNNEL.html
+                session.curl.setopt(CurlOpt.HTTPPROXYTUNNEL, 1)
+
+            # curl_cffi does not currently set these for proxies
+            session.curl.setopt(CurlOpt.PROXY_CAINFO, certifi.where())
+
+            if not self.verify:
+                session.curl.setopt(CurlOpt.PROXY_SSL_VERIFYPEER, 0)
+                session.curl.setopt(CurlOpt.PROXY_SSL_VERIFYHOST, 0)
+
+        headers = self._get_impersonate_headers(request)
+
+        if self._client_cert:
+            session.curl.setopt(CurlOpt.SSLCERT, self._client_cert['client_certificate'])
+            client_certificate_key = self._client_cert.get('client_certificate_key')
+            client_certificate_password = self._client_cert.get('client_certificate_password')
+            if client_certificate_key:
+                session.curl.setopt(CurlOpt.SSLKEY, client_certificate_key)
+            if client_certificate_password:
+                session.curl.setopt(CurlOpt.KEYPASSWD, client_certificate_password)
+
+        timeout = self._calculate_timeout(request)
+
+        # set CURLOPT_LOW_SPEED_LIMIT and CURLOPT_LOW_SPEED_TIME to act as a read timeout. [1]
+        # This is required only for 0.5.10 [2]
+        # Note: CURLOPT_LOW_SPEED_TIME is in seconds, so we need to round up to the nearest second. [3]
+        # [1] https://unix.stackexchange.com/a/305311
+        # [2] https://github.com/yifeikong/curl_cffi/issues/156
+        # [3] https://curl.se/libcurl/c/CURLOPT_LOW_SPEED_TIME.html
+        session.curl.setopt(CurlOpt.LOW_SPEED_LIMIT, 1)  # 1 byte per second
+        session.curl.setopt(CurlOpt.LOW_SPEED_TIME, math.ceil(timeout))
+
+        try:
+            curl_response = session.request(
+                method=request.method,
+                url=request.url,
+                headers=headers,
+                data=request.data,
+                verify=self.verify,
+                max_redirects=5,
+                timeout=(timeout, timeout),
+                impersonate=self._SUPPORTED_IMPERSONATE_TARGET_MAP.get(
+                    self._get_request_target(request)),
+                interface=self.source_address,
+                stream=True,
+            )
+        except curl_cffi.requests.errors.RequestsError as e:
+            if e.code == CurlECode.PEER_FAILED_VERIFICATION:
+                raise CertificateVerifyError(cause=e) from e
+
+            elif e.code == CurlECode.SSL_CONNECT_ERROR:
+                raise SSLError(cause=e) from e
+
+            elif e.code == CurlECode.TOO_MANY_REDIRECTS:
+                max_redirects_exceeded = True
+                curl_response = e.response
+
+            elif (
+                e.code == CurlECode.PROXY
+                or (e.code == CurlECode.RECV_ERROR and 'CONNECT' in str(e))
+            ):
+                raise ProxyError(cause=e) from e
+            else:
+                raise TransportError(cause=e) from e
+
+        response = CurlCFFIResponseAdapter(curl_response)
+
+        if not 200 <= response.status < 300:
+            raise HTTPError(response, redirect_loop=max_redirects_exceeded)
+
+        return response
+
+
+@register_preference(CurlCFFIRH)
+def curl_cffi_preference(rh, request):
+    return -100
diff --git a/plugins/youtube_download/yt_dlp/networking/_helper.py b/plugins/youtube_download/yt_dlp/networking/_helper.py
index a43c57b..b86d360 100644
--- a/plugins/youtube_download/yt_dlp/networking/_helper.py
+++ b/plugins/youtube_download/yt_dlp/networking/_helper.py
@@ -2,15 +2,17 @@ from __future__ import annotations
 
 import contextlib
 import functools
+import os
+import socket
 import ssl
 import sys
 import typing
 import urllib.parse
 import urllib.request
 
-from .exceptions import RequestError, UnsupportedRequest
+from .exceptions import RequestError
 from ..dependencies import certifi
-from ..socks import ProxyType
+from ..socks import ProxyType, sockssocket
 from ..utils import format_field, traverse_obj
 
 if typing.TYPE_CHECKING:
@@ -120,6 +122,9 @@ def make_ssl_context(
     context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
     context.check_hostname = verify
     context.verify_mode = ssl.CERT_REQUIRED if verify else ssl.CERT_NONE
+    # OpenSSL 1.1.1+ Python 3.8+ keylog file
+    if hasattr(context, 'keylog_filename'):
+        context.keylog_filename = os.environ.get('SSLKEYLOGFILE') or None
 
     # Some servers may reject requests if ALPN extension is not sent. See:
     # https://github.com/python/cpython/issues/85140
@@ -201,8 +206,82 @@ def wrap_request_errors(func):
     def wrapper(self, *args, **kwargs):
         try:
             return func(self, *args, **kwargs)
-        except UnsupportedRequest as e:
+        except RequestError as e:
             if e.handler is None:
                 e.handler = self
             raise
     return wrapper
+
+
+def _socket_connect(ip_addr, timeout, source_address):
+    af, socktype, proto, canonname, sa = ip_addr
+    sock = socket.socket(af, socktype, proto)
+    try:
+        if timeout is not socket._GLOBAL_DEFAULT_TIMEOUT:
+            sock.settimeout(timeout)
+        if source_address:
+            sock.bind(source_address)
+        sock.connect(sa)
+        return sock
+    except OSError:
+        sock.close()
+        raise
+
+
+def create_socks_proxy_socket(dest_addr, proxy_args, proxy_ip_addr, timeout, source_address):
+    af, socktype, proto, canonname, sa = proxy_ip_addr
+    sock = sockssocket(af, socktype, proto)
+    try:
+        connect_proxy_args = proxy_args.copy()
+        connect_proxy_args.update({'addr': sa[0], 'port': sa[1]})
+        sock.setproxy(**connect_proxy_args)
+        if timeout is not socket._GLOBAL_DEFAULT_TIMEOUT:
+            sock.settimeout(timeout)
+        if source_address:
+            sock.bind(source_address)
+        sock.connect(dest_addr)
+        return sock
+    except OSError:
+        sock.close()
+        raise
+
+
+def create_connection(
+    address,
+    timeout=socket._GLOBAL_DEFAULT_TIMEOUT,
+    source_address=None,
+    *,
+    _create_socket_func=_socket_connect,
+):
+    # Work around socket.create_connection() which tries all addresses from getaddrinfo() including IPv6.
+    # This filters the addresses based on the given source_address.
+    # Based on: https://github.com/python/cpython/blob/main/Lib/socket.py#L810
+    host, port = address
+    ip_addrs = socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM)
+    if not ip_addrs:
+        raise OSError('getaddrinfo returns an empty list')
+    if source_address is not None:
+        af = socket.AF_INET if ':' not in source_address[0] else socket.AF_INET6
+        ip_addrs = [addr for addr in ip_addrs if addr[0] == af]
+        if not ip_addrs:
+            raise OSError(
+                f'No remote IPv{4 if af == socket.AF_INET else 6} addresses available for connect. '
+                f'Can\'t use "{source_address[0]}" as source address')
+
+    err = None
+    for ip_addr in ip_addrs:
+        try:
+            sock = _create_socket_func(ip_addr, timeout, source_address)
+            # Explicitly break __traceback__ reference cycle
+            # https://bugs.python.org/issue36820
+            err = None
+            return sock
+        except OSError as e:
+            err = e
+
+    try:
+        raise err
+    finally:
+        # Explicitly break __traceback__ reference cycle
+        # https://bugs.python.org/issue36820
+        err = None
diff --git a/plugins/youtube_download/yt_dlp/networking/_requests.py b/plugins/youtube_download/yt_dlp/networking/_requests.py
new file mode 100644
index 0000000..5b6b264
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/networking/_requests.py
@@ -0,0 +1,426 @@
+from __future__ import annotations
+
+import contextlib
+import functools
+import http.client
+import logging
+import re
+import socket
+import warnings
+
+from ..dependencies import brotli, requests, urllib3
+from ..utils import bug_reports_message, int_or_none, variadic
+from ..utils.networking import normalize_url
+
+if requests is None:
+    raise ImportError('requests module is not installed')
+
+if urllib3 is None:
+    raise ImportError('urllib3 module is not installed')
+
+urllib3_version = tuple(int_or_none(x, default=0) for x in urllib3.__version__.split('.'))
+
+if urllib3_version < (1, 26, 17):
+    urllib3._yt_dlp__version = f'{urllib3.__version__} (unsupported)'
+    raise ImportError('Only urllib3 >= 1.26.17 is supported')
+
+if requests.__build__ < 0x023202:
+    requests._yt_dlp__version = f'{requests.__version__} (unsupported)'
+    raise ImportError('Only requests >= 2.32.2 is supported')
+
+import requests.adapters
+import requests.utils
+import urllib3.connection
+import urllib3.exceptions
+import urllib3.util
+
+from ._helper import (
+    InstanceStoreMixin,
+    add_accept_encoding_header,
+    create_connection,
+    create_socks_proxy_socket,
+    get_redirect_method,
+    make_socks_proxy_opts,
+    select_proxy,
+)
+from .common import (
+    Features,
+    RequestHandler,
+    Response,
+    register_preference,
+    register_rh,
+)
+from .exceptions import (
+    CertificateVerifyError,
+    HTTPError,
+    IncompleteRead,
+    ProxyError,
+    RequestError,
+    SSLError,
+    TransportError,
+)
+from ..socks import ProxyError as SocksProxyError
+
+SUPPORTED_ENCODINGS = [
+    'gzip', 'deflate',
+]
+
+if brotli is not None:
+    SUPPORTED_ENCODINGS.append('br')
+
+'''
+Override urllib3's behavior to not convert lower-case percent-encoded characters
+to upper-case during url normalization process.
+
+RFC3986 defines that the lower or upper case percent-encoded hexidecimal characters are equivalent
+and normalizers should convert them to uppercase for consistency [1].
+
+However, some sites may have an incorrect implementation where they provide
+a percent-encoded url that is then compared case-sensitively.[2]
+
+While this is a very rare case, since urllib does not do this normalization step, it
+is best to avoid it in requests too for compatability reasons.
+
+1: https://tools.ietf.org/html/rfc3986#section-2.1
+2: https://github.com/streamlink/streamlink/pull/4003
+'''
+
+
+class Urllib3PercentREOverride:
+    def __init__(self, r: re.Pattern):
+        self.re = r
+
+    # pass through all other attribute calls to the original re
+    def __getattr__(self, item):
+        return self.re.__getattribute__(item)
+
+    def subn(self, repl, string, *args, **kwargs):
+        return string, self.re.subn(repl, string, *args, **kwargs)[1]
+
+
+# urllib3 >= 1.25.8 uses subn:
+# https://github.com/urllib3/urllib3/commit/a2697e7c6b275f05879b60f593c5854a816489f0
+import urllib3.util.url
+
+if hasattr(urllib3.util.url, 'PERCENT_RE'):
+    urllib3.util.url.PERCENT_RE = Urllib3PercentREOverride(urllib3.util.url.PERCENT_RE)
+elif hasattr(urllib3.util.url, '_PERCENT_RE'):  # urllib3 >= 2.0.0
+    urllib3.util.url._PERCENT_RE = Urllib3PercentREOverride(urllib3.util.url._PERCENT_RE)
+else:
+    warnings.warn('Failed to patch PERCENT_RE in urllib3 (does the attribute exist?)' + bug_reports_message())
+
+'''
+Workaround for issue in urllib.util.ssl_.py: ssl_wrap_context does not pass
+server_hostname to SSLContext.wrap_socket if server_hostname is an IP,
+however this is an issue because we set check_hostname to True in our SSLContext.
+
+Monkey-patching IS_SECURETRANSPORT forces ssl_wrap_context to pass server_hostname regardless.
+
+This has been fixed in urllib3 2.0+.
+See: https://github.com/urllib3/urllib3/issues/517
+'''
+
+if urllib3_version < (2, 0, 0):
+    with contextlib.suppress(Exception):
+        urllib3.util.IS_SECURETRANSPORT = urllib3.util.ssl_.IS_SECURETRANSPORT = True
+
+
+# Requests will not automatically handle no_proxy by default
+# due to buggy no_proxy handling with proxy dict [1].
+# 1. https://github.com/psf/requests/issues/5000
+requests.adapters.select_proxy = select_proxy
+
+
+class RequestsResponseAdapter(Response):
+    def __init__(self, res: requests.models.Response):
+        super().__init__(
+            fp=res.raw, headers=res.headers, url=res.url,
+            status=res.status_code, reason=res.reason)
+
+        self._requests_response = res
+
+    def read(self, amt: int | None = None):
+        try:
+            # Interact with urllib3 response directly.
+            return self.fp.read(amt, decode_content=True)
+
+        # See urllib3.response.HTTPResponse.read() for exceptions raised on read
+        except urllib3.exceptions.SSLError as e:
+            raise SSLError(cause=e) from e
+
+        except urllib3.exceptions.ProtocolError as e:
+            # IncompleteRead is always contained within ProtocolError
+            # See urllib3.response.HTTPResponse._error_catcher()
+            ir_err = next(
+                (err for err in (e.__context__, e.__cause__, *variadic(e.args))
+                 if isinstance(err, http.client.IncompleteRead)), None)
+            if ir_err is not None:
+                # `urllib3.exceptions.IncompleteRead` is subclass of `http.client.IncompleteRead`
+                # but uses an `int` for its `partial` property.
+                partial = ir_err.partial if isinstance(ir_err.partial, int) else len(ir_err.partial)
+                raise IncompleteRead(partial=partial, expected=ir_err.expected) from e
+            raise TransportError(cause=e) from e
+
+        except urllib3.exceptions.HTTPError as e:
+            # catch-all for any other urllib3 response exceptions
+            raise TransportError(cause=e) from e
+
+
+class RequestsHTTPAdapter(requests.adapters.HTTPAdapter):
+    def __init__(self, ssl_context=None, proxy_ssl_context=None, source_address=None, **kwargs):
+        self._pm_args = {}
+        if ssl_context:
+            self._pm_args['ssl_context'] = ssl_context
+        if source_address:
+            self._pm_args['source_address'] = (source_address, 0)
+        self._proxy_ssl_context = proxy_ssl_context or ssl_context
+        super().__init__(**kwargs)
+
+    def init_poolmanager(self, *args, **kwargs):
+        return super().init_poolmanager(*args, **kwargs, **self._pm_args)
+
+    def proxy_manager_for(self, proxy, **proxy_kwargs):
+        extra_kwargs = {}
+        if not proxy.lower().startswith('socks') and self._proxy_ssl_context:
+            extra_kwargs['proxy_ssl_context'] = self._proxy_ssl_context
+        return super().proxy_manager_for(proxy, **proxy_kwargs, **self._pm_args, **extra_kwargs)
+
+    # Skip `requests` internal verification; we use our own SSLContext
+    def cert_verify(*args, **kwargs):
+        pass
+
+    # requests 2.32.2+: Reimplementation without `_urllib3_request_context`
+    def get_connection_with_tls_context(self, request, verify, proxies=None, cert=None):
+        url = urllib3.util.parse_url(request.url).url
+
+        manager = self.poolmanager
+        if proxy := select_proxy(url, proxies):
+            manager = self.proxy_manager_for(proxy)
+
+        return manager.connection_from_url(url)
+
+
+class RequestsSession(requests.sessions.Session):
+    """
+    Ensure unified redirect method handling with our urllib redirect handler.
+    """
+
+    def rebuild_method(self, prepared_request, response):
+        new_method = get_redirect_method(prepared_request.method, response.status_code)
+
+        # HACK: requests removes headers/body on redirect unless code was a 307/308.
+        if new_method == prepared_request.method:
+            response._real_status_code = response.status_code
+            response.status_code = 308
+
+        prepared_request.method = new_method
+
+        # Requests fails to resolve dot segments on absolute redirect locations
+        # See: https://github.com/yt-dlp/yt-dlp/issues/9020
+        prepared_request.url = normalize_url(prepared_request.url)
+
+    def rebuild_auth(self, prepared_request, response):
+        # HACK: undo status code change from rebuild_method, if applicable.
+        # rebuild_auth runs after requests would remove headers/body based on status code
+        if hasattr(response, '_real_status_code'):
+            response.status_code = response._real_status_code
+            del response._real_status_code
+        return super().rebuild_auth(prepared_request, response)
+
+
+class Urllib3LoggingFilter(logging.Filter):
+
+    def filter(self, record):
+        # Ignore HTTP request messages since HTTPConnection prints those
+        return record.msg != '%s://%s:%s "%s %s %s" %s %s'
+
+
+class Urllib3LoggingHandler(logging.Handler):
+    """Redirect urllib3 logs to our logger"""
+
+    def __init__(self, logger, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._logger = logger
+
+    def emit(self, record):
+        try:
+            msg = self.format(record)
+            if record.levelno >= logging.ERROR:
+                self._logger.error(msg)
+            else:
+                self._logger.stdout(msg)
+
+        except Exception:
+            self.handleError(record)
+
+
+@register_rh
+class RequestsRH(RequestHandler, InstanceStoreMixin):
+
+    """Requests RequestHandler
+    https://github.com/psf/requests
+    """
+    _SUPPORTED_URL_SCHEMES = ('http', 'https')
+    _SUPPORTED_ENCODINGS = tuple(SUPPORTED_ENCODINGS)
+    _SUPPORTED_PROXY_SCHEMES = ('http', 'https', 'socks4', 'socks4a', 'socks5', 'socks5h')
+    _SUPPORTED_FEATURES = (Features.NO_PROXY, Features.ALL_PROXY)
+    RH_NAME = 'requests'
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        # Forward urllib3 debug messages to our logger
+        logger = logging.getLogger('urllib3')
+        self.__logging_handler = Urllib3LoggingHandler(logger=self._logger)
+        self.__logging_handler.setFormatter(logging.Formatter('requests: %(message)s'))
+        self.__logging_handler.addFilter(Urllib3LoggingFilter())
+        logger.addHandler(self.__logging_handler)
+        # TODO: Use a logger filter to suppress pool reuse warning instead
+        logger.setLevel(logging.ERROR)
+
+        if self.verbose:
+            # Setting this globally is not ideal, but is easier than hacking with urllib3.
+            # It could technically be problematic for scripts embedding yt-dlp.
+            # However, it is unlikely debug traffic is used in that context in a way this will cause problems.
+            urllib3.connection.HTTPConnection.debuglevel = 1
+            logger.setLevel(logging.DEBUG)
+        # this is expected if we are using --no-check-certificate
+        urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+
+    def close(self):
+        self._clear_instances()
+        # Remove the logging handler that contains a reference to our logger
+        # See: https://github.com/yt-dlp/yt-dlp/issues/8922
+        logging.getLogger('urllib3').removeHandler(self.__logging_handler)
+
+    def _check_extensions(self, extensions):
+        super()._check_extensions(extensions)
+        extensions.pop('cookiejar', None)
+        extensions.pop('timeout', None)
+        extensions.pop('legacy_ssl', None)
+        extensions.pop('keep_header_casing', None)
+
+    def _create_instance(self, cookiejar, legacy_ssl_support=None):
+        session = RequestsSession()
+        http_adapter = RequestsHTTPAdapter(
+            ssl_context=self._make_sslcontext(legacy_ssl_support=legacy_ssl_support),
+            source_address=self.source_address,
+            max_retries=urllib3.util.retry.Retry(False),
+        )
+        session.adapters.clear()
+        session.headers = requests.models.CaseInsensitiveDict({'Connection': 'keep-alive'})
+        session.mount('https://', http_adapter)
+        session.mount('http://', http_adapter)
+        session.cookies = cookiejar
+        session.trust_env = False  # no need, we already load proxies from env
+        return session
+
+    def _prepare_headers(self, _, headers):
+        add_accept_encoding_header(headers, SUPPORTED_ENCODINGS)
+
+    def _send(self, request):
+
+        headers = self._get_headers(request)
+        max_redirects_exceeded = False
+
+        session = self._get_instance(
+            cookiejar=self._get_cookiejar(request),
+            legacy_ssl_support=request.extensions.get('legacy_ssl'),
+        )
+
+        try:
+            requests_res = session.request(
+                method=request.method,
+                url=request.url,
+                data=request.data,
+                headers=headers,
+                timeout=self._calculate_timeout(request),
+                proxies=self._get_proxies(request),
+                allow_redirects=True,
+                stream=True,
+            )
+
+        except requests.exceptions.TooManyRedirects as e:
+            max_redirects_exceeded = True
+            requests_res = e.response
+
+        except requests.exceptions.SSLError as e:
+            if 'CERTIFICATE_VERIFY_FAILED' in str(e):
+                raise CertificateVerifyError(cause=e) from e
+            raise SSLError(cause=e) from e
+
+        except requests.exceptions.ProxyError as e:
+            raise ProxyError(cause=e) from e
+
+        except (requests.exceptions.ConnectionError, requests.exceptions.Timeout) as e:
+            raise TransportError(cause=e) from e
+
+        except urllib3.exceptions.HTTPError as e:
+            # Catch any urllib3 exceptions that may leak through
+            raise TransportError(cause=e) from e
+
+        except requests.exceptions.RequestException as e:
+            # Miscellaneous Requests exceptions. May not necessary be network related e.g. InvalidURL
+            raise RequestError(cause=e) from e
+
+        res = RequestsResponseAdapter(requests_res)
+
+        if not 200 <= res.status < 300:
+            raise HTTPError(res, redirect_loop=max_redirects_exceeded)
+
+        return res
+
+
+@register_preference(RequestsRH)
+def requests_preference(rh, request):
+    return 100
+
+
+# Use our socks proxy implementation with requests to avoid an extra dependency.
+class SocksHTTPConnection(urllib3.connection.HTTPConnection):
+    def __init__(self, _socks_options, *args, **kwargs):  # must use _socks_options to pass PoolKey checks
+        self._proxy_args = _socks_options
+        super().__init__(*args, **kwargs)
+
+    def _new_conn(self):
+        try:
+            return create_connection(
+                address=(self._proxy_args['addr'], self._proxy_args['port']),
+                timeout=self.timeout,
+                source_address=self.source_address,
+                _create_socket_func=functools.partial(
+                    create_socks_proxy_socket, (self.host, self.port), self._proxy_args))
+        except (socket.timeout, TimeoutError) as e:
+            raise urllib3.exceptions.ConnectTimeoutError(
+                self, f'Connection to {self.host} timed out. (connect timeout={self.timeout})') from e
+        except SocksProxyError as e:
+            raise urllib3.exceptions.ProxyError(str(e), e) from e
+        except OSError as e:
+            raise urllib3.exceptions.NewConnectionError(
+                self, f'Failed to establish a new connection: {e}') from e
+
+
+class SocksHTTPSConnection(SocksHTTPConnection, urllib3.connection.HTTPSConnection):
+    pass
+
+
+class SocksHTTPConnectionPool(urllib3.HTTPConnectionPool):
+    ConnectionCls = SocksHTTPConnection
+
+
+class SocksHTTPSConnectionPool(urllib3.HTTPSConnectionPool):
+    ConnectionCls = SocksHTTPSConnection
+
+
+class SocksProxyManager(urllib3.PoolManager):
+
+    def __init__(self, socks_proxy, username=None, password=None, num_pools=10, headers=None, **connection_pool_kw):
+        connection_pool_kw['_socks_options'] = make_socks_proxy_opts(socks_proxy)
+        super().__init__(num_pools, headers, **connection_pool_kw)
+        self.pool_classes_by_scheme = {
+            'http': SocksHTTPConnectionPool,
+            'https': SocksHTTPSConnectionPool,
+        }
+
+
+requests.adapters.SOCKSProxyManager = SocksProxyManager
diff --git a/plugins/youtube_download/yt_dlp/networking/_urllib.py b/plugins/youtube_download/yt_dlp/networking/_urllib.py
index 0c47949..a188b35 100644
--- a/plugins/youtube_download/yt_dlp/networking/_urllib.py
+++ b/plugins/youtube_download/yt_dlp/networking/_urllib.py
@@ -1,10 +1,8 @@
 from __future__ import annotations
 
 import functools
-import gzip
 import http.client
 import io
-import socket
 import ssl
 import urllib.error
 import urllib.parse
@@ -24,6 +22,8 @@ from urllib.request import (
 from ._helper import (
     InstanceStoreMixin,
     add_accept_encoding_header,
+    create_connection,
+    create_socks_proxy_socket,
     get_redirect_method,
     make_socks_proxy_opts,
     select_proxy,
@@ -40,7 +40,6 @@ from .exceptions import (
 )
 from ..dependencies import brotli
 from ..socks import ProxyError as SocksProxyError
-from ..socks import sockssocket
 from ..utils import update_url_query
 from ..utils.networking import normalize_url
 
@@ -55,44 +54,10 @@ if brotli:
 def _create_http_connection(http_class, source_address, *args, **kwargs):
     hc = http_class(*args, **kwargs)
 
+    if hasattr(hc, '_create_connection'):
+        hc._create_connection = create_connection
+
     if source_address is not None:
-        # This is to workaround _create_connection() from socket where it will try all
-        # address data from getaddrinfo() including IPv6. This filters the result from
-        # getaddrinfo() based on the source_address value.
-        # This is based on the cpython socket.create_connection() function.
-        # https://github.com/python/cpython/blob/master/Lib/socket.py#L691
-        def _create_connection(address, timeout=socket._GLOBAL_DEFAULT_TIMEOUT, source_address=None):
-            host, port = address
-            err = None
-            addrs = socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM)
-            af = socket.AF_INET if '.' in source_address[0] else socket.AF_INET6
-            ip_addrs = [addr for addr in addrs if addr[0] == af]
-            if addrs and not ip_addrs:
-                ip_version = 'v4' if af == socket.AF_INET else 'v6'
-                raise OSError(
-                    "No remote IP%s addresses available for connect, can't use '%s' as source address"
-                    % (ip_version, source_address[0]))
-            for res in ip_addrs:
-                af, socktype, proto, canonname, sa = res
-                sock = None
-                try:
-                    sock = socket.socket(af, socktype, proto)
-                    if timeout is not socket._GLOBAL_DEFAULT_TIMEOUT:
-                        sock.settimeout(timeout)
-                    sock.bind(source_address)
-                    sock.connect(sa)
-                    err = None  # Explicitly break reference cycle
-                    return sock
-                except OSError as _:
-                    err = _
-                    if sock is not None:
-                        sock.close()
-            if err is not None:
-                raise err
-            else:
-                raise OSError('getaddrinfo returns an empty list')
-        if hasattr(hc, '_create_connection'):
-            hc._create_connection = _create_connection
         hc.source_address = (source_address, 0)
 
     return hc
@@ -155,20 +120,11 @@ class HTTPHandler(urllib.request.AbstractHTTPHandler):
 
     @staticmethod
     def gz(data):
-        gz = gzip.GzipFile(fileobj=io.BytesIO(data), mode='rb')
-        try:
-            return gz.read()
-        except OSError as original_oserror:
-            # There may be junk add the end of the file
-            # See http://stackoverflow.com/q/4928560/35070 for details
-            for i in range(1, 1024):
-                try:
-                    gz = gzip.GzipFile(fileobj=io.BytesIO(data[:-i]), mode='rb')
-                    return gz.read()
-                except OSError:
-                    continue
-            else:
-                raise original_oserror
+        # There may be junk added the end of the file
+        # We ignore it by only ever decoding a single gzip payload
+        if not data:
+            return data
+        return zlib.decompress(data, wbits=zlib.MAX_WBITS | 16)
 
     def http_request(self, req):
         # According to RFC 3986, URLs can not contain non-ASCII characters, however this is not
@@ -211,7 +167,7 @@ class HTTPHandler(urllib.request.AbstractHTTPHandler):
         if 300 <= resp.code < 400:
             location = resp.headers.get('Location')
             if location:
-                # As of RFC 2616 default charset is iso-8859-1 that is respected by python 3
+                # As of RFC 2616 default charset is iso-8859-1 that is respected by Python 3
                 location = location.encode('iso-8859-1').decode()
                 location_escaped = normalize_url(location)
                 if location != location_escaped:
@@ -230,13 +186,15 @@ def make_socks_conn_class(base_class, socks_proxy):
     proxy_args = make_socks_proxy_opts(socks_proxy)
 
     class SocksConnection(base_class):
-        def connect(self):
-            self.sock = sockssocket()
-            self.sock.setproxy(**proxy_args)
-            if type(self.timeout) in (int, float):  # noqa: E721
-                self.sock.settimeout(self.timeout)
-            self.sock.connect((self.host, self.port))
+        _create_connection = create_connection
 
+        def connect(self):
+            self.sock = create_connection(
+                (proxy_args['addr'], proxy_args['port']),
+                timeout=self.timeout,
+                source_address=self.source_address,
+                _create_socket_func=functools.partial(
+                    create_socks_proxy_socket, (self.host, self.port), proxy_args))
             if isinstance(self, http.client.HTTPSConnection):
                 self.sock = self._context.wrap_socket(self.sock, server_hostname=self.host)
 
@@ -288,8 +246,8 @@ class ProxyHandler(urllib.request.BaseHandler):
     def __init__(self, proxies=None):
         self.proxies = proxies
         # Set default handlers
-        for type in ('http', 'https', 'ftp'):
-            setattr(self, '%s_open' % type, lambda r, meth=self.proxy_open: meth(r))
+        for scheme in ('http', 'https', 'ftp'):
+            setattr(self, f'{scheme}_open', lambda r, meth=self.proxy_open: meth(r))
 
     def proxy_open(self, req):
         proxy = select_proxy(req.get_full_url(), self.proxies)
@@ -365,7 +323,7 @@ def handle_sslerror(e: ssl.SSLError):
 
 def handle_response_read_exceptions(e):
     if isinstance(e, http.client.IncompleteRead):
-        raise IncompleteRead(partial=e.partial, cause=e, expected=e.expected) from e
+        raise IncompleteRead(partial=len(e.partial), cause=e, expected=e.expected) from e
     elif isinstance(e, ssl.SSLError):
         handle_sslerror(e)
     elif isinstance(e, (OSError, EOFError, http.client.HTTPException, *CONTENT_DECODE_ERRORS)):
@@ -390,14 +348,15 @@ class UrllibRH(RequestHandler, InstanceStoreMixin):
         super()._check_extensions(extensions)
         extensions.pop('cookiejar', None)
         extensions.pop('timeout', None)
+        extensions.pop('legacy_ssl', None)
 
-    def _create_instance(self, proxies, cookiejar):
+    def _create_instance(self, proxies, cookiejar, legacy_ssl_support=None):
         opener = urllib.request.OpenerDirector()
         handlers = [
             ProxyHandler(proxies),
             HTTPHandler(
                 debuglevel=int(bool(self.verbose)),
-                context=self._make_sslcontext(),
+                context=self._make_sslcontext(legacy_ssl_support=legacy_ssl_support),
                 source_address=self.source_address),
             HTTPCookieProcessor(cookiejar),
             DataHandler(),
@@ -420,26 +379,29 @@ class UrllibRH(RequestHandler, InstanceStoreMixin):
         opener.addheaders = []
         return opener
 
-    def _send(self, request):
-        headers = self._merge_headers(request.headers)
+    def _prepare_headers(self, _, headers):
         add_accept_encoding_header(headers, SUPPORTED_ENCODINGS)
+
+    def _send(self, request):
+        headers = self._get_headers(request)
         urllib_req = urllib.request.Request(
             url=request.url,
             data=request.data,
-            headers=dict(headers),
-            method=request.method
+            headers=headers,
+            method=request.method,
         )
 
         opener = self._get_instance(
-            proxies=request.proxies or self.proxies,
-            cookiejar=request.extensions.get('cookiejar') or self.cookiejar
+            proxies=self._get_proxies(request),
+            cookiejar=self._get_cookiejar(request),
+            legacy_ssl_support=request.extensions.get('legacy_ssl'),
         )
         try:
-            res = opener.open(urllib_req, timeout=float(request.extensions.get('timeout') or self.timeout))
+            res = opener.open(urllib_req, timeout=self._calculate_timeout(request))
         except urllib.error.HTTPError as e:
             if isinstance(e.fp, (http.client.HTTPResponse, urllib.response.addinfourl)):
                 # Prevent file object from being closed when urllib.error.HTTPError is destroyed.
-                e._closer.file = None
+                e._closer.close_called = True
                 raise HTTPError(UrllibResponseAdapter(e.fp), redirect_loop='redirect error' in str(e)) from e
             raise  # unexpected
         except urllib.error.URLError as e:
diff --git a/plugins/youtube_download/yt_dlp/networking/_websockets.py b/plugins/youtube_download/yt_dlp/networking/_websockets.py
new file mode 100644
index 0000000..d29f8e4
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/networking/_websockets.py
@@ -0,0 +1,189 @@
+from __future__ import annotations
+
+import contextlib
+import functools
+import io
+import logging
+import ssl
+import sys
+
+from ._helper import (
+    create_connection,
+    create_socks_proxy_socket,
+    make_socks_proxy_opts,
+    select_proxy,
+)
+from .common import Features, Response, register_rh
+from .exceptions import (
+    CertificateVerifyError,
+    HTTPError,
+    ProxyError,
+    RequestError,
+    SSLError,
+    TransportError,
+)
+from .websocket import WebSocketRequestHandler, WebSocketResponse
+from ..dependencies import websockets
+from ..socks import ProxyError as SocksProxyError
+from ..utils import int_or_none
+
+if not websockets:
+    raise ImportError('websockets is not installed')
+
+import websockets.version
+
+websockets_version = tuple(map(int_or_none, websockets.version.version.split('.')))
+if websockets_version < (13, 0):
+    websockets._yt_dlp__version = f'{websockets.version.version} (unsupported)'
+    raise ImportError('Only websockets>=13.0 is supported')
+
+import websockets.sync.client
+from websockets.uri import parse_uri
+
+# In websockets Connection, recv_exc and recv_events_exc are defined
+# after the recv events handler thread is started [1].
+# On our CI using PyPy, in some cases a race condition may occur
+# where the recv events handler thread tries to use these attributes before they are defined [2].
+# 1: https://github.com/python-websockets/websockets/blame/de768cf65e7e2b1a3b67854fb9e08816a5ff7050/src/websockets/sync/connection.py#L93
+# 2: "AttributeError: 'ClientConnection' object has no attribute 'recv_events_exc'. Did you mean: 'recv_events'?"
+import websockets.sync.connection  # isort: split
+with contextlib.suppress(Exception):
+    websockets.sync.connection.Connection.recv_exc = None
+
+
+class WebsocketsResponseAdapter(WebSocketResponse):
+
+    def __init__(self, ws: websockets.sync.client.ClientConnection, url):
+        super().__init__(
+            fp=io.BytesIO(ws.response.body or b''),
+            url=url,
+            headers=ws.response.headers,
+            status=ws.response.status_code,
+            reason=ws.response.reason_phrase,
+        )
+        self._ws = ws
+
+    def close(self):
+        self._ws.close()
+        super().close()
+
+    def send(self, message):
+        # https://websockets.readthedocs.io/en/stable/reference/sync/client.html#websockets.sync.client.ClientConnection.send
+        try:
+            return self._ws.send(message)
+        except (websockets.exceptions.WebSocketException, RuntimeError, TimeoutError) as e:
+            raise TransportError(cause=e) from e
+        except SocksProxyError as e:
+            raise ProxyError(cause=e) from e
+        except TypeError as e:
+            raise RequestError(cause=e) from e
+
+    def recv(self):
+        # https://websockets.readthedocs.io/en/stable/reference/sync/client.html#websockets.sync.client.ClientConnection.recv
+        try:
+            return self._ws.recv()
+        except SocksProxyError as e:
+            raise ProxyError(cause=e) from e
+        except (websockets.exceptions.WebSocketException, RuntimeError, TimeoutError) as e:
+            raise TransportError(cause=e) from e
+
+
+@register_rh
+class WebsocketsRH(WebSocketRequestHandler):
+    """
+    Websockets request handler
+    https://websockets.readthedocs.io
+    https://github.com/python-websockets/websockets
+    """
+    _SUPPORTED_URL_SCHEMES = ('wss', 'ws')
+    _SUPPORTED_PROXY_SCHEMES = ('socks4', 'socks4a', 'socks5', 'socks5h')
+    _SUPPORTED_FEATURES = (Features.ALL_PROXY, Features.NO_PROXY)
+    RH_NAME = 'websockets'
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.__logging_handlers = {}
+        for name in ('websockets.client', 'websockets.server'):
+            logger = logging.getLogger(name)
+            handler = logging.StreamHandler(stream=sys.stdout)
+            handler.setFormatter(logging.Formatter(f'{self.RH_NAME}: %(message)s'))
+            self.__logging_handlers[name] = handler
+            logger.addHandler(handler)
+            if self.verbose:
+                logger.setLevel(logging.DEBUG)
+
+    def _check_extensions(self, extensions):
+        super()._check_extensions(extensions)
+        extensions.pop('timeout', None)
+        extensions.pop('cookiejar', None)
+        extensions.pop('legacy_ssl', None)
+        extensions.pop('keep_header_casing', None)
+
+    def close(self):
+        # Remove the logging handler that contains a reference to our logger
+        # See: https://github.com/yt-dlp/yt-dlp/issues/8922
+        for name, handler in self.__logging_handlers.items():
+            logging.getLogger(name).removeHandler(handler)
+
+    def _prepare_headers(self, request, headers):
+        if 'cookie' not in headers:
+            cookiejar = self._get_cookiejar(request)
+            cookie_header = cookiejar.get_cookie_header(request.url)
+            if cookie_header:
+                headers['cookie'] = cookie_header
+
+    def _send(self, request):
+        timeout = self._calculate_timeout(request)
+        headers = self._get_headers(request)
+        wsuri = parse_uri(request.url)
+        create_conn_kwargs = {
+            'source_address': (self.source_address, 0) if self.source_address else None,
+            'timeout': timeout,
+        }
+        proxy = select_proxy(request.url, self._get_proxies(request))
+        try:
+            if proxy:
+                socks_proxy_options = make_socks_proxy_opts(proxy)
+                sock = create_connection(
+                    address=(socks_proxy_options['addr'], socks_proxy_options['port']),
+                    _create_socket_func=functools.partial(
+                        create_socks_proxy_socket, (wsuri.host, wsuri.port), socks_proxy_options),
+                    **create_conn_kwargs,
+                )
+            else:
+                sock = create_connection(
+                    address=(wsuri.host, wsuri.port),
+                    **create_conn_kwargs,
+                )
+            ssl_ctx = self._make_sslcontext(legacy_ssl_support=request.extensions.get('legacy_ssl'))
+            conn = websockets.sync.client.connect(
+                sock=sock,
+                uri=request.url,
+                additional_headers=headers,
+                open_timeout=timeout,
+                user_agent_header=None,
+                ssl=ssl_ctx if wsuri.secure else None,
+                close_timeout=0,  # not ideal, but prevents yt-dlp hanging
+            )
+            return WebsocketsResponseAdapter(conn, url=request.url)
+
+        # Exceptions as per https://websockets.readthedocs.io/en/stable/reference/sync/client.html
+        except SocksProxyError as e:
+            raise ProxyError(cause=e) from e
+        except websockets.exceptions.InvalidURI as e:
+            raise RequestError(cause=e) from e
+        except ssl.SSLCertVerificationError as e:
+            raise CertificateVerifyError(cause=e) from e
+        except ssl.SSLError as e:
+            raise SSLError(cause=e) from e
+        except websockets.exceptions.InvalidStatus as e:
+            raise HTTPError(
+                Response(
+                    fp=io.BytesIO(e.response.body),
+                    url=request.url,
+                    headers=e.response.headers,
+                    status=e.response.status_code,
+                    reason=e.response.reason_phrase),
+            ) from e
+        except (OSError, TimeoutError, websockets.exceptions.WebSocketException) as e:
+            raise TransportError(cause=e) from e
diff --git a/plugins/youtube_download/yt_dlp/networking/common.py b/plugins/youtube_download/yt_dlp/networking/common.py
index 584c7bb..e337694 100644
--- a/plugins/youtube_download/yt_dlp/networking/common.py
+++ b/plugins/youtube_download/yt_dlp/networking/common.py
@@ -31,6 +31,8 @@ from ..utils import (
 )
 from ..utils.networking import HTTPHeaderDict, normalize_url
 
+DEFAULT_TIMEOUT = 20
+
 
 def register_preference(*handlers: type[RequestHandler]):
     assert all(issubclass(handler, RequestHandler) for handler in handlers)
@@ -68,6 +70,7 @@ class RequestDirector:
     def close(self):
         for handler in self.handlers.values():
             handler.close()
+        self.handlers.clear()
 
     def add_handler(self, handler: RequestHandler):
         """Add a handler. If a handler of the same RH_KEY exists, it will overwrite it"""
@@ -80,8 +83,8 @@ class RequestDirector:
             rh: sum(pref(rh, request) for pref in self.preferences)
             for rh in self.handlers.values()
         }
-        self._print_verbose('Handler preferences for this request: %s' % ', '.join(
-            f'{rh.RH_NAME}={pref}' for rh, pref in preferences.items()))
+        self._print_verbose('Handler preferences for this request: {}'.format(', '.join(
+            f'{rh.RH_NAME}={pref}' for rh, pref in preferences.items())))
         return sorted(self.handlers.values(), key=preferences.get, reverse=True)
 
     def _print_verbose(self, msg):
@@ -202,6 +205,8 @@ class RequestHandler(abc.ABC):
     The following extensions are defined for RequestHandler:
     - `cookiejar`: Cookiejar to use for this request.
     - `timeout`: socket timeout to use for this request.
+    - `legacy_ssl`: Enable legacy SSL options for this request. See legacy_ssl_support.
+    - `keep_header_casing`: Keep the casing of headers when sending the request.
     To enable these, add extensions.pop('<extension>', None) to _check_extensions
 
     Apart from the url protocol, proxies dict may contain the following keys:
@@ -221,11 +226,11 @@ class RequestHandler(abc.ABC):
         headers: HTTPHeaderDict = None,
         cookiejar: YoutubeDLCookieJar = None,
         timeout: float | int | None = None,
-        proxies: dict = None,
-        source_address: str = None,
+        proxies: dict | None = None,
+        source_address: str | None = None,
         verbose: bool = False,
         prefer_system_certs: bool = False,
-        client_cert: dict[str, str | None] = None,
+        client_cert: dict[str, str | None] | None = None,
         verify: bool = True,
         legacy_ssl_support: bool = False,
         **_,
@@ -234,7 +239,7 @@ class RequestHandler(abc.ABC):
         self._logger = logger
         self.headers = headers or {}
         self.cookiejar = cookiejar if cookiejar is not None else YoutubeDLCookieJar()
-        self.timeout = float(timeout or 20)
+        self.timeout = float(timeout or DEFAULT_TIMEOUT)
         self.proxies = proxies or {}
         self.source_address = source_address
         self.verbose = verbose
@@ -244,10 +249,10 @@ class RequestHandler(abc.ABC):
         self.legacy_ssl_support = legacy_ssl_support
         super().__init__()
 
-    def _make_sslcontext(self):
+    def _make_sslcontext(self, legacy_ssl_support=None):
         return make_ssl_context(
             verify=self.verify,
-            legacy_support=self.legacy_ssl_support,
+            legacy_support=legacy_ssl_support if legacy_ssl_support is not None else self.legacy_ssl_support,
             use_certifi=not self.prefer_system_certs,
             **self._client_cert,
         )
@@ -255,6 +260,33 @@ class RequestHandler(abc.ABC):
     def _merge_headers(self, request_headers):
         return HTTPHeaderDict(self.headers, request_headers)
 
+    def _prepare_headers(self, request: Request, headers: HTTPHeaderDict) -> None:  # noqa: B027
+        """Additional operations to prepare headers before building. To be extended by subclasses.
+        @param request: Request object
+        @param headers: Merged headers to prepare
+        """
+
+    def _get_headers(self, request: Request) -> dict[str, str]:
+        """
+        Get headers for external use.
+        Subclasses may define a _prepare_headers method to modify headers after merge but before building.
+        """
+        headers = self._merge_headers(request.headers)
+        self._prepare_headers(request, headers)
+        if request.extensions.get('keep_header_casing'):
+            return headers.sensitive()
+        return dict(headers)
+
+    def _calculate_timeout(self, request):
+        return float(request.extensions.get('timeout') or self.timeout)
+
+    def _get_cookiejar(self, request):
+        cookiejar = request.extensions.get('cookiejar')
+        return self.cookiejar if cookiejar is None else cookiejar
+
+    def _get_proxies(self, request):
+        return (request.proxies or self.proxies).copy()
+
     def _check_url_scheme(self, request: Request):
         scheme = urllib.parse.urlparse(request.url).scheme.lower()
         if self._SUPPORTED_URL_SCHEMES is not None and scheme not in self._SUPPORTED_URL_SCHEMES:
@@ -302,6 +334,8 @@ class RequestHandler(abc.ABC):
         """Check extensions for unsupported extensions. Subclasses should extend this."""
         assert isinstance(extensions.get('cookiejar'), (YoutubeDLCookieJar, NoneType))
         assert isinstance(extensions.get('timeout'), (float, int, NoneType))
+        assert isinstance(extensions.get('legacy_ssl'), (bool, NoneType))
+        assert isinstance(extensions.get('keep_header_casing'), (bool, NoneType))
 
     def _validate(self, request):
         self._check_url_scheme(request)
@@ -329,7 +363,7 @@ class RequestHandler(abc.ABC):
         """Handle a request from start to finish. Redefine in subclasses."""
         pass
 
-    def close(self):
+    def close(self):  # noqa: B027
         pass
 
     @classproperty
@@ -366,11 +400,11 @@ class Request:
             self,
             url: str,
             data: RequestData = None,
-            headers: typing.Mapping = None,
-            proxies: dict = None,
-            query: dict = None,
-            method: str = None,
-            extensions: dict = None
+            headers: typing.Mapping | None = None,
+            proxies: dict | None = None,
+            query: dict | None = None,
+            method: str | None = None,
+            extensions: dict | None = None,
     ):
 
         self._headers = HTTPHeaderDict()
@@ -445,7 +479,7 @@ class Request:
 
     @headers.setter
     def headers(self, new_headers: Mapping):
-        """Replaces headers of the request. If not a CaseInsensitiveDict, it will be converted to one."""
+        """Replaces headers of the request. If not a HTTPHeaderDict, it will be converted to one."""
         if isinstance(new_headers, HTTPHeaderDict):
             self._headers = new_headers
         elif isinstance(new_headers, Mapping):
@@ -453,9 +487,10 @@ class Request:
         else:
             raise TypeError('headers must be a mapping')
 
-    def update(self, url=None, data=None, headers=None, query=None):
+    def update(self, url=None, data=None, headers=None, query=None, extensions=None):
         self.data = data if data is not None else self.data
         self.headers.update(headers or {})
+        self.extensions.update(extensions or {})
         self.url = update_url_query(url or self.url, query or {})
 
     def copy(self):
@@ -470,6 +505,7 @@ class Request:
 
 
 HEADRequest = functools.partial(Request, method='HEAD')
+PATCHRequest = functools.partial(Request, method='PATCH')
 PUTRequest = functools.partial(Request, method='PUT')
 
 
@@ -486,15 +522,18 @@ class Response(io.IOBase):
     @param headers: response headers.
     @param status: Response HTTP status code. Default is 200 OK.
     @param reason: HTTP status reason. Will use built-in reasons based on status code if not provided.
+    @param extensions: Dictionary of handler-specific response extensions.
     """
 
     def __init__(
             self,
-            fp: typing.IO,
+            fp: io.IOBase,
             url: str,
             headers: Mapping[str, str],
             status: int = 200,
-            reason: str = None):
+            reason: str | None = None,
+            extensions: dict | None = None,
+    ):
 
         self.fp = fp
         self.headers = Message()
@@ -506,11 +545,12 @@ class Response(io.IOBase):
             self.reason = reason or HTTPStatus(status).phrase
         except ValueError:
             self.reason = None
+        self.extensions = extensions or {}
 
     def readable(self):
         return self.fp.readable()
 
-    def read(self, amt: int = None) -> bytes:
+    def read(self, amt: int | None = None) -> bytes:
         # Expected errors raised here should be of type RequestError or subclasses.
         # Subclasses should redefine this method with more precise error handling.
         try:
diff --git a/plugins/youtube_download/yt_dlp/networking/exceptions.py b/plugins/youtube_download/yt_dlp/networking/exceptions.py
index 10afc9c..daa9fb5 100644
--- a/plugins/youtube_download/yt_dlp/networking/exceptions.py
+++ b/plugins/youtube_download/yt_dlp/networking/exceptions.py
@@ -1,9 +1,8 @@
 from __future__ import annotations
 
 import typing
-import urllib.error
 
-from ..utils import YoutubeDLError, deprecation_warning
+from ..utils import YoutubeDLError
 
 if typing.TYPE_CHECKING:
     from .common import RequestHandler, Response
@@ -14,7 +13,7 @@ class RequestError(YoutubeDLError):
         self,
         msg: str | None = None,
         cause: Exception | str | None = None,
-        handler: RequestHandler = None
+        handler: RequestHandler = None,
     ):
         self.handler = handler
         self.cause = cause
@@ -75,10 +74,10 @@ class HTTPError(RequestError):
 
 
 class IncompleteRead(TransportError):
-    def __init__(self, partial, expected=None, **kwargs):
+    def __init__(self, partial: int, expected: int | None = None, **kwargs):
         self.partial = partial
         self.expected = expected
-        msg = f'{len(partial)} bytes read'
+        msg = f'{partial} bytes read'
         if expected is not None:
             msg += f', {expected} more expected'
 
@@ -101,117 +100,4 @@ class ProxyError(TransportError):
     pass
 
 
-class _CompatHTTPError(urllib.error.HTTPError, HTTPError):
-    """
-    Provides backwards compatibility with urllib.error.HTTPError.
-    Do not use this class directly, use HTTPError instead.
-    """
-
-    def __init__(self, http_error: HTTPError):
-        super().__init__(
-            url=http_error.response.url,
-            code=http_error.status,
-            msg=http_error.msg,
-            hdrs=http_error.response.headers,
-            fp=http_error.response
-        )
-        self._closer.file = None  # Disable auto close
-        self._http_error = http_error
-        HTTPError.__init__(self, http_error.response, redirect_loop=http_error.redirect_loop)
-
-    @property
-    def status(self):
-        return self._http_error.status
-
-    @status.setter
-    def status(self, value):
-        return
-
-    @property
-    def reason(self):
-        return self._http_error.reason
-
-    @reason.setter
-    def reason(self, value):
-        return
-
-    @property
-    def headers(self):
-        deprecation_warning('HTTPError.headers is deprecated, use HTTPError.response.headers instead')
-        return self._http_error.response.headers
-
-    @headers.setter
-    def headers(self, value):
-        return
-
-    def info(self):
-        deprecation_warning('HTTPError.info() is deprecated, use HTTPError.response.headers instead')
-        return self.response.headers
-
-    def getcode(self):
-        deprecation_warning('HTTPError.getcode is deprecated, use HTTPError.status instead')
-        return self.status
-
-    def geturl(self):
-        deprecation_warning('HTTPError.geturl is deprecated, use HTTPError.response.url instead')
-        return self.response.url
-
-    @property
-    def code(self):
-        deprecation_warning('HTTPError.code is deprecated, use HTTPError.status instead')
-        return self.status
-
-    @code.setter
-    def code(self, value):
-        return
-
-    @property
-    def url(self):
-        deprecation_warning('HTTPError.url is deprecated, use HTTPError.response.url instead')
-        return self.response.url
-
-    @url.setter
-    def url(self, value):
-        return
-
-    @property
-    def hdrs(self):
-        deprecation_warning('HTTPError.hdrs is deprecated, use HTTPError.response.headers instead')
-        return self.response.headers
-
-    @hdrs.setter
-    def hdrs(self, value):
-        return
-
-    @property
-    def filename(self):
-        deprecation_warning('HTTPError.filename is deprecated, use HTTPError.response.url instead')
-        return self.response.url
-
-    @filename.setter
-    def filename(self, value):
-        return
-
-    def __getattr__(self, name):
-        # File operations are passed through the response.
-        # Warn for some commonly used ones
-        passthrough_warnings = {
-            'read': 'response.read()',
-            # technically possibly due to passthrough, but we should discourage this
-            'get_header': 'response.get_header()',
-            'readable': 'response.readable()',
-            'closed': 'response.closed',
-            'tell': 'response.tell()',
-        }
-        if name in passthrough_warnings:
-            deprecation_warning(f'HTTPError.{name} is deprecated, use HTTPError.{passthrough_warnings[name]} instead')
-        return super().__getattr__(name)
-
-    def __str__(self):
-        return str(self._http_error)
-
-    def __repr__(self):
-        return repr(self._http_error)
-
-
 network_exceptions = (HTTPError, TransportError)
diff --git a/plugins/youtube_download/yt_dlp/networking/impersonate.py b/plugins/youtube_download/yt_dlp/networking/impersonate.py
new file mode 100644
index 0000000..b90d10b
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/networking/impersonate.py
@@ -0,0 +1,155 @@
+from __future__ import annotations
+
+import re
+from abc import ABC
+from dataclasses import dataclass
+from typing import Any
+
+from .common import RequestHandler, register_preference, Request
+from .exceptions import UnsupportedRequest
+from ..compat.types import NoneType
+from ..utils import classproperty, join_nonempty
+from ..utils.networking import std_headers, HTTPHeaderDict
+
+
+@dataclass(order=True, frozen=True)
+class ImpersonateTarget:
+    """
+    A target for browser impersonation.
+
+    Parameters:
+    @param client: the client to impersonate
+    @param version: the client version to impersonate
+    @param os: the client OS to impersonate
+    @param os_version: the client OS version to impersonate
+
+    Note: None is used to indicate to match any.
+
+    """
+    client: str | None = None
+    version: str | None = None
+    os: str | None = None
+    os_version: str | None = None
+
+    def __post_init__(self):
+        if self.version and not self.client:
+            raise ValueError('client is required if version is set')
+        if self.os_version and not self.os:
+            raise ValueError('os is required if os_version is set')
+
+    def __contains__(self, target: ImpersonateTarget):
+        if not isinstance(target, ImpersonateTarget):
+            return False
+        return (
+            (self.client is None or target.client is None or self.client == target.client)
+            and (self.version is None or target.version is None or self.version == target.version)
+            and (self.os is None or target.os is None or self.os == target.os)
+            and (self.os_version is None or target.os_version is None or self.os_version == target.os_version)
+        )
+
+    def __str__(self):
+        return f'{join_nonempty(self.client, self.version)}:{join_nonempty(self.os, self.os_version)}'.rstrip(':')
+
+    @classmethod
+    def from_str(cls, target: str):
+        mobj = re.fullmatch(r'(?:(?P<client>[^:-]+)(?:-(?P<version>[^:-]+))?)?(?::(?:(?P<os>[^:-]+)(?:-(?P<os_version>[^:-]+))?)?)?', target)
+        if not mobj:
+            raise ValueError(f'Invalid impersonate target "{target}"')
+        return cls(**mobj.groupdict())
+
+
+class ImpersonateRequestHandler(RequestHandler, ABC):
+    """
+    Base class for request handlers that support browser impersonation.
+
+    This provides a method for checking the validity of the impersonate extension,
+    which can be used in _check_extensions.
+
+    Impersonate targets consist of a client, version, os and os_ver.
+    See the ImpersonateTarget class for more details.
+
+    The following may be defined:
+     - `_SUPPORTED_IMPERSONATE_TARGET_MAP`: a dict mapping supported targets to custom object.
+                Any Request with an impersonate target not in this list will raise an UnsupportedRequest.
+                Set to None to disable this check.
+                Note: Entries are in order of preference
+
+    Parameters:
+    @param impersonate: the default impersonate target to use for requests.
+                        Set to None to disable impersonation.
+    """
+    _SUPPORTED_IMPERSONATE_TARGET_MAP: dict[ImpersonateTarget, Any] = {}
+
+    def __init__(self, *, impersonate: ImpersonateTarget = None, **kwargs):
+        super().__init__(**kwargs)
+        self.impersonate = impersonate
+
+    def _check_impersonate_target(self, target: ImpersonateTarget):
+        assert isinstance(target, (ImpersonateTarget, NoneType))
+        if target is None or not self.supported_targets:
+            return
+        if not self.is_supported_target(target):
+            raise UnsupportedRequest(f'Unsupported impersonate target: {target}')
+
+    def _check_extensions(self, extensions):
+        super()._check_extensions(extensions)
+        if 'impersonate' in extensions:
+            self._check_impersonate_target(extensions.get('impersonate'))
+
+    def _validate(self, request):
+        super()._validate(request)
+        self._check_impersonate_target(self.impersonate)
+
+    def _resolve_target(self, target: ImpersonateTarget | None):
+        """Resolve a target to a supported target."""
+        if target is None:
+            return
+        for supported_target in self.supported_targets:
+            if target in supported_target:
+                if self.verbose:
+                    self._logger.stdout(
+                        f'{self.RH_NAME}: resolved impersonate target {target} to {supported_target}')
+                return supported_target
+
+    @classproperty
+    def supported_targets(cls) -> tuple[ImpersonateTarget, ...]:
+        return tuple(cls._SUPPORTED_IMPERSONATE_TARGET_MAP.keys())
+
+    def is_supported_target(self, target: ImpersonateTarget):
+        assert isinstance(target, ImpersonateTarget)
+        return self._resolve_target(target) is not None
+
+    def _get_request_target(self, request):
+        """Get the requested target for the request"""
+        return self._resolve_target(request.extensions.get('impersonate') or self.impersonate)
+
+    def _prepare_impersonate_headers(self, request: Request, headers: HTTPHeaderDict) -> None:  # noqa: B027
+        """Additional operations to prepare headers before building. To be extended by subclasses.
+        @param request: Request object
+        @param headers: Merged headers to prepare
+        """
+
+    def _get_impersonate_headers(self, request: Request) -> dict[str, str]:
+        """
+        Get headers for external impersonation use.
+        Subclasses may define a _prepare_impersonate_headers method to modify headers after merge but before building.
+        """
+        headers = self._merge_headers(request.headers)
+        if self._get_request_target(request) is not None:
+            # remove all headers present in std_headers
+            # TODO: change this to not depend on std_headers
+            for k, v in std_headers.items():
+                if headers.get(k) == v:
+                    headers.pop(k)
+
+        self._prepare_impersonate_headers(request, headers)
+        if request.extensions.get('keep_header_casing'):
+            return headers.sensitive()
+        return dict(headers)
+
+
+@register_preference(ImpersonateRequestHandler)
+def impersonate_preference(rh, request):
+    if request.extensions.get('impersonate') or rh.impersonate:
+        return 1000
+    return 0
diff --git a/plugins/youtube_download/yt_dlp/networking/websocket.py b/plugins/youtube_download/yt_dlp/networking/websocket.py
new file mode 100644
index 0000000..0e7e73c
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/networking/websocket.py
@@ -0,0 +1,23 @@
+from __future__ import annotations
+
+import abc
+
+from .common import RequestHandler, Response
+
+
+class WebSocketResponse(Response):
+
+    def send(self, message: bytes | str):
+        """
+        Send a message to the server.
+
+        @param message: The message to send. A string (str) is sent as a text frame, bytes is sent as a binary frame.
+        """
+        raise NotImplementedError
+
+    def recv(self):
+        raise NotImplementedError
+
+
+class WebSocketRequestHandler(RequestHandler, abc.ABC):
+    pass
diff --git a/plugins/youtube_download/yt_dlp/options.py b/plugins/youtube_download/yt_dlp/options.py
index 1638097..76d401c 100644
--- a/plugins/youtube_download/yt_dlp/options.py
+++ b/plugins/youtube_download/yt_dlp/options.py
@@ -40,7 +40,7 @@ from .utils import (
 from .version import CHANNEL, __version__
 
 
-def parseOpts(overrideArguments=None, ignore_config_files='if_override'):
+def parseOpts(overrideArguments=None, ignore_config_files='if_override'):  # noqa: N803
     PACKAGE_NAME = 'yt-dlp'
 
     root = Config(create_parser())
@@ -150,8 +150,17 @@ class _YoutubeDLHelpFormatter(optparse.IndentedHelpFormatter):
         return opts
 
 
+_PRESET_ALIASES = {
+    'mp3': ['-f', 'ba[acodec^=mp3]/ba/b', '-x', '--audio-format', 'mp3'],
+    'aac': ['-f', 'ba[acodec^=aac]/ba[acodec^=mp4a.40.]/ba/b', '-x', '--audio-format', 'aac'],
+    'mp4': ['--merge-output-format', 'mp4', '--remux-video', 'mp4', '-S', 'vcodec:h264,lang,quality,res,fps,hdr:12,acodec:aac'],
+    'mkv': ['--merge-output-format', 'mkv', '--remux-video', 'mkv'],
+    'sleep': ['--sleep-subtitles', '5', '--sleep-requests', '0.75', '--sleep-interval', '10', '--max-sleep-interval', '20'],
+}
+
+
 class _YoutubeDLOptionParser(optparse.OptionParser):
-    # optparse is deprecated since python 3.2. So assume a stable interface even for private methods
+    # optparse is deprecated since Python 3.2. So assume a stable interface even for private methods
     ALIAS_DEST = '_triggered_aliases'
     ALIAS_TRIGGER_LIMIT = 100
 
@@ -196,9 +205,12 @@ class _YoutubeDLOptionParser(optparse.OptionParser):
                     raise
         return self.check_values(self.values, self.largs)
 
-    def error(self, msg):
+    def _generate_error_message(self, msg):
         msg = f'{self.get_prog_name()}: error: {str(msg).strip()}\n'
-        raise optparse.OptParseError(f'{self.get_usage()}\n{msg}' if self.usage else msg)
+        return f'{self.get_usage()}\n{msg}' if self.usage else msg
+
+    def error(self, msg):
+        raise optparse.OptParseError(self._generate_error_message(msg))
 
     def _get_args(self, args):
         return sys.argv[1:] if args is None else list(args)
@@ -212,6 +224,22 @@ class _YoutubeDLOptionParser(optparse.OptionParser):
                 return e.possibilities[0]
             raise
 
+    def format_option_help(self, formatter=None):
+        assert formatter, 'Formatter can not be None'
+        formatted_help = super().format_option_help(formatter=formatter)
+        formatter.indent()
+        heading = formatter.format_heading('Preset Aliases')
+        formatter.indent()
+        result = []
+        for name, args in _PRESET_ALIASES.items():
+            option = optparse.Option('-t', help=shlex.join(args))
+            formatter.option_strings[option] = f'-t {name}'
+            result.append(formatter.format_option(option))
+        formatter.dedent()
+        formatter.dedent()
+        help_lines = '\n'.join(result)
+        return f'{formatted_help}\n{heading}{help_lines}'
+
 
 def create_parser():
     def _list_from_options_callback(option, opt_str, value, parser, append=True, delim=',', process=str.strip):
@@ -261,7 +289,7 @@ def create_parser():
         except Exception as err:
             raise optparse.OptionValueError(f'wrong {opt_str} formatting; {err}')
         for key in keys:
-            out_dict[key] = out_dict.get(key, []) + [val] if append else val
+            out_dict[key] = [*out_dict.get(key, []), val] if append else val
         setattr(parser.values, option.dest, out_dict)
 
     def when_prefix(default):
@@ -314,6 +342,13 @@ def create_parser():
         parser.rargs[:0] = shlex.split(
             opts if value is None else opts.format(*map(shlex.quote, value)))
 
+    def _preset_alias_callback(option, opt_str, value, parser):
+        if not value:
+            return
+        if value not in _PRESET_ALIASES:
+            raise optparse.OptionValueError(f'Unknown preset alias: {value}')
+        parser.rargs[:0] = _PRESET_ALIASES[value]
+
     general = optparse.OptionGroup(parser, 'General Options')
     general.add_option(
         '-h', '--help', dest='print_help', action='store_true',
@@ -390,12 +425,12 @@ def create_parser():
         '--ignore-config', '--no-config',
         action='store_true', dest='ignoreconfig',
         help=(
-            'Don\'t load any more configuration files except those given by --config-locations. '
+            'Don\'t load any more configuration files except those given to --config-locations. '
             'For backward compatibility, if this option is found inside the system configuration file, the user configuration is not loaded. '
             '(Alias: --no-config)'))
     general.add_option(
         '--no-config-locations',
-        action='store_const', dest='config_locations', const=[],
+        action='store_const', dest='config_locations', const=None,
         help=(
             'Do not load any custom configuration files (default). When given inside a '
             'configuration file, ignore all previous --config-locations defined in the current file'))
@@ -405,10 +440,29 @@ def create_parser():
         help=(
             'Location of the main configuration file; either the path to the config or its containing directory '
             '("-" for stdin). Can be used multiple times and inside other configuration files'))
+    general.add_option(
+        '--plugin-dirs',
+        metavar='PATH',
+        dest='plugin_dirs',
+        action='callback',
+        callback=_list_from_options_callback,
+        type='str',
+        callback_kwargs={'delim': None},
+        default=['default'],
+        help=(
+            'Path to an additional directory to search for plugins. '
+            'This option can be used multiple times to add multiple directories. '
+            'Use "default" to search the default plugin directories (default)'))
+    general.add_option(
+        '--no-plugin-dirs',
+        dest='plugin_dirs', action='store_const', const=[],
+        help='Clear plugin directories to search, including defaults and those provided by previous --plugin-dirs')
     general.add_option(
         '--flat-playlist',
         action='store_const', dest='extract_flat', const='in_playlist', default=False,
-        help='Do not extract the videos of a playlist, only list them')
+        help=(
+            'Do not extract a playlist\'s URL result entries; '
+            'some entry metadata may be missing and downloading may be bypassed'))
     general.add_option(
         '--no-flat-playlist',
         action='store_false', dest='extract_flat',
@@ -459,6 +513,7 @@ def create_parser():
             'the STREAM (stdout or stderr) to apply the setting to. '
             'Can be one of "always", "auto" (default), "never", or '
             '"no_color" (use non color terminal sequences). '
+            'Use "auto-tty" or "no_color-tty" to decide based on terminal support only. '
             'Can be used multiple times'))
     general.add_option(
         '--compat-options',
@@ -471,12 +526,15 @@ def create_parser():
                 'no-attach-info-json', 'embed-thumbnail-atomicparsley', 'no-external-downloader-progress',
                 'embed-metadata', 'seperate-video-versions', 'no-clean-infojson', 'no-keep-subs', 'no-certifi',
                 'no-youtube-channel-redirect', 'no-youtube-unavailable-videos', 'no-youtube-prefer-utc-upload-date',
+                'prefer-legacy-http-handler', 'manifest-filesize-approx', 'allow-unsafe-ext', 'prefer-vp9-sort',
             }, 'aliases': {
-                'youtube-dl': ['all', '-multistreams', '-playlist-match-filter'],
-                'youtube-dlc': ['all', '-no-youtube-channel-redirect', '-no-live-chat', '-playlist-match-filter'],
-                '2021': ['2022', 'no-certifi', 'filename-sanitization', 'no-youtube-prefer-utc-upload-date'],
-                '2022': ['no-external-downloader-progress', 'playlist-match-filter'],
-            }
+                'youtube-dl': ['all', '-multistreams', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort'],
+                'youtube-dlc': ['all', '-no-youtube-channel-redirect', '-no-live-chat', '-playlist-match-filter', '-manifest-filesize-approx', '-allow-unsafe-ext', '-prefer-vp9-sort'],
+                '2021': ['2022', 'no-certifi', 'filename-sanitization'],
+                '2022': ['2023', 'no-external-downloader-progress', 'playlist-match-filter', 'prefer-legacy-http-handler', 'manifest-filesize-approx'],
+                '2023': ['2024', 'prefer-vp9-sort'],
+                '2024': [],
+            },
         }, help=(
             'Options that can help keep compatibility with youtube-dl or youtube-dlc '
             'configurations by reverting some of the changes made in yt-dlp. '
@@ -493,6 +551,15 @@ def create_parser():
             'Alias options can trigger more aliases; so be careful to avoid defining recursive options. '
             f'As a safety measure, each alias may be triggered a maximum of {_YoutubeDLOptionParser.ALIAS_TRIGGER_LIMIT} times. '
             'This option can be used multiple times'))
+    general.add_option(
+        '-t', '--preset-alias',
+        metavar='PRESET', dest='_', type='str',
+        action='callback', callback=_preset_alias_callback,
+        help=(
+            'Applies a predefined set of options. e.g. --preset-alias mp3. '
+            f'The following presets are available: {", ".join(_PRESET_ALIASES)}. '
+            'See the "Preset Aliases" section at the end for more info. '
+            'This option can be used multiple times'))
 
     network = optparse.OptionGroup(parser, 'Network Options')
     network.add_option(
@@ -510,6 +577,19 @@ def create_parser():
         metavar='IP', dest='source_address', default=None,
         help='Client-side IP address to bind to',
     )
+    network.add_option(
+        '--impersonate',
+        metavar='CLIENT[:OS]', dest='impersonate', default=None,
+        help=(
+            'Client to impersonate for requests. E.g. chrome, chrome-110, chrome:windows-10. '
+            'Pass --impersonate="" to impersonate any client. Note that forcing impersonation '
+            'for all requests may have a detrimental impact on download speed and stability'),
+    )
+    network.add_option(
+        '--list-impersonate-targets',
+        dest='list_impersonate_targets', default=False, action='store_true',
+        help='List available clients to impersonate.',
+    )
     network.add_option(
         '-4', '--force-ipv4',
         action='store_const', const='0.0.0.0', dest='source_address',
@@ -523,7 +603,7 @@ def create_parser():
     network.add_option(
         '--enable-file-urls', action='store_true',
         dest='enable_file_urls', default=False,
-        help='Enable file:// URLs. This is disabled by default for security reasons.'
+        help='Enable file:// URLs. This is disabled by default for security reasons.',
     )
 
     geo = optparse.OptionGroup(parser, 'Geo-restriction')
@@ -604,13 +684,13 @@ def create_parser():
         metavar='DATE', dest='datebefore', default=None,
         help=(
             'Download only videos uploaded on or before this date. '
-            'The date formats accepted is the same as --date'))
+            'The date formats accepted are the same as --date'))
     selection.add_option(
         '--dateafter',
         metavar='DATE', dest='dateafter', default=None,
         help=(
             'Download only videos uploaded on or after this date. '
-            'The date formats accepted is the same as --date'))
+            'The date formats accepted are the same as --date'))
     selection.add_option(
         '--min-views',
         metavar='COUNT', dest='min_views', default=None, type=int,
@@ -628,16 +708,16 @@ def create_parser():
             'You can also simply specify a field to match if the field is present, '
             'use "!field" to check if the field is not present, and "&" to check multiple conditions. '
             'Use a "\\" to escape "&" or quotes if needed. If used multiple times, '
-            'the filter matches if atleast one of the conditions are met. E.g. --match-filter '
-            '!is_live --match-filter "like_count>?100 & description~=\'(?i)\\bcats \\& dogs\\b\'" '
+            'the filter matches if at least one of the conditions is met. E.g. --match-filters '
+            '!is_live --match-filters "like_count>?100 & description~=\'(?i)\\bcats \\& dogs\\b\'" '
             'matches only videos that are not live OR those that have a like count more than 100 '
             '(or the like field is not available) and also has a description '
             'that contains the phrase "cats & dogs" (caseless). '
-            'Use "--match-filter -" to interactively ask whether to download each video'))
+            'Use "--match-filters -" to interactively ask whether to download each video'))
     selection.add_option(
         '--no-match-filters',
         dest='match_filter', action='store_const', const=None,
-        help='Do not use any --match-filter (default)')
+        help='Do not use any --match-filters (default)')
     selection.add_option(
         '--break-match-filters',
         metavar='FILTER', dest='breaking_match_filter', action='append',
@@ -664,7 +744,7 @@ def create_parser():
         help='Download only videos not listed in the archive file. Record the IDs of all downloaded videos in it')
     selection.add_option(
         '--no-download-archive',
-        dest='download_archive', action="store_const", const=None,
+        dest='download_archive', action='store_const', const=None,
         help='Do not use archive file (default)')
     selection.add_option(
         '--max-downloads',
@@ -673,7 +753,12 @@ def create_parser():
     selection.add_option(
         '--break-on-existing',
         action='store_true', dest='break_on_existing', default=False,
-        help='Stop the download process when encountering a file that is in the archive')
+        help='Stop the download process when encountering a file that is in the archive '
+             'supplied with the --download-archive option')
+    selection.add_option(
+        '--no-break-on-existing',
+        action='store_false', dest='break_on_existing',
+        help='Do not stop the download process when encountering a file that is in the archive (default)')
     selection.add_option(
         '--break-on-reject',
         action='store_true', dest='break_on_reject', default=False,
@@ -681,7 +766,7 @@ def create_parser():
     selection.add_option(
         '--break-per-input',
         action='store_true', dest='break_per_url', default=False,
-        help='Alters --max-downloads, --break-on-existing, --break-match-filter, and autonumber to reset per input URL')
+        help='Alters --max-downloads, --break-on-existing, --break-match-filters, and autonumber to reset per input URL')
     selection.add_option(
         '--no-break-per-input',
         action='store_false', dest='break_per_url',
@@ -727,7 +812,7 @@ def create_parser():
     authentication.add_option(
         '--video-password',
         dest='videopassword', metavar='PASSWORD',
-        help='Video password (vimeo, youku)')
+        help='Video-specific password')
     authentication.add_option(
         '--ap-mso',
         dest='ap_mso', metavar='MSO',
@@ -802,7 +887,7 @@ def create_parser():
         '--prefer-free-formats',
         action='store_true', dest='prefer_free_formats', default=False,
         help=(
-            'Prefer video formats with free containers over non-free ones of same quality. '
+            'Prefer video formats with free containers over non-free ones of the same quality. '
             'Use with "-S ext" to strictly prefer free containers irrespective of quality'))
     video_format.add_option(
         '--no-prefer-free-formats',
@@ -876,13 +961,14 @@ def create_parser():
     subtitles.add_option(
         '--sub-format',
         action='store', dest='subtitlesformat', metavar='FORMAT', default='best',
-        help='Subtitle format; accepts formats preference, e.g. "srt" or "ass/srt/best"')
+        help='Subtitle format; accepts formats preference separated by "/", e.g. "srt" or "ass/srt/best"')
     subtitles.add_option(
         '--sub-langs', '--srt-langs',
         action='callback', dest='subtitleslangs', metavar='LANGS', type='str',
         default=[], callback=_list_from_options_callback,
         help=(
-            'Languages of the subtitles to download (can be regex) or "all" separated by commas, e.g. --sub-langs "en.*,ja". '
+            'Languages of the subtitles to download (can be regex) or "all" separated by commas, e.g. --sub-langs "en.*,ja" '
+            '(where "en.*" is a regex pattern that matches "en" followed by 0 or more of any character). '
             'You can prefix the language code with a "-" to exclude it from the requested languages, e.g. --sub-langs all,-live_chat. '
             'Use --list-subs for a list of available language tags'))
 
@@ -1024,7 +1110,7 @@ def create_parser():
         callback_kwargs={
             'allowed_keys': 'http|ftp|m3u8|dash|rtsp|rtmp|mms',
             'default_key': 'default',
-            'process': str.strip
+            'process': str.strip,
         }, help=(
             'Name or path of the external downloader to use (optionally) prefixed by '
             'the protocols (http, ftp, m3u8, dash, rstp, rtmp, mms) to use it for. '
@@ -1038,9 +1124,9 @@ def create_parser():
         metavar='NAME:ARGS', dest='external_downloader_args', default={}, type='str',
         action='callback', callback=_dict_from_options_callback,
         callback_kwargs={
-            'allowed_keys': r'ffmpeg_[io]\d*|%s' % '|'.join(map(re.escape, list_external_downloaders())),
+            'allowed_keys': r'ffmpeg_[io]\d*|{}'.format('|'.join(map(re.escape, list_external_downloaders()))),
             'default_key': 'default',
-            'process': shlex.split
+            'process': shlex.split,
         }, help=(
             'Give these arguments to the external downloader. '
             'Specify the downloader name and the arguments separated by a colon ":". '
@@ -1151,7 +1237,7 @@ def create_parser():
         '--print-to-file',
         metavar='[WHEN:]TEMPLATE FILE', dest='print_to_file', nargs=2, **when_prefix('video'),
         help=(
-            'Append given template to the file. The values of WHEN and TEMPLATE are same as that of --print. '
+            'Append given template to the file. The values of WHEN and TEMPLATE are the same as that of --print. '
             'FILE uses the same syntax as the output template. This option can be used multiple times'))
     verbosity.add_option(
         '-g', '--get-url',
@@ -1188,12 +1274,14 @@ def create_parser():
     verbosity.add_option(
         '-j', '--dump-json',
         action='store_true', dest='dumpjson', default=False,
-        help='Quiet, but print JSON information for each video. Simulate unless --no-simulate is used. See "OUTPUT TEMPLATE" for a description of available keys')
+        help=(
+            'Quiet, but print JSON information for each video. Simulate unless --no-simulate is used. '
+            'See "OUTPUT TEMPLATE" for a description of available keys'))
     verbosity.add_option(
         '-J', '--dump-single-json',
         action='store_true', dest='dump_single_json', default=False,
         help=(
-            'Quiet, but print JSON information for each url or infojson passed. Simulate unless --no-simulate is used. '
+            'Quiet, but print JSON information for each URL or infojson passed. Simulate unless --no-simulate is used. '
             'If the URL refers to a playlist, the whole playlist information is dumped in a single line'))
     verbosity.add_option(
         '--print-json',
@@ -1227,7 +1315,7 @@ def create_parser():
         action='callback', callback=_dict_from_options_callback,
         callback_kwargs={
             'allowed_keys': '(download|postprocess)(-title)?',
-            'default_key': 'download'
+            'default_key': 'download',
         }, help=(
             'Template for progress outputs, optionally prefixed with one of "download:" (default), '
             '"download-title:" (the console title), "postprocess:",  or "postprocess-title:". '
@@ -1235,6 +1323,10 @@ def create_parser():
             'the progress attributes are accessible under "progress" key. E.g. '
             # TODO: Document the fields inside "progress"
             '--console-title --progress-template "download-title:%(info.id)s-%(progress.eta)s"'))
+    verbosity.add_option(
+        '--progress-delta',
+        metavar='SECONDS', action='store', dest='progress_delta', type=float, default=0,
+        help='Time between progress output (default: 0)')
     verbosity.add_option(
         '-v', '--verbose',
         action='store_true', dest='verbose', default=False,
@@ -1289,8 +1381,8 @@ def create_parser():
         metavar='[TYPES:]PATH', dest='paths', default={}, type='str',
         action='callback', callback=_dict_from_options_callback,
         callback_kwargs={
-            'allowed_keys': 'home|temp|%s' % '|'.join(map(re.escape, OUTTMPL_TYPES.keys())),
-            'default_key': 'home'
+            'allowed_keys': 'home|temp|{}'.format('|'.join(map(re.escape, OUTTMPL_TYPES.keys()))),
+            'default_key': 'home',
         }, help=(
             'The paths where the files should be downloaded. '
             'Specify the type of file and the path separated by a colon ":". '
@@ -1305,12 +1397,12 @@ def create_parser():
         action='callback', callback=_dict_from_options_callback,
         callback_kwargs={
             'allowed_keys': '|'.join(map(re.escape, OUTTMPL_TYPES.keys())),
-            'default_key': 'default'
+            'default_key': 'default',
         }, help='Output filename template; see "OUTPUT TEMPLATE" for details')
     filesystem.add_option(
         '--output-na-placeholder',
         dest='outtmpl_na_placeholder', metavar='TEXT', default='NA',
-        help=('Placeholder for unavailable fields in "OUTPUT TEMPLATE" (default: "%default")'))
+        help=('Placeholder for unavailable fields in --output (default: "%default")'))
     filesystem.add_option(
         '--autonumber-size',
         dest='autonumber_size', metavar='NUMBER', type=int,
@@ -1329,12 +1421,12 @@ def create_parser():
         help='Allow Unicode characters, "&" and spaces in filenames (default)')
     filesystem.add_option(
         '--windows-filenames',
-        action='store_true', dest='windowsfilenames', default=False,
+        action='store_true', dest='windowsfilenames', default=None,
         help='Force filenames to be Windows-compatible')
     filesystem.add_option(
         '--no-windows-filenames',
         action='store_false', dest='windowsfilenames',
-        help='Make filenames Windows-compatible only if using Windows (default)')
+        help='Sanitize filenames only minimally')
     filesystem.add_option(
         '--trim-filenames', '--trim-file-names', metavar='LENGTH',
         dest='trim_file_name', default=0, type=int,
@@ -1451,7 +1543,7 @@ def create_parser():
             'Optionally, the KEYRING used for decrypting Chromium cookies on Linux, '
             'the name/path of the PROFILE to load cookies from, '
             'and the CONTAINER name (if Firefox) ("none" for no container) '
-            'can be given with their respective seperators. '
+            'can be given with their respective separators. '
             'By default, all containers of the most recently accessed profile are used. '
             f'Currently supported keyrings are: {", ".join(map(str.lower, sorted(SUPPORTED_KEYRINGS)))}'))
     filesystem.add_option(
@@ -1533,7 +1625,7 @@ def create_parser():
         help=(
             'Remux the video into another container if necessary '
             f'(currently supported: {", ".join(FFmpegVideoRemuxerPP.SUPPORTED_EXTS)}). '
-            'If target container does not support the video/audio codec, remuxing will fail. You can specify multiple rules; '
+            'If the target container does not support the video/audio codec, remuxing will fail. You can specify multiple rules; '
             'e.g. "aac>m4a/mov>mp4/mkv" will remux aac to m4a, mov to mp4 and anything else to mkv'))
     postproc.add_option(
         '--recode-video',
@@ -1547,7 +1639,7 @@ def create_parser():
             'allowed_keys': r'\w+(?:\+\w+)?',
             'default_key': 'default-compat',
             'process': shlex.split,
-            'multiple_keys': False
+            'multiple_keys': False,
         }, help=(
             'Give these arguments to the postprocessors. '
             'Specify the postprocessor/executable name and the arguments separated by a colon ":" '
@@ -1639,7 +1731,7 @@ def create_parser():
     postproc.add_option(
         '--xattrs', '--xattr',
         action='store_true', dest='xattrs', default=False,
-        help='Write metadata to the video file\'s xattrs (using dublin core and xdg standards)')
+        help='Write metadata to the video file\'s xattrs (using Dublin Core and XDG standards)')
     postproc.add_option(
         '--concat-playlist',
         metavar='POLICY', dest='concat_playlist', default='multi_video',
@@ -1647,7 +1739,7 @@ def create_parser():
         help=(
             'Concatenate videos in a playlist. One of "never", "always", or '
             '"multi_video" (default; only when the videos form a single show). '
-            'All the video files must have same codecs and number of streams to be concatable. '
+            'All the video files must have the same codecs and number of streams to be concatenable. '
             'The "pl_video:" prefix can be used with "--paths" and "--output" to '
             'set the output filename for the concatenated files. See "OUTPUT TEMPLATE" for details'))
     postproc.add_option(
@@ -1657,8 +1749,8 @@ def create_parser():
         help=(
             'Automatically correct known faults of the file. '
             'One of never (do nothing), warn (only emit a warning), '
-            'detect_or_warn (the default; fix file if we can, warn otherwise), '
-            'force (try fixing even if file already exists)'))
+            'detect_or_warn (the default; fix the file if we can, warn otherwise), '
+            'force (try fixing even if the file already exists)'))
     postproc.add_option(
         '--prefer-avconv', '--no-prefer-ffmpeg',
         action='store_false', dest='prefer_ffmpeg',
@@ -1677,7 +1769,7 @@ def create_parser():
         help=(
             'Execute a command, optionally prefixed with when to execute it, separated by a ":". '
             'Supported values of "WHEN" are the same as that of --use-postprocessor (default: after_move). '
-            'Same syntax as the output template can be used to pass any field as arguments to the command. '
+            'The same syntax as the output template can be used to pass any field as arguments to the command. '
             'If no fields are passed, %(filepath,_filename|)q is appended to the end of the command. '
             'This option can be used multiple times'))
     postproc.add_option(
@@ -1696,15 +1788,17 @@ def create_parser():
         '--convert-subs', '--convert-sub', '--convert-subtitles',
         metavar='FORMAT', dest='convertsubtitles', default=None,
         help=(
-            'Convert the subtitles to another format (currently supported: %s) '
-            '(Alias: --convert-subtitles)' % ', '.join(sorted(FFmpegSubtitlesConvertorPP.SUPPORTED_EXTS))))
+            'Convert the subtitles to another format '
+            f'(currently supported: {", ".join(sorted(FFmpegSubtitlesConvertorPP.SUPPORTED_EXTS))}). '
+            'Use "--convert-subs none" to disable conversion (default) (Alias: --convert-subtitles)'))
     postproc.add_option(
         '--convert-thumbnails',
         metavar='FORMAT', dest='convertthumbnails', default=None,
         help=(
             'Convert the thumbnails to another format '
             f'(currently supported: {", ".join(sorted(FFmpegThumbnailsConvertorPP.SUPPORTED_EXTS))}). '
-            'You can specify multiple rules using similar syntax as --remux-video'))
+            'You can specify multiple rules using similar syntax as "--remux-video". '
+            'Use "--convert-thumbnails none" to disable conversion (default)'))
     postproc.add_option(
         '--split-chapters', '--split-tracks',
         dest='split_chapters', action='store_true', default=False,
@@ -1744,16 +1838,16 @@ def create_parser():
         action='callback', callback=_list_from_options_callback,
         callback_kwargs={
             'delim': None,
-            'process': lambda val: dict(_postprocessor_opts_parser(*val.split(':', 1)))
+            'process': lambda val: dict(_postprocessor_opts_parser(*val.split(':', 1))),
         }, help=(
-            'The (case sensitive) name of plugin postprocessors to be enabled, '
+            'The (case-sensitive) name of plugin postprocessors to be enabled, '
             'and (optionally) arguments to be passed to it, separated by a colon ":". '
             'ARGS are a semicolon ";" delimited list of NAME=VALUE. '
             'The "when" argument determines when the postprocessor is invoked. '
             'It can be one of "pre_process" (after video extraction), "after_filter" (after video passes filter), '
             '"video" (after --format; before --print/--output), "before_dl" (before each video download), '
             '"post_process" (after each video download; default), '
-            '"after_move" (after moving video file to it\'s final locations), '
+            '"after_move" (after moving the video file to its final location), '
             '"after_video" (after downloading and processing all formats of a video), '
             'or "playlist" (at end of playlist). '
             'This option can be used multiple times to add different postprocessors'))
@@ -1766,11 +1860,11 @@ def create_parser():
         dest='sponsorblock_mark', default=set(), action='callback', type='str',
         callback=_set_from_options_callback, callback_kwargs={
             'allowed_values': SponsorBlockPP.CATEGORIES.keys(),
-            'aliases': {'default': ['all']}
+            'aliases': {'default': ['all']},
         }, help=(
             'SponsorBlock categories to create chapters for, separated by commas. '
             f'Available categories are {", ".join(SponsorBlockPP.CATEGORIES.keys())}, all and default (=all). '
-            'You can prefix the category with a "-" to exclude it. See [1] for description of the categories. '
+            'You can prefix the category with a "-" to exclude it. See [1] for descriptions of the categories. '
             'E.g. --sponsorblock-mark all,-preview [1] https://wiki.sponsor.ajay.app/w/Segment_Categories'))
     sponsorblock.add_option(
         '--sponsorblock-remove', metavar='CATS',
@@ -1780,7 +1874,7 @@ def create_parser():
             # Note: From https://wiki.sponsor.ajay.app/w/Types:
             # The filler category is very aggressive.
             # It is strongly recommended to not use this in a client by default.
-            'aliases': {'default': ['all', '-filler']}
+            'aliases': {'default': ['all', '-filler']},
         }, help=(
             'SponsorBlock categories to be removed from the video file, separated by commas. '
             'If a category is present in both mark and remove, remove takes precedence. '
@@ -1851,12 +1945,12 @@ def create_parser():
     extractor.add_option(
         '--hls-split-discontinuity',
         dest='hls_split_discontinuity', action='store_true', default=False,
-        help='Split HLS playlists to different formats at discontinuities such as ad breaks'
+        help='Split HLS playlists to different formats at discontinuities such as ad breaks',
     )
     extractor.add_option(
         '--no-hls-split-discontinuity',
         dest='hls_split_discontinuity', action='store_false',
-        help='Do not split HLS playlists to different formats at discontinuities such as ad breaks (default)')
+        help='Do not split HLS playlists into different formats at discontinuities such as ad breaks (default)')
     _extractor_arg_parser = lambda key, vals='': (key.strip().lower().replace('-', '_'), [
         val.replace(r'\,', ',').strip() for val in re.split(r'(?<!\\),', vals)])
     extractor.add_option(
@@ -1866,7 +1960,7 @@ def create_parser():
         callback_kwargs={
             'multiple_keys': False,
             'process': lambda val: dict(
-                _extractor_arg_parser(*arg.split('=', 1)) for arg in val.split(';'))
+                _extractor_arg_parser(*arg.split('=', 1)) for arg in val.split(';')),
         }, help=(
             'Pass ARGS arguments to the IE_KEY extractor. See "EXTRACTOR ARGUMENTS" for details. '
             'You can use this option multiple times to give arguments for different extractors'))
diff --git a/plugins/youtube_download/yt_dlp/plugins.py b/plugins/youtube_download/yt_dlp/plugins.py
index 6422c7a..941709b 100644
--- a/plugins/youtube_download/yt_dlp/plugins.py
+++ b/plugins/youtube_download/yt_dlp/plugins.py
@@ -1,10 +1,13 @@
 import contextlib
+import dataclasses
+import functools
 import importlib
 import importlib.abc
 import importlib.machinery
 import importlib.util
 import inspect
 import itertools
+import os
 import pkgutil
 import sys
 import traceback
@@ -12,17 +15,48 @@ import zipimport
 from pathlib import Path
 from zipfile import ZipFile
 
-from .compat import functools  # isort: split
+from .globals import (
+    Indirect,
+    plugin_dirs,
+    all_plugins_loaded,
+    plugin_specs,
+)
+
 from .utils import (
     get_executable_path,
     get_system_config_dirs,
     get_user_config_dirs,
+    merge_dicts,
     orderedSet,
     write_string,
 )
 
 PACKAGE_NAME = 'yt_dlp_plugins'
 COMPAT_PACKAGE_NAME = 'ytdlp_plugins'
+_BASE_PACKAGE_PATH = Path(__file__).parent
+
+
+# Please Note: Due to necessary changes and the complex nature involved,
+# no backwards compatibility is guaranteed for the plugin system API.
+# However, we will still try our best.
+
+__all__ = [
+    'COMPAT_PACKAGE_NAME',
+    'PACKAGE_NAME',
+    'PluginSpec',
+    'directories',
+    'load_all_plugins',
+    'load_plugins',
+    'register_plugin_spec',
+]
+
+
+@dataclasses.dataclass
+class PluginSpec:
+    module_name: str
+    suffix: str
+    destination: Indirect
+    plugin_destination: Indirect
 
 
 class PluginLoader(importlib.abc.Loader):
@@ -42,7 +76,42 @@ def dirs_in_zip(archive):
         pass
     except Exception as e:
         write_string(f'WARNING: Could not read zip file {archive}: {e}\n')
-    return set()
+    return ()
+
+
+def default_plugin_paths():
+    def _get_package_paths(*root_paths, containing_folder):
+        for config_dir in orderedSet(map(Path, root_paths), lazy=True):
+            # We need to filter the base path added when running __main__.py directly
+            if config_dir == _BASE_PACKAGE_PATH:
+                continue
+            with contextlib.suppress(OSError):
+                yield from (config_dir / containing_folder).iterdir()
+
+    # Load from yt-dlp config folders
+    yield from _get_package_paths(
+        *get_user_config_dirs('yt-dlp'),
+        *get_system_config_dirs('yt-dlp'),
+        containing_folder='plugins',
+    )
+
+    # Load from yt-dlp-plugins folders
+    yield from _get_package_paths(
+        get_executable_path(),
+        *get_user_config_dirs(''),
+        *get_system_config_dirs(''),
+        containing_folder='yt-dlp-plugins',
+    )
+
+    # Load from PYTHONPATH directories
+    yield from (path for path in map(Path, sys.path) if path != _BASE_PACKAGE_PATH)
+
+
+def candidate_plugin_paths(candidate):
+    candidate_path = Path(candidate)
+    if not candidate_path.is_dir():
+        raise ValueError(f'Invalid plugin directory: {candidate_path}')
+    yield from candidate_path.iterdir()
 
 
 class PluginFinder(importlib.abc.MetaPathFinder):
@@ -54,43 +123,28 @@ class PluginFinder(importlib.abc.MetaPathFinder):
 
     def __init__(self, *packages):
         self._zip_content_cache = {}
-        self.packages = set(itertools.chain.from_iterable(
-            itertools.accumulate(name.split('.'), lambda a, b: '.'.join((a, b)))
-            for name in packages))
+        self.packages = set(
+            itertools.chain.from_iterable(
+                itertools.accumulate(name.split('.'), lambda a, b: '.'.join((a, b)))
+                for name in packages))
 
     def search_locations(self, fullname):
-        candidate_locations = []
-
-        def _get_package_paths(*root_paths, containing_folder='plugins'):
-            for config_dir in orderedSet(map(Path, root_paths), lazy=True):
-                with contextlib.suppress(OSError):
-                    yield from (config_dir / containing_folder).iterdir()
-
-        # Load from yt-dlp config folders
-        candidate_locations.extend(_get_package_paths(
-            *get_user_config_dirs('yt-dlp'),
-            *get_system_config_dirs('yt-dlp'),
-            containing_folder='plugins'))
-
-        # Load from yt-dlp-plugins folders
-        candidate_locations.extend(_get_package_paths(
-            get_executable_path(),
-            *get_user_config_dirs(''),
-            *get_system_config_dirs(''),
-            containing_folder='yt-dlp-plugins'))
-
-        candidate_locations.extend(map(Path, sys.path))  # PYTHONPATH
-        with contextlib.suppress(ValueError):  # Added when running __main__.py directly
-            candidate_locations.remove(Path(__file__).parent)
+        candidate_locations = itertools.chain.from_iterable(
+            default_plugin_paths() if candidate == 'default' else candidate_plugin_paths(candidate)
+            for candidate in plugin_dirs.value
+        )
 
         parts = Path(*fullname.split('.'))
         for path in orderedSet(candidate_locations, lazy=True):
             candidate = path / parts
-            if candidate.is_dir():
-                yield candidate
-            elif path.suffix in ('.zip', '.egg', '.whl') and path.is_file():
-                if parts in dirs_in_zip(path):
+            try:
+                if candidate.is_dir():
                     yield candidate
+                elif path.suffix in ('.zip', '.egg', '.whl') and path.is_file():
+                    if parts in dirs_in_zip(path):
+                        yield candidate
+            except PermissionError as e:
+                write_string(f'Permission error while accessing modules in "{e.filename}"\n')
 
     def find_spec(self, fullname, path=None, target=None):
         if fullname not in self.packages:
@@ -98,7 +152,8 @@ class PluginFinder(importlib.abc.MetaPathFinder):
 
         search_locations = list(map(str, self.search_locations(fullname)))
         if not search_locations:
-            return None
+            # Prevent using built-in meta finders for searching plugins.
+            raise ModuleNotFoundError(fullname)
 
         spec = importlib.machinery.ModuleSpec(fullname, PluginLoader(), is_package=True)
         spec.submodule_search_locations = search_locations
@@ -112,8 +167,10 @@ class PluginFinder(importlib.abc.MetaPathFinder):
 
 
 def directories():
-    spec = importlib.util.find_spec(PACKAGE_NAME)
-    return spec.submodule_search_locations if spec else []
+    with contextlib.suppress(ModuleNotFoundError):
+        if spec := importlib.util.find_spec(PACKAGE_NAME):
+            return list(spec.submodule_search_locations)
+    return []
 
 
 def iter_modules(subpackage):
@@ -123,17 +180,23 @@ def iter_modules(subpackage):
         yield from pkgutil.iter_modules(path=pkg.__path__, prefix=f'{fullname}.')
 
 
-def load_module(module, module_name, suffix):
+def get_regular_classes(module, module_name, suffix):
+    # Find standard public plugin classes (not overrides)
     return inspect.getmembers(module, lambda obj: (
         inspect.isclass(obj)
         and obj.__name__.endswith(suffix)
         and obj.__module__.startswith(module_name)
         and not obj.__name__.startswith('_')
-        and obj.__name__ in getattr(module, '__all__', [obj.__name__])))
+        and obj.__name__ in getattr(module, '__all__', [obj.__name__])
+        and getattr(obj, 'PLUGIN_NAME', None) is None
+    ))
 
 
-def load_plugins(name, suffix):
-    classes = {}
+def load_plugins(plugin_spec: PluginSpec):
+    name, suffix = plugin_spec.module_name, plugin_spec.suffix
+    regular_classes = {}
+    if os.environ.get('YTDLP_NO_PLUGINS') or not plugin_dirs.value:
+        return regular_classes
 
     for finder, module_name, _ in iter_modules(name):
         if any(x.startswith('_') for x in module_name.split('.')):
@@ -150,24 +213,42 @@ def load_plugins(name, suffix):
                 sys.modules[module_name] = module
                 spec.loader.exec_module(module)
         except Exception:
-            write_string(f'Error while importing module {module_name!r}\n{traceback.format_exc(limit=-1)}')
+            write_string(
+                f'Error while importing module {module_name!r}\n{traceback.format_exc(limit=-1)}',
+            )
             continue
-        classes.update(load_module(module, module_name, suffix))
+        regular_classes.update(get_regular_classes(module, module_name, suffix))
 
     # Compat: old plugin system using __init__.py
     # Note: plugins imported this way do not show up in directories()
     # nor are considered part of the yt_dlp_plugins namespace package
-    with contextlib.suppress(FileNotFoundError):
-        spec = importlib.util.spec_from_file_location(
-            name, Path(get_executable_path(), COMPAT_PACKAGE_NAME, name, '__init__.py'))
-        plugins = importlib.util.module_from_spec(spec)
-        sys.modules[spec.name] = plugins
-        spec.loader.exec_module(plugins)
-        classes.update(load_module(plugins, spec.name, suffix))
+    if 'default' in plugin_dirs.value:
+        with contextlib.suppress(FileNotFoundError):
+            spec = importlib.util.spec_from_file_location(
+                name,
+                Path(get_executable_path(), COMPAT_PACKAGE_NAME, name, '__init__.py'),
+            )
+            plugins = importlib.util.module_from_spec(spec)
+            sys.modules[spec.name] = plugins
+            spec.loader.exec_module(plugins)
+            regular_classes.update(get_regular_classes(plugins, spec.name, suffix))
 
-    return classes
+    # Add the classes into the global plugin lookup for that type
+    plugin_spec.plugin_destination.value = regular_classes
+    # We want to prepend to the main lookup for that type
+    plugin_spec.destination.value = merge_dicts(regular_classes, plugin_spec.destination.value)
+
+    return regular_classes
 
 
-sys.meta_path.insert(0, PluginFinder(f'{PACKAGE_NAME}.extractor', f'{PACKAGE_NAME}.postprocessor'))
+def load_all_plugins():
+    for plugin_spec in plugin_specs.value.values():
+        load_plugins(plugin_spec)
+    all_plugins_loaded.value = True
 
-__all__ = ['directories', 'load_plugins', 'PACKAGE_NAME', 'COMPAT_PACKAGE_NAME']
+
+def register_plugin_spec(plugin_spec: PluginSpec):
+    # If the plugin spec for a module is already registered, it will not be added again
+    if plugin_spec.module_name not in plugin_specs.value:
+        plugin_specs.value[plugin_spec.module_name] = plugin_spec
+        sys.meta_path.insert(0, PluginFinder(f'{PACKAGE_NAME}.{plugin_spec.module_name}'))
diff --git a/plugins/youtube_download/yt_dlp/postprocessor/__init__.py b/plugins/youtube_download/yt_dlp/postprocessor/__init__.py
index bfe9df7..20e8b14 100644
--- a/plugins/youtube_download/yt_dlp/postprocessor/__init__.py
+++ b/plugins/youtube_download/yt_dlp/postprocessor/__init__.py
@@ -33,15 +33,38 @@ from .movefilesafterdownload import MoveFilesAfterDownloadPP
 from .sponskrub import SponSkrubPP
 from .sponsorblock import SponsorBlockPP
 from .xattrpp import XAttrMetadataPP
-from ..plugins import load_plugins
+from ..globals import plugin_pps, postprocessors
+from ..plugins import PACKAGE_NAME, register_plugin_spec, PluginSpec
+from ..utils import deprecation_warning
 
-_PLUGIN_CLASSES = load_plugins('postprocessor', 'PP')
+
+def __getattr__(name):
+    lookup = plugin_pps.value
+    if name in lookup:
+        deprecation_warning(
+            f'Importing a plugin Post-Processor from {__name__} is deprecated. '
+            f'Please import {PACKAGE_NAME}.postprocessor.{name} instead.')
+        return lookup[name]
+
+    raise AttributeError(f'module {__name__!r} has no attribute {name!r}')
 
 
 def get_postprocessor(key):
-    return globals()[key + 'PP']
+    return postprocessors.value[key + 'PP']
 
 
-globals().update(_PLUGIN_CLASSES)
-__all__ = [name for name in globals().keys() if name.endswith('PP')]
-__all__.extend(('PostProcessor', 'FFmpegPostProcessor'))
+register_plugin_spec(PluginSpec(
+    module_name='postprocessor',
+    suffix='PP',
+    destination=postprocessors,
+    plugin_destination=plugin_pps,
+))
+
+_default_pps = {
+    name: value
+    for name, value in globals().items()
+    if name.endswith('PP') or name in ('FFmpegPostProcessor', 'PostProcessor')
+}
+postprocessors.value.update(_default_pps)
+
+__all__ = list(_default_pps.values())
diff --git a/plugins/youtube_download/yt_dlp/postprocessor/common.py b/plugins/youtube_download/yt_dlp/postprocessor/common.py
index 8cef86c..f0a71c1 100644
--- a/plugins/youtube_download/yt_dlp/postprocessor/common.py
+++ b/plugins/youtube_download/yt_dlp/postprocessor/common.py
@@ -9,8 +9,8 @@ from ..utils import (
     RetryManager,
     _configuration_args,
     deprecation_warning,
-    encodeFilename,
 )
+from ..utils._utils import _ProgressState
 
 
 class PostProcessorMetaClass(type):
@@ -65,7 +65,7 @@ class PostProcessor(metaclass=PostProcessorMetaClass):
 
     def to_screen(self, text, prefix=True, *args, **kwargs):
         if self._downloader:
-            tag = '[%s] ' % self.PP_NAME if prefix else ''
+            tag = f'[{self.PP_NAME}] ' if prefix else ''
             return self._downloader.to_screen(f'{tag}{text}', *args, **kwargs)
 
     def report_warning(self, text, *args, **kwargs):
@@ -127,7 +127,7 @@ class PostProcessor(metaclass=PostProcessorMetaClass):
                 if allowed[format_type]:
                     return func(self, info)
                 else:
-                    self.to_screen('Skipping %s' % format_type)
+                    self.to_screen(f'Skipping {format_type}')
                     return [], info
             return wrapper
         return decorator
@@ -151,7 +151,7 @@ class PostProcessor(metaclass=PostProcessorMetaClass):
 
     def try_utime(self, path, atime, mtime, errnote='Cannot update utime of file'):
         try:
-            os.utime(encodeFilename(path), (atime, mtime))
+            os.utime(path, (atime, mtime))
         except Exception:
             self.report_warning(errnote)
 
@@ -174,7 +174,7 @@ class PostProcessor(metaclass=PostProcessorMetaClass):
         self._progress_hooks.append(ph)
 
     def report_progress(self, s):
-        s['_default_template'] = '%(postprocessor)s %(status)s' % s
+        s['_default_template'] = '%(postprocessor)s %(status)s' % s  # noqa: UP031
         if not self._downloader:
             return
 
@@ -190,7 +190,7 @@ class PostProcessor(metaclass=PostProcessorMetaClass):
 
         self._downloader.to_console_title(self._downloader.evaluate_outtmpl(
             progress_template.get('postprocess-title') or 'yt-dlp %(progress._default_template)s',
-            progress_dict))
+            progress_dict), _ProgressState.from_dict(s), s.get('_percent'))
 
     def _retry_download(self, err, count, retries):
         # While this is not an extractor, it behaves similar to one and
diff --git a/plugins/youtube_download/yt_dlp/postprocessor/embedthumbnail.py b/plugins/youtube_download/yt_dlp/postprocessor/embedthumbnail.py
index d7be0b3..d8ba220 100644
--- a/plugins/youtube_download/yt_dlp/postprocessor/embedthumbnail.py
+++ b/plugins/youtube_download/yt_dlp/postprocessor/embedthumbnail.py
@@ -12,8 +12,6 @@ from ..utils import (
     PostProcessingError,
     check_executable,
     encodeArgument,
-    encodeFilename,
-    error_to_compat_str,
     prepend_extension,
     shell_quote,
 )
@@ -48,7 +46,7 @@ class EmbedThumbnailPP(FFmpegPostProcessor):
             if mobj is None:
                 return guess()
         except PostProcessingError as err:
-            self.report_warning('unable to find the thumbnail resolution; %s' % error_to_compat_str(err))
+            self.report_warning(f'unable to find the thumbnail resolution; {err}')
             return guess()
         return int(mobj.group('w')), int(mobj.group('h'))
 
@@ -69,7 +67,7 @@ class EmbedThumbnailPP(FFmpegPostProcessor):
             self.to_screen('There are no thumbnails on disk')
             return [], info
         thumbnail_filename = info['thumbnails'][idx]['filepath']
-        if not os.path.exists(encodeFilename(thumbnail_filename)):
+        if not os.path.exists(thumbnail_filename):
             self.report_warning('Skipping embedding the thumbnail because the file is missing.')
             return [], info
 
@@ -86,7 +84,7 @@ class EmbedThumbnailPP(FFmpegPostProcessor):
             thumbnail_filename = convertor.convert_thumbnail(thumbnail_filename, 'png')
             thumbnail_ext = 'png'
 
-        mtime = os.stat(encodeFilename(filename)).st_mtime
+        mtime = os.stat(filename).st_mtime
 
         success = True
         if info['ext'] == 'mp3':
@@ -104,12 +102,12 @@ class EmbedThumbnailPP(FFmpegPostProcessor):
             old_stream, new_stream = self.get_stream_number(
                 filename, ('tags', 'mimetype'), mimetype)
             if old_stream is not None:
-                options.extend(['-map', '-0:%d' % old_stream])
+                options.extend(['-map', f'-0:{old_stream}'])
                 new_stream -= 1
             options.extend([
                 '-attach', self._ffmpeg_filename_argument(thumbnail_filename),
-                '-metadata:s:%d' % new_stream, 'mimetype=%s' % mimetype,
-                '-metadata:s:%d' % new_stream, 'filename=cover.%s' % thumbnail_ext])
+                f'-metadata:s:{new_stream}', f'mimetype={mimetype}',
+                f'-metadata:s:{new_stream}', f'filename=cover.{thumbnail_ext}'])
 
             self._report_run('ffmpeg', filename)
             self.run_ffmpeg(filename, temp_filename, options)
@@ -120,19 +118,26 @@ class EmbedThumbnailPP(FFmpegPostProcessor):
             if not mutagen or prefer_atomicparsley:
                 success = False
             else:
+                self._report_run('mutagen', filename)
+                f = {'jpeg': MP4Cover.FORMAT_JPEG, 'png': MP4Cover.FORMAT_PNG}
                 try:
-                    self._report_run('mutagen', filename)
+                    with open(thumbnail_filename, 'rb') as thumbfile:
+                        thumb_data = thumbfile.read()
+
+                    type_ = imghdr.what(h=thumb_data)
+                    if not type_:
+                        raise ValueError('could not determine image type')
+                    elif type_ not in f:
+                        raise ValueError(f'incompatible image type: {type_}')
+
                     meta = MP4(filename)
                     # NOTE: the 'covr' atom is a non-standard MPEG-4 atom,
                     # Apple iTunes 'M4A' files include the 'moov.udta.meta.ilst' atom.
-                    f = {'jpeg': MP4Cover.FORMAT_JPEG, 'png': MP4Cover.FORMAT_PNG}[imghdr.what(thumbnail_filename)]
-                    with open(thumbnail_filename, 'rb') as thumbfile:
-                        thumb_data = thumbfile.read()
-                    meta.tags['covr'] = [MP4Cover(data=thumb_data, imageformat=f)]
+                    meta.tags['covr'] = [MP4Cover(data=thumb_data, imageformat=f[type_])]
                     meta.save()
                     temp_filename = filename
                 except Exception as err:
-                    self.report_warning('unable to embed using mutagen; %s' % error_to_compat_str(err))
+                    self.report_warning(f'unable to embed using mutagen; {err}')
                     success = False
 
             # Method 2: Use AtomicParsley
@@ -148,22 +153,23 @@ class EmbedThumbnailPP(FFmpegPostProcessor):
                 else:
                     if not prefer_atomicparsley:
                         self.to_screen('mutagen was not found. Falling back to AtomicParsley')
-                    cmd = [encodeFilename(atomicparsley, True),
-                           encodeFilename(filename, True),
+                    cmd = [atomicparsley,
+                           filename,
                            encodeArgument('--artwork'),
-                           encodeFilename(thumbnail_filename, True),
+                           thumbnail_filename,
                            encodeArgument('-o'),
-                           encodeFilename(temp_filename, True)]
+                           temp_filename]
                     cmd += [encodeArgument(o) for o in self._configuration_args('AtomicParsley')]
 
                     self._report_run('atomicparsley', filename)
-                    self.write_debug('AtomicParsley command line: %s' % shell_quote(cmd))
+                    self.write_debug(f'AtomicParsley command line: {shell_quote(cmd)}')
                     stdout, stderr, returncode = Popen.run(cmd, text=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
                     if returncode:
                         self.report_warning(f'Unable to embed thumbnails using AtomicParsley; {stderr.strip()}')
+                        success = False
                     # for formats that don't support thumbnails (like 3gp) AtomicParsley
                     # won't create to the temporary file
-                    if 'No changes' in stdout:
+                    elif 'No changes' in stdout:
                         self.report_warning('The file format doesn\'t support embedding a thumbnail')
                         success = False
 
@@ -178,9 +184,9 @@ class EmbedThumbnailPP(FFmpegPostProcessor):
                     old_stream, new_stream = self.get_stream_number(
                         filename, ('disposition', 'attached_pic'), 1)
                     if old_stream is not None:
-                        options.extend(['-map', '-0:%d' % old_stream])
+                        options.extend(['-map', f'-0:{old_stream}'])
                         new_stream -= 1
-                    options.extend(['-disposition:%s' % new_stream, 'attached_pic'])
+                    options.extend([f'-disposition:{new_stream}', 'attached_pic'])
 
                     self._report_run('ffmpeg', filename)
                     self.run_ffmpeg_multiple_files([filename, thumbnail_filename], temp_filename, options)
@@ -190,13 +196,13 @@ class EmbedThumbnailPP(FFmpegPostProcessor):
 
         elif info['ext'] in ['ogg', 'opus', 'flac']:
             if not mutagen:
-                raise EmbedThumbnailPPError('module mutagen was not found. Please install using `python -m pip install mutagen`')
+                raise EmbedThumbnailPPError('module mutagen was not found. Please install using `python3 -m pip install mutagen`')
 
             self._report_run('mutagen', filename)
             f = {'opus': OggOpus, 'flac': FLAC, 'ogg': OggVorbis}[info['ext']](filename)
 
             pic = Picture()
-            pic.mime = 'image/%s' % imghdr.what(thumbnail_filename)
+            pic.mime = f'image/{imghdr.what(thumbnail_filename)}'
             with open(thumbnail_filename, 'rb') as thumbfile:
                 pic.data = thumbfile.read()
             pic.type = 3  # front cover
diff --git a/plugins/youtube_download/yt_dlp/postprocessor/exec.py b/plugins/youtube_download/yt_dlp/postprocessor/exec.py
index cfc8316..1f0a001 100644
--- a/plugins/youtube_download/yt_dlp/postprocessor/exec.py
+++ b/plugins/youtube_download/yt_dlp/postprocessor/exec.py
@@ -1,8 +1,5 @@
-import subprocess
-
 from .common import PostProcessor
-from ..compat import compat_shlex_quote
-from ..utils import PostProcessingError, encodeArgument, variadic
+from ..utils import Popen, PostProcessingError, shell_quote, variadic
 
 
 class ExecPP(PostProcessor):
@@ -21,16 +18,16 @@ class ExecPP(PostProcessor):
         if filepath:
             if '{}' not in cmd:
                 cmd += ' {}'
-            cmd = cmd.replace('{}', compat_shlex_quote(filepath))
+            cmd = cmd.replace('{}', shell_quote(filepath))
         return cmd
 
     def run(self, info):
         for tmpl in self.exec_cmd:
             cmd = self.parse_cmd(tmpl, info)
-            self.to_screen('Executing command: %s' % cmd)
-            retCode = subprocess.call(encodeArgument(cmd), shell=True)
-            if retCode != 0:
-                raise PostProcessingError('Command returned error code %d' % retCode)
+            self.to_screen(f'Executing command: {cmd}')
+            _, _, return_code = Popen.run(cmd, shell=True)
+            if return_code != 0:
+                raise PostProcessingError(f'Command returned error code {return_code}')
         return [], info
 
 
diff --git a/plugins/youtube_download/yt_dlp/postprocessor/ffmpeg.py b/plugins/youtube_download/yt_dlp/postprocessor/ffmpeg.py
index 323f430..59a49aa 100644
--- a/plugins/youtube_download/yt_dlp/postprocessor/ffmpeg.py
+++ b/plugins/youtube_download/yt_dlp/postprocessor/ffmpeg.py
@@ -1,5 +1,6 @@
 import collections
 import contextvars
+import functools
 import itertools
 import json
 import os
@@ -8,7 +9,7 @@ import subprocess
 import time
 
 from .common import PostProcessor
-from ..compat import functools, imghdr
+from ..compat import imghdr
 from ..utils import (
     MEDIA_EXTENSIONS,
     ISO639Utils,
@@ -20,7 +21,6 @@ from ..utils import (
     determine_ext,
     dfxp2srt,
     encodeArgument,
-    encodeFilename,
     filter_dict,
     float_or_none,
     is_outdated_version,
@@ -61,7 +61,7 @@ ACODECS = {
 
 
 def create_mapping_re(supported):
-    return re.compile(r'{0}(?:/{0})*$'.format(r'(?:\s*\w+\s*>)?\s*(?:%s)\s*' % '|'.join(supported)))
+    return re.compile(r'{0}(?:/{0})*$'.format(r'(?:\s*\w+\s*>)?\s*(?:{})\s*'.format('|'.join(supported))))
 
 
 def resolve_mapping(source, mapping):
@@ -119,7 +119,7 @@ class FFmpegPostProcessor(PostProcessor):
             filename = os.path.basename(location)
             basename = next((p for p in programs if p in filename), 'ffmpeg')
             dirname = os.path.dirname(os.path.abspath(location))
-            if basename in self._ffmpeg_to_avconv.keys():
+            if basename in self._ffmpeg_to_avconv:
                 self._prefer_ffmpeg = True
 
         paths = {p: os.path.join(dirname, p) for p in programs}
@@ -169,12 +169,12 @@ class FFmpegPostProcessor(PostProcessor):
 
     @functools.cached_property
     def basename(self):
-        self._version  # run property
+        _ = self._version  # run property
         return self.basename
 
     @functools.cached_property
     def probe_basename(self):
-        self._probe_version  # run property
+        _ = self._probe_version  # run property
         return self.probe_basename
 
     def _get_version(self, kind):
@@ -202,7 +202,7 @@ class FFmpegPostProcessor(PostProcessor):
 
     @property
     def available(self):
-        return self.basename is not None
+        return bool(self._ffmpeg_location.get()) or self.basename is not None
 
     @property
     def executable(self):
@@ -242,13 +242,13 @@ class FFmpegPostProcessor(PostProcessor):
         try:
             if self.probe_available:
                 cmd = [
-                    encodeFilename(self.probe_executable, True),
+                    self.probe_executable,
                     encodeArgument('-show_streams')]
             else:
                 cmd = [
-                    encodeFilename(self.executable, True),
+                    self.executable,
                     encodeArgument('-i')]
-            cmd.append(encodeFilename(self._ffmpeg_filename_argument(path), True))
+            cmd.append(self._ffmpeg_filename_argument(path))
             self.write_debug(f'{self.basename} command line: {shell_quote(cmd)}')
             stdout, stderr, returncode = Popen.run(
                 cmd, text=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -281,7 +281,7 @@ class FFmpegPostProcessor(PostProcessor):
         self.check_version()
 
         cmd = [
-            encodeFilename(self.probe_executable, True),
+            self.probe_executable,
             encodeArgument('-hide_banner'),
             encodeArgument('-show_format'),
             encodeArgument('-show_streams'),
@@ -334,15 +334,15 @@ class FFmpegPostProcessor(PostProcessor):
         self.check_version()
 
         oldest_mtime = min(
-            os.stat(encodeFilename(path)).st_mtime for path, _ in input_path_opts if path)
+            os.stat(path).st_mtime for path, _ in input_path_opts if path)
 
-        cmd = [encodeFilename(self.executable, True), encodeArgument('-y')]
+        cmd = [self.executable, encodeArgument('-y')]
         # avconv does not have repeat option
         if self.basename == 'ffmpeg':
             cmd += [encodeArgument('-loglevel'), encodeArgument('repeat+info')]
 
         def make_args(file, args, name, number):
-            keys = ['_%s%d' % (name, number), '_%s' % name]
+            keys = [f'_{name}{number}', f'_{name}']
             if name == 'o':
                 args += ['-movflags', '+faststart']
                 if number == 1:
@@ -352,14 +352,14 @@ class FFmpegPostProcessor(PostProcessor):
                 args.append('-i')
             return (
                 [encodeArgument(arg) for arg in args]
-                + [encodeFilename(self._ffmpeg_filename_argument(file), True)])
+                + [self._ffmpeg_filename_argument(file)])
 
         for arg_type, path_opts in (('i', input_path_opts), ('o', output_path_opts)):
             cmd += itertools.chain.from_iterable(
                 make_args(path, list(opts), arg_type, i + 1)
                 for i, (path, opts) in enumerate(path_opts) if path)
 
-        self.write_debug('ffmpeg command line: %s' % shell_quote(cmd))
+        self.write_debug(f'ffmpeg command line: {shell_quote(cmd)}')
         _, stderr, returncode = Popen.run(
             cmd, text=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE)
         if returncode not in variadic(expected_retcodes):
@@ -437,7 +437,7 @@ class FFmpegPostProcessor(PostProcessor):
 
 
 class FFmpegExtractAudioPP(FFmpegPostProcessor):
-    COMMON_AUDIO_EXTS = MEDIA_EXTENSIONS.common_audio + ('wma', )
+    COMMON_AUDIO_EXTS = (*MEDIA_EXTENSIONS.common_audio, 'wma')
     SUPPORTED_EXTS = tuple(ACODECS.keys())
     FORMAT_RE = create_mapping_re(('best', *SUPPORTED_EXTS))
 
@@ -474,7 +474,7 @@ class FFmpegExtractAudioPP(FFmpegPostProcessor):
             acodec_opts = []
         else:
             acodec_opts = ['-acodec', codec]
-        opts = ['-vn'] + acodec_opts + more_opts
+        opts = ['-vn', *acodec_opts, *more_opts]
         try:
             FFmpegPostProcessor.run_ffmpeg(self, path, out_path, opts)
         except FFmpegPostProcessorError as err:
@@ -521,9 +521,9 @@ class FFmpegExtractAudioPP(FFmpegPostProcessor):
                 return [], information
             orig_path = prepend_extension(path, 'orig')
             temp_path = prepend_extension(path, 'temp')
-        if (self._nopostoverwrites and os.path.exists(encodeFilename(new_path))
-                and os.path.exists(encodeFilename(orig_path))):
-            self.to_screen('Post-process file %s exists, skipping' % new_path)
+        if (self._nopostoverwrites and os.path.exists(new_path)
+                and os.path.exists(orig_path)):
+            self.to_screen(f'Post-process file {new_path} exists, skipping')
             return [], information
 
         self.to_screen(f'Destination: {new_path}')
@@ -626,7 +626,7 @@ class FFmpegEmbedSubtitlePP(FFmpegPostProcessor):
             sub_ext = sub_info['ext']
             if sub_ext == 'json':
                 self.report_warning('JSON subtitles cannot be embedded')
-            elif ext != 'webm' or ext == 'webm' and sub_ext == 'vtt':
+            elif ext != 'webm' or (ext == 'webm' and sub_ext == 'vtt'):
                 sub_langs.append(lang)
                 sub_names.append(sub_info.get('name'))
                 sub_filenames.append(sub_info['filepath'])
@@ -641,7 +641,7 @@ class FFmpegEmbedSubtitlePP(FFmpegPostProcessor):
         if not sub_langs:
             return [], info
 
-        input_files = [filename] + sub_filenames
+        input_files = [filename, *sub_filenames]
 
         opts = [
             *self.stream_copy_opts(ext=info['ext']),
@@ -650,15 +650,15 @@ class FFmpegEmbedSubtitlePP(FFmpegPostProcessor):
             '-map', '-0:s',
         ]
         for i, (lang, name) in enumerate(zip(sub_langs, sub_names)):
-            opts.extend(['-map', '%d:0' % (i + 1)])
+            opts.extend(['-map', f'{i + 1}:0'])
             lang_code = ISO639Utils.short2long(lang) or lang
-            opts.extend(['-metadata:s:s:%d' % i, 'language=%s' % lang_code])
+            opts.extend([f'-metadata:s:s:{i}', f'language={lang_code}'])
             if name:
-                opts.extend(['-metadata:s:s:%d' % i, 'handler_name=%s' % name,
-                             '-metadata:s:s:%d' % i, 'title=%s' % name])
+                opts.extend([f'-metadata:s:s:{i}', f'handler_name={name}',
+                             f'-metadata:s:s:{i}', f'title={name}'])
 
         temp_filename = prepend_extension(filename, 'temp')
-        self.to_screen('Embedding subtitles in "%s"' % filename)
+        self.to_screen(f'Embedding subtitles in "{filename}"')
         self.run_ffmpeg_multiple_files(input_files, temp_filename, opts)
         os.replace(temp_filename, filename)
 
@@ -707,7 +707,7 @@ class FFmpegMetadataPP(FFmpegPostProcessor):
             return [], info
 
         temp_filename = prepend_extension(filename, 'temp')
-        self.to_screen('Adding metadata to "%s"' % filename)
+        self.to_screen(f'Adding metadata to "{filename}"')
         self.run_ffmpeg_multiple_files(
             (filename, metadata_filename), temp_filename,
             itertools.chain(self._options(info['ext']), *options))
@@ -728,7 +728,7 @@ class FFmpegMetadataPP(FFmpegPostProcessor):
                 metadata_file_content += 'END=%d\n' % (chapter['end_time'] * 1000)
                 chapter_title = chapter.get('title')
                 if chapter_title:
-                    metadata_file_content += 'title=%s\n' % ffmpeg_escape(chapter_title)
+                    metadata_file_content += f'title={ffmpeg_escape(chapter_title)}\n'
             f.write(metadata_file_content)
         yield ('-map_metadata', '1')
 
@@ -738,11 +738,12 @@ class FFmpegMetadataPP(FFmpegPostProcessor):
 
         def add(meta_list, info_list=None):
             value = next((
-                str(info[key]) for key in [f'{meta_prefix}_'] + list(variadic(info_list or meta_list))
+                info[key] for key in [f'{meta_prefix}_', *variadic(info_list or meta_list)]
                 if info.get(key) is not None), None)
             if value not in ('', None):
+                value = ', '.join(map(str, variadic(value)))
                 value = value.replace('\0', '')  # nul character cannot be passed in command line
-                metadata['common'].update({meta_f: value for meta_f in variadic(meta_list)})
+                metadata['common'].update(dict.fromkeys(variadic(meta_list), value))
 
         # Info on media metadata/metadata supported by ffmpeg:
         # https://wiki.multimedia.cx/index.php/FFmpeg_Metadata
@@ -754,10 +755,11 @@ class FFmpegMetadataPP(FFmpegPostProcessor):
         add(('description', 'synopsis'), 'description')
         add(('purl', 'comment'), 'webpage_url')
         add('track', 'track_number')
-        add('artist', ('artist', 'creator', 'uploader', 'uploader_id'))
-        add('genre')
+        add('artist', ('artist', 'artists', 'creator', 'creators', 'uploader', 'uploader_id'))
+        add('composer', ('composer', 'composers'))
+        add('genre', ('genre', 'genres'))
         add('album')
-        add('album_artist')
+        add('album_artist', ('album_artist', 'album_artists'))
         add('disc', 'disc_number')
         add('show', 'series')
         add('season_number')
@@ -780,7 +782,7 @@ class FFmpegMetadataPP(FFmpegPostProcessor):
             yield ('-metadata', f'{name}={value}')
 
         stream_idx = 0
-        for fmt in info.get('requested_formats') or []:
+        for fmt in info.get('requested_formats') or [info]:
             stream_count = 2 if 'none' not in (fmt.get('vcodec'), fmt.get('acodec')) else 1
             lang = ISO639Utils.short2long(fmt.get('language') or '') or fmt.get('language')
             for i in range(stream_idx, stream_idx + stream_count):
@@ -805,7 +807,7 @@ class FFmpegMetadataPP(FFmpegPostProcessor):
 
         old_stream, new_stream = self.get_stream_number(info['filepath'], ('tags', 'mimetype'), 'application/json')
         if old_stream is not None:
-            yield ('-map', '-0:%d' % old_stream)
+            yield ('-map', f'-0:{old_stream}')
             new_stream -= 1
 
         yield (
@@ -832,10 +834,10 @@ class FFmpegMergerPP(FFmpegPostProcessor):
                     args.extend([f'-bsf:a:{audio_streams}', 'aac_adtstoasc'])
                 audio_streams += 1
             if fmt.get('vcodec') != 'none':
-                args.extend(['-map', '%u:v:0' % (i)])
-        self.to_screen('Merging formats into "%s"' % filename)
+                args.extend(['-map', f'{i}:v:0'])
+        self.to_screen(f'Merging formats into "{filename}"')
         self.run_ffmpeg_multiple_files(info['__files_to_merge'], temp_filename, args)
-        os.rename(encodeFilename(temp_filename), encodeFilename(filename))
+        os.rename(temp_filename, filename)
         return info['__files_to_merge'], info
 
     def can_merge(self):
@@ -846,10 +848,9 @@ class FFmpegMergerPP(FFmpegPostProcessor):
         required_version = '10-0'
         if is_outdated_version(
                 self._versions[self.basename], required_version):
-            warning = ('Your copy of %s is outdated and unable to properly mux separate video and audio files, '
+            warning = (f'Your copy of {self.basename} is outdated and unable to properly mux separate video and audio files, '
                        'yt-dlp will download single file media. '
-                       'Update %s to version %s or newer to fix this.') % (
-                           self.basename, self.basename, required_version)
+                       f'Update {self.basename} to version {required_version} or newer to fix this.')
             self.report_warning(warning)
             return False
         return True
@@ -871,7 +872,7 @@ class FFmpegFixupStretchedPP(FFmpegFixupPostProcessor):
         stretched_ratio = info.get('stretched_ratio')
         if stretched_ratio not in (None, 1):
             self._fixup('Fixing aspect ratio', info['filepath'], [
-                *self.stream_copy_opts(), '-aspect', '%f' % stretched_ratio])
+                *self.stream_copy_opts(), '-aspect', f'{stretched_ratio:f}'])
         return [], info
 
 
@@ -923,7 +924,7 @@ class FFmpegFixupTimestampPP(FFmpegFixupPostProcessor):
             opts = ['-vf', 'setpts=PTS-STARTPTS']
         else:
             opts = ['-c', 'copy', '-bsf', 'setts=ts=TS-STARTPTS']
-        self._fixup('Fixing frame timestamp', info['filepath'], opts + [*self.stream_copy_opts(False), '-ss', self.trim])
+        self._fixup('Fixing frame timestamp', info['filepath'], [*opts, *self.stream_copy_opts(False), '-ss', self.trim])
         return [], info
 
 
@@ -968,7 +969,7 @@ class FFmpegSubtitlesConvertorPP(FFmpegPostProcessor):
                 continue
             ext = sub['ext']
             if ext == new_ext:
-                self.to_screen('Subtitle file for %s is already in the requested format' % new_ext)
+                self.to_screen(f'Subtitle file for {new_ext} is already in the requested format')
                 continue
             elif ext == 'json':
                 self.to_screen(
@@ -1037,7 +1038,7 @@ class FFmpegSplitChaptersPP(FFmpegPostProcessor):
 
     def _ffmpeg_args_for_chapter(self, number, chapter, info):
         destination = self._prepare_filename(number, chapter, info)
-        if not self._downloader._ensure_dir_exists(encodeFilename(destination)):
+        if not self._downloader._ensure_dir_exists(destination):
             return
 
         chapter['filepath'] = destination
@@ -1058,7 +1059,7 @@ class FFmpegSplitChaptersPP(FFmpegPostProcessor):
         in_file = info['filepath']
         if self._force_keyframes and len(chapters) > 1:
             in_file = self.force_keyframes(in_file, (c['start_time'] for c in chapters))
-        self.to_screen('Splitting video by chapters; %d chapters found' % len(chapters))
+        self.to_screen(f'Splitting video by chapters; {len(chapters)} chapters found')
         for idx, chapter in enumerate(chapters):
             destination, opts = self._ffmpeg_args_for_chapter(idx + 1, chapter, info)
             self.real_run_ffmpeg([(in_file, opts)], [(destination, self.stream_copy_opts())])
@@ -1085,7 +1086,7 @@ class FFmpegThumbnailsConvertorPP(FFmpegPostProcessor):
         _, thumbnail_ext = os.path.splitext(thumbnail_filename)
         if thumbnail_ext:
             if thumbnail_ext.lower() != '.webp' and imghdr.what(thumbnail_filename) == 'webp':
-                self.to_screen('Correcting thumbnail "%s" extension to webp' % thumbnail_filename)
+                self.to_screen(f'Correcting thumbnail "{thumbnail_filename}" extension to webp')
                 webp_filename = replace_extension(thumbnail_filename, 'webp')
                 os.replace(thumbnail_filename, webp_filename)
                 info['thumbnails'][idx]['filepath'] = webp_filename
diff --git a/plugins/youtube_download/yt_dlp/postprocessor/modify_chapters.py b/plugins/youtube_download/yt_dlp/postprocessor/modify_chapters.py
index f521986..d82685e 100644
--- a/plugins/youtube_download/yt_dlp/postprocessor/modify_chapters.py
+++ b/plugins/youtube_download/yt_dlp/postprocessor/modify_chapters.py
@@ -54,7 +54,7 @@ class ModifyChaptersPP(FFmpegPostProcessor):
                 self.write_debug('Expected and actual durations mismatch')
 
         concat_opts = self._make_concat_opts(cuts, real_duration)
-        self.write_debug('Concat spec = %s' % ', '.join(f'{c.get("inpoint", 0.0)}-{c.get("outpoint", "inf")}' for c in concat_opts))
+        self.write_debug('Concat spec = {}'.format(', '.join(f'{c.get("inpoint", 0.0)}-{c.get("outpoint", "inf")}' for c in concat_opts)))
 
         def remove_chapters(file, is_sub):
             return file, self.remove_chapters(file, cuts, concat_opts, self._force_keyframes and not is_sub)
diff --git a/plugins/youtube_download/yt_dlp/postprocessor/movefilesafterdownload.py b/plugins/youtube_download/yt_dlp/postprocessor/movefilesafterdownload.py
index 23b0924..964ca1f 100644
--- a/plugins/youtube_download/yt_dlp/postprocessor/movefilesafterdownload.py
+++ b/plugins/youtube_download/yt_dlp/postprocessor/movefilesafterdownload.py
@@ -4,8 +4,6 @@ from .common import PostProcessor
 from ..compat import shutil
 from ..utils import (
     PostProcessingError,
-    decodeFilename,
-    encodeFilename,
     make_dir,
 )
 
@@ -21,29 +19,28 @@ class MoveFilesAfterDownloadPP(PostProcessor):
         return 'MoveFiles'
 
     def run(self, info):
-        dl_path, dl_name = os.path.split(encodeFilename(info['filepath']))
+        dl_path, dl_name = os.path.split(info['filepath'])
         finaldir = info.get('__finaldir', dl_path)
         finalpath = os.path.join(finaldir, dl_name)
         if self._downloaded:
-            info['__files_to_move'][info['filepath']] = decodeFilename(finalpath)
+            info['__files_to_move'][info['filepath']] = finalpath
 
-        make_newfilename = lambda old: decodeFilename(os.path.join(finaldir, os.path.basename(encodeFilename(old))))
+        make_newfilename = lambda old: os.path.join(finaldir, os.path.basename(old))
         for oldfile, newfile in info['__files_to_move'].items():
             if not newfile:
                 newfile = make_newfilename(oldfile)
-            if os.path.abspath(encodeFilename(oldfile)) == os.path.abspath(encodeFilename(newfile)):
+            if os.path.abspath(oldfile) == os.path.abspath(newfile):
                 continue
-            if not os.path.exists(encodeFilename(oldfile)):
-                self.report_warning('File "%s" cannot be found' % oldfile)
+            if not os.path.exists(oldfile):
+                self.report_warning(f'File "{oldfile}" cannot be found')
                 continue
-            if os.path.exists(encodeFilename(newfile)):
+            if os.path.exists(newfile):
                 if self.get_param('overwrites', True):
-                    self.report_warning('Replacing existing file "%s"' % newfile)
-                    os.remove(encodeFilename(newfile))
+                    self.report_warning(f'Replacing existing file "{newfile}"')
+                    os.remove(newfile)
                 else:
                     self.report_warning(
-                        'Cannot move file "%s" out of temporary directory since "%s" already exists. '
-                        % (oldfile, newfile))
+                        f'Cannot move file "{oldfile}" out of temporary directory since "{newfile}" already exists. ')
                     continue
             make_dir(newfile, PostProcessingError)
             self.to_screen(f'Moving file "{oldfile}" to "{newfile}"')
diff --git a/plugins/youtube_download/yt_dlp/postprocessor/sponskrub.py b/plugins/youtube_download/yt_dlp/postprocessor/sponskrub.py
index ff50d5b..ac6db1b 100644
--- a/plugins/youtube_download/yt_dlp/postprocessor/sponskrub.py
+++ b/plugins/youtube_download/yt_dlp/postprocessor/sponskrub.py
@@ -9,7 +9,6 @@ from ..utils import (
     check_executable,
     cli_option,
     encodeArgument,
-    encodeFilename,
     prepend_extension,
     shell_quote,
     str_or_none,
@@ -35,7 +34,7 @@ class SponSkrubPP(PostProcessor):
 
         if not ignoreerror and self.path is None:
             if path:
-                raise PostProcessingError('sponskrub not found in "%s"' % path)
+                raise PostProcessingError(f'sponskrub not found in "{path}"')
             else:
                 raise PostProcessingError('sponskrub not found. Please install or provide the path using --sponskrub-path')
 
@@ -52,7 +51,7 @@ class SponSkrubPP(PostProcessor):
             return [], information
 
         filename = information['filepath']
-        if not os.path.exists(encodeFilename(filename)):  # no download
+        if not os.path.exists(filename):  # no download
             return [], information
 
         if information['extractor_key'].lower() != 'youtube':
@@ -71,8 +70,8 @@ class SponSkrubPP(PostProcessor):
                 self.report_warning('If sponskrub is run multiple times, unintended parts of the video could be cut out.')
 
         temp_filename = prepend_extension(filename, self._temp_ext)
-        if os.path.exists(encodeFilename(temp_filename)):
-            os.remove(encodeFilename(temp_filename))
+        if os.path.exists(temp_filename):
+            os.remove(temp_filename)
 
         cmd = [self.path]
         if not self.cutout:
@@ -83,7 +82,7 @@ class SponSkrubPP(PostProcessor):
         cmd += ['--', information['id'], filename, temp_filename]
         cmd = [encodeArgument(i) for i in cmd]
 
-        self.write_debug('sponskrub command line: %s' % shell_quote(cmd))
+        self.write_debug(f'sponskrub command line: {shell_quote(cmd)}')
         stdout, _, returncode = Popen.run(cmd, text=True, stdout=None if self.get_param('verbose') else subprocess.PIPE)
 
         if not returncode:
diff --git a/plugins/youtube_download/yt_dlp/postprocessor/sponsorblock.py b/plugins/youtube_download/yt_dlp/postprocessor/sponsorblock.py
index 6ba87cd..b3fc8b5 100644
--- a/plugins/youtube_download/yt_dlp/postprocessor/sponsorblock.py
+++ b/plugins/youtube_download/yt_dlp/postprocessor/sponsorblock.py
@@ -27,13 +27,13 @@ class SponsorBlockPP(FFmpegPostProcessor):
         'filler': 'Filler Tangent',
         'interaction': 'Interaction Reminder',
         'music_offtopic': 'Non-Music Section',
-        **NON_SKIPPABLE_CATEGORIES
+        **NON_SKIPPABLE_CATEGORIES,
     }
 
     def __init__(self, downloader, categories=None, api='https://sponsor.ajay.app'):
         FFmpegPostProcessor.__init__(self, downloader)
         self._categories = tuple(categories or self.CATEGORIES.keys())
-        self._API_URL = api if re.match('^https?://', api) else 'https://' + api
+        self._API_URL = api if re.match('https?://', api) else 'https://' + api
 
     def run(self, info):
         extractor = info['extractor_key']
@@ -57,7 +57,7 @@ class SponsorBlockPP(FFmpegPostProcessor):
             if start_end[0] <= 1:
                 start_end[0] = 0
             # Make POI chapters 1 sec so that we can properly mark them
-            if s['category'] in self.POI_CATEGORIES.keys():
+            if s['category'] in self.POI_CATEGORIES:
                 start_end[1] += 1
             # Ignore milliseconds difference at the end.
             # Never allow the segment to exceed the video.
@@ -91,12 +91,12 @@ class SponsorBlockPP(FFmpegPostProcessor):
         return sponsor_chapters
 
     def _get_sponsor_segments(self, video_id, service):
-        hash = hashlib.sha256(video_id.encode('ascii')).hexdigest()
+        video_hash = hashlib.sha256(video_id.encode('ascii')).hexdigest()
         # SponsorBlock API recommends using first 4 hash characters.
-        url = f'{self._API_URL}/api/skipSegments/{hash[:4]}?' + urllib.parse.urlencode({
+        url = f'{self._API_URL}/api/skipSegments/{video_hash[:4]}?' + urllib.parse.urlencode({
             'service': service,
             'categories': json.dumps(self._categories),
-            'actionTypes': json.dumps(['skip', 'poi', 'chapter'])
+            'actionTypes': json.dumps(['skip', 'poi', 'chapter']),
         })
         for d in self._download_json(url) or []:
             if d['videoID'] == video_id:
diff --git a/plugins/youtube_download/yt_dlp/postprocessor/xattrpp.py b/plugins/youtube_download/yt_dlp/postprocessor/xattrpp.py
index f822eff..e486b79 100644
--- a/plugins/youtube_download/yt_dlp/postprocessor/xattrpp.py
+++ b/plugins/youtube_download/yt_dlp/postprocessor/xattrpp.py
@@ -1,7 +1,6 @@
 import os
 
 from .common import PostProcessor
-from ..compat import compat_os_name
 from ..utils import (
     PostProcessingError,
     XAttrMetadataError,
@@ -26,38 +25,40 @@ class XAttrMetadataPP(PostProcessor):
 
     XATTR_MAPPING = {
         'user.xdg.referrer.url': 'webpage_url',
-        # 'user.xdg.comment': 'description',
         'user.dublincore.title': 'title',
         'user.dublincore.date': 'upload_date',
-        'user.dublincore.description': 'description',
         'user.dublincore.contributor': 'uploader',
         'user.dublincore.format': 'format',
+        # We do this last because it may get us close to the xattr limits
+        # (e.g., 4kB on ext4), and we don't want to have the other ones fail
+        'user.dublincore.description': 'description',
+        # 'user.xdg.comment': 'description',
     }
 
     def run(self, info):
         mtime = os.stat(info['filepath']).st_mtime
         self.to_screen('Writing metadata to file\'s xattrs')
-        try:
-            for xattrname, infoname in self.XATTR_MAPPING.items():
+        for xattrname, infoname in self.XATTR_MAPPING.items():
+            try:
                 value = info.get(infoname)
                 if value:
                     if infoname == 'upload_date':
                         value = hyphenate_date(value)
                     write_xattr(info['filepath'], xattrname, value.encode())
 
-        except XAttrUnavailableError as e:
-            raise PostProcessingError(str(e))
-        except XAttrMetadataError as e:
-            if e.reason == 'NO_SPACE':
-                self.report_warning(
-                    'There\'s no disk space left, disk quota exceeded or filesystem xattr limit exceeded. '
-                    'Some extended attributes are not written')
-            elif e.reason == 'VALUE_TOO_LONG':
-                self.report_warning('Unable to write extended attributes due to too long values.')
-            else:
-                tip = ('You need to use NTFS' if compat_os_name == 'nt'
-                       else 'You may have to enable them in your "/etc/fstab"')
-                raise PostProcessingError(f'This filesystem doesn\'t support extended attributes. {tip}')
+            except XAttrUnavailableError as e:
+                raise PostProcessingError(str(e))
+            except XAttrMetadataError as e:
+                if e.reason == 'NO_SPACE':
+                    self.report_warning(
+                        'There\'s no disk space left, disk quota exceeded or filesystem xattr limit exceeded. '
+                        f'Extended attribute "{xattrname}" was not written.')
+                elif e.reason == 'VALUE_TOO_LONG':
+                    self.report_warning(f'Unable to write extended attribute "{xattrname}" due to too long values.')
+                else:
+                    tip = ('You need to use NTFS' if os.name == 'nt'
+                           else 'You may have to enable them in your "/etc/fstab"')
+                    raise PostProcessingError(f'This filesystem doesn\'t support extended attributes. {tip}')
 
         self.try_utime(info['filepath'], mtime, mtime)
         return [], info
diff --git a/plugins/youtube_download/yt_dlp/socks.py b/plugins/youtube_download/yt_dlp/socks.py
index f93328f..e553a5f 100644
--- a/plugins/youtube_download/yt_dlp/socks.py
+++ b/plugins/youtube_download/yt_dlp/socks.py
@@ -49,7 +49,7 @@ class Socks5AddressType:
     ATYP_IPV6 = 0x04
 
 
-class ProxyError(socket.error):
+class ProxyError(OSError):
     ERR_SUCCESS = 0x00
 
     def __init__(self, code=None, msg=None):
@@ -60,8 +60,8 @@ class ProxyError(socket.error):
 
 class InvalidVersionError(ProxyError):
     def __init__(self, expected_version, got_version):
-        msg = ('Invalid response version from server. Expected {:02x} got '
-               '{:02x}'.format(expected_version, got_version))
+        msg = (f'Invalid response version from server. Expected {expected_version:02x} got '
+               f'{got_version:02x}')
         super().__init__(0, msg)
 
 
@@ -71,7 +71,7 @@ class Socks4Error(ProxyError):
     CODES = {
         91: 'request rejected or failed',
         92: 'request rejected because SOCKS server cannot connect to identd on the client',
-        93: 'request rejected because the client program and identd report different user-ids'
+        93: 'request rejected because the client program and identd report different user-ids',
     }
 
 
@@ -88,7 +88,7 @@ class Socks5Error(ProxyError):
         0x07: 'Command not supported',
         0x08: 'Address type not supported',
         0xFE: 'unknown username or invalid password',
-        0xFF: 'all offered authentication methods were rejected'
+        0xFF: 'all offered authentication methods were rejected',
     }
 
 
@@ -134,26 +134,31 @@ class sockssocket(socket.socket):
             self.close()
             raise InvalidVersionError(expected_version, got_version)
 
-    def _resolve_address(self, destaddr, default, use_remote_dns):
-        try:
-            return socket.inet_aton(destaddr)
-        except OSError:
-            if use_remote_dns and self._proxy.remote_dns:
-                return default
-            else:
-                return socket.inet_aton(socket.gethostbyname(destaddr))
+    def _resolve_address(self, destaddr, default, use_remote_dns, family=None):
+        for f in (family,) if family else (socket.AF_INET, socket.AF_INET6):
+            try:
+                return f, socket.inet_pton(f, destaddr)
+            except OSError:
+                continue
+
+        if use_remote_dns and self._proxy.remote_dns:
+            return 0, default
+        else:
+            res = socket.getaddrinfo(destaddr, None, family=family or 0)
+            f, _, _, _, ipaddr = res[0]
+            return f, socket.inet_pton(f, ipaddr[0])
 
     def _setup_socks4(self, address, is_4a=False):
         destaddr, port = address
 
-        ipaddr = self._resolve_address(destaddr, SOCKS4_DEFAULT_DSTIP, use_remote_dns=is_4a)
+        _, ipaddr = self._resolve_address(destaddr, SOCKS4_DEFAULT_DSTIP, use_remote_dns=is_4a, family=socket.AF_INET)
 
         packet = struct.pack('!BBH', SOCKS4_VERSION, Socks4Command.CMD_CONNECT, port) + ipaddr
 
         username = (self._proxy.username or '').encode()
         packet += username + b'\x00'
 
-        if is_4a and self._proxy.remote_dns:
+        if is_4a and self._proxy.remote_dns and ipaddr == SOCKS4_DEFAULT_DSTIP:
             packet += destaddr.encode() + b'\x00'
 
         self.sendall(packet)
@@ -210,7 +215,7 @@ class sockssocket(socket.socket):
     def _setup_socks5(self, address):
         destaddr, port = address
 
-        ipaddr = self._resolve_address(destaddr, None, use_remote_dns=True)
+        family, ipaddr = self._resolve_address(destaddr, None, use_remote_dns=True)
 
         self._socks5_auth()
 
@@ -220,8 +225,10 @@ class sockssocket(socket.socket):
             destaddr = destaddr.encode()
             packet += struct.pack('!B', Socks5AddressType.ATYP_DOMAINNAME)
             packet += self._len_and_data(destaddr)
-        else:
+        elif family == socket.AF_INET:
             packet += struct.pack('!B', Socks5AddressType.ATYP_IPV4) + ipaddr
+        elif family == socket.AF_INET6:
+            packet += struct.pack('!B', Socks5AddressType.ATYP_IPV6) + ipaddr
         packet += struct.pack('!H', port)
 
         self.sendall(packet)
diff --git a/plugins/youtube_download/yt_dlp/update.py b/plugins/youtube_download/yt_dlp/update.py
index d708b09..de289cb 100644
--- a/plugins/youtube_download/yt_dlp/update.py
+++ b/plugins/youtube_download/yt_dlp/update.py
@@ -1,5 +1,8 @@
+from __future__ import annotations
+
 import atexit
 import contextlib
+import functools
 import hashlib
 import json
 import os
@@ -7,31 +10,41 @@ import platform
 import re
 import subprocess
 import sys
+from dataclasses import dataclass
 from zipimport import zipimporter
 
-from .compat import functools  # isort: split
-from .compat import compat_realpath, compat_shlex_quote
 from .networking import Request
 from .networking.exceptions import HTTPError, network_exceptions
 from .utils import (
+    NO_DEFAULT,
     Popen,
-    cached_method,
     deprecation_warning,
+    format_field,
     remove_end,
-    remove_start,
     shell_quote,
     system_identifier,
     version_tuple,
 )
-from .version import CHANNEL, UPDATE_HINT, VARIANT, __version__
+from .version import (
+    CHANNEL,
+    ORIGIN,
+    RELEASE_GIT_HEAD,
+    UPDATE_HINT,
+    VARIANT,
+    __version__,
+)
 
 UPDATE_SOURCES = {
     'stable': 'yt-dlp/yt-dlp',
     'nightly': 'yt-dlp/yt-dlp-nightly-builds',
+    'master': 'yt-dlp/yt-dlp-master-builds',
 }
 REPOSITORY = UPDATE_SOURCES['stable']
+_INVERSE_UPDATE_SOURCES = {value: key for key, value in UPDATE_SOURCES.items()}
 
 _VERSION_RE = re.compile(r'(\d+\.)*\d+')
+_HASH_PATTERN = r'[\da-f]{40}'
+_COMMIT_RE = re.compile(rf'Generated from: https://(?:[^/?#]+/){{3}}commit/(?P<hash>{_HASH_PATTERN})')
 
 API_BASE_URL = 'https://api.github.com/repos'
 
@@ -52,9 +65,18 @@ def _get_variant_and_executable_path():
             machine = '_legacy' if version_tuple(platform.mac_ver()[0]) < (10, 15) else ''
         else:
             machine = f'_{platform.machine().lower()}'
+            is_64bits = sys.maxsize > 2**32
             # Ref: https://en.wikipedia.org/wiki/Uname#Examples
             if machine[1:] in ('x86', 'x86_64', 'amd64', 'i386', 'i686'):
-                machine = '_x86' if platform.architecture()[0][:2] == '32' else ''
+                machine = '_x86' if not is_64bits else ''
+            # platform.machine() on 32-bit raspbian OS may return 'aarch64', so check "64-bitness"
+            # See: https://github.com/yt-dlp/yt-dlp/issues/11813
+            elif machine[1:] == 'aarch64' and not is_64bits:
+                machine = '_armv7l'
+            # sys.executable returns a /tmp/ path for staticx builds (linux_static)
+            # Ref: https://staticx.readthedocs.io/en/latest/usage.html#run-time-information
+            if static_exe_path := os.getenv('STATICX_PROG_PATH'):
+                path = static_exe_path
         return f'{remove_end(sys.platform, "32")}{machine}_exe', path
 
     path = os.path.dirname(__file__)
@@ -85,7 +107,6 @@ def current_git_head():
 
 _FILE_SUFFIXES = {
     'zip': '',
-    'py2exe': '_min.exe',
     'win_exe': '.exe',
     'win_x86_exe': '_x86.exe',
     'darwin_exe': '_macos',
@@ -96,11 +117,12 @@ _FILE_SUFFIXES = {
 }
 
 _NON_UPDATEABLE_REASONS = {
-    **{variant: None for variant in _FILE_SUFFIXES},  # Updatable
+    **dict.fromkeys(_FILE_SUFFIXES),  # Updatable
     **{variant: f'Auto-update is not supported for unpackaged {name} executable; Re-download the latest release'
        for variant, name in {'win32_dir': 'Windows', 'darwin_dir': 'MacOS', 'linux_dir': 'Linux'}.items()},
+    'py2exe': 'py2exe is no longer supported by yt-dlp; This executable cannot be updated',
     'source': 'You cannot update when running from source code; Use git to pull the latest changes',
-    'unknown': 'You installed yt-dlp with a package manager or setup.py; Use that to update',
+    'unknown': 'You installed yt-dlp from a manual build or with a package manager; Use that to update',
     'other': 'You are using an unofficial build of yt-dlp; Build the executable again',
 }
 
@@ -112,6 +134,25 @@ def is_non_updateable():
         detect_variant(), _NON_UPDATEABLE_REASONS['unknown' if VARIANT else 'other'])
 
 
+def _get_binary_name():
+    return format_field(_FILE_SUFFIXES, detect_variant(), template='yt-dlp%s', ignore=None, default=None)
+
+
+def _get_system_deprecation():
+    MIN_SUPPORTED, MIN_RECOMMENDED = (3, 9), (3, 9)
+
+    if sys.version_info > MIN_RECOMMENDED:
+        return None
+
+    major, minor = sys.version_info[:2]
+    PYTHON_MSG = f'Please update to Python {".".join(map(str, MIN_RECOMMENDED))} or above'
+
+    if sys.version_info < MIN_SUPPORTED:
+        return f'Python version {major}.{minor} is no longer supported! {PYTHON_MSG}'
+
+    return f'Support for Python version {major}.{minor} has been deprecated. {PYTHON_MSG}'
+
+
 def _sha256_file(path):
     h = hashlib.sha256()
     mv = memoryview(bytearray(128 * 1024))
@@ -121,73 +162,116 @@ def _sha256_file(path):
     return h.hexdigest()
 
 
+def _make_label(origin, tag, version=None):
+    if '/' in origin:
+        channel = _INVERSE_UPDATE_SOURCES.get(origin, origin)
+    else:
+        channel = origin
+    label = f'{channel}@{tag}'
+    if version and version != tag:
+        label += f' build {version}'
+    if channel != origin:
+        label += f' from {origin}'
+    return label
+
+
+@dataclass
+class UpdateInfo:
+    """
+    Update target information
+
+    Can be created by `query_update()` or manually.
+
+    Attributes:
+        tag                 The release tag that will be updated to. If from query_update,
+                            the value is after API resolution and update spec processing.
+                            The only property that is required.
+        version             The actual numeric version (if available) of the binary to be updated to,
+                            after API resolution and update spec processing. (default: None)
+        requested_version   Numeric version of the binary being requested (if available),
+                            after API resolution only. (default: None)
+        commit              Commit hash (if available) of the binary to be updated to,
+                            after API resolution and update spec processing. (default: None)
+                            This value will only match the RELEASE_GIT_HEAD of prerelease builds.
+        binary_name         Filename of the binary to be updated to. (default: current binary name)
+        checksum            Expected checksum (if available) of the binary to be
+                            updated to. (default: None)
+    """
+    tag: str
+    version: str | None = None
+    requested_version: str | None = None
+    commit: str | None = None
+
+    binary_name: str | None = _get_binary_name()  # noqa: RUF009 # Always returns the same value
+    checksum: str | None = None
+
+
 class Updater:
-    _exact = True
+    # XXX: use class variables to simplify testing
+    _channel = CHANNEL
+    _origin = ORIGIN
+    _update_sources = UPDATE_SOURCES
 
-    def __init__(self, ydl, target=None):
+    def __init__(self, ydl, target: str | None = None):
         self.ydl = ydl
+        # For backwards compat, target needs to be treated as if it could be None
+        self.requested_channel, sep, self.requested_tag = (target or self._channel).rpartition('@')
+        # Check if requested_tag is actually the requested repo/channel
+        if not sep and ('/' in self.requested_tag or self.requested_tag in self._update_sources):
+            self.requested_channel = self.requested_tag
+            self.requested_tag: str = None  # type: ignore (we set it later)
+        elif not self.requested_channel:
+            # User did not specify a channel, so we are requesting the default channel
+            self.requested_channel = self._channel.partition('@')[0]
 
-        self.target_channel, sep, self.target_tag = (target or CHANNEL).rpartition('@')
-        # stable => stable@latest
-        if not sep and ('/' in self.target_tag or self.target_tag in UPDATE_SOURCES):
-            self.target_channel = self.target_tag
-            self.target_tag = None
-        elif not self.target_channel:
-            self.target_channel = CHANNEL.partition('@')[0]
-
-        if not self.target_tag:
-            self.target_tag = 'latest'
+        # --update should not be treated as an exact tag request even if CHANNEL has a @tag
+        self._exact = bool(target) and target != self._channel
+        if not self.requested_tag:
+            # User did not specify a tag, so we request 'latest' and track that no exact tag was passed
+            self.requested_tag = 'latest'
             self._exact = False
-        elif self.target_tag != 'latest':
-            self.target_tag = f'tags/{self.target_tag}'
 
-        if '/' in self.target_channel:
-            self._target_repo = self.target_channel
-            if self.target_channel not in (CHANNEL, *UPDATE_SOURCES.values()):
+        if '/' in self.requested_channel:
+            # requested_channel is actually a repository
+            self.requested_repo = self.requested_channel
+            if not self.requested_repo.startswith('yt-dlp/') and self.requested_repo != self._origin:
                 self.ydl.report_warning(
                     f'You are switching to an {self.ydl._format_err("unofficial", "red")} executable '
-                    f'from {self.ydl._format_err(self._target_repo, self.ydl.Styles.EMPHASIS)}. '
+                    f'from {self.ydl._format_err(self.requested_repo, self.ydl.Styles.EMPHASIS)}. '
                     f'Run {self.ydl._format_err("at your own risk", "light red")}')
                 self._block_restart('Automatically restarting into custom builds is disabled for security reasons')
         else:
-            self._target_repo = UPDATE_SOURCES.get(self.target_channel)
-            if not self._target_repo:
+            # Check if requested_channel resolves to a known repository or else raise
+            self.requested_repo = self._update_sources.get(self.requested_channel)
+            if not self.requested_repo:
                 self._report_error(
-                    f'Invalid update channel {self.target_channel!r} requested. '
-                    f'Valid channels are {", ".join(UPDATE_SOURCES)}', True)
+                    f'Invalid update channel {self.requested_channel!r} requested. '
+                    f'Valid channels are {", ".join(self._update_sources)}', True)
 
-    def _version_compare(self, a, b, channel=CHANNEL):
-        if self._exact and channel != self.target_channel:
-            return False
+        self._identifier = f'{detect_variant()} {system_identifier()}'
 
-        if _VERSION_RE.fullmatch(f'{a}.{b}'):
-            a, b = version_tuple(a), version_tuple(b)
-            return a == b if self._exact else a >= b
-        return a == b
+    @property
+    def current_version(self):
+        """Current version"""
+        return __version__
 
-    @functools.cached_property
-    def _tag(self):
-        if self._version_compare(self.current_version, self.latest_version):
-            return self.target_tag
+    @property
+    def current_commit(self):
+        """Current commit hash"""
+        return RELEASE_GIT_HEAD
 
-        identifier = f'{detect_variant()} {self.target_channel} {system_identifier()}'
-        for line in self._download('_update_spec', 'latest').decode().splitlines():
-            if not line.startswith('lock '):
-                continue
-            _, tag, pattern = line.split(' ', 2)
-            if re.match(pattern, identifier):
-                if not self._exact:
-                    return f'tags/{tag}'
-                elif self.target_tag == 'latest' or not self._version_compare(
-                        tag, self.target_tag[5:], channel=self.target_channel):
-                    self._report_error(
-                        f'yt-dlp cannot be updated above {tag} since you are on an older Python version', True)
-                    return f'tags/{self.current_version}'
-        return self.target_tag
+    def _download_asset(self, name, tag=None):
+        if not tag:
+            tag = self.requested_tag
 
-    @cached_method
-    def _get_version_info(self, tag):
-        url = f'{API_BASE_URL}/{self._target_repo}/releases/{tag}'
+        path = 'latest/download' if tag == 'latest' else f'download/{tag}'
+        url = f'https://github.com/{self.requested_repo}/releases/{path}/{name}'
+        self.ydl.write_debug(f'Downloading {name} from {url}')
+        return self.ydl.urlopen(url).read()
+
+    def _call_api(self, tag):
+        tag = f'tags/{tag}' if tag != 'latest' else tag
+        url = f'{API_BASE_URL}/{self.requested_repo}/releases/{tag}'
         self.ydl.write_debug(f'Fetching release info: {url}')
         return json.loads(self.ydl.urlopen(Request(url, headers={
             'Accept': 'application/vnd.github+json',
@@ -195,105 +279,181 @@ class Updater:
             'X-GitHub-Api-Version': '2022-11-28',
         })).read().decode())
 
-    @property
-    def current_version(self):
-        """Current version"""
-        return __version__
+    def _get_version_info(self, tag: str) -> tuple[str | None, str | None]:
+        if _VERSION_RE.fullmatch(tag):
+            return tag, None
 
-    @staticmethod
-    def _label(channel, tag):
-        """Label for a given channel and tag"""
-        return f'{channel}@{remove_start(tag, "tags/")}'
+        api_info = self._call_api(tag)
 
-    def _get_actual_tag(self, tag):
-        if tag.startswith('tags/'):
-            return tag[5:]
-        return self._get_version_info(tag)['tag_name']
+        if tag == 'latest':
+            requested_version = api_info['tag_name']
+        else:
+            match = re.search(rf'\s+(?P<version>{_VERSION_RE.pattern})$', api_info.get('name', ''))
+            requested_version = match.group('version') if match else None
 
-    @property
-    def new_version(self):
-        """Version of the latest release we can update to"""
-        return self._get_actual_tag(self._tag)
+        if re.fullmatch(_HASH_PATTERN, api_info.get('target_commitish', '')):
+            target_commitish = api_info['target_commitish']
+        else:
+            match = _COMMIT_RE.match(api_info.get('body', ''))
+            target_commitish = match.group('hash') if match else None
 
-    @property
-    def latest_version(self):
-        """Version of the target release"""
-        return self._get_actual_tag(self.target_tag)
+        if not (requested_version or target_commitish):
+            self._report_error('One of either version or commit hash must be available on the release', expected=True)
 
-    @property
-    def has_update(self):
-        """Whether there is an update available"""
-        return not self._version_compare(self.current_version, self.new_version)
+        return requested_version, target_commitish
 
-    @functools.cached_property
-    def filename(self):
-        """Filename of the executable"""
-        return compat_realpath(_get_variant_and_executable_path()[1])
+    def _download_update_spec(self, source_tags):
+        for tag in source_tags:
+            try:
+                return self._download_asset('_update_spec', tag=tag).decode()
+            except network_exceptions as error:
+                if isinstance(error, HTTPError) and error.status == 404:
+                    continue
+                self._report_network_error(f'fetch update spec: {error}')
+                return None
 
-    def _download(self, name, tag):
-        slug = 'latest/download' if tag == 'latest' else f'download/{tag[5:]}'
-        url = f'https://github.com/{self._target_repo}/releases/{slug}/{name}'
-        self.ydl.write_debug(f'Downloading {name} from {url}')
-        return self.ydl.urlopen(url).read()
-
-    @functools.cached_property
-    def release_name(self):
-        """The release filename"""
-        return f'yt-dlp{_FILE_SUFFIXES[detect_variant()]}'
-
-    @functools.cached_property
-    def release_hash(self):
-        """Hash of the latest release"""
-        hash_data = dict(ln.split()[::-1] for ln in self._download('SHA2-256SUMS', self._tag).decode().splitlines())
-        return hash_data[self.release_name]
-
-    def _report_error(self, msg, expected=False):
-        self.ydl.report_error(msg, tb=False if expected else None)
-        self.ydl._download_retcode = 100
-
-    def _report_permission_error(self, file):
-        self._report_error(f'Unable to write to {file}; Try running as administrator', True)
-
-    def _report_network_error(self, action, delim=';'):
         self._report_error(
-            f'Unable to {action}{delim} visit  '
-            f'https://github.com/{self._target_repo}/releases/{self.target_tag.replace("tags/", "tag/")}', True)
+            f'The requested tag {self.requested_tag} does not exist for {self.requested_repo}', True)
+        return None
+
+    def _process_update_spec(self, lockfile: str, resolved_tag: str):
+        lines = lockfile.splitlines()
+        is_version2 = any(line.startswith('lockV2 ') for line in lines)
+
+        for line in lines:
+            if is_version2:
+                if not line.startswith(f'lockV2 {self.requested_repo} '):
+                    continue
+                _, _, tag, pattern = line.split(' ', 3)
+            else:
+                if not line.startswith('lock '):
+                    continue
+                _, tag, pattern = line.split(' ', 2)
+
+            if re.match(pattern, self._identifier):
+                if _VERSION_RE.fullmatch(tag):
+                    if not self._exact:
+                        return tag
+                    elif self._version_compare(tag, resolved_tag):
+                        return resolved_tag
+                elif tag != resolved_tag:
+                    continue
+
+                self._report_error(
+                    f'yt-dlp cannot be updated to {resolved_tag} since you are on an older Python version '
+                    'or your operating system is not compatible with the requested build', True)
+                return None
+
+        return resolved_tag
+
+    def _version_compare(self, a: str, b: str):
+        """
+        Compare two version strings
+
+        This function SHOULD NOT be called if self._exact == True
+        """
+        if _VERSION_RE.fullmatch(f'{a}.{b}'):
+            return version_tuple(a) >= version_tuple(b)
+        return a == b
+
+    def query_update(self, *, _output=False) -> UpdateInfo | None:
+        """Fetches info about the available update
+        @returns   An `UpdateInfo` if there is an update available, else None
+        """
+        if not self.requested_repo:
+            self._report_error('No target repository could be determined from input')
+            return None
 
-    def check_update(self):
-        """Report whether there is an update available"""
-        if not self._target_repo:
-            return False
         try:
-            self.ydl.to_screen((
-                f'Available version: {self._label(self.target_channel, self.latest_version)}, ' if self.target_tag == 'latest' else ''
-            ) + f'Current version: {self._label(CHANNEL, self.current_version)}')
+            requested_version, target_commitish = self._get_version_info(self.requested_tag)
         except network_exceptions as e:
-            return self._report_network_error(f'obtain version info ({e})', delim='; Please try again later or')
+            self._report_network_error(f'obtain version info ({e})', delim='; Please try again later or')
+            return None
 
+        if self._exact and self._origin != self.requested_repo:
+            has_update = True
+        elif requested_version:
+            if self._exact:
+                has_update = self.current_version != requested_version
+            else:
+                has_update = not self._version_compare(self.current_version, requested_version)
+        elif target_commitish:
+            has_update = target_commitish != self.current_commit
+        else:
+            has_update = False
+
+        resolved_tag = requested_version if self.requested_tag == 'latest' else self.requested_tag
+        current_label = _make_label(self._origin, self._channel.partition('@')[2] or self.current_version, self.current_version)
+        requested_label = _make_label(self.requested_repo, resolved_tag, requested_version)
+        latest_or_requested = f'{"Latest" if self.requested_tag == "latest" else "Requested"} version: {requested_label}'
+        if not has_update:
+            if _output:
+                self.ydl.to_screen(f'{latest_or_requested}\nyt-dlp is up to date ({current_label})')
+            return None
+
+        update_spec = self._download_update_spec(('latest', None) if requested_version else (None,))
+        if not update_spec:
+            return None
+        # `result_` prefixed vars == post-_process_update_spec() values
+        result_tag = self._process_update_spec(update_spec, resolved_tag)
+        if not result_tag or result_tag == self.current_version:
+            return None
+        elif result_tag == resolved_tag:
+            result_version = requested_version
+        elif _VERSION_RE.fullmatch(result_tag):
+            result_version = result_tag
+        else:  # actual version being updated to is unknown
+            result_version = None
+
+        checksum = None
+        # Non-updateable variants can get update_info but need to skip checksum
         if not is_non_updateable():
-            self.ydl.to_screen(f'Current Build Hash: {_sha256_file(self.filename)}')
+            try:
+                hashes = self._download_asset('SHA2-256SUMS', result_tag)
+            except network_exceptions as error:
+                if not isinstance(error, HTTPError) or error.status != 404:
+                    self._report_network_error(f'fetch checksums: {error}')
+                    return None
+                self.ydl.report_warning('No hash information found for the release, skipping verification')
+            else:
+                for ln in hashes.decode().splitlines():
+                    if ln.endswith(_get_binary_name()):
+                        checksum = ln.split()[0]
+                        break
+                if not checksum:
+                    self.ydl.report_warning('The hash could not be found in the checksum file, skipping verification')
 
-        if self.has_update:
-            return True
+        if _output:
+            update_label = _make_label(self.requested_repo, result_tag, result_version)
+            self.ydl.to_screen(
+                f'Current version: {current_label}\n{latest_or_requested}'
+                + (f'\nUpgradable to: {update_label}' if update_label != requested_label else ''))
 
-        if self.target_tag == self._tag:
-            self.ydl.to_screen(f'yt-dlp is up to date ({self._label(CHANNEL, self.current_version)})')
-        elif not self._exact:
-            self.ydl.report_warning('yt-dlp cannot be updated any further since you are on an older Python version')
-        return False
+        return UpdateInfo(
+            tag=result_tag,
+            version=result_version,
+            requested_version=requested_version,
+            commit=target_commitish if result_tag == resolved_tag else None,
+            checksum=checksum)
+
+    def update(self, update_info=NO_DEFAULT):
+        """Update yt-dlp executable to the latest version
+        @param update_info  `UpdateInfo | None` as returned by query_update()
+        """
+        if update_info is NO_DEFAULT:
+            update_info = self.query_update(_output=True)
+        if not update_info:
+            return False
 
-    def update(self):
-        """Update yt-dlp executable to the latest version"""
-        if not self.check_update():
-            return
         err = is_non_updateable()
         if err:
-            return self._report_error(err, True)
-        self.ydl.to_screen(f'Updating to {self._label(self.target_channel, self.new_version)} ...')
-        if (_VERSION_RE.fullmatch(self.target_tag[5:])
-                and version_tuple(self.target_tag[5:]) < (2023, 3, 2)):
-            self.ydl.report_warning('You are downgrading to a version without --update-to')
-            self._block_restart('Cannot automatically restart to a version without --update-to')
+            self._report_error(err, True)
+            return False
+
+        self.ydl.to_screen(f'Current Build Hash: {_sha256_file(self.filename)}')
+
+        update_label = _make_label(self.requested_repo, update_info.tag, update_info.version)
+        self.ydl.to_screen(f'Updating to {update_label} ...')
 
         directory = os.path.dirname(self.filename)
         if not os.access(self.filename, os.W_OK):
@@ -312,20 +472,17 @@ class Updater:
             return self._report_error('Unable to remove the old version')
 
         try:
-            newcontent = self._download(self.release_name, self._tag)
+            newcontent = self._download_asset(update_info.binary_name, update_info.tag)
         except network_exceptions as e:
             if isinstance(e, HTTPError) and e.status == 404:
                 return self._report_error(
-                    f'The requested tag {self._label(self.target_channel, self.target_tag)} does not exist', True)
-            return self._report_network_error(f'fetch updates: {e}')
+                    f'The requested tag {self.requested_repo}@{update_info.tag} does not exist', True)
+            return self._report_network_error(f'fetch updates: {e}', tag=update_info.tag)
 
-        try:
-            expected_hash = self.release_hash
-        except Exception:
-            self.ydl.report_warning('no hash information found for the release')
-        else:
-            if hashlib.sha256(newcontent).hexdigest() != expected_hash:
-                return self._report_network_error('verify the new executable')
+        if not update_info.checksum:
+            self._block_restart('Automatically restarting into unverified builds is disabled for security reasons')
+        elif hashlib.sha256(newcontent).hexdigest() != update_info.checksum:
+            return self._report_network_error('verify the new executable', tag=update_info.tag)
 
         try:
             with open(new_filename, 'wb') as outf:
@@ -347,7 +504,7 @@ class Updater:
                 return os.rename(old_filename, self.filename)
 
         variant = detect_variant()
-        if variant.startswith('win') or variant == 'py2exe':
+        if variant.startswith('win'):
             atexit.register(Popen, f'ping 127.0.0.1 -n 5 -w 1000 & del /F "{old_filename}"',
                             shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
         elif old_filename:
@@ -360,19 +517,29 @@ class Updater:
                 os.chmod(self.filename, mask)
             except OSError:
                 return self._report_error(
-                    f'Unable to set permissions. Run: sudo chmod a+rx {compat_shlex_quote(self.filename)}')
+                    f'Unable to set permissions. Run: sudo chmod a+rx {shell_quote(self.filename)}')
 
-        self.ydl.to_screen(f'Updated yt-dlp to {self._label(self.target_channel, self.new_version)}')
+        self.ydl.to_screen(f'Updated yt-dlp to {update_label}')
         return True
 
+    @functools.cached_property
+    def filename(self):
+        """Filename of the executable"""
+        return os.path.realpath(_get_variant_and_executable_path()[1])
+
     @functools.cached_property
     def cmd(self):
         """The command-line to run the executable, if known"""
+        argv = None
         # There is no sys.orig_argv in py < 3.10. Also, it can be [] when frozen
         if getattr(sys, 'orig_argv', None):
-            return sys.orig_argv
+            argv = sys.orig_argv
         elif getattr(sys, 'frozen', False):
-            return sys.argv
+            argv = sys.argv
+        # linux_static exe's argv[0] will be /tmp/staticx-NNNN/yt-dlp_linux if we don't fixup here
+        if argv and os.getenv('STATICX_PROG_PATH'):
+            argv = [self.filename, *argv[1:]]
+        return argv
 
     def restart(self):
         """Restart the executable"""
@@ -387,53 +554,30 @@ class Updater:
             return self.ydl._download_retcode
         self.restart = wrapper
 
+    def _report_error(self, msg, expected=False):
+        self.ydl.report_error(msg, tb=False if expected else None)
+        self.ydl._download_retcode = 100
+
+    def _report_permission_error(self, file):
+        self._report_error(f'Unable to write to {file}; try running as administrator', True)
+
+    def _report_network_error(self, action, delim=';', tag=None):
+        if not tag:
+            tag = self.requested_tag
+        path = tag if tag == 'latest' else f'tag/{tag}'
+        self._report_error(
+            f'Unable to {action}{delim} visit  '
+            f'https://github.com/{self.requested_repo}/releases/{path}', True)
+
 
 def run_update(ydl):
     """Update the program file with the latest version from the repository
     @returns    Whether there was a successful update (No update = False)
     """
+    deprecation_warning(
+        '"yt_dlp.update.run_update(ydl)" is deprecated and may be removed in a future version. '
+        'Use "yt_dlp.update.Updater(ydl).update()" instead')
     return Updater(ydl).update()
 
 
-# Deprecated
-def update_self(to_screen, verbose, opener):
-    import traceback
-
-    deprecation_warning(f'"{__name__}.update_self" is deprecated and may be removed '
-                        f'in a future version. Use "{__name__}.run_update(ydl)" instead')
-
-    printfn = to_screen
-
-    class FakeYDL():
-        to_screen = printfn
-
-        def report_warning(self, msg, *args, **kwargs):
-            return printfn(f'WARNING: {msg}', *args, **kwargs)
-
-        def report_error(self, msg, tb=None):
-            printfn(f'ERROR: {msg}')
-            if not verbose:
-                return
-            if tb is None:
-                # Copied from YoutubeDL.trouble
-                if sys.exc_info()[0]:
-                    tb = ''
-                    if hasattr(sys.exc_info()[1], 'exc_info') and sys.exc_info()[1].exc_info[0]:
-                        tb += ''.join(traceback.format_exception(*sys.exc_info()[1].exc_info))
-                    tb += traceback.format_exc()
-                else:
-                    tb_data = traceback.format_list(traceback.extract_stack())
-                    tb = ''.join(tb_data)
-            if tb:
-                printfn(tb)
-
-        def write_debug(self, msg, *args, **kwargs):
-            printfn(f'[debug] {msg}', *args, **kwargs)
-
-        def urlopen(self, url):
-            return opener.open(url)
-
-    return run_update(FakeYDL())
-
-
 __all__ = ['Updater']
diff --git a/plugins/youtube_download/yt_dlp/utils/_deprecated.py b/plugins/youtube_download/yt_dlp/utils/_deprecated.py
index a8ae8ec..e476269 100644
--- a/plugins/youtube_download/yt_dlp/utils/_deprecated.py
+++ b/plugins/youtube_download/yt_dlp/utils/_deprecated.py
@@ -9,31 +9,23 @@ passthrough_module(__name__, '.._legacy', callback=lambda attr: warnings.warn(
 del passthrough_module
 
 
-from ._utils import preferredencoding
+import re
+import struct
 
 
-def encodeFilename(s, for_subprocess=False):
-    assert isinstance(s, str)
-    return s
+def bytes_to_intlist(bs):
+    if not bs:
+        return []
+    if isinstance(bs[0], int):  # Python 3
+        return list(bs)
+    else:
+        return [ord(c) for c in bs]
 
 
-def decodeFilename(b, for_subprocess=False):
-    return b
+def intlist_to_bytes(xs):
+    if not xs:
+        return b''
+    return struct.pack('%dB' % len(xs), *xs)
 
 
-def decodeArgument(b):
-    return b
-
-
-def decodeOption(optval):
-    if optval is None:
-        return optval
-    if isinstance(optval, bytes):
-        optval = optval.decode(preferredencoding())
-
-    assert isinstance(optval, str)
-    return optval
-
-
-def error_to_compat_str(err):
-    return str(err)
+compiled_regex_type = type(re.compile(''))
diff --git a/plugins/youtube_download/yt_dlp/utils/_legacy.py b/plugins/youtube_download/yt_dlp/utils/_legacy.py
index dde0209..d65b135 100644
--- a/plugins/youtube_download/yt_dlp/utils/_legacy.py
+++ b/plugins/youtube_download/yt_dlp/utils/_legacy.py
@@ -1,4 +1,6 @@
 """No longer used and new code should not use. Exists only for API compat."""
+import asyncio
+import atexit
 import platform
 import struct
 import sys
@@ -8,14 +10,14 @@ import urllib.request
 import zlib
 
 from ._utils import Popen, decode_base_n, preferredencoding
-from .networking import escape_rfc3986  # noqa: F401
-from .networking import normalize_url as escape_url  # noqa: F401
 from .traversal import traverse_obj
 from ..dependencies import certifi, websockets
 from ..networking._helper import make_ssl_context
 from ..networking._urllib import HTTPHandler
 
 # isort: split
+from .networking import escape_rfc3986  # noqa: F401
+from .networking import normalize_url as escape_url
 from .networking import random_user_agent, std_headers  # noqa: F401
 from ..cookies import YoutubeDLCookieJar  # noqa: F401
 from ..networking._urllib import PUTRequest  # noqa: F401
@@ -32,6 +34,77 @@ has_certifi = bool(certifi)
 has_websockets = bool(websockets)
 
 
+class WebSocketsWrapper:
+    """Wraps websockets module to use in non-async scopes"""
+    pool = None
+
+    def __init__(self, url, headers=None, connect=True, **ws_kwargs):
+        self.loop = asyncio.new_event_loop()
+        # XXX: "loop" is deprecated
+        self.conn = websockets.connect(
+            url, extra_headers=headers, ping_interval=None,
+            close_timeout=float('inf'), loop=self.loop, ping_timeout=float('inf'), **ws_kwargs)
+        if connect:
+            self.__enter__()
+        atexit.register(self.__exit__, None, None, None)
+
+    def __enter__(self):
+        if not self.pool:
+            self.pool = self.run_with_loop(self.conn.__aenter__(), self.loop)
+        return self
+
+    def send(self, *args):
+        self.run_with_loop(self.pool.send(*args), self.loop)
+
+    def recv(self, *args):
+        return self.run_with_loop(self.pool.recv(*args), self.loop)
+
+    def __exit__(self, type, value, traceback):
+        try:
+            return self.run_with_loop(self.conn.__aexit__(type, value, traceback), self.loop)
+        finally:
+            self.loop.close()
+            self._cancel_all_tasks(self.loop)
+
+    # taken from https://github.com/python/cpython/blob/3.9/Lib/asyncio/runners.py with modifications
+    # for contributors: If there's any new library using asyncio needs to be run in non-async, move these function out of this class
+    @staticmethod
+    def run_with_loop(main, loop):
+        if not asyncio.iscoroutine(main):
+            raise ValueError(f'a coroutine was expected, got {main!r}')
+
+        try:
+            return loop.run_until_complete(main)
+        finally:
+            loop.run_until_complete(loop.shutdown_asyncgens())
+            if hasattr(loop, 'shutdown_default_executor'):
+                loop.run_until_complete(loop.shutdown_default_executor())
+
+    @staticmethod
+    def _cancel_all_tasks(loop):
+        to_cancel = asyncio.all_tasks(loop)
+
+        if not to_cancel:
+            return
+
+        for task in to_cancel:
+            task.cancel()
+
+        # XXX: "loop" is removed in Python 3.10+
+        loop.run_until_complete(
+            asyncio.gather(*to_cancel, loop=loop, return_exceptions=True))
+
+        for task in to_cancel:
+            if task.cancelled():
+                continue
+            if task.exception() is not None:
+                loop.call_exception_handler({
+                    'message': 'unhandled exception during asyncio.run() shutdown',
+                    'exception': task.exception(),
+                    'task': task,
+                })
+
+
 def load_plugins(name, suffix, namespace):
     from ..plugins import load_plugins
     ret = load_plugins(name, suffix)
@@ -94,7 +167,7 @@ def decode_png(png_data):
         chunks.append({
             'type': chunk_type,
             'length': length,
-            'data': chunk_data
+            'data': chunk_data,
         })
 
     ihdr = chunks[0]['data']
@@ -122,15 +195,15 @@ def decode_png(png_data):
         return pixels[y][x]
 
     for y in range(height):
-        basePos = y * (1 + stride)
-        filter_type = decompressed_data[basePos]
+        base_pos = y * (1 + stride)
+        filter_type = decompressed_data[base_pos]
 
         current_row = []
 
         pixels.append(current_row)
 
         for x in range(stride):
-            color = decompressed_data[1 + basePos + x]
+            color = decompressed_data[1 + base_pos + x]
             basex = y * stride + x
             left = 0
             up = 0
@@ -240,3 +313,30 @@ def make_HTTPS_handler(params, **kwargs):
 
 def process_communicate_or_kill(p, *args, **kwargs):
     return Popen.communicate_or_kill(p, *args, **kwargs)
+
+
+def encodeFilename(s, for_subprocess=False):
+    assert isinstance(s, str)
+    return s
+
+
+def decodeFilename(b, for_subprocess=False):
+    return b
+
+
+def decodeArgument(b):
+    return b
+
+
+def decodeOption(optval):
+    if optval is None:
+        return optval
+    if isinstance(optval, bytes):
+        optval = optval.decode(preferredencoding())
+
+    assert isinstance(optval, str)
+    return optval
+
+
+def error_to_compat_str(err):
+    return str(err)
diff --git a/plugins/youtube_download/yt_dlp/utils/_utils.py b/plugins/youtube_download/yt_dlp/utils/_utils.py
index f5552ce..20aa341 100644
--- a/plugins/youtube_download/yt_dlp/utils/_utils.py
+++ b/plugins/youtube_download/yt_dlp/utils/_utils.py
@@ -1,5 +1,3 @@
-import asyncio
-import atexit
 import base64
 import binascii
 import calendar
@@ -7,10 +5,12 @@ import codecs
 import collections
 import collections.abc
 import contextlib
-import datetime
+import datetime as dt
 import email.header
 import email.utils
+import enum
 import errno
+import functools
 import hashlib
 import hmac
 import html.entities
@@ -46,20 +46,15 @@ import xml.etree.ElementTree
 
 from . import traversal
 
-from ..compat import functools  # isort: split
 from ..compat import (
     compat_etree_fromstring,
     compat_expanduser,
     compat_HTMLParseError,
-    compat_os_name,
-    compat_shlex_quote,
 )
-from ..dependencies import websockets, xattr
+from ..dependencies import xattr
+from ..globals import IN_CLI
 
-__name__ = __name__.rsplit('.', 1)[0]  # Pretend to be the parent module
-
-# This is not clearly defined otherwise
-compiled_regex_type = type(re.compile(''))
+__name__ = __name__.rsplit('.', 1)[0]  # noqa: A001 # Pretend to be the parent module
 
 
 class NO_DEFAULT:
@@ -93,7 +88,7 @@ TIMEZONE_NAMES = {
     'EST': -5, 'EDT': -4,  # Eastern
     'CST': -6, 'CDT': -5,  # Central
     'MST': -7, 'MDT': -6,  # Mountain
-    'PST': -8, 'PDT': -7   # Pacific
+    'PST': -8, 'PDT': -7,   # Pacific
 }
 
 # needed for sanitizing filenames in restricted mode
@@ -215,10 +210,27 @@ def write_json_file(obj, fn):
         raise
 
 
+def partial_application(func):
+    sig = inspect.signature(func)
+    required_args = [
+        param.name for param in sig.parameters.values()
+        if param.kind in (inspect.Parameter.POSITIONAL_ONLY, inspect.Parameter.POSITIONAL_OR_KEYWORD)
+        if param.default is inspect.Parameter.empty
+    ]
+
+    @functools.wraps(func)
+    def wrapped(*args, **kwargs):
+        if set(required_args[len(args):]).difference(kwargs):
+            return functools.partial(func, *args, **kwargs)
+        return func(*args, **kwargs)
+
+    return wrapped
+
+
 def find_xpath_attr(node, xpath, key, val=None):
     """ Find the xpath xpath[@key=val] """
     assert re.match(r'^[a-zA-Z_-]+$', key)
-    expr = xpath + ('[@%s]' % key if val is None else f"[@{key}='{val}']")
+    expr = xpath + (f'[@{key}]' if val is None else f"[@{key}='{val}']")
     return node.find(expr)
 
 # On python2.6 the xml.etree.ElementTree.Element methods don't support
@@ -233,7 +245,7 @@ def xpath_with_ns(path, ns_map):
             replaced.append(c[0])
         else:
             ns, tag = c
-            replaced.append('{%s}%s' % (ns_map[ns], tag))
+            replaced.append(f'{{{ns_map[ns]}}}{tag}')
     return '/'.join(replaced)
 
 
@@ -254,7 +266,7 @@ def xpath_element(node, xpath, name=None, fatal=False, default=NO_DEFAULT):
             return default
         elif fatal:
             name = xpath if name is None else name
-            raise ExtractorError('Could not find XML element %s' % name)
+            raise ExtractorError(f'Could not find XML element {name}')
         else:
             return None
     return n
@@ -269,7 +281,7 @@ def xpath_text(node, xpath, name=None, fatal=False, default=NO_DEFAULT):
             return default
         elif fatal:
             name = xpath if name is None else name
-            raise ExtractorError('Could not find XML element\'s text %s' % name)
+            raise ExtractorError(f'Could not find XML element\'s text {name}')
         else:
             return None
     return n.text
@@ -282,7 +294,7 @@ def xpath_attr(node, xpath, key, name=None, fatal=False, default=NO_DEFAULT):
             return default
         elif fatal:
             name = f'{xpath}[@{key}]' if name is None else name
-            raise ExtractorError('Could not find XML attribute %s' % name)
+            raise ExtractorError(f'Could not find XML attribute {name}')
         else:
             return None
     return n.attrib[key]
@@ -323,14 +335,14 @@ def get_element_html_by_attribute(attribute, value, html, **kargs):
 def get_elements_by_class(class_name, html, **kargs):
     """Return the content of all tags with the specified class in the passed HTML document as a list"""
     return get_elements_by_attribute(
-        'class', r'[^\'"]*(?<=[\'"\s])%s(?=[\'"\s])[^\'"]*' % re.escape(class_name),
+        'class', rf'[^\'"]*(?<=[\'"\s]){re.escape(class_name)}(?=[\'"\s])[^\'"]*',
         html, escape_value=False)
 
 
 def get_elements_html_by_class(class_name, html):
     """Return the html of all tags with the specified class in the passed HTML document as a list"""
     return get_elements_html_by_attribute(
-        'class', r'[^\'"]*(?<=[\'"\s])%s(?=[\'"\s])[^\'"]*' % re.escape(class_name),
+        'class', rf'[^\'"]*(?<=[\'"\s]){re.escape(class_name)}(?=[\'"\s])[^\'"]*',
         html, escape_value=False)
 
 
@@ -367,7 +379,7 @@ def get_elements_text_and_html_by_attribute(attribute, value, html, *, tag=r'[\w
 
         yield (
             unescapeHTML(re.sub(r'^(?P<q>["\'])(?P<content>.*)(?P=q)$', r'\g<content>', content, flags=re.DOTALL)),
-            whole
+            whole,
         )
 
 
@@ -410,7 +422,7 @@ class HTMLBreakOnClosingTagParser(html.parser.HTMLParser):
         else:
             raise compat_HTMLParseError(f'matching opening tag for closing {tag} tag not found')
         if not self.tagstack:
-            raise self.HTMLBreakOnClosingTagException()
+            raise self.HTMLBreakOnClosingTagException
 
 
 # XXX: This should be far less strict
@@ -560,7 +572,7 @@ class LenientJSONDecoder(json.JSONDecoder):
                     s = self._close_object(e)
                     if s is not None:
                         continue
-                raise type(e)(f'{e.msg} in {s[e.pos-10:e.pos+10]!r}', s, e.pos)
+                raise type(e)(f'{e.msg} in {s[e.pos - 10:e.pos + 10]!r}', s, e.pos)
         assert False, 'Too many attempts to decode JSON'
 
 
@@ -590,7 +602,7 @@ def sanitize_open(filename, open_mode):
                     # FIXME: An exclusive lock also locks the file from being read.
                     # Since windows locks are mandatory, don't lock the file on windows (for now).
                     # Ref: https://github.com/yt-dlp/yt-dlp/issues/3124
-                    raise LockingUnsupportedError()
+                    raise LockingUnsupportedError
                 stream = locked_file(filename, open_mode, block=False).__enter__()
             except OSError:
                 stream = open(filename, open_mode)
@@ -638,7 +650,7 @@ def sanitize_filename(s, restricted=False, is_id=NO_DEFAULT):
         elif char in '\\/|*<>':
             return '\0_'
         if restricted and (char in '!&\'()[]{}$;`^,#' or char.isspace() or ord(char) > 127):
-            return '\0_'
+            return '' if unicodedata.category(char)[0] in 'CM' else '\0_'
         return char
 
     # Replace look-alike Unicode glyphs
@@ -667,27 +679,54 @@ def sanitize_filename(s, restricted=False, is_id=NO_DEFAULT):
     return result
 
 
+def _sanitize_path_parts(parts):
+    sanitized_parts = []
+    for part in parts:
+        if not part or part == '.':
+            continue
+        elif part == '..':
+            if sanitized_parts and sanitized_parts[-1] != '..':
+                sanitized_parts.pop()
+            else:
+                sanitized_parts.append('..')
+            continue
+        # Replace invalid segments with `#`
+        # - trailing dots and spaces (`asdf...` => `asdf..#`)
+        # - invalid chars (`<>` => `##`)
+        sanitized_part = re.sub(r'[/<>:"\|\\?\*]|[\s.]$', '#', part)
+        sanitized_parts.append(sanitized_part)
+
+    return sanitized_parts
+
+
 def sanitize_path(s, force=False):
     """Sanitizes and normalizes path on Windows"""
-    if sys.platform == 'win32':
-        force = False
-        drive_or_unc, _ = os.path.splitdrive(s)
-    elif force:
-        drive_or_unc = ''
-    else:
-        return s
+    if sys.platform != 'win32':
+        if not force:
+            return s
+        root = '/' if s.startswith('/') else ''
+        path = '/'.join(_sanitize_path_parts(s.split('/')))
+        return root + path if root or path else '.'
 
-    norm_path = os.path.normpath(remove_start(s, drive_or_unc)).split(os.path.sep)
-    if drive_or_unc:
-        norm_path.pop(0)
-    sanitized_path = [
-        path_part if path_part in ['.', '..'] else re.sub(r'(?:[/<>:"\|\\?\*]|[\s.]$)', '#', path_part)
-        for path_part in norm_path]
-    if drive_or_unc:
-        sanitized_path.insert(0, drive_or_unc + os.path.sep)
-    elif force and s and s[0] == os.path.sep:
-        sanitized_path.insert(0, os.path.sep)
-    return os.path.join(*sanitized_path)
+    normed = s.replace('/', '\\')
+
+    if normed.startswith('\\\\'):
+        # UNC path (`\\SERVER\SHARE`) or device path (`\\.`, `\\?`)
+        parts = normed.split('\\')
+        root = '\\'.join(parts[:4]) + '\\'
+        parts = parts[4:]
+    elif normed[1:2] == ':':
+        # absolute path or drive relative path
+        offset = 3 if normed[2:3] == '\\' else 2
+        root = normed[:offset]
+        parts = normed[offset:].split('\\')
+    else:
+        # relative/drive root relative path
+        root = '\\' if normed[:1] == '\\' else ''
+        parts = normed.split('\\')
+
+    path = '\\'.join(_sanitize_path_parts(parts))
+    return root + path if root or path else '.'
 
 
 def sanitize_url(url, *, scheme='http'):
@@ -716,9 +755,9 @@ def extract_basic_auth(url):
         return url, None
     url = urllib.parse.urlunsplit(parts._replace(netloc=(
         parts.hostname if parts.port is None
-        else '%s:%d' % (parts.hostname, parts.port))))
+        else f'{parts.hostname}:{parts.port}')))
     auth_payload = base64.b64encode(
-        ('%s:%s' % (parts.username, parts.password or '')).encode())
+        ('{}:{}'.format(parts.username, parts.password or '')).encode())
     return url, f'Basic {auth_payload.decode()}'
 
 
@@ -757,7 +796,7 @@ def _htmlentity_transform(entity_with_semicolon):
         numstr = mobj.group(1)
         if numstr.startswith('x'):
             base = 16
-            numstr = '0%s' % numstr
+            numstr = f'0{numstr}'
         else:
             base = 10
         # See https://github.com/ytdl-org/youtube-dl/issues/7518
@@ -765,7 +804,7 @@ def _htmlentity_transform(entity_with_semicolon):
             return chr(int(numstr, base))
 
     # Unknown entity in name, return its literal representation
-    return '&%s;' % entity
+    return f'&{entity};'
 
 
 def unescapeHTML(s):
@@ -803,14 +842,18 @@ class Popen(subprocess.Popen):
         _startupinfo = None
 
     @staticmethod
-    def _fix_pyinstaller_ld_path(env):
-        """Restore LD_LIBRARY_PATH when using PyInstaller
-            Ref: https://github.com/pyinstaller/pyinstaller/blob/develop/doc/runtime-information.rst#ld_library_path--libpath-considerations
-                 https://github.com/yt-dlp/yt-dlp/issues/4573
-        """
+    def _fix_pyinstaller_issues(env):
         if not hasattr(sys, '_MEIPASS'):
             return
 
+        # Force spawning independent subprocesses for exes bundled with PyInstaller>=6.10
+        # Ref: https://pyinstaller.org/en/v6.10.0/CHANGES.html#incompatible-changes
+        #      https://github.com/yt-dlp/yt-dlp/issues/11259
+        env['PYINSTALLER_RESET_ENVIRONMENT'] = '1'
+
+        # Restore LD_LIBRARY_PATH when using PyInstaller
+        # Ref: https://pyinstaller.org/en/v6.10.0/runtime-information.html#ld-library-path-libpath-considerations
+        #      https://github.com/yt-dlp/yt-dlp/issues/4573
         def _fix(key):
             orig = env.get(f'{key}_ORIG')
             if orig is None:
@@ -821,17 +864,33 @@ class Popen(subprocess.Popen):
         _fix('LD_LIBRARY_PATH')  # Linux
         _fix('DYLD_LIBRARY_PATH')  # macOS
 
-    def __init__(self, *args, env=None, text=False, **kwargs):
+    def __init__(self, args, *remaining, env=None, text=False, shell=False, **kwargs):
         if env is None:
             env = os.environ.copy()
-        self._fix_pyinstaller_ld_path(env)
+        self._fix_pyinstaller_issues(env)
 
         self.__text_mode = kwargs.get('encoding') or kwargs.get('errors') or text or kwargs.get('universal_newlines')
         if text is True:
             kwargs['universal_newlines'] = True  # For 3.6 compatibility
             kwargs.setdefault('encoding', 'utf-8')
             kwargs.setdefault('errors', 'replace')
-        super().__init__(*args, env=env, **kwargs, startupinfo=self._startupinfo)
+
+        if shell and os.name == 'nt' and kwargs.get('executable') is None:
+            if not isinstance(args, str):
+                args = shell_quote(args, shell=True)
+            shell = False
+            # Set variable for `cmd.exe` newline escaping (see `utils.shell_quote`)
+            env['='] = '"^\n\n"'
+            args = f'{self.__comspec()} /Q /S /D /V:OFF /E:ON /C "{args}"'
+
+        super().__init__(args, *remaining, env=env, shell=shell, **kwargs, startupinfo=self._startupinfo)
+
+    def __comspec(self):
+        comspec = os.environ.get('ComSpec') or os.path.join(
+            os.environ.get('SystemRoot', ''), 'System32', 'cmd.exe')
+        if os.path.isabs(comspec):
+            return comspec
+        raise FileNotFoundError('shell not found: neither %ComSpec% nor %SystemRoot% is set')
 
     def communicate_or_kill(self, *args, **kwargs):
         try:
@@ -953,7 +1012,7 @@ class ExtractorError(YoutubeDLError):
 class UnsupportedError(ExtractorError):
     def __init__(self, url):
         super().__init__(
-            'Unsupported URL: %s' % url, expected=True)
+            f'Unsupported URL: {url}', expected=True)
         self.url = url
 
 
@@ -1117,7 +1176,7 @@ def is_path_like(f):
     return isinstance(f, (str, bytes, os.PathLike))
 
 
-def extract_timezone(date_str):
+def extract_timezone(date_str, default=None):
     m = re.search(
         r'''(?x)
             ^.{8,}?                                              # >=8 char non-TZ prefix, if present
@@ -1129,24 +1188,29 @@ def extract_timezone(date_str):
                 (?P<hours>[0-9]{2}):?(?P<minutes>[0-9]{2})       # hh[:]mm
             $)
         ''', date_str)
+    timezone = None
+
     if not m:
         m = re.search(r'\d{1,2}:\d{1,2}(?:\.\d+)?(?P<tz>\s*[A-Z]+)$', date_str)
         timezone = TIMEZONE_NAMES.get(m and m.group('tz').strip())
         if timezone is not None:
             date_str = date_str[:-len(m.group('tz'))]
-        timezone = datetime.timedelta(hours=timezone or 0)
+            timezone = dt.timedelta(hours=timezone)
     else:
         date_str = date_str[:-len(m.group('tz'))]
-        if not m.group('sign'):
-            timezone = datetime.timedelta()
-        else:
+        if m.group('sign'):
             sign = 1 if m.group('sign') == '+' else -1
-            timezone = datetime.timedelta(
+            timezone = dt.timedelta(
                 hours=sign * int(m.group('hours')),
                 minutes=sign * int(m.group('minutes')))
+
+    if timezone is None and default is not NO_DEFAULT:
+        timezone = default or dt.timedelta()
+
     return timezone, date_str
 
 
+@partial_application
 def parse_iso8601(date_str, delimiter='T', timezone=None):
     """ Return a UNIX timestamp from the given date """
 
@@ -1155,13 +1219,12 @@ def parse_iso8601(date_str, delimiter='T', timezone=None):
 
     date_str = re.sub(r'\.[0-9]+', '', date_str)
 
-    if timezone is None:
-        timezone, date_str = extract_timezone(date_str)
+    timezone, date_str = extract_timezone(date_str, timezone)
 
-    with contextlib.suppress(ValueError):
+    with contextlib.suppress(ValueError, TypeError):
         date_format = f'%Y-%m-%d{delimiter}%H:%M:%S'
-        dt = datetime.datetime.strptime(date_str, date_format) - timezone
-        return calendar.timegm(dt.timetuple())
+        dt_ = dt.datetime.strptime(date_str, date_format) - timezone
+        return calendar.timegm(dt_.timetuple())
 
 
 def date_formats(day_first=True):
@@ -1182,12 +1245,12 @@ def unified_strdate(date_str, day_first=True):
 
     for expression in date_formats(day_first):
         with contextlib.suppress(ValueError):
-            upload_date = datetime.datetime.strptime(date_str, expression).strftime('%Y%m%d')
+            upload_date = dt.datetime.strptime(date_str, expression).strftime('%Y%m%d')
     if upload_date is None:
         timetuple = email.utils.parsedate_tz(date_str)
         if timetuple:
             with contextlib.suppress(ValueError):
-                upload_date = datetime.datetime(*timetuple[:6]).strftime('%Y%m%d')
+                upload_date = dt.datetime(*timetuple[:6]).strftime('%Y%m%d')
     if upload_date is not None:
         return str(upload_date)
 
@@ -1197,7 +1260,7 @@ def unified_timestamp(date_str, day_first=True):
         return None
 
     date_str = re.sub(r'\s+', ' ', re.sub(
-        r'(?i)[,|]|(mon|tues?|wed(nes)?|thu(rs)?|fri|sat(ur)?)(day)?', '', date_str))
+        r'(?i)[,|]|(mon|tues?|wed(nes)?|thu(rs)?|fri|sat(ur)?|sun)(day)?', '', date_str))
 
     pm_delta = 12 if re.search(r'(?i)PM', date_str) else 0
     timezone, date_str = extract_timezone(date_str)
@@ -1217,14 +1280,15 @@ def unified_timestamp(date_str, day_first=True):
 
     for expression in date_formats(day_first):
         with contextlib.suppress(ValueError):
-            dt = datetime.datetime.strptime(date_str, expression) - timezone + datetime.timedelta(hours=pm_delta)
-            return calendar.timegm(dt.timetuple())
+            dt_ = dt.datetime.strptime(date_str, expression) - timezone + dt.timedelta(hours=pm_delta)
+            return calendar.timegm(dt_.timetuple())
 
     timetuple = email.utils.parsedate_tz(date_str)
     if timetuple:
         return calendar.timegm(timetuple) + pm_delta * 3600 - timezone.total_seconds()
 
 
+@partial_application
 def determine_ext(url, default_ext='unknown_video'):
     if url is None or '.' not in url:
         return default_ext
@@ -1256,11 +1320,11 @@ def datetime_from_str(date_str, precision='auto', format='%Y%m%d'):
     if precision == 'auto':
         auto_precision = True
         precision = 'microsecond'
-    today = datetime_round(datetime.datetime.utcnow(), precision)
+    today = datetime_round(dt.datetime.now(dt.timezone.utc), precision)
     if date_str in ('now', 'today'):
         return today
     if date_str == 'yesterday':
-        return today - datetime.timedelta(days=1)
+        return today - dt.timedelta(days=1)
     match = re.match(
         r'(?P<start>.+)(?P<sign>[+-])(?P<time>\d+)(?P<unit>microsecond|second|minute|hour|day|week|month|year)s?',
         date_str)
@@ -1275,13 +1339,13 @@ def datetime_from_str(date_str, precision='auto', format='%Y%m%d'):
             if unit == 'week':
                 unit = 'day'
                 time *= 7
-            delta = datetime.timedelta(**{unit + 's': time})
+            delta = dt.timedelta(**{unit + 's': time})
             new_date = start_time + delta
         if auto_precision:
             return datetime_round(new_date, unit)
         return new_date
 
-    return datetime_round(datetime.datetime.strptime(date_str, format), precision)
+    return datetime_round(dt.datetime.strptime(date_str, format), precision)
 
 
 def date_from_str(date_str, format='%Y%m%d', strict=False):
@@ -1296,21 +1360,21 @@ def date_from_str(date_str, format='%Y%m%d', strict=False):
     return datetime_from_str(date_str, precision='microsecond', format=format).date()
 
 
-def datetime_add_months(dt, months):
+def datetime_add_months(dt_, months):
     """Increment/Decrement a datetime object by months."""
-    month = dt.month + months - 1
-    year = dt.year + month // 12
+    month = dt_.month + months - 1
+    year = dt_.year + month // 12
     month = month % 12 + 1
-    day = min(dt.day, calendar.monthrange(year, month)[1])
-    return dt.replace(year, month, day)
+    day = min(dt_.day, calendar.monthrange(year, month)[1])
+    return dt_.replace(year, month, day)
 
 
-def datetime_round(dt, precision='day'):
+def datetime_round(dt_, precision='day'):
     """
     Round a datetime object's time to a specific precision
     """
     if precision == 'microsecond':
-        return dt
+        return dt_
 
     unit_seconds = {
         'day': 86400,
@@ -1319,8 +1383,8 @@ def datetime_round(dt, precision='day'):
         'second': 1,
     }
     roundto = lambda x, n: ((x + n / 2) // n) * n
-    timestamp = calendar.timegm(dt.timetuple())
-    return datetime.datetime.utcfromtimestamp(roundto(timestamp, unit_seconds[precision]))
+    timestamp = roundto(calendar.timegm(dt_.timetuple()), unit_seconds[precision])
+    return dt.datetime.fromtimestamp(timestamp, dt.timezone.utc)
 
 
 def hyphenate_date(date_str):
@@ -1341,13 +1405,13 @@ class DateRange:
         if start is not None:
             self.start = date_from_str(start, strict=True)
         else:
-            self.start = datetime.datetime.min.date()
+            self.start = dt.datetime.min.date()
         if end is not None:
             self.end = date_from_str(end, strict=True)
         else:
-            self.end = datetime.datetime.max.date()
+            self.end = dt.datetime.max.date()
         if self.start > self.end:
-            raise ValueError('Date range: "%s" , the start date must be before the end date' % self)
+            raise ValueError(f'Date range: "{self}" , the start date must be before the end date')
 
     @classmethod
     def day(cls, day):
@@ -1356,13 +1420,16 @@ class DateRange:
 
     def __contains__(self, date):
         """Check if the date is in the range"""
-        if not isinstance(date, datetime.date):
+        if not isinstance(date, dt.date):
             date = date_from_str(date)
         return self.start <= date <= self.end
 
     def __repr__(self):
         return f'{__name__}.{type(self).__name__}({self.start.isoformat()!r}, {self.end.isoformat()!r})'
 
+    def __str__(self):
+        return f'{self.start} to {self.end}'
+
     def __eq__(self, other):
         return (isinstance(other, DateRange)
                 and self.start == other.start and self.end == other.end)
@@ -1377,7 +1444,7 @@ def system_identifier():
     with contextlib.suppress(OSError):  # We may not have access to the executable
         libc_ver = platform.libc_ver()
 
-    return 'Python %s (%s %s %s) - %s (%s%s)' % (
+    return 'Python {} ({} {} {}) - {} ({}{})'.format(
         platform.python_version(),
         python_implementation,
         platform.machine(),
@@ -1390,8 +1457,8 @@ def system_identifier():
 
 @functools.cache
 def get_windows_version():
-    ''' Get Windows version. returns () if it's not running on Windows '''
-    if compat_os_name == 'nt':
+    """ Get Windows version. returns () if it's not running on Windows """
+    if os.name == 'nt':
         return version_tuple(platform.win32_ver()[1])
     else:
         return ()
@@ -1404,11 +1471,12 @@ def write_string(s, out=None, encoding=None):
     if not out:
         return
 
-    if compat_os_name == 'nt' and supports_terminal_sequences(out):
+    if os.name == 'nt' and supports_terminal_sequences(out):
         s = re.sub(r'([\r\n]+)', r' \1', s)
 
     enc, buffer = None, out
-    if 'b' in getattr(out, 'mode', ''):
+    # `mode` might be `None` (Ref: https://github.com/yt-dlp/yt-dlp/issues/8816)
+    if 'b' in (getattr(out, 'mode', None) or ''):
         enc = encoding or preferredencoding()
     elif hasattr(out, 'buffer'):
         buffer = out.buffer
@@ -1420,8 +1488,7 @@ def write_string(s, out=None, encoding=None):
 
 # TODO: Use global logger
 def deprecation_warning(msg, *, printer=None, stacklevel=0, **kwargs):
-    from .. import _IN_CLI
-    if _IN_CLI:
+    if IN_CLI.value:
         if msg in deprecation_warning._cache:
             return
         deprecation_warning._cache.add(msg)
@@ -1436,21 +1503,6 @@ def deprecation_warning(msg, *, printer=None, stacklevel=0, **kwargs):
 deprecation_warning._cache = set()
 
 
-def bytes_to_intlist(bs):
-    if not bs:
-        return []
-    if isinstance(bs[0], int):  # Python 3
-        return list(bs)
-    else:
-        return [ord(c) for c in bs]
-
-
-def intlist_to_bytes(xs):
-    if not xs:
-        return b''
-    return struct.pack('%dB' % len(xs), *xs)
-
-
 class LockingUnsupportedError(OSError):
     msg = 'File locking is not supported'
 
@@ -1481,7 +1533,7 @@ if sys.platform == 'win32':
         ctypes.wintypes.DWORD,      # dwReserved
         ctypes.wintypes.DWORD,      # nNumberOfBytesToLockLow
         ctypes.wintypes.DWORD,      # nNumberOfBytesToLockHigh
-        ctypes.POINTER(OVERLAPPED)  # Overlapped
+        ctypes.POINTER(OVERLAPPED),  # Overlapped
     ]
     LockFileEx.restype = ctypes.wintypes.BOOL
     UnlockFileEx = kernel32.UnlockFileEx
@@ -1490,7 +1542,7 @@ if sys.platform == 'win32':
         ctypes.wintypes.DWORD,      # dwReserved
         ctypes.wintypes.DWORD,      # nNumberOfBytesToLockLow
         ctypes.wintypes.DWORD,      # nNumberOfBytesToLockHigh
-        ctypes.POINTER(OVERLAPPED)  # Overlapped
+        ctypes.POINTER(OVERLAPPED),  # Overlapped
     ]
     UnlockFileEx.restype = ctypes.wintypes.BOOL
     whole_low = 0xffffffff
@@ -1513,7 +1565,7 @@ if sys.platform == 'win32':
         assert f._lock_file_overlapped_p
         handle = msvcrt.get_osfhandle(f.fileno())
         if not UnlockFileEx(handle, 0, whole_low, whole_high, f._lock_file_overlapped_p):
-            raise OSError('Unlocking file failed: %r' % ctypes.FormatError())
+            raise OSError(f'Unlocking file failed: {ctypes.FormatError()!r}')
 
 else:
     try:
@@ -1540,10 +1592,10 @@ else:
     except ImportError:
 
         def _lock_file(f, exclusive, block):
-            raise LockingUnsupportedError()
+            raise LockingUnsupportedError
 
         def _unlock_file(f):
-            raise LockingUnsupportedError()
+            raise LockingUnsupportedError
 
 
 class locked_file:
@@ -1617,15 +1669,31 @@ def get_filesystem_encoding():
     return encoding if encoding is not None else 'utf-8'
 
 
-def shell_quote(args):
-    quoted_args = []
-    encoding = get_filesystem_encoding()
-    for a in args:
-        if isinstance(a, bytes):
-            # We may get a filename encoded with 'encodeFilename'
-            a = a.decode(encoding)
-        quoted_args.append(compat_shlex_quote(a))
-    return ' '.join(quoted_args)
+_WINDOWS_QUOTE_TRANS = str.maketrans({'"': R'\"'})
+_CMD_QUOTE_TRANS = str.maketrans({
+    # Keep quotes balanced by replacing them with `""` instead of `\\"`
+    '"': '""',
+    # These require an env-variable `=` containing `"^\n\n"` (set in `utils.Popen`)
+    # `=` should be unique since variables containing `=` cannot be set using cmd
+    '\n': '%=%',
+    '\r': '%=%',
+    # Use zero length variable replacement so `%` doesn't get expanded
+    # `cd` is always set as long as extensions are enabled (`/E:ON` in `utils.Popen`)
+    '%': '%%cd:~,%',
+})
+
+
+def shell_quote(args, *, shell=False):
+    args = list(variadic(args))
+
+    if os.name != 'nt':
+        return shlex.join(args)
+
+    trans = _CMD_QUOTE_TRANS if shell else _WINDOWS_QUOTE_TRANS
+    return ' '.join(
+        s if re.fullmatch(r'[\w#$*\-+./:?@\\]+', s, re.ASCII)
+        else re.sub(r'(\\+)("|$)', r'\1\1\2', s).translate(trans).join('""')
+        for s in args)
 
 
 def smuggle_url(url, data):
@@ -1869,6 +1937,7 @@ def setproctitle(title):
     buf = ctypes.create_string_buffer(len(title_bytes))
     buf.value = title_bytes
     try:
+        # PR_SET_NAME = 15      Ref: /usr/include/linux/prctl.h
         libc.prctl(15, buf, 0, 0, 0)
     except AttributeError:
         return  # Strange libc, just skip this
@@ -1879,13 +1948,13 @@ def remove_start(s, start):
 
 
 def remove_end(s, end):
-    return s[:-len(end)] if s is not None and s.endswith(end) else s
+    return s[:-len(end)] if s is not None and end and s.endswith(end) else s
 
 
 def remove_quotes(s):
     if s is None or len(s) < 2:
         return s
-    for quote in ('"', "'", ):
+    for quote in ('"', "'"):
         if s[0] == quote and s[-1] == quote:
             return s[1:-1]
     return s
@@ -1908,12 +1977,13 @@ def base_url(url):
     return re.match(r'https?://[^?#]+/', url).group()
 
 
+@partial_application
 def urljoin(base, path):
     if isinstance(path, bytes):
         path = path.decode()
     if not isinstance(path, str) or not path:
         return None
-    if re.match(r'^(?:[a-zA-Z][a-zA-Z0-9+-.]*:)?//', path):
+    if re.match(r'(?:[a-zA-Z][a-zA-Z0-9+-.]*:)?//', path):
         return path
     if isinstance(base, bytes):
         base = base.decode()
@@ -1923,11 +1993,15 @@ def urljoin(base, path):
     return urllib.parse.urljoin(base, path)
 
 
-def int_or_none(v, scale=1, default=None, get_attr=None, invscale=1):
+@partial_application
+def int_or_none(v, scale=1, default=None, get_attr=None, invscale=1, base=None):
     if get_attr and v is not None:
         v = getattr(v, get_attr, None)
+    if invscale == 1 and scale < 1:
+        invscale = int(1 / scale)
+        scale = 1
     try:
-        return int(v) * invscale // scale
+        return (int(v) if base is None else int(v, base=base)) * invscale // scale
     except (ValueError, TypeError, OverflowError):
         return default
 
@@ -1945,9 +2019,13 @@ def str_to_int(int_str):
         return int_or_none(int_str)
 
 
+@partial_application
 def float_or_none(v, scale=1, invscale=1, default=None):
     if v is None:
         return default
+    if invscale == 1 and scale < 1:
+        invscale = int(1 / scale)
+        scale = 1
     try:
         return float(v) * invscale / scale
     except (ValueError, TypeError):
@@ -1966,7 +2044,7 @@ def url_or_none(url):
     if not url or not isinstance(url, str):
         return None
     url = url.strip()
-    return url if re.match(r'^(?:(?:https?|rt(?:m(?:pt?[es]?|fp)|sp[su]?)|mms|ftps?):)?//', url) else None
+    return url if re.match(r'(?:(?:https?|rt(?:m(?:pt?[es]?|fp)|sp[su]?)|mms|ftps?|wss?):)?//', url) else None
 
 
 def strftime_or_none(timestamp, date_format='%Y%m%d', default=None):
@@ -1975,12 +2053,12 @@ def strftime_or_none(timestamp, date_format='%Y%m%d', default=None):
         if isinstance(timestamp, (int, float)):  # unix timestamp
             # Using naive datetime here can break timestamp() in Windows
             # Ref: https://github.com/yt-dlp/yt-dlp/issues/5185, https://github.com/python/cpython/issues/94414
-            # Also, datetime.datetime.fromtimestamp breaks for negative timestamps
+            # Also, dt.datetime.fromtimestamp breaks for negative timestamps
             # Ref: https://github.com/yt-dlp/yt-dlp/issues/6706#issuecomment-1496842642
-            datetime_object = (datetime.datetime.fromtimestamp(0, datetime.timezone.utc)
-                               + datetime.timedelta(seconds=timestamp))
+            datetime_object = (dt.datetime.fromtimestamp(0, dt.timezone.utc)
+                               + dt.timedelta(seconds=timestamp))
         elif isinstance(timestamp, str):  # assume YYYYMMDD
-            datetime_object = datetime.datetime.strptime(timestamp, '%Y%m%d')
+            datetime_object = dt.datetime.strptime(timestamp, '%Y%m%d')
         date_format = re.sub(  # Support %s on windows
             r'(?<!%)(%%)*%s', rf'\g<1>{int(datetime_object.timestamp())}', date_format)
         return datetime_object.strftime(date_format)
@@ -2044,26 +2122,27 @@ def parse_duration(s):
         (days, 86400), (hours, 3600), (mins, 60), (secs, 1), (ms, 1)))
 
 
-def prepend_extension(filename, ext, expected_real_ext=None):
+def _change_extension(prepend, filename, ext, expected_real_ext=None):
     name, real_ext = os.path.splitext(filename)
-    return (
-        f'{name}.{ext}{real_ext}'
-        if not expected_real_ext or real_ext[1:] == expected_real_ext
-        else f'{filename}.{ext}')
+
+    if not expected_real_ext or real_ext[1:] == expected_real_ext:
+        filename = name
+        if prepend and real_ext:
+            _UnsafeExtensionError.sanitize_extension(ext, prepend=True)
+            return f'{filename}.{ext}{real_ext}'
+
+    return f'{filename}.{_UnsafeExtensionError.sanitize_extension(ext)}'
 
 
-def replace_extension(filename, ext, expected_real_ext=None):
-    name, real_ext = os.path.splitext(filename)
-    return '{}.{}'.format(
-        name if not expected_real_ext or real_ext[1:] == expected_real_ext else filename,
-        ext)
+prepend_extension = functools.partial(_change_extension, True)
+replace_extension = functools.partial(_change_extension, False)
 
 
 def check_executable(exe, args=[]):
     """ Checks if the given binary is installed somewhere in PATH, and returns its name.
     args can be a list of arguments for a short output (like -version) """
     try:
-        Popen.run([exe] + args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        Popen.run([exe, *args], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     except OSError:
         return False
     return exe
@@ -2074,7 +2153,7 @@ def _get_exe_version_output(exe, args):
         # STDIN should be redirected too. On UNIX-like systems, ffmpeg triggers
         # SIGTTOU if yt-dlp is run in the background.
         # See https://github.com/ytdl-org/youtube-dl/issues/955#issuecomment-209789656
-        stdout, _, ret = Popen.run([encodeArgument(exe)] + args, text=True,
+        stdout, _, ret = Popen.run([encodeArgument(exe), *args], text=True,
                                    stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
         if ret:
             return None
@@ -2120,7 +2199,7 @@ class LazyList(collections.abc.Sequence):
     """Lazy immutable list from an iterable
     Note that slices of a LazyList are lists and not LazyList"""
 
-    class IndexError(IndexError):
+    class IndexError(IndexError):  # noqa: A001
         pass
 
     def __init__(self, iterable, *, reverse=False, _cache=None):
@@ -2207,7 +2286,7 @@ class LazyList(collections.abc.Sequence):
 
 class PagedList:
 
-    class IndexError(IndexError):
+    class IndexError(IndexError):  # noqa: A001
         pass
 
     def __len__(self):
@@ -2241,9 +2320,12 @@ class PagedList:
             raise TypeError('indices must be non-negative integers')
         entries = self.getslice(idx, idx + 1)
         if not entries:
-            raise self.IndexError()
+            raise self.IndexError
         return entries[0]
 
+    def __bool__(self):
+        return bool(self.getslice(0, 1))
+
 
 class OnDemandPagedList(PagedList):
     """Download pages until a page with less than maximum results"""
@@ -2399,7 +2481,7 @@ class PlaylistEntries:
                 except IndexError:
                     entry = self.MissingEntry
                     if not self.is_incomplete:
-                        raise self.IndexError()
+                        raise self.IndexError
                 if entry is self.MissingEntry:
                     raise EntryNotInPlaylist(f'Entry {i + 1} cannot be found')
                 return entry
@@ -2408,7 +2490,7 @@ class PlaylistEntries:
                 try:
                     return type(self.ydl)._handle_extraction_exceptions(lambda _, i: self._entries[i])(self.ydl, i)
                 except (LazyList.IndexError, PagedList.IndexError):
-                    raise self.IndexError()
+                    raise self.IndexError
         return get_entry
 
     def __getitem__(self, idx):
@@ -2444,7 +2526,7 @@ class PlaylistEntries:
     def __len__(self):
         return len(tuple(self[:]))
 
-    class IndexError(IndexError):
+    class IndexError(IndexError):  # noqa: A001
         pass
 
 
@@ -2481,7 +2563,7 @@ def read_batch_urls(batch_fd):
             return False
         # "#" cannot be stripped out since it is part of the URI
         # However, it can be safely stripped out if following a whitespace
-        return re.split(r'\s#', url, 1)[0].rstrip()
+        return re.split(r'\s#', url, maxsplit=1)[0].rstrip()
 
     with contextlib.closing(batch_fd) as fd:
         return [url for url in map(fixup, fd) if url]
@@ -2491,6 +2573,7 @@ def urlencode_postdata(*args, **kargs):
     return urllib.parse.urlencode(*args, **kargs).encode('ascii')
 
 
+@partial_application
 def update_url(url, *, query_update=None, **kwargs):
     """Replace URL components specified by kwargs
        @param url           str or parse url tuple
@@ -2506,17 +2589,18 @@ def update_url(url, *, query_update=None, **kwargs):
         assert 'query' not in kwargs, 'query_update and query cannot be specified at the same time'
         kwargs['query'] = urllib.parse.urlencode({
             **urllib.parse.parse_qs(url.query),
-            **query_update
+            **query_update,
         }, True)
     return urllib.parse.urlunparse(url._replace(**kwargs))
 
 
+@partial_application
 def update_url_query(url, query):
     return update_url(url, query_update=query)
 
 
 def _multipart_encode_impl(data, boundary):
-    content_type = 'multipart/form-data; boundary=%s' % boundary
+    content_type = f'multipart/form-data; boundary={boundary}'
 
     out = b''
     for k, v in data.items():
@@ -2538,7 +2622,7 @@ def _multipart_encode_impl(data, boundary):
 
 
 def multipart_encode(data, boundary=None):
-    '''
+    """
     Encode a dict to RFC 7578-compliant form-data
 
     data:
@@ -2549,7 +2633,7 @@ def multipart_encode(data, boundary=None):
         a random boundary is generated.
 
     Reference: https://tools.ietf.org/html/rfc7578
-    '''
+    """
     has_specified_boundary = boundary is not None
 
     while True:
@@ -2603,8 +2687,8 @@ def merge_dicts(*dicts):
     merged = {}
     for a_dict in dicts:
         for k, v in a_dict.items():
-            if (v is not None and k not in merged
-                    or isinstance(v, str) and merged[k] == ''):
+            if ((v is not None and k not in merged)
+                    or (isinstance(v, str) and merged[k] == '')):
                 merged[k] = v
     return merged
 
@@ -2644,7 +2728,7 @@ def parse_age_limit(s):
     s = s.upper()
     if s in US_RATINGS:
         return US_RATINGS[s]
-    m = re.match(r'^TV[_-]?(%s)$' % '|'.join(k[3:] for k in TV_PARENTAL_GUIDELINES), s)
+    m = re.match(r'^TV[_-]?({})$'.format('|'.join(k[3:] for k in TV_PARENTAL_GUIDELINES)), s)
     if m:
         return TV_PARENTAL_GUIDELINES['TV-' + m.group(1)]
     return None
@@ -2683,7 +2767,8 @@ def js_to_json(code, vars={}, *, strict=False):
     def template_substitute(match):
         evaluated = js_to_json(match.group(1), vars, strict=strict)
         if evaluated[0] == '"':
-            return json.loads(evaluated)
+            with contextlib.suppress(json.JSONDecodeError):
+                return json.loads(evaluated)
         return evaluated
 
     def fix_kv(m):
@@ -2692,7 +2777,7 @@ def js_to_json(code, vars={}, *, strict=False):
             return v
         elif v in ('undefined', 'void 0'):
             return 'null'
-        elif v.startswith('/*') or v.startswith('//') or v.startswith('!') or v == ',':
+        elif v.startswith(('/*', '//', '!')) or v == ',':
             return ''
 
         if v[0] in STRING_QUOTES:
@@ -2723,9 +2808,10 @@ def js_to_json(code, vars={}, *, strict=False):
     def create_map(mobj):
         return json.dumps(dict(json.loads(js_to_json(mobj.group(1) or '[]', vars=vars))))
 
+    code = re.sub(r'(?:new\s+)?Array\((.*?)\)', r'[\g<1>]', code)
     code = re.sub(r'new Map\((\[.*?\])?\)', create_map, code)
     if not strict:
-        code = re.sub(r'new Date\((".+")\)', r'\g<1>', code)
+        code = re.sub(rf'new Date\(({STRING_RE})\)', r'\g<1>', code)
         code = re.sub(r'new \w+\((.*?)\)', lambda m: json.dumps(m.group(0)), code)
         code = re.sub(r'parseInt\([^\d]+(\d+)[^\d]+\)', r'\1', code)
         code = re.sub(r'\(function\([^)]*\)\s*\{[^}]*\}\s*\)\s*\(\s*(["\'][^)]*["\'])\s*\)', r'\1', code)
@@ -2824,13 +2910,14 @@ def ytdl_is_updateable():
 
 def args_to_str(args):
     # Get a short string representation for a subprocess command
-    return ' '.join(compat_shlex_quote(a) for a in args)
+    return shell_quote(args)
 
 
 def error_to_str(err):
     return f'{type(err).__name__}: {err}'
 
 
+@partial_application
 def mimetype2ext(mt, default=NO_DEFAULT):
     if not isinstance(mt, str):
         if default is not NO_DEFAULT:
@@ -2847,6 +2934,7 @@ def mimetype2ext(mt, default=NO_DEFAULT):
         'quicktime': 'mov',
         'webm': 'webm',
         'vp9': 'vp9',
+        'video/ogg': 'ogv',
         'x-flv': 'flv',
         'x-m4v': 'm4v',
         'x-matroska': 'mkv',
@@ -2872,6 +2960,7 @@ def mimetype2ext(mt, default=NO_DEFAULT):
         'audio/webm': 'webm',
         'audio/x-matroska': 'mka',
         'audio/x-mpegurl': 'm3u',
+        'aacp': 'aac',
         'midi': 'mid',
         'ogg': 'ogg',
         'wav': 'wav',
@@ -2937,6 +3026,7 @@ def parse_codecs(codecs_str):
         str.strip, codecs_str.strip().strip(',').split(','))))
     vcodec, acodec, scodec, hdr = None, None, None, None
     for full_codec in split_codecs:
+        full_codec = re.sub(r'^([^.]+)', lambda m: m.group(1).lower(), full_codec)
         parts = re.sub(r'0+(?=\d)', '', full_codec).split('.')
         if parts[0] in ('avc1', 'avc2', 'avc3', 'avc4', 'vp9', 'vp8', 'hev1', 'hev2',
                         'h263', 'h264', 'mp4v', 'hvc1', 'av1', 'theora', 'dvh1', 'dvhe'):
@@ -3033,7 +3123,7 @@ def urlhandle_detect_ext(url_handle, default=NO_DEFAULT):
 
 
 def encode_data_uri(data, mime_type):
-    return 'data:%s;base64,%s' % (mime_type, base64.b64encode(data).decode('ascii'))
+    return 'data:{};base64,{}'.format(mime_type, base64.b64encode(data).decode('ascii'))
 
 
 def age_restricted(content_limit, age_limit):
@@ -3064,7 +3154,7 @@ def is_html(first_bytes):
         while first_bytes.startswith(bom):
             encoding, first_bytes = enc, first_bytes[len(bom):]
 
-    return re.match(r'^\s*<', first_bytes.decode(encoding, 'replace'))
+    return re.match(r'\s*<', first_bytes.decode(encoding, 'replace'))
 
 
 def determine_protocol(info_dict):
@@ -3098,18 +3188,18 @@ def render_table(header_row, data, delim=False, extra_gap=0, hide_empty=False):
     def get_max_lens(table):
         return [max(width(str(v)) for v in col) for col in zip(*table)]
 
-    def filter_using_list(row, filterArray):
-        return [col for take, col in itertools.zip_longest(filterArray, row, fillvalue=True) if take]
+    def filter_using_list(row, filter_array):
+        return [col for take, col in itertools.zip_longest(filter_array, row, fillvalue=True) if take]
 
     max_lens = get_max_lens(data) if hide_empty else []
     header_row = filter_using_list(header_row, max_lens)
     data = [filter_using_list(row, max_lens) for row in data]
 
-    table = [header_row] + data
+    table = [header_row, *data]
     max_lens = get_max_lens(table)
     extra_gap += 1
     if delim:
-        table = [header_row, [delim * (ml + extra_gap) for ml in max_lens]] + data
+        table = [header_row, [delim * (ml + extra_gap) for ml in max_lens], *data]
         table[1][-1] = table[1][-1][:-extra_gap * len(delim)]  # Remove extra_gap from end of delimiter
     for row in table:
         for pos, text in enumerate(map(str, row)):
@@ -3117,8 +3207,7 @@ def render_table(header_row, data, delim=False, extra_gap=0, hide_empty=False):
                 row[pos] = text.replace('\t', ' ' * (max_lens[pos] - width(text))) + ' ' * extra_gap
             else:
                 row[pos] = text + ' ' * (max_lens[pos] - width(text) + extra_gap)
-    ret = '\n'.join(''.join(row).rstrip() for row in table)
-    return ret
+    return '\n'.join(''.join(row).rstrip() for row in table)
 
 
 def _match_one(filter_part, dct, incomplete):
@@ -3145,12 +3234,12 @@ def _match_one(filter_part, dct, incomplete):
 
     operator_rex = re.compile(r'''(?x)
         (?P<key>[a-z_]+)
-        \s*(?P<negation>!\s*)?(?P<op>%s)(?P<none_inclusive>\s*\?)?\s*
+        \s*(?P<negation>!\s*)?(?P<op>{})(?P<none_inclusive>\s*\?)?\s*
         (?:
             (?P<quote>["\'])(?P<quotedstrval>.+?)(?P=quote)|
             (?P<strval>.+?)
         )
-        ''' % '|'.join(map(re.escape, COMPARISON_OPERATORS.keys())))
+        '''.format('|'.join(map(re.escape, COMPARISON_OPERATORS.keys()))))
     m = operator_rex.fullmatch(filter_part.strip())
     if m:
         m = m.groupdict()
@@ -3159,9 +3248,9 @@ def _match_one(filter_part, dct, incomplete):
             op = lambda attr, value: not unnegated_op(attr, value)
         else:
             op = unnegated_op
-        comparison_value = m['quotedstrval'] or m['strval'] or m['intval']
+        comparison_value = m['quotedstrval'] or m['strval']
         if m['quote']:
-            comparison_value = comparison_value.replace(r'\%s' % m['quote'], m['quote'])
+            comparison_value = comparison_value.replace(r'\{}'.format(m['quote']), m['quote'])
         actual_value = dct.get(m['key'])
         numeric_comparison = None
         if isinstance(actual_value, (int, float)):
@@ -3178,7 +3267,7 @@ def _match_one(filter_part, dct, incomplete):
                 if numeric_comparison is None:
                     numeric_comparison = parse_duration(comparison_value)
         if numeric_comparison is not None and m['op'] in STRING_OPERATORS:
-            raise ValueError('Operator %s only supports string values!' % m['op'])
+            raise ValueError('Operator {} only supports string values!'.format(m['op']))
         if actual_value is None:
             return is_incomplete(m['key']) or m['none_inclusive']
         return op(actual_value, comparison_value if numeric_comparison is None else numeric_comparison)
@@ -3188,8 +3277,8 @@ def _match_one(filter_part, dct, incomplete):
         '!': lambda v: (v is False) if isinstance(v, bool) else (v is None),
     }
     operator_rex = re.compile(r'''(?x)
-        (?P<op>%s)\s*(?P<key>[a-z_]+)
-        ''' % '|'.join(map(re.escape, UNARY_OPERATORS.keys())))
+        (?P<op>{})\s*(?P<key>[a-z_]+)
+        '''.format('|'.join(map(re.escape, UNARY_OPERATORS.keys()))))
     m = operator_rex.fullmatch(filter_part.strip())
     if m:
         op = UNARY_OPERATORS[m.group('op')]
@@ -3198,7 +3287,7 @@ def _match_one(filter_part, dct, incomplete):
             return True
         return op(actual_value)
 
-    raise ValueError('Invalid filter part %r' % filter_part)
+    raise ValueError(f'Invalid filter part {filter_part!r}')
 
 
 def match_str(filter_str, dct, incomplete=False):
@@ -3216,6 +3305,8 @@ def match_str(filter_str, dct, incomplete=False):
 def match_filter_func(filters, breaking_filters=None):
     if not filters and not breaking_filters:
         return None
+    repr_ = f'{match_filter_func.__module__}.{match_filter_func.__qualname__}({filters}, {breaking_filters})'
+
     breaking_filters = match_filter_func(breaking_filters) or (lambda _, __: None)
     filters = set(variadic(filters or []))
 
@@ -3223,6 +3314,7 @@ def match_filter_func(filters, breaking_filters=None):
     if interactive:
         filters.remove('-')
 
+    @function_with_repr.set_repr(repr_)
     def _match_func(info_dict, incomplete=False):
         ret = breaking_filters(info_dict, incomplete)
         if ret is not None:
@@ -3302,10 +3394,10 @@ def ass_subtitles_timecode(seconds):
 
 
 def dfxp2srt(dfxp_data):
-    '''
+    """
     @param dfxp_data A bytes-like object containing DFXP data
     @returns A unicode object containing converted SRT data
-    '''
+    """
     LEGACY_NAMESPACES = (
         (b'http://www.w3.org/ns/ttml', [
             b'http://www.w3.org/2004/11/ttaf1',
@@ -3323,7 +3415,7 @@ def dfxp2srt(dfxp_data):
         'fontSize',
         'fontStyle',
         'fontWeight',
-        'textDecoration'
+        'textDecoration',
     ]
 
     _x = functools.partial(xpath_with_ns, ns_map={
@@ -3361,11 +3453,11 @@ def dfxp2srt(dfxp_data):
                         if self._applied_styles and self._applied_styles[-1].get(k) == v:
                             continue
                         if k == 'color':
-                            font += ' color="%s"' % v
+                            font += f' color="{v}"'
                         elif k == 'fontSize':
-                            font += ' size="%s"' % v
+                            font += f' size="{v}"'
                         elif k == 'fontFamily':
-                            font += ' face="%s"' % v
+                            font += f' face="{v}"'
                         elif k == 'fontWeight' and v == 'bold':
                             self._out += '<b>'
                             unclosed_elements.append('b')
@@ -3389,7 +3481,7 @@ def dfxp2srt(dfxp_data):
             if tag not in (_x('ttml:br'), 'br'):
                 unclosed_elements = self._unclosed_elements.pop()
                 for element in reversed(unclosed_elements):
-                    self._out += '</%s>' % element
+                    self._out += f'</{element}>'
                 if unclosed_elements and self._applied_styles:
                     self._applied_styles.pop()
 
@@ -4300,7 +4392,7 @@ def bytes_to_long(s):
 
 
 def ohdave_rsa_encrypt(data, exponent, modulus):
-    '''
+    """
     Implement OHDave's RSA algorithm. See http://www.ohdave.com/rsa/
 
     Input:
@@ -4309,11 +4401,11 @@ def ohdave_rsa_encrypt(data, exponent, modulus):
     Output: hex string of encrypted data
 
     Limitation: supports one block encryption only
-    '''
+    """
 
     payload = int(binascii.hexlify(data[::-1]), 16)
     encrypted = pow(payload, exponent, modulus)
-    return '%x' % encrypted
+    return f'{encrypted:x}'
 
 
 def pkcs1pad(data, length):
@@ -4328,7 +4420,7 @@ def pkcs1pad(data, length):
         raise ValueError('Input data too long for PKCS#1 padding')
 
     pseudo_random = [random.randint(0, 254) for _ in range(length - len(data) - 3)]
-    return [0, 2] + pseudo_random + [0] + data
+    return [0, 2, *pseudo_random, 0, *data]
 
 
 def _base_n_table(n, table):
@@ -4410,7 +4502,7 @@ def urshift(val, n):
 def write_xattr(path, key, value):
     # Windows: Write xattrs to NTFS Alternate Data Streams:
     # http://en.wikipedia.org/wiki/NTFS#Alternate_data_streams_.28ADS.29
-    if compat_os_name == 'nt':
+    if os.name == 'nt':
         assert ':' not in key
         assert os.path.exists(path)
 
@@ -4421,10 +4513,12 @@ def write_xattr(path, key, value):
             raise XAttrMetadataError(e.errno, e.strerror)
         return
 
-    # UNIX Method 1. Use xattrs/pyxattrs modules
+    # UNIX Method 1. Use os.setxattr/xattrs/pyxattrs modules
 
     setxattr = None
-    if getattr(xattr, '_yt_dlp__identifier', None) == 'pyxattr':
+    if callable(getattr(os, 'setxattr', None)):
+        setxattr = os.setxattr
+    elif getattr(xattr, '_yt_dlp__identifier', None) == 'pyxattr':
         # Unicode arguments are not supported in pyxattr until version 0.5.0
         # See https://github.com/ytdl-org/youtube-dl/issues/5498
         if version_tuple(xattr.__version__) >= (0, 5, 0):
@@ -4444,7 +4538,7 @@ def write_xattr(path, key, value):
            else 'xattr' if check_executable('xattr', ['-h']) else None)
     if not exe:
         raise XAttrUnavailableError(
-            'Couldn\'t find a tool to set the xattrs. Install either the python "xattr" or "pyxattr" modules or the '
+            'Couldn\'t find a tool to set the xattrs. Install either the "xattr" or "pyxattr" Python modules or the '
             + ('"xattr" binary' if sys.platform != 'linux' else 'GNU "attr" package (which contains the "setfattr" tool)'))
 
     value = value.decode()
@@ -4459,10 +4553,10 @@ def write_xattr(path, key, value):
 
 
 def random_birthday(year_field, month_field, day_field):
-    start_date = datetime.date(1950, 1, 1)
-    end_date = datetime.date(1995, 12, 31)
+    start_date = dt.date(1950, 1, 1)
+    end_date = dt.date(1995, 12, 31)
     offset = random.randint(0, (end_date - start_date).days)
-    random_date = start_date + datetime.timedelta(offset)
+    random_date = start_date + dt.timedelta(offset)
     return {
         year_field: str(random_date.year),
         month_field: str(random_date.month),
@@ -4564,6 +4658,7 @@ def to_high_limit_path(path):
     return path
 
 
+@partial_application
 def format_field(obj, field=None, template='%s', ignore=NO_DEFAULT, default='', func=IDENTITY):
     val = traversal.traverse_obj(obj, *variadic(field))
     if not val if ignore is NO_DEFAULT else val in variadic(ignore):
@@ -4641,7 +4736,7 @@ def time_seconds(**kwargs):
     """
     Returns TZ-aware time in seconds since the epoch (1970-01-01T00:00:00Z)
     """
-    return time.time() + datetime.timedelta(**kwargs).total_seconds()
+    return time.time() + dt.timedelta(**kwargs).total_seconds()
 
 
 # create a JSON Web Signature (jws) with HS256 algorithm
@@ -4659,24 +4754,22 @@ def jwt_encode_hs256(payload_data, key, headers={}):
     payload_b64 = base64.b64encode(json.dumps(payload_data).encode())
     h = hmac.new(key.encode(), header_b64 + b'.' + payload_b64, hashlib.sha256)
     signature_b64 = base64.b64encode(h.digest())
-    token = header_b64 + b'.' + payload_b64 + b'.' + signature_b64
-    return token
+    return header_b64 + b'.' + payload_b64 + b'.' + signature_b64
 
 
 # can be extended in future to verify the signature and parse header and return the algorithm used if it's not HS256
 def jwt_decode_hs256(jwt):
     header_b64, payload_b64, signature_b64 = jwt.split('.')
     # add trailing ='s that may have been stripped, superfluous ='s are ignored
-    payload_data = json.loads(base64.urlsafe_b64decode(f'{payload_b64}==='))
-    return payload_data
+    return json.loads(base64.urlsafe_b64decode(f'{payload_b64}==='))
 
 
-WINDOWS_VT_MODE = False if compat_os_name == 'nt' else None
+WINDOWS_VT_MODE = False if os.name == 'nt' else None
 
 
 @functools.cache
 def supports_terminal_sequences(stream):
-    if compat_os_name == 'nt':
+    if os.name == 'nt':
         if not WINDOWS_VT_MODE:
             return False
     elif not os.getenv('TERM'):
@@ -4746,7 +4839,7 @@ def scale_thumbnails_to_max_format_width(formats, thumbnails, url_width_re):
     """
     _keys = ('width', 'height')
     max_dimensions = max(
-        (tuple(format.get(k) or 0 for k in _keys) for format in formats),
+        (tuple(fmt.get(k) or 0 for k in _keys) for fmt in formats),
         default=(0, 0))
     if not max_dimensions[0]:
         return thumbnails
@@ -4769,8 +4862,9 @@ def parse_http_range(range):
 
 
 def read_stdin(what):
-    eof = 'Ctrl+Z' if compat_os_name == 'nt' else 'Ctrl+D'
-    write_string(f'Reading {what} from STDIN - EOF ({eof}) to end:\n')
+    if what:
+        eof = 'Ctrl+Z' if os.name == 'nt' else 'Ctrl+D'
+        write_string(f'Reading {what} from STDIN - EOF ({eof}) to end:\n')
     return sys.stdin
 
 
@@ -4901,77 +4995,6 @@ class Config:
         return self.parser.parse_args(self.all_args)
 
 
-class WebSocketsWrapper:
-    """Wraps websockets module to use in non-async scopes"""
-    pool = None
-
-    def __init__(self, url, headers=None, connect=True):
-        self.loop = asyncio.new_event_loop()
-        # XXX: "loop" is deprecated
-        self.conn = websockets.connect(
-            url, extra_headers=headers, ping_interval=None,
-            close_timeout=float('inf'), loop=self.loop, ping_timeout=float('inf'))
-        if connect:
-            self.__enter__()
-        atexit.register(self.__exit__, None, None, None)
-
-    def __enter__(self):
-        if not self.pool:
-            self.pool = self.run_with_loop(self.conn.__aenter__(), self.loop)
-        return self
-
-    def send(self, *args):
-        self.run_with_loop(self.pool.send(*args), self.loop)
-
-    def recv(self, *args):
-        return self.run_with_loop(self.pool.recv(*args), self.loop)
-
-    def __exit__(self, type, value, traceback):
-        try:
-            return self.run_with_loop(self.conn.__aexit__(type, value, traceback), self.loop)
-        finally:
-            self.loop.close()
-            self._cancel_all_tasks(self.loop)
-
-    # taken from https://github.com/python/cpython/blob/3.9/Lib/asyncio/runners.py with modifications
-    # for contributors: If there's any new library using asyncio needs to be run in non-async, move these function out of this class
-    @staticmethod
-    def run_with_loop(main, loop):
-        if not asyncio.iscoroutine(main):
-            raise ValueError(f'a coroutine was expected, got {main!r}')
-
-        try:
-            return loop.run_until_complete(main)
-        finally:
-            loop.run_until_complete(loop.shutdown_asyncgens())
-            if hasattr(loop, 'shutdown_default_executor'):
-                loop.run_until_complete(loop.shutdown_default_executor())
-
-    @staticmethod
-    def _cancel_all_tasks(loop):
-        to_cancel = asyncio.all_tasks(loop)
-
-        if not to_cancel:
-            return
-
-        for task in to_cancel:
-            task.cancel()
-
-        # XXX: "loop" is removed in python 3.10+
-        loop.run_until_complete(
-            asyncio.gather(*to_cancel, loop=loop, return_exceptions=True))
-
-        for task in to_cancel:
-            if task.cancelled():
-                continue
-            if task.exception() is not None:
-                loop.call_exception_handler({
-                    'message': 'unhandled exception during asyncio.run() shutdown',
-                    'exception': task.exception(),
-                    'task': task,
-                })
-
-
 def merge_headers(*dicts):
     """Merge dicts of http headers case insensitively, prioritizing the latter ones"""
     return {k.title(): v for k, v in itertools.chain.from_iterable(map(dict.items, dicts))}
@@ -5022,6 +5045,10 @@ class function_with_repr:
     def __call__(self, *args, **kwargs):
         return self.func(*args, **kwargs)
 
+    @classmethod
+    def set_repr(cls, repr_):
+        return functools.partial(cls, repr_=repr_)
+
     def __repr__(self):
         if self.__repr:
             return self.__repr
@@ -5043,7 +5070,7 @@ MEDIA_EXTENSIONS = Namespace(
     common_video=('avi', 'flv', 'mkv', 'mov', 'mp4', 'webm'),
     video=('3g2', '3gp', 'f4v', 'mk3d', 'divx', 'mpg', 'ogv', 'm4v', 'wmv'),
     common_audio=('aiff', 'alac', 'flac', 'm4a', 'mka', 'mp3', 'ogg', 'opus', 'wav'),
-    audio=('aac', 'ape', 'asf', 'f4a', 'f4b', 'm4b', 'm4p', 'm4r', 'oga', 'ogx', 'spx', 'vorbis', 'wma', 'weba'),
+    audio=('aac', 'ape', 'asf', 'f4a', 'f4b', 'm4b', 'm4r', 'oga', 'ogx', 'spx', 'vorbis', 'wma', 'weba'),
     thumbnails=('jpg', 'png', 'webp'),
     storyboards=('mhtml', ),
     subtitles=('srt', 'vtt', 'ass', 'lrc'),
@@ -5055,6 +5082,139 @@ MEDIA_EXTENSIONS.audio += MEDIA_EXTENSIONS.common_audio
 KNOWN_EXTENSIONS = (*MEDIA_EXTENSIONS.video, *MEDIA_EXTENSIONS.audio, *MEDIA_EXTENSIONS.manifests)
 
 
+class _UnsafeExtensionError(Exception):
+    """
+    Mitigation exception for uncommon/malicious file extensions
+    This should be caught in YoutubeDL.py alongside a warning
+
+    Ref: https://github.com/yt-dlp/yt-dlp/security/advisories/GHSA-79w7-vh3h-8g4j
+    """
+    ALLOWED_EXTENSIONS = frozenset([
+        # internal
+        'description',
+        'json',
+        'meta',
+        'orig',
+        'part',
+        'temp',
+        'uncut',
+        'unknown_video',
+        'ytdl',
+
+        # video
+        *MEDIA_EXTENSIONS.video,
+        'asx',
+        'ismv',
+        'm2t',
+        'm2ts',
+        'm2v',
+        'm4s',
+        'mng',
+        'mp2v',
+        'mp4v',
+        'mpe',
+        'mpeg',
+        'mpeg1',
+        'mpeg2',
+        'mpeg4',
+        'mxf',
+        'ogm',
+        'qt',
+        'rm',
+        'swf',
+        'ts',
+        'vid',
+        'vob',
+        'vp9',
+
+        # audio
+        *MEDIA_EXTENSIONS.audio,
+        '3ga',
+        'ac3',
+        'adts',
+        'aif',
+        'au',
+        'dts',
+        'isma',
+        'it',
+        'mid',
+        'mod',
+        'mpga',
+        'mp1',
+        'mp2',
+        'mp4a',
+        'mpa',
+        'ra',
+        'shn',
+        'xm',
+
+        # image
+        *MEDIA_EXTENSIONS.thumbnails,
+        'avif',
+        'bmp',
+        'gif',
+        'heic',
+        'ico',
+        'image',
+        'jfif',
+        'jng',
+        'jpe',
+        'jpeg',
+        'jxl',
+        'svg',
+        'tif',
+        'tiff',
+        'wbmp',
+
+        # subtitle
+        *MEDIA_EXTENSIONS.subtitles,
+        'dfxp',
+        'fs',
+        'ismt',
+        'json3',
+        'sami',
+        'scc',
+        'srv1',
+        'srv2',
+        'srv3',
+        'ssa',
+        'tt',
+        'ttml',
+        'xml',
+
+        # others
+        *MEDIA_EXTENSIONS.manifests,
+        *MEDIA_EXTENSIONS.storyboards,
+        'desktop',
+        'ism',
+        'm3u',
+        'sbv',
+        'url',
+        'webloc',
+    ])
+
+    def __init__(self, extension, /):
+        super().__init__(f'unsafe file extension: {extension!r}')
+        self.extension = extension
+
+    @classmethod
+    def sanitize_extension(cls, extension, /, *, prepend=False):
+        if extension is None:
+            return None
+
+        if '/' in extension or '\\' in extension:
+            raise cls(extension)
+
+        if not prepend:
+            _, _, last = extension.rpartition('.')
+            if last == 'bin':
+                extension = last = 'unknown_video'
+            if last.lower() not in cls.ALLOWED_EXTENSIONS:
+                raise cls(extension)
+
+        return extension
+
+
 class RetryManager:
     """Usage:
         for retry in RetryManager(...):
@@ -5111,16 +5271,18 @@ class RetryManager:
             time.sleep(delay)
 
 
+@partial_application
 def make_archive_id(ie, video_id):
     ie_key = ie if isinstance(ie, str) else ie.ie_key()
     return f'{ie_key.lower()} {video_id}'
 
 
+@partial_application
 def truncate_string(s, left, right=0):
     assert left > 3 and right >= 0
     if s is None or len(s) <= left + right:
         return s
-    return f'{s[:left-3]}...{s[-right:] if right else ""}'
+    return f'{s[:left - 3]}...{s[-right:] if right else ""}'
 
 
 def orderedSet_from_options(options, alias_dict, *, use_regex=False, start=None):
@@ -5158,15 +5320,18 @@ class FormatSorter:
     regex = r' *((?P<reverse>\+)?(?P<field>[a-zA-Z0-9_]+)((?P<separator>[~:])(?P<limit>.*?))?)? *$'
 
     default = ('hidden', 'aud_or_vid', 'hasvid', 'ie_pref', 'lang', 'quality',
-               'res', 'fps', 'hdr:12', 'vcodec:vp9.2', 'channels', 'acodec',
+               'res', 'fps', 'hdr:12', 'vcodec', 'channels', 'acodec',
                'size', 'br', 'asr', 'proto', 'ext', 'hasaud', 'source', 'id')  # These must not be aliases
+    _prefer_vp9_sort = ('hidden', 'aud_or_vid', 'hasvid', 'ie_pref', 'lang', 'quality',
+                        'res', 'fps', 'hdr:12', 'vcodec:vp9.2', 'channels', 'acodec',
+                        'size', 'br', 'asr', 'proto', 'ext', 'hasaud', 'source', 'id')
     ytdl_default = ('hasaud', 'lang', 'quality', 'tbr', 'filesize', 'vbr',
                     'height', 'width', 'proto', 'vext', 'abr', 'aext',
                     'fps', 'fs_approx', 'source', 'id')
 
     settings = {
         'vcodec': {'type': 'ordered', 'regex': True,
-                   'order': ['av0?1', 'vp0?9.2', 'vp0?9', '[hx]265|he?vc?', '[hx]264|avc', 'vp0?8', 'mp4v|h263', 'theora', '', None, 'none']},
+                   'order': ['av0?1', r'vp0?9\.0?2', 'vp0?9', '[hx]265|he?vc?', '[hx]264|avc', 'vp0?8', 'mp4v|h263', 'theora', '', None, 'none']},
         'acodec': {'type': 'ordered', 'regex': True,
                    'order': ['[af]lac', 'wav|aiff', 'opus', 'vorbis|ogg', 'aac', 'mp?4a?', 'mp3', 'ac-?4', 'e-?a?c-?3', 'ac-?3', 'dts', '', None, 'none']},
         'hdr': {'type': 'ordered', 'regex': True, 'field': 'dynamic_range',
@@ -5208,7 +5373,7 @@ class FormatSorter:
                  'function': lambda it: next(filter(None, it), None)},
         'ext': {'type': 'combined', 'field': ('vext', 'aext')},
         'res': {'type': 'multiple', 'field': ('height', 'width'),
-                'function': lambda it: (lambda l: min(l) if l else 0)(tuple(filter(None, it)))},
+                'function': lambda it: min(filter(None, it), default=0)},
 
         # Actual field names
         'format_id': {'type': 'alias', 'field': 'id'},
@@ -5256,21 +5421,21 @@ class FormatSorter:
             self.ydl.deprecated_feature(f'Using arbitrary fields ({field}) for format sorting is '
                                         'deprecated and may be removed in a future version')
             self.settings[field] = {}
-        propObj = self.settings[field]
-        if key not in propObj:
-            type = propObj.get('type')
+        prop_obj = self.settings[field]
+        if key not in prop_obj:
+            type_ = prop_obj.get('type')
             if key == 'field':
-                default = 'preference' if type == 'extractor' else (field,) if type in ('combined', 'multiple') else field
+                default = 'preference' if type_ == 'extractor' else (field,) if type_ in ('combined', 'multiple') else field
             elif key == 'convert':
-                default = 'order' if type == 'ordered' else 'float_string' if field else 'ignore'
+                default = 'order' if type_ == 'ordered' else 'float_string' if field else 'ignore'
             else:
-                default = {'type': 'field', 'visible': True, 'order': [], 'not_in_list': (None,)}.get(key, None)
-            propObj[key] = default
-        return propObj[key]
+                default = {'type': 'field', 'visible': True, 'order': [], 'not_in_list': (None,)}.get(key)
+            prop_obj[key] = default
+        return prop_obj[key]
 
-    def _resolve_field_value(self, field, value, convertNone=False):
+    def _resolve_field_value(self, field, value, convert_none=False):
         if value is None:
-            if not convertNone:
+            if not convert_none:
                 return None
         else:
             value = value.lower()
@@ -5332,7 +5497,7 @@ class FormatSorter:
         for item in sort_list:
             match = re.match(self.regex, item)
             if match is None:
-                raise ExtractorError('Invalid format sort string "%s" given by extractor' % item)
+                raise ExtractorError(f'Invalid format sort string "{item}" given by extractor')
             field = match.group('field')
             if field is None:
                 continue
@@ -5360,31 +5525,31 @@ class FormatSorter:
 
     def print_verbose_info(self, write_debug):
         if self._sort_user:
-            write_debug('Sort order given by user: %s' % ', '.join(self._sort_user))
+            write_debug('Sort order given by user: {}'.format(', '.join(self._sort_user)))
         if self._sort_extractor:
-            write_debug('Sort order given by extractor: %s' % ', '.join(self._sort_extractor))
-        write_debug('Formats sorted by: %s' % ', '.join(['%s%s%s' % (
+            write_debug('Sort order given by extractor: {}'.format(', '.join(self._sort_extractor)))
+        write_debug('Formats sorted by: {}'.format(', '.join(['{}{}{}'.format(
             '+' if self._get_field_setting(field, 'reverse') else '', field,
-            '%s%s(%s)' % ('~' if self._get_field_setting(field, 'closest') else ':',
-                          self._get_field_setting(field, 'limit_text'),
-                          self._get_field_setting(field, 'limit'))
+            '{}{}({})'.format('~' if self._get_field_setting(field, 'closest') else ':',
+                              self._get_field_setting(field, 'limit_text'),
+                              self._get_field_setting(field, 'limit'))
             if self._get_field_setting(field, 'limit_text') is not None else '')
-            for field in self._order if self._get_field_setting(field, 'visible')]))
+            for field in self._order if self._get_field_setting(field, 'visible')])))
 
-    def _calculate_field_preference_from_value(self, format, field, type, value):
+    def _calculate_field_preference_from_value(self, format_, field, type_, value):
         reverse = self._get_field_setting(field, 'reverse')
         closest = self._get_field_setting(field, 'closest')
         limit = self._get_field_setting(field, 'limit')
 
-        if type == 'extractor':
+        if type_ == 'extractor':
             maximum = self._get_field_setting(field, 'max')
             if value is None or (maximum is not None and value >= maximum):
                 value = -1
-        elif type == 'boolean':
+        elif type_ == 'boolean':
             in_list = self._get_field_setting(field, 'in_list')
             not_in_list = self._get_field_setting(field, 'not_in_list')
             value = 0 if ((in_list is None or value in in_list) and (not_in_list is None or value not in not_in_list)) else -1
-        elif type == 'ordered':
+        elif type_ == 'ordered':
             value = self._resolve_field_value(field, value, True)
 
         # try to convert to number
@@ -5400,26 +5565,27 @@ class FormatSorter:
                 else (0, -value, 0) if limit is None or (reverse and value == limit) or value > limit
                 else (-1, value, 0))
 
-    def _calculate_field_preference(self, format, field):
-        type = self._get_field_setting(field, 'type')  # extractor, boolean, ordered, field, multiple
-        get_value = lambda f: format.get(self._get_field_setting(f, 'field'))
-        if type == 'multiple':
-            type = 'field'  # Only 'field' is allowed in multiple for now
+    def _calculate_field_preference(self, format_, field):
+        type_ = self._get_field_setting(field, 'type')  # extractor, boolean, ordered, field, multiple
+        get_value = lambda f: format_.get(self._get_field_setting(f, 'field'))
+        if type_ == 'multiple':
+            type_ = 'field'  # Only 'field' is allowed in multiple for now
             actual_fields = self._get_field_setting(field, 'field')
 
             value = self._get_field_setting(field, 'function')(get_value(f) for f in actual_fields)
         else:
             value = get_value(field)
-        return self._calculate_field_preference_from_value(format, field, type, value)
+        return self._calculate_field_preference_from_value(format_, field, type_, value)
 
-    def calculate_preference(self, format):
+    @staticmethod
+    def _fill_sorting_fields(format):
         # Determine missing protocol
         if not format.get('protocol'):
             format['protocol'] = determine_protocol(format)
 
         # Determine missing ext
         if not format.get('ext') and 'url' in format:
-            format['ext'] = determine_ext(format['url'])
+            format['ext'] = determine_ext(format['url']).lower()
         if format.get('vcodec') == 'none':
             format['audio_ext'] = format['ext'] if format.get('acodec') != 'none' else 'none'
             format['video_ext'] = 'none'
@@ -5447,9 +5613,40 @@ class FormatSorter:
         if not format.get('tbr'):
             format['tbr'] = try_call(lambda: format['vbr'] + format['abr']) or None
 
+    def calculate_preference(self, format):
+        self._fill_sorting_fields(format)
         return tuple(self._calculate_field_preference(format, field) for field in self._order)
 
 
+def filesize_from_tbr(tbr, duration):
+    """
+    @param tbr:      Total bitrate in kbps (1000 bits/sec)
+    @param duration: Duration in seconds
+    @returns         Filesize in bytes
+    """
+    if tbr is None or duration is None:
+        return None
+    return int(duration * tbr * (1000 / 8))
+
+
+def _request_dump_filename(url, video_id, data=None, trim_length=None):
+    if data is not None:
+        data = hashlib.md5(data).hexdigest()
+    basen = join_nonempty(video_id, data, url, delim='_')
+    trim_length = trim_length or 240
+    if len(basen) > trim_length:
+        h = '___' + hashlib.md5(basen.encode()).hexdigest()
+        basen = basen[:trim_length - len(h)] + h
+    filename = sanitize_filename(f'{basen}.dump', restricted=True)
+    # Working around MAX_PATH limitation on Windows (see
+    # http://msdn.microsoft.com/en-us/library/windows/desktop/aa365247(v=vs.85).aspx)
+    if os.name == 'nt':
+        absfilepath = os.path.abspath(filename)
+        if len(absfilepath) > 259:
+            filename = fR'\\?\{absfilepath}'
+    return filename
+
+
 # XXX: Temporary
 class _YDLLogger:
     def __init__(self, ydl=None):
@@ -5478,3 +5675,32 @@ class _YDLLogger:
     def stderr(self, message):
         if self._ydl:
             self._ydl.to_stderr(message)
+
+
+class _ProgressState(enum.Enum):
+    """
+    Represents a state for a progress bar.
+
+    See: https://conemu.github.io/en/AnsiEscapeCodes.html#ConEmu_specific_OSC
+    """
+
+    HIDDEN = 0
+    INDETERMINATE = 3
+    VISIBLE = 1
+    WARNING = 4
+    ERROR = 2
+
+    @classmethod
+    def from_dict(cls, s, /):
+        if s['status'] == 'finished':
+            return cls.INDETERMINATE
+
+        # Not currently used
+        if s['status'] == 'error':
+            return cls.ERROR
+
+        return cls.INDETERMINATE if s.get('_percent') is None else cls.VISIBLE
+
+    def get_ansi_escape(self, /, percent=None):
+        percent = 0 if percent is None else int(percent)
+        return f'\033]9;4;{self.value};{percent}\007'
diff --git a/plugins/youtube_download/yt_dlp/utils/networking.py b/plugins/youtube_download/yt_dlp/utils/networking.py
index ba0493c..542abac 100644
--- a/plugins/youtube_download/yt_dlp/utils/networking.py
+++ b/plugins/youtube_download/yt_dlp/utils/networking.py
@@ -1,9 +1,16 @@
+from __future__ import annotations
+
 import collections
+import collections.abc
 import random
+import typing
 import urllib.parse
 import urllib.request
 
-from ._utils import remove_start
+if typing.TYPE_CHECKING:
+    T = typing.TypeVar('T')
+
+from ._utils import NO_DEFAULT, remove_start
 
 
 def random_user_agent():
@@ -51,32 +58,141 @@ def random_user_agent():
     return _USER_AGENT_TPL % random.choice(_CHROME_VERSIONS)
 
 
-class HTTPHeaderDict(collections.UserDict, dict):
+class HTTPHeaderDict(dict):
     """
     Store and access keys case-insensitively.
     The constructor can take multiple dicts, in which keys in the latter are prioritised.
+
+    Retains a case sensitive mapping of the headers, which can be accessed via `.sensitive()`.
     """
+    def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> typing.Self:
+        obj = dict.__new__(cls, *args, **kwargs)
+        obj.__sensitive_map = {}
+        return obj
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, /, *args, **kwargs):
         super().__init__()
-        for dct in args:
-            if dct is not None:
-                self.update(dct)
-        self.update(kwargs)
+        self.__sensitive_map = {}
 
-    def __setitem__(self, key, value):
-        if isinstance(value, bytes):
-            value = value.decode('latin-1')
-        super().__setitem__(key.title(), str(value))
+        for dct in filter(None, args):
+            self.update(dct)
+        if kwargs:
+            self.update(kwargs)
 
-    def __getitem__(self, key):
+    def sensitive(self, /) -> dict[str, str]:
+        return {
+            self.__sensitive_map[key]: value
+            for key, value in self.items()
+        }
+
+    def __contains__(self, key: str, /) -> bool:
+        return super().__contains__(key.title() if isinstance(key, str) else key)
+
+    def __delitem__(self, key: str, /) -> None:
+        key = key.title()
+        del self.__sensitive_map[key]
+        super().__delitem__(key)
+
+    def __getitem__(self, key, /) -> str:
         return super().__getitem__(key.title())
 
-    def __delitem__(self, key):
-        super().__delitem__(key.title())
+    def __ior__(self, other, /):
+        if isinstance(other, type(self)):
+            other = other.sensitive()
+        if isinstance(other, dict):
+            self.update(other)
+            return
+        return NotImplemented
 
-    def __contains__(self, key):
-        return super().__contains__(key.title() if isinstance(key, str) else key)
+    def __or__(self, other, /) -> typing.Self:
+        if isinstance(other, type(self)):
+            other = other.sensitive()
+        if isinstance(other, dict):
+            return type(self)(self.sensitive(), other)
+        return NotImplemented
+
+    def __ror__(self, other, /) -> typing.Self:
+        if isinstance(other, type(self)):
+            other = other.sensitive()
+        if isinstance(other, dict):
+            return type(self)(other, self.sensitive())
+        return NotImplemented
+
+    def __setitem__(self, key: str, value, /) -> None:
+        if isinstance(value, bytes):
+            value = value.decode('latin-1')
+        key_title = key.title()
+        self.__sensitive_map[key_title] = key
+        super().__setitem__(key_title, str(value).strip())
+
+    def clear(self, /) -> None:
+        self.__sensitive_map.clear()
+        super().clear()
+
+    def copy(self, /) -> typing.Self:
+        return type(self)(self.sensitive())
+
+    @typing.overload
+    def get(self, key: str, /) -> str | None: ...
+
+    @typing.overload
+    def get(self, key: str, /, default: T) -> str | T: ...
+
+    def get(self, key, /, default=NO_DEFAULT):
+        key = key.title()
+        if default is NO_DEFAULT:
+            return super().get(key)
+        return super().get(key, default)
+
+    @typing.overload
+    def pop(self, key: str, /) -> str: ...
+
+    @typing.overload
+    def pop(self, key: str, /, default: T) -> str | T: ...
+
+    def pop(self, key, /, default=NO_DEFAULT):
+        key = key.title()
+        if default is NO_DEFAULT:
+            self.__sensitive_map.pop(key)
+            return super().pop(key)
+        self.__sensitive_map.pop(key, default)
+        return super().pop(key, default)
+
+    def popitem(self) -> tuple[str, str]:
+        self.__sensitive_map.popitem()
+        return super().popitem()
+
+    @typing.overload
+    def setdefault(self, key: str, /) -> str: ...
+
+    @typing.overload
+    def setdefault(self, key: str, /, default) -> str: ...
+
+    def setdefault(self, key, /, default=None) -> str:
+        key = key.title()
+        if key in self.__sensitive_map:
+            return super().__getitem__(key)
+
+        self[key] = default or ''
+        return self[key]
+
+    def update(self, other, /, **kwargs) -> None:
+        if isinstance(other, type(self)):
+            other = other.sensitive()
+        if isinstance(other, collections.abc.Mapping):
+            for key, value in other.items():
+                self[key] = value
+
+        elif hasattr(other, 'keys'):
+            for key in other.keys():  # noqa: SIM118
+                self[key] = other[key]
+
+        else:
+            for key, value in other:
+                self[key] = value
+
+        for key, value in kwargs.items():
+            self[key] = value
 
 
 std_headers = HTTPHeaderDict({
@@ -112,7 +228,7 @@ def clean_proxies(proxies: dict, headers: HTTPHeaderDict):
 
             replace_scheme = {
                 'socks5': 'socks5h',  # compat: socks5 was treated as socks5h
-                'socks': 'socks4'  # compat: non-standard
+                'socks': 'socks4',  # compat: non-standard
             }
             if proxy_scheme in replace_scheme:
                 proxies[proxy_key] = urllib.parse.urlunparse(
@@ -123,6 +239,7 @@ def clean_headers(headers: HTTPHeaderDict):
     if 'Youtubedl-No-Compression' in headers:  # compat
         del headers['Youtubedl-No-Compression']
         headers['Accept-Encoding'] = 'identity'
+    headers.pop('Ytdl-socks-proxy', None)
 
 
 def remove_dot_segments(path):
@@ -159,5 +276,5 @@ def normalize_url(url):
         path=escape_rfc3986(remove_dot_segments(url_parsed.path)),
         params=escape_rfc3986(url_parsed.params),
         query=escape_rfc3986(url_parsed.query),
-        fragment=escape_rfc3986(url_parsed.fragment)
+        fragment=escape_rfc3986(url_parsed.fragment),
     ).geturl()
diff --git a/plugins/youtube_download/yt_dlp/utils/progress.py b/plugins/youtube_download/yt_dlp/utils/progress.py
new file mode 100644
index 0000000..f254a38
--- /dev/null
+++ b/plugins/youtube_download/yt_dlp/utils/progress.py
@@ -0,0 +1,109 @@
+from __future__ import annotations
+
+import bisect
+import threading
+import time
+
+
+class ProgressCalculator:
+    # Time to calculate the speed over (seconds)
+    SAMPLING_WINDOW = 3
+    # Minimum timeframe before to sample next downloaded bytes (seconds)
+    SAMPLING_RATE = 0.05
+    # Time before showing eta (seconds)
+    GRACE_PERIOD = 1
+
+    def __init__(self, initial: int):
+        self._initial = initial or 0
+        self.downloaded = self._initial
+
+        self.elapsed: float = 0
+        self.speed = SmoothValue(0, smoothing=0.7)
+        self.eta = SmoothValue(None, smoothing=0.9)
+
+        self._total = 0
+        self._start_time = time.monotonic()
+        self._last_update = self._start_time
+
+        self._lock = threading.Lock()
+        self._thread_sizes: dict[int, int] = {}
+
+        self._times = [self._start_time]
+        self._downloaded = [self.downloaded]
+
+    @property
+    def total(self):
+        return self._total
+
+    @total.setter
+    def total(self, value: int | None):
+        with self._lock:
+            if value is not None and value < self.downloaded:
+                value = self.downloaded
+
+            self._total = value
+
+    def thread_reset(self):
+        current_thread = threading.get_ident()
+        with self._lock:
+            self._thread_sizes[current_thread] = 0
+
+    def update(self, size: int | None):
+        if not size:
+            return
+
+        current_thread = threading.get_ident()
+
+        with self._lock:
+            last_size = self._thread_sizes.get(current_thread, 0)
+            self._thread_sizes[current_thread] = size
+            self._update(size - last_size)
+
+    def _update(self, size: int):
+        current_time = time.monotonic()
+
+        self.downloaded += size
+        self.elapsed = current_time - self._start_time
+        if self.total is not None and self.downloaded > self.total:
+            self._total = self.downloaded
+
+        if self._last_update + self.SAMPLING_RATE > current_time:
+            return
+        self._last_update = current_time
+
+        self._times.append(current_time)
+        self._downloaded.append(self.downloaded)
+
+        offset = bisect.bisect_left(self._times, current_time - self.SAMPLING_WINDOW)
+        del self._times[:offset]
+        del self._downloaded[:offset]
+        if len(self._times) < 2:
+            self.speed.reset()
+            self.eta.reset()
+            return
+
+        download_time = current_time - self._times[0]
+        if not download_time:
+            return
+
+        self.speed.set((self.downloaded - self._downloaded[0]) / download_time)
+        if self.total and self.speed.value and self.elapsed > self.GRACE_PERIOD:
+            self.eta.set((self.total - self.downloaded) / self.speed.value)
+        else:
+            self.eta.reset()
+
+
+class SmoothValue:
+    def __init__(self, initial: float | None, smoothing: float):
+        self.value = self.smooth = self._initial = initial
+        self._smoothing = smoothing
+
+    def set(self, value: float):
+        self.value = value
+        if self.smooth is None:
+            self.smooth = self.value
+        else:
+            self.smooth = (1 - self._smoothing) * value + self._smoothing * self.smooth
+
+    def reset(self):
+        self.value = self.smooth = self._initial
diff --git a/plugins/youtube_download/yt_dlp/utils/traversal.py b/plugins/youtube_download/yt_dlp/utils/traversal.py
index 462c3ba..76b51f5 100644
--- a/plugins/youtube_download/yt_dlp/utils/traversal.py
+++ b/plugins/youtube_download/yt_dlp/utils/traversal.py
@@ -1,33 +1,54 @@
+from __future__ import annotations
+
+import collections
 import collections.abc
 import contextlib
+import functools
+import http.cookies
 import inspect
 import itertools
 import re
+import typing
+import xml.etree.ElementTree
 
 from ._utils import (
     IDENTITY,
     NO_DEFAULT,
+    ExtractorError,
     LazyList,
-    int_or_none,
+    deprecation_warning,
+    get_elements_html_by_class,
+    get_elements_html_by_attribute,
+    get_elements_by_attribute,
+    get_element_by_class,
+    get_element_html_by_attribute,
+    get_element_by_attribute,
+    get_element_html_by_id,
+    get_element_by_id,
+    get_element_html_by_class,
+    get_elements_by_class,
+    get_element_text_and_html_by_tag,
     is_iterable_like,
     try_call,
+    url_or_none,
     variadic,
 )
 
 
 def traverse_obj(
         obj, *paths, default=NO_DEFAULT, expected_type=None, get_all=True,
-        casesense=True, is_user_input=False, traverse_string=False):
+        casesense=True, is_user_input=NO_DEFAULT, traverse_string=False):
     """
     Safely traverse nested `dict`s and `Iterable`s
 
     >>> obj = [{}, {"key": "value"}]
     >>> traverse_obj(obj, (1, "key"))
-    "value"
+    'value'
 
     Each of the provided `paths` is tested and the first producing a valid result will be returned.
     The next path will also be tested if the path branched but no results could be found.
-    Supported values for traversal are `Mapping`, `Iterable` and `re.Match`.
+    Supported values for traversal are `Mapping`, `Iterable`, `re.Match`,
+    `xml.etree.ElementTree` (xpath) and `http.cookies.Morsel`.
     Unhelpful values (`{}`, `None`) are treated as the absence of a value and discarded.
 
     The paths will be wrapped in `variadic`, so that `'key'` is conveniently the same as `('key', )`.
@@ -35,8 +56,8 @@ def traverse_obj(
     The keys in the path can be one of:
         - `None`:           Return the current object.
         - `set`:            Requires the only item in the set to be a type or function,
-                            like `{type}`/`{func}`. If a `type`, returns only values
-                            of this type. If a function, returns `func(obj)`.
+                            like `{type}`/`{type, type, ...}`/`{func}`. If a `type`, return only
+                            values of this type. If a function, returns `func(obj)`.
         - `str`/`int`:      Return `obj[key]`. For `re.Match`, return `obj.group(key)`.
         - `slice`:          Branch out and return all values in `obj[key]`.
         - `Ellipsis`:       Branch out and return a list of all values.
@@ -47,12 +68,15 @@ def traverse_obj(
                             For `Iterable`s, `key` is the index of the value.
                             For `re.Match`es, `key` is the group number (0 = full match)
                             as well as additionally any group names, if given.
-        - `dict`            Transform the current object and return a matching dict.
+        - `dict`:           Transform the current object and return a matching dict.
                             Read as: `{key: traverse_obj(obj, path) for key, path in dct.items()}`.
+        - `any`-builtin:    Take the first matching object and return it, resetting branching.
+        - `all`-builtin:    Take all matching objects and return them as a list, resetting branching.
+        - `filter`-builtin: Return the value if it is truthy, `None` otherwise.
 
         `tuple`, `list`, and `dict` all support nested paths and branches.
 
-    @params paths           Paths which to traverse by.
+    @params paths           Paths by which to traverse.
     @param default          Value to return if the paths do not match.
                             If the last key in the path is a `dict`, it will apply to each value inside
                             the dict instead, depth first. Try to avoid if using nested `dict` keys.
@@ -63,10 +87,8 @@ def traverse_obj(
     @param get_all          If `False`, return the first matching result, otherwise all matching ones.
     @param casesense        If `False`, consider string dictionary keys as case insensitive.
 
-    The following are only meant to be used by YoutubeDL.prepare_outtmpl and are not part of the API
+    `traverse_string` is only meant to be used by YoutubeDL.prepare_outtmpl and is not part of the API
 
-    @param is_user_input    Whether the keys are generated from user input.
-                            If `True` strings get converted to `int`/`slice` if needed.
     @param traverse_string  Whether to traverse into objects as strings.
                             If `True`, any non-compatible object will first be
                             converted into a string and then traversed into.
@@ -80,6 +102,9 @@ def traverse_obj(
                             If no `default` is given and the last path branches, a `list` of results
                             is always returned. If a path ends on a `dict` that result will always be a `dict`.
     """
+    if is_user_input is not NO_DEFAULT:
+        deprecation_warning('The is_user_input parameter is deprecated and no longer works')
+
     casefold = lambda k: k.casefold() if isinstance(k, str) else k
 
     if isinstance(expected_type, type):
@@ -100,10 +125,10 @@ def traverse_obj(
             result = obj
 
         elif isinstance(key, set):
-            assert len(key) == 1, 'Set should only be used to wrap a single item'
             item = next(iter(key))
-            if isinstance(item, type):
-                if isinstance(obj, item):
+            if len(key) > 1 or isinstance(item, type):
+                assert all(isinstance(item, type) for item in key)
+                if isinstance(obj, tuple(key)):
                     result = obj
             else:
                 result = try_call(item, args=(obj,))
@@ -115,9 +140,11 @@ def traverse_obj(
 
         elif key is ...:
             branching = True
+            if isinstance(obj, http.cookies.Morsel):
+                obj = dict(obj, key=obj.key, value=obj.value)
             if isinstance(obj, collections.abc.Mapping):
                 result = obj.values()
-            elif is_iterable_like(obj):
+            elif is_iterable_like(obj) or isinstance(obj, xml.etree.ElementTree.Element):
                 result = obj
             elif isinstance(obj, re.Match):
                 result = obj.groups()
@@ -129,9 +156,11 @@ def traverse_obj(
 
         elif callable(key):
             branching = True
+            if isinstance(obj, http.cookies.Morsel):
+                obj = dict(obj, key=obj.key, value=obj.value)
             if isinstance(obj, collections.abc.Mapping):
                 iter_obj = obj.items()
-            elif is_iterable_like(obj):
+            elif is_iterable_like(obj) or isinstance(obj, xml.etree.ElementTree.Element):
                 iter_obj = enumerate(obj)
             elif isinstance(obj, re.Match):
                 iter_obj = itertools.chain(
@@ -155,6 +184,8 @@ def traverse_obj(
             } or None
 
         elif isinstance(obj, collections.abc.Mapping):
+            if isinstance(obj, http.cookies.Morsel):
+                obj = dict(obj, key=obj.key, value=obj.value)
             result = (try_call(obj.get, args=(key,)) if casesense or try_call(obj.__contains__, args=(key,)) else
                       next((v for k, v in obj.items() if casefold(k) == key), None))
 
@@ -167,7 +198,7 @@ def traverse_obj(
                 result = next((v for k, v in obj.groupdict().items() if casefold(k) == key), None)
 
         elif isinstance(key, (int, slice)):
-            if is_iterable_like(obj, collections.abc.Sequence):
+            if is_iterable_like(obj, (collections.abc.Sequence, xml.etree.ElementTree.Element)):
                 branching = isinstance(key, slice)
                 with contextlib.suppress(IndexError):
                     result = obj[key]
@@ -175,6 +206,34 @@ def traverse_obj(
                 with contextlib.suppress(IndexError):
                     result = str(obj)[key]
 
+        elif isinstance(obj, xml.etree.ElementTree.Element) and isinstance(key, str):
+            xpath, _, special = key.rpartition('/')
+            if not special.startswith('@') and not special.endswith('()'):
+                xpath = key
+                special = None
+
+            # Allow abbreviations of relative paths, absolute paths error
+            if xpath.startswith('/'):
+                xpath = f'.{xpath}'
+            elif xpath and not xpath.startswith('./'):
+                xpath = f'./{xpath}'
+
+            def apply_specials(element):
+                if special is None:
+                    return element
+                if special == '@':
+                    return element.attrib
+                if special.startswith('@'):
+                    return try_call(element.attrib.get, args=(special[1:],))
+                if special == 'text()':
+                    return element.text
+                raise SyntaxError(f'apply_specials is missing case for {special!r}')
+
+            if xpath:
+                result = list(map(apply_specials, obj.iterfind(xpath)))
+            else:
+                result = apply_specials(obj)
+
         return branching, result if branching else (result,)
 
     def lazy_last(iterable):
@@ -195,17 +254,22 @@ def traverse_obj(
 
         key = None
         for last, key in lazy_last(variadic(path, (str, bytes, dict, set))):
-            if is_user_input and isinstance(key, str):
-                if key == ':':
-                    key = ...
-                elif ':' in key:
-                    key = slice(*map(int_or_none, key.split(':')))
-                elif int_or_none(key) is not None:
-                    key = int(key)
-
             if not casesense and isinstance(key, str):
                 key = key.casefold()
 
+            if key in (any, all):
+                has_branched = False
+                filtered_objs = (obj for obj in objs if obj not in (None, {}))
+                if key is any:
+                    objs = (next(filtered_objs, None),)
+                else:
+                    objs = (list(filtered_objs),)
+                continue
+
+            if key is filter:
+                objs = filter(None, objs)
+                continue
+
             if __debug__ and callable(key):
                 # Verify function signature
                 inspect.signature(key).bind(None, None)
@@ -236,13 +300,172 @@ def traverse_obj(
         return results[0] if results else {} if allow_empty and is_dict else None
 
     for index, path in enumerate(paths, 1):
-        result = _traverse_obj(obj, path, index == len(paths), True)
-        if result is not None:
-            return result
+        is_last = index == len(paths)
+        try:
+            result = _traverse_obj(obj, path, is_last, True)
+            if result is not None:
+                return result
+        except _RequiredError as e:
+            if is_last:
+                # Reraise to get cleaner stack trace
+                raise ExtractorError(e.orig_msg, expected=e.expected) from None
 
     return None if default is NO_DEFAULT else default
 
 
+def value(value, /):
+    return lambda _: value
+
+
+def require(name, /, *, expected=False):
+    def func(value):
+        if value is None:
+            raise _RequiredError(f'Unable to extract {name}', expected=expected)
+
+        return value
+
+    return func
+
+
+class _RequiredError(ExtractorError):
+    pass
+
+
+@typing.overload
+def subs_list_to_dict(*, lang: str | None = 'und', ext: str | None = None) -> collections.abc.Callable[[list[dict]], dict[str, list[dict]]]: ...
+
+
+@typing.overload
+def subs_list_to_dict(subs: list[dict] | None, /, *, lang: str | None = 'und', ext: str | None = None) -> dict[str, list[dict]]: ...
+
+
+def subs_list_to_dict(subs: list[dict] | None = None, /, *, lang='und', ext=None):
+    """
+    Convert subtitles from a traversal into a subtitle dict.
+    The path should have an `all` immediately before this function.
+
+    Arguments:
+    `ext`      The default value for `ext` in the subtitle dict
+
+    In the dict you can set the following additional items:
+    `id`       The subtitle id to sort the dict into
+    `quality`  The sort order for each subtitle
+    """
+    if subs is None:
+        return functools.partial(subs_list_to_dict, lang=lang, ext=ext)
+
+    result = collections.defaultdict(list)
+
+    for sub in subs:
+        if not url_or_none(sub.get('url')) and not sub.get('data'):
+            continue
+        sub_id = sub.pop('id', None)
+        if not isinstance(sub_id, str):
+            if not lang:
+                continue
+            sub_id = lang
+        sub_ext = sub.get('ext')
+        if not isinstance(sub_ext, str):
+            if not ext:
+                sub.pop('ext', None)
+            else:
+                sub['ext'] = ext
+        result[sub_id].append(sub)
+    result = dict(result)
+
+    for subs in result.values():
+        subs.sort(key=lambda x: x.pop('quality', 0) or 0)
+
+    return result
+
+
+@typing.overload
+def find_element(*, attr: str, value: str, tag: str | None = None, html=False, regex=False): ...
+
+
+@typing.overload
+def find_element(*, cls: str, html=False): ...
+
+
+@typing.overload
+def find_element(*, id: str, tag: str | None = None, html=False, regex=False): ...
+
+
+@typing.overload
+def find_element(*, tag: str, html=False, regex=False): ...
+
+
+def find_element(*, tag=None, id=None, cls=None, attr=None, value=None, html=False, regex=False):
+    # deliberately using `id=` and `cls=` for ease of readability
+    assert tag or id or cls or (attr and value), 'One of tag, id, cls or (attr AND value) is required'
+    ANY_TAG = r'[\w:.-]+'
+
+    if attr and value:
+        assert not cls, 'Cannot match both attr and cls'
+        assert not id, 'Cannot match both attr and id'
+        func = get_element_html_by_attribute if html else get_element_by_attribute
+        return functools.partial(func, attr, value, tag=tag or ANY_TAG, escape_value=not regex)
+
+    elif cls:
+        assert not id, 'Cannot match both cls and id'
+        assert tag is None, 'Cannot match both cls and tag'
+        assert not regex, 'Cannot use regex with cls'
+        func = get_element_html_by_class if html else get_element_by_class
+        return functools.partial(func, cls)
+
+    elif id:
+        func = get_element_html_by_id if html else get_element_by_id
+        return functools.partial(func, id, tag=tag or ANY_TAG, escape_value=not regex)
+
+    index = int(bool(html))
+    return lambda html: get_element_text_and_html_by_tag(tag, html)[index]
+
+
+@typing.overload
+def find_elements(*, cls: str, html=False): ...
+
+
+@typing.overload
+def find_elements(*, attr: str, value: str, tag: str | None = None, html=False, regex=False): ...
+
+
+def find_elements(*, tag=None, cls=None, attr=None, value=None, html=False, regex=False):
+    # deliberately using `cls=` for ease of readability
+    assert cls or (attr and value), 'One of cls or (attr AND value) is required'
+
+    if attr and value:
+        assert not cls, 'Cannot match both attr and cls'
+        func = get_elements_html_by_attribute if html else get_elements_by_attribute
+        return functools.partial(func, attr, value, tag=tag or r'[\w:.-]+', escape_value=not regex)
+
+    assert not tag, 'Cannot match both cls and tag'
+    assert not regex, 'Cannot use regex with cls'
+    func = get_elements_html_by_class if html else get_elements_by_class
+    return functools.partial(func, cls)
+
+
+def trim_str(*, start=None, end=None):
+    def trim(s):
+        if s is None:
+            return None
+        start_idx = 0
+        if start and s.startswith(start):
+            start_idx = len(start)
+        if end and s.endswith(end):
+            return s[start_idx:-len(end)]
+        return s[start_idx:]
+
+    return trim
+
+
+def unpack(func, **kwargs):
+    @functools.wraps(func)
+    def inner(items):
+        return func(*items, **kwargs)
+
+    return inner
+
+
 def get_first(obj, *paths, **kwargs):
     return traverse_obj(obj, *((..., *variadic(keys)) for keys in paths), **kwargs, get_all=False)
 
diff --git a/plugins/youtube_download/yt_dlp/version.py b/plugins/youtube_download/yt_dlp/version.py
index 67cfe44..e8b2bf1 100644
--- a/plugins/youtube_download/yt_dlp/version.py
+++ b/plugins/youtube_download/yt_dlp/version.py
@@ -1,11 +1,15 @@
 # Autogenerated by devscripts/update-version.py
 
-__version__ = '2023.07.06'
+__version__ = '2025.04.30'
 
-RELEASE_GIT_HEAD = 'b532a3481046e1eabb6232ee8196fb696c356ff6'
+RELEASE_GIT_HEAD = '505b400795af557bdcfd9d4fa7e9133b26ef431c'
 
 VARIANT = None
 
 UPDATE_HINT = None
 
 CHANNEL = 'stable'
+
+ORIGIN = 'yt-dlp/yt-dlp'
+
+_pkg_version = '2025.04.30'
diff --git a/plugins/youtube_download/yt_dlp/webvtt.py b/plugins/youtube_download/yt_dlp/webvtt.py
index dd72982..9f1a508 100644
--- a/plugins/youtube_download/yt_dlp/webvtt.py
+++ b/plugins/youtube_download/yt_dlp/webvtt.py
@@ -77,9 +77,8 @@ class _MatchChildParser(_MatchParser):
 
 class ParseError(Exception):
     def __init__(self, parser):
-        super().__init__("Parse error at position %u (near %r)" % (
-            parser._pos, parser._data[parser._pos:parser._pos + 20]
-        ))
+        data = parser._data[parser._pos:parser._pos + 100]
+        super().__init__(f'Parse error at position {parser._pos} (near {data!r})')
 
 
 # While the specification <https://www.w3.org/TR/webvtt1/#webvtt-timestamp>
@@ -95,6 +94,7 @@ _REGEX_TS = re.compile(r'''(?x)
 _REGEX_EOF = re.compile(r'\Z')
 _REGEX_NL = re.compile(r'(?:\r\n|[\r\n]|$)')
 _REGEX_BLANK = re.compile(r'(?:\r\n|[\r\n])+')
+_REGEX_OPTIONAL_WHITESPACE = re.compile(r'[ \t]*')
 
 
 def _parse_ts(ts):
@@ -148,7 +148,7 @@ class Magic(HeaderBlock):
 
     # XXX: The X-TIMESTAMP-MAP extension is described in RFC 8216 §3.5
     # <https://tools.ietf.org/html/rfc8216#section-3.5>, but the RFC
-    # doesn’t specify the exact grammar nor where in the WebVTT
+    # doesn't specify the exact grammar nor where in the WebVTT
     # syntax it should be placed; the below has been devised based
     # on usage in the wild
     #
@@ -272,10 +272,10 @@ class CueBlock(Block):
     def parse(cls, parser):
         parser = parser.child()
 
-        id = None
+        id_ = None
         m = parser.consume(cls._REGEX_ID)
         if m:
-            id = m.group(1)
+            id_ = m.group(1)
 
         m0 = parser.consume(_REGEX_TS)
         if not m0:
@@ -286,6 +286,7 @@ class CueBlock(Block):
         if not m1:
             return None
         m2 = parser.consume(cls._REGEX_SETTINGS)
+        parser.consume(_REGEX_OPTIONAL_WHITESPACE)
         if not parser.consume(_REGEX_NL):
             return None
 
@@ -302,9 +303,9 @@ class CueBlock(Block):
 
         parser.commit()
         return cls(
-            id=id,
+            id=id_,
             start=start, end=end, settings=settings,
-            text=text.getvalue()
+            text=text.getvalue(),
         )
 
     def write_into(self, stream):
@@ -341,7 +342,7 @@ class CueBlock(Block):
             start=json['start'],
             end=json['end'],
             text=json['text'],
-            settings=json['settings']
+            settings=json['settings'],
         )
 
     def hinges(self, other):
diff --git a/pyrightconfig.json b/pyrightconfig.json
index 6c993a3..51882b6 100644
--- a/pyrightconfig.json
+++ b/pyrightconfig.json
@@ -7,5 +7,7 @@
         {
             "root": "./src/versions/solarfm-0.0.1/solarfm"
         }
-    ]
+    ],
+    "venvPath": "/home/abaddon/Portable_Apps/py-venvs/pylsp-venv/",
+    "venv": "venv"
 }
diff --git a/src/solarfm/__builtins__.py b/src/solarfm/__builtins__.py
index 6ead649..4fb6a1e 100644
--- a/src/solarfm/__builtins__.py
+++ b/src/solarfm/__builtins__.py
@@ -1,5 +1,6 @@
 # Python imports
 import builtins
+import traceback
 import threading
 import sys
 
@@ -16,13 +17,29 @@ from utils.settings_manager.manager import SettingsManager
 # NOTE: Threads WILL NOT die with parent's destruction.
 def threaded_wrapper(fn):
     def wrapper(*args, **kwargs):
-        threading.Thread(target=fn, args=args, kwargs=kwargs, daemon=False).start()
+        thread = threading.Thread(target = fn, args = args, kwargs = kwargs, daemon = False)
+        thread.start()
+        return thread
     return wrapper
 
 # NOTE: Threads WILL die with parent's destruction.
 def daemon_threaded_wrapper(fn):
     def wrapper(*args, **kwargs):
-        threading.Thread(target=fn, args=args, kwargs=kwargs, daemon=True).start()
+        thread = threading.Thread(target = fn, args = args, kwargs = kwargs, daemon = True)
+        thread.start()
+        return thread
+    return wrapper
+
+def call_chain_wrapper(fn):
+    def wrapper(*args, **kwargs):
+        print()
+        print()
+        for line in traceback.format_stack():
+            print( line.strip() )
+        print()
+        print()
+
+        return fn(*args, **kwargs)
     return wrapper
 
 def sizeof_fmt_def(num, suffix="B"):
@@ -50,6 +67,7 @@ builtins.logger            = Logger(settings_manager.get_home_config_path(), \
 
 builtins.threaded          = threaded_wrapper
 builtins.daemon_threaded   = daemon_threaded_wrapper
+builtins.call_chain        = call_chain_wrapper
 builtins.sizeof_fmt        = sizeof_fmt_def
 
 
@@ -61,4 +79,4 @@ def custom_except_hook(exc_type, exc_value, exc_traceback):
 
     logger.error("Uncaught exception", exc_info=(exc_type, exc_value, exc_traceback))
 
-sys.excepthook = custom_except_hook
+sys.excepthook = custom_except_hook
\ No newline at end of file
diff --git a/src/solarfm/__main__.py b/src/solarfm/__main__.py
index 1da80a8..0ce080f 100644
--- a/src/solarfm/__main__.py
+++ b/src/solarfm/__main__.py
@@ -1,16 +1,16 @@
 #!/usr/bin/python3
 
 # Python imports
+import resource
 import argparse
 import faulthandler
-import locale
 import traceback
 from setproctitle import setproctitle
 
+import tracemalloc
+tracemalloc.start()
+
 # Lib imports
-import gi
-gi.require_version('Gtk', '3.0')
-from gi.repository import Gtk
 
 # Application imports
 from __builtins__ import *
@@ -18,39 +18,46 @@ from app import Application
 
 
 
-def run():
-    try:
-        locale.setlocale(locale.LC_NUMERIC, 'C')
+def limit_memory(maxsize): 
+    soft, hard = resource.getrlimit(resource.RLIMIT_AS) 
+    resource.setrlimit(resource.RLIMIT_AS, (maxsize, hard)) 
 
-        setproctitle(f"{app_name}")
-        faulthandler.enable()  # For better debug info
 
-        parser = argparse.ArgumentParser()
-        # Add long and short arguments
-        parser.add_argument("--debug", "-d", default="false", help="Do extra console messaging.")
-        parser.add_argument("--trace-debug", "-td", default="false", help="Disable saves, ignore IPC lock, do extra console messaging.")
-        parser.add_argument("--no-plugins", "-np", default="false", help="Do not load plugins.")
+def main(args, unknownargs):
+    setproctitle(f'{app_name}')
 
-        parser.add_argument("--new-tab", "-t", default="", help="Open a file into new tab.")
-        parser.add_argument("--new-window", "-w", default="", help="Open a file into a new window.")
+    if args.debug == "true":
+        settings_manager.set_debug(True)
 
-        # Read arguments (If any...)
-        args, unknownargs = parser.parse_known_args()
+    if args.trace_debug == "true":
+        settings_manager.set_trace_debug(True)
 
-        if args.debug == "true":
-            settings_manager.set_debug(True)
+    settings_manager.do_dirty_start_check()
 
-        if args.trace_debug == "true":
-            settings_manager.set_trace_debug(True)
+    app = Application()
+    app.run()
 
-        settings_manager.do_dirty_start_check()
-        Application(args, unknownargs)
-        Gtk.main()
-    except Exception as e:
-        traceback.print_exc()
-        quit()
 
 
 if __name__ == "__main__":
-    """ Set process title, get arguments, and create GTK main thread. """
-    run()
+    ''' Set process title, get arguments, and create GTK main thread. '''
+
+    parser = argparse.ArgumentParser()
+    # Add long and short arguments
+    parser.add_argument("--debug", "-d", default="false", help="Do extra console messaging.")
+    parser.add_argument("--trace-debug", "-td", default="false", help="Disable saves, ignore IPC lock, do extra console messaging.")
+    parser.add_argument("--no-plugins", "-np", default="false", help="Do not load plugins.")
+
+    parser.add_argument("--new-tab", "-nt", default="false", help="Opens a 'New Tab' if a handler is set for it.")
+    parser.add_argument("--file", "-f", default="default", help="JUST SOME FILE ARG.")
+
+    # Read arguments (If any...)
+    args, unknownargs = parser.parse_known_args()
+    settings_manager.set_starting_args( args, unknownargs )
+
+    try:
+        faulthandler.enable()  # For better debug info
+        main(args, unknownargs)
+    except Exception as e:
+        traceback.print_exc()
+        quit()
\ No newline at end of file
diff --git a/src/solarfm/app.py b/src/solarfm/app.py
index 209e350..b59826f 100644
--- a/src/solarfm/app.py
+++ b/src/solarfm/app.py
@@ -15,45 +15,59 @@ class AppLaunchException(Exception):
     ...
 
 
-class Application(IPCServer):
+
+class Application:
     """ docstring for Application. """
 
-    def __init__(self, args, unknownargs):
+    def __init__(self):
         super(Application, self).__init__()
 
-        if not settings_manager.is_trace_debug():
-            self.socket_realization_check()
-
-            if not self.is_ipc_alive:
-                for arg in unknownargs + [args.new_tab,]:
-                    if os.path.isdir(arg):
-                        message = f"FILE|{arg}"
-                        self.send_ipc_message(message)
-
-                raise AppLaunchException(f"{app_name} IPC Server Exists: Will send path(s) to it and close...")
-
         self.setup_debug_hook()
-        Window(args, unknownargs)
 
 
-    def socket_realization_check(self):
+    def run(self):
+        if not settings_manager.is_trace_debug():
+            if not self.load_ipc():
+                return
+
+        win = Window()
+        win.start()
+
+    def load_ipc(self):
+        args, \
+        unknownargs = settings_manager.get_starting_args()
+        ipc_server  = IPCServer()
+
+        self.ipc_realization_check(ipc_server)
+        if ipc_server.is_ipc_alive:
+            return True
+
+        logger.warning(f"{app_name} IPC Server Exists: Have sent path(s) to it and closing...")
+        for arg in unknownargs + [args.new_tab,]:
+            if os.path.isfile(arg):
+                message = f"FILE|{arg}"
+                ipc_server.send_ipc_message(message)
+
+            if os.path.isdir(arg):
+                message = f"DIR|{arg}"
+                ipc_server.send_ipc_message(message)
+
+        return False
+
+
+    def ipc_realization_check(self, ipc_server):
         try:
-            self.create_ipc_listener()
-        except Exception:
-            self.send_test_ipc_message()
-
-        try:
-            self.create_ipc_listener()
+            ipc_server.create_ipc_listener()
         except Exception as e:
-            ...
+            ipc_server.send_test_ipc_message()
 
     def setup_debug_hook(self):
         try:
             # kill -SIGUSR2 <pid> from Linux/Unix or SIGBREAK signal from Windows
             signal.signal(
-                vars(signal).get("SIGBREAK") or vars(signal).get("SIGUSR1"),
+                vars(signal).get("SIGBREAK") or vars(signal).get("SIGUSR2"),
                 debug_signal_handler
             )
         except ValueError:
             # Typically: ValueError: signal only works in main thread
-            ...
+            ...
\ No newline at end of file
diff --git a/src/solarfm/core/controller.py b/src/solarfm/core/controller.py
index ce10937..b991ce2 100644
--- a/src/solarfm/core/controller.py
+++ b/src/solarfm/core/controller.py
@@ -36,23 +36,14 @@ from .ui_mixin import UIMixin
 class Controller(UIMixin, SignalsMixins, Controller_Data):
     """ Controller coordinates the mixins and is somewhat the root hub of it all. """
 
-    def __init__(self, args, unknownargs):
+    def __init__(self):
         self._setup_controller_data()
 
         self._setup_styling()
         self._setup_signals()
         self._subscribe_to_events()
         self._load_widgets()
-
-        self._generate_file_views(self.fm_controller_data)
-
-        if args.no_plugins == "false":
-            self.plugins.launch_plugins()
-
-        for arg in unknownargs + [args.new_tab,]:
-            if os.path.isdir(arg):
-                message = f"FILE|{arg}"
-                event_system.emit("post_file_to_ipc", message)
+        self._load_plugins_and_files()
 
 
     def _setup_styling(self):
@@ -66,7 +57,7 @@ class Controller(UIMixin, SignalsMixins, Controller_Data):
 
     def _subscribe_to_events(self):
         event_system.subscribe("shutting_down", self._shutting_down)
-        event_system.subscribe("handle_file_from_ipc", self.handle_file_from_ipc)
+        event_system.subscribe("handle_dir_from_ipc", self.handle_dir_from_ipc)
         event_system.subscribe("generate_file_views", self._generate_file_views)
         event_system.subscribe("clear_notebooks", self.clear_notebooks)
 
@@ -78,6 +69,7 @@ class Controller(UIMixin, SignalsMixins, Controller_Data):
         event_system.subscribe("do_action_from_menu_controls", self.do_action_from_menu_controls)
         event_system.subscribe("set_clipboard_data", self.set_clipboard_data)
 
+
     def _load_glade_file(self):
         self.builder.add_from_file( settings_manager.get_glade_file() )
         self.builder.expose_object("main_window", self.window)
@@ -109,12 +101,29 @@ class Controller(UIMixin, SignalsMixins, Controller_Data):
         FileExistsWidget()
         SaveLoadWidget()
 
+    def _load_plugins_and_files(self):
+        args, unknownargs = settings_manager.get_starting_args()
+
+        if args.no_plugins == "false":
+            self.plugins_controller.pre_launch_plugins()
+
+        self._generate_file_views(self.fm_controller_data)
+
+        if args.no_plugins == "false":
+            self.plugins_controller.post_launch_plugins()
+
+        for arg in unknownargs + [args.new_tab,]:
+            if os.path.isdir(arg):
+                message = f"FILE|{arg}"
+                event_system.emit("post_file_to_ipc", message)
+
     def _shutting_down(self):
         if not settings_manager.is_trace_debug():
             self.fm_controller.save_state()
 
+
     def reload_plugins(self, widget=None, eve=None):
-        self.plugins.reload_plugins()
+        self.plugins_controller.reload_plugins()
 
 
     def do_action_from_menu_controls(self, _action=None, eve=None):
@@ -130,44 +139,48 @@ class Controller(UIMixin, SignalsMixins, Controller_Data):
         event_system.emit("hide_rename_file_menu")
 
         if action == "open":
-            event_system.emit("open_files")
+            event_system.emit_and_await("open_files")
         if action == "open_with":
-            event_system.emit("show_appchooser_menu")
+            event_system.emit_and_await("show_appchooser_menu")
+        if action == "open_2_new_tab":
+            event_system.emit_and_await("open_2_new_tab")
         if action == "execute":
-            event_system.emit("execute_files")
+            event_system.emit_and_await("execute_files")
         if action == "execute_in_terminal":
-            event_system.emit("execute_files", (True,))
+            event_system.emit_and_await("execute_files", (True,))
         if action == "rename":
-            event_system.emit("rename_files")
+            event_system.emit_and_await("rename_files")
         if action == "cut":
-            event_system.emit("cut_files")
+            event_system.emit_and_await("cut_files")
         if action == "copy":
-            event_system.emit("copy_files")
+            event_system.emit_and_await("copy_files")
         if action == "copy_path":
-            event_system.emit("copy_path")
+            event_system.emit_and_await("copy_path")
         if action == "copy_name":
-            event_system.emit("copy_name")
+            event_system.emit_and_await("copy_name")
         if action == "copy_path_name":
-            event_system.emit("copy_path_name")
+            event_system.emit_and_await("copy_path_name")
         if action == "paste":
-            event_system.emit("paste_files")
+            event_system.emit_and_await("paste_files")
         if action == "create":
-            event_system.emit("create_files")
+            event_system.emit_and_await("create_files")
         if action in ["save_session", "save_session_as", "load_session"]:
-            event_system.emit("save_load_session", (action))
+            event_system.emit_and_await("save_load_session", (action))
 
         if action == "about_page":
-            event_system.emit("show_about_page")
+            event_system.emit_and_await("show_about_page")
         if action == "io_popup":
-            event_system.emit("show_io_popup")
+            event_system.emit_and_await("show_io_popup")
         if action == "plugins_popup":
-            event_system.emit("show_plugins_popup")
+            event_system.emit_and_await("show_plugins_popup")
         if action == "messages_popup":
-            event_system.emit("show_messages_popup")
+            event_system.emit_and_await("show_messages_popup")
         if action == "ui_debug":
-            event_system.emit("load_interactive_debug")
+            event_system.emit_and_await("load_interactive_debug")
         if action == "tear_down":
-            event_system.emit("tear_down")
+            event_system.emit_and_await("tear_down")
+
+        action = None
 
 
     def go_home(self, widget=None, eve=None):
@@ -185,11 +198,14 @@ class Controller(UIMixin, SignalsMixins, Controller_Data):
     def tggl_top_main_menubar(self, widget=None, eve=None):
         top_main_menubar = self.builder.get_object("top_main_menubar")
         top_main_menubar.hide() if top_main_menubar.is_visible() else top_main_menubar.show()
+        top_main_menubar = None
 
     def open_terminal(self, widget=None, eve=None):
         wid, tid = self.fm_controller.get_active_wid_and_tid()
         tab      = self.get_fm_window(wid).get_tab_by_id(tid)
         tab.execute([f"{tab.terminal_app}"], start_dir=tab.get_current_directory())
 
+        wid, tid, tab = None, None, None
+
     def go_to_path(self, path: str):
-        self.builder.get_object("path_entry").set_text(path)
\ No newline at end of file
+        self.builder.get_object("path_entry").set_text(path)
diff --git a/src/solarfm/core/controller_data.py b/src/solarfm/core/controller_data.py
index 89961ac..aa215d7 100644
--- a/src/solarfm/core/controller_data.py
+++ b/src/solarfm/core/controller_data.py
@@ -29,7 +29,7 @@ class Controller_Data:
 
         self._load_glade_file()
         self.fm_controller      = WindowController()
-        self.plugins            = PluginsController()
+        self.plugins_controller = PluginsController()
         self.fm_controller_data = self.fm_controller.get_state_from_file()
 
         self.window1            = self.builder.get_object("window_1")
@@ -54,6 +54,7 @@ class Controller_Data:
         self.ctrl_down          = False
         self.shift_down         = False
         self.alt_down           = False
+        self.was_midified_key   = None
 
         self._state           = State()
         self.message_dialog   = MessageWidget()
@@ -70,23 +71,16 @@ class Controller_Data:
                 Returns:
                         state (obj): State
         '''
-        # state                  = State()
+
         state                  = self._state
         state.fm_controller    = self.fm_controller
         state.notebooks        = self.notebooks
         state.wid, state.tid   = self.fm_controller.get_active_wid_and_tid()
         state.tab              = self.get_fm_window(state.wid).get_tab_by_id(state.tid)
         state.icon_grid        = self.builder.get_object(f"{state.wid}|{state.tid}|icon_grid", use_gtk = False)
-        # state.icon_grid        = event_system.emit_and_await("get_files_view_icon_grid", (state.wid, state.tid))
         state.store            = state.icon_grid.get_model()
-
-        # NOTE: Need to watch this as I thought we had issues with just using single reference upon closing it.
-        # But, I found that not doing it this way caused objects to generate upon every click... (Because we're getting state info, duh)
-        # Yet interactive debug view shows them just pilling on and never clearing...
         state.message_dialog   = self.message_dialog
         state.user_pass_dialog = self.user_pass_dialog
-        # state.message_dialog   = MessageWidget()
-        # state.user_pass_dialog = UserPassWidget()
 
         selected_files     = state.icon_grid.get_selected_items()
         if selected_files:
@@ -95,12 +89,6 @@ class Controller_Data:
 
         state.selected_files = event_system.emit_and_await("get_selected_files")
 
-        # if self.to_copy_files:
-        #     state.to_copy_files  = self.format_to_uris(state.store, state.wid, state.tid, self.to_copy_files, True)
-        #
-        # if self.to_cut_files:
-        #     state.to_cut_files   = self.format_to_uris(state.store, state.wid, state.tid, self.to_cut_files, True)
-
         event_system.emit("update_state_info_plugins", state) # NOTE: Need to remove after we convert plugins to use emit_and_await
         return state
 
@@ -121,6 +109,9 @@ class Controller_Data:
 
             uris.append(fpath)
 
+        tab = None
+        dir = None
+
         return uris
 
 
diff --git a/src/solarfm/core/fs_actions/file_system_actions.py b/src/solarfm/core/fs_actions/file_system_actions.py
index 561de7b..be6573c 100644
--- a/src/solarfm/core/fs_actions/file_system_actions.py
+++ b/src/solarfm/core/fs_actions/file_system_actions.py
@@ -40,6 +40,7 @@ class FileSystemActions(HandlerMixin, CRUDMixin):
 
         event_system.subscribe("open_files", self.open_files)
         event_system.subscribe("open_with_files", self.open_with_files)
+        event_system.subscribe("open_2_new_tab", self.open_2_new_tab)
         event_system.subscribe("execute_files", self.execute_files)
 
         event_system.subscribe("cut_files", self.cut_files)
@@ -104,6 +105,12 @@ class FileSystemActions(HandlerMixin, CRUDMixin):
 
         state.tab.app_chooser_exec(app_info, uris)
 
+    def open_2_new_tab(self):
+        state   = event_system.emit_and_await("get_current_state")
+        uri     = state.uris[0]
+        message = f"FILE|{uri}"
+        logger.info(message)
+        event_system.emit("post_file_to_ipc", message)
 
     def execute_files(self, in_terminal=False):
         state       = event_system.emit_and_await("get_current_state")
@@ -111,4 +118,4 @@ class FileSystemActions(HandlerMixin, CRUDMixin):
         command     = None
         for path in state.uris:
             command = f"{shlex.quote(path)}" if not in_terminal else f"{state.tab.terminal_app} -e {shlex.quote(path)}"
-            state.tab.execute(shlex.split(command), start_dir=state.tab.get_current_directory())
+            state.tab.execute(shlex.split(command), start_dir=state.tab.get_current_directory())
\ No newline at end of file
diff --git a/src/solarfm/core/fs_actions/handler_mixin.py b/src/solarfm/core/fs_actions/handler_mixin.py
index 73705cd..17bf344 100644
--- a/src/solarfm/core/fs_actions/handler_mixin.py
+++ b/src/solarfm/core/fs_actions/handler_mixin.py
@@ -110,26 +110,29 @@ class HandlerMixin:
                         tab.move_file(fPath, tPath)
                 else:
                     io_widget = IOWidget(action, file)
+                    io_list   = self._builder.get_object("io_list")
+
+                    io_list.add(io_widget)
+                    io_list.show_all()
 
                     if action == "copy":
-                        file.copy_async(destination=target,
-                                        flags=Gio.FileCopyFlags.BACKUP,
-                                        io_priority=98,
-                                        cancellable=io_widget.cancle_eve,
-                                        progress_callback=io_widget.update_progress,
-                                        callback=io_widget.finish_callback)
+                        file.copy_async(target,
+                                        Gio.FileCopyFlags.BACKUP,
+                                        45,
+                                        io_widget.cancle_eve,
+                                        io_widget.update_progress,
+                                        io_widget.finish_callback)
 
-                        self._builder.get_object("io_list").add(io_widget)
                     if action == "move" or action == "rename":
-                        file.move_async(destination=target,
-                                        flags=Gio.FileCopyFlags.BACKUP,
-                                        io_priority=98,
-                                        cancellable=io_widget.cancle_eve,
-                                        progress_callback=None,
-                                        # NOTE: progress_callback here causes seg fault when set
-                                        callback=io_widget.finish_callback)
+                        file.move_async(target,
+                                        Gio.FileCopyFlags.BACKUP,
+                                        45,
+                                        io_widget.cancle_eve,
+                                        None,
+                                        io_widget.finish_callback)
 
-                        self._builder.get_object("io_list").add(io_widget)
+                        io_widget = None
+                        io_list   = None
 
             except GObject.GError as e:
                 raise OSError(e)
@@ -162,4 +165,4 @@ class HandlerMixin:
             target = Gio.File.new_for_path(f"{base_path}/{file_name}-copy{i}{extension}")
             i += 1
 
-        return target
+        return target
\ No newline at end of file
diff --git a/src/solarfm/core/mixins/signals/file_action_signals_mixin.py b/src/solarfm/core/mixins/signals/file_action_signals_mixin.py
index aba1eac..581d25e 100644
--- a/src/solarfm/core/mixins/signals/file_action_signals_mixin.py
+++ b/src/solarfm/core/mixins/signals/file_action_signals_mixin.py
@@ -20,6 +20,8 @@ class FileActionSignalsMixin:
         if tab.get_dir_watcher():
             watcher = tab.get_dir_watcher()
             watcher.cancel()
+            watcher.disconnect(watcher.watch_id)
+            watcher.run_dispose()
             if settings_manager.is_debug():
                 logger.debug(f"Watcher Is Cancelled:  {watcher.is_cancelled()}")
 
@@ -30,58 +32,57 @@ class FileActionSignalsMixin:
 
         wid = tab.get_wid()
         tid = tab.get_id()
-        dir_watcher.connect("changed", self.dir_watch_updates, (f"{wid}|{tid}",))
+        watch_id = dir_watcher.connect("changed", self.dir_watch_updates, *(f"{wid}|{tid}",))
         tab.set_dir_watcher(dir_watcher)
+        dir_watcher.watch_id = watch_id
 
-    # NOTE: Too lazy to impliment a proper update handler and so just regen store and update tab.
-    #       Use a lock system to prevent too many update calls for certain instances but user can manually refresh if they have urgency
-    def dir_watch_updates(self, file_monitor, file, other_file = None, eve_type = None, data = None):
+    def dir_watch_updates(self, file_monitor, file, other_file = None, eve_type = None, tab_widget_id = None):
         if eve_type in  [Gio.FileMonitorEvent.CREATED, Gio.FileMonitorEvent.DELETED,
                         Gio.FileMonitorEvent.RENAMED, Gio.FileMonitorEvent.MOVED_IN,
                         Gio.FileMonitorEvent.MOVED_OUT]:
-            logger.debug(eve_type)
 
-            if eve_type in [Gio.FileMonitorEvent.MOVED_IN, Gio.FileMonitorEvent.MOVED_OUT]:
-                self.update_on_soft_lock_end(data[0])
-            elif data[0] in self.soft_update_lock.keys():
-                self.soft_update_lock[data[0]]["last_update_time"] = time.time()
-            else:
-                self.soft_lock_countdown(data[0])
+            self.soft_lock_countdown(tab_widget_id)
 
-    @threaded
-    def soft_lock_countdown(self, tab_widget):
-        self.soft_update_lock[tab_widget] = { "last_update_time": time.time()}
+    def soft_lock_countdown(self, tab_widget_id):
+        if tab_widget_id in self.soft_update_lock:
+            timeout_id = self.soft_update_lock[tab_widget_id]["timeout_id"]
+            GLib.source_remove(timeout_id)
+            self.soft_update_lock[tab_widget_id]["call_count"] += 1
+        else:
+            self.soft_update_lock[tab_widget_id] = {}
+            self.soft_update_lock[tab_widget_id]["call_count"] = 0
 
-        lock = True
-        while lock:
-            time.sleep(0.6)
-            last_update_time = self.soft_update_lock[tab_widget]["last_update_time"]
-            current_time     = time.time()
-            if (current_time - last_update_time) > 0.6:
-                lock = False
+        timeout_id = GLib.timeout_add(
+            500 if self.soft_update_lock[tab_widget_id]["call_count"] <= 5 else 1000,
+            self.update_on_soft_lock_end,
+            tab_widget_id
+        )
 
-        self.soft_update_lock.pop(tab_widget, None)
-        GLib.idle_add(self.update_on_soft_lock_end, *(tab_widget,))
+        self.soft_update_lock[tab_widget_id]["timeout_id"] = timeout_id
 
 
-    def update_on_soft_lock_end(self, tab_widget):
-        wid, tid  = tab_widget.split("|")
+    def update_on_soft_lock_end(self, tab_widget_id):
+        GLib.idle_add(self._update_interface, tab_widget_id)
+        self.soft_update_lock.pop(tab_widget_id, None)
+        return False
+
+    def _update_interface(self, tab_widget_id):
+        wid, tid  = tab_widget_id.split("|")
         notebook  = self.builder.get_object(f"window_{wid}")
         tab       = self.get_fm_window(wid).get_tab_by_id(tid)
         icon_grid = self.builder.get_object(f"{wid}|{tid}|icon_grid", use_gtk = False)
         store     = icon_grid.get_model()
-        _store, tab_widget_label = self.get_store_and_label_from_notebook(notebook, f"{wid}|{tid}")
+        _store, tab_widget_id_label = self.get_store_and_label_from_notebook(notebook, f"{wid}|{tid}")
 
         tab.load_directory()
         icon_grid.clear_and_set_new_store()
         self.load_store(tab, icon_grid.get_store())
 
-        tab_widget_label.set_label(tab.get_end_of_path())
+        tab_widget_id_label.set_label(tab.get_end_of_path())
         state = self.get_current_state()
         if [wid, tid] in [state.wid, state.tid]:
             self.set_bottom_labels(tab)
 
-
     def do_file_search(self, widget, eve = None):
         if not self.ctrl_down and not self.shift_down and not self.alt_down:
             target    = widget.get_name()
diff --git a/src/solarfm/core/mixins/signals/ipc_signals_mixin.py b/src/solarfm/core/mixins/signals/ipc_signals_mixin.py
index 6f6b085..ca29b6d 100644
--- a/src/solarfm/core/mixins/signals/ipc_signals_mixin.py
+++ b/src/solarfm/core/mixins/signals/ipc_signals_mixin.py
@@ -13,7 +13,7 @@ class IPCSignalsMixin:
     def print_to_console(self, message=None):
         print(message)
 
-    def handle_file_from_ipc(self, path):
+    def handle_dir_from_ipc(self, path):
         window = self.builder.get_object("main_window")
         window.deiconify()
         window.show()
diff --git a/src/solarfm/core/mixins/signals/keyboard_signals_mixin.py b/src/solarfm/core/mixins/signals/keyboard_signals_mixin.py
index 9e02fe1..eed30c5 100644
--- a/src/solarfm/core/mixins/signals/keyboard_signals_mixin.py
+++ b/src/solarfm/core/mixins/signals/keyboard_signals_mixin.py
@@ -11,8 +11,8 @@ from gi.repository import Gdk
 # Application imports
 
 
-valid_keyvalue_pat    = re.compile(r"[a-z0-9A-Z-_\[\]\(\)\| ]")
 
+valid_keyvalue_pat = re.compile(r"[a-z0-9A-Z-_\[\]\(\)\| ]")
 
 
 
@@ -20,13 +20,25 @@ class KeyboardSignalsMixin:
     """ KeyboardSignalsMixin keyboard hooks controller. """
 
     # TODO: Need to set methods that use this to somehow check the keybindings state instead.
-    def unset_keys_and_data(self, widget=None, eve=None):
+    def unset_keys_and_data(self, widget = None, eve = None):
         self.ctrl_down    = False
         self.shift_down   = False
         self.alt_down     = False
 
+    def unmap_special_keys(self, keyname):
+        if "control" in keyname:
+            self.ctrl_down    = False
+        if "shift" in keyname:
+            self.shift_down   = False
+        if "alt" in keyname:
+            self.alt_down     = False
+
     def on_global_key_press_controller(self, eve, user_data):
-        keyname = Gdk.keyval_name(user_data.keyval).lower()
+        keyname   = Gdk.keyval_name(user_data.keyval).lower()
+        modifiers = Gdk.ModifierType(user_data.get_state() & ~Gdk.ModifierType.LOCK_MASK)
+
+        self.was_midified_key = True if modifiers != 0 else False
+
         if keyname.replace("_l", "").replace("_r", "") in ["control", "alt", "shift"]:
             if "control" in keyname:
                 self.ctrl_down    = True
@@ -36,52 +48,49 @@ class KeyboardSignalsMixin:
                 self.alt_down     = True
 
     def on_global_key_release_controller(self, widget, event):
-        """Handler for keyboard events"""
-        keyname = Gdk.keyval_name(event.keyval).lower()
+        """ Handler for keyboard events """
+        keyname   = Gdk.keyval_name(event.keyval).lower()
+        modifiers = Gdk.ModifierType(event.get_state() & ~Gdk.ModifierType.LOCK_MASK)
+
         if keyname.replace("_l", "").replace("_r", "") in ["control", "alt", "shift"]:
-            if "control" in keyname:
-                self.ctrl_down    = False
-            if "shift" in keyname:
-                self.shift_down   = False
-            if "alt" in keyname:
-                self.alt_down     = False
+            should_return = self.was_midified_key and (self.ctrl_down or self.shift_down or self.alt_down)
+            self.unmap_special_keys(keyname)
+
+            if should_return:
+                self.was_midified_key = False
+                return
 
         mapping = keybindings.lookup(event)
+        logger.debug(f"on_global_key_release_controller > key > {keyname}")
+        logger.debug(f"on_global_key_release_controller > keyval > {event.keyval}")
+        logger.debug(f"on_global_key_release_controller > mapping > {mapping}")
+
         if mapping:
-            # See if in filemanager scope
-            try:
-                getattr(self, mapping)()
-                return True
-            except Exception:
-                # Must be plugins scope, event call, OR we forgot to add method to file manager scope
-                if "||" in mapping:
-                    sender, eve_type = mapping.split("||")
-                else:
-                    sender = ""
-                    eve_type = mapping
-
-                self.handle_plugin_key_event(sender, eve_type)
+            self.handle_mapped_key_event(mapping)
         else:
-            logger.debug(f"on_global_key_release_controller > key > {keyname}")
+            self.handle_as_key_event_scope(keyname)
 
-            if self.ctrl_down:
-                if keyname in ["1", "kp_1", "2", "kp_2", "3", "kp_3", "4", "kp_4"]:
-                    self.builder.get_object(f"tggl_notebook_{keyname.strip('kp_')}").released()
+    def handle_mapped_key_event(self, mapping):
+        try:
+            self.handle_as_controller_scope(mapping)
+        except Exception:
+            self.handle_as_plugin_scope(mapping)
 
-    def handle_plugin_key_event(self, sender, eve_type):
-        event_system.emit(eve_type)
+    def handle_as_controller_scope(self, mapping):
+        getattr(self, mapping)()
 
-    def keyboard_close_tab(self):
-        wid, tid  = self.fm_controller.get_active_wid_and_tid()
-        notebook  = self.builder.get_object(f"window_{wid}")
-        scroll    = self.builder.get_object(f"{wid}|{tid}", use_gtk = False)
-        page      = notebook.page_num(scroll)
-        tab       = self.get_fm_window(wid).get_tab_by_id(tid)
-        watcher   = tab.get_dir_watcher()
-        watcher.cancel()
+    def handle_as_plugin_scope(self, mapping):
+        if "||" in mapping:
+            sender, eve_type = mapping.split("||")
+        else:
+            sender = ""
+            eve_type = mapping
 
-        self.get_fm_window(wid).delete_tab_by_id(tid)
-        notebook.remove_page(page)
-        if not trace_debug:
-            self.fm_controller.save_state()
-        self.set_window_title()
+        self.handle_key_event_system(sender, eve_type)
+
+    def handle_as_key_event_scope(self, keyname):
+        if self.ctrl_down and not keyname in ["1", "kp_1", "2", "kp_2", "3", "kp_3", "4", "kp_4"]:
+            self.handle_key_event_system(None, keyname)
+
+    def handle_key_event_system(self, sender, eve_type):
+        event_system.emit(eve_type)
\ No newline at end of file
diff --git a/src/solarfm/core/mixins/ui/grid_mixin.py b/src/solarfm/core/mixins/ui/grid_mixin.py
deleted file mode 100644
index 31881ef..0000000
--- a/src/solarfm/core/mixins/ui/grid_mixin.py
+++ /dev/null
@@ -1,147 +0,0 @@
-# Python imports
-import asyncio
-
-# Lib imports
-import gi
-
-gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk
-from gi.repository import GLib
-
-# Application imports
-from ...widgets.tab_header_widget import TabHeaderWidget
-from ...widgets.icon_grid_widget import IconGridWidget
-from ...widgets.icon_tree_widget import IconTreeWidget
-
-
-
-class GridMixin:
-    """docstring for GridMixin"""
-
-    def load_store(self, tab, store, save_state = False, use_generator = False):
-        dir   = tab.get_current_directory()
-        files = tab.get_files()
-
-        for file in files:
-            store.append([None, file[0]])
-
-        Gtk.main_iteration()
-        # for i, file in enumerate(files):
-        #     self.create_icon(i, tab, store, dir, file[0])
-
-        if use_generator:
-            # NOTE: tab > icon > _get_system_thumbnail_gtk_thread must not be used
-            # as the attempted promotion back to gtk threading stalls the generator. (We're already in main gtk thread)
-            for i, icon in enumerate( self.create_icons_generator(tab, dir, files) ):
-                self.load_icon(i, store, icon)
-        else:
-            try:
-                loop = asyncio.get_running_loop()
-            except RuntimeError:
-                loop = None
-
-            if loop and loop.is_running():
-                loop.create_task( self.create_icons(tab, store, dir, files) )
-            else:
-                asyncio.run( self.create_icons(tab, store, dir, files) )
-
-        # NOTE: Not likely called often from here but it could be useful
-        if save_state and not trace_debug:
-            self.fm_controller.save_state()
-
-    async def create_icons(self, tab, store, dir, files):
-        tasks = [self.update_store(i, store, dir, tab, file[0]) for i, file in enumerate(files)]
-        await asyncio.gather(*tasks)
-
-    async def load_icon(self, i, store, icon):
-        self.update_store(i, store, icon)
-
-    async def update_store(self, i, store, dir, tab, file):
-        icon = tab.create_icon(dir, file)
-        itr  = store.get_iter(i)
-        store.set_value(itr, 0, icon)
-
-    def create_icons_generator(self, tab, dir, files):
-        for file in files:
-            icon = tab.create_icon(dir, file[0])
-            yield icon
-
-    # @daemon_threaded
-    # def create_icon(self, i, tab, store, dir, file):
-    #     icon = tab.create_icon(dir, file)
-    #     GLib.idle_add(self.update_store, *(i, store, icon,))
-    #
-    # @daemon_threaded
-    # def load_icon(self, i, store, icon):
-    #     GLib.idle_add(self.update_store, *(i, store, icon,))
-
-    # def update_store(self, i, store, icon):
-    #     itr = store.get_iter(i)
-    #     store.set_value(itr, 0, icon)
-
-    def create_tab_widget(self, tab):
-        return TabHeaderWidget(tab, self.close_tab)
-
-    def create_scroll_and_store(self, tab, wid, use_tree_view = False):
-        scroll = Gtk.ScrolledWindow()
-
-        if not use_tree_view:
-            grid = self.create_icon_grid_widget()
-        else:
-            # TODO: Fix global logic to make the below work too
-            grid = self.create_icon_tree_widget()
-
-        scroll.add(grid)
-        scroll.set_name(f"{wid}|{tab.get_id()}")
-        grid.set_name(f"{wid}|{tab.get_id()}")
-        self.builder.expose_object(f"{wid}|{tab.get_id()}|icon_grid", grid, use_gtk = False)
-        self.builder.expose_object(f"{wid}|{tab.get_id()}", scroll, use_gtk = False)
-
-        return scroll, grid.get_store()
-
-    def create_icon_grid_widget(self):
-        grid = IconGridWidget()
-        grid._setup_additional_signals(
-            self.grid_icon_single_click,
-            self.grid_icon_double_click,
-            self.grid_set_selected_items,
-            self.grid_on_drag_set,
-            self.grid_on_drag_data_received,
-            self.grid_on_drag_motion
-        )
-
-        return grid
-
-    def create_icon_tree_widget(self):
-        grid = IconTreeWidget()
-        grid._setup_additional_signals(
-            self.grid_icon_single_click,
-            self.grid_icon_double_click,
-            self.grid_on_drag_set,
-            self.grid_on_drag_data_received,
-            self.grid_on_drag_motion
-        )
-
-        grid.columns_autosize()
-        return grid
-
-    def get_store_and_label_from_notebook(self, notebook, _name):
-        icon_grid = None
-        tab_label = None
-        store     = None
-
-        for obj in notebook.get_children():
-            icon_grid = obj.get_children()[0]
-            name      = icon_grid.get_name()
-            if name == _name:
-                store     = icon_grid.get_model()
-                tab_label = notebook.get_tab_label(obj).get_children()[0]
-
-        return store, tab_label
-
-    def get_icon_grid_from_notebook(self, notebook, _name):
-        for obj in notebook.get_children():
-            icon_grid = obj.get_children()[0]
-            name      = icon_grid.get_name()
-            if name == _name:
-                return icon_grid
diff --git a/src/solarfm/core/mixins/ui/tab_mixin.py b/src/solarfm/core/mixins/ui/tab_mixin.py
deleted file mode 100644
index aab38bd..0000000
--- a/src/solarfm/core/mixins/ui/tab_mixin.py
+++ /dev/null
@@ -1,239 +0,0 @@
-# Python imports
-import os
-import gc
-import time
-
-# Lib imports
-import gi
-gi.require_version('Gtk', '3.0')
-from gi.repository import Gtk
-from gi.repository import GLib
-
-# Application imports
-from .grid_mixin import GridMixin
-
-
-
-class TabMixin(GridMixin):
-    """docstring for TabMixin"""
-
-    def create_tab(self, wid: int = None, tid: int = None, path: str = None):
-        if not wid:
-            wid, tid = self.fm_controller.get_active_wid_and_tid()
-
-        notebook    = self.builder.get_object(f"window_{wid}")
-        path_entry  = self.builder.get_object(f"path_entry")
-        tab         = self.fm_controller.add_tab_for_window_by_nickname(f"window_{wid}")
-        tab.logger  = logger
-
-        tab.set_wid(wid)
-        if not path:
-            if wid and tid:
-                _tab = self.get_fm_window(wid).get_tab_by_id(tid)
-                tab.set_path(_tab.get_current_directory())
-        else:
-            tab.set_path(path)
-
-        tab_widget    = self.create_tab_widget(tab)
-        scroll, store = self.create_scroll_and_store(tab, wid)
-        index         = notebook.append_page(scroll, tab_widget)
-        notebook.set_tab_detachable(scroll, True)
-
-        self.fm_controller.set_wid_and_tid(wid, tab.get_id())
-        path_entry.set_text(tab.get_current_directory())
-        notebook.show_all()
-        notebook.set_current_page(index)
-
-        ctx = notebook.get_style_context()
-        ctx.add_class("notebook-unselected-focus")
-        notebook.set_tab_reorderable(scroll, True)
-        self.load_store(tab, store)
-        self.set_window_title()
-        self.set_file_watcher(tab)
-
-
-    def close_tab(self, button, eve = None):
-        notebook = button.get_parent().get_parent()
-        if notebook.get_n_pages() == 1:
-            return
-
-        tab_box   = button.get_parent()
-        wid       = int(notebook.get_name()[-1])
-        tid       = self.get_id_from_tab_box(tab_box)
-        scroll    = self.builder.get_object(f"{wid}|{tid}", use_gtk = False)
-        icon_grid = scroll.get_children()[0]
-        store     = icon_grid.get_store()
-        tab       = self.get_fm_window(wid).get_tab_by_id(tid)
-        watcher   = tab.get_dir_watcher()
-
-        watcher.cancel()
-        self.get_fm_window(wid).delete_tab_by_id(tid)
-
-        self.builder.dereference_object(f"{wid}|{tid}|icon_grid")
-        self.builder.dereference_object(f"{wid}|{tid}")
-
-        store.clear()
-        icon_grid.destroy()
-        scroll.destroy()
-        tab_box.destroy()
-
-        del store
-        del icon_grid
-        del scroll
-        del tab_box
-        del watcher
-        del tab
-
-        gc.collect()
-        if not settings_manager.is_trace_debug():
-            self.fm_controller.save_state()
-
-        self.set_window_title()
-
-    # NOTE: Not actually getting called even tho set in the glade file...
-    def on_tab_dnded(self, notebook, page, x, y):
-        ...
-
-    def on_tab_reorder(self, child, page_num, new_index):
-        wid, tid = page_num.get_name().split("|")
-        window   = self.get_fm_window(wid)
-        tab      = None
-
-        for i, tab in enumerate(window.get_all_tabs()):
-            if tab.get_id() == tid:
-                _tab    = window.get_tab_by_id(tid)
-                watcher = _tab.get_dir_watcher()
-                watcher.cancel()
-                window.get_all_tabs().insert(new_index, window.get_all_tabs().pop(i))
-
-        tab = window.get_tab_by_id(tid)
-        self.set_file_watcher(tab)
-        if not settings_manager.is_trace_debug():
-            self.fm_controller.save_state()
-
-    def on_tab_switch_update(self, notebook, content = None, index = None):
-        self.selected_files.clear()
-        wid, tid = content.get_children()[0].get_name().split("|")
-        self.fm_controller.set_wid_and_tid(wid, tid)
-        self.set_path_text(wid, tid)
-        self.set_window_title()
-
-    def get_id_from_tab_box(self, tab_box):
-        return tab_box.get_children()[2].get_text()
-
-    def get_tab_label(self, notebook, icon_grid):
-        return notebook.get_tab_label(icon_grid.get_parent()).get_children()[0]
-
-    def get_tab_close(self, notebook, icon_grid):
-        return notebook.get_tab_label(icon_grid.get_parent()).get_children()[1]
-
-    def get_tab_icon_grid_from_notebook(self, notebook):
-        return notebook.get_children()[1].get_children()[0]
-
-    def refresh_tab(data = None):
-        state = self.get_current_state()
-        state.tab.load_directory()
-        self.load_store(state.tab, state.store)
-
-    def update_tab(self, tab_label, tab, store, wid, tid):
-        self.load_store(tab, store)
-        self.set_path_text(wid, tid)
-
-        char_width = len(tab.get_end_of_path())
-        tab_label.set_width_chars(char_width)
-        tab_label.set_label(tab.get_end_of_path())
-        self.set_window_title()
-        self.set_file_watcher(tab)
-        if not settings_manager.is_trace_debug():
-            self.fm_controller.save_state()
-
-    def do_action_from_bar_controls(self, widget, eve = None):
-        action    = widget.get_name()
-        wid, tid  = self.fm_controller.get_active_wid_and_tid()
-        notebook  = self.builder.get_object(f"window_{wid}")
-        store, tab_label = self.get_store_and_label_from_notebook(notebook, f"{wid}|{tid}")
-        tab       = self.get_fm_window(wid).get_tab_by_id(tid)
-
-        if action == "create_tab":
-            dir = tab.get_current_directory()
-            self.create_tab(wid, None, dir)
-            if not settings_manager.is_trace_debug():
-                self.fm_controller.save_state()
-
-            return
-        if action == "go_up":
-            tab.pop_from_path()
-        if action == "go_home":
-            tab.set_to_home()
-        if action == "refresh_tab":
-            tab.load_directory()
-        if action == "path_entry":
-            focused_obj = self.window.get_focus()
-            dir         = f"{tab.get_current_directory()}/"
-            path        = widget.get_text()
-
-            if isinstance(focused_obj, Gtk.Entry):
-                self.process_path_menu(widget, tab, dir)
-
-            if path.endswith(".") or path == dir:
-                return
-
-            if not tab.set_path(path):
-                return
-
-        icon_grid = self.get_icon_grid_from_notebook(notebook, f"{wid}|{tid}")
-        icon_grid.clear_and_set_new_store()
-        self.update_tab(tab_label, tab, icon_grid.get_store(), wid, tid)
-
-    def process_path_menu(self, gtk_entry, tab, dir):
-        path_menu_buttons  = self.builder.get_object("path_menu_buttons")
-        query              = gtk_entry.get_text().replace(dir, "")
-        files              = tab.get_files() + tab.get_hidden()
-
-        self.clear_children(path_menu_buttons)
-        show_path_menu = False
-        for file, hash, size in files:
-            if os.path.isdir(f"{dir}{file}"):
-                if query.lower() in file.lower():
-                    button = Gtk.Button(label=file)
-                    button.show()
-                    button.connect("clicked", self.set_path_entry)
-                    path_menu_buttons.add(button)
-                    show_path_menu = True
-
-        if not show_path_menu:
-            event_system.emit("hide_path_menu")
-        else:
-            event_system.emit("show_path_menu")
-            buttons = path_menu_buttons.get_children()
-
-            if len(buttons) == 1:
-                self.slowed_focus(buttons[0])
-
-    @daemon_threaded
-    def slowed_focus(self, button):
-        time.sleep(0.05)
-        GLib.idle_add(self.do_focused_click, *(button,))
-
-    def do_focused_click(self, button):
-        button.grab_focus()
-        button.clicked()
-
-    def set_path_entry(self, button = None, eve = None):
-        self.path_auto_filled = True
-        state      = self.get_current_state()
-        path       = f"{state.tab.get_current_directory()}/{button.get_label()}"
-        path_entry = self.builder.get_object("path_entry")
-
-        path_entry.set_text(path)
-        path_entry.grab_focus_without_selecting()
-        path_entry.set_position(-1)
-        event_system.emit("hide_path_menu")
-
-
-    def show_hide_hidden_files(self):
-        wid, tid = self.fm_controller.get_active_wid_and_tid()
-        tab      = self.get_fm_window(wid).get_tab_by_id(tid)
-        tab.set_hiding_hidden(not tab.is_hiding_hidden())
-        tab.load_directory()
-        self.builder.get_object("refresh_tab").released()
diff --git a/src/solarfm/core/mixins/ui/window_mixin.py b/src/solarfm/core/mixins/ui/window_mixin.py
deleted file mode 100644
index 3d1d577..0000000
--- a/src/solarfm/core/mixins/ui/window_mixin.py
+++ /dev/null
@@ -1,182 +0,0 @@
-# Python imports
-import copy
-import traceback
-from os.path import isdir
-
-# Lib imports
-import gi
-gi.require_version('Gtk', '3.0')
-gi.require_version('Gdk', '3.0')
-from gi.repository import Gtk
-from gi.repository import Gdk
-from gi.repository import Gio
-
-# Application imports
-from .tab_mixin import TabMixin
-
-
-class WindowException(Exception):
-    ...
-
-
-class WindowMixin(TabMixin):
-    """docstring for WindowMixin"""
-
-    def get_fm_window(self, wid):
-        return self.fm_controller.get_window_by_nickname(f"window_{wid}")
-
-    def set_bottom_labels(self, tab):
-        event_system.emit("set_bottom_labels", (tab,))
-
-    def set_window_title(self):
-        wid, tid = self.fm_controller.get_active_wid_and_tid()
-        notebook = self.builder.get_object(f"window_{wid}")
-        tab      = self.get_fm_window(wid).get_tab_by_id(tid)
-        dir      = tab.get_current_directory()
-
-        for _notebook in self.notebooks:
-            ctx = _notebook.get_style_context()
-            ctx.remove_class("notebook-selected-focus")
-            ctx.add_class("notebook-unselected-focus")
-
-        ctx = notebook.get_style_context()
-        ctx.remove_class("notebook-unselected-focus")
-        ctx.add_class("notebook-selected-focus")
-
-        self.window.set_title(f"{app_name} ~ {dir}")
-        self.set_bottom_labels(tab)
-
-    def set_path_text(self, wid, tid):
-        path_entry = self.builder.get_object("path_entry")
-        tab        = self.get_fm_window(wid).get_tab_by_id(tid)
-        path_entry.set_text(tab.get_current_directory())
-
-    def grid_set_selected_items(self, icons_grid):
-        new_items      = icons_grid.get_selected_items()
-        items_size     = len(new_items)
-        selected_items = event_system.emit_and_await("get_selected_files")
-
-        if items_size == 1:
-            # NOTE: If already in selection, likely dnd else not so wont readd
-            if new_items[0] in selected_items:
-                self.dnd_left_primed += 1
-                # NOTE: If in selection but trying to just select an already selected item.
-                if self.dnd_left_primed > 1:
-                    self.dnd_left_primed = 0
-                    selected_items.clear()
-
-                # NOTE: Likely trying dnd, just readd to selection the former set.
-                #       Prevents losing highlighting of grid selected.
-                for path in selected_items:
-                    icons_grid.select_path(path)
-
-        if items_size > 0:
-            event_system.emit("set_selected_files", (new_items,))
-        else:
-            self.dnd_left_primed = 0
-            selected_items.clear()
-
-    def grid_icon_single_click(self, icons_grid, eve):
-        try:
-            event_system.emit("hide_path_menu")
-            wid, tid = icons_grid.get_name().split("|")
-            self.fm_controller.set_wid_and_tid(wid, tid)
-            self.set_path_text(wid, tid)
-            self.set_window_title()
-
-            if eve.type == Gdk.EventType.BUTTON_RELEASE and eve.button == 1:   # l-click
-                if eve.state & Gdk.ModifierType.CONTROL_MASK:
-                    self.dnd_left_primed = 0
-
-                if self.single_click_open: # FIXME: need to find a way to pass the model index
-                    self.grid_icon_double_click(icons_grid)
-            elif eve.type == Gdk.EventType.BUTTON_RELEASE and eve.button == 3: # r-click
-                event_system.emit("show_context_menu")
-
-        except WindowException as e:
-            logger.info(repr(e))
-            self.display_message(settings.theming.error_color, f"{repr(e)}")
-
-    def grid_icon_double_click(self, icons_grid, item, data=None):
-        try:
-            if self.ctrl_down and self.shift_down:
-                self.unset_keys_and_data()
-                self.execute_files(in_terminal=True)
-                return
-            elif self.ctrl_down:
-                self.unset_keys_and_data()
-                self.execute_files()
-                return
-
-            state      = self.get_current_state()
-            notebook   = self.builder.get_object(f"window_{state.wid}")
-            tab_label  = self.get_tab_label(notebook, state.icon_grid)
-
-            fileName   = state.store[item][1]
-            dir        = state.tab.get_current_directory()
-            file       = f"{dir}/{fileName}"
-
-            if isdir(file):
-                state.tab.set_path(file)
-                state.icon_grid.clear_and_set_new_store()
-                self.update_tab(tab_label, state.tab, state.icon_grid.get_store(), state.wid, state.tid)
-            else:
-                event_system.emit("open_files")
-        except WindowException as e:
-            traceback.print_exc()
-            self.display_message(settings.theming.error_color, f"{repr(e)}")
-
-
-
-    def grid_on_drag_set(self, icons_grid, drag_context, data, info, time):
-        action    = icons_grid.get_name()
-        wid, tid  = action.split("|")
-        store     = icons_grid.get_model()
-        treePaths = icons_grid.get_selected_items()
-        # NOTE: Need URIs as URI format for DnD to work. Will strip 'file://'
-        #       further down call chain when doing internal fm stuff.
-        uris      = self.format_to_uris(store, wid, tid, treePaths)
-        uris_text = '\n'.join(uris)
-
-        data.set_uris(uris)
-        data.set_text(uris_text, -1)
-
-    def grid_on_drag_motion(self, icons_grid, drag_context, x, y, data):
-        current     = '|'.join(self.fm_controller.get_active_wid_and_tid())
-        target      = icons_grid.get_name()
-        wid, tid    = target.split("|")
-        store       = icons_grid.get_model()
-        path_at_loc = None
-
-        try:
-            data = icons_grid.get_dest_item_at_pos(x, y)
-            path_at_loc   = data[0]
-            drop_position = data[1]
-            highlighted_item_path = icons_grid.get_drag_dest_item().path
-            if path_at_loc and path_at_loc == highlighted_item_path and drop_position == Gtk.IconViewDropPosition.DROP_INTO:
-                uri = self.format_to_uris(store, wid, tid, highlighted_item_path)[0].replace("file://", "")
-                self.override_drop_dest = uri if isdir(uri) else None
-            else:
-                self.override_drop_dest = None
-        except Exception as e:
-            self.override_drop_dest = None
-
-        if target not in current:
-            self.fm_controller.set_wid_and_tid(wid, tid)
-
-
-    def grid_on_drag_data_received(self, widget, drag_context, x, y, data, info, time):
-        if info == 80:
-            uris  = data.get_uris()
-            state = event_system.emit_and_await("get_current_state")
-            dest  = f"{state.tab.get_current_directory()}" if not self.override_drop_dest else self.override_drop_dest
-            if len(uris) == 0:
-                uris = data.get_text().split("\n")
-
-            from_uri = '/'.join(uris[0].replace("file://", "").split("/")[:-1])
-            if from_uri != dest:
-                event_system.emit("move_files", (uris, dest))
-
-
-    def create_new_tab_notebook(self, widget=None, wid=None, path=None):
-        self.create_tab(wid, None, path)
diff --git a/src/solarfm/core/ui_mixin.py b/src/solarfm/core/ui_mixin.py
index 406f1fa..d6d71cd 100644
--- a/src/solarfm/core/ui_mixin.py
+++ b/src/solarfm/core/ui_mixin.py
@@ -6,10 +6,11 @@ gi.require_version('Gtk', '3.0')
 gi.require_version('Gdk', '3.0')
 from gi.repository import Gtk
 from gi.repository import Gdk
+from gi.repository import GLib
 
 # Application imports
 from .mixins.ui.pane_mixin import PaneMixin
-from .mixins.ui.window_mixin import WindowMixin
+from .widgets.files_view.window_mixin import WindowMixin
 
 from .widgets.files_view.files_widget import FilesWidget
 
@@ -34,18 +35,20 @@ class UIMixin(PaneMixin, WindowMixin):
             nickname = session["window"]["Nickname"]
             tabs     = session["window"]["tabs"]
             isHidden = True if session["window"]["isHidden"] == "True" else False
-            event_system.emit("load_files_view_state", (nickname, tabs))
+            event_system.emit_and_await("load_files_view_state", (nickname, tabs, isHidden))
+
 
-    @daemon_threaded
     def _focus_last_visible_notebook(self, icon_grid):
         import time
 
         window = settings_manager.get_main_window()
         while not window.is_visible() and not window.get_realized():
-            time.sleep(0.1)
+            time.sleep(0.2)
 
         icon_grid.event(Gdk.Event().new(type = Gdk.EventType.BUTTON_RELEASE))
 
+        window = None
+
     def _current_loading_process(self, session_json = None):
         if session_json:
             for j, value in enumerate(session_json):
@@ -75,9 +78,10 @@ class UIMixin(PaneMixin, WindowMixin):
                 elif not self.is_pane1_hidden:
                     notebook = self.window1
 
+                # Todo: Maybe use 'realize' signal to focus widget instead...
                 scroll_win = notebook.get_children()[-1]
                 icon_grid  = scroll_win.get_children()[0]
-                self._focus_last_visible_notebook(icon_grid)
+                GLib.Thread("", self._focus_last_visible_notebook, icon_grid)
             except UIMixinException as e:
                 logger.info("\n:  The saved session might be missing window data!  :\nLocation: ~/.config/solarfm/session.json\nFix: Back it up and delete it to reset.\n")
                 logger.debug(repr(e))
diff --git a/src/solarfm/core/widgets/context_menu_widget.py b/src/solarfm/core/widgets/context_menu_widget.py
index 5774c5c..70745e7 100644
--- a/src/solarfm/core/widgets/context_menu_widget.py
+++ b/src/solarfm/core/widgets/context_menu_widget.py
@@ -16,10 +16,7 @@ class ContextMenuWidget(Gtk.Menu):
     def __init__(self):
         super(ContextMenuWidget, self).__init__()
 
-        self.builder            = settings_manager.get_builder()
-        self._builder           = Gtk.Builder()
-        self._context_menu_data = settings_manager.get_context_menu_data()
-        self._window            = settings_manager.get_main_window()
+        self._builder = Gtk.Builder()
 
         self._setup_styling()
         self._setup_signals()
@@ -32,24 +29,57 @@ class ContextMenuWidget(Gtk.Menu):
     def _setup_signals(self):
         event_system.subscribe("show_context_menu", self.show_context_menu)
         event_system.subscribe("hide_context_menu", self.hide_context_menu)
-        settings_manager.register_signals_to_builder([self,], self._builder)
+        settings_manager.register_signals_to_builder(self, self._builder)
 
     def _load_widgets(self):
+        self.builder            = settings_manager.get_builder()
+        self._window            = settings_manager.get_main_window()
+        self._context_menu_data = settings_manager.get_context_menu_data()
+
+        self.builder.expose_object("context_menu", self)
+
         self.build_context_menu()
 
     def _emit(self, menu_item, type):
         event_system.emit("do_action_from_menu_controls", type)
 
 
-    def make_submenu(self, name, data, keys):
+    def build_context_menu(self) -> None:
+        data          = self._context_menu_data
+        plugins_entry = None
+
+        for key, value in data.items():
+            entry = self.make_menu_item(key, value)
+            self.append(entry)
+            if key == "Plugins":
+                plugins_entry = entry
+
+        self.attach_to_widget(self._window, None)
+        self.show_all()
+
+        if plugins_entry:
+            self.builder.expose_object("context_menu_plugins", plugins_entry.get_submenu())
+
+    def make_menu_item(self, label, data) -> Gtk.MenuItem:
+        if isinstance(data, dict):
+            return self.make_submenu(label, data)
+        elif isinstance(data, list):
+            entry = Gtk.ImageMenuItem(label)
+            icon  = getattr(Gtk, f"{data[0]}")
+            entry.set_image( Gtk.Image(stock=icon) )
+            entry.set_always_show_image(True)
+            entry.connect("activate", self._emit, (data[1]))
+            return entry
+
+    def make_submenu(self, name, data):
         menu      = Gtk.Menu()
         menu_item = Gtk.MenuItem(name)
 
-        for key in keys:
+        for key, value in data.items():
             if isinstance(data, dict):
-                entry = self.make_menu_item(key, data[key])
+                entry = self.make_menu_item(key, value)
             elif isinstance(data, list):
-                entry = self.make_menu_item(key, data)
+                entry = self.make_menu_item(key, value)
             else:
                 continue
 
@@ -58,36 +88,9 @@ class ContextMenuWidget(Gtk.Menu):
         menu_item.set_submenu(menu)
         return menu_item
 
-    def make_menu_item(self, name, data) -> Gtk.MenuItem:
-        if isinstance(data, dict):
-            return self.make_submenu(name, data, data.keys())
-        elif isinstance(data, list):
-            entry = Gtk.ImageMenuItem(name)
-            icon  = getattr(Gtk, f"{data[0]}")
-            entry.set_image( Gtk.Image(stock=icon) )
-            entry.set_always_show_image(True)
-            entry.connect("activate", self._emit, (data[1]))
-            return entry
 
-    def build_context_menu(self) -> None:
-        data          = self._context_menu_data
-        dkeys         = data.keys()
-        plugins_entry = None
-
-        for dkey in dkeys:
-            entry = self.make_menu_item(dkey, data[dkey])
-            self.append(entry)
-            if dkey == "Plugins":
-                plugins_entry = entry
-
-        self.attach_to_widget(self._window, None)
-        self.show_all()
-        self.builder.expose_object("context_menu", self)
-        if plugins_entry:
-            self.builder.expose_object("context_menu_plugins", plugins_entry.get_submenu())
-
-    def show_context_menu(self, widget=None, eve=None):
+    def show_context_menu(self, widget = None, eve = None):
         self.builder.get_object("context_menu").popup_at_pointer(None)
 
-    def hide_context_menu(self, widget=None, eve=None):
+    def hide_context_menu(self, widget = None, eve = None):
         self.builder.get_object("context_menu").popdown()
diff --git a/src/solarfm/core/widgets/dialogs/about_widget.py b/src/solarfm/core/widgets/dialogs/about_widget.py
index b5535d9..6f661fd 100644
--- a/src/solarfm/core/widgets/dialogs/about_widget.py
+++ b/src/solarfm/core/widgets/dialogs/about_widget.py
@@ -39,11 +39,10 @@ class AboutWidget:
         self.about_page = self._builder.get_object("about_page")
         builder.expose_object(f"about_page", self.about_page)
 
-
-    def show_about_page(self, widget=None, eve=None):
+    def show_about_page(self, widget = None, eve = None):
         response   = self.about_page.run()
         if response in [Gtk.ResponseType.CANCEL, Gtk.ResponseType.DELETE_EVENT]:
             self.hide_about_page()
 
-    def hide_about_page(self, widget=None, eve=None):
+    def hide_about_page(self, widget = None, eve = None):
         self.about_page.hide()
diff --git a/src/solarfm/core/widgets/dialogs/rename_widget.py b/src/solarfm/core/widgets/dialogs/rename_widget.py
index 43b3d50..dfb69b4 100644
--- a/src/solarfm/core/widgets/dialogs/rename_widget.py
+++ b/src/solarfm/core/widgets/dialogs/rename_widget.py
@@ -50,6 +50,9 @@ class RenameWidget:
     def show_rename_file_menu(self, widget=None, eve=None):
         if widget:
             widget.grab_focus()
+            end_i = widget.get_text().rfind(".")
+            if end_i > 0:
+                widget.select_region(0, end_i)
 
         response = self._rename_file_menu.run()
         if response == Gtk.ResponseType.CLOSE:
@@ -61,16 +64,56 @@ class RenameWidget:
 
 
     def set_to_title_case(self, widget, eve=None):
-        self._rename_fname.set_text( self._rename_fname.get_text().title() )
+        bounds = self._rename_fname.get_selection_bounds()
+        fname  = self._rename_fname.get_text()
+
+        if bounds:
+            start, end = bounds
+            replace = fname[start:end]
+            fname   = fname.replace(replace, replace.title())
+        else:
+            fname   = fname.title()
+
+        self._rename_fname.set_text(fname)
 
     def set_to_upper_case(self, widget, eve=None):
-        self._rename_fname.set_text( self._rename_fname.get_text().upper() )
+        bounds = self._rename_fname.get_selection_bounds()
+        fname   = self._rename_fname.get_text()
+
+        if bounds:
+            start, end = bounds
+            replace = fname[start:end]
+            fname   = fname.replace(replace, replace.upper())
+        else:
+            fname   = fname.upper()
+
+        self._rename_fname.set_text(fname)
 
     def set_to_lower_case(self, widget, eve=None):
-        self._rename_fname.set_text( self._rename_fname.get_text().lower() )
+        bounds = self._rename_fname.get_selection_bounds()
+        fname  = self._rename_fname.get_text()
+
+        if bounds:
+            start, end = bounds
+            replace = fname[start:end]
+            fname   = fname.replace(replace, replace.lower())
+        else:
+            fname   = fname.lower()
+
+        self._rename_fname.set_text(fname)
 
     def set_to_invert_case(self, widget, eve=None):
-        self._rename_fname.set_text( self._rename_fname.get_text().swapcase() )
+        bounds = self._rename_fname.get_selection_bounds()
+        fname  = self._rename_fname.get_text()
+
+        if bounds:
+            start, end = bounds
+            replace = fname[start:end]
+            fname   = fname.replace(replace, replace.swapcase())
+        else:
+            fname   = fname.swapcase()
+
+        self._rename_fname.set_text(fname)
 
     def hide_rename_file_menu(self, widget=None, eve=None):
         self._rename_file_menu.hide()
@@ -78,4 +121,4 @@ class RenameWidget:
     def hide_rename_file_menu_enter_key(self, widget=None, eve=None):
         keyname = Gdk.keyval_name(eve.keyval).lower()
         if keyname in ["return", "enter"]:
-            self._rename_file_menu.hide()
+            self._rename_file_menu.hide()
\ No newline at end of file
diff --git a/src/solarfm/core/widgets/files_view/files_widget.py b/src/solarfm/core/widgets/files_view/files_widget.py
index cca26d6..de10fa7 100644
--- a/src/solarfm/core/widgets/files_view/files_widget.py
+++ b/src/solarfm/core/widgets/files_view/files_widget.py
@@ -1,11 +1,9 @@
 # Python imports
 
 # Lib imports
-import gi
-gi.require_version('Gtk', '3.0')
-from gi.repository import Gtk
 
 # Application imports
+from ...sfm_builder import SFMBuilder
 from ...mixins.signals.file_action_signals_mixin import FileActionSignalsMixin
 from .window_mixin import WindowMixin
 
@@ -27,7 +25,8 @@ class FilesWidget(FileActionSignalsMixin, WindowMixin):
 
         self.INDEX   = self.ccount
         self.NAME    = f"window_{self.INDEX}"
-        self.builder = Gtk.Builder()
+        self.builder = SFMBuilder()
+
         self.files_view    = None
         self.fm_controller = None
 
@@ -41,20 +40,21 @@ class FilesWidget(FileActionSignalsMixin, WindowMixin):
         ...
 
     def _setup_signals(self):
-        settings_manager.register_signals_to_builder([self,], self.builder)
+        settings_manager.register_signals_to_builder([self], self.builder)
 
     def _subscribe_to_events(self):
         event_system.subscribe("load_files_view_state", self._load_files_view_state)
         event_system.subscribe("get_files_view_icon_grid", self._get_files_view_icon_grid)
 
     def _load_widgets(self):
-        _builder   = settings_manager.get_builder()
+        _builder        = settings_manager.get_builder()
         self.files_view = _builder.get_object(f"{self.NAME}")
 
         self.files_view.set_group_name("files_widget")
+
         self.builder.expose_object(f"{self.NAME}", self.files_view)
 
-    def _load_files_view_state(self, win_name = None, tabs = None):
+    def _load_files_view_state(self, win_name = None, tabs = None, isHidden = False):
         if win_name == self.NAME:
             if tabs:
                 for tab in tabs:
@@ -62,10 +62,13 @@ class FilesWidget(FileActionSignalsMixin, WindowMixin):
             else:
                 self.create_new_tab_notebook(None, self.INDEX, None)
 
+            if isHidden:
+                self.files_view.hide()
+
     def _get_files_view_icon_grid(self, win_index = None, tid = None):
         if win_index == str(self.INDEX):
             return self.builder.get_object(f"{self.INDEX}|{tid}|icon_grid", use_gtk = False)
 
 
     def set_fm_controller(self, _fm_controller):
-        self.fm_controller = _fm_controller
+        self.fm_controller = _fm_controller
\ No newline at end of file
diff --git a/src/solarfm/core/widgets/files_view/grid_mixin.py b/src/solarfm/core/widgets/files_view/grid_mixin.py
index 0b02715..0b5a7ec 100644
--- a/src/solarfm/core/widgets/files_view/grid_mixin.py
+++ b/src/solarfm/core/widgets/files_view/grid_mixin.py
@@ -7,6 +7,7 @@ import gi
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk
 from gi.repository import GLib
+from gi.repository import Gio
 
 # Application imports
 from ...widgets.tab_header_widget import TabHeaderWidget
@@ -25,61 +26,49 @@ class GridMixin:
         for file in files:
             store.append([None, file[0]])
 
-        Gtk.main_iteration()
-        if use_generator:
-            # NOTE: tab > icon > _get_system_thumbnail_gtk_thread must not be used
-            # as the attempted promotion back to gtk threading stalls the generator. (We're already in main gtk thread)
-            for i, icon in enumerate( self.create_icons_generator(tab, dir, files) ):
-                self.load_icon(i, store, icon)
-        else:
-            # for i, file in enumerate(files):
-            #     self.create_icon(i, tab, store, dir, file[0])
-            try:
-                loop = asyncio.get_running_loop()
-            except RuntimeError:
-                loop = None
-
-            if loop and loop.is_running():
-                loop.create_task( self.create_icons(tab, store, dir, files) )
-            else:
-                asyncio.run( self.create_icons(tab, store, dir, files) )
+        self.load_icons(tab, store, dir, files, self.update_store)
 
         # NOTE: Not likely called often from here but it could be useful
         if save_state and not trace_debug:
             self.fm_controller.save_state()
 
-    async def create_icons(self, tab, store, dir, files):
-        tasks = [self.update_store(i, store, dir, tab, file[0]) for i, file in enumerate(files)]
-        await asyncio.gather(*tasks)
+    @daemon_threaded
+    def load_icons(self, tab, store, dir, files, callback):
+        icons = []
+        for file in files:
+            icons.append(
+                tab.create_icon(dir, file[0])
+            )
 
-    async def load_icon(self, i, store, icon):
-        self.update_store(i, store, icon)
+        GLib.idle_add(callback, store, icons)
 
-    async def update_store(self, i, store, dir, tab, file):
-        icon = tab.create_icon(dir, file)
-        itr  = store.get_iter(i)
+    def update_store(self, store, icons):
+        for i, icon in enumerate(icons):
+            try:
+                itr  = store.get_iter(i)
+                store.set_value(itr, 0, icon)
+                icon.run_dispose()
+            except:
+                icon.run_dispose()
+                continue
+
+        store.run_dispose()
+        del icons
+        del store
+
+    def insert_store(self, store, itr, icon):
         store.set_value(itr, 0, icon)
 
-    def create_icons_generator(self, tab, dir, files):
-        for file in files:
-            icon = tab.create_icon(dir, file[0])
-            yield icon
+        # Note:  If the function returns GLib.SOURCE_REMOVE or False it is automatically removed from the list of event sources and will not be called again.
+        return False
 
-    # @daemon_threaded
-    # def create_icon(self, i, tab, store, dir, file):
-    #     icon = tab.create_icon(dir, file)
-    #     GLib.idle_add(self.update_store, *(i, store, icon,))
-    #
-    # @daemon_threaded
-    # def load_icon(self, i, store, icon):
-    #     GLib.idle_add(self.update_store, *(i, store, icon,))
-    #
-    # def update_store(self, i, store, icon):
-    #     itr = store.get_iter(i)
-    #     store.set_value(itr, 0, icon)
+    def do_ui_update(self):
+        Gtk.main_iteration()
+        # Note:  If the function returns GLib.SOURCE_REMOVE or False it is automatically removed from the list of event sources and will not be called again.
+        return False
 
-    def create_tab_widget(self, tab):
-        return TabHeaderWidget(tab, self.close_tab)
+    def create_tab_widget(self):
+        return TabHeaderWidget(self.close_tab)
 
     def create_scroll_and_store(self, tab, wid, use_tree_view = False):
         scroll = Gtk.ScrolledWindow()
@@ -136,4 +125,12 @@ class GridMixin:
                 store     = icon_grid.get_model()
                 tab_label = notebook.get_tab_label(obj).get_children()[0]
 
+        icon_grid = None
         return store, tab_label
+
+    def get_icon_grid_from_notebook(self, notebook, _name):
+        for obj in notebook.get_children():
+            icon_grid = obj.get_children()[0]
+            name      = icon_grid.get_name()
+            if name == _name:
+                return icon_grid
\ No newline at end of file
diff --git a/src/solarfm/core/widgets/files_view/tab_mixin.py b/src/solarfm/core/widgets/files_view/tab_mixin.py
index 9ea81ba..f67eb05 100644
--- a/src/solarfm/core/widgets/files_view/tab_mixin.py
+++ b/src/solarfm/core/widgets/files_view/tab_mixin.py
@@ -1,7 +1,7 @@
 # Python imports
 import os
-import gc
 import time
+import gc
 
 # Lib imports
 import gi
@@ -22,9 +22,9 @@ class TabMixin(GridMixin):
             wid, tid = self.fm_controller.get_active_wid_and_tid()
 
         notebook    = self.builder.get_object(f"window_{wid}")
-        # path_entry  = self.builder.get_object(f"path_entry")
+        path_entry  = self.builder.get_object(f"path_entry")
         tab         = self.fm_controller.add_tab_for_window_by_nickname(f"window_{wid}")
-        # tab.logger  = logger
+        tab.logger  = logger
 
         tab.set_wid(wid)
         if not path:
@@ -34,71 +34,89 @@ class TabMixin(GridMixin):
         else:
             tab.set_path(path)
 
-        tab_widget    = self.create_tab_widget(tab)
+        tab_widget    = self.get_tab_widget(tab)
         scroll, store = self.create_scroll_and_store(tab, wid)
         index         = notebook.append_page(scroll, tab_widget)
         notebook.set_tab_detachable(scroll, True)
+        notebook.set_tab_reorderable(scroll, True)
 
         self.fm_controller.set_wid_and_tid(wid, tab.get_id())
-        event_system.emit("go_to_path", (tab.get_current_directory(),)) # NOTE: Not efficent if I understand how
-        # path_entry.set_text(tab.get_current_directory())
+        path_entry.set_text(tab.get_current_directory())
+        # event_system.emit("go_to_path", (tab.get_current_directory(),)) # NOTE: Not efficent if I understand how
         notebook.show_all()
         notebook.set_current_page(index)
 
         ctx = notebook.get_style_context()
         ctx.add_class("notebook-unselected-focus")
-        notebook.set_tab_reorderable(scroll, True)
         self.load_store(tab, store)
-        # self.set_window_title()
         event_system.emit("set_window_title", (tab.get_current_directory(),))
         self.set_file_watcher(tab)
 
 
+    def get_tab_widget(self, tab):
+        tab_widget     = self.create_tab_widget()
+        tab_widget.tab = tab
+
+        tab_widget.label.set_label(f"{tab.get_end_of_path()}")
+        tab_widget.label.set_width_chars(len(tab.get_end_of_path()))
+
+        return tab_widget
+
     def close_tab(self, button, eve = None):
         notebook = button.get_parent().get_parent()
-        if notebook.get_n_pages() == 1:
-            return
+        if notebook.get_n_pages() == 1: return
 
         tab_box   = button.get_parent()
         wid       = int(notebook.get_name()[-1])
         tid       = self.get_id_from_tab_box(tab_box)
         scroll    = self.builder.get_object(f"{wid}|{tid}", use_gtk = False)
         icon_grid = scroll.get_children()[0]
-        store     = icon_grid.get_model()
         tab       = self.get_fm_window(wid).get_tab_by_id(tid)
         watcher   = tab.get_dir_watcher()
 
         watcher.cancel()
+        watcher.disconnect(watcher.watch_id)
+        watcher.run_dispose()
         self.get_fm_window(wid).delete_tab_by_id(tid)
 
+        logger.debug(f"Reference count for watcher is: {watcher.__grefcount__}")
+        logger.debug(f"Reference count for tab_box is: {tab_box.__grefcount__}")
+        logger.debug(f"Reference count for icon_grid is: {icon_grid.__grefcount__}")
+        logger.debug(f"Reference count for scroll is: {scroll.__grefcount__}")
+
+        tab_box.clear_signals_and_data()
+        icon_grid.clear_signals_and_data()
+
         self.builder.dereference_object(f"{wid}|{tid}|icon_grid")
         self.builder.dereference_object(f"{wid}|{tid}")
 
-        store.clear()
-        # store.run_dispose()
-        icon_grid.destroy()
-        # icon_grid.run_dispose()
-        scroll.destroy()
-        #scroll.run_dispose()
-        tab_box.destroy()
-        #tab_box.run_dispose()
+        notebook.remove_page( notebook.page_num(scroll) )
 
-        del store
+        tab_box.tab = None
+        tab_box.unparent()
+        tab_box.run_dispose()
+        icon_grid.run_dispose()
+        scroll.run_dispose()
+        icon_grid.unparent()
+        scroll.unparent()
+
+        logger.debug(f"Reference count for tab_box is: {tab_box.__grefcount__}")
+        logger.debug(f"Reference count for icon_grid is: {icon_grid.__grefcount__}")
+        logger.debug(f"Reference count for scroll is: {scroll.__grefcount__}")
+
+        del tab_box
         del icon_grid
         del scroll
-        del tab_box
-        del watcher
-        del tab
 
         gc.collect()
+
         if not settings_manager.is_trace_debug():
             self.fm_controller.save_state()
 
         self.set_window_title()
 
-    # NOTE: Not actually getting called even tho set in the glade file...
     def on_tab_dnded(self, notebook, page, x, y):
-        ...
+        logger.info("Create new window on tab dnd outside stub...")
 
     def on_tab_reorder(self, child, page_num, new_index):
         wid, tid = page_num.get_name().split("|")
@@ -110,6 +128,8 @@ class TabMixin(GridMixin):
                 _tab    = window.get_tab_by_id(tid)
                 watcher = _tab.get_dir_watcher()
                 watcher.cancel()
+                watcher.disconnect(watcher.watch_id)
+                watcher.run_dispose()
                 window.get_all_tabs().insert(new_index, window.get_all_tabs().pop(i))
 
         tab = window.get_tab_by_id(tid)
@@ -120,12 +140,13 @@ class TabMixin(GridMixin):
     def on_tab_switch_update(self, notebook, content = None, index = None):
         self.selected_files.clear()
         wid, tid = content.get_children()[0].get_name().split("|")
+
         self.fm_controller.set_wid_and_tid(wid, tid)
         self.set_path_text(wid, tid)
         self.set_window_title()
 
     def get_id_from_tab_box(self, tab_box):
-        return tab_box.get_children()[2].get_text()
+        return tab_box.tab.get_id()
 
     def get_tab_label(self, notebook, icon_grid):
         return notebook.get_tab_label(icon_grid.get_parent()).get_children()[0]
@@ -141,6 +162,8 @@ class TabMixin(GridMixin):
         state.tab.load_directory()
         self.load_store(state.tab, state.store)
 
+        state = None
+
     def update_tab(self, tab_label, tab, store, wid, tid):
         self.load_store(tab, store)
         self.set_path_text(wid, tid)
@@ -181,15 +204,37 @@ class TabMixin(GridMixin):
             if isinstance(focused_obj, Gtk.Entry):
                 self.process_path_menu(widget, tab, dir)
 
+            action = None
+            store  = None
+
             if path.endswith(".") or path == dir:
+                tab_label = None
+                notebook  = None
+                wid, tid  = None, None
+                path = None
+                tab  = None
                 return
 
             if not tab.set_path(path):
+                tab_label = None
+                notebook  = None
+                wid, tid  = None, None
+                path = None
+                tab  = None
                 return
 
         icon_grid = self.get_icon_grid_from_notebook(notebook, f"{wid}|{tid}")
         icon_grid.clear_and_set_new_store()
-        self.update_tab(tab_label, tab, store, wid, tid)
+        self.update_tab(tab_label, tab, icon_grid.get_store(), wid, tid)
+
+        action    = None
+        wid, tid  = None, None
+        notebook  = None
+        store, tab_label = None, None
+        path      = None
+        tab       = None
+        icon_grid = None
+
 
     def process_path_menu(self, gtk_entry, tab, dir):
         path_menu_buttons  = self.builder.get_object("path_menu_buttons")
@@ -207,11 +252,16 @@ class TabMixin(GridMixin):
                     path_menu_buttons.add(button)
                     show_path_menu = True
 
+        query = None
+        files = None
+
         if not show_path_menu:
+            path_menu_buttons = None
             event_system.emit("hide_path_menu")
         else:
             event_system.emit("show_path_menu")
             buttons = path_menu_buttons.get_children()
+            path_menu_buttons = None
 
             if len(buttons) == 1:
                 self.slowed_focus(buttons[0])
@@ -224,6 +274,7 @@ class TabMixin(GridMixin):
     def do_focused_click(self, button):
         button.grab_focus()
         button.clicked()
+        return False
 
     def set_path_entry(self, button = None, eve = None):
         self.path_auto_filled = True
@@ -236,9 +287,17 @@ class TabMixin(GridMixin):
         path_entry.set_position(-1)
         event_system.emit("hide_path_menu")
 
+        state      = None
+        path       = None
+        path_entry = None
+
+
     def show_hide_hidden_files(self):
         wid, tid = self.fm_controller.get_active_wid_and_tid()
         tab      = self.get_fm_window(wid).get_tab_by_id(tid)
         tab.set_hiding_hidden(not tab.is_hiding_hidden())
         tab.load_directory()
         self.builder.get_object("refresh_tab").released()
+
+        wid, tid = None, None
+        tab      = None
\ No newline at end of file
diff --git a/src/solarfm/core/widgets/files_view/window_mixin.py b/src/solarfm/core/widgets/files_view/window_mixin.py
index 59a33dc..b3ac86b 100644
--- a/src/solarfm/core/widgets/files_view/window_mixin.py
+++ b/src/solarfm/core/widgets/files_view/window_mixin.py
@@ -34,17 +34,31 @@ class WindowMixin(TabMixin):
         tab      = self.get_fm_window(wid).get_tab_by_id(tid)
         dir      = tab.get_current_directory()
 
-        event_system.emit("unset_selected_files_views")
-        ctx = self.files_view.get_style_context()
+        for _notebook in self.notebooks:
+            ctx = _notebook.get_style_context()
+            ctx.remove_class("notebook-selected-focus")
+            ctx.add_class("notebook-unselected-focus")
+
+        ctx = notebook.get_style_context()
         ctx.remove_class("notebook-unselected-focus")
         ctx.add_class("notebook-selected-focus")
 
-        event_system.emit("set_window_title", (dir,))
+        self.window.set_title(f"{app_name} ~ {dir}")
         self.set_bottom_labels(tab)
 
+        wid, tid = None, None
+        notebook = None
+        tab      = None
+        dir      = None
+
     def set_path_text(self, wid, tid):
-        tab = self.get_fm_window(wid).get_tab_by_id(tid)
-        event_system.emit("go_to_path", (tab.get_current_directory(),))
+        path_entry = self.builder.get_object("path_entry")
+        tab        = self.get_fm_window(wid).get_tab_by_id(tid)
+        path_entry.set_text(tab.get_current_directory())
+        path_entry.set_position(-1)
+
+        path_entry = None
+        tab        = None
 
     def grid_set_selected_items(self, icons_grid):
         new_items      = icons_grid.get_selected_items()
@@ -103,7 +117,6 @@ class WindowMixin(TabMixin):
                 self.execute_files()
                 return
 
-
             state      = self.get_current_state()
             notebook   = self.builder.get_object(f"window_{state.wid}")
             tab_label  = self.get_tab_label(notebook, state.icon_grid)
@@ -118,6 +131,10 @@ class WindowMixin(TabMixin):
                 self.update_tab(tab_label, state.tab, state.icon_grid.get_store(), state.wid, state.tid)
             else:
                 event_system.emit("open_files")
+
+            state     = None
+            notebook  = None
+            tab_label = None
         except WindowException as e:
             traceback.print_exc()
             self.display_message(settings.theming.error_color, f"{repr(e)}")
@@ -160,6 +177,12 @@ class WindowMixin(TabMixin):
         if target not in current:
             self.fm_controller.set_wid_and_tid(wid, tid)
 
+        current     = None
+        target      = None
+        wid, tid    = None, None
+        store       = None
+        path_at_loc = None
+
 
     def grid_on_drag_data_received(self, widget, drag_context, x, y, data, info, time):
         if info == 80:
@@ -173,6 +196,10 @@ class WindowMixin(TabMixin):
             if from_uri != dest:
                 event_system.emit("move_files", (uris, dest))
 
+            Gtk.drag_finish(drag_context, True, False, time)
+            return
+
+        Gtk.drag_finish(drag_context, False, False, time)
 
     def create_new_tab_notebook(self, widget=None, wid=None, path=None):
-        self.create_tab(wid, None, path)
+        self.create_tab(wid, None, path)
\ No newline at end of file
diff --git a/src/solarfm/core/widgets/icon_grid_widget.py b/src/solarfm/core/widgets/icon_grid_widget.py
index 51088b3..cca69ba 100644
--- a/src/solarfm/core/widgets/icon_grid_widget.py
+++ b/src/solarfm/core/widgets/icon_grid_widget.py
@@ -1,4 +1,5 @@
 # Python imports
+import gc
 
 # Lib imports
 import gi
@@ -8,8 +9,8 @@ from gi.repository import Gtk
 from gi.repository import Gdk
 from gi.repository import GdkPixbuf
 
-
 # Application imports
+# from utils.cbindings import gtkmemreaper
 
 
 
@@ -20,6 +21,8 @@ class IconGridWidget(Gtk.IconView):
     def __init__(self):
         super(IconGridWidget, self).__init__()
 
+        self._handler_ids = []
+
         self._setup_styling()
         self._setup_signals()
         self._set_up_dnd()
@@ -45,19 +48,23 @@ class IconGridWidget(Gtk.IconView):
     def _setup_signals(self):
         ...
 
-    def _setup_additional_signals(self, grid_icon_single_click,
-                                        grid_icon_double_click,
-                                        grid_set_selected_items,
-                                        grid_on_drag_set,
-                                        grid_on_drag_data_received,
-                                        grid_on_drag_motion):
+    def _setup_additional_signals(self,
+        grid_icon_single_click,
+        grid_icon_double_click,
+        grid_set_selected_items,
+        grid_on_drag_set,
+        grid_on_drag_data_received,
+        grid_on_drag_motion
+    ):
 
-        self.connect("button_release_event", grid_icon_single_click)
-        self.connect("item-activated",       grid_icon_double_click)
-        self.connect("selection-changed",    grid_set_selected_items)
-        self.connect("drag-data-get",        grid_on_drag_set)
-        self.connect("drag-data-received",   grid_on_drag_data_received)
-        self.connect("drag-motion",          grid_on_drag_motion)
+        self._handler_ids = [
+            self.connect("button_release_event", grid_icon_single_click),
+            self.connect("item-activated",       grid_icon_double_click),
+            self.connect("selection-changed",    grid_set_selected_items),
+            self.connect("drag-data-get",        grid_on_drag_set),
+            self.connect("drag-data-received",   grid_on_drag_data_received),
+            self.connect("drag-motion",          grid_on_drag_motion)
+        ]
 
     def _load_widgets(self):
         self.clear_and_set_new_store()
@@ -75,6 +82,49 @@ class IconGridWidget(Gtk.IconView):
         return self.get_model()
 
     def clear_and_set_new_store(self):
+        self._clear_store()
+        self.set_model(
+            Gtk.ListStore(
+                GdkPixbuf.Pixbuf or GdkPixbuf.PixbufAnimation or None, str or None
+            )
+        )
+
+    def clear_signals_and_data(self):
+        self.unset_model_drag_dest()
+        self.unset_model_drag_source()
+
+        for handle_id in self._handler_ids:
+            self.disconnect(handle_id)
+
+        self._handler_ids.clear()
+        self._clear_store()
+
+    def _clear_store(self):
+        store = self.get_model()
         self.set_model(None)
-        store = Gtk.ListStore(GdkPixbuf.Pixbuf or GdkPixbuf.PixbufAnimation or None, str or None)
-        self.set_model(store)
+
+        if not store: return
+
+        iter = store.get_iter_first()
+        while iter:
+            icon = store.get_value(iter, 0)
+
+            store.set_value(iter, 0, None)
+            store.set_value(iter, 1, None)
+
+            iter = store.iter_next(iter)
+
+            if icon:
+                logger.debug(f"Reference count for icon is: {icon.__grefcount__}")
+                icon.run_dispose()
+                # icon_ptr = int(hash(icon))  # WARNING: not stable across runs
+                # gtkmemreaper.free_pixbuf(icon_ptr)
+                del icon
+
+        store.clear()
+        store.run_dispose()
+        # store_ptr = int(hash(store))  # WARNING: not stable across runs
+        # gtkmemreaper.free_list_store(store)
+        del store
+
+        gc.collect()
diff --git a/src/solarfm/core/widgets/icon_tree_widget.py b/src/solarfm/core/widgets/icon_tree_widget.py
index 6f935e6..8bad446 100644
--- a/src/solarfm/core/widgets/icon_tree_widget.py
+++ b/src/solarfm/core/widgets/icon_tree_widget.py
@@ -59,7 +59,7 @@ class IconTreeWidget(Gtk.TreeView):
         name   = Gtk.CellRendererText()
         selec  = self.get_selection()
 
-        self.set_model(store)
+        self.set_model(self._store)
         selec.set_mode(3)
 
         column.pack_start(icon, False)
diff --git a/src/solarfm/core/widgets/io_widget.py b/src/solarfm/core/widgets/io_widget.py
index c0bcce1..ab8bf41 100644
--- a/src/solarfm/core/widgets/io_widget.py
+++ b/src/solarfm/core/widgets/io_widget.py
@@ -65,19 +65,20 @@ class IOWidget(Gtk.Box):
         logger.info(f"Canceling: [{self._action}] of {self._basename} ...")
         eve.cancel()
 
-    def update_progress(self, current, total, eve=None):
+    def update_progress(self, current, total, eve = None):
         self.progress.set_fraction(current/total)
 
-    def finish_callback(self, file, task=None, eve=None):
+    def finish_callback(self, file, task = None, eve = None):
+        if task.had_error():
+            logger.info(f"{self._action} of {self._basename} cancelled/failed...")
+            return
+
         if self._action == "move" or self._action == "rename":
             status = self._file.move_finish(task)
         if self._action == "copy":
             status = self._file.copy_finish(task)
 
-        if status:
-            self.delete_self()
-        else:
-            logger.info(f"{self._action} of {self._basename} failed...")
+        self.delete_self()
 
-    def delete_self(self, widget=None, eve=None):
-        self.get_parent().remove(self)
+    def delete_self(self, widget = None, eve = None):
+        self.get_parent().remove(self)
\ No newline at end of file
diff --git a/src/solarfm/core/widgets/popups/message_popup_widget.py b/src/solarfm/core/widgets/popups/message_popup_widget.py
index 75b0b5c..d8bf706 100644
--- a/src/solarfm/core/widgets/popups/message_popup_widget.py
+++ b/src/solarfm/core/widgets/popups/message_popup_widget.py
@@ -61,7 +61,6 @@ class MessagePopupWidget(Gtk.Popover):
         scroll_window.set_hexpand(True)
         vbox.set_orientation(Gtk.Orientation.VERTICAL)
 
-        self.builder.expose_object(f"message_popup_widget", self)
         self.builder.expose_object(f"message_text_view", message_text_view)
 
         scroll_window.add(message_text_view)
@@ -103,7 +102,7 @@ class MessagePopupWidget(Gtk.Popover):
             self.popup()
             self.hide_message_timeout(seconds)
 
-    @threaded
+    @daemon_threaded
     def hide_message_timeout(self, seconds=3):
         time.sleep(seconds)
         GLib.idle_add(event_system.emit, ("hide_messages_popup"))
diff --git a/src/solarfm/core/widgets/popups/path_menu_popup_widget.py b/src/solarfm/core/widgets/popups/path_menu_popup_widget.py
index e3359bf..3f2c507 100644
--- a/src/solarfm/core/widgets/popups/path_menu_popup_widget.py
+++ b/src/solarfm/core/widgets/popups/path_menu_popup_widget.py
@@ -29,16 +29,16 @@ class PathMenuPopupWidget(Gtk.Popover):
         self.set_relative_to(path_entry)
         self.set_modal(False)
         self.set_position(Gtk.PositionType.BOTTOM)
-        self.set_size_request(240, 420)
+        self.set_size_request(480, 420)
 
     def _setup_signals(self):
         event_system.subscribe("show_path_menu", self.show_path_menu)
         event_system.subscribe("hide_path_menu", self.hide_path_menu)
 
     def _load_widgets(self):
-        path_menu_buttons = Gtk.ButtonBox()
-        scroll_window = Gtk.ScrolledWindow()
-        view_port = Gtk.Viewport()
+        scroll_window     = Gtk.ScrolledWindow()
+        view_port         = Gtk.Viewport()
+        path_menu_buttons = Gtk.Box()
 
         scroll_window.set_vexpand(True)
         scroll_window.set_hexpand(True)
@@ -47,12 +47,13 @@ class PathMenuPopupWidget(Gtk.Popover):
         self.builder.expose_object(f"path_menu_buttons", path_menu_buttons)
         view_port.add(path_menu_buttons)
         scroll_window.add(view_port)
-        scroll_window.show_all()
         self.add(scroll_window)
 
+        scroll_window.show_all()
 
-    def show_path_menu(self, widget=None, eve=None):
+
+    def show_path_menu(self, widget = None, eve = None):
         self.popup()
 
-    def hide_path_menu(self, widget=None, eve=None):
-        self.popdown()
+    def hide_path_menu(self, widget = None, eve = None):
+        self.popdown()
\ No newline at end of file
diff --git a/src/solarfm/core/widgets/tab_header_widget.py b/src/solarfm/core/widgets/tab_header_widget.py
index df07706..0bcab0c 100644
--- a/src/solarfm/core/widgets/tab_header_widget.py
+++ b/src/solarfm/core/widgets/tab_header_widget.py
@@ -9,15 +9,13 @@ from gi.repository import Gtk
 
 
 
-
 class TabHeaderWidget(Gtk.Box):
     """docstring for TabHeaderWidget"""
 
-    def __init__(self, tab, close_tab):
+    def __init__(self, close_tab):
         super(TabHeaderWidget, self).__init__()
 
-        self._tab       = tab
-        self._close_tab = close_tab # NOTE: Close method in tab_mixin
+        self._close_tab = close_tab # NOTE: Close method is from tab_mixin
 
         self._setup_styling()
         self._setup_signals()
@@ -32,25 +30,28 @@ class TabHeaderWidget(Gtk.Box):
         ...
 
     def _load_widgets(self):
-        label = Gtk.Label()
-        tid   = Gtk.Label()
-        close = Gtk.Button()
-        icon  = Gtk.Image(stock=Gtk.STOCK_CLOSE)
+        self.label     = Gtk.Label()
+        self.close_btn = Gtk.Button()
+        icon           = Gtk.Image(stock = Gtk.STOCK_CLOSE)
 
-        label.set_label(f"{self._tab.get_end_of_path()}")
-        label.set_width_chars(len(self._tab.get_end_of_path()))
-        label.set_xalign(0.0)
-        label.set_margin_left(25)
-        label.set_margin_right(25)
-        label.set_hexpand(True)
-        tid.set_label(f"{self._tab.get_id()}")
+        self.label.set_xalign(0.0)
+        self.label.set_margin_left(25)
+        self.label.set_margin_right(25)
+        self.label.set_hexpand(True)
 
-        close.connect("released", self._close_tab)
+        self._handler_id = self.close_btn.connect("released", self._close_tab)
 
-        close.add(icon)
-        self.add(label)
-        self.add(close)
-        self.add(tid)
+        self.close_btn.add(icon)
+        self.add(self.label)
+        self.add(self.close_btn)
 
         self.show_all()
-        tid.hide()
+
+    def clear_signals_and_data(self):
+        self.close_btn.disconnect(self._handler_id)
+        self._close_tab    = None
+        self._handler_id   = None
+
+        for child in self.get_children():
+            child.unparent()
+            child.run_dispose()
diff --git a/src/solarfm/core/window.py b/src/solarfm/core/window.py
index 4bce515..2b6015a 100644
--- a/src/solarfm/core/window.py
+++ b/src/solarfm/core/window.py
@@ -1,5 +1,4 @@
 # Python imports
-import time
 import signal
 
 # Lib imports
@@ -23,19 +22,20 @@ class ControllerStartException(Exception):
 class Window(Gtk.ApplicationWindow):
     """docstring for Window."""
 
-    def __init__(self, args, unknownargs):
-        super(Window, self).__init__()
+    def __init__(self):
+        Gtk.ApplicationWindow.__init__(self)
 
-        self._controller = None
         settings_manager.set_main_window(self)
 
-        self._set_window_data()
+        self._controller = None
+
         self._setup_styling()
         self._setup_signals()
         self._subscribe_to_events()
+        self._load_widgets()
 
-        self._load_widgets(args, unknownargs)
-
+        self._set_window_data()
+        self._set_size_constraints()
         self.show()
 
 
@@ -55,17 +55,29 @@ class Window(Gtk.ApplicationWindow):
         event_system.subscribe("tear_down", self._tear_down)
         event_system.subscribe("load_interactive_debug", self._load_interactive_debug)
 
-    def _load_widgets(self, args, unknownargs):
+    def _load_widgets(self):
         if settings_manager.is_debug():
             self.set_interactive_debugging(True)
 
-        self._controller = Controller(args, unknownargs)
+        self._controller = Controller()
 
         if not self._controller:
             raise ControllerStartException("Controller exited and doesn't exist...")
 
         self.add( self._controller.get_core_widget() )
 
+    def _set_size_constraints(self):
+        _window_x   = settings.config.main_window_x
+        _window_y   = settings.config.main_window_y
+        _min_width  = settings.config.main_window_min_width
+        _min_height = settings.config.main_window_min_height
+        _width      = settings.config.main_window_width
+        _height     = settings.config.main_window_height
+
+        self.move(_window_x, _window_y - 28)
+        self.set_size_request(_min_width, _min_height)
+        self.set_default_size(_width, _height)
+
     def _set_window_data(self) -> None:
         screen = self.get_screen()
         visual = screen.get_rgba_visual()
@@ -73,7 +85,7 @@ class Window(Gtk.ApplicationWindow):
         if visual != None and screen.is_composited():
             self.set_visual(visual)
             self.set_app_paintable(True)
-            self.connect("draw", self._area_draw)
+            # self.connect("draw", self._area_draw)
 
         # bind css file
         cssProvider  = Gtk.CssProvider()
@@ -87,12 +99,25 @@ class Window(Gtk.ApplicationWindow):
         cr.set_operator(cairo.OPERATOR_SOURCE)
         cr.paint()
         cr.set_operator(cairo.OPERATOR_OVER)
-    
+
     def _load_interactive_debug(self):
         self.set_interactive_debugging(True)
 
 
     def _tear_down(self, widget = None, eve = None):
         event_system.emit("shutting_down")
+
+        size = self.get_size()
+        pos  = self.get_position()
+
+        settings_manager.set_main_window_width(size.width)
+        settings_manager.set_main_window_height(size.height)
+        settings_manager.set_main_window_x(pos.root_x)
+        settings_manager.set_main_window_y(pos.root_y)
+        settings_manager.save_settings()
+
         settings_manager.clear_pid()
-        Gtk.main_quit()
\ No newline at end of file
+        Gtk.main_quit()
+
+    def start(self):
+        Gtk.main()
\ No newline at end of file
diff --git a/src/solarfm/plugins/manifest.py b/src/solarfm/plugins/manifest.py
index 392fc2a..bfcebc7 100644
--- a/src/solarfm/plugins/manifest.py
+++ b/src/solarfm/plugins/manifest.py
@@ -15,32 +15,37 @@ class ManifestProcessorException(Exception):
     ...
 
 
-@dataclass(slots=True)
+@dataclass(slots = True)
 class PluginInfo:
-    path: str       = None
-    name: str       = None
-    author: str     = None
-    version: str    = None
-    support: str    = None
-    requests:{}     = None
-    reference: type = None
+    path: str        = None
+    name: str        = None
+    author: str      = None
+    version: str     = None
+    support: str     = None
+    requests:{}      = None
+    reference: type  = None
+    pre_launch: bool = False
 
 
 class ManifestProcessor:
     def __init__(self, path, builder):
-        manifest = join(path, "manifest.json")
-        if not os.path.exists(manifest):
+        manifest_pth = join(path, "manifest.json")
+        if not os.path.exists(manifest_pth):
             raise ManifestProcessorException("Invalid Plugin Structure: Plugin doesn't have 'manifest.json'. Aboarting load...")
 
         self._path    = path
         self._builder = builder
-        with open(manifest) as f:
+        with open(manifest_pth) as f:
             data           = json.load(f)
             self._manifest = data["manifest"]
             self._plugin   = self.collect_info()
 
+    def is_pre_launch(self) -> bool:
+        return self._plugin.pre_launch
+
     def collect_info(self) -> PluginInfo:
         plugin          = PluginInfo()
+
         plugin.path     = self._path
         plugin.name     = self._manifest["name"]
         plugin.author   = self._manifest["author"]
@@ -48,14 +53,16 @@ class ManifestProcessor:
         plugin.support  = self._manifest["support"]
         plugin.requests = self._manifest["requests"]
 
+        if "pre_launch" in self._manifest.keys():
+            plugin.pre_launch = True if self._manifest["pre_launch"] == "true" else False
+
         return plugin
 
     def get_loading_data(self):
         loading_data = {}
         requests     = self._plugin.requests
-        keys         = requests.keys()
 
-        if "ui_target" in keys:
+        if "ui_target" in requests:
             if requests["ui_target"] in  [
                                             "none", "other", "main_Window", "main_menu_bar",
                                             "main_menu_bttn_box_bar", "path_menu_bar", "plugin_control_list",
@@ -63,7 +70,7 @@ class ManifestProcessor:
                                             "window_2", "window_3", "window_4"
                                         ]:
                 if requests["ui_target"] == "other":
-                    if "ui_target_id" in keys:
+                    if "ui_target_id" in requests:
                         loading_data["ui_target"] = self._builder.get_object(requests["ui_target_id"])
                         if loading_data["ui_target"] == None:
                             raise ManifestProcessorException('Invalid "ui_target_id" given in requests. Must have one if setting "ui_target" to "other"...')
@@ -74,11 +81,11 @@ class ManifestProcessor:
             else:
                 raise ManifestProcessorException('Unknown "ui_target" given in requests.')
 
-        if "pass_fm_events" in keys:
+        if "pass_fm_events" in requests:
             if requests["pass_fm_events"] in ["true"]:
                 loading_data["pass_fm_events"] = True
 
-        if "pass_ui_objects" in keys:
+        if "pass_ui_objects" in requests:
             if len(requests["pass_ui_objects"]) > 0:
                 loading_data["pass_ui_objects"] = []
                 for ui_id  in requests["pass_ui_objects"]:
@@ -87,8 +94,8 @@ class ManifestProcessor:
                     except ManifestProcessorException as e:
                         logger.error(repr(e))
 
-        if "bind_keys" in keys:
+        if "bind_keys" in requests:
             if isinstance(requests["bind_keys"], list):
                 loading_data["bind_keys"] = requests["bind_keys"]
 
-        return self._plugin, loading_data
\ No newline at end of file
+        return self._plugin, loading_data
diff --git a/src/solarfm/plugins/plugins_controller.py b/src/solarfm/plugins/plugins_controller.py
index 3ee9bd0..07d4b72 100644
--- a/src/solarfm/plugins/plugins_controller.py
+++ b/src/solarfm/plugins/plugins_controller.py
@@ -36,41 +36,76 @@ class PluginsController:
 
         self._plugins_dir_watcher = None
         self._plugin_collection   = []
+        self._plugin_manifests    = {}
+
+        self._load_manifests()
 
 
-    def launch_plugins(self) -> None:
+    def _load_manifests(self):
+        logger.info(f"Loading manifests...")
+
+        for path, folder in [[join(self._plugins_path, item), item] if os.path.isdir(join(self._plugins_path, item)) else None for item in os.listdir(self._plugins_path)]:
+            manifest = ManifestProcessor(path, self._builder)
+            self._plugin_manifests[path] =  {
+                "path": path,
+                "folder": folder,
+                "manifest": manifest
+            }
+
         self._set_plugins_watcher()
-        self.load_plugins()
 
     def _set_plugins_watcher(self) -> None:
         self._plugins_dir_watcher  = Gio.File.new_for_path(self._plugins_path) \
                                             .monitor_directory(Gio.FileMonitorFlags.WATCH_MOVES, Gio.Cancellable())
         self._plugins_dir_watcher.connect("changed", self._on_plugins_changed, ())
 
-    def _on_plugins_changed(self, file_monitor, file, other_file=None, eve_type=None, data=None):
+    def _on_plugins_changed(self, file_monitor, file, other_file = None, eve_type = None, data = None):
         if eve_type in [Gio.FileMonitorEvent.CREATED, Gio.FileMonitorEvent.DELETED,
                         Gio.FileMonitorEvent.RENAMED, Gio.FileMonitorEvent.MOVED_IN,
                                                     Gio.FileMonitorEvent.MOVED_OUT]:
             self.reload_plugins(file)
 
-    @daemon_threaded
-    def load_plugins(self, file: str = None) -> None:
-        logger.info(f"Loading plugins...")
+    def pre_launch_plugins(self) -> None:
+        logger.info(f"Loading pre-launch plugins...")
+        plugin_manifests: {} = {}
+
+        for key in self._plugin_manifests:
+            target_manifest = self._plugin_manifests[key]["manifest"]
+            if target_manifest.is_pre_launch():
+                plugin_manifests[key] = self._plugin_manifests[key]
+
+        self._load_plugins(plugin_manifests, is_pre_launch = True)
+
+    def post_launch_plugins(self) -> None:
+        logger.info(f"Loading post-launch plugins...")
+        plugin_manifests: {} = {}
+
+        for key in self._plugin_manifests:
+            target_manifest = self._plugin_manifests[key]["manifest"]
+            if not target_manifest.is_pre_launch():
+                plugin_manifests[key] = self._plugin_manifests[key]
+
+        self._load_plugins(plugin_manifests)
+
+    def _load_plugins(self, plugin_manifests: {} = {}, is_pre_launch: bool = False) -> None:
         parent_path = os.getcwd()
 
-        for path, folder in [[join(self._plugins_path, item), item] if os.path.isdir(join(self._plugins_path, item)) else None for item in os.listdir(self._plugins_path)]:
-            try:
-                target   = join(path, "plugin.py")
-                manifest = ManifestProcessor(path, self._builder)
+        for key in plugin_manifests:
+            target_manifest = plugin_manifests[key]
+            path, folder, manifest = target_manifest["path"], target_manifest["folder"], target_manifest["manifest"]
 
+            try:
+                target = join(path, "plugin.py")
                 if not os.path.exists(target):
                     raise FileNotFoundError("Invalid Plugin Structure: Plugin doesn't have 'plugin.py'. Aboarting load...")
 
                 plugin, loading_data = manifest.get_loading_data()
                 module               = self.load_plugin_module(path, folder, target)
 
-                GLib.idle_add(self.execute_plugin, *(module, plugin, loading_data))
-                # self.execute_plugin(module, plugin, loading_data)
+                if is_pre_launch:
+                    self.execute_plugin(module, plugin, loading_data)
+                else:
+                    GLib.idle_add(self.execute_plugin, *(module, plugin, loading_data))
             except InvalidPluginException as e:
                 logger.info(f"Malformed Plugin: Not loading -->: '{folder}' !")
                 logger.debug("Trace: ", traceback.print_exc())
@@ -100,25 +135,26 @@ class PluginsController:
 
     def execute_plugin(self, module: type, plugin: PluginInfo, loading_data: []):
         plugin.reference = module.Plugin()
-        keys             = loading_data.keys()
 
-        if "ui_target" in keys:
+        if "ui_target" in loading_data:
             loading_data["ui_target"].add( plugin.reference.generate_reference_ui_element() )
             loading_data["ui_target"].show_all()
 
-        if "pass_ui_objects" in keys:
+        if "pass_ui_objects" in loading_data:
             plugin.reference.set_ui_object_collection( loading_data["pass_ui_objects"] )
 
-        if "pass_fm_events" in keys:
+        if "pass_fm_events" in loading_data:
             plugin.reference.set_fm_event_system(event_system)
             plugin.reference.subscribe_to_events()
 
-        if "bind_keys" in keys:
+        if "bind_keys" in loading_data:
             keybindings.append_bindings( loading_data["bind_keys"] )
 
         plugin.reference.run()
         self._plugin_collection.append(plugin)
 
+        return False
+
     def reload_plugins(self, file: str = None) -> None:
         logger.info(f"Reloading plugins...")
         parent_path = os.getcwd()
diff --git a/src/solarfm/shellfm/windows/tabs/tab.py b/src/solarfm/shellfm/windows/tabs/tab.py
index d450421..f51ea5d 100644
--- a/src/solarfm/shellfm/windows/tabs/tab.py
+++ b/src/solarfm/shellfm/windows/tabs/tab.py
@@ -14,7 +14,6 @@ from random import randint
 from .utils.settings import Settings
 from .utils.launcher import Launcher
 from .utils.filehandler import FileHandler
-from .icons.icon import Icon
 from .path import Path
 
 
@@ -40,9 +39,8 @@ except Exception as e:
 
 
 
-class Tab(Settings, FileHandler, Launcher, Icon, Path):
+class Tab(Settings, FileHandler, Launcher, Path):
     def __init__(self):
-        self.logger             = None
         self._id_length: int    = 10
 
         self._id: str           = ""
@@ -168,33 +166,6 @@ class Tab(Settings, FileHandler, Launcher, Icon, Path):
             }
         }
 
-    def get_video_icons(self) -> list:
-        data = []
-        dir  = self.get_current_directory()
-        for file in self._vids:
-            img_hash, hash_img_path = self.create_video_thumbnail(full_path=f"{dir}/{file}", returnHashInstead=True)
-            data.append([img_hash, hash_img_path])
-
-        return data
-
-    def get_pixbuf_icon_str_combo(self):
-        data = []
-        dir  = self.get_current_directory()
-        for file in self._files:
-            icon = self.create_icon(dir, file).get_pixbuf()
-            data.append([icon, file])
-
-        return data
-
-    def get_gtk_icon_str_combo(self) -> list:
-        data = []
-        dir  = self.get_current_directory()
-        for file in self._files:
-            icon = self.create_icon(dir, file)
-            data.append([icon, file[0]])
-
-        return data
-
     def get_current_directory(self) -> str:
         return self.get_path()
 
@@ -264,7 +235,7 @@ class Tab(Settings, FileHandler, Launcher, Icon, Path):
         return int(text) if text.isdigit() else text
 
     def _natural_keys(self, text):
-        return [ self._atoi(c) for c in re.split('(\d+)',text) ]
+        return [ self._atoi(c) for c in re.split(r'(\d+)', text) ]
 
     def _hash_text(self, text) -> str:
         return hashlib.sha256(str.encode(text)).hexdigest()[:18]
@@ -289,3 +260,7 @@ class Tab(Settings, FileHandler, Launcher, Icon, Path):
 
     def _set_error_message(self, text: str):
         self.error_message = text
+
+
+    def create_icon(self, dir, file):
+        return event_system.emit_and_await("create-thumbnail", (dir, file,))
diff --git a/src/solarfm/shellfm/windows/tabs/utils/launcher.py b/src/solarfm/shellfm/windows/tabs/utils/launcher.py
index 8b6fd86..84ede79 100644
--- a/src/solarfm/shellfm/windows/tabs/utils/launcher.py
+++ b/src/solarfm/shellfm/windows/tabs/utils/launcher.py
@@ -17,22 +17,25 @@ class Launcher:
         lowerName = file.lower()
         command   = []
 
-        if lowerName.endswith(self.fvideos):
-            command = [self.media_app, file]
-        elif lowerName.endswith(self.fimages):
-            command = [self.image_app, file]
-        elif lowerName.endswith(self.fmusic):
-            command = [self.music_app, file]
-        elif lowerName.endswith(self.foffice):
-            command = [self.office_app, file]
-        elif lowerName.endswith(self.fcode):
-            command = [self.code_app, file]
-        elif lowerName.endswith(self.ftext):
-            command = [self.text_app, file]
-        elif lowerName.endswith(self.fpdf):
-            command = [self.pdf_app, file]
-        elif lowerName.endswith("placeholder-until-i-can-get-a-use-pref-fm-flag"):
-            command = [self.file_manager_app, file]
+        if self.use_defined_launchers:
+            if lowerName.endswith(self.fvideos):
+                command = [self.media_app, file]
+            elif lowerName.endswith(self.fimages):
+                command = [self.image_app, file]
+            elif lowerName.endswith(self.fmusic):
+                command = [self.music_app, file]
+            elif lowerName.endswith(self.foffice):
+                command = [self.office_app, file]
+            elif lowerName.endswith(self.fcode):
+                command = [self.code_app, file]
+            elif lowerName.endswith(self.ftext):
+                command = [self.text_app, file]
+            elif lowerName.endswith(self.fpdf):
+                command = [self.pdf_app, file]
+            elif lowerName.endswith("placeholder-until-i-can-get-a-use-pref-fm-flag"):
+                command = [self.file_manager_app, file]
+            else:
+                command = ["xdg-open", file]
         else:
             command = ["xdg-open", file]
 
@@ -41,20 +44,19 @@ class Launcher:
 
     def execute(self, command, start_dir=os.getenv("HOME"), use_shell=False):
         try:
-            self.logger.debug(command)
-            subprocess.Popen(command, cwd=start_dir, shell=use_shell, start_new_session=True, stdout=None, stderr=None, close_fds=True)
+            logger.debug(command)
+            subprocess.Popen(command, cwd=start_dir, shell=use_shell, start_new_session=True, stdout=subprocess.DEVNULL, stderr=None, close_fds=True)
         except ShellFMLauncherException as e:
-            self.logger.error(f"Couldn't execute: {command}")
-            self.logger.error(e)
+            logger.error(f"Couldn't execute: {command}")
+            logger.error(e)
 
     # TODO: Return std(out/in/err) handlers along with subprocess instead of sinking to null
     def execute_and_return_thread_handler(self, command, start_dir=os.getenv("HOME"), use_shell=False):
         try:
-            DEVNULL = open(os.devnull, 'w')
-            return subprocess.Popen(command, cwd=start_dir, shell=use_shell, start_new_session=False, stdout=DEVNULL, stderr=DEVNULL, close_fds=False)
+            return subprocess.Popen(command, cwd=start_dir, shell=use_shell, start_new_session=False, stdout=subprocess.DEVNULL, stderr=None, close_fds=False)
         except ShellFMLauncherException as e:
-            self.logger.error(f"Couldn't execute and return thread: {command}")
-            self.logger.error(e)
+            logger.error(f"Couldn't execute and return thread: {command}")
+            logger.error(e)
             return None
 
     @threaded
@@ -63,7 +65,7 @@ class Launcher:
 
     def remux_video(self, hash, file):
         remux_vid_pth = "{self.REMUX_FOLDER}/{hash}.mp4"
-        self.logger.debug(remux_vid_pth)
+        logger.debug(remux_vid_pth)
 
         if not os.path.isfile(remux_vid_pth):
             self.check_remux_space()
@@ -80,11 +82,11 @@ class Launcher:
 
             command += [remux_vid_pth]
             try:
-                proc = subprocess.Popen(command)
+                proc = subprocess.Popen(command, stdout=subprocess.DEVNULL, stderr=None)
                 proc.wait()
             except ShellFMLauncherException as e:
-                self.logger.error(message)
-                self.logger.error(e)
+                logger.error(message)
+                logger.error(e)
                 return False
 
         return True
@@ -94,7 +96,7 @@ class Launcher:
         try:
             limit = int(limit)
         except ShellFMLauncherException as e:
-            self.logger.debug(e)
+            logger.debug(e)
             return
 
         usage = self.get_remux_folder_usage(self.REMUX_FOLDER)
@@ -113,4 +115,4 @@ class Launcher:
                 if not os.path.islink(fp): # Skip if it is symbolic link
                     total_size += os.path.getsize(fp)
 
-        return total_size
+        return total_size
\ No newline at end of file
diff --git a/src/solarfm/shellfm/windows/tabs/utils/settings.py b/src/solarfm/shellfm/windows/tabs/utils/settings.py
index f3c0cd2..dbc059d 100644
--- a/src/solarfm/shellfm/windows/tabs/utils/settings.py
+++ b/src/solarfm/shellfm/windows/tabs/utils/settings.py
@@ -14,8 +14,6 @@ class ShellFMSettingsException(Exception):
 
 
 class Settings:
-    logger            = None
-
     # NOTE: app_name should be defined using python 'builtins'
     app_name_exists   = False
     try:
@@ -31,50 +29,19 @@ class Settings:
     CONFIG_FILE       = f"{CONFIG_PATH}/settings.json"
     HIDE_HIDDEN_FILES = True
 
-    DEFAULT_ICONS     = f"{CONFIG_PATH}/icons"
-    DEFAULT_ICON      = f"{DEFAULT_ICONS}/text.png"
-    FFMPG_THUMBNLR    = f"{CONFIG_PATH}/ffmpegthumbnailer"    # Thumbnail generator binary
-    BLENDER_THUMBNLR  = f"{CONFIG_PATH}/blender-thumbnailer"  # Blender thumbnail generator binary
     REMUX_FOLDER      = f"{USER_HOME}/.remuxs"                # Remuxed files folder
 
-    ICON_DIRS         = ["/usr/share/icons", f"{USER_HOME}/.icons" "/usr/share/pixmaps"]
-    BASE_THUMBS_PTH   = f"{USER_HOME}/.thumbnails"
-    ABS_THUMBS_PTH    = f"{BASE_THUMBS_PTH}/normal"
-    STEAM_ICONS_PTH   = f"{BASE_THUMBS_PTH}/steam_icons"
-
-    if not os.path.exists(CONFIG_PATH) or not os.path.exists(CONFIG_FILE):
-        msg = f"No config file located! Aborting loading ShellFM library...\nExpected: {CONFIG_FILE}"
-        raise ShellFMSettingsException(msg)
-
-    if not path.isdir(REMUX_FOLDER):
-        os.mkdir(REMUX_FOLDER)
-
-    if not path.isdir(BASE_THUMBS_PTH):
-        os.mkdir(BASE_THUMBS_PTH)
-
-    if not path.isdir(ABS_THUMBS_PTH):
-        os.mkdir(ABS_THUMBS_PTH)
-
-    if not path.isdir(STEAM_ICONS_PTH):
-        os.mkdir(STEAM_ICONS_PTH)
-
-    if not os.path.exists(DEFAULT_ICONS):
-        DEFAULT_ICONS = f"{USR_APP_CONTEXT}/icons"
-        DEFAULT_ICON  = f"{DEFAULT_ICONS}/text.png"
-
     with open(CONFIG_FILE) as f:
         settings          = json.load(f)
         config            = settings["config"]
 
         subpath           = config["base_of_home"]
-        STEAM_CDN_URL     = config["steam_cdn_url"]
-        FFMPG_THUMBNLR    = FFMPG_THUMBNLR   if config["thumbnailer_path"] == "" else config["thumbnailer_path"]
-        BLENDER_THUMBNLR  = BLENDER_THUMBNLR if config["blender_thumbnailer_path"] == "" else config["blender_thumbnailer_path"]
         HIDE_HIDDEN_FILES = True  if config["hide_hidden_files"] in ["true", ""] else False
         go_past_home      = True  if config["go_past_home"] in ["true", ""] else False
         lock_folder       = False if config["lock_folder"] in ["false", ""] else True
         locked_folders    = config["locked_folders"].split("::::")
         mplayer_options   = config["mplayer_options"].split()
+        use_defined_launchers = config["use_defined_launchers"]
         music_app         = config["music_app"]
         media_app         = config["media_app"]
         image_app         = config["image_app"]
@@ -83,9 +50,6 @@ class Settings:
         code_app          = config["code_app"]
         text_app          = config["text_app"]
         terminal_app      = config["terminal_app"]
-        container_icon_wh = config["container_icon_wh"]
-        video_icon_wh     = config["video_icon_wh"]
-        sys_icon_wh       = config["sys_icon_wh"]
         file_manager_app  = config["file_manager_app"]
         remux_folder_max_disk_usage = config["remux_folder_max_disk_usage"]
 
diff --git a/src/solarfm/utils/cbindings/__init__.py b/src/solarfm/utils/cbindings/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/solarfm/utils/cbindings/gtkmemreaper.py b/src/solarfm/utils/cbindings/gtkmemreaper.py
new file mode 100644
index 0000000..da1201c
--- /dev/null
+++ b/src/solarfm/utils/cbindings/gtkmemreaper.py
@@ -0,0 +1,20 @@
+# Python imports
+import pkg_resources
+import importlib.util
+
+# Lib imports
+
+# Application imports
+
+
+
+def __bootstrap__():
+    __file__   = pkg_resources.resource_filename(__name__, 'gtkmemreaper.cpython-313-x86_64-linux-gnu.so')
+    spec       = importlib.util.spec_from_file_location(
+        __name__,
+        __file__
+    )
+    mod        = importlib.util.module_from_spec(spec)
+    spec.loader.exec_module(mod)
+
+__bootstrap__()
diff --git a/user_config/usr/bin/solarfm b/src/solarfm/utils/cbindings/python_package_works/compile.sh
similarity index 74%
rename from user_config/usr/bin/solarfm
rename to src/solarfm/utils/cbindings/python_package_works/compile.sh
index 8cca2db..cebb6b4 100755
--- a/user_config/usr/bin/solarfm
+++ b/src/solarfm/utils/cbindings/python_package_works/compile.sh
@@ -6,12 +6,10 @@
 # set -o errexit      ## To exit on error
 # set -o errunset     ## To exit if a variable is referenced but not set
 
-
 function main() {
-    call_path=`pwd`
-    cd "${call_path}"
+    cd "$(dirname "")"
     echo "Working Dir: " $(pwd)
 
-    python /opt/solarfm.zip "$@"
+    python3 setup.py build && python3 setup.py install --user
 }
 main "$@";
diff --git a/src/solarfm/utils/cbindings/python_package_works/gtkmemreaper.c b/src/solarfm/utils/cbindings/python_package_works/gtkmemreaper.c
new file mode 100644
index 0000000..e4d2c7f
--- /dev/null
+++ b/src/solarfm/utils/cbindings/python_package_works/gtkmemreaper.c
@@ -0,0 +1,62 @@
+#include <Python.h>
+#include <gtk/gtk.h>
+#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <stdlib.h>
+
+// static PyObject* free_pixbuf(PyObject* self, PyObject* args) {
+static PyObject* free_pixbuf(PyObject* self, PyObject* args) {
+    PyObject *py_pixbuf;
+
+    if (!PyArg_ParseTuple(args, "O", &py_pixbuf)) {
+        Py_RETURN_NONE;
+    }
+
+    GdkPixbuf *pixbuf = (GdkPixbuf *) PyLong_AsVoidPtr(py_pixbuf);
+    if (!GDK_IS_PIXBUF(pixbuf)) {
+        PyErr_SetString(PyExc_TypeError, "Invalid GdkPixbuf pointer.");
+        Py_RETURN_NONE;
+    }
+
+    g_object_unref(pixbuf);
+    g_assert_null(pixbuf);
+    Py_RETURN_NONE;
+}
+
+
+static PyObject* free_list_store(PyObject* self, PyObject* args) {
+    PyObject *py_list_store;
+
+    if (!PyArg_ParseTuple(args, "O", &py_list_store)) {
+        Py_RETURN_NONE;
+    }
+
+    GtkListStore *list_store = (GtkListStore *) PyLong_AsVoidPtr(py_list_store);
+    if (!GTK_IS_LIST_STORE(list_store)) {
+        PyErr_SetString(PyExc_TypeError, "Invalid Gtk.ListStore pointer.");
+        Py_RETURN_NONE;
+    }
+
+    g_object_unref(list_store);
+    g_assert_null(list_store);
+    Py_RETURN_NONE;
+}
+
+
+static PyMethodDef Methods[] = {
+    {"free_pixbuf", free_pixbuf, METH_VARARGS, "Clear GdkPixbuf* ."},
+    {"free_list_store", free_list_store, METH_VARARGS, "Clear GtkListStore* ."},
+    {NULL, NULL, 0, NULL}
+};
+
+static struct PyModuleDef moduledef = {
+    PyModuleDef_HEAD_INIT,
+    "gtkmemreaper",
+    NULL,
+    -1,
+    Methods
+};
+
+PyMODINIT_FUNC PyInit_gtkmemreaper(void) {
+    return PyModule_Create(&moduledef);
+}
diff --git a/src/solarfm/utils/cbindings/python_package_works/setup.py b/src/solarfm/utils/cbindings/python_package_works/setup.py
new file mode 100644
index 0000000..677b53d
--- /dev/null
+++ b/src/solarfm/utils/cbindings/python_package_works/setup.py
@@ -0,0 +1,28 @@
+# Python imports
+from setuptools import setup, Extension
+from subprocess import check_output
+
+# Lib imports
+
+# Application imports
+
+
+
+pkg_config_args = ["gdk-pixbuf-2.0", "cairo", "gtk+-3.0"]
+
+def get_pkgconfig_flags(flag_type):
+    return check_output(["pkg-config", flag_type] + pkg_config_args).decode().split()
+
+ext = Extension(
+    "gtkmemreaper",
+    sources              = ["gtkmemreaper.c"],
+    include_dirs       = [],
+    extra_compile_args = get_pkgconfig_flags("--cflags"),
+    extra_link_args    = get_pkgconfig_flags("--libs")
+)
+
+setup(
+    name = "gtkmemreaper",
+    version = "0.1",
+    ext_modules = [ext]
+)
diff --git a/src/solarfm/utils/debugging.py b/src/solarfm/utils/debugging.py
index b84193a..5eaa286 100644
--- a/src/solarfm/utils/debugging.py
+++ b/src/solarfm/utils/debugging.py
@@ -18,7 +18,7 @@ def debug_signal_handler(signal, frame):
         rpdb2.start_embedded_debugger("foobar", True, True)
         rpdb2.setbreak(depth=1)
         return
-    except StandardError:
+    except Exception:
         ...
 
     try:
@@ -26,7 +26,7 @@ def debug_signal_handler(signal, frame):
         logger.debug("\n\nStarting embedded rconsole debugger...\n\n")
         rconsole.spawn_server()
         return
-    except StandardError as ex:
+    except Exception as ex:
         ...
 
     try:
@@ -34,7 +34,15 @@ def debug_signal_handler(signal, frame):
         logger.debug("\n\nStarting PuDB debugger...\n\n")
         set_trace(paused = True)
         return
-    except StandardError as ex:
+    except Exception as ex:
+        ...
+
+    try:
+        import ipdb
+        logger.debug("\n\nStarting IPDB debugger...\n\n")
+        ipdb.set_trace()
+        return
+    except Exception as ex:
         ...
 
     try:
@@ -42,11 +50,11 @@ def debug_signal_handler(signal, frame):
         logger.debug("\n\nStarting embedded PDB debugger...\n\n")
         pdb.Pdb(skip=['gi.*']).set_trace()
         return
-    except StandardError as ex:
+    except Exception as ex:
         ...
 
     try:
         import code
         code.interact()
-    except StandardError as ex:
-        logger.debug(f"{ex}, returning to normal program flow...")
+    except Exception as ex:
+        logger.debug(f"{ex}, returning to normal program flow...")
\ No newline at end of file
diff --git a/src/solarfm/utils/ipc_server.py b/src/solarfm/utils/ipc_server.py
index 7ce42e1..4559dc2 100644
--- a/src/solarfm/utils/ipc_server.py
+++ b/src/solarfm/utils/ipc_server.py
@@ -5,7 +5,6 @@ from multiprocessing.connection import Client
 from multiprocessing.connection import Listener
 
 # Lib imports
-from gi.repository import GLib
 
 # Application imports
 from .singleton import Singleton
@@ -16,7 +15,7 @@ class IPCServer(Singleton):
     """ Create a listener so that other SolarFM instances send requests back to existing instance. """
     def __init__(self, ipc_address: str = '127.0.0.1', conn_type: str = "socket"):
         self.is_ipc_alive     = False
-        self._ipc_port        = 4848
+        self._ipc_port        = 0 # Use 0 to let Listener chose port
         self._ipc_address     = ipc_address
         self._conn_type       = conn_type
         self._ipc_authkey     = b'' + bytes(f'{app_name}-ipc', 'utf-8')
@@ -43,8 +42,7 @@ class IPCServer(Singleton):
             if os.path.exists(self._ipc_address) and settings_manager.is_dirty_start():
                 os.unlink(self._ipc_address)
 
-            listener = Listener(address = self._ipc_address, family = "AF_UNIX", authkey = self._ipc_authkey)
-
+            listener = Listener(self._ipc_address, family = "AF_UNIX", authkey = self._ipc_authkey)
         elif "unsecured" not in self._conn_type:
             listener = Listener((self._ipc_address, self._ipc_port), authkey = self._ipc_authkey)
         else:
@@ -59,9 +57,14 @@ class IPCServer(Singleton):
             try:
                 conn       = listener.accept()
                 start_time = time.perf_counter()
-                GLib.idle_add(self._handle_ipc_message, *(conn, start_time,))
+
+                self._handle_ipc_message(conn, start_time)
+            except EOFError as e:
+                logger.debug( repr(e) )
             except Exception as e:
                 logger.debug( repr(e) )
+            finally:
+                conn.close()
 
         listener.close()
 
@@ -73,13 +76,21 @@ class IPCServer(Singleton):
             if "FILE|" in msg:
                 file = msg.split("FILE|")[1].strip()
                 if file:
-                    event_system.emit("handle_file_from_ipc", file)
+                    event_system.emit_and_await("handle_file_from_ipc", file)
+
+                conn.close()
+                break
+
+            if "DIR|" in msg:
+                file = msg.split("DIR|")[1].strip()
+                if file:
+                    event_system.emit_and_await("handle_dir_from_ipc", file)
 
                 conn.close()
                 break
 
 
-            if msg in ['close connection', 'close server']:
+            if msg in ['close connection', 'close server', 'Empty Data...']:
                 conn.close()
                 break
 
diff --git a/src/solarfm/utils/settings_manager/manager.py b/src/solarfm/utils/settings_manager/manager.py
index 4730741..46ee2dc 100644
--- a/src/solarfm/utils/settings_manager/manager.py
+++ b/src/solarfm/utils/settings_manager/manager.py
@@ -87,17 +87,18 @@ class SettingsManager(StartCheckMixin, Singleton):
             print( f"Settings: {self._CONTEXT_MENU}\n\t\t{repr(e)}" )
 
 
-        self.settings: Settings = None
-        self._main_window       = None
-        self._main_window_w     = 1670
-        self._main_window_h     = 830
-        self._builder           = None
-        self.PAINT_BG_COLOR     = (0, 0, 0, 0.0)
-
-        self._trace_debug       = False
-        self._debug             = False
-        self._dirty_start       = False
+        self.settings: Settings    = None
+        self._main_window          = None
+        self._main_window_w        = 1670
+        self._main_window_h        = 830
+        self._builder              = None
+        self.PAINT_BG_COLOR        = (0, 0, 0, 0.0)
 
+        self._trace_debug          = False
+        self._debug                = False
+        self._dirty_start          = False
+        self._passed_in_file: bool = False
+        self._starting_files: list = []
 
     def register_signals_to_builder(self, classes=None, builder=None):
         handlers = {}
@@ -143,9 +144,26 @@ class SettingsManager(StartCheckMixin, Singleton):
     def get_trash_info_path(self)   -> str: return self._TRASH_INFO_PATH
     def get_plugins_path(self)      -> str: return self._PLUGINS_PATH
 
+    def get_starting_args(self):
+        return self.args, self.unknownargs
+
+    def set_is_starting_with_file(self, is_passed_in_file: bool = False):
+        self._passed_in_file = is_passed_in_file
+
     def is_trace_debug(self)    -> bool:  return self._trace_debug
     def is_debug(self)          -> bool:  return self._debug
 
+    def set_main_window_x(self, x = 0):  self.settings.config.main_window_x  = x
+    def set_main_window_y(self, y = 0):  self.settings.config.main_window_y  = y
+    def set_main_window_width(self, width = 800):   self.settings.config.main_window_width  = width
+    def set_main_window_height(self, height = 600): self.settings.config.main_window_height = height
+    def set_main_window_min_width(self, width = 720):   self.settings.config.main_window_min_width  = width
+    def set_main_window_min_height(self, height = 480): self.settings.config.main_window_min_height = height
+
+    def set_starting_args(self, args, unknownargs):
+        self.args = args
+        self.unknownargs = unknownargs
+
     def set_trace_debug(self, trace_debug: bool):
         self._trace_debug = trace_debug
 
@@ -164,4 +182,4 @@ class SettingsManager(StartCheckMixin, Singleton):
 
     def save_settings(self):
         with open(self._CONFIG_FILE, 'w') as outfile:
-            json.dump(self.settings.as_dict(), outfile, separators=(',', ':'), indent=4)
\ No newline at end of file
+            json.dump(self.settings.as_dict(), outfile, separators=(',', ':'), indent=4)
diff --git a/src/solarfm/utils/settings_manager/options/config.py b/src/solarfm/utils/settings_manager/options/config.py
index 05c366f..f173ae3 100644
--- a/src/solarfm/utils/settings_manager/options/config.py
+++ b/src/solarfm/utils/settings_manager/options/config.py
@@ -16,6 +16,7 @@ class Config:
     lock_folder: str                 = "false"
     locked_folders: list             = field(default_factory=lambda: ["venv", "flasks"])
     mplayer_options: str             = "-quiet -really-quiet -xy 1600 -geometry 50%:50%"
+    use_defined_launchers: bool      = False
     music_app: str                   = "deadbeef"
     media_app: str                   = "mpv"
     image_app: str                   = "mirage"
@@ -30,7 +31,14 @@ class Config:
     sys_icon_wh: list                = field(default_factory=lambda: [56, 56])
     steam_cdn_url: str               = "https://steamcdn-a.akamaihd.net/steam/apps/"
     remux_folder_max_disk_usage: str = "8589934592"
+    make_transparent: int            = 0
+    main_window_x: int               = 721
+    main_window_y: int               = 465
+    main_window_min_width: int       = 720
+    main_window_min_height: int      = 480
+    main_window_width: int           = 800
+    main_window_height: int          = 600
     application_dirs: list           = field(default_factory=lambda: [
         "/usr/share/applications",
         f"{settings_manager.get_home_path()}/.local/share/applications"
-    ])
+    ])
\ No newline at end of file
diff --git a/src/solarfm/utils/settings_manager/start_check_mixin.py b/src/solarfm/utils/settings_manager/start_check_mixin.py
index 688da36..824b056 100644
--- a/src/solarfm/utils/settings_manager/start_check_mixin.py
+++ b/src/solarfm/utils/settings_manager/start_check_mixin.py
@@ -11,36 +11,48 @@ import inspect
 
 
 class StartCheckMixin:
-    def is_dirty_start(self) -> bool: return self._dirty_start
-    def clear_pid(self): self._clean_pid()
+    def is_dirty_start(self) -> bool:
+        return self._dirty_start
+
+    def clear_pid(self):
+        if not self.is_trace_debug():
+            self._clean_pid()
 
     def do_dirty_start_check(self):
-        if not os.path.exists(self._PID_FILE):
-            self._write_new_pid()
-        else:
-            with open(self._PID_FILE, "r") as _pid:
-                pid = _pid.readline().strip()
+        if self.is_trace_debug():
+            pid = os.getpid()
+            self._print_pid(pid)
+            return
+
+        if os.path.exists(self._PID_FILE):
+            with open(self._PID_FILE, "r") as f:
+                pid = f.readline().strip()
                 if pid not in ("", None):
-                    self._check_alive_status(int(pid))
-                else:
-                    self._write_new_pid()
+                    if self.is_pid_alive( int(pid) ):
+                        print("PID file exists and PID is alive...")
+                        return
+
+        self._write_new_pid()
 
     """ Check For the existence of a unix pid. """
-    def _check_alive_status(self, pid):
+    def is_pid_alive(self, pid):
         print(f"PID Found: {pid}")
+
         try:
             os.kill(pid, 0)
         except OSError:
-            print(f"{app_name} is starting dirty...")
+            print(f"{app_name} PID file exists but PID is irrelevant; starting dirty...")
             self._dirty_start = True
-            self._write_new_pid()
-            return
+            return False
 
-        print("PID is alive... Let downstream errors (sans debug args) handle app closure propigation.")
+        return True
 
     def _write_new_pid(self):
         pid = os.getpid()
         self._write_pid(pid)
+        self._print_pid(pid)
+
+    def _print_pid(self, pid):
         print(f"{app_name} PID:  {pid}")
 
     def _clean_pid(self):
@@ -48,4 +60,4 @@ class StartCheckMixin:
 
     def _write_pid(self, pid):
         with open(self._PID_FILE, "w") as _pid:
-            _pid.write(f"{pid}")
+            _pid.write(f"{pid}")
\ No newline at end of file
diff --git a/user_config/bin/solarfm b/user_config/bin/solarfm
index e833ed3..9921548 100755
--- a/user_config/bin/solarfm
+++ b/user_config/bin/solarfm
@@ -20,6 +20,10 @@ function main() {
         files[$size]="${target}"
     done
 
-    python /opt/solarfm.zip "${files[@]}"
+    export G_SLICE=always-malloc
+    export G_DEBUG=gc-friendly
+    export GOBJECT_DEBUG=instance-count
+    export GSK_RENDERER=cairo
+    python /opt/solarfm.zip "$@"
 }
 main "$@";
diff --git a/user_config/usr/share/solarfm/contexct_menu.json b/user_config/usr/share/solarfm/contexct_menu.json
index c17be4c..786c9dd 100644
--- a/user_config/usr/share/solarfm/contexct_menu.json
+++ b/user_config/usr/share/solarfm/contexct_menu.json
@@ -1,8 +1,9 @@
 {
     "Open Actions": {
-        "Open":      ["STOCK_OPEN", "open"],
-        "Open With": ["STOCK_OPEN", "open_with"],
-        "Execute":   ["STOCK_EXECUTE", "execute"],
+        "Open":       ["STOCK_OPEN", "open"],
+        "Open With":  ["STOCK_OPEN", "open_with"],
+        "Open 2 Tab": ["STOCK_OPEN", "open_2_new_tab"],
+        "Execute":    ["STOCK_EXECUTE", "execute"],
         "Execute in Terminal": ["STOCK_EXECUTE", "execute_in_terminal"]
     },
     "File Actions": {
@@ -16,4 +17,4 @@
         "Paste":     ["STOCK_PASTE", "paste"]
     },
     "Plugins": {}
-}
+}
\ No newline at end of file
diff --git a/user_config/usr/share/solarfm/settings.json b/user_config/usr/share/solarfm/settings.json
index a67c142..3735d34 100644
--- a/user_config/usr/share/solarfm/settings.json
+++ b/user_config/usr/share/solarfm/settings.json
@@ -2,8 +2,6 @@
     "config": {
         "base_of_home": "",
         "hide_hidden_files": "true",
-        "thumbnailer_path": "ffmpegthumbnailer",
-        "blender_thumbnailer_path": "",
         "go_past_home": "true",
         "lock_folder": "false",
         "locked_folders": "venv::::flasks",
@@ -16,30 +14,111 @@
         "code_app": "newton",
         "text_app": "mousepad",
         "terminal_app": "terminator",
-        "container_icon_wh": [128, 128],
-        "video_icon_wh":     [128, 64],
-        "sys_icon_wh":       [56, 56],
         "file_manager_app": "solarfm",
-        "steam_cdn_url": "https://steamcdn-a.akamaihd.net/steam/apps/",
-        "remux_folder_max_disk_usage": "8589934592"
+        "remux_folder_max_disk_usage": "8589934592",
+        "make_transparent":0,
+        "main_window_x":721,
+        "main_window_y":465,
+        "main_window_min_width":720,
+        "main_window_min_height":480,
+        "main_window_width":800,
+        "main_window_height":600,
+        "application_dirs":[
+            "/usr/share/applications"
+        ]
     },
-    "filters": {
-        "meshs":  [".dae", ".fbx", ".gltf", ".obj", ".stl"],
-        "code":   [".cpp", ".css", ".c", ".go", ".html", ".htm", ".java", ".js", ".json", ".lua", ".md", ".py", ".rs", ".toml", ".xml", ".pom"],
-        "videos": [".mkv", ".mp4", ".webm", ".avi", ".mov", ".m4v", ".mpg", ".mpeg", ".wmv", ".flv"],
-        "office": [".doc", ".docx", ".xls", ".xlsx", ".xlt", ".xltx", ".xlm", ".ppt", ".pptx", ".pps", ".ppsx", ".odt", ".rtf"],
-        "images": [".png", ".jpg", ".jpeg", ".gif", ".ico", ".tga", ".webp"],
-        "text":   [".txt", ".text", ".sh", ".cfg", ".conf", ".log"],
-        "music":  [".psf", ".mp3", ".ogg", ".flac", ".m4a"],
-        "pdf":    [".pdf"]
-   },
-   "theming":{
-       "success_color": "#88cc27",
-       "warning_color": "#ffa800",
-       "error_color":   "#ff0000"
-   },
-   "debugging": {
-       "ch_log_lvl": 20,
-       "fh_log_lvl": 10
-   }
+    "filters":{
+        "meshs":[
+            ".dae",
+            ".fbx",
+            ".gltf",
+            ".obj",
+            ".stl"
+        ],
+        "code":[
+            ".cpp",
+            ".css",
+            ".c",
+            ".go",
+            ".html",
+            ".htm",
+            ".java",
+            ".js",
+            ".ts",
+            ".json",
+            ".lua",
+            ".md",
+            ".py",
+            ".rs",
+            ".toml",
+            ".xml",
+            ".pom"
+        ],
+        "videos":[
+            ".mkv",
+            ".mp4",
+            ".webm",
+            ".avi",
+            ".mov",
+            ".m4v",
+            ".mpg",
+            ".mpeg",
+            ".wmv",
+            ".flv",
+            ".m4b"
+        ],
+        "office":[
+            ".doc",
+            ".docx",
+            ".xls",
+            ".xlsx",
+            ".xlt",
+            ".xltx",
+            ".xlm",
+            ".ppt",
+            ".pptx",
+            ".pps",
+            ".ppsx",
+            ".odt",
+            ".rtf"
+        ],
+        "images":[
+            ".png",
+            ".jpg",
+            ".jpeg",
+            ".gif",
+            ".ico",
+            ".tga",
+            ".webp"
+        ],
+        "text":[
+            ".txt",
+            ".text",
+            ".sh",
+            ".cfg",
+            ".conf",
+            ".log",
+            ".yml",
+            ".yaml"
+        ],
+        "music":[
+            ".psf",
+            ".mp3",
+            ".ogg",
+            ".flac",
+            ".m4a"
+        ],
+        "pdf":[
+            ".pdf"
+        ]
+    },
+    "theming":{
+        "success_color": "#88cc27",
+        "warning_color": "#ffa800",
+        "error_color":   "#ff0000"
+    },
+    "debugging": {
+        "ch_log_lvl": 20,
+        "fh_log_lvl": 10
+    }
 }
\ No newline at end of file
diff --git a/user_config/usr/share/solarfm/ui_widgets/about_ui.glade b/user_config/usr/share/solarfm/ui_widgets/about_ui.glade
index f559f6c..db5df48 100644
--- a/user_config/usr/share/solarfm/ui_widgets/about_ui.glade
+++ b/user_config/usr/share/solarfm/ui_widgets/about_ui.glade
@@ -8,7 +8,7 @@
     <property name="can-focus">False</property>
     <property name="border-width">5</property>
     <property name="window-position">center-on-parent</property>
-    <property name="icon">../icons/solarfm.png</property>
+    <property name="icon">../icons/solarfm-64x64.png</property>
     <property name="type-hint">dialog</property>
     <property name="skip-taskbar-hint">True</property>
     <property name="skip-pager-hint">True</property>
@@ -19,6 +19,7 @@
     <property name="copyright" translatable="yes">Copyright (C) 2021   GPL2</property>
     <property name="comments" translatable="yes">by ITDominator</property>
     <property name="website">https://code.itdominator.com/itdominator/SolarFM</property>
+    <property name="website-label" translatable="yes">ITDominator</property>
     <property name="license" translatable="yes">SolarFM - Copyright (C) 2021 ITDominator  GPL2
 
 
@@ -367,7 +368,9 @@ Public License instead of this License.
 
 
 SolarFM is developed on Atom, git, and using Python 3+ with Gtk GObject introspection.</property>
-    <property name="translator-credits" translatable="yes" comments="Please replace this line with your own names, one name per line. ">translator-credits</property>
+    <property name="documenters">...</property>
+    <property name="translator-credits" translatable="yes" comments="Please replace this line with your own names, one name per line. ">...</property>
+    <property name="artists">...</property>
     <property name="logo">../icons/solarfm-64x64.png</property>
     <property name="wrap-license">True</property>
     <property name="license-type">custom</property>