Refactor: use universal FileHeader when handling file upload, remove usage of global ctx with FileHeader, SavePath, DisableOverwrite

pkg/filesystem/driver/local/file.go

@@ -1,38 +0,0 @@
-package local
-
-import (
-	"io"
-)
-
-// FileStream 用户传来的文件
-type FileStream struct {
-	File        io.ReadCloser
-	Size        uint64
-	VirtualPath string
-	Name        string
-	MIMEType    string
-}
-
-func (file FileStream) Read(p []byte) (n int, err error) {
-	return file.File.Read(p)
-}
-
-func (file FileStream) GetMIMEType() string {
-	return file.MIMEType
-}
-
-func (file FileStream) GetSize() uint64 {
-	return file.Size
-}
-
-func (file FileStream) Close() error {
-	return file.File.Close()
-}
-
-func (file FileStream) GetFileName() string {
-	return file.Name
-}
-
-func (file FileStream) GetVirtualPath() string {
-	return file.VirtualPath
-}

pkg/filesystem/driver/local/file_test.go

@@ -1,48 +0,0 @@
-package local
-
-import (
-	"github.com/stretchr/testify/assert"
-	"io/ioutil"
-	"strings"
-	"testing"
-)
-
-func TestFileStream_GetFileName(t *testing.T) {
-	asserts := assert.New(t)
-	file := FileStream{Name: "123"}
-	asserts.Equal("123", file.GetFileName())
-}
-
-func TestFileStream_GetMIMEType(t *testing.T) {
-	asserts := assert.New(t)
-	file := FileStream{MIMEType: "123"}
-	asserts.Equal("123", file.GetMIMEType())
-}
-
-func TestFileStream_GetSize(t *testing.T) {
-	asserts := assert.New(t)
-	file := FileStream{Size: 123}
-	asserts.Equal(uint64(123), file.GetSize())
-}
-
-func TestFileStream_Read(t *testing.T) {
-	asserts := assert.New(t)
-	file := FileStream{
-		File: ioutil.NopCloser(strings.NewReader("123")),
-	}
-	var p = make([]byte, 3)
-	{
-		n, err := file.Read(p)
-		asserts.Equal(3, n)
-		asserts.NoError(err)
-	}
-}
-
-func TestFileStream_Close(t *testing.T) {
-	asserts := assert.New(t)
-	file := FileStream{
-		File: ioutil.NopCloser(strings.NewReader("123")),
-	}
-	err := file.Close()
-	asserts.NoError(err)
-}

pkg/filesystem/driver/local/handler.go

@@ -83,12 +83,12 @@ func (handler Driver) Get(ctx context.Context, path string) (response.RSCloser,
 }
 
 // Put 将文件流保存到指定目录
-func (handler Driver) Put(ctx context.Context, file io.ReadCloser, dst string, size uint64) error {
+func (handler Driver) Put(ctx context.Context, file fsctx.FileHeader) error {
 	defer file.Close()
-	dst = util.RelativePath(filepath.FromSlash(dst))
+	dst := util.RelativePath(filepath.FromSlash(file.GetSavePath()))
 
-	// 如果禁止了 Overwrite，则检查是否有重名冲突
-	if ctx.Value(fsctx.DisableOverwrite) != nil {
+	// 如果非 Overwrite，则检查是否有重名冲突
+	if file.GetMode() != fsctx.Overwrite {
 		if util.Exists(dst) {
 			util.Log().Warning("物理同名文件已存在或不可用: %s", dst)
 			return errors.New("物理同名文件已存在或不可用")
@@ -214,7 +214,7 @@ func (handler Driver) Source(
 }
 
 // Token 获取上传策略和认证Token，本地策略直接返回空值
-func (handler Driver) Token(ctx context.Context, ttl int64, uploadSession *serializer.UploadSession) (serializer.UploadCredential, error) {
+func (handler Driver) Token(ctx context.Context, ttl int64, uploadSession *serializer.UploadSession, file fsctx.FileHeader) (serializer.UploadCredential, error) {
 	return serializer.UploadCredential{
 		SessionID: uploadSession.Key,
 	}, nil