From: Philipp Hagemeister Date: Tue, 28 Oct 2014 11:54:29 +0000 (+0100) Subject: [YoutubeDL] Simplify API of YoutubeDL X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=3511266bc39976a926a9f33a0762aa40212431ee;p=youtube-dl [YoutubeDL] Simplify API of YoutubeDL Calling add_default_extractors twice should be harmless since the first set of extractors will match. --- diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index 28dcc0195..fd775b9fd 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -189,7 +189,7 @@ class YoutubeDL(object): _num_downloads = None _screen_file = None - def __init__(self, params=None): + def __init__(self, params=None, auto_init=True): """Create a FileDownloader object with the given options.""" if params is None: params = {} @@ -246,6 +246,10 @@ class YoutubeDL(object): self._setup_opener() + if auto_init: + self.print_debug_header() + self.add_default_info_extractors() + def add_info_extractor(self, ie): """Add an InfoExtractor object to the end of the list.""" self._ies.append(ie) diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 7dc971884..3c968082c 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -293,9 +293,6 @@ def _real_main(argv=None): } with YoutubeDL(ydl_opts) as ydl: - ydl.print_debug_header() - ydl.add_default_info_extractors() - # PostProcessors # Add the metadata pp first, the other pps will copy it if opts.addmetadata: