filesystem: Fix issues related to create_directories

f3d-app · Jan 5, 2025 · ccb2e6d · ccb2e6d
1 parent 9d93ad0
commit ccb2e6d
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/library/src/image.cxx b/library/src/image.cxx
@@ -479,8 +479,12 @@ const image& image::save(const fs::path& filePath, SaveFormat format) const
 
   try
   {
-    // Ensure the directories exists
-    fs::create_directories(filePath.parent_path());
+    // Ensure the directories exists if not empty
+    fs::path parent = filePath.parent_path();
+    if (!parent.empty())
+    {
+      fs::create_directories(parent);
+    }
 
     writer->SetFileName(filePath.string().c_str());
     writer->SetInputData(this->Internals->Image);

diff --git a/library/src/interactor_impl.cxx b/library/src/interactor_impl.cxx
@@ -1185,8 +1185,12 @@ bool interactor_impl::recordInteraction(const fs::path& file)
 
   try
   {
-    // Ensure parent directories exists
-    fs::create_directories(file.parent_path());
+    // Ensure parent directories exists if not empty
+    fs::path parent = file.parent_path();
+    if (!parent.empty())
+    {
+      fs::create_directories(parent);
+    }
 
     // Make sure the recorder is off and streams are cleared
     this->Internals->Recorder->Off();

diff --git a/library/src/window_impl.cxx b/library/src/window_impl.cxx
@@ -553,6 +553,16 @@ void window_impl::SetCachePath(const fs::path& cachePath)
 {
   try
   {
+    if (cachePath.empty())
+    {
+      throw engine::cache_exception("Provided cache path is empty");
+    }
+
+    if (!fs::is_directory(cachePath))
+    {
+      throw engine::cache_exception("Provided cache path is not a directory: " + cachePath.string());
+    }
+
     // create directories if they do not exist
     fs::create_directories(cachePath);
   }

diff --git a/library/testing/TestSDKEngineExceptions.cxx b/library/testing/TestSDKEngineExceptions.cxx
@@ -22,6 +22,10 @@ int TestSDKEngineExceptions(int argc, char* argv[])
       "get non-existent interactor", [&]() { std::ignore = eng.getInteractor(); });
 
     // Test setCachePath error handling
+    test.expect<f3d::engine::cache_exception>("set cache path with empty name",
+      [&]() { eng.setCachePath(""); });
+    test.expect<f3d::engine::cache_exception>("set cache path with non directory name",
+      [&]() { eng.setCachePath("/path/to/file.ext"); });
     test.expect<f3d::engine::cache_exception>("set cache path with invalid long name",
       [&]() { eng.setCachePath("/" + std::string(257, 'x')); });