From a19418e46f663dfe43fa648dec7bfdef4a9a8a51 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Wed, 20 Jun 2018 12:44:39 -0700
Subject: [PATCH] Remove sg-raw (#64)

* Remove sg-raw from OptionsWindow.xaml.cs

* Remove sg-raw from OptionsWindow.xaml

* Remove sg-raw from Options.cs

* Remove sg-raw from MainWindow.xaml.cs

* Missed the other rows

* Remove sg-raw from App.config
---
 App.config            |  3 +--
 MainWindow.xaml.cs    | 31 +++----------------------------
 Options.cs            |  2 --
 OptionsWindow.xaml    | 20 ++++++--------------
 OptionsWindow.xaml.cs |  2 +-
 5 files changed, 11 insertions(+), 47 deletions(-)

diff --git a/App.config b/App.config
index 64846a90..fa36aba6 100644
--- a/App.config
+++ b/App.config
@@ -3,8 +3,7 @@
   <appSettings>
     <add key="dicPath" value="Programs\DiscImageCreator.exe"/>
     <add key="psxt001zPath" value="psxt001z.exe"/>
-    <add key="sgRawPath" value="sg_raw.exe"/>
     <add key="subdumpPath" value="subdump.exe"/>
     <add key="defaultOutputPath" value="ISO"/>
   </appSettings>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index decafcc6..4f9b8084 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -226,11 +226,6 @@ namespace DICUI
         /// </summary>
         private async void StartDumping()
         {
-            string dicPath = _options.dicPath;
-            string sgRawPath = _options.sgRawPath;
-            string psxtPath = _options.psxtPath;
-            string subdumpPath = _options.subdumpPath;
-
             btn_StartStop.Content = UIElements.StopDumping;
 
             // Populate all tuples
@@ -239,6 +234,9 @@ namespace DICUI
             var discTypeTuple = cmb_DiscType.SelectedValue as Tuple<string, DiscType?>;
 
             // Get the currently selected options
+            string dicPath = _options.dicPath;
+            string psxtPath = _options.psxtPath;
+            string subdumpPath = _options.subdumpPath;
             char driveLetter = driveLetterTuple.Item1;
             bool isFloppy = driveLetterTuple.Item3;
             string outputDirectory = txt_OutputDirectory.Text;
@@ -308,29 +306,6 @@ namespace DICUI
             // Special cases
             switch (system)
             {
-                // TODO: May not be needed anymore? DIC claims to have this functionality now
-                case KnownSystem.MicrosoftXBOXOne:
-                case KnownSystem.SonyPlayStation4:
-                    if (!File.Exists(sgRawPath))
-                    {
-                        lbl_Status.Content = "Error! Could not find sg-raw!";
-                        break;
-                    }
-
-                    await Task.Run(() =>
-                    {
-                        childProcess = new Process()
-                        {
-                            StartInfo = new ProcessStartInfo()
-                            {
-                                FileName = sgRawPath,
-                                Arguments = "-v -r 4100 -R " + driveLetter + ": " + "ad 01 00 00 00 00 00 00 10 04 00 00 -o \"PIC.bin\""
-                            },
-                        };
-                        childProcess.Start();
-                        childProcess.WaitForExit();
-                    });
-                    break;
                 case KnownSystem.SegaSaturn:
                     if (!File.Exists(subdumpPath))
                     {
diff --git a/Options.cs b/Options.cs
index b3c26ca8..0119735c 100644
--- a/Options.cs
+++ b/Options.cs
@@ -13,7 +13,6 @@ namespace DICUI
         public string defaultOutputPath { get; private set; }
         public string dicPath { get; private set; }
         public string psxtPath { get; private set; }
-        public string sgRawPath { get; private set; }
         public string subdumpPath { get; private set; }
 
         public void Save()
@@ -37,7 +36,6 @@ namespace DICUI
             //TODO: hardcoded, we should find a better way
             dicPath = ConfigurationManager.AppSettings["dicPath"] ?? @"Programs\DiscImageCreator.exe";
             psxtPath = ConfigurationManager.AppSettings["psxt001zPath"] ?? "psxt001z.exe";
-            sgRawPath = ConfigurationManager.AppSettings["sgRawPath"] ?? "sg_raw.exe";
             subdumpPath = ConfigurationManager.AppSettings["subdumpPath"] ?? "subdump.exe";
             defaultOutputPath = ConfigurationManager.AppSettings["defaultOutputPath"] ?? "ISO";
         }
diff --git a/OptionsWindow.xaml b/OptionsWindow.xaml
index 843b3461..de8eec43 100644
--- a/OptionsWindow.xaml
+++ b/OptionsWindow.xaml
@@ -27,7 +27,6 @@
                     <RowDefinition/>
                     <RowDefinition/>
                     <RowDefinition/>
-                    <RowDefinition/>
                 </Grid.RowDefinitions>
 
                 <Label Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="DicImageCreator Path:" FontWeight="Bold"/>
@@ -38,20 +37,13 @@
                 <TextBox x:Name="txt_psxtPath" Grid.Row="1" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
                 <Button x:Name="btn_psxtPath" Grid.Row="1" Grid.Column="2" Height="22" Width="22" Content="..." Click="btn_BrowseForPath_Click" />
 
+                <Label Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="subdump Path:" FontWeight="Bold"/>
+                <TextBox x:Name="txt_subdumpPath" Grid.Row="2" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
+                <Button x:Name="btn_subdumpPath" Grid.Row="2" Grid.Column="2" Height="22" Width="22" Content="..." Click="btn_BrowseForPath_Click"/>
 
-                <Label Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="sg-raw Path:" FontWeight="Bold"/>
-                <TextBox x:Name="txt_sgRawPath" Grid.Row="2" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
-                <Button x:Name="btn_sgRawPathh" Grid.Row="2" Grid.Column="2" Height="22" Width="22" Content="..." Click="btn_BrowseForPath_Click" />
-
-
-                <Label Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="subdump Path:" FontWeight="Bold"/>
-                <TextBox x:Name="txt_subdumpPath" Grid.Row="3" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
-                <Button x:Name="btn_subdumpPath" Grid.Row="3" Grid.Column="2" Height="22" Width="22" Content="..." Click="btn_BrowseForPath_Click"/>
-
-
-                <Label Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Default Output Path:" FontWeight="Bold"/>
-                <TextBox x:Name="txt_defaultOutputPath" Grid.Row="4" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
-                <Button x:Name="btn_defaultOutputPath" Grid.Row="4" Grid.Column="2" Height="22" Width="22" Content="..." Click="btn_BrowseForPath_Click" />
+                <Label Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Default Output Path:" FontWeight="Bold"/>
+                <TextBox x:Name="txt_defaultOutputPath" Grid.Row="3" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
+                <Button x:Name="btn_defaultOutputPath" Grid.Row="3" Grid.Column="2" Height="22" Width="22" Content="..." Click="btn_BrowseForPath_Click" />
 
             </Grid>
 
diff --git a/OptionsWindow.xaml.cs b/OptionsWindow.xaml.cs
index b3b7bce8..13f970e3 100644
--- a/OptionsWindow.xaml.cs
+++ b/OptionsWindow.xaml.cs
@@ -51,7 +51,7 @@ namespace DICUI
 
         private string[] PathSettings()
         {
-            string[] pathSettings = { "defaultOutputPath", "dicPath", "psxtPath", "sgRawPath", "subdumpPath" };
+            string[] pathSettings = { "defaultOutputPath", "dicPath", "psxtPath", "subdumpPath" };
             return pathSettings;
         }