From 89afb99de35fedb1c708d684f052222b5513447e Mon Sep 17 00:00:00 2001
From: sdoe0 <69821734+sdoe0@users.noreply.github.com>
Date: Wed, 2 Oct 2024 00:06:27 +0200
Subject: [PATCH 1/2] module: metadata.py Bugfix/Improvement regarding
 Simplify3D meta parsing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Current parsing param are not able to get filament_name and filament_type correctly.
printMaterial,(%S) for filament_name is not present in Gcode (anymore?).
makerBotModelMaterial,(%S) for type of filament is only changable for Export File Format= .makerbot.
Even worse: the last state of the Setting is present in Gcode even if the user didnt ever used something different than Standard G-Code Export. (By default = pla)
By using autoConfigurationMaterial,(%S), wich is by default one of PLA, PETG, ABS..., as filament_type we can avoid unnecessary Spoolman warnings and get a pleasurable printing history. -even with S3D ;)

Signed-off-by: Silas Döring sdoe0@proton.me
---
 moonraker/components/file_manager/metadata.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/moonraker/components/file_manager/metadata.py b/moonraker/components/file_manager/metadata.py
index af48d7b08..37bef681f 100644
--- a/moonraker/components/file_manager/metadata.py
+++ b/moonraker/components/file_manager/metadata.py
@@ -598,7 +598,7 @@ def parse_filament_name(self) -> Optional[str]:
 
     def parse_filament_type(self) -> Optional[str]:
         return regex_find_string(
-            r";\s+makerBotModelMaterial,(%S)", self.footer_data)
+            r";\s+autoConfigureMaterial,(%S)", self.footer_data)
 
     def parse_estimated_time(self) -> Optional[float]:
         time_match = re.search(r';\s+Build (t|T)ime:.*', self.footer_data)

From 2c459b48ff898ecc62f3a63495e9a9c87d9d21ea Mon Sep 17 00:00:00 2001
From: sdoe0 <69821734+sdoe0@users.noreply.github.com>
Date: Wed, 2 Oct 2024 00:18:56 +0200
Subject: [PATCH 2/2] module: metadata.py Bugfix/Improvement regarding
 Simplify3D meta parsing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Current parsing param are not able to get filament_name and filament_type correctly.
printMaterial,(%S) for filament_name is not present in Gcode (anymore?).
makerBotModelMaterial,(%S) for type of filament is only changeable for Export File Format= .makerbot.
Even worse: the last state of the Setting is present in Gcode even if the user didnt ever used something different than Standard G-Code Export (By default = pla).
By using autoConfigurationMaterial,(%S), wich is by default one of PLA, PETG, ABS..., as filament_type we can avoid unnecessary Spoolman warnings and get a pleasurable printing history. -even with S3D ;)

Signed-off-by: Silas Döring sdoe0@proton.me
---
 moonraker/components/file_manager/metadata.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/moonraker/components/file_manager/metadata.py b/moonraker/components/file_manager/metadata.py
index 37bef681f..6492dff53 100644
--- a/moonraker/components/file_manager/metadata.py
+++ b/moonraker/components/file_manager/metadata.py
@@ -594,7 +594,7 @@ def parse_filament_weight_total(self) -> Optional[float]:
 
     def parse_filament_name(self) -> Optional[str]:
         return regex_find_string(
-            r";\s+printMaterial,(%S)", self.header_data)
+            r";\s+(?:printMaterial|autoConfigureBrand),(%S)", self.header_data)
 
     def parse_filament_type(self) -> Optional[str]:
         return regex_find_string(