Ouverture par défaut du dossier courant des logs, s'il existe.

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

diff --git a/src/minwii/logapp.py b/src/minwii/logapp.py
index b10ca16..555c9fd 100755 (executable)
--- a/src/minwii/logapp.py
+++ b/src/minwii/logapp.py
@@ -13,7 +13,9 @@ 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 minwii.config import LOGS_DIR
 from pprint import pprint
 
 class Application(Frame) :
@@ -25,8 +27,8 @@ class Application(Frame) :
         self.logFiles = []
         self.resultsFrame = None
         
-        # debug
-        self.chooseDirDialog(dir='/Users/pinbe/minwii_logs')
+        if os.path.exists(LOGS_DIR) :
+            self.chooseDirDialog(dir=LOGS_DIR)
     
     def configureStretching(self) :
         top=self.winfo_toplevel()
@@ -65,14 +67,14 @@ class Application(Frame) :
         else :
             self.logDir = dir
         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.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 = []
@@ -82,10 +84,14 @@ class Application(Frame) :
                 os.remove(f)
                 continue
             else :
-                lfa = LogFileAnalyser(f)
+                of = open(f)
+                lfa = LogFileAnalyser(of)
                 if lfa.getLastEventTicks() is None :
+                    of.close()
                     os.remove(f)
                     continue
+                else :
+                    of.close()
                 
                 files.append(f)