fix: translation issue caused by mapping

2026-01-12 10:54:55 +08:00 · 2025-11-01 19:13:10 -04:00
parent 80984218ec
commit 4dd032655c
16 changed files with 130 additions and 42 deletions
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3
@@ -12,7 +12,7 @@
 	<Identity
 	  Name="37412.BetterLyrics"
 	  Publisher="CN=E1428B0E-DC1D-4EA4-ACB1-4556569D5BA9"
-	  Version="1.0.90.0" />
+	  Version="1.0.91.0" />

 	<mp:PhoneIdentity PhoneProductId="ca4a4830-fc19-40d9-b823-53e2bff3d816" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>

--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml
@@ -52,6 +52,19 @@
                                        Style="{StaticResource GhostButtonStyle}" />
                                </StackPanel>
                            </controls:SettingsCard>
+                            <controls:SettingsCard x:Uid="LyricsSearchControlAlbum" Description="{x:Bind ViewModel.MappedSongSearchQuery.OriginalAlbum, Mode=OneWay}">
+                                <StackPanel Orientation="Horizontal" Spacing="6">
+                                    <TextBlock x:Uid="LyricsSearchControlMappedAs" VerticalAlignment="Center" />
+                                    <TextBox Text="{x:Bind ViewModel.MappedSongSearchQuery.MappedAlbum, Mode=TwoWay}" TextWrapping="Wrap" />
+                                    <Button
+                                        VerticalAlignment="Center"
+                                        Command="{x:Bind ViewModel.ResetMappedAlbumCommand}"
+                                        Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                              FontSize=12,
+                                                              Glyph=&#xE777;}"
+                                        Style="{StaticResource GhostButtonStyle}" />
+                                </StackPanel>
+                            </controls:SettingsCard>
                            <controls:SettingsCard>
                                <CheckBox x:Uid="LyricsSearchControlMarkAsPureMusic" IsChecked="{x:Bind ViewModel.MappedSongSearchQuery.IsMarkedAsPureMusic, Mode=TwoWay}" />
                            </controls:SettingsCard>
@@ -78,6 +91,7 @@
                                            x:Name="SearchedTitle"
                                            RelativePanel.AlignLeftWithPanel="True"
                                            Text="{Binding Title}"
+                                            TextWrapping="Wrap"
                                            Visibility="{Binding IsFound, Converter={StaticResource BoolToVisibilityConverter}}" />
                                        <TextBlock
                                            x:Name="SearchedArtists"
@@ -85,6 +99,14 @@
                                            RelativePanel.AlignLeftWithPanel="True"
                                            RelativePanel.Below="SearchedTitle"
                                            Text="{Binding Artist}"
+                                            TextWrapping="Wrap"
+                                            Visibility="{Binding IsFound, Converter={StaticResource BoolToVisibilityConverter}}" />
+                                        <TextBlock
+                                            x:Name="SearchedAlbum"
+                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                            RelativePanel.Below="SearchedArtists"
+                                            Text="{Binding Album}"
+                                            TextWrapping="Wrap"
                                            Visibility="{Binding IsFound, Converter={StaticResource BoolToVisibilityConverter}}" />
                                        <TextBlock
                                            x:Name="SearchedProvider"
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FileHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FileHelper.cs
@@ -37,9 +37,9 @@ namespace BetterLyrics.WinUI3.Helper
            return sb.ToString();
        }

-        public static string? ReadLyricsCache(string title, string artist, LyricsFormat format, string cacheFolderPath)
+        public static string? ReadLyricsCache(string title, string artist, string album, LyricsFormat format, string cacheFolderPath)
        {
-            var cacheFilePath = Path.Combine(cacheFolderPath, SanitizeFileName($"{artist} - {title}{format.ToFileExtension()}"));
+            var cacheFilePath = Path.Combine(cacheFolderPath, SanitizeFileName($"{artist} - {title} - {album}{format.ToFileExtension()}"));
            if (File.Exists(cacheFilePath))
            {
                return File.ReadAllText(cacheFilePath);
@@ -57,9 +57,9 @@ namespace BetterLyrics.WinUI3.Helper
            return null;
        }

-        public static void WriteLyricsCache(string title, string artist, string lyrics, LyricsFormat format, string cacheFolderPath)
+        public static void WriteLyricsCache(string title, string artist, string album, string lyrics, LyricsFormat format, string cacheFolderPath)
        {
-            var cacheFilePath = Path.Combine(cacheFolderPath, SanitizeFileName($"{artist} - {title}{format.ToFileExtension()}"));
+            var cacheFilePath = Path.Combine(cacheFolderPath, SanitizeFileName($"{artist} - {title} - {album}{format.ToFileExtension()}"));
            File.WriteAllText(cacheFilePath, lyrics);
        }

--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LyricsParser.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LyricsParser.cs
@@ -11,6 +11,7 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Xml.Linq;
+using Vanara.PInvoke;
 using LyricsData = BetterLyrics.WinUI3.Models.LyricsData;

 namespace BetterLyrics.WinUI3.Helper
@@ -19,10 +20,23 @@ namespace BetterLyrics.WinUI3.Helper
    {
        public List<LyricsData> LyricsDataArr { get; private set; } = [];

-        public LyricsData? LibreTranslationLyricsData => LyricsDataArr.LastOrDefault();
-
-        public void Parse(string title, string artist, string? raw, int? durationMs, LyricsSearchProvider? lyricsSearchProvider)
+        public void Parse(List<MappedSongSearchQuery> mappedSongSearchQueries, string title, string artist, string album, string? raw, int? durationMs, LyricsSearchProvider? lyricsSearchProvider)
        {
+            var overridenTitle = title;
+            var overridenArtist = artist;
+            var overridenAlbum = album;
+
+            var found = mappedSongSearchQueries
+                .Where(x => x.OriginalTitle == overridenTitle && x.OriginalArtist == overridenArtist && x.OriginalAlbum == overridenAlbum)
+                .FirstOrDefault();
+
+            if (found != null)
+            {
+                overridenTitle = found.MappedTitle;
+                overridenArtist = found.MappedArtist;
+                overridenAlbum = found.MappedAlbum;
+            }
+
            LyricsDataArr = [];
            durationMs ??= (int)TimeSpan.FromMinutes(99).TotalMilliseconds;
            if (raw == null)
@@ -51,22 +65,22 @@ namespace BetterLyrics.WinUI3.Helper
                }
            }
            FillRomanizationLyricsData();
-            FillTranslationFromCache(title, artist, lyricsSearchProvider);
+            FillTranslationFromCache(overridenTitle, overridenArtist, overridenAlbum, lyricsSearchProvider);
        }

-        private void FillTranslationFromCache(string title, string artist, LyricsSearchProvider? provider)
+        private void FillTranslationFromCache(string title, string artist, string album, LyricsSearchProvider? provider)
        {
            string? translationRaw = null;
            switch (provider)
            {
                case LyricsSearchProvider.QQ:
-                    translationRaw = FileHelper.ReadLyricsCache(title, artist, LyricsFormat.Lrc, PathHelper.QQTranslationCacheDirectory);
+                    translationRaw = FileHelper.ReadLyricsCache(title, artist, album, LyricsFormat.Lrc, PathHelper.QQTranslationCacheDirectory);
                    break;
                case LyricsSearchProvider.Kugou:
-                    translationRaw = FileHelper.ReadLyricsCache(title, artist, LyricsFormat.Lrc, PathHelper.KugouTranslationCacheDirectory);
+                    translationRaw = FileHelper.ReadLyricsCache(title, artist, album, LyricsFormat.Lrc, PathHelper.KugouTranslationCacheDirectory);
                    break;
                case LyricsSearchProvider.Netease:
-                    translationRaw = FileHelper.ReadLyricsCache(title, artist, LyricsFormat.Lrc, PathHelper.NeteaseTranslationCacheDirectory);
+                    translationRaw = FileHelper.ReadLyricsCache(title, artist, album, LyricsFormat.Lrc, PathHelper.NeteaseTranslationCacheDirectory);
                    break;
                case LyricsSearchProvider.LrcLib:
                    break;
@@ -99,7 +113,7 @@ namespace BetterLyrics.WinUI3.Helper
            }
        }

-        private async Task FillRomanizationLyricsData()
+        private void FillRomanizationLyricsData()
        {
            var chinese = LyricsDataArr.Where(x => x.LanguageCode == "zh").FirstOrDefault();
            if (chinese != null)
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsSearchResult.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsSearchResult.cs
@@ -16,5 +16,6 @@ namespace BetterLyrics.WinUI3.Models

        public string? Title { get; set; }
        public string? Artist { get; set; }
+        public string? Album { get; set; }
    }
 }
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MappedSongSearchQuery.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MappedSongSearchQuery.cs
@@ -12,9 +12,11 @@ namespace BetterLyrics.WinUI3.Models
    {
        [ObservableProperty][NotifyPropertyChangedRecipients] public partial string OriginalTitle { get; set; } = string.Empty;
        [ObservableProperty][NotifyPropertyChangedRecipients] public partial string OriginalArtist { get; set; } = string.Empty;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial string OriginalAlbum { get; set; } = string.Empty;

        [ObservableProperty][NotifyPropertyChangedRecipients] public partial string MappedTitle { get; set; } = string.Empty;
        [ObservableProperty][NotifyPropertyChangedRecipients] public partial string MappedArtist { get; set; } = string.Empty;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial string MappedAlbum { get; set; } = string.Empty;

        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsMarkedAsPureMusic { get; set; } = false;

@@ -26,8 +28,10 @@ namespace BetterLyrics.WinUI3.Models
            {
                OriginalTitle = this.OriginalTitle,
                OriginalArtist = this.OriginalArtist,
+                OriginalAlbum = this.OriginalAlbum,
                MappedTitle = this.MappedTitle,
                MappedArtist = this.MappedArtist,
+                MappedAlbum = this.MappedAlbum,
                IsMarkedAsPureMusic = this.IsMarkedAsPureMusic,
                LyricsSearchProvider = this.LyricsSearchProvider
            };
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/SongInfo.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/SongInfo.cs
@@ -9,7 +9,7 @@ namespace BetterLyrics.WinUI3.Models
    public partial class SongInfo : ObservableObject
    {
        [ObservableProperty]
-        public partial string? Album { get; set; }
+        public partial string Album { get; set; }

        [ObservableProperty]
        public partial string Artist { get; set; }
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService/LyricsSearchService.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService/LyricsSearchService.cs
@@ -98,17 +98,19 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService

            string overridenTitle = title;
            string overridenArtist = artist;
+            string overridenAlbum = album;

            _logger.LogInformation("Searching img for: {Title} - {Artist} (Album: {Album}, Duration: {DurationMs}ms)", title, artist, album, durationMs);

            var found = _settingsService.AppSettings.MappedSongSearchQueries
-                .Where(x => x.OriginalTitle == title && x.OriginalArtist == artist)
+                .Where(x => x.OriginalTitle == overridenTitle && x.OriginalArtist == overridenArtist && x.OriginalAlbum == overridenAlbum)
                .FirstOrDefault();

            if (found != null)
            {
                overridenTitle = found.MappedTitle;
                overridenArtist = found.MappedArtist;
+                overridenAlbum = found.MappedAlbum;

                _logger.LogInformation("Found mapped song search query: {MappedSongSearchQuery}", found);

@@ -117,6 +119,7 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
                {
                    lyricsSearchResult.Title = overridenTitle;
                    lyricsSearchResult.Artist = overridenArtist;
+                    lyricsSearchResult.Album = overridenAlbum;
                    lyricsSearchResult.Raw = "[99:00.000]🎶🎶🎶";
                    return lyricsSearchResult;
                }
@@ -124,7 +127,7 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
                var targetProvider = found.LyricsSearchProvider;
                if (targetProvider != null)
                {
-                    return await SearchSingleAsync(targetProvider.Value, overridenTitle, overridenArtist, album, durationMs, songId, token);
+                    return await SearchSingleAsync(targetProvider.Value, overridenTitle, overridenArtist, overridenAlbum, durationMs, songId, token);
                }
            }

@@ -135,7 +138,7 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
                    continue;
                }

-                lyricsSearchResult = await SearchSingleAsync(provider.Provider, overridenTitle, overridenArtist, album, durationMs, null, token);
+                lyricsSearchResult = await SearchSingleAsync(provider.Provider, overridenTitle, overridenArtist, overridenAlbum, durationMs, null, token);

                if (lyricsSearchResult.IsFound)
                {
@@ -172,12 +175,13 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
                // Check cache first
                if (provider.IsRemote())
                {
-                    var cachedLyrics = FileHelper.ReadLyricsCache(title, artist, lyricsFormat, provider.GetCacheDirectory());
+                    var cachedLyrics = FileHelper.ReadLyricsCache(title, artist, album, lyricsFormat, provider.GetCacheDirectory());
                    if (!string.IsNullOrWhiteSpace(cachedLyrics))
                    {
                        lyricsSearchResult.Raw = cachedLyrics;
                        lyricsSearchResult.Title = title;
                        lyricsSearchResult.Artist = artist;
+                        lyricsSearchResult.Album = album;
                        return lyricsSearchResult;
                    }
                }
@@ -186,11 +190,11 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
                {
                    if (provider == LyricsSearchProvider.LocalMusicFile)
                    {
-                        lyricsSearchResult = SearchEmbedded(title, artist);
+                        lyricsSearchResult = SearchEmbedded(title, artist, album);
                    }
                    else
                    {
-                        lyricsSearchResult = await SearchFile(title, artist, lyricsFormat);
+                        lyricsSearchResult = await SearchFile(title, artist, album, lyricsFormat);
                    }
                }
                else
@@ -210,7 +214,7 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
                            lyricsSearchResult = await SearchQQNeteaseKugouAsync(title, artist, album, (int)durationMs, songId, Searchers.Netease);
                            break;
                        case LyricsSearchProvider.AmllTtmlDb:
-                            lyricsSearchResult = await SearchAmllTtmlDbAsync(title, artist);
+                            lyricsSearchResult = await SearchAmllTtmlDbAsync(title, artist, album);
                            break;
                        case LyricsSearchProvider.AppleMusic:
                            lyricsSearchResult = await SearchAppleMusicAsync(title, artist, album, (int)durationMs);
@@ -229,7 +233,7 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
                {
                    if (provider.IsRemote())
                    {
-                        FileHelper.WriteLyricsCache(title, artist, lyricsSearchResult.Raw!, lyricsFormat, provider.GetCacheDirectory());
+                        FileHelper.WriteLyricsCache(title, artist, album, lyricsSearchResult.Raw!, lyricsFormat, provider.GetCacheDirectory());
                    }
                }
            }
@@ -240,7 +244,7 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
            return lyricsSearchResult;
        }

-        private async Task<LyricsSearchResult> SearchFile(string title, string artist, LyricsFormat format)
+        private async Task<LyricsSearchResult> SearchFile(string title, string artist, string album, LyricsFormat format)
        {
            var lyricsSearchResult = new LyricsSearchResult
            {
@@ -263,6 +267,9 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
                                    lyricsSearchResult.Raw = raw;
                                    lyricsSearchResult.Title = title;
                                    lyricsSearchResult.Artist = artist;
+                                    lyricsSearchResult.Album = album;
+
+                                    return lyricsSearchResult;
                                }
                            }
                        }
@@ -275,7 +282,7 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
            return lyricsSearchResult;
        }

-        private LyricsSearchResult SearchEmbedded(string title, string artist)
+        private LyricsSearchResult SearchEmbedded(string title, string artist, string album)
        {
            var lyricsSearchResult = new LyricsSearchResult
            {
@@ -291,14 +298,19 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
                        if (FileHelper.MusicExtensions.Contains(Path.GetExtension(file)))
                        {
                            var track = new Track(file);
-                            if ((track.Title == title && track.Artist == artist) || FileHelper.IsSwitchableNormalizedMatch(Path.GetFileNameWithoutExtension(file), title, artist))
+                            if ((album != "" && track.Title == title && track.Artist == artist && track.Album == album)
+                                || (album == "" && track.Title == title && track.Artist == artist)
+                                || (album == "" && FileHelper.IsSwitchableNormalizedMatch(Path.GetFileNameWithoutExtension(file), title, artist)))
                            {
                                var plain = TagLib.File.Create(file).Tag.Lyrics;
                                if (!plain.IsNullOrEmpty())
                                {
                                    lyricsSearchResult.Raw = plain;
                                    lyricsSearchResult.Title = track.Title;
-                                    lyricsSearchResult.Artist = artist;
+                                    lyricsSearchResult.Artist = track.Artist;
+                                    lyricsSearchResult.Album = track.Album;
+
+                                    return lyricsSearchResult;
                                }
                            }
                        }
@@ -308,7 +320,7 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
            return lyricsSearchResult;
        }

-        private async Task<LyricsSearchResult> SearchAmllTtmlDbAsync(string title, string artist)
+        private async Task<LyricsSearchResult> SearchAmllTtmlDbAsync(string title, string artist, string album)
        {
            var lyricsSearchResult = new LyricsSearchResult
            {
@@ -382,6 +394,7 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
                lyricsSearchResult.Raw = lyrics;
                lyricsSearchResult.Title = title;
                lyricsSearchResult.Artist = artist;
+                lyricsSearchResult.Album = album;
            }
            catch
            {
@@ -421,6 +434,7 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
            string? original = null;
            string? searchedTitle = null;
            string? searchedArtist = null;
+            string? searchedAlbum = null;

            if (jArr.ValueKind == JsonValueKind.Array && jArr.GetArrayLength() > 0)
            {
@@ -428,11 +442,13 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
                original = first.GetProperty("syncedLyrics").GetString();
                searchedTitle = first.GetProperty("trackName").GetString();
                searchedArtist = first.GetProperty("artistName").GetString();
+                searchedAlbum = first.GetProperty("albumName").GetString();
            }

            lyricsSearchResult.Raw = original;
            lyricsSearchResult.Title = searchedTitle;
            lyricsSearchResult.Artist = searchedArtist;
+            lyricsSearchResult.Album = searchedAlbum;

            return lyricsSearchResult;
        }
@@ -485,6 +501,7 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
                    FileHelper.WriteLyricsCache(
                        title,
                        artist,
+                        album,
                        translated,
                        LyricsFormat.Lrc,
                        PathHelper.QQTranslationCacheDirectory
@@ -492,8 +509,6 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
                }

                lyricsSearchResult.Raw = original;
-                lyricsSearchResult.Title = qqResult.Title;
-                lyricsSearchResult.Artist = qqResult.Artists.Join(" | ");
            }
            else if (result is NeteaseSearchResult neteaseResult)
            {
@@ -505,6 +520,7 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
                    FileHelper.WriteLyricsCache(
                        title,
                        artist,
+                        album,
                        translated,
                        LyricsFormat.Lrc,
                        PathHelper.NeteaseTranslationCacheDirectory
@@ -512,8 +528,6 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
                }

                lyricsSearchResult.Raw = original;
-                lyricsSearchResult.Title = neteaseResult.Title;
-                lyricsSearchResult.Artist = neteaseResult.Artists.Join(" | ");
            }
            else if (result is KugouSearchResult kugouResult)
            {
@@ -544,6 +558,7 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
                                FileHelper.WriteLyricsCache(
                                    title,
                                    artist,
+                                    album,
                                    translated,
                                    LyricsFormat.Lrc,
                                    PathHelper.KugouTranslationCacheDirectory
@@ -554,10 +569,12 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
                }

                lyricsSearchResult.Raw = original;
-                lyricsSearchResult.Title = kugouResult.Title;
-                lyricsSearchResult.Artist = kugouResult.Artists.Join(" | ");
            }

+            lyricsSearchResult.Title = result?.Title;
+            lyricsSearchResult.Artist = result?.Artists.Join(" | ");
+            lyricsSearchResult.Album = result?.Album;
+
            return lyricsSearchResult;
        }

@@ -575,6 +592,7 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
                lyricsSearchResult.Raw = raw;
                lyricsSearchResult.Title = title;
                lyricsSearchResult.Artist = artist;
+                lyricsSearchResult.Album = "";
            }

            return lyricsSearchResult;
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.AlbumArtUpdater.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.AlbumArtUpdater.cs
@@ -37,7 +37,7 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
                SongInfo?.PlayerId ?? "",
                _cachedSongInfo.Title,
                _cachedSongInfo.Artist,
-                _cachedSongInfo?.Album ?? string.Empty,
+                _cachedSongInfo.Album,
                _SMTCAlbumArtBuffer,
                token
            ), token);
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.LyricsUpdater.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.LyricsUpdater.cs
@@ -166,7 +166,7 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
                    SongInfo.PlayerId ?? "",
                    SongInfo.Title,
                    SongInfo.Artist,
-                    SongInfo.Album ?? "",
+                    SongInfo.Album,
                    SongInfo.DurationMs ?? 0,
                    SongInfo.SongId,
                    token
@@ -177,7 +177,9 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
                _logger.LogInformation("Lyrics was found? {Found}, Provider: {LyricsSearchProvider}", lyricsSearchResult?.IsFound, LyricsSearchProvider?.ToString() ?? "null");

                var lyricsParser = new LyricsParser();
-                lyricsParser.Parse(SongInfo.Title, SongInfo.Artist, lyricsSearchResult?.Raw, (int?)SongInfo?.DurationMs, LyricsSearchProvider);
+                lyricsParser.Parse(
+                    _settingsService.AppSettings.MappedSongSearchQueries.ToList(),
+                    SongInfo.Title, SongInfo.Artist, SongInfo.Album, lyricsSearchResult?.Raw, (int?)SongInfo?.DurationMs, LyricsSearchProvider);
                _lyricsDataArr = lyricsParser.LyricsDataArr;
                ApplyChinesePreference();
            }
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw
@@ -249,6 +249,9 @@
  <data name="LyricsPageTranslationProviderPrefix.Header" xml:space="preserve">
    <value>Translation provider</value>
  </data>
+  <data name="LyricsSearchControlAlbum.Header" xml:space="preserve">
+    <value>Album</value>
+  </data>
  <data name="LyricsSearchControlArtist.Header" xml:space="preserve">
    <value>Artist</value>
  </data>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw
@@ -249,6 +249,9 @@
  <data name="LyricsPageTranslationProviderPrefix.Header" xml:space="preserve">
    <value>翻訳プロバイダー</value>
  </data>
+  <data name="LyricsSearchControlAlbum.Header" xml:space="preserve">
+    <value>アルバム</value>
+  </data>
  <data name="LyricsSearchControlArtist.Header" xml:space="preserve">
    <value>アーティスト</value>
  </data>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw
@@ -249,6 +249,9 @@
  <data name="LyricsPageTranslationProviderPrefix.Header" xml:space="preserve">
    <value>번역 제공자</value>
  </data>
+  <data name="LyricsSearchControlAlbum.Header" xml:space="preserve">
+    <value>앨범</value>
+  </data>
  <data name="LyricsSearchControlArtist.Header" xml:space="preserve">
    <value>아티스트</value>
  </data>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw
@@ -249,6 +249,9 @@
  <data name="LyricsPageTranslationProviderPrefix.Header" xml:space="preserve">
    <value>翻译来源</value>
  </data>
+  <data name="LyricsSearchControlAlbum.Header" xml:space="preserve">
+    <value>专辑</value>
+  </data>
  <data name="LyricsSearchControlArtist.Header" xml:space="preserve">
    <value>艺术家</value>
  </data>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw
@@ -249,6 +249,9 @@
  <data name="LyricsPageTranslationProviderPrefix.Header" xml:space="preserve">
    <value>翻譯來源</value>
  </data>
+  <data name="LyricsSearchControlAlbum.Header" xml:space="preserve">
+    <value>專輯</value>
+  </data>
  <data name="LyricsSearchControlArtist.Header" xml:space="preserve">
    <value>藝術家</value>
  </data>
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsSearchControlViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/LyricsSearchControlViewModel.cs
@@ -78,8 +78,10 @@ namespace BetterLyrics.WinUI3.ViewModels
                    {
                        OriginalTitle = _mediaSessionsService.SongInfo.Title,
                        OriginalArtist = _mediaSessionsService.SongInfo.Artist,
+                        OriginalAlbum = _mediaSessionsService.SongInfo.Album,
                        MappedTitle = _mediaSessionsService.SongInfo.Title,
                        MappedArtist = _mediaSessionsService.SongInfo.Artist,
+                        MappedAlbum = _mediaSessionsService.SongInfo.Album,
                    };
                }
                else
@@ -95,9 +97,11 @@ namespace BetterLyrics.WinUI3.ViewModels
            {
                return null;
            }
+
            var found = AppSettings.MappedSongSearchQueries
-                .Where(x => x.OriginalTitle == _mediaSessionsService.SongInfo.Title && x.OriginalArtist == _mediaSessionsService.SongInfo.Artist).FirstOrDefault();
-            return found;
+                .Where(x => x.OriginalTitle == _mediaSessionsService.SongInfo.Title && x.OriginalArtist == _mediaSessionsService.SongInfo.Artist && x.OriginalAlbum == _mediaSessionsService.SongInfo.Album);
+
+            return found.FirstOrDefault();
        }

        [RelayCommand]
@@ -118,7 +122,7 @@ namespace BetterLyrics.WinUI3.ViewModels
                    return await _lyricsSearchService.SearchAllAsync(
                        MappedSongSearchQuery.MappedTitle,
                        MappedSongSearchQuery.MappedArtist,
-                        _mediaSessionsService.SongInfo?.Album ?? "",
+                        MappedSongSearchQuery.MappedAlbum,
                        _mediaSessionsService.SongInfo?.DurationMs ?? 0, token);
                }, token)];
                IsSearching = false;
@@ -166,6 +170,12 @@ namespace BetterLyrics.WinUI3.ViewModels
            MappedSongSearchQuery?.MappedArtist = MappedSongSearchQuery?.OriginalArtist ?? string.Empty;
        }

+        [RelayCommand]
+        private void ResetMappedAlbum()
+        {
+            MappedSongSearchQuery?.MappedAlbum = MappedSongSearchQuery?.OriginalAlbum ?? string.Empty;
+        }
+
        partial void OnSelectedLyricsSearchResultChanged(LyricsSearchResult? value)
        {
            MappedSongSearchQuery?.LyricsSearchProvider = value?.Provider;
@@ -173,8 +183,10 @@ namespace BetterLyrics.WinUI3.ViewModels
            {
                var lyricsParser = new LyricsParser();
                lyricsParser.Parse(
-                    MappedSongSearchQuery?.MappedTitle ?? "",
-                    MappedSongSearchQuery?.MappedArtist ?? "",
+                    AppSettings.MappedSongSearchQueries.ToList(),
+                    MappedSongSearchQuery?.OriginalTitle ?? "",
+                    MappedSongSearchQuery?.OriginalArtist ?? "",
+                    MappedSongSearchQuery?.OriginalAlbum ?? "",
                    value?.Raw, (int?)_mediaSessionsService.SongInfo?.DurationMs, value?.Provider);
                LyricsDataArr = [.. lyricsParser.LyricsDataArr];
            }