aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-06-27 23:51:06 +0200
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-06-27 23:51:06 +0200
commit023fa8c44037d747c719b25428624db8e9636093 (patch)
treee9e65c78ebecd1f7b8356c4c685bebdd6bb65e79 /youtube_dl
parent427023a1e6f2bb45a61b2bbfd56f845ee0c0ffee (diff)
downloadyoutube-dl-023fa8c44037d747c719b25428624db8e9636093.tar.xz
Add function add_default_info_extractors to YoutubeDL
It adds to the list the ies returned by ge_extractors
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/YoutubeDL.py9
-rw-r--r--youtube_dl/__init__.py3
2 files changed, 9 insertions, 3 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index 9931c98e9..d3281fed2 100644
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -13,7 +13,7 @@ import time
import traceback
from .utils import *
-from .extractor import get_info_extractor
+from .extractor import get_info_extractor, gen_extractors
from .FileDownloader import FileDownloader
@@ -113,6 +113,13 @@ class YoutubeDL(object):
self._ies.append(ie)
ie.set_downloader(self)
+ def add_default_info_extractors(self):
+ """
+ Add the InfoExtractors returned by gen_extractors to the end of the list
+ """
+ for ie in gen_extractors():
+ self.add_info_extractor(ie)
+
def add_post_processor(self, pp):
"""Add a PostProcessor object to the end of the chain."""
self._pps.append(pp)
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 34fccdd8c..6334ce3c4 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -573,8 +573,7 @@ def _real_main(argv=None):
ydl.to_screen(u'[debug] Python version %s - %s' %(platform.python_version(), platform.platform()))
ydl.to_screen(u'[debug] Proxy map: ' + str(proxy_handler.proxies))
- for extractor in extractors:
- ydl.add_info_extractor(extractor)
+ ydl.add_default_info_extractors()
# PostProcessors
if opts.extractaudio: