juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-31 14:52:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "feat: draft endpoint for fetching new vendor profiles"

Browse Source 
This reverts commit e7936297a1.
This commit is contained in:
Ian Chua
2026-07-24 12:49:23 +08:00
parent 7ad7f8b65b
commit 3f0ef7e6d9
1 changed files with 0 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,15 +1,12 @@
#include "PresetUpdater.hpp" #include "PresetUpdater.hpp"
#include <algorithm> #include <algorithm>
#include <boost/filesystem/directory.hpp>
#include <boost/filesystem/operations.hpp> #include <boost/filesystem/operations.hpp>
#include <boost/filesystem/path.hpp>
#include <boost/nowide/fstream.hpp> #include <boost/nowide/fstream.hpp>
#include <functional> #include <functional>
#include <atomic> #include <atomic>
#include <mutex> #include <mutex>
#include <set> #include <set>
#include <string>
#include <thread> #include <thread>
#include <unordered_map> #include <unordered_map>
#include <ostream> #include <ostream>
@@ -22,7 +19,6 @@
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <boost/log/trivial.hpp> #include <boost/log/trivial.hpp>
#include <vector>
#include <wx/app.h> #include <wx/app.h>
#include <wx/msgdlg.h> #include <wx/msgdlg.h>
@@ -233,8 +229,6 @@ struct PresetUpdater::priv
void parse_version_string(const std::string& body) const; void parse_version_string(const std::string& body) const;
void sync_resources(std::string http_url, std::map<std::string, Resource> &resources, bool check_patch = false, std::string current_version="", std::string changelog_file=""); void sync_resources(std::string http_url, std::map<std::string, Resource> &resources, bool check_patch = false, std::string current_version="", std::string changelog_file="");
void sync_vendor_config(const std::string& vendor_id); void sync_vendor_config(const std::string& vendor_id);
std::vector<std::string> check_new_vendors();
std::set<std::string> get_all_system_vendors();
void sync_tooltip(std::string http_url, std::string language); void sync_tooltip(std::string http_url, std::string language);
void sync_plugins(std::string http_url, std::string plugin_version); void sync_plugins(std::string http_url, std::string plugin_version);
void sync_printer_config(std::string http_url); void sync_printer_config(std::string http_url);
@@ -1410,76 +1404,6 @@ void PresetUpdater::check_vendor_update(const std::string& vendor_id)
}); });
} }
// TBD the actual shape of the reponse before using this.
std::vector<std::string> PresetUpdater::priv::check_new_vendors()
{
AppConfig* app_config = GUI::wxGetApp().app_config;
std::string url = app_config->profile_update_url() + "/new?orca_version=" + Http::url_encode(SoftFever_VERSION);
auto check_cancel = [this](Http::Progress, bool& cancel_http) {
if (cancel || vendor_check_cancel)
cancel_http = true;
};
std::vector<std::string> vendor_ids;
const auto system_vendors = get_all_system_vendors();
const std::vector<std::string> system_vendor_list(system_vendors.begin(), system_vendors.end());
auto post = Http::post(url);
post.timeout_connect(5);
post.on_progress(check_cancel);
post.on_error([](std::string body, std::string error, unsigned http_status) {
BOOST_LOG_TRIVIAL(warning) << "[Orca Updater] new vendor check HTTP error: " << error;
})
.on_complete([&vendor_ids](std::string body, unsigned http_status) {
if (http_status != 200)
return;
try {
json j = json::parse(body);
if (j.is_array()) {
vendor_ids = j.get<std::vector<std::string>>();
}
} catch (const std::exception& e) {
BOOST_LOG_TRIVIAL(warning) << "[Orca Updater] vendor check JSON parse failed: " << e.what();
}
});
post.set_post_body(json(system_vendor_list).dump());
post.perform_sync();
return vendor_ids;
}
std::set<std::string> PresetUpdater::priv::get_all_system_vendors() {
std::set<std::string> vendors;
PresetBundle temp_bundle;
boost::filesystem::path dir = boost::filesystem::path(resources_dir()) / "profiles";
for (auto& entry : boost::filesystem::directory_iterator(dir)) {
if (!Slic3r::is_json_file(entry.path().string()))
continue;
std::string vendor_name = entry.path().filename().stem().string();
temp_bundle.load_vendor_configs_from_json(dir.string(), vendor_name, PresetBundle::LoadSystem,
ForwardCompatibilitySubstitutionRule::EnableSystemSilent);
}
for (auto& preset : temp_bundle.printers)
if (preset.is_system)
vendors.insert(preset.vendor->name);
for (auto& preset : temp_bundle.prints)
if (preset.is_system)
vendors.insert(preset.vendor->name);
for (auto& preset : temp_bundle.filaments)
if (preset.is_system)
vendors.insert(preset.vendor->name);
return vendors;
}
void PresetUpdater::slic3r_update_notify() void PresetUpdater::slic3r_update_notify()
{ {
if (! p->enabled_version_check) if (! p->enabled_version_check)