From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Wed, 22 Jul 2015 12:10:45 +0000 (+0800)
Subject: Merge branch 'lecture2go' of https://github.com/nichdu/youtube-dl into nichdu-lecture2go
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=3f724339dbe61fe84dd8e66e9c3b74ba6a9c6ddf;hp=-c

Merge branch 'lecture2go' of https://github.com/nichdu/youtube-dl into nichdu-lecture2go
---

3f724339dbe61fe84dd8e66e9c3b74ba6a9c6ddf
diff --combined youtube_dl/extractor/__init__.py
index 50da08830,3d6e981b2..3cfa804ec
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -4,10 -4,7 +4,10 @@@ from .abc import ABCI
  from .abc7news import Abc7NewsIE
  from .academicearth import AcademicEarthCourseIE
  from .addanime import AddAnimeIE
 -from .adobetv import AdobeTVIE
 +from .adobetv import (
 +    AdobeTVIE,
 +    AdobeTVVideoIE,
 +)
  from .adultswim import AdultSwimIE
  from .aftenposten import AftenpostenIE
  from .aftonbladet import AftonbladetIE
@@@ -19,14 -16,9 +19,14 @@@ from .anysex import AnySexI
  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 .ard import ARDIE, ARDMediathekIE
 +from .ard import (
 +    ARDIE,
 +    ARDMediathekIE,
 +    SportschauIE,
 +)
  from .arte import (
      ArteTvIE,
      ArteTVPlus7IE,
@@@ -40,7 -32,6 +40,7 @@@ from .atresplayer import AtresPlayerI
  from .atttechchannel import ATTTechChannelIE
  from .audiomack import AudiomackIE, AudiomackAlbumIE
  from .azubu import AzubuIE
 +from .baidu import BaiduVideoIE
  from .bambuser import BambuserIE, BambuserChannelIE
  from .bandcamp import BandcampIE, BandcampAlbumIE
  from .bbccouk import BBCCoUkIE
@@@ -79,7 -70,6 +79,7 @@@ from .chirbit import 
      ChirbitProfileIE,
  )
  from .cinchcast import CinchcastIE
 +from .cinemassacre import CinemassacreIE
  from .clipfish import ClipfishIE
  from .cliphunter import CliphunterIE
  from .clipsyndicate import ClipsyndicateIE
@@@ -111,7 -101,6 +111,7 @@@ from .dailymotion import 
      DailymotionIE,
      DailymotionPlaylistIE,
      DailymotionUserIE,
 +    DailymotionCloudIE,
  )
  from .daum import DaumIE
  from .dbtv import DBTVIE
@@@ -121,10 -110,6 +121,10 @@@ from .dfb import DFBI
  from .dhm import DHMIE
  from .dotsub import DotsubIE
  from .douyutv import DouyuTVIE
 +from .dramafever import (
 +    DramaFeverIE,
 +    DramaFeverSeriesIE,
 +)
  from .dreisat import DreiSatIE
  from .drbonanza import DRBonanzaIE
  from .drtuber import DrTuberIE
@@@ -149,11 -134,11 +149,11 @@@ from .ellentv import 
  )
  from .elpais import ElPaisIE
  from .embedly import EmbedlyIE
 -from .empflix import EMPFlixIE
  from .engadget import EngadgetIE
  from .eporner import EpornerIE
  from .eroprofile import EroProfileIE
  from .escapist import EscapistIE
 +from .espn import ESPNIE
  from .everyonesmixtape import EveryonesMixtapeIE
  from .exfm import ExfmIE
  from .expotv import ExpoTVIE
@@@ -161,10 -146,10 +161,10 @@@ from .extremetube import ExtremeTubeI
  from .facebook import FacebookIE
  from .faz import FazIE
  from .fc2 import FC2IE
 -from .firedrive import FiredriveIE
  from .firstpost import FirstpostIE
  from .firsttv import FirstTVIE
  from .fivemin import FiveMinIE
 +from .fivetv import FiveTVIE
  from .fktv import (
      FKTVIE,
      FKTVPosteckeIE,
@@@ -175,7 -160,6 +175,7 @@@ from .footyroom import FootyRoomI
  from .fourtube import FourTubeIE
  from .foxgay import FoxgayIE
  from .foxnews import FoxNewsIE
 +from .foxsports import FoxSportsIE
  from .franceculture import FranceCultureIE
  from .franceinter import FranceInterIE
  from .francetv import (
@@@ -201,7 -185,6 +201,7 @@@ from .gametrailers import GametrailersI
  from .gazeta import GazetaIE
  from .gdcvault import GDCVaultIE
  from .generic import GenericIE
 +from .gfycat import GfycatIE
  from .giantbomb import GiantBombIE
  from .giga import GigaIE
  from .glide import GlideIE
@@@ -213,6 -196,7 +213,6 @@@ from .googleplus import GooglePlusI
  from .googlesearch import GoogleSearchIE
  from .gorillavid import GorillaVidIE
  from .goshgay import GoshgayIE
 -from .grooveshark import GroovesharkIE
  from .groupon import GrouponIE
  from .hark import HarkIE
  from .hearthisat import HearThisAtIE
@@@ -242,7 -226,6 +242,7 @@@ from .infoq import InfoQI
  from .instagram import InstagramIE, InstagramUserIE
  from .internetvideoarchive import InternetVideoArchiveIE
  from .iprima import IPrimaIE
 +from .iqiyi import IqiyiIE
  from .ivi import (
      IviIE,
      IviCompilationIE
@@@ -257,7 -240,6 +257,7 @@@ from .kaltura import KalturaI
  from .kanalplay import KanalPlayIE
  from .kankan import KankanIE
  from .karaoketv import KaraoketvIE
 +from .karrierevideos import KarriereVideosIE
  from .keezmovies import KeezMoviesIE
  from .khanacademy import KhanAcademyIE
  from .kickstarter import KickStarterIE
@@@ -265,26 -247,16 +265,27 @@@ from .keek import KeekI
  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 .lecture2go import Lecture2GoIE
  from .letv import (
      LetvIE,
      LetvTvIE,
      LetvPlaylistIE
  )
  from .libsyn import LibsynIE
 -from .lifenews import LifeNewsIE
 +from .lifenews import (
 +    LifeNewsIE,
 +    LifeEmbedIE,
 +)
  from .liveleak import LiveLeakIE
  from .livestream import (
      LivestreamIE,
@@@ -302,7 -274,6 +303,7 @@@ from .macgamestore import MacGameStoreI
  from .mailru import MailRuIE
  from .malemotion import MalemotionIE
  from .mdr import MDRIE
 +from .megavideoz import MegaVideozIE
  from .metacafe import MetacafeIE
  from .metacritic import MetacriticIE
  from .mgoon import MgoonIE
@@@ -336,7 -307,6 +337,7 @@@ from .musicvault import MusicVaultI
  from .muzu import MuzuTVIE
  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
@@@ -348,29 -318,18 +349,29 @@@ from .nbc import 
      NBCSportsIE,
      NBCSportsVPlayerIE,
  )
 -from .ndr import NDRIE
 +from .ndr import (
 +    NDRIE,
 +    NJoyIE,
 +)
  from .ndtv import NDTVIE
  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 (
      NextMediaIE,
      NextMediaActionNewsIE,
 -    AppleDailyRealtimeNewsIE,
 -    AppleDailyAnimationNewsIE
 +    AppleDailyIE,
  )
  from .nfb import NFBIE
  from .nfl import NFLIE
@@@ -384,18 -343,15 +385,18 @@@ from .ninegag import NineGagI
  from .noco import NocoIE
  from .normalboots import NormalbootsIE
  from .nosvideo import NosVideoIE
 +from .nova import NovaIE
  from .novamov import NovaMovIE
  from .nowness import NownessIE
 +from .nowtv import NowTVIE
  from .nowvideo import NowVideoIE
  from .npo import (
      NPOIE,
      NPOLiveIE,
      NPORadioIE,
      NPORadioFragmentIE,
 -    TegenlichtVproIE,
 +    VPROIE,
 +    WNLIE
  )
  from .nrk import (
      NRKIE,
@@@ -404,18 -360,11 +405,18 @@@
  )
  from .ntvde import NTVDeIE
  from .ntvru import NTVRuIE
 -from .nytimes import NYTimesIE
 +from .nytimes import (
 +    NYTimesIE,
 +    NYTimesArticleIE,
 +)
  from .nuvid import NuvidIE
  from .odnoklassniki import OdnoklassnikiIE
  from .oktoberfesttv import OktoberfestTVIE
 -from .ooyala import OoyalaIE
 +from .onionstudios import OnionStudiosIE
 +from .ooyala import (
 +    OoyalaIE,
 +    OoyalaExternalIE,
 +)
  from .openfilm import OpenFilmIE
  from .orf import (
      ORFTVthekIE,
@@@ -426,10 -375,8 +427,10 @@@
  from .parliamentliveuk import ParliamentLiveUKIE
  from .patreon import PatreonIE
  from .pbs import PBSIE
 +from .philharmoniedeparis import PhilharmonieDeParisIE
  from .phoenix import PhoenixIE
  from .photobucket import PhotobucketIE
 +from .pinkbike import PinkbikeIE
  from .planetaplay import PlanetaPlayIE
  from .pladform import PladformIE
  from .played import PlayedIE
@@@ -437,7 -384,6 +438,7 @@@ from .playfm import PlayFMI
  from .playvid import PlayvidIE
  from .playwire import PlaywireIE
  from .podomatic import PodomaticIE
 +from .porn91 import Porn91IE
  from .pornhd import PornHdIE
  from .pornhub import (
      PornHubIE,
@@@ -451,13 -397,6 +452,13 @@@ from .promptfile import PromptFileI
  from .prosiebensat1 import ProSiebenSat1IE
  from .puls4 import Puls4IE
  from .pyvideo import PyvideoIE
 +from .qqmusic import (
 +    QQMusicIE,
 +    QQMusicSingerIE,
 +    QQMusicAlbumIE,
 +    QQMusicToplistIE,
 +    QQMusicPlaylistIE,
 +)
  from .quickvid import QuickVidIE
  from .r7 import R7IE
  from .radiode import RadioDeIE
@@@ -466,7 -405,6 +467,7 @@@ from .radiobremen import RadioBremenI
  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
@@@ -477,6 -415,7 +478,6 @@@ from .roxwel import RoxwelI
  from .rtbf import RTBFIE
  from .rte import RteIE
  from .rtlnl import RtlNlIE
 -from .rtlnow import RTLnowIE
  from .rtl2 import RTL2IE
  from .rtp import RTPIE
  from .rts import RTSIE
@@@ -490,7 -429,6 +491,7 @@@ from .rutube import 
      RutubePersonIE,
  )
  from .rutv import RUTVIE
 +from .ruutu import RuutuIE
  from .sandia import SandiaIE
  from .safari import (
      SafariIE,
@@@ -502,8 -440,7 +503,8 @@@ from .sbs import SBSI
  from .scivee import SciVeeIE
  from .screencast import ScreencastIE
  from .screencastomatic import ScreencastOMaticIE
 -from .screenwavemedia import CinemassacreIE, ScreenwaveMediaIE, TeamFourIE
 +from .screenwavemedia import ScreenwaveMediaIE, TeamFourIE
 +from .senateisvp import SenateISVPIE
  from .servingsys import ServingSysIE
  from .sexu import SexuIE
  from .sexykarma import SexyKarmaIE
@@@ -518,16 -455,9 +519,16 @@@ from .smotri import 
      SmotriUserIE,
      SmotriBroadcastIE,
  )
 +from .snagfilms import (
 +    SnagFilmsIE,
 +    SnagFilmsEmbedIE,
 +)
  from .snotr import SnotrIE
 -from .sockshare import SockshareIE
  from .sohu import SohuIE
 +from .soompi import (
 +    SoompiIE,
 +    SoompiShowIE,
 +)
  from .soundcloud import (
      SoundcloudIE,
      SoundcloudSetIE,
@@@ -540,10 -470,7 +541,10 @@@ from .soundgasm import 
  )
  from .southpark import (
      SouthParkIE,
 -    SouthparkDeIE,
 +    SouthParkDeIE,
 +    SouthParkDkIE,
 +    SouthParkEsIE,
 +    SouthParkNlIE
  )
  from .space import SpaceIE
  from .spankbang import SpankBangIE
@@@ -552,12 -479,8 +553,12 @@@ from .spiegel import SpiegelIE, Spiegel
  from .spiegeltv import SpiegeltvIE
  from .spike import SpikeIE
  from .sport5 import Sport5IE
 -from .sportbox import SportBoxIE
 +from .sportbox import (
 +    SportBoxIE,
 +    SportBoxEmbedIE,
 +)
  from .sportdeutschland import SportDeutschlandIE
 +from .srf import SrfIE
  from .srmediathek import SRMediathekIE
  from .ssa import SSAIE
  from .stanfordoc import StanfordOpenClassroomIE
@@@ -566,10 -489,7 +567,10 @@@ from .streamcloud import StreamcloudI
  from .streamcz import StreamCZIE
  from .streetvoice import StreetVoiceIE
  from .sunporno import SunPornoIE
 -from .svtplay import SVTPlayIE
 +from .svt import (
 +    SVTIE,
 +    SVTPlayIE,
 +)
  from .swrmediathek import SWRMediathekIE
  from .syfy import SyfyIE
  from .sztvhu import SztvHuIE
@@@ -595,19 -515,11 +596,19 @@@ from .tf1 import TF1I
  from .theonion import TheOnionIE
  from .theplatform import ThePlatformIE
  from .thesixtyone import TheSixtyOneIE
 +from .thisamericanlife import ThisAmericanLifeIE
  from .thisav import ThisAVIE
  from .tinypic import TinyPicIE
  from .tlc import TlcIE, TlcDeIE
 -from .tmz import TMZIE
 -from .tnaflix import TNAFlixIE
 +from .tmz import (
 +    TMZIE,
 +    TMZArticleIE,
 +)
 +from .tnaflix import (
 +    TNAFlixIE,
 +    EMPFlixIE,
 +    MovieFapIE,
 +)
  from .thvideo import (
      THVideoIE,
      THVideoPlaylistIE
@@@ -618,21 -530,12 +619,21 @@@ from .traileraddict import TrailerAddic
  from .trilulilu import TriluliluIE
  from .trutube import TruTubeIE
  from .tube8 import Tube8IE
 +from .tubitv import TubiTvIE
  from .tudou import TudouIE
  from .tumblr import TumblrIE
  from .tunein import TuneInIE
  from .turbo import TurboIE
  from .tutv import TutvIE
 +from .tv2 import (
 +    TV2IE,
 +    TV2ArticleIE,
 +)
  from .tv4 import TV4IE
 +from .tvc import (
 +    TVCIE,
 +    TVCArticleIE,
 +)
  from .tvigle import TvigleIE
  from .tvp import TvpIE, TvpSeriesIE
  from .tvplay import TVPlayIE
@@@ -651,7 -554,6 +652,7 @@@ from .twitch import 
      TwitchBookmarksIE,
      TwitchStreamIE,
  )
 +from .twitter import TwitterCardIE
  from .ubu import UbuIE
  from .udemy import (
      UdemyIE,
@@@ -669,11 -571,7 +670,11 @@@ from .veoh import VeohI
  from .vessel import VesselIE
  from .vesti import VestiIE
  from .vevo import VevoIE
 -from .vgtv import VGTVIE
 +from .vgtv import (
 +    BTArticleIE,
 +    BTVestlendingenIE,
 +    VGTVIE,
 +)
  from .vh1 import VH1IE
  from .vice import ViceIE
  from .viddler import ViddlerIE
@@@ -704,16 -602,12 +705,16 @@@ from .vine import 
      VineIE,
      VineUserIE,
  )
 -from .viki import VikiIE
 +from .viki import (
 +    VikiIE,
 +    VikiChannelIE,
 +)
  from .vk import (
      VKIE,
      VKUserVideosIE,
  )
  from .vodlocker import VodlockerIE
 +from .voicerepublic import VoiceRepublicIE
  from .vporn import VpornIE
  from .vrt import VRTIE
  from .vube import VubeIE
@@@ -728,10 -622,7 +729,10 @@@ from .wdr import 
      WDRMobileIE,
      WDRMausIE,
  )
 -from .webofstories import WebOfStoriesIE
 +from .webofstories import (
 +    WebOfStoriesIE,
 +    WebOfStoriesPlaylistIE,
 +)
  from .weibo import WeiboIE
  from .wimp import WimpIE
  from .wistia import WistiaIE
@@@ -740,16 -631,12 +741,16 @@@ from .wrzuta import WrzutaI
  from .wsj import WSJIE
  from .xbef import XBefIE
  from .xboxclips import XboxClipsIE
 -from .xhamster import XHamsterIE
 +from .xhamster import (
 +    XHamsterIE,
 +    XHamsterEmbedIE,
 +)
  from .xminus import XMinusIE
  from .xnxx import XNXXIE
 -from .xvideos import XVideosIE
 +from .xstream import XstreamIE
  from .xtube import XTubeUserIE, XTubeIE
  from .xuite import XuiteIE
 +from .xvideos import XVideosIE
  from .xxxymovies import XXXYMoviesIE
  from .yahoo import (
      YahooIE,
@@@ -762,7 -649,6 +763,7 @@@ from .yandexmusic import 
      YandexMusicPlaylistIE,
  )
  from .yesjapan import YesJapanIE
 +from .yinyuetai import YinYueTaiIE
  from .ynet import YnetIE
  from .youjizz import YouJizzIE
  from .youku import YoukuIE