From 0f0a06330cb0df49281e8ce637920d7a7307b901 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Fri, 28 Jul 2023 22:42:30 +0300
Subject: [PATCH] [FS] Better file flushing

Fixes a small memory leak and some filesystem bugs
---
 include/io_file.hpp               | 1 +
 src/core/fs/archive_save_data.cpp | 4 ++++
 src/io_file.cpp                   | 6 ++++++
 3 files changed, 11 insertions(+)

diff --git a/include/io_file.hpp b/include/io_file.hpp
index 8a54dfaa..17e6d843 100644
--- a/include/io_file.hpp
+++ b/include/io_file.hpp
@@ -27,6 +27,7 @@ class IOFile {
 
 	bool seek(std::int64_t offset, int origin = SEEK_SET);
 	bool rewind();
+	bool flush();
 	FILE* getHandle();
 	static void setAppDataDir(const std::filesystem::path& dir);
 	static std::filesystem::path getAppData() { return appData; }
diff --git a/src/core/fs/archive_save_data.cpp b/src/core/fs/archive_save_data.cpp
index 2b17f51c..1dcc1db8 100644
--- a/src/core/fs/archive_save_data.cpp
+++ b/src/core/fs/archive_save_data.cpp
@@ -156,6 +156,8 @@ Rust::Result<ArchiveBase::FormatInfo, HorizonResult> SaveDataArchive::getFormatI
 
 	FormatInfo ret;
 	auto [success, bytesRead] = file.readBytes(&ret, sizeof(FormatInfo));
+	file.close();
+
 	if (!success || bytesRead != sizeof(FormatInfo)) {
 		Helpers::warn("SaveData::GetFormatInfo: Format file exists but was not properly read into the FormatInfo struct");
 		return Err(Result::FS::NotFormatted);
@@ -175,6 +177,8 @@ void SaveDataArchive::format(const FSPath& path, const ArchiveBase::FormatInfo&
 	// Write format info on disk
 	IOFile file(formatInfoPath, "wb");
 	file.writeBytes(&info, sizeof(info));
+	file.flush();
+	file.close();
 }
 
 Rust::Result<ArchiveBase*, HorizonResult> SaveDataArchive::openArchive(const FSPath& path) {
diff --git a/src/io_file.cpp b/src/io_file.cpp
index 3d797782..1f794284 100644
--- a/src/io_file.cpp
+++ b/src/io_file.cpp
@@ -92,6 +92,12 @@ bool IOFile::seek(std::int64_t offset, int origin) {
 	return true;
 }
 
+bool IOFile::flush() {
+	if (!isOpen() || fflush(handle)) return false;
+
+	return true;
+}
+
 bool IOFile::rewind() { return seek(0, SEEK_SET); }
 FILE* IOFile::getHandle() { return handle; }