To make Fenrir easier to approach for new developer, start code migration to be pep8 compliant.
This commit is contained in:
@ -8,20 +8,28 @@ from fenrirscreenreader.core import debug
|
||||
from fenrirscreenreader.core.remoteDriver import remoteDriver
|
||||
from fenrirscreenreader.core.eventData import fenrirEventType
|
||||
|
||||
import select, socket, os, os.path
|
||||
import select
|
||||
import socket
|
||||
import os
|
||||
import os.path
|
||||
|
||||
|
||||
class driver(remoteDriver):
|
||||
def __init__(self):
|
||||
remoteDriver.__init__(self)
|
||||
|
||||
def initialize(self, environment):
|
||||
self.env = environment
|
||||
self.env['runtime']['processManager'].addCustomEventThread(self.watchDog, multiprocess=True)
|
||||
self.env = environment
|
||||
self.env['runtime']['processManager'].addCustomEventThread(
|
||||
self.watchDog, multiprocess=True)
|
||||
|
||||
def watchDog(self, active, eventQueue):
|
||||
# echo "command say this is a test" | nc localhost 22447
|
||||
self.fenrirSock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
self.fenrirSock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
|
||||
self.host = '127.0.0.1'
|
||||
self.port = self.env['runtime']['settingsManager'].getSettingAsInt('remote', 'port')
|
||||
self.port = self.env['runtime']['settingsManager'].getSettingAsInt(
|
||||
'remote', 'port')
|
||||
self.fenrirSock.bind((self.host, self.port))
|
||||
self.fenrirSock.listen(1)
|
||||
while active.value:
|
||||
@ -36,18 +44,24 @@ class driver(remoteDriver):
|
||||
try:
|
||||
rawdata = client_sock.recv(8129)
|
||||
except Exception as e:
|
||||
self.env['runtime']['debug'].writeDebugOut('tcpDriver watchDog: Error receiving data from client: ' + str(e), debug.debugLevel.ERROR)
|
||||
self.env['runtime']['debug'].writeDebugOut(
|
||||
'tcpDriver watchDog: Error receiving data from client: ' + str(e),
|
||||
debug.debugLevel.ERROR)
|
||||
try:
|
||||
data = rawdata.decode("utf-8").rstrip().lstrip()
|
||||
eventQueue.put({"Type":fenrirEventType.RemoteIncomming,
|
||||
"Data": data
|
||||
})
|
||||
eventQueue.put({"Type": fenrirEventType.RemoteIncomming,
|
||||
"Data": data
|
||||
})
|
||||
except Exception as e:
|
||||
self.env['runtime']['debug'].writeDebugOut('tcpDriver watchDog: Error decoding/queuing data: ' + str(e), debug.debugLevel.ERROR)
|
||||
self.env['runtime']['debug'].writeDebugOut(
|
||||
'tcpDriver watchDog: Error decoding/queuing data: ' + str(e),
|
||||
debug.debugLevel.ERROR)
|
||||
try:
|
||||
client_sock.close()
|
||||
except Exception as e:
|
||||
self.env['runtime']['debug'].writeDebugOut('tcpDriver watchDog: Error closing client socket: ' + str(e), debug.debugLevel.ERROR)
|
||||
self.env['runtime']['debug'].writeDebugOut(
|
||||
'tcpDriver watchDog: Error closing client socket: ' + str(e),
|
||||
debug.debugLevel.ERROR)
|
||||
if self.fenrirSock:
|
||||
self.fenrirSock.close()
|
||||
self.fenrirSock = None
|
||||
|
Reference in New Issue
Block a user