kkroening#30: add global_args operator

kkroening · kkroening · commit 3e68bc8c9a51 · 2018-05-09T03:09:21.000-05:00
diff --git a/ffmpeg/_ffmpeg.py b/ffmpeg/_ffmpeg.py
@@ -26,13 +26,20 @@ def input(filename, **kwargs):
     return InputNode(input.__name__, kwargs=kwargs).stream()
 
 
+@output_operator()
+def global_args(stream, *args):
+    """Add extra global command-line argument(s), e.g. ``-progress``.
+    """
+    return GlobalNode(stream, global_args.__name__, args).stream()
+
+
 @output_operator()
 def overwrite_output(stream):
     """Overwrite output files without asking (ffmpeg ``-y`` option)
 
     Official documentation: `Main options <https://ffmpeg.org/ffmpeg.html#Main-options>`__
     """
-    return GlobalNode(stream, overwrite_output.__name__).stream()
+    return GlobalNode(stream, overwrite_output.__name__, ['-y']).stream()
 
 
 @output_operator()
diff --git a/ffmpeg/_run.py b/ffmpeg/_run.py
@@ -10,7 +10,6 @@
 from ._ffmpeg import (
     input,
     output,
-    overwrite_output,
 )
 from .nodes import (
     get_stream_spec_nodes,
@@ -92,10 +91,7 @@ def _get_filter_arg(filter_nodes, outgoing_edge_maps, stream_name_map):
 
 
 def _get_global_args(node):
-    if node.name == overwrite_output.__name__:
-        return ['-y']
-    else:
-        raise ValueError('Unsupported global node: {}'.format(node))
+    return list(node.args)
 
 
 def _get_output_args(node, stream_name_map):
diff --git a/ffmpeg/tests/test_ffmpeg.py b/ffmpeg/tests/test_ffmpeg.py
@@ -105,6 +105,11 @@ def test_get_args_simple():
     assert out_file.get_args() == ['-i', 'dummy.mp4', 'dummy2.mp4']
 
 
+def test_global_args():
+    out_file = ffmpeg.input('dummy.mp4').output('dummy2.mp4').global_args('-progress', 'someurl')
+    assert out_file.get_args() == ['-i', 'dummy.mp4', 'dummy2.mp4', '-progress', 'someurl']
+
+
 def _get_complex_filter_example():
     split = (ffmpeg
         .input(TEST_INPUT_FILE1)
