RPJosh
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(config): drop getValidPath

pull/1243/head
Aleksei Bavshin 2021-08-13 08:19:12 -07:00
parent 1f7d399b8e
commit 1f16d7955d
No known key found for this signature in database
GPG Key ID: 4F071603387A382A
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/config.cpp
View File

@ -33,16 +33,6 @@ std::optional<std::string> tryExpandPath(const std::string &path) {
return std::nullopt; return std::nullopt;
} }
const std::string getValidPath(const std::vector<std::string> &paths) {
for (const std::string &path : paths) {
if (auto res = tryExpandPath(path); res) {
return res.value();
}
}
return std::string();
}
std::optional<std::string> Config::findConfigPath(const std::vector<std::string> &names, std::optional<std::string> Config::findConfigPath(const std::vector<std::string> &names,
const std::vector<std::string> &dirs) { const std::vector<std::string> &dirs) {
std::vector<std::string> paths; std::vector<std::string> paths;
@ -82,11 +72,11 @@ void Config::resolveConfigIncludes(Json::Value &config, int depth) {
if (includes.isArray()) { if (includes.isArray()) {
for (const auto &include : includes) { for (const auto &include : includes) {
spdlog::info("Including resource file: {}", include.asString()); spdlog::info("Including resource file: {}", include.asString());
setupConfig(getValidPath({include.asString()}), ++depth); setupConfig(tryExpandPath(include.asString()).value_or(""), ++depth);
} }
} else if (includes.isString()) { } else if (includes.isString()) {
spdlog::info("Including resource file: {}", includes.asString()); spdlog::info("Including resource file: {}", includes.asString());
setupConfig(getValidPath({includes.asString()}), ++depth); setupConfig(tryExpandPath(includes.asString()).value_or(""), ++depth);
} }
} }