internal: fixes to config path handling

hyprwm · Feb 12, 2024 · 689b405 · 689b405
1 parent dbe5835
commit 689b405
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/src/config.cpp b/src/config.cpp
@@ -30,19 +30,12 @@ static std::string removeBeginEndSpacesTabs(std::string str) {
 }
 
 CConfig::CConfig(const char* path, const Hyprlang::SConfigOptions& options) {
-    impl = new CConfigImpl;
-    try {
-        impl->path = std::filesystem::canonical(path);
-    } catch (std::exception& e) {
-        if (!options.allowMissingConfig)
-            throw "Couldn't open file. File does not exist";
-    }
+    impl       = new CConfigImpl;
+    impl->path = path;
 
     if (!std::filesystem::exists(impl->path)) {
         if (!options.allowMissingConfig)
             throw "File does not exist";
-
-        impl->path = "";
     }
 
     impl->envVariables.clear();
@@ -543,11 +536,20 @@ CParseResult CConfig::parse() {
         applyDefaultsToCat(*sc);
     }
 
+    bool fileExists = std::filesystem::exists(impl->path);
+
     // implies options.allowMissingConfig
-    if (impl->path.empty())
+    if (impl->configOptions.allowMissingConfig && !fileExists)
         return CParseResult{};
+    else if (!fileExists) {
+        CParseResult res;
+        res.setError("Config file is missing");
+        return res;
+    }
+
+    std::string  canonical = std::filesystem::canonical(impl->path);
 
-    CParseResult fileParseResult = parseFile(impl->path.c_str());
+    CParseResult fileParseResult = parseFile(canonical.c_str());
 
     return fileParseResult;
 }

diff --git a/src/config.hpp b/src/config.hpp
@@ -55,7 +55,8 @@ struct SSpecialCategory {
 
 class CConfigImpl {
   public:
-    std::string                                              path = "";
+    std::string                                              path         = "";
+    std::string                                              originalPath = "";
 
     std::unordered_map<std::string, Hyprlang::CConfigValue>  values;
     std::unordered_map<std::string, SConfigDefaultValue>     defaultValues;