diff --git a/example-scripts/control-server/generate-cut-list.py b/example-scripts/control-server/generate-cut-list.py index 394865b6..fd8ae6f5 100755 --- a/example-scripts/control-server/generate-cut-list.py +++ b/example-scripts/control-server/generate-cut-list.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -import socket import datetime +import socket import sys host = 'localhost' diff --git a/example-scripts/ffmpeg/record-all-audio-streams.py b/example-scripts/ffmpeg/record-all-audio-streams.py index a0cfc7b2..d448faf6 100755 --- a/example-scripts/ffmpeg/record-all-audio-streams.py +++ b/example-scripts/ffmpeg/record-all-audio-streams.py @@ -1,10 +1,10 @@ #!/usr/bin/env python3 -import socket -import sys import json +import logging import shlex +import socket import subprocess -import logging +import sys from configparser import SafeConfigParser logging.basicConfig(level=logging.DEBUG) diff --git a/example-scripts/gstreamer/ingest.py b/example-scripts/gstreamer/ingest.py index 30c089c5..8d14f39c 100755 --- a/example-scripts/gstreamer/ingest.py +++ b/example-scripts/gstreamer/ingest.py @@ -12,14 +12,15 @@ """ import argparse -import gi import os import signal import socket import sys +import gi + gi.require_version('Gst', '1.0') -from gi.repository import Gst, GstNet, GObject +from gi.repository import GObject, Gst, GstNet # init GObject & Co. before importing local classes GObject.threads_init() diff --git a/example-scripts/gstreamer/source-background-loop.py b/example-scripts/gstreamer/source-background-loop.py index 01e47e40..16a89a66 100755 --- a/example-scripts/gstreamer/source-background-loop.py +++ b/example-scripts/gstreamer/source-background-loop.py @@ -1,11 +1,12 @@ #!/usr/bin/env python3 import os +import signal import sys + import gi -import signal gi.require_version('Gst', '1.0') -from gi.repository import Gst, GObject +from gi.repository import GObject, Gst # init GObject & Co. before importing local classes GObject.threads_init() diff --git a/example-scripts/gstreamer/source-nostream-music-from-folder.py b/example-scripts/gstreamer/source-nostream-music-from-folder.py index b6f3fba3..f2a7df8e 100755 --- a/example-scripts/gstreamer/source-nostream-music-from-folder.py +++ b/example-scripts/gstreamer/source-nostream-music-from-folder.py @@ -1,15 +1,16 @@ #!/usr/bin/env python3 +import argparse +import logging import os +import random +import signal import sys + import gi -import signal -import random -import argparse -import logging import pyinotify gi.require_version('Gst', '1.0') -from gi.repository import Gst, GObject, GLib +from gi.repository import GLib, GObject, Gst # init GObject & Co. before importing local classes GObject.threads_init() diff --git a/example-scripts/gstreamer/source-remote-desktop-as-cam1.py b/example-scripts/gstreamer/source-remote-desktop-as-cam1.py index 60d2df98..0198c7d7 100755 --- a/example-scripts/gstreamer/source-remote-desktop-as-cam1.py +++ b/example-scripts/gstreamer/source-remote-desktop-as-cam1.py @@ -1,13 +1,14 @@ #!/usr/bin/python3 +import argparse import os -import sys -import gi import signal -import argparse import socket +import sys + +import gi gi.require_version('Gst', '1.0') -from gi.repository import Gst, GstNet, GObject +from gi.repository import GObject, Gst, GstNet # init GObject & Co. before importing local classes GObject.threads_init() diff --git a/example-scripts/gstreamer/source-remote-videotestsrc-as-cam1.py b/example-scripts/gstreamer/source-remote-videotestsrc-as-cam1.py index 0fe35fcb..681054e9 100755 --- a/example-scripts/gstreamer/source-remote-videotestsrc-as-cam1.py +++ b/example-scripts/gstreamer/source-remote-videotestsrc-as-cam1.py @@ -1,13 +1,14 @@ #!/usr/bin/python3 +import argparse import os -import sys -import gi import signal -import argparse import socket +import sys + +import gi gi.require_version('Gst', '1.0') -from gi.repository import Gst, GstNet, GObject +from gi.repository import GObject, Gst, GstNet # init GObject & Co. before importing local classes GObject.threads_init() diff --git a/example-scripts/voctolight/lib/config.py b/example-scripts/voctolight/lib/config.py index 8d64e489..b32ed201 100644 --- a/example-scripts/voctolight/lib/config.py +++ b/example-scripts/voctolight/lib/config.py @@ -1,5 +1,4 @@ import logging - import os.path from configparser import ConfigParser diff --git a/example-scripts/voctolight/voctolight.py b/example-scripts/voctolight/voctolight.py index 972ad177..1eaf7ba3 100755 --- a/example-scripts/voctolight/voctolight.py +++ b/example-scripts/voctolight/voctolight.py @@ -1,8 +1,9 @@ #!/usr/bin/env python3 +import re import socket -from lib.config import Config import time -import re + +from lib.config import Config DO_GPIO = True try: diff --git a/example-scripts/voctomidi/voctomidi.py b/example-scripts/voctomidi/voctomidi.py index afc85df4..05196ef9 100755 --- a/example-scripts/voctomidi/voctomidi.py +++ b/example-scripts/voctomidi/voctomidi.py @@ -4,9 +4,9 @@ import socket import sys import time -from rtmidi.midiutil import open_midiport from lib.config import get_config +from rtmidi.midiutil import open_midiport NOTE_ON = 0x90 NOTE_OFF = 0x80 diff --git a/example-scripts/voctopanel/voctopanel.py b/example-scripts/voctopanel/voctopanel.py index 8cef23e7..5e9ae917 100755 --- a/example-scripts/voctopanel/voctopanel.py +++ b/example-scripts/voctopanel/voctopanel.py @@ -3,8 +3,8 @@ import socket import sys import time -import serial +import serial from lib.config import Config server_address = Config.get("server", "address") diff --git a/example-scripts/voctoremote/lib/config.py b/example-scripts/voctoremote/lib/config.py index 8d64e489..b32ed201 100644 --- a/example-scripts/voctoremote/lib/config.py +++ b/example-scripts/voctoremote/lib/config.py @@ -1,5 +1,4 @@ import logging - import os.path from configparser import ConfigParser diff --git a/example-scripts/voctoremote/voctoremote.py b/example-scripts/voctoremote/voctoremote.py index 3340d55c..b1c6dc8a 100755 --- a/example-scripts/voctoremote/voctoremote.py +++ b/example-scripts/voctoremote/voctoremote.py @@ -1,8 +1,9 @@ #!/usr/bin/env python3 import socket + +from flask import Flask, redirect, render_template, request, url_for from lib.config import Config -from flask import Flask, render_template, request, redirect, url_for app = Flask(__name__) diff --git a/vocto/__init__.py b/vocto/__init__.py index 33d5e040..234f08bf 100644 --- a/vocto/__init__.py +++ b/vocto/__init__.py @@ -2,9 +2,10 @@ import gi gi.require_version('Gst', '1.0') -from gi.repository import Gst import os +from gi.repository import Gst + # set GST debug dir for dot files if 'GST_DEBUG_DUMP_DOT_DIR' not in os.environ: os.environ['GST_DEBUG_DUMP_DOT_DIR'] = os.getcwd() diff --git a/vocto/audio_codecs.py b/vocto/audio_codecs.py index bb3befc3..2b43b14a 100644 --- a/vocto/audio_codecs.py +++ b/vocto/audio_codecs.py @@ -1,10 +1,10 @@ #!/usr/bin/env python3 -import gi import logging import sys -from lib.config import Config +import gi from gi.repository import Gst +from lib.config import Config gi.require_version('GstController', '1.0') log = logging.getLogger('audio_codecs') diff --git a/vocto/audio_streams.py b/vocto/audio_streams.py index dfd6a692..7128d333 100644 --- a/vocto/audio_streams.py +++ b/vocto/audio_streams.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -import re import logging +import re log = logging.getLogger('AudioStreams') diff --git a/vocto/composites.py b/vocto/composites.py index e7312ca7..59c731b2 100644 --- a/vocto/composites.py +++ b/vocto/composites.py @@ -1,16 +1,14 @@ #!/usr/bin/env python3 # for debug logging -import logging - -# use Frame -from vocto.frame import Frame, X, Y, L, T, R, B - # for cloning objects import copy - +import logging # for parsing configuration items import re +# use Frame +from vocto.frame import B, Frame, L, R, T, X, Y + log = logging.getLogger('Composites') diff --git a/vocto/debug.py b/vocto/debug.py index 7dda6a2b..e182f9f1 100644 --- a/vocto/debug.py +++ b/vocto/debug.py @@ -1,8 +1,9 @@ #!/usr/bin/env python3 -import os import logging -from gi.repository import Gst +import os + import gi +from gi.repository import Gst gi.require_version('Gst', '1.0') diff --git a/vocto/frame.py b/vocto/frame.py index 8e6929e1..6342c88c 100644 --- a/vocto/frame.py +++ b/vocto/frame.py @@ -1,9 +1,8 @@ #!/usr/bin/env python3 # for debug logging -import logging - # for cloning objects import copy +import logging # substitute array coordinate mappings fer better reading X, Y = 0, 1 diff --git a/vocto/transitions.py b/vocto/transitions.py index f7f3cabd..d196a782 100644 --- a/vocto/transitions.py +++ b/vocto/transitions.py @@ -1,14 +1,13 @@ #!/usr/bin/env python3 # for debug logging +# for cloning objects +import copy import logging -from vocto.composites import Composite, Composites, swap_name -from vocto.frame import Frame, L, R, T, B, X, Y - # for calculating square roots import math -# for cloning objects -import copy +from vocto.composites import Composite, Composites, swap_name +from vocto.frame import B, Frame, L, R, T, X, Y V = 2 # distance (velocity) index @@ -379,10 +378,9 @@ def bspline(points): returns interpolated points """ # for generating B-Splines - from scipy import interpolate as spi - # for converting arrays import numpy as np + from scipy import interpolate as spi # parameter check assert isinstance(points, np.ndarray) diff --git a/vocto/video_codecs.py b/vocto/video_codecs.py index ea9d22cc..c8c5fc1b 100644 --- a/vocto/video_codecs.py +++ b/vocto/video_codecs.py @@ -1,10 +1,10 @@ #!/usr/bin/env python3 import logging -import gi import sys -from lib.config import Config +import gi from gi.repository import Gst +from lib.config import Config gi.require_version('GstController', '1.0') diff --git a/voctocore/lib/audiomix.py b/voctocore/lib/audiomix.py index c8bc73f3..470d30fb 100644 --- a/voctocore/lib/audiomix.py +++ b/voctocore/lib/audiomix.py @@ -2,9 +2,9 @@ import logging from configparser import NoOptionError, NoSectionError +from lib.args import Args from lib.config import Config from lib.errors.configuration_error import ConfigurationError -from lib.args import Args class AudioMix(object): diff --git a/voctocore/lib/avpreviewoutput.py b/voctocore/lib/avpreviewoutput.py index 66edd10c..2018f810 100644 --- a/voctocore/lib/avpreviewoutput.py +++ b/voctocore/lib/avpreviewoutput.py @@ -1,10 +1,10 @@ import logging -from vocto.video_codecs import construct_video_encoder_pipeline - -from lib.tcpmulticonnection import TCPMultiConnection -from lib.config import Config from lib.args import Args +from lib.config import Config +from lib.tcpmulticonnection import TCPMultiConnection + +from vocto.video_codecs import construct_video_encoder_pipeline class AVPreviewOutput(TCPMultiConnection): diff --git a/voctocore/lib/blinder.py b/voctocore/lib/blinder.py index 63d52bd9..31af55f8 100644 --- a/voctocore/lib/blinder.py +++ b/voctocore/lib/blinder.py @@ -2,10 +2,9 @@ import logging from gi.repository import Gst - -from lib.config import Config -from lib.clock import Clock from lib.args import Args +from lib.clock import Clock +from lib.config import Config class Blinder(object): diff --git a/voctocore/lib/clock.py b/voctocore/lib/clock.py index 3eb85832..273c5a71 100644 --- a/voctocore/lib/clock.py +++ b/voctocore/lib/clock.py @@ -1,5 +1,6 @@ #!/usr/bin/python3 import logging + from gi.repository import Gst, GstNet __all__ = ['Clock', 'NetTimeProvider'] diff --git a/voctocore/lib/commands.py b/voctocore/lib/commands.py index 506972a0..e5a02e90 100644 --- a/voctocore/lib/commands.py +++ b/voctocore/lib/commands.py @@ -1,13 +1,14 @@ #!/usr/bin/env python3 -import logging -import json import inspect +import json +import logging +import os from lib.config import Config from lib.response import NotifyResponse, OkResponse + +from vocto.command_helpers import dequote, quote, str2bool from vocto.composite_commands import CompositeCommand -from vocto.command_helpers import quote, dequote, str2bool -import os class ControlServerCommands(object): diff --git a/voctocore/lib/controlserver.py b/voctocore/lib/controlserver.py index 93ca7ced..027e3561 100644 --- a/voctocore/lib/controlserver.py +++ b/voctocore/lib/controlserver.py @@ -1,10 +1,10 @@ import logging from queue import Queue -from gi.repository import GObject +from gi.repository import GObject from lib.commands import ControlServerCommands -from lib.tcpmulticonnection import TCPMultiConnection from lib.response import NotifyResponse +from lib.tcpmulticonnection import TCPMultiConnection from vocto.port import Port diff --git a/voctocore/lib/overlay.py b/voctocore/lib/overlay.py index ae6e6079..a81eec1e 100644 --- a/voctocore/lib/overlay.py +++ b/voctocore/lib/overlay.py @@ -1,7 +1,8 @@ #!/usr/bin/env python3 -from gi.repository import Gst, GstController import logging + import gi +from gi.repository import Gst, GstController gi.require_version('GstController', '1.0') diff --git a/voctocore/lib/pipeline.py b/voctocore/lib/pipeline.py index 4ac66091..8250fd09 100644 --- a/voctocore/lib/pipeline.py +++ b/voctocore/lib/pipeline.py @@ -4,7 +4,6 @@ import sys from gi.repository import Gst - # import library components from lib.args import Args from lib.audiomix import AudioMix diff --git a/voctocore/lib/scene.py b/voctocore/lib/scene.py index 3bbfd98a..0277f30e 100644 --- a/voctocore/lib/scene.py +++ b/voctocore/lib/scene.py @@ -1,10 +1,12 @@ #!/usr/bin/env python3 import logging + import gi gi.require_version('GstController', '1.0') from gi.repository import Gst, GstController -from vocto.transitions import Frame, L, T, R, B + +from vocto.transitions import B, Frame, L, R, T class Scene: diff --git a/voctocore/lib/sources/__init__.py b/voctocore/lib/sources/__init__.py index 415e6966..cb177923 100644 --- a/voctocore/lib/sources/__init__.py +++ b/voctocore/lib/sources/__init__.py @@ -8,15 +8,15 @@ def spawn_source(name, port, has_audio=True, has_video=True): from lib.config import Config + from lib.sources.alsaaudiosource import AlsaAudioSource from lib.sources.decklinkavsource import DeckLinkAVSource + from lib.sources.filesource import FileSource from lib.sources.imgvsource import ImgVSource + from lib.sources.pulseaudiosource import PulseAudioSource + from lib.sources.rpicamsource import RPICamAVSource from lib.sources.tcpavsource import TCPAVSource from lib.sources.testsource import TestSource - from lib.sources.filesource import FileSource from lib.sources.v4l2source import V4l2AVSource - from lib.sources.rpicamsource import RPICamAVSource - from lib.sources.pulseaudiosource import PulseAudioSource - from lib.sources.alsaaudiosource import AlsaAudioSource kind = Config.getSourceKind(name) diff --git a/voctocore/lib/sources/alsaaudiosource.py b/voctocore/lib/sources/alsaaudiosource.py index 476e5c75..cbbccb33 100644 --- a/voctocore/lib/sources/alsaaudiosource.py +++ b/voctocore/lib/sources/alsaaudiosource.py @@ -1,9 +1,8 @@ #!/usr/bin/env python3 import logging - from configparser import NoOptionError -from gi.repository import Gst +from gi.repository import Gst from lib.config import Config from lib.sources.avsource import AVSource diff --git a/voctocore/lib/sources/avsource.py b/voctocore/lib/sources/avsource.py index 5df9cf2c..c814d9c7 100644 --- a/voctocore/lib/sources/avsource.py +++ b/voctocore/lib/sources/avsource.py @@ -1,10 +1,10 @@ #!/usr/bin/env python3 import logging from abc import ABCMeta, abstractmethod -from gi.repository import GLib -from lib.config import Config +from gi.repository import GLib from lib.args import Args +from lib.config import Config class AVSource(object, metaclass=ABCMeta): diff --git a/voctocore/lib/sources/filesource.py b/voctocore/lib/sources/filesource.py index c25407eb..b9e97d1b 100644 --- a/voctocore/lib/sources/filesource.py +++ b/voctocore/lib/sources/filesource.py @@ -1,11 +1,9 @@ #!/usr/bin/env python3 import logging -import re - import os +import re from gi.repository import Gst - from lib.config import Config from lib.sources.avsource import AVSource diff --git a/voctocore/lib/sources/imgvsource.py b/voctocore/lib/sources/imgvsource.py index 2513f967..07bdc8d6 100644 --- a/voctocore/lib/sources/imgvsource.py +++ b/voctocore/lib/sources/imgvsource.py @@ -1,10 +1,9 @@ #!/usr/bin/env python3 import logging -import re import os +import re from gi.repository import Gst - from lib.config import Config from lib.sources.avsource import AVSource diff --git a/voctocore/lib/sources/pulseaudiosource.py b/voctocore/lib/sources/pulseaudiosource.py index c58eb49d..e6cb974b 100644 --- a/voctocore/lib/sources/pulseaudiosource.py +++ b/voctocore/lib/sources/pulseaudiosource.py @@ -1,9 +1,8 @@ #!/usr/bin/env python3 import logging - from configparser import NoOptionError -from gi.repository import Gst +from gi.repository import Gst from lib.config import Config from lib.sources.avsource import AVSource diff --git a/voctocore/lib/sources/rpicamsource.py b/voctocore/lib/sources/rpicamsource.py index 97630a3e..4bae99b9 100644 --- a/voctocore/lib/sources/rpicamsource.py +++ b/voctocore/lib/sources/rpicamsource.py @@ -2,8 +2,7 @@ import logging import re -from gi.repository import Gst, GLib - +from gi.repository import GLib, Gst from lib.config import Config from lib.sources.avsource import AVSource diff --git a/voctocore/lib/sources/tcpavsource.py b/voctocore/lib/sources/tcpavsource.py index 4387f44a..d6dc131e 100644 --- a/voctocore/lib/sources/tcpavsource.py +++ b/voctocore/lib/sources/tcpavsource.py @@ -1,9 +1,8 @@ #!/usr/bin/env python3 import logging - -from gi.repository import Gst, GObject import socket +from gi.repository import GObject, Gst from lib.config import Config from lib.sources.avsource import AVSource diff --git a/voctocore/lib/sources/testsource.py b/voctocore/lib/sources/testsource.py index 05bf35a6..71e55751 100644 --- a/voctocore/lib/sources/testsource.py +++ b/voctocore/lib/sources/testsource.py @@ -1,9 +1,8 @@ #!/usr/bin/env python3 import logging - from configparser import NoOptionError -from gi.repository import Gst +from gi.repository import Gst from lib.config import Config from lib.sources.avsource import AVSource diff --git a/voctocore/lib/sources/v4l2source.py b/voctocore/lib/sources/v4l2source.py index 7c1eb47d..a02a6fa9 100644 --- a/voctocore/lib/sources/v4l2source.py +++ b/voctocore/lib/sources/v4l2source.py @@ -2,8 +2,7 @@ import logging import re -from gi.repository import Gst, GLib - +from gi.repository import GLib, Gst from lib.config import Config from lib.sources.avsource import AVSource diff --git a/voctocore/lib/tcpmulticonnection.py b/voctocore/lib/tcpmulticonnection.py index d2da35f1..dc99ed97 100644 --- a/voctocore/lib/tcpmulticonnection.py +++ b/voctocore/lib/tcpmulticonnection.py @@ -1,8 +1,9 @@ import logging import socket import sys -from queue import Queue from abc import ABCMeta, abstractmethod +from queue import Queue + from gi.repository import GObject diff --git a/voctocore/lib/videomix.py b/voctocore/lib/videomix.py index 3c6217d0..8195d891 100644 --- a/voctocore/lib/videomix.py +++ b/voctocore/lib/videomix.py @@ -1,19 +1,19 @@ #!/usr/bin/env python3 import logging - from configparser import NoOptionError from enum import Enum, unique + import gi gi.require_version('GstController', '1.0') from gi.repository import Gst +from lib.args import Args from lib.config import Config -from vocto.transitions import Composites, Transitions, Frame, fade_alpha -from lib.scene import Scene from lib.overlay import Overlay -from lib.args import Args +from lib.scene import Scene from vocto.composite_commands import CompositeCommand +from vocto.transitions import Composites, Frame, Transitions, fade_alpha class VideoMix(object): diff --git a/voctocore/test-transition.py b/voctocore/test-transition.py index 7c062026..8f71daab 100644 --- a/voctocore/test-transition.py +++ b/voctocore/test-transition.py @@ -1,17 +1,17 @@ #!/usr/bin/env python3 -from configparser import SafeConfigParser -from vocto.transitions import Composites, Transitions, L, T, R, B, X, Y -from PIL import Image, ImageDraw, ImageFont - +import argparse +import copy +import logging +import re # for integer maximum size import sys - +from configparser import SafeConfigParser # for calling convert to generate animated GIF from subprocess import call -import copy -import re -import logging -import argparse + +from PIL import Image, ImageDraw, ImageFont + +from vocto.transitions import B, Composites, L, R, T, Transitions, X, Y def read_arguments(): diff --git a/voctocore/tests/commands/commands_test_base.py b/voctocore/tests/commands/commands_test_base.py index dac71f7e..45cd4412 100644 --- a/voctocore/tests/commands/commands_test_base.py +++ b/voctocore/tests/commands/commands_test_base.py @@ -1,7 +1,6 @@ +from lib.commands import ControlServerCommands from mock import MagicMock - from tests.helper.voctomix_test import VoctomixTest -from lib.commands import ControlServerCommands class CommandsTestBase(VoctomixTest): diff --git a/voctocore/tests/commands/test_get_audio.py b/voctocore/tests/commands/test_get_audio.py index 9e16d126..3b00f46c 100644 --- a/voctocore/tests/commands/test_get_audio.py +++ b/voctocore/tests/commands/test_get_audio.py @@ -1,8 +1,7 @@ import json -from mock import ANY - from lib.response import OkResponse +from mock import ANY from tests.commands.commands_test_base import CommandsTestBase diff --git a/voctocore/tests/commands/test_get_config_option.py b/voctocore/tests/commands/test_get_config_option.py index cd47be27..dbedd308 100644 --- a/voctocore/tests/commands/test_get_config_option.py +++ b/voctocore/tests/commands/test_get_config_option.py @@ -1,4 +1,5 @@ import configparser + from lib.config import Config from lib.response import OkResponse from tests.commands.commands_test_base import CommandsTestBase diff --git a/voctocore/tests/commands/test_set_audio.py b/voctocore/tests/commands/test_set_audio.py index 323d549e..72e70a38 100644 --- a/voctocore/tests/commands/test_set_audio.py +++ b/voctocore/tests/commands/test_set_audio.py @@ -1,6 +1,5 @@ -from mock import ANY - from lib.response import NotifyResponse +from mock import ANY from tests.commands.commands_test_base import CommandsTestBase diff --git a/voctocore/tests/commands/test_set_audio_volume.py b/voctocore/tests/commands/test_set_audio_volume.py index 7d2fbebe..5578f979 100644 --- a/voctocore/tests/commands/test_set_audio_volume.py +++ b/voctocore/tests/commands/test_set_audio_volume.py @@ -1,6 +1,5 @@ -from mock import ANY - from lib.response import NotifyResponse +from mock import ANY from tests.commands.commands_test_base import CommandsTestBase diff --git a/voctocore/tests/commands/test_set_composite_mode.py b/voctocore/tests/commands/test_set_composite_mode.py index 01197c4b..cecec7ca 100644 --- a/voctocore/tests/commands/test_set_composite_mode.py +++ b/voctocore/tests/commands/test_set_composite_mode.py @@ -1,7 +1,6 @@ -from mock import ANY - from lib.response import NotifyResponse from lib.videomix import CompositeModes +from mock import ANY from tests.commands.commands_test_base import CommandsTestBase diff --git a/voctocore/tests/commands/test_set_stream_blanker.py b/voctocore/tests/commands/test_set_stream_blanker.py index 5d7f1610..a4c977d1 100644 --- a/voctocore/tests/commands/test_set_stream_blanker.py +++ b/voctocore/tests/commands/test_set_stream_blanker.py @@ -1,6 +1,5 @@ -from mock import ANY - from lib.response import NotifyResponse +from mock import ANY from tests.commands.commands_test_base import CommandsTestBase diff --git a/voctocore/tests/commands/test_set_video.py b/voctocore/tests/commands/test_set_video.py index ca9b3e27..a435a6dc 100644 --- a/voctocore/tests/commands/test_set_video.py +++ b/voctocore/tests/commands/test_set_video.py @@ -1,6 +1,5 @@ -from mock import ANY - from lib.response import NotifyResponse +from mock import ANY from tests.commands.commands_test_base import CommandsTestBase diff --git a/voctocore/tests/commands/test_set_videos_and_composite.py b/voctocore/tests/commands/test_set_videos_and_composite.py index f1329478..82b1421f 100644 --- a/voctocore/tests/commands/test_set_videos_and_composite.py +++ b/voctocore/tests/commands/test_set_videos_and_composite.py @@ -1,7 +1,6 @@ +from lib.videomix import CompositeModes from mock import ANY - from tests.commands.commands_test_base import CommandsTestBase -from lib.videomix import CompositeModes class CommandsSetVideosAndComposite(CommandsTestBase): diff --git a/voctocore/tests/commands/test_store_fetch_value.py b/voctocore/tests/commands/test_store_fetch_value.py index ead7e20a..7c997377 100644 --- a/voctocore/tests/commands/test_store_fetch_value.py +++ b/voctocore/tests/commands/test_store_fetch_value.py @@ -1,6 +1,5 @@ -from mock import ANY - from lib.response import NotifyResponse, OkResponse +from mock import ANY from tests.commands.commands_test_base import CommandsTestBase diff --git a/voctocore/tests/helper/config_mock.py b/voctocore/tests/helper/config_mock.py index 11731fdc..342fdb5a 100644 --- a/voctocore/tests/helper/config_mock.py +++ b/voctocore/tests/helper/config_mock.py @@ -1,4 +1,4 @@ -from configparser import NoSectionError, NoOptionError, DuplicateSectionError +from configparser import DuplicateSectionError, NoOptionError, NoSectionError from lib.config import VocConfigParser diff --git a/voctocore/tests/helper/voctomix_test.py b/voctocore/tests/helper/voctomix_test.py index e55aebfd..421f833e 100644 --- a/voctocore/tests/helper/voctomix_test.py +++ b/voctocore/tests/helper/voctomix_test.py @@ -2,9 +2,8 @@ import unittest import gi.repository -from mock import MagicMock - import lib.config +from mock import MagicMock from tests.helper.config_mock import ConfigMock gi.repository.Gst = MagicMock() diff --git a/voctocore/tests/sources/avsource/decklinkavsource/test_deinterlacer_setting.py b/voctocore/tests/sources/avsource/decklinkavsource/test_deinterlacer_setting.py index 510641f0..41b90aea 100644 --- a/voctocore/tests/sources/avsource/decklinkavsource/test_deinterlacer_setting.py +++ b/voctocore/tests/sources/avsource/decklinkavsource/test_deinterlacer_setting.py @@ -1,7 +1,7 @@ -from tests.helper.voctomix_test import VoctomixTest from gi.repository import Gst -from lib.sources import DeckLinkAVSource from lib.config import Config +from lib.sources import DeckLinkAVSource +from tests.helper.voctomix_test import VoctomixTest # noinspection PyUnusedLocal diff --git a/voctocore/tests/sources/avsource/tcpavsource/test_deinterlacer_setting.py b/voctocore/tests/sources/avsource/tcpavsource/test_deinterlacer_setting.py index 44656dca..39b4f512 100644 --- a/voctocore/tests/sources/avsource/tcpavsource/test_deinterlacer_setting.py +++ b/voctocore/tests/sources/avsource/tcpavsource/test_deinterlacer_setting.py @@ -1,11 +1,10 @@ import io -from mock import MagicMock - -from tests.helper.voctomix_test import VoctomixTest from gi.repository import Gst -from lib.sources import TCPAVSource from lib.config import Config +from lib.sources import TCPAVSource +from mock import MagicMock +from tests.helper.voctomix_test import VoctomixTest # noinspection PyUnusedLocal diff --git a/voctocore/tests/test_audiomix_multiple_sources.py b/voctocore/tests/test_audiomix_multiple_sources.py index 1683d15e..0bee9519 100644 --- a/voctocore/tests/test_audiomix_multiple_sources.py +++ b/voctocore/tests/test_audiomix_multiple_sources.py @@ -1,9 +1,9 @@ import unittest -from lib.errors.configuration_error import ConfigurationError -from tests.helper.voctomix_test import VoctomixTest from lib.audiomix import AudioMix from lib.config import Config +from lib.errors.configuration_error import ConfigurationError +from tests.helper.voctomix_test import VoctomixTest # noinspection PyUnusedLocal diff --git a/voctocore/tests/test_config_getlist.py b/voctocore/tests/test_config_getlist.py index 2f97d6d1..221b9aa7 100644 --- a/voctocore/tests/test_config_getlist.py +++ b/voctocore/tests/test_config_getlist.py @@ -1,6 +1,5 @@ -from tests.helper.voctomix_test import VoctomixTest - from lib.config import Config +from tests.helper.voctomix_test import VoctomixTest # noinspection PyUnusedLocal diff --git a/voctocore/tests/videomix/test_videomixer_set_composite_mode.py b/voctocore/tests/videomix/test_videomixer_set_composite_mode.py index 71bb8ecb..efeab89c 100644 --- a/voctocore/tests/videomix/test_videomixer_set_composite_mode.py +++ b/voctocore/tests/videomix/test_videomixer_set_composite_mode.py @@ -1,8 +1,7 @@ +from lib.config import Config +from lib.videomix import CompositeModes, VideoMix from mock import MagicMock - from tests.helper.voctomix_test import VoctomixTest -from lib.config import Config -from lib.videomix import VideoMix, CompositeModes class VideomixerSetCompositeMode(VoctomixTest): diff --git a/voctocore/tests/videomix/test_videomixer_set_sources.py b/voctocore/tests/videomix/test_videomixer_set_sources.py index 7b396bf2..1fec3cf2 100644 --- a/voctocore/tests/videomix/test_videomixer_set_sources.py +++ b/voctocore/tests/videomix/test_videomixer_set_sources.py @@ -1,5 +1,5 @@ -from tests.helper.voctomix_test import VoctomixTest from lib.videomix import VideoMix +from tests.helper.voctomix_test import VoctomixTest class VideomixerSetSources(VoctomixTest): diff --git a/voctocore/voctocore.py b/voctocore/voctocore.py index e4742cca..65bc0e54 100755 --- a/voctocore/voctocore.py +++ b/voctocore/voctocore.py @@ -1,18 +1,18 @@ #!/usr/bin/env python3 -import gi -import sdnotify -import signal import logging +import signal import sys +import gi +import sdnotify + sys.path.insert(0, '.') from vocto.debug import gst_log_messages # import GStreamer and GLib-Helper classes gi.require_version('Gst', '1.0') gi.require_version('GstNet', '1.0') -from gi.repository import Gst, GLib - +from gi.repository import GLib, Gst # import local classes from lib.loghandler import LogHandler @@ -43,8 +43,8 @@ def __init__(self): # import local which use the config or the logging system # this is required, so that we can configure logging, # before reading the config - from lib.pipeline import Pipeline from lib.controlserver import ControlServer + from lib.pipeline import Pipeline self.log = logging.getLogger('Voctocore') self.log.debug('Creating GLib-MainLoop') diff --git a/voctogui/lib/audiodisplay.py b/voctogui/lib/audiodisplay.py index 2b170436..a853ebb2 100644 --- a/voctogui/lib/audiodisplay.py +++ b/voctogui/lib/audiodisplay.py @@ -1,14 +1,14 @@ #!/usr/bin/env python3 -import logging -import os import json +import logging import math +import os from configparser import NoOptionError -from gi.repository import Gtk, Gdk, GObject import lib.connection as Connection - +from gi.repository import Gdk, GObject, Gtk from lib.config import Config + from vocto.port import Port diff --git a/voctogui/lib/audioleveldisplay.py b/voctogui/lib/audioleveldisplay.py index 8e9e5338..6f61c7c9 100644 --- a/voctogui/lib/audioleveldisplay.py +++ b/voctogui/lib/audioleveldisplay.py @@ -1,7 +1,7 @@ import math -import cairo -from gi.repository import Gtk, GLib +import cairo +from gi.repository import GLib, Gtk class AudioLevelDisplay(Gtk.DrawingArea): diff --git a/voctogui/lib/clock.py b/voctogui/lib/clock.py index 43f0ab08..c801e323 100644 --- a/voctogui/lib/clock.py +++ b/voctogui/lib/clock.py @@ -1,5 +1,6 @@ #!/usr/bin/python3 import logging + import gi gi.require_version('GstNet', '1.0') diff --git a/voctogui/lib/config.py b/voctogui/lib/config.py index ff3b3144..e8ba6847 100644 --- a/voctogui/lib/config.py +++ b/voctogui/lib/config.py @@ -1,8 +1,10 @@ #!/usr/bin/env python3 -import os.path import logging -from lib.args import Args +import os.path + import lib.connection as Connection +from lib.args import Args + from vocto.config import VocConfigParser __all__ = ['Config'] diff --git a/voctogui/lib/connection.py b/voctogui/lib/connection.py index ee76bff7..86cc6832 100644 --- a/voctogui/lib/connection.py +++ b/voctogui/lib/connection.py @@ -1,10 +1,10 @@ +import json import logging import socket -import json import sys - from queue import Queue -from gi.repository import Gtk, GObject + +from gi.repository import GObject, Gtk from vocto.port import Port diff --git a/voctogui/lib/ports.py b/voctogui/lib/ports.py index 00e95a73..69ceed91 100644 --- a/voctogui/lib/ports.py +++ b/voctogui/lib/ports.py @@ -1,12 +1,13 @@ #!/usr/bin/env python3 +import json import logging import os -import json -from gi.repository import Gtk, Gst, GLib +import lib.connection as Connection +from gi.repository import GLib, Gst, Gtk from lib.config import Config from lib.uibuilder import UiBuilder -import lib.connection as Connection + from vocto.port import Port # time interval to re-fetch queue timings diff --git a/voctogui/lib/queues.py b/voctogui/lib/queues.py index 397252c6..6b8f5107 100644 --- a/voctogui/lib/queues.py +++ b/voctogui/lib/queues.py @@ -1,12 +1,12 @@ #!/usr/bin/env python3 +import json import logging import os -import json -from gi.repository import Gtk, Gst, GLib +import lib.connection as Connection +from gi.repository import GLib, Gst, Gtk from lib.config import Config from lib.uibuilder import UiBuilder -import lib.connection as Connection # time interval to re-fetch queue timings TIMER_RESOLUTION = 1.0 diff --git a/voctogui/lib/studioclock.py b/voctogui/lib/studioclock.py index 8754f822..9d3beb83 100644 --- a/voctogui/lib/studioclock.py +++ b/voctogui/lib/studioclock.py @@ -1,8 +1,8 @@ import math import time -import cairo -from gi.repository import Gtk, GLib +import cairo +from gi.repository import GLib, Gtk # studio clock that displays a clock like mentioned in: diff --git a/voctogui/lib/toolbar/blinder.py b/voctogui/lib/toolbar/blinder.py index 1476c916..eba27837 100644 --- a/voctogui/lib/toolbar/blinder.py +++ b/voctogui/lib/toolbar/blinder.py @@ -1,12 +1,10 @@ #!/usr/bin/env python3 import logging import os - import time -from gi.repository import Gtk, GLib import lib.connection as Connection - +from gi.repository import GLib, Gtk from lib.config import Config diff --git a/voctogui/lib/toolbar/buttons.py b/voctogui/lib/toolbar/buttons.py index 76c11d31..eae54d91 100644 --- a/voctogui/lib/toolbar/buttons.py +++ b/voctogui/lib/toolbar/buttons.py @@ -1,7 +1,8 @@ #!/usr/bin/env python3 -from gi.repository import Gtk import sys -from lib.toolbar.widgets import _decode, Widgets + +from gi.repository import Gtk +from lib.toolbar.widgets import Widgets, _decode class Buttons(Widgets): diff --git a/voctogui/lib/toolbar/misc.py b/voctogui/lib/toolbar/misc.py index e3b5ffbc..f7a4c36a 100644 --- a/voctogui/lib/toolbar/misc.py +++ b/voctogui/lib/toolbar/misc.py @@ -1,9 +1,9 @@ #!/usr/bin/env python3 import logging -from gi.repository import Gdk, Gtk -from lib.config import Config import lib.connection as Connection +from gi.repository import Gdk, Gtk +from lib.config import Config class MiscToolbarController(object): diff --git a/voctogui/lib/toolbar/mix.py b/voctogui/lib/toolbar/mix.py index bdb997fe..4998d636 100644 --- a/voctogui/lib/toolbar/mix.py +++ b/voctogui/lib/toolbar/mix.py @@ -1,15 +1,15 @@ #!/usr/bin/env python3 -import os import logging +import os -from gi.repository import Gtk import lib.connection as Connection - +from gi.repository import Gtk from lib.config import Config -from vocto.composite_commands import CompositeCommand from lib.toolbar.buttons import Buttons from lib.uibuilder import UiBuilder +from vocto.composite_commands import CompositeCommand + class MixToolbarController(object): """Manages Accelerators and Clicks on the Preview Composition Toolbar-Buttons""" diff --git a/voctogui/lib/toolbar/overlay.py b/voctogui/lib/toolbar/overlay.py index 7f9401a0..ee1000bd 100644 --- a/voctogui/lib/toolbar/overlay.py +++ b/voctogui/lib/toolbar/overlay.py @@ -1,15 +1,15 @@ #!/usr/bin/env python3 -import os import logging +import os +from datetime import datetime, timedelta -from gi.repository import Gtk import lib.connection as Connection - +from gi.repository import Gtk from lib.config import Config -from lib.uibuilder import UiBuilder from lib.toolbar.widgets import Widgets -from datetime import datetime, timedelta -from vocto.command_helpers import quote, dequote, str2bool +from lib.uibuilder import UiBuilder + +from vocto.command_helpers import dequote, quote, str2bool class OverlayToolbarController(object): diff --git a/voctogui/lib/toolbar/preview.py b/voctogui/lib/toolbar/preview.py index 4a70a555..e45a568a 100644 --- a/voctogui/lib/toolbar/preview.py +++ b/voctogui/lib/toolbar/preview.py @@ -1,16 +1,16 @@ #!/usr/bin/env python3 -import os -import logging import copy +import logging +import os -from gi.repository import Gtk import lib.connection as Connection - +from gi.repository import Gtk from lib.config import Config -from vocto.composite_commands import CompositeCommand from lib.toolbar.buttons import Buttons from lib.uibuilder import UiBuilder +from vocto.composite_commands import CompositeCommand + class PreviewToolbarController(object): """Manages Accelerators and Clicks on the Preview Composition Toolbar-Buttons""" diff --git a/voctogui/lib/toolbar/widgets.py b/voctogui/lib/toolbar/widgets.py index 0c179c30..d9a89cc1 100644 --- a/voctogui/lib/toolbar/widgets.py +++ b/voctogui/lib/toolbar/widgets.py @@ -1,7 +1,8 @@ #!/usr/bin/env python3 -from gi.repository import Gtk import sys +from gi.repository import Gtk + def _decode(text, multiline=True): '''decode multiline text''' diff --git a/voctogui/lib/ui.py b/voctogui/lib/ui.py index eba8d8c5..c6b7b6cd 100644 --- a/voctogui/lib/ui.py +++ b/voctogui/lib/ui.py @@ -1,23 +1,20 @@ import logging -from gi.repository import Gtk, Gdk -from lib.config import Config -from lib.uibuilder import UiBuilder - -from lib.videodisplay import VideoDisplay -from lib.audioleveldisplay import AudioLevelDisplay +from gi.repository import Gdk, Gtk from lib.audiodisplay import AudioDisplay -from lib.videopreviews import VideoPreviewsController -from lib.queues import QueuesWindowController +from lib.audioleveldisplay import AudioLevelDisplay +from lib.config import Config from lib.ports import PortsWindowController - -from lib.toolbar.mix import MixToolbarController -from lib.toolbar.preview import PreviewToolbarController -from lib.toolbar.overlay import OverlayToolbarController +from lib.queues import QueuesWindowController +from lib.studioclock import StudioClock from lib.toolbar.blinder import BlinderToolbarController from lib.toolbar.misc import MiscToolbarController - -from lib.studioclock import StudioClock +from lib.toolbar.mix import MixToolbarController +from lib.toolbar.overlay import OverlayToolbarController +from lib.toolbar.preview import PreviewToolbarController +from lib.uibuilder import UiBuilder +from lib.videodisplay import VideoDisplay +from lib.videopreviews import VideoPreviewsController from vocto.port import Port diff --git a/voctogui/lib/uibuilder.py b/voctogui/lib/uibuilder.py index 2325537d..0074800c 100644 --- a/voctogui/lib/uibuilder.py +++ b/voctogui/lib/uibuilder.py @@ -1,4 +1,5 @@ import logging + from gi.repository import Gtk diff --git a/voctogui/lib/videodisplay.py b/voctogui/lib/videodisplay.py index e130b157..6f3099eb 100644 --- a/voctogui/lib/videodisplay.py +++ b/voctogui/lib/videodisplay.py @@ -1,14 +1,13 @@ import logging import sys -from gi.repository import Gst, Gdk - +from gi.repository import Gdk, Gst from lib.args import Args -from lib.config import Config from lib.clock import Clock +from lib.config import Config -from vocto.port import Port from vocto.debug import gst_generate_dot +from vocto.port import Port from vocto.pretty import pretty from vocto.video_codecs import construct_video_decoder_pipeline diff --git a/voctogui/lib/videopreviews.py b/voctogui/lib/videopreviews.py index ade11ea3..ae6a6990 100644 --- a/voctogui/lib/videopreviews.py +++ b/voctogui/lib/videopreviews.py @@ -1,16 +1,16 @@ #!/usr/bin/env python3 -import logging import json +import logging import math import os from configparser import NoOptionError -from gi.repository import Gtk, Gdk, GObject -from lib.videodisplay import VideoDisplay -from lib.audiodisplay import AudioDisplay import lib.connection as Connection - +from gi.repository import Gdk, GObject, Gtk +from lib.audiodisplay import AudioDisplay from lib.config import Config +from lib.videodisplay import VideoDisplay + from vocto.port import Port diff --git a/voctogui/voctogui.py b/voctogui/voctogui.py index 92125cc2..9778622c 100755 --- a/voctogui/voctogui.py +++ b/voctogui/voctogui.py @@ -6,12 +6,12 @@ gi.require_version('Gst', '1.0') gi.require_version('GstVideo', '1.0') gi.require_version('GstNet', '1.0') -from gi.repository import Gtk, Gdk, Gst, GstVideo - -import signal import logging -import sys import os +import signal +import sys + +from gi.repository import Gdk, Gst, GstVideo, Gtk sys.path.insert(0, '.') from vocto.debug import gst_log_messages @@ -141,10 +141,9 @@ def main(): config.load() - from lib.config import Config - # establish a synchronus connection to server import lib.connection as Connection + from lib.config import Config Connection.establish(Config.getHost()) @@ -165,8 +164,8 @@ def main(): Config.getHost(), ) - import lib.connection as Connection import lib.clock as ClockManager + import lib.connection as Connection # obtain network-clock ClockManager.obtainClock(Connection.ip)