feat(archive): support non-overwrite decompress (#1701)

Author: KirCute

drivers/openlist/driver.go

@@ -360,6 +360,7 @@ func (d *OpenList) ArchiveDecompress(ctx context.Context, srcObj, dstDir model.O
 			Name:          []string{name},
 			PutIntoNewDir: args.PutIntoNewDir,
 			SrcDir:        dir,
+			Overwrite:     args.Overwrite,
 		})
 	})
 	return err

drivers/openlist/types.go

@@ -167,4 +167,5 @@ type DecompressReq struct {
 	Name          []string `json:"name"`
 	PutIntoNewDir bool     `json:"put_into_new_dir"`
 	SrcDir        string   `json:"src_dir"`
+	Overwrite     bool     `json:"overwrite"`
 }

drivers/url_tree/meta.go

@@ -20,6 +20,7 @@ var config = driver.Config{
 	LocalSort:   true,
 	NoCache:     true,
 	CheckStatus: true,
+	OnlyIndices: true,
 }
 
 func init() {

internal/driver/config.go

@@ -22,6 +22,8 @@ type Config struct {
 	//  - LinkCacheNone: no extra info added to cache key (default)
 	//  - flags (OR-able) can add more attributes to cache key (IP, UA, ...)
 	LinkCacheMode `json:"-"`
+	// if the driver only store indices of files (e.g. UrlTree)
+	OnlyIndices bool `json:"only_indices"`
 }
 type LinkCacheMode int8
 

internal/fs/archive.go

@@ -125,6 +125,7 @@ func (t *ArchiveDownloadTask) RunWithoutPushUploadTask() (*ArchiveContentUploadT
 		DstActualPath: t.DstActualPath,
 		dstStorage:    t.DstStorage,
 		DstStorageMp:  t.DstStorageMp,
+		overwrite:     t.Overwrite,
 	}
 	return uploadTask, nil
 }
@@ -142,6 +143,7 @@ type ArchiveContentUploadTask struct {
 	DstStorageMp  string
 	finalized     bool
 	groupID       string
+	overwrite     bool
 }
 
 func (t *ArchiveContentUploadTask) GetName() string {
@@ -232,6 +234,7 @@ func (t *ArchiveContentUploadTask) RunWithNextTaskCallback(f func(nextTask *Arch
 				dstStorage:    t.dstStorage,
 				DstStorageMp:  t.DstStorageMp,
 				groupID:       t.groupID,
+				overwrite:     t.overwrite,
 			})
 			if err != nil {
 				es = stderrors.Join(es, err)
@@ -241,6 +244,12 @@ func (t *ArchiveContentUploadTask) RunWithNextTaskCallback(f func(nextTask *Arch
 			return es
 		}
 	} else {
+		if !t.overwrite {
+			dstPath := stdpath.Join(t.DstActualPath, t.ObjName)
+			if res, _ := op.Get(t.Ctx(), t.dstStorage, dstPath); res != nil {
+				return errs.ObjectAlreadyExists
+			}
+		}
 		file, err := os.Open(t.FilePath)
 		if err != nil {
 			return err

internal/model/args.go

@@ -77,6 +77,7 @@ type ArchiveDecompressArgs struct {
 	ArchiveInnerArgs
 	CacheFull     bool
 	PutIntoNewDir bool
+	Overwrite     bool
 }
 
 type SharingListArgs struct {

internal/op/fs.go

@@ -509,7 +509,7 @@ func Put(ctx context.Context, storage driver.Driver, dstDirPath string, file mod
 		return errors.WithMessagef(errs.StorageNotInit, "storage status: %s", storage.GetStorage().Status)
 	}
 	// UrlTree PUT
-	if storage.GetStorage().Driver == "UrlTree" {
+	if storage.Config().OnlyIndices {
 		var link string
 		dstDirPath, link = urlTreeSplitLineFormPath(stdpath.Join(dstDirPath, file.GetName()))
 		file = &stream.FileStream{Obj: &model.Object{Name: link}}

server/handles/archive.go

@@ -1,7 +1,6 @@
 package handles
 
 import (
-	"encoding/json"
 	"fmt"
 	"io"
 	stdpath "path"
@@ -229,30 +228,15 @@ func FsArchiveList(c *gin.Context, req *ArchiveListReq, user *model.User) {
 	})
 }
 
-type StringOrArray []string
-
-func (s *StringOrArray) UnmarshalJSON(data []byte) error {
-	var value string
-	if err := json.Unmarshal(data, &value); err == nil {
-		*s = []string{value}
-		return nil
-	}
-	var sliceValue []string
-	if err := json.Unmarshal(data, &sliceValue); err != nil {
-		return err
-	}
-	*s = sliceValue
-	return nil
-}
-
 type ArchiveDecompressReq struct {
-	SrcDir        string        `json:"src_dir" form:"src_dir"`
-	DstDir        string        `json:"dst_dir" form:"dst_dir"`
-	Name          StringOrArray `json:"name" form:"name"`
-	ArchivePass   string        `json:"archive_pass" form:"archive_pass"`
-	InnerPath     string        `json:"inner_path" form:"inner_path"`
-	CacheFull     bool          `json:"cache_full" form:"cache_full"`
-	PutIntoNewDir bool          `json:"put_into_new_dir" form:"put_into_new_dir"`
+	SrcDir        string   `json:"src_dir" form:"src_dir"`
+	DstDir        string   `json:"dst_dir" form:"dst_dir"`
+	Name          []string `json:"name" form:"name"`
+	ArchivePass   string   `json:"archive_pass" form:"archive_pass"`
+	InnerPath     string   `json:"inner_path" form:"inner_path"`
+	CacheFull     bool     `json:"cache_full" form:"cache_full"`
+	PutIntoNewDir bool     `json:"put_into_new_dir" form:"put_into_new_dir"`
+	Overwrite     bool     `json:"overwrite" form:"overwrite"`
 }
 
 func FsArchiveDecompress(c *gin.Context) {
@@ -295,6 +279,7 @@ func FsArchiveDecompress(c *gin.Context) {
 			},
 			CacheFull:     req.CacheFull,
 			PutIntoNewDir: req.PutIntoNewDir,
+			Overwrite:     req.Overwrite,
 		})
 		if e != nil {
 			if errors.Is(e, errs.WrongArchivePassword) {