mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-27 19:01:02 +00:00
Run every profile maintenance job from one tool (#15726)
* Run every profile maintenance job from one tool orca_id_tool.py becomes orca_profile_tool.py, and orca_extra_profile_check.py and orca_filament_lib.py fold into it as subcommands: check, generate-id, fix, trim, update-index and update-snapshot. The three scripts already overlapped -- the checker imported half of its rules from the id tool, which in turn kept a copy-pasted set of output helpers to avoid the resulting import cycle -- while disagreeing on how a vendor is enumerated, how a JSON file is read and what the exit code means. One file settles all three. check, normalize, trim and update-index reproduce their predecessors exactly; normalize and update-index were diffed byte-for-byte against the old scripts over a copy of the whole tree. Deliberate changes: the compatible-printers check no longer switches itself off when --check-materials is passed, an error exits 1 rather than -1, update-index honours --profile-type and reports a profile it cannot place instead of dropping it from the index, fix and update-index gained --dry-run, trim keeps an unindexed file some surviving profile still inherits from, and vendors are enumerated as directories with an index -- which is why blacklist.json, a data file that an unscoped index rebuild once wrote four empty list sections into, loses them here and will not collect them again. The dead rename_filament_system() helper is gone. The suite under scripts/tests now covers the maintenance commands too, and CI runs it; nothing there ran in CI before. No shipped profile data changes apart from those four keys. * update vendor index files with "python3 ./scripts/orca_profile_tool.py update-index" and "python3 ./scripts/orca_profile_tool.py normalize"
This commit is contained in:
SoftFever
@@ -360,14 +360,6 @@
|
||||
"name": "fdm_filament_tpu",
|
||||
"sub_path": "filament/fdm_filament_tpu.json"
|
||||
},
|
||||
{
|
||||
"name": "Tiertime ABS",
|
||||
"sub_path": "filament/Tiertime ABS.json"
|
||||
},
|
||||
{
|
||||
"name": "Tiertime ABS@300HS",
|
||||
"sub_path": "filament/Tiertime ABS@300HS.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic ABS @Tiertime",
|
||||
"sub_path": "filament/Generic ABS @Tiertime.json"
|
||||
@@ -377,12 +369,12 @@
|
||||
"sub_path": "filament/Generic ABS @Tiertime 300HS.json"
|
||||
},
|
||||
{
|
||||
"name": "Tiertime ASA",
|
||||
"sub_path": "filament/Tiertime ASA.json"
|
||||
"name": "Tiertime ABS",
|
||||
"sub_path": "filament/Tiertime ABS.json"
|
||||
},
|
||||
{
|
||||
"name": "Tiertime ASA@300HS",
|
||||
"sub_path": "filament/Tiertime ASA@300HS.json"
|
||||
"name": "Tiertime ABS@300HS",
|
||||
"sub_path": "filament/Tiertime ABS@300HS.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic ASA @Tiertime",
|
||||
@@ -392,6 +384,14 @@
|
||||
"name": "Generic ASA @Tiertime 300HS",
|
||||
"sub_path": "filament/Generic ASA @Tiertime 300HS.json"
|
||||
},
|
||||
{
|
||||
"name": "Tiertime ASA",
|
||||
"sub_path": "filament/Tiertime ASA.json"
|
||||
},
|
||||
{
|
||||
"name": "Tiertime ASA@300HS",
|
||||
"sub_path": "filament/Tiertime ASA@300HS.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic BVOH @Tiertime",
|
||||
"sub_path": "filament/Generic BVOH @Tiertime.json"
|
||||
@@ -420,6 +420,10 @@
|
||||
"name": "Generic PA @Tiertime",
|
||||
"sub_path": "filament/Generic PA @Tiertime.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PA @Tiertime 300HS",
|
||||
"sub_path": "filament/Generic PA @Tiertime 300HS.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PA-CF @Tiertime",
|
||||
"sub_path": "filament/Generic PA-CF @Tiertime.json"
|
||||
@@ -428,10 +432,6 @@
|
||||
"name": "Generic PA-CF @Tiertime 300HS",
|
||||
"sub_path": "filament/Generic PA-CF @Tiertime 300HS.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PA @Tiertime 300HS",
|
||||
"sub_path": "filament/Generic PA @Tiertime 300HS.json"
|
||||
},
|
||||
{
|
||||
"name": "Tiertime PA6-CF",
|
||||
"sub_path": "filament/Tiertime PA6-CF.json"
|
||||
@@ -468,6 +468,10 @@
|
||||
"name": "Generic PE @Tiertime",
|
||||
"sub_path": "filament/Generic PE @Tiertime.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PE @Tiertime 300HS",
|
||||
"sub_path": "filament/Generic PE @Tiertime 300HS.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PE-CF @Tiertime",
|
||||
"sub_path": "filament/Generic PE-CF @Tiertime.json"
|
||||
@@ -476,14 +480,14 @@
|
||||
"name": "Generic PE-CF @Tiertime 300HS",
|
||||
"sub_path": "filament/Generic PE-CF @Tiertime 300HS.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PE @Tiertime 300HS",
|
||||
"sub_path": "filament/Generic PE @Tiertime 300HS.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PETG @Tiertime",
|
||||
"sub_path": "filament/Generic PETG @Tiertime.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PETG @Tiertime 300HS",
|
||||
"sub_path": "filament/Generic PETG @Tiertime 300HS.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PETG-CF @Tiertime",
|
||||
"sub_path": "filament/Generic PETG-CF @Tiertime.json"
|
||||
@@ -492,10 +496,6 @@
|
||||
"name": "Generic PETG-CF @Tiertime 300HS",
|
||||
"sub_path": "filament/Generic PETG-CF @Tiertime 300HS.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PETG @Tiertime 300HS",
|
||||
"sub_path": "filament/Generic PETG @Tiertime 300HS.json"
|
||||
},
|
||||
{
|
||||
"name": "Tiertime PET-CF",
|
||||
"sub_path": "filament/Tiertime PET-CF.json"
|
||||
@@ -524,6 +524,10 @@
|
||||
"name": "Generic PLA @Tiertime",
|
||||
"sub_path": "filament/Generic PLA @Tiertime.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PLA @Tiertime 300HS",
|
||||
"sub_path": "filament/Generic PLA @Tiertime 300HS.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PLA High Speed @Tiertime",
|
||||
"sub_path": "filament/Generic PLA High Speed @Tiertime.json"
|
||||
@@ -548,10 +552,6 @@
|
||||
"name": "Generic PLA-CF @Tiertime 300HS",
|
||||
"sub_path": "filament/Generic PLA-CF @Tiertime 300HS.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PLA @Tiertime 300HS",
|
||||
"sub_path": "filament/Generic PLA @Tiertime 300HS.json"
|
||||
},
|
||||
{
|
||||
"name": "Tiertime PLA",
|
||||
"sub_path": "filament/Tiertime PLA.json"
|
||||
@@ -572,6 +572,10 @@
|
||||
"name": "Generic PP @Tiertime",
|
||||
"sub_path": "filament/Generic PP @Tiertime.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PP @Tiertime 300HS",
|
||||
"sub_path": "filament/Generic PP @Tiertime 300HS.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PP-CF @Tiertime",
|
||||
"sub_path": "filament/Generic PP-CF @Tiertime.json"
|
||||
@@ -588,10 +592,6 @@
|
||||
"name": "Generic PP-GF @Tiertime 300HS",
|
||||
"sub_path": "filament/Generic PP-GF @Tiertime 300HS.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PP @Tiertime 300HS",
|
||||
"sub_path": "filament/Generic PP @Tiertime 300HS.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PPA-CF @Tiertime",
|
||||
"sub_path": "filament/Generic PPA-CF @Tiertime.json"
|
||||
@@ -612,6 +612,10 @@
|
||||
"name": "Generic PPS @Tiertime",
|
||||
"sub_path": "filament/Generic PPS @Tiertime.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PPS @Tiertime 300HS",
|
||||
"sub_path": "filament/Generic PPS @Tiertime 300HS.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PPS-CF @Tiertime",
|
||||
"sub_path": "filament/Generic PPS-CF @Tiertime.json"
|
||||
@@ -620,10 +624,6 @@
|
||||
"name": "Generic PPS-CF @Tiertime 300HS",
|
||||
"sub_path": "filament/Generic PPS-CF @Tiertime 300HS.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PPS @Tiertime 300HS",
|
||||
"sub_path": "filament/Generic PPS @Tiertime 300HS.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PVA @Tiertime",
|
||||
"sub_path": "filament/Generic PVA @Tiertime.json"
|
||||
|
||||
Reference in New Issue
Block a user