GameDriver: Improve FFNx configuration management

- Make a backup of the vanilla configuration file everytime the user installs/updates FFNx via 7th - Restore a vanilla backup for the configuration file ( with 7th defaults applied ) everytime the user click on Reset to Default on the Game Driver window - Move the backup file inside the 7thWorkshop folder so users won't mistakenly delete it
tsunamods-codes · Jul 3, 2022 · ca14de4 · ca14de4
1 parent 32770a2
commit ca14de4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/7thHeaven.Code/FFNxConfigManager.cs b/7thHeaven.Code/FFNxConfigManager.cs
@@ -12,7 +12,7 @@ namespace Iros._7th.Workshop.ConfigSettings
     public class FFNxConfigManager
     {
         private string _pathToFFNxToml = Sys.PathToFFNxToml;
-        private string _pathToFFNxTomlBak = Sys.PathToFFNxToml + ".bak";
+        private string _pathToFFNxTomlBak = Path.Combine(Sys.PathToGameDriverFolder, "FFNx.toml.bak");
         private Exception _lastException = null;
 
         private TomlTable _toml = null;
@@ -274,7 +274,7 @@ public void RestoreBackup()
             if (File.Exists(_pathToFFNxTomlBak))
             {
                 File.Delete(_pathToFFNxToml);
-                File.Move(_pathToFFNxTomlBak, _pathToFFNxToml);
+                File.Copy(_pathToFFNxTomlBak, _pathToFFNxToml);
                 Reload();
             }
         }

diff --git a/SeventhHeavenUI/Classes/FFNxDriverUpdater.cs b/SeventhHeavenUI/Classes/FFNxDriverUpdater.cs
@@ -251,6 +251,7 @@ private void DownloadAndExtract(string url, string version)
                         }
 
                         SwitchToModPanel();
+                        Sys.FFNxConfig.Backup();
                         Sys.FFNxConfig.Reload();
                         Sys.FFNxConfig.ResetTo7thHeavenDefaults();
                         Sys.FFNxConfig.OverrideInternalKeys();

diff --git a/SeventhHeavenUI/ViewModels/MainWindowViewModel.cs b/SeventhHeavenUI/ViewModels/MainWindowViewModel.cs
@@ -763,6 +763,9 @@ public void InitViewModel()
                 DS4ControllerService.Instance.StartService();
             }
 
+            // Ensure game driver directory exists
+            Directory.CreateDirectory(Sys.PathToGameDriverFolder);
+
             // Ensure temp directory exists
             Directory.CreateDirectory(Sys.PathToTempFolder);
 

diff --git a/SeventhHeavenUI/Windows/ConfigureGLWindow.xaml.cs b/SeventhHeavenUI/Windows/ConfigureGLWindow.xaml.cs
@@ -227,6 +227,10 @@ private void btnSave_Click(object sender, RoutedEventArgs e)
 
         private void btnReset_Click(object sender, RoutedEventArgs e)
         {
+            Sys.FFNxConfig.RestoreBackup();
+            Sys.FFNxConfig.ResetTo7thHeavenDefaults();
+            Sys.FFNxConfig.Save();
+
             foreach (var item in ViewModels)
             {
                 item.ResetToDefault(_settings);