From 774f44c8ce85281ea66c47e8eadd8ec959e871b2 Mon Sep 17 00:00:00 2001
From: Deterous <138427222+Deterous@users.noreply.github.com>
Date: Tue, 27 Feb 2024 10:35:04 +0900
Subject: [PATCH] Pull PS3 Disc Key from redump (#656)

* Pull PS3 Disc Key from redump

* Bump RedumpLib to 1.3.3
---
 CHANGELIST.md                  | 1 +
 MPF.Check/MPF.Check.csproj     | 2 +-
 MPF.Core/MPF.Core.csproj       | 2 +-
 MPF.Core/SubmissionInfoTool.cs | 2 +-
 MPF.Test/MPF.Test.csproj       | 2 +-
 MPF.UI.Core/MPF.UI.Core.csproj | 2 +-
 MPF/MPF.csproj                 | 2 +-
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGELIST.md b/CHANGELIST.md
index 050e58f2..4b88e39b 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -41,6 +41,7 @@
 - Show hashes in readonly data
 - Update to BinaryObjectScanner 3.1.0
 - Add Mattel HyperScan detection
+- Pull PS3 Disc Key from redump (Deterous)
 
 ### 3.1.1 (2024-02-20)
 
diff --git a/MPF.Check/MPF.Check.csproj b/MPF.Check/MPF.Check.csproj
index c0213b85..d017c9e1 100644
--- a/MPF.Check/MPF.Check.csproj
+++ b/MPF.Check/MPF.Check.csproj
@@ -35,7 +35,7 @@
     <PackageReference Include="BinaryObjectScanner" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="3.1.0" GeneratePathProperty="true">
       <IncludeAssets>runtime; compile; build; native; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="SabreTools.RedumpLib" Version="1.3.2" />
+    <PackageReference Include="SabreTools.RedumpLib" Version="1.3.4" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/MPF.Core/MPF.Core.csproj b/MPF.Core/MPF.Core.csproj
index a4ee4475..b46e53ce 100644
--- a/MPF.Core/MPF.Core.csproj
+++ b/MPF.Core/MPF.Core.csproj
@@ -57,7 +57,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="psxt001z.Library" Version="0.21.0-beta3" />
     <PackageReference Include="SabreTools.Models" Version="1.3.0" />
-    <PackageReference Include="SabreTools.RedumpLib" Version="1.3.2" />
+    <PackageReference Include="SabreTools.RedumpLib" Version="1.3.4" />
     <PackageReference Include="SabreTools.Serialization" Version="1.3.2" />
   </ItemGroup>
 
diff --git a/MPF.Core/SubmissionInfoTool.cs b/MPF.Core/SubmissionInfoTool.cs
index 442b57b7..27eb9e70 100644
--- a/MPF.Core/SubmissionInfoTool.cs
+++ b/MPF.Core/SubmissionInfoTool.cs
@@ -452,7 +452,7 @@ namespace MPF.Core
                     break;
 
                 case RedumpSystem.SonyPlayStation3:
-                    info.Extras!.DiscKey = options.AddPlaceholders ? Template.RequiredValue : string.Empty;
+                    info.Extras!.DiscKey ??= options.AddPlaceholders ? Template.RequiredValue : string.Empty;
                     info.Extras.DiscID = options.AddPlaceholders ? Template.RequiredValue : string.Empty;
                     break;
 
diff --git a/MPF.Test/MPF.Test.csproj b/MPF.Test/MPF.Test.csproj
index 781cfbfa..086baa5b 100644
--- a/MPF.Test/MPF.Test.csproj
+++ b/MPF.Test/MPF.Test.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="Microsoft.CodeCoverage" Version="17.9.0-preview-23531-01" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0-preview-23531-01" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="SabreTools.RedumpLib" Version="1.3.2" />
+    <PackageReference Include="SabreTools.RedumpLib" Version="1.3.4" />
     <PackageReference Include="xunit" Version="2.6.2" />
     <PackageReference Include="xunit.abstractions" Version="2.0.3" />
     <PackageReference Include="xunit.analyzers" Version="1.6.0" />
diff --git a/MPF.UI.Core/MPF.UI.Core.csproj b/MPF.UI.Core/MPF.UI.Core.csproj
index 7d81bcf6..d07de2d3 100644
--- a/MPF.UI.Core/MPF.UI.Core.csproj
+++ b/MPF.UI.Core/MPF.UI.Core.csproj
@@ -43,7 +43,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SabreTools.RedumpLib" Version="1.3.2" />
+    <PackageReference Include="SabreTools.RedumpLib" Version="1.3.4" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/MPF/MPF.csproj b/MPF/MPF.csproj
index 04b1fbd7..32581b0d 100644
--- a/MPF/MPF.csproj
+++ b/MPF/MPF.csproj
@@ -73,7 +73,7 @@
     <PackageReference Include="BinaryObjectScanner" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="3.1.0" GeneratePathProperty="true">
       <IncludeAssets>runtime; compile; build; native; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="SabreTools.RedumpLib" Version="1.3.2" />
+    <PackageReference Include="SabreTools.RedumpLib" Version="1.3.4" />
   </ItemGroup>
 
   <ItemGroup>