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

Merge pull request #4333 from Arkoniak/relative_paths_in_includes

Browse Source 
Relative paths in included configs
This commit is contained in:
Alexis Rouillard
2025-08-08 08:53:55 +02:00
committed by GitHub
parent 61b3c6d7d1 1e0037a873
commit 07d3a4da10
4 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/config.cpp
View File

@ -106,19 +106,33 @@ void Config::setupConfig(Json::Value &dst, const std::string &config_file, int d
mergeConfig(dst, tmp_config);
}
std::optional<std::string> Config::findIncludePath(const std::string &name) {
auto match1 = tryExpandPath(name, "");
if (!match1.empty()) {
return match1.front();
}
return findConfigPath({name});
}
void Config::resolveConfigIncludes(Json::Value &config, int depth) {
Json::Value includes = config["include"];
if (includes.isArray()) {
for (const auto &include : includes) {
spdlog::info("Including resource file: {}", include.asString());
for (const auto &match : tryExpandPath(include.asString(), "")) {
setupConfig(config, match, depth + 1);
auto match = findIncludePath(include.asString());
if (match.has_value()) {
setupConfig(config, match.value(), depth + 1);
} else {
spdlog::warn("Unable to find resource file: {}", include.asString());
}
}
} else if (includes.isString()) {
spdlog::info("Including resource file: {}", includes.asString());
for (const auto &match : tryExpandPath(includes.asString(), "")) {
setupConfig(config, match, depth + 1);
auto match = findIncludePath(includes.asString());
if (match.has_value()) {
setupConfig(config, match.value(), depth + 1);
} else {
spdlog::warn("Unable to find resource file: {}", includes.asString());
}
}
}