Latest merge from testing.
This commit is contained in:
		| @@ -176,7 +176,7 @@ class commandManager(): | ||||
|                 continue | ||||
|  | ||||
|     def executeSwitchTrigger(self, trigger, unLoadScript, loadScript): | ||||
|         if self.env['runtime']['screenManager'].isSuspendingScreen(): | ||||
|         if self.env['runtime']['screenManager'].isIgnoredScreen(): | ||||
|             return | ||||
|         #unload | ||||
|         oldScript = unLoadScript | ||||
| @@ -199,7 +199,7 @@ class commandManager(): | ||||
|  | ||||
|     def executeDefaultTrigger(self, trigger, force=False): | ||||
|         if not force: | ||||
|             if self.env['runtime']['screenManager'].isSuspendingScreen(): | ||||
|             if self.env['runtime']['screenManager'].isIgnoredScreen(): | ||||
|                 return | ||||
|         for command in sorted(self.env['commands'][trigger]): | ||||
|             if self.commandExists(command, trigger): | ||||
| @@ -214,7 +214,7 @@ class commandManager(): | ||||
|                     self.env['runtime']['debug'].writeDebugOut("Executing trigger:" + trigger + "." + command + str(e) ,debug.debugLevel.ERROR) | ||||
|  | ||||
|     def executeCommand(self, command, section = 'commands'): | ||||
|         if self.env['runtime']['screenManager'].isSuspendingScreen(): | ||||
|         if self.env['runtime']['screenManager'].isIgnoredScreen(): | ||||
|             return     | ||||
|         if self.commandExists(command, section): | ||||
|             try: | ||||
|   | ||||
| @@ -52,12 +52,15 @@ class debugManager(): | ||||
|         else: | ||||
|             if not self._fileOpened and fileMode: | ||||
|                 self.openDebugFile() | ||||
|             timestamp = str(datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S.%f')) | ||||
|             if onAnyLevel: | ||||
|                 msg = 'ANY '+ str(level) + ' ' +  str(datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S.%f')) | ||||
|                 levelInfo = 'INFO ANY' | ||||
|             else:             | ||||
|                 msg = str(level) +' ' + str(datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S.%f') | ||||
| ) | ||||
|             msg +=  ': ' + text          | ||||
|                 levelInfo = str(level) | ||||
|                  | ||||
|             # Changed order: text comes first, then level and timestamp | ||||
|             msg = text + ' - ' + levelInfo + ' ' + timestamp | ||||
|              | ||||
|             if printMode: | ||||
|                 print(msg) | ||||
|             if fileMode: | ||||
|   | ||||
| @@ -55,7 +55,7 @@ class fenrirManager(): | ||||
|         if self.environment['runtime']['inputManager'].noKeyPressed():  | ||||
|             self.environment['runtime']['inputManager'].clearLastDeepInput() | ||||
|  | ||||
|         if self.environment['runtime']['screenManager'].isSuspendingScreen(): | ||||
|         if self.environment['runtime']['screenManager'].isIgnoredScreen(): | ||||
|             self.environment['runtime']['inputManager'].writeEventBuffer() | ||||
|         else:  | ||||
|             if self.environment['runtime']['helpManager'].isTutorialMode(): | ||||
|   | ||||
| @@ -59,7 +59,7 @@ class screenManager(): | ||||
|         if self.isCurrScreenIgnoredChanged(): | ||||
|             self.env['runtime']['inputManager'].setExecuteDeviceGrab() | ||||
|         self.env['runtime']['inputManager'].handleDeviceGrab() | ||||
|         if not self.isSuspendingScreen(self.env['screen']['newTTY']): | ||||
|         if not self.isIgnoredScreen(self.env['screen']['newTTY']): | ||||
|             self.update(eventData, 'onScreenChange') | ||||
|             self.env['screen']['lastScreenUpdate'] = time.time() | ||||
|         else: | ||||
| @@ -81,7 +81,7 @@ class screenManager(): | ||||
|         return self.prevScreenIgnored | ||||
|     def updateScreenIgnored(self): | ||||
|         self.prevScreenIgnored = self.currScreenIgnored | ||||
|         self.currScreenIgnored = self.isSuspendingScreen(self.env['screen']['newTTY']) | ||||
|         self.currScreenIgnored = self.isIgnoredScreen(self.env['screen']['newTTY']) | ||||
|     def update(self, eventData, trigger='onUpdate'): | ||||
|         # set new "old" values | ||||
|         self.env['screen']['oldContentBytes'] = self.env['screen']['newContentBytes'] | ||||
| @@ -174,16 +174,16 @@ class screenManager(): | ||||
|         except Exception as e: | ||||
|             self.env['runtime']['debug'].writeDebugOut('screenManager:update:highlight: ' + str(e),debug.debugLevel.ERROR)  | ||||
|  | ||||
|     def isSuspendingScreen(self, screen = None): | ||||
|     def isIgnoredScreen(self, screen = None): | ||||
|         if screen == None: | ||||
|             screen = self.env['screen']['newTTY'] | ||||
|         ignoreScreens = [] | ||||
|         fixIgnoreScreens = self.env['runtime']['settingsManager'].getSetting('screen', 'suspendingScreen') | ||||
|         fixIgnoreScreens = self.env['runtime']['settingsManager'].getSetting('screen', 'ignoreScreen') | ||||
|         if fixIgnoreScreens != '': | ||||
|             ignoreScreens.extend(fixIgnoreScreens.split(',')) | ||||
|         if self.env['runtime']['settingsManager'].getSettingAsBool('screen', 'autodetectSuspendingScreen'): | ||||
|         if self.env['runtime']['settingsManager'].getSettingAsBool('screen', 'autodetectIgnoreScreen'): | ||||
|             ignoreScreens.extend(self.env['screen']['autoIgnoreScreens']) | ||||
|         self.env['runtime']['debug'].writeDebugOut('screenManager:isSuspendingScreen ignore:' + str(ignoreScreens) + ' current:'+ str(screen ), debug.debugLevel.INFO) | ||||
|         self.env['runtime']['debug'].writeDebugOut('screenManager:isIgnoredScreen ignore:' + str(ignoreScreens) + ' current:'+ str(screen ), debug.debugLevel.INFO) | ||||
|         return (screen in ignoreScreens) | ||||
|   | ||||
|     def isScreenChange(self): | ||||
|   | ||||
| @@ -40,8 +40,8 @@ settingsData = { | ||||
|     'driver': 'vcsaDriver', | ||||
|     'encoding': 'auto', | ||||
|     'screenUpdateDelay': 0.1, | ||||
|     'suspendingScreen': '', | ||||
|     'autodetectSuspendingScreen': False, | ||||
|     'ignoreScreen': '', | ||||
|     'autodetectIgnoreScreen': False, | ||||
| }, | ||||
| 'general':{ | ||||
|   'debugLevel': debug.debugLevel.DEACTIVE, | ||||
|   | ||||
| @@ -4,5 +4,5 @@ | ||||
| # Fenrir TTY screen reader | ||||
| # By Chrys, Storm Dragon, and contributers. | ||||
|  | ||||
| version = "2025.04.14" | ||||
| version = "2025.04.28" | ||||
| codeName = "master" | ||||
|   | ||||
		Reference in New Issue
	
	Block a user