", methods=["POST"])
+@restricted_access
+@admin_permission.require(403)
+def executeSystemCommand(source, command):
+ logger = logging.getLogger(__name__)
+
+ command_spec = _get_command_spec(source, command)
+ if not command_spec:
+ return make_response("Command {}:{} not found".format(source, command), 404)
+
+ if not "command" in command_spec:
+ return make_response("Command {}:{} does not define a command to execute, can't proceed".format(source, command), 500)
+
+ async = command_spec["async"] if "async" in command_spec else False
+ ignore = command_spec["ignore"] if "ignore" in command_spec else False
+ logger.info("Performing command for {}:{}: {}".format(source, command, command_spec["command"]))
+ try:
+ # we run this with shell=True since we have to trust whatever
+ # our admin configured as command and since we want to allow
+ # shell-alike handling here...
+ p = sarge.run(command_spec["command"],
+ stdout=sarge.Capture(),
+ stderr=sarge.Capture(),
+ shell=True,
+ async=async)
+ if not async:
+ if not ignore and p.returncode != 0:
+ returncode = p.returncode
+ stdout_text = p.stdout.text
+ stderr_text = p.stderr.text
+
+ error = "Command failed with return code {}:\nSTDOUT: {}\nSTDERR: {}".format(returncode, stdout_text, stderr_text)
+ logger.warn(error)
+ return make_response(error, 500)
+ except Exception, e:
+ if not ignore:
+ error = "Command failed: {}".format(str(e))
+ logger.warn(error)
+ return make_response(error, 500)
+
+ return NO_CONTENT
+
+
+def _to_client_specs(specs):
+ result = list()
+ for spec in specs.values():
+ if not "action" in spec or not "source" in spec:
+ continue
+ copied = dict((k, v) for k, v in spec.items() if k in ("source", "action", "name", "confirm"))
+ copied["resource"] = url_for(".executeSystemCommand",
+ source=spec["source"],
+ command=spec["action"],
+ _external=True)
+ result.append(copied)
+ return result
+
+
+def _get_command_spec(source, action):
+ if source == "core":
+ return _get_core_command_spec(action)
+ elif source == "custom":
+ return _get_custom_command_spec(action)
+ else:
+ return None
+
+
+def _get_core_command_specs():
+ commands = collections.OrderedDict(
+ shutdown=dict(
+ command=s().get(["server", "commands", "systemShutdownCommand"]),
+ name=gettext("Shutdown"),
+ confirm=gettext("You are about to shutdown the system.")),
+ reboot=dict(
+ command=s().get(["server", "commands", "systemRestartCommand"]),
+ name=gettext("Reboot"),
+ confirm=gettext("You are about to reboot the system.")),
+ restart=dict(
+ command=s().get(["server", "commands", "serverRestartCommand"]),
+ name="Restart OctoPrint",
+ confirm="You are about to restart the OctoPrint server.")
+ )
+
+ available_commands = dict()
+ for action, spec in commands.items():
+ if not spec["command"]:
+ continue
+ spec.update(dict(action=action, source="core", async=True, ignore=True))
+ available_commands[action] = spec
+ return available_commands
+
+
+def _get_core_command_spec(action):
+ available_actions = _get_core_command_specs()
+ if not action in available_actions:
+ logging.getLogger(__name__).warn("Command for core action {} is not configured, you need to configure the command before it can be used".format(action))
+ return None
+
+ return available_actions[action]
+
+
+def _get_custom_command_specs():
+ specs = collections.OrderedDict()
+ for spec in s().get(["system", "actions"]):
+ if not "action" in spec:
+ continue
+ copied = dict(spec)
+ copied["source"] = "custom"
+ specs[spec["action"]] = copied
+ return specs
+
+
+def _get_custom_command_spec(action):
+ available_actions = _get_custom_command_specs()
+ if not action in available_actions:
+ return None
+
+ return available_actions[action]
+
diff --git a/src/octoprint/server/util/flask.py b/src/octoprint/server/util/flask.py
index 4fb4d6cb..b1c386af 100644
--- a/src/octoprint/server/util/flask.py
+++ b/src/octoprint/server/util/flask.py
@@ -631,6 +631,7 @@ def collect_plugin_assets(enable_gcodeviewer=True, preferred_stylesheet="css"):
'js/app/viewmodels/printerprofiles.js',
'js/app/viewmodels/settings.js',
'js/app/viewmodels/slicing.js',
+ 'js/app/viewmodels/system.js',
'js/app/viewmodels/temperature.js',
'js/app/viewmodels/terminal.js',
'js/app/viewmodels/timelapse.js',
diff --git a/src/octoprint/static/js/app/main.js b/src/octoprint/static/js/app/main.js
index 5f301582..3e8a85c5 100644
--- a/src/octoprint/static/js/app/main.js
+++ b/src/octoprint/static/js/app/main.js
@@ -80,6 +80,26 @@ $(function() {
PNotify.prototype.options.styling = "bootstrap2";
PNotify.prototype.options.mouse_reset = false;
+ PNotify.singleButtonNotify = function(options) {
+ if (!options.confirm || !options.confirm.buttons || !options.confirm.buttons.length) {
+ return new PNotify(options);
+ }
+
+ var autoDisplay = options.auto_display != false;
+
+ var params = $.extend(true, {}, options);
+ params.auto_display = false;
+
+ var notify = new PNotify(params);
+ notify.options.confirm.buttons = [notify.options.confirm.buttons[0]];
+ notify.modules.confirm.makeDialog(notify, notify.options.confirm);
+
+ if (autoDisplay) {
+ notify.open();
+ }
+ return notify;
+ };
+
//~~ Initialize view models
// the view model map is our basic look up table for dependencies that may be injected into other view models
diff --git a/src/octoprint/static/js/app/viewmodels/navigation.js b/src/octoprint/static/js/app/viewmodels/navigation.js
index 1c9851fa..37bebbe8 100644
--- a/src/octoprint/static/js/app/viewmodels/navigation.js
+++ b/src/octoprint/static/js/app/viewmodels/navigation.js
@@ -6,8 +6,7 @@ $(function() {
self.appearance = parameters[1];
self.settings = parameters[2];
self.usersettings = parameters[3];
-
- self.systemActions = self.settings.system_actions;
+ self.system = parameters[4];
self.appearanceClasses = ko.computed(function() {
var classes = self.appearance.color();
@@ -17,36 +16,11 @@ $(function() {
return classes;
});
- self.triggerAction = function(action) {
- var callback = function() {
- OctoPrint.control.executeSystemCommand(action.action)
- .done(function() {
- new PNotify({title: gettext("Success"), text: _.sprintf(gettext("The command \"%(command)s\" executed successfully"), {command: action.name}), type: "success"});
- })
- .fail(function() {
- if (!action.hasOwnProperty("ignore") || !action.ignore) {
- var error = "" + _.sprintf(gettext("The command \"%(command)s\" could not be executed."), {command: action.name}) + "
";
- error += pnotifyAdditionalInfo("" + jqXHR.responseText + "
");
- new PNotify({title: gettext("Error"), text: error, type: "error", hide: false});
- }
- });
- };
- if (action.confirm) {
- showConfirmationDialog({
- message: action.confirm,
- onproceed: function(e) {
- callback();
- }
- });
- } else {
- callback();
- }
- }
}
OCTOPRINT_VIEWMODELS.push([
NavigationViewModel,
- ["loginStateViewModel", "appearanceViewModel", "settingsViewModel", "userSettingsViewModel"],
+ ["loginStateViewModel", "appearanceViewModel", "settingsViewModel", "userSettingsViewModel", "systemViewModel"],
"#navbar"
]);
});
diff --git a/src/octoprint/static/js/app/viewmodels/system.js b/src/octoprint/static/js/app/viewmodels/system.js
new file mode 100644
index 00000000..054ceff6
--- /dev/null
+++ b/src/octoprint/static/js/app/viewmodels/system.js
@@ -0,0 +1,98 @@
+$(function() {
+ function SystemViewModel(parameters) {
+ var self = this;
+
+ self.loginState = parameters[0];
+
+ self.lastCommandResponse = undefined;
+ self.systemActions = ko.observableArray([]);
+
+ self.requestData = function() {
+ self.requestCommandData();
+ };
+
+ self.requestCommandData = function() {
+ if (!self.loginState.isAdmin()) {
+ return;
+ }
+
+ $.ajax({
+ url: API_BASEURL + "system/commands",
+ type: "GET",
+ dataType: "json",
+ success: self.fromCommandResponse
+ });
+ };
+
+ self.fromCommandResponse = function(response) {
+ var actions = [];
+ if (response.core && response.core.length) {
+ _.each(response.core, function(data) {
+ var action = _.extend({}, data);
+ action.actionSource = "core";
+ actions.push(action);
+ });
+ actions.push({action: "divider"});
+ }
+ _.each(response.custom, function(data) {
+ var action = _.extend({}, data);
+ action.actionSource = "custom";
+ actions.push(action);
+ });
+ self.lastCommandResponse = response;
+ self.systemActions(actions);
+ };
+
+ self.triggerCommand = function(commandSpec) {
+ var callback = function() {
+ $.ajax({
+ url: commandSpec.resource,
+ type: "POST",
+ dataType: "json",
+ data: "{}",
+ contentType: "application/json; charset=UTF-8",
+ success: function() {
+ new PNotify({title: "Success", text: _.sprintf(gettext("The command \"%(command)s\" executed successfully"), {command: commandSpec.name}), type: "success"});
+ },
+ error: function(jqXHR, textStatus, errorThrown) {
+ if (!commandSpec.hasOwnProperty("ignore") || !commandSpec.ignore) {
+ var error = "" + _.sprintf(gettext("The command \"%(command)s\" could not be executed."), {command: commandSpec.name}) + "
";
+ error += pnotifyAdditionalInfo("" + jqXHR.responseText + "
");
+ new PNotify({title: gettext("Error"), text: error, type: "error", hide: false});
+ }
+ }
+ })
+ };
+ if (commandSpec.confirm) {
+ showConfirmationDialog({
+ message: commandSpec.confirm,
+ onproceed: function(e) {
+ callback();
+ }
+ });
+ } else {
+ callback();
+ }
+ };
+
+ self.onUserLoggedIn = function(user) {
+ if (user.admin) {
+ self.requestData();
+ } else {
+ self.onUserLoggedOut();
+ }
+ };
+
+ self.onUserLoggedOut = function() {
+ self.lastCommandResponse = undefined;
+ self.systemActions([]);
+ }
+ }
+
+ // view model class, parameters for constructor, container to bind to
+ ADDITIONAL_VIEWMODELS.push([
+ SystemViewModel,
+ ["loginStateViewModel"],
+ []
+ ]);
+});
diff --git a/src/octoprint/templates/navbar/systemmenu.jinja2 b/src/octoprint/templates/navbar/systemmenu.jinja2
index a2ee3f3b..603d2a09 100644
--- a/src/octoprint/templates/navbar/systemmenu.jinja2
+++ b/src/octoprint/templates/navbar/systemmenu.jinja2
@@ -2,11 +2,11 @@
{{ _('System') }}
-