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

scrobblerlog: renamed setting include-skipped to ignore-skipped

Browse source 
This makes the setting consistent with the similar setting for spotify
This commit is contained in:
Philipp Wolfer 2025-04-29 12:57:28 +02:00
parent 82858315fa
commit 1516a3a9d6
No known key found for this signature in database
GPG key ID: 8FDF744D4919943B
4 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

11
pkg/scrobblerlog/parser.go
View file

@ -79,7 +79,7 @@ type ScrobblerLog struct {
FallbackTimezone *time.Location
}
func (l *ScrobblerLog) Parse(data io.Reader, includeSkipped bool) error {
func (l *ScrobblerLog) Parse(data io.Reader, ignoreSkipped bool) error {
l.Records = make([]Record, 0)
reader := bufio.NewReader(data)
@ -111,16 +111,15 @@ func (l *ScrobblerLog) Parse(data io.Reader, includeSkipped bool) error {
return fmt.Errorf("invalid record in scrobblerlog line %v", line)
}
rating := row[5]
if !includeSkipped && rating == "S" {
continue
}
record, err := l.rowToRecord(row)
if err != nil {
return err
}
if ignoreSkipped && record.Rating == RATING_SKIPPED {
continue
}
l.Records = append(l.Records, record)
}

6
pkg/scrobblerlog/parser_test.go
View file

@ -48,7 +48,7 @@ func TestParser(t *testing.T) {
assert := assert.New(t)
data := bytes.NewBufferString(testScrobblerLog)
result := scrobblerlog.ScrobblerLog{}
err := result.Parse(data, true)
err := result.Parse(data, false)
require.NoError(t, err)
assert.Equal(scrobblerlog.TZ_UNKNOWN, result.TZ)
assert.Equal("Rockbox sansaclipplus $Revision$", result.Client)
@ -68,11 +68,11 @@ func TestParser(t *testing.T) {
record4.MusicBrainzRecordingID)
}
func TestParserExcludeSkipped(t *testing.T) {
func TestParserIgnoreSkipped(t *testing.T) {
assert := assert.New(t)
data := bytes.NewBufferString(testScrobblerLog)
result := scrobblerlog.ScrobblerLog{}
err := result.Parse(data, false)
err := result.Parse(data, true)
require.NoError(t, err)
assert.Len(result.Records, 4)
record4 := result.Records[3]