Masplund/less system calls (#255)

* Convert to try open * Add up to date test
soup-build · Sep 8, 2024 · a12f472 · a12f472
1 parent 0ef073a
commit a12f472
Show file tree

Hide file tree

Showing 16 changed files with 809 additions and 359 deletions.
diff --git a/Source/Client/Core/Source/Build/FileSystemState.h b/Source/Client/Core/Source/Build/FileSystemState.h
@@ -256,9 +256,12 @@ namespace Soup::Core
 				// Load the write times for all files in the directory
 				// This optimization assumes that most files in a directory are relevant to the build
 				// and on windows it is a lot faster to iterate over the files instead of making individual calls
-				System::IFileSystem::Current().GetDirectoryFilesLastWriteTime(
+				if (!System::IFileSystem::Current().TryGetDirectoryFilesLastWriteTime(
 					directory,
-					callback);
+					callback))
+				{
+					Log::Info("Preload Directory Missing: {}", directory.ToString());
+				}
 			}
 		}
 

diff --git a/Source/Client/Core/Source/LocalUserConfig/LocalUserConfigExtensions.h b/Source/Client/Core/Source/LocalUserConfig/LocalUserConfigExtensions.h
@@ -24,17 +24,15 @@ namespace Soup::Core
 			const Path& localUserConfigFile,
 			LocalUserConfig& result)
 		{
-			// Verify the requested file exists
+			// Open the file to read from
 			Log::Diag("Load Local User Config: {}", localUserConfigFile.ToString());
-			if (!System::IFileSystem::Current().Exists(localUserConfigFile))
+			std::shared_ptr<System::IInputFile> file;
+			if (!System::IFileSystem::Current().TryOpenRead(localUserConfigFile, true, file))
 			{
 				Log::Warning("Local User Config file does not exist");
 				return false;
 			}
 
-			// Open the file to read from
-			auto file = System::IFileSystem::Current().OpenRead(localUserConfigFile, true);
-
 			// Read the contents of the local user config file
 			try
 			{

diff --git a/Source/Client/Core/Source/OperationGraph/OperationGraphManager.h b/Source/Client/Core/Source/OperationGraph/OperationGraphManager.h
@@ -26,16 +26,14 @@ namespace Soup::Core
 			OperationGraph& result,
 			FileSystemState& fileSystemState)
 		{
-			// Verify the requested file exists
-			if (!System::IFileSystem::Current().Exists(operationGraphFile))
+			// Open the file to read from
+			std::shared_ptr<System::IInputFile> file;
+			if (!System::IFileSystem::Current().TryOpenRead(operationGraphFile, true, file))
 			{
 				Log::Info("Operation graph file does not exist");
 				return false;
 			}
 
-			// Open the file to read from
-			auto file = System::IFileSystem::Current().OpenRead(operationGraphFile, true);
-
 			// Read the contents of the build state file
 			try
 			{

diff --git a/Source/Client/Core/Source/OperationGraph/OperationResultsManager.h b/Source/Client/Core/Source/OperationGraph/OperationResultsManager.h
@@ -25,16 +25,14 @@ namespace Soup::Core
 			OperationResults& result,
 			FileSystemState& fileSystemState)
 		{
-			// Verify the requested file exists
-			if (!System::IFileSystem::Current().Exists(operationResultsFile))
+			// Open the file to read from
+			std::shared_ptr<System::IInputFile> file;
+			if (!System::IFileSystem::Current().TryOpenRead(operationResultsFile, true, file))
 			{
 				Log::Info("Operation results file does not exist");
 				return false;
 			}
 
-			// Open the file to read from
-			auto file = System::IFileSystem::Current().OpenRead(operationResultsFile, true);
-
 			// Read the contents of the build state file
 			try
 			{

diff --git a/Source/Client/Core/Source/PackageLock/PackageLockExtensions.h b/Source/Client/Core/Source/PackageLock/PackageLockExtensions.h
@@ -24,17 +24,15 @@ namespace Soup::Core
 			const Path& packageLockFile,
 			PackageLock& result)
 		{
-			// Verify the requested file exists
+			// Open the file to read from
 			Log::Diag("Load PackageLock: {}", packageLockFile.ToString());
-			if (!System::IFileSystem::Current().Exists(packageLockFile))
+			std::shared_ptr<System::IInputFile> file;
+			if (!System::IFileSystem::Current().TryOpenRead(packageLockFile, true, file))
 			{
 				Log::Info("PackageLock file does not exist");
 				return false;
 			}
 
-			// Open the file to read from
-			auto file = System::IFileSystem::Current().OpenRead(packageLockFile, true);
-
 			// Read the contents of the recipe file
 			try
 			{

diff --git a/Source/Client/Core/Source/Recipe/RecipeExtensions.h b/Source/Client/Core/Source/Recipe/RecipeExtensions.h
@@ -24,17 +24,15 @@ namespace Soup::Core
 			const Path& recipeFile,
 			Recipe& result)
 		{
-			// Verify the requested file exists
+			// Open the file to read from
 			Log::Diag("Load Recipe: {}", recipeFile.ToString());
-			if (!System::IFileSystem::Current().Exists(recipeFile))
+			std::shared_ptr<System::IInputFile> file;
+			if (!System::IFileSystem::Current().TryOpenRead(recipeFile, true, file))
 			{
 				Log::Info("Recipe file does not exist.");
 				return false;
 			}
 
-			// Open the file to read from
-			auto file = System::IFileSystem::Current().OpenRead(recipeFile, true);
-
 			// Read the contents of the recipe file
 			try
 			{

diff --git a/Source/Client/Core/Source/ValueTable/ValueTableManager.h b/Source/Client/Core/Source/ValueTable/ValueTableManager.h
@@ -25,16 +25,14 @@ namespace Soup::Core
 			const Path& valueTableFile,
 			ValueTable& result)
 		{
-			// Verify the requested file exists
-			if (!System::IFileSystem::Current().Exists(valueTableFile))
+			// Open the file to read from
+			std::shared_ptr<System::IInputFile> file;
+			if (!System::IFileSystem::Current().TryOpenRead(valueTableFile, true, file))
 			{
 				Log::Info("Value Table file does not exist");
 				return false;
 			}
 
-			// Open the file to read from
-			auto file = System::IFileSystem::Current().OpenRead(valueTableFile, true);
-
 			// Read the contents of the build state file
 			try
 			{