From 3a63a57ad7692cd3da1818b6b22002c113dd62f0 Mon Sep 17 00:00:00 2001
From: pin <pin@fe552daf-6dbe-4428-90eb-1537e0879342>
Date: Wed, 28 Jul 2010 17:07:04 +0000
Subject: [PATCH] =?utf8?q?ok,=20=C3=A7a=20le=20fait=20l'erreur=2032=20Wind?=
=?utf8?q?ows=20=C3=A0=20la=20con.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
git-svn-id: https://svn.cri.ensmp.fr/svn/minwii/trunk@303 fe552daf-6dbe-4428-90eb-1537e0879342
---
src/minwii/logapp.py | 31 ++++++++++++++++---------------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/minwii/logapp.py b/src/minwii/logapp.py
index 323e293..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
@@ -65,34 +66,34 @@ 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 = []
- junk = []
while self.logFiles :
f = self.logFiles.pop()
if not getsize(f) :
- junk.append(f)
+ os.remove(f)
continue
else :
- lfa = LogFileAnalyser(f)
+ of = open(f)
+ lfa = LogFileAnalyser(of)
if lfa.getLastEventTicks() is None :
- junk.append(f)
+ of.close()
+ os.remove(f)
continue
+ else :
+ of.close()
files.append(f)
- for f in junk :
- os.remove(f)
-
self.logFiles = files
--
2.20.1