feat: add artist page

data/album.go

@@ -7,10 +7,15 @@ import (
 	"github.com/PuerkitoBio/goquery"
 )
 
+type AlbumPreview struct {
+	Name  string
+	Image string
+	URL   string
+}
+
 type Album struct {
-	Artist string
-	Name   string
-	Image  string
+	AlbumPreview
+	Artist ArtistPreview
 	About  [2]string
 
 	Tracks []Track
@@ -24,11 +29,11 @@ type Track struct {
 
 type albumMetadata struct {
 	Album struct {
-		Id          int    `json:"id"`
-		Image       string `json:"cover_art_thumbnail_url"`
-		Name        string `json:"name"`
-		Description string `json:"description_preview"`
-		Artist      `json:"artist"`
+		Id                    int    `json:"id"`
+		Image                 string `json:"cover_art_thumbnail_url"`
+		Name                  string `json:"name"`
+		Description           string `json:"description_preview"`
+		artistPreviewMetadata `json:"artist"`
 	}
 	AlbumAppearances []AlbumAppearances `json:"album_appearances"`
 }
@@ -42,8 +47,9 @@ type AlbumAppearances struct {
 	}
 }
 
-type Artist struct {
+type artistPreviewMetadata struct {
 	Name string `json:"name"`
+	URL  string `json:"url"`
 }
 
 func (a *Album) parseAlbumData(doc *goquery.Document) error {
@@ -58,7 +64,10 @@ func (a *Album) parseAlbumData(doc *goquery.Document) error {
 	}
 
 	albumData := albumMetadataFromPage.Album
-	a.Artist = albumData.Artist.Name
+	a.Artist = ArtistPreview{
+		Name: albumData.artistPreviewMetadata.Name,
+		URL:  strings.Replace(albumData.artistPreviewMetadata.URL, "https://genius.com", "", -1),
+	}
 	a.Name = albumData.Name
 	a.Image = albumData.Image
 	a.About[0] = albumData.Description

data/artist.go

@@ -0,0 +1,65 @@
+package data
+
+import (
+	"encoding/json"
+	"strings"
+
+	"github.com/PuerkitoBio/goquery"
+)
+
+type ArtistPreview struct {
+	Name string
+	URL  string
+}
+
+type Artist struct {
+	Name        string
+	Description string
+	Albums      []AlbumPreview
+	Image       string
+}
+
+type artistMetadata struct {
+	Artist struct {
+		Id          int    `json:"id"`
+		Name        string `json:"name"`
+		Description string `json:"description_preview"`
+		Image       string `json:"image_url"`
+	}
+	Albums []struct {
+		Id    int    `json:"id"`
+		Image string `json:"cover_art_thumbnail_url"`
+		Name  string `json:"name"`
+		URL   string `json:"url"`
+	} `json:"artist_albums"`
+}
+
+func (a *Artist) parseArtistData(doc *goquery.Document) error {
+	pageMetadata, exists := doc.Find("meta[itemprop='page_data']").Attr("content")
+	if !exists {
+		return nil
+	}
+
+	var artistMetadataFromPage artistMetadata
+	if err := json.Unmarshal([]byte(pageMetadata), &artistMetadataFromPage); err != nil {
+		return err
+	}
+
+	a.Name = artistMetadataFromPage.Artist.Name
+	a.Description = artistMetadataFromPage.Artist.Description
+	a.Image = artistMetadataFromPage.Artist.Image
+
+	for _, album := range artistMetadataFromPage.Albums {
+		a.Albums = append(a.Albums, AlbumPreview{
+			Name:  album.Name,
+			Image: album.Image,
+			URL:   strings.Replace(album.URL, "https://genius.com", "", -1),
+		})
+	}
+
+	return nil
+}
+
+func (a *Artist) Parse(doc *goquery.Document) error {
+	return a.parseArtistData(doc)
+}

data/lyrics.go

@@ -16,11 +16,7 @@ type Song struct {
 	Lyrics  string
 	Credits map[string]string
 	About   [2]string
-	Album   struct {
-		URL   string
-		Name  string
-		Image string
-	}
+	Album   AlbumPreview
 }
 
 type songResponse struct {
@@ -38,10 +34,10 @@ type songResponse struct {
 				Image string `json:"cover_art_url"`
 			}
 			CustomPerformances []customPerformance `json:"custom_performances"`
-			WriterArtists []struct {
+			WriterArtists      []struct {
 				Name string
 			} `json:"writer_artists"`
-			ProducerArtists    []struct {
+			ProducerArtists []struct {
 				Name string
 			} `json:"producer_artists"`
 		}
@@ -117,7 +113,8 @@ func (s *Song) parseSongData(doc *goquery.Document) error {
 
 func joinNames(data []struct {
 	Name string
-}) string {
+},
+) string {
 	var names []string
 	for _, hasName := range data {
 		names = append(names, hasName.Name)