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

more cleanup

Browse Source
This commit is contained in:
Chrys 2016-08-19 17:47:21 +02:00
parent b1a2a15c8f
commit b534e554e5
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/fenrir-package/core/commandManager.py
View File

@ -12,22 +12,28 @@ class commandManager():
commandFolder = "commands/" + section +"/" commandFolder = "commands/" + section +"/"
commandList = glob.glob(commandFolder+'*') commandList = glob.glob(commandFolder+'*')
for currCommand in commandList: for currCommand in commandList:
#try: try:
fileName, fileExtension = os.path.splitext(currCommand) fileName, fileExtension = os.path.splitext(currCommand)
fileName = fileName.split('/')[-1] fileName = fileName.split('/')[-1]
if fileName in ['__init__','__pycache__']: if fileName in ['__init__','__pycache__']:
continue
if fileExtension.lower() == '.py':
spec = importlib.util.spec_from_file_location(fileName, currCommand)
command_mod = importlib.util.module_from_spec(spec)
spec.loader.exec_module(command_mod)
environment['commands'][section][fileName] = command_mod.command()
except Exception as e:
print(e)
continue continue
if fileExtension.lower() == '.py':
spec = importlib.util.spec_from_file_location(fileName, currCommand)
command_mod = importlib.util.module_from_spec(spec)
spec.loader.exec_module(command_mod)
environment['commands'][section][fileName] = command_mod.command()
#except:
# continue
return environment return environment
def executeTriggerCommands(self, environment, trigger): def executeTriggerCommands(self, environment, trigger):
for cmd in sorted(environment['commands'][trigger]): for cmd in sorted(environment['commands'][trigger]):
environment = environment['commands'][trigger][cmd].run(environment) try:
environ = environment['commands'][trigger][cmd].run(environment)
if environ != None:
environment = environ
except Exception as e:
print(e)
return environment return environment
def executeCommand(self, environment, currCommand, section = 'commands'): def executeCommand(self, environment, currCommand, section = 'commands'):
@ -36,14 +42,12 @@ class commandManager():
environ = environment['commands'][section][currCommand].run(environment) environ = environment['commands'][section][currCommand].run(environment)
if environ != None: if environ != None:
environment = environ environment = environ
except: except Exception as e:
pass print(e)
environment['commandInfo']['currCommand'] = '' environment['commandInfo']['currCommand'] = ''
environment['commandInfo']['lastCommandTime'] = time.time() environment['commandInfo']['lastCommandTime'] = time.time()
return environment return environment
def executeNextCommand(self, environment):
pass
def isShortcutDefined(self, environment): def isShortcutDefined(self, environment):
return( environment['input']['currShortcutString'] in environment['bindings']) return( environment['input']['currShortcutString'] in environment['bindings'])
@ -56,7 +60,3 @@ class commandManager():
def isCommandDefined(self, environment): def isCommandDefined(self, environment):
return( environment['commandInfo']['currCommand'] in environment['commands']['commands']) return( environment['commandInfo']['currCommand'] in environment['commands']['commands'])
def enqueueCommand(self, environment):
if not self.isCommandDefined(environment):
return False
return True