marc/scotty
1
0
Fork 0
mirror of https://git.sr.ht/~phw/scotty synced 2025-04-30 05:37:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move the JSPF playlist code into public module

Browse source
This commit is contained in:
Philipp Wolfer 2023-11-24 01:22:45 +01:00
parent 0f5cb49b4c
commit e1c9fb6076
No known key found for this signature in database
GPG key ID: 8FDF744D4919943B
11 changed files with 367 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

36
internal/backends/jspf/jspf.go
View file

@ -18,12 +18,12 @@ Scotty. If not, see <https://www.gnu.org/licenses/>.
package jspf
import (
"encoding/json"
"os"
"time"
"github.com/spf13/viper"
"go.uploadedlobster.com/scotty/internal/models"
"go.uploadedlobster.com/scotty/pkg/jspf"
)
type JSPFBackend struct {
@ -31,7 +31,7 @@ type JSPFBackend struct {
title string
creator string
identifier string
tracks []Track
tracks []jspf.Track
}
func (b *JSPFBackend) Name() string { return "jspf" }
@ -41,7 +41,7 @@ func (b *JSPFBackend) FromConfig(config *viper.Viper) models.Backend {
b.title = config.GetString("title")
b.creator = config.GetString("username")
b.identifier = config.GetString("identifier")
b.tracks = make([]Track, 0)
b.tracks = make([]jspf.Track, 0)
return b
}
@ -75,13 +75,13 @@ func (b *JSPFBackend) ImportLoves(export models.LovesResult, importResult models
return importResult, nil
}
func listenAsTrack(l models.Listen) Track {
func listenAsTrack(l models.Listen) jspf.Track {
l.FillAdditionalInfo()
track := trackAsTrack(l.Track)
extension := makeMusicBrainzExtension(l.Track)
extension.AddedAt = l.ListenedAt
extension.AddedBy = l.UserName
track.Extension[MusicBrainzTrackExtensionId] = extension
track.Extension[jspf.MusicBrainzTrackExtensionId] = extension
if l.RecordingMbid != "" {
track.Identifier = append(track.Identifier, "https://musicbrainz.org/recording/"+string(l.RecordingMbid))
@ -90,13 +90,13 @@ func listenAsTrack(l models.Listen) Track {
return track
}
func loveAsTrack(l models.Love) Track {
func loveAsTrack(l models.Love) jspf.Track {
l.FillAdditionalInfo()
track := trackAsTrack(l.Track)
extension := makeMusicBrainzExtension(l.Track)
extension.AddedAt = l.Created
extension.AddedBy = l.UserName
track.Extension[MusicBrainzTrackExtensionId] = extension
track.Extension[jspf.MusicBrainzTrackExtensionId] = extension
if l.RecordingMbid != "" {
track.Identifier = append(track.Identifier, "https://musicbrainz.org/recording/"+string(l.RecordingMbid))
@ -105,8 +105,8 @@ func loveAsTrack(l models.Love) Track {
return track
}
func trackAsTrack(t models.Track) Track {
track := Track{
func trackAsTrack(t models.Track) jspf.Track {
track := jspf.Track{
Title: t.TrackName,
Album: t.ReleaseName,
Creator: t.ArtistName(),
@ -117,8 +117,8 @@ func trackAsTrack(t models.Track) Track {
return track
}
func makeMusicBrainzExtension(t models.Track) MusicBrainzTrackExtension {
extension := MusicBrainzTrackExtension{
func makeMusicBrainzExtension(t models.Track) jspf.MusicBrainzTrackExtension {
extension := jspf.MusicBrainzTrackExtension{
AdditionalMetadata: t.AdditionalInfo,
ArtistIdentifiers: make([]string, len(t.ArtistMbids)),
}
@ -137,9 +137,9 @@ func makeMusicBrainzExtension(t models.Track) MusicBrainzTrackExtension {
return extension
}
func (b JSPFBackend) writeJSPF(tracks []Track) error {
playlist := JSPF{
Playlist: Playlist{
func (b JSPFBackend) writeJSPF(tracks []jspf.Track) error {
playlist := jspf.JSPF{
Playlist: jspf.Playlist{
Title: b.title,
Creator: b.creator,
Identifier: b.identifier,
@ -154,11 +154,5 @@ func (b JSPFBackend) writeJSPF(tracks []Track) error {
}
defer file.Close()
jspfJson, err := json.MarshalIndent(playlist, "", "\t")
if err != nil {
return err
}
_, err = file.Write(jspfJson)
return err
return playlist.Write(file)
}