From e587ae69fc64abfe408187ffe5e24302ee87fc5a Mon Sep 17 00:00:00 2001 From: aynakeya Date: Sat, 2 Mar 2024 19:31:03 -0800 Subject: [PATCH] fix stupid javascript --- providers/bilibili/bilibili.go | 2 -- providers/kuwo/kuwo.go | 10 +++++----- providers/kuwo/kuwo_test.go | 8 ++++---- providers/netease/init.go | 7 +++++++ 4 files changed, 16 insertions(+), 11 deletions(-) create mode 100644 providers/netease/init.go diff --git a/providers/bilibili/bilibili.go b/providers/bilibili/bilibili.go index 376f967..c4618bb 100644 --- a/providers/bilibili/bilibili.go +++ b/providers/bilibili/bilibili.go @@ -1,7 +1,6 @@ package bilibili import ( - "fmt" "github.com/AynaLivePlayer/miaosic" "github.com/AynaLivePlayer/miaosic/providers" "github.com/aynakeya/deepcolor" @@ -54,7 +53,6 @@ func NewBilibili() *Bilibili { }, deepcolor.ParserGJson, func(resp *gjson.Result, media *[]miaosic.MediaUrl) error { - fmt.Println(resp.String()) if resp.Get("data.cdns.0").String() == "" { return miaosic.ErrorExternalApi } diff --git a/providers/kuwo/kuwo.go b/providers/kuwo/kuwo.go index e21dffe..fb27814 100644 --- a/providers/kuwo/kuwo.go +++ b/providers/kuwo/kuwo.go @@ -114,8 +114,8 @@ func NewKuwo() *Kuwo { func (k *Kuwo) initToken() { k.header = map[string]string{ "accept": "application/json, text/plain, */*", - "cookie": "Hm_Iuvt_cdb524f42f0cer9b268e4v7y735ewrq2324=Ta28hMQmpTA2FCyzxSaDSXYfjF4wz7XB", - "secret": k.generateSecret("Ta28hMQmpTA2FCyzxSaDSXYfjF4wz7XB", "Hm_Iuvt_cdb524f42f0cer9b268e4v7y735ewrq2324"), + "cookie": "Hm_Iuvt_cdb524f42f23cer9b268564v7y735ewrq2324=Z3mc22m5FG2cezTznhS6YPNMPD5HnzSn", + "secret": k.generateSecret("Z3mc22m5FG2cezTznhS6YPNMPD5HnzSn", "Hm_Iuvt_cdb524f42f23cer9b268564v7y735ewrq2324"), } //searchCookie, err := k.requester.Get("http://kuwo.cn/search/list?key=any", nil) //fmt.Println(searchCookie.Header(), err) @@ -181,7 +181,7 @@ func (k *Kuwo) generateSecret(t, e string) string { } d := rand.Intn(100000000) - //d := 80378195 + //d = 28886583 n += strconv.Itoa(d) var num1, num2 int64 @@ -189,8 +189,8 @@ func (k *Kuwo) generateSecret(t, e string) string { // stupid javascript if len(n[10:]) > 19 { num1 = cast.ToInt64(n[10:11]) - // 19+6+1 - num2 = cast.ToInt64(n[19 : 19+6+1]) + // 19+8+1 + num2 = cast.ToInt64(n[19 : 19+8+1]) if num2%10 >= 5 { num2 = num2/10 + 1 } else { diff --git a/providers/kuwo/kuwo_test.go b/providers/kuwo/kuwo_test.go index c0f30e4..b9adc61 100644 --- a/providers/kuwo/kuwo_test.go +++ b/providers/kuwo/kuwo_test.go @@ -1,8 +1,8 @@ package kuwo import ( - "fmt" "github.com/AynaLivePlayer/miaosic" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "testing" ) @@ -19,7 +19,7 @@ var api miaosic.MediaProvider = NewKuwo() func TestKuwo_Secret2(t *testing.T) { // using 80378195 as d t.Log( - api.(*Kuwo).generateSecret("c8JTmFjTQ3StRczHZTfAJ8hCPX3rtxzZ", "Hm_Iuvt_cdb524f42f0cer9b268e4v7y735ewrq2324")) + api.(*Kuwo).generateSecret("Z3mc22m5FG2cezTznhS6YPNMPD5HnzSn", "Hm_Iuvt_cdb524f42f23cer9b268564v7y735ewrq2324")) } @@ -30,7 +30,7 @@ func TestKuwo_Search(t *testing.T) { media := result[0] urls, err := api.GetMediaUrl(media.Meta, miaosic.QualityAny) require.NoError(t, err) - fmt.Println(urls) + assert.NotEmpty(t, urls) } func TestKuwo_GetMusicMeta(t *testing.T) { @@ -50,7 +50,7 @@ func TestKuwo_GetMusic(t *testing.T) { } urls, err := api.GetMediaUrl(meta, miaosic.QualityAny) require.NoError(t, err) - require.True(t, len(urls) > 0) + require.NotEmpty(t, urls) } func TestKuwo_UpdateMediaLyric(t *testing.T) { diff --git a/providers/netease/init.go b/providers/netease/init.go new file mode 100644 index 0000000..df98405 --- /dev/null +++ b/providers/netease/init.go @@ -0,0 +1,7 @@ +package netease + +import "github.com/AynaLivePlayer/miaosic" + +func init() { + miaosic.RegisterProvider(NewNetease()) +}