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

make code more short, remove unneded sleeps

Browse Source
This commit is contained in:
chrys 2017-02-26 14:52:38 +01:00
parent 21e7f68235
commit 7a41c015a8
2 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/fenrir/core/commandManager.py
View File

@ -15,38 +15,17 @@ class commandManager():
def initialize(self, environment): def initialize(self, environment):
self.env = environment self.env = environment
# commands # commands
self.env['runtime']['commandManager'].loadCommands('commands', for commandFolder in self.env['generalInformation']['commandFolderList']:
self.env['runtime']['settingsManager'].getSetting('general', 'commandPath')) self.env['runtime']['commandManager'].loadCommands(commandFolder,
self.env['runtime']['commandManager'].loadCommands('commands') self.env['runtime']['settingsManager'].getSetting('general', 'commandPath'))
# onInput self.env['runtime']['commandManager'].loadCommands(commandFolder)
self.env['runtime']['commandManager'].loadCommands('onInput',
self.env['runtime']['settingsManager'].getSetting('general', 'commandPath'))
self.env['runtime']['commandManager'].loadCommands('onInput')
# onScreenUpdate
self.env['runtime']['commandManager'].loadCommands('onScreenUpdate',
self.env['runtime']['settingsManager'].getSetting('general', 'commandPath'))
self.env['runtime']['commandManager'].loadCommands('onScreenUpdate')
# onScreenChanged
self.env['runtime']['commandManager'].loadCommands('onScreenChanged',
self.env['runtime']['settingsManager'].getSetting('general', 'commandPath'))
self.env['runtime']['commandManager'].loadCommands('onScreenChanged')
# onApplicationChange
self.env['runtime']['commandManager'].loadCommands('onApplicationChange',
self.env['runtime']['settingsManager'].getSetting('general', 'commandPath'))
self.env['runtime']['commandManager'].loadCommands('onApplicationChange')
# onSwitchApplicationProfile
self.env['runtime']['commandManager'].loadCommands('onSwitchApplicationProfile',
self.env['runtime']['settingsManager'].getSetting('general', 'commandPath'))
self.env['runtime']['commandManager'].loadCommands('onSwitchApplicationProfile')
# scripts for scriptKey # scripts for scriptKey
self.env['runtime']['commandManager'].loadScriptCommands() self.env['runtime']['commandManager'].loadScriptCommands()
def shutdown(self): def shutdown(self):
self.env['runtime']['commandManager'].shutdownCommands('commands') for commandFolder in self.env['generalInformation']['commandFolderList']:
self.env['runtime']['commandManager'].shutdownCommands('onInput') self.env['runtime']['commandManager'].shutdownCommands(commandFolder)
self.env['runtime']['commandManager'].shutdownCommands('onScreenUpdate')
self.env['runtime']['commandManager'].shutdownCommands('onScreenChanged')
self.env['runtime']['commandManager'].shutdownCommands('onApplicationChange')
self.env['runtime']['commandManager'].shutdownCommands('onSwitchApplicationProfile')
def loadCommands(self, section='commands',commandPath=''): def loadCommands(self, section='commands',commandPath=''):
if commandPath =='': if commandPath =='':

2
src/fenrir/core/generalInformation.py
View File

@ -13,4 +13,6 @@ generalInformation = {
'prevUser':'', 'prevUser':'',
'managerList':['inputManager','screenManager','commandManager','outputManager' 'managerList':['inputManager','screenManager','commandManager','outputManager'
,'punctuationManager','cursorManager','applicationManager','debug'], ,'punctuationManager','cursorManager','applicationManager','debug'],
'commandFolderList':['commands','onInput','onScreenUpdate','onScreenChanged'
,'onApplicationChange','onSwitchApplicationProfile',],
} }