From 9e5d36360a611bb67c4313e722d00081d75e4d6d Mon Sep 17 00:00:00 2001
From: Tommy Olofsson <tommy.olofsson.90@gmail.com>
Date: Fri, 30 Jan 2015 20:22:05 +0100
Subject: [PATCH] The csv tool can follow files now.
---
tools/lc2csv.py | 31 ++++++++++++++++++++++++++-----
1 file changed, 26 insertions(+), 5 deletions(-)
diff --git a/tools/lc2csv.py b/tools/lc2csv.py
index 134782e..0e351f0 100755
--- a/tools/lc2csv.py
+++ b/tools/lc2csv.py
@@ -1,7 +1,9 @@
#!/usr/bin/env python
-import sys
+import argparse
import labcomm
+import subprocess
+import sys
class Reader(object):
@@ -18,6 +20,18 @@ class Reader(object):
pass
+class FollowingReader(object):
+ def __init__(self, file_):
+ self.tail_proc = subprocess.Popen(['tail', '-c', '+0', '-f', file_],
+ stdout=subprocess.PIPE)
+
+ def read(self, count):
+ return self.tail_proc.stdout.read(count)
+
+ def mark(self, value, decl):
+ pass
+
+
def flatten(sample, _type):
if isinstance(_type, labcomm.sample):
flatten(sample, _type.decl)
@@ -70,9 +84,15 @@ def dump_labels(current, _type):
def main():
- if len(sys.argv) != 2:
- sys.exit("Give input file as argument\n")
- d = labcomm.Decoder(Reader(sys.argv[1]))
+ parser = argparse.ArgumentParser()
+ parser.add_argument('elc', type=str, help="The log file.")
+ parser.add_argument('-f', '--follow', action='store_true',
+ help="Find all registrations that already "
+ "exist, then watch the file for changes. All "
+ "future registrations are ignored (because "
+ "the header has already been written).")
+ args = parser.parse_args()
+ d = labcomm.Decoder(Reader(args.elc))
seen = {}
current = {}
_type = {}
@@ -92,7 +112,8 @@ def main():
# Do another pass to extract the data.
current = {}
- d = labcomm.Decoder(Reader(sys.argv[1]))
+ reader = FollowingReader(args.elc) if args.follow else Reader(args.elc)
+ d = labcomm.Decoder(reader)
while True:
try:
o, t = d.decode()
--
GitLab