amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fixed a regression that checking new version didn't work

Browse source 
Fixed #2622
This commit is contained in:
SoftFever 2023-11-07 21:32:36 +08:00
parent e001b66192
commit 42f8efc0d8
1 changed files with 27 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/slic3r/GUI/GUI_App.cpp
View file

@ -2477,7 +2477,6 @@ bool GUI_App::on_init_inner()
#endif // __WXMSW__ #endif // __WXMSW__
preset_updater = new PresetUpdater(); preset_updater = new PresetUpdater();
#if orca_todo
Bind(EVT_SLIC3R_VERSION_ONLINE, [this](const wxCommandEvent& evt) { Bind(EVT_SLIC3R_VERSION_ONLINE, [this](const wxCommandEvent& evt) {
if (this->plater_ != nullptr) { if (this->plater_ != nullptr) {
// this->plater_->get_notification_manager()->push_notification(NotificationType::NewAppAvailable); // this->plater_->get_notification_manager()->push_notification(NotificationType::NewAppAvailable);
@ -2566,7 +2565,6 @@ bool GUI_App::on_init_inner()
}); });
dlg.ShowModal(); dlg.ShowModal();
}); });
#endif
} }
else { else {
#ifdef __WXMSW__ #ifdef __WXMSW__
@ -4266,7 +4264,7 @@ void GUI_App::check_new_version_sf(bool show_tips, int by_user)
error); error);
}) })
.timeout_connect(1) .timeout_connect(1)
.on_complete([&](std::string body, unsigned http_status) { .on_complete([this,by_user](std::string body, unsigned http_status) {
// Http response OK // Http response OK
if (http_status != 200) if (http_status != 200)
return; return;
@ -4292,30 +4290,28 @@ void GUI_App::check_new_version_sf(bool show_tips, int by_user)
std::string best_release_content; std::string best_release_content;
std::string best_pre_content; std::string best_pre_content;
const std::regex reg_num("([0-9]+)"); const std::regex reg_num("([0-9]+)");
for (auto json_version : root) { std::string tag = root.get<std::string>("tag_name");
std::string tag = json_version.second.get<std::string>("tag_name"); if (tag[0] == 'v')
if (tag[0] == 'v') tag.erase(0, 1);
tag.erase(0, 1); for (std::regex_iterator it = std::sregex_iterator(tag.begin(), tag.end(), reg_num);
for (std::regex_iterator it = std::sregex_iterator(tag.begin(), tag.end(), reg_num); it != std::sregex_iterator(); ++it) {
it != std::sregex_iterator(); ++it) { }
} Semver tag_version = get_version(tag, matcher);
Semver tag_version = get_version(tag, matcher); if (current_version == tag_version)
if (current_version == tag_version) i_am_pre = root.get<bool>("prerelease");
i_am_pre = json_version.second.get<bool>("prerelease"); if (root.get<bool>("prerelease")) {
if (json_version.second.get<bool>("prerelease")) { if (best_pre < tag_version) {
if (best_pre < tag_version) { best_pre = tag_version;
best_pre = tag_version; best_pre_url = root.get<std::string>("html_url");
best_pre_url = json_version.second.get<std::string>("html_url"); best_pre_content = root.get<std::string>("body");
best_pre_content = json_version.second.get<std::string>("body"); best_pre.set_prerelease("Preview");
best_pre.set_prerelease("Preview"); }
} } else {
} else { if (best_release < tag_version) {
if (best_release < tag_version) { best_release = tag_version;
best_release = tag_version; best_release_url = root.get<std::string>("html_url");
best_release_url = json_version.second.get<std::string>("html_url"); best_release_content = root.get<std::string>("body");
best_release_content = json_version.second.get<std::string>("body"); }
}
}
} }
// if release is more recent than beta, use release anyway // if release is more recent than beta, use release anyway
@ -4325,8 +4321,11 @@ void GUI_App::check_new_version_sf(bool show_tips, int by_user)
best_pre_content = best_release_content; best_pre_content = best_release_content;
} }
// if we're the most recent, don't do anything // if we're the most recent, don't do anything
if ((i_am_pre ? best_pre : best_release) <= current_version) if ((i_am_pre ? best_pre : best_release) <= current_version) {
if (by_user != 0)
this->no_new_version();
return; return;
}
// BOOST_LOG_TRIVIAL(info) << format("Got %1% online version: `%2%`. Sending to GUI thread...", // BOOST_LOG_TRIVIAL(info) << format("Got %1% online version: `%2%`. Sending to GUI thread...",
// SLIC3R_APP_NAME, i_am_pre ? best_pre.to_string(): best_release.to_string()); // SLIC3R_APP_NAME, i_am_pre ? best_pre.to_string(): best_release.to_string());