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

Merge branch 'event'

Browse Source
This commit is contained in:
chrys 2017-05-25 13:44:19 +02:00
commit 6e8a275588
7 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
experimental/setup.py → setup.py
View File

@ -42,7 +42,7 @@ setup(
# Dependent packages (distributions)
install_requires=[
"evdev",
"sox",
"sox"
],
)

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

@ -5,7 +5,7 @@
# By Chrys, Storm Dragon, and contributers.
import glob, os, time
import __main__
import fenrirVersion
from core import debug
from utils import module_utils
@ -29,7 +29,7 @@ class commandManager():
def loadCommands(self, section='commands',commandPath=''):
if commandPath =='':
commandPath = os.path.dirname(os.path.realpath(__main__.__file__))+ "/commands/"
commandPath = os.path.dirname(os.path.realpath(fenrirVersion.__file__))+ "/commands/"
if not commandPath.endswith('/'):
commandPath += '/'
commandFolder = commandPath + section +"/"
@ -73,8 +73,8 @@ class commandManager():
if not scriptPath.endswith('/'):
scriptPath += '/'
if not os.path.exists(scriptPath):
if os.path.exists(os.path.dirname(os.path.realpath(__main__.__file__)) +'/../../config/scripts/'):
scriptPath = os.path.dirname(os.path.realpath(__main__.__file__)) +'/../../config/scripts/'
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/'
else:
self.env['runtime']['debug'].writeDebugOut("scriptpath not exists:" + scriptPath ,debug.debugLevel.WARNING)
return
@ -85,7 +85,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(__main__.__file__)) + '/commands/commands/subprocess.py'
subCommand = os.path.dirname(os.path.realpath(fenrirVersion.__file__)) + '/commands/commands/subprocess.py'
for command in commandList:
invalid = False
try:

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

@ -5,10 +5,10 @@
# By Chrys, Storm Dragon, and contributers.
import os, sys, signal, time
import __main__
import fenrirVersion
if not os.path.dirname(os.path.realpath(__main__.__file__)) in sys.path:
sys.path.append(os.path.dirname(os.path.realpath(__main__.__file__)))
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

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

@ -5,7 +5,7 @@
# By Chrys, Storm Dragon, and contributers.
import os
import __main__
import fenrirVersion
from configparser import ConfigParser
from core import eventManager
from core import inputManager
@ -29,7 +29,7 @@ class settingsManager():
self.env = environment
def shutdown(self):
pass
def loadShortcuts(self, kbConfigPath=os.path.dirname(os.path.realpath(__main__.__file__)) + '/../../config/keyboard/desktop.conf'):
def loadShortcuts(self, kbConfigPath=os.path.dirname(os.path.realpath(fenrirVersion.__file__)) + '/../../config/keyboard/desktop.conf'):
kbConfig = open(kbConfigPath,"r")
while(True):
invalid = False
@ -103,7 +103,7 @@ class settingsManager():
def isValidKey(self, key):
return key in inputData.keyNames
def loadDicts(self, dictConfigPath=os.path.dirname(os.path.realpath(__main__.__file__)) + '/../../config/punctuation/default.conf'):
def loadDicts(self, dictConfigPath=os.path.dirname(os.path.realpath(fenrirVersion.__file__)) + '/../../config/punctuation/default.conf'):
dictConfig = open(dictConfigPath,"r")
currDictName = ''
while(True):
@ -201,7 +201,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(__main__.__file__)) + "/" + driverType + '/' + driverName + '.py')
os.path.dirname(os.path.realpath(fenrirVersion.__file__)) + "/" + 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)
@ -250,8 +250,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(__main__.__file__)) +'/../../config/'):
settingsRoot = os.path.dirname(os.path.realpath(__main__.__file__)) +'/../../config/'
if os.path.exists(os.path.dirname(os.path.realpath(fenrirVersion.__file__)) +'/../../config/'):
settingsRoot = os.path.dirname(os.path.realpath(fenrirVersion.__file__)) +'/../../config/'
else:
return None
# get settings file
@ -262,8 +262,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(__main__.__file__)) +'/../../config/sound/'):
soundRoot = os.path.dirname(os.path.realpath(__main__.__file__)) +'/../../config/sound/'
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/'
environment['runtime']['settingsManager'] = self
environment['runtime']['settingsManager'].initialize(environment)

6
src/fenrir/fenrir
View File

@ -5,10 +5,10 @@
# By Chrys, Storm Dragon, and contributers.
import os, sys
import __main__
import fenrirVersion
if not os.path.dirname(os.path.realpath(__main__.__file__)) in sys.path:
sys.path.append(os.path.dirname(os.path.realpath(__main__.__file__)))
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 fenrirManager

10
src/fenrir/fenrir-daemon
View File

@ -5,10 +5,10 @@
# By Chrys, Storm Dragon, and contributers.
import os, sys
import __main__
import fenrirVersion
if not os.path.dirname(os.path.realpath(__main__.__file__)) in sys.path:
sys.path.append(os.path.dirname(os.path.realpath(__main__.__file__)))
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 fenrirManager
from daemonize import Daemonize
@ -22,7 +22,7 @@ def main():
if __name__ == "__main__":
# for debug in foreground
#daemon = Daemonize(app="fenrir-daemon", pid=pidFile, action=main, foreground=True,chdir=os.path.dirname(os.path.realpath(__main__.__file__)))
daemon = Daemonize(app="fenrir-daemon", pid=pidFile, action=main, chdir=os.path.dirname(os.path.realpath(__main__.__file__)))
#daemon = Daemonize(app="fenrir-daemon", pid=pidFile, action=main, foreground=True,chdir=os.path.dirname(os.path.realpath(fenrirVersion.__file__)))
daemon = Daemonize(app="fenrir-daemon", pid=pidFile, action=main, chdir=os.path.dirname(os.path.realpath(fenrirVersion.__file__)))
daemon.start()

11
src/fenrir/fenrirVersion.py Normal file
View File

@ -0,0 +1,11 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
# Fenrir TTY screen reader
# By Chrys, Storm Dragon, and contributers.
import os, sys
import __main__
version = 1.5
codename = 'gampert'