From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 26 Aug 2013 19:29:04 +0000 (-0700)
Subject: Merge pull request #1231 from yasoob/master
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=6dc63025992404ddb4f7e3f9d42957e83621011d;hp=-c;p=youtube-dl

Merge pull request #1231 from yasoob/master

Added an IE for hark.com
---

6dc63025992404ddb4f7e3f9d42957e83621011d
diff --combined youtube_dl/extractor/__init__.py
index 39c530ba3,ca5664577..f71ae2713
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@@ -29,6 -29,7 +29,7 @@@ from .gametrailers import GametrailersI
  from .generic import GenericIE
  from .googleplus import GooglePlusIE
  from .googlesearch import GoogleSearchIE
+ from .hark import HarkIE
  from .hotnewhiphop import HotNewHipHopIE
  from .howcast import HowcastIE
  from .hypem import HypemIE
@@@ -36,7 -37,6 +37,7 @@@ from .ign import IGNIE, OneUPI
  from .ina import InaIE
  from .infoq import InfoQIE
  from .instagram import InstagramIE
 +from .jeuxvideo import JeuxVideoIE
  from .jukebox import JukeboxIE
  from .justintv import JustinTVIE
  from .kankan import KankanIE
@@@ -51,17 -51,13 +52,17 @@@ from .myspass import MySpassI
  from .myvideo import MyVideoIE
  from .nba import NBAIE
  from .ooyala import OoyalaIE
 +from .pbs import PBSIE
  from .photobucket import PhotobucketIE
  from .pornotube import PornotubeIE
  from .rbmaradio import RBMARadioIE
  from .redtube import RedTubeIE
  from .ringtv import RingTVIE
 +from .ro220 import Ro220IE
  from .roxwel import RoxwelIE
 +from .rtlnow import RTLnowIE
  from .sina import SinaIE
 +from .slashdot import SlashdotIE
  from .soundcloud import SoundcloudIE, SoundcloudSetIE
  from .spiegel import SpiegelIE
  from .stanfordoc import StanfordOpenClassroomIE
@@@ -76,7 -72,6 +77,7 @@@ from .tudou import TudouI
  from .tumblr import TumblrIE
  from .tutv import TutvIE
  from .ustream import UstreamIE
 +from .unistra import UnistraIE
  from .vbox7 import Vbox7IE
  from .veoh import VeohIE
  from .vevo import VevoIE
@@@ -117,14 -112,12 +118,14 @@@ _ALL_CLASSES = 
  ]
  _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]
  
 +
  def get_info_extractor(ie_name):
      """Returns the info extractor class with the given ie_name"""
      return globals()[ie_name+'IE']