ngn/dumb
1
0
Fork 0
Code Issues 1 Pull Requests 3 Actions Packages Activity

refactor: remove redundant code

Browse Source
This commit is contained in:
rramiachraf 2024-06-11 21:02:58 +01:00
parent 3bf802c9c2
commit 41d13e1edb
4 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
data/album.go
View File

@ -16,7 +16,7 @@ type AlbumPreview struct {
type Album struct {
AlbumPreview
Artist ArtistPreview
About [2]string
About string
Tracks []Track
}
@ -70,8 +70,7 @@ func (a *Album) parseAlbumData(doc *goquery.Document) error {
}
a.Name = albumData.Name
a.Image = albumData.Image
a.About[0] = albumData.Description
a.About[1] = truncateText(albumData.Description)
a.About = albumData.Description
for _, track := range albumMetadataFromPage.AlbumAppearances {
url := strings.Replace(track.Song.Url, "https://genius.com", "", -1)

15
data/lyrics.go
View File

@ -15,7 +15,7 @@ type Song struct {
Image string
Lyrics string
Credits map[string]string
About [2]string
About string
Album AlbumPreview
}
@ -94,8 +94,7 @@ func (s *Song) parseSongData(doc *goquery.Document) error {
s.Artist = songData.ArtistNames
s.Image = songData.Image
s.Title = songData.Title
s.About[0] = songData.Description.Plain
s.About[1] = truncateText(songData.Description.Plain)
s.About = songData.Description.Plain
s.Credits = make(map[string]string)
s.Album.Name = songData.Album.Name
s.Album.URL = strings.Replace(songData.Album.URL, "https://genius.com", "", -1)
@ -122,16 +121,6 @@ func joinNames(data []struct {
return strings.Join(names, ", ")
}
func truncateText(text string) string {
textArr := strings.Split(text, "")
if len(textArr) > 250 {
return strings.Join(textArr[0:250], "") + "..."
}
return text
}
func (s *Song) Parse(doc *goquery.Document) error {
if err := s.parseLyrics(doc); err != nil {
return err

11
views/album.templ
View File

@ -3,6 +3,7 @@ package views
import (
"fmt"
"github.com/rramiachraf/dumb/data"
"github.com/rramiachraf/dumb/utils"
)
templ AlbumPage(a data.Album) {
@ -11,7 +12,9 @@ templ AlbumPage(a data.Album) {
<div id="metadata">
<img id="album-artwork" src={ data.ExtractImageURL(a.Image) } alt="Album image"/>
<div id="metadata-info">
<a href={ templ.URL(a.Artist.URL) } id="album-artist"><h2>{ a.Artist.Name }</h2></a>
<a href={ templ.URL(a.Artist.URL) } id="album-artist">
<h2>{ a.Artist.Name }</h2>
</a>
<h1>{ a.Name }</h1>
</div>
</div>
@ -23,12 +26,12 @@ templ AlbumPage(a data.Album) {
</a>
}
</div>
if a.About[0] != "" {
if a.About != "" {
<div id="info">
<div id="description" dir="auto">
<h1 id="title">About</h1>
<p class="hidden" id="full">{ a.About[0] }</p>
<p id="summary">{ a.About[1] }</p>
<p class="hidden" id="full">{ a.About }</p>
<p id="summary">{ utils.TrimText(a.About, 250) }</p>
</div>
</div>
}

7
views/lyrics.templ
View File

@ -3,6 +3,7 @@ package views
import (
"fmt"
"github.com/rramiachraf/dumb/data"
"github.com/rramiachraf/dumb/utils"
)
templ LyricsPage(s data.Song) {
@ -23,11 +24,11 @@ templ LyricsPage(s data.Song) {
@templ.Raw(s.Lyrics)
</div>
<div id="info">
if s.About[0] != "?" {
if s.About != "?" {
<div id="description" dir="auto">
<h1 id="title">About</h1>
<p class="hidden" id="full">{ s.About[0] }</p>
<p id="summary">{ s.About[1] }</p>
<p class="hidden" id="full">{ s.About }</p>
<p id="summary">{ utils.TrimText(s.About, 250) }</p>
</div>
}
if len(s.Credits) > 0 {