refactor the codes

Author: lunny

integrations/sqlite.ini.tmpl

@@ -66,12 +66,12 @@ PROVIDER = file
 PROVIDER_CONFIG = integrations/gitea-integration-sqlite/data/sessions
 
 [log]
-MODE                 = test,file,console
+MODE                 = test,file
 ROOT_PATH            = sqlite-log
 REDIRECT_MACARON_LOG = true
 ROUTER               = ,
 MACARON              = ,
-XORM                 = file,console
+XORM                 = file
 
 [log.test]
 LEVEL                = Info
@@ -86,4 +86,4 @@ SECRET_KEY     = 9pCviYTWSb
 INTERNAL_TOKEN = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYmYiOjE0OTI3OTU5ODN9.OQkH5UmzID2XBdwQ9TAI6Jj2t1X-wElVTjbE7aoN4I8
 
 [oauth2]
-JWT_SECRET = KZb_QLUd4fYVyxetjxC4eZkrBgWM2SndOOWDNtgUUko
+JWT_SECRET = KZb_QLUd4fYVyxetjxC4eZkrBgWM2SndOOWDNtgUUko

models/attachment.go

@@ -56,11 +56,6 @@ func (a *Attachment) APIFormat() *api.Attachment {
 	}
 }
 
-// DownloadURL returns the download url of the attached file
-func (a *Attachment) DownloadURL() string {
-	return fmt.Sprintf("%sattachments/%s", setting.AppURL, a.UUID)
-}
-
 // AttachmentRelativePath returns the relative path
 func AttachmentRelativePath(uuid string) string {
 	return path.Join(uuid[0:1], uuid[1:2], uuid)
@@ -71,6 +66,11 @@ func (a *Attachment) RelativePath() string {
 	return AttachmentRelativePath(a.UUID)
 }
 
+// DownloadURL returns the download url of the attached file
+func (a *Attachment) DownloadURL() string {
+	return fmt.Sprintf("%sattachments/%s", setting.AppURL, a.UUID)
+}
+
 // LinkedRepository returns the linked repo if any
 func (a *Attachment) LinkedRepository() (*Repository, UnitType, error) {
 	if a.IssueID != 0 {

modules/setting/attachment.go

@@ -0,0 +1,72 @@
+// Copyright 2020 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 setting
+
+import (
+	"path"
+	"path/filepath"
+	"strings"
+)
+
+var (
+	// Attachment settings
+	Attachment = struct {
+		StoreType string
+		Path      string
+		Minio     struct {
+			Endpoint        string
+			AccessKeyID     string
+			SecretAccessKey string
+			UseSSL          bool
+			Bucket          string
+			Location        string
+			BasePath        string
+		}
+		AllowedTypes string
+		MaxSize      int64
+		MaxFiles     int
+		Enabled      bool
+	}{
+		StoreType: "local",
+		Minio: struct {
+			Endpoint        string
+			AccessKeyID     string
+			SecretAccessKey string
+			UseSSL          bool
+			Bucket          string
+			Location        string
+			BasePath        string
+		}{},
+		AllowedTypes: "image/jpeg,image/png,application/zip,application/gzip",
+		MaxSize:      4,
+		MaxFiles:     5,
+		Enabled:      true,
+	}
+)
+
+func newAttachmentService() {
+	sec := Cfg.Section("attachment")
+	Attachment.StoreType = sec.Key("STORE_TYPE").MustString("local")
+	switch Attachment.StoreType {
+	case "local":
+		Attachment.Path = sec.Key("PATH").MustString(path.Join(AppDataPath, "attachments"))
+		if !filepath.IsAbs(Attachment.Path) {
+			Attachment.Path = path.Join(AppWorkPath, Attachment.Path)
+		}
+	case "minio":
+		Attachment.Minio.Endpoint = sec.Key("MINIO_ENDPOINT").MustString("localhost:9000")
+		Attachment.Minio.AccessKeyID = sec.Key("MINIO_ACCESS_KEY_ID").MustString("")
+		Attachment.Minio.SecretAccessKey = sec.Key("MINIO_SECRET_ACCESS_KEY").MustString("")
+		Attachment.Minio.Bucket = sec.Key("MINIO_BUCKET").MustString("gitea")
+		Attachment.Minio.Location = sec.Key("MINIO_LOCATION").MustString("us-east-1")
+		Attachment.Minio.BasePath = sec.Key("MINIO_BASE_PATH").MustString("attachments/")
+		Attachment.Minio.UseSSL = sec.Key("MINIO_USE_SSL").MustBool(false)
+	}
+
+	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)
+	Attachment.Enabled = sec.Key("ENABLED").MustBool(true)
+}

modules/setting/setting.go

@@ -298,40 +298,6 @@ var (
 	AccessLogTemplate  string
 	EnableXORMLog      bool
 
-	// Attachment settings
-	Attachment = struct {
-		StoreType string
-		Path      string
-		Minio     struct {
-			Endpoint        string
-			AccessKeyID     string
-			SecretAccessKey string
-			UseSSL          bool
-			Bucket          string
-			Location        string
-			BasePath        string
-		}
-		AllowedTypes string
-		MaxSize      int64
-		MaxFiles     int
-		Enabled      bool
-	}{
-		StoreType: "local",
-		Minio: struct {
-			Endpoint        string
-			AccessKeyID     string
-			SecretAccessKey string
-			UseSSL          bool
-			Bucket          string
-			Location        string
-			BasePath        string
-		}{},
-		AllowedTypes: "image/jpeg,image/png,application/zip,application/gzip",
-		MaxSize:      4,
-		MaxFiles:     5,
-		Enabled:      true,
-	}
-
 	// Time settings
 	TimeFormat string
 	// UILocation is the location on the UI, so that we can display the time on UI.
@@ -864,28 +830,7 @@ func NewContext() {
 		}
 	}
 
-	sec = Cfg.Section("attachment")
-	Attachment.StoreType = sec.Key("STORE_TYPE").MustString("local")
-	switch Attachment.StoreType {
-	case "local":
-		Attachment.Path = sec.Key("PATH").MustString(path.Join(AppDataPath, "attachments"))
-		if !filepath.IsAbs(Attachment.Path) {
-			Attachment.Path = path.Join(AppWorkPath, Attachment.Path)
-		}
-	case "minio":
-		Attachment.Minio.Endpoint = sec.Key("MINIO_ENDPOINT").MustString("localhost:9000")
-		Attachment.Minio.AccessKeyID = sec.Key("MINIO_ACCESS_KEY_ID").MustString("")
-		Attachment.Minio.SecretAccessKey = sec.Key("MINIO_SECRET_ACCESS_KEY").MustString("")
-		Attachment.Minio.Bucket = sec.Key("MINIO_BUCKET").MustString("gitea")
-		Attachment.Minio.Location = sec.Key("MINIO_LOCATION").MustString("us-east-1")
-		Attachment.Minio.BasePath = sec.Key("MINIO_BASE_PATH").MustString("attachments/")
-		Attachment.Minio.UseSSL = sec.Key("MINIO_USE_SSL").MustBool(false)
-	}
-
-	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)
-	Attachment.Enabled = sec.Key("ENABLED").MustBool(true)
+	newAttachmentService()
 
 	timeFormatKey := Cfg.Section("time").Key("FORMAT").MustString("")
 	if timeFormatKey != "" {