From a514effba777a7749cb704cb2919a97ef36f19c8 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Sat, 2 Oct 2021 05:00:23 +1000
Subject: [PATCH] Encapsulate "hawking" routine in DiscoHawk and use it in CLI

resolves #2947
---
 src/BizHawk.Client.DiscoHawk/MainDiscoForm.cs | 17 +++--------
 .../DiscoHawkLogic/DiscoHawkLogic.cs          | 29 ++++++++++++++-----
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/src/BizHawk.Client.DiscoHawk/MainDiscoForm.cs b/src/BizHawk.Client.DiscoHawk/MainDiscoForm.cs
index 4049dfb40a..9f0c671894 100644
--- a/src/BizHawk.Client.DiscoHawk/MainDiscoForm.cs
+++ b/src/BizHawk.Client.DiscoHawk/MainDiscoForm.cs
@@ -42,19 +42,10 @@ namespace BizHawk.Client.DiscoHawk
 				Cursor = Cursors.WaitCursor;
 				foreach (var file in files)
 				{
-					var job = new DiscMountJob(fromPath: file);
-					job.Run();
-					var disc = job.OUT_Disc;
-					if (job.OUT_ErrorLevel)
-					{
-						MessageBox.Show(job.OUT_Log, "Error loading disc");
-						break;
-					}
-
-					string baseName = Path.GetFileNameWithoutExtension(file);
-					baseName += "_hawked";
-					string outfile = $"{Path.Combine(Path.GetDirectoryName(file), baseName)}.ccd";
-					CCD_Format.Dump(disc, outfile);
+					var success = DiscoHawkLogic.HawkAndWriteFile(
+						inputPath: file,
+						errorCallback: err => MessageBox.Show(err, "Error loading disc"));
+					if (!success) break;
 				}
 
 				Cursor = Cursors.Default;
diff --git a/src/BizHawk.Emulation.DiscSystem/DiscoHawkLogic/DiscoHawkLogic.cs b/src/BizHawk.Emulation.DiscSystem/DiscoHawkLogic/DiscoHawkLogic.cs
index 95c00b244f..42770ba10a 100644
--- a/src/BizHawk.Emulation.DiscSystem/DiscoHawkLogic/DiscoHawkLogic.cs
+++ b/src/BizHawk.Emulation.DiscSystem/DiscoHawkLogic/DiscoHawkLogic.cs
@@ -243,6 +243,22 @@ namespace BizHawk.Emulation.DiscSystem
 			return ret;
 		}
 
+		public static bool HawkAndWriteFile(string inputPath, Action<string> errorCallback, DiscInterface discInterface = DiscInterface.BizHawk)
+		{
+			DiscMountJob job = new(inputPath, discInterface);
+			job.Run();
+			var disc = job.OUT_Disc;
+			if (job.OUT_ErrorLevel)
+			{
+				errorCallback(job.OUT_Log);
+				return false;
+			}
+			var baseName = Path.GetFileNameWithoutExtension(inputPath);
+			var outfile = Path.Combine(Path.GetDirectoryName(inputPath), $"{baseName}_hawked.ccd");
+			CCD_Format.Dump(disc, outfile);
+			return true;
+		}
+
 		public static void RunWithArgs(string[] args, Action<string> showComparisonResultsCallback)
 		{
 			bool scanCues = false;
@@ -273,14 +289,11 @@ namespace BizHawk.Emulation.DiscSystem
 
 			if (hawk)
 			{
-				if (infile == null)
-				{
-					return;
-				}
-
-				// TODO - write it out
-				var dmj = new DiscMountJob(fromPath: infile, discInterface: loadDiscInterface);
-				dmj.Run();
+				if (infile == null) return;
+				HawkAndWriteFile(
+					inputPath: infile,
+					errorCallback: err => Console.WriteLine($"failed to convert {infile}:\n{err}"),
+					discInterface: loadDiscInterface);
 			}
 
 			bool verbose = true;