Prise en charge de l'analyseur de logs dans l'installateur Windows.

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

diff --git a/src/minwii/logapp.py b/src/minwii/logapp.py
index 176d179..b10ca16 100755 (executable)
--- a/src/minwii/logapp.py
+++ b/src/minwii/logapp.py
@@ -24,6 +24,9 @@ class Application(Frame) :
         self.logDir = ''
         self.logFiles = []
         self.resultsFrame = None
         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()


@@ -37,37 +40,35 @@ 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.nav = Navbar(bf, incCallback=self.loadLogFile, decCallback=self.loadLogFile)
         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)
     
 
         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()
         if self.logDir :
              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.dataFrame.grid(row=0, column=0, sticky=NW)
              self.nav.setSize(len(self.logFiles))
              self.nav.grid(row=0, column=1)


@@ -80,8 +81,12 @@ class Application(Frame) :
             if not getsize(f) :
                 os.remove(f)
                 continue
             if not getsize(f) :
                 os.remove(f)
                 continue

-            # TODO : vérifier qu'il existe des événements

             else :
             else :

+                lfa = LogFileAnalyser(f)
+                if lfa.getLastEventTicks() is None :
+                    os.remove(f)
+                    continue
+                

                 files.append(f)
         
         self.logFiles = files
                 files.append(f)
         
         self.logFiles = files


@@ -192,7 +197,7 @@ class ResultsFrame(Frame) :
         lfa = LogFileAnalyser(self.logFilePath)
         results = lfa.analyse()
         if results :
         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)
                 k, v = kv
                 kl = Label(self, text='%s :' % k)
                 kl.grid(row=i, column=0, sticky=E)