Start new release.

[youtubedl] / youtube_dl / extractor / extractors.py

diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index de38c6641acb6730c73d3d3975ed2faca1e70914..530474f3fc61282799a64d9c52589de3a0cc38a1 100644 (file)
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -20,6 +20,7 @@ from .acast import (
 )
 from .addanime import AddAnimeIE
 from .adn import ADNIE
 )
 from .addanime import AddAnimeIE
 from .adn import ADNIE

+from .adobeconnect import AdobeConnectIE

 from .adobetv import (
     AdobeTVIE,
     AdobeTVShowIE,
 from .adobetv import (
     AdobeTVIE,
     AdobeTVShowIE,


@@ -38,9 +39,7 @@ from .alphaporno import AlphaPornoIE
 from .amcnetworks import AMCNetworksIE
 from .americastestkitchen import AmericasTestKitchenIE
 from .animeondemand import AnimeOnDemandIE
 from .amcnetworks import AMCNetworksIE
 from .americastestkitchen import AmericasTestKitchenIE
 from .animeondemand import AnimeOnDemandIE

-from .anitube import AnitubeIE

 from .anvato import AnvatoIE
 from .anvato import AnvatoIE

-from .anysex import AnySexIE

 from .aol import AolIE
 from .allocine import AllocineIE
 from .aliexpress import AliExpressLiveIE
 from .aol import AolIE
 from .allocine import AllocineIE
 from .aliexpress import AliExpressLiveIE


@@ -108,6 +107,7 @@ from .behindkink import BehindKinkIE
 from .bellmedia import BellMediaIE
 from .beatport import BeatportIE
 from .bet import BetIE
 from .bellmedia import BellMediaIE
 from .beatport import BeatportIE
 from .bet import BetIE

+from .bfi import BFIPlayerIE

 from .bigflix import BigflixIE
 from .bild import BildIE
 from .bilibili import (
 from .bigflix import BigflixIE
 from .bild import BildIE
 from .bilibili import (


@@ -173,11 +173,15 @@ from .cbs import CBSIE
 from .cbslocal import CBSLocalIE
 from .cbsinteractive import CBSInteractiveIE
 from .cbsnews import (
 from .cbslocal import CBSLocalIE
 from .cbsinteractive import CBSInteractiveIE
 from .cbsnews import (

+    CBSNewsEmbedIE,

     CBSNewsIE,
     CBSNewsLiveVideoIE,
 )
 from .cbssports import CBSSportsIE
     CBSNewsIE,
     CBSNewsLiveVideoIE,
 )
 from .cbssports import CBSSportsIE

-from .ccc import CCCIE
+from .ccc import (
+    CCCIE,
+    CCCPlaylistIE,
+)

 from .ccma import CCMAIE
 from .cctv import CCTVIE
 from .cda import CDAIE
 from .ccma import CCMAIE
 from .cctv import CCTVIE
 from .cda import CDAIE


@@ -194,6 +198,7 @@ from .chirbit import (
     ChirbitProfileIE,
 )
 from .cinchcast import CinchcastIE
     ChirbitProfileIE,
 )
 from .cinchcast import CinchcastIE

+from .cinemax import CinemaxIE

 from .ciscolive import (
     CiscoLiveSessionIE,
     CiscoLiveSearchIE,
 from .ciscolive import (
     CiscoLiveSessionIE,
     CiscoLiveSearchIE,


@@ -236,7 +241,6 @@ from .condenast import CondeNastIE
 from .corus import CorusIE
 from .cracked import CrackedIE
 from .crackle import CrackleIE
 from .corus import CorusIE
 from .cracked import CrackedIE
 from .crackle import CrackleIE

-from .criterion import CriterionIE

 from .crooksandliars import CrooksAndLiarsIE
 from .crunchyroll import (
     CrunchyrollIE,
 from .crooksandliars import CrooksAndLiarsIE
 from .crunchyroll import (
     CrunchyrollIE,


@@ -283,10 +287,6 @@ from .dplay import (
     DPlayIE,
     DPlayItIE,
 )
     DPlayIE,
     DPlayItIE,
 )

-from .dramafever import (
-    DramaFeverIE,
-    DramaFeverSeriesIE,
-)

 from .dreisat import DreiSatIE
 from .drbonanza import DRBonanzaIE
 from .drtuber import DrTuberIE
 from .dreisat import DreiSatIE
 from .drbonanza import DRBonanzaIE
 from .drtuber import DrTuberIE


@@ -442,16 +442,14 @@ from .goshgay import GoshgayIE
 from .gputechconf import GPUTechConfIE
 from .groupon import GrouponIE
 from .hark import HarkIE
 from .gputechconf import GPUTechConfIE
 from .groupon import GrouponIE
 from .hark import HarkIE

-from .hbo import (
-    HBOIE,
-    HBOEpisodeIE,
-)
+from .hbo import HBOIE

 from .hearthisat import HearThisAtIE
 from .heise import HeiseIE
 from .hellporno import HellPornoIE
 from .helsinki import HelsinkiIE
 from .hentaistigma import HentaiStigmaIE
 from .hgtv import HGTVComShowIE
 from .hearthisat import HearThisAtIE
 from .heise import HeiseIE
 from .hellporno import HellPornoIE
 from .helsinki import HelsinkiIE
 from .hentaistigma import HentaiStigmaIE
 from .hgtv import HGTVComShowIE

+from .hketv import HKETVIE

 from .hidive import HiDiveIE
 from .historicfilms import HistoricFilmsIE
 from .hitbox import HitboxIE, HitboxLiveIE
 from .hidive import HiDiveIE
 from .historicfilms import HistoricFilmsIE
 from .hitbox import HitboxIE, HitboxLiveIE


@@ -494,7 +492,11 @@ from .ina import InaIE
 from .inc import IncIE
 from .indavideo import IndavideoEmbedIE
 from .infoq import InfoQIE
 from .inc import IncIE
 from .indavideo import IndavideoEmbedIE
 from .infoq import InfoQIE

-from .instagram import InstagramIE, InstagramUserIE
+from .instagram import (
+    InstagramIE,
+    InstagramUserIE,
+    InstagramTagIE,
+)

 from .internazionale import InternazionaleIE
 from .internetvideoarchive import InternetVideoArchiveIE
 from .iprima import IPrimaIE
 from .internazionale import InternazionaleIE
 from .internetvideoarchive import InternetVideoArchiveIE
 from .iprima import IPrimaIE


@@ -588,6 +590,7 @@ from .linkedin import (
     LinkedInLearningIE,
     LinkedInLearningCourseIE,
 )
     LinkedInLearningIE,
     LinkedInLearningCourseIE,
 )

+from .linuxacademy import LinuxAcademyIE

 from .litv import LiTVIE
 from .liveleak import (
     LiveLeakIE,
 from .litv import LiTVIE
 from .liveleak import (
     LiveLeakIE,


@@ -614,6 +617,7 @@ from .mailru import (
     MailRuMusicSearchIE,
 )
 from .makertv import MakerTVIE
     MailRuMusicSearchIE,
 )
 from .makertv import MakerTVIE

+from .malltv import MallTVIE

 from .mangomolo import (
     MangomoloVideoIE,
     MangomoloLiveIE,
 from .mangomolo import (
     MangomoloVideoIE,
     MangomoloLiveIE,


@@ -627,7 +631,11 @@ from .massengeschmacktv import MassengeschmackTVIE
 from .matchtv import MatchTVIE
 from .mdr import MDRIE
 from .mediaset import MediasetIE
 from .matchtv import MatchTVIE
 from .mdr import MDRIE
 from .mediaset import MediasetIE

-from .mediasite import MediasiteIE
+from .mediasite import (
+    MediasiteIE,
+    MediasiteCatalogIE,
+    MediasiteNamedCatalogIE,
+)

 from .medici import MediciIE
 from .megaphone import MegaphoneIE
 from .meipai import MeipaiIE
 from .medici import MediciIE
 from .megaphone import MegaphoneIE
 from .meipai import MeipaiIE


@@ -687,7 +695,10 @@ from .myvi import (
     MyviEmbedIE,
 )
 from .myvidster import MyVidsterIE
     MyviEmbedIE,
 )
 from .myvidster import MyVidsterIE

-from .nationalgeographic import NationalGeographicVideoIE
+from .nationalgeographic import (
+    NationalGeographicVideoIE,
+    NationalGeographicTVIE,
+)

 from .naver import NaverIE
 from .nba import NBAIE
 from .nbc import (
 from .naver import NaverIE
 from .nba import NBAIE
 from .nbc import (


@@ -734,7 +745,6 @@ from .nexx import (
     NexxIE,
     NexxEmbedIE,
 )
     NexxIE,
     NexxEmbedIE,
 )

-from .nfb import NFBIE

 from .nfl import NFLIE
 from .nhk import NhkVodIE
 from .nhl import NHLIE
 from .nfl import NFLIE
 from .nhk import NhkVodIE
 from .nhl import NHLIE


@@ -761,13 +771,6 @@ from .nova import (
     NovaEmbedIE,
     NovaIE,
 )
     NovaEmbedIE,
     NovaIE,
 )

-from .novamov import (
-    AuroraVidIE,
-    CloudTimeIE,
-    NowVideoIE,
-    VideoWeedIE,
-    WholeCloudIE,
-)

 from .nowness import (
     NownessIE,
     NownessPlaylistIE,
 from .nowness import (
     NownessIE,
     NownessPlaylistIE,


@@ -797,6 +800,8 @@ from .nrk import (
     NRKTVSeasonIE,
     NRKTVSeriesIE,
 )
     NRKTVSeasonIE,
     NRKTVSeriesIE,
 )

+from .nrl import NRLTVIE
+from .ntvcojp import NTVCoJpCUIE

 from .ntvde import NTVDeIE
 from .ntvru import NTVRuIE
 from .nytimes import (
 from .ntvde import NTVDeIE
 from .ntvru import NTVRuIE
 from .nytimes import (


@@ -820,7 +825,10 @@ from .ooyala import (
     OoyalaIE,
     OoyalaExternalIE,
 )
     OoyalaIE,
     OoyalaExternalIE,
 )

-from .openload import OpenloadIE
+from .openload import (
+    OpenloadIE,
+    VerystreamIE,
+)

 from .ora import OraTVIE
 from .orf import (
     ORFTVthekIE,
 from .ora import OraTVIE
 from .orf import (
     ORFTVthekIE,


@@ -857,6 +865,10 @@ from .picarto import (
 from .piksel import PikselIE
 from .pinkbike import PinkbikeIE
 from .pladform import PladformIE
 from .piksel import PikselIE
 from .pinkbike import PinkbikeIE
 from .pladform import PladformIE

+from .platzi import (
+    PlatziIE,
+    PlatziCourseIE,
+)

 from .playfm import PlayFMIE
 from .playplustv import PlayPlusTVIE
 from .plays import PlaysTVIE
 from .playfm import PlayFMIE
 from .playplustv import PlayPlusTVIE
 from .plays import PlaysTVIE


@@ -876,12 +888,12 @@ from .polskieradio import (
 from .popcorntv import PopcornTVIE
 from .porn91 import Porn91IE
 from .porncom import PornComIE
 from .popcorntv import PopcornTVIE
 from .porn91 import Porn91IE
 from .porncom import PornComIE

-from .pornflip import PornFlipIE

 from .pornhd import PornHdIE
 from .pornhub import (
     PornHubIE,
 from .pornhd import PornHdIE
 from .pornhub import (
     PornHubIE,

-    PornHubPlaylistIE,
-    PornHubUserVideosIE,
+    PornHubUserIE,
+    PornHubPagedVideoListIE,
+    PornHubUserVideosUploadIE,

 )
 from .pornotube import PornotubeIE
 from .pornovoisines import PornoVoisinesIE
 )
 from .pornotube import PornotubeIE
 from .pornovoisines import PornoVoisinesIE


@@ -891,7 +903,6 @@ from .puhutv import (
     PuhuTVSerieIE,
 )
 from .presstv import PressTVIE
     PuhuTVSerieIE,
 )
 from .presstv import PressTVIE

-from .primesharetv import PrimeShareTVIE

 from .promptfile import PromptFileIE
 from .prosiebensat1 import ProSiebenSat1IE
 from .puls4 import Puls4IE
 from .promptfile import PromptFileIE
 from .prosiebensat1 import ProSiebenSat1IE
 from .puls4 import Puls4IE


@@ -927,7 +938,10 @@ from .raywenderlich import (
 )
 from .rbmaradio import RBMARadioIE
 from .rds import RDSIE
 )
 from .rbmaradio import RBMARadioIE
 from .rds import RDSIE

-from .redbulltv import RedBullTVIE
+from .redbulltv import (
+    RedBullTVIE,
+    RedBullTVRrnContentIE,
+)

 from .reddit import (
     RedditIE,
     RedditRIE,
 from .reddit import (
     RedditIE,
     RedditRIE,


@@ -968,7 +982,6 @@ from .rtvnh import RTVNHIE
 from .rtvs import RTVSIE
 from .rudo import RudoIE
 from .ruhd import RUHDIE
 from .rtvs import RTVSIE
 from .rudo import RudoIE
 from .ruhd import RUHDIE

-from .ruleporn import RulePornIE

 from .rutube import (
     RutubeIE,
     RutubeChannelIE,
 from .rutube import (
     RutubeIE,
     RutubeChannelIE,


@@ -1018,7 +1031,10 @@ from .skynewsarabia import (
     SkyNewsArabiaIE,
     SkyNewsArabiaArticleIE,
 )
     SkyNewsArabiaIE,
     SkyNewsArabiaArticleIE,
 )

-from .skysports import SkySportsIE
+from .sky import (
+    SkyNewsIE,
+    SkySportsIE,
+)

 from .slideshare import SlideshareIE
 from .slideslive import SlidesLiveIE
 from .slutload import SlutloadIE
 from .slideshare import SlideshareIE
 from .slideslive import SlidesLiveIE
 from .slutload import SlutloadIE


@@ -1050,7 +1066,10 @@ from .southpark import (
     SouthParkEsIE,
     SouthParkNlIE
 )
     SouthParkEsIE,
     SouthParkNlIE
 )

-from .spankbang import SpankBangIE
+from .spankbang import (
+    SpankBangIE,
+    SpankBangPlaylistIE,
+)

 from .spankwire import SpankwireIE
 from .spiegel import SpiegelIE, SpiegelArticleIE
 from .spiegeltv import SpiegeltvIE
 from .spankwire import SpankwireIE
 from .spiegel import SpiegelIE, SpiegelArticleIE
 from .spiegeltv import SpiegeltvIE


@@ -1077,7 +1096,12 @@ from .streamcloud import StreamcloudIE
 from .streamcz import StreamCZIE
 from .streetvoice import StreetVoiceIE
 from .stretchinternet import StretchInternetIE
 from .streamcz import StreamCZIE
 from .streetvoice import StreetVoiceIE
 from .stretchinternet import StretchInternetIE

+from .stv import STVPlayerIE

 from .sunporno import SunPornoIE
 from .sunporno import SunPornoIE

+from .sverigesradio import (
+    SverigesRadioEpisodeIE,
+    SverigesRadioPublicationIE,
+)

 from .svt import (
     SVTIE,
     SVTPageIE,
 from .svt import (
     SVTIE,
     SVTPageIE,


@@ -1105,6 +1129,7 @@ from .teachertube import (
 )
 from .teachingchannel import TeachingChannelIE
 from .teamcoco import TeamcocoIE
 )
 from .teachingchannel import TeachingChannelIE
 from .teamcoco import TeamcocoIE

+from .teamtreehouse import TeamTreeHouseIE

 from .techtalks import TechTalksIE
 from .ted import TEDIE
 from .tele5 import Tele5IE
 from .techtalks import TechTalksIE
 from .ted import TEDIE
 from .tele5 import Tele5IE


@@ -1159,6 +1184,7 @@ from .toutv import TouTvIE
 from .toypics import ToypicsUserIE, ToypicsIE
 from .traileraddict import TrailerAddictIE
 from .trilulilu import TriluliluIE
 from .toypics import ToypicsUserIE, ToypicsIE
 from .traileraddict import TrailerAddictIE
 from .trilulilu import TriluliluIE

+from .trunews import TruNewsIE

 from .trutv import TruTVIE
 from .tube8 import Tube8IE
 from .tubitv import TubiTvIE
 from .trutv import TruTVIE
 from .tube8 import Tube8IE
 from .tubitv import TubiTvIE


@@ -1204,7 +1230,7 @@ from .tvnow import (
 from .tvp import (
     TVPEmbedIE,
     TVPIE,
 from .tvp import (
     TVPEmbedIE,
     TVPIE,

-    TVPSeriesIE,
+    TVPWebsiteIE,

 )
 from .tvplay import (
     TVPlayIE,
 )
 from .tvplay import (
     TVPlayIE,


@@ -1285,7 +1311,6 @@ from .viddler import ViddlerIE
 from .videa import VideaIE
 from .videodetective import VideoDetectiveIE
 from .videofyme import VideofyMeIE
 from .videa import VideaIE
 from .videodetective import VideoDetectiveIE
 from .videofyme import VideofyMeIE

-from .videomega import VideoMegaIE

 from .videomore import (
     VideomoreIE,
     VideomoreVideoIE,
 from .videomore import (
     VideomoreIE,
     VideomoreVideoIE,


@@ -1354,7 +1379,6 @@ from .voxmedia import (
     VoxMediaVolumeIE,
     VoxMediaIE,
 )
     VoxMediaVolumeIE,
     VoxMediaIE,
 )

-from .vporn import VpornIE

 from .vrt import VRTIE
 from .vrak import VrakIE
 from .vrv import (
 from .vrt import VRTIE
 from .vrak import VrakIE
 from .vrv import (


@@ -1368,6 +1392,7 @@ from .vuclip import VuClipIE
 from .vvvvid import VVVVIDIE
 from .vyborymos import VyboryMosIE
 from .vzaar import VzaarIE
 from .vvvvid import VVVVIDIE
 from .vyborymos import VyboryMosIE
 from .vzaar import VzaarIE

+from .wakanim import WakanimIE

 from .walla import WallaIE
 from .washingtonpost import (
     WashingtonPostIE,
 from .walla import WallaIE
 from .washingtonpost import (
     WashingtonPostIE,


@@ -1391,17 +1416,13 @@ from .webofstories import (
     WebOfStoriesPlaylistIE,
 )
 from .weibo import (
     WebOfStoriesPlaylistIE,
 )
 from .weibo import (

-    WeiboIE, 
+    WeiboIE,

     WeiboMobileIE
 )
 from .weiqitv import WeiqiTVIE
 from .wimp import WimpIE
 from .wistia import WistiaIE
 from .worldstarhiphop import WorldStarHipHopIE
     WeiboMobileIE
 )
 from .weiqitv import WeiqiTVIE
 from .wimp import WimpIE
 from .wistia import WistiaIE
 from .worldstarhiphop import WorldStarHipHopIE

-from .wrzuta import (
-    WrzutaIE,
-    WrzutaPlaylistIE,
-)

 from .wsj import (
     WSJIE,
     WSJArticleIE,
 from .wsj import (
     WSJIE,
     WSJArticleIE,


@@ -1434,13 +1455,16 @@ from .xxxymovies import XXXYMoviesIE
 from .yahoo import (
     YahooIE,
     YahooSearchIE,
 from .yahoo import (
     YahooIE,
     YahooSearchIE,

+    YahooGyaOPlayerIE,
+    YahooGyaOIE,

 )
 )

+from .yandexdisk import YandexDiskIE

 from .yandexmusic import (
     YandexMusicTrackIE,
     YandexMusicAlbumIE,
     YandexMusicPlaylistIE,
 )
 from .yandexmusic import (
     YandexMusicTrackIE,
     YandexMusicAlbumIE,
     YandexMusicPlaylistIE,
 )

-from .yandexdisk import YandexDiskIE
+from .yandexvideo import YandexVideoIE

 from .yapfiles import YapFilesIE
 from .yesjapan import YesJapanIE
 from .yinyuetai import YinYueTaiIE
 from .yapfiles import YapFilesIE
 from .yesjapan import YesJapanIE
 from .yinyuetai import YinYueTaiIE


@@ -1491,6 +1515,7 @@ from .zattoo import (
     QuantumTVIE,
     QuicklineIE,
     QuicklineLiveIE,
     QuantumTVIE,
     QuicklineIE,
     QuicklineLiveIE,

+    SaltTVIE,

     SAKTVIE,
     VTXTVIE,
     WalyTVIE,
     SAKTVIE,
     VTXTVIE,
     WalyTVIE,