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

Update fenrir.py

Browse Source
This commit is contained in:
chrys87 2016-09-20 16:49:44 +02:00 committed by GitHub
parent a98c241c0e
commit b8a6ef4fdc
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/fenrir-package/fenrir.py
View File

@ -21,9 +21,10 @@ class fenrir():
except RuntimeError: except RuntimeError:
raise raise
signal.signal(signal.SIGINT, self.captureSignal) signal.signal(signal.SIGINT, self.captureSignal)
signal.signal(signal.SIGTERM, self.captureSignal)
def proceed(self):
self.environment['runtime']['outputManager'].presentText(self.environment, "Start Fenrir", soundIcon='ScreenReaderOn', interrupt=True) self.environment['runtime']['outputManager'].presentText(self.environment, "Start Fenrir", soundIcon='ScreenReaderOn', interrupt=True)
def proceed(self):
while(self.environment['generalInformation']['running']): while(self.environment['generalInformation']['running']):
try: try:
self.handleProcess() self.handleProcess()
@ -54,15 +55,13 @@ class fenrir():
def prepareCommand(self): def prepareCommand(self):
if self.environment['input']['keyForeward']: if self.environment['input']['keyForeward']:
return return
if time.time() - self.environment['commandInfo']['lastCommandExecutionTime'] < 0.2: if time.time() - self.environment['commandInfo']['lastCommandExecutionTime'] < 0.2:
return return
shortcut = self.environment['runtime']['inputManager'].getCurrShortcut(self.environment) shortcut = self.environment['runtime']['inputManager'].getCurrShortcut(self.environment)
command = self.environment['runtime']['inputManager'].getCommandForShortcut(self.environment, shortcut) command = self.environment['runtime']['inputManager'].getCommandForShortcut(self.environment, shortcut)
self.environment['runtime']['commandManager'].queueCommand(self.environment, command) self.environment['runtime']['commandManager'].queueCommand(self.environment, command)
def handleCommands(self): def handleCommands(self):
if self.environment['input']['keyForeward']:
return
if self.environment['runtime']['commandManager'].isCommandQueued(self.environment): if self.environment['runtime']['commandManager'].isCommandQueued(self.environment):
self.environment['runtime']['commandManager'].executeCommand(self.environment, self.environment['commandInfo']['currCommand'], 'commands') self.environment['runtime']['commandManager'].executeCommand(self.environment, self.environment['commandInfo']['currCommand'], 'commands')
@ -76,7 +75,7 @@ class fenrir():
if self.environment['runtime']['inputManager']: if self.environment['runtime']['inputManager']:
self.environment['runtime']['inputManager'].shutdown(self.environment) self.environment['runtime']['inputManager'].shutdown(self.environment)
self.environment['runtime']['outputManager'].presentText(self.environment, "Quit Fenrir", soundIcon='ScreenReaderOff', interrupt=True) self.environment['runtime']['outputManager'].presentText(self.environment, "Quit Fenrir", soundIcon='ScreenReaderOff', interrupt=True)
time.sleep(1.0) # wait a little before splatter it :) time.sleep(.8) # wait a little for sound
if self.environment['runtime']['screenManager']: if self.environment['runtime']['screenManager']:
self.environment['runtime']['screenManager'].shutdown(self.environment) self.environment['runtime']['screenManager'].shutdown(self.environment)
@ -87,7 +86,7 @@ class fenrir():
if self.environment['runtime']['debug']: if self.environment['runtime']['debug']:
self.environment['runtime']['debug'].closeDebugFile() self.environment['runtime']['debug'].closeDebugFile()
time.sleep(0.8) # wait a little before splatter it :) time.sleep(0.5) # wait a little before splatter it :)
self.environment = None self.environment = None
if __name__ == "__main__": if __name__ == "__main__":