From 1bba5ca7882afe1d065b7f0ae8c8bfdd166eef0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Tue, 18 Aug 2015 17:06:49 +0200 Subject: [PATCH] Refactored settings save API methods to make actual saving reusable --- src/octoprint/server/api/settings.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/octoprint/server/api/settings.py b/src/octoprint/server/api/settings.py index 0afb6913..1cb3d4bf 100644 --- a/src/octoprint/server/api/settings.py +++ b/src/octoprint/server/api/settings.py @@ -164,8 +164,6 @@ def getSettings(): @restricted_access @admin_permission.require(403) def setSettings(): - logger = logging.getLogger(__name__) - if not "application/json" in request.headers["Content-Type"]: return make_response("Expected content-type JSON", 400) @@ -173,6 +171,13 @@ def setSettings(): data = request.json except BadRequest: return make_response("Malformed JSON body in request", 400) + + _saveSettings(data) + return getSettings() + +def _saveSettings(data): + logger = logging.getLogger(__name__) + s = settings() if "api" in data.keys(): @@ -290,6 +295,3 @@ def setSettings(): effective_hash=s.effective_hash ) eventManager().fire(Events.SETTINGS_UPDATED, payload=payload) - - return getSettings() -