Improved exceptions when a file path containing invalid characters is…

… provided. On Windows (under visual studio) if a std::filesystem::path contains ':', extension() returns empty string. There's not an obvious method within std::filesystem to check a path for bad characters.
FLAMEGPU · Oct 28, 2024 · ba93b32 · ba93b32
1 parent f33efe7
commit ba93b32
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/include/flamegpu/io/LoggerFactory.h b/include/flamegpu/io/LoggerFactory.h
@@ -31,9 +31,12 @@ class LoggerFactory {
             return std::make_unique<XMLLogger>(output_path, prettyPrint, truncateFile);
         } else if (extension == ".json") {
             return std::make_unique<JSONLogger>(output_path, prettyPrint, truncateFile);
+        } else if (extension.empty()) {
+                THROW exception::InvalidFilePath("Filepath '%s' contains unsuitable characters or lacks a file extension, "
+                    "in LoggerFactory::createLogger().", output_path.c_str());
         }
         THROW exception::UnsupportedFileType("File '%s' is not a type which can be written "
-            "by StateWriterFactory::createLogger().",
+            "by LoggerFactory::createLogger().",
             output_path.c_str());
     }
 };

diff --git a/include/flamegpu/io/StateReaderFactory.h b/include/flamegpu/io/StateReaderFactory.h
@@ -37,6 +37,9 @@ class StateReaderFactory {
             return new XMLStateReader();
         } else if (extension == ".json") {
             return new JSONStateReader();
+        } else if (extension.empty()) {
+                THROW exception::InvalidFilePath("Filepath '%s' contains unsuitable characters or lacks a file extension, "
+                    "in StateReaderFactory::createLogger().", input.c_str());
         }
         THROW exception::UnsupportedFileType("File '%s' is not a type which can be read "
             "by StateReaderFactory::createReader().",

diff --git a/include/flamegpu/io/StateWriterFactory.h b/include/flamegpu/io/StateWriterFactory.h
@@ -32,6 +32,9 @@ class StateWriterFactory {
             return new XMLStateWriter();
         } else if (extension == ".json") {
             return new JSONStateWriter();
+        } else if (extension.empty()) {
+            THROW exception::InvalidFilePath("Filepath '%s' contains unsuitable characters or lacks a file extension, "
+                "in StateWriterFactory::createLogger().", output_file.c_str());
         }
         THROW exception::UnsupportedFileType("File '%s' is not a type which can be written "
             "by StateWriterFactory::createWriter().",