refactor: abstract filesystem operations with NativeFileSystem and increment build version

Author: Okladnoj

Core/GameEngine/Source/Common/System/XferLoad.cpp

@@ -33,6 +33,9 @@
 #include "Common/GameState.h"
 #include "Common/Snapshot.h"
 #include "Common/XferLoad.h"
+#ifdef __APPLE__
+#include "Common/System/NativeFileSystem.h"
+#endif
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
@@ -80,7 +83,11 @@ void XferLoad::open( AsciiString identifier )
 	Xfer::open( identifier );
 
 	// open the file
+#ifdef __APPLE__
+	m_fileFP = NativeFileSystem::fopen( identifier.str(), "rb" );
+#else
 	m_fileFP = fopen( identifier.str(), "rb" );
+#endif
 	if( m_fileFP == nullptr )
 	{
 

Core/GameEngine/Source/Common/System/XferSave.cpp

@@ -32,6 +32,9 @@
 #include "Common/XferSave.h"
 #include "Common/Snapshot.h"
 #include "Common/GameMemory.h"
+#ifdef __APPLE__
+#include "Common/System/NativeFileSystem.h"
+#endif
 
 // PRIVATE TYPES //////////////////////////////////////////////////////////////////////////////////
 class XferBlockData : public MemoryPoolObject
@@ -120,7 +123,11 @@ void XferSave::open( AsciiString identifier )
 	Xfer::open( identifier );
 
 	// open the file
+#ifdef __APPLE__
+	m_fileFP = NativeFileSystem::fopen( identifier.str(), "w+b" );
+#else
 	m_fileFP = fopen( identifier.str(), "w+b" );
+#endif
 	if( m_fileFP == nullptr )
 	{
 

GeneralsMD/Code/GameEngine/Source/Common/System/SaveGame/GameState.cpp

@@ -30,6 +30,7 @@
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "PreRTS.h"
 #include <filesystem>
+#include "Common/System/NativeFileSystem.h"
 #ifndef __APPLE__
 #include <io.h>
 #else
@@ -477,7 +478,7 @@ AsciiString GameState::findNextSaveFilename( UnicodeString desc )
 		leaf.format("%s_%04d%s", adesc.str(), i, SAVE_GAME_EXTENSION);
 
 		AsciiString path = getFilePathInSaveDirectory(leaf);
-		if( _access( path.str(), 0 ) == -1 )
+		if( !NativeFileSystem::exists(path.str()) )
 			return leaf;	// note that this returns the leaf, not the full path
 	}
 #else
@@ -524,7 +525,7 @@ AsciiString GameState::findNextSaveFilename( UnicodeString desc )
 			fullPath = getFilePathInSaveDirectory(filename);
 
 			// if file does not exist we're all good
-			if( _access( fullPath.str(), 0 ) == -1 )
+			if( !NativeFileSystem::exists(fullPath.str()) )
 				return filename;
 
 			// test the text filename
@@ -571,7 +572,7 @@ SaveCode GameState::saveGame( AsciiString filename, UnicodeString desc,
 	}
 
 	// make absolutely sure the save directory exists
-	CreateDirectory( getSaveDirectory().str(), nullptr );
+	NativeFileSystem::create_directory( std::string(getSaveDirectory().str()) );
 
 	// construct path to file
 	AsciiString filepath = getFilePathInSaveDirectory(filename);
@@ -1019,7 +1020,8 @@ void GameState::getSaveGameInfoFromFile( AsciiString filename, SaveGameInfo *sav
 
 	// open file for partial loading
 	XferLoad xferLoad;
-	xferLoad.open( filename );
+	AsciiString filepath = getFilePathInSaveDirectory(filename);
+	xferLoad.open( filepath );
 
 	//
 	// disable post processing cause we're not really doing a load of game data that
@@ -1349,7 +1351,8 @@ void GameState::iterateSaveFiles( IterateSaveFileCallback callback, void *userDa
 #else
 	try
 	{
-		for (const auto& entry : std::filesystem::directory_iterator(getSaveDirectory().str()))
+		std::string safeSaveDir = NativeFileSystem::get_safe_path(getSaveDirectory().str());
+		for (const auto& entry : std::filesystem::directory_iterator(safeSaveDir))
 		{
 			if (entry.is_regular_file())
 			{

GeneralsMD/Code/GameEngine/Source/Common/System/SaveGame/GameStateMap.cpp

@@ -41,6 +41,7 @@
 #include "GameClient/MapUtil.h"
 #include "GameLogic/GameLogic.h"
 #include "GameNetwork/GameInfo.h"
+#include "Common/System/NativeFileSystem.h"
 #include <filesystem>
 
 // GLOBALS ////////////////////////////////////////////////////////////////////////////////////////
@@ -130,7 +131,7 @@ static void embedPristineMap( AsciiString map, Xfer *xfer )
 // ------------------------------------------------------------------------------------------------
 static void embedInUseMap( AsciiString map, Xfer *xfer )
 {
-	FILE *fp = fopen( map.str(), "rb" );
+	FILE *fp = NativeFileSystem::fopen( map.str(), "rb" );
 
 	// sanity
 	if( fp == nullptr )
@@ -188,7 +189,7 @@ static void extractAndSaveMap( AsciiString mapToSave, Xfer *xfer )
 	UnsignedInt dataSize;
 
 	// open handle to output file
-	FILE *fp = fopen( mapToSave.str(), "w+b" );
+	FILE *fp = NativeFileSystem::fopen( mapToSave.str(), "w+b" );
 	if( fp == nullptr )
 	{
 
@@ -520,18 +521,18 @@ void GameStateMap::clearScratchPadMaps()
 #else
 	try
 	{
-		for (const auto& entry : std::filesystem::directory_iterator(TheGameState->getSaveDirectory().str()))
+		std::string safeSaveDir = NativeFileSystem::get_safe_path(TheGameState->getSaveDirectory().str());
+		for (const auto& entry : std::filesystem::directory_iterator(safeSaveDir))
 		{
 			if (entry.is_regular_file())
 			{
 				std::string path = entry.path().string();
 				if (path.length() >= 4)
 				{
 					std::string ext = path.substr(path.length() - 4);
-					// lowercase ext manually or just check for .map
 					if (ext == ".map" || ext == ".MAP")
 					{
-						std::filesystem::remove(entry.path());
+						NativeFileSystem::remove(path);
 					}
 				}
 			}

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp

@@ -59,6 +59,7 @@
 #include "GameClient/Shell.h"
 #include "GameLogic/GameLogic.h"
 #include "GameClient/GameWindowTransitions.h"
+#include "Common/System/NativeFileSystem.h"
 
 // PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
 static NameKeyType buttonBackKey					= NAMEKEY_INVALID;
@@ -715,7 +716,7 @@ WindowMsgHandledType SaveLoadMenuSystem( GameWindow *window, UnsignedInt msg,
 					AsciiString filepath = TheGameState->getFilePathInSaveDirectory(selectedGameInfo->filename);
 
 					// delete the file
-					DeleteFile( filepath.str() );
+					NativeFileSystem::remove( filepath.str() );
 
 					// repopulate the listbox
 					TheGameState->populateSaveGameListbox( listboxGames, currentLayoutType );

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp

@@ -654,7 +654,7 @@ WindowMsgHandledType ScoreScreenSystem( GameWindow *window, UnsignedInt msg,
 						}
 						else
 						{
-
+							startNextCampaignGame();
 						}
 					}
 					else if (screenType == SCORESCREEN_INTERNET)

Platform/MacOS/Launcher/assemble_distribution.sh

@@ -14,8 +14,8 @@
 #   - dylibbundler  (brew install dylibbundler)
 #   - create-dmg    (brew install create-dmg)  — optional, for premium DMG
 
-VERSION="1.2.1"
-BUILD="5"
+VERSION="1.2.2"
+BUILD="6"
 
 LAUNCHER_NAME="GeneralsLauncher"
 FINAL_APP_NAME="Generals Online"