dbrun
/
youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move gen_extractors to InfoExtractors

This commit is contained in:
Philipp Hagemeister 2013-01-01 19:37:07 +01:00
parent c073e35b1e
commit 4aeae91f86
2 changed files with 49 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
youtube_dl/InfoExtractors.py
View File

@ -3764,7 +3764,7 @@ class SteamIE(InfoExtractor):
(?P<videoID>\d*)(?P<extra>\??) #For urltype == video we sometimes get the videoID (?P<videoID>\d*)(?P<extra>\??) #For urltype == video we sometimes get the videoID
""" """
IE_NAME = u'Steam' IE_NAME = u'Steam'
def suitable(self, url): def suitable(self, url):
"""Receives a URL and returns True if suitable for this IE.""" """Receives a URL and returns True if suitable for this IE."""
return re.match(self._VALID_URL, url, re.VERBOSE) is not None return re.match(self._VALID_URL, url, re.VERBOSE) is not None
@ -3833,4 +3833,50 @@ class UstreamIE(InfoExtractor):
'uploader': uploader 'uploader': uploader
} }
return [info] return [info]
pass
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(),
BlipTVUserIE(),
BlipTVIE(),
VimeoIE(),
MyVideoIE(),
ComedyCentralIE(),
EscapistIE(),
CollegeHumorIE(),
XVideosIE(),
SoundcloudIE(),
InfoQIE(),
MixcloudIE(),
StanfordOpenClassroomIE(),
MTVIE(),
YoukuIE(),
XNXXIE(),
GooglePlusIE(),
ArteTvIE(),
NBAIE(),
JustinTVIE(),
FunnyOrDieIE(),
TweetReelIE(),
SteamIE(),
UstreamIE(),
GenericIE()
]

46
youtube_dl/__init__.py
View File

@ -41,7 +41,7 @@ from .utils import *
from .update import update_self from .update import update_self
from .version import __version__ from .version import __version__
from .FileDownloader import * from .FileDownloader import *
from .InfoExtractors import * from .InfoExtractors import gen_extractors
from .PostProcessor import * from .PostProcessor import *
def parseOpts(): def parseOpts():
@ -275,50 +275,6 @@ def parseOpts():
return parser, opts, args return parser, opts, args
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(),
BlipTVUserIE(),
BlipTVIE(),
VimeoIE(),
MyVideoIE(),
ComedyCentralIE(),
EscapistIE(),
CollegeHumorIE(),
XVideosIE(),
SoundcloudIE(),
InfoQIE(),
MixcloudIE(),
StanfordOpenClassroomIE(),
MTVIE(),
YoukuIE(),
XNXXIE(),
GooglePlusIE(),
ArteTvIE(),
NBAIE(),
JustinTVIE(),
FunnyOrDieIE(),
TweetReelIE(),
SteamIE(),
UstreamIE(),
GenericIE()
]
def _real_main(): def _real_main():
parser, opts, args = parseOpts() parser, opts, args = parseOpts()