Affichage des durées bien comme il faut.

[minwii.git] / src / minwii / logapp.py

diff --git a/src/minwii/logapp.py b/src/minwii/logapp.py
index 4c680ba..9306809 100755 (executable)
--- a/src/minwii/logapp.py
+++ b/src/minwii/logapp.py
@@ -9,9 +9,11 @@ $URL$
 from Tkinter import *
 import tkFileDialog
 from glob import glob
 from Tkinter import *
 import tkFileDialog
 from glob import glob

+import os

 from os.path import join as pjoin
 from os.path import basename
 from os.path import join as pjoin
 from os.path import basename

-from loganalyse import LogFileAnalyser
+from os.path import getsize
+from minwii.loganalyse import LogFileAnalyser

 from pprint import pprint
 
 class Application(Frame) :
 from pprint import pprint
 
 class Application(Frame) :


@@ -21,6 +23,10 @@ class Application(Frame) :
         self.createWidgets()
         self.logDir = ''
         self.logFiles = []
         self.createWidgets()
         self.logDir = ''
         self.logFiles = []

+        self.resultsFrame = None
+        
+        # debug
+        self.chooseDirDialog(dir='/Users/pinbe/minwii_logs')

     
     def configureStretching(self) :
         top=self.winfo_toplevel()
     
     def configureStretching(self) :
         top=self.winfo_toplevel()


@@ -34,45 +40,63 @@ class Application(Frame) :
     def createWidgets(self) :
         # zone d'affichage des données'
         self.dataFrame = df = Frame(self)
     def createWidgets(self) :
         # zone d'affichage des données'
         self.dataFrame = df = Frame(self)

-        #df.grid(sticky=NW)

         
         self.identFrame = Identification(df)
         self.identFrame.grid(sticky=NW)
         
         self.identFrame = Identification(df)
         self.identFrame.grid(sticky=NW)

-        self.nav = Navbar(df, incCallback=self.loadLogFile, decCallback=self.loadLogFile)
-        self.nav.grid()
-        

         
         # barre de boutons
         self.btnFrame = bf = Frame(self)
         bf.grid(row=1, column=0, sticky=W+S+E)
         bf.rowconfigure(0, weight=1)
         
         # barre de boutons
         self.btnFrame = bf = Frame(self)
         bf.grid(row=1, column=0, sticky=W+S+E)
         bf.rowconfigure(0, weight=1)

-        bf.columnconfigure(0, weight=1)
-        bf.columnconfigure(1, weight=1)
-        
+        for i in range(3) :
+            bf.columnconfigure(i, weight=1)        

 
 

-        self.chooseLogDir = Button(bf, text="Parcourir…", command=self.openFileDialog)
+        self.chooseLogDir = Button(bf, text="Parcourir…", command=self.chooseDirDialog)

         self.chooseLogDir.grid(row=0, column=0, sticky=W)
         self.chooseLogDir.grid(row=0, column=0, sticky=W)

+        
+        self.nav = Navbar(bf, incCallback=self.loadLogFile, decCallback=self.loadLogFile)

 
         self.quitButton = Button(bf, text='Terminer', command=self.quit)
 
         self.quitButton = Button(bf, text='Terminer', command=self.quit)

-        self.quitButton.grid(row=0, column=1, sticky=E)
+        self.quitButton.grid(row=0, column=2, sticky=E)

     
     

-    def openFileDialog(self) :
-        self.logDir = tkFileDialog.askdirectory()
+    def chooseDirDialog(self, dir=None) :
+        if dir is None :
+            self.logDir = tkFileDialog.askdirectory()
+        else :
+            self.logDir = dir

         if self.logDir :
              self.logFiles = glob(pjoin(self.logDir, '*.log'))
         if self.logDir :
              self.logFiles = glob(pjoin(self.logDir, '*.log'))

+             self._cleanupJunkFiles()

              self.logFiles.sort()
              self.dataFrame.grid(row=0, column=0, sticky=NW)
              self.nav.setSize(len(self.logFiles))
              self.logFiles.sort()
              self.dataFrame.grid(row=0, column=0, sticky=NW)
              self.nav.setSize(len(self.logFiles))

+             self.nav.grid(row=0, column=1)

              self.loadLogFile(self.nav)
     
              self.loadLogFile(self.nav)
     

+    def _cleanupJunkFiles(self) :
+        files = []
+        while self.logFiles :
+            f = self.logFiles.pop()
+            if not getsize(f) :
+                os.remove(f)
+                continue
+            # TODO : vérifier qu'il existe des événements
+            else :
+                files.append(f)
+        
+        self.logFiles = files
+        
+    

     def loadLogFile(self, nav) :
         index = nav.index - 1
         filepath = self.logFiles[index]
         filename = basename(filepath)
         self.identFrame.setFileName(filename)
     def loadLogFile(self, nav) :
         index = nav.index - 1
         filepath = self.logFiles[index]
         filename = basename(filepath)
         self.identFrame.setFileName(filename)

-        rf = ResultsFrame(self.dataFrame, filepath)
-        rf.layResults()
-        rf.grid()
+        if self.resultsFrame :
+            self.resultsFrame.destroy()
+        self.resultsFrame = ResultsFrame(self.dataFrame, filepath)
+        self.resultsFrame.layResults()
+        self.resultsFrame.grid()

 
 
 class Navbar(Frame) :
 
 
 class Navbar(Frame) :


@@ -83,7 +107,6 @@ class Navbar(Frame) :
         self.setSize(size)
         self.incCallback = incCallback if incCallback else lambda x : None
         self.decCallback = decCallback if decCallback else lambda x : None
         self.setSize(size)
         self.incCallback = incCallback if incCallback else lambda x : None
         self.decCallback = decCallback if decCallback else lambda x : None

-        self.grid()

         self.caption.set('%d / %d' % (self.index, self.to))
     
     def createWidgets(self) :
         self.caption.set('%d / %d' % (self.index, self.to))
     
     def createWidgets(self) :


@@ -168,9 +191,18 @@ class ResultsFrame(Frame) :
     def layResults(self) :
         lfa = LogFileAnalyser(self.logFilePath)
         results = lfa.analyse()
     def layResults(self) :
         lfa = LogFileAnalyser(self.logFilePath)
         results = lfa.analyse()

-        pprint(results)
-        rawPrint = Label(self, text=str(results))
-        rawPrint.grid()
+        if results :
+            for i, kv in enumerate(results) :
+                k, v = kv
+                kl = Label(self, text='%s :' % k)
+                kl.grid(row=i, column=0, sticky=E)
+            
+                vl = Label(self, text=v)
+                vl.grid(row=i, column=1, sticky=W)
+        else :
+            msg = Label(self, text="Pas de données exploitables.")
+            msg.grid()
+            

         
 
 app = Application()
         
 
 app = Application()