From 14835de9fb41798c8e6e731a3f07ae871770666f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lio=20A=2E=20Heckert?= Date: Tue, 16 Jun 2015 18:10:31 -0300 Subject: Use shlex.split for --pp-params and update related docs. --- youtube_dl/postprocessor/common.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'youtube_dl/postprocessor/common.py') diff --git a/youtube_dl/postprocessor/common.py b/youtube_dl/postprocessor/common.py index 3b0e8ddd8..d944d9367 100644 --- a/youtube_dl/postprocessor/common.py +++ b/youtube_dl/postprocessor/common.py @@ -22,7 +22,8 @@ class PostProcessor(object): of the chain is reached. PostProcessor objects follow a "mutual registration" process similar - to InfoExtractor objects. + to InfoExtractor objects. And it can receive parameters from CLI trough + --pp-params. """ _downloader = None -- cgit v1.2.3 From 1866432db74946c2b66263d38ed2c9d9d7e3177d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lio=20A=2E=20Heckert?= Date: Tue, 30 Jun 2015 16:22:09 -0300 Subject: Rename --pp-params to --postprocessor-args and access value as super class attribute --- youtube_dl/postprocessor/common.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'youtube_dl/postprocessor/common.py') diff --git a/youtube_dl/postprocessor/common.py b/youtube_dl/postprocessor/common.py index d944d9367..c44501b59 100644 --- a/youtube_dl/postprocessor/common.py +++ b/youtube_dl/postprocessor/common.py @@ -1,6 +1,7 @@ from __future__ import unicode_literals import os +import shlex from ..utils import ( PostProcessingError, @@ -23,12 +24,13 @@ class PostProcessor(object): PostProcessor objects follow a "mutual registration" process similar to InfoExtractor objects. And it can receive parameters from CLI trough - --pp-params. + --postprocessor-args. """ _downloader = None - def __init__(self, downloader=None): + def __init__(self, downloader=None, extra_cmd_args=None): + self._extra_cmd_args = shlex.split(extra_cmd_args or '') self._downloader = downloader def set_downloader(self, downloader): -- cgit v1.2.3 From aa5d9a79d6b5c354ee4a6bfbb43f94c2485ab9b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lio=20A=2E=20Heckert?= Date: Wed, 1 Jul 2015 20:12:26 -0300 Subject: Simplify `postprocessor_args` transmission to PP base class * Remove `extra_cmd_args` transmission from sub to super class. * Simplify params transmission through `downloader.params`. --- youtube_dl/postprocessor/common.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'youtube_dl/postprocessor/common.py') diff --git a/youtube_dl/postprocessor/common.py b/youtube_dl/postprocessor/common.py index c44501b59..bee64c457 100644 --- a/youtube_dl/postprocessor/common.py +++ b/youtube_dl/postprocessor/common.py @@ -1,7 +1,6 @@ from __future__ import unicode_literals import os -import shlex from ..utils import ( PostProcessingError, @@ -29,8 +28,8 @@ class PostProcessor(object): _downloader = None - def __init__(self, downloader=None, extra_cmd_args=None): - self._extra_cmd_args = shlex.split(extra_cmd_args or '') + def __init__(self, downloader=None): + self._extra_cmd_args = downloader.params.get('postprocessor_args') self._downloader = downloader def set_downloader(self, downloader): -- cgit v1.2.3 From e35b23f54df83886dd14428b618aa9d0221968ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergey=20M=E2=80=A4?= Date: Sat, 11 Jul 2015 22:41:33 +0600 Subject: [postprocessor/common] Improve postprocessor args fetching and clarify doc --- youtube_dl/postprocessor/common.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'youtube_dl/postprocessor/common.py') diff --git a/youtube_dl/postprocessor/common.py b/youtube_dl/postprocessor/common.py index bee64c457..4191d040b 100644 --- a/youtube_dl/postprocessor/common.py +++ b/youtube_dl/postprocessor/common.py @@ -22,14 +22,15 @@ class PostProcessor(object): of the chain is reached. PostProcessor objects follow a "mutual registration" process similar - to InfoExtractor objects. And it can receive parameters from CLI trough - --postprocessor-args. + to InfoExtractor objects. + + Optionally PostProcessor can use a list of additional command-line arguments + with self._configuration_args. """ _downloader = None def __init__(self, downloader=None): - self._extra_cmd_args = downloader.params.get('postprocessor_args') self._downloader = downloader def set_downloader(self, downloader): @@ -59,6 +60,13 @@ class PostProcessor(object): except Exception: self._downloader.report_warning(errnote) + def _configuration_args(self, default=[]): + pp_args = self._downloader.params.get('postprocessor_args') + if pp_args is None: + return default + assert isinstance(pp_args, list) + return pp_args + class AudioConversionError(PostProcessingError): pass -- cgit v1.2.3