diff --git a/CMakeLists.txt b/CMakeLists.txt index a98d598..5d4a2fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,38 +3,50 @@ project(nutri) set(CMAKE_CXX_STANDARD 26) set(CMAKE_EXPORT_COMPILE_COMMANDS 1) - -find_package(nlohmann_json REQUIRED) +set(CMAKE_CXX_FLAGS -fdiagnostics-color=always) include(FetchContent) -FetchContent_Declare( - ctre - GIT_REPOSITORY https://github.com/hanickadot/compile-time-regular-expressions.git - GIT_TAG v3.9.0 - GIT_SHALLOW TRUE -) -FetchContent_Declare( - cpr - GIT_REPOSITORY https://github.com/libcpr/cpr.git - GIT_TAG 1.11.0 - GIT_SHALLOW TRUE -) -FetchContent_Declare( - glaze - GIT_REPOSITORY https://github.com/stephenberry/glaze.git - GIT_TAG main - GIT_SHALLOW TRUE -) +find_package(ctre QUIET) +if (NOT ctre_FOUND) + FetchContent_Declare( + ctre + GIT_REPOSITORY https://github.com/hanickadot/compile-time-regular-expressions.git + GIT_TAG v3.9.0 + GIT_SHALLOW TRUE + ) + FetchContent_MakeAvailable(ctre) +endif() -FetchContent_MakeAvailable(ctre cpr glaze) +find_package(cpr QUIET) +if (NOT cpr_FOUND) + FetchContent_Declare( + cpr + GIT_REPOSITORY https://github.com/libcpr/cpr.git + GIT_TAG 1.11.0 + GIT_SHALLOW TRUE + ) + FetchContent_MakeAvailable(cpr) +endif() + +find_package(glaze QUIET) +if (NOT glaze_FOUND) + FetchContent_Declare( + glaze + GIT_REPOSITORY https://github.com/stephenberry/glaze.git + GIT_TAG main + GIT_SHALLOW TRUE + ) + FetchContent_MakeAvailable(glaze) +endif() add_executable( - nutri - src/main.cpp - src/ArgParser.hpp - src/Helpers/Utility.cpp - src/Helpers/Utility.hpp - src/Helpers/WolframAlpha.hpp - ) -target_link_libraries(nutri PRIVATE cpr::cpr nlohmann_json::nlohmann_json ctre::ctre glaze::glaze) + nutri + src/main.cpp + src/ArgParser.hpp + src/Helpers/Utility.cpp + src/Helpers/Utility.hpp + src/Helpers/WolframAlpha.hpp +) + +target_link_libraries(nutri PRIVATE cpr::cpr ctre::ctre glaze::glaze) diff --git a/src/ArgParser.hpp b/src/ArgParser.hpp index b071406..3f96b6b 100644 --- a/src/ArgParser.hpp +++ b/src/ArgParser.hpp @@ -1,41 +1,43 @@ #pragma once +#include #include +#include #include #include #include class ArgParser { public: - void addArg(const std::string& shortOpt, const std::string& longOpt, const std::string& description, bool hasValue = true) { - m_arguments.emplace_back(shortOpt, longOpt, description, "", hasValue); - if (!shortOpt.empty()) { - m_shortOptMap[shortOpt] = &m_arguments.back(); - } - if (!longOpt.empty()) { - m_longOptMap[longOpt] = &m_arguments.back(); - } + void add(const std::string& shortOpt, const std::string& longOpt, const std::string& description, bool requiresValue = true) { + Argument arg{shortOpt, longOpt, description, std::nullopt, requiresValue, false}; + m_arguments.push_back(arg); + if (!shortOpt.empty()) + m_optMap[shortOpt] = &m_arguments.back(); + if (!longOpt.empty()) + m_optMap[longOpt] = &m_arguments.back(); } - bool parse(const int argc, char* argv[]) { - for (int i{1}; i < argc; ++i) { - if (const std::string arg{argv[i]}; m_shortOptMap.contains(arg)) { - if (arg == "--help" || arg == "-h") { - printHelp(); - return false; - } - m_shortOptMap[arg]->exists = true; - if (m_shortOptMap[arg]->hasValue && i + 1 < argc) { - m_shortOptMap[arg]->value = argv[++i]; - } - } else if (m_longOptMap.contains(arg)) { - if (arg == "--help" || arg == "-h") { - printHelp(); - return false; - } - m_longOptMap[arg]->exists = true; - if (m_longOptMap[arg]->hasValue && i + 1 < argc) { - m_longOptMap[arg]->value = argv[++i]; + bool parse(int argc, char* argv[]) { + if (argc == 1) { + printHelp(); + return false; + } + + for (int i = 1; i < argc; ++i) { + std::string arg = argv[i]; + + if (arg == "-h" || arg == "--help") { + printHelp(); + return false; + } + + if (auto* argument = findArgument(arg); argument) { + argument->exists = true; + if (argument->requiresValue) { + if (i + 1 >= argc) + throw std::invalid_argument("Missing value for " + arg); + argument->value = argv[++i]; } } else { throw std::invalid_argument("Unknown option: " + arg); @@ -44,6 +46,20 @@ public: return true; } + template + T get(const std::string& arg) const { + const Argument* argument = findArgument(arg); + if (!argument || !argument->value) + throw std::runtime_error(arg + " has no value"); + + return convertToType(*argument->value); + } + + bool has(const std::string& arg) const { + const Argument* argument = findArgument(arg); + return argument && argument->exists; + } + void printHelp() const { std::println("Usage: [options]"); for (const auto& arg : m_arguments) { @@ -51,44 +67,41 @@ public: } } - template - T get(const std::string& arg) const { - std::string value; - if (m_longOptMap.contains(arg) && !m_longOptMap.at(arg)->value.empty()) { - value = m_longOptMap.at(arg)->value; - } else if (m_shortOptMap.contains(arg) && !m_shortOptMap.at(arg)->value.empty()) { - value = m_shortOptMap.at(arg)->value; - } else { - throw std::runtime_error(arg + " has no value"); - } - if constexpr (std::is_same_v) { - return value; - } else { - return std::stoi(value); - } - } - - bool has(const std::string& arg) const { - if (const auto longOptIt = m_longOptMap.find(arg); longOptIt != m_longOptMap.end()) { - return longOptIt->second->exists; - } - if (const auto shortOptIt = m_shortOptMap.find(arg); shortOptIt != m_shortOptMap.end()) { - return shortOptIt->second->exists; - } - return false; - } - private: struct Argument { - std::string shortOpt; - std::string longOpt; - std::string description; - std::string value; - bool hasValue = true; - bool exists = false; + std::string shortOpt; + std::string longOpt; + std::string description; + std::optional value; + bool requiresValue; + bool exists = false; }; - std::vector m_arguments{}; - std::unordered_map m_shortOptMap{}; - std::unordered_map m_longOptMap{}; + Argument* findArgument(const std::string& opt) { + if (auto it = m_optMap.find(opt); it != m_optMap.end()) + return it->second; + return nullptr; + } + + const Argument* findArgument(const std::string& opt) const { + if (auto it = m_optMap.find(opt); it != m_optMap.end()) + return it->second; + return nullptr; + } + + template + T convertToType(const std::string& value) const { + if constexpr (std::is_same_v) { + return value; + } else if constexpr (std::is_same_v) { + return std::stoi(value); + } else if constexpr (std::is_same_v) { + return std::stod(value); + } else { + throw std::runtime_error("Unsupported type for argument conversion"); + } + } + + std::vector m_arguments; + std::unordered_map m_optMap; }; diff --git a/src/Helpers/WolframAlpha.hpp b/src/Helpers/WolframAlpha.hpp index d2cf51f..8472742 100644 --- a/src/Helpers/WolframAlpha.hpp +++ b/src/Helpers/WolframAlpha.hpp @@ -6,11 +6,10 @@ #include #include #include +#include #include #include -// Example regex patern: (?<=protein\s)(\d+)\s(\w) - struct Data { double cals{}; double proteins{}; @@ -20,61 +19,71 @@ struct Data { class WolframAlpha { public: - WolframAlpha(const std::string& query, double amount) : m_plaintext{getData(query)}, m_amount{amount / 100} {} - - //debug - std::string getPlain() { - return m_plaintext; + WolframAlpha(const std::string& query, double amount) : m_plaintext{initPlaintext(query)}, m_amount{amount} { + initData(); } - Data getNutrition() { - return m_data; + void print() { + std::println("Cals: {:g} kcal\nProtein: {:g} g\nCarbs: {:g} g\nFats: {:g} g", m_data.cals, m_data.proteins, m_data.carbs, m_data.fats); } private: - void getMacro() { - static constexpr ctll::fixed_string calories_regex{R"((?<=total calories\s)\d+)"}; - static constexpr ctll::fixed_string proteins_regex{R"((?<=protein\s)(\d+)\s(\w))"}; - static constexpr ctll::fixed_string carbs_regex{R"((?<=total carbohydrates\s)(\d+)\s(\w))"}; - static constexpr ctll::fixed_string fats_regex{R"((?<=total fat\s)(\d+)\s(\w))"}; - - const auto convertToGrams = [this](const auto& match, const std::string& unit) -> double { - const double value = (unit == "g") ? match.to_number() : match.to_number() / 1000; - return value * m_amount; + void initData() { + const auto convertToGrams = [this](const double& match, const std::string& unit) { + if (unit == "g") { + return match * m_amount; + } else if (unit == "mg") { + return (match / 1000) * m_amount; + } else { + throw std::invalid_argument("Unsupported unit: " + unit); + } }; + constexpr ctll::fixed_string calories_regex{R"((?<=total calories\s)\d+)"}; + constexpr ctll::fixed_string proteins_regex{R"((?<=protein\s)(\d+)\s(\w+))"}; + constexpr ctll::fixed_string carbs_regex{R"((?<=total carbohydrates\s)(\d+)\s(\w+))"}; + constexpr ctll::fixed_string fats_regex{R"((?<=total fat\s)(\d+)\s(\w+))"}; + if (auto match = ctre::search(m_plaintext); match) { - m_data.proteins = convertToGrams(match.get<1>(), match.get<2>().to_string()); + m_data.proteins = convertToGrams(match.get<1>().to_number(), match.get<2>().to_string()); } if (auto match = ctre::search(m_plaintext); match) { - m_data.carbs = convertToGrams(match.get<1>(), match.get<2>().to_string()); + m_data.carbs = convertToGrams(match.get<1>().to_number(), match.get<2>().to_string()); } if (auto match = ctre::search(m_plaintext); match) { - m_data.fats = convertToGrams(match.get<1>(), match.get<2>().to_string()); + m_data.fats = convertToGrams(match.get<1>().to_number(), match.get<2>().to_string()); } if (auto match = ctre::search(m_plaintext); match) { - m_data.cals = match.get<0>().to_number(); + m_data.cals = match.get<0>().to_number() * m_amount; } } - std::string getData(const std::string& query) { - const auto WOLFRAM_KEY = utl::getEnv("NUTRI_WA_KEY"); - cpr::Response response = Get(cpr::Url{"https://api.wolframalpha.com/v2/query"}, - cpr::Parameters{{"input", query + "100g nutrition"}, {"appid", WOLFRAM_KEY}, {"output", "JSON"}, {"format", "plaintext"}}); - glz::json_t json{}; - // Pretty sure this is wrong and i always is false - if (glz::read_json(json, response.text)) { - throw std::runtime_error("Failed to parse the JSON"); - } else { + std::string initPlaintext(const std::string& query) { + const auto WOLFRAM_KEY = utl::getEnv("NUTRI_WA_KEY"); + + // clang-format off + cpr::Response response = Get( + cpr::Url{"https://api.wolframalpha.com/v2/query"}, + cpr::Parameters{ + {"input", query + "100g nutrition"}, + {"appid", WOLFRAM_KEY}, + {"output", "JSON"}, + {"format", "plaintext"}}); + // clang-format on + + glz::json_t json{}; + auto ec = glz::read_json(json, response.text); + if (ec != glz::error_code::missing_key) { return json["queryresult"]["pods"][1]["subpods"][0]["plaintext"].get(); + } else { + throw std::invalid_argument("JSON Key not found"); } } Data m_data{}; - std::string m_pod{}; std::string m_plaintext{}; double m_amount{}; }; diff --git a/src/main.cpp b/src/main.cpp index fbf3916..2f8f998 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -5,19 +5,20 @@ int main(const int argc, char* argv[]) { try { ArgParser args; - args.addArg("-f", "--food", "Specify the food item"); - args.addArg("-a", "--amount", "Specify the amount (in grams)"); - args.addArg("-h", "--help", "Print help", false); - args.parse(argc, argv); + args.add("-h", "--help", "Print help", false); + args.add("-f", "--food", "Specify the food item"); + args.add("-a", "--amount", "Specify the amount (in grams)"); + + if (!args.parse(argc, argv)) { + return 0; + } const auto food = args.get("--food"); const double amount = args.get("--amount") / 100; WolframAlpha wa(food, amount); - auto a = wa.getNutrition(); - std::println("cals: {}\nprotein: {}\ncarbs: {}\nfat: {}", a.cals, a.proteins, a.carbs, a.fats); - + wa.print(); } catch (const std::exception& e) { std::println(stderr, "Error: {}", e.what()); return 1;