mirrors/filebrowser
1
0
Fork 0
mirror of https://github.com/filebrowser/filebrowser.git synced 2025-11-26 14:25:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix golangci-lint errors

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/bolt/bolt.go
View File

@@ -17,7 +17,7 @@ func NewStorage(db *storm.DB) (*storage.Storage, error) {
settingsStore := settings.NewStorage(settingsBackend{db: db})
authStore := auth.NewStorage(authBackend{db: db}, userStore)
err := save(db, "version", 2) //nolint:gomnd
err := save(db, "version", 2)
if err != nil {
return nil, err
}

2
storage/bolt/importer/users.go
View File

@@ -32,7 +32,7 @@ type oldUser struct {
func readOldUsers(db *storm.DB) ([]*oldUser, error) {
var oldUsers []*oldUser
err := db.Bolt.View(func(tx *bolt.Tx) error {
return tx.Bucket([]byte("User")).ForEach(func(k []byte, v []byte) error {
return tx.Bucket([]byte("User")).ForEach(func(_ []byte, v []byte) error {
if len(v) > 0 && string(v)[0] == '{' {
user := &oldUser{}
err := json.Unmarshal(v, user)

26
storage/bolt/share.go
View File

@@ -1,10 +1,12 @@
package bolt
import (
"errors"
"github.com/asdine/storm/v3"
"github.com/asdine/storm/v3/q"
"github.com/filebrowser/filebrowser/v2/errors"
fbErrors "github.com/filebrowser/filebrowser/v2/errors"
"github.com/filebrowser/filebrowser/v2/share"
)
@@ -15,8 +17,8 @@ type shareBackend struct {
func (s shareBackend) All() ([]*share.Link, error) {
var v []*share.Link
err := s.db.All(&v)
if err == storm.ErrNotFound {
return v, errors.ErrNotExist
if errors.Is(err, storm.ErrNotFound) {
return v, fbErrors.ErrNotExist
}
return v, err
@@ -25,8 +27,8 @@ func (s shareBackend) All() ([]*share.Link, error) {
func (s shareBackend) FindByUserID(id uint) ([]*share.Link, error) {
var v []*share.Link
err := s.db.Select(q.Eq("UserID", id)).Find(&v)
if err == storm.ErrNotFound {
return v, errors.ErrNotExist
if errors.Is(err, storm.ErrNotFound) {
return v, fbErrors.ErrNotExist
}
return v, err
@@ -35,8 +37,8 @@ func (s shareBackend) FindByUserID(id uint) ([]*share.Link, error) {
func (s shareBackend) GetByHash(hash string) (*share.Link, error) {
var v share.Link
err := s.db.One("Hash", hash, &v)
if err == storm.ErrNotFound {
return nil, errors.ErrNotExist
if errors.Is(err, storm.ErrNotFound) {
return nil, fbErrors.ErrNotExist
}
return &v, err
@@ -45,8 +47,8 @@ func (s shareBackend) GetByHash(hash string) (*share.Link, error) {
func (s shareBackend) GetPermanent(path string, id uint) (*share.Link, error) {
var v share.Link
err := s.db.Select(q.Eq("Path", path), q.Eq("Expire", 0), q.Eq("UserID", id)).First(&v)
if err == storm.ErrNotFound {
return nil, errors.ErrNotExist
if errors.Is(err, storm.ErrNotFound) {
return nil, fbErrors.ErrNotExist
}
return &v, err
@@ -55,8 +57,8 @@ func (s shareBackend) GetPermanent(path string, id uint) (*share.Link, error) {
func (s shareBackend) Gets(path string, id uint) ([]*share.Link, error) {
var v []*share.Link
err := s.db.Select(q.Eq("Path", path), q.Eq("UserID", id)).Find(&v)
if err == storm.ErrNotFound {
return v, errors.ErrNotExist
if errors.Is(err, storm.ErrNotFound) {
return v, fbErrors.ErrNotExist
}
return v, err
@@ -68,7 +70,7 @@ func (s shareBackend) Save(l *share.Link) error {
func (s shareBackend) Delete(hash string) error {
err := s.db.DeleteStruct(&share.Link{Hash: hash})
if err == storm.ErrNotFound {
if errors.Is(err, storm.ErrNotFound) {
return nil
}
return err

17
storage/bolt/users.go
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
}

8
storage/bolt/utils.go
View File

@@ -1,15 +1,17 @@
package bolt
import (
"errors"
"github.com/asdine/storm/v3"
"github.com/filebrowser/filebrowser/v2/errors"
fbErrors "github.com/filebrowser/filebrowser/v2/errors"
)
func get(db *storm.DB, name string, to interface{}) error {
err := db.Get("config", name, to)
if err == storm.ErrNotFound {
return errors.ErrNotExist
if errors.Is(err, storm.ErrNotFound) {
return fbErrors.ErrNotExist
}
return err