finish remove unneeded returns, import debug to everything, add header

src/fenrir-package/utils/char_utils.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 def getPrevChar(currX,currY, currText):
     if currText == '':

src/fenrir-package/utils/debug.py

@@ -1,61 +0,0 @@
-#!/usr/bin/python
-# Debugger module for the Fenrir screen reader.
-
-from enum import Enum
-from datetime import datetime
-
-class debugLevel(Enum):
-    DEACTIVE = 0
-    ERROR = 1
-    WARNING = 2
-    INFO = 3
-    def __int__(self):
-        return self.value
-    def __str__(self):
-        return self.name
-
-class debug():
-    def __init__(self,  fileName='/var/log/fenrir.log'):
-        self._fileName = fileName
-        self._file = None
-        self._fileOpened = False
-
-    def __del__(self):
-        try:
-            self.closeDebugFile()
-        except:
-            pass
-
-    def openDebugFile(self, fileName = ''):
-        self._fileOpened = False
-        if fileName != '':
-            self._fileName = fileName
-        if self._fileName != '':
-            self._file = open(self._fileName,'a')
-            self._fileOpened = True
-
-    def writeDebugOut(self, environment, text, level = debugLevel.DEACTIVE):
-        if environment['runtime']['settingsManager'].getSettingAsInt(environment, 'general','debugLevel') < int(level):
-            if self._fileOpened:
-                self.closeDebugFile()
-            return
-        else:
-            if not self._fileOpened:
-                self.openDebugFile()
-            self._file.write(str(level) +' ' + str(datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S.%f')
-) + ': ' + text + '\n')
-
-    def closeDebugFile(self):
-        if not self._fileOpened:
-            return False
-        if self._file != None:
-            self._file.close()
-        self._fileOpened = False
-        return True
-
-    def getDebugFile(self):
-        return self._fileName
-
-    def setDebugFile(self, fileName):
-        self.closeDebugFile()
-        self._fileName = fileName

src/fenrir-package/utils/line_utils.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 def getPrevLine(currX,currY, currText):
     if currText == '':

src/fenrir-package/utils/mark_utils.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 def getTextBetweenMarks(firstMark, secondMark, inText):
     if inText == None:

src/fenrir-package/utils/review_utils.py

@@ -1,3 +1,8 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
 
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 

src/fenrir-package/utils/word_utils.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 def getPrevWord(currX,currY, currText):
     if currText == '':