From: Thomas Fillon Date: Tue, 22 Apr 2014 13:30:51 +0000 (+0200) Subject: Fix PEP8 on timeside/encoder/ with autopep8 X-Git-Tag: 0.5.5~1^2~38^2~4 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f74973299dffd5b4524145fe473a6077d3afa871;p=timeside.git Fix PEP8 on timeside/encoder/ with autopep8 --- diff --git a/timeside/encoder/__init__.py b/timeside/encoder/__init__.py index 0d341a2..4303fa2 100644 --- a/timeside/encoder/__init__.py +++ b/timeside/encoder/__init__.py @@ -7,4 +7,4 @@ from flac import FlacEncoder from m4a import AacEncoder from webm import WebMEncoder from audiosink import AudioSink -from opus import OpusEncoder \ No newline at end of file +from opus import OpusEncoder diff --git a/timeside/encoder/audiosink.py b/timeside/encoder/audiosink.py index b7e6531..524d685 100644 --- a/timeside/encoder/audiosink.py +++ b/timeside/encoder/audiosink.py @@ -25,7 +25,9 @@ from timeside.encoder.core import GstEncoder from timeside.api import IEncoder from timeside.tools import * + class AudioSink(GstEncoder): + """gstreamer-based Audio Sink This encoder plays the decoded audio stream to the sound card diff --git a/timeside/encoder/core.py b/timeside/encoder/core.py index ef7614e..72acbf2 100644 --- a/timeside/encoder/core.py +++ b/timeside/encoder/core.py @@ -54,7 +54,8 @@ class GstEncoder(Processor): if os.path.isdir(output): raise IOError("Encoder output must be a file, not a directory") elif os.path.isfile(output) and not overwrite: - raise IOError("Encoder output %s exists, but overwrite set to False") + raise IOError( + "Encoder output %s exists, but overwrite set to False") self.filename = output else: self.filename = None @@ -145,7 +146,7 @@ class GstEncoder(Processor): self.end_cond.release() def _on_new_buffer_streaming(self, appsink): - #print 'pull-buffer' + # print 'pull-buffer' chunk = appsink.emit('pull-buffer') self._streaming_queue.put(chunk) diff --git a/timeside/encoder/flac.py b/timeside/encoder/flac.py index e35dfaa..542079b 100644 --- a/timeside/encoder/flac.py +++ b/timeside/encoder/flac.py @@ -26,12 +26,14 @@ from timeside.tools import * class FlacEncoder(GstEncoder): + """ gstreamer-based FLAC encoder """ implements(IEncoder) @interfacedoc def setup(self, channels=None, samplerate=None, blocksize=None, totalframes=None): - super(FlacEncoder, self).setup(channels, samplerate, blocksize, totalframes) + super(FlacEncoder, self).setup( + channels, samplerate, blocksize, totalframes) self.pipe = ''' appsrc name=src ! audioconvert ! flacenc ''' @@ -42,14 +44,13 @@ class FlacEncoder(GstEncoder): t. ! queue ! appsink name=app sync=False ''' % self.filename - elif self.filename : + elif self.filename: self.pipe += '! filesink location=%s async=False sync=False ' % self.filename else: self.pipe += '! queue ! appsink name=app sync=False ' self.start_pipeline(channels, samplerate) - @staticmethod @interfacedoc def id(): diff --git a/timeside/encoder/m4a.py b/timeside/encoder/m4a.py index c23e3d7..a036d21 100644 --- a/timeside/encoder/m4a.py +++ b/timeside/encoder/m4a.py @@ -26,17 +26,19 @@ from timeside.tools import * class AacEncoder(GstEncoder): + """ gstreamer-based AAC encoder """ implements(IEncoder) - def __init__(self, output, streaming = False, overwrite = False): + def __init__(self, output, streaming=False, overwrite=False): super(AacEncoder, self).__init__(output, streaming, overwrite) if self.streaming: raise Exception("Streaming not supported") @interfacedoc def setup(self, channels=None, samplerate=None, blocksize=None, totalframes=None): - super(AacEncoder, self).setup(channels, samplerate, blocksize, totalframes) + super(AacEncoder, self).setup( + channels, samplerate, blocksize, totalframes) self.streaming = False self.pipe = ''' appsrc name=src @@ -51,14 +53,13 @@ class AacEncoder(GstEncoder): t. ! queue ! appsink name=app sync=False ''' % self.filename - elif self.filename : + elif self.filename: self.pipe += '! filesink location=%s async=False sync=False ' % self.filename else: self.pipe += '! queue ! appsink name=app sync=False ' self.start_pipeline(channels, samplerate) - @staticmethod @interfacedoc def id(): diff --git a/timeside/encoder/mp3.py b/timeside/encoder/mp3.py index eee74cf..5ff28f6 100644 --- a/timeside/encoder/mp3.py +++ b/timeside/encoder/mp3.py @@ -30,8 +30,8 @@ from timeside.encoder.core import GstEncoder from timeside.api import IEncoder - class Mp3Encoder(GstEncoder): + """ gstreamer-based MP3 encoder """ implements(IEncoder) @@ -98,7 +98,7 @@ class Mp3Encoder(GstEncoder): try: id3.add(frame) except: - raise IOError('EncoderError: cannot tag "'+tag+'"') + raise IOError('EncoderError: cannot tag "' + tag + '"') try: id3.save() except: diff --git a/timeside/encoder/ogg.py b/timeside/encoder/ogg.py index e56741f..cf1f249 100644 --- a/timeside/encoder/ogg.py +++ b/timeside/encoder/ogg.py @@ -24,13 +24,16 @@ from timeside.encoder.core import GstEncoder from timeside.api import IEncoder from timeside.tools import * + class VorbisEncoder(GstEncoder): + """ gstreamer-based OGG Vorbis encoder """ implements(IEncoder) @interfacedoc def setup(self, channels=None, samplerate=None, blocksize=None, totalframes=None): - super(VorbisEncoder, self).setup(channels, samplerate, blocksize, totalframes) + super(VorbisEncoder, self).setup( + channels, samplerate, blocksize, totalframes) self.pipe = ''' appsrc name=src ! audioconvert ! audioresample ! vorbisenc quality=0.9 @@ -43,14 +46,13 @@ class VorbisEncoder(GstEncoder): t. ! queue ! appsink name=app sync=False ''' % self.filename - elif self.filename : + elif self.filename: self.pipe += '! filesink location=%s async=False sync=False ' % self.filename else: self.pipe += '! queue ! appsink name=app sync=False ' self.start_pipeline(channels, samplerate) - @staticmethod @interfacedoc def id(): @@ -79,4 +81,3 @@ class VorbisEncoder(GstEncoder): @interfacedoc def set_metadata(self, metadata): self.metadata = metadata - diff --git a/timeside/encoder/opus.py b/timeside/encoder/opus.py index 0a185f6..301e0b2 100644 --- a/timeside/encoder/opus.py +++ b/timeside/encoder/opus.py @@ -31,6 +31,7 @@ from timeside.api import IEncoder class OpusEncoder(GstEncoder): + """ gstreamer-based Opus encoder """ implements(IEncoder) diff --git a/timeside/encoder/wav.py b/timeside/encoder/wav.py index 69d5557..99c9a4b 100644 --- a/timeside/encoder/wav.py +++ b/timeside/encoder/wav.py @@ -27,12 +27,14 @@ from timeside.tools import * class WavEncoder(GstEncoder): + """ gstreamer-based WAV encoder """ implements(IEncoder) @interfacedoc def setup(self, channels=None, samplerate=None, blocksize=None, totalframes=None): - super(WavEncoder, self).setup(channels, samplerate, blocksize, totalframes) + super(WavEncoder, self).setup( + channels, samplerate, blocksize, totalframes) self.pipe = ''' appsrc name=src ! audioconvert @@ -44,14 +46,13 @@ class WavEncoder(GstEncoder): t. ! queue ! appsink name=app sync=False ''' % self.filename - elif self.filename : + elif self.filename: self.pipe += '! filesink location=%s async=False sync=False ' % self.filename else: self.pipe += '! queue ! appsink name=app sync=False ' self.start_pipeline(channels, samplerate) - @staticmethod @interfacedoc def id(): @@ -79,5 +80,5 @@ class WavEncoder(GstEncoder): @interfacedoc def set_metadata(self, metadata): - #TODO + # TODO pass diff --git a/timeside/encoder/webm.py b/timeside/encoder/webm.py index 5ff9594..de01d48 100644 --- a/timeside/encoder/webm.py +++ b/timeside/encoder/webm.py @@ -26,6 +26,7 @@ from timeside.tools import * class WebMEncoder(GstEncoder): + """ gstreamer-based WebM encoder """ implements(IEncoder)