From 96fb3ff0506821f006ce9d110aa0d92356d41909 Mon Sep 17 00:00:00 2001 From: Jacotsu Date: Wed, 7 Oct 2020 18:52:15 +0200 Subject: [PATCH 1/3] Added parameter to set ffmpeg's working directory --- ffmpeg/_run.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ffmpeg/_run.py b/ffmpeg/_run.py index c9cbb7c..bebf178 100644 --- a/ffmpeg/_run.py +++ b/ffmpeg/_run.py @@ -199,6 +199,7 @@ def run_async( pipe_stderr=False, quiet=False, overwrite_output=False, + cwd=None ): """Asynchronously invoke ffmpeg for the supplied node graph. @@ -282,7 +283,8 @@ def run_async( stdout_stream = subprocess.PIPE if pipe_stdout or quiet else None stderr_stream = subprocess.PIPE if pipe_stderr or quiet else None return subprocess.Popen( - args, stdin=stdin_stream, stdout=stdout_stream, stderr=stderr_stream + args, stdin=stdin_stream, stdout=stdout_stream, stderr=stderr_stream, + cwd=cwd ) @@ -295,6 +297,7 @@ def run( input=None, quiet=False, overwrite_output=False, + cwd=None ): """Invoke ffmpeg for the supplied node graph. @@ -318,6 +321,7 @@ def run( pipe_stderr=capture_stderr, quiet=quiet, overwrite_output=overwrite_output, + cwd ) out, err = process.communicate(input) retcode = process.poll() From b64f40a8b56d8ccd822f18be2be6adaf1dcf4db8 Mon Sep 17 00:00:00 2001 From: Jacotsu Date: Wed, 7 Oct 2020 18:56:05 +0200 Subject: [PATCH 2/3] Fixed typo in cwd parameter usage --- ffmpeg/_run.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffmpeg/_run.py b/ffmpeg/_run.py index bebf178..c912885 100644 --- a/ffmpeg/_run.py +++ b/ffmpeg/_run.py @@ -321,7 +321,7 @@ def run( pipe_stderr=capture_stderr, quiet=quiet, overwrite_output=overwrite_output, - cwd + cwd=cwd ) out, err = process.communicate(input) retcode = process.poll() From 17995f5ff3ab77f3b6736783c4b180283ec0fc15 Mon Sep 17 00:00:00 2001 From: Jacotsu Date: Fri, 9 Oct 2020 16:53:17 +0200 Subject: [PATCH 3/3] Updated test to check the new cwd parameter --- ffmpeg/tests/test_ffmpeg.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ffmpeg/tests/test_ffmpeg.py b/ffmpeg/tests/test_ffmpeg.py index 51ee258..4a8183c 100644 --- a/ffmpeg/tests/test_ffmpeg.py +++ b/ffmpeg/tests/test_ffmpeg.py @@ -441,12 +441,14 @@ def test__compile(): @pytest.mark.parametrize('pipe_stdin', [True, False]) @pytest.mark.parametrize('pipe_stdout', [True, False]) @pytest.mark.parametrize('pipe_stderr', [True, False]) -def test__run_async(mocker, pipe_stdin, pipe_stdout, pipe_stderr): +@pytest.mark.parametrize('cwd', [None, '/tmp']) +def test__run_async(mocker, pipe_stdin, pipe_stdout, pipe_stderr, cwd): process__mock = mock.Mock() popen__mock = mocker.patch.object(subprocess, 'Popen', return_value=process__mock) stream = _get_simple_example() process = ffmpeg.run_async( - stream, pipe_stdin=pipe_stdin, pipe_stdout=pipe_stdout, pipe_stderr=pipe_stderr + stream, pipe_stdin=pipe_stdin, pipe_stdout=pipe_stdout, + pipe_stderr=pipe_stderr, cwd=cwd ) assert process is process__mock @@ -456,7 +458,8 @@ def test__run_async(mocker, pipe_stdin, pipe_stdout, pipe_stderr): (args,), kwargs = popen__mock.call_args assert args == ffmpeg.compile(stream) assert kwargs == dict( - stdin=expected_stdin, stdout=expected_stdout, stderr=expected_stderr + stdin=expected_stdin, stdout=expected_stdout, stderr=expected_stderr, + cwd=cwd )