Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

file_manager: Added additional metadata to aid tool selection on single extruder multi-material prints #962

Merged
merged 14 commits into from
Feb 26, 2025
Merged
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 48 additions & 1 deletion moonraker/components/file_manager/metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,21 @@ def parse_filament_name(self) -> Optional[str]:
def parse_filament_type(self) -> Optional[str]:
return None

def parse_filament_color(self) -> Optional[str]:
return None

def parse_extruder_color(self) -> Optional[str]:
return None

def parse_filament_temp(self) -> Optional[str]:
return None

def parse_referenced_tools(self) -> Optional[str]:
return None

def parse_single_extruder_multi_material(self) -> Optional[int]:
return None

def parse_estimated_time(self) -> Optional[float]:
return None

Expand Down Expand Up @@ -374,13 +389,40 @@ def parse_filament_weight_total(self) -> Optional[float]:
)

def parse_filament_type(self) -> Optional[str]:
return regex_find_string(r";\sfilament_type\s=\s(%S)", self.footer_data)
return regex_find_string(
r";\sfilament_type\s=\s(%S)", self.footer_data
)

def parse_filament_name(self) -> Optional[str]:
return regex_find_string(
r";\sfilament_settings_id\s=\s(%S)", self.footer_data
)

def parse_filament_color(self) -> Optional[str]:
return regex_find_string(
r";\sfilament_colour\s=\s(%S)", self.footer_data
)

def parse_extruder_color(self) -> Optional[str]:
return regex_find_string(
r";\sextruder_colour\s=\s(%S)", self.footer_data
)

def parse_filament_temp(self) -> Optional[str]:
return regex_find_string(
r";\s(?:nozzle_)?temperature\s=\s(%S)", self.footer_data
)

def parse_referenced_tools(self) -> Optional[str]:
return regex_find_string(
r";\sreferenced_tools\s=\s(%S)", self.footer_data
)

def parse_single_extruder_multi_material(self) -> Optional[int]:
return regex_find_int(
r";\ssingle_extruder_multi_material\s=\s(%D)",
self.footer_data)

def parse_estimated_time(self) -> Optional[float]:
time_match = re.search(
r';\sestimated\sprinting\stime.*', self.footer_data)
Expand Down Expand Up @@ -940,6 +982,11 @@ def parse_first_layer_bed_temp(self) -> Optional[float]:
'chamber_temp',
'filament_name',
'filament_type',
'filament_color',
'extruder_color',
'filament_temp',
'referenced_tools',
'single_extruder_multi_material',
'filament_total',
'filament_weight_total',
'thumbnails']
Expand Down
Loading