Merge tag 'upstream/2013.08.08'

[youtubedl] / youtube_dl / extractor / __init__.py

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index b208f9002e9e9bb31771b12e6b96399859d1382f..84c02c2ed99967832264e642fa084367cd4eff05 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -1,132 +1,121 @@
-
+from .archiveorg import ArchiveOrgIE

 from .ard import ARDIE
 from .arte import ArteTvIE
 from .ard import ARDIE
 from .arte import ArteTvIE

+from .auengine import AUEngineIE

 from .bandcamp import BandcampIE
 from .bliptv import BlipTVIE, BlipTVUserIE
 from .breakcom import BreakIE
 from .bandcamp import BandcampIE
 from .bliptv import BlipTVIE, BlipTVUserIE
 from .breakcom import BreakIE

-from .comedycentral import ComedyCentralIE
+from .brightcove import BrightcoveIE
+from .canalplus import CanalplusIE

 from .collegehumor import CollegeHumorIE
 from .collegehumor import CollegeHumorIE

-from .dailymotion import DailymotionIE
+from .comedycentral import ComedyCentralIE
+from .condenast import CondeNastIE
+from .criterion import CriterionIE
+from .cspan import CSpanIE
+from .dailymotion import DailymotionIE, DailymotionPlaylistIE

 from .depositfiles import DepositFilesIE
 from .depositfiles import DepositFilesIE

+from .dotsub import DotsubIE
+from .dreisat import DreiSatIE
+from .ehow import EHowIE

 from .eighttracks import EightTracksIE
 from .escapist import EscapistIE
 from .eighttracks import EightTracksIE
 from .escapist import EscapistIE

+from .exfm import ExfmIE

 from .facebook import FacebookIE
 from .flickr import FlickrIE
 from .facebook import FacebookIE
 from .flickr import FlickrIE

+from .freesound import FreesoundIE

 from .funnyordie import FunnyOrDieIE
 from .funnyordie import FunnyOrDieIE

+from .gamespot import GameSpotIE

 from .gametrailers import GametrailersIE
 from .generic import GenericIE
 from .googleplus import GooglePlusIE
 from .googlesearch import GoogleSearchIE
 from .gametrailers import GametrailersIE
 from .generic import GenericIE
 from .googleplus import GooglePlusIE
 from .googlesearch import GoogleSearchIE

+from .hotnewhiphop import HotNewHipHopIE

 from .howcast import HowcastIE
 from .hypem import HypemIE
 from .howcast import HowcastIE
 from .hypem import HypemIE

+from .ign import IGNIE, OneUPIE

 from .ina import InaIE
 from .infoq import InfoQIE
 from .ina import InaIE
 from .infoq import InfoQIE

+from .instagram import InstagramIE
+from .jukebox import JukeboxIE

 from .justintv import JustinTVIE
 from .justintv import JustinTVIE

+from .kankan import KankanIE

 from .keek import KeekIE
 from .liveleak import LiveLeakIE
 from .keek import KeekIE
 from .liveleak import LiveLeakIE

+from .livestream import LivestreamIE

 from .metacafe import MetacafeIE
 from .mixcloud import MixcloudIE
 from .mtv import MTVIE
 from .metacafe import MetacafeIE
 from .mixcloud import MixcloudIE
 from .mtv import MTVIE

+from .muzu import MuzuTVIE

 from .myspass import MySpassIE
 from .myvideo import MyVideoIE
 from .nba import NBAIE
 from .myspass import MySpassIE
 from .myvideo import MyVideoIE
 from .nba import NBAIE

-from .statigram import StatigramIE
+from .ooyala import OoyalaIE

 from .photobucket import PhotobucketIE
 from .pornotube import PornotubeIE
 from .rbmaradio import RBMARadioIE
 from .redtube import RedTubeIE
 from .photobucket import PhotobucketIE
 from .pornotube import PornotubeIE
 from .rbmaradio import RBMARadioIE
 from .redtube import RedTubeIE

+from .ringtv import RingTVIE
+from .roxwel import RoxwelIE
+from .sina import SinaIE

 from .soundcloud import SoundcloudIE, SoundcloudSetIE
 from .spiegel import SpiegelIE
 from .stanfordoc import StanfordOpenClassroomIE
 from .soundcloud import SoundcloudIE, SoundcloudSetIE
 from .spiegel import SpiegelIE
 from .stanfordoc import StanfordOpenClassroomIE

+from .statigram import StatigramIE

 from .steam import SteamIE
 from .teamcoco import TeamcocoIE
 from .ted import TEDIE
 from .steam import SteamIE
 from .teamcoco import TeamcocoIE
 from .ted import TEDIE

+from .tf1 import TF1IE
+from .thisav import ThisAVIE
+from .traileraddict import TrailerAddictIE
+from .tudou import TudouIE

 from .tumblr import TumblrIE
 from .tumblr import TumblrIE

+from .tutv import TutvIE

 from .ustream import UstreamIE
 from .vbox7 import Vbox7IE
 from .ustream import UstreamIE
 from .vbox7 import Vbox7IE

-from .vimeo import VimeoIE
+from .veoh import VeohIE
+from .vevo import VevoIE
+from .videofyme import VideofyMeIE
+from .vimeo import VimeoIE, VimeoChannelIE

 from .vine import VineIE
 from .vine import VineIE

+from .c56 import C56IE
+from .wat import WatIE
+from .weibo import WeiboIE
+from .wimp import WimpIE

 from .worldstarhiphop import WorldStarHipHopIE
 from .worldstarhiphop import WorldStarHipHopIE

-from .xnxx import XNXXIE

 from .xhamster import XHamsterIE
 from .xhamster import XHamsterIE

+from .xnxx import XNXXIE

 from .xvideos import XVideosIE
 from .yahoo import YahooIE, YahooSearchIE
 from .youjizz import YouJizzIE
 from .youku import YoukuIE
 from .youporn import YouPornIE
 from .xvideos import XVideosIE
 from .yahoo import YahooIE, YahooSearchIE
 from .youjizz import YouJizzIE
 from .youku import YoukuIE
 from .youporn import YouPornIE

-from .youtube import YoutubeIE, YoutubePlaylistIE, YoutubeSearchIE, YoutubeUserIE, YoutubeChannelIE
+from .youtube import (
+    YoutubeIE,
+    YoutubePlaylistIE,
+    YoutubeSearchIE,
+    YoutubeUserIE,
+    YoutubeChannelIE,
+    YoutubeShowIE,
+    YoutubeSubscriptionsIE,
+    YoutubeRecommendedIE,
+    YoutubeWatchLaterIE,
+    YoutubeFavouritesIE,
+)

 from .zdf import ZDFIE
 
 from .zdf import ZDFIE
 

+
+_ALL_CLASSES = [
+    klass
+    for name, klass in globals().items()
+    if name.endswith('IE') and name != 'GenericIE'
+]
+_ALL_CLASSES.append(GenericIE)
+

 def gen_extractors():
     """ Return a list of an instance of every supported extractor.
     The order does matter; the first extractor matched is the one handling the URL.
     """
 def gen_extractors():
     """ Return a list of an instance of every supported extractor.
     The order does matter; the first extractor matched is the one handling the URL.
     """

-    return [
-        YoutubePlaylistIE(),
-        YoutubeChannelIE(),
-        YoutubeUserIE(),
-        YoutubeSearchIE(),
-        YoutubeIE(),
-        MetacafeIE(),
-        DailymotionIE(),
-        GoogleSearchIE(),
-        PhotobucketIE(),
-        YahooIE(),
-        YahooSearchIE(),
-        DepositFilesIE(),
-        FacebookIE(),
-        BlipTVIE(),
-        BlipTVUserIE(),
-        VimeoIE(),
-        MyVideoIE(),
-        ComedyCentralIE(),
-        EscapistIE(),
-        CollegeHumorIE(),
-        XVideosIE(),
-        SoundcloudSetIE(),
-        SoundcloudIE(),
-        InfoQIE(),
-        MixcloudIE(),
-        StanfordOpenClassroomIE(),
-        MTVIE(),
-        YoukuIE(),
-        XNXXIE(),
-        YouJizzIE(),
-        PornotubeIE(),
-        YouPornIE(),
-        GooglePlusIE(),
-        ArteTvIE(),
-        NBAIE(),
-        WorldStarHipHopIE(),
-        JustinTVIE(),
-        FunnyOrDieIE(),
-        SteamIE(),
-        UstreamIE(),
-        RBMARadioIE(),
-        EightTracksIE(),
-        KeekIE(),
-        TEDIE(),
-        MySpassIE(),
-        SpiegelIE(),
-        LiveLeakIE(),
-        ARDIE(),
-        ZDFIE(),
-        TumblrIE(),
-        BandcampIE(),
-        RedTubeIE(),
-        InaIE(),
-        HowcastIE(),
-        VineIE(),
-        FlickrIE(),
-        TeamcocoIE(),
-        XHamsterIE(),
-        HypemIE(),
-        Vbox7IE(),
-        GametrailersIE(),
-        StatigramIE(),
-        BreakIE(),
-        GenericIE()
-    ]
+    return [klass() for klass in _ALL_CLASSES]

 
 def get_info_extractor(ie_name):
     """Returns the info extractor class with the given ie_name"""
 
 def get_info_extractor(ie_name):
     """Returns the info extractor class with the given ie_name"""