hyprwm
/
hyprlang
mirror of https://github.com/hyprwm/hyprlang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configOptions: add allowMissingConfig

This commit is contained in:
Vaxry 2023-12-31 01:59:37 +01:00
parent 0d7d03363b
commit 1210de188c
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/hyprlang.hpp
View File

@ -69,6 +69,12 @@ namespace Hyprlang {
Return all errors instead of just the first Return all errors instead of just the first
*/ */
bool throwAllErrors = false; bool throwAllErrors = false;
/*!
@since 0.2.0
Don't throw on a missing config file. Carry on as if nothing happened.
*/
bool allowMissingConfig = false;
}; };
/*! /*!

15
src/config.cpp
View File

@ -32,11 +32,18 @@ CConfig::CConfig(const char* path, const Hyprlang::SConfigOptions& options) {
impl = new CConfigImpl; impl = new CConfigImpl;
try { try {
impl->path = std::filesystem::canonical(path); impl->path = std::filesystem::canonical(path);
} catch (std::exception& e) { throw "Couldn't open file. File does not exist"; } } catch (std::exception& e) {
if (!options.allowMissingConfig)
throw "Couldn't open file. File does not exist";
}
if (!std::filesystem::exists(impl->path)) if (!std::filesystem::exists(impl->path)) {
if (!options.allowMissingConfig)
throw "File does not exist"; throw "File does not exist";
impl->path = "";
}
impl->envVariables.clear(); impl->envVariables.clear();
for (char** env = environ; *env; ++env) { for (char** env = environ; *env; ++env) {
const std::string ENVVAR = *env ? *env : ""; const std::string ENVVAR = *env ? *env : "";
@ -496,6 +503,10 @@ CParseResult CConfig::parse() {
applyDefaultsToCat(*sc); applyDefaultsToCat(*sc);
} }
// implies options.allowMissingConfig
if (impl->path.empty())
return CParseResult{};
CParseResult fileParseResult = parseFile(impl->path); CParseResult fileParseResult = parseFile(impl->path);
return fileParseResult; return fileParseResult;