Use fmt.Errorf, error strings should start lowercase

This commit is contained in:
Philipp Wolfer 2023-12-05 08:17:46 +01:00
parent a9e07915ce
commit 28ed1183e4
No known key found for this signature in database
GPG key ID: 8FDF744D4919943B
4 changed files with 10 additions and 15 deletions

View file

@ -17,7 +17,6 @@ Scotty. If not, see <https://www.gnu.org/licenses/>.
package backends package backends
import ( import (
"errors"
"fmt" "fmt"
"reflect" "reflect"
"strings" "strings"
@ -54,8 +53,7 @@ func ResolveBackend[T interface{}](config *viper.Viper) (T, error) {
if implements { if implements {
result = backend.(T) result = backend.(T)
} else { } else {
err = errors.New( err = fmt.Errorf("backend %s does not implement %s", backendName, interfaceName)
fmt.Sprintf("Backend %s does not implement %s", backendName, interfaceName))
} }
return result, err return result, err
@ -93,7 +91,7 @@ func resolveBackend(config *viper.Viper) (string, models.Backend, error) {
backendName := config.GetString("backend") backendName := config.GetString("backend")
backendType := knownBackends[backendName] backendType := knownBackends[backendName]
if backendType == nil { if backendType == nil {
return backendName, nil, fmt.Errorf("Unknown backend %s", backendName) return backendName, nil, fmt.Errorf("unknown backend %s", backendName)
} }
return backendName, backendType().FromConfig(config), nil return backendName, backendType().FromConfig(config), nil
} }

View file

@ -49,14 +49,14 @@ func TestResolveBackendUnknown(t *testing.T) {
config := viper.New() config := viper.New()
config.Set("backend", "foo") config.Set("backend", "foo")
_, err := backends.ResolveBackend[models.ListensImport](config) _, err := backends.ResolveBackend[models.ListensImport](config)
assert.EqualError(t, err, "Unknown backend foo") assert.EqualError(t, err, "unknown backend foo")
} }
func TestResolveBackendInvalidInterface(t *testing.T) { func TestResolveBackendInvalidInterface(t *testing.T) {
config := viper.New() config := viper.New()
config.Set("backend", "dump") config.Set("backend", "dump")
_, err := backends.ResolveBackend[models.ListensExport](config) _, err := backends.ResolveBackend[models.ListensExport](config)
assert.EqualError(t, err, "Backend dump does not implement ListensExport") assert.EqualError(t, err, "backend dump does not implement ListensExport")
} }
func TestGetBackends(t *testing.T) { func TestGetBackends(t *testing.T) {

View file

@ -16,7 +16,6 @@ Scotty. If not, see <https://www.gnu.org/licenses/>.
package lastfm package lastfm
import ( import (
"errors"
"fmt" "fmt"
"net/url" "net/url"
"sort" "sort"
@ -223,8 +222,8 @@ func (b *LastfmApiBackend) ImportListens(export models.ListensResult, importResu
importResult.ImportErrors = append(importResult.ImportErrors, ignoreMsg) importResult.ImportErrors = append(importResult.ImportErrors, ignoreMsg)
} }
} }
errMsg := fmt.Sprintf("Last.fm import ignored %v scrobbles", count-accepted) err := fmt.Errorf("last.fm import ignored %v scrobbles", count-accepted)
return importResult, errors.New(errMsg) return importResult, err
} }
importResult.UpdateTimestamp(listens[count-1].ListenedAt) importResult.UpdateTimestamp(listens[count-1].ListenedAt)

View file

@ -24,7 +24,6 @@ package scrobblerlog
import ( import (
"bufio" "bufio"
"encoding/csv" "encoding/csv"
"errors"
"fmt" "fmt"
"io" "io"
"strconv" "strconv"
@ -71,8 +70,7 @@ func Parse(data io.Reader, includeSkipped bool) (ScrobblerLog, error) {
// We consider only the last field (recording MBID) optional // We consider only the last field (recording MBID) optional
if len(row) < 7 { if len(row) < 7 {
line, _ := tsvReader.FieldPos(0) line, _ := tsvReader.FieldPos(0)
return result, errors.New(fmt.Sprintf( return result, fmt.Errorf("invalid record in scrobblerlog line %v", line)
"Invalid record in scrobblerlog line %v", line))
} }
rating := row[5] rating := row[5]
@ -132,15 +130,15 @@ func ReadHeader(reader *bufio.Reader, log *ScrobblerLog) error {
} }
if len(line) == 0 || line[0] != '#' { if len(line) == 0 || line[0] != '#' {
err = errors.New(fmt.Sprintf("Unexpected header (line %v)", i)) err = fmt.Errorf("unexpected header (line %v)", i)
} else { } else {
text := string(line) text := string(line)
if i == 0 && !strings.HasPrefix(text, "#AUDIOSCROBBLER/1") { if i == 0 && !strings.HasPrefix(text, "#AUDIOSCROBBLER/1") {
err = errors.New(fmt.Sprintf("Not a scrobbler log file")) err = fmt.Errorf("not a scrobbler log file")
} }
timezone, found := strings.CutPrefix(text, "#TZ/") timezone, found := strings.CutPrefix(text, "#TZ/")
if strings.HasPrefix(text, "#TZ/") { if found {
log.Timezone = timezone log.Timezone = timezone
} }