From a0be333097623e554d088ac80e99200b2bebc367 Mon Sep 17 00:00:00 2001
From: Pedro Lamas <pedrolamas@gmail.com>
Date: Thu, 14 Oct 2021 00:05:47 +0100
Subject: [PATCH] Fix for numbered lines

Signed-off-by: Pedro Lamas <pedrolamas@gmail.com>
---
 klippy/extras/display_status.py | 10 +---------
 klippy/extras/gcode_macro.py    |  2 +-
 klippy/extras/respond.py        |  8 +-------
 klippy/gcode.py                 |  4 ++++
 4 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/klippy/extras/display_status.py b/klippy/extras/display_status.py
index 05eca0a9eba6..f6f8b6901e4f 100644
--- a/klippy/extras/display_status.py
+++ b/klippy/extras/display_status.py
@@ -35,15 +35,7 @@ def cmd_M73(self, gcmd):
         curtime = self.printer.get_reactor().monotonic()
         self.expire_progress = curtime + M73_TIMEOUT
     def cmd_M117(self, gcmd):
-        msg = gcmd.get_commandline()
-        umsg = msg.upper()
-        if not umsg.startswith('M117'):
-            # Parse out additional info if M117 recd during a print
-            start = umsg.find('M117')
-            end = msg.rfind('*')
-            if end >= 0:
-                msg = msg[:end]
-            msg = msg[start:]
+        msg = gcmd.get_sanitizedcommandline()
         if len(msg) > 5:
             self.message = msg[5:]
         else:
diff --git a/klippy/extras/gcode_macro.py b/klippy/extras/gcode_macro.py
index f9073fad6d78..7f06e709af77 100644
--- a/klippy/extras/gcode_macro.py
+++ b/klippy/extras/gcode_macro.py
@@ -184,7 +184,7 @@ def cmd(self, gcmd):
         if self.in_script:
             raise gcmd.error("Macro %s called recursively" % (self.alias,))
         params = gcmd.get_command_parameters()
-        commandline = gcmd.get_commandline()
+        commandline = gcmd.get_sanitizedcommandline()
         kwparams = dict(self.kwparams)
         kwparams.update(params)
         kwparams.update(self.variables)
diff --git a/klippy/extras/respond.py b/klippy/extras/respond.py
index 0adbc4bffb11..b3c90d04616b 100644
--- a/klippy/extras/respond.py
+++ b/klippy/extras/respond.py
@@ -22,13 +22,7 @@ def __init__(self, config):
         gcode.register_command('RESPOND', self.cmd_RESPOND, True,
                                desc=self.cmd_RESPOND_help)
     def cmd_M118(self, gcmd):
-        msg = gcmd.get_commandline()
-        umsg = msg.upper()
-        if not umsg.startswith('M118'):
-            # Parse out additional info if M118 recd during a print
-            start = umsg.find('M118')
-            end = msg.rfind('*')
-            msg = msg[start:end]
+        msg = gcmd.get_sanitizedcommandline()
         if len(msg) > 5:
             msg = msg[5:]
         else:
diff --git a/klippy/gcode.py b/klippy/gcode.py
index 97621cb91d0e..1f505cc2996d 100644
--- a/klippy/gcode.py
+++ b/klippy/gcode.py
@@ -15,6 +15,8 @@ class GCodeCommand:
     def __init__(self, gcode, command, commandline, params, need_ack):
         self._command = command
         self._commandline = commandline
+        self._sanitizedcommandline = self.commandline_r.sub(
+            r'\1', commandline).strip()
         self._params = params
         self._need_ack = need_ack
         # Method wrappers
@@ -24,6 +26,8 @@ def get_command(self):
         return self._command
     def get_commandline(self):
         return self._commandline
+    def get_sanitizedcommandline(self):
+        return self._sanitizedcommandline
     def get_command_parameters(self):
         return self._params
     def ack(self, msg=None):