From 9b809cb140d32d0a4fbf0f63f521b43f9226afe0 Mon Sep 17 00:00:00 2001 From: Bruno Bottazzini Date: Mon, 26 Oct 2015 16:32:37 -0200 Subject: [PATCH] Show the FBP name that is running or last that was last ran It is good to let know what is running right now in the device or what was running. This will give more control of what is happening/happened in the device. Signed-off-by: Bruno Bottazzini --- client/js/controllers/editor.js | 2 ++ server/routes.js | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/client/js/controllers/editor.js b/client/js/controllers/editor.js index a8a24d3..b8929ad 100644 --- a/client/js/controllers/editor.js +++ b/client/js/controllers/editor.js @@ -281,6 +281,7 @@ }); } else if ($scope.fbpType === true && $scope.buttonSyncDisabled === false) { var fbpCode = editor.getSession().getValue(); + var fbpName = $scope.fileName; $scope.newFile = true; var conf = $scope.selectConfigPath; if (conf === "none") { @@ -288,6 +289,7 @@ } $http.post('/api/fbp/run', {params: { + "fbp_name": fbpName, "code": fbpCode, "conf": conf } diff --git a/server/routes.js b/server/routes.js index 3b5e2c2..c83dc5e 100644 --- a/server/routes.js +++ b/server/routes.js @@ -38,6 +38,7 @@ require('./configuration.js')(); var jConf = getConfigurationJson(); + var runningFBPName; /* GET home page. */ router.get('/', function(req, res) { @@ -90,6 +91,9 @@ }); child.on('close', function(code) { stdout = stdout.replace(/Active:/, '').trim(); + if (runningFBPName) { + stdout = runningFBPName + " - " + stdout; + } res.send(stdout); }); } else { @@ -199,6 +203,7 @@ router.post('/api/fbp/run', function(req, res) { if (jConf.run_fbp_access === true) { var exec = require('child_process').exec; + var name = req.body.params.fbp_name; var code = req.body.params.code; var conf = req.body.params.conf; if (!code) { @@ -228,6 +233,9 @@ }); child.on('close', function(code) { console.log('closing code: ' + code); + if (name) { + runningFBPName = name; + } res.sendStatus(code); }); });