fix:[#484]read dic config error

RayWangQvQ · Mar 7, 2023 · 420a0bc · 420a0bc
1 parent 7cbd2cf
commit 420a0bc
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -107,3 +107,5 @@
 - Feature #460 : publish single file when release
 - Feature: use new scripts for gh actions's release
 - Feature #473 : let user input when there is no target task in configs
+## 1.0.2
+- Fix #484 : fix read dic config error
diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <Authors>Ray</Authors>
-    <Version>1.0.1</Version>
+    <Version>1.0.2</Version>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
   </PropertyGroup>
 </Project>
diff --git a/src/Ray.BiliBiliTool.Config/Constants.cs b/src/Ray.BiliBiliTool.Config/Constants.cs
@@ -1,5 +1,7 @@
 
+using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Ray.BiliBiliTool.Config
 {
@@ -33,13 +35,16 @@ public static class OptionsNames
         /// <returns></returns>
         public static Dictionary<string, string> GetExpDic()
         {
-            return new Dictionary<string, string>()
+            var dic = new Dictionary<string, string>()
             {
                 {"每日登录", "5"},
                 {"每日观看视频", "5"},
                 {"每日分享视频", "5"},
                 {"每日投币", "10"}
             };
+            return dic.Select(x =>
+                new KeyValuePair<string, string>($"{OptionsNames.ExpDictionaryName}:{x.Key}", x.Value))
+                .ToDictionary(k => k.Key, v => v.Value);
         }
 
         /// <summary>
@@ -49,7 +54,7 @@ public static Dictionary<string, string> GetExpDic()
         /// <returns></returns>
         public static Dictionary<string, string> GetDonateCoinCanContinueStatusDic()
         {
-            return new Dictionary<string, string>()
+            var dic = new Dictionary<string, string>()
             {
                 {"0", "成功"},
                 {"-400", "请求错误"},
@@ -59,6 +64,10 @@ public static Dictionary<string, string> GetDonateCoinCanContinueStatusDic()
                 {"34004", "投币间隔太短"},
                 {"34005", "超过投币上限"}
             };
+            return dic.Select(x =>
+                new KeyValuePair<string, string>($"{OptionsNames.DonateCoinCanContinueStatusDictionaryName}:{x.Key}", x.Value))
+                    .ToDictionary(k => k.Key, v => v.Value)
+                ;
         }
 
         public static Dictionary<string, string> GetCommandLineMappingsDic()

diff --git a/src/Ray.BiliBiliTool.Config/Extensions/ServiceCollectionExtension.cs b/src/Ray.BiliBiliTool.Config/Extensions/ServiceCollectionExtension.cs
@@ -26,8 +26,8 @@ public static IServiceCollection AddBiliBiliConfigs(this IServiceCollection serv
                 .Configure<SecurityOptions>(configuration.GetSection("Security"))
                 .Configure<ReceiveVipPrivilegeOptions>(configuration.GetSection("ReceiveVipPrivilegeConfig"))
                 .Configure<LiveFansMedalTaskOptions>(configuration.GetSection("LiveFansMedalTaskOptions"))
-                .Configure<Dictionary<string, int>>(Constants.OptionsNames.ExpDictionaryName, configuration.GetSection("Exp"))
-                .Configure<Dictionary<string, string>>(Constants.OptionsNames.DonateCoinCanContinueStatusDictionaryName, configuration.GetSection("DonateCoinCanContinueStatus"));
+                .Configure<Dictionary<string, int>>(Constants.OptionsNames.ExpDictionaryName, configuration.GetSection(Constants.OptionsNames.ExpDictionaryName))
+                .Configure<Dictionary<string, string>>(Constants.OptionsNames.DonateCoinCanContinueStatusDictionaryName, configuration.GetSection(Constants.OptionsNames.DonateCoinCanContinueStatusDictionaryName));
 
             return services;
         }

diff --git a/test/ConfigTest/TestDonateCoinStatusConfig.cs b/test/ConfigTest/TestDonateCoinStatusConfig.cs
@@ -1,14 +1,11 @@
 using System;
-using System.Text.Json;
 using System.Diagnostics;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Ray.BiliBiliTool.Config;
-using Ray.BiliBiliTool.Config.Options;
 using Ray.BiliBiliTool.Console;
 using Xunit;
 using Ray.BiliBiliTool.Infrastructure;
-using Microsoft.Extensions.Hosting;
 using System.Collections.Generic;
 
 namespace ConfigTest
@@ -29,6 +26,8 @@ public void Test1()
             var dic = options.Get(Constants.OptionsNames.DonateCoinCanContinueStatusDictionaryName);
 
             Debug.WriteLine(dic.ToJson());
+
+            Assert.True(dic.Count > 0);
         }
     }
 }
diff --git a/test/ConfigTest/TestExpConfig.cs b/test/ConfigTest/TestExpConfig.cs
@@ -1,14 +1,11 @@
 using System;
-using System.Text.Json;
 using System.Diagnostics;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Ray.BiliBiliTool.Config;
-using Ray.BiliBiliTool.Config.Options;
 using Ray.BiliBiliTool.Console;
 using Xunit;
 using Ray.BiliBiliTool.Infrastructure;
-using Microsoft.Extensions.Hosting;
 using System.Collections.Generic;
 
 namespace ConfigTest
@@ -25,10 +22,12 @@ public void Test1()
         {
             using var scope = Global.ServiceProviderRoot.CreateScope();
 
-            var options = scope.ServiceProvider.GetRequiredService<IOptionsMonitor<Dictionary<string, string>>>();
-            var dic = options.Get("exp");
+            var options = scope.ServiceProvider.GetRequiredService<IOptionsMonitor<Dictionary<string, int>>>();
+            var dic = options.Get(Constants.OptionsNames.ExpDictionaryName);
 
             Debug.WriteLine(dic.ToJson());
+
+            Assert.True(dic.Count > 0);
         }
     }
 }