From b0459fa7f9b62e1e9fbb578a112c549ad2d66d25 Mon Sep 17 00:00:00 2001
From: chrys <chrys87@web.de>
Date: Fri, 7 Sep 2018 23:27:15 +0200
Subject: [PATCH] remove ignore file support

---
 config/settings/espeak.settings.conf            |  1 -
 config/settings/settings.conf                   |  1 -
 config/settings/settings.conf.example           |  1 -
 config/settings/settings.conf.storm             |  1 -
 config/settings/speech-dispatcher.settings.conf |  1 -
 src/fenrirscreenreader/core/screenManager.py    | 12 ++----------
 src/fenrirscreenreader/core/settingsData.py     |  1 -
 7 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/config/settings/espeak.settings.conf b/config/settings/espeak.settings.conf
index 2ee038c1..563feda4 100644
--- 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]
diff --git a/config/settings/settings.conf b/config/settings/settings.conf
index 54550c55..c6213de0 100644
--- 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]
diff --git a/config/settings/settings.conf.example b/config/settings/settings.conf.example
index 64d71a66..fe8a4f99 100644
--- 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]
diff --git a/config/settings/settings.conf.storm b/config/settings/settings.conf.storm
index 7e808e86..758d12e2 100644
--- 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]
diff --git a/config/settings/speech-dispatcher.settings.conf b/config/settings/speech-dispatcher.settings.conf
index 8dbbc242..ba3178a3 100644
--- 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]
diff --git a/src/fenrirscreenreader/core/screenManager.py b/src/fenrirscreenreader/core/screenManager.py
index b39608d9..e3bca0de 100644
--- a/src/fenrirscreenreader/core/screenManager.py
+++ b/src/fenrirscreenreader/core/screenManager.py
@@ -195,15 +195,7 @@ class screenManager():
         if fixIgnoreScreens != '':
             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
+            ignoreScreens.extend(self.env['screen']['autoIgnoreScreens'])
         self.env['runtime']['debug'].writeDebugOut('screenManager:isSuspendingScreen ignore:' + str(ignoreScreens) + ' current:'+ str(screen ), debug.debugLevel.INFO)         
         return (screen in ignoreScreens)
  
@@ -214,7 +206,7 @@ class screenManager():
     def isDelta(self, ignoreSpace=False):
         newDelta = self.env['screen']['newDelta']
         if ignoreSpace:
-            newDelta = newDelta.strip()                
+            newDelta = newDelta.strip()
         return newDelta != ''
     def isNegativeDelta(self):    
         return self.env['screen']['newNegativeDelta'] != ''
diff --git a/src/fenrirscreenreader/core/settingsData.py b/src/fenrirscreenreader/core/settingsData.py
index 60b34e50..021d1267 100644
--- 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':{