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 /modules/doctor | |
| 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 'modules/doctor')
| -rw-r--r-- | modules/doctor/paths.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/modules/doctor/paths.go b/modules/doctor/paths.go index 7b1c6ce9ad..d7bf2539e7 100644 --- a/modules/doctor/paths.go +++ b/modules/doctor/paths.go @@ -9,7 +9,6 @@ import ( "os" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/options" "code.gitea.io/gitea/modules/setting" ) @@ -79,7 +78,7 @@ func checkConfigurationFiles(ctx context.Context, logger log.Logger, autofix boo {"Log Root Path", setting.Log.RootPath, true, true, true}, } - if options.IsDynamic() { + if !setting.HasBuiltinBindata { configurationFiles = append(configurationFiles, configurationFile{"Static File Root Path", setting.StaticRootPath, true, true, false}) } |