Change file utility functions to return std::filesystem::path

src/core/include/cesium/omniverse/FilesystemUtil.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <string>
+#include <filesystem>
 
 namespace cesium::omniverse::FilesystemUtil {
-std::string getCesiumCacheDirectory();
-std::string getUserHomeDirectory();
+std::filesystem::path getCesiumCacheDirectory();
+std::filesystem::path getUserHomeDirectory();
 } // namespace cesium::omniverse::FilesystemUtil

src/core/src/Context.cpp

@@ -38,9 +38,8 @@ namespace cesium::omniverse {
 namespace {
 
 std::string getCacheDatabaseName() {
-    std::string cacheDir = FilesystemUtil::getCesiumCacheDirectory();
-    if (!cacheDir.empty()) {
-        std::filesystem::path cacheDirPath(cacheDir);
+    auto cacheDirPath = FilesystemUtil::getCesiumCacheDirectory();
+    if (!cacheDirPath.empty()) {
         auto cacheFilePath = cacheDirPath / "cesium-request-cache.sqlite";
         return cacheFilePath.generic_string();
     }
@@ -54,7 +53,7 @@ std::shared_ptr<CesiumAsync::ICacheDatabase> makeCacheDatabase(const std::shared
         return {};
     } else if (auto dbName = getCacheDatabaseName(); !dbName.empty()) {
         logger->oneTimeWarning(fmt::format("Cesium cache file: {}", dbName));
-        return std::make_shared<CesiumAsync::SqliteCache>(logger, getCacheDatabaseName(), maxCacheItems);
+        return std::make_shared<CesiumAsync::SqliteCache>(logger, dbName, maxCacheItems);
     }
     logger->oneTimeWarning("could not get name for cache database");
     return {};

src/core/src/FilesystemUtil.cpp

@@ -17,7 +17,7 @@
 
 namespace cesium::omniverse::FilesystemUtil {
 
-std::string getCesiumCacheDirectory() {
+std::filesystem::path getCesiumCacheDirectory() {
     auto f = carb::getFramework();
     auto* tokensInterface = f->tryAcquireInterface<carb::tokens::ITokens>();
     std::string cacheDir;
@@ -27,7 +27,7 @@ std::string getCesiumCacheDirectory() {
     if (!cacheDir.empty()) {
         std::filesystem::path cacheDirPath(cacheDir);
         if (exists(cacheDirPath)) {
-            return cacheDirPath.generic_string();
+            return cacheDirPath;
         }
         // Should we create the directory if it doesn't exist? It's hard to believe that Omniverse
         // won't have already created it.
@@ -37,15 +37,15 @@ std::string getCesiumCacheDirectory() {
         std::filesystem::path homeDirPath(homeDir);
         auto cacheDirPath = homeDirPath / ".nvidia-omniverse";
         if (exists(cacheDirPath)) {
-            return cacheDirPath.generic_string();
+            return cacheDirPath;
         }
     }
     return {};
 }
 
 // Quite a lot of ceremony to get the home directory.
 
-std::string getUserHomeDirectory() {
+std::filesystem::path getUserHomeDirectory() {
     std::string homeDir;
 #if defined(__linux__)
     if (char* cString = std::getenv("HOME")) {