Merge branch 'vlive' of https://github.com/ping/youtube-dl into ping-vlive

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

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index aba62db53232e7ab9a90b3f7734999fcf5010bc4..5d2ea39d0abfdc5d83d04e172e87edbdc54de44a 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -19,9 +19,14 @@ from .anysex import AnySexIE
 from .aol import AolIE
 from .allocine import AllocineIE
 from .aparat import AparatIE
 from .aol import AolIE
 from .allocine import AllocineIE
 from .aparat import AparatIE

+from .appleconnect import AppleConnectIE

 from .appletrailers import AppleTrailersIE
 from .archiveorg import ArchiveOrgIE
 from .appletrailers import AppleTrailersIE
 from .archiveorg import ArchiveOrgIE

-from .ard import ARDIE, ARDMediathekIE
+from .ard import (
+    ARDIE,
+    ARDMediathekIE,
+    SportschauIE,
+)

 from .arte import (
     ArteTvIE,
     ArteTVPlus7IE,
 from .arte import (
     ArteTvIE,
     ArteTVPlus7IE,


@@ -38,7 +43,10 @@ from .azubu import AzubuIE
 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

-from .bbccouk import BBCCoUkIE
+from .bbc import (
+    BBCCoUkIE,
+    BBCIE,
+)

 from .beeg import BeegIE
 from .behindkink import BehindKinkIE
 from .beatportpro import BeatportProIE
 from .beeg import BeegIE
 from .behindkink import BehindKinkIE
 from .beatportpro import BeatportProIE


@@ -110,6 +118,7 @@ from .dailymotion import (
 )
 from .daum import DaumIE
 from .dbtv import DBTVIE
 )
 from .daum import DaumIE
 from .dbtv import DBTVIE

+from .dcn import DCNIE

 from .dctp import DctpTvIE
 from .deezer import DeezerPlaylistIE
 from .dfb import DFBIE
 from .dctp import DctpTvIE
 from .deezer import DeezerPlaylistIE
 from .dfb import DFBIE


@@ -149,6 +158,7 @@ from .eporner import EpornerIE
 from .eroprofile import EroProfileIE
 from .escapist import EscapistIE
 from .espn import ESPNIE
 from .eroprofile import EroProfileIE
 from .escapist import EscapistIE
 from .espn import ESPNIE

+from .esri import EsriVideoIE

 from .everyonesmixtape import EveryonesMixtapeIE
 from .exfm import ExfmIE
 from .expotv import ExpoTVIE
 from .everyonesmixtape import EveryonesMixtapeIE
 from .exfm import ExfmIE
 from .expotv import ExpoTVIE


@@ -231,13 +241,21 @@ from .imdb import (
     ImdbIE,
     ImdbListIE
 )
     ImdbIE,
     ImdbListIE
 )

-from .imgur import ImgurIE
+from .imgur import (
+    ImgurIE,
+    ImgurAlbumIE,
+)

 from .ina import InaIE
 from .ina import InaIE

+from .indavideo import (
+    IndavideoIE,
+    IndavideoEmbedIE,
+)

 from .infoq import InfoQIE
 from .instagram import InstagramIE, InstagramUserIE
 from .internetvideoarchive import InternetVideoArchiveIE
 from .iprima import IPrimaIE
 from .iqiyi import IqiyiIE
 from .infoq import InfoQIE
 from .instagram import InstagramIE, InstagramUserIE
 from .internetvideoarchive import InternetVideoArchiveIE
 from .iprima import IPrimaIE
 from .iqiyi import IqiyiIE

+from .ir90tv import Ir90TvIE

 from .ivi import (
     IviIE,
     IviCompilationIE
 from .ivi import (
     IviIE,
     IviCompilationIE


@@ -260,8 +278,17 @@ from .keek import KeekIE
 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 .kuwo import (
+    KuwoIE,
+    KuwoAlbumIE,
+    KuwoChartIE,
+    KuwoSingerIE,
+    KuwoCategoryIE,
+    KuwoMvIE,
+)

 from .la7 import LA7IE
 from .laola1tv import Laola1TvIE
 from .la7 import LA7IE
 from .laola1tv import Laola1TvIE

+from .lecture2go import Lecture2GoIE

 from .letv import (
     LetvIE,
     LetvTvIE,
 from .letv import (
     LetvIE,
     LetvTvIE,


@@ -316,13 +343,16 @@ from .mtv import (
     MTVIE,
     MTVServicesEmbeddedIE,
     MTVIggyIE,
     MTVIE,
     MTVServicesEmbeddedIE,
     MTVIggyIE,

+    MTVDEIE,

 )
 from .muenchentv import MuenchenTVIE
 from .musicplayon import MusicPlayOnIE
 from .musicvault import MusicVaultIE
 from .muzu import MuzuTVIE
 )
 from .muenchentv import MuenchenTVIE
 from .musicplayon import MusicPlayOnIE
 from .musicvault import MusicVaultIE
 from .muzu import MuzuTVIE

+from .mwave import MwaveIE

 from .myspace import MySpaceIE, MySpaceAlbumIE
 from .myspass import MySpassIE
 from .myspace import MySpaceIE, MySpaceAlbumIE
 from .myspass import MySpassIE

+from .myvi import MyviIE

 from .myvideo import MyVideoIE
 from .myvidster import MyVidsterIE
 from .nationalgeographic import NationalGeographicIE
 from .myvideo import MyVideoIE
 from .myvidster import MyVidsterIE
 from .nationalgeographic import NationalGeographicIE


@@ -333,6 +363,7 @@ from .nbc import (
     NBCNewsIE,
     NBCSportsIE,
     NBCSportsVPlayerIE,
     NBCNewsIE,
     NBCSportsIE,
     NBCSportsVPlayerIE,

+    MSNBCIE,

 )
 from .ndr import (
     NDRIE,
 )
 from .ndr import (
     NDRIE,


@@ -342,6 +373,15 @@ from .ndtv import NDTVIE
 from .netzkino import NetzkinoIE
 from .nerdcubed import NerdCubedFeedIE
 from .nerdist import NerdistIE
 from .netzkino import NetzkinoIE
 from .nerdcubed import NerdCubedFeedIE
 from .nerdist import NerdistIE

+from .neteasemusic import (
+    NetEaseMusicIE,
+    NetEaseMusicAlbumIE,
+    NetEaseMusicSingerIE,
+    NetEaseMusicListIE,
+    NetEaseMusicMvIE,
+    NetEaseMusicProgramIE,
+    NetEaseMusicDjRadioIE,
+)

 from .newgrounds import NewgroundsIE
 from .newstube import NewstubeIE
 from .nextmedia import (
 from .newgrounds import NewgroundsIE
 from .newstube import NewstubeIE
 from .nextmedia import (


@@ -371,7 +411,8 @@ from .npo import (
     NPOLiveIE,
     NPORadioIE,
     NPORadioFragmentIE,
     NPOLiveIE,
     NPORadioIE,
     NPORadioFragmentIE,

-    TegenlichtVproIE,
+    VPROIE,
+    WNLIE

 )
 from .nrk import (
     NRKIE,
 )
 from .nrk import (
     NRKIE,


@@ -402,6 +443,10 @@ from .orf import (
 from .parliamentliveuk import ParliamentLiveUKIE
 from .patreon import PatreonIE
 from .pbs import PBSIE
 from .parliamentliveuk import ParliamentLiveUKIE
 from .patreon import PatreonIE
 from .pbs import PBSIE

+from .periscope import (
+    PeriscopeIE,
+    QuickscopeIE,
+)

 from .philharmoniedeparis import PhilharmonieDeParisIE
 from .phoenix import PhoenixIE
 from .photobucket import PhotobucketIE
 from .philharmoniedeparis import PhilharmonieDeParisIE
 from .phoenix import PhoenixIE
 from .photobucket import PhotobucketIE


@@ -410,8 +455,13 @@ 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 .playtvak import PlaytvakIE

 from .playvid import PlayvidIE
 from .playwire import PlaywireIE
 from .playvid import PlayvidIE
 from .playwire import PlaywireIE

+from .pluralsight import (
+    PluralsightIE,
+    PluralsightCourseIE,
+)

 from .podomatic import PodomaticIE
 from .porn91 import Porn91IE
 from .pornhd import PornHdIE
 from .podomatic import PodomaticIE
 from .porn91 import Porn91IE
 from .pornhd import PornHdIE


@@ -432,6 +482,7 @@ from .qqmusic import (
     QQMusicSingerIE,
     QQMusicAlbumIE,
     QQMusicToplistIE,
     QQMusicSingerIE,
     QQMusicAlbumIE,
     QQMusicToplistIE,

+    QQMusicPlaylistIE,

 )
 from .quickvid import QuickVidIE
 from .r7 import R7IE
 )
 from .quickvid import QuickVidIE
 from .r7 import R7IE


@@ -441,6 +492,7 @@ from .radiobremen import RadioBremenIE
 from .radiofrance import RadioFranceIE
 from .rai import RaiIE
 from .rbmaradio import RBMARadioIE
 from .radiofrance import RadioFranceIE
 from .rai import RaiIE
 from .rbmaradio import RBMARadioIE

+from .rds import RDSIE

 from .redtube import RedTubeIE
 from .restudy import RestudyIE
 from .reverbnation import ReverbNationIE
 from .redtube import RedTubeIE
 from .restudy import RestudyIE
 from .reverbnation import ReverbNationIE


@@ -455,6 +507,7 @@ from .rtl2 import RTL2IE
 from .rtp import RTPIE
 from .rts import RTSIE
 from .rtve import RTVEALaCartaIE, RTVELiveIE, RTVEInfantilIE
 from .rtp import RTPIE
 from .rts import RTSIE
 from .rtve import RTVEALaCartaIE, RTVELiveIE, RTVEInfantilIE

+from .rtvnh import RTVNHIE

 from .ruhd import RUHDIE
 from .rutube import (
     RutubeIE,
 from .ruhd import RUHDIE
 from .rutube import (
     RutubeIE,


@@ -481,6 +534,7 @@ from .senateisvp import SenateISVPIE
 from .servingsys import ServingSysIE
 from .sexu import SexuIE
 from .sexykarma import SexyKarmaIE
 from .servingsys import ServingSysIE
 from .sexu import SexuIE
 from .sexykarma import SexyKarmaIE

+from .shahid import ShahidIE

 from .shared import SharedIE
 from .sharesix import ShareSixIE
 from .sina import SinaIE
 from .shared import SharedIE
 from .sharesix import ShareSixIE
 from .sina import SinaIE


@@ -560,6 +614,7 @@ from .techtalks import TechTalksIE
 from .ted import TEDIE
 from .telebruxelles import TeleBruxellesIE
 from .telecinco import TelecincoIE
 from .ted import TEDIE
 from .telebruxelles import TeleBruxellesIE
 from .telecinco import TelecincoIE

+from .telegraaf import TelegraafIE

 from .telemb import TeleMBIE
 from .teletask import TeleTaskIE
 from .tenplay import TenPlayIE
 from .telemb import TeleMBIE
 from .teletask import TeleTaskIE
 from .tenplay import TenPlayIE


@@ -567,7 +622,10 @@ from .testurl import TestURLIE
 from .testtube import TestTubeIE
 from .tf1 import TF1IE
 from .theonion import TheOnionIE
 from .testtube import TestTubeIE
 from .tf1 import TF1IE
 from .theonion import TheOnionIE

-from .theplatform import ThePlatformIE
+from .theplatform import (
+    ThePlatformIE,
+    ThePlatformFeedIE,
+)

 from .thesixtyone import TheSixtyOneIE
 from .thisamericanlife import ThisAmericanLifeIE
 from .thisav import ThisAVIE
 from .thesixtyone import TheSixtyOneIE
 from .thisamericanlife import ThisAmericanLifeIE
 from .thisav import ThisAVIE


@@ -651,7 +709,6 @@ from .vgtv import (
 from .vh1 import VH1IE
 from .vice import ViceIE
 from .viddler import ViddlerIE
 from .vh1 import VH1IE
 from .vice import ViceIE
 from .viddler import ViddlerIE

-from .videobam import VideoBamIE

 from .videodetective import VideoDetectiveIE
 from .videolecturesnet import VideoLecturesNetIE
 from .videofyme import VideofyMeIE
 from .videodetective import VideoDetectiveIE
 from .videolecturesnet import VideoLecturesNetIE
 from .videofyme import VideofyMeIE


@@ -686,6 +743,7 @@ from .vk import (
     VKIE,
     VKUserVideosIE,
 )
     VKIE,
     VKUserVideosIE,
 )

+from .vlive import VLiveIE

 from .vodlocker import VodlockerIE
 from .voicerepublic import VoiceRepublicIE
 from .vporn import VpornIE
 from .vodlocker import VodlockerIE
 from .voicerepublic import VoiceRepublicIE
 from .vporn import VpornIE


@@ -702,7 +760,10 @@ from .wdr import (
     WDRMobileIE,
     WDRMausIE,
 )
     WDRMobileIE,
     WDRMausIE,
 )

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

 from .weibo import WeiboIE
 from .wimp import WimpIE
 from .wistia import WistiaIE
 from .weibo import WeiboIE
 from .wimp import WimpIE
 from .wistia import WistiaIE


@@ -733,6 +794,7 @@ from .yandexmusic import (
     YandexMusicPlaylistIE,
 )
 from .yesjapan import YesJapanIE
     YandexMusicPlaylistIE,
 )
 from .yesjapan import YesJapanIE

+from .yinyuetai import YinYueTaiIE

 from .ynet import YnetIE
 from .youjizz import YouJizzIE
 from .youku import YoukuIE
 from .ynet import YnetIE
 from .youjizz import YouJizzIE
 from .youku import YoukuIE