commit 023fa8c44037d747c719b25428624db8e9636093
parent 427023a1e6f2bb45a61b2bbfd56f845ee0c0ffee
Author: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date: Thu, 27 Jun 2013 23:51:06 +0200
Add function add_default_info_extractors to YoutubeDL
It adds to the list the ies returned by ge_extractors
Diffstat:
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/test/test_download.py b/test/test_download.py
@@ -14,7 +14,6 @@ import binascii
sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
import youtube_dl.YoutubeDL
-import youtube_dl.extractor
from youtube_dl.utils import *
PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "parameters.json")
@@ -87,8 +86,7 @@ def generator(test_case):
params.update(test_case.get('params', {}))
ydl = YoutubeDL(params)
- for ie in youtube_dl.extractor.gen_extractors():
- ydl.add_info_extractor(ie)
+ ydl.add_default_info_extractors()
finished_hook_called = set()
def _hook(status):
if status['status'] == 'finished':
diff --git 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
@@ -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: