From 27dc184cc9e4a052f258cb6a4f742abe0b99aa1e Mon Sep 17 00:00:00 2001
From: Tommy Olofsson <tommy.olofsson.90@gmail.com>
Date: Mon, 2 Feb 2015 13:53:01 +0100
Subject: [PATCH] Do not let the readers reopen the file.
---
tools/lc2csv.py | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/tools/lc2csv.py b/tools/lc2csv.py
index 4a305d9..f38d147 100755
--- a/tools/lc2csv.py
+++ b/tools/lc2csv.py
@@ -6,8 +6,8 @@ import labcomm
class Reader(object):
- def __init__(self, _file):
- self._file = open(_file)
+ def __init__(self, file_):
+ self._file = file_
def read(self, count):
data = self._file.read(count)
@@ -106,11 +106,11 @@ def main():
"Requires -f.")
args = parser.parse_args()
- d = labcomm.Decoder(Reader(args.elc))
seen = {}
current = {}
_type = {}
-
+ file_ = open(args.elc)
+ d = labcomm.Decoder(Reader(file_))
# Do one pass through the file to find all registrations.
while True:
try:
@@ -126,10 +126,11 @@ def main():
# Do another pass to extract the data.
current = {}
+ file_.seek(0)
if args.follow:
- reader = FollowingReader(args.elc, args.interval, args.timeout)
+ reader = FollowingReader(file_, args.interval, args.timeout)
else:
- reader = Reader(args.elc)
+ reader = Reader(file_)
d = labcomm.Decoder(reader)
while True:
try:
--
GitLab