From 47cf9eace1e3e554f415aced909c7db0d57d7557 Mon Sep 17 00:00:00 2001 From: thelastWallE <12502210+thelastWallE@users.noreply.github.com> Date: Thu, 1 Apr 2021 21:23:37 +0200 Subject: [PATCH] Added missing Checkbox for debug logging setting was already there in the configuration. -bump for rc5 --- octoprint_klipper/__init__.py | 7 ++++--- octoprint_klipper/templates/klipper_settings.jinja2 | 9 ++++++++- setup.py | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/octoprint_klipper/__init__.py b/octoprint_klipper/__init__.py index 6a7b99a..8c8acee 100644 --- a/octoprint_klipper/__init__.py +++ b/octoprint_klipper/__init__.py @@ -425,7 +425,6 @@ class KlipperPlugin( return flask.jsonify(data=data["config"]) elif command == "checkConfig": if "config" in data: - self.log_debug("config in ") if not self.validate_configfile(data["config"]): self.log_debug("validateConfig ->" + data["config"]) self._settings.set(["configuration", "old_config"], data["config"]) @@ -533,7 +532,9 @@ class KlipperPlugin( dataToValidated = configparser.RawConfigParser() dataToValidated.read_string(dataToBeValidated) except configparser.Error as error: - error.message = error.message.replace("\n","") + error.message = error.message.replace("\\n","") + error.message = error.message.replace("file:","Klipper Configuration", 1) + error.message = error.message.replace("'","", 2) error.source = "Klipper config" self.log_error( "Error: Invalid Klipper config file:\n" + @@ -542,7 +543,7 @@ class KlipperPlugin( self.send_message("PopUp", "warning", "Invalid Config", "Config got not saved!\n" + "You can reload your last changes\n" + - "on the file editor tab.\n\n" + str(error)) + "on the 'Klipper Configuration' tab.\n\n" + str(error)) self._parsing_check_response = False return else: diff --git a/octoprint_klipper/templates/klipper_settings.jinja2 b/octoprint_klipper/templates/klipper_settings.jinja2 index 83f5c36..d6c68fc 100644 --- a/octoprint_klipper/templates/klipper_settings.jinja2 +++ b/octoprint_klipper/templates/klipper_settings.jinja2 @@ -19,12 +19,19 @@
-
+
+
+
+ +
+ +
+
diff --git a/setup.py b/setup.py index e7f7199..ac6ebf4 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ plugin_package = "octoprint_klipper" plugin_name = "OctoKlipper" -plugin_version = "0.3.4rc4" +plugin_version = "0.3.4rc5" plugin_description = """A plugin for OctoPrint to configure,control and monitor the Klipper 3D printer software."""