修复字符串对比错误

wwh1004 · Aug 24, 2019 · 5908b8f · 5908b8f
1 parent 79957a8
commit 5908b8f
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 23 deletions.
diff --git a/NLyric/Audio/Album.cs b/NLyric/Audio/Album.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 
 namespace NLyric.Audio {
 	public class Album : ITrackOrAlbum {
@@ -22,7 +23,7 @@ public Album(string name, string[] artists, int? trackCount, int? year) {
 				throw new ArgumentNullException(nameof(artists));
 
 			_name = name;
-			_artists = artists;
+			_artists = artists.Select(t => t.Trim()).ToArray();
 			_trackCount = trackCount;
 			_year = year;
 		}

diff --git a/NLyric/Audio/Track.cs b/NLyric/Audio/Track.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Collections.Generic;
+using System.Linq;
 
 namespace NLyric.Audio {
 	public class Track : ITrackOrAlbum {
@@ -17,7 +17,7 @@ public Track(string name, string[] artists) {
 				throw new ArgumentNullException(nameof(artists));
 
 			_name = name;
-			_artists = artists;
+			_artists = artists.Select(t => t.Trim()).ToArray();
 		}
 
 		public Track(ATL.Track track) {
@@ -26,24 +26,11 @@ public Track(ATL.Track track) {
 
 			_name = track.Title.GetSafeString();
 			_artists = track.Artist.GetSafeString().SplitEx();
-			Array.Sort(_artists, StringComparer.Instance);
+			Array.Sort(_artists, StringHelper.OrdinalComparer);
 		}
 
 		public override string ToString() {
 			return "Name:" + _name + " | Artists:" + string.Join(",", _artists);
 		}
-
-		private sealed class StringComparer : IComparer<string> {
-			private static readonly StringComparer _instance = new StringComparer();
-
-			public static StringComparer Instance => _instance;
-
-			private StringComparer() {
-			}
-
-			public int Compare(string x, string y) {
-				return string.CompareOrdinal(x, y);
-			}
-		}
 	}
 }
diff --git a/NLyric/NLyric.csproj b/NLyric/NLyric.csproj
@@ -4,8 +4,8 @@
     <Title>NLyric</Title>
     <Product>NLyric</Product>
     <Copyright>Copyright © 2019 Wwh</Copyright>
-    <AssemblyVersion>2.2.5.0</AssemblyVersion>
-    <FileVersion>2.2.5.0</FileVersion>
+    <AssemblyVersion>2.2.5.1</AssemblyVersion>
+    <FileVersion>2.2.5.1</FileVersion>
     <OutputPath>..\bin\$(Configuration)</OutputPath>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>netcoreapp2.1;net472</TargetFrameworks>

diff --git a/NLyric/NLyricImpl.cs b/NLyric/NLyricImpl.cs
@@ -361,24 +361,35 @@ private static async Task<NcmAlbum> MapToAsync(Album album, bool withArtists) {
 		private static void LoadLocalCaches() {
 			if (File.Exists(_allCachesPath)) {
 				_allCaches = JsonConvert.DeserializeObject<AllCaches>(File.ReadAllText(_allCachesPath));
+				NormalizeAllCaches();
 				Logger.Instance.LogInfo($"搜索缓存\"{_allCachesPath}\"加载成功。");
 			}
-			else
+			else {
 				_allCaches = new AllCaches() {
 					AlbumCaches = new List<AlbumCache>(),
 					LyricCaches = new List<LyricCache>(),
 					TrackCaches = new List<TrackCache>()
 				};
+			}
 		}
 
 		private static void SaveLocalCaches() {
-			_allCaches.AlbumCaches.Sort((x, y) => x.Name.CompareTo(y.Name));
-			_allCaches.TrackCaches.Sort((x, y) => x.Name.CompareTo(y.Name));
-			_allCaches.LyricCaches.Sort((x, y) => x.Id.CompareTo(y.Id));
+			NormalizeAllCaches();
 			SaveLocalCachesCore(_allCachesPath);
 			Logger.Instance.LogInfo($"搜索缓存\"{_allCachesPath}\"已被保存。");
 		}
 
+		private static void NormalizeAllCaches() {
+			_allCaches.AlbumCaches.Sort((x, y) => string.CompareOrdinal(x.Name, y.Name));
+			_allCaches.TrackCaches.Sort((x, y) => string.CompareOrdinal(x.Name, y.Name));
+			_allCaches.LyricCaches.Sort((x, y) => x.Id.CompareTo(y.Id));
+			foreach (TrackCache cache in _allCaches.TrackCaches) {
+				for (int i = 0; i < cache.Artists.Length; i++)
+					cache.Artists[i] = cache.Artists[i].Trim();
+				Array.Sort(cache.Artists, StringHelper.OrdinalComparer);
+			}
+		}
+
 		private static void SaveLocalCachesCore(string cachePath) {
 			File.WriteAllText(cachePath, FormatJson(JsonConvert.SerializeObject(_allCaches)));
 		}

diff --git a/NLyric/StringHelper.cs b/NLyric/StringHelper.cs
@@ -10,6 +10,11 @@ internal static class StringHelper {
 		private static readonly FuzzySettings _fuzzySettings = AllSettings.Default.Fuzzy;
 		private static readonly MatchSettings _matchSettings = AllSettings.Default.Match;
 
+		/// <summary>
+		/// 二进制比较器
+		/// </summary>
+		public static IComparer<string> OrdinalComparer => StringOrdinalComparer.Instance;
+
 		/// <summary>
 		/// 获取非空字符串，并且清楚首尾空格
 		/// </summary>
@@ -123,5 +128,18 @@ public static string ToHalfWidth(this string value) {
 			}
 			return new string(chars);
 		}
+
+		private sealed class StringOrdinalComparer : IComparer<string> {
+			private static readonly StringOrdinalComparer _instance = new StringOrdinalComparer();
+
+			public static StringOrdinalComparer Instance => _instance;
+
+			private StringOrdinalComparer() {
+			}
+
+			public int Compare(string x, string y) {
+				return string.CompareOrdinal(x, y);
+			}
+		}
 	}
 }