ok, ça le fait l'erreur 32 Windows à la con.

git-svn-id: https://svn.cri.ensmp.fr/svn/minwii/trunk@303 fe552daf-6dbe-4428-90eb-1537e0879342

diff --git a/src/minwii/logapp.py b/src/minwii/logapp.py
index 323e293..950a478 100755 (executable)
--- 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
 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
 
 from minwii.loganalyse import LogFileAnalyser
 from pprint import pprint
 


@@ -65,34 +66,34 @@ class Application(Frame) :
         else :
             self.logDir = dir
         if self.logDir :
         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 = []
     
     def _cleanupJunkFiles(self) :
         files = []

-        junk = []

         while self.logFiles :
             f = self.logFiles.pop()
             if not getsize(f) :
         while self.logFiles :
             f = self.logFiles.pop()
             if not getsize(f) :

-                junk.append(f)
+                os.remove(f)

                 continue
             else :
                 continue
             else :

-                lfa = LogFileAnalyser(f)
+                of = open(f)
+                lfa = LogFileAnalyser(of)

                 if lfa.getLastEventTicks() is None :
                 if lfa.getLastEventTicks() is None :

-                    junk.append(f)
+                    of.close()
+                    os.remove(f)

                     continue
                     continue

+                else :
+                    of.close()

                 
                 files.append(f)
         
                 
                 files.append(f)
         

-        for f in junk :
-            os.remove(f)
-        

         self.logFiles = files
         
     
         self.logFiles = files