Bump version

RedumpTool/RedumpTool.csproj

@@ -9,7 +9,7 @@
         <Nullable>enable</Nullable>
         <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <Version>1.6.5</Version>
+        <Version>1.6.9</Version>
     </PropertyGroup>
 
     <!-- Support All Frameworks -->

SabreTools.RedumpLib.Test/Data/ExtensionsTests.cs

@@ -681,6 +681,7 @@ namespace SabreTools.RedumpLib.Test.Data
         /// </summary>
         private static readonly SiteCode?[] _booleanSiteCodes =
         [
+            SiteCode.PCMacHybrid,
             SiteCode.PostgapType,
             SiteCode.VCD,
         ];
@@ -696,15 +697,19 @@ namespace SabreTools.RedumpLib.Test.Data
             SiteCode.BBFCRegistrationNumber,
             SiteCode.CompatibleOS,
             SiteCode.DiscHologramID,
+            SiteCode.DiscTitleNonLatin,
             SiteCode.DMIHash,
             SiteCode.DNASDiscID,
+            SiteCode.EditionNonLatin,
             SiteCode.Filename,
             SiteCode.Genre,
             SiteCode.InternalName,
             SiteCode.InternalSerialName,
             SiteCode.ISBN,
             SiteCode.ISSN,
+            SiteCode.LogsLink,
             SiteCode.Multisession,
+            SiteCode.PCMacHybrid,
             SiteCode.PFIHash,
             SiteCode.PostgapType,
             SiteCode.PPN,
@@ -731,6 +736,7 @@ namespace SabreTools.RedumpLib.Test.Data
             SiteCode.ElectronicArtsID,
             SiteCode.FoxInteractiveID,
             SiteCode.GTInteractiveID,
+            SiteCode.InterplayID,
             SiteCode.JASRACID,
             SiteCode.KingRecordsID,
             SiteCode.KoeiID,

SabreTools.RedumpLib.Test/SabreTools.RedumpLib.Test.csproj

@@ -28,7 +28,7 @@
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
         <PackageReference Include="xunit" Version="2.9.3" />
         <PackageReference Include="xunit.abstractions" Version="2.0.3" />
-        <PackageReference Include="xunit.analyzers" Version="1.20.0" />
+        <PackageReference Include="xunit.analyzers" Version="1.21.0" />
         <PackageReference Include="xunit.assert" Version="2.9.3" />
         <PackageReference Include="xunit.core" Version="2.9.3" />
         <PackageReference Include="xunit.extensibility.core" Version="2.9.3" />

SabreTools.RedumpLib/Builder.cs

@@ -458,41 +458,8 @@ namespace SabreTools.RedumpLib
                             addToLast = siteCode.IsMultiLine();
 
                             // Skip certain site codes because of data issues
-                            switch (siteCode)
-                            {
-                                // Multiple
-                                case SiteCode.InternalSerialName:
-                                case SiteCode.Multisession:
-                                case SiteCode.VolumeLabel:
-                                    continue;
-
-                                // Audio CD
-                                case SiteCode.RingNonZeroDataStart:
-                                case SiteCode.RingPerfectAudioOffset:
-                                case SiteCode.UniversalHash:
-                                    continue;
-
-                                // Microsoft Xbox and Xbox 360
-                                case SiteCode.DMIHash:
-                                case SiteCode.PFIHash:
-                                case SiteCode.SSHash:
-                                case SiteCode.SSVersion:
-                                case SiteCode.XMID:
-                                case SiteCode.XeMID:
-                                    continue;
-
-                                // Microsoft Xbox One and Series X/S
-                                case SiteCode.Filename:
-                                    continue;
-
-                                // Nintendo Gamecube
-                                case SiteCode.InternalName:
-                                    continue;
-
-                                // Protection
-                                case SiteCode.Protection:
-                                    continue;
-                            }
+                            if (ShouldSkipSiteCode(siteCode))
+                                continue;
 
                             // If we don't already have this site code, add it to the dictionary
                             if (!info.CommonDiscInfo.CommentsSpecialFields!.ContainsKey(siteCode.Value))
@@ -508,14 +475,14 @@ namespace SabreTools.RedumpLib
                         // If we didn't find a known tag, just add the line, just in case
                         if (!foundTag)
                         {
-                            if (addToLast && lastSiteCode != null)
+                            if (addToLast && lastSiteCode != null && !ShouldSkipSiteCode(lastSiteCode))
                             {
                                 if (!string.IsNullOrEmpty(info.CommonDiscInfo.CommentsSpecialFields![lastSiteCode.Value]))
                                     info.CommonDiscInfo.CommentsSpecialFields[lastSiteCode.Value] += "\n";
 
                                 info.CommonDiscInfo.CommentsSpecialFields[lastSiteCode.Value] += commentLine;
                             }
-                            else
+                            else if (!addToLast || lastSiteCode == null)
                             {
                                 newComments += $"{commentLine}\n";
                             }
@@ -596,14 +563,14 @@ namespace SabreTools.RedumpLib
                         // If we didn't find a known tag, just add the line, just in case
                         if (!foundTag)
                         {
-                            if (addToLast && lastSiteCode != null)
+                            if (addToLast && lastSiteCode != null && !ShouldSkipSiteCode(lastSiteCode))
                             {
                                 if (!string.IsNullOrEmpty(info.CommonDiscInfo.ContentsSpecialFields![lastSiteCode.Value]))
                                     info.CommonDiscInfo.ContentsSpecialFields[lastSiteCode.Value] += "\n";
 
                                 info.CommonDiscInfo.ContentsSpecialFields[lastSiteCode.Value] += contentLine;
                             }
-                            else
+                            else if (!addToLast || lastSiteCode == null)
                             {
                                 newContents += $"{contentLine}\n";
                             }
@@ -738,6 +705,44 @@ namespace SabreTools.RedumpLib
             return info;
         }
 
+        /// <summary>
+        /// Determine if a site code should be skipped on pulling
+        /// </summary>
+        private static bool ShouldSkipSiteCode(SiteCode? siteCode)
+        {
+            return siteCode switch
+            {
+                // Multiple
+                SiteCode.InternalSerialName
+                    or SiteCode.Multisession
+                    or SiteCode.VolumeLabel => true,
+
+                // Audio CD
+                SiteCode.RingNonZeroDataStart
+                    or SiteCode.RingPerfectAudioOffset
+                    or SiteCode.UniversalHash => true,
+
+                // Microsoft Xbox and Xbox 360
+                SiteCode.DMIHash
+                    or SiteCode.PFIHash
+                    or SiteCode.SSHash
+                    or SiteCode.SSVersion
+                    or SiteCode.XMID
+                    or SiteCode.XeMID => true,
+
+                // Microsoft Xbox One and Series X/S
+                SiteCode.Filename => true,
+
+                // Nintendo Gamecube
+                SiteCode.InternalName => true,
+
+                // Protection
+                SiteCode.Protection => true,
+
+                _ => false,
+            };
+        }
+
         #endregion
 
         #region Helpers

SabreTools.RedumpLib/Data/Enumerations.cs

@@ -3550,6 +3550,10 @@ namespace SabreTools.RedumpLib.Data
         [HumanReadable(ShortName = "<b>Disc Hologram ID</b>:", LongName = "<b>Disc Hologram ID</b>:")]
         DiscHologramID,
 
+        // This doesn't have a site tag yet
+        [HumanReadable(ShortName = "<b>Disc Title (non-Latin)</b>:", LongName = "<b>Disc Title (non-Latin)</b>:")]
+        DiscTitleNonLatin,
+
         // This doesn't have a site tag yet
         [HumanReadable(ShortName = "<b>DMI</b>:", LongName = "<b>DMI</b>:")]
         DMIHash,
@@ -3557,6 +3561,10 @@ namespace SabreTools.RedumpLib.Data
         [HumanReadable(ShortName = "[T:DNAS]", LongName = "<b>DNAS Disc ID</b>:")]
         DNASDiscID,
 
+        // This doesn't have a site tag yet
+        [HumanReadable(ShortName = "<b>Edition (non-Latin)</b>:", LongName = "<b>Edition (non-Latin)</b>:")]
+        EditionNonLatin,
+
         // This doesn't have a site tag yet
         [HumanReadable(ShortName = "<b>Eidos ID</b>:", LongName = "<b>Eidos ID</b>:")]
         EidosID,
@@ -3594,6 +3602,10 @@ namespace SabreTools.RedumpLib.Data
         [HumanReadable(ShortName = "[T:ISN]", LongName = "<b>Internal Serial</b>:")]
         InternalSerialName,
 
+        // This doesn't have a site tag yet
+        [HumanReadable(ShortName = "<b>Interplay ID</b>:", LongName = "<b>Interplay ID</b>:")]
+        InterplayID,
+
         [HumanReadable(ShortName = "[T:ISBN]", LongName = "<b>ISBN</b>:")]
         ISBN,
 
@@ -3612,6 +3624,10 @@ namespace SabreTools.RedumpLib.Data
         [HumanReadable(ShortName = "[T:KID]", LongName = "<b>Konami ID</b>:")]
         KonamiID,
 
+        // This doesn't have a site tag yet
+        [HumanReadable(ShortName = "<b>Logs Link</b>:", LongName = "<b>Logs Link</b>:")]
+        LogsLink,
+
         [HumanReadable(ShortName = "[T:LAID]", LongName = "<b>Lucas Arts ID</b>:")]
         LucasArtsID,
 
@@ -3641,6 +3657,11 @@ namespace SabreTools.RedumpLib.Data
         [HumanReadable(ShortName = "[T:P]", LongName = "<b>Patches</b>:")]
         Patches,
 
+        // This doesn't have a site tag yet
+        /// <remarks>No text value after</remarks>
+        [HumanReadable(ShortName = "PC/Mac Hybrid", LongName = "PC/Mac Hybrid")]
+        PCMacHybrid,
+
         // This doesn't have a site tag yet
         [HumanReadable(ShortName = "<b>PFI</b>:", LongName = "<b>PFI</b>:")]
         PFIHash,
@@ -3651,6 +3672,7 @@ namespace SabreTools.RedumpLib.Data
         [HumanReadable(ShortName = "[T:PCID]", LongName = "<b>Pony Canyon ID</b>:")]
         PonyCanyonID,
 
+        /// <remarks>No text value after</remarks>
         [HumanReadable(ShortName = "[T:PT2]", LongName = "<b>Postgap type</b>: Form 2")]
         PostgapType,
 
@@ -3721,6 +3743,7 @@ namespace SabreTools.RedumpLib.Data
         [HumanReadable(ShortName = "[T:VOL]", LongName = "<b>Volume Label</b>:")]
         VolumeLabel,
 
+        /// <remarks>No text value after</remarks>
         [HumanReadable(ShortName = "[T:VCD]", LongName = "<b>V-CD</b>")]
         VCD,
 

SabreTools.RedumpLib/Data/Extensions.cs

@@ -1220,6 +1220,7 @@ namespace SabreTools.RedumpLib.Data
         {
             return siteCode switch
             {
+                SiteCode.PCMacHybrid => true,
                 SiteCode.PostgapType => true,
                 SiteCode.VCD => true,
                 _ => false,
@@ -1247,15 +1248,19 @@ namespace SabreTools.RedumpLib.Data
                 SiteCode.BBFCRegistrationNumber => true,
                 SiteCode.CompatibleOS => true,
                 SiteCode.DiscHologramID => true,
+                SiteCode.DiscTitleNonLatin => true,
                 SiteCode.DMIHash => true,
                 SiteCode.DNASDiscID => true,
+                SiteCode.EditionNonLatin => true,
                 SiteCode.Filename => true,
                 SiteCode.Genre => true,
                 SiteCode.InternalName => true,
                 SiteCode.InternalSerialName => true,
                 SiteCode.ISBN => true,
                 SiteCode.ISSN => true,
+                SiteCode.LogsLink => true,
                 SiteCode.Multisession => true,
+                SiteCode.PCMacHybrid => true,
                 SiteCode.PFIHash => true,
                 SiteCode.PostgapType => true,
                 SiteCode.PPN => true,
@@ -1282,6 +1287,7 @@ namespace SabreTools.RedumpLib.Data
                 SiteCode.ElectronicArtsID => true,
                 SiteCode.FoxInteractiveID => true,
                 SiteCode.GTInteractiveID => true,
+                SiteCode.InterplayID => true,
                 SiteCode.JASRACID => true,
                 SiteCode.KingRecordsID => true,
                 SiteCode.KoeiID => true,

SabreTools.RedumpLib/Formatter.cs

@@ -13,9 +13,14 @@ namespace SabreTools.RedumpLib
         /// </summary>
         internal static readonly SiteCode[] OrderedCommentCodes =
         [
+            // Submission Info
+            SiteCode.LogsLink,
+
             // Identifying Info
             SiteCode.AlternativeTitle,
             SiteCode.AlternativeForeignTitle,
+            SiteCode.DiscTitleNonLatin,
+            SiteCode.EditionNonLatin,
             SiteCode.InternalName,
             SiteCode.InternalSerialName,
             SiteCode.VolumeLabel,
@@ -59,6 +64,7 @@ namespace SabreTools.RedumpLib
             SiteCode.ElectronicArtsID,
             SiteCode.FoxInteractiveID,
             SiteCode.GTInteractiveID,
+            SiteCode.InterplayID,
             SiteCode.JASRACID,
             SiteCode.KingRecordsID,
             SiteCode.KoeiID,
@@ -76,6 +82,9 @@ namespace SabreTools.RedumpLib
             SiteCode.TaitoID,
             SiteCode.UbisoftID,
             SiteCode.ValveID,
+
+            // Standardized Comments
+            SiteCode.PCMacHybrid,
         ];
 
         /// <summary>

SabreTools.RedumpLib/SabreTools.RedumpLib.csproj

@@ -8,7 +8,7 @@
         <Nullable>enable</Nullable>
         <SymbolPackageFormat>snupkg</SymbolPackageFormat>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <Version>1.6.5</Version>
+        <Version>1.6.9</Version>
 
         <!-- Package Properties -->
         <Authors>Matt Nadareski</Authors>
@@ -32,7 +32,7 @@
 
     <ItemGroup>
         <PackageReference Include="MinAsyncBridge" Version="0.12.4" Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`)) OR $(TargetFramework.StartsWith(`net40`))" />
-        <PackageReference Include="Net35.Actions" Version="1.1.0" Condition="$(TargetFramework.StartsWith(`net2`))" />
+        <PackageReference Include="Net35.Actions" Version="1.4.0" Condition="$(TargetFramework.StartsWith(`net2`))" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="SabreTools.Models" Version="1.5.8" />
     </ItemGroup>