trilader
/
yttui
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Show configuration file location if the API key isn't specified

This commit is contained in:
Daniel Schulte 2020-11-26 19:40:11 +01:00
parent 9e50c06ceb
commit 806e45fc5c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main.cpp
View File

@ -451,9 +451,10 @@ int main()
curl_global_init(CURL_GLOBAL_ALL); curl_global_init(CURL_GLOBAL_ALL);
tp_init(); tp_init();
std::string config_file;
nlohmann::json config; nlohmann::json config;
for(const std::string &location: config_locations) { for(const std::string &location: config_locations) {
std::string config_file(location + "yttui.conf"); config_file = location + "/yttui.conf";
auto config_data = load_json(config_file); auto config_data = load_json(config_file);
if(config_data) { if(config_data) {
config = *config_data; config = *config_data;
@ -463,7 +464,7 @@ int main()
if(config.count("apiKey") && config["apiKey"].is_string()) { if(config.count("apiKey") && config["apiKey"].is_string()) {
yt_config.api_key = config["apiKey"]; yt_config.api_key = config["apiKey"];
} else { } else {
tui_abort("A YouTube API key is required for this application to function.\n Please provide one in the config file."); tui_abort("A YouTube API key is required for this application to function.\nPlease provide one in the config file.\n\nCurrent config file:\n" + config_file);
} }
if(config.count("extraHeaders") && config["extraHeaders"].is_array()) { if(config.count("extraHeaders") && config["extraHeaders"].is_array()) {
for(const json &elem: config["extraHeaders"]) { for(const json &elem: config["extraHeaders"]) {