From b33078fa33441c33c5d018b1b9a248c646549842 Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Thu, 22 Dec 2016 19:12:23 +0100 Subject: Bindata is optional and over-writable on restart (#354) * Moved conf assets into options folder * Dropped old bindata * Started to integrate options bindata and accessors * Do not enforce a builtin app.ini * Replaced bindata calls with options * Dropped bindata task from makefile, it's the generate task now * Always embedd app.ini to provide sane config defaults * Use sane defaults for the configuration * Defined default value for SSH_KEYGEN_PATH * Dropped "NEVER EVER MODIFY THIS FILE" header from app.ini * Fixed new paths in latest test additions * Drop bindata with make clean task * Set more proper default values --- modules/options/dynamic.go | 94 ++++++++++++++++++++++++++++++++++++++++++++++ modules/options/options.go | 51 +++++++++++++++++++++++++ modules/options/static.go | 84 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 229 insertions(+) create mode 100644 modules/options/dynamic.go create mode 100644 modules/options/options.go create mode 100644 modules/options/static.go (limited to 'modules/options') diff --git a/modules/options/dynamic.go b/modules/options/dynamic.go new file mode 100644 index 0000000000..28ed70c07d --- /dev/null +++ b/modules/options/dynamic.go @@ -0,0 +1,94 @@ +// +build !bindata + +// Copyright 2016 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package options + +import ( + "fmt" + "io/ioutil" + "path" + + "code.gitea.io/gitea/modules/setting" + "github.com/Unknwon/com" +) + +var ( + directories = make(directorySet) +) + +// Dir returns all files from static or custom directory. +func Dir(name string) ([]string, error) { + if directories.Filled(name) { + return directories.Get(name), nil + } + + var ( + result []string + ) + + customDir := path.Join(setting.CustomPath, "options", name) + + if com.IsDir(customDir) { + files, err := com.StatDir(customDir, true) + + if err != nil { + return []string{}, fmt.Errorf("Failed to read custom directory. %v", err) + } + + result = append(result, files...) + } + + staticDir := path.Join(setting.StaticRootPath, "options", name) + + if com.IsDir(staticDir) { + files, err := com.StatDir(staticDir, true) + + if err != nil { + return []string{}, fmt.Errorf("Failed to read static directory. %v", err) + } + + result = append(result, files...) + } + + return directories.AddAndGet(name, result), nil +} + +// Locale reads the content of a specific locale from static or custom path. +func Locale(name string) ([]byte, error) { + return fileFromDir(path.Join("locale", name)) +} + +// Readme reads the content of a specific readme from static or custom path. +func Readme(name string) ([]byte, error) { + return fileFromDir(path.Join("readme", name)) +} + +// Gitignore reads the content of a specific gitignore from static or custom path. +func Gitignore(name string) ([]byte, error) { + return fileFromDir(path.Join("gitignore", name)) +} + +// License reads the content of a specific license from static or custom path. +func License(name string) ([]byte, error) { + return fileFromDir(path.Join("license", name)) +} + +// fileFromDir is a helper to read files from static or custom path. +func fileFromDir(name string) ([]byte, error) { + customPath := path.Join(setting.CustomPath, "options", name) + + if com.IsFile(customPath) { + return ioutil.ReadFile(customPath) + } + + staticPath := path.Join(setting.StaticRootPath, "options", name) + + if com.IsFile(staticPath) { + return ioutil.ReadFile(staticPath) + } + + return []byte{}, fmt.Errorf("Asset file does not exist: %s", name) +} diff --git a/modules/options/options.go b/modules/options/options.go new file mode 100644 index 0000000000..4f0c69b335 --- /dev/null +++ b/modules/options/options.go @@ -0,0 +1,51 @@ +// Copyright 2016 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package options + +//go:generate go-bindata -tags "bindata" -ignore "TRANSLATORS" -pkg "options" -o "bindata.go" ../../options/... +//go:generate go fmt bindata.go +//go:generate sed -i.bak s/..\/..\/options\/// bindata.go +//go:generate rm -f bindata.go.bak + +type directorySet map[string][]string + +func (s directorySet) Add(key string, value []string) { + _, ok := s[key] + + if !ok { + s[key] = make([]string, 0, len(value)) + } + + s[key] = append(s[key], value...) +} + +func (s directorySet) Get(key string) []string { + _, ok := s[key] + + if ok { + result := []string{} + seen := map[string]string{} + + for _, val := range s[key] { + if _, ok := seen[val]; !ok { + result = append(result, val) + seen[val] = val + } + } + + return result + } + + return []string{} +} + +func (s directorySet) AddAndGet(key string, value []string) []string { + s.Add(key, value) + return s.Get(key) +} + +func (s directorySet) Filled(key string) bool { + return len(s[key]) > 0 +} diff --git a/modules/options/static.go b/modules/options/static.go new file mode 100644 index 0000000000..da97afb5f3 --- /dev/null +++ b/modules/options/static.go @@ -0,0 +1,84 @@ +// +build bindata + +// Copyright 2016 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package options + +import ( + "fmt" + "io/ioutil" + "path" + + "code.gitea.io/gitea/modules/setting" + "github.com/Unknwon/com" +) + +var ( + directories = make(directorySet) +) + +// Dir returns all files from bindata or custom directory. +func Dir(name string) ([]string, error) { + if directories.Filled(name) { + return directories.Get(name), nil + } + + var ( + result []string + ) + + customDir := path.Join(setting.CustomPath, "options", name) + + if com.IsDir(customDir) { + files, err := com.StatDir(customDir, true) + + if err != nil { + return []string{}, fmt.Errorf("Failed to read custom directory. %v", err) + } + + result = append(result, files...) + } + + files, err := AssetDir(path.Join("..", "..", "options", name)) + + if err != nil { + return []string{}, fmt.Errorf("Failed to read embedded directory. %v", err) + } + + result = append(result, files...) + + return directories.AddAndGet(name, result), nil +} + +// Locale reads the content of a specific locale from bindata or custom path. +func Locale(name string) ([]byte, error) { + return fileFromDir(path.Join("locale", name)) +} + +// Readme reads the content of a specific readme from bindata or custom path. +func Readme(name string) ([]byte, error) { + return fileFromDir(path.Join("readme", name)) +} + +// Gitignore reads the content of a gitignore locale from bindata or custom path. +func Gitignore(name string) ([]byte, error) { + return fileFromDir(path.Join("gitignore", name)) +} + +// License reads the content of a specific license from bindata or custom path. +func License(name string) ([]byte, error) { + return fileFromDir(path.Join("license", name)) +} + +// fileFromDir is a helper to read files from bindata or custom path. +func fileFromDir(name string) ([]byte, error) { + customPath := path.Join(setting.CustomPath, "options", name) + + if com.IsFile(customPath) { + return ioutil.ReadFile(customPath) + } + + return Asset(name) +} -- cgit v1.2.3