From fd92a1f7ae7cf902c6171cdc9bf8d848c667b2f8 Mon Sep 17 00:00:00 2001 From: Amirhossein Barati Date: Sat, 22 Jun 2024 15:00:47 +0330 Subject: [PATCH 1/2] fix: Add double qoutation if the command started and ended with brackets --- ffmpeg/_run.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ffmpeg/_run.py b/ffmpeg/_run.py index f42d1d73..0e1411c7 100644 --- a/ffmpeg/_run.py +++ b/ffmpeg/_run.py @@ -170,6 +170,9 @@ def get_args(stream_spec, overwrite_output=False): args += reduce(operator.add, [_get_global_args(node) for node in global_nodes], []) if overwrite_output: args += ['-y'] + for i, arg in enumerate(args): + if arg.startswith('[') and arg.endswith(']'): + args[i] = f'"{args}"' return args From a2ed652c53d0d4a3cc6599f8023609130c9fb714 Mon Sep 17 00:00:00 2001 From: Amirhossein Barati Date: Wed, 26 Jun 2024 17:54:42 +0330 Subject: [PATCH 2/2] fix: remove empty strings from returned arguments --- .gitignore | 1 + ffmpeg/_run.py | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 780f20e4..1aed517d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .cache .eggs +.idea/ .tox/ dist/ ffmpeg/tests/sample_data/out*.mp4 diff --git a/ffmpeg/_run.py b/ffmpeg/_run.py index 0e1411c7..1fb3e6c8 100644 --- a/ffmpeg/_run.py +++ b/ffmpeg/_run.py @@ -170,9 +170,6 @@ def get_args(stream_spec, overwrite_output=False): args += reduce(operator.add, [_get_global_args(node) for node in global_nodes], []) if overwrite_output: args += ['-y'] - for i, arg in enumerate(args): - if arg.startswith('[') and arg.endswith(']'): - args[i] = f'"{args}"' return args @@ -192,7 +189,7 @@ def compile(stream_spec, cmd='ffmpeg', overwrite_output=False): cmd = [cmd] elif type(cmd) != list: cmd = list(cmd) - return cmd + get_args(stream_spec, overwrite_output=overwrite_output) + return cmd + list(filter(lambda x: x != '', get_args(stream_spec, overwrite_output=overwrite_output))) @output_operator()