From bfce82991e1d4e9f53fd5ded9b465bbab3c9892c Mon Sep 17 00:00:00 2001
From: uye <2396806385@qq.com>
Date: Thu, 20 Jul 2023 23:05:59 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9C=AA=E9=85=8D=E7=BD=AE=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E5=8F=98=E9=87=8F=E6=97=B6=E4=B9=9F=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E5=82=A8=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaWpfGui/Helper/ConfigurationHelper.cs | 65 +++------------------
 1 file changed, 8 insertions(+), 57 deletions(-)

diff --git a/src/MaaWpfGui/Helper/ConfigurationHelper.cs b/src/MaaWpfGui/Helper/ConfigurationHelper.cs
index 105b00b1e9..e33e6394d5 100644
--- a/src/MaaWpfGui/Helper/ConfigurationHelper.cs
+++ b/src/MaaWpfGui/Helper/ConfigurationHelper.cs
@@ -63,9 +63,13 @@ namespace MaaWpfGui.Helper
         {
             var hasValue = _globalKvs.TryGetValue(key, out var value);
             _logger.Debug("Read global configuration key {Key} with default value {DefaultValue}, configuration hit: {HasValue}, configuration value {Value}", key, defaultValue, hasValue, value);
-            return hasValue
-                ? value
-                : defaultValue;
+            if (!hasValue)
+            {
+                SetGlobalValue(key, defaultValue);
+                return defaultValue;
+            }
+
+            return value;
         }
 
         /// <summary>
@@ -288,21 +292,6 @@ namespace MaaWpfGui.Helper
 
         public static string GetTimer(int i, string defaultValue)
         {
-            // 迁移旧数据，过几个版本后删除
-            {
-                var value = GetGlobalValue($"Timer.Timer{i + 1}", defaultValue);
-                if (value != defaultValue)
-                {
-                    return value;
-                }
-
-                value = GetValue($"Timer.Timer{i + 1}", defaultValue);
-                if (value != defaultValue)
-                {
-                    SetTimer(i, value);
-                }
-            }
-
             return GetGlobalValue($"Timer.Timer{i + 1}", defaultValue);
         }
 
@@ -313,21 +302,6 @@ namespace MaaWpfGui.Helper
 
         public static string GetTimerHour(int i, string defaultValue)
         {
-            // 迁移旧数据，过几个版本后删除
-            {
-                var value = GetGlobalValue($"Timer.Timer{i + 1}Hour", defaultValue);
-                if (value != defaultValue)
-                {
-                    return value;
-                }
-
-                value = GetValue($"Timer.Timer{i + 1}Hour", defaultValue);
-                if (value != defaultValue)
-                {
-                    SetTimerHour(i, value);
-                }
-            }
-
             return GetGlobalValue($"Timer.Timer{i + 1}Hour", defaultValue);
         }
 
@@ -338,21 +312,6 @@ namespace MaaWpfGui.Helper
 
         public static string GetTimerMin(int i, string defaultValue)
         {
-            // 迁移旧数据，过几个版本后删除
-            {
-                var value = GetGlobalValue($"Timer.Timer{i + 1}Min", defaultValue);
-                if (value != defaultValue)
-                {
-                    return value;
-                }
-
-                value = GetValue($"Timer.Timer{i + 1}Min", defaultValue);
-                if (value != defaultValue)
-                {
-                    SetTimerMin(i, value);
-                }
-            }
-
             return GetGlobalValue($"Timer.Timer{i + 1}Min", defaultValue);
         }
 
@@ -363,15 +322,7 @@ namespace MaaWpfGui.Helper
 
         public static string GetTimerConfig(int i, string defaultValue)
         {
-            // 防止未配置过任务时，读取到的是当前值，切换配置后仍会改变当前值
-            var hasValue = _globalKvs.TryGetValue($"Timer.Timer{i + 1}.Config", out var value);
-            if (!hasValue)
-            {
-                SetGlobalValue($"Timer.Timer{i + 1}.Config", value);
-                return defaultValue;
-            }
-
-            return GetGlobalValue($"Timer.Timer{i + 1}.Config", defaultValue); ;
+            return GetGlobalValue($"Timer.Timer{i + 1}.Config", defaultValue);
         }
 
         public static bool SetTimerConfig(int i, string value)