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

lib: fixup theme name matching

This commit is contained in:
Vaxry 2024-03-25 11:54:29 +00:00
parent 44d46e45a1
commit 1a1fcfb58d
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libhyprcursor/hyprcursor.cpp
View File

@ -128,7 +128,7 @@ static std::string getFullPathForThemeName(const std::string& name, PHYPRCURSORL
const std::string NAME = std::any_cast<Hyprlang::STRING>(manifest->getConfigValue("name")); const std::string NAME = std::any_cast<Hyprlang::STRING>(manifest->getConfigValue("name"));
if (NAME != name) if (NAME != name && name != themeDir.path().stem().string())
continue; continue;
Debug::log(HC_LOG_INFO, logfn, "getFullPathForThemeName: found {}", themeDir.path().string()); Debug::log(HC_LOG_INFO, logfn, "getFullPathForThemeName: found {}", themeDir.path().string());
@ -146,18 +146,29 @@ static std::string getFullPathForThemeName(const std::string& name, PHYPRCURSORL
if (!themeDir.is_directory()) if (!themeDir.is_directory())
continue; continue;
if (!name.empty() && themeDir.path().stem().string() != name)
continue;
if (!themeAccessible(themeDir.path().string())) if (!themeAccessible(themeDir.path().string()))
continue; continue;
const auto MANIFESTPATH = themeDir.path().string() + "/manifest.hl"; const auto MANIFESTPATH = themeDir.path().string() + "/manifest.hl";
if (std::filesystem::exists(MANIFESTPATH)) { if (!std::filesystem::exists(MANIFESTPATH))
Debug::log(HC_LOG_INFO, logfn, "getFullPathForThemeName: found {}", themeDir.path().string()); continue;
return std::filesystem::canonical(themeDir.path()).string();
} std::unique_ptr<Hyprlang::CConfig> manifest;
try {
manifest = std::make_unique<Hyprlang::CConfig>(MANIFESTPATH.c_str(), Hyprlang::SConfigOptions{});
manifest->addConfigValue("name", Hyprlang::STRING{""});
manifest->commence();
manifest->parse();
} catch (const char* e) { continue; }
const std::string NAME = std::any_cast<Hyprlang::STRING>(manifest->getConfigValue("name"));
if (NAME != name && name != themeDir.path().stem().string())
continue;
Debug::log(HC_LOG_INFO, logfn, "getFullPathForThemeName: found {}", themeDir.path().string());
return std::filesystem::canonical(themeDir.path()).string();
} }
} }

2
tests/test.cpp
View File

@ -11,7 +11,7 @@ void logFunction(enum eHyprcursorLogLevel level, char* message) {
*/ */
int main(int argc, char** argv) { int main(int argc, char** argv) {
Hyprcursor::CHyprcursorManager mgr(nullptr, logFunction); Hyprcursor::CHyprcursorManager mgr("classicFlatHypr", logFunction);
if (!mgr.valid()) { if (!mgr.valid()) {
std::cout << "mgr is invalid\n"; std::cout << "mgr is invalid\n";