mirror of
https://github.com/real-zony/ZonyLrcToolsX.git
synced 2025-07-01 20:30:41 +00:00
chore: Some code tweaks.
This commit is contained in:
parent
7adda14713
commit
7778b7be09
@ -1,5 +1,4 @@
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Collections.Immutable;
|
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
@ -65,8 +64,10 @@ namespace ZonyLrcTools.Cli.Commands.SubCommand
|
|||||||
{
|
{
|
||||||
if (DownloadLyric)
|
if (DownloadLyric)
|
||||||
{
|
{
|
||||||
var musicInfos = await LoadMusicInfoAsync(RemoveExistLyricFiles(await ScanMusicFilesAsync()));
|
await _lyricsDownloader.DownloadAsync(
|
||||||
await _lyricsDownloader.DownloadAsync(musicInfos.ToList(), ParallelNumber);
|
await LoadMusicInfoAsync(
|
||||||
|
RemoveExistLyricFiles(
|
||||||
|
await ScanMusicFilesAsync())), ParallelNumber);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (DownloadAlbum)
|
if (DownloadAlbum)
|
||||||
@ -117,7 +118,7 @@ namespace ZonyLrcTools.Cli.Commands.SubCommand
|
|||||||
.ToList();
|
.ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task<ImmutableList<MusicInfo>> LoadMusicInfoAsync(IReadOnlyCollection<string> files)
|
private async Task<List<MusicInfo>> LoadMusicInfoAsync(IReadOnlyCollection<string> files)
|
||||||
{
|
{
|
||||||
await _logger.InfoAsync("开始加载音乐文件的标签信息...");
|
await _logger.InfoAsync("开始加载音乐文件的标签信息...");
|
||||||
|
|
||||||
@ -128,17 +129,13 @@ namespace ZonyLrcTools.Cli.Commands.SubCommand
|
|||||||
.Where(m => !string.IsNullOrEmpty(m.Name) || !string.IsNullOrEmpty(m.Artist))
|
.Where(m => !string.IsNullOrEmpty(m.Name) || !string.IsNullOrEmpty(m.Artist))
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
// Load music total time info.
|
|
||||||
// result.Foreach(m => { m.TotalTime = (long?)new AudioFileReader(m.FilePath).TotalTime.TotalMilliseconds; });
|
|
||||||
|
|
||||||
await _logger.InfoAsync($"已成功加载 {files.Count} 个音乐文件的标签信息。");
|
await _logger.InfoAsync($"已成功加载 {files.Count} 个音乐文件的标签信息。");
|
||||||
|
return result;
|
||||||
return result.ToImmutableList();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#region > Ablum image download logic <
|
#region > Ablum image download logic <
|
||||||
|
|
||||||
private async ValueTask DownloadAlbumAsync(ImmutableList<MusicInfo> musicInfos)
|
private async ValueTask DownloadAlbumAsync(List<MusicInfo> musicInfos)
|
||||||
{
|
{
|
||||||
await _logger.InfoAsync("开始下载专辑图像数据...");
|
await _logger.InfoAsync("开始下载专辑图像数据...");
|
||||||
|
|
||||||
|
@ -40,6 +40,7 @@ public class DefaultLyricsDownloader : ILyricsDownloader, ISingletonDependency
|
|||||||
CancellationToken cancellationToken = default)
|
CancellationToken cancellationToken = default)
|
||||||
{
|
{
|
||||||
await _logger.InfoAsync("开始下载歌词文件数据...");
|
await _logger.InfoAsync("开始下载歌词文件数据...");
|
||||||
|
|
||||||
if (parallelCount <= 0)
|
if (parallelCount <= 0)
|
||||||
{
|
{
|
||||||
parallelCount = 1;
|
parallelCount = 1;
|
||||||
@ -66,7 +67,6 @@ public class DefaultLyricsDownloader : ILyricsDownloader, ISingletonDependency
|
|||||||
await Task.WhenAll(downloadTasks);
|
await Task.WhenAll(downloadTasks);
|
||||||
|
|
||||||
await _logger.InfoAsync($"歌词数据下载完成,成功: {needDownloadMusicInfos.Count(m => m.IsSuccessful)} 失败{needDownloadMusicInfos.Count(m => m.IsSuccessful == false)}。");
|
await _logger.InfoAsync($"歌词数据下载完成,成功: {needDownloadMusicInfos.Count(m => m.IsSuccessful)} 失败{needDownloadMusicInfos.Count(m => m.IsSuccessful == false)}。");
|
||||||
|
|
||||||
return needDownloadMusicInfos;
|
return needDownloadMusicInfos;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user