hyprwm/hyprcursor
1
0
Fork 0
mirror of https://github.com/hyprwm/hyprcursor.git synced 2024-11-16 18:25:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

util: err out on invalid manifest/meta

Browse source
This commit is contained in:
Vaxry 2024-03-11 20:28:34 +00:00
parent 05db7dfd7f
commit ea1c1ff897
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
hyprcursor-util/src/main.cpp
View file

@ -141,7 +141,9 @@ static std::optional<std::string> createCursorThemeFromPath(const std::string& p
manifest->addConfigValue("description", Hyprlang::STRING{""}); manifest->addConfigValue("description", Hyprlang::STRING{""});
manifest->addConfigValue("version", Hyprlang::STRING{""}); manifest->addConfigValue("version", Hyprlang::STRING{""});
manifest->commence(); manifest->commence();
manifest->parse(); const auto RESULT = manifest->parse();
if (RESULT.error)
return "Manifest has errors: \n" + std::string{RESULT.getError()};
} catch (const char* err) { return "failed parsing manifest: " + std::string{err}; } } catch (const char* err) { return "failed parsing manifest: " + std::string{err}; }
const std::string THEMENAME = std::any_cast<Hyprlang::STRING>(manifest->getConfigValue("name")); const std::string THEMENAME = std::any_cast<Hyprlang::STRING>(manifest->getConfigValue("name"));
@ -173,7 +175,10 @@ static std::optional<std::string> createCursorThemeFromPath(const std::string& p
meta->registerHandler(::parseDefineSize, "define_size", {.allowFlags = false}); meta->registerHandler(::parseDefineSize, "define_size", {.allowFlags = false});
meta->registerHandler(::parseOverride, "define_override", {.allowFlags = false}); meta->registerHandler(::parseOverride, "define_override", {.allowFlags = false});
meta->commence(); meta->commence();
meta->parse(); const auto RESULT = meta->parse();
if (RESULT.error)
return "meta.hl has errors: \n" + std::string{RESULT.getError()};
} catch (const char* err) { return "failed parsing meta (" + METAPATH + "): " + std::string{err}; } } catch (const char* err) { return "failed parsing meta (" + METAPATH + "): " + std::string{err}; }
// check if we have at least one image. // check if we have at least one image.