gnuradio-companion/gui/Executor.py
Volker Schroer 925662db77 Decode stdout as utf-8 for the fg execution console
If the executed script sends some ( error ) messages you get a lot of error messages like

    Traceback (most recent call last):
      File "/usr/local/gnuradio/lib/python3.6/dist-packages/gnuradio/grc/core/Messages.py", line 117, in send_verbose_exec
        send(verbose)
       File "/usr/local/gnuradio/lib/python3.6/dist-packages/gnuradio/grc/core/Messages.py", line 52, in send
    messenger(_indent + message)
    TypeError: must be str, not bytes

But you don't find out the reason of this error. The return type of os.read seems to have changed between python 2.7 and python 3.
The decode function fixes this issue and you get valuable messages.
2018-08-24 21:17:22 +02:00

95 lines
3.4 KiB
Python

# Copyright 2016 Free Software Foundation, Inc.
# This file is part of GNU Radio
#
# GNU Radio Companion is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# GNU Radio Companion is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
from __future__ import absolute_import
import os
import shlex
import subprocess
import threading
from distutils.spawn import find_executable
from gi.repository import GLib
from ..core import Messages
class ExecFlowGraphThread(threading.Thread):
"""Execute the flow graph as a new process and wait on it to finish."""
def __init__(self, flow_graph_page, xterm_executable, callback):
"""
ExecFlowGraphThread constructor.
"""
threading.Thread.__init__(self)
self.page = flow_graph_page # store page and don't use main window calls in run
self.flow_graph = self.page.flow_graph
self.xterm_executable = xterm_executable
self.update_callback = callback
try:
self.process = self.page.process = self._popen()
self.update_callback()
self.start()
except Exception as e:
Messages.send_verbose_exec(str(e))
Messages.send_end_exec()
def _popen(self):
"""
Execute this python flow graph.
"""
generator = self.page.get_generator()
run_command = self.flow_graph.get_run_command(generator.file_path)
run_command_args = shlex.split(run_command)
# When in no gui mode on linux, use a graphical terminal (looks nice)
xterm_executable = find_executable(self.xterm_executable)
if generator.generate_options == 'no_gui' and xterm_executable:
run_command_args = [xterm_executable, '-e', run_command]
# this does not reproduce a shell executable command string, if a graphical
# terminal is used. Passing run_command though shlex_quote would do it but
# it looks really ugly and confusing in the console panel.
Messages.send_start_exec(' '.join(run_command_args))
return subprocess.Popen(
args=run_command_args,
stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
shell=False, universal_newlines=True
)
def run(self):
"""
Wait on the executing process by reading from its stdout.
Use GObject.idle_add when calling functions that modify gtk objects.
"""
# handle completion
r = "\n"
while r:
GLib.idle_add(Messages.send_verbose_exec, r)
r = self.process.stdout.read(1024).decode('utf-8','ignore')
self.process.poll()
GLib.idle_add(self.done)
def done(self):
"""Perform end of execution tasks."""
Messages.send_end_exec(self.process.returncode)
self.page.process = None
self.update_callback()