GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-15 10:45:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

SPE-2451: Fix of faulty manifest file

Browse Source 
Decision tree on (un)selected repo / installed printers
This commit is contained in:
David Kocik 2024-09-02 09:34:27 +02:00 committed by Lukas Matena
parent 0285ba2d84
commit 67d5651278
1 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/slic3r/GUI/PresetArchiveDatabase.cpp
View File

@ -409,21 +409,44 @@ void PresetArchiveDatabase::set_installed_printer_repositories(const std::vector
// set correct repos as having installed printer // set correct repos as having installed printer
for (const std::string &used_id : used_ids) { for (const std::string &used_id : used_ids) {
// find archive with id and is used // find archive with id and is used
std::vector<std::string> selected_uuid;
std::vector<std::string> unselected_uuid;
for (const auto &archive : m_archive_repositories) { for (const auto &archive : m_archive_repositories) {
if (archive->get_manifest().id != used_id) { if (archive->get_manifest().id != used_id) {
continue; continue;
} }
const std::string uuid = archive->get_uuid(); const std::string uuid = archive->get_uuid();
if (m_selected_repositories_uuid[uuid]) {
const auto& it = m_selected_repositories_uuid.find(uuid); selected_uuid.emplace_back(uuid);
assert(it != m_selected_repositories_uuid.end()); } else {
if (it->second == false) { unselected_uuid.emplace_back(uuid);
continue; }
}
// set archive as has installed printer
m_has_installed_printer_repositories_uuid[uuid] = true;
} }
if (selected_uuid.empty() && unselected_uuid.empty()) {
// there is id in used_ids that is not in m_archive_repositories - BAD
assert(true);
continue;
} else if (selected_uuid.size() == 1){
// regular case
m_has_installed_printer_repositories_uuid[selected_uuid.front()] = true;
} else if (selected_uuid.size() > 1) {
// this should not happen, only one repo of same id should be selected (online / local conflict)
assert(true);
// select first one to solve the conflict
m_has_installed_printer_repositories_uuid[selected_uuid.front()] = true;
// unselect the rest
for (size_t i = 1; i < selected_uuid.size(); i++) {
m_selected_repositories_uuid[selected_uuid[i]] = false;
}
} else if (selected_uuid.empty()) {
// This is a rare case, where there are no selected repos with matching id but id has installed printers
// Repro: install printer, unselect repo in the next run of wizard, next, cancel wizard, run wizard again and press finish.
// Solution: Select the first unselected
m_has_installed_printer_repositories_uuid[unselected_uuid.front()] = true;
m_selected_repositories_uuid[unselected_uuid.front()] = true;
}
} }
save_app_manifest_json(); save_app_manifest_json();
} }