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

fix formatting

Browse Source
This commit is contained in:
chrys 2016-07-07 17:24:53 +02:00
parent ac4e654aa3
commit a7af5fadde
1 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/fenrir.py
View File

@ -7,7 +7,6 @@ import hashlib
import difflib
import textwrap
import time
from subprocess import Popen, PIPE
import utils.debug
import core.environment as environment
@ -20,50 +19,50 @@ runtime['speechDriverString'] = 'speechd'
runtime['speechDriver'] = sd.speech()
while(runtime['running']):
# read screen
currTTY = open('/sys/devices/virtual/tty/tty0/active','r')
runtime['newTTY'] = currTTY.read()[3:-1]
currTTY.close()
# read screen
currTTY = open('/sys/devices/virtual/tty/tty0/active','r')
runtime['newTTY'] = currTTY.read()[3:-1]
currTTY.close()
try:
vcsa = open(runtime['screenDriver'] + runtime['newTTY'] ,'rb',0)
runtime['newContentBytes'] = vcsa.read()
vcsa.close()
except:
continue
try:
vcsa = open(runtime['screenDriver'] + runtime['newTTY'] ,'rb',0)
runtime['newContentBytes'] = vcsa.read()
vcsa.close()
except:
continue
# get metadata like cursor or screensize
runtime['lines'] = int( runtime['newContentBytes'][0])
runtime['columns'] = int( runtime['newContentBytes'][1])
runtime['newCursor']['x'] = int( runtime['newContentBytes'][2])
runtime['newCursor']['y'] = int( runtime['newContentBytes'][3])
# get metadata like cursor or screensize
runtime['lines'] = int( runtime['newContentBytes'][0])
runtime['columns'] = int( runtime['newContentBytes'][1])
runtime['newCursor']['x'] = int( runtime['newContentBytes'][2])
runtime['newCursor']['y'] = int( runtime['newContentBytes'][3])
# analyze content
# analyze content
runtime['newContentText'] = str(runtime['newContentBytes'][4:][::2].decode('cp1252').encode('utf-8'))[2:-1]
runtime['newContentAttrib'] = runtime['newContentBytes'][5:][::2]
runtime['newContentText'] = '\n'.join(textwrap.wrap(runtime['newContentText'], runtime['columns']))[:-1]
print("|"+runtime['newContentText'] +"|")
print(runtime['newTTY'])
if runtime['newTTY'] != runtime['oldTTY']:
runtime['oldContentBytes'] = b''
runtime['newContentText'] = str(runtime['newContentBytes'][4:][::2].decode('cp1252').encode('utf-8'))[2:-1]
runtime['newContentAttrib'] = runtime['newContentBytes'][5:][::2]
runtime['newContentText'] = '\n'.join(textwrap.wrap(runtime['newContentText'], runtime['columns']))[:-1]
print("|"+runtime['newContentText'] +"|")
print(runtime['newTTY'])
if runtime['newTTY'] != runtime['oldTTY']:
runtime['oldContentBytes'] = b''
runtime['oldContentAttrib'] = b''
runtime['oldContentText'] = ''
runtime['oldCursor']['x'] = 0
runtime['oldCursor']['y'] = 0
# changes on the screen
if runtime['oldContentBytes'] != runtime['newContentBytes']:
if ((len(runtime['delta']) < 3) or runtime['oldTTY'] != runtime['newTTY']):
runtime['speechDriver'].cancel()
diff = difflib.ndiff(runtime['oldContentText'], runtime['newContentText'])
runtime['delta'] = ''.join(x[2:] for x in diff if x.startswith('+ '))
runtime['speechDriver'].speak(runtime['delta'])
# changes on the screen
if runtime['oldContentBytes'] != runtime['newContentBytes']:
if ((len(runtime['delta']) < 3) or runtime['oldTTY'] != runtime['newTTY']):
runtime['speechDriver'].cancel()
diff = difflib.ndiff(runtime['oldContentText'], runtime['newContentText'])
runtime['delta'] = ''.join(x[2:] for x in diff if x.startswith('+ '))
runtime['speechDriver'].speak(runtime['delta'])
# set new "old" values
runtime['oldContentBytes'] = runtime['newContentBytes']
runtime['oldContentText'] = runtime['newContentText']
runtime['oldContentTextAttrib'] = runtime['newContentAttrib']
runtime['oldCursor']['x'] = runtime['newCursor']['x']
runtime['oldCursor']['y'] = runtime['newCursor']['y']
runtime['oldTTY'] = runtime['newTTY']
# set new "old" values
runtime['oldContentBytes'] = runtime['newContentBytes']
runtime['oldContentText'] = runtime['newContentText']
runtime['oldContentTextAttrib'] = runtime['newContentAttrib']
runtime['oldCursor']['x'] = runtime['newCursor']['x']
runtime['oldCursor']['y'] = runtime['newCursor']['y']
runtime['oldTTY'] = runtime['newTTY']