From: remitamine <remitamine@gmail.com>
Date: Fri, 4 Dec 2015 07:54:06 +0000 (+0100)
Subject: Merge pull request #7320 from remitamine/adobetv
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=3047121c639428235191ff5f7afbda7ecda38779;hp=-c

Merge pull request #7320 from remitamine/adobetv

[adobetv] improve extraction and add support specific language video,show and channel extraction
---

3047121c639428235191ff5f7afbda7ecda38779
diff --combined youtube_dl/extractor/__init__.py
index 62f32f8c8,d4b42dc25..7eb7da53d
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -6,6 -6,8 +6,8 @@@ from .academicearth import AcademicEart
  from .addanime import AddAnimeIE
  from .adobetv import (
      AdobeTVIE,
+     AdobeTVShowIE,
+     AdobeTVChannelIE,
      AdobeTVVideoIE,
  )
  from .adultswim import AdultSwimIE
@@@ -38,7 -40,6 +40,7 @@@ from .arte import 
  )
  from .atresplayer import AtresPlayerIE
  from .atttechchannel import ATTTechChannelIE
 +from .audimedia import AudiMediaIE
  from .audiomack import AudiomackIE, AudiomackAlbumIE
  from .azubu import AzubuIE
  from .baidu import BaiduVideoIE
@@@ -61,10 -62,7 +63,10 @@@ from .bloomberg import BloombergI
  from .bpb import BpbIE
  from .br import BRIE
  from .breakcom import BreakIE
 -from .brightcove import BrightcoveIE
 +from .brightcove import (
 +    BrightcoveLegacyIE,
 +    BrightcoveNewIE,
 +)
  from .buzzfeed import BuzzFeedIE
  from .byutv import BYUtvIE
  from .c56 import C56IE
@@@ -94,7 -92,6 +96,7 @@@ from .cliphunter import CliphunterI
  from .clipsyndicate import ClipsyndicateIE
  from .cloudy import CloudyIE
  from .clubic import ClubicIE
 +from .clyp import ClypIE
  from .cmt import CMTIE
  from .cnet import CNETIE
  from .cnn import (
@@@ -128,12 -125,10 +130,12 @@@ from .dbtv import DBTVI
  from .dcn import DCNIE
  from .dctp import DctpTvIE
  from .deezer import DeezerPlaylistIE
 +from .democracynow import DemocracynowIE
  from .dfb import DFBIE
  from .dhm import DHMIE
  from .dotsub import DotsubIE
  from .douyutv import DouyuTVIE
 +from .dplay import DPlayIE
  from .dramafever import (
      DramaFeverIE,
      DramaFeverSeriesIE,
@@@ -217,15 -212,13 +219,15 @@@ from .gfycat import GfycatI
  from .giantbomb import GiantBombIE
  from .giga import GigaIE
  from .glide import GlideIE
 -from .globo import GloboIE
 +from .globo import (
 +    GloboIE,
 +    GloboArticleIE,
 +)
  from .godtube import GodTubeIE
  from .goldenmoustache import GoldenMoustacheIE
  from .golem import GolemIE
  from .googleplus import GooglePlusIE
  from .googlesearch import GoogleSearchIE
 -from .gorillavid import GorillaVidIE
  from .goshgay import GoshgayIE
  from .groupon import GrouponIE
  from .hark import HarkIE
@@@ -422,10 -415,7 +424,10 @@@ from .nowness import 
      NownessPlaylistIE,
      NownessSeriesIE,
  )
 -from .nowtv import NowTVIE
 +from .nowtv import (
 +    NowTVIE,
 +    NowTVListIE,
 +)
  from .nowvideo import NowVideoIE
  from .npo import (
      NPOIE,
@@@ -463,7 -453,10 +465,7 @@@ from .orf import 
  from .parliamentliveuk import ParliamentLiveUKIE
  from .patreon import PatreonIE
  from .pbs import PBSIE
 -from .periscope import (
 -    PeriscopeIE,
 -    QuickscopeIE,
 -)
 +from .periscope import PeriscopeIE
  from .philharmoniedeparis import PhilharmonieDeParisIE
  from .phoenix import PhoenixIE
  from .photobucket import PhotobucketIE
@@@ -555,10 -548,6 +557,10 @@@ from .shahid import ShahidI
  from .shared import SharedIE
  from .sharesix import ShareSixIE
  from .sina import SinaIE
 +from .skynewsarabia import (
 +    SkyNewsArabiaIE,
 +    SkyNewsArabiaArticleIE,
 +)
  from .slideshare import SlideshareIE
  from .slutload import SlutloadIE
  from .smotri import (
@@@ -581,8 -570,7 +583,8 @@@ from .soundcloud import 
      SoundcloudIE,
      SoundcloudSetIE,
      SoundcloudUserIE,
 -    SoundcloudPlaylistIE
 +    SoundcloudPlaylistIE,
 +    SoundcloudSearchIE
  )
  from .soundgasm import (
      SoundgasmIE,
@@@ -733,6 -721,7 +735,6 @@@ from .vh1 import VH1I
  from .vice import ViceIE
  from .viddler import ViddlerIE
  from .videodetective import VideoDetectiveIE
 -from .videolecturesnet import VideoLecturesNetIE
  from .videofyme import VideofyMeIE
  from .videomega import VideoMegaIE
  from .videopremium import VideoPremiumIE
@@@ -742,7 -731,6 +744,7 @@@ from .vidme import VidmeI
  from .vidzi import VidziIE
  from .vier import VierIE, VierVideosIE
  from .viewster import ViewsterIE
 +from .viidea import ViideaIE
  from .vimeo import (
      VimeoIE,
      VimeoAlbumIE,
@@@ -795,7 -783,6 +797,7 @@@ from .wrzuta import WrzutaI
  from .wsj import WSJIE
  from .xbef import XBefIE
  from .xboxclips import XboxClipsIE
 +from .xfileshare import XFileShareIE
  from .xhamster import (
      XHamsterIE,
      XHamsterEmbedIE,
@@@ -839,7 -826,6 +841,7 @@@ from .youtube import 
      YoutubeTruncatedIDIE,
      YoutubeTruncatedURLIE,
      YoutubeUserIE,
 +    YoutubeUserPlaylistsIE,
      YoutubeWatchLaterIE,
  )
  from .zapiks import ZapiksIE