nicoeri/filebrowser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

still run fn when exec disabled

Browse Source
This commit is contained in:
Aiden McClelland 2020-09-24 10:17:02 -06:00
parent dba8d53c9f
commit 00e671e9b9
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
runner/runner.go
View File

@ -19,12 +19,10 @@ type Runner struct {
// RunHook runs the hooks for the before and after event. // RunHook runs the hooks for the before and after event.
func (r *Runner) RunHook(fn func() error, evt, path, dst string, user *users.User) error { func (r *Runner) RunHook(fn func() error, evt, path, dst string, user *users.User) error {
if !r.Enabled {
return nil
}
path = user.FullPath(path) path = user.FullPath(path)
dst = user.FullPath(dst) dst = user.FullPath(dst)
if r.Enabled {
if val, ok := r.Commands["before_"+evt]; ok { if val, ok := r.Commands["before_"+evt]; ok {
for _, command := range val { for _, command := range val {
err := r.exec(command, "before_"+evt, path, dst, user) err := r.exec(command, "before_"+evt, path, dst, user)
@ -33,12 +31,14 @@ func (r *Runner) RunHook(fn func() error, evt, path, dst string, user *users.Use
} }
} }
} }
}
err := fn() err := fn()
if err != nil { if err != nil {
return err return err
} }
if r.Enabled {
if val, ok := r.Commands["after_"+evt]; ok { if val, ok := r.Commands["after_"+evt]; ok {
for _, command := range val { for _, command := range val {
err := r.exec(command, "after_"+evt, path, dst, user) err := r.exec(command, "after_"+evt, path, dst, user)
@ -47,6 +47,7 @@ func (r *Runner) RunHook(fn func() error, evt, path, dst string, user *users.Use
} }
} }
} }
}
return nil return nil
} }