Merge branch 'yt-dlp:master' into master

README.md

@@ -1308,6 +1308,8 @@ The available fields are:
  - `description` (string): The description of the video
  - `display_id` (string): An alternative identifier for the video
  - `uploader` (string): Full name of the video uploader
+ - `uploader_id` (string): Nickname or id of the video uploader
+ - `uploader_url` (string): URL to the video uploader's profile
  - `license` (string): License name the video is licensed under
  - `creators` (list): The creators of the video
  - `creator` (string): The creators of the video; comma-separated
@@ -1318,9 +1320,9 @@ The available fields are:
  - `release_year` (numeric): Year (YYYY) when the video or album was released
  - `modified_timestamp` (numeric): UNIX timestamp of the moment the video was last modified
  - `modified_date` (string): The date (YYYYMMDD) when the video was last modified in UTC
- - `uploader_id` (string): Nickname or id of the video uploader
  - `channel` (string): Full name of the channel the video is uploaded on
  - `channel_id` (string): Id of the channel
+ - `channel_url` (string): URL of the channel
  - `channel_follower_count` (numeric): Number of followers of the channel
  - `channel_is_verified` (boolean): Whether the channel is verified on the platform
  - `location` (string): Physical location where the video was filmed
@@ -1360,7 +1362,10 @@ The available fields are:
  - `webpage_url_basename` (string): The basename of the webpage URL
  - `webpage_url_domain` (string): The domain of the webpage URL
  - `original_url` (string): The URL given by the user (or same as `webpage_url` for playlist entries)
-
+ - `categories` (list): List of categories the video belongs to
+ - `tags` (list): List of tags assigned to the video
+ - `cast` (list): List of cast members
+
 All the fields in [Filtering Formats](#filtering-formats) can also be used
 
 Available for the video that belongs to some logical chapter or section:
@@ -1372,6 +1377,7 @@ Available for the video that belongs to some logical chapter or section:
 Available for the video that is an episode of some series or programme:
 
  - `series` (string): Title of the series or programme the video episode belongs to
+ - `series_id` (string): Id of the series or programme the video episode belongs to
  - `season` (string): Title of the season the video episode belongs to
  - `season_number` (numeric): Number of the season the video episode belongs to
  - `season_id` (string): Id of the season the video episode belongs to

yt_dlp/YoutubeDL.py

@@ -2649,7 +2649,8 @@ def _fill_common_fields(self, info_dict, final=True):
 
         for old_key, new_key in self._deprecated_multivalue_fields.items():
             if new_key in info_dict and old_key in info_dict:
-                self.deprecation_warning(f'Do not return {old_key!r} when {new_key!r} is present')
+                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):
@@ -3576,6 +3577,8 @@ def download_with_info_file(self, info_filename):
                     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

yt_dlp/extractor/_extractors.py

@@ -320,7 +320,6 @@
     CBSIE,
     ParamountPressExpressIE,
 )
-from .cbsinteractive import CBSInteractiveIE
 from .cbsnews import (
     CBSNewsEmbedIE,
     CBSNewsIE,
@@ -348,10 +347,6 @@
 from .charlierose import CharlieRoseIE
 from .chaturbate import ChaturbateIE
 from .chilloutzone import ChilloutzoneIE
-from .chingari import (
-    ChingariIE,
-    ChingariUserIE,
-)
 from .chzzk import (
     CHZZKLiveIE,
     CHZZKVideoIE,
@@ -369,7 +364,6 @@
 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 .closertotruth import CloserToTruthIE
@@ -476,7 +470,6 @@
 )
 from .dfb import DFBIE
 from .dhm import DHMIE
-from .digg import DiggIE
 from .douyutv import (
     DouyuShowIE,
     DouyuTVIE,
@@ -610,7 +603,6 @@
 )
 from .fczenit import FczenitIE
 from .fifa import FifaIE
-from .filmmodu import FilmmoduIE
 from .filmon import (
     FilmOnIE,
     FilmOnChannelIE,
@@ -676,7 +668,6 @@
     GabIE,
 )
 from .gaia import GaiaIE
-from .gameinformer import GameInformerIE
 from .gamejolt import (
     GameJoltIE,
     GameJoltUserIE,
@@ -705,7 +696,6 @@
     GettrStreamingIE,
 )
 from .giantbomb import GiantBombIE
-from .giga import GigaIE
 from .glide import GlideIE
 from .globalplayer import (
     GlobalPlayerLiveIE,
@@ -896,10 +886,8 @@
 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 .kelbyone import KelbyOneIE
 from .khanacademy import (
     KhanAcademyIE,
@@ -915,13 +903,11 @@
 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 .ku6 import Ku6IE
 from .kukululive import KukuluLiveIE
-from .kusi import KUSIIE
 from .kuwo import (
     KuwoIE,
     KuwoAlbumIE,
@@ -1003,7 +989,6 @@
     LnkGoIE,
     LnkIE,
 )
-from .localnews8 import LocalNews8IE
 from .lovehomeporn import LoveHomePornIE
 from .lrt import (
     LRTVODIE,
@@ -1030,7 +1015,6 @@
     MailRuMusicSearchIE,
 )
 from .mainstreaming import MainStreamingIE
-from .malltv import MallTVIE
 from .mangomolo import (
     MangomoloVideoIE,
     MangomoloLiveIE,
@@ -1074,7 +1058,6 @@
 from .melonvod import MelonVODIE
 from .metacritic import MetacriticIE
 from .mgtv import MGTVIE
-from .miaopai import MiaoPaiIE
 from .microsoftstream import MicrosoftStreamIE
 from .microsoftvirtualacademy import (
     MicrosoftVirtualAcademyIE,
@@ -1092,7 +1075,6 @@
     MindsChannelIE,
     MindsGroupIE,
 )
-from .ministrygrid import MinistryGridIE
 from .minoto import MinotoIE
 from .mirrativ import (
     MirrativIE,
@@ -1120,7 +1102,6 @@
 from .mocha import MochaVideoIE
 from .mojvideo import MojvideoIE
 from .monstercat import MonstercatIE
-from .morningstar import MorningstarIE
 from .motherless import (
     MotherlessIE,
     MotherlessGroupIE,
@@ -1365,7 +1346,6 @@
 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 (
@@ -1477,7 +1457,6 @@
     PlatziCourseIE,
 )
 from .playplustv import PlayPlusTVIE
-from .playstuff import PlayStuffIE
 from .playsuisse import PlaySuisseIE
 from .playtvak import PlaytvakIE
 from .playwire import PlaywireIE
@@ -1599,7 +1578,6 @@
     RayWenderlichIE,
     RayWenderlichCourseIE,
 )
-from .rbmaradio import RBMARadioIE
 from .rbgtum import (
     RbgTumIE,
     RbgTumCourseIE,
@@ -1631,7 +1609,6 @@
     RedGifsUserIE,
 )
 from .redtube import RedTubeIE
-from .regiotv import RegioTVIE
 from .rentv import (
     RENTVIE,
     RENTVArticleIE,
@@ -1640,6 +1617,7 @@
 from .reuters import ReutersIE
 from .reverbnation import ReverbNationIE
 from .rheinmaintv import RheinMainTVIE
+from .ridehome import RideHomeIE
 from .rinsefm import (
     RinseFMIE,
     RinseFMArtistPlaylistIE,
@@ -1738,7 +1716,6 @@
 from .saitosan import SaitosanIE
 from .samplefocus import SampleFocusIE
 from .sapo import SapoIE
-from .savefrom import SaveFromIE
 from .sbs import SBSIE
 from .sbscokr import (
     SBSCoKrIE,
@@ -1758,7 +1735,6 @@
     SCTECourseIE,
 )
 from .scrolller import ScrolllerIE
-from .seeker import SeekerIE
 from .sejmpl import SejmIE
 from .senalcolombia import SenalColombiaLiveIE
 from .senategov import SenateISVPIE, SenateGovIE
@@ -1901,7 +1877,6 @@
 )
 from .streamable import StreamableIE
 from .streamcz import StreamCZIE
-from .streamff import StreamFFIE
 from .streetvoice import StreetVoiceIE
 from .stretchinternet import StretchInternetIE
 from .stripchat import StripchatIE
@@ -1930,7 +1905,6 @@
     TBSJPProgramIE,
     TBSJPPlaylistIE,
 )
-from .tdslifeway import TDSLifewayIE
 from .teachable import (
     TeachableIE,
     TeachableCourseIE,

yt_dlp/extractor/abc.py

@@ -245,7 +245,6 @@ class ABCIViewIE(InfoExtractor):
             'episode_id': 'NC2203H039S00',
             'season_number': 2022,
             'season': 'Season 2022',
-            'episode_number': None,
             'episode': 'Locking Up Kids',
             'thumbnail': 'https://cdn.iview.abc.net.au/thumbs/i/nc/NC2203H039S00_636d8a0944a22_1920.jpg',
             'timestamp': 1668460497,
@@ -271,8 +270,6 @@ class ABCIViewIE(InfoExtractor):
             'episode_id': 'RF2004Q043S00',
             'season_number': 2021,
             'season': 'Season 2021',
-            'episode_number': None,
-            'episode': None,
             'thumbnail': 'https://cdn.iview.abc.net.au/thumbs/i/rf/RF2004Q043S00_61a950639dbc0_1920.jpg',
             'timestamp': 1638710705,
 

yt_dlp/extractor/abematv.py

@@ -259,7 +259,7 @@ class AbemaTVIE(AbemaTVBaseIE):
             'title': 'ゆるキャン△ SEASON２ 全話一挙【無料ビデオ72時間】',
             'series': 'ゆるキャン△ SEASON２',
             'episode': 'ゆるキャン△ SEASON２ 全話一挙【無料ビデオ72時間】',
-            'series_number': 2,
+            'season_number': 2,
             'episode_number': 1,
             'description': 'md5:9c5a3172ae763278f9303922f0ea5b17',
         },

yt_dlp/extractor/acfun.py

@@ -3,6 +3,7 @@
     float_or_none,
     format_field,
     int_or_none,
+    str_or_none,
     traverse_obj,
     parse_codecs,
     parse_qs,
@@ -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 @@ def _real_extract(self, url):
             '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,

yt_dlp/extractor/archiveorg.py

@@ -31,6 +31,7 @@
     unified_timestamp,
     url_or_none,
     urlhandle_detect_ext,
+    variadic,
 )
 
 
@@ -49,7 +50,7 @@ class ArchiveOrgIE(InfoExtractor):
             'release_date': '19681210',
             'timestamp': 1268695290,
             'upload_date': '20100315',
-            'creator': 'SRI International',
+            'creators': ['SRI International'],
             'uploader': '[email protected]',
             'thumbnail': r're:https://archive\.org/download/.*\.jpg',
             'display_id': 'XD300-23_68HighlightsAResearchCntAugHumanIntellect.cdr',
@@ -109,7 +110,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',
@@ -129,7 +130,7 @@ 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',
@@ -167,7 +168,7 @@ class ArchiveOrgIE(InfoExtractor):
             'upload_date': '20160610',
             'description': 'md5:f70956a156645a658a0dc9513d9e78b7',
             'uploader': '[email protected]',
-            'creator': ['British Broadcasting Corporation', 'Time-Life Films'],
+            'creators': ['British Broadcasting Corporation', 'Time-Life Films'],
             'timestamp': 1465594947,
         },
         'playlist': [
@@ -257,7 +258,7 @@ def _real_extract(self, url):
             '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'])),
@@ -272,7 +273,7 @@ def _real_extract(self, url):
                     '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'),