From a973d5515dc0561873b9db6cc5c9ca452a739df8 Mon Sep 17 00:00:00 2001 From: chrys Date: Wed, 19 Oct 2016 23:29:40 +0200 Subject: [PATCH] add simple daeomon wrapper --- README.md | 7 +- src/fenrir/fenrir | 124 ++------------------------------ src/fenrir/fenrir-daemon.py | 26 +++++++ src/fenrir/fenrir.py | 136 ++++++++++++++++++++++++++++++++++++ 4 files changed, 170 insertions(+), 123 deletions(-) create mode 100755 src/fenrir/fenrir-daemon.py create mode 100755 src/fenrir/fenrir.py diff --git a/README.md b/README.md index f165cdd6..db1af81d 100644 --- a/README.md +++ b/README.md @@ -18,9 +18,10 @@ ReadWrite permission # optional - sox [its used by default in the generic sound driver for playing sound-icons] - speech-dispatcher, python3-speechd [to use the speech-dispatcher driver] -- brltty, python-brlapi [for using braille] # (not implemented yet) -- gstreamer [for soundicons via gstreamer] # not working yet -- python-pyenchant for spell check functionality +- brltty, python-brlapi [using braille] # (not implemented yet) +- gstreamer [soundicons via gstreamer] # not working yet +- python-pyenchant [spell check functionality] +- python-daemonize [use fenrir as background service on Unix like systems] # installation Currently there is no setupscript (sorry). But you can just run as root or setup needed permission diff --git a/src/fenrir/fenrir b/src/fenrir/fenrir index 93e541c2..091f2c4a 100755 --- a/src/fenrir/fenrir +++ b/src/fenrir/fenrir @@ -4,134 +4,18 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -import os, sys, signal, time +import os, sys import __main__ if not os.path.dirname(os.path.realpath(__main__.__file__)) in sys.path: sys.path.append(os.path.dirname(os.path.realpath(__main__.__file__))) -from core import settingsManager -from core import debug - -class fenrir(): - def __init__(self): - try: - self.environment = settingsManager.settingsManager().initFenrirConfig() - if not self.environment: - raise RuntimeError('Cannot Initialize. Maybe the configfile is not available or not parseable') - except RuntimeError: - raise - self.environment['runtime']['outputManager'].presentText("Start Fenrir", soundIcon='ScreenReaderOn', interrupt=True) - signal.signal(signal.SIGINT, self.captureSignal) - signal.signal(signal.SIGTERM, self.captureSignal) - self.wasCommand = False - - def proceed(self): - while(self.environment['generalInformation']['running']): - try: - self.handleProcess() - except Exception as e: - self.environment['runtime']['debug'].writeDebugOut(str(e),debug.debugLevel.ERROR) - self.shutdown() - - def handleProcess(self): - #startTime = time.time() - eventReceived = self.environment['runtime']['inputManager'].getInputEvent() - if eventReceived: - self.prepareCommand() - if not (self.wasCommand or self.environment['runtime']['inputManager'].isFenrirKeyPressed() or self.environment['runtime']['inputManager'].isScriptKeyPressed() or self.environment['generalInformation']['tutorialMode']) or self.environment['runtime']['screenManager'].isSuspendingScreen(): - self.environment['runtime']['inputManager'].writeEventBuffer() - if self.environment['runtime']['inputManager'].noKeyPressed(): - if self.wasCommand: - self.wasCommand = False - self.environment['runtime']['inputManager'].clearEventBuffer() - if self.environment['generalInformation']['tutorialMode']: - self.environment['runtime']['inputManager'].clearEventBuffer() - if self.environment['input']['keyForeward'] > 0: - self.environment['input']['keyForeward'] -=1 - self.environment['runtime']['screenManager'].update('onInput') - self.environment['runtime']['commandManager'].executeDefaultTrigger('onInput') - else: - self.environment['runtime']['screenManager'].update('onUpdate') - if self.environment['runtime']['applicationManager'].isApplicationChange(): - self.environment['runtime']['commandManager'].executeDefaultTrigger('onApplicationChange') - self.environment['runtime']['commandManager'].executeSwitchTrigger('onSwitchApplicationProfile', \ - self.environment['runtime']['applicationManager'].getPrevApplication(), \ - self.environment['runtime']['applicationManager'].getCurrentApplication()) - - if self.environment['runtime']['screenManager'].isScreenChange(): - self.environment['runtime']['commandManager'].executeDefaultTrigger('onScreenChanged') - else: - self.environment['runtime']['commandManager'].executeDefaultTrigger('onScreenUpdate') - - self.handleCommands() - #print(time.time()-startTime) - - def prepareCommand(self): - if self.environment['runtime']['screenManager'].isSuspendingScreen(): - return - if self.environment['runtime']['inputManager'].noKeyPressed(): - return - if self.environment['input']['keyForeward'] > 0: - return - shortcut = self.environment['runtime']['inputManager'].getCurrShortcut() - command = self.environment['runtime']['inputManager'].getCommandForShortcut(shortcut) - if len(self.environment['input']['prevDeepestInput']) <= len(self.environment['input']['currInput']): - self.wasCommand = command != '' - if command == '': - return - - self.environment['runtime']['commandManager'].queueCommand(command) - - - def handleCommands(self): - if not self.environment['runtime']['commandManager'].isCommandQueued(): - return - self.environment['runtime']['commandManager'].executeCommand( self.environment['commandInfo']['currCommand'], 'commands') - - def shutdownRequest(self): - self.environment['generalInformation']['running'] = False - - def captureSignal(self, siginit, frame): - self.shutdownRequest() - - def shutdown(self): - if self.environment['runtime']['inputManager']: - self.environment['runtime']['inputManager'].shutdown() - del self.environment['runtime']['inputManager'] - self.environment['runtime']['outputManager'].presentText("Quit Fenrir", soundIcon='ScreenReaderOff', interrupt=True) - time.sleep(0.9) # wait a little for sound - - if self.environment['runtime']['screenManager']: - self.environment['runtime']['screenManager'].shutdown() - del self.environment['runtime']['screenManager'] - if self.environment['runtime']['commandManager']: - self.environment['runtime']['commandManager'].shutdown() - del self.environment['runtime']['commandManager'] - if self.environment['runtime']['outputManager']: - self.environment['runtime']['outputManager'].shutdown() - del self.environment['runtime']['outputManager'] - if self.environment['runtime']['punctuationManager']: - self.environment['runtime']['punctuationManager'].shutdown() - del self.environment['runtime']['punctuationManager'] - if self.environment['runtime']['cursorManager']: - self.environment['runtime']['cursorManager'].shutdown() - del self.environment['runtime']['cursorManager'] - if self.environment['runtime']['applicationManager']: - self.environment['runtime']['applicationManager'].shutdown() - del self.environment['runtime']['applicationManager'] - - if self.environment['runtime']['debug']: - self.environment['runtime']['debug'].shutdown() - del self.environment['runtime']['debug'] - time.sleep(0.2) # wait a little before splatter it :) - self.environment = None +import fenrir def main(): - #if __name__ == "__main__": - app = fenrir() + app = fenrir.fenrir() app.proceed() del app if __name__ == "__main__": - main() + main() diff --git a/src/fenrir/fenrir-daemon.py b/src/fenrir/fenrir-daemon.py new file mode 100755 index 00000000..8652f576 --- /dev/null +++ b/src/fenrir/fenrir-daemon.py @@ -0,0 +1,26 @@ +#!/bin/python +# -*- coding: utf-8 -*- + +# Fenrir TTY screen reader +# By Chrys, Storm Dragon, and contributers. + +import os, sys +import __main__ + +if not os.path.dirname(os.path.realpath(__main__.__file__)) in sys.path: + sys.path.append(os.path.dirname(os.path.realpath(__main__.__file__))) + +import fenrir +from daemonize import Daemonize + +pid = "/tmp/fenrir.pid" + +def main(): + app = fenrir.fenrir() + app.proceed() + del app + +if __name__ == "__main__": + daemon = Daemonize(app="fenrir-daemon", pid=pid, action=main) + daemon.start() + diff --git a/src/fenrir/fenrir.py b/src/fenrir/fenrir.py new file mode 100755 index 00000000..2073414c --- /dev/null +++ b/src/fenrir/fenrir.py @@ -0,0 +1,136 @@ +#!/bin/python +# -*- coding: utf-8 -*- + +# Fenrir TTY screen reader +# By Chrys, Storm Dragon, and contributers. + +import os, sys, signal, time +import __main__ + +if not os.path.dirname(os.path.realpath(__main__.__file__)) in sys.path: + sys.path.append(os.path.dirname(os.path.realpath(__main__.__file__))) + +from core import settingsManager +from core import debug + +class fenrir(): + def __init__(self): + try: + self.environment = settingsManager.settingsManager().initFenrirConfig() + if not self.environment: + raise RuntimeError('Cannot Initialize. Maybe the configfile is not available or not parseable') + except RuntimeError: + raise + self.environment['runtime']['outputManager'].presentText("Start Fenrir", soundIcon='ScreenReaderOn', interrupt=True) + signal.signal(signal.SIGINT, self.captureSignal) + signal.signal(signal.SIGTERM, self.captureSignal) + self.wasCommand = False + + def proceed(self): + while(self.environment['generalInformation']['running']): + try: + self.handleProcess() + except Exception as e: + self.environment['runtime']['debug'].writeDebugOut(str(e),debug.debugLevel.ERROR) + self.shutdown() + + def handleProcess(self): + #startTime = time.time() + eventReceived = self.environment['runtime']['inputManager'].getInputEvent() + if eventReceived: + self.prepareCommand() + if not (self.wasCommand or self.environment['runtime']['inputManager'].isFenrirKeyPressed() or self.environment['runtime']['inputManager'].isScriptKeyPressed() or self.environment['generalInformation']['tutorialMode']) or self.environment['runtime']['screenManager'].isSuspendingScreen(): + self.environment['runtime']['inputManager'].writeEventBuffer() + if self.environment['runtime']['inputManager'].noKeyPressed(): + if self.wasCommand: + self.wasCommand = False + self.environment['runtime']['inputManager'].clearEventBuffer() + if self.environment['generalInformation']['tutorialMode']: + self.environment['runtime']['inputManager'].clearEventBuffer() + if self.environment['input']['keyForeward'] > 0: + self.environment['input']['keyForeward'] -=1 + self.environment['runtime']['screenManager'].update('onInput') + self.environment['runtime']['commandManager'].executeDefaultTrigger('onInput') + else: + self.environment['runtime']['screenManager'].update('onUpdate') + if self.environment['runtime']['applicationManager'].isApplicationChange(): + self.environment['runtime']['commandManager'].executeDefaultTrigger('onApplicationChange') + self.environment['runtime']['commandManager'].executeSwitchTrigger('onSwitchApplicationProfile', \ + self.environment['runtime']['applicationManager'].getPrevApplication(), \ + self.environment['runtime']['applicationManager'].getCurrentApplication()) + + if self.environment['runtime']['screenManager'].isScreenChange(): + self.environment['runtime']['commandManager'].executeDefaultTrigger('onScreenChanged') + else: + self.environment['runtime']['commandManager'].executeDefaultTrigger('onScreenUpdate') + + self.handleCommands() + #print(time.time()-startTime) + + def prepareCommand(self): + if self.environment['runtime']['screenManager'].isSuspendingScreen(): + return + if self.environment['runtime']['inputManager'].noKeyPressed(): + return + if self.environment['input']['keyForeward'] > 0: + return + shortcut = self.environment['runtime']['inputManager'].getCurrShortcut() + command = self.environment['runtime']['inputManager'].getCommandForShortcut(shortcut) + if len(self.environment['input']['prevDeepestInput']) <= len(self.environment['input']['currInput']): + self.wasCommand = command != '' + if command == '': + return + + self.environment['runtime']['commandManager'].queueCommand(command) + + + def handleCommands(self): + if not self.environment['runtime']['commandManager'].isCommandQueued(): + return + self.environment['runtime']['commandManager'].executeCommand( self.environment['commandInfo']['currCommand'], 'commands') + + def shutdownRequest(self): + self.environment['generalInformation']['running'] = False + + def captureSignal(self, siginit, frame): + self.shutdownRequest() + + def shutdown(self): + if self.environment['runtime']['inputManager']: + self.environment['runtime']['inputManager'].shutdown() + del self.environment['runtime']['inputManager'] + self.environment['runtime']['outputManager'].presentText("Quit Fenrir", soundIcon='ScreenReaderOff', interrupt=True) + time.sleep(0.9) # wait a little for sound + + if self.environment['runtime']['screenManager']: + self.environment['runtime']['screenManager'].shutdown() + del self.environment['runtime']['screenManager'] + if self.environment['runtime']['commandManager']: + self.environment['runtime']['commandManager'].shutdown() + del self.environment['runtime']['commandManager'] + if self.environment['runtime']['outputManager']: + self.environment['runtime']['outputManager'].shutdown() + del self.environment['runtime']['outputManager'] + if self.environment['runtime']['punctuationManager']: + self.environment['runtime']['punctuationManager'].shutdown() + del self.environment['runtime']['punctuationManager'] + if self.environment['runtime']['cursorManager']: + self.environment['runtime']['cursorManager'].shutdown() + del self.environment['runtime']['cursorManager'] + if self.environment['runtime']['applicationManager']: + self.environment['runtime']['applicationManager'].shutdown() + del self.environment['runtime']['applicationManager'] + + if self.environment['runtime']['debug']: + self.environment['runtime']['debug'].shutdown() + del self.environment['runtime']['debug'] + time.sleep(0.2) # wait a little before splatter it :) + self.environment = None + +def main(): + app = fenrir() + app.proceed() + del app + +if __name__ == "__main__": + main()