Revert FileWriter/FileWriteResult

.global.editorconfig.ini

@@ -156,15 +156,6 @@ dotnet_diagnostic.CA2229.severity = silent
 # Opt in to preview features before using them
 dotnet_diagnostic.CA2252.severity = silent # CSharpDetectPreviewFeatureAnalyzer very slow
 
-## Nullable rules; generics are a bit wonky and I have no idea why we're allowed to configure these to be not errors or why they aren't errors by default.
-
-# Nullability of reference types in value doesn't match target type.
-dotnet_diagnostic.CS8619.severity = error
-# Make Foo<string?> an error for class Foo<T> where T : class. Use `where T : class?` if Foo<string?> should be allowed.
-dotnet_diagnostic.CS8634.severity = error
-# Nullability of type argument doesn't match 'notnull' constraint.
-dotnet_diagnostic.CS8714.severity = error
-
 ## .NET DocumentationAnalyzers style rules
 
 # Place text in paragraphs

src/BizHawk.Client.Common/Api/Classes/EmuClientApi.cs

@@ -88,7 +88,7 @@ private void CallStateSaved(object sender, StateSavedEventArgs args)
 
 		public void CloseEmulator(int? exitCode = null) => _mainForm.CloseEmulator(exitCode);
 
-		public void CloseRom() => _mainForm.LoadNullRom();
+		public void CloseRom() => _mainForm.CloseRom();
 
 		public void DisplayMessages(bool value) => _config.DisplayMessages = value;
 
@@ -160,19 +160,9 @@ public bool OpenRom(string path)
 
 		public void RebootCore() => _mainForm.RebootCore();
 
-		// TODO: Change return type to FileWriteResult.
 		public void SaveRam() => _mainForm.FlushSaveRAM();
 
-		// TODO: Change return type to FileWriteResult.
-		// We may wish to change more than that, since we have a mostly-dupicate ISaveStateApi.Save, neither has documentation indicating what the differences are.
-		public void SaveState(string name)
-		{
-			FileWriteResult result = _mainForm.SaveState(Path.Combine(_config.PathEntries.SaveStateAbsolutePath(Game.System), $"{name}.State"), name);
-			if (result.Exception != null && result.Exception is not UnlessUsingApiException)
-			{
-				throw result.Exception;
-			}
-		}
+		public void SaveState(string name) => _mainForm.SaveState(Path.Combine(_config.PathEntries.SaveStateAbsolutePath(Game.System), $"{name}.State"), name, fromLua: false);
 
 		public int ScreenHeight() => _displayManager.GetPanelNativeSize().Height;
 

src/BizHawk.Client.Common/Api/Classes/MovieApi.cs

@@ -52,7 +52,6 @@ public string GetInputAsMnemonic(int frame)
 			return Bk2LogEntryGenerator.GenerateLogEntry(_movieSession.Movie.GetInputState(frame));
 		}
 
-		// TODO: Change return type to FileWriteResult
 		public void Save(string filename)
 		{
 			if (_movieSession.Movie.NotActive())
@@ -70,8 +69,7 @@ public void Save(string filename)
 				}
 				_movieSession.Movie.Filename = filename;
 			}
-			FileWriteResult result = _movieSession.Movie.Save();
-			if (result.Exception != null) throw result.Exception;
+			_movieSession.Movie.Save();
 		}
 
 		public IReadOnlyDictionary<string, string> GetHeader()

src/BizHawk.Client.Common/Api/Classes/SaveStateApi.cs

@@ -39,17 +39,8 @@ public bool LoadSlot(int slotNum, bool suppressOSD)
 			return _mainForm.LoadQuickSave(slotNum, suppressOSD: suppressOSD);
 		}
 
-		// TODO: Change return type FileWriteResult.
-		public void Save(string path, bool suppressOSD)
-		{
-			FileWriteResult result = _mainForm.SaveState(path, path, suppressOSD);
-			if (result.Exception != null && result.Exception is not UnlessUsingApiException)
-			{
-				throw result.Exception;
-			}
-		}
+		public void Save(string path, bool suppressOSD) => _mainForm.SaveState(path, path, true, suppressOSD);
 
-		// TODO: Change return type to FileWriteResult.
 		public void SaveSlot(int slotNum, bool suppressOSD)
 		{
 			if (slotNum is < 0 or > 10) throw new ArgumentOutOfRangeException(paramName: nameof(slotNum), message: ERR_MSG_NOT_A_SLOT);
@@ -58,11 +49,7 @@ public void SaveSlot(int slotNum, bool suppressOSD)
 				LogCallback(ERR_MSG_USE_SLOT_10);
 				slotNum = 10;
 			}
-			FileWriteResult result = _mainForm.SaveQuickSave(slotNum, suppressOSD: suppressOSD);
-			if (result.Exception != null && result.Exception is not UnlessUsingApiException)
-			{
-				throw result.Exception;
-			}
+			_mainForm.SaveQuickSave(slotNum, suppressOSD: suppressOSD, fromLua: true);
 		}
 	}
 }

src/BizHawk.Client.Common/DialogControllerExtensions.cs

@@ -1,18 +1,10 @@
 #nullable enable
 
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 
 namespace BizHawk.Client.Common
 {
-	public enum TryAgainResult
-	{
-		Saved,
-		IgnoredFailure,
-		Canceled,
-	}
-
 	public static class DialogControllerExtensions
 	{
 		public static void AddOnScreenMessage(
@@ -72,48 +64,6 @@ public static bool ModalMessageBox2(
 			EMsgBoxIcon? icon = null)
 				=> dialogParent.DialogController.ShowMessageBox3(owner: dialogParent, text: text, caption: caption, icon: icon);
 
-		public static void ErrorMessageBox(
-			this IDialogParent dialogParent,
-			FileWriteResult fileResult,
-			string? prefixMessage = null)
-		{
-			Debug.Assert(fileResult.IsError && fileResult.Exception != null, "Error box must have an error.");
-
-			string prefix = prefixMessage ?? "";
-			dialogParent.ModalMessageBox(
-				text: $"{prefix}\n{fileResult.UserFriendlyErrorMessage()}\n{fileResult.Exception!.Message}",
-				caption: "Error",
-				icon: EMsgBoxIcon.Error);
-		}
-
-		/// <summary>
-		/// If the action fails, asks the user if they want to try again.
-		/// The user will be repeatedly asked if they want to try again until either success or the user says no.
-		/// </summary>
-		/// <returns>Returns true on success or if the user said no. Returns false if the user said cancel.</returns>
-		public static TryAgainResult DoWithTryAgainBox(
-			this IDialogParent dialogParent,
-			Func<FileWriteResult> action,
-			string message)
-		{
-			FileWriteResult fileResult = action();
-			while (fileResult.IsError)
-			{
-				bool? askResult = dialogParent.ModalMessageBox3(
-					caption: "Failed to write file",
-					text: $"{message} Do you want to try again?"
-						+ $"\nError details: {fileResult.UserFriendlyErrorMessage()}"
-						+ $"\n\nFull info for debugging:\n--------------------\n{fileResult.Exception}\n--------------------"
-						+ "\n\n(Retry?)",
-					icon: EMsgBoxIcon.Warning);
-				if (askResult == null) return TryAgainResult.Canceled;
-				if (askResult == false) return TryAgainResult.IgnoredFailure;
-				if (askResult == true) fileResult = action();
-			}
-
-			return TryAgainResult.Saved;
-		}
-
 		/// <summary>Creates and shows a <c>System.Windows.Forms.OpenFileDialog</c> or equivalent with the receiver (<paramref name="dialogParent"/>) as its parent</summary>
 		/// <param name="discardCWDChange"><c>OpenFileDialog.RestoreDirectory</c> (isn't this useless when specifying <paramref name="initDir"/>? keeping it for backcompat)</param>
 		/// <param name="filter"><c>OpenFileDialog.Filter</c></param>