Skip to content

Commit b0096be

Browse files
committed
Backport moonraker metadata: filament_name and filament_type as array
Backports upstream commit 3a54161 to return filament_name and filament_type as JSON arrays for multi-material slices, fixes #355. Also restructures patch paths under home/lava/moonraker/ to match the target filesystem layout.
1 parent 4095a0c commit b0096be

File tree

2 files changed

+45
-2
lines changed

2 files changed

+45
-2
lines changed

overlays/firmware-extended/24-moonraker-patches/patches/01-add-oem-disk-usage-support.patch renamed to overlays/firmware-extended/24-moonraker-patches/patches/home/lava/moonraker/01-add-oem-disk-usage-support.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- a/home/lava/moonraker/moonraker/components/file_manager/file_manager.py 2026-02-06 19:12:24.179575409 +0100
2-
+++ b/home/lava/moonraker/moonraker/components/file_manager/file_manager.py 2026-02-06 19:13:16.448036223 +0100
1+
--- a/moonraker/components/file_manager/file_manager.py 2026-02-06 19:12:24.179575409 +0100
2+
+++ b/moonraker/components/file_manager/file_manager.py 2026-02-06 19:13:16.448036223 +0100
33
@@ -825,10 +825,12 @@
44
}
55
flist['disk_usage'] = disk_usage
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
From 3a54161ce7d274c9dfe70205c2747c97f1eb3294 Mon Sep 17 00:00:00 2001
2+
From: Pedro Lamas <pedrolamas@gmail.com>
3+
Date: Wed, 12 Mar 2025 18:19:59 +0000
4+
Subject: [PATCH] metadata: filament_name and filament_type as array
5+
6+
Signed-off-by: Pedro Lamas <pedrolamas@gmail.com>
7+
---
8+
moonraker/components/file_manager/metadata.py | 18 ++++++++++++++----
9+
1 file changed, 14 insertions(+), 4 deletions(-)
10+
11+
diff --git a/moonraker/components/file_manager/metadata.py b/moonraker/components/file_manager/metadata.py
12+
index b1e68ea64..b6d23a8f8 100644
13+
--- a/moonraker/components/file_manager/metadata.py
14+
+++ b/moonraker/components/file_manager/metadata.py
15+
@@ -429,14 +429,24 @@ def parse_filament_weights(self) -> Optional[List[float]]:
16+
return None
17+
18+
def parse_filament_type(self) -> Optional[str]:
19+
- return regex_find_string(
20+
- r";\sfilament_type\s=\s(%S)", self.footer_data
21+
+ result = regex_find_strings(
22+
+ r";\sfilament_type\s=\s(%S)", ",;", self.footer_data
23+
)
24+
+ if len(result) > 1:
25+
+ return json.dumps(result)
26+
+ elif result:
27+
+ return result[0]
28+
+ return None
29+
30+
def parse_filament_name(self) -> Optional[str]:
31+
- return regex_find_string(
32+
- r";\sfilament_settings_id\s=\s(%S)", self.footer_data
33+
+ result = regex_find_strings(
34+
+ r";\sfilament_settings_id\s=\s(%S)", ",;", self.footer_data
35+
)
36+
+ if len(result) > 1:
37+
+ return json.dumps(result)
38+
+ elif result:
39+
+ return result[0]
40+
+ return None
41+
42+
def parse_filament_colors(self) -> Optional[List[str]]:
43+
return regex_find_strings(

0 commit comments

Comments
 (0)