marc/scotty
1
0
Fork 0
mirror of https://git.sr.ht/~phw/scotty synced 2025-07-15 12:53:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added Listen.Skipped attribute

Browse source 
This will help implementing similar functionality for other formats
that make this distinction.
This commit is contained in:
Philipp Wolfer 2025-07-14 15:13:38 +02:00
parent 543b3ced27
commit d162702d5d
No known key found for this signature in database
GPG key ID: 8FDF744D4919943B
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
internal/backends/scrobblerlog/scrobblerlog.go
View file

@ -188,6 +188,7 @@ func (b *ScrobblerLogBackend) ImportListens(ctx context.Context, export models.L
func recordToListen(record scrobblerlog.Record, client string) models.Listen { func recordToListen(record scrobblerlog.Record, client string) models.Listen {
return models.Listen{ return models.Listen{
ListenedAt: record.Timestamp, ListenedAt: record.Timestamp,
Skipped: record.Rating == scrobblerlog.RatingSkipped,
Track: models.Track{ Track: models.Track{
ArtistNames: []string{record.ArtistName}, ArtistNames: []string{record.ArtistName},
ReleaseName: record.AlbumName, ReleaseName: record.AlbumName,
@ -196,8 +197,7 @@ func recordToListen(record scrobblerlog.Record, client string) models.Listen {
Duration: record.Duration, Duration: record.Duration,
RecordingMBID: record.MusicBrainzRecordingID, RecordingMBID: record.MusicBrainzRecordingID,
AdditionalInfo: models.AdditionalInfo{ AdditionalInfo: models.AdditionalInfo{
"rockbox_rating": record.Rating, "media_player": client,
"media_player": client,
}, },
}, },
} }
@ -205,11 +205,10 @@ func recordToListen(record scrobblerlog.Record, client string) models.Listen {
func listenToRecord(listen models.Listen) scrobblerlog.Record { func listenToRecord(listen models.Listen) scrobblerlog.Record {
var rating scrobblerlog.Rating var rating scrobblerlog.Rating
rockboxRating, ok := listen.AdditionalInfo["rockbox_rating"].(string) if listen.Skipped {
if !ok || rockboxRating == "" { rating = scrobblerlog.RatingSkipped
rating = scrobblerlog.RatingListened
} else { } else {
rating = scrobblerlog.Rating(rating) rating = scrobblerlog.RatingListened
} }
return scrobblerlog.Record{ return scrobblerlog.Record{

1
internal/backends/spotifyhistory/models.go
View file

@ -91,6 +91,7 @@ func (i HistoryItem) AsListen() models.Listen {
ListenedAt: i.Timestamp, ListenedAt: i.Timestamp,
PlaybackDuration: time.Duration(i.MillisecondsPlayed) * time.Millisecond, PlaybackDuration: time.Duration(i.MillisecondsPlayed) * time.Millisecond,
UserName: i.UserName, UserName: i.UserName,
Skipped: i.Skipped,
} }
if trackURL, err := formatSpotifyUri(i.SpotifyTrackUri); err != nil { if trackURL, err := formatSpotifyUri(i.SpotifyTrackUri); err != nil {
listen.AdditionalInfo["spotify_id"] = trackURL listen.AdditionalInfo["spotify_id"] = trackURL

1
internal/models/models.go
View file

@ -106,6 +106,7 @@ type Listen struct {
ListenedAt time.Time ListenedAt time.Time
PlaybackDuration time.Duration PlaybackDuration time.Duration
UserName string UserName string
Skipped bool
} }
type Love struct { type Love struct {