修复部分情况下判断为非NLyric创建歌词的错误

Batch Step改为100
wwh1004 · Aug 4, 2020 · 5ee5faa · 5ee5faa
1 parent 043b4f0
commit 5ee5faa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/NLyric/NLyric.csproj b/NLyric/NLyric.csproj
@@ -4,8 +4,8 @@
 		<Title>NLyric</Title>
 		<Product>NLyric</Product>
 		<Copyright>Copyright © 2019-2020 Wwh</Copyright>
-		<AssemblyVersion>2.6.0.0</AssemblyVersion>
-		<FileVersion>2.6.0.0</FileVersion>
+		<AssemblyVersion>2.6.0.1</AssemblyVersion>
+		<FileVersion>2.6.0.1</FileVersion>
 		<OutputPath>..\bin\$(Configuration)</OutputPath>
 		<OutputType>Exe</OutputType>
 		<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>

diff --git a/NLyric/NLyricImpl.cs b/NLyric/NLyricImpl.cs
@@ -113,14 +113,19 @@ private static AudioInfo[] LoadAllAudioInfos(string directory) {
 				finally {
 					audioFile?.Dispose();
 				}
-				var trackInfo = _database.TrackInfos.Match(audioInfo.Album, audioInfo.Track);
+				TrackInfo trackInfo;
+				lock (_database.TrackInfos)
+					trackInfo = _database.TrackInfos.Match(audioInfo.Album, audioInfo.Track);
 				if (!(trackInfo is null)) {
 					audioInfo.TrackInfo = trackInfo;
 					return audioInfo;
 				}
 				// 尝试从数据库获取歌曲
 				if (The163KeyHelper.TryGetTrackId(tag, out int trackId)) {
-					audioInfo.TrackInfo = new TrackInfo(audioInfo.Track, audioInfo.Album, trackId);
+					trackInfo = new TrackInfo(audioInfo.Track, audioInfo.Album, trackId);
+					lock (_database.TrackInfos)
+						_database.TrackInfos.Add(trackInfo);
+					audioInfo.TrackInfo = trackInfo;
 					return audioInfo;
 				}
 				// 尝试从163Key获取ID
@@ -145,6 +150,7 @@ private static async Task LoadAllAudioInfoCandidates(AudioInfo[] audioInfoCandid
 				else {
 					FastConsole.WriteInfo($"已获取文件\"{Path.GetFileName(candidate.Path)}\"的网易云音乐ID: {trackInfo.Id}。");
 					candidate.TrackInfo = new TrackInfo(candidate.Track, candidate.Album, trackInfo.Id);
+					_database.TrackInfos.Add(candidate.TrackInfo);
 				}
 				callback?.Invoke(candidate);
 				FastConsole.WriteNewLine();
@@ -696,7 +702,7 @@ private static Task AccelerateAllTracksAsync(AudioInfo[] audioInfos) {
 		}
 
 		private static async Task AccelerateAllLyricsAsync(AudioInfo[] audioInfos) {
-			const int STEP = 50;
+			const int STEP = 100;
 
 			int[] trackIds = audioInfos.Select(t => t.TrackInfo.Id).ToArray();
 			for (int i = 0; i < trackIds.Length; i += STEP) {