Add close file method to filesystems implementation

Author: nextgeniuspro

include/vfspp/IFileSystem.h

@@ -55,14 +55,8 @@ class IFileSystem
     /*
      * Close file
      */
-    virtual void CloseFile(IFilePtr file)
-    {
-        if (!file) {
-            return;
-        }
-        file->Close();
-    }
-    
+    virtual void CloseFile(IFilePtr file) = 0;
+
     /*
      * Create file on writeable filesystem. Return true if file already exists
      */
@@ -129,4 +123,4 @@ class IFileSystem
 
 }; // namespace vfspp
 
-#endif /* IFILESYSTEM_H */
+#endif // IFILESYSTEM_H

include/vfspp/MemoryFile.hpp

@@ -237,7 +237,6 @@ class MemoryFile final : public IFile
         m_SeekPos = 0;
         m_IsReadOnly = true;
 
-        std::ios_base::openmode open_mode = static_cast<std::ios_base::openmode>(0x00);
         if ((mode & FileMode::Write) == FileMode::Write) {
             m_IsReadOnly = false;
         }

include/vfspp/MemoryFileSystem.hpp

@@ -119,6 +119,19 @@ class MemoryFileSystem final : public IFileSystem
             return OpenFileST(filePath, mode);
         }
     }
+
+    /*
+     * Close file
+     */
+    virtual void CloseFile(IFilePtr file) override
+    {
+        if constexpr (VFSPP_MT_SUPPORT_ENABLED) {
+            std::lock_guard<std::mutex> lock(m_Mutex);
+            CloseFileST(file);
+        } else {
+            CloseFileST(file);
+        }
+    }
 
     /*
      * Create file on writeable filesystem. Returns true if file created successfully
@@ -270,6 +283,16 @@ class MemoryFileSystem final : public IFileSystem
         return file;
     }
 
+    inline void CloseFileST(IFilePtr file)
+    {
+        if (!file) {
+            return;
+        }
+
+        file->Close();
+        m_FileList.erase(file->GetFileInfo().AbsolutePath());
+    }
+
     inline bool CreateFileST(const FileInfo& filePath)
     {
         IFilePtr file = OpenFileST(filePath, IFile::FileMode::Write | IFile::FileMode::Truncate);

include/vfspp/NativeFile.hpp

@@ -314,8 +314,15 @@ class NativeFile final : public IFile
             return 0;
         }
 
-        m_Stream.read(reinterpret_cast<char*>(buffer), size);
-        return static_cast<uint64_t>(m_Stream.gcount());
+        
+        uint64_t leftSize = SizeST() - TellST();
+        uint64_t maxSize = std::min(size, leftSize);
+        if (maxSize > 0) {
+            m_Stream.read(reinterpret_cast<char*>(buffer), maxSize);
+            return maxSize;
+        }
+
+        return 0;
     }
 
     inline uint64_t WriteST(const uint8_t* buffer, uint64_t size)
@@ -373,22 +380,22 @@ class NativeFile final : public IFile
         uint64_t totalSize = size;
         std::vector<uint8_t> buffer(bufferSize);
         while (size > 0) {
-			stream.read(reinterpret_cast<char*>(buffer.data()), std::min(size, static_cast<uint64_t>(buffer.size())));
-			uint64_t bytesRead = stream.gcount();
-			if (bytesRead == 0) {
-				break;
-			}
-			
-			if (size < bytesRead) {
-				bytesRead = size;
-			}
-			
-			WriteST(buffer.data(), bytesRead);
-			
-			size -= bytesRead;
-		}
-		
-		return totalSize - size;
+            stream.read(reinterpret_cast<char*>(buffer.data()), std::min(size, static_cast<uint64_t>(buffer.size())));
+            uint64_t bytesRead = static_cast<uint64_t>(stream.gcount());
+            if (bytesRead == 0) {
+                break;
+            }
+
+            if (size < bytesRead) {
+                bytesRead = size;
+            }
+
+            WriteST(buffer.data(), bytesRead);
+
+            size -= bytesRead;
+        }
+        
+        return totalSize - size;
     }
 
 private:

include/vfspp/NativeFileSystem.hpp

@@ -119,6 +119,19 @@ class NativeFileSystem final : public IFileSystem
             return OpenFileST(filePath, mode);
         }
     }
+
+    /*
+     * Close file
+     */
+    virtual void CloseFile(IFilePtr file) override
+    {
+        if constexpr (VFSPP_MT_SUPPORT_ENABLED) {
+            std::lock_guard<std::mutex> lock(m_Mutex);
+            CloseFileST(file);
+        } else {
+            CloseFileST(file);
+        }
+    }
 
     /*
      * Create file on writeable filesystem. Returns true if file created successfully
@@ -290,6 +303,13 @@ class NativeFileSystem final : public IFileSystem
 
         return file;
     }
+
+    inline void CloseFileST(IFilePtr file)
+    {
+        if (file) {
+            file->Close();
+        }
+    }
 
     inline bool CreateFileST(const FileInfo& filePath)
     {