WIP: Bonjour

1 files changed, 63 insertions, 63 deletions

diff --git a/xs/src/slic3r/Utils/OctoPrint.cpp b/xs/src/slic3r/Utils/OctoPrint.cpp
index 019a4e238..58530833b 100644
--- a/xs/src/slic3r/Utils/OctoPrint.cpp
+++ b/xs/src/slic3r/Utils/OctoPrint.cpp
@@ -15,90 +15,90 @@ namespace Slic3r {
 
 
 OctoPrint::OctoPrint(DynamicPrintConfig *config) :
-    host(config->opt_string("octoprint_host")),
-    apikey(config->opt_string("octoprint_apikey")),
-    cafile(config->opt_string("octoprint_cafile"))
+	host(config->opt_string("octoprint_host")),
+	apikey(config->opt_string("octoprint_apikey")),
+	cafile(config->opt_string("octoprint_cafile"))
 {}
 
 std::string  OctoPrint::test() const
 {
-    // Since the request is performed synchronously here,
-    // it is ok to refer to `res` from within the closure
-    std::string res;
-
-    auto http = Http::get(std::move(make_url("api/version")));
-    set_auth(http);
-    http.on_error([&](std::string, std::string error, unsigned status) {
-            res = format_error(error, status);
-        })
-        .perform_sync();
-
-    return res;
+	// Since the request is performed synchronously here,
+	// it is ok to refer to `res` from within the closure
+	std::string res;
+
+	auto http = Http::get(std::move(make_url("api/version")));
+	set_auth(http);
+	http.on_error([&](std::string, std::string error, unsigned status) {
+			res = format_error(error, status);
+		})
+		.perform_sync();
+
+	return res;
 }
 
 void OctoPrint::send_gcode(int windowId, int completeEvt, int errorEvt, const std::string &filename, bool print) const
 {
-    auto http = Http::post(std::move(make_url("api/files/local")));
-    set_auth(http);
-    http.form_add("print", print ? "true" : "false")
-        .form_add_file("file", filename)
-        .on_complete([=](std::string body, unsigned status) {
-            wxWindow *window = GUI::get_widget_by_id(windowId);
-            wxCommandEvent* evt = new wxCommandEvent(completeEvt);
-            evt->SetString("G-code file successfully uploaded to the OctoPrint server");
-            evt->SetInt(100);
-            wxQueueEvent(window, evt);
-        })
-        .on_error([=](std::string body, std::string error, unsigned status) {
-            wxWindow *window = GUI::get_widget_by_id(windowId);
-
-            wxCommandEvent* evt_complete = new wxCommandEvent(completeEvt);
-            evt_complete->SetInt(100);
-            wxQueueEvent(window, evt_complete);
-
-            wxCommandEvent* evt_error = new wxCommandEvent(errorEvt);
-            evt_error->SetString(wxString::Format("Error while uploading to the OctoPrint server: %s", format_error(error, status)));
-            wxQueueEvent(window, evt_error);
-        })
-        .perform();
+	auto http = Http::post(std::move(make_url("api/files/local")));
+	set_auth(http);
+	http.form_add("print", print ? "true" : "false")
+		.form_add_file("file", filename)
+		.on_complete([=](std::string body, unsigned status) {
+			wxWindow *window = GUI::get_widget_by_id(windowId);
+			wxCommandEvent* evt = new wxCommandEvent(completeEvt);
+			evt->SetString("G-code file successfully uploaded to the OctoPrint server");
+			evt->SetInt(100);
+			wxQueueEvent(window, evt);
+		})
+		.on_error([=](std::string body, std::string error, unsigned status) {
+			wxWindow *window = GUI::get_widget_by_id(windowId);
+
+			wxCommandEvent* evt_complete = new wxCommandEvent(completeEvt);
+			evt_complete->SetInt(100);
+			wxQueueEvent(window, evt_complete);
+
+			wxCommandEvent* evt_error = new wxCommandEvent(errorEvt);
+			evt_error->SetString(wxString::Format("Error while uploading to the OctoPrint server: %s", format_error(error, status)));
+			wxQueueEvent(window, evt_error);
+		})
+		.perform();
 }
 
 void OctoPrint::set_auth(Http &http) const
 {
-    http.header("X-Api-Key", apikey);
+	http.header("X-Api-Key", apikey);
 
-    if (! cafile.empty()) {
-        http.ca_file(cafile);
-    }
+	if (! cafile.empty()) {
+		http.ca_file(cafile);
+	}
 }
 
 std::string OctoPrint::make_url(const std::string &path) const
 {
-    if (host.find("http://") == 0 || host.find("https://") == 0) {
-        if (host.back() == '/') {
-            return std::move((boost::format("%1%%2%") % host % path).str());
-        } else {
-            return std::move((boost::format("%1%/%2%") % host % path).str());
-        }
-    } else {
-        return std::move((boost::format("http://%1%/%2%") % host % path).str());
-    }
+	if (host.find("http://") == 0 || host.find("https://") == 0) {
+		if (host.back() == '/') {
+			return std::move((boost::format("%1%%2%") % host % path).str());
+		} else {
+			return std::move((boost::format("%1%/%2%") % host % path).str());
+		}
+	} else {
+		return std::move((boost::format("http://%1%/%2%") % host % path).str());
+	}
 }
 
 std::string OctoPrint::format_error(std::string error, unsigned status)
 {
-    if (status != 0) {
-        std::string res{"HTTP "};
-        res.append(std::to_string(status));
-
-        if (status == 401) {
-            res.append(": Invalid API key");
-        }
-
-        return std::move(res);
-    } else {
-        return std::move(error);
-    }
+	if (status != 0) {
+		std::string res{"HTTP "};
+		res.append(std::to_string(status));
+
+		if (status == 401) {
+			res.append(": Invalid API key");
+		}
+
+		return std::move(res);
+	} else {
+		return std::move(error);
+	}
 }