From 82b64fe64265ed6af20db03cc272f08eb0b8e071 Mon Sep 17 00:00:00 2001 From: Hazel Noack Date: Wed, 8 Oct 2025 11:39:57 +0200 Subject: [PATCH] fetching name --- go.mod | 6 +- go.sum | 69 +++++++++++++++++++++++ internal/plugin/interface.go | 6 +- internal/plugin/musify.go | 100 ++++++++++++++++++++++++--------- internal/plugin/plugin_test.go | 4 +- 5 files changed, 152 insertions(+), 33 deletions(-) diff --git a/go.mod b/go.mod index c9c1222..ad50d2b 100644 --- a/go.mod +++ b/go.mod @@ -2,4 +2,8 @@ module gitea.elara.ws/Hazel/music-kraken go 1.24.2 -require golang.org/x/net v0.45.0 // indirect +require ( + github.com/PuerkitoBio/goquery v1.10.3 // indirect + github.com/andybalholm/cascadia v1.3.3 // indirect + golang.org/x/net v0.45.0 // indirect +) diff --git a/go.sum b/go.sum index 7b7b26c..b2baab7 100644 --- a/go.sum +++ b/go.sum @@ -1,2 +1,71 @@ +github.com/PuerkitoBio/goquery v1.10.3 h1:pFYcNSqHxBD06Fpj/KsbStFRsgRATgnf3LeXiUkhzPo= +github.com/PuerkitoBio/goquery v1.10.3/go.mod h1:tMUX0zDMHXYlAQk6p35XxQMqMweEKB7iK7iLNd4RH4Y= +github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM= +github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmgu1YHNnWw0GeA= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= +golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/net v0.45.0 h1:RLBg5JKixCy82FtLJpeNlVM0nrSqpCRYzVU1n8kj0tM= golang.org/x/net v0.45.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= +golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= +golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/internal/plugin/interface.go b/internal/plugin/interface.go index bc146a1..8bcc939 100644 --- a/internal/plugin/interface.go +++ b/internal/plugin/interface.go @@ -25,7 +25,7 @@ type Plugin interface { } var namePlugins = map[string]Plugin{} -var nameSourceType = map[string]data.SourceType{} +var NameSourceType = map[string]data.SourceType{} func RegisterPlugin(plugin Plugin) error { name := plugin.Name() @@ -34,7 +34,7 @@ func RegisterPlugin(plugin Plugin) error { return errors.New("plugin " + name + " is already registered") } - nameSourceType[name] = data.SourceType{ + NameSourceType[name] = data.SourceType{ Name: name, Regex: plugin.Regex(), RegexArtist: plugin.RegexArtist(), @@ -57,7 +57,7 @@ func compileSourceType(source data.Source) (data.Source, error) { return source, nil } - for _, st := range nameSourceType { + for _, st := range NameSourceType { if m := st.Regex.FindString(source.Url); m != "" { source.Url = m source.SourceType = &st diff --git a/internal/plugin/musify.go b/internal/plugin/musify.go index fa3c167..af9db80 100644 --- a/internal/plugin/musify.go +++ b/internal/plugin/musify.go @@ -1,15 +1,14 @@ package plugin import ( - "compress/gzip" "fmt" - "io" "regexp" "strings" "gitea.elara.ws/Hazel/music-kraken/internal/common" "gitea.elara.ws/Hazel/music-kraken/internal/data" "gitea.elara.ws/Hazel/music-kraken/internal/scraper" + "github.com/PuerkitoBio/goquery" ) func extractName(s string) string { @@ -20,12 +19,14 @@ func extractName(s string) string { return result } +const musifyHost = "https://musify.club" + type Musify struct { session *scraper.Session } func (m Musify) Name() string { - return "Musify" + return "musify" } func (m Musify) Regex() *regexp.Regexp { @@ -48,6 +49,62 @@ func (m Musify) RegexSong() *regexp.Regexp { return regexp.MustCompile(`(?i)https?://musify\.club/track/[a-z\-0-9]+`) } +func parseArtistContact(contact *goquery.Selection) data.Artist { + artist := data.Artist{} + + anchor := contact.Find("a") + if anchor.Length() > 0 { + url, urlExists := anchor.Attr("href") + + if urlExists { + artist.Sources = append(artist.Sources, data.Source{ + Url: musifyHost + url, + ObjectType: data.ArtistSource, + }) + } + + if name, nameExists := anchor.Attr("title"); nameExists { + artist.Name = name + } + } + + return artist +} + +func parseAlbumContact(contact *goquery.Selection) data.Album { + album := data.Album{} + + return album +} + +func parseContactContainer(contactContainer *goquery.Selection) []data.MusicObject { + res := []data.MusicObject{} + + contactContainer.Find("div.contacts__item").Each(func(i int, contact *goquery.Selection) { + anchor := contact.Find("a") + + if anchor.Length() > 0 { + url, exists := anchor.Attr("href") + + if exists { + if strings.Contains(url, "artist") { + res = append(res, parseArtistContact(contact)) + } else if strings.Contains(url, "release") { + res = append(res, parseAlbumContact(contact)) + } + } + } + }) + + return res +} + +func parsePlaylist(playlist *goquery.Selection) []data.MusicObject { + res := []data.MusicObject{} + + return res +} + func (m *Musify) Search(query common.Query) ([]data.MusicObject, error) { musicObjects := []data.MusicObject{} @@ -58,33 +115,22 @@ func (m *Musify) Search(query common.Query) ([]data.MusicObject, error) { return musicObjects, err } - defer resp.Body.Close() - - var bodyReader io.Reader = resp.Body - - // Check if we need to decompress manually - if resp.Header.Get("Content-Encoding") == "gzip" && false { - fmt.Println("Response is gzipped, decompressing...") - gzReader, err := gzip.NewReader(resp.Body) - if err != nil { - panic(err) - } - defer gzReader.Close() - bodyReader = gzReader - } - - body, err := io.ReadAll(bodyReader) - if err != nil { - panic(err) - } - - fmt.Printf("Response length: %d bytes\n", len(body)) - fmt.Println("Content:") - fmt.Println(string(body)) - fmt.Println(resp.Header) fmt.Println(resp.StatusCode) + doc, err := scraper.GetHtml(resp) + if err != nil { + return musicObjects, err + } + + doc.Find("div.contacts").Each(func(i int, contactContainer *goquery.Selection) { + musicObjects = append(musicObjects, parseContactContainer(contactContainer)...) + }) + + doc.Find("div.playlist").Each(func(i int, playlist *goquery.Selection) { + musicObjects = append(musicObjects, parsePlaylist(playlist)...) + }) + return musicObjects, nil } diff --git a/internal/plugin/plugin_test.go b/internal/plugin/plugin_test.go index f466d35..317b633 100644 --- a/internal/plugin/plugin_test.go +++ b/internal/plugin/plugin_test.go @@ -79,8 +79,8 @@ func TestRegister(t *testing.T) { t.Errorf(`%d plugins where registered`, len(namePlugins)) } - if len(nameSourceType) != 1 { - t.Errorf(`%d source types were registered`, len(nameSourceType)) + if len(NameSourceType) != 1 { + t.Errorf(`%d source types were registered`, len(NameSourceType)) } }