From dde9bcc752c4827ff0ffc01ed99c6f487122c04f Mon Sep 17 00:00:00 2001 From: Eric Callahan Date: Wed, 30 Nov 2022 16:24:34 -0500 Subject: [PATCH] metadata: add object detection logging Signed-off-by: Eric Callahan --- moonraker/components/file_manager/metadata.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/moonraker/components/file_manager/metadata.py b/moonraker/components/file_manager/metadata.py index 048f4ba..8e48de2 100644 --- a/moonraker/components/file_manager/metadata.py +++ b/moonraker/components/file_manager/metadata.py @@ -138,11 +138,21 @@ class BaseSlicer(object): pattern: Optional[str] = None ) -> bool: match = re.search( - r"\n(DEFINE_OBJECT)|(EXCLUDE_OBJECT_DEFINE) NAME=", + r"\n((DEFINE_OBJECT)|(EXCLUDE_OBJECT_DEFINE)) NAME=", data ) if match is not None: - # Objects alread processed + # Objects already processed + fname = os.path.basename(self.path) + log_to_stderr( + f"File '{fname}' currently supports cancellation, " + "processing aborted" + ) + if match.group(1).startswith("DEFINE_OBJECT"): + log_to_stderr( + "Legacy object processing detected. This is not " + "compatible with official versions of Klipper." + ) return False # Always check M486 patterns = [r"\nM486"]