fix

CMakeLists.txt

@@ -3,31 +3,42 @@ project(nutri)
 
 set(CMAKE_CXX_STANDARD 26)
 set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
-
+set(CMAKE_CXX_FLAGS -fdiagnostics-color=always)
-find_package(nlohmann_json REQUIRED)
 
 include(FetchContent)
 
+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()
+
+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)
-FetchContent_MakeAvailable(ctre cpr glaze)
+endif()
 
 add_executable(
   nutri
@@ -37,4 +48,5 @@ add_executable(
   src/Helpers/Utility.hpp
   src/Helpers/WolframAlpha.hpp
 )
-target_link_libraries(nutri PRIVATE cpr::cpr nlohmann_json::nlohmann_json ctre::ctre glaze::glaze)
+
+target_link_libraries(nutri PRIVATE cpr::cpr ctre::ctre glaze::glaze)

src/ArgParser.hpp

@@ -1,41 +1,43 @@
 #pragma once
 
+#include <optional>
 #include <print>
+#include <stdexcept>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
 class ArgParser {
 public:
-  void addArg(const std::string& shortOpt, const std::string& longOpt, const std::string& description, bool hasValue = true) {
+  void add(const std::string& shortOpt, const std::string& longOpt, const std::string& description, bool requiresValue = true) {
-    m_arguments.emplace_back(shortOpt, longOpt, description, "", hasValue);
+    Argument arg{shortOpt, longOpt, description, std::nullopt, requiresValue, false};
-    if (!shortOpt.empty()) {
+    m_arguments.push_back(arg);
-      m_shortOptMap[shortOpt] = &m_arguments.back();
+    if (!shortOpt.empty())
-    }
+      m_optMap[shortOpt] = &m_arguments.back();
-    if (!longOpt.empty()) {
+    if (!longOpt.empty())
-      m_longOptMap[longOpt] = &m_arguments.back();
+      m_optMap[longOpt] = &m_arguments.back();
-    }
   }
 
-  bool parse(const int argc, char* argv[]) {
+  bool parse(int argc, char* argv[]) {
-    for (int i{1}; i < argc; ++i) {
+    if (argc == 1) {
-      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) {
+    for (int i = 1; i < argc; ++i) {
-          m_shortOptMap[arg]->value = argv[++i];
+      std::string arg = argv[i];
-        }
+
-      } else if (m_longOptMap.contains(arg)) {
+      if (arg == "-h" || arg == "--help") {
-        if (arg == "--help" || arg == "-h") {
         printHelp();
         return false;
       }
-        m_longOptMap[arg]->exists = true;
+
-        if (m_longOptMap[arg]->hasValue && i + 1 < argc) {
+      if (auto* argument = findArgument(arg); argument) {
-          m_longOptMap[arg]->value = argv[++i];
+        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 <typename T>
+  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<T>(*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 <typename T>
-  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<T, std::string>) {
-      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;
+    std::optional<std::string> value;
-    bool        hasValue = true;
+    bool                       requiresValue;
     bool                       exists = false;
   };
 
-  std::vector<Argument>                      m_arguments{};
+  Argument* findArgument(const std::string& opt) {
-  std::unordered_map<std::string, Argument*> m_shortOptMap{};
+    if (auto it = m_optMap.find(opt); it != m_optMap.end())
-  std::unordered_map<std::string, Argument*> m_longOptMap{};
+      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 <typename T>
+  T convertToType(const std::string& value) const {
+    if constexpr (std::is_same_v<T, std::string>) {
+      return value;
+    } else if constexpr (std::is_same_v<T, int>) {
+      return std::stoi(value);
+    } else if constexpr (std::is_same_v<T, double>) {
+      return std::stod(value);
+    } else {
+      throw std::runtime_error("Unsupported type for argument conversion");
+    }
+  }
+
+  std::vector<Argument>                      m_arguments;
+  std::unordered_map<std::string, Argument*> m_optMap;
 };

src/Helpers/WolframAlpha.hpp

@@ -6,11 +6,10 @@
 #include <ctll.hpp>
 #include <ctre.hpp>
 #include <glaze/glaze.hpp>
+#include <print>
 #include <stdexcept>
 #include <string>
 
-// 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} {}
+  WolframAlpha(const std::string& query, double amount) : m_plaintext{initPlaintext(query)}, m_amount{amount} {
-
+    initData();
-  //debug
-  std::string getPlain() {
-    return m_plaintext;
   }
 
-  Data getNutrition() {
+  void print() {
-    return m_data;
+    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() {
+  void initData() {
-    static constexpr ctll::fixed_string calories_regex{R"((?<=total calories\s)\d+)"};
+    const auto convertToGrams = [this](const double& match, const std::string& unit) {
-    static constexpr ctll::fixed_string proteins_regex{R"((?<=protein\s)(\d+)\s(\w))"};
+      if (unit == "g") {
-    static constexpr ctll::fixed_string carbs_regex{R"((?<=total carbohydrates\s)(\d+)\s(\w))"};
+        return match * m_amount;
-    static constexpr ctll::fixed_string fats_regex{R"((?<=total fat\s)(\d+)\s(\w))"};
+      } else if (unit == "mg") {
-
+        return (match / 1000) * m_amount;
-    const auto                          convertToGrams = [this](const auto& match, const std::string& unit) -> double {
+      } else {
-      const double value = (unit == "g") ? match.to_number() : match.to_number() / 1000;
+        throw std::invalid_argument("Unsupported unit: " + unit);
-      return value * m_amount;
+      }
     };
 
+    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<proteins_regex>(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<carbs_regex>(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<fats_regex>(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<calories_regex>(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) {
+
+  std::string initPlaintext(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"}});
+    // 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{};
-    // Pretty sure this is wrong and i always is false
+    auto        ec = glz::read_json(json, response.text);
-    if (glz::read_json(json, response.text)) {
+    if (ec != glz::error_code::missing_key) {
-      throw std::runtime_error("Failed to parse the JSON");
-    } else {
       return json["queryresult"]["pods"][1]["subpods"][0]["plaintext"].get<std::string>();
+    } else {
+      throw std::invalid_argument("JSON Key not found");
     }
   }
 
   Data        m_data{};
-  std::string m_pod{};
   std::string m_plaintext{};
   double      m_amount{};
 };

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.add("-h", "--help", "Print help", false);
-    args.addArg("-a", "--amount", "Specify the amount (in grams)");
+    args.add("-f", "--food", "Specify the food item");
-    args.addArg("-h", "--help", "Print help", false);
+    args.add("-a", "--amount", "Specify the amount (in grams)");
-    args.parse(argc, argv);
+
+    if (!args.parse(argc, argv)) {
+      return 0;
+    }
 
     const auto   food   = args.get<std::string>("--food");
     const double amount = args.get<double>("--amount") / 100;
 
     WolframAlpha wa(food, amount);
 
-    auto         a = wa.getNutrition();
+    wa.print();
-    std::println("cals: {}\nprotein: {}\ncarbs: {}\nfat: {}", a.cals, a.proteins, a.carbs, a.fats);
-
   } catch (const std::exception& e) {
     std::println(stderr, "Error: {}", e.what());
     return 1;