Add internal name for Cleanrip outputs (fixes #398)

CHANGELIST.md

@@ -105,6 +105,7 @@
 - Update to BurnOutSharp 2.3.1 (nw)
 - Fix serial parsing for Dreamcast
 - Fix missing parenthesis
+- Add internal name for Cleanrip outputs
 
 ### 2.3 (2022-02-05)
 - Start overhauling Redump information pulling, again

MPF.Library/InfoTool.cs

@@ -2132,6 +2132,8 @@ namespace MPF.Library
                 sorted.Add(new KeyValuePair<SiteCode?, string>(SiteCode.AlternativeTitle, tags[SiteCode.AlternativeTitle]));
             if (tags.ContainsKey(SiteCode.AlternativeForeignTitle))
                 sorted.Add(new KeyValuePair<SiteCode?, string>(SiteCode.AlternativeForeignTitle, tags[SiteCode.AlternativeForeignTitle]));
+            if (tags.ContainsKey(SiteCode.InternalName))
+                sorted.Add(new KeyValuePair<SiteCode?, string>(SiteCode.InternalName, tags[SiteCode.InternalName]));
             if (tags.ContainsKey(SiteCode.InternalSerialName))
                 sorted.Add(new KeyValuePair<SiteCode?, string>(SiteCode.InternalSerialName, tags[SiteCode.InternalSerialName]));
             if (tags.ContainsKey(SiteCode.VolumeLabel))

MPF.Modules/CleanRIp/Parameters.cs

@@ -84,10 +84,11 @@ namespace MPF.Modules.CleanRip
                     if (File.Exists(basePath + ".bca"))
                         info.Extras.BCA = GetBCA(basePath + ".bca");
 
-                    if (GetGameCubeWiiInformation(basePath + "-dumpinfo.txt", out Region? gcRegion, out string gcVersion))
+                    if (GetGameCubeWiiInformation(basePath + "-dumpinfo.txt", out Region? gcRegion, out string gcVersion, out string gcName))
                     {
                         info.CommonDiscInfo.Region = gcRegion ?? info.CommonDiscInfo.Region;
                         info.VersionAndEditions.Version = gcVersion ?? info.VersionAndEditions.Version;
+                        info.CommonDiscInfo.CommentsSpecialFields[SiteCode.InternalName] = gcName ?? string.Empty;
                     }
 
                     break;
@@ -204,8 +205,9 @@ namespace MPF.Modules.CleanRip
         /// <param name="dumpinfo">Path to discinfo file</param>
         /// <param name="region">Output region, if possible</param>
         /// <param name="version">Output internal version of the game</param>
+        /// <param name="name">Output internal name of the game</param>
         /// <returns></returns>
-        private static bool GetGameCubeWiiInformation(string dumpinfo, out Region? region, out string version)
+        private static bool GetGameCubeWiiInformation(string dumpinfo, out Region? region, out string version, out string name)
         {
             region = null; version = null;
 
@@ -227,11 +229,15 @@ namespace MPF.Modules.CleanRip
                         string line = sr.ReadLine().Trim();
                         if (line.StartsWith("Version"))
                         {
-                            version = line.Substring(9);
+                            version = line.Substring("Version: ".Length);
+                        }
+                        else if (line.StartsWith("Internal Name"))
+                        {
+                            name = line.Substring("Internal Name: ".Length);
                         }
                         else if (line.StartsWith("Filename"))
                         {
-                            string serial = line.Substring(10);
+                            string serial = line.Substring("Filename: ".Length);
 
                             // char gameType = serial[0];
                             // string gameid = serial[1] + serial[2];

MPF.UI.Core/ViewModels/DiscInformationViewModel.cs

@@ -302,6 +302,8 @@ namespace MPF.UI.Core.ViewModels
                 Parent.EDC.Text = SubmissionInfo.EDC.EDC.LongName();
             if (string.IsNullOrWhiteSpace(SubmissionInfo?.Extras?.Header))
                 Parent.Header.Visibility = Visibility.Collapsed;
+            if (SubmissionInfo?.CommonDiscInfo?.CommentsSpecialFields.Keys.Contains(SiteCode.InternalName) != true)
+                Parent.InternalName.Visibility = Visibility.Collapsed;
             if (SubmissionInfo?.CommonDiscInfo?.CommentsSpecialFields.Keys.Contains(SiteCode.InternalSerialName) != true)
                 Parent.InternalSerialName.Visibility = Visibility.Collapsed;
             if (SubmissionInfo?.CopyProtection?.LibCrypt == null)
@@ -453,6 +455,8 @@ namespace MPF.UI.Core.ViewModels
                     Parent.DMIHash.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.DMIHash];
                 if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.Filename))
                     Parent.Filename.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.Filename];
+                if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.InternalName))
+                    Parent.InternalName.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.InternalName];
                 if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.InternalSerialName))
                     Parent.InternalSerialName.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.InternalSerialName];
                 if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.Multisession))
@@ -571,6 +575,7 @@ namespace MPF.UI.Core.ViewModels
             // Read-Only Information
             SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.DMIHash] = Parent.DMIHash.Text;
             SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.Filename] = Parent.Filename.Text;
+            SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.InternalName] = Parent.InternalName.Text;
             SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.InternalSerialName] = Parent.InternalSerialName.Text;
             SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.Multisession] = Parent.Multisession.Text;
             SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.PFIHash] = Parent.PFIHash.Text;

MPF.UI.Core/Windows/DiscInformationWindow.xaml

@@ -352,6 +352,7 @@
                             <controls:UserInput x:Name="Header" Label="Header" IsReadOnly="True"
                                                 Text="{Binding SubmissionInfo.Extras.Header, Mode=TwoWay}" TextHeight="75" TextWrapping="NoWrap"
                                                 VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>
+                            <controls:UserInput x:Name="InternalName" Label="Internal Names" IsReadOnly="True"/>
                             <controls:UserInput x:Name="InternalSerialName" Label="Internal Serial" IsReadOnly="True"/>
                             <controls:UserInput x:Name="Multisession" Label="Multisession" IsReadOnly="True" TextHeight="75" TextWrapping="NoWrap"
                                                 VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>

RedumpLib/Data/Enumerations.cs

@@ -3557,6 +3557,10 @@ namespace RedumpLib.Data
         [HumanReadable(ShortName = "[T:GTID]", LongName = "<b>GT Interactive ID</b>:")]
         GTInteractiveID,
 
+        // TODO: This doesn't have a site tag yet
+        [HumanReadable(ShortName = "<b>Internal Name</b>:", LongName = "<b>Internal Name</b>:")]
+        InternalName,
+
         [HumanReadable(ShortName = "[T:ISN]", LongName = "<b>Internal Serial</b>:")]
         InternalSerialName,