Merge pull request #2 from hrntknr/add-inmemory-option

add in memory option

file.go

@@ -3,7 +3,9 @@ package main
 import (
 	"bytes"
 	"context"
+	"fmt"
 	"io/fs"
+	"log"
 	"os"
 	"strings"
 	"sync"
@@ -21,6 +23,7 @@ type File struct {
 	lock        *sync.Mutex
 	cacheObject *minio.Object
 	writeBuffer *bytes.Buffer
+	writeTmp    *os.File
 	flag        int
 }
 
@@ -34,11 +37,13 @@ func newFile(ctx context.Context, mc *minio.Client, path []string, dummyDirs []s
 		lock:        &sync.Mutex{},
 		cacheObject: nil,
 		writeBuffer: bytes.NewBuffer([]byte{}),
+		writeTmp:    nil,
 		flag:        flag,
 	}
 }
 
 func (f *File) Readdir(count int) ([]fs.FileInfo, error) {
+	fmt.Println("Readdir", f.path, count)
 	if len(f.path) == 0 {
 		list, err := f.mc.ListBuckets(context.Background())
 		if err != nil {
@@ -163,13 +168,24 @@ func (f *File) Stat() (fs.FileInfo, error) {
 					isDir:   true,
 				}, nil
 			} else {
-				if f.writeBuffer.Len() > 0 {
+				if inMemory && f.writeBuffer.Len() > 0 {
 					return &FileInfo{
 						name:    "",
 						size:    int64(f.writeBuffer.Len()),
 						modTime: time.Now(),
 						isDir:   false,
 					}, nil
+				} else if !inMemory && f.writeTmp != nil {
+					stat, err := f.writeTmp.Stat()
+					if err != nil {
+						return nil, err
+					}
+					return &FileInfo{
+						name:    "",
+						size:    stat.Size(),
+						modTime: time.Now(),
+						isDir:   false,
+					}, nil
 				} else {
 					return &FileInfo{
 						name:    "",
@@ -223,10 +239,28 @@ func (f *File) Write(p []byte) (n int, err error) {
 		return 0, os.ErrInvalid
 	}
 	if f.offset != 0 {
-		f.writeBuffer.Reset()
+		if inMemory {
+			f.writeBuffer.Reset()
+		} else {
+			if f.writeTmp != nil {
+				f.writeTmp.Close()
+				f.writeTmp = nil
+			}
+		}
 		return 0, os.ErrInvalid
 	}
-	return f.writeBuffer.Write(p)
+	if inMemory {
+		return f.writeBuffer.Write(p)
+	} else {
+		if f.writeTmp == nil {
+			file, err := os.CreateTemp("", "s3dav-proxy")
+			if err != nil {
+				return 0, os.ErrInvalid
+			}
+			f.writeTmp = file
+		}
+		return f.writeTmp.Write(p)
+	}
 }
 
 func (f *File) Seek(offset int64, whence int) (int64, error) {
@@ -246,11 +280,19 @@ func (f *File) Seek(offset int64, whence int) (int64, error) {
 }
 
 func (f *File) Close() error {
-	if f.writeBuffer.Len() > 0 {
+	if inMemory && f.writeBuffer.Len() > 0 {
 		if _, err := f.mc.PutObject(f.ctx, f.path[0], strings.Join(f.path[1:], "/"), f.writeBuffer, int64(f.writeBuffer.Len()), minio.PutObjectOptions{}); err != nil {
 			return handleMinioError(err)
 		}
 	}
+	if !inMemory && f.writeTmp != nil {
+		if _, err := f.mc.PutObject(f.ctx, f.path[0], strings.Join(f.path[1:], "/"), f.writeTmp, 0, minio.PutObjectOptions{}); err != nil {
+			return handleMinioError(err)
+		}
+		if err := os.Remove(f.writeTmp.Name()); err != nil {
+			log.Println(err)
+		}
+	}
 	if f.cacheObject != nil {
 		if err := f.cacheObject.Close(); err != nil {
 			return err

main.go

@@ -25,6 +25,7 @@ var (
 	preferDirectory bool // Minio does not allow duplicate names for directory and file names, but s3 does.
 	allowBucketsOps bool
 	readOnly        bool
+	inMemory        bool
 	verbose         bool
 	tlsCert         string
 	tlsKey          string
@@ -115,6 +116,7 @@ func init() {
 	RootCmd.Flags().BoolVarP(&preferDirectory, "prefer-directory", "d", true, "Prefer directory over file")
 	RootCmd.Flags().BoolVarP(&allowBucketsOps, "allow-buckets-ops", "b", false, "Allow operations on buckets")
 	RootCmd.Flags().BoolVarP(&readOnly, "ro", "", false, "Read only")
+	RootCmd.Flags().BoolVarP(&inMemory, "in-memory", "m", false, "In memory(upload)")
 	RootCmd.Flags().BoolVarP(&verbose, "verbose", "v", false, "Verbose output")
 	RootCmd.Flags().StringVarP(&tlsCert, "tls-cert", "c", "", "TLS certificate")
 	RootCmd.Flags().StringVarP(&tlsKey, "tls-key", "k", "", "TLS key")

webdav.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"fmt"
 	"os"
 	"strings"
 
@@ -56,6 +57,7 @@ func (d *Handler) Mkdir(ctx context.Context, name string, perm os.FileMode) erro
 }
 
 func (d *Handler) OpenFile(ctx context.Context, name string, flag int, perm os.FileMode) (webdav.File, error) {
+	fmt.Println("OpenFile", name, flag, perm)
 	mc := ctx.Value(minioClientCtxKey).(*minio.Client)
 	names := splitPath(name)
 	return newFile(ctx, mc, names, d.dummyDirs, flag), nil