Add @property decorator to some functions in timeside.analyzer.core

- in Analyzer results() became a property
- modify tests to reflect this change
- add id() and name() as property in AnalyzerResult

diff --git a/tests/test_analyzer_dc.py b/tests/test_analyzer_dc.py
index 3fd683dc967b5b241fa3cd43ad43e9f347339846..65bf3d9884008b62c147f56a8da7e85852220b8e 100755 (executable)
--- a/tests/test_analyzer_dc.py
+++ b/tests/test_analyzer_dc.py
@@ -23,7 +23,7 @@ class TestAnalyzerDC(TestCase):
     def tearDown(self):
         decoder = FileDecoder(self.source)
         (decoder | self.analyzer).run()
-        results = self.analyzer.results()
+        results = self.analyzer.results
         for key in self.expected.keys():
             self.assertEquals(results[key].dataObject.value, self.expected[key])
 

diff --git a/tests/test_analyzer_level.py b/tests/test_analyzer_level.py
index 64fee4a1d6649357cde3be3f41a3125009c4e28b..8fcf1168d4e8959c4bb26c5f72729659eb789fe4 100755 (executable)
--- a/tests/test_analyzer_level.py
+++ b/tests/test_analyzer_level.py
@@ -31,7 +31,7 @@ class TestAnalyzerLevel(TestCase):
     def tearDown(self):
         decoder = FileDecoder(self.source)
         (decoder | self.analyzer).run()
-        results = self.analyzer.results()
+        results = self.analyzer.results
         for key in self.expected.keys():
             self.assertEquals(results[key].dataObject.value, self.expected[key])
         #print results

diff --git a/tests/test_aubio_melenergy.py b/tests/test_aubio_melenergy.py
index b53eb64ee65b47c2e383cd1b28fffcb9bd224f5f..8ee4a86d4ad5c21085b4d3200bb6c6931223e99a 100755 (executable)
--- a/tests/test_aubio_melenergy.py
+++ b/tests/test_aubio_melenergy.py
@@ -20,7 +20,7 @@ class TestAubioMelEnergy(TestCase):
     def tearDown(self):
         decoder = FileDecoder(self.source)
         (decoder | self.analyzer).run()
-        results = self.analyzer.results()
+        results = self.analyzer.results
         #print results
         #print results.to_yaml()
         #print results.to_json()

diff --git a/tests/test_aubio_mfcc.py b/tests/test_aubio_mfcc.py
index abdaad61781a89ec432ddffa181df84c8417a79c..bc1f26cf4e01d0553ad5eeb24ede3865837b0dc7 100755 (executable)
--- a/tests/test_aubio_mfcc.py
+++ b/tests/test_aubio_mfcc.py
@@ -20,7 +20,7 @@ class TestAubioMfcc(TestCase):
     def tearDown(self):
         decoder = FileDecoder(self.source)
         (decoder | self.analyzer).run()
-        results = self.analyzer.results()
+        results = self.analyzer.results
         #print results
         #print results.to_yaml()
         #print results.to_json()

diff --git a/tests/test_aubio_pitch.py b/tests/test_aubio_pitch.py
index 7c120f2560de86a26541471d4a2f809a8cd6e22b..660d7d0b8728042381aa350010bf779eb2f60a46 100755 (executable)
--- a/tests/test_aubio_pitch.py
+++ b/tests/test_aubio_pitch.py
@@ -20,7 +20,7 @@ class TestAubioPitch(TestCase):
     def tearDown(self):
         decoder = FileDecoder(self.source)
         (decoder | self.analyzer).run()
-        results = self.analyzer.results()
+        results = self.analyzer.results
         #print "result:", self.analyzer.result()
 
 if __name__ == '__main__':

diff --git a/tests/test_aubio_specdesc.py b/tests/test_aubio_specdesc.py
index 4170a5c34254c86af3cf6077cd355960e7474501..5fb0fcf5555d6aa9232b5351e840b0dbc0b9fbf8 100755 (executable)
--- a/tests/test_aubio_specdesc.py
+++ b/tests/test_aubio_specdesc.py
@@ -20,7 +20,7 @@ class TestAubioSpecdesc(TestCase):
     def tearDown(self):
         decoder = FileDecoder(self.source)
         (decoder | self.analyzer).run()
-        results = self.analyzer.results()
+        results = self.analyzer.results
         #results.to_yaml()
         #results.to_json()
         #results.to_xml()

diff --git a/tests/test_aubio_temporal.py b/tests/test_aubio_temporal.py
index 423f75b47b0c83a7b53c0a514fafa6828030ed8d..6189efbde1b863e6e66c26340421a0e450ff2ecd 100755 (executable)
--- a/tests/test_aubio_temporal.py
+++ b/tests/test_aubio_temporal.py
@@ -20,7 +20,7 @@ class TestAubioTemporal(TestCase):
     def tearDown(self):
         decoder = FileDecoder(self.source)
         (decoder | self.analyzer).run()
-        results = self.analyzer.results()
+        results = self.analyzer.results
         #print results
         results.to_yaml()
         results.to_json()

diff --git a/tests/test_yaafe.py b/tests/test_yaafe.py
index 71dc50bb66470c9b787ae599c5329de422521546..086bdeebe6748fbd167bf932c208b03bc49d4f2c 100755 (executable)
--- a/tests/test_yaafe.py
+++ b/tests/test_yaafe.py
@@ -65,7 +65,7 @@ class TestYaafe(TestCase):
         decoder = FileDecoder(self.source)
         decoder.output_samplerate = self.sample_rate
         (decoder | self.analyzer).run()
-        results = self.analyzer.results()
+        results = self.analyzer.results
         self.assertEquals(self.result_length, len(results))
         #print results
         #print results.to_yaml()

diff --git a/timeside/analyzer/core.py b/timeside/analyzer/core.py
index 8eda8516fea5f318be93902ceae41e63e94348ea..a54a4b9ff07191706675eed7bb8c59f8c3649d78 100644 (file)
--- a/timeside/analyzer/core.py
+++ b/timeside/analyzer/core.py
@@ -570,6 +570,7 @@ class AnalyzerResult(MetadataObject):
 
         return result
 
+    @property
     def data(self):
         if self.dataMode is None:
             return (
@@ -581,6 +582,7 @@ class AnalyzerResult(MetadataObject):
         elif self.dataMode is 'label':
             return self.dataObject.label
 
+    @property
     def time(self):
         if self.timeMode == 'global':
             return self.audioMetadata.start
@@ -593,6 +595,7 @@ class AnalyzerResult(MetadataObject):
             return self.audioMetadata.start + self.dataObject.time
         pass
 
+    @property
     def duration(self):
         if self.timeMode == 'global':
             return self.audioMetadata.duration
@@ -605,6 +608,15 @@ class AnalyzerResult(MetadataObject):
         elif self.timeMode == 'segment':
             return self.dataObject.duration
 
+    @property
+    def id(self):
+        return self.idMetadata.id
+
+    @property
+    def name(self):
+        return self.idMetadata.name
+
+
 
 #    @property
 #    def properties(self):
@@ -879,6 +891,7 @@ class Analyzer(Processor):
         self.result_blocksize = self.input_blocksize
         self.result_stepsize = self.input_stepsize
 
+    @property
     def results(self):
 
         return AnalyzerResultContainer(