diff options
| author | Aotrix <[email protected]> | 2026-01-01 03:35:41 +0100 |
|---|---|---|
| committer | Aotrix <[email protected]> | 2026-01-01 03:35:41 +0100 |
| commit | c05901c38c6a77779807a6b224b9b624bfcaa5d3 (patch) | |
| tree | fb8d212cd9995e4eecd351de352ea6aab2295924 | |
| parent | a56ae1a7ad5f624b05570965bed76e928bbd945c (diff) | |
removed useless files
| -rw-r--r-- | CMakeLists.txt | 32 | ||||
| -rw-r--r-- | battleNetApi/CMakeLists.txt (renamed from submodules/battleNetApi/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | battleNetApi/include/apiUrl.hpp (renamed from submodules/battleNetApi/include/apiUrl.hpp) | 0 | ||||
| -rw-r--r-- | battleNetApi/include/hearthstoneApi.hpp (renamed from submodules/battleNetApi/include/hearthstoneApi.hpp) | 0 | ||||
| -rw-r--r-- | battleNetApi/include/token.hpp (renamed from submodules/battleNetApi/include/token.hpp) | 0 | ||||
| -rw-r--r-- | battleNetApi/resources/token_info | 1 | ||||
| -rw-r--r-- | battleNetApi/src/apiUrl.cpp (renamed from submodules/battleNetApi/src/apiUrl.cpp) | 0 | ||||
| -rw-r--r-- | battleNetApi/src/hearthstoneApi.cpp (renamed from submodules/battleNetApi/src/hearthstoneApi.cpp) | 0 | ||||
| -rw-r--r-- | battleNetApi/src/token.cpp (renamed from submodules/battleNetApi/src/token.cpp) | 0 | ||||
| -rw-r--r-- | battleNetApi/tests/tests.cpp (renamed from submodules/battleNetApi/tests/tests.cpp) | 5 | ||||
| -rw-r--r-- | include/cardTypeHandlerInfo.hpp | 21 | ||||
| -rw-r--r-- | include/hearthstoneAPI.hpp | 25 | ||||
| -rw-r--r-- | include/postgresHandler.hpp | 32 | ||||
| -rw-r--r-- | resources/token_info.txt | 1 | ||||
| -rw-r--r-- | src/cardTypeHandlerInfo.cpp | 32 | ||||
| -rw-r--r-- | src/hearthstoneAPI.cpp | 121 | ||||
| -rw-r--r-- | src/main.cpp | 7 | ||||
| -rw-r--r-- | src/postgresHandler.cpp | 182 | ||||
| -rw-r--r-- | src/tests/tests.cpp | 16 |
19 files changed, 3 insertions, 472 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index 63ba1b7..0000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ -cmake_minimum_required(VERSION 3.15) - -get_filename_component(FNAME ${CMAKE_SOURCE_DIR} NAME) -set(ProjectName ${FNAME}) - -project(${ProjectName} LANGUAGES CXX) - -set(CMAKE_COMPILE_COMMANDS ON) -set(CMAKE_CXX_STANDARD 20) -set(CXX_STANDARD_REQUIRED ON) -set(CMAKE_BUILD_TYPE Debug) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++20 -Wall") -set(CMAKE_EXPORT_COMPILE_COMMANDS ON) -add_definitions(-DSOURCE_DIR_PATH="${CMAKE_SOURCE_DIR}") - -set(INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include) -set(SRC_COMMON - ${PROJECT_SOURCE_DIR}/src/cardTypeHandlerInfo.cpp - ${PROJECT_SOURCE_DIR}/src/hearthstoneAPI.cpp - ${PROJECT_SOURCE_DIR}/src/token.cpp - ${PROJECT_SOURCE_DIR}/src/postgresHandler.cpp) -set(SRC_FILES ${PROJECT_SOURCE_DIR}/src/main.cpp) -set(SRC_TESTS_FILES ${PROJECT_SOURCE_DIR}/src/tests/tests.cpp) - -add_executable(${FNAME} ${SRC_COMMON} ${SRC_FILES}) -target_include_directories(${FNAME} PRIVATE ${INCLUDE_DIR}) -target_link_libraries(${FNAME} pqxx pq curl) - -find_package(Catch2 3 REQUIRED) -add_executable(tests ${SRC_COMMON} ${SRC_TESTS_FILES}) -target_include_directories(tests PRIVATE ${INCLUDE_DIR}) -target_link_libraries(tests PRIVATE Catch2::Catch2WithMain pqxx pq curl) diff --git a/submodules/battleNetApi/CMakeLists.txt b/battleNetApi/CMakeLists.txt index b4f6a48..b4f6a48 100644 --- a/submodules/battleNetApi/CMakeLists.txt +++ b/battleNetApi/CMakeLists.txt diff --git a/submodules/battleNetApi/include/apiUrl.hpp b/battleNetApi/include/apiUrl.hpp index 509b248..509b248 100644 --- a/submodules/battleNetApi/include/apiUrl.hpp +++ b/battleNetApi/include/apiUrl.hpp diff --git a/submodules/battleNetApi/include/hearthstoneApi.hpp b/battleNetApi/include/hearthstoneApi.hpp index c11acc7..c11acc7 100644 --- a/submodules/battleNetApi/include/hearthstoneApi.hpp +++ b/battleNetApi/include/hearthstoneApi.hpp diff --git a/submodules/battleNetApi/include/token.hpp b/battleNetApi/include/token.hpp index e2e3088..e2e3088 100644 --- a/submodules/battleNetApi/include/token.hpp +++ b/battleNetApi/include/token.hpp diff --git a/battleNetApi/resources/token_info b/battleNetApi/resources/token_info new file mode 100644 index 0000000..a3da9f6 --- /dev/null +++ b/battleNetApi/resources/token_info @@ -0,0 +1 @@ +EUmsmWh2JRYNfdfZQ2YkIzF0BEtRD3jBL3 1767267228 diff --git a/submodules/battleNetApi/src/apiUrl.cpp b/battleNetApi/src/apiUrl.cpp index 3de13cd..3de13cd 100644 --- a/submodules/battleNetApi/src/apiUrl.cpp +++ b/battleNetApi/src/apiUrl.cpp diff --git a/submodules/battleNetApi/src/hearthstoneApi.cpp b/battleNetApi/src/hearthstoneApi.cpp index c34e6ad..c34e6ad 100644 --- a/submodules/battleNetApi/src/hearthstoneApi.cpp +++ b/battleNetApi/src/hearthstoneApi.cpp diff --git a/submodules/battleNetApi/src/token.cpp b/battleNetApi/src/token.cpp index 89f0d2a..89f0d2a 100644 --- a/submodules/battleNetApi/src/token.cpp +++ b/battleNetApi/src/token.cpp diff --git a/submodules/battleNetApi/tests/tests.cpp b/battleNetApi/tests/tests.cpp index 74845c5..2c3a2ff 100644 --- a/submodules/battleNetApi/tests/tests.cpp +++ b/battleNetApi/tests/tests.cpp @@ -1,7 +1,6 @@ #include "apiUrl.hpp" #include "hearthstoneApi.hpp" #include <catch2/catch_test_macros.hpp> -#include <iostream> #include <utility> class TokenMock { @@ -49,7 +48,7 @@ TEST_CASE("Retrieve number of cards", "[getCardsCount]") { aApiUrl.setGameMode("constructed"); aApiUrl.setPageSize("1"); std::uint64_t kNumberOfCards{aHearthstoneApi.numberOfCards(aHearthstoneApi.makeApiRequest(aApiUrl()))}; - REQUIRE(kNumberOfCards == 5991); + REQUIRE(kNumberOfCards == 5992); } TEST_CASE("Retrieve cards", "[retrieveCards]") { @@ -61,5 +60,5 @@ TEST_CASE("Retrieve cards", "[retrieveCards]") { aApiUrl.setGameMode("constructed"); aApiUrl.setPageSize("10"); const std::string kApiResponse{aHearthstoneApi.makeApiRequest(aApiUrl())}; - REQUIRE(kApiResponse.size() > 300); + REQUIRE(kApiResponse.size() > 6000); } diff --git a/include/cardTypeHandlerInfo.hpp b/include/cardTypeHandlerInfo.hpp deleted file mode 100644 index 82eb469..0000000 --- a/include/cardTypeHandlerInfo.hpp +++ /dev/null @@ -1,21 +0,0 @@ -#include <functional> -#include <string> - -class CardTypeHandlerInfo { - public: - CardTypeHandlerInfo() = default; - ~CardTypeHandlerInfo() = default; - CardTypeHandlerInfo(const CardTypeHandlerInfo &) = delete; - CardTypeHandlerInfo(CardTypeHandlerInfo &&) = default; - CardTypeHandlerInfo( - const std::vector<std::string> &kCardTypeVector, const std::vector<std::string> &kCardValueRegexVector, - const std::vector<std::function<const std::string(const std::string &)>> kJSONToSQLConverterVector); - - void addCardInfo(const std::string &kCardType, const std::string &kCardValueRegex, - const std::function<const std::string(const std::string &)> kJSONToSQLConverter); - - private: - std::vector<std::string> mCardType; - std::vector<std::string> mCardValueRegex; - std::vector<std::function<const std::string(const std::string &)>> mJSONToSQLConverter; -}; diff --git a/include/hearthstoneAPI.hpp b/include/hearthstoneAPI.hpp deleted file mode 100644 index f677080..0000000 --- a/include/hearthstoneAPI.hpp +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once -#include <chrono> -#include <string> - -class HearthstoneAPI { - public: - HearthstoneAPI(); - std::string get_cards(const std::string &t_card_parameters); - - private: - static size_t curl_callback_string_output(void *t_contents, size_t t_size, size_t t_nmemb, std::string *t_s); - std::chrono::seconds get_current_time(); - std::string extract_string_with_regex(const std::string &t_str, const std::string t_regex); - void write_new_token_info_to_file(const std::string &t_file_path); - void refresh_token_if_needed(); - std::string get_valid_token(); - std::string generate_request_header(); - const std::string get_url(const std::string &t_parameters); - const std::string get_set_of_cards_url(const std::string &t_card_parameters); - std::string make_api_request(const char *t_url, const char *t_header); - std::string make_api_request(const std::string &t_url, const std::string &t_header); - - std::string m_access_token; - std::string m_header; -}; diff --git a/include/postgresHandler.hpp b/include/postgresHandler.hpp deleted file mode 100644 index 444a50f..0000000 --- a/include/postgresHandler.hpp +++ /dev/null @@ -1,32 +0,0 @@ -#pragma once -#include "hearthstoneAPI.hpp" -#include <pqxx/pqxx> -#include <regex> - -/** - * Execute a SQL query from a libpqxx transaction - * - * @param aTransaction The SQL transaction object used to execute the query - * @param aQuery The SQL query - * @return The result of the executed SQL query - */ -const pqxx::result executeQuery(pqxx::work &aTransaction, std::string_view aQuery); - -/** - * Get the type id of the value element in the "key": value regex match - * For instance, if the regex match is "isZilliaxCosmeticModule":false - * Then the type id is the one correponding to BOOL - * - * @param kSregexIt the regex match for a "key": value card information - * @return the type identifier of the value element - */ -const unsigned int getTypeIndexOfRegexIterator(const std::sregex_iterator &kSregexIt); -/** - * Add a list of cards (TODO: Complete documentation and function) - * - * @param kCards - * @param aTransaction - */ -void addCardsToDatabase(HearthstoneAPI &aAPIIntermediate, pqxx::work &aTransaction, const std::string &kURLOfCardsPage); - -void refresh_cards_table(); diff --git a/resources/token_info.txt b/resources/token_info.txt deleted file mode 100644 index 1bb3518..0000000 --- a/resources/token_info.txt +++ /dev/null @@ -1 +0,0 @@ -EUSfRDfuwbJnHlh1oQxDVHm0OJEr12uYbG 1761332682 diff --git a/src/cardTypeHandlerInfo.cpp b/src/cardTypeHandlerInfo.cpp deleted file mode 100644 index 46e8f56..0000000 --- a/src/cardTypeHandlerInfo.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include "cardTypeHandlerInfo.hpp" - -void CardTypeHandlerInfo::addCardInfo(const std::string &kCardType, const std::string &kCardValueRegex, - const std::function<const std::string(const std::string &)> kJSONToSQLConverter) { -} - -const CardTypeHandlerInfo cardTypeHandlerInfoList() { - CardTypeHandlerInfo aCardTypeHandlerInfo; - - aCardTypeHandlerInfo.addCardInfo("INT", "[0-9]+", [](const std::string &kJSONContent) { return kJSONContent; }); - - aCardTypeHandlerInfo.addCardInfo("BOOL", "true|false", - [](const std::string &kJSONContent) { return kJSONContent; }); - - aCardTypeHandlerInfo.addCardInfo("STRING", "\"[^\"?]*\"", [](const std::string &kJSONContent) { - std::string aCopyOfJSONValue = kJSONContent; - *aCopyOfJSONValue.begin() = '\''; - *std::prev(aCopyOfJSONValue.end()) = '\''; - return aCopyOfJSONValue; - }); - - aCardTypeHandlerInfo.addCardInfo("LIST_OF_INT", "\\[[0-9,]*\\]", [](const std::string &kJSONContent) { - std::string aCopyOfJSONValue = kJSONContent; - aCopyOfJSONValue.append("\'"); - aCopyOfJSONValue.insert(aCopyOfJSONValue.begin(), '\''); - return aCopyOfJSONValue; - }); - - aCardTypeHandlerInfo.addCardInfo("NULL", "null", [](const std::string &kJSONContent) { return "NULL"; }); - - return aCardTypeHandlerInfo; -} diff --git a/src/hearthstoneAPI.cpp b/src/hearthstoneAPI.cpp deleted file mode 100644 index cb72b11..0000000 --- a/src/hearthstoneAPI.cpp +++ /dev/null @@ -1,121 +0,0 @@ -#include "hearthstoneAPI.hpp" -#include <chrono> -#include <curl/curl.h> -#include <format> -#include <fstream> -#include <iostream> -#include <regex> - -HearthstoneAPI::HearthstoneAPI() : m_access_token(get_valid_token()), m_header(generate_request_header()) {} - -size_t HearthstoneAPI::curl_callback_string_output(void *t_contents, size_t t_size, size_t t_nmemb, std::string *t_s) { - size_t newLength = t_size * t_nmemb; - try { - t_s->append((char *)t_contents, newLength); - } catch (std::bad_alloc &e) { - // handle memory problem - return 0; - } - return newLength; -} - -std::chrono::seconds HearthstoneAPI::get_current_time() { - return std::chrono::duration_cast<std::chrono::seconds>(std::chrono::utc_clock::now().time_since_epoch()); -} - -std::string HearthstoneAPI::extract_string_with_regex(const std::string &t_str, const std::string t_regex) { - std::regex regex(t_regex); - auto it = std::sregex_iterator(t_str.begin(), t_str.end(), regex); - std::smatch match = *it; - return match[1].str(); -} - -void HearthstoneAPI::write_new_token_info_to_file(const std::string &t_file_path) { - std::ofstream token_file(t_file_path); - CURL *curl = curl_easy_init(); - std::string token_info; - if (curl) { - curl_easy_setopt(curl, CURLOPT_URL, "https://oauth.battle.net/token"); - curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L); - curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L); - curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_callback_string_output); - curl_easy_setopt(curl, CURLOPT_WRITEDATA, &token_info); - curl_easy_setopt(curl, CURLOPT_USERPWD, - "2b50f1123b424d5e9c21971a110fdd04:" - "MrMkhVMNdOeqPL4Q4XVQAsRPR14J7Yq6"); - curl_easy_setopt(curl, CURLOPT_POSTFIELDS, "grant_type=client_credentials"); - CURLcode result_code; - result_code = curl_easy_perform(curl); - curl_easy_cleanup(curl); - if (result_code != CURLE_OK) { - std::cerr << "ERROR: token request failed" << std::endl; - std::exit(EXIT_FAILURE); - } - } - std::string token = extract_string_with_regex(token_info, "\"access_token\":\"(\\w+)\""); - std::chrono::seconds expires_at = get_current_time() + std::chrono::hours(24); - token_file << token << " " << expires_at.count() << '\n'; -} - -void HearthstoneAPI::refresh_token_if_needed() { - std::string file_path = std::format("{}/resources/token_info.txt", SOURCE_DIR_PATH); - std::ifstream token_file(file_path); - std::string line; - std::getline(token_file, line); - if (line.empty()) { - write_new_token_info_to_file(file_path); - } else { - long expire_at = std::stoull(line.substr(line.find(" ") + 1)); - if (std::chrono::duration_cast<std::chrono::seconds>(std::chrono::utc_clock::now().time_since_epoch()) - .count() >= expire_at) { - write_new_token_info_to_file(file_path); - } - } -} -std::string HearthstoneAPI::get_valid_token() { - refresh_token_if_needed(); - std::string file_path = std::format("{}/resources/token_info.txt", SOURCE_DIR_PATH); - std::ifstream token_file(file_path); - std::string line; - std::getline(token_file, line); - std::string token = line.substr(0, line.find(" ")); - return token; -} - -std::string HearthstoneAPI::generate_request_header() { - return std::format("Authorization: Bearer {}", m_access_token); -} - -const std::string HearthstoneAPI::get_url(const std::string &t_parameters) { - return std::format("https://eu.api.blizzard.com/hearthstone/{}", t_parameters); -} - -const std::string HearthstoneAPI::get_set_of_cards_url(const std::string &t_card_parameters) { - return get_url(std::format("cards{}", t_card_parameters)); -} - -std::string HearthstoneAPI::make_api_request(const char *t_url, const char *t_header) { - CURL *curl = curl_easy_init(); - std::string request_output; - if (curl) { - curl_easy_setopt(curl, CURLOPT_URL, t_url); - curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L); - curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L); - curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_callback_string_output); - curl_easy_setopt(curl, CURLOPT_WRITEDATA, &request_output); - struct curl_slist *chunk = nullptr; - chunk = curl_slist_append(chunk, t_header); - curl_easy_setopt(curl, CURLOPT_HTTPHEADER, chunk); - curl_easy_perform(curl); - curl_easy_cleanup(curl); - } - return request_output; -} - -std::string HearthstoneAPI::make_api_request(const std::string &t_url, const std::string &t_header) { - return make_api_request(t_url.c_str(), t_header.c_str()); -} - -std::string HearthstoneAPI::get_cards(const std::string &t_card_parameters) { - return make_api_request(get_set_of_cards_url(t_card_parameters), m_header); -} diff --git a/src/main.cpp b/src/main.cpp deleted file mode 100644 index 60b948a..0000000 --- a/src/main.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "postgresHandler.hpp" -#include <pqxx/pqxx> - -int main() { - refresh_cards_table(); - return 0; -} diff --git a/src/postgresHandler.cpp b/src/postgresHandler.cpp deleted file mode 100644 index 8ca3c20..0000000 --- a/src/postgresHandler.cpp +++ /dev/null @@ -1,182 +0,0 @@ -#include "postgresHandler.hpp" -#include "cardTypeHandlerInfo.hpp" -#include "hearthstoneAPI.hpp" -#include <cctype> -#include <cstddef> -#include <cstdint> -#include <cstdlib> -#include <iostream> -#include <regex> -#include <stdexcept> - -#define KEY_ID 1 - -const std::map<std::string, std::string> aCardValueTypeToRegex = {{"INT", "[0-9]+"}, - {"STRING", "\"[^\"?]*\""}, - {"LIST_OF_INT", "\\[[0-9,]*\\]"}, - {"NULL", "null"}, - {"BOOL", "true|false"}}; - -const pqxx::result executeQuery(pqxx::work &aTransaction, std::string_view aQuery) { return aTransaction.exec(aQuery); } - -std::ostream &operator<<(std::ostream &aOstream, const pqxx::result &kResult) { - const int kNbColumnsInResult = kResult.columns(); - aOstream << "| "; - for (const auto &kResultRow : kResult) { - for (int i = 0; i < kNbColumnsInResult; i++) { - aOstream << kResultRow[i].c_str() << " | "; - } - } - return aOstream; -} - -const unsigned int getTypeIndexOfRegexIterator(const std::sregex_iterator &kSregexIt) { - // TODO: remove hardcoded variable because it is... weird. - // The input should already be the "value" part? - const unsigned int offset = 2; - for (size_t aCardInfoType = 0; aCardInfoType < aCardValueTypeToRegex.size(); aCardInfoType++) { - if ((*kSregexIt)[aCardInfoType] != "") { - return offset + aCardInfoType; - } - } - throw std::invalid_argument("regex iterator input is invalid"); -} - -const std::string format_json_value_to_sql(const std::string &kTypeOfValue, const std::string &kValueFromJSON) { - // TODO: show an error if a type is no longer here, - // to avoid having useless conditions - // FIXME: it does not scale well, a bit ugly... should be a single line - if (kTypeOfValue == "BOOL" || kTypeOfValue == "INT") { - return kValueFromJSON; - } else if (kTypeOfValue == "STRING") { - std::string aCopyOfJSONValue = kValueFromJSON; - *aCopyOfJSONValue.begin() = '\''; - *std::prev(aCopyOfJSONValue.end()) = '\''; - return aCopyOfJSONValue; - } else if (kTypeOfValue == "NULL") { - return "NULL"; - } else if (kTypeOfValue == "LIST_OF_INT") { - std::string aCopyOfJSONValue = kValueFromJSON; - aCopyOfJSONValue.append("\'"); - aCopyOfJSONValue.insert(aCopyOfJSONValue.begin(), '\''); - return aCopyOfJSONValue; - } else { - throw std::invalid_argument("ERROR: type of value is invalid"); - } -} - -std::string format_key(const std::string &key) { - std::string key_copy(key); - std::stack<size_t> uppercase_indexes; - for (size_t i = 0; i < key.length(); i++) { - if (std::isupper(key[i])) { - uppercase_indexes.push(i); - } - } - while (!uppercase_indexes.empty()) { - size_t top_index = uppercase_indexes.top(); - uppercase_indexes.pop(); - key_copy[top_index] = std::tolower(key_copy[top_index]); - key_copy.insert(std::next(key_copy.begin(), top_index), '_'); - } - return key_copy; -} - -static void add_single_card_to_database(const std::string &kCards, pqxx::work &aTransaction, - const std::regex &kKeyRegex, const std::string::size_type &kIdPos, - const std::string::size_type &kClosingBracketPos) { - auto words_begin = std::sregex_iterator(std::next(kCards.begin(), kIdPos), - std::next(kCards.begin(), kClosingBracketPos), kKeyRegex); - auto words_end = std::sregex_iterator(); - if (words_begin != words_end) { - std::string insert_columns("INSERT INTO cards ("); - std::string values(" VALUES ("); - for (std::sregex_iterator kSregexIt = words_begin; kSregexIt != words_end; ++kSregexIt) { - insert_columns.append(format_key((*kSregexIt)[KEY_ID].str()) + ","); // key - const unsigned int kTypeIndexOfValue = getTypeIndexOfRegexIterator(kSregexIt); - const std::string kTypeNameOfValue = std::next(aCardValueTypeToRegex.begin(), kTypeIndexOfValue)->first; - values.append(format_json_value_to_sql(kTypeNameOfValue, (*kSregexIt)[kTypeIndexOfValue].str()) + ","); - } - *std::prev(insert_columns.end()) = ')'; - *std::prev(values.end()) = ')'; - - insert_columns.append(values); - insert_columns.append(" ON CONFLICT (id) DO NOTHING;"); - executeQuery(aTransaction, insert_columns); - } -} - -const std::regex regexKeyValueInJSON() { - std::string aRegexString = "\"([^\"?]+)\":("; - for (auto &[fieldName, regex] : aCardValueTypeToRegex) { - aRegexString += "(" + regex + ")|"; - } - aRegexString[aRegexString.length() - 1] = ')'; - return std::regex(aRegexString); -} - -const std::string::size_type startPosOfCardJSON(const std::string &kCardsPageJSON, - const std::string::size_type kSearchStartPos = 0) { - return kCardsPageJSON.find("{\"id", kSearchStartPos); -} - -const std::string::size_type endPosOfCardJSON(const std::string &kCardsPageJSON, - const std::string::size_type kSearchStartPos = 0) { - return kCardsPageJSON.find("}", kSearchStartPos); -} - -void addCardsToDatabase(HearthstoneAPI &aAPIIntermediate, pqxx::work &aTransaction, - const std::string &kURLOfCardsPage) { - const std::regex aRegexKeyValueInJSON = regexKeyValueInJSON(); - const std::string &kCardsPageJSON = aAPIIntermediate.get_cards(kURLOfCardsPage); - std::string::size_type aCardStartPos = startPosOfCardJSON(kCardsPageJSON); - std::string::size_type aCardEndPos = endPosOfCardJSON(kCardsPageJSON); - while (aCardStartPos != std::string::npos && aCardEndPos != std::string::npos) { - add_single_card_to_database(kCardsPageJSON, aTransaction, aRegexKeyValueInJSON, aCardStartPos, aCardEndPos); - aCardStartPos = startPosOfCardJSON(kCardsPageJSON, aCardStartPos + 1); - aCardEndPos = endPosOfCardJSON(kCardsPageJSON, aCardEndPos + 1); - } -} - -void clearCardDatabase(pqxx::work &aTransaction) { executeQuery(aTransaction, "DELETE FROM cards"); } - -const uint32_t numberOfPagesInSetOfCards(const std::string &cards) { - std::regex key_regex("\"pageCount\":([0-9]+)"); - auto nb_pages_begin = std::sregex_iterator(cards.begin(), cards.end(), key_regex); - auto nb_pages_end = std::sregex_iterator(); - if (nb_pages_begin != nb_pages_end) { - return std::stoi((*nb_pages_begin)[1].str()); - } - return 0; -} - -void refresh_cards_table() { - try { - pqxx::connection aConnection{ - "postgresql://aotrix@localhost:5432/hearthstonegameinfo"}; // FIXME: load a .xml file instead - pqxx::work aTransaction{aConnection}; - HearthstoneAPI aAPIConnector; - std::string aCards = - aAPIConnector.get_cards("/?locale=fr_FR&gameMode=constructed"); // FIXME: use a struct as a parameter - clearCardDatabase(aTransaction); - addCardsToDatabase(aAPIConnector, aTransaction, - "/?locale=fr_FR&gameMode=constructed"); // FIXME: To which - // table? to a more generic function - const uint32_t kNbPages = numberOfPagesInSetOfCards(aCards); - - // FIXME: [Process exited 139] - // for (int i = 2; i < kNbPages; i++) { - for (uint32_t i = 2; i < 3; i++) { - const std::string kCardsPageURL{std::format("/?locale=fr_FR&gameMode=constructed&page={}", i)}; - addCardsToDatabase(aAPIConnector, aTransaction, kCardsPageURL); - } - std::cout << "number of cards in database: " << executeQuery(aTransaction, "SELECT COUNT(*) FROM cards") - << std::endl; - aTransaction.commit(); - } catch (pqxx::sql_error const &kSqlError) { - std::cerr << "SQL error: " << kSqlError.what() << std::endl; - std::cerr << "Query was: " << kSqlError.query() << std::endl; - } catch (std::exception const &kException) { - std::cerr << "Error: " << kException.what() << std::endl; - } -} diff --git a/src/tests/tests.cpp b/src/tests/tests.cpp deleted file mode 100644 index d1a037b..0000000 --- a/src/tests/tests.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include <catch2/benchmark/catch_benchmark.hpp> -#include <catch2/catch_test_macros.hpp> - -#include <cstdint> - -uint64_t fibonacci(uint64_t number) { return number < 2 ? number : fibonacci(number - 1) + fibonacci(number - 2); } - -TEST_CASE("Benchmark Fibonacci", "[fibonacci]") { - REQUIRE(fibonacci(5) == 5); - - REQUIRE(fibonacci(20) == 6'765); - BENCHMARK("fibonacci 20") { return fibonacci(20); }; - - REQUIRE(fibonacci(25) == 75'025); - BENCHMARK("fibonacci 25") { return fibonacci(25); }; -} |
