Rename 2 XGD helper methods

SabreTools · Aug 20, 2024 · 851a43d · 851a43d
1 parent a88bef4
commit 851a43d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/CHANGELIST.md b/CHANGELIST.md
@@ -19,6 +19,7 @@
 - Support GD-ROM info for Redumper
 - Futureproof GD-ROM LD in Redumper
 - Make GD-ROM LD code nicer to read
+- Rename 2 XGD helper methods
 
 ### 3.2.1 (2024-08-05)
 

diff --git a/MPF.Processors/DiscImageCreator.cs b/MPF.Processors/DiscImageCreator.cs
@@ -449,7 +449,7 @@ public override void GenerateSubmissionInfo(SubmissionInfo info, string basePath
                     break;
 
                 case RedumpSystem.MicrosoftXbox:
-                    string xmidString = ProcessingTool.GetXGD1XMID($"{basePath}_DMI.bin");
+                    string xmidString = ProcessingTool.GetXMID($"{basePath}_DMI.bin");
                     var xmid = SabreTools.Serialization.Wrappers.XMID.Create(xmidString);
                     if (xmid != null)
                     {
@@ -493,7 +493,7 @@ public override void GenerateSubmissionInfo(SubmissionInfo info, string basePath
                     break;
 
                 case RedumpSystem.MicrosoftXbox360:
-                    string xemidString = ProcessingTool.GetXGD23XeMID($"{basePath}_DMI.bin");
+                    string xemidString = ProcessingTool.GetXeMID($"{basePath}_DMI.bin");
                     var xemid = SabreTools.Serialization.Wrappers.XeMID.Create(xemidString);
                     if (xemid != null)
                     {

diff --git a/MPF.Processors/ProcessingTool.cs b/MPF.Processors/ProcessingTool.cs
@@ -816,7 +816,7 @@ public static bool ParseGetKeyLog(string? logPath, out byte[]? key, out byte[]?
         /// </summary>
         /// <param name="dmi">DMI.bin file location</param>
         /// <returns>String representation of the XGD1 DMI information, empty string on error</returns>
-        public static string GetXGD1XMID(string dmi)
+        public static string GetXMID(string dmi)
         {
             if (!File.Exists(dmi))
                 return string.Empty;
@@ -838,7 +838,7 @@ public static string GetXGD1XMID(string dmi)
         /// </summary>
         /// <param name="dmi">DMI.bin file location</param>
         /// <returns>String representation of the XGD2/3 DMI information, empty string on error</returns>
-        public static string GetXGD23XeMID(string dmi)
+        public static string GetXeMID(string dmi)
         {
             if (!File.Exists(dmi))
                 return string.Empty;

diff --git a/MPF.Processors/Redumper.cs b/MPF.Processors/Redumper.cs
@@ -339,7 +339,7 @@ public override void GenerateSubmissionInfo(SubmissionInfo info, string basePath
                     break;
 
                 case RedumpSystem.MicrosoftXbox:
-                    string xmidString = ProcessingTool.GetXGD1XMID($"{basePath}.manufacturer");
+                    string xmidString = ProcessingTool.GetXMID($"{basePath}.manufacturer");
                     var xmid = SabreTools.Serialization.Wrappers.XMID.Create(xmidString);
                     if (xmid != null)
                     {
@@ -360,7 +360,7 @@ public override void GenerateSubmissionInfo(SubmissionInfo info, string basePath
                     break;
 
                 case RedumpSystem.MicrosoftXbox360:
-                    string xemidString = ProcessingTool.GetXGD23XeMID($"{basePath}.manufacturer");
+                    string xemidString = ProcessingTool.GetXeMID($"{basePath}.manufacturer");
                     var xemid = SabreTools.Serialization.Wrappers.XeMID.Create(xemidString);
                     if (xemid != null)
                     {

diff --git a/MPF.Processors/XboxBackupCreator.cs b/MPF.Processors/XboxBackupCreator.cs
@@ -132,7 +132,7 @@ public override void GenerateSubmissionInfo(SubmissionInfo info, string basePath
                         case RedumpSystem.MicrosoftXbox:
 
                             // Parse DMI.bin
-                            string xmidString = ProcessingTool.GetXGD1XMID($"{baseDir}DMI.bin");
+                            string xmidString = ProcessingTool.GetXMID($"{baseDir}DMI.bin");
                             var xmid = SabreTools.Serialization.Wrappers.XMID.Create(xmidString);
                             if (xmid != null)
                             {
@@ -156,7 +156,7 @@ public override void GenerateSubmissionInfo(SubmissionInfo info, string basePath
                             //string? mediaID = GetMediaID(logPath);
 
                             // Parse DMI.bin
-                            string xemidString = ProcessingTool.GetXGD23XeMID($"{baseDir}DMI.bin");
+                            string xemidString = ProcessingTool.GetXeMID($"{baseDir}DMI.bin");
                             var xemid = SabreTools.Serialization.Wrappers.XeMID.Create(xemidString);
                             if (xemid != null)
                             {