3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-26 16:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix custom profiles added/removed each other run (#8179)

Browse source 
* Avoid updating same vendor multiple times and unnecessary version checks

* Fix custom profiles added/removed each other run (SoftFever/OrcaSlicer#8094)

Co-authored-by: Dima Buzdyk <46728448+buzzhuzz@users.noreply.github.com>

---------

Co-authored-by: Dima Buzdyk <46728448+buzzhuzz@users.noreply.github.com>
This commit is contained in:
Noisyfox 2025-01-25 23:50:16 +08:00 • committed by GitHub
parent 23a31bcad9
commit 592402ea46
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/slic3r/Utils/PresetUpdater.cpp
View file

@ -226,7 +226,7 @@ struct PresetUpdater::priv
bool get_cached_plugins_version(std::string &cached_version, bool& force); bool get_cached_plugins_version(std::string &cached_version, bool& force);
//BBS: refine preset update logic //BBS: refine preset update logic
bool install_bundles_rsrc(std::vector<std::string> bundles, bool snapshot) const; bool install_bundles_rsrc(const std::vector<std::string>& bundles, bool snapshot) const;
void check_installed_vendor_profiles() const; void check_installed_vendor_profiles() const;
Updates get_printer_config_updates(bool update = false) const; Updates get_printer_config_updates(bool update = false) const;
Updates get_config_updates(const Semver& old_slic3r_version) const; Updates get_config_updates(const Semver& old_slic3r_version) const;
@ -1042,7 +1042,7 @@ void PresetUpdater::priv::sync_printer_config(std::string http_url)
} }
} }
bool PresetUpdater::priv::install_bundles_rsrc(std::vector<std::string> bundles, bool snapshot) const bool PresetUpdater::priv::install_bundles_rsrc(const std::vector<std::string>& bundles, bool snapshot) const
{ {
Updates updates; Updates updates;
@ -1079,9 +1079,9 @@ void PresetUpdater::priv::check_installed_vendor_profiles() const
AppConfig *app_config = GUI::wxGetApp().app_config; AppConfig *app_config = GUI::wxGetApp().app_config;
const auto enabled_vendors = app_config->vendors(); const auto enabled_vendors = app_config->vendors();
std::vector<std::string> bundles; std::set<std::string> bundles;
// Orca: always install filament library // Orca: always install filament library
bundles.push_back(PresetBundle::ORCA_FILAMENT_LIBRARY); bundles.insert(PresetBundle::ORCA_FILAMENT_LIBRARY);
for (auto &dir_entry : boost::filesystem::directory_iterator(rsrc_path)) { for (auto &dir_entry : boost::filesystem::directory_iterator(rsrc_path)) {
const auto &path = dir_entry.path(); const auto &path = dir_entry.path();
std::string file_path = path.string(); std::string file_path = path.string();
@ -1090,9 +1090,13 @@ void PresetUpdater::priv::check_installed_vendor_profiles() const
std::string vendor_name = path.filename().string(); std::string vendor_name = path.filename().string();
// Remove the .json suffix. // Remove the .json suffix.
vendor_name.erase(vendor_name.size() - 5); vendor_name.erase(vendor_name.size() - 5);
if (bundles.find(vendor_name) != bundles.end())continue;
const auto is_vendor_enabled = (vendor_name == PresetBundle::ORCA_DEFAULT_BUNDLE) // always update configs from resource to vendor for ORCA_DEFAULT_BUNDLE
|| (enabled_vendors.find(vendor_name) != enabled_vendors.end());
if (enabled_config_update) { if (enabled_config_update) {
if ( fs::exists(path_in_vendor)) { if ( fs::exists(path_in_vendor)) {
if (enabled_vendors.find(vendor_name) != enabled_vendors.end()) { if (is_vendor_enabled) {
Semver resource_ver = get_version_from_json(file_path); Semver resource_ver = get_version_from_json(file_path);
Semver vendor_ver = get_version_from_json(path_in_vendor.string()); Semver vendor_ver = get_version_from_json(path_in_vendor.string());
@ -1100,7 +1104,7 @@ void PresetUpdater::priv::check_installed_vendor_profiles() const
if (!version_match || (vendor_ver < resource_ver)) { if (!version_match || (vendor_ver < resource_ver)) {
BOOST_LOG_TRIVIAL(info) << "[Orca Updater]:found vendor "<<vendor_name<<" newer version "<<resource_ver.to_string() <<" from resource, old version "<<vendor_ver.to_string(); BOOST_LOG_TRIVIAL(info) << "[Orca Updater]:found vendor "<<vendor_name<<" newer version "<<resource_ver.to_string() <<" from resource, old version "<<vendor_ver.to_string();
bundles.push_back(vendor_name); bundles.insert(vendor_name);
} }
} }
else { else {
@ -1111,18 +1115,19 @@ void PresetUpdater::priv::check_installed_vendor_profiles() const
fs::remove_all(path_of_vendor); fs::remove_all(path_of_vendor);
} }
} }
else if ((vendor_name == PresetBundle::ORCA_DEFAULT_BUNDLE) || (enabled_vendors.find(vendor_name) != enabled_vendors.end())) {//if vendor has no file, copy it from resource for ORCA_DEFAULT_BUNDLE else if (is_vendor_enabled) {
bundles.push_back(vendor_name); bundles.insert(vendor_name);
} }
} }
else if ((vendor_name == PresetBundle::ORCA_DEFAULT_BUNDLE) || (enabled_vendors.find(vendor_name) != enabled_vendors.end())) { //always update configs from resource to vendor for ORCA_DEFAULT_BUNDLE else if (is_vendor_enabled) {
bundles.push_back(vendor_name); bundles.insert(vendor_name);
} }
} }
} }
if (bundles.size() > 0) if (bundles.size() > 0) {
install_bundles_rsrc(bundles, false); install_bundles_rsrc(std::vector(bundles.begin(), bundles.end()), false);
}
} }
Updates PresetUpdater::priv::get_printer_config_updates(bool update) const Updates PresetUpdater::priv::get_printer_config_updates(bool update) const