From 975011d19078c209ff5175698962ab12c10b1a07 Mon Sep 17 00:00:00 2001 From: WALDNER Emmanuel Date: Tue, 7 Nov 2023 22:12:58 +0100 Subject: [PATCH] metadata : fix extract to work with Ideamaker Correction of the regex (Replacing the = with one: and adding the filament index for the regex to work). Signed-off-by: Emmanuel WALDNER emmanuel.waldner@gmail.com --- moonraker/components/file_manager/metadata.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/moonraker/components/file_manager/metadata.py b/moonraker/components/file_manager/metadata.py index 7fdb469..71cfeaa 100644 --- a/moonraker/components/file_manager/metadata.py +++ b/moonraker/components/file_manager/metadata.py @@ -777,12 +777,16 @@ class IdeaMaker(BaseSlicer): return None def parse_filament_type(self) -> Optional[str]: - return _regex_find_string( - r";Filament\stype\s=\s(.*)", self.header_data) + return ( + _regex_find_string(r";Filament\sType\s.\d:\s(.*)", self.header_data) or + _regex_find_string(r";Filament\stype\s=\s(.*)", self.header_data) + ) def parse_filament_name(self) -> Optional[str]: - return _regex_find_string( - r";Filament\sname\s=\s(.*)", self.header_data) + return ( + _regex_find_string(r";Filament\sName\s.\d:\s(.*)", self.header_data) or + _regex_find_string(r";Filament\sname\s=\s(.*)", self.header_data) + ) def parse_filament_weight_total(self) -> Optional[float]: pi = 3.141592653589793