Gandalf/OctoPrint-Enclosure
1
0
Fork 0
Code Issues 156 Pull Requests 6 Actions Packages Projects Releases 28 Wiki Activity

improved msg when sending shell scripts

Browse Source
This commit is contained in:
Vitor de Miranda Henrique
2018-06-15 14:23:22 -05:00
parent e1a9c9c217
commit 8a284caaa2
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
octoprint_enclosure/__init__.py
View File

@@ -194,7 +194,7 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin,
return flask.jsonify(success=True)
@octoprint.plugin.BlueprintPlugin.route("/sendShellCommand", methods=["GET"])
def send_shell_command(self):
def send_send_shell_command(self):
output_index = self.to_int(flask.request.values["index_id"])
rpi_output = [r_out for r_out in self.rpi_outputs if self.to_int(
r_out['index_id']) == output_index].pop()
@@ -289,11 +289,13 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin,
return flask.jsonify(success=True)
def shell_command(self, command):
def send_shell_command(self, command):
try:
stdout = (Popen(command, shell=True, stdout=PIPE).stdout).read()
self._plugin_manager.send_plugin_message(
self._identifier, dict(is_msg=True, msg=stdout, msg_type="success"))
response = stdout or "Command executed with no return value."
self._plugin_manager.send_plugin_message(self._identifier, dict(is_msg=True, msg=response, msg_type="success"))
except Exception as ex:
self.log_error(ex)
self._plugin_manager.send_plugin_message(
@@ -1056,7 +1058,7 @@ class EnclosurePlugin(octoprint.plugin.StartupPlugin,
self.send_notification(msg)
if rpi_output['output_type'] == 'shell_output':
command = rpi_output['shell_script']
self.shell_command(command)
self.send_shell_command(command)
self.log_error(ex)
pass