Updated regex for obtaining metadata from path to be more precise

prusa3d · Aug 29, 2023 · 8215f0b · 8215f0b
1 parent 3f4c6bd
commit 8215f0b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/gcode_metadata/metadata.py b/gcode_metadata/metadata.py
@@ -364,8 +364,8 @@ def set_attr(self, name, value):
     }
 
     FDM_FILENAME_PAT = re.compile(
-        r"^(?P<name>.*?)_(?P<height>[0-9.]+)mm_"
-        r"(?P<material>\w+)_(?P<printer>\w+)_(?P<time>.*)\.")
+        r"^(?P<name>.*?)_(?P<height>[0-9.]+)mm_(?P<material>[A-Za-z]+)_"
+        r"(?P<printer>[A-Za-z0-9]+)_(?P<time>[A-Za-z0-9]+)_?\w*.")
 
     METADATA_START_OFFSET = 400000  # Read 400KB from the start
     METADATA_END_OFFSET = 40000  # Read 40KB at the end of the file