From 8d81b770a5ed92b79532a9f37bf27ef7a6bc52e0 Mon Sep 17 00:00:00 2001 From: Mars Date: Tue, 11 Mar 2025 20:09:17 -0400 Subject: [PATCH] oops --- src/config/config.cpp | 2 +- src/config/config.h | 40 ++++++++++++++-------------------------- src/config/weather.cpp | 28 +++++++++++++--------------- src/config/weather.h | 4 ++-- 4 files changed, 30 insertions(+), 44 deletions(-) diff --git a/src/config/config.cpp b/src/config/config.cpp index fbabb13..c689944 100644 --- a/src/config/config.cpp +++ b/src/config/config.cpp @@ -31,7 +31,7 @@ fn Config::getInstance() -> Config { try { const fs::path configPath = GetConfigPath(); if (!fs::exists(configPath)) { - DEBUG_LOG("Config file not found, using defaults"); + WARN_LOG("Config file not found, using defaults"); return Config {}; } diff --git a/src/config/config.h b/src/config/config.h index 83120ac..209bd99 100644 --- a/src/config/config.h +++ b/src/config/config.h @@ -12,7 +12,7 @@ #include "src/util/macros.h" #include "weather.h" -using Location = std::variant; +using Location = std::variant; struct General { string name = []() -> string { @@ -26,29 +26,17 @@ struct General { if (const char* envUser = getenv("USER")) return envUser; -#endif + return "User"; +#endif }(); static fn fromToml(const toml::table& tbl) -> General { General gen; - if (auto name = tbl["name"].value()) { + + if (std::optional name = tbl["name"].value()) gen.name = *name; - } else { -#ifdef _WIN32 - std::array username; - DWORD size = sizeof(username); - g.name = GetUserNameA(username.data(), &size) ? username.data() : "User"; -#else - if (struct passwd* pwd = getpwuid(getuid()); pwd) { - gen.name = pwd->pw_name; - } else if (const char* envUser = getenv("USER")) { - gen.name = envUser; - } else { - gen.name = "User"; - } -#endif - } + return gen; } }; @@ -64,22 +52,22 @@ struct NowPlaying { }; struct Weather { - bool enabled = false; - bool show_town_name = false; - Location location; - std::string api_key; - std::string units; + bool enabled = false; + bool show_town_name = false; + Location location; + string api_key; + string units; static fn fromToml(const toml::table& tbl) -> Weather { Weather weather; weather.enabled = tbl["enabled"].value().value_or(false); weather.show_town_name = tbl["show_town_name"].value().value_or(false); - weather.api_key = tbl["api_key"].value().value_or(""); - weather.units = tbl["units"].value().value_or("metric"); + weather.api_key = tbl["api_key"].value().value_or(""); + weather.units = tbl["units"].value().value_or("metric"); if (auto location = tbl["location"]) { if (location.is_string()) { - weather.location = location.value().value(); + weather.location = location.value().value(); } else if (location.is_table()) { const auto* coord = location.as_table(); Coords coords; diff --git a/src/config/weather.cpp b/src/config/weather.cpp index 65d6978..9e04446 100644 --- a/src/config/weather.cpp +++ b/src/config/weather.cpp @@ -4,7 +4,6 @@ #include #include #include -#include #include "weather.h" @@ -12,11 +11,10 @@ #include "src/util/macros.h" namespace fs = std::filesystem; -using namespace nlohmann; using namespace std::string_literals; template -using Result = std::expected; +using Result = std::expected; namespace { constexpr glz::opts glaze_opts = { .error_on_unknown_keys = false }; @@ -46,9 +44,9 @@ namespace { DEBUG_LOG("Reading from cache file..."); try { - const std::string content((std::istreambuf_iterator(ifs)), std::istreambuf_iterator()); - WeatherOutput result; - glz::error_ctx errc = glz::read(result, content); + const string content((std::istreambuf_iterator(ifs)), std::istreambuf_iterator()); + WeatherOutput result; + glz::error_ctx errc = glz::read(result, content); if (errc.ec != glz::error_code::none) return std::unexpected("JSON parse error: " + glz::format_error(errc, content)); @@ -74,7 +72,7 @@ namespace { if (!ofs.is_open()) return std::unexpected("Failed to open temp file: " + tempPath.string()); - std::string jsonStr; + string jsonStr; glz::error_ctx errc = glz::write_json(data, jsonStr); if (errc.ec != glz::error_code::none) @@ -97,16 +95,16 @@ namespace { } catch (const std::exception& e) { return std::unexpected("File operation error: "s + e.what()); } } - fn WriteCallback(void* contents, const size_t size, const size_t nmemb, std::string* str) -> size_t { + fn WriteCallback(void* contents, const size_t size, const size_t nmemb, string* str) -> size_t { const size_t totalSize = size * nmemb; str->append(static_cast(contents), totalSize); return totalSize; } - fn MakeApiRequest(const std::string& url) -> const Result { + fn MakeApiRequest(const string& url) -> const Result { DEBUG_LOG("Making API request to URL: {}", url); - CURL* curl = curl_easy_init(); - std::string responseBuffer; + CURL* curl = curl_easy_init(); + string responseBuffer; if (!curl) return std::unexpected("Failed to initialize cURL"); @@ -162,12 +160,12 @@ fn Weather::getWeatherInfo() const -> WeatherOutput { return *result; }; - if (std::holds_alternative(location)) { - const auto& city = std::get(location); + if (std::holds_alternative(location)) { + const auto& city = std::get(location); char* escaped = curl_easy_escape(nullptr, city.c_str(), static_cast(city.length())); DEBUG_LOG("Requesting city: {}", escaped); - const std::string apiUrl = + const string apiUrl = fmt::format("https://api.openweathermap.org/data/2.5/weather?q={}&appid={}&units={}", escaped, api_key, units); curl_free(escaped); @@ -177,7 +175,7 @@ fn Weather::getWeatherInfo() const -> WeatherOutput { const auto& [lat, lon] = std::get(location); DEBUG_LOG("Requesting coordinates: lat={:.3f}, lon={:.3f}", lat, lon); - const std::string apiUrl = fmt::format( + const string apiUrl = fmt::format( "https://api.openweathermap.org/data/2.5/weather?lat={:.3f}&lon={:.3f}&appid={}&units={}", lat, lon, api_key, units ); diff --git a/src/config/weather.h b/src/config/weather.h index 6f2a10d..ee1e07e 100644 --- a/src/config/weather.h +++ b/src/config/weather.h @@ -7,7 +7,7 @@ // NOLINTBEGIN(readability-identifier-naming) struct Condition { - std::string description; + string description; struct glaze { using T = Condition; @@ -31,7 +31,7 @@ struct Coords { struct WeatherOutput { Main main; - std::string name; + string name; std::vector weather; usize dt;