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/repository/init.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 'modules/repository/init.go')
| -rw-r--r-- | modules/repository/init.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/repository/init.go b/modules/repository/init.go index 38dd8a0c4f..cb353f2496 100644 --- a/modules/repository/init.go +++ b/modules/repository/init.go @@ -79,7 +79,7 @@ func LoadRepoConfig() error { typeFiles := make([]optionFileList, len(types)) for i, t := range types { var err error - if typeFiles[i].all, err = options.Dir(t); err != nil { + if typeFiles[i].all, err = options.AssetFS().ListFiles(t, true); err != nil { return fmt.Errorf("failed to list %s files: %w", t, err) } sort.Strings(typeFiles[i].all) |