juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-10-02 13:20:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove unrelated moonraker.cpp changes

Browse Source
This commit is contained in:
Ian Chua
2026-10-01 13:55:37 +08:00
parent 4c6f93400c
commit 0a0f050479
1 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/slic3r/Utils/Moonraker.cpp
+5 -20
View File
@@ -38,25 +38,12 @@ wxString Moonraker::get_test_failed_msg(wxString &msg) const
std::string Moonraker::make_url(const std::string &path) const std::string Moonraker::make_url(const std::string &path) const
{ {
const bool has_scheme = m_host.find("http://") == 0 || m_host.find("https://") == 0; if (m_host.find("http://") == 0 || m_host.find("https://") == 0) {
const bool use_ssl = m_host.find("https://") == 0; if (m_host.back() == '/')
std::string base = has_scheme ? m_host : ("http://" + m_host); return (boost::format("%1%%2%") % m_host % path).str();
return (boost::format("%1%/%2%") % m_host % path).str();
const size_t authority_start = base.find("://") + 3;
const size_t authority_end = base.find('/', authority_start);
const std::string authority = base.substr(authority_start, authority_end - authority_start);
const size_t closing_bracket = authority.rfind(']');
const bool has_port = closing_bracket != std::string::npos
? closing_bracket + 1 < authority.size() && authority[closing_bracket + 1] == ':'
: authority.find(':') != std::string::npos;
if (!has_port) {
const std::string default_port = use_ssl ? ":7130" : ":7125";
base.insert(authority_end == std::string::npos ? base.size() : authority_end, default_port);
} }
return (boost::format("http://%1%/%2%") % m_host % path).str();
if (base.back() == '/')
return (boost::format("%1%%2%") % base % path).str();
return (boost::format("%1%/%2%") % base % path).str();
} }
void Moonraker::set_auth(Http &http) const void Moonraker::set_auth(Http &http) const
@@ -66,8 +53,6 @@ void Moonraker::set_auth(Http &http) const
// filled the user/password fields — those are PrusaLink/OctoPrint conventions. // filled the user/password fields — those are PrusaLink/OctoPrint conventions.
if (!m_apikey.empty()) if (!m_apikey.empty())
http.header("X-Api-Key", m_apikey); http.header("X-Api-Key", m_apikey);
const bool use_ssl = m_host.find("https://") == 0;
http.tls_verify(use_ssl);
if (!m_cafile.empty()) if (!m_cafile.empty())
http.ca_file(m_cafile); http.ca_file(m_cafile);
} }