refactored FileMode to make more sense

include/blah/core/filesystem.h

@@ -9,10 +9,17 @@ namespace Blah
 	
 	enum class FileMode
 	{
-		None       = 0,
+		// Opens an existing file for reading.
-		Read       = 1 << 0,
+		OpenRead,
-		Write      = 1 << 1,
+
-		ReadWrite  = Read | Write,
+		// Opens an existing file for reading and writing.
+		Open,
+
+		// Creates a new file or overwrites an existing file for writing.
+		CreateWrite,
+
+		// Creates a new file or overwrites an existing file for reading and writing.
+		Create,
 	};
 
 	namespace Directory
@@ -43,7 +50,7 @@ namespace Blah
 		bool remove(const FilePath& path);
 
 		// Opens the given file and returns a stream
-		FileStream open(const FilePath& path, FileMode mode = FileMode::ReadWrite);
+		FileStream open(const FilePath& path, FileMode mode);
 	}
 
 	namespace Path

include/blah/streams/filestream.h

@@ -8,7 +8,7 @@ namespace Blah
 	{
 	public:
 		FileStream();
-		FileStream(const FilePath& path, FileMode mode = FileMode::ReadWrite);
+		FileStream(const FilePath& path, FileMode mode);
 		FileStream(FileStream&& fs) noexcept;
 		FileStream& operator=(FileStream&& fs) noexcept;
 		~FileStream();

src/images/aseprite.cpp

@@ -17,7 +17,7 @@ Aseprite::Aseprite()
 
 Aseprite::Aseprite(const FilePath& path)
 {
-	FileStream fs(path, FileMode::Read);
+	FileStream fs(path, FileMode::OpenRead);
 	parse(fs);
 }
 

src/images/font.cpp

@@ -58,7 +58,7 @@ Font::Font(Stream& stream) : Font()
 
 Font::Font(const FilePath& path) : Font()
 {
-	FileStream fs(path, FileMode::Read);
+	FileStream fs(path, FileMode::OpenRead);
 	if (fs.is_readable())
 		load(fs);
 }

src/images/image.cpp

@@ -64,7 +64,7 @@ Image::Image(const FilePath& file)
 	pixels = nullptr;
 	m_stbi_ownership = false;
 
-	FileStream fs(file, FileMode::Read);
+	FileStream fs(file, FileMode::OpenRead);
 	if (fs.is_readable())
 		from_stream(fs);
 }
@@ -205,7 +205,7 @@ void Image::set_pixels(const RectI& rect, Color* data)
 
 bool Image::save_png(const FilePath& file) const
 {
-	FileStream fs(file, FileMode::Write);
+	FileStream fs(file, FileMode::CreateWrite);
 	return save_png(fs);
 }
 
@@ -234,7 +234,7 @@ bool Image::save_png(Stream& stream) const
 
 bool Image::save_jpg(const FilePath& file, int quality) const
 {
-	FileStream fs(file, FileMode::Write);
+	FileStream fs(file, FileMode::CreateWrite);
 	return save_jpg(fs, quality);
 }
 

src/internal/platform_backend_sdl2.cpp

@@ -647,11 +647,25 @@ void PlatformBackend::dir_explore(const char* path)
 
 bool PlatformBackend::file_open(const char* path, PlatformBackend::FileHandle* handle, FileMode mode)
 {
-	const char* sdlMode = "rb";
+	const char* sdl_mode = "";
-	if (mode == FileMode::Write)
-		sdlMode = "wb";
 
-	auto ptr = SDL_RWFromFile(path, sdlMode);
+	switch (mode)
+	{
+	case FileMode::OpenRead:
+		sdl_mode = "rb";
+		break;
+	case FileMode::OpenReadWrite:
+		sdl_mode = "r+b";
+		break;
+	case FileMode::CreateWrite:
+		sdl_mode = "wb";
+		break;
+	case FileMode::CreateReadWrite:
+		sdl_mode = "w+b";
+		break;
+	}
+
+	auto ptr = SDL_RWFromFile(path, sdl_mode);
 	*handle = (PlatformBackend::FileHandle)ptr;
 	return ptr != nullptr;
 }

src/internal/platform_backend_win32.cpp

@@ -489,16 +489,24 @@ bool PlatformBackend::file_open(const char* path, PlatformBackend::FileHandle* h
 	int access = 0;
 	int creation = 0;
 
-	if (((int)mode & (int)FileMode::Read) == (int)FileMode::Read)
+	switch (mode)
 	{
-		access |= GENERIC_READ;
+	case FileMode::OpenRead:
+		access = GENERIC_READ;
 		creation = OPEN_EXISTING;
-	}
+		break;
-
+	case FileMode::Open:
-	if (((int)mode & (int)FileMode::Write) == (int)FileMode::Write)
+		access = GENERIC_READ | GENERIC_WRITE;
-	{
+		creation = OPEN_EXISTING;
-		access |= GENERIC_WRITE;
+		break;
-		creation = OPEN_ALWAYS;
+	case FileMode::CreateWrite:
+		access = GENERIC_WRITE;
+		creation = CREATE_ALWAYS;
+		break;
+	case FileMode::Create:
+		access = GENERIC_READ | GENERIC_WRITE;
+		creation = CREATE_ALWAYS;
+		break;
 	}
 
 	auto result = CreateFile(path, access, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, creation, FILE_ATTRIBUTE_NORMAL, NULL);

src/streams/filestream.cpp

@@ -8,7 +8,7 @@ using namespace Blah;
 FileStream::FileStream()
 {
 	m_handle = nullptr;
-	m_mode = FileMode::None;
+	m_mode = FileMode::OpenRead;
 }
 
 FileStream::FileStream(const FilePath& path, FileMode mode)
@@ -70,12 +70,12 @@ bool FileStream::is_open() const
 
 bool FileStream::is_readable() const
 {
-	return m_handle != nullptr && (m_mode == FileMode::ReadWrite || m_mode == FileMode::Read);
+	return m_handle != nullptr && (m_mode != FileMode::CreateWrite);
 }
 
 bool FileStream::is_writable() const
 {
-	return m_handle != nullptr && (m_mode == FileMode::ReadWrite || m_mode == FileMode::Write);
+	return m_handle != nullptr && (m_mode != FileMode::OpenRead);
 }
 
 i64 FileStream::read_into(void* ptr, i64 length)
@@ -108,5 +108,4 @@ void FileStream::close()
 	if (m_handle != nullptr)
 		PlatformBackend::file_close(m_handle);
 	m_handle = nullptr;
-	m_mode = FileMode::None;
 }