refactor: cleanup package names (#5605)

This commit is contained in:
Henrique Dias
2025-12-06 10:52:11 +01:00
committed by GitHub
parent a6934e40ff
commit f029c3005e
33 changed files with 78 additions and 78 deletions

View File

@@ -4,7 +4,7 @@ import (
"github.com/asdine/storm/v3"
"github.com/filebrowser/filebrowser/v2/auth"
"github.com/filebrowser/filebrowser/v2/errors"
fberrors "github.com/filebrowser/filebrowser/v2/errors"
"github.com/filebrowser/filebrowser/v2/settings"
)
@@ -25,7 +25,7 @@ func (s authBackend) Get(t settings.AuthMethod) (auth.Auther, error) {
case auth.MethodNoAuth:
auther = &auth.NoAuth{}
default:
return nil, errors.ErrInvalidAuthMethod
return nil, fberrors.ErrInvalidAuthMethod
}
return auther, get(s.db, "auther", auther)

View File

@@ -6,7 +6,7 @@ import (
"github.com/asdine/storm/v3"
"github.com/asdine/storm/v3/q"
fbErrors "github.com/filebrowser/filebrowser/v2/errors"
fberrors "github.com/filebrowser/filebrowser/v2/errors"
"github.com/filebrowser/filebrowser/v2/share"
)
@@ -18,7 +18,7 @@ func (s shareBackend) All() ([]*share.Link, error) {
var v []*share.Link
err := s.db.All(&v)
if errors.Is(err, storm.ErrNotFound) {
return v, fbErrors.ErrNotExist
return v, fberrors.ErrNotExist
}
return v, err
@@ -28,7 +28,7 @@ func (s shareBackend) FindByUserID(id uint) ([]*share.Link, error) {
var v []*share.Link
err := s.db.Select(q.Eq("UserID", id)).Find(&v)
if errors.Is(err, storm.ErrNotFound) {
return v, fbErrors.ErrNotExist
return v, fberrors.ErrNotExist
}
return v, err
@@ -38,7 +38,7 @@ func (s shareBackend) GetByHash(hash string) (*share.Link, error) {
var v share.Link
err := s.db.One("Hash", hash, &v)
if errors.Is(err, storm.ErrNotFound) {
return nil, fbErrors.ErrNotExist
return nil, fberrors.ErrNotExist
}
return &v, err
@@ -48,7 +48,7 @@ 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 errors.Is(err, storm.ErrNotFound) {
return nil, fbErrors.ErrNotExist
return nil, fberrors.ErrNotExist
}
return &v, err
@@ -58,7 +58,7 @@ 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 errors.Is(err, storm.ErrNotFound) {
return v, fbErrors.ErrNotExist
return v, fberrors.ErrNotExist
}
return v, err

View File

@@ -7,7 +7,7 @@ import (
"github.com/asdine/storm/v3"
fbErrors "github.com/filebrowser/filebrowser/v2/errors"
fberrors "github.com/filebrowser/filebrowser/v2/errors"
"github.com/filebrowser/filebrowser/v2/users"
)
@@ -25,14 +25,14 @@ func (st usersBackend) GetBy(i interface{}) (user *users.User, err error) {
case string:
arg = "Username"
default:
return nil, fbErrors.ErrInvalidDataType
return nil, fberrors.ErrInvalidDataType
}
err = st.db.One(arg, i, user)
if err != nil {
if errors.Is(err, storm.ErrNotFound) {
return nil, fbErrors.ErrNotExist
return nil, fberrors.ErrNotExist
}
return nil, err
}
@@ -44,7 +44,7 @@ func (st usersBackend) Gets() ([]*users.User, error) {
var allUsers []*users.User
err := st.db.All(&allUsers)
if errors.Is(err, storm.ErrNotFound) {
return nil, fbErrors.ErrNotExist
return nil, fberrors.ErrNotExist
}
if err != nil {
@@ -76,7 +76,7 @@ func (st usersBackend) Update(user *users.User, fields ...string) error {
func (st usersBackend) Save(user *users.User) error {
err := st.db.Save(user)
if errors.Is(err, storm.ErrAlreadyExists) {
return fbErrors.ErrExist
return fberrors.ErrExist
}
return err
}

View File

@@ -5,13 +5,13 @@ import (
"github.com/asdine/storm/v3"
fbErrors "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 errors.Is(err, storm.ErrNotFound) {
return fbErrors.ErrNotExist
return fberrors.ErrNotExist
}
return err