From 36b2dbc9735985d5e97aa3367ae7c787e9daadd6 Mon Sep 17 00:00:00 2001 From: yomguy Date: Sat, 6 Oct 2012 00:35:41 +0200 Subject: [PATCH] fix grapher tests, cleanup --- tests/testdecoding.py | 2 +- tests/testgraphing.py | 20 ++++++++++++++++++-- timeside/__init__.py | 13 +------------ timeside/analyzer/__init__.py | 4 +--- timeside/decoder/__init__.py | 1 - timeside/encoder/__init__.py | 3 +-- 6 files changed, 22 insertions(+), 21 deletions(-) diff --git a/tests/testdecoding.py b/tests/testdecoding.py index a1933b6..a8b64f8 100644 --- a/tests/testdecoding.py +++ b/tests/testdecoding.py @@ -1,4 +1,4 @@ -from timeside.decoder import * +from timeside.decoder.core import FileDecoder from unit_timeside import * import os.path diff --git a/tests/testgraphing.py b/tests/testgraphing.py index b10e82a..ea39eda 100644 --- a/tests/testgraphing.py +++ b/tests/testgraphing.py @@ -1,5 +1,4 @@ -from timeside.decoder import * -from timeside.grapher import * +from timeside.decoder.core import FileDecoder from unit_timeside import * import os.path @@ -15,24 +14,28 @@ class TestGraphing(TestCase): # WAVEFORMS def testWav2Waveform(self): "Test WAV to Waveform" + from timeside.grapher.waveform import Waveform self.source = os.path.join (os.path.dirname(__file__), "samples/sweep.wav") self.image = "/tmp/test_waveform_sweep_wav.png" self.grapher = Waveform(width=1024, height=256, bg_color=(0,0,0), color_scheme='default') def testFlac2Waveform(self): "Test FLAC to Waveform" + from timeside.grapher.waveform import Waveform self.source = os.path.join (os.path.dirname(__file__), "samples/sweep.flac") self.image = "/tmp/test_waveform_sweep_flac.png" self.grapher = Waveform(width=1024, height=256, bg_color=(0,0,0), color_scheme='default') def testMp32Waveform(self): "Test MP3 to Waveform" + from timeside.grapher.waveform import Waveform self.source = os.path.join (os.path.dirname(__file__), "samples/sweep.mp3") self.image = "/tmp/test_waveform_sweep_mp3.png" self.grapher = Waveform(width=1024, height=256, bg_color=(0,0,0), color_scheme='default') def testOgg2Waveform(self): "Test OGG to Waveform" + from timeside.grapher.waveform import Waveform self.source = os.path.join (os.path.dirname(__file__), "samples/sweep.ogg") self.image = "/tmp/test_waveform_sweep_ogg.png" self.grapher = Waveform(width=1024, height=256, bg_color=(0,0,0), color_scheme='default') @@ -40,6 +43,7 @@ class TestGraphing(TestCase): # WAVEFORM SIMPLE def testWav2WaveformSimple(self): "Test WAV to WaveformSimple" + from timeside.grapher.waveform_simple import WaveformSimple self.source = os.path.join (os.path.dirname(__file__), "samples/sweep.wav") self.image = "/tmp/test_waveform_simple_sweep_wav.png" self.grapher = WaveformSimple(width=1024, height=256, bg_color=(0,0,0), color_scheme='default') @@ -47,24 +51,28 @@ class TestGraphing(TestCase): # WAVEFORMS CONTOUR BLACK def testWav2WaveformContourBlack(self): "Test WAV to WaveformContourBlack" + from timeside.grapher.waveform_contour_bk import WaveformContourBlack self.source = os.path.join (os.path.dirname(__file__), "samples/sweep.wav") self.image = "/tmp/test_waveform_contour_bk_sweep_wav.png" self.grapher = WaveformContourBlack(width=1024, height=256, bg_color=(0,0,0), color_scheme='default') def testFlac2WaveformContourBlack(self): "Test FLAC to WaveformContourBlack" + from timeside.grapher.waveform_contour_bk import WaveformContourBlack self.source = os.path.join (os.path.dirname(__file__), "samples/sweep.flac") self.image = "/tmp/test_waveform_contour_bk_sweep_flac.png" self.grapher = WaveformContourBlack(width=1024, height=256, bg_color=(0,0,0), color_scheme='default') def testMp32WaveformContourBlack(self): "Test MP3 to WaveformContourBlack" + from timeside.grapher.waveform_contour_bk import WaveformContourBlack self.source = os.path.join (os.path.dirname(__file__), "samples/sweep.mp3") self.image = "/tmp/test_waveform_contour_bk_sweep_mp3.png" self.grapher = WaveformContourBlack(width=1024, height=256, bg_color=(0,0,0), color_scheme='default') def testOgg2WaveformContourBlack(self): "Test OGG to WaveformContourBlack" + from timeside.grapher.waveform_contour_bk import WaveformContourBlack self.source = os.path.join (os.path.dirname(__file__), "samples/sweep.ogg") self.image = "/tmp/test_waveform_contour_bk_sweep_ogg.png" self.grapher = WaveformContourBlack(width=1024, height=256, bg_color=(0,0,0), color_scheme='default') @@ -72,24 +80,28 @@ class TestGraphing(TestCase): # WAVEFORMS CONTOUR WHITE def testWav2WaveformContourWhite(self): "Test WAV to WaveformContourWhite" + from timeside.grapher.waveform_contour_wh import WaveformContourWhite self.source = os.path.join (os.path.dirname(__file__), "samples/sweep.wav") self.image = "/tmp/test_waveform_contour_wh_sweep_wav.png" self.grapher = WaveformContourWhite(width=1024, height=256, bg_color=(0,0,0), color_scheme='default') def testFlac2WaveformContourWhite(self): "Test FLAC to WaveformContourWhite" + from timeside.grapher.waveform_contour_wh import WaveformContourWhite self.source = os.path.join (os.path.dirname(__file__), "samples/sweep.flac") self.image = "/tmp/test_waveform_contour_wh_sweep_flac.png" self.grapher = WaveformContourWhite(width=1024, height=256, bg_color=(0,0,0), color_scheme='default') def testMp32WaveformContourWhite(self): "Test MP3 to WaveformContourWhite" + from timeside.grapher.waveform_contour_wh import WaveformContourWhite self.source = os.path.join (os.path.dirname(__file__), "samples/sweep.mp3") self.image = "/tmp/test_waveform_contour_wh_sweep_mp3.png" self.grapher = WaveformContourWhite(width=1024, height=256, bg_color=(0,0,0), color_scheme='default') def testOggWaveformContourWhite(self): "Test OGG to WaveformContourWhite" + from timeside.grapher.waveform_contour_wh import WaveformContourWhite self.source = os.path.join (os.path.dirname(__file__), "samples/sweep.ogg") self.image = "/tmp/test_waveform_contour_wh_sweep_ogg.png" self.grapher = WaveformContourWhite(width=1024, height=256, bg_color=(0,0,0), color_scheme='default') @@ -98,24 +110,28 @@ class TestGraphing(TestCase): # SPECTROGRAMS def testWav2Spectrogram(self): "Test WAV to Spectrogram" + from timeside.grapher.spectrogram import Spectrogram self.source = os.path.join (os.path.dirname(__file__), "samples/sweep.wav") self.image = "/tmp/test_spectrogram_sweep_wav.png" self.grapher = Spectrogram(width=1024, height=256, bg_color=(0,0,0), color_scheme='default') def testMp32Spectrogram(self): "Test MP3 to Spectrogram" + from timeside.grapher.spectrogram import Spectrogram self.source = os.path.join (os.path.dirname(__file__), "samples/sweep.mp3") self.image = "/tmp/test_spectrogram_sweep_mp3.png" self.grapher = Spectrogram(width=1024, height=256, bg_color=(0,0,0), color_scheme='default') def testFlac2Spectrogram(self): "Test FLAC to Spectrogram" + from timeside.grapher.spectrogram import Spectrogram self.source = os.path.join (os.path.dirname(__file__), "samples/sweep.flac") self.image = "/tmp/test_spectrogram_sweep_flac.png" self.grapher = Spectrogram(width=1024, height=256, bg_color=(0,0,0), color_scheme='default') def testOgg2Spectrogram(self): "Test OGG to Spectrogram" + from timeside.grapher.spectrogram import Spectrogram self.source = os.path.join (os.path.dirname(__file__), "samples/sweep.ogg") self.image = "/tmp/test_spectrogram_sweep_ogg.png" self.grapher = Spectrogram(width=1024, height=256, bg_color=(0,0,0), color_scheme='default') diff --git a/timeside/__init__.py b/timeside/__init__.py index 8b25ad8..e1b8e0b 100644 --- a/timeside/__init__.py +++ b/timeside/__init__.py @@ -1,14 +1,3 @@ # -*- coding: utf-8 -*- -import timeside.api -import timeside.exceptions -import timeside.core -import timeside.component -import timeside.metadata -import timeside.decoder -import timeside.encoder -import timeside.grapher -import timeside.analyzer -from timeside.core import * - -__version__ = '0.4.1' +__version__ = '0.4.2' diff --git a/timeside/analyzer/__init__.py b/timeside/analyzer/__init__.py index 92d3bf9..02c0119 100644 --- a/timeside/analyzer/__init__.py +++ b/timeside/analyzer/__init__.py @@ -1,9 +1,7 @@ # -*- coding: utf-8 -*- -from core import * - -#from duration import * from max_level import * from mean_level import * from dc import * +#from duration import * diff --git a/timeside/decoder/__init__.py b/timeside/decoder/__init__.py index 78457b3..fcb882b 100644 --- a/timeside/decoder/__init__.py +++ b/timeside/decoder/__init__.py @@ -1,4 +1,3 @@ # -*- coding: utf-8 -*- -import timeside.core from core import * diff --git a/timeside/encoder/__init__.py b/timeside/encoder/__init__.py index 18745cf..5a09e94 100644 --- a/timeside/encoder/__init__.py +++ b/timeside/encoder/__init__.py @@ -5,7 +5,6 @@ from ogg import * from wav import * from mp3 import * from flac import * -#from m4a import * +from m4a import * from webm import * -#from timeside.encoder.flac import * -- 2.39.5