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

Revert "replace replace by sub"

Browse Source 
This reverts commit 7f91223f94.
This commit is contained in:
Chrys 2019-08-29 17:52:57 +02:00
parent 7f91223f94
commit 6b6de57c9e
2 changed files with 16 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/fenrirscreenreader/core/punctuationManager.py
View File

@ -34,13 +34,14 @@ class punctuationManager():
except: except:
pass pass
return text.translate(currAllPunctNone) return text.translate(currAllPunctNone)
def useCustomDict(self, text, customDict, seperator=''): def useCustomDict(self, text, customDict, seperator=''):
resultText = str(text) resultText = str(text)
if customDict: if customDict:
for key,item in customDict.items(): for key,item in customDict.items():
#resultText = resultText.replace(str(key),seperator + str(item) + seperator) resultText = resultText.replace(str(key),seperator + str(item) + seperator)
resultText = re.sub(str(key), str(item), resultText)
return resultText return resultText
def usePunctuationDict(self, text, punctuationDict, punctuation): def usePunctuationDict(self, text, punctuationDict, punctuation):
resultText = str(text) resultText = str(text)

28
src/fenrirscreenreader/screenDriver/ptyDriver.py
View File

@ -87,13 +87,6 @@ class driver(screenDriver):
self.env = environment self.env = environment
self.command = self.env['runtime']['settingsManager'].getSetting('general','shell') self.command = self.env['runtime']['settingsManager'].getSetting('general','shell')
self.shortcutType = self.env['runtime']['inputManager'].getShortcutType() self.shortcutType = self.env['runtime']['inputManager'].getShortcutType()
param = [sys.stdin.fileno(), sys.stdout.fileno(), self.signalPipe, self.p_out, self.p_pid]
#param[0] = sys.stdin
#param[1] = sys.stdout
#param[2] = self.signalPipe
#param[3] = self.p_out
#param[4] = self.p_pid
self.env['runtime']['processManager'].addCustomEventThread(self.terminalEmulation, pargs = param, multiprocess = False)
self.env['runtime']['processManager'].addCustomEventThread(self.terminalEmulation) self.env['runtime']['processManager'].addCustomEventThread(self.terminalEmulation)
def getCurrScreen(self): def getCurrScreen(self):
self.env['screen']['oldTTY'] = 'pty' self.env['screen']['oldTTY'] = 'pty'
@ -160,26 +153,17 @@ class driver(screenDriver):
return lines, columns return lines, columns
def handleSigwinch(self, *args): def handleSigwinch(self, *args):
os.write(self.signalPipe[1], b'w') os.write(self.signalPipe[1], b'w')
def terminalEmulation(self,active , eventQueue, param = None): def terminalEmulation(self,active , eventQueue):
try: try:
#stdin = param[0] old_attr = termios.tcgetattr(sys.stdin)
stdin = os.fdopen(param[0])
stdout = os.fdopen(param[1])
signalPipe = param[2]
p_outFd = param[3]
p_pid = param[4]
old_attr = termios.tcgetattr(stdin)
tty.setraw(0) tty.setraw(0)
lines, columns = self.getTerminalSize(0) lines, columns = self.getTerminalSize(0)
if self.command == '': if self.command == '':
self.command = screen_utils.getShell() self.command = screen_utils.getShell()
terminal, p_pid.value, fd = self.openTerminal(columns, lines, self.command) self.terminal, self.p_pid, self.p_out = self.openTerminal(columns, lines, self.command)
p_outFd.value = os.dup(fd) lines, columns = self.resizeTerminal(self.p_out)
p_out = fd self.terminal.resize(lines, columns)
#p_out = os.fdopen(p_outFd.value, "r+b", 0) fdList = [sys.stdin, self.p_out, self.signalPipe[0]]
lines, columns = self.resizeTerminal(p_out)
terminal.resize(lines, columns)
fdList = [stdin, p_out, signalPipe[0]]
while active.value: while active.value:
r, _, _ = select(fdList, [], [], 1) r, _, _ = select(fdList, [], [], 1)
# none # none