[bugfix] Fileutils iOS isDirectory (#20079)

Author: PatriceJiang

cocos/platform/CCFileUtils.cpp

@@ -800,6 +800,11 @@ std::string FileUtils::getPathForFilename(const std::string& filename, const std
     return path;
 }
 
+std::string FileUtils::getPathForDirectory(const std::string &dir, const std::string &resolutionDiretory, const std::string &searchPath) const
+{
+    return searchPath + resolutionDiretory + dir;
+}
+
 std::string FileUtils::fullPathForFilename(const std::string &filename) const
 {
 
@@ -880,14 +885,14 @@ std::string FileUtils::fullPathForDirectory(const std::string &dir) const
         longdir +="/";
     }
 
+    const std::string newdirname( getNewFilename(longdir) );
+    
     for (const auto& searchIt : _searchPathArray)
     {
         for (const auto& resolutionIt : _searchResolutionsOrderArray)
         {
-            fullpath = searchIt + longdir + resolutionIt;
-            auto exists = isDirectoryExistInternal(fullpath);
-
-            if (exists && !fullpath.empty())
+            fullpath = this->getPathForDirectory(newdirname, resolutionIt, searchIt);
+            if (!fullpath.empty() && isDirectoryExistInternal(fullpath))
             {
                 // Using the filename passed in as key.
                 _fullPathCacheDir.emplace(dir, fullpath);
@@ -1151,30 +1156,10 @@ bool FileUtils::isDirectoryExist(const std::string& dirPath) const
     if (isAbsolutePath(dirPath))
     {
         return isDirectoryExistInternal(dirPath);
+    } else {
+        auto fullPath = fullPathForDirectory(dirPath);
+        return !fullPath.empty();
     }
-
-    // Already Cached ?
-    auto cacheIter = _fullPathCacheDir.find(dirPath);
-    if( cacheIter != _fullPathCacheDir.end() )
-    {
-        return isDirectoryExistInternal(cacheIter->second);
-    }
-
-    std::string fullpath;
-    for (const auto& searchIt : _searchPathArray)
-    {
-        for (const auto& resolutionIt : _searchResolutionsOrderArray)
-        {
-            // searchPath + file_path + resourceDirectory
-            fullpath = fullPathForDirectory(searchIt + dirPath + resolutionIt);
-            if (isDirectoryExistInternal(fullpath))
-            {
-                _fullPathCacheDir.emplace(dirPath, fullpath);
-                return true;
-            }
-        }
-    }
-    return false;
 }
 
 void FileUtils::isDirectoryExist(const std::string& fullPath, std::function<void(bool)> callback) const

cocos/platform/CCFileUtils.h

@@ -879,6 +879,9 @@ class CC_DLL FileUtils
      */
     virtual std::string getPathForFilename(const std::string& filename, const std::string& resolutionDirectory, const std::string& searchPath) const;
 
+    virtual std::string getPathForDirectory(const std::string &dir, const std::string &resolutionDiretory, const std::string &searchPath) const;
+    
+    
     /**
      *  Gets full path for the directory and the filename.
      *
@@ -890,8 +893,8 @@ class CC_DLL FileUtils
      *  @return The full path of the file, if the file can't be found, it will return an empty string.
      */
     virtual std::string getFullPathForFilenameWithinDirectory(const std::string& directory, const std::string& filename) const;
-
-
+    
+ 
     /**
      * Returns the fullpath for a given dirname.
      * @since 3.17.1

cocos/platform/apple/CCFileUtils-apple.h

@@ -62,6 +62,8 @@ class CC_DLL FileUtilsApple : public FileUtils
 #endif
 
     virtual bool createDirectory(const std::string& path) const override;
+    virtual std::string getPathForDirectory(const std::string &dir, const std::string &resolutionDiretory, const std::string &searchPath) const override;
+
 private:
     virtual bool isFileExistInternal(const std::string& filePath) const override;
     virtual bool removeDirectory(const std::string& dirPath) const override;

cocos/platform/apple/CCFileUtils-apple.mm

@@ -315,6 +315,34 @@ static int unlink_cb(const char *fpath, const struct stat *sb, int typeflag, str
         return true;
 }
 
+std::string FileUtilsApple::getPathForDirectory(const std::string &dir, const std::string &resolutionDiretory, const std::string &searchPath) const
+{
+    auto path = searchPath + resolutionDiretory + dir;
+    
+    if(!path.empty() && path[path.length() -1] == '/') {
+        path.erase(path.end() - 1);
+    }
+    
+    if(path[0] == '/')
+    {
+        BOOL isDir = false;
+        if([s_fileManager fileExistsAtPath:[NSString stringWithUTF8String:dir.c_str()]
+                               isDirectory:&isDir]) {
+            return isDir ? path : "";
+        }
+    }
+    else
+    {
+        NSString *fullpath = [pimpl_->getBundle() pathForResource:[NSString stringWithUTF8String:path.c_str()]
+                                                           ofType:nil];
+        if(fullpath != nil) {
+            return [fullpath UTF8String];
+        }
+    }
+    return "";
+}
+
+
 std::string FileUtilsApple::getFullPathForFilenameWithinDirectory(const std::string& directory, const std::string& filename) const
 {
     if (directory[0] != '/')

tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.cpp

@@ -626,7 +626,7 @@ void TestGetContents::onEnter()
 
         // Text read string in text mode
         std::string ts = fs->getStringFromFile(_generatedFile);
-        if (ts != "\r\n\r\n")
+        if (strcmp(ts.c_str(), "\r\n\r\n")!=0)
             return std::string("failed: read as zero terminated string");