lib/cpp-httplib
1
0
Fork 0
mirror of synced 2025-04-20 11:47:43 +03:00
Code

Merge pull request #23 from underscorediscovery/progress-callback

Browse Source 
add progress callback for http clients
This commit is contained in:
yhirose 2017-11-24 20:37:31 -05:00 committed by GitHub
commit ad5fba498e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
httplib.h
View File

@ -70,6 +70,7 @@ namespace httplib
typedef std::map<std::string, std::string> Map; typedef std::map<std::string, std::string> Map;
typedef std::multimap<std::string, std::string> MultiMap; typedef std::multimap<std::string, std::string> MultiMap;
typedef std::smatch Match; typedef std::smatch Match;
typedef std::function<void (int64_t current, int64_t total)> Progress;
struct Request { struct Request {
std::string method; std::string method;
@ -78,6 +79,7 @@ struct Request {
std::string body; std::string body;
Map params; Map params;
Match matches; Match matches;
Progress progress;
bool has_header(const char* key) const; bool has_header(const char* key) const;
std::string get_header_value(const char* key) const; std::string get_header_value(const char* key) const;
@ -169,7 +171,7 @@ public:
Client(const char* host, int port); Client(const char* host, int port);
virtual ~Client(); virtual ~Client();
std::shared_ptr<Response> get(const char* path); std::shared_ptr<Response> get(const char* path, Progress callback = [](int64_t,int64_t){});
std::shared_ptr<Response> head(const char* path); std::shared_ptr<Response> head(const char* path);
std::shared_ptr<Response> post(const char* path, const std::string& body, const char* content_type); std::shared_ptr<Response> post(const char* path, const std::string& body, const char* content_type);
std::shared_ptr<Response> post(const char* path, const Map& params); std::shared_ptr<Response> post(const char* path, const Map& params);
@ -511,7 +513,7 @@ inline bool read_headers(Stream& strm, MultiMap& headers)
} }
template <typename T> template <typename T>
bool read_content(Stream& strm, T& x, bool allow_no_content_length) bool read_content(Stream& strm, T& x, bool allow_no_content_length, Progress progress = [](int64_t,int64_t){})
{ {
auto len = get_header_value_int(x.headers, "Content-Length", 0); auto len = get_header_value_int(x.headers, "Content-Length", 0);
if (len) { if (len) {
@ -523,6 +525,7 @@ bool read_content(Stream& strm, T& x, bool allow_no_content_length)
return false; return false;
} }
r += r_incr; r += r_incr;
progress(r, len);
} }
} else if (allow_no_content_length) { } else if (allow_no_content_length) {
for (;;) { for (;;) {
@ -1087,7 +1090,7 @@ inline bool Client::process_request(Stream& strm, const Request& req, Response&
return false; return false;
} }
if (req.method != "HEAD") { if (req.method != "HEAD") {
if (!detail::read_content(strm, res, true)) { if (!detail::read_content(strm, res, true, req.progress)) {
return false; return false;
} }
} }
@ -1109,11 +1112,12 @@ inline void Client::add_default_headers(Request& req)
req.set_header("User-Agent", "cpp-httplib/0.1"); req.set_header("User-Agent", "cpp-httplib/0.1");
} }
inline std::shared_ptr<Response> Client::get(const char* path) inline std::shared_ptr<Response> Client::get(const char* path, Progress callback)
{ {
Request req; Request req;
req.method = "GET"; req.method = "GET";
req.path = path; req.path = path;
req.progress = callback;
add_default_headers(req); add_default_headers(req);
auto res = std::make_shared<Response>(); auto res = std::make_shared<Response>();