diff --git a/CHANGELIST.md b/CHANGELIST.md index 072b077b..f20d28ac 100644 --- a/CHANGELIST.md +++ b/CHANGELIST.md @@ -1,3 +1,7 @@ +### WIP (xxxx-xx-xx) + +- Read CSS for some copy protections + ### 3.0.1 (2023-11-30) - Add Bandai Pippin detection diff --git a/MPF.Core/Modules/DiscImageCreator/Parameters.cs b/MPF.Core/Modules/DiscImageCreator/Parameters.cs index 75f6e7c5..2ff5e4fe 100644 --- a/MPF.Core/Modules/DiscImageCreator/Parameters.cs +++ b/MPF.Core/Modules/DiscImageCreator/Parameters.cs @@ -521,6 +521,9 @@ namespace MPF.Core.Modules.DiscImageCreator info.CopyProtection!.SecuROMData = GetFullFile($"{basePath}_subIntention.txt") ?? string.Empty; } + // Needed for some odd copy protections + info.CopyProtection!.Protection = GetDVDProtection($"{basePath}_CSSKey.txt", $"{basePath}_disc.txt") ?? string.Empty; + break; case RedumpSystem.DVDAudio: diff --git a/MPF.Core/Modules/Redumper/Parameters.cs b/MPF.Core/Modules/Redumper/Parameters.cs index eb57279f..6944177d 100644 --- a/MPF.Core/Modules/Redumper/Parameters.cs +++ b/MPF.Core/Modules/Redumper/Parameters.cs @@ -358,6 +358,9 @@ namespace MPF.Core.Modules.Redumper case RedumpSystem.RainbowDisc: case RedumpSystem.SonyElectronicBook: info.CopyProtection!.SecuROMData = GetSecuROMData($"{basePath}.log") ?? string.Empty; + + // Needed for some odd copy protections + info.CopyProtection!.Protection = GetDVDProtection($"{basePath}.log") ?? string.Empty; break; case RedumpSystem.DVDAudio: diff --git a/MPF.Core/SubmissionInfoTool.cs b/MPF.Core/SubmissionInfoTool.cs index 876d1719..fc148c17 100644 --- a/MPF.Core/SubmissionInfoTool.cs +++ b/MPF.Core/SubmissionInfoTool.cs @@ -234,7 +234,7 @@ namespace MPF.Core resultProgress?.Report(Result.Success("Running copy protection scan... this might take a while!")); var (protectionString, fullProtections) = await InfoTool.GetCopyProtection(drive, options, protectionProgress); - info.CopyProtection!.Protection = protectionString; + info.CopyProtection!.Protection += protectionString; info.CopyProtection.FullProtections = fullProtections as Dictionary?> ?? []; resultProgress?.Report(Result.Success("Copy protection scan complete!"));