print_config_info: change file handling in GetConfigPaths

Author: NaniNoni

application/F3DConfigFileTools.cxx

@@ -62,16 +62,9 @@ std::vector<fs::path> GetConfigPaths(const std::string& configSearch)
 
       for (const auto& configName : configNames)
       {
-        configPath = dir / (configName);
-        if (fs::exists(configPath))
-        {
-          f3d::log::debug("Config file found: ", configPath.string());
-          paths.emplace_back(configPath);
-        }
-        else
-        {
-          f3d::log::debug("Candidate config file not found: ", configPath.string());
-        }
+        configPath = dir / configName;
+        paths.emplace_back(configPath);
+        f3d::log::debug("Found potential config file: ", configPath.string());
       }
     }
     catch (const fs::filesystem_error&)
@@ -129,7 +122,16 @@ F3DConfigFileTools::ParsedConfigFiles F3DConfigFileTools::ReadConfigFiles(
     }
     catch (const fs::filesystem_error&)
     {
-      f3d::log::error("Configuration file does not exist: ", configPath.string(), " , ignoring it");
+      // This (file not found) error is expected in dry run mode
+      if (dryRun)
+      {
+        f3d::log::print(logLevel, "Found available config location ", configPath.string());
+      }
+      else
+      {
+        f3d::log::debug(
+          "Configuration file does not exist: ", configPath.string(), " , ignoring it");
+      }
       continue;
     }
 
@@ -157,16 +159,17 @@ F3DConfigFileTools::ParsedConfigFiles F3DConfigFileTools::ReadConfigFiles(
     f3d::log::print(logLevel, "Configuration file for \"", configSearch, "\" could not be found");
   }
 
-  // Clear config file paths to avoid reading them if dryRun is set
-  if (dryRun)
-  {
-    actualConfigFilePaths.clear();
-  }
-
   // Read config files
   F3DOptionsTools::OptionsEntries optionsEntries;
   F3DOptionsTools::OptionsEntries imperativeOptionsEntries;
   F3DConfigFileTools::BindingsEntries bindingsEntries;
+  // Return early to avoid reading any config files
+  if (dryRun)
+  {
+    return F3DConfigFileTools::ParsedConfigFiles{ std::move(optionsEntries),
+      std::move(imperativeOptionsEntries), std::move(bindingsEntries) };
+  }
+
   for (const auto& configFilePath : actualConfigFilePaths)
   {
     std::ifstream file(configFilePath);

application/F3DConfigFileTools.h

@@ -25,6 +25,8 @@ struct ParsedConfigFiles
 /**
  * Read config files using userConfig if any, return a ParsedConfigFiles
  * containing ordered optionDict, ordered imperative optionDict and ordered bindingsEntries
+ * If dryRun is set, config files won't be read
+ * logLevel determines the VerboseLevel of any non-warning/error log calls
  */
 ParsedConfigFiles ReadConfigFiles(
   const std::string& userConfig, bool dryRun, f3d::log::VerboseLevel logLevel);