From be9e4b91d59fb7a846270a8ea95f01ba043915bc Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Tue, 10 Oct 2023 21:45:17 -0400
Subject: [PATCH] Add generic drive flag for Redumper (fixes #546)

---
 CHANGELIST.md                           |  1 +
 MPF.Core/Data/Options.cs                |  9 +++++++++
 MPF.Core/Modules/Redumper/Parameters.cs |  5 +++++
 MPF.UI.Core/Windows/OptionsWindow.xaml  | 27 ++++++++++++++++---------
 4 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/CHANGELIST.md b/CHANGELIST.md
index 8996ec28..1cbcbd1b 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -4,6 +4,7 @@
 - Fix errant version detection issue
 - Allow user-supplied information in Check
 - Add BE read flag for Redumper
+- Add generic drive flag for Redumper
 
 ### 2.7.0 (2023-10-11)
 
diff --git a/MPF.Core/Data/Options.cs b/MPF.Core/Data/Options.cs
index c6cabe8b..8a283a25 100644
--- a/MPF.Core/Data/Options.cs
+++ b/MPF.Core/Data/Options.cs
@@ -349,6 +349,15 @@ namespace MPF.Core.Data
             set { Settings["RedumperUseBEReading"] = value.ToString(); }
         }
 
+        /// <summary>
+        /// Enable generic drive type by default with Redumper
+        /// </summary>
+        public bool RedumperUseGenericDriveType
+        {
+            get { return GetBooleanSetting(Settings, "RedumperUseGenericDriveType", false); }
+            set { Settings["RedumperUseGenericDriveType"] = value.ToString(); }
+        }
+
         /// <summary>
         /// Default number of rereads
         /// </summary>
diff --git a/MPF.Core/Modules/Redumper/Parameters.cs b/MPF.Core/Modules/Redumper/Parameters.cs
index 1c3331dc..909d78b0 100644
--- a/MPF.Core/Modules/Redumper/Parameters.cs
+++ b/MPF.Core/Modules/Redumper/Parameters.cs
@@ -1031,6 +1031,11 @@ namespace MPF.Core.Modules.Redumper
                 this[FlagStrings.DriveReadMethod] = true;
                 DriveReadMethodValue = "BE_CDDA";
             }
+            if (options.RedumperUseGenericDriveType)
+            {
+                this[FlagStrings.DriveType] = true;
+                DriveTypeValue = "Generic";
+            }
 
             // Set the output paths
             if (!string.IsNullOrWhiteSpace(filename))
diff --git a/MPF.UI.Core/Windows/OptionsWindow.xaml b/MPF.UI.Core/Windows/OptionsWindow.xaml
index d1ef0c98..26b37f9a 100644
--- a/MPF.UI.Core/Windows/OptionsWindow.xaml
+++ b/MPF.UI.Core/Windows/OptionsWindow.xaml
@@ -63,7 +63,7 @@
                     </Button>
                 </Grid>
             </Grid>
-            
+
             <TabControl Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
                         Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
                         Foreground="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"
@@ -84,7 +84,7 @@
                         />
                     </UniformGrid>
                 </TabItem>
-                
+
                 <TabItem Header="Paths" Style="{DynamicResource CustomTabItemStyle}">
                     <Grid Margin="5,5,5,5">
                         <Grid.ColumnDefinitions>
@@ -232,7 +232,7 @@
                                      />
                             </UniformGrid>
                         </GroupBox>
-                        
+
                         <GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Header="Default Speeds" Grid.ColumnSpan="2">
                             <Grid>
                                 <Grid.ColumnDefinitions>
@@ -247,7 +247,7 @@
                                     <RowDefinition />
                                     <RowDefinition />
                                 </Grid.RowDefinitions>
-                                
+
                                 <Label Grid.Row="0" Grid.Column="0" Content="CD" />
                                 <Slider x:Name="DumpSpeedCDSlider" Grid.Row="0" Grid.Column="1" Minimum="1" Maximum="72" IsSnapToTickEnabled="True" TickPlacement="BottomRight"
                                     Ticks="{Binding Source={x:Static core:Constants.SpeedsForCDAsCollection}}"
@@ -357,7 +357,8 @@
                             IsChecked="{Binding Options.DICMultiSectorRead}"
                             ToolTip="Enable the /mr flag for BD drive dumping" Margin="0,4"
                             />
-                        <Label/> <!-- Empty label for padding -->
+                        <Label/>
+                        <!-- Empty label for padding -->
 
                         <Label Content="Multi-Sector Read Value:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
                         <TextBox VerticalAlignment="Center" VerticalContentAlignment="Center"
@@ -391,12 +392,16 @@
                             ToolTip="Enable verbose output in logs" Margin="0,4"
                             />
 
-                        <CheckBox VerticalAlignment="Center" Content="Enable BE drive reading"
+                        <CheckBox VerticalAlignment="Center" Content="Enable BE Drive Reading"
                             IsChecked="{Binding Options.RedumperUseBEReading}"
                             ToolTip="Enable setting drive read method to BE_CDDA by default" Margin="0,4"
                             />
-                        <Label/> <!-- Empty label for padding -->
-                        
+
+                        <CheckBox VerticalAlignment="Center" Content="Set Generic Drive Type"
+                            IsChecked="{Binding Options.RedumperUseGenericDriveType}"
+                            ToolTip="Enable setting drive type to Generic by default" Margin="0,4"
+                            />
+
                         <Label Content="Reread Tries:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
                         <TextBox VerticalAlignment="Center" VerticalContentAlignment="Center"
                             Text="{Binding Options.RedumperRereadCount}"
@@ -447,12 +452,14 @@
             <!-- Accept / Cancel -->
             <GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                 <UniformGrid Columns="4" Margin="5,5,5,5" Height="28">
-                    <Label/> <!-- Empty label for padding -->
+                    <Label/>
+                    <!-- Empty label for padding -->
                     <Button Name="AcceptButton" Height="25" Width="80" IsDefault="True" Content="Accept"
                             Style="{DynamicResource CustomButtonStyle}" />
                     <Button Name="CancelButton" Height="25" Width="80" IsCancel="True" Content="Cancel"
                             Style="{DynamicResource CustomButtonStyle}" />
-                    <Label/> <!-- Empty label for padding -->
+                    <Label/>
+                    <!-- Empty label for padding -->
                 </UniformGrid>
             </GroupBox>
         </StackPanel>