Ver Fonte

[annex] make annex min upload size configurable

cgars há 8 anos atrás
pai
commit
ad2a521a79
3 ficheiros alterados com 9 adições e 6 exclusões
  1. 2 0
      conf/app.ini
  2. 1 1
      models/repo_editor.go
  3. 6 5
      pkg/setting/setting.go

+ 2 - 0
conf/app.ini

@@ -116,6 +116,8 @@ TEMP_PATH = data/tmp/uploads
 ALLOWED_TYPES =
 ; Maximum size of each file in MB
 FILE_MAX_SIZE = 3
+; Minimum Size for Annex upload
+ANEX_FILE_MIN_SIZE = 10
 ; Maximum number of files per upload
 MAX_FILES = 5
 

+ 1 - 1
models/repo_editor.go

@@ -482,7 +482,7 @@ func (repo *Repository) UploadRepoFiles(doer *User, opts UploadRepoFileOptions)
 		log.Trace("Check for annexing: %s,%s", upload.Name)
 		if finfo, err := os.Stat(targetPath); err == nil {
 			log.Trace("Filesize is:%s", finfo.Size())
-			if finfo.Size() > 10*gannex.MEGABYTE {
+			if finfo.Size() > setting.Repository.Upload.AnexFileMinSize*gannex.MEGABYTE {
 				log.Trace("This file should be annexed: %s", upload.Name)
 				if msg, err := gannex.Add(repoFileName, localPath); err != nil {
 					log.Trace("Annex add failed with error: %v,%s,%s", err, msg, repoFileName)

+ 6 - 5
pkg/setting/setting.go

@@ -134,11 +134,12 @@ var (
 
 		// Repository upload settings
 		Upload struct {
-			Enabled      bool
-			TempPath     string
-			AllowedTypes []string `delim:"|"`
-			FileMaxSize  int64
-			MaxFiles     int
+			Enabled         bool
+			TempPath        string
+			AllowedTypes    []string `delim:"|"`
+			FileMaxSize     int64
+			AnexFileMinSize int64
+			MaxFiles        int
 		} `ini:"-"`
 	}
 	RepoRootPath string