storm/fenrir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sync

Browse Source
This commit is contained in:
chrys 2016-10-30 01:16:07 +02:00
parent f91a493c4b
commit 965c850ca2
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/fenrir/screenDriver/linux.py
View File

@ -17,9 +17,6 @@ class driver():
self.env = environment self.env = environment
def shutdown(self): def shutdown(self):
pass pass
def insert_newlines(self, string, every=64):
return '\n'.join(string[i:i+every] for i in range(0, len(string), every))
def getCurrScreen(self): def getCurrScreen(self):
self.env['screenData']['oldTTY'] = self.env['screenData']['newTTY'] self.env['screenData']['oldTTY'] = self.env['screenData']['newTTY']
try: try:
@ -86,7 +83,7 @@ class driver():
# set new "old" values # set new "old" values
self.env['screenData']['oldContentBytes'] = self.env['screenData']['newContentBytes'] self.env['screenData']['oldContentBytes'] = self.env['screenData']['newContentBytes']
self.env['screenData']['oldContentText'] = self.env['screenData']['newContentText'] self.env['screenData']['oldContentText'] = self.env['screenData']['newContentText']
self.env['screenData']['oldContentTextAttrib'] = self.env['screenData']['newContentAttrib'] self.env['screenData']['oldContentAttrib'] = self.env['screenData']['newContentAttrib']
self.env['screenData']['oldCursor'] = self.env['screenData']['newCursor'].copy() self.env['screenData']['oldCursor'] = self.env['screenData']['newCursor'].copy()
self.env['screenData']['oldDelta'] = self.env['screenData']['newDelta'] self.env['screenData']['oldDelta'] = self.env['screenData']['newDelta']
self.env['screenData']['oldAttribDelta'] = self.env['screenData']['newAttribDelta'] self.env['screenData']['oldAttribDelta'] = self.env['screenData']['newAttribDelta']
@ -100,7 +97,7 @@ class driver():
# analyze content # analyze content
self.env['screenData']['newContentText'] = self.env['screenData']['newContentBytes'][4:][::2].decode(screenEncoding, "replace").encode('utf-8').decode('utf-8') self.env['screenData']['newContentText'] = self.env['screenData']['newContentBytes'][4:][::2].decode(screenEncoding, "replace").encode('utf-8').decode('utf-8')
self.env['screenData']['newContentAttrib'] = self.env['screenData']['newContentBytes'][5:][::2] self.env['screenData']['newContentAttrib'] = self.env['screenData']['newContentBytes'][5:][::2]
self.env['screenData']['newContentText'] = self.insert_newlines(self.env['screenData']['newContentText'], self.env['screenData']['columns']) self.env['screenData']['newContentText'] = screen_utils.insertNewlines(self.env['screenData']['newContentText'], self.env['screenData']['columns'])
if self.env['screenData']['newTTY'] != self.env['screenData']['oldTTY']: if self.env['screenData']['newTTY'] != self.env['screenData']['oldTTY']:
self.env['screenData']['oldContentBytes'] = b'' self.env['screenData']['oldContentBytes'] = b''
@ -152,6 +149,8 @@ class driver():
self.env['screenData']['newNegativeDelta'] = ''.join(x[2:] for x in diffList if x[0] == '-') self.env['screenData']['newNegativeDelta'] = ''.join(x[2:] for x in diffList if x[0] == '-')
# track highlighted # track highlighted
#print(self.env['screenData']['oldContentAttrib'] , self.env['screenData']['newContentAttrib'])
if self.env['screenData']['oldContentAttrib'] != self.env['screenData']['newContentAttrib']: if self.env['screenData']['oldContentAttrib'] != self.env['screenData']['newContentAttrib']:
pass self.env['screenData']['newAttribDelta'], currCursor = screen_utils.trackHighlights(self.env['screenData']['oldContentAttrib'], self.env['screenData']['newContentAttrib'], self.env['screenData']['newContentText'], self.env['screenData']['columns'])
#print('drin',self.env['screenData']['newAttribDelta'])

6
src/fenrir/utils/screen_utils.py
View File

@ -10,7 +10,7 @@ from collections import Counter
def insertNewlines(string, every=64): def insertNewlines(string, every=64):
return '\n'.join(string[i:i+every] for i in range(0, len(string), every)) return '\n'.join(string[i:i+every] for i in range(0, len(string), every))
def splitOnPos(string, every=64): def splitEvery(string, every=64):
return list(string[i:i+every] for i in range(0, len(string), every)) return list(string[i:i+every] for i in range(0, len(string), every))
old = b'eeeemmmeeeeeeeee' old = b'eeeemmmeeeeeeeee'
@ -26,8 +26,8 @@ def trackHighlights(oldAttr, newAttr, text, lenght):
return result, currCursor return result, currCursor
textLines = insertNewlines(text,lenght) textLines = insertNewlines(text,lenght)
textLines = textLines.split('\n') textLines = textLines.split('\n')
old = splitOnPos(oldAttr,lenght) old = splitEvery(oldAttr,lenght)
new = splitOnPos(newAttr,lenght) new = splitEvery(newAttr,lenght)
if len(old) != len(new): if len(old) != len(new):
return result, currCursor return result, currCursor
if len(text) != len(new): if len(text) != len(new):