X-Git-Url: https://svn.cri.ensmp.fr/git/minwii.git/blobdiff_plain/73301d45fc7fbc65d3dbb551be8ffddf97588cd2..fa75b1df8242dff846bd0fd6c2a274170892b73a:/src/minwii/loganalyse.py?ds=sidebyside

diff --git a/src/minwii/loganalyse.py b/src/minwii/loganalyse.py
index 03d0837..ab8c819 100755
--- a/src/minwii/loganalyse.py
+++ b/src/minwii/loganalyse.py
@@ -9,12 +9,17 @@ $URL$
 from minwii.logfilereader import LogFileReader
 from pprint import pprint
 from minwii.musicxml import musicXml2Song
+from minwii.globals import PLAYING_MODES
 from statlib import stats
 from datetime import timedelta
+from xml.etree import ElementTree
+import os.path
+
+PLAYING_MODES = dict(PLAYING_MODES)
 
 DEFAULT_STATS = (#'geometricmean',
-                 #'harmonicmean',
-                 #'mean',
+                 ('harmonicmean', 'Moyenne harmonique'),
+                 ('mean', 'Moyenne  '),
                  ('median', 'Médiane'),
                  #'medianscore',
                  #'mode',
@@ -69,7 +74,11 @@ class LogFileAnalyser(LogFileReader) :
         
         try :
             self.mode = mode = self.getMode()
-            results.append(('Mode de jeu', mode))
+            results.append(('Mode de jeu', PLAYING_MODES.get(mode, mode)))
+
+            self.songTitle = LogFileAnalyser.getSongTitle(self.getSongFile())
+            results.append(('Chanson', self.songTitle))
+
             for name in self.POSSIBLE_ANALYSES[mode] :
                 meth = getattr(self, name)
                 results.append((meth.__doc__, meth()))
@@ -78,6 +87,23 @@ class LogFileAnalyser(LogFileReader) :
         
         return results
     
+    @staticmethod
+    def getSongTitle(file) :
+        if os.path.exists(file) :
+            it = ElementTree.iterparse(file, ['start', 'end'])
+            creditFound = False
+
+            for evt, el in it :
+                if el.tag == 'credit' :
+                    creditFound = True
+                if el.tag == 'credit-words' and creditFound:
+                    return el.text
+                if el.tag == 'part-list' :
+                    # plus de chance de trouver un titre
+                    return os.path.basename(file)
+        else :
+            return os.path.basename(file)
+
     def _toTimeDelta(self, milliseconds) :
         duration = milliseconds / 1000.
         duration = int(round(duration, 0))