Change modules's init files

diff --git a/README.rst b/README.rst
index e0548af7e1782ca89a2247a7633c966942c519c6..c1bb59ab9e484a06fc65d6ac409052bf9484241b 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -114,9 +114,9 @@ News
  * Encoder : transcoded streams where broken. Now fixed with some smart thread controls.
  * Analyzer : update VAMP plugin example in sandbox
  * Analyzer : new *experimental* plugin : Limsi Speech Activity Detection Systems (limsi_sad)
- * Decoder : process any media in streaming mode giving its URL 
+ * Decoder : process any media in streaming mode giving its URL
  * Install : fix some setup requirements
- 
+
 0.5.3
 
  * Make Analyzer rendering more generic and easy to implement
@@ -129,7 +129,7 @@ News
  * Grapher : add a generic Class to display Analyzers through their 'render' method. For now, it only support FrameValueResult analyzer
  * Core : add a condition to catch signal only if a LiveDecoder source is used
  * Various bugfixes
- 
+
 0.5.2
 
  * Add a general launch script "timeside-launch" (see "Shell interface")
@@ -242,7 +242,7 @@ Dive in
 Define some processors::
 
  >>> import timeside
- >>> decoder  =  timeside.decoder.FileDecoder('sweep.wav')
+ >>> decoder  =  timeside.decoder.file.FileDecoder('sweep.wav')
  >>> grapher  =  timeside.grapher.Waveform()
  >>> analyzer =  timeside.analyzer.Level()
  >>> encoder  =  timeside.encoder.VorbisEncoder('sweep.ogg')

diff --git a/tests/sandbox/test_lolevel_streaming.py b/tests/sandbox/test_lolevel_streaming.py
index ee48d697ced62d26d3376cb3a33e5260834875f5..e0f6e2b17ee703f97b71512e6e7a493641b4ceed 100644 (file)
--- a/tests/sandbox/test_lolevel_streaming.py
+++ b/tests/sandbox/test_lolevel_streaming.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from timeside.core import *
-from timeside.decoder import FileDecoder
+from timeside.decoder.file import FileDecoder
 from timeside.encoder import Mp3Encoder
 
 import sys

diff --git a/tests/sandbox/test_lolevel_streaming_threaded.py b/tests/sandbox/test_lolevel_streaming_threaded.py
index c3a97eb7e3452556a2a142de755551b823056480..1e19dab929060bf125aafe321961fe44f0a7d207 100644 (file)
--- a/tests/sandbox/test_lolevel_streaming_threaded.py
+++ b/tests/sandbox/test_lolevel_streaming_threaded.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from timeside.core import *
-from timeside.decoder import FileDecoder
+from timeside.decoder.file import FileDecoder
 from timeside.encoder import Mp3Encoder
 
 import sys

diff --git a/tests/sandbox/test_lolevel_streaming_threaded_ogg.py b/tests/sandbox/test_lolevel_streaming_threaded_ogg.py
index 881ddbebd3076e00bd4807437120354761a7c399..7b41879e482464f4e21f1f3a5f9f9daa7ed59fc2 100644 (file)
--- a/tests/sandbox/test_lolevel_streaming_threaded_ogg.py
+++ b/tests/sandbox/test_lolevel_streaming_threaded_ogg.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from timeside.core import *
-from timeside.decoder import FileDecoder
+from timeside.decoder.file import FileDecoder
 from timeside.encoder import Mp3Encoder, VorbisEncoder
 
 import sys

diff --git a/tests/test_analyzer_dc.py b/tests/test_analyzer_dc.py
index 68890cb2c5483579b3eb405270728200942ceb2a..69c8a883eede575453f4f21f5661ce7964c0d820 100755 (executable)
--- a/tests/test_analyzer_dc.py
+++ b/tests/test_analyzer_dc.py
@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 
 from unit_timeside import *
-from timeside.decoder import FileDecoder
+from timeside.decoder.file import FileDecoder
 from timeside.analyzer.dc import MeanDCShift
 import os
 

diff --git a/tests/test_analyzer_level.py b/tests/test_analyzer_level.py
index 97c1f66bc1a5204f60d3e256fd208cdff84faa8e..6fb00b73017eab21be20a76231c0151c3ecbd3be 100755 (executable)
--- a/tests/test_analyzer_level.py
+++ b/tests/test_analyzer_level.py
@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 
 from unit_timeside import *
-from timeside.decoder import FileDecoder
+from timeside.decoder.file import FileDecoder
 from timeside.analyzer.level import Level
 import os
 

diff --git a/tests/test_array_decoding.py b/tests/test_array_decoding.py
index f68dfefe9deb34eb97dff040089634d400d34022..fd2a56fdd274ff355aa0084b57b7e1a820b44366 100755 (executable)
--- a/tests/test_array_decoding.py
+++ b/tests/test_array_decoding.py
@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 from __future__ import division
 
-from timeside.decoder import ArrayDecoder
+from timeside.decoder.array import ArrayDecoder
 from unit_timeside import *
 
 import numpy as np

diff --git a/tests/test_aubio_melenergy.py b/tests/test_aubio_melenergy.py
index 53560014140719ef6c82a813d2858caae0d38298..f5ff1d0a510a9732a748d70f2f0c755cfd811121 100755 (executable)
--- a/tests/test_aubio_melenergy.py
+++ b/tests/test_aubio_melenergy.py
@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 
 from unit_timeside import *
-from timeside.decoder import FileDecoder
+from timeside.decoder.file import FileDecoder
 from timeside.analyzer import WITH_AUBIO
 if WITH_AUBIO:
     from timeside.analyzer.aubio_melenergy import AubioMelEnergy

diff --git a/tests/test_aubio_mfcc.py b/tests/test_aubio_mfcc.py
index 2c40287ebfe3a63933167001e30d89fcf1176b2b..d7d5ce70589a43df52d58e69df32d365500043ba 100755 (executable)
--- a/tests/test_aubio_mfcc.py
+++ b/tests/test_aubio_mfcc.py
@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 
 from unit_timeside import *
-from timeside.decoder import FileDecoder
+from timeside.decoder.file import FileDecoder
 from timeside.analyzer import WITH_AUBIO
 if WITH_AUBIO:
     from timeside.analyzer.aubio_mfcc import AubioMfcc

diff --git a/tests/test_aubio_pitch.py b/tests/test_aubio_pitch.py
index cb43bcd00e7946370cb4ebcf2652265e42058b79..dc6022dbdf1f6e352b0323fb8f925dd85134d31a 100755 (executable)
--- a/tests/test_aubio_pitch.py
+++ b/tests/test_aubio_pitch.py
@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 
 from unit_timeside import *
-from timeside.decoder import *
+from timeside.decoder.file import FileDecoder
 from timeside.analyzer import WITH_AUBIO
 if WITH_AUBIO:
     from timeside.analyzer.aubio_pitch import AubioPitch

diff --git a/tests/test_aubio_specdesc.py b/tests/test_aubio_specdesc.py
index 4e561c6c2ef0f8646f355d3fc754e86cf3405a21..1fe125592b63ab44a448862b273398d557d6d924 100755 (executable)
--- a/tests/test_aubio_specdesc.py
+++ b/tests/test_aubio_specdesc.py
@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 
 from unit_timeside import *
-from timeside.decoder import FileDecoder
+from timeside.decoder.file import FileDecoder
 from timeside.analyzer import WITH_AUBIO
 if WITH_AUBIO:
     from timeside.analyzer.aubio_specdesc import AubioSpecdesc

diff --git a/tests/test_aubio_temporal.py b/tests/test_aubio_temporal.py
index 7011da68ebbdd956cd3aae8dfed3de124e9a35ee..2dd0801eaf1c70ef53c88e825aad70b773c298cf 100755 (executable)
--- a/tests/test_aubio_temporal.py
+++ b/tests/test_aubio_temporal.py
@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 
 from unit_timeside import *
-from timeside.decoder import FileDecoder
+from timeside.decoder.file import FileDecoder
 from timeside.analyzer import WITH_AUBIO
 if WITH_AUBIO:
     from timeside.analyzer.aubio_temporal import AubioTemporal

diff --git a/tests/test_decoding.py b/tests/test_decoding.py
index 057af4a033c885df289da18e6ed059a19b85a93c..5ce3f82b6676e73648702db77d8d5a32ad8c7239 100755 (executable)
--- a/tests/test_decoding.py
+++ b/tests/test_decoding.py
@@ -2,7 +2,7 @@
 
 from __future__ import division
 
-from timeside.decoder import FileDecoder
+from timeside.decoder.file import FileDecoder
 from timeside.core import ProcessPipe
 
 from unit_timeside import *
@@ -127,7 +127,7 @@ class TestDecoding(unittest.TestCase):
 
         expected_totalframes = [self.expected_totalframes, self.expected_totalframes +32]  # +32 to handle some issue with ogg
         self.assertIn(totalframes, expected_totalframes)
-        
+
         input_duration = decoder.input_totalframes / decoder.input_samplerate
         output_duration = decoder.totalframes() / decoder.output_samplerate
         if self.test_exact_duration:

diff --git a/tests/test_decoding_stack.py b/tests/test_decoding_stack.py
index 020321112f8a6a227890faf9cb29cbf20a31aefd..4650a753cb1de0a663bb50c34175dfc1e1a27beb 100755 (executable)
--- a/tests/test_decoding_stack.py
+++ b/tests/test_decoding_stack.py
@@ -2,7 +2,7 @@
 
 from __future__ import division
 
-from timeside.decoder import FileDecoder
+from timeside.decoder.file import FileDecoder
 from timeside.analyzer import Level
 from timeside.core import ProcessPipe
 import numpy as np

diff --git a/tests/test_encoding.py b/tests/test_encoding.py
index 8df16b652705896077c22bdeef25a354e611df57..388d062af8003f754619826b87a85f43f19a57b9 100755 (executable)
--- a/tests/test_encoding.py
+++ b/tests/test_encoding.py
@@ -6,7 +6,7 @@ from math import pi
 import numpy as np
 from unit_timeside import *
 from timeside.decoder.utils import get_uri, get_media_uri_info
-from timeside.decoder import ArrayDecoder
+from timeside.decoder.array import ArrayDecoder
 import os
 from tools import tmp_file_sink
 

diff --git a/tests/test_graphing.py b/tests/test_graphing.py
index 5322b6a40768b4bb61b6329ac328d8e65385b1af..51bad4d9111b93abc277743477fe8201d58df855 100755 (executable)
--- a/tests/test_graphing.py
+++ b/tests/test_graphing.py
@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 
-from timeside.decoder import FileDecoder
+from timeside.decoder.file import FileDecoder
 from unit_timeside import *
 
 import os.path

diff --git a/tests/test_transcoding.py b/tests/test_transcoding.py
index d345ead9c883bb3e8ef4f5379ac98e8299753ca7..a42aedc0ccc1db886135d82c9d8e3de0a26e46fc 100755 (executable)
--- a/tests/test_transcoding.py
+++ b/tests/test_transcoding.py
@@ -3,7 +3,7 @@
 from __future__ import division
 
 from timeside.core import *
-from timeside.decoder import *
+from timeside.decoder.file import FileDecoder
 from timeside.analyzer import *
 from timeside.encoder import *
 from timeside.component import *

diff --git a/tests/test_transcoding_streaming.py b/tests/test_transcoding_streaming.py
index 2ff0f4a3a0614c83bfd063b84653ad5d88572750..a7655fcd258df41182b67ca7bccc7c6c531e6ff3 100755 (executable)
--- a/tests/test_transcoding_streaming.py
+++ b/tests/test_transcoding_streaming.py
@@ -2,11 +2,11 @@
 
 from __future__ import division
 
-from timeside.core import *
-from timeside.decoder import *
-from timeside.analyzer import *
+#from timeside.core import *
+from timeside.decoder.file import FileDecoder
+#from timeside.analyzer import *
 from timeside.encoder import *
-from timeside.component import *
+#from timeside.component import *
 
 from unit_timeside import *
 from tools import tmp_file_sink

diff --git a/tests/test_yaafe.py b/tests/test_yaafe.py
index a7ed80a641aae66afdce7f94f233650013792ef4..50b6dfedf635b87cad953c614f113b2b3fc4d556 100755 (executable)
--- a/tests/test_yaafe.py
+++ b/tests/test_yaafe.py
@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 
 from unit_timeside import *
-from timeside.decoder import FileDecoder
+from timeside.decoder.file import FileDecoder
 from timeside.analyzer import WITH_YAAFE
 if WITH_YAAFE:
     from timeside.analyzer import Yaafe

diff --git a/timeside/__init__.py b/timeside/__init__.py
index ce217f4950e3fca4b2e5e3837ef6dcf7fb536abe..f1a0bcd0184e278512aac20824e88756d3908732 100644 (file)
--- a/timeside/__init__.py
+++ b/timeside/__init__.py
@@ -10,3 +10,28 @@ import encoder
 __version__ = '0.5.5'
 
 __all__ = ['api', 'core', 'decoder', 'analyzer', 'grapher', 'encoder']
+
+print __file__
+print __name__
+
+def _discover_modules():
+    import sys
+    import pkgutil
+    import importlib
+    pkg = 'timeside'
+    #__import__(pkg)
+    package = sys.modules[pkg]
+    prefix = pkg + "."
+
+    for importer, modname, ispkg in pkgutil.iter_modules(package.__path__,
+                                                          prefix):
+        #print modname
+        if modname.split('.')[1] in ['decoder', 'analyzer', 'encoder', 'grapher']:
+            print modname
+            mod = importlib.import_module(modname)
+
+            del mod
+        del modname
+
+
+_discover_modules()

diff --git a/timeside/analyzer/core.py b/timeside/analyzer/core.py
index f2a2548809d6e46145d4901c47726d09d7c43b55..fa189419445f7a0a75574fa426afd12046dccaa2 100644 (file)
--- a/timeside/analyzer/core.py
+++ b/timeside/analyzer/core.py
@@ -869,7 +869,7 @@ class AnalyzerResultContainer(dict):
     >>> import timeside
     >>> from timeside.analyzer.core import Analyzer
     >>> wav_file = 'tests/samples/sweep.mp3' # doctest: +SKIP
-    >>> d = timeside.decoder.FileDecoder(wav_file)
+    >>> d = timeside.decoder.file.FileDecoder(wav_file)
 
     >>> a = Analyzer()
     >>> (d|a).run()

diff --git a/timeside/decoder/__init__.py b/timeside/decoder/__init__.py
index ee59bda17af42276a5fc17b0e29cd9c81d5bc705..ebd2f39496e079e6bfcd87100a73f0d879cb683f 100644 (file)
--- a/timeside/decoder/__init__.py
+++ b/timeside/decoder/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-from file import FileDecoder
-from array import ArrayDecoder
-from live import LiveDecoder
-
-__all__ = ['FileDecoder', 'ArrayDecoder', 'LiveDecoder']
+#from file import FileDecoder
+#from array import ArrayDecoder
+#from live import LiveDecoder
+#
+#__all__ = ['FileDecoder', 'ArrayDecoder', 'LiveDecoder']

diff --git a/timeside/decoder/file.py b/timeside/decoder/file.py
index 62d8ecf995e1568d095e136ac71d9af587fe3ec2..88bedc1b995abcb96b35acf96b6e411bcec12b1c 100644 (file)
--- a/timeside/decoder/file.py
+++ b/timeside/decoder/file.py
@@ -50,7 +50,7 @@ class FileDecoder(Decoder):
     def id():
         return "gst_dec"
 
-    def __init__(self, uri, start=0, duration=None, stack=False):
+    def __init__(self, uri, start=0, duration=None, stack=False, sha1=None):
         """
         Construct a new FileDecoder
 
@@ -71,7 +71,11 @@ class FileDecoder(Decoder):
         self.stack = stack
 
         self.uri = get_uri(uri)
-        self._sha1 = get_sha1(uri)
+
+        if not sha1:
+            self._sha1 = get_sha1(uri)
+        else:
+            self._sha1 = sha1
 
         self.uri_total_duration = get_media_uri_info(self.uri)['duration']
 

diff --git a/timeside/decoder/live.py b/timeside/decoder/live.py
index ae9b7ba21d827d76dc4050d968d2b75294d0a52d..c8dcb8d0f566ac7e026988d76ba1ab0794655ea1 100644 (file)
--- a/timeside/decoder/live.py
+++ b/timeside/decoder/live.py
@@ -63,9 +63,9 @@ class LiveDecoder(Decoder):
 
         >>> import timeside
 
-        >>> live = timeside.decoder.LiveDecoder(num_buffers=5)
+        >>> live = timeside.decoder.live.LiveDecoder(num_buffers=5)
         >>> a = timeside.analyzer.Waveform()
-        >>> e = timeside.encoder.Mp3Encoder('/tmp/test_live.mp3',
+        >>> e = timeside.encoder.mp3.Mp3Encoder('/tmp/test_live.mp3',
         ...                                 overwrite=True)
         >>> pipe = (live | a | e)
         >>> pipe.run() # doctest: +SKIP

diff --git a/timeside/encoder/__init__.py b/timeside/encoder/__init__.py
index 4c6d4eefc18a22b0f0a4a3f55bb95c5e2ef9915a..f04257de8920e0e7c58dd8ca7cce679b53cdd277 100644 (file)
--- a/timeside/encoder/__init__.py
+++ b/timeside/encoder/__init__.py
@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
-
-from ogg import VorbisEncoder
-from wav import WavEncoder
-from mp3 import Mp3Encoder
-from flac import FlacEncoder
-from m4a import AacEncoder
-from webm import WebMEncoder
-from audiosink import AudioSink
-from opus import OpusEncoder
-
-__all__ = ['VorbisEncoder', 'WavEncoder', 'Mp3Encoder', 'FlacEncoder',
-           'AacEncoder', 'WebMEncoder', 'AudioSink', 'OpusEncoder']
+#
+#from ogg import VorbisEncoder
+#from wav import WavEncoder
+#from mp3 import Mp3Encoder
+#from flac import FlacEncoder
+#from m4a import AacEncoder
+#from webm import WebMEncoder
+#from audiosink import AudioSink
+#from opus import OpusEncoder
+#
+#__all__ = ['VorbisEncoder', 'WavEncoder', 'Mp3Encoder', 'FlacEncoder',
+#           'AacEncoder', 'WebMEncoder', 'AudioSink', 'OpusEncoder']

diff --git a/timeside/encoder/audiosink.py b/timeside/encoder/audiosink.py
index 524d685f604435c4f4d34af0a1e83c6fb52b62fe..542470098fdd618192968e5db01556a653019904 100644 (file)
--- a/timeside/encoder/audiosink.py
+++ b/timeside/encoder/audiosink.py
@@ -35,8 +35,8 @@ class AudioSink(GstEncoder):
 
     >>> import timeside
     >>> wav_file = 'tests/samples/guitar.wav' # doctest: +SKIP
-    >>> d = timeside.decoder.FileDecoder(wav_file)
-    >>> e = timeside.encoder.AudioSink()
+    >>> d = timeside.decoder.file.FileDecoder(wav_file)
+    >>> e = timeside.encoder.audiosink.AudioSink()
     >>> (d|e).run() # doctest: +SKIP
     """