refactor: remove redundant code

This commit is contained in:
rramiachraf 2024-06-11 21:25:27 +01:00
parent 8545cb313c
commit 7e26bf48f6
3 changed files with 5 additions and 4 deletions

View File

@ -5,6 +5,7 @@ import (
"strings" "strings"
"github.com/PuerkitoBio/goquery" "github.com/PuerkitoBio/goquery"
"github.com/rramiachraf/dumb/utils"
) )
type AlbumPreview struct { type AlbumPreview struct {
@ -66,7 +67,7 @@ func (a *Album) parseAlbumData(doc *goquery.Document) error {
albumData := albumMetadataFromPage.Album albumData := albumMetadataFromPage.Album
a.Artist = ArtistPreview{ a.Artist = ArtistPreview{
Name: albumData.artistPreviewMetadata.Name, 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.Name = albumData.Name
a.Image = albumData.Image a.Image = albumData.Image

View File

@ -2,9 +2,9 @@ package data
import ( import (
"encoding/json" "encoding/json"
"strings"
"github.com/PuerkitoBio/goquery" "github.com/PuerkitoBio/goquery"
"github.com/rramiachraf/dumb/utils"
) )
type ArtistPreview struct { type ArtistPreview struct {
@ -53,7 +53,7 @@ func (a *Artist) parseArtistData(doc *goquery.Document) error {
a.Albums = append(a.Albums, AlbumPreview{ a.Albums = append(a.Albums, AlbumPreview{
Name: album.Name, Name: album.Name,
Image: album.Image, Image: album.Image,
URL: strings.Replace(album.URL, "https://genius.com", "", -1), URL: utils.TrimURL(album.URL),
}) })
} }

View File

@ -102,7 +102,7 @@ func (s *Song) parseSongData(doc *goquery.Document) error {
s.Credits = make(map[string]string) s.Credits = make(map[string]string)
s.Album.Name = songData.Album.Name s.Album.Name = songData.Album.Name
s.ArtistPageURL = utils.TrimURL(songData.PrimaryArtist.URL) 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.Album.Image = ExtractImageURL(songData.Album.Image)
s.Credits["Writers"] = joinNames(songData.WriterArtists) s.Credits["Writers"] = joinNames(songData.WriterArtists)