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

Path: simplify

Browse source
This commit is contained in:
Mihai Fufezan 2024-09-10 19:59:07 +03:00
parent 4fb47606be
commit 360fb14385
Signed by: fufexan
SSH key fingerprint: SHA256:SdnKmEpJrDu1+2UO1QpB/Eg4HKcdDi6n+xSRqFNJVpg
1 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/path/Path.cpp
View file

@ -51,36 +51,42 @@ namespace Hyprutils::Path {
using T = std::optional<std::string>;
std::pair<T, T> findConfig(std::string programName) {
std::string configPath;
bool xdgConfigHomeExists = false;
static const auto xdgConfigHome = getXdgConfigHome();
if (xdgConfigHome.has_value()) {
xdgConfigHomeExists = true;
if (checkConfigExists(xdgConfigHome.value(), programName))
return std::make_pair(fullConfigPath(xdgConfigHome.value(), programName), xdgConfigHome);
Debug::log(INFO, "No config file could be found in {}/{}", xdgConfigHome.value(), programName);
configPath = fullConfigPath(xdgConfigHome.value(), programName);
if (std::filesystem::exists(configPath))
return std::make_pair(configPath, xdgConfigHome);
Debug::log(INFO, "No config file {}", configPath);
}
bool homeExists = false;
static const auto home = getHome();
if (home.has_value()) {
homeExists = true;
if (checkConfigExists(home.value(), programName))
return std::make_pair(fullConfigPath(home.value(), programName), home);
Debug::log(INFO, "No config file could be found in {}/{}", home.value(), programName);
configPath = fullConfigPath(home.value(), programName);
if (std::filesystem::exists(configPath))
return std::make_pair(configPath, home);
Debug::log(INFO, "No config file {}", configPath);
}
static const auto xdgConfigDirs = getXdgConfigDirs();
if (xdgConfigDirs.has_value()) {
for (auto dir : xdgConfigDirs.value()) {
if (checkConfigExists(dir, programName))
return std::make_pair(fullConfigPath(dir, programName), std::nullopt);
Debug::log(INFO, "No config file could be found in {}/{}", dir, programName);
configPath = fullConfigPath(dir, programName);
if (std::filesystem::exists(configPath))
return std::make_pair(configPath, std::nullopt);
Debug::log(INFO, "No config file {}", configPath);
}
}
if (checkConfigExists("/etc/xdg", programName))
return std::make_pair(fullConfigPath("/etc/xdg", programName), std::nullopt);
Debug::log(INFO, "No config file could be found in /etc/xdg/{}", programName);
configPath = fullConfigPath("/etc/xdg", programName);
if (std::filesystem::exists(configPath))
return std::make_pair(configPath, std::nullopt);
Debug::log(INFO, "No config file {}", configPath);
if (xdgConfigHomeExists)
return std::make_pair(std::nullopt, xdgConfigHome);