scrobblerlog: Use specific Record type

This makes the interface more generic and easier to reuse in other
projects.
This commit is contained in:
Philipp Wolfer 2025-04-29 09:18:57 +02:00
parent aeb3a56982
commit aad542850a
No known key found for this signature in database
GPG key ID: 8FDF744D4919943B
3 changed files with 132 additions and 76 deletions

View file

@ -31,7 +31,6 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.uploadedlobster.com/mbtypes"
"go.uploadedlobster.com/scotty/internal/models"
"go.uploadedlobster.com/scotty/pkg/scrobblerlog"
)
@ -53,19 +52,20 @@ func TestParser(t *testing.T) {
require.NoError(t, err)
assert.Equal(scrobblerlog.TZ_UNKNOWN, result.TZ)
assert.Equal("Rockbox sansaclipplus $Revision$", result.Client)
assert.Len(result.Listens, 5)
listen1 := result.Listens[0]
assert.Equal("Özcan Deniz", listen1.ArtistName())
assert.Equal("Ses ve Ayrilik", listen1.ReleaseName)
assert.Equal("Sevdanin rengi (sipacik) byMrTurkey", listen1.TrackName)
assert.Equal(5, listen1.TrackNumber)
assert.Equal(time.Duration(306*time.Second), listen1.Duration)
assert.Equal("L", listen1.AdditionalInfo["rockbox_rating"])
assert.Equal(time.Unix(1260342084, 0), listen1.ListenedAt)
assert.Equal(mbtypes.MBID(""), listen1.RecordingMBID)
listen4 := result.Listens[3]
assert.Equal("S", listen4.AdditionalInfo["rockbox_rating"])
assert.Equal(mbtypes.MBID("385ba9e9-626d-4750-a607-58e541dca78e"), listen4.RecordingMBID)
assert.Len(result.Records, 5)
record1 := result.Records[0]
assert.Equal("Özcan Deniz", record1.ArtistName)
assert.Equal("Ses ve Ayrilik", record1.AlbumName)
assert.Equal("Sevdanin rengi (sipacik) byMrTurkey", record1.TrackName)
assert.Equal(5, record1.TrackNumber)
assert.Equal(time.Duration(306*time.Second), record1.Duration)
assert.Equal(scrobblerlog.RATING_LISTENED, record1.Rating)
assert.Equal(time.Unix(1260342084, 0), record1.Timestamp)
assert.Equal(mbtypes.MBID(""), record1.MusicBrainzRecordingID)
record4 := result.Records[3]
assert.Equal(scrobblerlog.RATING_SKIPPED, record4.Rating)
assert.Equal(mbtypes.MBID("385ba9e9-626d-4750-a607-58e541dca78e"),
record4.MusicBrainzRecordingID)
}
func TestParserExcludeSkipped(t *testing.T) {
@ -74,10 +74,11 @@ func TestParserExcludeSkipped(t *testing.T) {
result := scrobblerlog.ScrobblerLog{}
err := result.Parse(data, false)
require.NoError(t, err)
assert.Len(result.Listens, 4)
listen4 := result.Listens[3]
assert.Equal("L", listen4.AdditionalInfo["rockbox_rating"])
assert.Equal(mbtypes.MBID("1262beaf-19f8-4534-b9ed-7eef9ca8e83f"), listen4.RecordingMBID)
assert.Len(result.Records, 4)
record4 := result.Records[3]
assert.Equal(scrobblerlog.RATING_LISTENED, record4.Rating)
assert.Equal(mbtypes.MBID("1262beaf-19f8-4534-b9ed-7eef9ca8e83f"),
record4.MusicBrainzRecordingID)
}
func TestAppend(t *testing.T) {
@ -88,23 +89,21 @@ func TestAppend(t *testing.T) {
TZ: scrobblerlog.TZ_UNKNOWN,
Client: "Rockbox foo $Revision$",
}
listens := []models.Listen{
records := []scrobblerlog.Record{
{
ListenedAt: time.Unix(1699572072, 0),
Track: models.Track{
ArtistNames: []string{"Prinzhorn Dance School"},
ReleaseName: "Home Economics",
TrackName: "Reign",
TrackNumber: 1,
Duration: 271 * time.Second,
RecordingMBID: mbtypes.MBID("b59cf4e7-caee-4019-a844-79d2c58d4dff"),
AdditionalInfo: models.AdditionalInfo{"rockbox_rating": "L"},
},
ArtistName: "Prinzhorn Dance School",
AlbumName: "Home Economics",
TrackName: "Reign",
TrackNumber: 1,
Duration: 271 * time.Second,
Rating: scrobblerlog.RATING_LISTENED,
Timestamp: time.Unix(1699572072, 0),
MusicBrainzRecordingID: mbtypes.MBID("b59cf4e7-caee-4019-a844-79d2c58d4dff"),
},
}
err := log.WriteHeader(buffer)
require.NoError(t, err)
lastTimestamp, err := log.Append(buffer, listens)
lastTimestamp, err := log.Append(buffer, records)
require.NoError(t, err)
result := buffer.String()
lines := strings.Split(result, "\n")
@ -127,5 +126,5 @@ func TestReadHeader(t *testing.T) {
assert.NoError(t, err)
assert.Equal(t, log.TZ, scrobblerlog.TZ_UNKNOWN)
assert.Equal(t, log.Client, "Rockbox sansaclipplus $Revision$")
assert.Empty(t, log.Listens)
assert.Empty(t, log.Records)
}