Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2024-11-25 19:32:57 +08:00
Code Issues Releases Wiki Activity

Add function add_default_info_extractors to YoutubeDL

Browse Source 
It adds to the list the ies returned by ge_extractors
This commit is contained in:
Jaime Marquínez Ferrándiz 2013-06-27 23:51:06 +02:00
parent 427023a1e6
commit 023fa8c440
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/test_download.py
View File

@ -14,7 +14,6 @@ import binascii
sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
import youtube_dl.YoutubeDL import youtube_dl.YoutubeDL
import youtube_dl.extractor
from youtube_dl.utils import * from youtube_dl.utils import *
PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "parameters.json") 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', {})) params.update(test_case.get('params', {}))
ydl = YoutubeDL(params) ydl = YoutubeDL(params)
for ie in youtube_dl.extractor.gen_extractors(): ydl.add_default_info_extractors()
ydl.add_info_extractor(ie)
finished_hook_called = set() finished_hook_called = set()
def _hook(status): def _hook(status):
if status['status'] == 'finished': if status['status'] == 'finished':

9
youtube_dl/YoutubeDL.py
View File

@ -13,7 +13,7 @@ import time
import traceback import traceback
from .utils import * from .utils import *
from .extractor import get_info_extractor from .extractor import get_info_extractor, gen_extractors
from .FileDownloader import FileDownloader from .FileDownloader import FileDownloader
@ -113,6 +113,13 @@ class YoutubeDL(object):
self._ies.append(ie) self._ies.append(ie)
ie.set_downloader(self) 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): def add_post_processor(self, pp):
"""Add a PostProcessor object to the end of the chain.""" """Add a PostProcessor object to the end of the chain."""
self._pps.append(pp) self._pps.append(pp)

3
youtube_dl/__init__.py
View File

@ -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] Python version %s - %s' %(platform.python_version(), platform.platform()))
ydl.to_screen(u'[debug] Proxy map: ' + str(proxy_handler.proxies)) ydl.to_screen(u'[debug] Proxy map: ' + str(proxy_handler.proxies))
for extractor in extractors: ydl.add_default_info_extractors()
ydl.add_info_extractor(extractor)
# PostProcessors # PostProcessors
if opts.extractaudio: if opts.extractaudio: