Merge branch 'kusi' of https://github.com/mutantmonkey/youtube-dl into mutantmonkey...

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

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 64e1fd334af08d05dd33cf10bf91f3d9782fc30b..08b3dc67393c688529ea2b524950f7a6200fd433 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -15,10 +15,12 @@ from .adobetv import (
     AdobeTVVideoIE,
 )
 from .adultswim import AdultSwimIE
     AdobeTVVideoIE,
 )
 from .adultswim import AdultSwimIE

+from .aenetworks import AENetworksIE

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

+from .animeondemand import AnimeOnDemandIE

 from .anitube import AnitubeIE
 from .anysex import AnySexIE
 from .aol import AolIE
 from .anitube import AnitubeIE
 from .anysex import AnySexIE
 from .aol import AolIE


@@ -41,14 +43,16 @@ from .arte import (
     ArteTVCreativeIE,
     ArteTVConcertIE,
     ArteTVFutureIE,
     ArteTVCreativeIE,
     ArteTVConcertIE,
     ArteTVFutureIE,

+    ArteTVCinemaIE,

     ArteTVDDCIE,
     ArteTVDDCIE,

+    ArteTVMagazineIE,

     ArteTVEmbedIE,
 )
 from .atresplayer import AtresPlayerIE
 from .atttechchannel import ATTTechChannelIE
 from .audimedia import AudiMediaIE
 from .audiomack import AudiomackIE, AudiomackAlbumIE
     ArteTVEmbedIE,
 )
 from .atresplayer import AtresPlayerIE
 from .atttechchannel import ATTTechChannelIE
 from .audimedia import AudiMediaIE
 from .audiomack import AudiomackIE, AudiomackAlbumIE

-from .azubu import AzubuIE
+from .azubu import AzubuIE, AzubuLiveIE

 from .baidu import BaiduVideoIE
 from .bambuser import BambuserIE, BambuserChannelIE
 from .bandcamp import BandcampIE, BandcampAlbumIE
 from .baidu import BaiduVideoIE
 from .bambuser import BambuserIE, BambuserChannelIE
 from .bandcamp import BandcampIE, BandcampAlbumIE


@@ -61,6 +65,7 @@ from .beeg import BeegIE
 from .behindkink import BehindKinkIE
 from .beatportpro import BeatportProIE
 from .bet import BetIE
 from .behindkink import BehindKinkIE
 from .beatportpro import BeatportProIE
 from .bet import BetIE

+from .bigflix import BigflixIE

 from .bild import BildIE
 from .bilibili import BiliBiliIE
 from .bleacherreport import (
 from .bild import BildIE
 from .bilibili import BiliBiliIE
 from .bleacherreport import (


@@ -69,6 +74,7 @@ from .bleacherreport import (
 )
 from .blinkx import BlinkxIE
 from .bloomberg import BloombergIE
 )
 from .blinkx import BlinkxIE
 from .bloomberg import BloombergIE

+from .bokecc import BokeCCIE

 from .bpb import BpbIE
 from .br import BRIE
 from .breakcom import BreakIE
 from .bpb import BpbIE
 from .br import BRIE
 from .breakcom import BreakIE


@@ -85,8 +91,16 @@ from .camdemy import (
 )
 from .canalplus import CanalplusIE
 from .canalc2 import Canalc2IE
 )
 from .canalplus import CanalplusIE
 from .canalc2 import Canalc2IE

+from .canvas import CanvasIE
+from .cbc import (
+    CBCIE,
+    CBCPlayerIE,
+)

 from .cbs import CBSIE
 from .cbs import CBSIE

-from .cbsnews import CBSNewsIE
+from .cbsnews import (
+    CBSNewsIE,
+    CBSNewsLiveVideoIE,
+)

 from .cbssports import CBSSportsIE
 from .ccc import CCCIE
 from .ceskatelevize import CeskaTelevizeIE
 from .cbssports import CBSSportsIE
 from .ccc import CCCIE
 from .ceskatelevize import CeskaTelevizeIE


@@ -119,6 +133,7 @@ from .comcarcoff import ComCarCoffIE
 from .commonmistakes import CommonMistakesIE, UnicodeBOMIE
 from .condenast import CondeNastIE
 from .cracked import CrackedIE
 from .commonmistakes import CommonMistakesIE, UnicodeBOMIE
 from .condenast import CondeNastIE
 from .cracked import CrackedIE

+from .crackle import CrackleIE

 from .criterion import CriterionIE
 from .crooksandliars import CrooksAndLiarsIE
 from .crunchyroll import (
 from .criterion import CriterionIE
 from .crooksandliars import CrooksAndLiarsIE
 from .crunchyroll import (


@@ -127,6 +142,8 @@ from .crunchyroll import (
 )
 from .cspan import CSpanIE
 from .ctsnews import CtsNewsIE
 )
 from .cspan import CSpanIE
 from .ctsnews import CtsNewsIE

+from .cultureunplugged import CultureUnpluggedIE
+from .cwtv import CWTVIE

 from .dailymotion import (
     DailymotionIE,
     DailymotionPlaylistIE,
 from .dailymotion import (
     DailymotionIE,
     DailymotionPlaylistIE,


@@ -136,6 +153,8 @@ from .dailymotion import (
 from .daum import (
     DaumIE,
     DaumClipIE,
 from .daum import (
     DaumIE,
     DaumClipIE,

+    DaumPlaylistIE,
+    DaumUserIE,

 )
 from .dbtv import DBTVIE
 from .dcn import (
 )
 from .dbtv import DBTVIE
 from .dcn import (


@@ -190,7 +209,10 @@ 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 .facebook import FacebookIE
+from .facebook import (
+    FacebookIE,
+    FacebookPostIE,
+)

 from .faz import FazIE
 from .fc2 import FC2IE
 from .fczenit import FczenitIE
 from .faz import FazIE
 from .fc2 import FC2IE
 from .fczenit import FczenitIE


@@ -261,7 +283,6 @@ from .hellporno import HellPornoIE
 from .helsinki import HelsinkiIE
 from .hentaistigma import HentaiStigmaIE
 from .historicfilms import HistoricFilmsIE
 from .helsinki import HelsinkiIE
 from .hentaistigma import HentaiStigmaIE
 from .historicfilms import HistoricFilmsIE

-from .history import HistoryIE

 from .hitbox import HitboxIE, HitboxLiveIE
 from .hornbunny import HornBunnyIE
 from .hotnewhiphop import HotNewHipHopIE
 from .hitbox import HitboxIE, HitboxLiveIE
 from .hornbunny import HornBunnyIE
 from .hotnewhiphop import HotNewHipHopIE


@@ -299,6 +320,7 @@ from .ivi import (
     IviIE,
     IviCompilationIE
 )
     IviIE,
     IviCompilationIE
 )

+from .ivideon import IvideonIE

 from .izlesene import IzleseneIE
 from .jadorecettepub import JadoreCettePubIE
 from .jeuxvideo import JeuxVideoIE
 from .izlesene import IzleseneIE
 from .jadorecettepub import JadoreCettePubIE
 from .jeuxvideo import JeuxVideoIE


@@ -314,9 +336,11 @@ from .keezmovies import KeezMoviesIE
 from .khanacademy import KhanAcademyIE
 from .kickstarter import KickStarterIE
 from .keek import KeekIE
 from .khanacademy import KhanAcademyIE
 from .kickstarter import KickStarterIE
 from .keek import KeekIE

+from .konserthusetplay import KonserthusetPlayIE

 from .kontrtube import KontrTubeIE
 from .krasview import KrasViewIE
 from .ku6 import Ku6IE
 from .kontrtube import KontrTubeIE
 from .krasview import KrasViewIE
 from .ku6 import Ku6IE

+from .kusi import KUSIIE

 from .kuwo import (
     KuwoIE,
     KuwoAlbumIE,
 from .kuwo import (
     KuwoIE,
     KuwoAlbumIE,


@@ -328,10 +352,11 @@ from .kuwo import (
 from .la7 import LA7IE
 from .laola1tv import Laola1TvIE
 from .lecture2go import Lecture2GoIE
 from .la7 import LA7IE
 from .laola1tv import Laola1TvIE
 from .lecture2go import Lecture2GoIE

-from .letv import (
-    LetvIE,
-    LetvTvIE,
-    LetvPlaylistIE
+from .lemonde import LemondeIE
+from .leeco import (
+    LeIE,
+    LePlaylistIE,
+    LetvCloudIE,

 )
 from .libsyn import LibsynIE
 from .lifenews import (
 )
 from .libsyn import LibsynIE
 from .lifenews import (


@@ -350,6 +375,7 @@ from .livestream import (
     LivestreamShortenerIE,
 )
 from .lnkgo import LnkGoIE
     LivestreamShortenerIE,
 )
 from .lnkgo import LnkGoIE

+from .lovehomeporn import LoveHomePornIE

 from .lrt import LRTIE
 from .lynda import (
     LyndaIE,
 from .lrt import LRTIE
 from .lynda import (
     LyndaIE,


@@ -360,11 +386,11 @@ from .macgamestore import MacGameStoreIE
 from .mailru import MailRuIE
 from .makertv import MakerTVIE
 from .malemotion import MalemotionIE
 from .mailru import MailRuIE
 from .makertv import MakerTVIE
 from .malemotion import MalemotionIE

+from .matchtv import MatchTVIE

 from .mdr import MDRIE
 from .metacafe import MetacafeIE
 from .metacritic import MetacriticIE
 from .mgoon import MgoonIE
 from .mdr import MDRIE
 from .metacafe import MetacafeIE
 from .metacritic import MetacriticIE
 from .mgoon import MgoonIE

-from .min20 import Min20IE

 from .minhateca import MinhatecaIE
 from .ministrygrid import MinistryGridIE
 from .miomio import MioMioIE
 from .minhateca import MinhatecaIE
 from .ministrygrid import MinistryGridIE
 from .miomio import MioMioIE


@@ -466,17 +492,21 @@ from .nowtv import (
     NowTVIE,
     NowTVListIE,
 )
     NowTVIE,
     NowTVListIE,
 )

+from .noz import NozIE

 from .npo import (
     NPOIE,
     NPOLiveIE,
     NPORadioIE,
     NPORadioFragmentIE,
 from .npo import (
     NPOIE,
     NPOLiveIE,
     NPORadioIE,
     NPORadioFragmentIE,

+    SchoolTVIE,

     VPROIE,
     WNLIE
 )
     VPROIE,
     WNLIE
 )

+from .npr import NprIE

 from .nrk import (
     NRKIE,
     NRKPlaylistIE,
 from .nrk import (
     NRKIE,
     NRKPlaylistIE,

+    NRKSkoleIE,

     NRKTVIE,
 )
 from .ntvde import NTVDeIE
     NRKTVIE,
 )
 from .ntvde import NTVDeIE


@@ -513,6 +543,7 @@ from .planetaplay import PlanetaPlayIE
 from .pladform import PladformIE
 from .played import PlayedIE
 from .playfm import PlayFMIE
 from .pladform import PladformIE
 from .played import PlayedIE
 from .playfm import PlayFMIE

+from .plays import PlaysTVIE

 from .playtvak import PlaytvakIE
 from .playvid import PlayvidIE
 from .playwire import PlaywireIE
 from .playtvak import PlaytvakIE
 from .playvid import PlayvidIE
 from .playwire import PlaywireIE


@@ -526,6 +557,7 @@ from .pornhd import PornHdIE
 from .pornhub import (
     PornHubIE,
     PornHubPlaylistIE,
 from .pornhub import (
     PornHubIE,
     PornHubPlaylistIE,

+    PornHubUserVideosIE,

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


@@ -564,7 +596,7 @@ from .ro220 import Ro220IE
 from .rottentomatoes import RottenTomatoesIE
 from .roxwel import RoxwelIE
 from .rtbf import RTBFIE
 from .rottentomatoes import RottenTomatoesIE
 from .roxwel import RoxwelIE
 from .rtbf import RTBFIE

-from .rte import RteIE
+from .rte import RteIE, RteRadioIE

 from .rtlnl import RtlNlIE
 from .rtl2 import RTL2IE
 from .rtp import RTPIE
 from .rtlnl import RtlNlIE
 from .rtl2 import RTL2IE
 from .rtp import RTPIE


@@ -572,6 +604,7 @@ from .rts import RTSIE
 from .rtve import RTVEALaCartaIE, RTVELiveIE, RTVEInfantilIE
 from .rtvnh import RTVNHIE
 from .ruhd import RUHDIE
 from .rtve import RTVEALaCartaIE, RTVELiveIE, RTVEInfantilIE
 from .rtvnh import RTVNHIE
 from .ruhd import RUHDIE

+from .ruleporn import RulePornIE

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


@@ -592,6 +625,7 @@ from .sbs import SBSIE
 from .scivee import SciVeeIE
 from .screencast import ScreencastIE
 from .screencastomatic import ScreencastOMaticIE
 from .scivee import SciVeeIE
 from .screencast import ScreencastIE
 from .screencastomatic import ScreencastOMaticIE

+from .screenjunkies import ScreenJunkiesIE

 from .screenwavemedia import ScreenwaveMediaIE, TeamFourIE
 from .senateisvp import SenateISVPIE
 from .servingsys import ServingSysIE
 from .screenwavemedia import ScreenwaveMediaIE, TeamFourIE
 from .senateisvp import SenateISVPIE
 from .servingsys import ServingSysIE


@@ -637,7 +671,6 @@ from .southpark import (
     SouthParkEsIE,
     SouthParkNlIE
 )
     SouthParkEsIE,
     SouthParkNlIE
 )

-from .space import SpaceIE

 from .spankbang import SpankBangIE
 from .spankwire import SpankwireIE
 from .spiegel import SpiegelIE, SpiegelArticleIE
 from .spankbang import SpankBangIE
 from .spankwire import SpankwireIE
 from .spiegel import SpiegelIE, SpiegelArticleIE


@@ -705,6 +738,7 @@ from .tmz import (
     TMZArticleIE,
 )
 from .tnaflix import (
     TMZArticleIE,
 )
 from .tnaflix import (

+    TNAFlixNetworkEmbedIE,

     TNAFlixIE,
     EMPFlixIE,
     MovieFapIE,
     TNAFlixIE,
     EMPFlixIE,
     MovieFapIE,


@@ -718,10 +752,15 @@ 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 .trollvids import TrollvidsIE

 from .trutube import TruTubeIE
 from .tube8 import Tube8IE
 from .tubitv import TubiTvIE
 from .trutube import TruTubeIE
 from .tube8 import Tube8IE
 from .tubitv import TubiTvIE

-from .tudou import TudouIE
+from .tudou import (
+    TudouIE,
+    TudouPlaylistIE,
+    TudouAlbumIE,
+)

 from .tumblr import TumblrIE
 from .tunein import (
     TuneInClipIE,
 from .tumblr import TumblrIE
 from .tunein import (
     TuneInClipIE,


@@ -747,6 +786,7 @@ 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

+from .twentymin import TwentyMinutenIE

 from .twentytwotracks import (
     TwentyTwoTracksIE,
     TwentyTwoTracksGenreIE
 from .twentytwotracks import (
     TwentyTwoTracksIE,
     TwentyTwoTracksGenreIE


@@ -760,17 +800,22 @@ from .twitch import (
     TwitchBookmarksIE,
     TwitchStreamIE,
 )
     TwitchBookmarksIE,
     TwitchStreamIE,
 )

-from .twitter import TwitterCardIE, TwitterIE
+from .twitter import (
+    TwitterCardIE,
+    TwitterIE,
+    TwitterAmplifyIE,
+)

 from .ubu import UbuIE
 from .udemy import (
     UdemyIE,
     UdemyCourseIE
 )
 from .udn import UDNEmbedIE
 from .ubu import UbuIE
 from .udemy import (
     UdemyIE,
     UdemyCourseIE
 )
 from .udn import UDNEmbedIE

-from .ultimedia import UltimediaIE
+from .digiteka import DigitekaIE

 from .unistra import UnistraIE
 from .urort import UrortIE
 from .ustream import UstreamIE, UstreamChannelIE
 from .unistra import UnistraIE
 from .urort import UrortIE
 from .ustream import UstreamIE, UstreamChannelIE

+from .ustudio import UstudioIE

 from .varzesh3 import Varzesh3IE
 from .vbox7 import Vbox7IE
 from .veehd import VeeHDIE
 from .varzesh3 import Varzesh3IE
 from .vbox7 import Vbox7IE
 from .veehd import VeeHDIE


@@ -796,7 +841,11 @@ from .videomore import (
 )
 from .videopremium import VideoPremiumIE
 from .videott import VideoTtIE
 )
 from .videopremium import VideoPremiumIE
 from .videott import VideoTtIE

-from .vidme import VidmeIE
+from .vidme import (
+    VidmeIE,
+    VidmeUserIE,
+    VidmeUserLikesIE,
+)

 from .vidzi import VidziIE
 from .vier import VierIE, VierVideosIE
 from .viewster import ViewsterIE
 from .vidzi import VidziIE
 from .vier import VierIE, VierVideosIE
 from .viewster import ViewsterIE


@@ -846,6 +895,7 @@ from .webofstories import (
     WebOfStoriesPlaylistIE,
 )
 from .weibo import WeiboIE
     WebOfStoriesPlaylistIE,
 )
 from .weibo import WeiboIE

+from .weiqitv import WeiqiTVIE

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


@@ -906,6 +956,7 @@ from .zingmp3 import (
     ZingMp3SongIE,
     ZingMp3AlbumIE,
 )
     ZingMp3SongIE,
     ZingMp3AlbumIE,
 )

+from .zippcast import ZippCastIE

 
 _ALL_CLASSES = [
     klass
 
 _ALL_CLASSES = [
     klass