mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-08-30 05:17:19 +00:00
feature diff server update and import update on web resource
This commit is contained in:
@@ -1653,7 +1653,7 @@ void PresetUpdater::sync_web_async()
|
|||||||
GUI::wxGetApp().CallAfter([this] {
|
GUI::wxGetApp().CallAfter([this] {
|
||||||
std::string zipfilepath = this->p->cache_path.string() + "/flutter_web.zip";
|
std::string zipfilepath = this->p->cache_path.string() + "/flutter_web.zip";
|
||||||
BOOST_LOG_TRIVIAL(debug) << "[Orca Updater] sync_web_async completed, checking updates...";
|
BOOST_LOG_TRIVIAL(debug) << "[Orca Updater] sync_web_async completed, checking updates...";
|
||||||
load_lutter_web(zipfilepath);
|
load_lutter_web(zipfilepath, true);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -1737,7 +1737,7 @@ bool PresetUpdater::version_check_enabled() const
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void PresetUpdater::load_lutter_web(const std::string& zip_file)
|
void PresetUpdater::load_lutter_web(const std::string& zip_file, bool serverUpdate)
|
||||||
{
|
{
|
||||||
boost::filesystem::path temp_path = boost::filesystem::temp_directory_path() / "orca_temp_flutter_import";
|
boost::filesystem::path temp_path = boost::filesystem::temp_directory_path() / "orca_temp_flutter_import";
|
||||||
try {
|
try {
|
||||||
@@ -1854,7 +1854,7 @@ void PresetUpdater::load_lutter_web(const std::string& zip_file)
|
|||||||
}
|
}
|
||||||
|
|
||||||
wxString message;
|
wxString message;
|
||||||
if (!outdated_presets.empty()) {
|
if (!outdated_presets.empty() && !serverUpdate) {
|
||||||
message = _L("This web resouce could not be imported due to outdated versions.") + "\n";
|
message = _L("This web resouce could not be imported due to outdated versions.") + "\n";
|
||||||
for (const auto& preset : outdated_presets) {
|
for (const auto& preset : outdated_presets) {
|
||||||
message += "• " + preset + "\n";
|
message += "• " + preset + "\n";
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ public:
|
|||||||
|
|
||||||
void import_flutter_web();
|
void import_flutter_web();
|
||||||
|
|
||||||
void load_lutter_web(const std::string& zip_file);
|
void load_lutter_web(const std::string& zip_file,bool serverUpdate = false);
|
||||||
|
|
||||||
void sync_config_async();
|
void sync_config_async();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user