Support query lyrics by each search results

Author: MikiraSora

SourcePrivoder/Base/SourceProviderBase.cs

@@ -30,10 +30,6 @@ public override Lyrics ProvideLyric(string artist, string title, int time, bool
 
                 var lyrics= PickLyric(artist, title, time, search_result,request_trans_lyrics, out SEARCHRESULT picked_result);
 
-                //过滤没有实质歌词内容的玩意,比如没有时间轴的歌词文本
-                if (lyrics?.LyricSentencs?.Count==0)
-                    return null;
-
                 if (lyrics!=null&& Setting.EnableOutputSearchResult)
                 {
                     //output lyrics search result
@@ -68,23 +64,36 @@ public virtual Lyrics PickLyric(string artist, string title, int time, List<SEAR
 
             if (search_result.Count == 0)
                 return null;
+            
+            Lyrics lyric_cont = null;
+            SEARCHRESULT cur_result=null;
 
-            var result = search_result.First();
-
-            Utils.Debug($"* Picked music_id:{result.ID} artist:{result.Artist} title:{result.Title}");
+            foreach (var result in search_result)
+            {
+                var content = Downloader.DownloadLyric(result, request_trans_lyrics);
+                cur_result = result;
 
-            var lyric_cont = Downloader.DownloadLyric(result, request_trans_lyrics);
+                if (string.IsNullOrWhiteSpace(content))
+                    continue;
 
-            if (string.IsNullOrWhiteSpace(lyric_cont))
-                return null;
+                lyric_cont = Parser.Parse(content);
 
-            picked_result = result;
+                //过滤没有实质歌词内容的玩意,比如没有时间轴的歌词文本
+                if (lyric_cont?.LyricSentencs?.Count == 0)
+                    continue;
+                
+                Utils.Debug($"* Picked music_id:{result.ID} artist:{result.Artist} title:{result.Title}");
+                break;
+            }
 
-            var lyrics = Parser.Parse(lyric_cont);
+            if (lyric_cont==null)
+                return null;
 
-            WrapInfo(lyrics);
+            picked_result = cur_result;
+            
+            WrapInfo(lyric_cont);
 
-            return lyrics;
+            return lyric_cont;
 
             #region Wrap Methods
 
@@ -100,9 +109,9 @@ void WrapInfo(Lyrics l)
                     Title = title
                 }, query_info = new Info()
                 {
-                    Artist = result.Artist,
-                    Title=result.Title,
-                    ID=result.ID
+                    Artist = cur_result.Artist,
+                    Title= cur_result.Title,
+                    ID= cur_result.ID
                 };
 
                 l.RawInfo = raw_info;

SourcePrivoder/QQMusic/QQMusicSearch.cs

@@ -23,7 +23,7 @@ public class Song:SearchSongResultBase
 
         public override string Title { get => title; }
         public string title { get; set; }
-        public int id { get; set; }
+        //public int id { get; set; }
         public string mid { get; set; }
         public override string ID { get => /*id.ToString();*/mid; }
 
@@ -38,7 +38,7 @@ public class Song:SearchSongResultBase
 
         public override string ToString()
         {
-            return $"({id}){Artist} - {title} ({interval / 60}:{interval % 60})";
+            return $"({ID}){Artist} - {title} ({interval / 60}:{interval % 60})";
         }
     }