更新Settings文件内容，配置文件不再支持pcld格式

memorydream · memorydream · commit 3b7d490f3b20 · 2021-07-11T20:40:25.000+08:00
diff --git a/PearlCalculatorCP/SettingsJsonConverter.cs b/PearlCalculatorCP/SettingsJsonConverter.cs
@@ -32,26 +32,46 @@ public override Settings Read(ref Utf8JsonReader reader, Type typeToConvert, Jso
             settings.BlueTNT = rootElement.GetProperty(nameof(settings.BlueTNT)).GetInt32();
             settings.MaxTNT = rootElement.GetProperty(nameof(settings.MaxTNT)).GetInt32();
 
-            settings.Direction =
-                Enum.TryParse<Direction>(rootElement.GetProperty(nameof(settings.Direction)).GetString(),
-                    out var direction)
-                    ? direction
-                    : Direction.North;
-            
+            {
+                settings.Direction =
+                    Enum.TryParse<Direction>(rootElement.GetProperty(nameof(settings.Direction)).GetString(),
+                        out var direction)
+                        ? direction
+                        : Direction.North;
+            }
+
             var pearlElemRoot = rootElement.GetProperty(nameof(settings.Pearl));
 
             settings.Pearl = new PearlEntity
             {
                 Position = ReadSpace3D(pearlElemRoot.GetProperty(nameof(settings.Pearl.Position))),
                 Motion = ReadSpace3D(pearlElemRoot.GetProperty(nameof(settings.Pearl.Motion)))
             };
-            
+
+            {
+                settings.DefaultRedTNTDirection =
+                    rootElement.TryGetProperty(nameof(settings.DefaultRedTNTDirection), out var drt) &&
+                    Enum.TryParse<Direction>(drt.GetString(), out var direction)
+                        ? direction
+                        : Data.DefaultRedDuper;
+            }
+
+            {
+                settings.DefaultBlueTNTDirection =
+                    rootElement.TryGetProperty(nameof(settings.DefaultBlueTNTDirection), out var drt) &&
+                    Enum.TryParse<Direction>(drt.GetString(), out var direction)
+                        ? direction
+                        : Data.DefaultBlueDuper;
+            }
+
             return settings;
         }
 
         public override void Write(Utf8JsonWriter writer, Settings value, JsonSerializerOptions options)
         {
             writer.WriteStartObject();
+            
+            writer.WriteString("Version", Settings.Version);
 
             WriteObject(writer, options, nameof(value.NorthEastTNT), ref value.NorthEastTNT, _space3DJsonConverter);
 
@@ -81,6 +101,9 @@ public override void Write(Utf8JsonWriter writer, Settings value, JsonSerializer
             
             writer.WriteString(nameof(value.Direction), value.Direction.ToString());
             
+            writer.WriteString(nameof(value.DefaultRedTNTDirection), value.DefaultRedTNTDirection.ToString());
+            writer.WriteString(nameof(value.DefaultBlueTNTDirection), value.DefaultBlueTNTDirection.ToString());
+            
             writer.WriteEndObject();
         }
 
diff --git a/PearlCalculatorCP/ViewModels/MoreSettingsViewModel.cs b/PearlCalculatorCP/ViewModels/MoreSettingsViewModel.cs
@@ -231,6 +231,9 @@ public MoreSettingsViewModel()
                 
                 PearlYCoor     = settings.Pearl.Position.Y;
                 PearlYMomentum = settings.Pearl.Motion.Y;
+                
+                DefaultRedDuperIndex  = (int) Enum.Parse<ComboBoxDireEnum>(settings.DefaultRedTNTDirection.ToString());
+                DefaultBlueDuperIndex = (int) Enum.Parse<ComboBoxDireEnum>(settings.DefaultBlueTNTDirection.ToString());
             });
         }
 
diff --git a/PearlCalculatorCP/Views/MainWindow.axaml.cs b/PearlCalculatorCP/Views/MainWindow.axaml.cs
@@ -1,5 +1,3 @@
-#define ENABLE_ALL_SETTINGS
-
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -14,15 +12,8 @@
 using PearlCalculatorCP.Utils;
 using PearlCalculatorCP.ViewModels;
 using PearlCalculatorLib.General;
-
-#if ENABLE_JSON_SETTINGS || ENABLE_ALL_SETTINGS
 using System.Text;
 using System.Text.Json;
-#endif
-
-#if !ENABLE_JSON_SETTINGS || ENABLE_ALL_SETTINGS
-using System.Runtime.Serialization.Formatters.Binary;
-#endif
 
 #nullable disable
 
@@ -33,32 +24,13 @@ public class MainWindow : Window
 
         private static readonly List<FileDialogFilter> FileDialogFilter = new List<FileDialogFilter>
         {
-#if ENABLE_ALL_SETTINGS
-            new FileDialogFilter
-            {
-                Name = "pcld;json",
-                Extensions = {"pcld", "json"}
-            },
-#endif
-            
-#if ENABLE_ALL_SETTINGS || !ENABLE_JSON_SETTINGS
-            new FileDialogFilter
-            {
-                Name = "pcld",
-                Extensions = {"pcld"}
-            },
-#endif
-            
-#if ENABLE_JSON_SETTINGS || ENABLE_ALL_SETTINGS
             new FileDialogFilter
             {
                 Name = "json",
                 Extensions = {"json"}
             },
-#endif
         };
-
-#if ENABLE_JSON_SETTINGS || ENABLE_ALL_SETTINGS
+        
         private static readonly SettingsJsonConverter JsonConverter = new SettingsJsonConverter();
         
         private static readonly JsonSerializerOptions WriteSerializerOptions = new JsonSerializerOptions
@@ -71,7 +43,7 @@ public class MainWindow : Window
         {
             Converters = { JsonConverter }
         };
-#endif
+        
         private bool _isLoadDefaultSettings;
         
         private MainWindowViewModel _vm;
@@ -127,23 +99,7 @@ private async void ImportSettingsBtn_OnClick(object sender, RoutedEventArgs e)
             ImportSettings(result[0]);
         }
 
-        public void ImportSettings(string path)
-        {
-#if ENABLE_ALL_SETTINGS
-            if (Path.GetExtension(path) == ".json")
-                ImportSettingsFormJson(path);
-            else
-                ImportSettingsFormPcld(path);
-#elif ENABLE_JSON_SETTINGS
-            ImportSettingsFormJson(path);
-#else
-            ImportSettingsFormPcld(path);
-#endif
-        }
-
-#if ENABLE_JSON_SETTINGS || ENABLE_ALL_SETTINGS
-        
-        private async void ImportSettingsFormJson(string path)
+        public async void ImportSettings(string path)
         {
             var json = await File.ReadAllTextAsync(path, Encoding.UTF8);
             try
@@ -155,59 +111,24 @@ private async void ImportSettingsFormJson(string path)
                 LogUtils.Error("settings json file format error");
             }
         }
-#endif
-        
-#if !ENABLE_JSON_SETTINGS || ENABLE_ALL_SETTINGS
-        private async void ImportSettingsFormPcld(string path)
-        {
-            await using var fs = File.OpenRead(path);
-            if (new BinaryFormatter().Deserialize(fs) is Settings settings)
-            {
-                _vm.LoadDataFormSettings(settings);
-            }
-        }
-#endif
-
-        
         
         private async void SaveSettingsBtn_OnClick(object sender, RoutedEventArgs e)
         {
             var dialog = new SaveFileDialog {Filters = FileDialogFilter};
             var path = await dialog.ShowAsync(this);
 
             if (string.IsNullOrWhiteSpace(path) || string.IsNullOrEmpty(path)) return;
-            
-#if ENABLE_ALL_SETTINGS
-            if (Path.GetExtension(path) == ".json")
-                SaveSettingsToJson(path);
-            else
-                SaveSettingsToPcld(path);
-#elif ENABLE_JSON_SETTINGS
-            SaveSettingsToJson(path);
-#else
-            SaveSettingsToPcld(path);
-#endif
+            SaveSettings(path);
         }
-
-#if ENABLE_JSON_SETTINGS || ENABLE_ALL_SETTINGS
-        private async void SaveSettingsToJson(string path)
+        
+        private async void SaveSettings(string path)
         {
             var json = JsonSerializer.SerializeToUtf8Bytes(Settings.CreateSettingsFormData(), WriteSerializerOptions);
 
             using var sr = File.OpenWrite(path);
             sr.SetLength(0);
             await sr.WriteAsync(json.AsMemory());
         }
-#endif
-
-#if !ENABLE_JSON_SETTINGS || ENABLE_ALL_SETTINGS
-        private async void SaveSettingsToPcld(string path)
-        {
-            var bf = new BinaryFormatter();
-            await using var fs = File.Open(path, FileMode.OpenOrCreate, FileAccess.ReadWrite);
-            bf.Serialize(fs, Settings.CreateSettingsFormData());
-        }
-#endif
 
         #endregion
 
diff --git a/PearlCalculatorLib/General/Settings.cs b/PearlCalculatorLib/General/Settings.cs
@@ -12,7 +12,7 @@ namespace PearlCalculatorLib.General
     [Serializable]
     public class Settings
     {
-        public const string FileSuffix = "pcld file|*.pcld";
+        public const string Version = "2.7";
 
         public Space3D NorthWestTNT;
         public Space3D NorthEastTNT;
diff --git a/PearlCalculatorWFA/PearlCalculatorForm.cs b/PearlCalculatorWFA/PearlCalculatorForm.cs
@@ -17,13 +17,28 @@
 using System.Drawing.Printing;
 using System.Runtime.Serialization;
 using System.Drawing;
+using System.Text;
+using System.Text.Json;
 using PearlCalculatorLib.PearlCalculationLib.Entity;
 
 namespace PearlCalculatorWFA
 {
     public partial class PearlCalculatorWFA : Form
     {
-        const string DefaultImportSettingsPath = @"./settings.pcld";
+        const string DefaultImportSettingsPath = @"./settings.json";
+
+        private static readonly SettingsJsonConverter JsonConverter = new SettingsJsonConverter();
+        
+        private static readonly JsonSerializerOptions WriteSerializerOptions = new JsonSerializerOptions
+        {
+            Converters = { JsonConverter },
+            WriteIndented = true
+        };
+
+        private static readonly JsonSerializerOptions ReadSerializerOptions = new JsonSerializerOptions
+        {
+            Converters = { JsonConverter }
+        };
 
         private bool IsDisplayOnTNT = false;
         private string OffsetXTextBoxString = "0.";
@@ -357,52 +372,52 @@ private void OffsetZTextBox_TextChanged(object sender , EventArgs e)
 
         #region General : Import/Export Settings
 
-        private void ImportSettingButton_Click(object sender , EventArgs e)
+        private async void ImportSettingButton_Click(object sender , EventArgs e)
         {
-            using var fileDialog = new OpenFileDialog { Filter = Settings.FileSuffix };
+            using var fileDialog = new OpenFileDialog { Filter = "json|*.json" };
 
             if(fileDialog.ShowDialog() == DialogResult.OK)
             {
-                using var fs = File.OpenRead(fileDialog.FileName);
-                if(new BinaryFormatter().Deserialize(fs) is Settings settings)
+                var json = await File.ReadAllTextAsync(fileDialog.FileName, Encoding.UTF8);
+                try
                 {
-                    ImportSettings(settings);
+                    ImportSettings(JsonSerializer.Deserialize<Settings>(json, ReadSerializerOptions));
                     RefleshInput();
                 }
+                catch (Exception)
+                {
+                    Log("Main", "Error", "settings json file format error");
+                }
             }
         }
 
-        private void SaveSettingButton_Click(object sender , EventArgs e)
+        private async void SaveSettingButton_Click(object sender , EventArgs e)
         {
-            var bf = new BinaryFormatter();
-            using var fileDialog = new SaveFileDialog();
-            fileDialog.Filter = Settings.FileSuffix;
-            fileDialog.AddExtension = true;
+            using var fileDialog = new SaveFileDialog {Filter = "json|*.json", AddExtension = true};
 
             if(fileDialog.ShowDialog() == DialogResult.OK)
             {
-                var fs = File.Open(fileDialog.FileName , FileMode.OpenOrCreate);
-                bf.Serialize(fs , Settings.CreateSettingsFormData());
-                fs.Close();
+                var json = JsonSerializer.SerializeToUtf8Bytes(Settings.CreateSettingsFormData(), WriteSerializerOptions);
+
+                using var sr = File.OpenWrite(fileDialog.FileName);
+                sr.SetLength(0);
+                await sr.WriteAsync(json.AsMemory());
             }
         }
 
-        void ImportSettingFormDefaultFile()
+        async void ImportSettingFormDefaultFile()
         {
             if (File.Exists(DefaultImportSettingsPath))
             {
-                using var fs = File.OpenRead(DefaultImportSettingsPath);
+                var json = await File.ReadAllTextAsync(DefaultImportSettingsPath, Encoding.UTF8);
                 try
                 {
-                    if (new BinaryFormatter().Deserialize(fs) is Settings settings)
-                    {
-                        ImportSettings(settings);
-                        RefleshInput();
-                    }
+                    ImportSettings(JsonSerializer.Deserialize<Settings>(json, ReadSerializerOptions));
+                    RefleshInput();
                 }
-                catch (SerializationException)
+                catch (Exception)
                 {
-                    Log("Main", "Error", "At start, found settings.pcld file, but it not is calculator's settings file");
+                    Log("Main", "Error", "At start, found settings.json file, but it not is calculator's settings file");
                 }
             }
         }
@@ -427,6 +442,9 @@ void ImportSettings(Settings settings)
             GeneralData.PearlOffset = settings.Offset;
 
             GeneralData.Direction = settings.Direction;
+
+            GeneralData.DefaultRedDuper = settings.DefaultRedTNTDirection;
+            GeneralData.DefaultBlueDuper = settings.DefaultBlueTNTDirection;
         }
 
         void RefleshInput()
diff --git a/PearlCalculatorWFA/SettingsJsonConverter.cs b/PearlCalculatorWFA/SettingsJsonConverter.cs

Original file line number	Diff line number	Diff line change
`@@ -231,6 +231,9 @@ public MoreSettingsViewModel()`
`231`	`231`
`232`	`232`	`PearlYCoor = settings.Pearl.Position.Y;`
`233`	`233`	`PearlYMomentum = settings.Pearl.Motion.Y;`
	`234`	`+`
	`235`	`+ DefaultRedDuperIndex = (int) Enum.Parse<ComboBoxDireEnum>(settings.DefaultRedTNTDirection.ToString());`
	`236`	`+ DefaultBlueDuperIndex = (int) Enum.Parse<ComboBoxDireEnum>(settings.DefaultBlueTNTDirection.ToString());`
`234`	`237`	`});`
`235`	`238`	`}`
`236`	`239`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace PearlCalculatorLib.General`
`12`	`12`	`[Serializable]`
`13`	`13`	`public class Settings`
`14`	`14`	`{`
`15`		`- public const string FileSuffix = "pcld file\|*.pcld";`
	`15`	`+ public const string Version = "2.7";`
`16`	`16`
`17`	`17`	`public Space3D NorthWestTNT;`
`18`	`18`	`public Space3D NorthEastTNT;`
Original file line number	Diff line number	Diff line change
`@@ -17,13 +17,28 @@`
`17`	`17`	`using System.Drawing.Printing;`
`18`	`18`	`using System.Runtime.Serialization;`
`19`	`19`	`using System.Drawing;`
	`20`	`+using System.Text;`
	`21`	`+using System.Text.Json;`
`20`	`22`	`using PearlCalculatorLib.PearlCalculationLib.Entity;`
`21`	`23`
`22`	`24`	`namespace PearlCalculatorWFA`
`23`	`25`	`{`
`24`	`26`	`public partial class PearlCalculatorWFA : Form`
`25`	`27`	`{`
`26`		`- const string DefaultImportSettingsPath = @"./settings.pcld";`
	`28`	`+ const string DefaultImportSettingsPath = @"./settings.json";`
	`29`	`+`
	`30`	`+ private static readonly SettingsJsonConverter JsonConverter = new SettingsJsonConverter();`
	`31`	`+`
	`32`	`+ private static readonly JsonSerializerOptions WriteSerializerOptions = new JsonSerializerOptions`
	`33`	`+ {`
	`34`	`+ Converters = { JsonConverter },`
	`35`	`+ WriteIndented = true`
	`36`	`+ };`
	`37`	`+`
	`38`	`+ private static readonly JsonSerializerOptions ReadSerializerOptions = new JsonSerializerOptions`
	`39`	`+ {`
	`40`	`+ Converters = { JsonConverter }`
	`41`	`+ };`
`27`	`42`
`28`	`43`	`private bool IsDisplayOnTNT = false;`
`29`	`44`	`private string OffsetXTextBoxString = "0.";`
`@@ -357,52 +372,52 @@ private void OffsetZTextBox_TextChanged(object sender , EventArgs e)`
`357`	`372`
`358`	`373`	`#region General : Import/Export Settings`
`359`	`374`
`360`		`- private void ImportSettingButton_Click(object sender , EventArgs e)`
	`375`	`+ private async void ImportSettingButton_Click(object sender , EventArgs e)`
`361`	`376`	`{`
`362`		`- using var fileDialog = new OpenFileDialog { Filter = Settings.FileSuffix };`
	`377`	`+ using var fileDialog = new OpenFileDialog { Filter = "json\|*.json" };`
`363`	`378`
`364`	`379`	`if(fileDialog.ShowDialog() == DialogResult.OK)`
`365`	`380`	`{`
`366`		`- using var fs = File.OpenRead(fileDialog.FileName);`
`367`		`- if(new BinaryFormatter().Deserialize(fs) is Settings settings)`
	`381`	`+ var json = await File.ReadAllTextAsync(fileDialog.FileName, Encoding.UTF8);`
	`382`	`+ try`
`368`	`383`	`{`
`369`		`- ImportSettings(settings);`
	`384`	`+ ImportSettings(JsonSerializer.Deserialize<Settings>(json, ReadSerializerOptions));`
`370`	`385`	`RefleshInput();`
`371`	`386`	`}`
	`387`	`+ catch (Exception)`
	`388`	`+ {`
	`389`	`+ Log("Main", "Error", "settings json file format error");`
	`390`	`+ }`
`372`	`391`	`}`
`373`	`392`	`}`
`374`	`393`
`375`		`- private void SaveSettingButton_Click(object sender , EventArgs e)`
	`394`	`+ private async void SaveSettingButton_Click(object sender , EventArgs e)`
`376`	`395`	`{`
`377`		`- var bf = new BinaryFormatter();`
`378`		`- using var fileDialog = new SaveFileDialog();`
`379`		`- fileDialog.Filter = Settings.FileSuffix;`
`380`		`- fileDialog.AddExtension = true;`
	`396`	`+ using var fileDialog = new SaveFileDialog {Filter = "json\|*.json", AddExtension = true};`
`381`	`397`
`382`	`398`	`if(fileDialog.ShowDialog() == DialogResult.OK)`
`383`	`399`	`{`
`384`		`- var fs = File.Open(fileDialog.FileName , FileMode.OpenOrCreate);`
`385`		`- bf.Serialize(fs , Settings.CreateSettingsFormData());`
`386`		`- fs.Close();`
	`400`	`+ var json = JsonSerializer.SerializeToUtf8Bytes(Settings.CreateSettingsFormData(), WriteSerializerOptions);`
	`401`	`+`
	`402`	`+ using var sr = File.OpenWrite(fileDialog.FileName);`
	`403`	`+ sr.SetLength(0);`
	`404`	`+ await sr.WriteAsync(json.AsMemory());`
`387`	`405`	`}`
`388`	`406`	`}`
`389`	`407`
`390`		`- void ImportSettingFormDefaultFile()`
	`408`	`+ async void ImportSettingFormDefaultFile()`
`391`	`409`	`{`
`392`	`410`	`if (File.Exists(DefaultImportSettingsPath))`
`393`	`411`	`{`
`394`		`- using var fs = File.OpenRead(DefaultImportSettingsPath);`
	`412`	`+ var json = await File.ReadAllTextAsync(DefaultImportSettingsPath, Encoding.UTF8);`
`395`	`413`	`try`
`396`	`414`	`{`
`397`		`- if (new BinaryFormatter().Deserialize(fs) is Settings settings)`
`398`		`- {`
`399`		`- ImportSettings(settings);`
`400`		`- RefleshInput();`
`401`		`- }`
	`415`	`+ ImportSettings(JsonSerializer.Deserialize<Settings>(json, ReadSerializerOptions));`
	`416`	`+ RefleshInput();`
`402`	`417`	`}`
`403`		`- catch (SerializationException)`
	`418`	`+ catch (Exception)`
`404`	`419`	`{`
`405`		`- Log("Main", "Error", "At start, found settings.pcld file, but it not is calculator's settings file");`
	`420`	`+ Log("Main", "Error", "At start, found settings.json file, but it not is calculator's settings file");`
`406`	`421`	`}`
`407`	`422`	`}`
`408`	`423`	`}`
`@@ -427,6 +442,9 @@ void ImportSettings(Settings settings)`
`427`	`442`	`GeneralData.PearlOffset = settings.Offset;`
`428`	`443`
`429`	`444`	`GeneralData.Direction = settings.Direction;`
	`445`	`+`
	`446`	`+ GeneralData.DefaultRedDuper = settings.DefaultRedTNTDirection;`
	`447`	`+ GeneralData.DefaultBlueDuper = settings.DefaultBlueTNTDirection;`
`430`	`448`	`}`
`431`	`449`
`432`	`450`	`void RefleshInput()`