Skip to content

Backport moonraker metadata: filament_name and filament_type as array #358

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.

Sign up for GitHub

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

Open
paxx12 wants to merge 4 commits into
base: develop
Choose a base branch
from
+47 −2
Open

Backport moonraker metadata: filament_name and filament_type as array #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b0096be
Backport moonraker metadata: filament_name and filament_type as array
paxx12 Mar 29, 2026
87c383b
Backport moonraker metadata: balanced quoted string split
paxx12 Mar 29, 2026
992cf02
Backport moonraker file_manager: fix filament change count parsing fo…
paxx12 Mar 29, 2026
b296657
Backport moonraker metadata: support multiple filament lengths for Pr…
paxx12 Mar 29, 2026
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
4 changes: 2 additions & 2 deletions ...tches/01-add-oem-disk-usage-support.patch → ...raker/01-add-oem-disk-usage-support.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- a/home/lava/moonraker/moonraker/components/file_manager/file_manager.py 2026-02-06 19:12:24.179575409 +0100
+++ b/home/lava/moonraker/moonraker/components/file_manager/file_manager.py 2026-02-06 19:13:16.448036223 +0100
--- a/moonraker/components/file_manager/file_manager.py 2026-02-06 19:12:24.179575409 +0100
+++ b/moonraker/components/file_manager/file_manager.py 2026-02-06 19:13:16.448036223 +0100
@@ -825,10 +825,12 @@
}
flist['disk_usage'] = disk_usage
Expand Down
45 changes: 45 additions & 0 deletions ...es/patches/home/lava/moonraker/02-metadata-filament_name-and-filament_type-as-array.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
From 3a54161ce7d274c9dfe70205c2747c97f1eb3294 Mon Sep 17 00:00:00 2001
From: Pedro Lamas <pedrolamas@gmail.com>
Date: Wed, 12 Mar 2025 18:19:59 +0000
Subject: [PATCH] metadata: filament_name and filament_type as array

Signed-off-by: Pedro Lamas <pedrolamas@gmail.com>
---
moonraker/components/file_manager/metadata.py | 20 +++++++++++++-------
1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/moonraker/components/file_manager/metadata.py b/moonraker/components/file_manager/metadata.py
--- a/moonraker/components/file_manager/metadata.py
+++ b/moonraker/components/file_manager/metadata.py
@@ -435,6 +435,13 @@ 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)
+ result = regex_find_strings(
+ r";\sfilament_type\s=\s(%S)", ",;", self.footer_data
+ )
+ if len(result) > 1:
+ return json.dumps(result)
+ elif result:
+ return result[0]
+ return None

def parse_filament_retract_length_toolchange(self) -> Optional[List[float]]:
@@ -457,8 +464,13 @@ def parse_filament_retract_length_toolchange(self) -> Optional[List[float]]:
return []

def parse_filament_name(self) -> Optional[str]:
- return regex_find_string(
- r";\sfilament_settings_id\s=\s(%S)", self.footer_data
- )
+ result = regex_find_strings(
+ r";\sfilament_settings_id\s=\s(%S)", ",;", self.footer_data
+ )
+ if len(result) > 1:
+ return json.dumps(result)
+ elif result:
+ return result[0]
+ return None

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