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

To make Fenrir easier to approach for new developer, start code migration to be pep8 compliant.

Browse Source
This commit is contained in:
Storm Dragon
2025-07-01 22:23:50 -04:00
parent 4bcf82178e
commit 7408951152
345 changed files with 8688 additions and 3852 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/fenrirscreenreader/remoteDriver/dummyDriver.py
View File

@ -7,6 +7,7 @@
from fenrirscreenreader.core import debug
from fenrirscreenreader.core.remoteDriver import remoteDriver
class driver(remoteDriver):
def __init__(self):
remoteDriver.__init__(self)

34
src/fenrirscreenreader/remoteDriver/tcpDriver.py
View File

@ -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

51
src/fenrirscreenreader/remoteDriver/unixDriver.py
View File

@ -8,27 +8,39 @@ 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['runtime']['processManager'].addCustomEventThread(
self.watchDog, multiprocess=True)
def watchDog(self, active, eventQueue):
# echo "command say this is a test" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
# echo "command say this is a test" | socat -
# UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
socketFile = ''
try:
socketFile = self.env['runtime']['settingsManager'].getSetting('remote', 'socketFile')
socketFile = self.env['runtime']['settingsManager'].getSetting(
'remote', 'socketFile')
except Exception as e:
self.env['runtime']['debug'].writeDebugOut('unixDriver watchDog: Error getting socket file setting: ' + str(e), debug.debugLevel.ERROR)
self.env['runtime']['debug'].writeDebugOut(
'unixDriver watchDog: Error getting socket file setting: ' + str(e),
debug.debugLevel.ERROR)
if socketFile == '':
if self.env['runtime']['settingsManager'].getSetting('screen', 'driver') =='vcsaDriver':
socketFile = '/tmp/fenrirscreenreader-deamon.sock'
if self.env['runtime']['settingsManager'].getSetting(
'screen', 'driver') == 'vcsaDriver':
socketFile = '/tmp/fenrirscreenreader-deamon.sock'
else:
socketFile = '/tmp/fenrirscreenreader-' + str(os.getppid()) + '.sock'
socketFile = '/tmp/fenrirscreenreader-' + \
str(os.getppid()) + '.sock'
if os.path.exists(socketFile):
os.unlink(socketFile)
self.fenrirSock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
@ -45,27 +57,34 @@ class driver(remoteDriver):
continue
if self.fenrirSock in r:
client_sock, client_addr = self.fenrirSock.accept()
# Ensure client socket is always closed to prevent resource leaks
# Ensure client socket is always closed to prevent resource
# leaks
try:
try:
rawdata = client_sock.recv(8129)
except Exception as e:
self.env['runtime']['debug'].writeDebugOut('unixDriver watchDog: Error receiving data from client: ' + str(e), debug.debugLevel.ERROR)
self.env['runtime']['debug'].writeDebugOut(
'unixDriver watchDog: Error receiving data from client: ' + str(e),
debug.debugLevel.ERROR)
rawdata = b'' # Set default empty data if recv fails
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('unixDriver watchDog: Error decoding/queuing data: ' + str(e), debug.debugLevel.ERROR)
self.env['runtime']['debug'].writeDebugOut(
'unixDriver watchDog: Error decoding/queuing data: ' + str(e),
debug.debugLevel.ERROR)
finally:
# Always close client socket, even if data processing fails
try:
client_sock.close()
except Exception as e:
self.env['runtime']['debug'].writeDebugOut('unixDriver watchDog: Error closing client socket: ' + str(e), debug.debugLevel.ERROR)
self.env['runtime']['debug'].writeDebugOut(
'unixDriver watchDog: Error closing client socket: ' + str(e),
debug.debugLevel.ERROR)
if self.fenrirSock:
self.fenrirSock.close()
self.fenrirSock = None