summaryrefslogtreecommitdiffstats
path: root/modules/storage/local.go
diff options
context:
space:
mode:
Diffstat (limited to 'modules/storage/local.go')
-rw-r--r--modules/storage/local.go20
1 files changed, 3 insertions, 17 deletions
diff --git a/modules/storage/local.go b/modules/storage/local.go
index 73ef306979..9bb532f1df 100644
--- a/modules/storage/local.go
+++ b/modules/storage/local.go
@@ -12,20 +12,12 @@ import (
"path/filepath"
"code.gitea.io/gitea/modules/log"
+ "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
)
var _ ObjectStorage = &LocalStorage{}
-// LocalStorageType is the type descriptor for local storage
-const LocalStorageType Type = "local"
-
-// LocalStorageConfig represents the configuration for a local storage
-type LocalStorageConfig struct {
- Path string `ini:"PATH"`
- TemporaryPath string `ini:"TEMPORARY_PATH"`
-}
-
// LocalStorage represents a local files storage
type LocalStorage struct {
ctx context.Context
@@ -34,13 +26,7 @@ type LocalStorage struct {
}
// NewLocalStorage returns a local files
-func NewLocalStorage(ctx context.Context, cfg interface{}) (ObjectStorage, error) {
- configInterface, err := toConfig(LocalStorageConfig{}, cfg)
- if err != nil {
- return nil, err
- }
- config := configInterface.(LocalStorageConfig)
-
+func NewLocalStorage(ctx context.Context, config *setting.Storage) (ObjectStorage, error) {
if !filepath.IsAbs(config.Path) {
return nil, fmt.Errorf("LocalStorageConfig.Path should have been prepared by setting/storage.go and should be an absolute path, but not: %q", config.Path)
}
@@ -164,5 +150,5 @@ func (l *LocalStorage) IterateObjects(dirName string, fn func(path string, obj O
}
func init() {
- RegisterStorageType(LocalStorageType, NewLocalStorage)
+ RegisterStorageType(setting.LocalStorageType, NewLocalStorage)
}