3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 17:27:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Octoprint: Add a dialog for setting the filename/path

Browse source 
and a "print now" option
cf. #880, #245, #55, #87
This commit is contained in:
Vojtech Kral 2018-05-23 12:47:39 +02:00 • committed by bubnikv
parent a3a8333d20
commit 1ba81655e2
6 changed files with 140 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

39
xs/src/slic3r/Utils/Http.cpp
View file

@ -50,6 +50,9 @@ struct Http::priv
static size_t writecb(void *data, size_t size, size_t nmemb, void *userp);
static int xfercb(void *userp, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow);
static int xfercb_legacy(void *userp, double dltotal, double dlnow, double ultotal, double ulnow);
void form_add_file(const char *name, const char *path, const char* filename);
std::string curl_error(CURLcode curlcode);
std::string body_size_error();
void http_perform();
@ -135,6 +138,26 @@ int Http::priv::xfercb_legacy(void *userp, double dltotal, double dlnow, double
return xfercb(userp, dltotal, dlnow, ultotal, ulnow);
}
void Http::priv::form_add_file(const char *name, const char *path, const char* filename)
{
if (filename != nullptr) {
::curl_formadd(&form, &form_end,
CURLFORM_COPYNAME, name,
CURLFORM_FILE, path,
CURLFORM_FILENAME, filename,
CURLFORM_CONTENTTYPE, "application/octet-stream",
CURLFORM_END
);
} else {
::curl_formadd(&form, &form_end,
CURLFORM_COPYNAME, name,
CURLFORM_FILE, path,
CURLFORM_CONTENTTYPE, "application/octet-stream",
CURLFORM_END
);
}
}
std::string Http::priv::curl_error(CURLcode curlcode)
{
return (boost::format("%1% (%2%)")
@ -265,17 +288,15 @@ Http& Http::form_add(const std::string &name, const std::string &contents)
return *this;
}
Http& Http::form_add_file(const std::string &name, const std::string &filename)
Http& Http::form_add_file(const std::string &name, const std::string &path)
{
if (p) {
::curl_formadd(&p->form, &p->form_end,
CURLFORM_COPYNAME, name.c_str(),
CURLFORM_FILE, filename.c_str(),
CURLFORM_CONTENTTYPE, "application/octet-stream",
CURLFORM_END
);
}
if (p) { p->form_add_file(name.c_str(), path.c_str(), nullptr); }
return *this;
}
Http& Http::form_add_file(const std::string &name, const std::string &path, const std::string &filename)
{
if (p) { p->form_add_file(name.c_str(), path.c_str(), filename.c_str()); }
return *this;
}