feat(provider): 支持酷我&酷狗组合关键字进行搜索

2025-01-08 12:08:06 +08:00 · 2021-11-04 00:12:56 +08:00 · 2021-11-04 00:12:56 +08:00 · 65179e6f42
commit 65179e6f42
parent 6d44782760
3 changed files with 167 additions and 108 deletions
--- a/provider/kugou/kugou.go
+++ b/provider/kugou/kugou.go
@ -1,13 +1,15 @@
-package kuwo
+package kugou

 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"github.com/cnsilvan/UnblockNeteaseMusic/provider/base"
 	"log"
 	"net/http"
 	"strconv"
 	"strings"
+	"sync"

 	"github.com/cnsilvan/UnblockNeteaseMusic/common"
 	"github.com/cnsilvan/UnblockNeteaseMusic/network"
@ -16,70 +18,77 @@ import (

 const (
 	APIGetSongURL = "http://trackercdn.kugou.com/i/v2/?"
+	SearchSongURL = "http://mobilecdn.kugou.com/api/v3/search/song?keyword=%s&page=1&pagesize=10"
 )

 type KuGou struct{}

+var lock sync.Mutex
+
 func (m *KuGou) SearchSong(song common.SearchSong) (songs []*common.Song) {
 	song = base.PreSearchSong(song)
 	cookies := getCookies()
-	result, err := base.Fetch(
-		"http://mobilecdn.kugou.com/api/v3/search/song?keyword="+song.Keyword+"&page=1&pagesize=10",
-		cookies, nil, true)
-	if err != nil {
-		log.Println(err)
-		return songs
-	}
-	data := result["data"]
-	if data != nil {
-		if dMap, ok := data.(common.MapType); ok {
-			if lists, ok := dMap["info"]; ok {
-				if listSlice, ok := lists.(common.SliceType); ok {
-					listLength := len(listSlice)
-					if listLength > 0 {
-						maxIndex := listLength/2 + 1
-						if maxIndex > 10 {
-							maxIndex = 10
+	keyWordList := utils.Combination(strings.Split(song.ArtistsName, " "))
+	wg := sync.WaitGroup{}
+	for _, v := range keyWordList {
+		wg.Add(1)
+		// use goroutine to deal multiple request
+		go func(word string) {
+			defer wg.Done()
+			keyWord := song.Name
+			if len(word) != 0 {
+				keyWord = fmt.Sprintf("%s %s", song.Name, word)
+			}
+			searchUrl := fmt.Sprintf(SearchSongURL, keyWord)
+			result, err := base.Fetch(searchUrl, cookies, nil, true)
+			if err != nil {
+				log.Println(err)
+				return
+			}
+			if listSlice, ok := transSearchResponse(result); ok {
+				listLength := len(listSlice)
+				if listLength > 0 {
+					maxIndex := listLength/2 + 1
+					if maxIndex > 5 {
+						maxIndex = 5
+					}
+					for index, matched := range listSlice {
+						if index >= maxIndex {
+							break
 						}
-						for index, matched := range listSlice {
-							if index >= maxIndex {
-								break
-							}
-							if kugouSong, ok := matched.(common.MapType); ok {
-								if _, ok := kugouSong["hash"].(string); ok {
-									songResult := &common.Song{}
-									singerName, _ := kugouSong["singername"].(string)
-									songName, _ := kugouSong["songname"].(string)
-									songResult.PlatformUniqueKey = kugouSong
-									songResult.PlatformUniqueKey["UnKeyWord"] = song.Keyword
-									songResult.Source = "kugou"
-									songResult.Name = songName
-									songResult.Artist = singerName
-									songResult.Artist = strings.ReplaceAll(singerName, " ", "")
-									songResult.AlbumName, _ = kugouSong["album_name"].(string)
-									audioId, ok := kugouSong["audio_id"].(json.Number)
-									songResult.Id = audioId.String()
-									if ok && len(songResult.Id) > 0 {
-										songResult.Id = string(common.KuGouTag) + songResult.Id
-									}
-									songResult.MatchScore, ok = base.CalScore(song, songName, singerName, index, maxIndex)
-									if !ok {
-										continue
-									}
-									songs = append(songs, songResult)
-
+						if kugouSong, ok := matched.(common.MapType); ok {
+							if _, ok := kugouSong["hash"].(string); ok {
+								songResult := &common.Song{}
+								singerName, _ := kugouSong["singername"].(string)
+								songName, _ := kugouSong["songname"].(string)
+								songResult.PlatformUniqueKey = kugouSong
+								songResult.PlatformUniqueKey["UnKeyWord"] = song.Keyword
+								songResult.Source = "kugou"
+								songResult.Name = songName
+								songResult.Artist = singerName
+								songResult.Artist = strings.ReplaceAll(singerName, " ", "")
+								songResult.AlbumName, _ = kugouSong["album_name"].(string)
+								audioId, ok := kugouSong["audio_id"].(json.Number)
+								songResult.Id = audioId.String()
+								if ok && len(songResult.Id) > 0 {
+									songResult.Id = string(common.KuGouTag) + songResult.Id
 								}
-
+								songResult.MatchScore, ok = base.CalScore(song, songName, singerName, index, maxIndex)
+								if !ok {
+									continue
+								}
+								// protect slice thread safe
+								lock.Lock()
+								songs = append(songs, songResult)
+								lock.Unlock()
 							}
-
 						}
 					}
-
 				}
-
 			}
-		}
+		}(v)
 	}
+	wg.Wait()
 	return base.AfterSearchSong(song, songs)
 }
 func (m *KuGou) GetSongUrl(searchSong common.SearchMusic, song *common.Song) *common.Song {
@ -171,3 +180,17 @@ func s4() string {
 	num = num | 0
 	return strconv.FormatUint(num, 16)[1:]
 }
+
+func transSearchResponse(obj map[string]interface{}) (common.SliceType, bool) {
+	data := obj["data"]
+	if data != nil {
+		if dMap, ok := data.(common.MapType); ok {
+			if lists, ok := dMap["info"]; ok {
+				if listSlice, ok := lists.(common.SliceType); ok {
+					return listSlice, true
+				}
+			}
+		}
+	}
+	return nil, false
+}
--- a/provider/kuwo/kuwo.go
+++ b/provider/kuwo/kuwo.go
@ -3,6 +3,7 @@ package kuwo
 import (
 	"encoding/base64"
 	"encoding/json"
+	"fmt"
 	"github.com/cnsilvan/UnblockNeteaseMusic/provider/base"
 	"log"
 	"net/http"
@ -10,6 +11,7 @@ import (
 	"path/filepath"
 	"regexp"
 	"strings"
+	"sync"

 	"github.com/cnsilvan/UnblockNeteaseMusic/common"
 	"github.com/cnsilvan/UnblockNeteaseMusic/network"
@ -18,78 +20,97 @@ import (

 type KuWo struct{}

+const (
+	SearchSongURL = "http://www.kuwo.cn/api/www/search/searchMusicBykeyWord?key=%s&pn=1&rn=30"
+)
+
 var blockSongUrl = map[string]json.Number{
 	"2914632520.mp3": "7",
 }

+var lock sync.Mutex
+
 func (m *KuWo) SearchSong(song common.SearchSong) (songs []*common.Song) {
 	song = base.PreSearchSong(song)
-	token := getToken(song.Keyword)
-	header := make(http.Header, 4)
-	header["referer"] = append(header["referer"], "http://www.kuwo.cn/search/list?key="+url.QueryEscape(song.Keyword))
-	header["csrf"] = append(header["csrf"], token)
-	header["cookie"] = append(header["cookie"], "kw_token="+token)
-	result, err := base.Fetch(
-		"http://www.kuwo.cn/api/www/search/searchMusicBykeyWord?key="+song.Keyword+"&pn=1&rn=30",
-		nil, header, true)
-	if err != nil {
-		log.Println(err)
-		return songs
-	}
-	data, ok := result["data"].(common.MapType)
-	if ok {
-		list, ok := data["list"].([]interface{})
-		if ok && len(list) > 0 {
-			listLength := len(list)
-			maxIndex := listLength/2 + 1
-			if maxIndex > 10 {
-				maxIndex = 10
+	keyWordList := utils.Combination(strings.Split(song.ArtistsName, " "))
+	wg := sync.WaitGroup{}
+	for _, v := range keyWordList {
+		wg.Add(1)
+		// use goroutine to deal multiple request
+		go func(word string) {
+			defer wg.Done()
+			keyWord := song.Name
+			if len(word) != 0 {
+				keyWord = fmt.Sprintf("%s %s", song.Name, word)
 			}
-			for index, matched := range list {
-				if index >= 1 { //kuwo list order by score default
-					break
-				}
-				kuWoSong, ok := matched.(common.MapType)
-				if ok {
-					rid, ok := kuWoSong["rid"].(json.Number)
-					rids := ""
-					if !ok {
-						rids, ok = kuWoSong["rid"].(string)
-					} else {
-						rids = rid.String()
+			token := getToken(keyWord)
+			header := make(http.Header, 4)
+			header["referer"] = append(header["referer"], "http://www.kuwo.cn/search/list?key="+url.QueryEscape(keyWord))
+			header["csrf"] = append(header["csrf"], token)
+			header["cookie"] = append(header["cookie"], "kw_token="+token)
+			searchUrl := fmt.Sprintf(SearchSongURL, keyWord)
+			result, err := base.Fetch(searchUrl, nil, header, true)
+			if err != nil {
+				log.Println(err)
+				return
+			}
+			data, ok := result["data"].(common.MapType)
+			if ok {
+				list, ok := data["list"].([]interface{})
+				if ok && len(list) > 0 {
+					listLength := len(list)
+					maxIndex := listLength/2 + 1
+					if maxIndex > 5 {
+						maxIndex = 5
 					}
-					if ok {
-						songResult := &common.Song{}
-						singerName, _ := kuWoSong["artist"].(string)
-						songName, _ := kuWoSong["name"].(string)
-						//musicSlice := strings.Split(musicrid, "_")
-						//musicId := musicSlice[len(musicSlice)-1]
-						songResult.PlatformUniqueKey = kuWoSong
-						songResult.PlatformUniqueKey["UnKeyWord"] = song.Keyword
-						songResult.Source = "kuwo"
-						songResult.PlatformUniqueKey["header"] = header
-						songResult.PlatformUniqueKey["musicId"] = rids
-						songResult.Id = rids
-						if len(songResult.Id) > 0 {
-							songResult.Id = string(common.KuWoTag) + songResult.Id
+					for index, matched := range list {
+						if index >= maxIndex { //kuwo list order by score default
+							break
 						}
-						songResult.Name = songName
-						songResult.Artist = singerName
-						songResult.AlbumName, _ = kuWoSong["album"].(string)
-						songResult.Artist = strings.ReplaceAll(singerName, " ", "")
-						songResult.MatchScore, ok = base.CalScore(song, songName, singerName, index, maxIndex)
-						if !ok {
-							continue
+						kuWoSong, ok := matched.(common.MapType)
+						if ok {
+							rid, ok := kuWoSong["rid"].(json.Number)
+							rids := ""
+							if !ok {
+								rids, ok = kuWoSong["rid"].(string)
+							} else {
+								rids = rid.String()
+							}
+							if ok {
+								songResult := &common.Song{}
+								singerName, _ := kuWoSong["artist"].(string)
+								songName, _ := kuWoSong["name"].(string)
+								//musicSlice := strings.Split(musicrid, "_")
+								//musicId := musicSlice[len(musicSlice)-1]
+								songResult.PlatformUniqueKey = kuWoSong
+								songResult.PlatformUniqueKey["UnKeyWord"] = song.Keyword
+								songResult.Source = "kuwo"
+								songResult.PlatformUniqueKey["header"] = header
+								songResult.PlatformUniqueKey["musicId"] = rids
+								songResult.Id = rids
+								if len(songResult.Id) > 0 {
+									songResult.Id = string(common.KuWoTag) + songResult.Id
+								}
+								songResult.Name = songName
+								songResult.Artist = singerName
+								songResult.AlbumName, _ = kuWoSong["album"].(string)
+								songResult.Artist = strings.ReplaceAll(singerName, " ", "")
+								songResult.MatchScore, ok = base.CalScore(song, songName, singerName, index, maxIndex)
+								if !ok {
+									continue
+								}
+								// protect slice thread safe
+								lock.Lock()
+								songs = append(songs, songResult)
+								lock.Unlock()
+							}
 						}
-						songs = append(songs, songResult)
-
 					}
 				}
 			}
-
-		}
+		}(v)
 	}
-
+	wg.Wait()
 	return base.AfterSearchSong(song, songs)
 }
 func (m *KuWo) GetSongUrl(searchSong common.SearchMusic, song *common.Song) *common.Song {
--- a/utils/utils.go
+++ b/utils/utils.go
@ -330,3 +330,18 @@ func ParseCookies(file string) []*http.Cookie {
 	}
 	return cl
 }
+
+func Combination(keyWords []string) (result []string) {
+	if len(keyWords) == 1 {
+		return []string{
+			"",
+			keyWords[0],
+		}
+	}
+	tmp := Combination(keyWords[1:])
+	result = append(result, tmp...)
+	for _, v := range tmp {
+		result = append(result, keyWords[0]+" "+v)
+	}
+	return result
+}