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

Print host bugfixes / refactoring

Browse source
This commit is contained in:
Vojtech Kral 2018-08-21 11:10:32 +02:00
parent ee9f7eaef6
commit 0c984c7584
20 changed files with 61 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -62,7 +62,7 @@ struct Http::priv
static size_t form_file_read_cb(char *buffer, size_t size, size_t nitems, void *userp);
void form_add_file(const char *name, const fs::path &path, const char* filename);
void postfield_add_file(const fs::path &path);
void set_post_body(const fs::path &path);
std::string curl_error(CURLcode curlcode);
std::string body_size_error();
@ -190,14 +190,11 @@ void Http::priv::form_add_file(const char *name, const fs::path &path, const cha
}
}
void Http::priv::postfield_add_file(const fs::path &path)
void Http::priv::set_post_body(const fs::path &path)
{
std::ifstream f (path.string());
std::string file_content { std::istreambuf_iterator<char>(f), std::istreambuf_iterator<char>() };
if (!postfields.empty()) {
postfields += "&";
}
postfields += file_content;
std::ifstream file(path.string());
std::string file_content { std::istreambuf_iterator<char>(file), std::istreambuf_iterator<char>() };
postfields = file_content;
}
std::string Http::priv::curl_error(CURLcode curlcode)
@ -356,9 +353,9 @@ Http& Http::form_add_file(const std::string &name, const fs::path &path, const s
return *this;
}
Http& Http::postfield_add_file(const fs::path &path)
Http& Http::set_post_body(const fs::path &path)
{
if (p) { p->postfield_add_file(path);}
if (p) { p->set_post_body(path);}
return *this;
}