diff --git a/data/album.go b/data/album.go index 8d907ca..085fd97 100644 --- a/data/album.go +++ b/data/album.go @@ -5,6 +5,7 @@ import ( "strings" "github.com/PuerkitoBio/goquery" + "github.com/rramiachraf/dumb/utils" ) type AlbumPreview struct { @@ -66,7 +67,7 @@ func (a *Album) parseAlbumData(doc *goquery.Document) error { albumData := albumMetadataFromPage.Album a.Artist = ArtistPreview{ Name: albumData.artistPreviewMetadata.Name, - URL: strings.Replace(albumData.artistPreviewMetadata.URL, "https://genius.com", "", -1), + URL: utils.TrimURL(albumData.artistPreviewMetadata.URL), } a.Name = albumData.Name a.Image = albumData.Image diff --git a/data/artist.go b/data/artist.go index b5829a9..a2b9162 100644 --- a/data/artist.go +++ b/data/artist.go @@ -2,9 +2,9 @@ package data import ( "encoding/json" - "strings" "github.com/PuerkitoBio/goquery" + "github.com/rramiachraf/dumb/utils" ) type ArtistPreview struct { @@ -53,7 +53,7 @@ func (a *Artist) parseArtistData(doc *goquery.Document) error { a.Albums = append(a.Albums, AlbumPreview{ Name: album.Name, Image: album.Image, - URL: strings.Replace(album.URL, "https://genius.com", "", -1), + URL: utils.TrimURL(album.URL), }) } diff --git a/data/lyrics.go b/data/lyrics.go index 0c1abf4..bb1dc39 100644 --- a/data/lyrics.go +++ b/data/lyrics.go @@ -102,7 +102,7 @@ func (s *Song) parseSongData(doc *goquery.Document) error { s.Credits = make(map[string]string) s.Album.Name = songData.Album.Name s.ArtistPageURL = utils.TrimURL(songData.PrimaryArtist.URL) - s.Album.URL = strings.Replace(songData.Album.URL, "https://genius.com", "", -1) + s.Album.URL = utils.TrimURL(songData.Album.URL) s.Album.Image = ExtractImageURL(songData.Album.Image) s.Credits["Writers"] = joinNames(songData.WriterArtists)