github/ZonyLrcToolsX
1
0
Fork 0
mirror of https://github.com/real-zony/ZonyLrcToolsX.git synced 2025-07-01 12:11:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: Common components are moved to the Common library.

Browse Source
This commit is contained in:
real-zony 2022-10-06 13:02:20 +08:00
parent ecab0e0f5c
commit 740e8f4c63
64 changed files with 84 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ZonyLrcTools.Cli/Commands/SubCommand/DownloadCommand.cs
View File

@ -8,15 +8,15 @@ using System.Threading.Tasks;
using McMaster.Extensions.CommandLineUtils;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using ZonyLrcTools.Cli.Infrastructure;
using ZonyLrcTools.Cli.Infrastructure.Album;
using ZonyLrcTools.Cli.Infrastructure.Extensions;
using ZonyLrcTools.Cli.Infrastructure.IO;
using ZonyLrcTools.Cli.Infrastructure.Lyric;
using ZonyLrcTools.Cli.Infrastructure.Tag;
using ZonyLrcTools.Cli.Infrastructure.Threading;
using ZonyLrcTools.Common;
using ZonyLrcTools.Common.Album;
using ZonyLrcTools.Common.Configuration;
using ZonyLrcTools.Common.Infrastructure.Exceptions;
using ZonyLrcTools.Common.Infrastructure.Extensions;
using ZonyLrcTools.Common.Infrastructure.IO;
using ZonyLrcTools.Common.Infrastructure.Threading;
using ZonyLrcTools.Common.Lyrics;
using File = System.IO.File;
namespace ZonyLrcTools.Cli.Commands.SubCommand

6
src/ZonyLrcTools.Cli/Commands/SubCommand/UtilityCommand.cs
View File

@ -6,10 +6,10 @@ using System.Threading.Tasks;
using McMaster.Extensions.CommandLineUtils;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json.Linq;
using ZonyLrcTools.Cli.Infrastructure.IO;
using ZonyLrcTools.Cli.Infrastructure.MusicDecryption;
using ZonyLrcTools.Cli.Infrastructure.Threading;
using ZonyLrcTools.Common.Infrastructure.Exceptions;
using ZonyLrcTools.Common.Infrastructure.IO;
using ZonyLrcTools.Common.Infrastructure.Threading;
using ZonyLrcTools.Common.MusicDecryption;
namespace ZonyLrcTools.Cli.Commands.SubCommand
{

7
src/ZonyLrcTools.Cli/ZonyLrcTools.Cli.csproj
View File

@ -13,18 +13,11 @@
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.0.1" />
<PackageReference Include="McMaster.Extensions.Hosting.CommandLine" Version="4.0.1" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
<PackageReference Include="NetEscapades.Configuration.Yaml" Version="2.2.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Refit" Version="6.3.2" />
<PackageReference Include="Refit.HttpClientFactory" Version="6.3.2" />
<PackageReference Include="Refit.Newtonsoft.Json" Version="6.3.2" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="5.0.1" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
<PackageReference Include="TagLibSharp" Version="2.3.0" />
</ItemGroup>
<ItemGroup>

4
src/ZonyLrcTools.Cli/Infrastructure/Album/IAlbumDownloader.cs → src/ZonyLrcTools.Common/Album/IAlbumDownloader.cs
View File

@ -1,6 +1,4 @@
using System.Threading.Tasks;
namespace ZonyLrcTools.Cli.Infrastructure.Album
namespace ZonyLrcTools.Common.Album
{
/// <summary>
/// 专辑封面下载器，用于匹配并下载歌曲的专辑封面。

2
src/ZonyLrcTools.Cli/Infrastructure/Album/InternalAlbumDownloaderNames.cs → src/ZonyLrcTools.Common/Album/InternalAlbumDownloaderNames.cs
View File

@ -1,4 +1,4 @@
namespace ZonyLrcTools.Cli.Infrastructure.Album
namespace ZonyLrcTools.Common.Album
{
/// <summary>
/// 定义了程序默认提供的专辑图像下载器。

9
src/ZonyLrcTools.Cli/Infrastructure/Album/NetEase/NetEaseAlbumDownloader.cs → src/ZonyLrcTools.Common/Album/NetEase/NetEaseAlbumDownloader.cs
View File

@ -1,14 +1,11 @@
using System;
using System.Net.Http;
using System.Net.Http.Headers;
using System.Threading.Tasks;
using System.Net.Http.Headers;
using Newtonsoft.Json.Linq;
using ZonyLrcTools.Cli.Infrastructure.Lyric.NetEase.JsonModel;
using ZonyLrcTools.Common.Infrastructure.DependencyInject;
using ZonyLrcTools.Common.Infrastructure.Exceptions;
using ZonyLrcTools.Common.Infrastructure.Network;
using ZonyLrcTools.Common.Lyrics.Providers.NetEase.JsonModel;
namespace ZonyLrcTools.Cli.Infrastructure.Album.NetEase
namespace ZonyLrcTools.Common.Album.NetEase
{
public class NetEaseAlbumDownloader : IAlbumDownloader, ITransientDependency
{

7
src/ZonyLrcTools.Cli/Infrastructure/Album/QQMusic/QQMusicAlbumDownloader.cs → src/ZonyLrcTools.Common/Album/QQMusic/QQMusicAlbumDownloader.cs
View File

@ -1,12 +1,9 @@
using System;
using System.Net.Http;
using System.Net.Http.Headers;
using System.Threading.Tasks;
using ZonyLrcTools.Cli.Infrastructure.Lyric.QQMusic.JsonModel;
using ZonyLrcTools.Common.Infrastructure.DependencyInject;
using ZonyLrcTools.Common.Infrastructure.Network;
using ZonyLrcTools.Common.Lyrics.Providers.QQMusic.JsonModel;
namespace ZonyLrcTools.Cli.Infrastructure.Album.QQMusic
namespace ZonyLrcTools.Common.Album.QQMusic
{
public class QQMusicAlbumDownloader : IAlbumDownloader, ITransientDependency
{

5
src/ZonyLrcTools.Cli/Infrastructure/Extensions/LoggerExtensions.cs → src/ZonyLrcTools.Common/Infrastructure/Extensions/LoggerHelper.cs
View File

@ -1,15 +1,14 @@
using System;
using System.Text;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using ZonyLrcTools.Common.Infrastructure.Exceptions;
namespace ZonyLrcTools.Cli.Infrastructure.Extensions
namespace ZonyLrcTools.Common.Infrastructure.Extensions
{
/// <summary>
/// 日志记录相关的扩展方法。
/// </summary>
public static class LoggerExtensions
public static class LoggerHelper
{
/// <summary>
/// 使用 <see cref="LogLevel.Warning"/> 级别打印错误日志，并记录异常堆栈。

4
src/ZonyLrcTools.Cli/Infrastructure/Extensions/StringHelper.cs → src/ZonyLrcTools.Common/Infrastructure/Extensions/StringHelper.cs
View File

@ -1,6 +1,4 @@
using System;
namespace ZonyLrcTools.Cli.Infrastructure.Extensions
namespace ZonyLrcTools.Common.Infrastructure.Extensions
{
/// <summary>
/// 字符串处理相关的工具方法。

9
src/ZonyLrcTools.Cli/Infrastructure/IO/FileScanner.cs → src/ZonyLrcTools.Common/Infrastructure/IO/FileScanner.cs
View File

@ -1,16 +1,11 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
using ZonyLrcTools.Cli.Infrastructure.Extensions;
using ZonyLrcTools.Common.Infrastructure.DependencyInject;
using ZonyLrcTools.Common.Infrastructure.Exceptions;
using ZonyLrcTools.Common.Infrastructure.Extensions;
namespace ZonyLrcTools.Cli.Infrastructure.IO
namespace ZonyLrcTools.Common.Infrastructure.IO
{
public class FileScanner : IFileScanner, ITransientDependency
{

4
src/ZonyLrcTools.Cli/Infrastructure/IO/FileScannerResult.cs → src/ZonyLrcTools.Common/Infrastructure/IO/FileScannerResult.cs
View File

@ -1,6 +1,4 @@
using System.Collections.Generic;
namespace ZonyLrcTools.Cli.Infrastructure.IO
namespace ZonyLrcTools.Common.Infrastructure.IO
{
/// <summary>
/// 文件扫描结果对象。

5
src/ZonyLrcTools.Cli/Infrastructure/IO/FileStreamExtensions.cs → src/ZonyLrcTools.Common/Infrastructure/IO/FileStreamExtensions.cs
View File

@ -1,7 +1,4 @@
using System.IO;
using System.Threading.Tasks;
namespace ZonyLrcTools.Cli.Infrastructure.IO
namespace ZonyLrcTools.Common.Infrastructure.IO
{
public static class FileStreamExtensions
{

5
src/ZonyLrcTools.Cli/Infrastructure/IO/IFileScanner.cs → src/ZonyLrcTools.Common/Infrastructure/IO/IFileScanner.cs
View File

@ -1,7 +1,4 @@
using System.Collections.Generic;
using System.Threading.Tasks;
namespace ZonyLrcTools.Cli.Infrastructure.IO
namespace ZonyLrcTools.Common.Infrastructure.IO
{
/// <summary>
/// 音乐文件扫描器，用于扫描音乐文件。

6
src/ZonyLrcTools.Cli/Infrastructure/Threading/WarpTask.cs → src/ZonyLrcTools.Common/Infrastructure/Threading/WarpTask.cs
View File

@ -1,8 +1,4 @@
using System;
using System.Threading;
using System.Threading.Tasks;
namespace ZonyLrcTools.Cli.Infrastructure.Threading
namespace ZonyLrcTools.Common.Infrastructure.Threading
{
/// <summary>
/// 针对 Task 的包装类，基于信号量 <see cref="SemaphoreSlim"/> 限定并行度。

4
src/ZonyLrcTools.Cli/Infrastructure/Lyric/ILyricDownloader.cs → src/ZonyLrcTools.Common/Lyrics/ILyricDownloader.cs
View File

@ -1,6 +1,4 @@
using System.Threading.Tasks;
namespace ZonyLrcTools.Cli.Infrastructure.Lyric
namespace ZonyLrcTools.Common.Lyrics
{
/// <summary>
/// 歌词数据下载器，用于匹配并下载歌曲的歌词。

2
src/ZonyLrcTools.Cli/Infrastructure/Lyric/ILyricItemCollectionFactory.cs → src/ZonyLrcTools.Common/Lyrics/ILyricItemCollectionFactory.cs
View File

@ -1,4 +1,4 @@
namespace ZonyLrcTools.Cli.Infrastructure.Lyric
namespace ZonyLrcTools.Common.Lyrics
{
/// <summary>
/// 构建 <see cref="LyricItemCollection"/> 对象的工厂。

2
src/ZonyLrcTools.Cli/Infrastructure/Lyric/ILyricTextResolver.cs → src/ZonyLrcTools.Common/Lyrics/ILyricTextResolver.cs
View File

@ -1,4 +1,4 @@
namespace ZonyLrcTools.Cli.Infrastructure.Lyric
namespace ZonyLrcTools.Common.Lyrics
{
public interface ILyricTextResolver
{

2
src/ZonyLrcTools.Cli/Infrastructure/Lyric/InternalLyricDownloaderNames.cs → src/ZonyLrcTools.Common/Lyrics/InternalLyricDownloaderNames.cs
View File

@ -1,4 +1,4 @@
namespace ZonyLrcTools.Cli.Infrastructure.Lyric
namespace ZonyLrcTools.Common.Lyrics
{
/// <summary>
/// 定义了程序默认提供的歌词下载器。

3
src/ZonyLrcTools.Cli/Infrastructure/Lyric/LyricDownloader.cs → src/ZonyLrcTools.Common/Lyrics/LyricDownloader.cs
View File

@ -1,8 +1,7 @@
using System.Threading.Tasks;
using ZonyLrcTools.Common.Infrastructure.DependencyInject;
using ZonyLrcTools.Common.Infrastructure.Exceptions;
namespace ZonyLrcTools.Cli.Infrastructure.Lyric
namespace ZonyLrcTools.Common.Lyrics
{
/// <summary>
/// 歌词下载器的基类，定义了歌词下载器的常规逻辑。

2
src/ZonyLrcTools.Cli/Infrastructure/Lyric/LyricDownloaderArgs.cs → src/ZonyLrcTools.Common/Lyrics/LyricDownloaderArgs.cs
View File

@ -1,4 +1,4 @@
namespace ZonyLrcTools.Cli.Infrastructure.Lyric
namespace ZonyLrcTools.Common.Lyrics
{
public class LyricDownloaderArgs
{

3
src/ZonyLrcTools.Cli/Infrastructure/Lyric/LyricItem.cs → src/ZonyLrcTools.Common/Lyrics/LyricItem.cs
View File

@ -1,7 +1,6 @@
using System;
using System.Text.RegularExpressions;
namespace ZonyLrcTools.Cli.Infrastructure.Lyric
namespace ZonyLrcTools.Common.Lyrics
{
/// <summary>
/// 歌词的行对象，是 <see cref="LyricItemCollection"/> 的最小单位。。

6
src/ZonyLrcTools.Cli/Infrastructure/Lyric/LyricItemCollection.cs → src/ZonyLrcTools.Common/Lyrics/LyricItemCollection.cs
View File

@ -1,12 +1,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using ZonyLrcTools.Cli.Infrastructure.Extensions;
using ZonyLrcTools.Common.Configuration;
using ZonyLrcTools.Common.Infrastructure.Extensions;
namespace ZonyLrcTools.Cli.Infrastructure.Lyric
namespace ZonyLrcTools.Common.Lyrics
{
/// <summary>
/// 歌词数据，包含多条歌词行对象(<see cref="LyricItem"/>)。

2
src/ZonyLrcTools.Cli/Infrastructure/Lyric/LyricItemCollectionFactory.cs → src/ZonyLrcTools.Common/Lyrics/LyricItemCollectionFactory.cs
View File

@ -3,7 +3,7 @@ using Microsoft.Extensions.Options;
using ZonyLrcTools.Common.Configuration;
using ZonyLrcTools.Common.Infrastructure.DependencyInject;
namespace ZonyLrcTools.Cli.Infrastructure.Lyric
namespace ZonyLrcTools.Common.Lyrics
{
/// <summary>
/// <see cref="ILyricItemCollectionFactory"/> 的默认实现。

2
src/ZonyLrcTools.Cli/Infrastructure/Lyric/KuGou/JsonModel/GetLyricAccessKeyRequest.cs → src/ZonyLrcTools.Common/Lyrics/Providers/KuGou/JsonModel/GetLyricAccessKeyRequest.cs
View File

@ -1,6 +1,6 @@
using Newtonsoft.Json;
namespace ZonyLrcTools.Cli.Infrastructure.Lyric.KuGou.JsonModel
namespace ZonyLrcTools.Common.Lyrics.Providers.KuGou.JsonModel
{
public class GetLyricAccessKeyRequest
{

3
src/ZonyLrcTools.Cli/Infrastructure/Lyric/KuGou/JsonModel/GetLyricAccessKeyResponse.cs → src/ZonyLrcTools.Common/Lyrics/Providers/KuGou/JsonModel/GetLyricAccessKeyResponse.cs
View File

@ -1,7 +1,6 @@
using System.Collections.Generic;
using Newtonsoft.Json;
namespace ZonyLrcTools.Cli.Infrastructure.Lyric.KuGou.JsonModel
namespace ZonyLrcTools.Common.Lyrics.Providers.KuGou.JsonModel
{
public class GetLyricAccessKeyResponse
{

2
src/ZonyLrcTools.Cli/Infrastructure/Lyric/KuGou/JsonModel/GetLyricRequest.cs → src/ZonyLrcTools.Common/Lyrics/Providers/KuGou/JsonModel/GetLyricRequest.cs
View File

@ -1,6 +1,6 @@
using Newtonsoft.Json;
namespace ZonyLrcTools.Cli.Infrastructure.Lyric.KuGou.JsonModel
namespace ZonyLrcTools.Common.Lyrics.Providers.KuGou.JsonModel
{
public class GetLyricRequest
{

2
src/ZonyLrcTools.Cli/Infrastructure/Lyric/KuGou/JsonModel/SongSearchRequest.cs → src/ZonyLrcTools.Common/Lyrics/Providers/KuGou/JsonModel/SongSearchRequest.cs
View File

@ -2,7 +2,7 @@
using System.Web;
using Newtonsoft.Json;
namespace ZonyLrcTools.Cli.Infrastructure.Lyric.KuGou.JsonModel
namespace ZonyLrcTools.Common.Lyrics.Providers.KuGou.JsonModel
{
public class SongSearchRequest
{

5
src/ZonyLrcTools.Cli/Infrastructure/Lyric/KuGou/JsonModel/SongSearchResponse.cs → src/ZonyLrcTools.Common/Lyrics/Providers/KuGou/JsonModel/SongSearchResponse.cs
View File

@ -1,7 +1,6 @@
using System.Collections.Generic;
using Newtonsoft.Json;
using Newtonsoft.Json;
namespace ZonyLrcTools.Cli.Infrastructure.Lyric.KuGou.JsonModel
namespace ZonyLrcTools.Common.Lyrics.Providers.KuGou.JsonModel
{
public class SongSearchResponse
{

6
src/ZonyLrcTools.Cli/Infrastructure/Lyric/KuGou/KuGourLyricDownloader.cs → src/ZonyLrcTools.Common/Lyrics/Providers/KuGou/KuGourLyricDownloader.cs
View File

@ -1,14 +1,12 @@
using System;
using System.Text;
using System.Threading.Tasks;
using Microsoft.Extensions.Options;
using Newtonsoft.Json.Linq;
using ZonyLrcTools.Cli.Infrastructure.Lyric.KuGou.JsonModel;
using ZonyLrcTools.Common.Configuration;
using ZonyLrcTools.Common.Infrastructure.Exceptions;
using ZonyLrcTools.Common.Infrastructure.Network;
using ZonyLrcTools.Common.Lyrics.Providers.KuGou.JsonModel;
namespace ZonyLrcTools.Cli.Infrastructure.Lyric.KuGou
namespace ZonyLrcTools.Common.Lyrics.Providers.KuGou
{
public class KuGourLyricDownloader : LyricDownloader
{

2
src/ZonyLrcTools.Cli/Infrastructure/Lyric/NetEase/JsonModel/GetLyricRequest.cs → src/ZonyLrcTools.Common/Lyrics/Providers/NetEase/JsonModel/GetLyricRequest.cs
View File

@ -2,7 +2,7 @@ using Newtonsoft.Json;
// ReSharper disable InconsistentNaming
namespace ZonyLrcTools.Cli.Infrastructure.Lyric.NetEase.JsonModel
namespace ZonyLrcTools.Common.Lyrics.Providers.NetEase.JsonModel
{
public class GetLyricRequest
{

2
src/ZonyLrcTools.Cli/Infrastructure/Lyric/NetEase/JsonModel/GetLyricResponse.cs → src/ZonyLrcTools.Common/Lyrics/Providers/NetEase/JsonModel/GetLyricResponse.cs
View File

@ -1,6 +1,6 @@
using Newtonsoft.Json;
namespace ZonyLrcTools.Cli.Infrastructure.Lyric.NetEase.JsonModel
namespace ZonyLrcTools.Common.Lyrics.Providers.NetEase.JsonModel
{
public class GetLyricResponse
{

2
src/ZonyLrcTools.Cli/Infrastructure/Lyric/NetEase/JsonModel/GetSongDetailsRequest.cs → src/ZonyLrcTools.Common/Lyrics/Providers/NetEase/JsonModel/GetSongDetailsRequest.cs
View File

@ -1,6 +1,6 @@
using Newtonsoft.Json;
namespace ZonyLrcTools.Cli.Infrastructure.Lyric.NetEase.JsonModel
namespace ZonyLrcTools.Common.Lyrics.Providers.NetEase.JsonModel
{
public class GetSongDetailsRequest
{

2
src/ZonyLrcTools.Cli/Infrastructure/Lyric/NetEase/JsonModel/SongSearchRequest.cs → src/ZonyLrcTools.Common/Lyrics/Providers/NetEase/JsonModel/SongSearchRequest.cs
View File

@ -3,7 +3,7 @@ using System.Text.RegularExpressions;
using System.Web;
using Newtonsoft.Json;
namespace ZonyLrcTools.Cli.Infrastructure.Lyric.NetEase.JsonModel
namespace ZonyLrcTools.Common.Lyrics.Providers.NetEase.JsonModel
{
public class SongSearchRequest
{

5
src/ZonyLrcTools.Cli/Infrastructure/Lyric/NetEase/JsonModel/SongSearchResponse.cs → src/ZonyLrcTools.Common/Lyrics/Providers/NetEase/JsonModel/SongSearchResponse.cs
View File

@ -1,9 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Newtonsoft.Json;
namespace ZonyLrcTools.Cli.Infrastructure.Lyric.NetEase.JsonModel
namespace ZonyLrcTools.Common.Lyrics.Providers.NetEase.JsonModel
{
public class SongSearchResponse
{

2
src/ZonyLrcTools.Cli/Infrastructure/Lyric/NetEase/JsonModel/SongSearchResponseStatusCode.cs → src/ZonyLrcTools.Common/Lyrics/Providers/NetEase/JsonModel/SongSearchResponseStatusCode.cs
View File

@ -1,4 +1,4 @@
namespace ZonyLrcTools.Cli.Infrastructure.Lyric.NetEase.JsonModel
namespace ZonyLrcTools.Common.Lyrics.Providers.NetEase.JsonModel
{
public static class SongSearchResponseStatusCode
{

6
src/ZonyLrcTools.Cli/Infrastructure/Lyric/NetEase/NetEaseLyricDownloader.cs → src/ZonyLrcTools.Common/Lyrics/Providers/NetEase/NetEaseLyricDownloader.cs
View File

@ -1,15 +1,13 @@
using System;
using System.Net.Http.Headers;
using System.Text;
using System.Threading.Tasks;
using Microsoft.Extensions.Options;
using Newtonsoft.Json;
using ZonyLrcTools.Cli.Infrastructure.Lyric.NetEase.JsonModel;
using ZonyLrcTools.Common.Configuration;
using ZonyLrcTools.Common.Infrastructure.Exceptions;
using ZonyLrcTools.Common.Infrastructure.Network;
using ZonyLrcTools.Common.Lyrics.Providers.NetEase.JsonModel;
namespace ZonyLrcTools.Cli.Infrastructure.Lyric.NetEase
namespace ZonyLrcTools.Common.Lyrics.Providers.NetEase
{
public class NetEaseLyricDownloader : LyricDownloader
{

2
src/ZonyLrcTools.Cli/Infrastructure/Lyric/QQMusic/JsonModel/GetLyricRequest.cs → src/ZonyLrcTools.Common/Lyrics/Providers/QQMusic/JsonModel/GetLyricRequest.cs
View File

@ -1,6 +1,6 @@
using Newtonsoft.Json;
namespace ZonyLrcTools.Cli.Infrastructure.Lyric.QQMusic.JsonModel
namespace ZonyLrcTools.Common.Lyrics.Providers.QQMusic.JsonModel
{
public class GetLyricRequest
{

2
src/ZonyLrcTools.Cli/Infrastructure/Lyric/QQMusic/JsonModel/SongSearchRequest.cs → src/ZonyLrcTools.Common/Lyrics/Providers/QQMusic/JsonModel/SongSearchRequest.cs
View File

@ -2,7 +2,7 @@ using System.Text;
using System.Web;
using Newtonsoft.Json;
namespace ZonyLrcTools.Cli.Infrastructure.Lyric.QQMusic.JsonModel
namespace ZonyLrcTools.Common.Lyrics.Providers.QQMusic.JsonModel
{
public class SongSearchRequest
{

3
src/ZonyLrcTools.Cli/Infrastructure/Lyric/QQMusic/JsonModel/SongSearchResponse.cs → src/ZonyLrcTools.Common/Lyrics/Providers/QQMusic/JsonModel/SongSearchResponse.cs
View File

@ -1,7 +1,6 @@
using System.Collections.Generic;
using Newtonsoft.Json;
namespace ZonyLrcTools.Cli.Infrastructure.Lyric.QQMusic.JsonModel
namespace ZonyLrcTools.Common.Lyrics.Providers.QQMusic.JsonModel
{
public class SongSearchResponse
{

7
src/ZonyLrcTools.Cli/Infrastructure/Lyric/QQMusic/QQLyricDownloader.cs → src/ZonyLrcTools.Common/Lyrics/Providers/QQMusic/QQLyricDownloader.cs
View File

@ -1,14 +1,11 @@
using System;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Web;
using Newtonsoft.Json.Linq;
using ZonyLrcTools.Cli.Infrastructure.Lyric.QQMusic.JsonModel;
using ZonyLrcTools.Common.Infrastructure.Exceptions;
using ZonyLrcTools.Common.Infrastructure.Network;
using ZonyLrcTools.Common.Lyrics.Providers.QQMusic.JsonModel;
namespace ZonyLrcTools.Cli.Infrastructure.Lyric.QQMusic
namespace ZonyLrcTools.Common.Lyrics.Providers.QQMusic
{
public class QQLyricDownloader : LyricDownloader
{

4
src/ZonyLrcTools.Cli/Infrastructure/MusicDecryption/DecryptionResult.cs → src/ZonyLrcTools.Common/MusicDecryption/DecryptionResult.cs
View File

@ -1,6 +1,4 @@
using System.Collections.Generic;
namespace ZonyLrcTools.Cli.Infrastructure.MusicDecryption
namespace ZonyLrcTools.Common.MusicDecryption
{
public class DecryptionResult
{

4
src/ZonyLrcTools.Cli/Infrastructure/MusicDecryption/IMusicDecryptor.cs → src/ZonyLrcTools.Common/MusicDecryption/IMusicDecryptor.cs
View File

@ -1,6 +1,4 @@
using System.Threading.Tasks;
namespace ZonyLrcTools.Cli.Infrastructure.MusicDecryption
namespace ZonyLrcTools.Common.MusicDecryption
{
/// <summary>
/// 音乐解密器，用于将加密的歌曲数据，转换为可识别的歌曲格式。

8
src/ZonyLrcTools.Cli/Infrastructure/MusicDecryption/NcmMusicDecryptor.cs → src/ZonyLrcTools.Common/MusicDecryption/NcmMusicDecryptor.cs
View File

@ -1,13 +1,9 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Security.Cryptography;
using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;
using Newtonsoft.Json.Linq;
using ZonyLrcTools.Common.Infrastructure.DependencyInject;
namespace ZonyLrcTools.Cli.Infrastructure.MusicDecryption
namespace ZonyLrcTools.Common.MusicDecryption
{
/// <summary>
/// NCM 音乐转换器，用于将 NCM 格式的音乐转换为可播放的格式。

4
src/ZonyLrcTools.Cli/Infrastructure/MusicInfo.cs → src/ZonyLrcTools.Common/MusicInfo.cs
View File

@ -1,6 +1,4 @@
using System;
namespace ZonyLrcTools.Cli.Infrastructure
namespace ZonyLrcTools.Common
{
/// <summary>
/// 歌曲信息的承载类，携带歌曲的相关数据。

0
src/ZonyLrcTools.Cli/Infrastructure/Tag/BlockWordDictionary.cs → src/ZonyLrcTools.Common/TagInfo/BlockWordDictionary.cs
View File

1
src/ZonyLrcTools.Cli/Infrastructure/Tag/DefaultTagLoader.cs → src/ZonyLrcTools.Common/TagInfo/DefaultTagLoader.cs
View File

@ -4,6 +4,7 @@ using System.Linq;
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using ZonyLrcTools.Common;
using ZonyLrcTools.Common.Configuration;
using ZonyLrcTools.Common.Infrastructure.DependencyInject;
using ZonyLrcTools.Common.Infrastructure.Exceptions;

1
src/ZonyLrcTools.Cli/Infrastructure/Tag/FileNameTagInfoProvider.cs → src/ZonyLrcTools.Common/TagInfo/FileNameTagInfoProvider.cs
View File

@ -3,6 +3,7 @@ using System.Linq;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using Microsoft.Extensions.Options;
using ZonyLrcTools.Common;
using ZonyLrcTools.Common.Configuration;
using ZonyLrcTools.Common.Infrastructure.DependencyInject;

0
src/ZonyLrcTools.Cli/Infrastructure/Tag/IBlockWordDictionary.cs → src/ZonyLrcTools.Common/TagInfo/IBlockWordDictionary.cs
View File

1
src/ZonyLrcTools.Cli/Infrastructure/Tag/ITagInfoProvider.cs → src/ZonyLrcTools.Common/TagInfo/ITagInfoProvider.cs
View File

@ -1,4 +1,5 @@
using System.Threading.Tasks;
using ZonyLrcTools.Common;
namespace ZonyLrcTools.Cli.Infrastructure.Tag
{

1
src/ZonyLrcTools.Cli/Infrastructure/Tag/ITagLoader.cs → src/ZonyLrcTools.Common/TagInfo/ITagLoader.cs
View File

@ -1,4 +1,5 @@
using System.Threading.Tasks;
using ZonyLrcTools.Common;
namespace ZonyLrcTools.Cli.Infrastructure.Tag
{

1
src/ZonyLrcTools.Cli/Infrastructure/Tag/TaglibTagInfoProvider.cs → src/ZonyLrcTools.Common/TagInfo/TaglibTagInfoProvider.cs
View File

@ -1,5 +1,6 @@
using System;
using System.Threading.Tasks;
using ZonyLrcTools.Common;
using ZonyLrcTools.Common.Infrastructure.DependencyInject;
using ZonyLrcTools.Common.Infrastructure.Exceptions;

9
src/ZonyLrcTools.Cli/Infrastructure/Updater/DefaultUpdater.cs → src/ZonyLrcTools.Common/Updater/DefaultUpdater.cs
View File

@ -1,14 +1,11 @@
using System;
using System.Diagnostics;
using System.Linq;
using System.Diagnostics;
using System.Reflection;
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using ZonyLrcTools.Cli.Infrastructure.Updater.JsonModel;
using ZonyLrcTools.Common.Infrastructure.DependencyInject;
using ZonyLrcTools.Common.Infrastructure.Network;
using ZonyLrcTools.Common.Updater.JsonModel;
namespace ZonyLrcTools.Cli.Infrastructure.Updater;
namespace ZonyLrcTools.Common.Updater;
public class DefaultUpdater : ISingletonDependency
{

2
src/ZonyLrcTools.Cli/Infrastructure/Updater/JsonModel/NewVersionItem.cs → src/ZonyLrcTools.Common/Updater/JsonModel/NewVersionItem.cs
View File

@ -1,4 +1,4 @@
namespace ZonyLrcTools.Cli.Infrastructure.Updater.JsonModel;
namespace ZonyLrcTools.Common.Updater.JsonModel;
public class NewVersionItem
{

2
src/ZonyLrcTools.Cli/Infrastructure/Updater/JsonModel/NewVersionItemType.cs → src/ZonyLrcTools.Common/Updater/JsonModel/NewVersionItemType.cs
View File

@ -1,4 +1,4 @@
namespace ZonyLrcTools.Cli.Infrastructure.Updater.JsonModel;
namespace ZonyLrcTools.Common.Updater.JsonModel;
public enum NewVersionItemType
{

5
src/ZonyLrcTools.Cli/Infrastructure/Updater/JsonModel/NewVersionResponse.cs → src/ZonyLrcTools.Common/Updater/JsonModel/NewVersionResponse.cs
View File

@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
namespace ZonyLrcTools.Cli.Infrastructure.Updater.JsonModel;
namespace ZonyLrcTools.Common.Updater.JsonModel;
public class NewVersionResponse
{

5
src/ZonyLrcTools.Common/ZonyLrcTools.Common.csproj
View File

@ -12,6 +12,11 @@
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
<PackageReference Include="NetEscapades.Configuration.Yaml" Version="2.2.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="TagLibSharp" Version="2.3.0" />
</ItemGroup>
<ItemGroup>
<Folder Include="Lyrics\Providers" />
</ItemGroup>
</Project>

5
tests/ZonyLrcTools.Tests/FileScannerTests.cs
View File

@ -1,11 +1,10 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
using Shouldly;
using Xunit;
using ZonyLrcTools.Cli.Infrastructure.IO;
using ZonyLrcTools.Common.Infrastructure.IO;
namespace ZonyLrcTools.Tests
{
@ -21,7 +20,7 @@ namespace ZonyLrcTools.Tests
var fileScanner = ServiceProvider.GetRequiredService<IFileScanner>();
var result = await fileScanner.ScanAsync(
Path.GetDirectoryName(tempMusicFilePath),
new[] {"*.mp3", "*.flac"});
new[] { "*.mp3", "*.flac" });
result.Count.ShouldBe(2);
result.First(e => e.ExtensionName == ".mp3").FilePaths.Count.ShouldNotBe(0);

2
tests/ZonyLrcTools.Tests/Infrastructure/Album/NetEaseAlbumDownloader_Tests.cs
View File

@ -5,7 +5,7 @@ using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
using Shouldly;
using Xunit;
using ZonyLrcTools.Cli.Infrastructure.Album;
using ZonyLrcTools.Common.Album;
namespace ZonyLrcTools.Tests.Infrastructure.Album
{

2
tests/ZonyLrcTools.Tests/Infrastructure/Album/QQMusicAlbumDownloaderTests.cs
View File

@ -4,7 +4,7 @@ using System.Linq;
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
using Shouldly;
using ZonyLrcTools.Cli.Infrastructure.Album;
using ZonyLrcTools.Common.Album;
namespace ZonyLrcTools.Tests.Infrastructure.Album
{

3
tests/ZonyLrcTools.Tests/Infrastructure/Lyric/KuGouLyricDownloaderTests.cs
View File

@ -1,10 +1,9 @@
using System.Collections.Generic;
using System.Linq;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using Shouldly;
using Xunit;
using ZonyLrcTools.Cli.Infrastructure.Lyric;
using ZonyLrcTools.Common.Lyrics;
namespace ZonyLrcTools.Tests.Infrastructure.Lyric
{

1
tests/ZonyLrcTools.Tests/Infrastructure/Lyric/LyricCollectionTests.cs
View File

@ -1,6 +1,5 @@
using Shouldly;
using Xunit;
using ZonyLrcTools.Cli.Infrastructure.Lyric;
using ZonyLrcTools.Common.Configuration;
using ZonyLrcTools.Common.Lyrics;

2
tests/ZonyLrcTools.Tests/Infrastructure/Lyric/NetEaseLyricDownloaderTests.cs
View File

@ -5,8 +5,8 @@ using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
using Shouldly;
using Xunit;
using ZonyLrcTools.Cli.Infrastructure.Lyric;
using ZonyLrcTools.Common.Configuration;
using ZonyLrcTools.Common.Lyrics;
namespace ZonyLrcTools.Tests.Infrastructure.Lyric
{

3
tests/ZonyLrcTools.Tests/Infrastructure/Lyric/QQLyricDownloaderTests.cs
View File

@ -1,10 +1,9 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
using Shouldly;
using Xunit;
using ZonyLrcTools.Cli.Infrastructure.Lyric;
using ZonyLrcTools.Common.Lyrics;
namespace ZonyLrcTools.Tests.Infrastructure.Lyric
{

2
tests/ZonyLrcTools.Tests/Infrastructure/MusicDecryption/NcmMusicDecryptor_Tests.cs
View File

@ -3,7 +3,7 @@ using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
using Newtonsoft.Json.Linq;
using Xunit;
using ZonyLrcTools.Cli.Infrastructure.MusicDecryption;
using ZonyLrcTools.Common.MusicDecryption;
namespace ZonyLrcTools.Tests.Infrastructure.MusicDecryption
{