Merge pull request #11 from PercyDan54/skip-existing

存在本地歌词跳过搜索
MATRIX-feather · Sep 27, 2024 · a3730b9 · a3730b9
2 parents a6d516e + a4ed101
commit a3730b9
Show file tree

Hide file tree

Showing 18 changed files with 136 additions and 65 deletions.
diff --git a/M.Resources/Localisation/LLin/Plugins/CloudMusicStrings.zh.resx b/M.Resources/Localisation/LLin/Plugins/CloudMusicStrings.zh.resx
@@ -108,4 +108,19 @@
     <data name="offset_adjust_to_lyric" xml:space="preserve">
         <value>对其偏移至该歌词</value>
     </data>
+    <data name="search_state_fail" xml:space="preserve">
+        <value>未找到歌曲或信息不匹配</value>
+    </data>
+    <data name="search_state_searching" xml:space="preserve">
+        <value>搜索中</value>
+    </data>
+    <data name="search_state_fuzzy_searching" xml:space="preserve">
+        <value>模糊搜索中</value>
+    </data>
+    <data name="search_state_success" xml:space="preserve">
+        <value>已就绪</value>
+    </data>
+    <data name="search_by_id" xml:space="preserve">
+        <value>按网易云ID搜索歌词</value>
+    </data>
 </root>
diff --git a/M.Resources/Localisation/LLin/Plugins/StpStrings.zh.resx b/M.Resources/Localisation/LLin/Plugins/StpStrings.zh.resx
@@ -63,4 +63,13 @@
     <data name="bars_per_visual" xml:space="preserve">
         <value>频谱密度</value>
     </data>
+    <data name="type_a_settings" xml:space="preserve">
+        <value>Type A 设置</value>
+    </data>
+    <data name="type_b_settings" xml:space="preserve">
+        <value>Type B 设置</value>
+    </data>
+    <data name="spinning_cover_and_visualizer" xml:space="preserve">
+        <value>旋转唱片</value>
+    </data>
 </root>
diff --git a/M.Resources/Localisation/LLin/Plugins/YaspStrings.zh.resx b/M.Resources/Localisation/LLin/Plugins/YaspStrings.zh.resx
@@ -21,4 +21,7 @@
     <data name="use_avatar_for_coverii" xml:space="preserve">
         <value>(封面II) 使用头像作为封面</value>
     </data>
+    <data name="panel_type" xml:space="preserve">
+        <value>面板样式</value>
+    </data>
 </root>
diff --git a/M.Resources/M.Resources.csproj b/M.Resources/M.Resources.csproj
@@ -16,6 +16,6 @@
     <EmbeddedResource Include="Documents\**\*" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework" Version="2024.205.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2024.912.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game.Rulesets.IGPlayer/Feature/Player/Plugins/Bundle/CloudMusic/Helper/LyricProcessor.cs b/osu.Game.Rulesets.IGPlayer/Feature/Player/Plugins/Bundle/CloudMusic/Helper/LyricProcessor.cs
@@ -1,17 +1,18 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.IO;
 using System.Net.Http;
 using System.Text.Encodings.Web;
 using System.Threading;
 using Newtonsoft.Json;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Localisation;
 using osu.Framework.Platform;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.IGPlayer.Feature.Player.Misc;
 using osu.Game.Rulesets.IGPlayer.Feature.Player.Plugins.Bundle.CloudMusic.Misc;
+using osu.Game.Rulesets.IGPlayer.Localisation.LLin.Plugins;
 using Component = osu.Framework.Graphics.Component;
 
 namespace osu.Game.Rulesets.IGPlayer.Feature.Player.Plugins.Bundle.CloudMusic.Helper
@@ -22,16 +23,16 @@ public partial class LyricProcessor : Component
 
         public enum SearchState
         {
-            [Description("未找到歌曲或信息不匹配")]
+            [LocalisableDescription(typeof(CloudMusicStrings), nameof(CloudMusicStrings.SearchStateFail))]
             Fail,
 
-            [Description("搜索中")]
+            [LocalisableDescription(typeof(CloudMusicStrings), nameof(CloudMusicStrings.SearchStateSearching))]
             Searching,
 
-            [Description("模糊搜索中")]
+            [LocalisableDescription(typeof(CloudMusicStrings), nameof(CloudMusicStrings.SearchStateFuzzySearching))]
             FuzzySearching,
 
-            [Description("已就绪")]
+            [LocalisableDescription(typeof(CloudMusicStrings), nameof(CloudMusicStrings.SearchStateSuccess))]
             Success
         }
 
@@ -73,26 +74,15 @@ public void Search(SearchOption searchOption)
             var onFinish = searchOption.OnFinish;
             var onFail = searchOption.OnFail;
 
-            if (!searchOption.NoLocalFile)
+            if (!searchOption.NoLocalFile && searchOption.NoRetry)
             {
-                try
-                {
-                    string filePath = $"custom/lyrics/beatmap-{beatmap.BeatmapSetInfo.ID}.json";
-
-                    string content = File.ReadAllText(storage.GetFullPath(filePath, true));
-
-                    var deserializeObject = JsonConvert.DeserializeObject<APILyricResponseRoot>(content);
+                var localLyrics = GetLocalLyrics(beatmap);
 
-                    if (deserializeObject != null)
-                    {
-                        onFinish?.Invoke(deserializeObject);
-                        setState(SearchState.Success);
-                        return;
-                    }
-                }
-                catch
+                if (localLyrics != null)
                 {
-                    //忽略异常
+                    setState(SearchState.Success);
+                    onFinish?.Invoke(localLyrics);
+                    return;
                 }
             }
 
@@ -116,7 +106,7 @@ public void Search(SearchOption searchOption)
             //处理要搜索的歌名: "标题 艺术家"
             string title = beatmap.Metadata.GetTitle();
             string artist = searchOption.NoArtist ? string.Empty : $" {beatmap.Metadata.GetArtist()}";
-            string target = encoder.Encode($"{title}{artist}");
+            string target = encoder.Encode($"{title} {artist}");
 
             var req = new APISearchRequest(target);
 
@@ -147,6 +137,24 @@ public void Search(SearchOption searchOption)
             currentSearchRequest = req;
         }
 
+        public APILyricResponseRoot? GetLocalLyrics(WorkingBeatmap beatmap)
+        {
+            APILyricResponseRoot? deserializedObject = null;
+
+            try
+            {
+                string path = storage.GetFullPath(lyricFilePath(beatmap), true);
+                string content = File.ReadAllText(path);
+                deserializedObject = JsonConvert.DeserializeObject<APILyricResponseRoot>(content);
+            }
+            catch
+            {
+                //忽略异常
+            }
+
+            return deserializedObject;
+        }
+
         /// <summary>
         /// 通过给定的网易云音乐ID搜索歌曲
         /// </summary>
@@ -181,6 +189,8 @@ public void SearchByNeteaseID(long id, WorkingBeatmap beatmap, Action<APILyricRe
             onSongSearchRequestFinish(meta, null);
         }
 
+        private static string lyricFilePath(WorkingBeatmap beatmap) => $"custom/lyrics/beatmap-{beatmap.BeatmapSetInfo.ID}.json";
+
         /// <summary>
         /// 当歌曲搜索请求完成后...
         /// </summary>
@@ -260,15 +270,12 @@ private void onSongSearchRequestFinish(RequestFinishMeta meta, APISearchRequest?
         [Resolved]
         private Storage storage { get; set; } = null!;
 
-        public void WriteLrcToFile(APILyricResponseRoot? responseRoot, WorkingBeatmap working)
+        public void WriteLrcToFile(APILyricResponseRoot? responseRoot, WorkingBeatmap beatmap)
         {
             try
             {
-                string target = $"custom/lyrics/beatmap-{working.BeatmapSetInfo.ID}.json";
-
-                string serializeObject = JsonConvert.SerializeObject(responseRoot);
-
-                File.WriteAllText(storage.GetFullPath(target, true), serializeObject);
+                string serializedObject = JsonConvert.SerializeObject(responseRoot);
+                File.WriteAllText(storage.GetFullPath(lyricFilePath(beatmap), true), serializedObject);
             }
             catch (Exception e)
             {

diff --git a/...me.Rulesets.IGPlayer/Feature/Player/Plugins/Bundle/CloudMusic/Helper/RequestFinishMeta.cs b/...me.Rulesets.IGPlayer/Feature/Player/Plugins/Bundle/CloudMusic/Helper/RequestFinishMeta.cs
@@ -43,8 +43,8 @@ public struct RequestFinishMeta
         /// <returns>相似度百分比</returns>
         public float GetSimiliarPrecentage()
         {
-            string neteaseTitle = GetNeteaseTitle();
-            string ourTitle = SourceBeatmap?.Metadata.GetTitle() ?? string.Empty;
+            string neteaseTitle = GetNeteaseTitle().ToLowerInvariant();
+            string ourTitle = SourceBeatmap?.Metadata.GetTitle().ToLowerInvariant() ?? string.Empty;
 
             string source = neteaseTitle.Length > ourTitle.Length ? neteaseTitle : ourTitle;
             string target = neteaseTitle.Length > ourTitle.Length ? ourTitle : neteaseTitle;

diff --git a/osu.Game.Rulesets.IGPlayer/Feature/Player/Plugins/Bundle/CloudMusic/LyricPlugin.cs b/osu.Game.Rulesets.IGPlayer/Feature/Player/Plugins/Bundle/CloudMusic/LyricPlugin.cs
@@ -284,15 +284,24 @@ public void RefreshLyric(bool noLocalFile = false)
             Lyrics.Clear();
             currentResponseRoot = null;
             CurrentLine = null;
-
             Offset.Value = 0d;
 
-            if (UserDefinitionHelper.BeatmapMetaHaveDefinition(CurrentWorkingBeatmap.BeatmapInfo, out long neid))
-                GetLyricFor(neid);
-            else if (UserDefinitionHelper.OnlineIDHaveDefinition(CurrentWorkingBeatmap.BeatmapSetInfo.OnlineID, out neid))
-                GetLyricFor(neid);
+            var localLyrics = LyricProcessor.GetLocalLyrics(CurrentWorkingBeatmap);
+
+            if (noLocalFile || localLyrics == null)
+            {
+                if (UserDefinitionHelper.BeatmapMetaHaveDefinition(CurrentWorkingBeatmap.BeatmapInfo, out long neid))
+                    GetLyricFor(neid);
+                else if (UserDefinitionHelper.OnlineIDHaveDefinition(CurrentWorkingBeatmap.BeatmapSetInfo.OnlineID, out neid))
+                    GetLyricFor(neid);
+                else
+                    LyricProcessor.Search(SearchOption.From(CurrentWorkingBeatmap, noLocalFile, onLyricRequestFinished, onLyricRequestFail, TitleSimilarThreshold.Value));
+            }
             else
-                LyricProcessor.Search(SearchOption.From(CurrentWorkingBeatmap, noLocalFile, onLyricRequestFinished, onLyricRequestFail, TitleSimilarThreshold.Value));
+            {
+                LyricProcessor.State.Value = LyricProcessor.SearchState.Success;
+                onLyricRequestFinished(localLyrics);
+            }
         }
 
         private double targetTime => track.CurrentTime + Offset.Value;

diff --git a/...e.Rulesets.IGPlayer/Feature/Player/Plugins/Bundle/CloudMusic/Misc/APILyricResponseRoot.cs b/...e.Rulesets.IGPlayer/Feature/Player/Plugins/Bundle/CloudMusic/Misc/APILyricResponseRoot.cs
@@ -40,7 +40,7 @@ public List<Lyric> ToLyricList()
                 //可能存在一行歌词多个时间，所以先创建列表
                 List<Lyric> lyrics = new List<Lyric>();
 
-                //Logging.Log($"处理歌词: {lyricString}");
+                //Logger.Log($"处理歌词: {lyricString}");
 
                 bool propertyDetected = false;
                 string propertyName = string.Empty;
@@ -107,7 +107,7 @@ public List<Lyric> ToLyricList()
                     string propertyName = string.Empty;
                     string lyricContent = string.Empty;
 
-                    IList<int> times = new List<int>();
+                    List<int> times = [];
 
                     //Logging.Log($"处理翻译歌词: {tlyricString}");
 
@@ -155,7 +155,7 @@ public List<Lyric> ToLyricList()
                         foreach (var lrc in result.FindAll(l => l.Time == time))
                         {
                             lrc.TranslatedString = lyricContent;
-                            //Logging.Log($"设置歌词歌词: {lrc}");
+                            //Logger.Log($"设置歌词: {lrc}");
                         }
                     }
                 }

diff --git a/osu.Game.Rulesets.IGPlayer/Feature/Player/Plugins/Bundle/CloudMusic/Misc/StringExtensions.cs b/osu.Game.Rulesets.IGPlayer/Feature/Player/Plugins/Bundle/CloudMusic/Misc/StringExtensions.cs
@@ -10,8 +10,8 @@ public static class StringExtensions
         public static int ToMilliseconds(this string src)
         {
             string[] spilt = src.Contains(':')
-                ? src.Split(":")
-                : src.Split(".", 2);
+                ? src.Split(':')
+                : src.Split('.', 2);
 
             if (spilt.Length < 2)
             {

diff --git a/....Rulesets.IGPlayer/Feature/Player/Plugins/Bundle/CloudMusic/Sidebar/Graphic/LyricPiece.cs b/....Rulesets.IGPlayer/Feature/Player/Plugins/Bundle/CloudMusic/Sidebar/Graphic/LyricPiece.cs
@@ -1,5 +1,6 @@
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -36,13 +37,14 @@ public partial class LyricPiece : DrawableLyric, IHasTooltip, IHasContextMenu
             new OsuMenuItem(
                 CloudMusicStrings.AdjustOffsetToLyric.ToString(),
                 MenuItemType.Standard,
-                () => plugin.Offset.Value = Value.Time - mvisScreen.CurrentTrack.CurrentTime)
+                () => plugin.Offset.Value = Value.Time - llinScreen.CurrentTrack.CurrentTime)
         };
 
         private Box hoverBox = null!;
         private OsuSpriteText contentText = null!;
         private OsuSpriteText translateText = null!;
         private OsuSpriteText timeText = null!;
+        private readonly BindableDouble offset = new BindableDouble();
 
         public LyricPiece(Lyric lrc)
         {
@@ -58,7 +60,7 @@ public LyricPiece()
         }
 
         [Resolved]
-        private IImplementLLin mvisScreen { get; set; } = null!;
+        private IImplementLLin llinScreen { get; set; } = null!;
 
         [Resolved]
         private CustomColourProvider colourProvider { get; set; } = null!;
@@ -164,23 +166,30 @@ private void load()
             {
                 bgBox.Colour = colourProvider.Highlight1.Opacity(isCurrent ? 1 : 0);
             }, true);
+            offset.BindValueChanged(_ => Schedule(() => UpdateValue(Value)), true);
         }
 
-        private bool isCurrent_real;
+        private bool isCurrentReal;
 
         private bool isCurrent
         {
-            get => isCurrent_real;
+            get => isCurrentReal;
             set
             {
                 bgBox.FadeColour(colourProvider.Highlight1.Opacity(value ? 1 : 0), 300, Easing.OutQuint);
                 textFillFlow.FadeColour(value ? Color4.Black : Color4.White, 300, Easing.OutQuint);
                 timeText.FadeColour(value ? Color4.Black : Color4.White, 300, Easing.OutQuint);
 
-                isCurrent_real = value;
+                isCurrentReal = value;
             }
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            offset.BindTo(plugin.Offset);
+        }
+
         protected override void Update()
         {
             isCurrent = plugin.CurrentLine != null && plugin.CurrentLine.Equals(Value);
@@ -196,26 +205,26 @@ protected override void UpdateValue(Lyric lyric)
             contentText.Text = lyric.Content;
             translateText.Text = lyric.TranslatedString;
 
-            var timeSpan = TimeSpan.FromMilliseconds(lyric.Time);
+            var timeSpan = TimeSpan.FromMilliseconds(Math.Max(lyric.Time - offset.Value, 0));
             timeText.Text = $"{timeSpan:mm\\:ss\\.fff}";
             TooltipText = $"{timeText.Text}"
                           + (string.IsNullOrEmpty(lyric.Content)
-                              ? ""
+                              ? string.Empty
                               : $"－ {lyric.Content}")
                           + (string.IsNullOrEmpty(lyric.TranslatedString)
-                              ? ""
+                              ? string.Empty
                               : $"－ {lyric.TranslatedString}");
 
-            haveLyric = string.IsNullOrEmpty(lyric.Content);
+            haveLyric = !string.IsNullOrWhiteSpace(lyric.Content);
 
             Colour = haveLyric
-                ? Color4Extensions.FromHex(@"555")
-                : Color4.White;
+                ? Color4.White
+                : Color4Extensions.FromHex(@"555");
         }
 
         protected override bool OnClick(ClickEvent e)
         {
-            mvisScreen.SeekTo(Value.Time + 1);
+            llinScreen.SeekTo(Value.Time + 1 - offset.Value);
             return base.OnClick(e);
         }
 

diff --git a/...ame.Rulesets.IGPlayer/Feature/Player/Plugins/Bundle/CloudMusic/Sidebar/Graphic/Toolbox.cs b/...ame.Rulesets.IGPlayer/Feature/Player/Plugins/Bundle/CloudMusic/Sidebar/Graphic/Toolbox.cs
@@ -129,7 +129,7 @@ private void load(LyricPlugin plugin)
             {
                 this.Schedule(() =>
                 {
-                    statusText.Text = $"{v.NewValue.GetDescription()}";
+                    statusText.Text = v.NewValue.GetLocalisableDescription();
 
                     var color = Color4.White;
 
@@ -191,7 +191,7 @@ private void initToolbox()
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
                     RelativeSizeAxes = Axes.X,
-                    PlaceholderText = "按网易云ID搜索歌词"
+                    PlaceholderText = CloudMusicStrings.SearchById
                 },
                 new FillFlowContainer
                 {
@@ -243,7 +243,7 @@ private void initToolbox()
                     plugin.GetLyricFor(id);
                 else
                 {
-                    textBox.Text = "";
+                    textBox.Text = string.Empty;
                 }
             };
         }