remove ignore file support

2018-09-07 23:27:15 +02:00
parent 5cd0a1dd67
commit b0459fa7f9
7 changed files with 2 additions and 16 deletions
--- a/config/settings/espeak.settings.conf
+++ b/config/settings/espeak.settings.conf
@@ -122,7 +122,6 @@ driver=vcsaDriver
 encoding=auto
 screenUpdateDelay=0.05
 suspendingScreen=
-suspendingScreenFile=/tmp/fenrirSuspend
 autodetectSuspendingScreen=True

 [keyboard]
--- a/config/settings/settings.conf
+++ b/config/settings/settings.conf
@@ -124,7 +124,6 @@ driver=vcsaDriver
 encoding=auto
 screenUpdateDelay=0.05
 suspendingScreen=
-suspendingScreenFile=/tmp/fenrirSuspend
 autodetectSuspendingScreen=True

 [keyboard]
--- a/config/settings/settings.conf.example
+++ b/config/settings/settings.conf.example
@@ -125,7 +125,6 @@ driver=vcsaDriver
 encoding=auto
 screenUpdateDelay=0.05
 suspendingScreen=
-suspendingScreenFile=/tmp/fenrirSuspend
 autodetectSuspendingScreen=True

 [keyboard]
--- a/config/settings/settings.conf.storm
+++ b/config/settings/settings.conf.storm
@@ -79,7 +79,6 @@ driver=vcsaDriver
 encoding=auto
 screenUpdateDelay=0.05
 suspendingScreen=
-suspendingScreenFile=/tmp/fenrirSuspend
 autodetectSuspendingScreen=True

 [keyboard]
--- a/config/settings/speech-dispatcher.settings.conf
+++ b/config/settings/speech-dispatcher.settings.conf
@@ -124,7 +124,6 @@ driver=vcsaDriver
 encoding=auto
 screenUpdateDelay=0.05
 suspendingScreen=
-suspendingScreenFile=/tmp/fenrirSuspend
 autodetectSuspendingScreen=True

 [keyboard]
--- a/src/fenrirscreenreader/core/screenManager.py
+++ b/src/fenrirscreenreader/core/screenManager.py
@@ -196,14 +196,6 @@ class screenManager():
            ignoreScreens.extend(fixIgnoreScreens.split(',')) 
        if self.env['runtime']['settingsManager'].getSettingAsBool('screen', 'autodetectSuspendingScreen'):
            ignoreScreens.extend(self.env['screen']['autoIgnoreScreens'])
-        try:
-            ignoreFileName = self.env['runtime']['settingsManager'].getSetting('screen', 'suspendingScreenFile')
-            if ignoreFileName != '':
-                if os.access(ignoreFileName, os.R_OK):
-                    with open(ignoreFileName) as fp:
-                        ignoreScreens.extend(fp.read().replace('\n','').split(','))
-        except:
-            pass
        self.env['runtime']['debug'].writeDebugOut('screenManager:isSuspendingScreen ignore:' + str(ignoreScreens) + ' current:'+ str(screen ), debug.debugLevel.INFO)         
        return (screen in ignoreScreens)
 
--- a/src/fenrirscreenreader/core/settingsData.py
+++ b/src/fenrirscreenreader/core/settingsData.py
@@ -51,7 +51,6 @@ settingsData = {
    'encoding': 'auto',
    'screenUpdateDelay': 0.1,
    'suspendingScreen': '',
-    'suspendingScreenFile': '/tmp/fenrirSuspend',
    'autodetectSuspendingScreen': False,
 },
 'general':{