From acfe00ef21a904b9818704dfb8716600ac55f335 Mon Sep 17 00:00:00 2001 From: trilader Date: Sun, 22 Nov 2020 23:44:33 +0100 Subject: [PATCH] Use nlohmann::json::count so it works with the version shipped in Debian 10 --- main.cpp | 8 ++++---- yt.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/main.cpp b/main.cpp index f13ef04..8f91d75 100644 --- a/main.cpp +++ b/main.cpp @@ -410,19 +410,19 @@ int main() break; } } - if(config.contains("apiKey") && config["apiKey"].is_string()) { + if(config.count("apiKey") && config["apiKey"].is_string()) { yt_config.api_key = config["apiKey"]; } else { tui_abort("A YouTube API key is required for this application to function.\n Please provide one in the config file."); } - if(config.contains("extraHeaders") && config["extraHeaders"].is_array()) { + if(config.count("extraHeaders") && config["extraHeaders"].is_array()) { for(const json &elem: config["extraHeaders"]) { - if(elem.contains("key") && elem["key"].is_string() && elem.contains("value") && elem["value"].is_string()) { + if(elem.count("key") && elem["key"].is_string() && elem.count("value") && elem["value"].is_string()) { yt_config.extra_headers.emplace(elem["key"], elem["value"]); } } } - if(config.contains("database") && config["database"].is_string()) { + if(config.count("database") && config["database"].is_string()) { database_filename = config["database"]; } diff --git a/yt.cpp b/yt.cpp index e14d40e..3100dcd 100644 --- a/yt.cpp +++ b/yt.cpp @@ -217,7 +217,7 @@ void Channel::fetch_new_videos(sqlite3 *db, progress_info *info, std::optional