diff --git a/go.mod b/go.mod index 11f910b..052d9ca 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,12 @@ module github.com/Superredstone/spotiflac-cli go 1.24.4 require ( + github.com/bogem/id3v2/v2 v2.1.4 github.com/pquerna/otp v1.5.0 github.com/urfave/cli/v3 v3.6.2 ) -require github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect +require ( + github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect + golang.org/x/text v0.3.8 // indirect +) diff --git a/go.sum b/go.sum index eac4cd7..1e0d80e 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,5 @@ +github.com/bogem/id3v2/v2 v2.1.4 h1:CEwe+lS2p6dd9UZRlPc1zbFNIha2mb2qzT1cCEoNWoI= +github.com/bogem/id3v2/v2 v2.1.4/go.mod h1:l+gR8MZ6rc9ryPTPkX77smS5Me/36gxkMgDayZ9G1vY= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc h1:biVzkmvwrH8WK8raXaxBx6fRVTlJILwEwQGL1I/ByEI= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -13,5 +15,30 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/urfave/cli/v3 v3.6.2 h1:lQuqiPrZ1cIz8hz+HcrG0TNZFxU70dPZ3Yl+pSrH9A8= github.com/urfave/cli/v3 v3.6.2/go.mod h1:ysVLtOEmg2tOy6PknnYVhDoouyC/6N42TMeoMzskhso= +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/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +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/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/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/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/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.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY= +golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= +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/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/lib/download.go b/lib/download.go index 6406d4f..30c98b1 100644 --- a/lib/download.go +++ b/lib/download.go @@ -69,9 +69,9 @@ func (app *App) Download(url string, outputFile string, serviceString string, qu return err } - fileExists, err := FileExists(outputFile) + fileExists, err := FileExists(outputFile) if err != nil { - return err + return err } if fileExists { @@ -84,6 +84,11 @@ func (app *App) Download(url string, outputFile string, serviceString string, qu return err } + err = app.EmbedMetadata(outputFile, metadata) + if err != nil { + return err + } + return nil } diff --git a/lib/metadata.go b/lib/metadata.go index 3892fbd..f5fed2c 100644 --- a/lib/metadata.go +++ b/lib/metadata.go @@ -3,6 +3,8 @@ package lib import ( "encoding/json" "errors" + + id3v2 "github.com/bogem/id3v2/v2" ) func (app *App) GetTrackMetadata(url string) (TrackMetadata, error) { @@ -40,3 +42,26 @@ func (app *App) GetTrackMetadata(url string) (TrackMetadata, error) { func (app *App) PrintMetadata(url string) error { return errors.New("Unimplemented.") } + +func (app *App) EmbedMetadata(file string, metadata TrackMetadata) error { + tag, err := id3v2.Open(file, id3v2.Options{Parse: true}) + if err != nil { + return err + } + + artists, err := GetArtists(metadata) + if err != nil { + return err + } + + tag.SetArtist(artists) + tag.SetTitle(metadata.Data.TrackUnion.Name) + tag.SetYear(string(metadata.Data.TrackUnion.AlbumOfTrack.Date.Year)) + tag.SetAlbum(metadata.Data.TrackUnion.AlbumOfTrack.Name) + + if err = tag.Save(); err != nil { + return err + } + + return nil +} diff --git a/lib/utils.go b/lib/utils.go index 424a28f..8e823ab 100644 --- a/lib/utils.go +++ b/lib/utils.go @@ -44,20 +44,30 @@ func ParseTrackId(url string) (string, error) { func BuildFileName(metadata TrackMetadata, extension string) (string, error) { var result string - var artists string + + artists, err := GetArtists(metadata) + if err != nil { + return result, err + } + + result = fmt.Sprintf("%s - %s.%s", metadata.Data.TrackUnion.Name, artists, extension) + + return result, nil +} + +func GetArtists(metadata TrackMetadata) (string, error) { + var result string firstArtistLen := len(metadata.Data.TrackUnion.FirstArtist.Items) if firstArtistLen == 0 { return result, errors.New("What? This should never happen.") } - artists = metadata.Data.TrackUnion.FirstArtist.Items[firstArtistLen-1].Profile.Name + result = metadata.Data.TrackUnion.FirstArtist.Items[firstArtistLen-1].Profile.Name for _, artist := range metadata.Data.TrackUnion.OtherArtists.Items { - artists += ", " + artist.Profile.Name + result += ", " + artist.Profile.Name } - result = fmt.Sprintf("%s - %s.%s", metadata.Data.TrackUnion.Name, artists, extension) - return result, nil }