Merge branch 'vgtv' of https://github.com/mrkolby/youtube-dl into mrkolby-vgtv

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

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 18f73a8906b50e665945f40f46047e6275e55105..f9077d96950157d81375ef880ea445ed8da00f61 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -1,13 +1,16 @@
+from .abc import ABCIE

 from .academicearth import AcademicEarthCourseIE
 from .addanime import AddAnimeIE
 from .academicearth import AcademicEarthCourseIE
 from .addanime import AddAnimeIE

+from .adultswim import AdultSwimIE

 from .aftonbladet import AftonbladetIE
 from .anitube import AnitubeIE
 from .aftonbladet import AftonbladetIE
 from .anitube import AnitubeIE

+from .anysex import AnySexIE

 from .aol import AolIE
 from .allocine import AllocineIE
 from .aparat import AparatIE
 from .appletrailers import AppleTrailersIE
 from .archiveorg import ArchiveOrgIE
 from .aol import AolIE
 from .allocine import AllocineIE
 from .aparat import AparatIE
 from .appletrailers import AppleTrailersIE
 from .archiveorg import ArchiveOrgIE

-from .ard import ARDIE
+from .ard import ARDIE, ARDMediathekIE

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


@@ -21,6 +24,7 @@ from .auengine import AUEngineIE
 from .bambuser import BambuserIE, BambuserChannelIE
 from .bandcamp import BandcampIE, BandcampAlbumIE
 from .bbccouk import BBCCoUkIE
 from .bambuser import BambuserIE, BambuserChannelIE
 from .bandcamp import BandcampIE, BandcampAlbumIE
 from .bbccouk import BBCCoUkIE

+from .beeg import BeegIE

 from .bilibili import BiliBiliIE
 from .blinkx import BlinkxIE
 from .bliptv import BlipTVIE, BlipTVUserIE
 from .bilibili import BiliBiliIE
 from .blinkx import BlinkxIE
 from .bliptv import BlipTVIE, BlipTVUserIE


@@ -52,6 +56,7 @@ from .cnn import (
 from .collegehumor import CollegeHumorIE
 from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE
 from .condenast import CondeNastIE
 from .collegehumor import CollegeHumorIE
 from .comedycentral import ComedyCentralIE, ComedyCentralShowsIE
 from .condenast import CondeNastIE

+from .cracked import CrackedIE

 from .criterion import CriterionIE
 from .crunchyroll import CrunchyrollIE
 from .cspan import CSpanIE
 from .criterion import CriterionIE
 from .crunchyroll import CrunchyrollIE
 from .cspan import CSpanIE


@@ -62,9 +67,13 @@ from .dailymotion import (
     DailymotionUserIE,
 )
 from .daum import DaumIE
     DailymotionUserIE,
 )
 from .daum import DaumIE

+from .dbtv import DBTVIE
+from .dfb import DFBIE

 from .dotsub import DotsubIE
 from .dreisat import DreiSatIE
 from .dotsub import DotsubIE
 from .dreisat import DreiSatIE

+from .drtuber import DrTuberIE

 from .drtv import DRTVIE
 from .drtv import DRTVIE

+from .dump import DumpIE

 from .defense import DefenseGouvFrIE
 from .discovery import DiscoveryIE
 from .divxstage import DivxStageIE
 from .defense import DefenseGouvFrIE
 from .discovery import DiscoveryIE
 from .divxstage import DivxStageIE


@@ -73,12 +82,18 @@ from .ebaumsworld import EbaumsWorldIE
 from .ehow import EHowIE
 from .eighttracks import EightTracksIE
 from .eitb import EitbIE
 from .ehow import EHowIE
 from .eighttracks import EightTracksIE
 from .eitb import EitbIE

+from .ellentv import (
+    EllenTVIE,
+    EllenTVClipsIE,
+)

 from .elpais import ElPaisIE
 from .elpais import ElPaisIE

-from .empflix import EmpflixIE
+from .empflix import EMPFlixIE

 from .engadget import EngadgetIE
 from .engadget import EngadgetIE

+from .eporner import EpornerIE

 from .escapist import EscapistIE
 from .everyonesmixtape import EveryonesMixtapeIE
 from .exfm import ExfmIE
 from .escapist import EscapistIE
 from .everyonesmixtape import EveryonesMixtapeIE
 from .exfm import ExfmIE

+from .expotv import ExpoTVIE

 from .extremetube import ExtremeTubeIE
 from .facebook import FacebookIE
 from .faz import FazIE
 from .extremetube import ExtremeTubeIE
 from .facebook import FacebookIE
 from .faz import FazIE


@@ -106,20 +121,28 @@ from .freesound import FreesoundIE
 from .freespeech import FreespeechIE
 from .funnyordie import FunnyOrDieIE
 from .gamekings import GamekingsIE
 from .freespeech import FreespeechIE
 from .funnyordie import FunnyOrDieIE
 from .gamekings import GamekingsIE

-from .gameone import GameOneIE
+from .gameone import (
+    GameOneIE,
+    GameOnePlaylistIE,
+)

 from .gamespot import GameSpotIE
 from .gamespot import GameSpotIE

+from .gamestar import GameStarIE

 from .gametrailers import GametrailersIE
 from .gdcvault import GDCVaultIE
 from .generic import GenericIE
 from .gametrailers import GametrailersIE
 from .gdcvault import GDCVaultIE
 from .generic import GenericIE

+from .godtube import GodTubeIE

 from .googleplus import GooglePlusIE
 from .googlesearch import GoogleSearchIE
 from .gorillavid import GorillaVidIE
 from .goshgay import GoshgayIE
 from .googleplus import GooglePlusIE
 from .googlesearch import GoogleSearchIE
 from .gorillavid import GorillaVidIE
 from .goshgay import GoshgayIE

+from .grooveshark import GroovesharkIE

 from .hark import HarkIE
 from .helsinki import HelsinkiIE
 from .hentaistigma import HentaiStigmaIE
 from .hark import HarkIE
 from .helsinki import HelsinkiIE
 from .hentaistigma import HentaiStigmaIE

+from .hornbunny import HornBunnyIE

 from .hotnewhiphop import HotNewHipHopIE
 from .howcast import HowcastIE
 from .hotnewhiphop import HotNewHipHopIE
 from .howcast import HowcastIE

+from .howstuffworks import HowStuffWorksIE

 from .huffpost import HuffPostIE
 from .hypem import HypemIE
 from .iconosquare import IconosquareIE
 from .huffpost import HuffPostIE
 from .hypem import HypemIE
 from .iconosquare import IconosquareIE


@@ -137,8 +160,10 @@ from .ivi import (
     IviIE,
     IviCompilationIE
 )
     IviIE,
     IviCompilationIE
 )

+from .izlesene import IzleseneIE

 from .jadorecettepub import JadoreCettePubIE
 from .jeuxvideo import JeuxVideoIE
 from .jadorecettepub import JadoreCettePubIE
 from .jeuxvideo import JeuxVideoIE

+from .jove import JoveIE

 from .jukebox import JukeboxIE
 from .justintv import JustinTVIE
 from .jpopsukitv import JpopsukiIE
 from .jukebox import JukeboxIE
 from .justintv import JustinTVIE
 from .jpopsukitv import JpopsukiIE


@@ -148,6 +173,7 @@ from .khanacademy import KhanAcademyIE
 from .kickstarter import KickStarterIE
 from .keek import KeekIE
 from .kontrtube import KontrTubeIE
 from .kickstarter import KickStarterIE
 from .keek import KeekIE
 from .kontrtube import KontrTubeIE

+from .krasview import KrasViewIE

 from .ku6 import Ku6IE
 from .la7 import LA7IE
 from .lifenews import LifeNewsIE
 from .ku6 import Ku6IE
 from .la7 import LA7IE
 from .lifenews import LifeNewsIE


@@ -168,14 +194,19 @@ from .malemotion import MalemotionIE
 from .mdr import MDRIE
 from .metacafe import MetacafeIE
 from .metacritic import MetacriticIE
 from .mdr import MDRIE
 from .metacafe import MetacafeIE
 from .metacritic import MetacriticIE

+from .ministrygrid import MinistryGridIE

 from .mit import TechTVMITIE, MITIE, OCWMITIE
 from .mit import TechTVMITIE, MITIE, OCWMITIE

+from .mitele import MiTeleIE

 from .mixcloud import MixcloudIE
 from .mixcloud import MixcloudIE

+from .mlb import MLBIE

 from .mpora import MporaIE
 from .mofosex import MofosexIE
 from .mpora import MporaIE
 from .mofosex import MofosexIE

+from .mojvideo import MojvideoIE

 from .mooshare import MooshareIE
 from .morningstar import MorningstarIE
 from .motherless import MotherlessIE
 from .motorsport import MotorsportIE
 from .mooshare import MooshareIE
 from .morningstar import MorningstarIE
 from .motherless import MotherlessIE
 from .motorsport import MotorsportIE

+from .movieclips import MovieClipsIE

 from .moviezine import MoviezineIE
 from .movshare import MovShareIE
 from .mtv import (
 from .moviezine import MoviezineIE
 from .movshare import MovShareIE
 from .mtv import (


@@ -184,6 +215,7 @@ from .mtv import (
     MTVIggyIE,
 )
 from .musicplayon import MusicPlayOnIE
     MTVIggyIE,
 )
 from .musicplayon import MusicPlayOnIE

+from .musicvault import MusicVaultIE

 from .muzu import MuzuTVIE
 from .myspace import MySpaceIE
 from .myspass import MySpassIE
 from .muzu import MuzuTVIE
 from .myspace import MySpaceIE
 from .myspass import MySpassIE


@@ -204,6 +236,7 @@ from .niconico import NiconicoIE
 from .ninegag import NineGagIE
 from .noco import NocoIE
 from .normalboots import NormalbootsIE
 from .ninegag import NineGagIE
 from .noco import NocoIE
 from .normalboots import NormalbootsIE

+from .nosvideo import NosVideoIE

 from .novamov import NovaMovIE
 from .nowness import NownessIE
 from .nowvideo import NowVideoIE
 from .novamov import NovaMovIE
 from .nowness import NownessIE
 from .nowvideo import NowVideoIE


@@ -215,17 +248,23 @@ from .nrk import (
 from .ntv import NTVIE
 from .nytimes import NYTimesIE
 from .nuvid import NuvidIE
 from .ntv import NTVIE
 from .nytimes import NYTimesIE
 from .nuvid import NuvidIE

-from .oe1 import OE1IE

 from .ooyala import OoyalaIE
 from .ooyala import OoyalaIE

-from .orf import ORFIE
+from .orf import (
+    ORFTVthekIE,
+    ORFOE1IE,
+    ORFFM4IE,
+)

 from .parliamentliveuk import ParliamentLiveUKIE
 from .parliamentliveuk import ParliamentLiveUKIE

+from .patreon import PatreonIE

 from .pbs import PBSIE
 from .photobucket import PhotobucketIE
 from .pbs import PBSIE
 from .photobucket import PhotobucketIE

+from .playfm import PlayFMIE

 from .playvid import PlayvidIE
 from .podomatic import PodomaticIE
 from .pornhd import PornHdIE
 from .pornhub import PornHubIE
 from .pornotube import PornotubeIE
 from .playvid import PlayvidIE
 from .podomatic import PodomaticIE
 from .pornhd import PornHdIE
 from .pornhub import PornHubIE
 from .pornotube import PornotubeIE

+from .promptfile import PromptFileIE

 from .prosiebensat1 import ProSiebenSat1IE
 from .pyvideo import PyvideoIE
 from .radiofrance import RadioFranceIE
 from .prosiebensat1 import ProSiebenSat1IE
 from .pyvideo import PyvideoIE
 from .radiofrance import RadioFranceIE


@@ -238,9 +277,10 @@ 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 .rtlnl import RtlXlIE

 from .rtlnow import RTLnowIE
 from .rts import RTSIE
 from .rtlnow import RTLnowIE
 from .rts import RTSIE

-from .rtve import RTVEALaCartaIE
+from .rtve import RTVEALaCartaIE, RTVELiveIE

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


@@ -249,10 +289,13 @@ from .rutube import (
     RutubePersonIE,
 )
 from .rutv import RUTVIE
     RutubePersonIE,
 )
 from .rutv import RUTVIE

+from .sapo import SapoIE

 from .savefrom import SaveFromIE
 from .savefrom import SaveFromIE

+from .sbs import SBSIE

 from .scivee import SciVeeIE
 from .screencast import ScreencastIE
 from .servingsys import ServingSysIE
 from .scivee import SciVeeIE
 from .screencast import ScreencastIE
 from .servingsys import ServingSysIE

+from .shared import SharedIE

 from .sina import SinaIE
 from .slideshare import SlideshareIE
 from .slutload import SlutloadIE
 from .sina import SinaIE
 from .slideshare import SlideshareIE
 from .slutload import SlutloadIE


@@ -262,6 +305,8 @@ from .smotri import (
     SmotriUserIE,
     SmotriBroadcastIE,
 )
     SmotriUserIE,
     SmotriBroadcastIE,
 )

+from .snotr import SnotrIE
+from .sockshare import SockshareIE

 from .sohu import SohuIE
 from .soundcloud import (
     SoundcloudIE,
 from .sohu import SohuIE
 from .soundcloud import (
     SoundcloudIE,


@@ -279,10 +324,12 @@ from .spankwire import SpankwireIE
 from .spiegel import SpiegelIE
 from .spiegeltv import SpiegeltvIE
 from .spike import SpikeIE
 from .spiegel import SpiegelIE
 from .spiegeltv import SpiegeltvIE
 from .spike import SpikeIE

+from .sportdeutschland import SportDeutschlandIE

 from .stanfordoc import StanfordOpenClassroomIE
 from .steam import SteamIE
 from .streamcloud import StreamcloudIE
 from .streamcz import StreamCZIE
 from .stanfordoc import StanfordOpenClassroomIE
 from .steam import SteamIE
 from .streamcloud import StreamcloudIE
 from .streamcz import StreamCZIE

+from .sunporno import SunPornoIE

 from .swrmediathek import SWRMediathekIE
 from .syfy import SyfyIE
 from .sztvhu import SztvHuIE
 from .swrmediathek import SWRMediathekIE
 from .syfy import SyfyIE
 from .sztvhu import SztvHuIE


@@ -302,6 +349,7 @@ from .theplatform import ThePlatformIE
 from .thisav import ThisAVIE
 from .tinypic import TinyPicIE
 from .tlc import TlcIE, TlcDeIE
 from .thisav import ThisAVIE
 from .tinypic import TinyPicIE
 from .tlc import TlcIE, TlcDeIE

+from .tnaflix import TNAFlixIE

 from .toutv import TouTvIE
 from .toypics import ToypicsUserIE, ToypicsIE
 from .traileraddict import TrailerAddictIE
 from .toutv import TouTvIE
 from .toypics import ToypicsUserIE, ToypicsIE
 from .traileraddict import TrailerAddictIE


@@ -313,6 +361,8 @@ from .tumblr import TumblrIE
 from .tutv import TutvIE
 from .tvigle import TvigleIE
 from .tvp import TvpIE
 from .tutv import TutvIE
 from .tvigle import TvigleIE
 from .tvp import TvpIE

+from .tvplay import TVPlayIE
+from .ubu import UbuIE

 from .udemy import (
     UdemyIE,
     UdemyCourseIE
 from .udemy import (
     UdemyIE,
     UdemyCourseIE


@@ -335,6 +385,7 @@ from .videofyme import VideofyMeIE
 from .videopremium import VideoPremiumIE
 from .videott import VideoTtIE
 from .videoweed import VideoWeedIE
 from .videopremium import VideoPremiumIE
 from .videott import VideoTtIE
 from .videoweed import VideoWeedIE

+from .vidme import VidmeIE

 from .vimeo import (
     VimeoIE,
     VimeoChannelIE,
 from .vimeo import (
     VimeoIE,
     VimeoChannelIE,


@@ -352,11 +403,13 @@ from .vine import (
 from .viki import VikiIE
 from .vk import VKIE
 from .vodlocker import VodlockerIE
 from .viki import VikiIE
 from .vk import VKIE
 from .vodlocker import VodlockerIE

+from .vporn import VpornIE

 from .vube import VubeIE
 from .vuclip import VuClipIE
 from .vulture import VultureIE
 from .washingtonpost import WashingtonPostIE
 from .wat import WatIE
 from .vube import VubeIE
 from .vuclip import VuClipIE
 from .vulture import VultureIE
 from .washingtonpost import WashingtonPostIE
 from .wat import WatIE

+from .wayofthemaster import WayOfTheMasterIE

 from .wdr import (
     WDRIE,
     WDRMobileIE,
 from .wdr import (
     WDRIE,
     WDRMobileIE,


@@ -368,6 +421,7 @@ from .wistia import WistiaIE
 from .worldstarhiphop import WorldStarHipHopIE
 from .wrzuta import WrzutaIE
 from .xbef import XBefIE
 from .worldstarhiphop import WorldStarHipHopIE
 from .wrzuta import WrzutaIE
 from .xbef import XBefIE

+from .xboxclips import XboxClipsIE

 from .xhamster import XHamsterIE
 from .xnxx import XNXXIE
 from .xvideos import XVideosIE
 from .xhamster import XHamsterIE
 from .xnxx import XNXXIE
 from .xvideos import XVideosIE


@@ -397,6 +451,7 @@ from .youtube import (
     YoutubeUserIE,
     YoutubeWatchLaterIE,
 )
     YoutubeUserIE,
     YoutubeWatchLaterIE,
 )

+

 from .zdf import ZDFIE
 
 
 from .zdf import ZDFIE