Windows fmt fs::path formatting errors.

NREL · Jul 20, 2023 · 8279335 · 8279335 · nrel-bot-2b · Jul 20, 2023
1 parent 8888241
commit 8279335
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/src/ConvertInputFormat/main.cpp b/src/ConvertInputFormat/main.cpp
@@ -329,12 +329,7 @@ bool processInput(fs::path const &inputFilePath,
     }
 
     if (!EnergyPlus::FileSystem::fileExists(inputFilePath)) {
-#ifdef _WIN32
-        displayMessage("Input file path {} not found", inputFilePath.string());
-#else
-        displayMessage("Input file path {} not found", inputFilePath);
-#endif
-
+        displayMessage("Input file path {} not found", inputFilePath.generic_string());
         return false;
     }
 
@@ -548,9 +543,10 @@ Select one (case insensitive):
 #pragma omp atomic
             ++fileCount;
             if (successful) {
-                displayMessage("Input file converted to {} successfully | {}/{} | {}", outputTypeStr, fileCount, number_files, files[i]);
+                displayMessage(
+                    "Input file converted to {} successfully | {}/{} | {}", outputTypeStr, fileCount, number_files, files[i].generic_string());
             } else {
-                displayMessage("Input file conversion failed: | {}/{} | {}", fileCount, number_files, files[i]);
+                displayMessage("Input file conversion failed: | {}/{} | {}", fileCount, number_files, files[i].generic_string());
             }
         }
     }
@@ -565,9 +561,9 @@ Select one (case insensitive):
         bool successful = processInput(file, schema, outputType, outputDirectoryPath, outputTypeStr, convertHVACTemplate);
         ++fileCount;
         if (successful) {
-            displayMessage("Input file converted to {} successfully | {}/{} | {}", outputTypeStr, fileCount, number_files, file);
+            displayMessage("Input file converted to {} successfully | {}/{} | {}", outputTypeStr, fileCount, number_files, file.generic_string());
         } else {
-            displayMessage("Input file conversion failed: | {}/{} | {}", fileCount, number_files, file);
+            displayMessage("Input file conversion failed: | {}/{} | {}", fileCount, number_files, file.generic_string());
         }
     }
 #endif

diff --git a/src/EnergyPlus/CommandLineInterface.cc b/src/EnergyPlus/CommandLineInterface.cc
@@ -300,8 +300,8 @@ state.dataStrGlobals->inputFilePath='{}',
                        state.dataGlobal->outputEpJSONConversionOnly,
                        suffixType,
                        state.dataGlobal->numThread,
-                       state.files.inputWeatherFilePath.filePath,
-                       state.dataStrGlobals->inputFilePath);
+                       state.files.inputWeatherFilePath.filePath.generic_string(),
+                       state.dataStrGlobals->inputFilePath.generic_string());
             exit(0);
         }
 
@@ -337,7 +337,8 @@ state.dataStrGlobals->inputFilePath='{}',
                 break;
             default:
                 DisplayString(state,
-                              fmt::format("ERROR: Input file must have IDF, IMF, or epJSON extension: {}", state.dataStrGlobals->inputFilePath));
+                              fmt::format("ERROR: Input file must have IDF, IMF, or epJSON extension: {}",
+                                          state.dataStrGlobals->inputFilePath.generic_string()));
                 if (eplusRunningViaAPI) {
                     return static_cast<int>(ReturnCodes::Failure);
                 } else {

diff --git a/tst/EnergyPlus/unit/CommandLineInterface.unit.cc b/tst/EnergyPlus/unit/CommandLineInterface.unit.cc
@@ -259,7 +259,7 @@ TEST_F(CommandLineInterfaceFixture, IdfDoesNotExist)
     EXPECT_EQ(static_cast<int>(ReturnCodes::Failure), exitcode);
     compare_cout_stream("");
     compare_cerr_stream(delimited_string({
-        fmt::format("input_file: File does not exist: {}", FileSystem::makeNativePath(expectedParams.inputFilePath).string()),
+        fmt::format("input_file: File does not exist: {}", expectedParams.inputFilePath.generic_string()),
         "Run with --help for more information.",
     }));
 }