Merge pull request kkroening#213 from kkroening/black

Use Black formatter

Author: kkroening

ffmpeg/_ffmpeg.py

@@ -94,9 +94,4 @@ def output(*streams_and_filename, **kwargs):
     return OutputNode(streams, output.__name__, kwargs=kwargs).stream()
 
 
-__all__ = [
-    'input',
-    'merge_outputs',
-    'output',
-    'overwrite_output',
-]
+__all__ = ['input', 'merge_outputs', 'output', 'overwrite_output']

ffmpeg/_filters.py

@@ -21,7 +21,9 @@ def filter_multi_output(stream_spec, filter_name, *args, **kwargs):
         ffmpeg.concat(split0, split1).output('out.mp4').run()
         ```
     """
-    return FilterNode(stream_spec, filter_name, args=args, kwargs=kwargs, max_inputs=None)
+    return FilterNode(
+        stream_spec, filter_name, args=args, kwargs=kwargs, max_inputs=None
+    )
 
 
 @filter_operator()
@@ -144,7 +146,12 @@ def overlay(main_parent_node, overlay_parent_node, eof_action='repeat', **kwargs
     Official documentation: `overlay <https://ffmpeg.org/ffmpeg-filters.html#overlay-1>`__
     """
     kwargs['eof_action'] = eof_action
-    return FilterNode([main_parent_node, overlay_parent_node], overlay.__name__, kwargs=kwargs, max_inputs=2).stream()
+    return FilterNode(
+        [main_parent_node, overlay_parent_node],
+        overlay.__name__,
+        kwargs=kwargs,
+        max_inputs=2,
+    ).stream()
 
 
 @filter_operator()
@@ -180,10 +187,7 @@ def crop(stream, x, y, width, height, **kwargs):
     Official documentation: `crop <https://ffmpeg.org/ffmpeg-filters.html#crop>`__
     """
     return FilterNode(
-        stream,
-        crop.__name__,
-        args=[width, height, x, y],
-        kwargs=kwargs
+        stream, crop.__name__, args=[width, height, x, y], kwargs=kwargs
     ).stream()
 
 
@@ -209,7 +213,9 @@ def drawbox(stream, x, y, width, height, color, thickness=None, **kwargs):
     """
     if thickness:
         kwargs['t'] = thickness
-    return FilterNode(stream, drawbox.__name__, args=[x, y, width, height, color], kwargs=kwargs).stream()
+    return FilterNode(
+        stream, drawbox.__name__, args=[x, y, width, height, color], kwargs=kwargs
+    ).stream()
 
 
 @filter_operator()
@@ -385,8 +391,10 @@ def concat(*streams, **kwargs):
     stream_count = video_stream_count + audio_stream_count
     if len(streams) % stream_count != 0:
         raise ValueError(
-            'Expected concat input streams to have length multiple of {} (v={}, a={}); got {}'
-                .format(stream_count, video_stream_count, audio_stream_count, len(streams)))
+            'Expected concat input streams to have length multiple of {} (v={}, a={}); got {}'.format(
+                stream_count, video_stream_count, audio_stream_count, len(streams)
+            )
+        )
     kwargs['n'] = int(len(streams) / stream_count)
     return FilterNode(streams, concat.__name__, kwargs=kwargs, max_inputs=None).stream()
 

ffmpeg/_probe.py

@@ -24,6 +24,4 @@ def probe(filename, cmd='ffprobe', **kwargs):
     return json.loads(out.decode('utf-8'))
 
 
-__all__ = [
-    'probe',
-]
+__all__ = ['probe']

ffmpeg/_run.py

@@ -8,10 +8,7 @@
 import operator
 import subprocess
 
-from ._ffmpeg import (
-    input,
-    output,
-)
+from ._ffmpeg import input, output
 from .nodes import (
     get_stream_spec_nodes,
     FilterNode,
@@ -24,7 +21,9 @@
 
 class Error(Exception):
     def __init__(self, cmd, stdout, stderr):
-        super(Error, self).__init__('{} error (see stderr output for detail)'.format(cmd))
+        super(Error, self).__init__(
+            '{} error (see stderr output for detail)'.format(cmd)
+        )
         self.stdout = stdout
         self.stderr = stderr
 
@@ -69,9 +68,15 @@ def _format_output_stream_name(stream_name_map, edge):
 def _get_filter_spec(node, outgoing_edge_map, stream_name_map):
     incoming_edges = node.incoming_edges
     outgoing_edges = get_outgoing_edges(node, outgoing_edge_map)
-    inputs = [_format_input_stream_name(stream_name_map, edge) for edge in incoming_edges]
-    outputs = [_format_output_stream_name(stream_name_map, edge) for edge in outgoing_edges]
-    filter_spec = '{}{}{}'.format(''.join(inputs), node._get_filter(outgoing_edges), ''.join(outputs))
+    inputs = [
+        _format_input_stream_name(stream_name_map, edge) for edge in incoming_edges
+    ]
+    outputs = [
+        _format_output_stream_name(stream_name_map, edge) for edge in outgoing_edges
+    ]
+    filter_spec = '{}{}{}'.format(
+        ''.join(inputs), node._get_filter(outgoing_edges), ''.join(outputs)
+    )
     return filter_spec
 
 
@@ -84,14 +89,20 @@ def _allocate_filter_stream_names(filter_nodes, outgoing_edge_maps, stream_name_
                 # TODO: automatically insert `splits` ahead of time via graph transformation.
                 raise ValueError(
                     'Encountered {} with multiple outgoing edges with same upstream label {!r}; a '
-                    '`split` filter is probably required'.format(upstream_node, upstream_label))
+                    '`split` filter is probably required'.format(
+                        upstream_node, upstream_label
+                    )
+                )
             stream_name_map[upstream_node, upstream_label] = 's{}'.format(stream_count)
             stream_count += 1
 
 
 def _get_filter_arg(filter_nodes, outgoing_edge_maps, stream_name_map):
     _allocate_filter_stream_names(filter_nodes, outgoing_edge_maps, stream_name_map)
-    filter_specs = [_get_filter_spec(node, outgoing_edge_maps[node], stream_name_map) for node in filter_nodes]
+    filter_specs = [
+        _get_filter_spec(node, outgoing_edge_maps[node], stream_name_map)
+        for node in filter_nodes
+    ]
     return ';'.join(filter_specs)
 
 
@@ -109,7 +120,9 @@ def _get_output_args(node, stream_name_map):
 
     for edge in node.incoming_edges:
         # edge = node.incoming_edges[0]
-        stream_name = _format_input_stream_name(stream_name_map, edge, is_final_arg=True)
+        stream_name = _format_input_stream_name(
+            stream_name_map, edge, is_final_arg=True
+        )
         if stream_name != '0' or len(node.incoming_edges) > 1:
             args += ['-map', stream_name]
 
@@ -123,7 +136,9 @@ def _get_output_args(node, stream_name_map):
         args += ['-b:a', str(kwargs.pop('audio_bitrate'))]
     if 'video_size' in kwargs:
         video_size = kwargs.pop('video_size')
-        if not isinstance(video_size, basestring) and isinstance(video_size, collections.Iterable):
+        if not isinstance(video_size, basestring) and isinstance(
+            video_size, collections.Iterable
+        ):
             video_size = '{}x{}'.format(video_size[0], video_size[1])
         args += ['-video_size', video_size]
     args += convert_kwargs_to_cmd_line_args(kwargs)
@@ -147,7 +162,9 @@ def get_args(stream_spec, overwrite_output=False):
     args += reduce(operator.add, [_get_input_args(node) for node in input_nodes])
     if filter_arg:
         args += ['-filter_complex', filter_arg]
-    args += reduce(operator.add, [_get_output_args(node, stream_name_map) for node in output_nodes])
+    args += reduce(
+        operator.add, [_get_output_args(node, stream_name_map) for node in output_nodes]
+    )
     args += reduce(operator.add, [_get_global_args(node) for node in global_nodes], [])
     if overwrite_output:
         args += ['-y']
@@ -175,8 +192,14 @@ def compile(stream_spec, cmd='ffmpeg', overwrite_output=False):
 
 @output_operator()
 def run_async(
-        stream_spec, cmd='ffmpeg', pipe_stdin=False, pipe_stdout=False, pipe_stderr=False,
-        quiet=False, overwrite_output=False):
+    stream_spec,
+    cmd='ffmpeg',
+    pipe_stdin=False,
+    pipe_stdout=False,
+    pipe_stderr=False,
+    quiet=False,
+    overwrite_output=False,
+):
     """Asynchronously invoke ffmpeg for the supplied node graph.
 
     Args:
@@ -259,13 +282,20 @@ 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
+    )
 
 
 @output_operator()
 def run(
-        stream_spec, cmd='ffmpeg', capture_stdout=False, capture_stderr=False, input=None,
-        quiet=False, overwrite_output=False):
+    stream_spec,
+    cmd='ffmpeg',
+    capture_stdout=False,
+    capture_stderr=False,
+    input=None,
+    quiet=False,
+    overwrite_output=False,
+):
     """Invoke ffmpeg for the supplied node graph.
 
     Args:
@@ -296,10 +326,4 @@ def run(
     return out, err
 
 
-__all__ = [
-    'compile',
-    'Error',
-    'get_args',
-    'run',
-    'run_async',
-]
+__all__ = ['compile', 'Error', 'get_args', 'run', 'run_async']

ffmpeg/_utils.py

@@ -34,8 +34,11 @@ def __new__(cls, name, this_bases, d):
 
 
 if sys.version_info.major >= 3:
+
     class basestring(with_metaclass(BaseBaseString)):
         pass
+
+
 else:
     # noinspection PyUnresolvedReferences,PyCompatibility
     from builtins import basestring
@@ -52,7 +55,10 @@ def _recursive_repr(item):
     elif isinstance(item, list):
         result = '[{}]'.format(', '.join([_recursive_repr(x) for x in item]))
     elif isinstance(item, dict):
-        kv_pairs = ['{}: {}'.format(_recursive_repr(k), _recursive_repr(item[k])) for k in sorted(item)]
+        kv_pairs = [
+            '{}: {}'.format(_recursive_repr(k), _recursive_repr(item[k]))
+            for k in sorted(item)
+        ]
         result = '{' + ', '.join(kv_pairs) + '}'
     else:
         result = repr(item)

ffmpeg/_view.py

@@ -34,8 +34,10 @@ def view(stream_spec, detail=False, filename=None, pipe=False, **kwargs):
     try:
         import graphviz
     except ImportError:
-        raise ImportError('failed to import graphviz; please make sure graphviz is installed (e.g. `pip install '
-            'graphviz`)')
+        raise ImportError(
+            'failed to import graphviz; please make sure graphviz is installed (e.g. `pip install '
+            'graphviz`)'
+        )
 
     show_labels = kwargs.pop('show_labels', True)
     if pipe and filename is not None:
@@ -49,19 +51,25 @@ def view(stream_spec, detail=False, filename=None, pipe=False, **kwargs):
     graph = graphviz.Digraph(format='png')
     graph.attr(rankdir='LR')
     if len(list(kwargs.keys())) != 0:
-        raise ValueError('Invalid kwargs key(s): {}'.format(', '.join(list(kwargs.keys()))))
+        raise ValueError(
+            'Invalid kwargs key(s): {}'.format(', '.join(list(kwargs.keys())))
+        )
 
     for node in sorted_nodes:
         color = _get_node_color(node)
 
         if detail:
             lines = [node.short_repr]
             lines += ['{!r}'.format(arg) for arg in node.args]
-            lines += ['{}={!r}'.format(key, node.kwargs[key]) for key in sorted(node.kwargs)]
+            lines += [
+                '{}={!r}'.format(key, node.kwargs[key]) for key in sorted(node.kwargs)
+            ]
             node_text = '\n'.join(lines)
         else:
             node_text = node.short_repr
-        graph.node(str(hash(node)), node_text, shape='box', style='filled', fillcolor=color)
+        graph.node(
+            str(hash(node)), node_text, shape='box', style='filled', fillcolor=color
+        )
         outgoing_edge_map = outgoing_edge_maps.get(node, {})
 
         for edge in get_outgoing_edges(node, outgoing_edge_map):
@@ -70,7 +78,11 @@ def view(stream_spec, detail=False, filename=None, pipe=False, **kwargs):
             down_label = edge.downstream_label
             up_selector = edge.upstream_selector
 
-            if show_labels and (up_label is not None or down_label is not None or up_selector is not None):
+            if show_labels and (
+                up_label is not None
+                or down_label is not None
+                or up_selector is not None
+            ):
                 if up_label is None:
                     up_label = ''
                 if up_selector is not None:
@@ -93,6 +105,4 @@ def view(stream_spec, detail=False, filename=None, pipe=False, **kwargs):
         return stream_spec
 
 
-__all__ = [
-    'view',
-]
+__all__ = ['view']