Bump version

* Add Polymega system

* Polymega detected by windows

.github/workflows/build_and_test.yml

@@ -16,19 +16,16 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: |
+            6.0.x
+            8.0.x
+            9.0.x
 
     - name: Run tests
       run: dotnet test
       
     - name: Run publish script
-      run: ./publish-nix.sh
-
-    - name: Upload build
-      uses: actions/upload-artifact@v4
-      with:
-        name: 'Nuget Package'
-        path: "*.nupkg,*.snupkg"
+      run: ./publish-nix.sh -d
 
     - name: Upload to rolling
       uses: ncipollo/release-action@v1.14.0

.github/workflows/check_pr.yml

@@ -11,7 +11,10 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: |
+            6.0.x
+            8.0.x
+            9.0.x
       
     - name: Build
       run: dotnet build

LICENSE

@@ -0,0 +1,7 @@
+Copyright (c) 2018-2025 Matt Nadareski
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next paragraph) shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

RedumpTool/RedumpTool.csproj

@@ -9,7 +9,7 @@
         <Nullable>enable</Nullable>
         <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <Version>1.6.2</Version>
+        <Version>1.7.5</Version>
     </PropertyGroup>
 
     <!-- Support All Frameworks -->
@@ -30,4 +30,4 @@
         <ProjectReference Include="..\SabreTools.RedumpLib\SabreTools.RedumpLib.csproj" />
     </ItemGroup>
 
-</Project>
+</Project>

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,22 +697,30 @@ namespace SabreTools.RedumpLib.Test.Data
             SiteCode.BBFCRegistrationNumber,
             SiteCode.CompatibleOS,
             SiteCode.DiscHologramID,
+            SiteCode.DiscTitleNonLatin,
             SiteCode.DMIHash,
             SiteCode.DNASDiscID,
+            SiteCode.EditionNonLatin,
             SiteCode.Filename,
             SiteCode.Genre,
+            SiteCode.HighSierraVolumeDescriptor,
             SiteCode.InternalName,
             SiteCode.InternalSerialName,
             SiteCode.ISBN,
             SiteCode.ISSN,
+            SiteCode.LogsLink,
             SiteCode.Multisession,
+            SiteCode.PCMacHybrid,
             SiteCode.PFIHash,
             SiteCode.PostgapType,
             SiteCode.PPN,
+            SiteCode.Protection,
             SiteCode.RingNonZeroDataStart,
+            SiteCode.RingPerfectAudioOffset,
             SiteCode.Series,
             SiteCode.SSHash,
             SiteCode.SSVersion,
+            SiteCode.TitleID,
             SiteCode.UniversalHash,
             SiteCode.VCD,
             SiteCode.VFCCode,
@@ -729,6 +738,7 @@ namespace SabreTools.RedumpLib.Test.Data
             SiteCode.ElectronicArtsID,
             SiteCode.FoxInteractiveID,
             SiteCode.GTInteractiveID,
+            SiteCode.InterplayID,
             SiteCode.JASRACID,
             SiteCode.KingRecordsID,
             SiteCode.KoeiID,
@@ -775,6 +785,7 @@ namespace SabreTools.RedumpLib.Test.Data
             SiteCode.Filename,
             SiteCode.Games,
             SiteCode.GameFootage,
+            SiteCode.HighSierraVolumeDescriptor,
             SiteCode.Multisession,
             SiteCode.NetYarozeGames,
             SiteCode.Patches,
@@ -1022,7 +1033,6 @@ namespace SabreTools.RedumpLib.Test.Data
             RedumpSystem.NintendoWiiU,
             RedumpSystem.Panasonic3DOInteractiveMultiplayer,
             RedumpSystem.PhilipsCDi,
-            RedumpSystem.PhilipsCDiDigitalVideo,
             RedumpSystem.SegaDreamcast,
             RedumpSystem.SegaMegaCDSegaCD,
             RedumpSystem.SegaSaturn,
@@ -1099,7 +1109,6 @@ namespace SabreTools.RedumpLib.Test.Data
             RedumpSystem.MicrosoftXboxOne,
             RedumpSystem.MicrosoftXboxSeriesXS,
             RedumpSystem.NintendoWiiU,
-            RedumpSystem.PhilipsCDiDigitalVideo,
             RedumpSystem.SonyPlayStation4,
             RedumpSystem.SonyPlayStation5,
 
@@ -1179,7 +1188,7 @@ namespace SabreTools.RedumpLib.Test.Data
             [RedumpSystem.NintendoWiiU] = SystemCategory.DiscBasedConsole,
             [RedumpSystem.Panasonic3DOInteractiveMultiplayer] = SystemCategory.DiscBasedConsole,
             [RedumpSystem.PhilipsCDi] = SystemCategory.DiscBasedConsole,
-            [RedumpSystem.PhilipsCDiDigitalVideo] = SystemCategory.DiscBasedConsole,
+            [RedumpSystem.PlaymajiPolymega] = SystemCategory.DiscBasedConsole,
             [RedumpSystem.PioneerLaserActive] = SystemCategory.DiscBasedConsole,
             [RedumpSystem.SegaDreamcast] = SystemCategory.DiscBasedConsole,
             [RedumpSystem.SegaMegaCDSegaCD] = SystemCategory.DiscBasedConsole,
@@ -1530,6 +1539,7 @@ namespace SabreTools.RedumpLib.Test.Data
             RedumpSystem.NECPCEngineCDTurboGrafxCD,
             RedumpSystem.NECPCFXPCFXGA,
             RedumpSystem.NintendoSonySuperNESCDROMSystem,
+            RedumpSystem.PlaymajiPolymega,
             RedumpSystem.SegaDreamcast,
             RedumpSystem.SegaMegaCDSegaCD,
             RedumpSystem.SegaSaturn,

SabreTools.RedumpLib.Test/FormatterTests.cs

@@ -20,19 +20,21 @@ namespace SabreTools.RedumpLib.Test
         // TODO: Write tests for FormatOutputData(CommonDiscInfoSection)
 
         [Fact]
-        public void FormatOutputData_CDINullSACNull_Minimal()
+        public void FormatOutputData_CDINullSACNullTAWONull_Minimal()
         {
             string expected = "Common Disc Info:\n\tRegion: SPACE! (CHANGE THIS)\n\tLanguages: ADD LANGUAGES HERE (ONLY IF YOU TESTED)\n\n\tRingcode Information:\n\n\n";
 
             var builder = new StringBuilder();
             CommonDiscInfoSection? section = null;
             SizeAndChecksumsSection? sac = null;
+            TracksAndWriteOffsetsSection? tawo = null;
             int? fullyMatchedID = null;
             List<int>? partiallyMatchedIDs = null;
 
             Formatter.FormatOutputData(builder,
                 section,
                 sac,
+                tawo,
                 fullyMatchedID,
                 partiallyMatchedIDs);
 
@@ -554,7 +556,7 @@ namespace SabreTools.RedumpLib.Test
             string? expected = "BD-ROM-66";
 
             MediaType? mediaType = MediaType.BluRay;
-            string? picIdentifier = Models.PIC.Constants.DiscTypeIdentifierROMUltra;
+            string? picIdentifier = "BDU";
             long? size = null;
             long? layerbreak = 12345;
             long? layerbreak2 = null;
@@ -620,7 +622,7 @@ namespace SabreTools.RedumpLib.Test
             string? expected = "BD-ROM-33";
 
             MediaType? mediaType = MediaType.BluRay;
-            string? picIdentifier = Models.PIC.Constants.DiscTypeIdentifierROMUltra;
+            string? picIdentifier = "BDU";
             long? size = null;
             long? layerbreak = null;
             long? layerbreak2 = null;

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

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
         <CheckEolTargetFramework>false</CheckEolTargetFramework>
         <LangVersion>latest</LangVersion>
         <Nullable>enable</Nullable>
@@ -24,20 +24,20 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.CodeCoverage" Version="17.12.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-        <PackageReference Include="xunit" Version="2.9.2" />
+        <PackageReference Include="Microsoft.CodeCoverage" Version="18.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
+        <PackageReference Include="xunit" Version="2.9.3" />
         <PackageReference Include="xunit.abstractions" Version="2.0.3" />
-        <PackageReference Include="xunit.analyzers" Version="1.17.0" />
-        <PackageReference Include="xunit.assert" Version="2.9.2" />
-        <PackageReference Include="xunit.core" Version="2.9.2" />
-        <PackageReference Include="xunit.extensibility.core" Version="2.9.2" />
-        <PackageReference Include="xunit.extensibility.execution" Version="2.9.2" />
-        <PackageReference Include="xunit.runner.console" Version="2.9.2">
+        <PackageReference Include="xunit.analyzers" Version="1.24.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" />
+        <PackageReference Include="xunit.extensibility.execution" Version="2.9.3" />
+        <PackageReference Include="xunit.runner.console" Version="2.9.3">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

SabreTools.RedumpLib.Test/ValidatorTests.cs

@@ -143,7 +143,7 @@ namespace SabreTools.RedumpLib.Test
                 SizeAndChecksums = new SizeAndChecksumsSection
                 {
                     Layerbreak = 12345,
-                    PICIdentifier = Models.PIC.Constants.DiscTypeIdentifierROMUltra,
+                    PICIdentifier = "BDU",
                 },
             };
 
@@ -213,7 +213,7 @@ namespace SabreTools.RedumpLib.Test
                 CommonDiscInfo = new CommonDiscInfoSection { Media = type },
                 SizeAndChecksums = new SizeAndChecksumsSection
                 {
-                    PICIdentifier = Models.PIC.Constants.DiscTypeIdentifierROMUltra,
+                    PICIdentifier = "BDU",
                 },
             };
 

SabreTools.RedumpLib/Attributes/AttributeHelper.cs

@@ -44,4 +44,4 @@ namespace SabreTools.RedumpLib.Attributes
             return attributes[0] as HumanReadableAttribute;
         }
     }
-}
+}

SabreTools.RedumpLib/Attributes/HumanReadableAttribute.cs

@@ -22,4 +22,4 @@ namespace SabreTools.RedumpLib.Attributes
         /// </summary>
         public string? ShortName { get; set; }
     }
-}
+}

SabreTools.RedumpLib/Attributes/LanguageAttribute.cs

@@ -23,4 +23,4 @@ namespace SabreTools.RedumpLib.Attributes
         /// </summary>
         public string? ThreeLetterCodeAlt { get; set; }
     }
-}
+}

SabreTools.RedumpLib/Attributes/SystemAttribute.cs

@@ -52,4 +52,4 @@ namespace SabreTools.RedumpLib.Attributes
         /// </summary>
         public bool HasSbi { get; set; } = false;
     }
-}
+}

SabreTools.RedumpLib/Builder.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-#if NET40_OR_GREATER || NETCOREAPP
+#if NET40_OR_GREATER || NETCOREAPP || NETSTANDARD2_0_OR_GREATER
 using System.Net;
 #endif
 using System.Text;
@@ -458,36 +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.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;
-                            }
+                            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))
@@ -503,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";
                             }
@@ -591,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";
                             }
@@ -733,6 +705,46 @@ 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.HighSierraVolumeDescriptor
+                    or 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,
+                SiteCode.TitleID => true,
+
+                // Nintendo Gamecube
+                SiteCode.InternalName => true,
+
+                // Protection
+                SiteCode.Protection => true,
+
+                _ => false,
+            };
+        }
+
         #endregion
 
         #region Helpers

SabreTools.RedumpLib/Converters/DiscCategoryConverter.cs

@@ -33,4 +33,4 @@ namespace SabreTools.RedumpLib.Converters
             t.WriteTo(writer);
         }
     }
-}
+}

SabreTools.RedumpLib/Converters/DiscTypeConverter.cs

@@ -33,4 +33,4 @@ namespace SabreTools.RedumpLib.Converters
             t.WriteTo(writer);
         }
     }
-}
+}

SabreTools.RedumpLib/Converters/LanguageConverter.cs

@@ -18,7 +18,7 @@ namespace SabreTools.RedumpLib.Converters
             // If we have a value already, don't overwrite it
             if (hasExistingValue)
                 return existingValue ?? [];
-                
+
             // Get the current depth for checking
             int currentDepth = reader.Depth;
 
@@ -53,4 +53,4 @@ namespace SabreTools.RedumpLib.Converters
             array.WriteTo(writer);
         }
     }
-}
+}

SabreTools.RedumpLib/Converters/LanguageSelectionConverter.cs

@@ -18,7 +18,7 @@ namespace SabreTools.RedumpLib.Converters
             // If we have a value already, don't overwrite it
             if (hasExistingValue)
                 return existingValue ?? [];
-                
+
             // Get the current depth for checking
             int currentDepth = reader.Depth;
 
@@ -53,4 +53,4 @@ namespace SabreTools.RedumpLib.Converters
             array.WriteTo(writer);
         }
     }
-}
+}

SabreTools.RedumpLib/Converters/RegionConverter.cs

@@ -33,4 +33,4 @@ namespace SabreTools.RedumpLib.Converters
             t.WriteTo(writer);
         }
     }
-}
+}

SabreTools.RedumpLib/Converters/SystemConverter.cs

@@ -33,4 +33,4 @@ namespace SabreTools.RedumpLib.Converters
             t.WriteTo(writer);
         }
     }
-}
+}

SabreTools.RedumpLib/Converters/YesNoConverter.cs

@@ -33,4 +33,4 @@ namespace SabreTools.RedumpLib.Converters
             t.WriteTo(writer);
         }
     }
-}
+}

SabreTools.RedumpLib/Data/Constants.cs

@@ -306,4 +306,4 @@ namespace SabreTools.RedumpLib.Data
 
         #endregion
     }
-}
+}

SabreTools.RedumpLib/Data/Enumerations.cs

@@ -2008,8 +2008,8 @@ namespace SabreTools.RedumpLib.Data
         [System(Category = SystemCategory.DiscBasedConsole, LongName = "Philips CD-i", ShortName = "cdi", HasCues = true, HasDat = true)]
         PhilipsCDi,
 
-        [System(Category = SystemCategory.DiscBasedConsole, LongName = "Philips CD-i Digital Video", ShortName = "cdi-video", IsBanned = true)]
-        PhilipsCDiDigitalVideo,
+        [System(Category = SystemCategory.DiscBasedConsole, Available = false, LongName = "Playmaji Polymega")]
+        PlaymajiPolymega,
 
         [System(Category = SystemCategory.DiscBasedConsole, Available = false, LongName = "Pioneer LaserActive")]
         PioneerLaserActive,
@@ -3553,6 +3553,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,
@@ -3560,6 +3564,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,
@@ -3590,6 +3598,10 @@ namespace SabreTools.RedumpLib.Data
         [HumanReadable(ShortName = "[T:GTID]", LongName = "<b>GT Interactive ID</b>:")]
         GTInteractiveID,
 
+        // This doesn't have a site tag yet
+        [HumanReadable(ShortName = "<b>High Sierra Volume Descriptor</b>:", LongName = "<b>High Sierra Volume Descriptor</b>:")]
+        HighSierraVolumeDescriptor,
+
         // This doesn't have a site tag yet
         [HumanReadable(ShortName = "<b>Internal Name</b>:", LongName = "<b>Internal Name</b>:")]
         InternalName,
@@ -3597,6 +3609,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,
 
@@ -3615,6 +3631,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,
 
@@ -3644,6 +3664,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,
@@ -3654,16 +3679,25 @@ 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,
 
         [HumanReadable(ShortName = "[T:PPN]", LongName = "<b>PPN</b>:")]
         PPN,
 
+        // This doesn't have a site tag for some systems yet
+        [HumanReadable(ShortName = "<b>Protection</b>:", LongName = "<b>Protection</b>:")]
+        Protection,
+
         // This doesn't have a site tag yet
         [HumanReadable(ShortName = "<b>Ring non-zero data start</b>:", LongName = "<b>Ring non-zero data start</b>:")]
         RingNonZeroDataStart,
 
+        // This doesn't have a site tag yet
+        [HumanReadable(ShortName = "<b>Ring Perfect Audio Offset</b>:", LongName = "<b>Ring Perfect Audio Offset</b>:")]
+        RingPerfectAudioOffset,
+
         [HumanReadable(ShortName = "[T:RD]", LongName = "<b>Rolling Demos</b>:")]
         RollingDemos,
 
@@ -3697,6 +3731,10 @@ namespace SabreTools.RedumpLib.Data
         [HumanReadable(ShortName = "[T:TD]", LongName = "<b>Tech Demos</b>:")]
         TechDemos,
 
+        // This doesn't have a site tag yet
+        [HumanReadable(ShortName = "<b>Title ID</b>:", LongName = "<b>Title ID</b>:")]
+        TitleID,
+
         [HumanReadable(ShortName = "[T:UID]", LongName = "<b>Ubisoft ID</b>:")]
         UbisoftID,
 
@@ -3716,6 +3754,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

@@ -159,6 +159,12 @@ namespace SabreTools.RedumpLib.Data
                     types.Add(MediaType.CDROM);
                     break;
 
+                // https://en.wikipedia.org/wiki/Polymega
+                case RedumpSystem.PlaymajiPolymega:
+                    types.Add(MediaType.CDROM);
+                    types.Add(MediaType.DVD);
+                    break;
+
                 // https://en.wikipedia.org/wiki/LaserActive
                 case RedumpSystem.PioneerLaserActive:
                     types.Add(MediaType.CDROM);
@@ -1220,6 +1226,7 @@ namespace SabreTools.RedumpLib.Data
         {
             return siteCode switch
             {
+                SiteCode.PCMacHybrid => true,
                 SiteCode.PostgapType => true,
                 SiteCode.VCD => true,
                 _ => false,
@@ -1247,22 +1254,30 @@ 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.HighSierraVolumeDescriptor => 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,
+                SiteCode.Protection => true,
                 SiteCode.RingNonZeroDataStart => true,
+                SiteCode.RingPerfectAudioOffset => true,
                 SiteCode.Series => true,
                 SiteCode.SSHash => true,
                 SiteCode.SSVersion => true,
+                SiteCode.TitleID => true,
                 SiteCode.UniversalHash => true,
                 SiteCode.VCD => true,
                 SiteCode.VFCCode => true,
@@ -1280,6 +1295,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,
@@ -1351,6 +1367,7 @@ namespace SabreTools.RedumpLib.Data
                 SiteCode.Filename => true,
                 SiteCode.Games => true,
                 SiteCode.GameFootage => true,
+                SiteCode.HighSierraVolumeDescriptor => true,
                 SiteCode.Multisession => true,
                 SiteCode.NetYarozeGames => true,
                 SiteCode.Patches => true,
@@ -1419,7 +1436,6 @@ namespace SabreTools.RedumpLib.Data
                     or RedumpSystem.NintendoWiiU
                     or RedumpSystem.Panasonic3DOInteractiveMultiplayer
                     or RedumpSystem.PhilipsCDi
-                    or RedumpSystem.PhilipsCDiDigitalVideo
                     or RedumpSystem.PioneerLaserActive
                     or RedumpSystem.MarkerDiscBasedConsoleEnd => false,
 

SabreTools.RedumpLib/Data/SubmissionInfo.cs

@@ -1,8 +1,5 @@
 using System;
 using System.Collections.Generic;
-#if NET40_OR_GREATER || NETCOREAPP
-using System.Linq;
-#endif
 using Newtonsoft.Json;
 using SabreTools.RedumpLib.Converters;
 
@@ -75,7 +72,6 @@ namespace SabreTools.RedumpLib.Data
 
         public object Clone()
         {
-#if NET20 || NET35
             Dictionary<string, string>? artifacts = null;
             if (this.Artifacts != null)
             {
@@ -85,9 +81,6 @@ namespace SabreTools.RedumpLib.Data
                     artifacts[kvp.Key] = kvp.Value;
                 }
             }
-#else
-            var artifacts = this.Artifacts?.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
-#endif
 
             return new SubmissionInfo
             {
@@ -249,7 +242,6 @@ namespace SabreTools.RedumpLib.Data
 
         public object Clone()
         {
-#if NET20 || NET35
             Dictionary<SiteCode, string>? commentsSpecialFields = null;
             if (this.CommentsSpecialFields != null)
             {
@@ -269,10 +261,6 @@ namespace SabreTools.RedumpLib.Data
                     contentsSpecialFields[kvp.Key] = kvp.Value;
                 }
             }
-#else
-            var commentsSpecialFields = this.CommentsSpecialFields?.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
-            var contentsSpecialFields = this.ContentsSpecialFields?.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
-#endif
 
             return new CommonDiscInfoSection
             {
@@ -455,7 +443,6 @@ namespace SabreTools.RedumpLib.Data
 
         public object Clone()
         {
-#if NET20 || NET35
             Dictionary<string, List<string>?>? fullProtections = null;
             if (this.FullProtections != null)
             {
@@ -465,9 +452,6 @@ namespace SabreTools.RedumpLib.Data
                     fullProtections[kvp.Key] = kvp.Value;
                 }
             }
-#else
-            var fullProtections = this.FullProtections?.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
-#endif
 
             return new CopyProtectionSection
             {

SabreTools.RedumpLib/ExtensionAttribute.cs

@@ -6,4 +6,4 @@ namespace System.Runtime.CompilerServices
     internal sealed class ExtensionAttribute : Attribute {}
 }
 
-#endif
+#endif

SabreTools.RedumpLib/Formatter.cs

@@ -13,15 +13,22 @@ 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,
+            SiteCode.HighSierraVolumeDescriptor,
             SiteCode.Multisession,
             SiteCode.UniversalHash,
             SiteCode.RingNonZeroDataStart,
+            SiteCode.RingPerfectAudioOffset,
 
             SiteCode.XMID,
             SiteCode.XeMID,
@@ -31,6 +38,9 @@ namespace SabreTools.RedumpLib
             SiteCode.SSVersion,
 
             SiteCode.Filename,
+            SiteCode.TitleID,
+
+            SiteCode.Protection,
 
             SiteCode.BBFCRegistrationNumber,
             SiteCode.DiscHologramID,
@@ -56,6 +66,7 @@ namespace SabreTools.RedumpLib
             SiteCode.ElectronicArtsID,
             SiteCode.FoxInteractiveID,
             SiteCode.GTInteractiveID,
+            SiteCode.InterplayID,
             SiteCode.JASRACID,
             SiteCode.KingRecordsID,
             SiteCode.KoeiID,
@@ -73,6 +84,9 @@ namespace SabreTools.RedumpLib
             SiteCode.TaitoID,
             SiteCode.UbisoftID,
             SiteCode.ValveID,
+
+            // Standardized Comments
+            SiteCode.PCMacHybrid,
         ];
 
         /// <summary>
@@ -132,6 +146,7 @@ namespace SabreTools.RedumpLib
                 FormatOutputData(output,
                     info.CommonDiscInfo,
                     info.SizeAndChecksums,
+                    info.TracksAndWriteOffsets,
                     info.FullyMatchedID,
                     info.PartiallyMatchedIDs);
                 output.AppendLine();
@@ -241,6 +256,7 @@ namespace SabreTools.RedumpLib
         internal static void FormatOutputData(StringBuilder output,
             CommonDiscInfoSection? section,
             SizeAndChecksumsSection? sac,
+            TracksAndWriteOffsetsSection? tawo,
             int? fullyMatchedID,
             List<int>? partiallyMatchedIDs)
         {
@@ -351,7 +367,13 @@ namespace SabreTools.RedumpLib
                 AddIfExists(output, "Label Side " + Template.AdditionalMouldField, section?.Layer1AdditionalMould, 0);
             }
 
+            var offset = tawo?.OtherWriteOffsets;
+            if (int.TryParse(offset, out int i))
+                offset = i.ToString("+#;-#;0");
+
+            AddIfExists(output, Template.WriteOffsetField, offset, 0);
             output.AppendLine();
+
             AddIfExists(output, Template.BarcodeField, section?.Barcode, 1);
             AddIfExists(output, Template.EXEDateBuildDate, section?.EXEDateBuildDate, 1);
             AddIfExists(output, Template.ErrorCountField, section?.ErrorsCount, 1);
@@ -530,8 +552,13 @@ namespace SabreTools.RedumpLib
                 && key != "Cuesheet")
             {
                 // Convert to tabs
+#if NETCOREAPP
+                value = value.Replace("<tab>", "\t", StringComparison.OrdinalIgnoreCase);
+#else
                 value = value.Replace("<tab>", "\t");
                 value = value.Replace("<TAB>", "\t");
+                value = value.Replace("<Tab>", "\t");
+#endif
                 value = value.Replace("   ", "\t");
 
                 // Sanitize whitespace around tabs
@@ -661,13 +688,13 @@ namespace SabreTools.RedumpLib
                         return $"{mediaType.LongName()}-128";
                     else if (layerbreak2 != default && layerbreak2 != default(long))
                         return $"{mediaType.LongName()}-100";
-                    else if (layerbreak != default && layerbreak != default(long) && picIdentifier == Models.PIC.Constants.DiscTypeIdentifierROMUltra)
+                    else if (layerbreak != default && layerbreak != default(long) && picIdentifier == "BDU")
                         return $"{mediaType.LongName()}-66";
                     else if (layerbreak != default && layerbreak != default(long) && size > 53_687_063_712)
                         return $"{mediaType.LongName()}-66";
                     else if (layerbreak != default && layerbreak != default(long))
                         return $"{mediaType.LongName()}-50";
-                    else if (picIdentifier == Models.PIC.Constants.DiscTypeIdentifierROMUltra)
+                    else if (picIdentifier == "BDU")
                         return $"{mediaType.LongName()}-33";
                     else if (size > 26_843_531_856)
                         return $"{mediaType.LongName()}-33";

SabreTools.RedumpLib/SabreTools.RedumpLib.csproj

@@ -2,18 +2,18 @@
 
     <PropertyGroup>
         <!-- Assembly Properties -->
-        <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;netstandard2.0;netstandard2.1</TargetFrameworks>
         <IncludeSymbols>true</IncludeSymbols>
         <LangVersion>latest</LangVersion>
         <Nullable>enable</Nullable>
         <SymbolPackageFormat>snupkg</SymbolPackageFormat>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <Version>1.6.2</Version>
+        <Version>1.7.5</Version>
 
         <!-- Package Properties -->
         <Authors>Matt Nadareski</Authors>
         <Description>Code to interact with redump.org</Description>
-        <Copyright>Copyright (c) Matt Nadareski 2020-2024</Copyright>
+        <Copyright>Copyright (c) Matt Nadareski 2020-2025</Copyright>
         <PackageProjectUrl>https://github.com/SabreTools/</PackageProjectUrl>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <RepositoryUrl>https://github.com/SabreTools/SabreTools.RedumpLib</RepositoryUrl>
@@ -30,17 +30,10 @@
         <None Include="../README.md" Pack="true" PackagePath="" />
     </ItemGroup>
 
-    <!-- Support for old .NET versions -->
-    <ItemGroup Condition="$(TargetFramework.StartsWith(`net2`))">
-        <PackageReference Include="Net35.Actions" Version="1.1.0" />
-    </ItemGroup>
-    <ItemGroup Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`)) OR $(TargetFramework.StartsWith(`net40`))">
-        <PackageReference Include="MinAsyncBridge" Version="0.12.4" />
-    </ItemGroup>
-
     <ItemGroup>
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageReference Include="SabreTools.Models" Version="1.5.8" />
+        <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.4.0" Condition="$(TargetFramework.StartsWith(`net2`))" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
     </ItemGroup>
 
-</Project>
+</Project>

SabreTools.RedumpLib/Validator.cs

@@ -39,13 +39,13 @@ namespace SabreTools.RedumpLib
                         info.CommonDiscInfo.Media = DiscType.BD128;
                     else if (info.SizeAndChecksums.Layerbreak2 != default)
                         info.CommonDiscInfo.Media = DiscType.BD100;
-                    else if (info.SizeAndChecksums.Layerbreak != default && info.SizeAndChecksums.PICIdentifier == Models.PIC.Constants.DiscTypeIdentifierROMUltra)
+                    else if (info.SizeAndChecksums.Layerbreak != default && info.SizeAndChecksums.PICIdentifier == "BDU")
                         info.CommonDiscInfo.Media = DiscType.BD66;
                     else if (info.SizeAndChecksums.Layerbreak != default && info.SizeAndChecksums.Size > 50_050_629_632)
                         info.CommonDiscInfo.Media = DiscType.BD66;
                     else if (info.SizeAndChecksums.Layerbreak != default)
                         info.CommonDiscInfo.Media = DiscType.BD50;
-                    else if (info.SizeAndChecksums.PICIdentifier == Models.PIC.Constants.DiscTypeIdentifierROMUltra)
+                    else if (info.SizeAndChecksums.PICIdentifier == "BDU")
                         info.CommonDiscInfo.Media = DiscType.BD33;
                     else if (info.SizeAndChecksums.Size > 25_025_314_816)
                         info.CommonDiscInfo.Media = DiscType.BD33;
@@ -157,7 +157,6 @@ namespace SabreTools.RedumpLib
         /// </summary>
         /// <param name="rc">RedumpClient for making the connection</param>
         /// <param name="info">Existing SubmissionInfo object to fill</param>
-        /// <param name="resultProgress">Optional result progress callback</param>
         /// <returns>List of found values, if possible</returns>
         public async static Task<List<int>?> ValidateUniversalHash(RedumpClient rc, SubmissionInfo info)
         {

SabreTools.RedumpLib/Web/CookieWebClient.cs

@@ -32,9 +32,12 @@ namespace SabreTools.RedumpLib.Web
         {
             WebRequest request = base.GetWebRequest(address);
             if (request is HttpWebRequest webRequest)
+            {
+                webRequest.Timeout = 30 * 1000; // 30 seconds
                 webRequest.CookieContainer = _container;
+            }
 
             return request;
         }
     }
-}
+}

SabreTools.RedumpLib/Web/DelayHelper.cs

@@ -18,4 +18,4 @@ namespace SabreTools.RedumpLib.Web
             Thread.Sleep(delay * 100);
         }
     }
-}
+}

SabreTools.RedumpLib/Web/Discs.cs

@@ -62,4 +62,4 @@ namespace SabreTools.RedumpLib.Web
             return ids;
         }
     }
-}
+}

SabreTools.RedumpLib/Web/Packs.cs

@@ -68,4 +68,4 @@ namespace SabreTools.RedumpLib.Web
             return true;
         }
     }
-}
+}

SabreTools.RedumpLib/Web/RedumpClient.cs

@@ -36,7 +36,7 @@ namespace SabreTools.RedumpLib.Web
         /// <summary>
         /// Internal client for interaction
         /// </summary>
-#if NETFRAMEWORK
+#if NETFRAMEWORK || NETSTANDARD2_0_OR_GREATER
         private CookieWebClient _internalClient;
 #else
         private HttpClient _internalClient;
@@ -49,10 +49,10 @@ namespace SabreTools.RedumpLib.Web
         /// </summary>
         public RedumpClient()
         {
-#if NETFRAMEWORK
+#if NETFRAMEWORK || NETSTANDARD2_0_OR_GREATER
             _internalClient = new CookieWebClient();
 #else
-            _internalClient = new HttpClient(new HttpClientHandler { UseCookies = true });
+            _internalClient = new HttpClient(new HttpClientHandler { UseCookies = true }) { Timeout = TimeSpan.FromSeconds(30) };
 #endif
         }
 
@@ -131,7 +131,7 @@ namespace SabreTools.RedumpLib.Web
                     var loginPage = await DownloadString(Constants.LoginUrl);
                     string token = Constants.TokenRegex.Match(loginPage ?? string.Empty).Groups[1].Value;
 
-#if NETFRAMEWORK
+#if NETFRAMEWORK || NETSTANDARD2_0_OR_GREATER
                     // Construct the login request
                     _internalClient.Headers[HttpRequestHeader.ContentType] = "application/x-www-form-urlencoded";
                     _internalClient.Encoding = Encoding.UTF8;
@@ -205,7 +205,7 @@ namespace SabreTools.RedumpLib.Web
                 {
 #if NET40
                     return await Task.Factory.StartNew(() => _internalClient.DownloadData(uri));
-#elif NETFRAMEWORK
+#elif NETFRAMEWORK || NETSTANDARD2_0_OR_GREATER
                     return await Task.Run(() => _internalClient.DownloadData(uri));
 #else
                     return await _internalClient.GetByteArrayAsync(uri);
@@ -231,7 +231,7 @@ namespace SabreTools.RedumpLib.Web
 #if NET40
             await Task.Factory.StartNew(() => { _internalClient.DownloadFile(uri, fileName); return true; });
             return _internalClient.GetLastFilename();
-#elif NETFRAMEWORK
+#elif NETFRAMEWORK || NETSTANDARD2_0_OR_GREATER
             await Task.Run(() => _internalClient.DownloadFile(uri, fileName));
             return _internalClient.GetLastFilename();
 #else
@@ -271,7 +271,7 @@ namespace SabreTools.RedumpLib.Web
                 {
 #if NET40
                     return await Task.Factory.StartNew(() => _internalClient.DownloadString(uri));
-#elif NETFRAMEWORK
+#elif NETFRAMEWORK || NETSTANDARD2_0_OR_GREATER
                     return await Task.Run(() => _internalClient.DownloadString(uri));
 #else
                     return await _internalClient.GetStringAsync(uri);
@@ -497,7 +497,7 @@ namespace SabreTools.RedumpLib.Web
             {
 #if NET40
                 return await Task.Factory.StartNew(() => _internalClient.DownloadData(string.Format(url, system.ShortName())));
-#elif NETFRAMEWORK
+#elif NETFRAMEWORK || NETSTANDARD2_0_OR_GREATER
                 return await Task.Run(() => _internalClient.DownloadData(string.Format(url, system.ShortName())));
 #else
                 return await _internalClient.GetByteArrayAsync(string.Format(url, system.ShortName()));
@@ -928,4 +928,4 @@ namespace SabreTools.RedumpLib.Web
 
         #endregion
     }
-}
+}

SabreTools.RedumpLib/Web/Search.cs

@@ -99,4 +99,4 @@ namespace SabreTools.RedumpLib.Web
             return ids;
         }
     }
-}
+}

SabreTools.RedumpLib/Web/User.cs

@@ -69,7 +69,7 @@ namespace SabreTools.RedumpLib.Web
 
             return ids;
         }
-    
+
         /// <summary>
         /// List the disc IDs associated with the given user
         /// </summary>
@@ -107,4 +107,4 @@ namespace SabreTools.RedumpLib.Web
             return ids;
         }
     }
-}
+}

SabreTools.RedumpLib/Web/WIP.cs

@@ -49,4 +49,4 @@ namespace SabreTools.RedumpLib.Web
             return ids;
         }
     }
-}
+}