mirror of
https://github.com/maziggy/bambuddy.git
synced 2026-09-30 03:01:21 +02:00
maziggy
0229d61cea
Previewing a sliced multi-plate 3MF from the File Manager showed a plate nobody picked. The library route took no plate parameter at all, so the one the viewer has always put in the URL was dropped -- FastAPI discards unknown query parameters silently. Both routes then fell back to the first .gcode member of the zip, and member order is whatever the slicer wrote: the reported file stores plate_2.gcode ahead of plate_1.gcode. Nothing that opens the viewer from the File Manager passes a plate, so there was no way to ask for another one either. Plate resolution now lives in threemf_tools and both routes share it. select_plate_gcode_name() returns the named plate or None, so a caller serving an explicit choice can 404 instead of rendering something else; default_plate_gcode_name() returns the lowest-numbered plate. The viewer gained a plate switcher, and keeps the choice in its URL so a link to one plate survives a reload. Filament colours follow it too -- they were taken from the first plate regardless of which one was on screen. G-code injection and the finish-photo max_z_height read shared the old first-member fallback and now resolve the lowest plate as well.
63 lines
3.0 KiB
Python
63 lines
3.0 KiB
Python
"""Which ``.gcode`` member of a 3MF a plate resolves to.
|
|
|
|
A sliced multi-plate 3MF holds one toolpath per plate, and the order they sit
|
|
in the zip is whatever the slicer wrote — not plate order. A real two-plate
|
|
export measured for this fix stores ``Metadata/plate_2.gcode`` ahead of
|
|
``Metadata/plate_1.gcode``, so every caller that took the first member was
|
|
opening plate 2 on a file whose first plate is plate 1.
|
|
"""
|
|
|
|
from backend.app.utils.threemf_tools import (
|
|
default_plate_gcode_name,
|
|
select_plate_gcode_name,
|
|
)
|
|
|
|
# The exact member order of the reporter's AMS_Rack.gcode.3mf.
|
|
REVERSED_ORDER = ["Metadata/plate_2.gcode", "Metadata/plate_1.gcode"]
|
|
|
|
|
|
class TestDefaultPlateGcodeName:
|
|
def test_picks_the_lowest_plate_not_the_first_member(self):
|
|
assert default_plate_gcode_name(REVERSED_ORDER) == "Metadata/plate_1.gcode"
|
|
|
|
def test_ignores_non_gcode_members(self):
|
|
names = ["Metadata/plate_1.png", "Metadata/plate_2.gcode", "3D/3dmodel.model", "Metadata/plate_1.gcode"]
|
|
assert default_plate_gcode_name(names) == "Metadata/plate_1.gcode"
|
|
|
|
def test_a_gcode_md5_sidecar_is_not_mistaken_for_the_toolpath(self):
|
|
# Bambu writes plate_N.gcode.md5 next to each plate; it ends in .md5,
|
|
# so it must not win the lowest-plate sort.
|
|
names = ["Metadata/plate_1.gcode.md5", "Metadata/plate_2.gcode", "Metadata/plate_1.gcode"]
|
|
assert default_plate_gcode_name(names) == "Metadata/plate_1.gcode"
|
|
|
|
def test_falls_back_to_first_member_when_nothing_is_plate_numbered(self):
|
|
# Slicers that don't use the convention have no numbering to sort by.
|
|
assert default_plate_gcode_name(["out.gcode", "other.gcode"]) == "out.gcode"
|
|
|
|
def test_double_digit_plates_sort_numerically_not_lexically(self):
|
|
names = ["Metadata/plate_10.gcode", "Metadata/plate_2.gcode"]
|
|
assert default_plate_gcode_name(names) == "Metadata/plate_2.gcode"
|
|
|
|
def test_returns_none_for_an_unsliced_file(self):
|
|
assert default_plate_gcode_name(["3D/3dmodel.model"]) is None
|
|
|
|
|
|
class TestSelectPlateGcodeName:
|
|
def test_selects_the_named_plate_regardless_of_zip_order(self):
|
|
assert select_plate_gcode_name(REVERSED_ORDER, 1) == "Metadata/plate_1.gcode"
|
|
assert select_plate_gcode_name(REVERSED_ORDER, 2) == "Metadata/plate_2.gcode"
|
|
|
|
def test_zero_padded_names_match_the_index_the_plates_endpoint_reports(self):
|
|
assert select_plate_gcode_name(["Metadata/plate_01.gcode"], 1) == "Metadata/plate_01.gcode"
|
|
|
|
def test_returns_none_for_a_plate_the_file_does_not_hold(self):
|
|
# Never a silent fallback: the caller asked for a specific plate, and
|
|
# serving a different one is how the viewer showed the wrong toolpath.
|
|
assert select_plate_gcode_name(REVERSED_ORDER, 3) is None
|
|
|
|
def test_returns_none_without_a_plate_id(self):
|
|
assert select_plate_gcode_name(REVERSED_ORDER, None) is None
|
|
|
|
def test_does_not_match_a_prefix_of_a_longer_number(self):
|
|
assert select_plate_gcode_name(["Metadata/plate_12.gcode"], 1) is None
|