github
/
filebrowser
mirror of https://github.com/filebrowser/filebrowser
1
0
Fork 0
Code Issues Releases Wiki Activity

reduce code duplication

pull/618/head
1138-4EB 2019-01-08 03:03:52 +01:00
parent 88644664e4
commit ef56112711
2 changed files with 23 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
storage/bolt/users.go
View File

@ -12,32 +12,29 @@ type usersBackend struct {
db *storm.DB db *storm.DB
} }
func (st usersBackend) GetByID(id uint) (*users.User, error) { func (st usersBackend) GetBy(i interface{}) (user *users.User, err error) {
user := &users.User{} user = &users.User{}
err := st.db.One("ID", id, user)
if err == storm.ErrNotFound { var arg string
return nil, errors.ErrNotExist switch i.(type) {
case uint:
arg = "ID"
case string:
arg = "Username"
default:
return nil, errors.ErrInvalidDataType
} }
err = st.db.One(arg, i, user)
if err != nil { if err != nil {
if err == storm.ErrNotFound {
return nil, errors.ErrNotExist
}
return nil, err return nil, err
} }
return user, nil return
}
func (st usersBackend) GetByUsername(username string) (*users.User, error) {
user := &users.User{}
err := st.db.One("Username", username, user)
if err == storm.ErrNotFound {
return nil, errors.ErrNotExist
}
if err != nil {
return nil, err
}
return user, nil
} }
func (st usersBackend) Gets() ([]*users.User, error) { func (st usersBackend) Gets() ([]*users.User, error) {
@ -82,7 +79,7 @@ func (st usersBackend) DeleteByID(id uint) error {
} }
func (st usersBackend) DeleteByUsername(username string) error { func (st usersBackend) DeleteByUsername(username string) error {
user, err := st.GetByUsername(username) user, err := st.GetBy(username)
if err != nil { if err != nil {
return err return err
} }

25
users/storage.go
View File

@ -9,8 +9,7 @@ import (
// StorageBackend is the interface to implement for a users storage. // StorageBackend is the interface to implement for a users storage.
type StorageBackend interface { type StorageBackend interface {
GetByID(uint) (*User, error) GetBy(interface{}) (*User, error)
GetByUsername(string) (*User, error)
Gets() ([]*User, error) Gets() ([]*User, error)
Save(u *User) error Save(u *User) error
Update(u *User, fields ...string) error Update(u *User, fields ...string) error
@ -36,27 +35,13 @@ func NewStorage(back StorageBackend) *Storage {
// Get allows you to get a user by its name or username. The provided // Get allows you to get a user by its name or username. The provided
// id must be a string for username lookup or a uint for id lookup. If id // id must be a string for username lookup or a uint for id lookup. If id
// is neither, a ErrInvalidDataType will be returned. // is neither, a ErrInvalidDataType will be returned.
func (s *Storage) Get(baseScope string, id interface{}) (*User, error) { func (s *Storage) Get(baseScope string, id interface{}) (user *User, err error) {
var ( user, err = s.back.GetBy(id)
user *User
err error
)
switch id.(type) {
case string:
user, err = s.back.GetByUsername(id.(string))
case uint:
user, err = s.back.GetByID(id.(uint))
default:
return nil, errors.ErrInvalidDataType
}
if err != nil { if err != nil {
return nil, err return
} }
user.Clean(baseScope) user.Clean(baseScope)
return user, err return
} }
// Gets gets a list of all users. // Gets gets a list of all users.