From 7778b7be0938d9a64616ca41e2a31e5d276da126 Mon Sep 17 00:00:00 2001
From: real-zony <zony@myzony.com>
Date: Sun, 23 Oct 2022 13:51:24 +0800
Subject: [PATCH] chore: Some code tweaks.

---
 .../Commands/SubCommand/DownloadCommand.cs      | 17 +++++++----------
 .../Lyrics/DefaultLyricsDownloader.cs           |  2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/ZonyLrcTools.Cli/Commands/SubCommand/DownloadCommand.cs b/src/ZonyLrcTools.Cli/Commands/SubCommand/DownloadCommand.cs
index b1a126e..338814c 100644
--- a/src/ZonyLrcTools.Cli/Commands/SubCommand/DownloadCommand.cs
+++ b/src/ZonyLrcTools.Cli/Commands/SubCommand/DownloadCommand.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
@@ -65,8 +64,10 @@ namespace ZonyLrcTools.Cli.Commands.SubCommand
         {
             if (DownloadLyric)
             {
-                var musicInfos = await LoadMusicInfoAsync(RemoveExistLyricFiles(await ScanMusicFilesAsync()));
-                await _lyricsDownloader.DownloadAsync(musicInfos.ToList(), ParallelNumber);
+                await _lyricsDownloader.DownloadAsync(
+                    await LoadMusicInfoAsync(
+                        RemoveExistLyricFiles(
+                            await ScanMusicFilesAsync())), ParallelNumber);
             }
 
             if (DownloadAlbum)
@@ -117,7 +118,7 @@ namespace ZonyLrcTools.Cli.Commands.SubCommand
                 .ToList();
         }
 
-        private async Task<ImmutableList<MusicInfo>> LoadMusicInfoAsync(IReadOnlyCollection<string> files)
+        private async Task<List<MusicInfo>> LoadMusicInfoAsync(IReadOnlyCollection<string> files)
         {
             await _logger.InfoAsync("开始加载音乐文件的标签信息...");
 
@@ -128,17 +129,13 @@ namespace ZonyLrcTools.Cli.Commands.SubCommand
                 .Where(m => !string.IsNullOrEmpty(m.Name) || !string.IsNullOrEmpty(m.Artist))
                 .ToList();
 
-            // Load music total time info.
-            // result.Foreach(m => { m.TotalTime = (long?)new AudioFileReader(m.FilePath).TotalTime.TotalMilliseconds; });
-
             await _logger.InfoAsync($"已成功加载 {files.Count} 个音乐文件的标签信息。");
-
-            return result.ToImmutableList();
+            return result;
         }
 
         #region > Ablum image download logic <
 
-        private async ValueTask DownloadAlbumAsync(ImmutableList<MusicInfo> musicInfos)
+        private async ValueTask DownloadAlbumAsync(List<MusicInfo> musicInfos)
         {
             await _logger.InfoAsync("开始下载专辑图像数据...");
 
diff --git a/src/ZonyLrcTools.Common/Lyrics/DefaultLyricsDownloader.cs b/src/ZonyLrcTools.Common/Lyrics/DefaultLyricsDownloader.cs
index 740afcb..6580a99 100644
--- a/src/ZonyLrcTools.Common/Lyrics/DefaultLyricsDownloader.cs
+++ b/src/ZonyLrcTools.Common/Lyrics/DefaultLyricsDownloader.cs
@@ -40,6 +40,7 @@ public class DefaultLyricsDownloader : ILyricsDownloader, ISingletonDependency
         CancellationToken cancellationToken = default)
     {
         await _logger.InfoAsync("开始下载歌词文件数据...");
+        
         if (parallelCount <= 0)
         {
             parallelCount = 1;
@@ -66,7 +67,6 @@ public class DefaultLyricsDownloader : ILyricsDownloader, ISingletonDependency
         await Task.WhenAll(downloadTasks);
 
         await _logger.InfoAsync($"歌词数据下载完成，成功: {needDownloadMusicInfos.Count(m => m.IsSuccessful)} 失败{needDownloadMusicInfos.Count(m => m.IsSuccessful == false)}。");
-
         return needDownloadMusicInfos;
     }