pupbrained/draconisplusplus
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

suckle

Browse source
This commit is contained in:
Mars 2025-04-20 18:19:23 -04:00
parent a5cdc09156
commit 96c6e79780
Signed by: pupbrained
GPG key ID: 874E22DF2F9DFCB5
10 changed files with 177 additions and 202 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/config/weather.cpp
View file

@ -2,7 +2,6 @@
#include <curl/curl.h>
#include <expected>
#include <filesystem>
#include <fmt/core.h>
#include <fstream>
#include "weather.h"
@ -114,7 +113,7 @@ namespace {
curl_easy_cleanup(curl);
if (res != CURLE_OK)
return std::unexpected(fmt::format("cURL error: {}", curl_easy_strerror(res)));
return std::unexpected(std::format("cURL error: {}", curl_easy_strerror(res)));
WeatherOutput output;
@ -160,7 +159,7 @@ fn Weather::getWeatherInfo() const -> WeatherOutput {
DEBUG_LOG("Requesting city: {}", escaped);
const string apiUrl =
fmt::format("https://api.openweathermap.org/data/2.5/weather?q={}&appid={}&units={}", escaped, api_key, units);
std::format("https://api.openweathermap.org/data/2.5/weather?q={}&appid={}&units={}", escaped, api_key, units);
curl_free(escaped);
return handleApiResult(MakeApiRequest(apiUrl));
@ -169,7 +168,7 @@ fn Weather::getWeatherInfo() const -> WeatherOutput {
const auto& [lat, lon] = std::get<Coords>(location);
DEBUG_LOG("Requesting coordinates: lat={:.3f}, lon={:.3f}", lat, lon);
const string apiUrl = fmt::format(
const string apiUrl = std::format(
"https://api.openweathermap.org/data/2.5/weather?lat={:.3f}&lon={:.3f}&appid={}&units={}", lat, lon, api_key, units
);