hiro/tridactyl
1
0
Fork 0
mirror of https://github.com/vale981/tridactyl synced 2025-03-04 17:11:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Catch errors with native run

Browse source
This commit is contained in:
Oliver Blanthorn 2018-04-25 14:26:39 +01:00
parent 5d936a7d44
commit e3cd80a91a
No known key found for this signature in database
GPG key ID: 2BB8C36BB504BFF3
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
native/native_main.py
View file

@ -70,18 +70,15 @@ def handleMessage(message):
reply = {'version': VERSION}
elif cmd == 'run':
if "|" in message["command"]:
commands = message["command"].split("|")
p1 = subprocess.Popen(commands[0].split(" "),stdout=subprocess.PIPE)
p2 = p1
for command in commands[1:]:
command = list(filter(None,command.split(" ")))
p2 = subprocess.Popen(command,stdin=p1.stdout,stdout=subprocess.PIPE)
p1.stdout.close()
p1 = p2
output = p2.communicate()[0].decode("utf-8")
else:
output = subprocess.check_output(message["command"].split(" ")).decode("utf-8")
commands = message["command"].split("|")
p1 = subprocess.Popen(commands[0].split(" "),stderr=subprocess.STDOUT,stdout=subprocess.PIPE)
p2 = p1
for command in commands[1:]:
command = list(filter(None,command.split(" ")))
p2 = subprocess.Popen(command,stdin=p1.stdout,stderr=subprocess.STDOUT,stdout=subprocess.PIPE)
p1.stdout.close()
p1 = p2
output = p2.communicate()[0].decode("utf-8")
reply['content'] = output if output else ""
elif cmd == 'eval':