xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-21 17:11:58 +00:00
Code Issues Projects Releases Wiki Activity

Logreader enhancements

Browse Source 
Highlight all visible matches on screen

Restore cursor visibility if trashed.

Backspace in search string works.
This commit is contained in:
Jarrod Johnson 2022-04-06 15:28:48 -04:00
parent eba668b96c
commit 4b8be913ee
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
misc/logreader.py
View File

@ -165,8 +165,12 @@ class LogReplay(object):
return b'', 0
lastoffset = self.bin.tell()
clear = b'\x1b[2J\x1b[H'
first, high, last = self.lasttxt.partition(searchstr)
output = clear + first + b'\x1b[7m' + high + b'\x1b[27m' + last
txtchunks = self.lasttxt.split(searchstr)
output = clear + txtchunks[0]
txtchunks = txtchunks[1:]
while txtchunks:
output += b'\x1b[7m' + searchstr + b'\x1b[27m' + txtchunks[0]
txtchunks = txtchunks[1:]
return output, 0
@ -232,7 +236,11 @@ def main(txtfile, binfile):
sys.stdout.flush()
select.select((sys.stdin,), (), (), 86400)
nxtchr = sys.stdin.read(1)
searchstr += nxtchr
if nxtchr in ('\x08', '\x7f'):
searchstr = searchstr[:-1]
nxtchr = '\x08 \x08'
else:
searchstr += nxtchr
if not isinstance(searchstr, bytes):
searchstr = searchstr.encode('utf8')
searchstr = searchstr[:-1]
@ -249,12 +257,12 @@ def main(txtfile, binfile):
currfl = fcntl.fcntl(sys.stdin.fileno(), fcntl.F_GETFL)
fcntl.fcntl(sys.stdin.fileno(), fcntl.F_SETFL, currfl ^ os.O_NONBLOCK)
termios.tcsetattr(sys.stdin.fileno(), termios.TCSANOW, oldtcattr)
writeout('\x1b[m')
writeout('\x1b[m\x1b[?25h\n')
raise
currfl = fcntl.fcntl(sys.stdin.fileno(), fcntl.F_GETFL)
fcntl.fcntl(sys.stdin.fileno(), fcntl.F_SETFL, currfl ^ os.O_NONBLOCK)
termios.tcsetattr(sys.stdin.fileno(), termios.TCSANOW, oldtcattr)
writeout('\x1b[m')
writeout('\x1b[m\x1b[?25h\n')
if __name__ == '__main__':
txtfile = sys.argv[1]