Browse Source

Updated.

master v0.7.11
Mingcai SHEN 5 years ago
parent
commit
83c06e14dc
3 changed files with 13 additions and 0 deletions
  1. +6
    -0
      storage/filesystem.go
  2. +6
    -0
      storage/minio.go
  3. +1
    -0
      storage/types.go

+ 6
- 0
storage/filesystem.go View File

@ -12,6 +12,7 @@ import (
) )
type FileSystem struct { type FileSystem struct {
cdn string
root string root string
prefix string prefix string
minFreeSize int64 minFreeSize int64
@ -35,6 +36,7 @@ func NewFileSystem(cfg config.Config) (Storage, error) {
} else { } else {
fs.root = root fs.root = root
} }
fs.cdn = cfg.GetString("cdn")
fs.prefix = cfg.GetString("prefix", "/") fs.prefix = cfg.GetString("prefix", "/")
fs.minFreeSize = cfg.GetInt64("min_free_size", 10*GB) fs.minFreeSize = cfg.GetInt64("min_free_size", 10*GB)
fs.allowZeroFile = cfg.GetBool("allow_zero_file", false) fs.allowZeroFile = cfg.GetBool("allow_zero_file", false)
@ -45,6 +47,10 @@ func NewFileSystem(cfg config.Config) (Storage, error) {
return fs, nil return fs, nil
} }
func (fs FileSystem) CDN() string {
return fs.cdn
}
func (fs FileSystem) Root() string { func (fs FileSystem) Root() string {
return fs.root return fs.root
} }

+ 6
- 0
storage/minio.go View File

@ -23,6 +23,7 @@ type minioOption struct {
} }
type Minio struct { type Minio struct {
cdn string
endpoint string endpoint string
secure bool secure bool
bucket string bucket string
@ -70,6 +71,10 @@ func ParseMinioURL(s string) (*minioOption, error) {
return &opt, nil return &opt, nil
} }
func (mio Minio) CDN() string {
return mio.cdn
}
func (mio Minio) Root() string { func (mio Minio) Root() string {
return mio.bucket return mio.bucket
} }
@ -147,6 +152,7 @@ func NewMinio(cfg config.Config) (Storage, error) {
} else { } else {
mio.prefix = s mio.prefix = s
} }
mio.cdn = cfg.GetString("cdn")
if s3Client, e := minio.New(mio.endpoint, mio.access, mio.secret, mio.secure); e != nil { if s3Client, e := minio.New(mio.endpoint, mio.access, mio.secret, mio.secure); e != nil {
//fmt.Println("minio.New failed:", e) //fmt.Println("minio.New failed:", e)
return nil, e return nil, e

+ 1
- 0
storage/types.go View File

@ -27,6 +27,7 @@ type StatInfo interface {
type Storage interface { type Storage interface {
//Initialize(cfg config.Config) error //Initialize(cfg config.Config) error
CDN() string
Root() string Root() string
Prefix() string Prefix() string
SaveFile(src interface{}, destination string) (FileObject, error) SaveFile(src interface{}, destination string) (FileObject, error)

Loading…
Cancel
Save