3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

metadata: add support for parsing layer count 

Currently this is only supported in SuperSlicer.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2021-11-25 14:37:02 -05:00 committed by Eric Callahan
parent cfa5f4a432
commit b1c9a96040
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
moonraker/components/file_manager/metadata.py
View File

@ -184,6 +184,9 @@ class BaseSlicer(object):
def parse_thumbnails(self) -> Optional[List[Dict[str, Any]]]: def parse_thumbnails(self) -> Optional[List[Dict[str, Any]]]:
return None return None
def parse_layer_count(self) -> Optional[int]:
return None
class UnknownSlicer(BaseSlicer): class UnknownSlicer(BaseSlicer):
def check_identity(self, data: str) -> Optional[Dict[str, str]]: def check_identity(self, data: str) -> Optional[Dict[str, str]]:
return {'slicer': "Unknown"} return {'slicer': "Unknown"}
@ -328,6 +331,16 @@ class PrusaSlicer(BaseSlicer):
return _regex_find_first( return _regex_find_first(
r"; first_layer_bed_temperature = (\d+\.?\d*)", self.footer_data) r"; first_layer_bed_temperature = (\d+\.?\d*)", self.footer_data)
def parse_layer_count(self) -> Optional[int]:
match = re.search(r"; total layers count = (\d+)", self.footer_data)
val: Optional[int] = None
if match:
try:
val = int(match.group(1))
except Exception:
return None
return val
class Slic3rPE(PrusaSlicer): class Slic3rPE(PrusaSlicer):
def check_identity(self, data: str) -> Optional[Dict[str, str]]: def check_identity(self, data: str) -> Optional[Dict[str, str]]:
match = re.search(r"Slic3r\sPrusa\sEdition\s(.*)\son", data) match = re.search(r"Slic3r\sPrusa\sEdition\s(.*)\son", data)
@ -713,7 +726,7 @@ SUPPORTED_DATA = [
'layer_height', 'first_layer_height', 'object_height', 'layer_height', 'first_layer_height', 'object_height',
'filament_total', 'filament_weight_total', 'estimated_time', 'filament_total', 'filament_weight_total', 'estimated_time',
'thumbnails', 'first_layer_bed_temp', 'first_layer_extr_temp', 'thumbnails', 'first_layer_bed_temp', 'first_layer_extr_temp',
'gcode_start_byte', 'gcode_end_byte'] 'gcode_start_byte', 'gcode_end_byte', 'layer_count']
def process_objects(file_path: str) -> None: def process_objects(file_path: str) -> None:
fname = os.path.basename(file_path) fname = os.path.basename(file_path)