juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-08-06 01:27:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Store network plug-in identity by AA.BB.CC series

Browse Source 
The stored plug-in identity is now the AA.BB.CC series (matching BambuStudio)
rather than the full build version, so the meaningless 4th build digit stops
driving config, the whitelist, filenames, and the version selector. This fixes
the macOS "can't switch to an older build" bug: the cloud endpoint is
series-keyed and only ever serves a series' newest build, so downgrade-by-
download was impossible and the download silently adopted the latest.

A startup migration normalizes an existing full-version config and file name to
the series form with no re-download, the loader resolves a bare series to the
newest same-series build on disk, and user-provided custom-named plug-ins
(libbambu_networking_02.08.01_custom.*) are still enumerated and loaded.
This commit is contained in:
SoftFever
2026-07-19 00:26:05 +08:00
parent 2804e06cf2
commit afb4505ea7
7 changed files with 290 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
src/slic3r/GUI/Preferences.cpp
View File

@@ -1273,55 +1273,79 @@ wxBoxSizer *PreferencesDialog::create_item_network_plugin_version(wxString title
m_sizer->Add(m_network_version_combo, 0, wxALIGN_CENTER);
m_network_version_combo->GetDropDown().Bind(wxEVT_COMBOBOX, [this](wxCommandEvent& e) {
e.Skip(); // order-independent flag read after this handler returns; every path just returns
int selection = e.GetSelection();
if (selection >= 0 && selection < (int)m_available_versions.size()) {
const auto& selected_ver = m_available_versions[selection];
std::string new_version = selected_ver.version;
std::string old_version = app_config->get_network_plugin_version();
if (old_version.empty()) {
old_version = get_latest_network_version();
}
if (selection < 0 || selection >= (int) m_available_versions.size())
return;
app_config->set_network_plugin_version(new_version);
app_config->save();
const auto& selected_ver = m_available_versions[selection];
const std::string new_version = selected_ver.version;
std::string old_version = app_config->get_network_plugin_version();
if (old_version.empty())
old_version = get_latest_network_version();
if (new_version != old_version) {
BOOST_LOG_TRIVIAL(info) << "Network plugin version changed from " << old_version << " to " << new_version;
if (!selected_ver.warning.empty()) {
MessageDialog warn_dlg(this, wxString::FromUTF8(selected_ver.warning), _L("Warning"), wxOK | wxCANCEL | wxICON_WARNING);
if (warn_dlg.ShowModal() != wxID_OK) {
app_config->set_network_plugin_version(old_version);
app_config->save();
e.Skip();
return;
}
// Move the combo back to the row for `version`, so the UI never shows a build other
// than the one actually configured/loaded (e.g. after a declined or refused switch).
auto reselect = [this](const std::string& version) {
for (size_t i = 0; i < m_available_versions.size(); ++i)
if (m_available_versions[i].version == version) {
m_network_version_combo->SetSelection((int) i);
break;
}
};
// Check if the selected version already exists on disk
if (Slic3r::NetworkAgent::versioned_library_exists(new_version)) {
BOOST_LOG_TRIVIAL(info) << "Version " << new_version << " already exists on disk, triggering hot reload";
if (wxGetApp().hot_reload_network_plugin()) {
MessageDialog dlg(this, _L("Network plug-in switched successfully."), _L("Success"), wxOK | wxICON_INFORMATION);
dlg.ShowModal();
} else {
MessageDialog dlg(this, _L("Failed to load network plug-in. Please restart the application."), _L("Restart Required"), wxOK | wxICON_WARNING);
dlg.ShowModal();
}
} else {
wxString msg = wxString::Format(
_L("You've selected network plug-in version %s.\n\nWould you like to download and install this version now?\n\nNote: The application may need to restart after installation."),
wxString::FromUTF8(new_version));
if (new_version == old_version)
return;
MessageDialog dlg(this, msg, _L("Download Network Plug-in"), wxYES_NO | wxICON_QUESTION);
if (dlg.ShowModal() == wxID_YES) {
DownloadProgressDialog progress_dlg(_L("Downloading Network Plug-in"));
progress_dlg.ShowModal();
}
}
BOOST_LOG_TRIVIAL(info) << "Network plugin version selection changed from " << old_version << " to " << new_version;
if (!selected_ver.warning.empty()) {
MessageDialog warn_dlg(this, wxString::FromUTF8(selected_ver.warning), _L("Warning"), wxOK | wxCANCEL | wxICON_WARNING);
if (warn_dlg.ShowModal() != wxID_OK) {
reselect(old_version);
return;
}
}
e.Skip();
// A build already present on disk loads directly with a hot reload - on any platform
// and across series (legacy <-> modern). Only claim success once the build that
// actually loaded is the one that was requested.
if (Slic3r::NetworkAgent::versioned_library_exists(new_version)) {
app_config->set_network_plugin_version(new_version);
app_config->save();
BOOST_LOG_TRIVIAL(info) << "Version " << new_version << " already exists on disk, triggering hot reload";
// Claim success only once the series that actually loaded is the one requested - the
// loaded plug-in reports its full build (02.08.01.53) while the requested identity is
// the series (02.08.01), so compare series, not the raw string.
if (wxGetApp().hot_reload_network_plugin() &&
network_plugin_series(Slic3r::NetworkAgent::get_version()) == network_plugin_series(new_version)) {
MessageDialog dlg(this, _L("Network plug-in switched successfully."), _L("Success"), wxOK | wxICON_INFORMATION);
dlg.ShowModal();
} else {
MessageDialog dlg(this, _L("Failed to load network plug-in. Please restart the application."), _L("Restart Required"), wxOK | wxICON_WARNING);
dlg.ShowModal();
reselect(app_config->get_network_plugin_version());
}
return;
}
// Not on disk: offer to download it. The endpoint is series-keyed and serves that series'
// newest build. (A same-series custom build is only ever listed when its file is on disk,
// so it takes the hot-reload branch above; the only not-on-disk selectable is a series or
// legacy entry that genuinely needs fetching.)
wxString msg = wxString::Format(
_L("You've selected network plug-in version %s.\n\nWould you like to download and install this version now?\n\nNote: The application may need to restart after installation."),
wxString::FromUTF8(new_version));
MessageDialog dlg(this, msg, _L("Download Network Plug-in"), wxYES_NO | wxICON_QUESTION);
if (dlg.ShowModal() == wxID_YES) {
app_config->set_network_plugin_version(new_version);
app_config->save();
DownloadProgressDialog progress_dlg(_L("Downloading Network Plug-in"));
progress_dlg.ShowModal();
reselect(app_config->get_network_plugin_version());
} else {
reselect(old_version);
}
});
auto reload_btn = new Button(m_parent, wxEmptyString, "refresh", 0, 16);