Small filesystem improvements (#1802)

* #include an absolute path didn't work - because paths were taken to always be relative.

* Small improvements around uniqueIdentify and CacheFileSystem

2 files changed, 31 insertions, 5 deletions

diff --git a/source/core/slang-file-system.cpp b/source/core/slang-file-system.cpp
index 91dd09ff9..8dd01ebf0 100644
--- a/source/core/slang-file-system.cpp
+++ b/source/core/slang-file-system.cpp
@@ -473,19 +473,43 @@ SlangResult CacheFileSystem::_calcUniqueIdentity(const String& path, String& out
         case UniqueIdentityMode::SimplifyPathAndHash:
         case UniqueIdentityMode::Hash:
         {
+            // If m_uniqueIdentityMode is SimplifyPathAndHash, the path will already be simplified before this function is hit (and it hasn't been found
+            // via path lookup). That being the case only option left is to 'hash' (or fallback to backing impls uniqueIdentity impl)
+
             // If we don't have a file system -> assume cannot be found
             if (m_fileSystem == nullptr)
             {
                 return SLANG_E_NOT_FOUND;
             }
 
-            // I can only see if this is the same file as already loaded by loading the file and doing a hash
+            // First attempt to load as a file
             Result res = m_fileSystem->loadFile(path.getBuffer(), outFileContents.writeRef());
-            if (SLANG_FAILED(res) || outFileContents == nullptr)
+
+            // If it succeeded but there is no contents, then make the result NOT_FOUND
+            res = (SLANG_SUCCEEDED(res) && outFileContents == nullptr) ? SLANG_E_NOT_FOUND : res;
+
+            // If that failed, we may be able to do something if m_fileSystemExt is available
+            if (SLANG_FAILED(res))
             {
-                return SLANG_FAIL;
+                // If we have m_fileSystemExt interface we can just use it's implementation, as a fallback.
+                // Doing so will mean the uniqueIdentity will work if say it's a directory
+                if (m_fileSystemExt)
+                {
+                    ComPtr<ISlangBlob> uniqueIdentity;
+                    SLANG_RETURN_ON_FAIL(m_fileSystemExt->getFileUniqueIdentity(path.getBuffer(), uniqueIdentity.writeRef()));
+                    // Get the path as a string
+                    outUniqueIdentity = StringUtil::getString(uniqueIdentity);
+                    return SLANG_OK;
+                }
+               
+                // If we can't access as a file (or use the backing implementations impl), we are in a tricky situation.
+                // The ISlangFileSystem interface provides no way to determine if the path is a directory for example -
+                // so there is no way of determining if something along the path exists.
+                // 
+                // So we just return the error.
+                return res;
             }
-             
+ 
             // Calculate the hash on the contents
             const uint64_t hash = getHashCode64((const char*)outFileContents->getBufferPointer(), outFileContents->getBufferSize());
 
diff --git a/source/core/slang-file-system.h b/source/core/slang-file-system.h
index 1a27ddc83..8a9cfb811 100644
--- a/source/core/slang-file-system.h
+++ b/source/core/slang-file-system.h
@@ -176,7 +176,9 @@ class CacheFileSystem: public ISlangFileSystemExt, public RefObject
 
 protected:
     
-        /// Given a path, works out a uniqueIdentity, based on the uniqueIdentityMode. outFileContents will be set if file had to be read to produce the uniqueIdentity (ie with Hash)
+        /// Given a path, works out a uniqueIdentity, based on the uniqueIdentityMode.
+        /// outFileContents will be set if file had to be read to produce the uniqueIdentity (ie with Hash)
+        /// If the file doesn't have to be read, then outFileContents will be nullptr, even if it is backed by a file.
     SlangResult _calcUniqueIdentity(const String& path, String& outUniqueIdentity, ComPtr<ISlangBlob>& outFileContents);
 
         /// For a given path gets a PathInfo. Can return nullptr, if it is not possible to create the PathInfo for some reason