Update changelog

[youtubedl] / youtube_dl / extractor / __init__.py

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 41efc57d4d7470ccb24797050964612a4351008d..18d8dbcd6672f82776a9bd9f6f4cc63cac91129d 100644 (file)
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -1,90 +1,46 @@
+from __future__ import unicode_literals
 
-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 .collegehumor import CollegeHumorIE
-from .comedycentral import ComedyCentralIE
-from .cspan import CSpanIE
-from .dailymotion import DailymotionIE
-from .depositfiles import DepositFilesIE
-from .eighttracks import EightTracksIE
-from .escapist import EscapistIE
-from .facebook import FacebookIE
-from .flickr import FlickrIE
-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 .hotnewhiphop import HotNewHipHopIE
-from .howcast import HowcastIE
-from .hypem import HypemIE
-from .ina import InaIE
-from .infoq import InfoQIE
-from .instagram import InstagramIE
-from .jukebox import JukeboxIE
-from .justintv import JustinTVIE
-from .keek import KeekIE
-from .liveleak import LiveLeakIE
-from .metacafe import MetacafeIE
-from .mixcloud import MixcloudIE
-from .mtv import MTVIE
-from .myspass import MySpassIE
-from .myvideo import MyVideoIE
-from .nba import NBAIE
-from .photobucket import PhotobucketIE
-from .pornotube import PornotubeIE
-from .rbmaradio import RBMARadioIE
-from .redtube import RedTubeIE
-from .ringtv import RingTVIE
-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 .tf1 import TF1IE
-from .traileraddict import TrailerAddictIE
-from .tudou import TudouIE
-from .tumblr import TumblrIE
-from .tutv import TutvIE
-from .ustream import UstreamIE
-from .vbox7 import Vbox7IE
-from .vevo import VevoIE
-from .vimeo import VimeoIE
-from .vine import VineIE
-from .wat import WatIE
-from .wimp import WimpIE
-from .worldstarhiphop import WorldStarHipHopIE
-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 .youtube import YoutubeIE, YoutubePlaylistIE, YoutubeSearchIE, YoutubeUserIE, YoutubeChannelIE, YoutubeShowIE
-from .zdf import ZDFIE
+try:
+    from .lazy_extractors import *
+    from .lazy_extractors import _ALL_CLASSES
+    _LAZY_LOADER = True
+except ImportError:
+    _LAZY_LOADER = False
+    from .extractors import *
 
+    _ALL_CLASSES = [
+        klass
+        for name, klass in globals().items()
+        if name.endswith('IE') and name != 'GenericIE'
+    ]
+    _ALL_CLASSES.append(GenericIE)
+
+
+def gen_extractor_classes():
+    """ Return a list of supported extractors.
+    The order does matter; the first extractor matched is the one handling the URL.
+    """
+    return _ALL_CLASSES
 
-_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.
     """
-    return [klass() for klass in _ALL_CLASSES]
+    return [klass() for klass in gen_extractor_classes()]
+
+
+def list_extractors(age_limit):
+    """
+    Return a list of extractors that are suitable for the given age,
+    sorted by extractor ID.
+    """
+
+    return sorted(
+        filter(lambda ie: ie.is_suitable(age_limit), gen_extractors()),
+        key=lambda ie: ie.IE_NAME.lower())
+
 
 def get_info_extractor(ie_name):
     """Returns the info extractor class with the given ie_name"""
-    return globals()[ie_name+'IE']
+    return globals()[ie_name + 'IE']