Skip to content

Improve assets handler middleware #15961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
May 30, 2021
Merged

Improve assets handler middleware #15961

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
6ab513f
Use route to serve assets but not middleware
lunny May 23, 2021
c2ff37b
Fix build error with bindata tag
lunny May 24, 2021
1baec0b
convert path to absolute
lunny May 24, 2021
a38bfd6
fix build
lunny May 24, 2021
86b5006
reduce function stack
lunny May 24, 2021
389b91e
Add tests for assets
lunny May 24, 2021
d175dba
Remove test for assets because they are not generated
lunny May 24, 2021
0fba106
Use a http function to serve assets
lunny May 29, 2021
b58830f
Still use middleware to serve assets then less middleware stack for a…
lunny May 29, 2021
83830bf
Move serveContent to original position
lunny May 29, 2021
20e2150
remove unnecessary blank line change
lunny May 29, 2021
c07ef99
Fix bug for /assets* requests
lunny May 29, 2021
3c4d221
clean code
lunny May 29, 2021
2d56c40
Merge branch 'main' into lunny/assets
zeripath May 30, 2021
1315852
Merge branch 'main' into lunny/assets
zeripath May 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use a http function to serve assets
  • Loading branch information
@lunny
lunny committed May 29, 2021
commit 0fba10663a06afc65aa90617114e94546a0c7c1c
38 changes: 18 additions & 20 deletions modules/public/public.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,30 +22,28 @@ type Options struct {
}

// AssetsHandler implements the static handler for serving custom or original assets.
func AssetsHandler(opts *Options) func(http.Handler) http.Handler {
return func(next http.Handler) http.Handler {
var custPath = filepath.Join(setting.CustomPath, "public")
if !filepath.IsAbs(custPath) {
custPath = filepath.Join(setting.AppWorkPath, custPath)
}
func AssetsHandler(opts *Options) func(resp http.ResponseWriter, req *http.Request) {
var custPath = filepath.Join(setting.CustomPath, "public")
if !filepath.IsAbs(custPath) {
custPath = filepath.Join(setting.AppWorkPath, custPath)
}

if !filepath.IsAbs(opts.Directory) {
opts.Directory = filepath.Join(setting.AppWorkPath, opts.Directory)
}
if !filepath.IsAbs(opts.Directory) {
opts.Directory = filepath.Join(setting.AppWorkPath, opts.Directory)
}

return http.HandlerFunc(func(resp http.ResponseWriter, req *http.Request) {
// custom files
if opts.handle(resp, req, http.Dir(custPath), opts.Prefix) {
return
}
return func(resp http.ResponseWriter, req *http.Request) {
// custom files
if opts.handle(resp, req, http.Dir(custPath), opts.Prefix) {
return
}

// internal files
if opts.handle(resp, req, fileSystem(opts.Directory), opts.Prefix) {
return
}
// internal files
if opts.handle(resp, req, fileSystem(opts.Directory), opts.Prefix) {
return
}

resp.WriteHeader(404)
})
resp.WriteHeader(404)
}
}

Expand Down