Syping/dtranslatebot
1
0
Fork 0
mirror of https://github.com/Syping/dtranslatebot.git synced 2026-04-21 14:40:41 +02:00
Code Issues Projects Releases Packages Wiki Activity

http_response: add content_type support

Browse source
This commit is contained in:
Syping 2026-04-05 19:58:27 +02:00
parent 481a2a8357
commit b27d55b4bf
3 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/core/http_request.cpp
View file

@ -19,6 +19,7 @@
#include <cstring> #include <cstring>
#include "curl_exception.h" #include "curl_exception.h"
#include "http_request.h" #include "http_request.h"
using namespace bot::exception;
using namespace bot::http; using namespace bot::http;
http_request::http_request() { http_request::http_request() {
@ -37,10 +38,10 @@ const http_response http_request::get(const std::string &url, const http_headers
curl_easy_setopt(instance, CURLOPT_ERRORBUFFER, error); curl_easy_setopt(instance, CURLOPT_ERRORBUFFER, error);
CURLcode result = curl_easy_perform(instance); CURLcode result = curl_easy_perform(instance);
if (result == CURLE_OK) if (result == CURLE_OK)
curl_easy_getinfo(instance, CURLINFO_RESPONSE_CODE, &response.status); process_response(instance, response);
curl_easy_reset(instance); curl_easy_reset(instance);
return result == CURLE_OK ? return result == CURLE_OK ?
response : throw bot::exception::curl_exception(error, result); response : throw curl_exception(error, result);
} }
const http_response http_request::post(const std::string &url, const std::string &content, const http_headers &headers) { const http_response http_request::post(const std::string &url, const std::string &content, const http_headers &headers) {
@ -55,10 +56,10 @@ const http_response http_request::post(const std::string &url, const std::string
curl_easy_setopt(instance, CURLOPT_ERRORBUFFER, error); curl_easy_setopt(instance, CURLOPT_ERRORBUFFER, error);
CURLcode result = curl_easy_perform(instance); CURLcode result = curl_easy_perform(instance);
if (result == CURLE_OK) if (result == CURLE_OK)
curl_easy_getinfo(instance, CURLINFO_RESPONSE_CODE, &response.status); process_response(instance, response);
curl_easy_reset(instance); curl_easy_reset(instance);
return result == CURLE_OK ? return result == CURLE_OK ?
response : throw bot::exception::curl_exception(error, result); response : throw curl_exception(error, result);
} }
std::string http_request::legacy_url(const std::string &hostname, uint16_t port, const std::string &url, bool tls) { std::string http_request::legacy_url(const std::string &hostname, uint16_t port, const std::string &url, bool tls) {
@ -69,7 +70,15 @@ http_request::~http_request() {
curl_easy_cleanup(instance); curl_easy_cleanup(instance);
} }
size_t http_request::writer(char *source, size_t size, size_t nmemb, std::string *target) { void http_request::process_response(CURL* instance, http_response &response) {
curl_easy_getinfo(instance, CURLINFO_RESPONSE_CODE, &response.status);
curl_header* content_type;
CURLHcode result = curl_easy_header(instance, "Content-Type", 0, CURLH_HEADER, -1, &content_type);
if (result == CURLHE_OK)
response.content_type = content_type->value;
}
size_t http_request::writer(char* source, size_t size, size_t nmemb, std::string* target) {
if (target == nullptr) if (target == nullptr)
return 0; return 0;
size_t write_size = size * nmemb; size_t write_size = size * nmemb;

5
src/core/http_request.h
View file

@ -36,8 +36,9 @@ namespace bot {
static std::string legacy_url(const std::string &hostname, uint16_t port, const std::string &url, bool tls); static std::string legacy_url(const std::string &hostname, uint16_t port, const std::string &url, bool tls);
private: private:
static size_t writer(char *source, size_t size, size_t nmemb, std::string *target); static void process_response(CURL* instance, http_response &response);
CURL *instance; static size_t writer(char* source, size_t size, size_t nmemb, std::string* target);
CURL* instance;
}; };
} }
} }

1
src/core/http_response.h
View file

@ -24,6 +24,7 @@ namespace bot {
namespace http { namespace http {
struct http_response { struct http_response {
std::string content; std::string content;
std::string content_type;
long status; long status;
}; };
} }