mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-28 03:11:47 +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:
@@ -201,82 +201,66 @@
|
||||
}
|
||||
],
|
||||
"filament_list": [
|
||||
{
|
||||
"name": "Generic ABS @Sovol SV08 MAX",
|
||||
"sub_path": "filament/Generic ABS @Sovol SV08 MAX.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PC @Sovol SV08 MAX",
|
||||
"sub_path": "filament/Generic PC @Sovol SV08 MAX.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PETG @Sovol SV08 MAX",
|
||||
"sub_path": "filament/Generic PETG @Sovol SV08 MAX.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PLA @Sovol SV08 MAX",
|
||||
"sub_path": "filament/Generic PLA @Sovol SV08 MAX.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PLA Silk @Sovol SV08 MAX",
|
||||
"sub_path": "filament/Generic PLA Silk @Sovol SV08 MAX.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic TPU @Sovol SV08 MAX",
|
||||
"sub_path": "filament/Generic TPU @Sovol SV08 MAX.json"
|
||||
},
|
||||
{
|
||||
"name": "Polymaker PETG @Sovol SV08 MAX",
|
||||
"sub_path": "filament/Polymaker PETG @Sovol SV08 MAX.json"
|
||||
},
|
||||
{
|
||||
"name": "SUNLU PETG @Sovol SV08 MAX",
|
||||
"sub_path": "filament/SUNLU PETG @Sovol SV08 MAX.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic ABS @Sovol SV06 ACE",
|
||||
"sub_path": "filament/Generic ABS @Sovol SV06 ACE.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PETG @Sovol SV06 ACE",
|
||||
"sub_path": "filament/Generic PETG @Sovol SV06 ACE.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PLA @Sovol SV06 ACE",
|
||||
"sub_path": "filament/Generic PLA @Sovol SV06 ACE.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic TPU @Sovol SV06 ACE",
|
||||
"sub_path": "filament/Generic TPU @Sovol SV06 ACE.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic ABS @Sovol SV06 Plus ACE",
|
||||
"sub_path": "filament/Generic ABS @Sovol SV06 Plus ACE.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic ABS @Sovol SV08",
|
||||
"sub_path": "filament/Generic ABS @Sovol SV08.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic ABS @Sovol SV08 MAX",
|
||||
"sub_path": "filament/Generic ABS @Sovol SV08 MAX.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic ABS @Sovol Zero",
|
||||
"sub_path": "filament/Generic ABS @Sovol Zero.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PC @Sovol SV08 MAX",
|
||||
"sub_path": "filament/Generic PC @Sovol SV08 MAX.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PC @Sovol Zero",
|
||||
"sub_path": "filament/Generic PC @Sovol Zero.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PETG @Sovol SV06 ACE",
|
||||
"sub_path": "filament/Generic PETG @Sovol SV06 ACE.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PETG @Sovol SV06 Plus ACE",
|
||||
"sub_path": "filament/Generic PETG @Sovol SV06 Plus ACE.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PETG @Sovol SV08",
|
||||
"sub_path": "filament/Generic PETG @Sovol SV08.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PETG @Sovol SV08 MAX",
|
||||
"sub_path": "filament/Generic PETG @Sovol SV08 MAX.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PETG @Sovol Zero",
|
||||
"sub_path": "filament/Generic PETG @Sovol Zero.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PLA @Sovol SV06 ACE",
|
||||
"sub_path": "filament/Generic PLA @Sovol SV06 ACE.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PLA @Sovol SV06 Plus ACE",
|
||||
"sub_path": "filament/Generic PLA @Sovol SV06 Plus ACE.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic TPU @Sovol SV06 Plus ACE",
|
||||
"sub_path": "filament/Generic TPU @Sovol SV06 Plus ACE.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PLA @Sovol SV07",
|
||||
"sub_path": "filament/Generic PLA @Sovol SV07.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic ABS @Sovol SV08",
|
||||
"sub_path": "filament/Generic ABS @Sovol SV08.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PETG @Sovol SV08",
|
||||
"sub_path": "filament/Generic PETG @Sovol SV08.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PLA @Sovol SV08",
|
||||
"sub_path": "filament/Generic PLA @Sovol SV08.json"
|
||||
@@ -286,44 +270,60 @@
|
||||
"sub_path": "filament/Generic PLA @Sovol SV08 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic TPU @Sovol SV08",
|
||||
"sub_path": "filament/Generic TPU @Sovol SV08.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic ABS @Sovol Zero",
|
||||
"sub_path": "filament/Generic ABS @Sovol Zero.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PC @Sovol Zero",
|
||||
"sub_path": "filament/Generic PC @Sovol Zero.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PETG @Sovol Zero",
|
||||
"sub_path": "filament/Generic PETG @Sovol Zero.json"
|
||||
},
|
||||
{
|
||||
"name": "Sovol Zero PETG HS Nozzle",
|
||||
"sub_path": "filament/Sovol Zero PETG HS Nozzle.json"
|
||||
"name": "Generic PLA @Sovol SV08 MAX",
|
||||
"sub_path": "filament/Generic PLA @Sovol SV08 MAX.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PLA @Sovol Zero",
|
||||
"sub_path": "filament/Generic PLA @Sovol Zero.json"
|
||||
},
|
||||
{
|
||||
"name": "Sovol Zero PLA Basic HS Nozzle",
|
||||
"sub_path": "filament/Sovol Zero PLA Basic HS Nozzle.json"
|
||||
"name": "Generic PLA Silk @Sovol SV08 MAX",
|
||||
"sub_path": "filament/Generic PLA Silk @Sovol SV08 MAX.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic PLA Silk @Sovol Zero",
|
||||
"sub_path": "filament/Generic PLA Silk @Sovol Zero.json"
|
||||
},
|
||||
{
|
||||
"name": "Sovol Zero PLA Silk HS Nozzle",
|
||||
"sub_path": "filament/Sovol Zero PLA Silk HS Nozzle.json"
|
||||
"name": "Generic TPU @Sovol SV06 ACE",
|
||||
"sub_path": "filament/Generic TPU @Sovol SV06 ACE.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic TPU @Sovol SV06 Plus ACE",
|
||||
"sub_path": "filament/Generic TPU @Sovol SV06 Plus ACE.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic TPU @Sovol SV08",
|
||||
"sub_path": "filament/Generic TPU @Sovol SV08.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic TPU @Sovol SV08 MAX",
|
||||
"sub_path": "filament/Generic TPU @Sovol SV08 MAX.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic TPU @Sovol Zero",
|
||||
"sub_path": "filament/Generic TPU @Sovol Zero.json"
|
||||
},
|
||||
{
|
||||
"name": "Polymaker PETG @Sovol SV08 MAX",
|
||||
"sub_path": "filament/Polymaker PETG @Sovol SV08 MAX.json"
|
||||
},
|
||||
{
|
||||
"name": "SUNLU PETG @Sovol SV08 MAX",
|
||||
"sub_path": "filament/SUNLU PETG @Sovol SV08 MAX.json"
|
||||
},
|
||||
{
|
||||
"name": "Sovol Zero PETG HS Nozzle",
|
||||
"sub_path": "filament/Sovol Zero PETG HS Nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "Sovol Zero PLA Basic HS Nozzle",
|
||||
"sub_path": "filament/Sovol Zero PLA Basic HS Nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "Sovol Zero PLA Silk HS Nozzle",
|
||||
"sub_path": "filament/Sovol Zero PLA Silk HS Nozzle.json"
|
||||
}
|
||||
],
|
||||
"machine_list": [
|
||||
|
||||
Reference in New Issue
Block a user