[closertotruth] Update and improve (Closes #8680)

[youtube-dl] / youtube_dl / extractor / extractors.py

diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index 861701f4cf23932bafda7dd56fae7da5c9a04251..2ff8676510ec17945c7f70d42208d0be49011616 100644 (file)
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -21,6 +21,7 @@ from .adobetv import (
 )
 from .adultswim import AdultSwimIE
 from .aenetworks import AENetworksIE
 )
 from .adultswim import AdultSwimIE
 from .aenetworks import AENetworksIE

+from .afreecatv import AfreecaTVIE

 from .aftonbladet import AftonbladetIE
 from .airmozilla import AirMozillaIE
 from .aljazeera import AlJazeeraIE
 from .aftonbladet import AftonbladetIE
 from .airmozilla import AirMozillaIE
 from .aljazeera import AlJazeeraIE


@@ -43,7 +44,6 @@ from .archiveorg import ArchiveOrgIE
 from .ard import (
     ARDIE,
     ARDMediathekIE,
 from .ard import (
     ARDIE,
     ARDMediathekIE,

-    SportschauIE,

 )
 from .arte import (
     ArteTvIE,
 )
 from .arte import (
     ArteTvIE,


@@ -56,6 +56,7 @@ from .arte import (
     ArteTVDDCIE,
     ArteTVMagazineIE,
     ArteTVEmbedIE,
     ArteTVDDCIE,
     ArteTVMagazineIE,
     ArteTVEmbedIE,

+    ArteTVPlaylistIE,

 )
 from .atresplayer import AtresPlayerIE
 from .atttechchannel import ATTTechChannelIE
 )
 from .atresplayer import AtresPlayerIE
 from .atttechchannel import ATTTechChannelIE


@@ -69,6 +70,8 @@ from .bandcamp import BandcampIE, BandcampAlbumIE
 from .bbc import (
     BBCCoUkIE,
     BBCCoUkArticleIE,
 from .bbc import (
     BBCCoUkIE,
     BBCCoUkArticleIE,

+    BBCCoUkIPlayerPlaylistIE,
+    BBCCoUkPlaylistIE,

     BBCIE,
 )
 from .beeg import BeegIE
     BBCIE,
 )
 from .beeg import BeegIE


@@ -106,11 +109,16 @@ from .camwithher import CamWithHerIE
 from .canalplus import CanalplusIE
 from .canalc2 import Canalc2IE
 from .canvas import CanvasIE
 from .canalplus import CanalplusIE
 from .canalc2 import Canalc2IE
 from .canvas import CanvasIE

+from .carambatv import (
+    CarambaTVIE,
+    CarambaTVPageIE,
+)

 from .cbc import (
     CBCIE,
     CBCPlayerIE,
 )
 from .cbs import CBSIE
 from .cbc import (
     CBCIE,
     CBCPlayerIE,
 )
 from .cbs import CBSIE

+from .cbslocal import CBSLocalIE

 from .cbsinteractive import CBSInteractiveIE
 from .cbsnews import (
     CBSNewsIE,
 from .cbsinteractive import CBSInteractiveIE
 from .cbsnews import (
     CBSNewsIE,


@@ -132,6 +140,7 @@ from .cliprs import ClipRsIE
 from .clipfish import ClipfishIE
 from .cliphunter import CliphunterIE
 from .clipsyndicate import ClipsyndicateIE
 from .clipfish import ClipfishIE
 from .cliphunter import CliphunterIE
 from .clipsyndicate import ClipsyndicateIE

+from .closertotruth import CloserToTruthIE

 from .cloudy import CloudyIE
 from .clubic import ClubicIE
 from .clyp import ClypIE
 from .cloudy import CloudyIE
 from .clubic import ClubicIE
 from .clyp import ClypIE


@@ -142,6 +151,7 @@ from .cnn import (
     CNNBlogsIE,
     CNNArticleIE,
 )
     CNNBlogsIE,
     CNNArticleIE,
 )

+from .coub import CoubIE

 from .collegerama import CollegeRamaIE
 from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE
 from .comcarcoff import ComCarCoffIE
 from .collegerama import CollegeRamaIE
 from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE
 from .comcarcoff import ComCarCoffIE


@@ -230,6 +240,7 @@ from .everyonesmixtape import EveryonesMixtapeIE
 from .exfm import ExfmIE
 from .expotv import ExpoTVIE
 from .extremetube import ExtremeTubeIE
 from .exfm import ExfmIE
 from .expotv import ExpoTVIE
 from .extremetube import ExtremeTubeIE

+from .eyedotv import EyedoTVIE

 from .facebook import FacebookIE
 from .faz import FazIE
 from .fc2 import FC2IE
 from .facebook import FacebookIE
 from .faz import FazIE
 from .fc2 import FC2IE


@@ -242,6 +253,7 @@ from .fktv import FKTVIE
 from .flickr import FlickrIE
 from .folketinget import FolketingetIE
 from .footyroom import FootyRoomIE
 from .flickr import FlickrIE
 from .folketinget import FolketingetIE
 from .footyroom import FootyRoomIE

+from .formula1 import Formula1IE

 from .fourtube import FourTubeIE
 from .fox import FOXIE
 from .foxgay import FoxgayIE
 from .fourtube import FourTubeIE
 from .fox import FOXIE
 from .foxgay import FoxgayIE


@@ -286,6 +298,7 @@ from .globo import (
     GloboArticleIE,
 )
 from .godtube import GodTubeIE
     GloboArticleIE,
 )
 from .godtube import GodTubeIE

+from .godtv import GodTVIE

 from .goldenmoustache import GoldenMoustacheIE
 from .golem import GolemIE
 from .googledrive import GoogleDriveIE
 from .goldenmoustache import GoldenMoustacheIE
 from .golem import GolemIE
 from .googledrive import GoogleDriveIE


@@ -369,6 +382,7 @@ from .kuwo import (
 )
 from .la7 import LA7IE
 from .laola1tv import Laola1TvIE
 )
 from .la7 import LA7IE
 from .laola1tv import Laola1TvIE

+from .learnr import LearnrIE

 from .lecture2go import Lecture2GoIE
 from .lemonde import LemondeIE
 from .leeco import (
 from .lecture2go import Lecture2GoIE
 from .lemonde import LemondeIE
 from .leeco import (


@@ -376,6 +390,7 @@ from .leeco import (
     LePlaylistIE,
     LetvCloudIE,
 )
     LePlaylistIE,
     LetvCloudIE,
 )

+from .libraryofcongress import LibraryOfCongressIE

 from .libsyn import LibsynIE
 from .lifenews import (
     LifeNewsIE,
 from .libsyn import LibsynIE
 from .lifenews import (
     LifeNewsIE,


@@ -394,6 +409,7 @@ from .livestream import (
     LivestreamShortenerIE,
 )
 from .lnkgo import LnkGoIE
     LivestreamShortenerIE,
 )
 from .lnkgo import LnkGoIE

+from .localnews8 import LocalNews8IE

 from .lovehomeporn import LoveHomePornIE
 from .lrt import LRTIE
 from .lynda import (
 from .lovehomeporn import LoveHomePornIE
 from .lrt import LRTIE
 from .lynda import (


@@ -502,7 +518,10 @@ from .nhl import (
     NHLVideocenterCategoryIE,
     NHLIE,
 )
     NHLVideocenterCategoryIE,
     NHLIE,
 )

-from .nick import NickIE
+from .nick import (
+    NickIE,
+    NickDeIE,
+)

 from .niconico import NiconicoIE, NiconicoPlaylistIE
 from .ninegag import NineGagIE
 from .noco import NocoIE
 from .niconico import NiconicoIE, NiconicoPlaylistIE
 from .ninegag import NineGagIE
 from .noco import NocoIE


@@ -613,6 +632,10 @@ from .qqmusic import (
     QQMusicPlaylistIE,
 )
 from .r7 import R7IE
     QQMusicPlaylistIE,
 )
 from .r7 import R7IE

+from .radiocanada import (
+    RadioCanadaIE,
+    RadioCanadaAudioVideoIE,
+)

 from .radiode import RadioDeIE
 from .radiojavan import RadioJavanIE
 from .radiobremen import RadioBremenIE
 from .radiode import RadioDeIE
 from .radiojavan import RadioJavanIE
 from .radiobremen import RadioBremenIE


@@ -626,11 +649,16 @@ from .rds import RDSIE
 from .redtube import RedTubeIE
 from .regiotv import RegioTVIE
 from .restudy import RestudyIE
 from .redtube import RedTubeIE
 from .regiotv import RegioTVIE
 from .restudy import RestudyIE

+from .reuters import ReutersIE

 from .reverbnation import ReverbNationIE
 from .reverbnation import ReverbNationIE

-from .revision3 import Revision3IE
+from .revision3 import (
+    Revision3EmbedIE,
+    Revision3IE,
+)

 from .rice import RICEIE
 from .ringtv import RingTVIE
 from .ro220 import Ro220IE
 from .rice import RICEIE
 from .ringtv import RingTVIE
 from .ro220 import Ro220IE

+from .rockstargames import RockstarGamesIE

 from .rottentomatoes import RottenTomatoesIE
 from .roxwel import RoxwelIE
 from .rtbf import RTBFIE
 from .rottentomatoes import RottenTomatoesIE
 from .roxwel import RoxwelIE
 from .rtbf import RTBFIE


@@ -666,7 +694,9 @@ from .screencast import ScreencastIE
 from .screencastomatic import ScreencastOMaticIE
 from .screenjunkies import ScreenJunkiesIE
 from .screenwavemedia import ScreenwaveMediaIE, TeamFourIE
 from .screencastomatic import ScreencastOMaticIE
 from .screenjunkies import ScreenJunkiesIE
 from .screenwavemedia import ScreenwaveMediaIE, TeamFourIE

+from .seeker import SeekerIE

 from .senateisvp import SenateISVPIE
 from .senateisvp import SenateISVPIE

+from .sendtonews import SendtoNewsIE

 from .servingsys import ServingSysIE
 from .sexu import SexuIE
 from .shahid import ShahidIE
 from .servingsys import ServingSysIE
 from .sexu import SexuIE
 from .shahid import ShahidIE


@@ -717,6 +747,7 @@ from .sportbox import (
     SportBoxEmbedIE,
 )
 from .sportdeutschland import SportDeutschlandIE
     SportBoxEmbedIE,
 )
 from .sportdeutschland import SportDeutschlandIE

+from .sportschau import SportschauIE

 from .srgssr import (
     SRGSSRIE,
     SRGSSRPlayIE,
 from .srgssr import (
     SRGSSRIE,
     SRGSSRPlayIE,


@@ -757,6 +788,7 @@ from .telecinco import TelecincoIE
 from .telegraaf import TelegraafIE
 from .telemb import TeleMBIE
 from .teletask import TeleTaskIE
 from .telegraaf import TelegraafIE
 from .telemb import TeleMBIE
 from .teletask import TeleTaskIE

+from .telewebion import TelewebionIE

 from .testurl import TestURLIE
 from .tf1 import TF1IE
 from .theintercept import TheInterceptIE
 from .testurl import TestURLIE
 from .tf1 import TF1IE
 from .theintercept import TheInterceptIE


@@ -822,7 +854,10 @@ from .tvc import (
 )
 from .tvigle import TvigleIE
 from .tvland import TVLandIE
 )
 from .tvigle import TvigleIE
 from .tvland import TVLandIE

-from .tvp import TvpIE, TvpSeriesIE
+from .tvp import (
+    TVPIE,
+    TVPSeriesIE,
+)

 from .tvplay import TVPlayIE
 from .tweakers import TweakersIE
 from .twentyfourvideo import TwentyFourVideoIE
 from .tvplay import TVPlayIE
 from .tweakers import TweakersIE
 from .twentyfourvideo import TwentyFourVideoIE


@@ -838,6 +873,7 @@ from .twitch import (
     TwitchProfileIE,
     TwitchPastBroadcastsIE,
     TwitchStreamIE,
     TwitchProfileIE,
     TwitchPastBroadcastsIE,
     TwitchStreamIE,

+    TwitchClipsIE,

 )
 from .twitter import (
     TwitterCardIE,
 )
 from .twitter import (
     TwitterCardIE,


@@ -889,6 +925,7 @@ from .videomore import (
 )
 from .videopremium import VideoPremiumIE
 from .videott import VideoTtIE
 )
 from .videopremium import VideoPremiumIE
 from .videott import VideoTtIE

+from .vidio import VidioIE

 from .vidme import (
     VidmeIE,
     VidmeUserIE,
 from .vidme import (
     VidmeIE,
     VidmeUserIE,


@@ -934,26 +971,29 @@ from .vporn import VpornIE
 from .vrt import VRTIE
 from .vube import VubeIE
 from .vuclip import VuClipIE
 from .vrt import VRTIE
 from .vube import VubeIE
 from .vuclip import VuClipIE

-from .vulture import VultureIE

 from .walla import WallaIE
 from .walla import WallaIE

-from .washingtonpost import WashingtonPostIE
+from .washingtonpost import (
+    WashingtonPostIE,
+    WashingtonPostArticleIE,
+)

 from .wat import WatIE
 from .watchindianporn import WatchIndianPornIE
 from .wdr import (
     WDRIE,
     WDRMobileIE,
 from .wat import WatIE
 from .watchindianporn import WatchIndianPornIE
 from .wdr import (
     WDRIE,
     WDRMobileIE,

-    WDRMausIE,

 )
 from .webofstories import (
     WebOfStoriesIE,
     WebOfStoriesPlaylistIE,
 )
 )
 from .webofstories import (
     WebOfStoriesIE,
     WebOfStoriesPlaylistIE,
 )

-from .weibo import WeiboIE

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

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

 from .wsj import WSJIE
 from .xbef import XBefIE
 from .xboxclips import XboxClipsIE
 from .wsj import WSJIE
 from .xbef import XBefIE
 from .xboxclips import XboxClipsIE


@@ -989,7 +1029,10 @@ from .yesjapan import YesJapanIE
 from .yinyuetai import YinYueTaiIE
 from .ynet import YnetIE
 from .youjizz import YouJizzIE
 from .yinyuetai import YinYueTaiIE
 from .ynet import YnetIE
 from .youjizz import YouJizzIE

-from .youku import YoukuIE
+from .youku import (
+    YoukuIE,
+    YoukuShowIE,
+)

 from .youporn import YouPornIE
 from .yourupload import YourUploadIE
 from .youtube import (
 from .youporn import YouPornIE
 from .yourupload import YourUploadIE
 from .youtube import (