From eb7843f282815a93ef866f673c8e9293ff5bb254 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Thu, 30 Apr 2026 13:54:38 -0400
Subject: [PATCH] Separate BEE

---
 CHANGELIST.md                             | 1 +
 MPF.Frontend/Tools/PhysicalTool.cs        | 5 -----
 MPF.Frontend/Tools/SubmissionGenerator.cs | 9 +++++++++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGELIST.md b/CHANGELIST.md
index 9677ffc4..c2ca32d1 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -13,6 +13,7 @@
 - Fix name conflict
 - Sync with Redump wiki
 - Add BD protection info, fix Cover ID setting
+- Separate BEE
 
 ### 3.7.1 (2026-03-30)
 
diff --git a/MPF.Frontend/Tools/PhysicalTool.cs b/MPF.Frontend/Tools/PhysicalTool.cs
index b05e283f..73114a3e 100644
--- a/MPF.Frontend/Tools/PhysicalTool.cs
+++ b/MPF.Frontend/Tools/PhysicalTool.cs
@@ -132,9 +132,6 @@ namespace MPF.Frontend.Tools
             if (File.Exists(unitKeyPath))
                 unitKeyFileHash = HashTool.GetFileHash(unitKeyPath, HashType.SHA1)?.ToUpperInvariant();
 
-            // Determine if BEE is set
-            bool busEncryptionEnabled = GetBusEncryptionEnabled(drive);
-
             // Generate the output strings
             var sb = new StringBuilder();
 
@@ -142,8 +139,6 @@ namespace MPF.Frontend.Tools
             sb.AppendLine($"Volume ID: (OPTIONAL)");
             sb.AppendLine($"Volume Unique Key: (OPTIONAL)");
             sb.AppendLine($"Unit Key File Hash (DiscID): {unitKeyFileHash ?? "(OPTIONAL)"}");
-            if (busEncryptionEnabled)
-                sb.AppendLine("Bus encryption enabled flag set");
 
             return sb.ToString();
         }
diff --git a/MPF.Frontend/Tools/SubmissionGenerator.cs b/MPF.Frontend/Tools/SubmissionGenerator.cs
index 2015057f..50e55671 100644
--- a/MPF.Frontend/Tools/SubmissionGenerator.cs
+++ b/MPF.Frontend/Tools/SubmissionGenerator.cs
@@ -834,6 +834,8 @@ namespace MPF.Frontend.Tools
 
                 case RedumpSystem.BDVideo:
                     info.CommonDiscInfo.Category ??= DiscCategory.Video;
+
+                    // General protection info
                     string? bdProtection = PhysicalTool.GetBluRayProtection(drive);
                     if (bdProtection is not null && string.IsNullOrEmpty(info.CopyProtection.Protection))
                         info.CopyProtection.Protection = bdProtection;
@@ -842,6 +844,13 @@ namespace MPF.Frontend.Tools
                     else
                         info.CopyProtection.Protection ??= addPlaceholders ? RequiredIfExistsValue : string.Empty;
 
+                    // Determine if BEE is set
+                    bool busEncryptionEnabled = PhysicalTool.GetBusEncryptionEnabled(drive);
+                    if (busEncryptionEnabled && !info.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.Protection))
+                        info.CommonDiscInfo.CommentsSpecialFields[SiteCode.Protection] = "Bus Encryption Enabled";
+                    else if (busEncryptionEnabled && info.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.Protection))
+                        info.CopyProtection.Protection += $"\nBus Encryption Enabled";
+
                     break;
 
                 case RedumpSystem.DVDVideo: