You've already forked filebrowser
mirror of
https://github.com/filebrowser/filebrowser.git
synced 2025-11-26 14:25:26 +08:00
feat: wrap commands to send info (#612)
Wrap commands in a better way to pass storage
This commit is contained in:
10
cmd/rules.go
10
cmd/rules.go
@@ -32,18 +32,14 @@ rules.`,
|
||||
},
|
||||
}
|
||||
|
||||
func runRules(cmd *cobra.Command, users func(*users.User, *storage.Storage), global func(*settings.Settings, *storage.Storage)) {
|
||||
db := getDB()
|
||||
defer db.Close()
|
||||
st := getStorage(db)
|
||||
|
||||
func runRules(st *storage.Storage, cmd *cobra.Command, users func(*users.User), global func(*settings.Settings)) {
|
||||
id := getUserIdentifier(cmd)
|
||||
if id != nil {
|
||||
user, err := st.Users.Get("", id)
|
||||
checkErr(err)
|
||||
|
||||
if users != nil {
|
||||
users(user, st)
|
||||
users(user)
|
||||
}
|
||||
|
||||
printRules(user.Rules, id)
|
||||
@@ -54,7 +50,7 @@ func runRules(cmd *cobra.Command, users func(*users.User, *storage.Storage), glo
|
||||
checkErr(err)
|
||||
|
||||
if global != nil {
|
||||
global(settings, st)
|
||||
global(settings)
|
||||
}
|
||||
|
||||
printRules(settings.Rules, id)
|
||||
|
||||
Reference in New Issue
Block a user