fix: temp file not close and incorrect WebPutAsTask

AlistGo · Aug 28, 2023 · ce10c9f · ce10c9f
1 parent 6c4736f
commit ce10c9f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/internal/stream/stream.go b/internal/stream/stream.go
@@ -5,12 +5,13 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"io"
+	"os"
+
 	"github.com/alist-org/alist/v3/internal/errs"
 	"github.com/alist-org/alist/v3/internal/model"
 	"github.com/alist-org/alist/v3/pkg/http_range"
 	"github.com/alist-org/alist/v3/pkg/utils"
-	"io"
-	"os"
 )
 
 type FileStream struct {
@@ -66,6 +67,7 @@ func (f *FileStream) CacheFullInTempFile() (model.File, error) {
 	if err != nil {
 		return nil, err
 	}
+	f.Add(tmpF)
 	f.tmpFile = tmpF
 	f.Reader = tmpF
 	return f.tmpFile, nil
@@ -220,6 +222,7 @@ func (ss *SeekableStream) CacheFullInTempFile() (model.File, error) {
 	if err != nil {
 		return nil, err
 	}
+	ss.Add(tmpF)
 	ss.tmpFile = tmpF
 	ss.Reader = tmpF
 	return ss.tmpFile, nil

diff --git a/server/handles/fsup.go b/server/handles/fsup.go
@@ -111,7 +111,7 @@ func FsForm(c *gin.Context) {
 		},
 		Reader:       f,
 		Mimetype:     file.Header.Get("Content-Type"),
-		WebPutAsTask: false,
+		WebPutAsTask: asTask,
 	}
 	ss, err := stream.NewSeekableStream(s, nil)
 	if err != nil {