Remove reliance on Models library

Author: mnadareski

SabreTools.RedumpLib.Test/FormatterTests.cs

@@ -556,7 +556,7 @@ public void GetFixedMediaType_BD66PIC_Formatted()
             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;
@@ -622,7 +622,7 @@ public void GetFixedMediaType_BD33PIC_Formatted()
             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/ValidatorTests.cs

@@ -143,7 +143,7 @@ public void NormalizeDiscType_BD66PIC_Fixed(DiscType type)
                 SizeAndChecksums = new SizeAndChecksumsSection
                 {
                     Layerbreak = 12345,
-                    PICIdentifier = Models.PIC.Constants.DiscTypeIdentifierROMUltra,
+                    PICIdentifier = "BDU",
                 },
             };
 
@@ -213,7 +213,7 @@ public void NormalizeDiscType_BD33PIC_Fixed(DiscType type)
                 CommonDiscInfo = new CommonDiscInfoSection { Media = type },
                 SizeAndChecksums = new SizeAndChecksumsSection
                 {
-                    PICIdentifier = Models.PIC.Constants.DiscTypeIdentifierROMUltra,
+                    PICIdentifier = "BDU",
                 },
             };
 

SabreTools.RedumpLib/Formatter.cs

@@ -687,13 +687,13 @@ internal static string FormatSiteTag(SiteCode code, string value)
                         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

@@ -34,7 +34,6 @@
         <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" />
-        <PackageReference Include="SabreTools.Models" Version="1.7.2" />
     </ItemGroup>
 
 </Project>

SabreTools.RedumpLib/Validator.cs

@@ -39,13 +39,13 @@ public static void NormalizeDiscType(SubmissionInfo info)
                         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 @@ public static void NormalizeDiscType(SubmissionInfo info)
         /// </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)
         {