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

28
src/fenrirscreenreader/soundDriver/debugDriver.py
View File

@ -5,12 +5,12 @@
# By Chrys, Storm Dragon, and contributers.
from fenrirscreenreader.core import debug
from fenrirscreenreader.core.soundDriver import soundDriver
from fenrirscreenreader.core.soundDriver import sound_driver
class driver(soundDriver):
class driver(sound_driver):
def __init__(self):
soundDriver.__init__(self)
sound_driver.__init__(self)
def initialize(self, environment):
self.env = environment
@ -24,32 +24,32 @@ class driver(soundDriver):
self._initialized = False
print('Sound Debug Driver: Shutdown')
def playFrequence(
def play_frequence(
self,
frequence,
duration,
adjustVolume=0.0,
adjust_volume=0.0,
interrupt=True):
if not self._initialized:
return
if interrupt:
self.cancel()
print(
'Sound Debug Driver: playFrequence:' +
'Sound Debug Driver: play_frequence:' +
' freq:' +
str(frequence) +
' duration:' +
str(duration) +
' adjustVolume:' +
str(adjustVolume))
' adjust_volume:' +
str(adjust_volume))
print('Sound Debug Driver: -----------------------------------')
def playSoundFile(self, filePath, interrupt=True):
def play_sound_file(self, file_path, interrupt=True):
if not self._initialized:
return
if interrupt:
self.cancel()
print('Sound Debug Driver: playSoundFile:' + str(filePath))
print('Sound Debug Driver: play_sound_file:' + str(file_path))
print('Sound Debug Driver: -----------------------------------')
def cancel(self):
@ -57,13 +57,13 @@ class driver(soundDriver):
return
print('Sound Debug Driver: Cancel')
def setCallback(self, callback):
def set_callback(self, callback):
if not self._initialized:
return
print('Sound Debug Driver: setCallback')
print('Sound Debug Driver: set_callback')
def setVolume(self, volume):
def set_volume(self, volume):
if not self._initialized:
return
self.volume = volume
print('Sound Debug Driver: setVolume:' + str(self.volume))
print('Sound Debug Driver: set_volume:' + str(self.volume))

6
src/fenrirscreenreader/soundDriver/dummyDriver.py
View File

@ -5,9 +5,9 @@
# By Chrys, Storm Dragon, and contributers.
from fenrirscreenreader.core import debug
from fenrirscreenreader.core.soundDriver import soundDriver
from fenrirscreenreader.core.soundDriver import sound_driver
class driver(soundDriver):
class driver(sound_driver):
def __init__(self):
soundDriver.__init__(self)
sound_driver.__init__(self)

38
src/fenrirscreenreader/soundDriver/genericDriver.py
View File

@ -7,12 +7,12 @@
from fenrirscreenreader.core import debug
import subprocess
import shlex
from fenrirscreenreader.core.soundDriver import soundDriver
from fenrirscreenreader.core.soundDriver import sound_driver
class driver(soundDriver):
class driver(sound_driver):
def __init__(self):
soundDriver.__init__(self)
sound_driver.__init__(self)
self.proc = None
self.soundType = ''
self.soundFileCommand = ''
@ -20,9 +20,9 @@ class driver(soundDriver):
def initialize(self, environment):
self.env = environment
self.soundFileCommand = self.env['runtime']['settingsManager'].getSetting(
self.soundFileCommand = self.env['runtime']['SettingsManager'].get_setting(
'sound', 'genericPlayFileCommand')
self.frequenceCommand = self.env['runtime']['settingsManager'].getSetting(
self.frequenceCommand = self.env['runtime']['SettingsManager'].get_setting(
'sound', 'genericFrequencyCommand')
if self.soundFileCommand == '':
self.soundFileCommand = 'play -q -v fenrirVolume fenrirSoundFile'
@ -30,47 +30,47 @@ class driver(soundDriver):
self.frequenceCommand = 'play -q -v fenrirVolume -n -c1 synth fenrirDuration sine fenrirFrequence'
self._initialized = True
def playFrequence(
def play_frequence(
self,
frequence,
duration,
adjustVolume=0.0,
adjust_volume=0.0,
interrupt=True):
if not self._initialized:
return
if interrupt:
self.cancel()
popenFrequenceCommand = shlex.split(self.frequenceCommand)
for idx, word in enumerate(popenFrequenceCommand):
popen_frequence_command = shlex.split(self.frequenceCommand)
for idx, word in enumerate(popen_frequence_command):
word = word.replace(
'fenrirVolume', str(
self.volume * adjustVolume))
self.volume * adjust_volume))
word = word.replace('fenrirDuration', str(duration))
word = word.replace('fenrirFrequence', str(frequence))
popenFrequenceCommand[idx] = word
popen_frequence_command[idx] = word
self.proc = subprocess.Popen(
popenFrequenceCommand,
popen_frequence_command,
stdin=None,
stdout=None,
stderr=None,
shell=False)
self.soundType = 'frequence'
def playSoundFile(self, filePath, interrupt=True):
def play_sound_file(self, file_path, interrupt=True):
if not self._initialized:
return
if interrupt:
self.cancel()
# Validate file path to prevent injection
import os
if not os.path.isfile(filePath) or '..' in filePath:
if not os.path.isfile(file_path) or '..' in file_path:
return
popenSoundFileCommand = shlex.split(self.soundFileCommand)
for idx, word in enumerate(popenSoundFileCommand):
popen_sound_file_command = shlex.split(self.soundFileCommand)
for idx, word in enumerate(popen_sound_file_command):
word = word.replace('fenrirVolume', str(self.volume))
word = word.replace('fenrirSoundFile', shlex.quote(str(filePath)))
popenSoundFileCommand[idx] = word
self.proc = subprocess.Popen(popenSoundFileCommand, shell=False)
word = word.replace('fenrirSoundFile', shlex.quote(str(file_path)))
popen_sound_file_command[idx] = word
self.proc = subprocess.Popen(popen_sound_file_command, shell=False)
self.soundType = 'file'
def cancel(self):

44
src/fenrirscreenreader/soundDriver/gstreamerDriver.py
View File

@ -7,7 +7,7 @@
from fenrirscreenreader.core import debug
import time
import threading
from fenrirscreenreader.core.soundDriver import soundDriver
from fenrirscreenreader.core.soundDriver import sound_driver
_gstreamerAvailable = False
try:
@ -21,9 +21,9 @@ except Exception as e:
_availableError = str(e)
class driver(soundDriver):
class driver(sound_driver):
def __init__(self):
soundDriver.__init__(self)
sound_driver.__init__(self)
self._source = None
self._sink = None
@ -33,18 +33,18 @@ class driver(soundDriver):
self._initialized = _gstreamerAvailable
if not self._initialized:
global _availableError
self.environment['runtime']['debug'].writeDebugOut(
'Gstreamer not available ' + _availableError, debug.debugLevel.ERROR)
self.environment['runtime']['DebugManager'].write_debug_out(
'Gstreamer not available ' + _availableError, debug.DebugLevel.ERROR)
return
self._player = Gst.ElementFactory.make('playbin', 'player')
bus = self._player.get_bus()
bus.add_signal_watch()
bus.connect("message", self._onPlayerMessage)
bus.connect("message", self._on_player_message)
self._pipeline = Gst.Pipeline(name='fenrir-pipeline')
bus = self._pipeline.get_bus()
bus.add_signal_watch()
bus.connect("message", self._onPipelineMessage)
bus.connect("message", self._on_pipeline_message)
self._source = Gst.ElementFactory.make('audiotestsrc', 'src')
self._sink = Gst.ElementFactory.make('autoaudiosink', 'output')
@ -65,7 +65,7 @@ class driver(soundDriver):
# 2 second timeout to prevent hanging
self.thread.join(timeout=2.0)
def _onPlayerMessage(self, bus, message):
def _on_player_message(self, bus, message):
if not self._initialized:
return
if message.type == Gst.MessageType.EOS:
@ -73,11 +73,11 @@ class driver(soundDriver):
elif message.type == Gst.MessageType.ERROR:
self._player.set_state(Gst.State.NULL)
error, info = message.parse_error()
self.env['runtime']['debug'].writeDebugOut(
'GSTREAMER: _onPlayerMessage' + str(error) + str(info),
debug.debugLevel.WARNING)
self.env['runtime']['DebugManager'].write_debug_out(
'GSTREAMER: _on_player_message' + str(error) + str(info),
debug.DebugLevel.WARNING)
def _onPipelineMessage(self, bus, message):
def _on_pipeline_message(self, bus, message):
if not self._initialized:
return
if message.type == Gst.MessageType.EOS:
@ -85,39 +85,39 @@ class driver(soundDriver):
elif message.type == Gst.MessageType.ERROR:
self._pipeline.set_state(Gst.State.NULL)
error, info = message.parse_error()
self.env['runtime']['debug'].writeDebugOut(
'GSTREAMER: _onPipelineMessage' + str(error) + str(info),
debug.debugLevel.WARNING)
self.env['runtime']['DebugManager'].write_debug_out(
'GSTREAMER: _on_pipeline_message' + str(error) + str(info),
debug.DebugLevel.WARNING)
def _onTimeout(self, element):
def _on_timeout(self, element):
if not self._initialized:
return
element.set_state(Gst.State.NULL)
def playSoundFile(self, fileName, interrupt=True):
def play_sound_file(self, file_name, interrupt=True):
if not self._initialized:
return
if interrupt:
self.cancel()
self._player.set_property('volume', self.volume)
self._player.set_property('uri', 'file://%s' % fileName)
self._player.set_property('uri', 'file://%s' % file_name)
self._player.set_state(Gst.State.PLAYING)
def playFrequence(
def play_frequence(
self,
frequence,
duration,
adjustVolume=0.0,
adjust_volume=0.0,
interrupt=True):
if not self._initialized:
return
if interrupt:
self.cancel()
duration = duration * 1000
self._source.set_property('volume', self.volume * adjustVolume)
self._source.set_property('volume', self.volume * adjust_volume)
self._source.set_property('freq', frequence)
self._pipeline.set_state(Gst.State.PLAYING)
GLib.timeout_add(duration, self._onTimeout, self._pipeline)
GLib.timeout_add(duration, self._on_timeout, self._pipeline)
def cancel(self, element=None):
if not self._initialized: