voctocore: pep8ify

* Indent by 4 spaces
* Reformat some argument lists
* Two newlines before free functions
* One newline before methods
* Spaces around infix operators

1 files changed, 122 insertions, 112 deletions

diff --git a/voctocore/lib/avsource.py b/voctocore/lib/avsource.py
index aa604b2..c2e08da 100644
--- a/voctocore/lib/avsource.py
+++ b/voctocore/lib/avsource.py
@@ -5,116 +5,126 @@ from lib.config import Config
 from lib.tcpsingleconnection import TCPSingleConnection
 from lib.clock import Clock
 
+
 class AVSource(TCPSingleConnection):
-	def __init__(self, name, port, outputs=None, has_audio=True, has_video=True):
-		self.log = logging.getLogger('AVSource['+name+']')
-		super().__init__(port)
-
-		if outputs is None:
-			outputs = [name]
-
-		assert has_audio or has_video
-
-		self.name = name
-		self.has_audio = has_audio
-		self.has_video = has_video
-		self.outputs = outputs
-
-	def on_accepted(self, conn, addr):
-		pipeline = """
-			fdsrc fd={fd} blocksize=1048576 !
-			queue !
-			matroskademux name=demux
-		""".format(
-			fd=conn.fileno()
-		)
-
-		if self.has_audio:
-			pipeline += """
-				demux. !
-				{acaps} !
-				queue !
-				tee name=atee
-			""".format(
-				acaps=Config.get('mix', 'audiocaps')
-			)
-
-			for output in self.outputs:
-				pipeline += """
-					atee. ! queue ! interaudiosink channel=audio_{output}
-				""".format(
-					output=output
-				)
-
-		if self.has_video:
-			pipeline += """
-				demux. !
-				{vcaps} !
-				queue !
-				tee name=vtee
-			""".format(
-				vcaps=Config.get('mix', 'videocaps')
-			)
-
-			for output in self.outputs:
-				pipeline += """
-					vtee. ! queue ! intervideosink channel=video_{output}
-				""".format(
-					output=output
-				)
-
-		self.log.debug('Launching Source-Pipeline:\n%s', pipeline)
-		self.receiverPipeline = Gst.parse_launch(pipeline)
-		self.receiverPipeline.use_clock(Clock)
-
-		self.log.debug('Binding End-of-Stream-Signal on Source-Pipeline')
-		self.receiverPipeline.bus.add_signal_watch()
-		self.receiverPipeline.bus.connect("message::eos", self.on_eos)
-		self.receiverPipeline.bus.connect("message::error", self.on_error)
-
-		self.all_video_caps = Gst.Caps.from_string('video/x-raw')
-		self.video_caps = Gst.Caps.from_string(Config.get('mix', 'videocaps'))
-
-		self.all_audio_caps = Gst.Caps.from_string('audio/x-raw')
-		self.audio_caps = Gst.Caps.from_string(Config.get('mix', 'audiocaps'))
-
-		demux = self.receiverPipeline.get_by_name('demux')
-		demux.connect('pad-added', self.on_pad_added)
-
-		self.receiverPipeline.set_state(Gst.State.PLAYING)
-
-	def on_pad_added(self, demux, src_pad):
-		caps = src_pad.query_caps(None)
-		self.log.debug('demuxer added pad w/ caps: %s', caps.to_string())
-		if caps.can_intersect(self.all_audio_caps):
-			self.log.debug('new demuxer-pad is a audio-pad, testing against configured audio-caps')
-			if not caps.can_intersect(self.audio_caps):
-				self.log.warning('the incoming connection presented a video-stream that is not compatible to the configured caps')
-				self.log.warning('   incoming caps:   %s', caps.to_string())
-				self.log.warning('   configured caps: %s', self.audio_caps.to_string())
-
-
-		elif caps.can_intersect(self.all_video_caps):
-			self.log.debug('new demuxer-pad is a video-pad, testing against configured video-caps')
-			if not caps.can_intersect(self.video_caps):
-				self.log.warning('the incoming connection presented a video-stream that is not compatible to the configured caps')
-				self.log.warning('   incoming caps:   %s', caps.to_string())
-				self.log.warning('   configured caps: %s', self.video_caps.to_string())
-
-	def on_eos(self, bus, message):
-		self.log.debug('Received End-of-Stream-Signal on Source-Pipeline')
-		if self.currentConnection is not None:
-			self.disconnect()
-
-	def on_error(self, bus, message):
-		self.log.debug('Received Error-Signal on Source-Pipeline')
-		(error, debug) = message.parse_error()
-		self.log.debug('Error-Details: #%u: %s', error.code, debug)
-
-		if self.currentConnection is not None:
-			self.disconnect()
-
-	def disconnect(self):
-		self.receiverPipeline.set_state(Gst.State.NULL)
-		self.receiverPipeline = None
-		self.close_connection()
+
+    def __init__(self, name, port, outputs=None,
+                 has_audio=True, has_video=True):
+        self.log = logging.getLogger('AVSource[{}]'.format(name))
+        super().__init__(port)
+
+        if outputs is None:
+            outputs = [name]
+
+        assert has_audio or has_video
+
+        self.name = name
+        self.has_audio = has_audio
+        self.has_video = has_video
+        self.outputs = outputs
+
+    def on_accepted(self, conn, addr):
+        pipeline = """
+            fdsrc fd={fd} blocksize=1048576 !
+            queue !
+            matroskademux name=demux
+        """.format(
+            fd=conn.fileno()
+        )
+
+        if self.has_audio:
+            pipeline += """
+                demux. !
+                {acaps} !
+                queue !
+                tee name=atee
+            """.format(
+                acaps=Config.get('mix', 'audiocaps')
+            )
+
+            for output in self.outputs:
+                pipeline += """
+                    atee. ! queue ! interaudiosink channel=audio_{output}
+                """.format(
+                    output=output
+                )
+
+        if self.has_video:
+            pipeline += """
+                demux. !
+                {vcaps} !
+                queue !
+                tee name=vtee
+            """.format(
+                vcaps=Config.get('mix', 'videocaps')
+            )
+
+            for output in self.outputs:
+                pipeline += """
+                    vtee. ! queue ! intervideosink channel=video_{output}
+                """.format(
+                    output=output
+                )
+
+        self.log.debug('Launching Source-Pipeline:\n%s', pipeline)
+        self.receiverPipeline = Gst.parse_launch(pipeline)
+        self.receiverPipeline.use_clock(Clock)
+
+        self.log.debug('Binding End-of-Stream-Signal on Source-Pipeline')
+        self.receiverPipeline.bus.add_signal_watch()
+        self.receiverPipeline.bus.connect("message::eos", self.on_eos)
+        self.receiverPipeline.bus.connect("message::error", self.on_error)
+
+        self.all_video_caps = Gst.Caps.from_string('video/x-raw')
+        self.video_caps = Gst.Caps.from_string(Config.get('mix', 'videocaps'))
+
+        self.all_audio_caps = Gst.Caps.from_string('audio/x-raw')
+        self.audio_caps = Gst.Caps.from_string(Config.get('mix', 'audiocaps'))
+
+        demux = self.receiverPipeline.get_by_name('demux')
+        demux.connect('pad-added', self.on_pad_added)
+
+        self.receiverPipeline.set_state(Gst.State.PLAYING)
+
+    def on_pad_added(self, demux, src_pad):
+        caps = src_pad.query_caps(None)
+        self.log.debug('demuxer added pad w/ caps: %s', caps.to_string())
+        if caps.can_intersect(self.all_audio_caps):
+            self.log.debug('new demuxer-pad is a audio-pad, '
+                           'testing against configured audio-caps')
+            if not caps.can_intersect(self.audio_caps):
+                self.log.warning('the incoming connection presented '
+                                 'a video-stream that is not compatible '
+                                 'to the configured caps')
+                self.log.warning('   incoming caps:   %s', caps.to_string())
+                self.log.warning('   configured caps: %s',
+                                 self.audio_caps.to_string())
+
+        elif caps.can_intersect(self.all_video_caps):
+            self.log.debug('new demuxer-pad is a video-pad, '
+                           'testing against configured video-caps')
+            if not caps.can_intersect(self.video_caps):
+                self.log.warning('the incoming connection presented '
+                                 'a video-stream that is not compatible '
+                                 'to the configured caps')
+                self.log.warning('   incoming caps:   %s', caps.to_string())
+                self.log.warning('   configured caps: %s',
+                                 self.video_caps.to_string())
+
+    def on_eos(self, bus, message):
+        self.log.debug('Received End-of-Stream-Signal on Source-Pipeline')
+        if self.currentConnection is not None:
+            self.disconnect()
+
+    def on_error(self, bus, message):
+        self.log.debug('Received Error-Signal on Source-Pipeline')
+        (error, debug) = message.parse_error()
+        self.log.debug('Error-Details: #%u: %s', error.code, debug)
+
+        if self.currentConnection is not None:
+            self.disconnect()
+
+    def disconnect(self):
+        self.receiverPipeline.set_state(Gst.State.NULL)
+        self.receiverPipeline = None
+        self.close_connection()