X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2F__init__.py;h=a9aa7e50685ebdcfc1a3f1143ba5cebcec1ef43f;hb=27473d18da11e5e7edec040a70d43e4296e303e7;hp=e27f5849601a32d291100977b0288c710a8f93e0;hpb=28ef06f7c28fa214841be6339bf3801b4834769a;p=youtube-dl diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index e27f58496..a9aa7e506 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -1,11 +1,13 @@ 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 .comedycentral import ComedyCentralIE from .collegehumor import CollegeHumorIE +from .comedycentral import ComedyCentralIE +from .cspan import CSpanIE from .dailymotion import DailymotionIE from .depositfiles import DepositFilesIE from .eighttracks import EightTracksIE @@ -17,12 +19,13 @@ 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 .justintv import JustinTVIE from .jukebox import JukeboxIE +from .justintv import JustinTVIE from .keek import KeekIE from .liveleak import LiveLeakIE from .metacafe import MetacafeIE @@ -31,7 +34,6 @@ from .mtv import MTVIE from .myspass import MySpassIE from .myvideo import MyVideoIE from .nba import NBAIE -from .statigram import StatigramIE from .photobucket import PhotobucketIE from .pornotube import PornotubeIE from .rbmaradio import RBMARadioIE @@ -39,17 +41,21 @@ from .redtube import RedTubeIE 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 .tudou import TudouIE from .tumblr import TumblrIE from .ustream import UstreamIE from .vbox7 import Vbox7IE +from .vevo import VevoIE from .vimeo import VimeoIE from .vine import VineIE +from .wimp import WimpIE from .worldstarhiphop import WorldStarHipHopIE -from .xnxx import XNXXIE from .xhamster import XHamsterIE +from .xnxx import XNXXIE from .xvideos import XVideosIE from .yahoo import YahooIE, YahooSearchIE from .youjizz import YouJizzIE @@ -58,6 +64,7 @@ from .youporn import YouPornIE from .youtube import YoutubeIE, YoutubePlaylistIE, YoutubeSearchIE, YoutubeUserIE, YoutubeChannelIE from .zdf import ZDFIE + 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. @@ -126,7 +133,13 @@ def gen_extractors(): GametrailersIE(), StatigramIE(), BreakIE(), + VevoIE(), JukeboxIE(), + TudouIE(), + CSpanIE(), + WimpIE(), + HotNewHipHopIE(), + AUEngineIE(), GenericIE() ]