修正前の版を使っている人がアプでしたとき、処理がフリーズしないよう調整

kmycode · Aug 28, 2022 · d127c1a · d127c1a
1 parent 1d697e0
commit d127c1a
Showing 1 changed file with 23 additions and 3 deletions.
diff --git a/KmyKeiba/Models/Race/ExNumber/ExternalNumberConfigModel.cs b/KmyKeiba/Models/Race/ExNumber/ExternalNumberConfigModel.cs
@@ -123,6 +123,8 @@ public class ExternalNumberConfigItem : IDisposable, ICheckableItem
     public ExternalNumberConfigItem(ExternalNumberConfig data)
     {
       this.Data = data;
+
+      this.CheckInvalidData();
       this.LoadFromData();
 
       this.Name
@@ -143,9 +145,9 @@ public ExternalNumberConfigItem(ExternalNumberConfig data)
           return;
         }
 
-        if (this.IsFormatHorseCsv.Value == this.IsFormatRaceFixedLength.Value == this.IsFormatRaceCsv.Value == this.IsFormatHorseFixedLength.Value == false ||
-          this.IsValuesNumberOnly.Value == this.IsValuesNumberAndOrder.Value == false ||
-          this.IsSortLarger.Value == this.IsSortSmaller.Value == this.IsSortSmallerWithoutZero.Value == false)
+        if ((this.IsFormatHorseCsv.Value == false && this.IsFormatRaceFixedLength.Value == false && this.IsFormatRaceCsv.Value == false && this.IsFormatHorseFixedLength.Value == false) ||
+          (this.IsValuesNumberOnly.Value == false && this.IsValuesNumberAndOrder.Value == false) ||
+          (this.IsSortLarger.Value == false && this.IsSortSmaller.Value == false && this.IsSortSmallerWithoutZero.Value == false))
         {
           // UIのせいでなぜか全部falseになってイベント通知してくることがある
           this.LoadFromData();
@@ -178,6 +180,24 @@ public ExternalNumberConfigItem(ExternalNumberConfig data)
       this._isInitializing = false;
     }
 
+    private void CheckInvalidData()
+    {
+      var data = this.Data;
+
+      if (data.FileFormat == ExternalNumberFileFormat.Unknown)
+      {
+        data.FileFormat = ExternalNumberFileFormat.RaceCsv;
+      }
+      if (data.ValuesFormat == ExternalNumberValuesFormat.Unknown)
+      {
+        data.ValuesFormat = ExternalNumberValuesFormat.NumberOnly;
+      }
+      if (data.SortRule == ExternalNumberSortRule.Unknown)
+      {
+        data.SortRule = ExternalNumberSortRule.Larger;
+      }
+    }
+
     private void LoadFromData()
     {
       var data = this.Data;