More simplification

Signed-off-by: Andrew Thornton <[email protected]>

Author: zeripath

modules/setting/attachment.go

@@ -5,10 +5,7 @@
 package setting
 
 import (
-	"path/filepath"
 	"strings"
-
-	"code.gitea.io/gitea/modules/log"
 )
 
 var (
@@ -33,37 +30,11 @@ var (
 
 func newAttachmentService() {
 	sec := Cfg.Section("attachment")
-	Attachment.Storage.Type = sec.Key("STORAGE_TYPE").MustString("")
-	if Attachment.Storage.Type == "" {
-		Attachment.Storage.Type = "default"
-	}
-
-	if Attachment.Storage.Type != LocalStorageType && Attachment.Storage.Type != MinioStorageType {
-		storage, ok := storages[Attachment.Storage.Type]
-		if !ok {
-			log.Fatal("Failed to get attachment storage type: %s", Attachment.Storage.Type)
-		}
-		Attachment.Storage = storage
-
-		for _, key := range storage.Section.Keys() {
-			if !sec.HasKey(key.Name()) {
-				_, _ = sec.NewKey(key.Name(), key.Value())
-			}
-		}
-		Attachment.Storage.Section = sec
-	}
-
-	// Override
-	Attachment.ServeDirect = sec.Key("SERVE_DIRECT").MustBool(Attachment.ServeDirect)
-
-	Attachment.Storage.Path = sec.Key("PATH").MustString(filepath.Join(AppDataPath, "attachments"))
-	if !filepath.IsAbs(Attachment.Storage.Path) {
-		Attachment.Storage.Path = filepath.Join(AppWorkPath, Attachment.Storage.Path)
-		sec.Key("PATH").SetValue(Attachment.Storage.Path)
-	}
+	storageType := sec.Key("STORAGE_TYPE").MustString("")
 
-	sec.Key("MINIO_BASE_PATH").MustString("attachments/")
+	Attachment.Storage = getStorage("attachment", storageType, sec)
 
+	// Other settings
 	Attachment.AllowedTypes = strings.Replace(sec.Key("ALLOWED_TYPES").MustString("image/jpeg,image/png,application/zip,application/gzip"), "|", ",", -1)
 	Attachment.MaxSize = sec.Key("MAX_SIZE").MustInt64(4)
 	Attachment.MaxFiles = sec.Key("MAX_FILES").MustInt(5)

modules/setting/lfs.go

@@ -37,35 +37,15 @@ func newLFSService() {
 	}
 
 	lfsSec := Cfg.Section("lfs")
-	LFS.Storage.Type = lfsSec.Key("STORAGE_TYPE").MustString("")
-	if LFS.Storage.Type == "" {
-		LFS.Storage.Type = "default"
-	}
+	storageType := lfsSec.Key("STORAGE_TYPE").MustString("")
 
-	if LFS.Storage.Type != LocalStorageType && LFS.Storage.Type != MinioStorageType {
-		storage, ok := storages[LFS.Storage.Type]
-		if !ok {
-			log.Fatal("Failed to get lfs storage type: %s", LFS.Storage.Type)
-		}
-		LFS.Storage = storage
+	// Specifically default PATH to LFS_CONTENT_PATH
+	lfsSec.Key("PATH").MustString(
+		sec.Key("LFS_CONTENT_PATH").String())
 
-		for _, key := range storage.Section.Keys() {
-			if !lfsSec.HasKey(key.Name()) {
-				_, _ = lfsSec.NewKey(key.Name(), key.Value())
-			}
-		}
-		LFS.Storage.Section = lfsSec
-	}
-
-	// Override
-	LFS.ServeDirect = lfsSec.Key("SERVE_DIRECT").MustBool(LFS.ServeDirect)
-	LFS.Storage.Path = sec.Key("LFS_CONTENT_PATH").MustString(filepath.Join(AppDataPath, "lfs"))
-	LFS.Storage.Path = lfsSec.Key("PATH").MustString(LFS.Storage.Path)
-	if !filepath.IsAbs(LFS.Storage.Path) {
-		lfsSec.Key("PATH").SetValue(filepath.Join(AppWorkPath, LFS.Storage.Path))
-	}
-	lfsSec.Key("MINIO_BASE_PATH").MustString("lfs/")
+	LFS.Storage = getStorage("lfs", storageType, lfsSec)
 
+	// Rest of LFS service settings
 	if LFS.LocksPagingNum == 0 {
 		LFS.LocksPagingNum = 50
 	}

modules/setting/setting.go

@@ -759,7 +759,6 @@ func NewContext() {
 		}
 	}
 
-	newStorageService()
 	newAttachmentService()
 	newLFSService()
 

modules/setting/storage.go

@@ -5,10 +5,9 @@
 package setting
 
 import (
+	"path/filepath"
 	"reflect"
-	"strings"
 
-	"code.gitea.io/gitea/modules/log"
 	ini "gopkg.in/ini.v1"
 )
 
@@ -38,34 +37,51 @@ func (s *Storage) MapTo(v interface{}) error {
 	return nil
 }
 
-var (
-	storages = make(map[string]Storage)
-)
+func getStorage(name, typ string, overrides ...*ini.Section) Storage {
+	sectionName := "storage"
+	if len(name) > 0 {
+		sectionName = sectionName + "." + typ
+	}
+	sec := Cfg.Section(sectionName)
+
+	if len(overrides) == 0 {
+		overrides = []*ini.Section{
+			Cfg.Section(sectionName + "." + name),
+		}
+	}
 
-func getStorage(sec *ini.Section) Storage {
 	var storage Storage
+
 	storage.Type = sec.Key("STORAGE_TYPE").MustString(LocalStorageType)
-	storage.Section = sec
 	storage.ServeDirect = sec.Key("SERVE_DIRECT").MustBool(false)
+
+	// Global Defaults
 	sec.Key("MINIO_ENDPOINT").MustString("localhost:9000")
 	sec.Key("MINIO_ACCESS_KEY_ID").MustString("")
 	sec.Key("MINIO_SECRET_ACCESS_KEY").MustString("")
 	sec.Key("MINIO_BUCKET").MustString("gitea")
 	sec.Key("MINIO_LOCATION").MustString("us-east-1")
 	sec.Key("MINIO_USE_SSL").MustBool(false)
-	return storage
-}
 
-func newStorageService() {
-	sec := Cfg.Section("storage")
-	storages["default"] = getStorage(sec)
+	storage.Section = sec
 
-	for _, sec := range Cfg.Section("storage").ChildSections() {
-		name := strings.TrimPrefix(sec.Name(), "storage.")
-		if name == "default" || name == LocalStorageType || name == MinioStorageType {
-			log.Error("storage name %s is system reserved!", name)
-			continue
+	for _, override := range overrides {
+		for _, key := range storage.Section.Keys() {
+			if !override.HasKey(key.Name()) {
+				_, _ = override.NewKey(key.Name(), key.Value())
+			}
 		}
-		storages[name] = getStorage(sec)
+		storage.ServeDirect = override.Key("SERVE_DIRECT").MustBool(false)
+		storage.Section = override
 	}
+
+	// Specific defaults
+	storage.Path = storage.Section.Key("PATH").MustString(filepath.Join(AppDataPath, name))
+	if !filepath.IsAbs(storage.Path) {
+		storage.Path = filepath.Join(AppWorkPath, storage.Path)
+		storage.Section.Key("PATH").SetValue(storage.Path)
+	}
+	storage.Section.Key("MINIO_BASE_PATH").MustString(name + "/")
+
+	return storage
 }