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

Merge branch 'master' into processing

Browse Source
This commit is contained in:
Chrys
2017-07-25 16:16:35 +02:00
parent 332a38f77e 71c84dec64
commit 2608ce0dc6
10 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
src/fenrir/commands/help/__init__.py Executable file
View File

0
src/fenrir/commands/onCursorChange/__init__.py Executable file
View File

0
src/fenrir/commands/onPlugInputDevice/__init__.py Executable file
View File

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

@ -4,8 +4,10 @@
# Fenrir TTY screen reader
# By Chrys, Storm Dragon, and contributers.
import glob, os, time
import fenrirVersion
import glob, os, time, inspect
currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
fenrirPath = os.path.dirname(currentdir)
from core import debug
from utils import module_utils
@ -32,7 +34,7 @@ class commandManager():
def loadCommands(self, section='commands',commandPath=''):
if commandPath =='':
commandPath = os.path.dirname(os.path.realpath(fenrirVersion.__file__))+ "/commands/"
commandPath = fenrirPath+ "/commands/"
if not commandPath.endswith('/'):
commandPath += '/'
commandFolder = commandPath + section +"/"
@ -76,8 +78,8 @@ class commandManager():
if not scriptPath.endswith('/'):
scriptPath += '/'
if not os.path.exists(scriptPath):
if os.path.exists(os.path.dirname(os.path.realpath(fenrirVersion.__file__)) +'/../../config/scripts/'):
scriptPath = os.path.dirname(os.path.realpath(fenrirVersion.__file__)) +'/../../config/scripts/'
if os.path.exists(fenrirPath +'/../../config/scripts/'):
scriptPath = fenrirPath +'/../../config/scripts/'
else:
self.env['runtime']['debug'].writeDebugOut("scriptpath not exists:" + scriptPath ,debug.debugLevel.WARNING)
return
@ -88,7 +90,7 @@ class commandManager():
self.env['runtime']['debug'].writeDebugOut("scriptpath not readable:" + scriptPath ,debug.debugLevel.ERROR)
return
commandList = glob.glob(scriptPath+'*')
subCommand = os.path.dirname(os.path.realpath(fenrirVersion.__file__)) + '/commands/commands/subprocess.py'
subCommand = fenrirPath + '/commands/commands/subprocess.py'
for command in commandList:
invalid = False
try:

12
src/fenrir/core/fenrirManager.py
View File

@ -5,10 +5,6 @@
# By Chrys, Storm Dragon, and contributers.
import os, sys, signal, time
import fenrirVersion
if not os.path.dirname(os.path.realpath(fenrirVersion.__file__)) in sys.path:
sys.path.append(os.path.dirname(os.path.realpath(fenrirVersion.__file__)))
from core import i18n
from core import settingsManager
@ -170,11 +166,3 @@ class fenrirManager():
self.environment['runtime'][currManager].shutdown()
del self.environment['runtime'][currManager]
self.environment = None
def main():
app = fenrir()
app.proceed()
del app
if __name__ == "__main__":
main()

20
src/fenrir/core/settingsManager.py
View File

@ -4,8 +4,10 @@
# Fenrir TTY screen reader
# By Chrys, Storm Dragon, and contributers.
import os
import fenrirVersion
import os, inspect
currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
fenrirPath = os.path.dirname(currentdir)
from configparser import ConfigParser
from core import eventManager
from core import inputManager
@ -30,7 +32,7 @@ class settingsManager():
self.env = environment
def shutdown(self):
pass
def loadShortcuts(self, kbConfigPath=os.path.dirname(os.path.realpath(fenrirVersion.__file__)) + '/../../config/keyboard/desktop.conf'):
def loadShortcuts(self, kbConfigPath=fenrirPath + '/../../config/keyboard/desktop.conf'):
kbConfig = open(kbConfigPath,"r")
while(True):
invalid = False
@ -106,7 +108,7 @@ class settingsManager():
def isValidKey(self, key):
return key in inputData.keyNames
def loadDicts(self, dictConfigPath=os.path.dirname(os.path.realpath(fenrirVersion.__file__)) + '/../../config/punctuation/default.conf'):
def loadDicts(self, dictConfigPath=fenrirPath + '/../../config/punctuation/default.conf'):
dictConfig = open(dictConfigPath,"r")
currDictName = ''
while(True):
@ -204,7 +206,7 @@ class settingsManager():
if self.env['runtime'][driverType] != None:
self.env['runtime'][driverType].shutdown(self.env)
driver_mod = module_utils.importModule(driverName,
os.path.dirname(os.path.realpath(fenrirVersion.__file__)) + "/" + driverType + '/' + driverName + '.py')
fenrirPath + "/" + driverType + '/' + driverName + '.py')
self.env['runtime'][driverType] = driver_mod.driver()
self.env['runtime'][driverType].initialize(self.env)
self.env['runtime']['debug'].writeDebugOut('Loading Driver ' + driverType + ' (' + driverName +") OK",debug.debugLevel.INFO, onAnyLevel=True)
@ -257,8 +259,8 @@ class settingsManager():
environment['runtime']['debug'].initialize(environment)
# get fenrir settings root
if not os.path.exists(settingsRoot):
if os.path.exists(os.path.dirname(os.path.realpath(fenrirVersion.__file__)) +'/../../config/'):
settingsRoot = os.path.dirname(os.path.realpath(fenrirVersion.__file__)) +'/../../config/'
if os.path.exists(fenrirPath +'/../../config/'):
settingsRoot = fenrirPath +'/../../config/'
else:
return None
# get settings file
@ -269,8 +271,8 @@ class settingsManager():
return None
# get sound themes root
if not os.path.exists(soundRoot):
if os.path.exists(os.path.dirname(os.path.realpath(fenrirVersion.__file__)) +'/../../config/sound/'):
soundRoot = os.path.dirname(os.path.realpath(fenrirVersion.__file__)) +'/../../config/sound/'
if os.path.exists(fenrirPath +' /../../config/sound/'):
soundRoot = fenrirPath + '/../../config/sound/'
environment['runtime']['settingsManager'] = self
environment['runtime']['settingsManager'].initialize(environment)

8
src/fenrir/fenrir
View File

@ -4,11 +4,11 @@
# Fenrir TTY screen reader
# By Chrys, Storm Dragon, and contributers.
import os, sys
import fenrirVersion
import os, sys, inspect
fenrirPath = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
if not os.path.dirname(os.path.realpath(fenrirVersion.__file__)) in sys.path:
sys.path.append(os.path.dirname(os.path.realpath(fenrirVersion.__file__)))
if not fenrirPath in sys.path:
sys.path.append(fenrirPath)
from core import fenrirManager