diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2023-04-12 18:16:45 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-12 18:16:45 +0800 |
| commit | 50a72e7a83a16d183a264e969a73cdbc7fb808f4 (patch) | |
| tree | 013456110621c36edb3fa0d1bb77906ba8d4e013 /routers/web/web.go | |
| parent | 42919ccb7cd32ab67d0878baf2bac6cd007899a8 (diff) | |
| download | gitea-50a72e7a83a16d183a264e969a73cdbc7fb808f4.tar.gz gitea-50a72e7a83a16d183a264e969a73cdbc7fb808f4.zip | |
Use a general approach to access custom/static/builtin assets (#24022)
The idea is to use a Layered Asset File-system (modules/assetfs/layered.go)
For example: when there are 2 layers: "custom", "builtin", when access
to asset "my/page.tmpl", the Layered Asset File-system will first try to
use "custom" assets, if not found, then use "builtin" assets.
This approach will hugely simplify a lot of code, make them testable.
Other changes:
* Simplify the AssetsHandlerFunc code
* Simplify the `gitea embedded` sub-command code
---------
Co-authored-by: Jason Song <i@wolfogre.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Diffstat (limited to 'routers/web/web.go')
| -rw-r--r-- | routers/web/web.go | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/routers/web/web.go b/routers/web/web.go index cee8bafcdb..a4a1b7113c 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -103,11 +103,7 @@ func buildAuthGroup() *auth_service.Group { func Routes(ctx gocontext.Context) *web.Route { routes := web.NewRoute() - routes.Use(web.WrapWithPrefix(public.AssetsURLPathPrefix, public.AssetsHandlerFunc(&public.Options{ - Directory: path.Join(setting.StaticRootPath, "public"), - Prefix: public.AssetsURLPathPrefix, - CorsHandler: CorsHandler(), - }), "AssetsHandler")) + routes.Use(web.WrapWithPrefix("/assets/", web.Wrap(CorsHandler(), public.AssetsHandlerFunc("/assets/")), "AssetsHandler")) sessioner := session.Sessioner(session.Options{ Provider: setting.SessionConfig.Provider, |