X-Git-Url: https://scm.cri.mines-paristech.fr/git/minwii.git/blobdiff_plain/a07152998dd50dab4e31a809158b3f5b430ac094..3a63a57ad7692cd3da1818b6b22002c113dd62f0:/src/minwii/logapp.py?ds=sidebyside

diff --git a/src/minwii/logapp.py b/src/minwii/logapp.py
index 176d179..950a478 100755
--- a/src/minwii/logapp.py
+++ b/src/minwii/logapp.py
@@ -13,6 +13,7 @@ import os
 from os.path import join as pjoin
 from os.path import basename
 from os.path import getsize
+import os.path
 from minwii.loganalyse import LogFileAnalyser
 from pprint import pprint
 
@@ -24,6 +25,9 @@ class Application(Frame) :
         self.logDir = ''
         self.logFiles = []
         self.resultsFrame = None
+        
+        # debug
+        #self.chooseDirDialog(dir='/Users/pinbe/minwii_logs')
     
     def configureStretching(self) :
         top=self.winfo_toplevel()
@@ -37,41 +41,39 @@ class Application(Frame) :
     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.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)
-        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.nav = Navbar(bf, incCallback=self.loadLogFile, decCallback=self.loadLogFile)
-        #self.nav.grid(row=0, column=1)
 
         self.quitButton = Button(bf, text='Terminer', command=self.quit)
         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(title='Sélectionnez un dossier de fichiers de logs')
+        else :
+            self.logDir = dir
         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.nav.grid(row=0, column=1)
-             self.loadLogFile(self.nav)
+            self.logFiles = glob(pjoin(self.logDir, '*.log'))
+            self._cleanupJunkFiles()
+            self.logFiles.sort()
+            self.logFiles.reverse()
+            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)
     
     def _cleanupJunkFiles(self) :
         files = []
@@ -80,8 +82,16 @@ class Application(Frame) :
             if not getsize(f) :
                 os.remove(f)
                 continue
-            # TODO : vérifier qu'il existe des événements
             else :
+                of = open(f)
+                lfa = LogFileAnalyser(of)
+                if lfa.getLastEventTicks() is None :
+                    of.close()
+                    os.remove(f)
+                    continue
+                else :
+                    of.close()
+                
                 files.append(f)
         
         self.logFiles = files
@@ -192,7 +202,7 @@ class ResultsFrame(Frame) :
         lfa = LogFileAnalyser(self.logFilePath)
         results = lfa.analyse()
         if results :
-            for i, kv in enumerate(results.items()) :
+            for i, kv in enumerate(results) :
                 k, v = kv
                 kl = Label(self, text='%s :' % k)
                 kl.grid(row=i, column=0, sticky=E)