Fix settings

Author: lunny

models/unit_tests.go

@@ -71,10 +71,8 @@ func MainTest(m *testing.M, pathToGiteaRoot string) {
 
 	setting.LFS.Storage.Path = filepath.Join(setting.AppDataPath, "lfs")
 
-	setting.Avatar.Storage.Type = setting.LocalStorageType
 	setting.Avatar.Storage.Path = filepath.Join(setting.AppDataPath, "avatars")
 
-	setting.RepoAvatar.Storage.Type = setting.LocalStorageType
 	setting.RepoAvatar.Storage.Path = filepath.Join(setting.AppDataPath, "repo-avatars")
 
 	if err = storage.Init(); err != nil {

modules/setting/picture.go

@@ -6,7 +6,6 @@ package setting
 
 import (
 	"net/url"
-	"path/filepath"
 
 	"code.gitea.io/gitea/modules/log"
 
@@ -18,14 +17,11 @@ var (
 	// Picture settings
 	Avatar = struct {
 		Storage
+
 		MaxWidth    int
 		MaxHeight   int
 		MaxFileSize int64
 	}{
-		Storage: Storage{
-			Type:        LocalStorageType,
-			ServeDirect: false,
-		},
 		MaxWidth:    4096,
 		MaxHeight:   3072,
 		MaxFileSize: 1048576,
@@ -39,43 +35,22 @@ var (
 
 	RepoAvatar = struct {
 		Storage
+
 		Fallback      string
 		FallbackImage string
-	}{
-		Storage: Storage{
-			Type:        LocalStorageType,
-			ServeDirect: false,
-		},
-	}
+	}{}
 )
 
 func newPictureService() {
 	sec := Cfg.Section("picture")
 
-	Avatar.Storage.Type = sec.Key("AVATAR_STORAGE_TYPE").MustString("")
-	if Avatar.Storage.Type == "" {
-		Avatar.Storage.Type = "default"
-	}
-
-	storage, ok := storages[Avatar.Storage.Type]
-	if !ok {
-		log.Fatal("Failed to get avatar storage type: %s", Avatar.Storage.Type)
-	}
-	Avatar.Storage = storage
+	avatarSec := Cfg.Section("avatar")
+	storageType := sec.Key("AVATAR_STORAGE_TYPE").MustString("")
+	// Specifically default PATH to AVATAR_UPLOAD_PATH
+	avatarSec.Key("PATH").MustString(
+		sec.Key("AVATAR_UPLOAD_PATH").String())
 
-	switch Avatar.Storage.Type {
-	case LocalStorageType:
-		Avatar.Path = sec.Key("AVATAR_UPLOAD_PATH").MustString(Avatar.Path)
-		if Avatar.Path == "" {
-			Avatar.Path = filepath.Join(AppDataPath, "avatars")
-		}
-		forcePathSeparator(Avatar.Path)
-		if !filepath.IsAbs(Avatar.Path) {
-			Avatar.Path = filepath.Join(AppWorkPath, Avatar.Path)
-		}
-	case MinioStorageType:
-		Avatar.Minio.BasePath = sec.Key("AVATAR_UPLOAD_PATH").MustString("avatars/")
-	}
+	Avatar.Storage = getStorage("avatar", storageType, avatarSec)
 
 	Avatar.MaxWidth = sec.Key("AVATAR_MAX_WIDTH").MustInt(4096)
 	Avatar.MaxHeight = sec.Key("AVATAR_MAX_HEIGHT").MustInt(3072)
@@ -126,27 +101,13 @@ func newPictureService() {
 func newRepoAvatarService() {
 	sec := Cfg.Section("picture")
 
-	RepoAvatar.Storage.Type = sec.Key("REPOSITORY_AVATAR_STORAGE_TYPE").MustString("")
-	if RepoAvatar.Storage.Type == "" {
-		RepoAvatar.Storage.Type = "default"
-	}
+	repoAvatarSec := Cfg.Section("repo-avatar")
+	storageType := sec.Key("REPOSITORY_AVATAR_STORAGE_TYPE").MustString("")
+	// Specifically default PATH to AVATAR_UPLOAD_PATH
+	repoAvatarSec.Key("PATH").MustString(
+		sec.Key("REPOSITORY_AVATAR_UPLOAD_PATH").String())
 
-	storage, ok := storages[RepoAvatar.Storage.Type]
-	if !ok {
-		log.Fatal("Failed to get repo-avatar storage type: %s", RepoAvatar.Storage.Type)
-	}
-	RepoAvatar.Storage = storage
-
-	switch RepoAvatar.Storage.Type {
-	case LocalStorageType:
-		RepoAvatar.Path = sec.Key("REPOSITORY_AVATAR_UPLOAD_PATH").MustString(filepath.Join(AppDataPath, "repo-avatars"))
-		forcePathSeparator(RepoAvatar.Path)
-		if !filepath.IsAbs(RepoAvatar.Path) {
-			RepoAvatar.Path = filepath.Join(AppWorkPath, RepoAvatar.Path)
-		}
-	case MinioStorageType:
-		RepoAvatar.Minio.BasePath = sec.Key("REPOSITORY_AVATAR_MINIO_BASE_PATH").MustString("repo-avatars/")
-	}
+	RepoAvatar.Storage = getStorage("avatar", storageType, repoAvatarSec)
 
 	RepoAvatar.Fallback = sec.Key("REPOSITORY_AVATAR_FALLBACK").MustString("none")
 	RepoAvatar.FallbackImage = sec.Key("REPOSITORY_AVATAR_FALLBACK_IMAGE").MustString("/img/repo_default.png")

modules/storage/storage.go

@@ -141,7 +141,7 @@ func NewStorage(typStr string, cfg interface{}) (ObjectStorage, error) {
 }
 
 func initAvatars() (err error) {
-	Avatars, err = initStorage(setting.Avatar.Storage)
+	Avatars, err = NewStorage(setting.Avatar.Storage.Type, setting.Avatar.Storage)
 	return
 }
 
@@ -156,6 +156,6 @@ func initLFS() (err error) {
 }
 
 func initRepoAvatars() (err error) {
-	RepoAvatars, err = initStorage(setting.RepoAvatar.Storage)
+	RepoAvatars, err = NewStorage(setting.RepoAvatar.Storage.Type, setting.RepoAvatar.Storage)
 	return
 }