chore: fix golangci-lint errors

This commit is contained in:
Oleg Lobanov
2024-04-01 18:24:06 +02:00
parent d194d71293
commit ae0af1f996
54 changed files with 452 additions and 475 deletions

View File

@@ -1,12 +1,13 @@
package bolt
import (
"errors"
"fmt"
"reflect"
"github.com/asdine/storm/v3"
"github.com/filebrowser/filebrowser/v2/errors"
fbErrors "github.com/filebrowser/filebrowser/v2/errors"
"github.com/filebrowser/filebrowser/v2/users"
)
@@ -24,14 +25,14 @@ func (st usersBackend) GetBy(i interface{}) (user *users.User, err error) {
case string:
arg = "Username"
default:
return nil, errors.ErrInvalidDataType
return nil, fbErrors.ErrInvalidDataType
}
err = st.db.One(arg, i, user)
if err != nil {
if err == storm.ErrNotFound {
return nil, errors.ErrNotExist
if errors.Is(err, storm.ErrNotFound) {
return nil, fbErrors.ErrNotExist
}
return nil, err
}
@@ -42,8 +43,8 @@ func (st usersBackend) GetBy(i interface{}) (user *users.User, err error) {
func (st usersBackend) Gets() ([]*users.User, error) {
var allUsers []*users.User
err := st.db.All(&allUsers)
if err == storm.ErrNotFound {
return nil, errors.ErrNotExist
if errors.Is(err, storm.ErrNotFound) {
return nil, fbErrors.ErrNotExist
}
if err != nil {
@@ -74,8 +75,8 @@ func (st usersBackend) Update(user *users.User, fields ...string) error {
func (st usersBackend) Save(user *users.User) error {
err := st.db.Save(user)
if err == storm.ErrAlreadyExists {
return errors.ErrExist
if errors.Is(err, storm.ErrAlreadyExists) {
return fbErrors.ErrExist
}
return err
}