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

Most of the pep8 changes finished. Be careful, things may be horribly broken.

Browse Source
This commit is contained in:
Storm Dragon
2025-07-03 13:22:00 -04:00
parent 7408951152
commit 21bb9c6083
344 changed files with 6374 additions and 6083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@
# By Chrys, Storm Dragon, and contributers.
from fenrirscreenreader.core import debug
from fenrirscreenreader.core.remoteDriver import remoteDriver
from fenrirscreenreader.core.remoteDriver import RemoteDriver as remoteDriver
class driver(remoteDriver):

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

@ -5,8 +5,8 @@
# By Chrys, Storm Dragon, and contributers.
from fenrirscreenreader.core import debug
from fenrirscreenreader.core.remoteDriver import remoteDriver
from fenrirscreenreader.core.eventData import fenrirEventType
from fenrirscreenreader.core.remoteDriver import RemoteDriver as remoteDriver
from fenrirscreenreader.core.eventData import FenrirEventType
import select
import socket
@ -20,15 +20,15 @@ class driver(remoteDriver):
def initialize(self, environment):
self.env = environment
self.env['runtime']['processManager'].addCustomEventThread(
self.watchDog, multiprocess=True)
self.env['runtime']['ProcessManager'].add_custom_event_thread(
self.watch_dog, multiprocess=True)
def watchDog(self, active, eventQueue):
def watch_dog(self, active, event_queue):
# 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(
self.port = self.env['runtime']['SettingsManager'].get_setting_as_int(
'remote', 'port')
self.fenrirSock.bind((self.host, self.port))
self.fenrirSock.listen(1)
@ -44,24 +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']['DebugManager'].write_debug_out(
'tcpDriver watch_dog: 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
event_queue.put({"Type": FenrirEventType.remote_incomming,
"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']['DebugManager'].write_debug_out(
'tcpDriver watch_dog: 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']['DebugManager'].write_debug_out(
'tcpDriver watch_dog: Error closing client socket: ' + str(e),
debug.DebugLevel.ERROR)
if self.fenrirSock:
self.fenrirSock.close()
self.fenrirSock = None

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

@ -5,8 +5,8 @@
# By Chrys, Storm Dragon, and contributers.
from fenrirscreenreader.core import debug
from fenrirscreenreader.core.remoteDriver import remoteDriver
from fenrirscreenreader.core.eventData import fenrirEventType
from fenrirscreenreader.core.remoteDriver import RemoteDriver as remoteDriver
from fenrirscreenreader.core.eventData import FenrirEventType
import select
import socket
@ -20,32 +20,32 @@ class driver(remoteDriver):
def initialize(self, environment):
self.env = environment
self.env['runtime']['processManager'].addCustomEventThread(
self.watchDog, multiprocess=True)
self.env['runtime']['ProcessManager'].add_custom_event_thread(
self.watch_dog, multiprocess=True)
def watchDog(self, active, eventQueue):
def watch_dog(self, active, event_queue):
# echo "command say this is a test" | socat -
# UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
socketFile = ''
socket_file = ''
try:
socketFile = self.env['runtime']['settingsManager'].getSetting(
'remote', 'socketFile')
socket_file = self.env['runtime']['SettingsManager'].get_setting(
'remote', 'socket_file')
except Exception as e:
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(
self.env['runtime']['DebugManager'].write_debug_out(
'unixDriver watch_dog: Error getting socket file setting: ' + str(e),
debug.DebugLevel.ERROR)
if socket_file == '':
if self.env['runtime']['SettingsManager'].get_setting(
'screen', 'driver') == 'vcsaDriver':
socketFile = '/tmp/fenrirscreenreader-deamon.sock'
socket_file = '/tmp/fenrirscreenreader-deamon.sock'
else:
socketFile = '/tmp/fenrirscreenreader-' + \
socket_file = '/tmp/fenrirscreenreader-' + \
str(os.getppid()) + '.sock'
if os.path.exists(socketFile):
os.unlink(socketFile)
if os.path.exists(socket_file):
os.unlink(socket_file)
self.fenrirSock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
self.fenrirSock.bind(socketFile)
os.chmod(socketFile, 0o666) # Allow all users to read/write
self.fenrirSock.bind(socket_file)
os.chmod(socket_file, 0o666) # Allow all users to read/write
self.fenrirSock.listen(1)
while active.value:
# Check if the client is still connected and if data is available:
@ -63,30 +63,30 @@ class driver(remoteDriver):
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']['DebugManager'].write_debug_out(
'unixDriver watch_dog: 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
event_queue.put({"Type": FenrirEventType.remote_incomming,
"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']['DebugManager'].write_debug_out(
'unixDriver watch_dog: 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']['DebugManager'].write_debug_out(
'unixDriver watch_dog: Error closing client socket: ' + str(e),
debug.DebugLevel.ERROR)
if self.fenrirSock:
self.fenrirSock.close()
self.fenrirSock = None
if os.path.exists(socketFile):
os.unlink(socketFile)
if os.path.exists(socket_file):
os.unlink(socket_file)