zias/wolk
1
0
Fork 0
Code Issues Pull Requests Actions 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

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