From: Thomas Fillon <thomas@parisson.com>
Date: Tue, 3 Dec 2013 11:36:31 +0000 (+0100)
Subject: timeside.analyzer.core.py : AnalyzeResultContainer : add method can handle update... 
X-Git-Tag: 0.5.2~12
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f7ed7214c55fa97f4cc2e8b827d37ecee68f1d94;p=timeside.git

timeside.analyzer.core.py : AnalyzeResultContainer : add method can handle update from AnalyzeResultContainer
---

diff --git a/timeside/analyzer/core.py b/timeside/analyzer/core.py
index 0d49736..609bc94 100644
--- a/timeside/analyzer/core.py
+++ b/timeside/analyzer/core.py
@@ -806,13 +806,16 @@ class AnalyzerResultContainer(dict):
             self.add(analyzer_results)
 
     def add(self, analyzer_result):
-        if isinstance(analyzer_result, list):
+        if isinstance(analyzer_result, AnalyzerResultContainer):
+            self.update(analyzer_result)
+            return
+        elif isinstance(analyzer_result, list):
             for res in analyzer_result:
                 self.add(res)
             return
         # Check result
         if not isinstance(analyzer_result, AnalyzerResult):
-            raise TypeError('only AnalyzerResult can be added')
+            raise TypeError('Only AnalyzerResult can be added')
 
         self.__setitem__(analyzer_result.id_metadata.id,
                          analyzer_result)
@@ -1011,7 +1014,7 @@ class Analyzer(Processor):
         from datetime import datetime
 
         result = AnalyzerResult.factory(data_mode=data_mode,
-                                time_mode=time_mode)
+                                        time_mode=time_mode)
 
         # Automatically write known metadata
         result.id_metadata.date = datetime.now().replace(