GitHub-Proxy/OrcaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-15 21:45:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed crashes caused by failed version checks 修复:检查更新概率崩溃 (#1903)

Browse Source 
修复:检查更新概率崩溃

Co-authored-by: ZdDroid <601865048@qq.com>
This commit is contained in:
ZdDroid 2023-08-24 18:30:32 +08:00 committed by GitHub
parent ec8d348c5a
commit 761417f1bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/slic3r/GUI/GUI_App.cpp
View File

@ -4118,18 +4118,27 @@ void GUI_App::check_new_version_sf(bool show_tips, int by_user)
Http::get(version_check_url).on_error([&](std::string body, std::string error, unsigned http_status) { Http::get(version_check_url).on_error([&](std::string body, std::string error, unsigned http_status) {
(void)body; (void)body;
BOOST_LOG_TRIVIAL(error) << format("Error getting: `%1%`: HTTP %2%, %3%", BOOST_LOG_TRIVIAL(error) << format("Error getting: `%1%`: HTTP %2%, %3%",
version_check_url, "check_new_version_sf",
http_status, http_status,
error); error);
}) })
.timeout_connect(1) .timeout_connect(1)
.on_complete([&](std::string body, unsigned /* http_status */) { .on_complete([&](std::string body, unsigned http_status ) {
//Http response OK
if (http_status != 200)
return;
boost::trim(body); boost::trim(body);
// SoftFever: parse github release, ported from SS // SoftFever: parse github release, ported from SS
boost::property_tree::ptree root; boost::property_tree::ptree root;
try {
std::stringstream json_stream(body); std::stringstream json_stream(body);
boost::property_tree::read_json(json_stream, root); boost::property_tree::read_json(json_stream, root);
} catch (const boost::property_tree::ptree_error &e) {
BOOST_LOG_TRIVIAL(error) << format("Error version json: `%1%`", e.what());
return;
}
bool i_am_pre = false; bool i_am_pre = false;
//at least two number, use '.' as separator. can be followed by -Az23 for prereleased and +Az42 for metadata //at least two number, use '.' as separator. can be followed by -Az23 for prereleased and +Az42 for metadata
std::regex matcher("[0-9]+\\.[0-9]+(\\.[0-9]+)*(-[A-Za-z0-9]+)?(\\+[A-Za-z0-9]+)?"); std::regex matcher("[0-9]+\\.[0-9]+(\\.[0-9]+)*(-[A-Za-z0-9]+)?(\\+[A-Za-z0-9]+)?");