From 363d104dbeda5d50f63d31b3298f0d274f0c24f0 Mon Sep 17 00:00:00 2001 From: real-zony Date: Sun, 20 Mar 2022 19:27:26 +0800 Subject: [PATCH] refactor: Configuration class unified storage. --- .../{Infrastructure/Tag => Config}/BlockWordOption.cs | 2 +- .../{Infrastructure/Lyric => Config}/LyricOption.cs | 3 ++- .../{Infrastructure/Lyric => Config}/LyricProviderOption.cs | 2 +- .../Infrastructure/Lyric/LyricItemCollection.cs | 1 + .../Infrastructure/Tag/TagInfoProviderOptions.cs | 1 + .../Infrastructure/Lyric/LyricCollectionTests.cs | 1 + 6 files changed, 7 insertions(+), 3 deletions(-) rename src/ZonyLrcTools.Cli/{Infrastructure/Tag => Config}/BlockWordOption.cs (89%) rename src/ZonyLrcTools.Cli/{Infrastructure/Lyric => Config}/LyricOption.cs (89%) rename src/ZonyLrcTools.Cli/{Infrastructure/Lyric => Config}/LyricProviderOption.cs (87%) diff --git a/src/ZonyLrcTools.Cli/Infrastructure/Tag/BlockWordOption.cs b/src/ZonyLrcTools.Cli/Config/BlockWordOption.cs similarity index 89% rename from src/ZonyLrcTools.Cli/Infrastructure/Tag/BlockWordOption.cs rename to src/ZonyLrcTools.Cli/Config/BlockWordOption.cs index 5904523..c31557a 100644 --- a/src/ZonyLrcTools.Cli/Infrastructure/Tag/BlockWordOption.cs +++ b/src/ZonyLrcTools.Cli/Config/BlockWordOption.cs @@ -1,4 +1,4 @@ -namespace ZonyLrcTools.Cli.Infrastructure.Tag +namespace ZonyLrcTools.Cli.Config { /// /// 屏蔽词选项类。 diff --git a/src/ZonyLrcTools.Cli/Infrastructure/Lyric/LyricOption.cs b/src/ZonyLrcTools.Cli/Config/LyricOption.cs similarity index 89% rename from src/ZonyLrcTools.Cli/Infrastructure/Lyric/LyricOption.cs rename to src/ZonyLrcTools.Cli/Config/LyricOption.cs index f5c622c..cab1530 100644 --- a/src/ZonyLrcTools.Cli/Infrastructure/Lyric/LyricOption.cs +++ b/src/ZonyLrcTools.Cli/Config/LyricOption.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; +using ZonyLrcTools.Cli.Infrastructure.Lyric; -namespace ZonyLrcTools.Cli.Infrastructure.Lyric; +namespace ZonyLrcTools.Cli.Config; public class LyricOption { diff --git a/src/ZonyLrcTools.Cli/Infrastructure/Lyric/LyricProviderOption.cs b/src/ZonyLrcTools.Cli/Config/LyricProviderOption.cs similarity index 87% rename from src/ZonyLrcTools.Cli/Infrastructure/Lyric/LyricProviderOption.cs rename to src/ZonyLrcTools.Cli/Config/LyricProviderOption.cs index af1e680..356c165 100644 --- a/src/ZonyLrcTools.Cli/Infrastructure/Lyric/LyricProviderOption.cs +++ b/src/ZonyLrcTools.Cli/Config/LyricProviderOption.cs @@ -1,4 +1,4 @@ -namespace ZonyLrcTools.Cli.Infrastructure.Lyric +namespace ZonyLrcTools.Cli.Config { public class LyricProviderOption { diff --git a/src/ZonyLrcTools.Cli/Infrastructure/Lyric/LyricItemCollection.cs b/src/ZonyLrcTools.Cli/Infrastructure/Lyric/LyricItemCollection.cs index 1d15932..5300d83 100644 --- a/src/ZonyLrcTools.Cli/Infrastructure/Lyric/LyricItemCollection.cs +++ b/src/ZonyLrcTools.Cli/Infrastructure/Lyric/LyricItemCollection.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; +using ZonyLrcTools.Cli.Config; using ZonyLrcTools.Cli.Infrastructure.Extensions; namespace ZonyLrcTools.Cli.Infrastructure.Lyric diff --git a/src/ZonyLrcTools.Cli/Infrastructure/Tag/TagInfoProviderOptions.cs b/src/ZonyLrcTools.Cli/Infrastructure/Tag/TagInfoProviderOptions.cs index 74ae686..ff5457e 100644 --- a/src/ZonyLrcTools.Cli/Infrastructure/Tag/TagInfoProviderOptions.cs +++ b/src/ZonyLrcTools.Cli/Infrastructure/Tag/TagInfoProviderOptions.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using YamlDotNet.Serialization; +using ZonyLrcTools.Cli.Config; namespace ZonyLrcTools.Cli.Infrastructure.Tag { diff --git a/tests/ZonyLrcTools.Tests/Infrastructure/Lyric/LyricCollectionTests.cs b/tests/ZonyLrcTools.Tests/Infrastructure/Lyric/LyricCollectionTests.cs index 1fb17e9..8bd16a4 100644 --- a/tests/ZonyLrcTools.Tests/Infrastructure/Lyric/LyricCollectionTests.cs +++ b/tests/ZonyLrcTools.Tests/Infrastructure/Lyric/LyricCollectionTests.cs @@ -1,5 +1,6 @@ using Shouldly; using Xunit; +using ZonyLrcTools.Cli.Config; using ZonyLrcTools.Cli.Infrastructure.Lyric; namespace ZonyLrcTools.Tests.Infrastructure.Lyric