GitHub-Proxy/OrcaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-14 09:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

FIX: config: update config with correct logic

Browse Source 
1. remove other vendors
2. set the version to correct one
jira: STUDIO-4009

Change-Id: I804bb1d08a9d241bc323a22b0d3fb40f7c9c3c9a
This commit is contained in:
lane.wei 2023-08-15 11:08:14 +08:00
parent 630b879b28
commit 6750b5b33c
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/slic3r/Utils/PresetUpdater.cpp
View File

@ -653,14 +653,21 @@ void PresetUpdater::priv::sync_config(std::string http_url, const VendorMap vend
{ {
std::map<std::string, std::pair<Semver, std::string>> vendor_list; std::map<std::string, std::pair<Semver, std::string>> vendor_list;
std::map<std::string, std::string> vendor_descriptions; std::map<std::string, std::string> vendor_descriptions;
BOOST_LOG_TRIVIAL(info) << "[BBL Updater]: sync_config Syncing configuration cache";
if (!enabled_config_update) { return; } BOOST_LOG_TRIVIAL(info) << boost::format("[BBL Updater]: sync_config Syncing configuration enter");
BOOST_LOG_TRIVIAL(info) << boost::format("[BBL Updater]: sync_config get preferred setting version for app version %1%, http_url: %2%")%SLIC3R_APP_NAME%http_url; if (!enabled_config_update) { return; }
BOOST_LOG_TRIVIAL(info) << boost::format("[BBL Updater]: sync_config get preferred setting version for app version %1%, http_url: %2%")%SLIC3R_VERSION%http_url;
std::string app_version = SLIC3R_VERSION;
std::string query_version = app_version.substr(0, 6) + "00.00";
std::string query_params = "?"; std::string query_params = "?";
bool first = true; std::string vendor_string = PresetBundle::BBL_BUNDLE;
boost::to_lower(vendor_string);
std::string query_vendor = (boost::format("slicer/settings/%1%=%2%")%vendor_string % query_version ).str();
query_params += query_vendor;
/*bool first = true;
for (auto vendor_it :vendors) { for (auto vendor_it :vendors) {
if (cancel) { return; } if (cancel) { return; }
@ -675,7 +682,7 @@ void PresetUpdater::priv::sync_config(std::string http_url, const VendorMap vend
if (!first) if (!first)
query_params += "&"; query_params += "&";
query_params += query_vendor; query_params += query_vendor;
} }*/
std::string url = http_url; std::string url = http_url;
url += query_params; url += query_params;