From 8837de4783b25255b6a1799be210c9e580dd2d4f Mon Sep 17 00:00:00 2001 From: Aotrix <9aotrix@protonmail.com> Date: Sat, 18 Apr 2026 22:20:26 +0200 Subject: Replace operator() with text method --- battleNetApi/src/hearthstoneApi.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'battleNetApi/src/hearthstoneApi.cpp') diff --git a/battleNetApi/src/hearthstoneApi.cpp b/battleNetApi/src/hearthstoneApi.cpp index 32c3164..d6becc1 100644 --- a/battleNetApi/src/hearthstoneApi.cpp +++ b/battleNetApi/src/hearthstoneApi.cpp @@ -21,11 +21,11 @@ size_t HearthstoneApi::curlCallbackStringOutput(void *iContent, size_t iSize, si return kNewLength; } -json HearthstoneApi::makeApiRequest(const std::string &iUrl, const std::string &iTokenText) { +json HearthstoneApi::makeApiRequest(const ApiUrl &iApiUrl, const std::string &iTokenText) { CURL *curl = curl_easy_init(); std::string aRequestOutput; if (curl) { - curl_easy_setopt(curl, CURLOPT_URL, iUrl.c_str()); + curl_easy_setopt(curl, CURLOPT_URL, iApiUrl.text().c_str()); curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L); curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L); curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curlCallbackStringOutput); @@ -40,6 +40,12 @@ json HearthstoneApi::makeApiRequest(const std::string &iUrl, const std::string & return aOutputJson; } +std::vector HearthstoneApi::makeApiRequest(const std::vector &iApiUrls, const std::string &iTokenText) { + std::vector aApiUrls(iApiUrls.size()); + std::ranges::transform(iApiUrls, aApiUrls.begin(), [](const ApiUrl &iApiUrl) { return iApiUrl.text(); }); + return makeApiRequest(aApiUrls, iTokenText); +} + std::vector HearthstoneApi::makeApiRequest(const std::vector &iUrls, const std::string &iTokenText) { std::vector aResponses(iUrls.size()); CURLM *curlm = curl_multi_init(); @@ -101,12 +107,12 @@ std::vector HearthstoneApi::makeApiRequest(const std::vector json HearthstoneApi::downloadCards(ApiUrl &iApiUrl, Token &iToken) { iApiUrl.setPage("1"); std::vector aRequests; - json aFirstPageJson = makeApiRequest(iApiUrl(), iToken.text()); + json aFirstPageJson = makeApiRequest(iApiUrl, iToken.text()); int kNumberOfPages{aFirstPageJson["pageCount"]}; for (int i{1}; i < kNumberOfPages; ++i) { iApiUrl.setPage(std::to_string(i + 1)); - aRequests.push_back(iApiUrl()); + aRequests.push_back(iApiUrl.text()); } json::reference &aOutputJson = aFirstPageJson["cards"]; std::vector kApiResponses = makeApiRequest(aRequests, iToken.text()); -- cgit v1.2.3