feat(alias): support writing to non-ambiguous paths (#8216)

* feat(alias): support writing to non-ambiguous paths

* feat(alias): support extract concurrency

* fix(alias): extract url no pass query

drivers/alias/driver.go

@@ -3,6 +3,7 @@ package alias
 import (
 	"context"
 	"errors"
+	stdpath "path"
 	"strings"
 
 	"github.com/alist-org/alist/v3/internal/driver"
@@ -126,8 +127,46 @@ func (d *Alias) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (
 	return nil, errs.ObjectNotFound
 }
 
+func (d *Alias) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
+	if !d.Writable {
+		return errs.PermissionDenied
+	}
+	reqPath, err := d.getReqPath(ctx, parentDir, true)
+	if err == nil {
+		return fs.MakeDir(ctx, stdpath.Join(*reqPath, dirName))
+	}
+	if errs.IsNotImplement(err) {
+		return errors.New("same-name dirs cannot make sub-dir")
+	}
+	return err
+}
+
+func (d *Alias) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
+	if !d.Writable {
+		return errs.PermissionDenied
+	}
+	srcPath, err := d.getReqPath(ctx, srcObj, false)
+	if errs.IsNotImplement(err) {
+		return errors.New("same-name files cannot be moved")
+	}
+	if err != nil {
+		return err
+	}
+	dstPath, err := d.getReqPath(ctx, dstDir, true)
+	if errs.IsNotImplement(err) {
+		return errors.New("same-name dirs cannot be moved to")
+	}
+	if err != nil {
+		return err
+	}
+	return fs.Move(ctx, *srcPath, *dstPath)
+}
+
 func (d *Alias) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
-	reqPath, err := d.getReqPath(ctx, srcObj)
+	if !d.Writable {
+		return errs.PermissionDenied
+	}
+	reqPath, err := d.getReqPath(ctx, srcObj, false)
 	if err == nil {
 		return fs.Rename(ctx, *reqPath, newName)
 	}
@@ -137,8 +176,33 @@ func (d *Alias) Rename(ctx context.Context, srcObj model.Obj, newName string) er
 	return err
 }
 
+func (d *Alias) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
+	if !d.Writable {
+		return errs.PermissionDenied
+	}
+	srcPath, err := d.getReqPath(ctx, srcObj, false)
+	if errs.IsNotImplement(err) {
+		return errors.New("same-name files cannot be copied")
+	}
+	if err != nil {
+		return err
+	}
+	dstPath, err := d.getReqPath(ctx, dstDir, true)
+	if errs.IsNotImplement(err) {
+		return errors.New("same-name dirs cannot be copied to")
+	}
+	if err != nil {
+		return err
+	}
+	_, err = fs.Copy(ctx, *srcPath, *dstPath)
+	return err
+}
+
 func (d *Alias) Remove(ctx context.Context, obj model.Obj) error {
-	reqPath, err := d.getReqPath(ctx, obj)
+	if !d.Writable {
+		return errs.PermissionDenied
+	}
+	reqPath, err := d.getReqPath(ctx, obj, false)
 	if err == nil {
 		return fs.Remove(ctx, *reqPath)
 	}
@@ -148,4 +212,110 @@ func (d *Alias) Remove(ctx context.Context, obj model.Obj) error {
 	return err
 }
 
+func (d *Alias) Put(ctx context.Context, dstDir model.Obj, s model.FileStreamer, up driver.UpdateProgress) error {
+	if !d.Writable {
+		return errs.PermissionDenied
+	}
+	reqPath, err := d.getReqPath(ctx, dstDir, true)
+	if err == nil {
+		return fs.PutDirectly(ctx, *reqPath, s)
+	}
+	if errs.IsNotImplement(err) {
+		return errors.New("same-name dirs cannot be Put")
+	}
+	return err
+}
+
+func (d *Alias) PutURL(ctx context.Context, dstDir model.Obj, name, url string) error {
+	if !d.Writable {
+		return errs.PermissionDenied
+	}
+	reqPath, err := d.getReqPath(ctx, dstDir, true)
+	if err == nil {
+		return fs.PutURL(ctx, *reqPath, name, url)
+	}
+	if errs.IsNotImplement(err) {
+		return errors.New("same-name files cannot offline download")
+	}
+	return err
+}
+
+func (d *Alias) GetArchiveMeta(ctx context.Context, obj model.Obj, args model.ArchiveArgs) (model.ArchiveMeta, error) {
+	root, sub := d.getRootAndPath(obj.GetPath())
+	dsts, ok := d.pathMap[root]
+	if !ok {
+		return nil, errs.ObjectNotFound
+	}
+	for _, dst := range dsts {
+		meta, err := d.getArchiveMeta(ctx, dst, sub, args)
+		if err == nil {
+			return meta, nil
+		}
+	}
+	return nil, errs.NotImplement
+}
+
+func (d *Alias) ListArchive(ctx context.Context, obj model.Obj, args model.ArchiveInnerArgs) ([]model.Obj, error) {
+	root, sub := d.getRootAndPath(obj.GetPath())
+	dsts, ok := d.pathMap[root]
+	if !ok {
+		return nil, errs.ObjectNotFound
+	}
+	for _, dst := range dsts {
+		l, err := d.listArchive(ctx, dst, sub, args)
+		if err == nil {
+			return l, nil
+		}
+	}
+	return nil, errs.NotImplement
+}
+
+func (d *Alias) Extract(ctx context.Context, obj model.Obj, args model.ArchiveInnerArgs) (*model.Link, error) {
+	// alias的两个驱动，一个支持驱动提取，一个不支持，如何兼容？
+	// 如果访问的是不支持驱动提取的驱动内的压缩文件，GetArchiveMeta就会返回errs.NotImplement，提取URL前缀就会是/ae，Extract就不会被调用
+	// 如果访问的是支持驱动提取的驱动内的压缩文件，GetArchiveMeta就会返回有效值，提取URL前缀就会是/ad，Extract就会被调用
+	root, sub := d.getRootAndPath(obj.GetPath())
+	dsts, ok := d.pathMap[root]
+	if !ok {
+		return nil, errs.ObjectNotFound
+	}
+	for _, dst := range dsts {
+		link, err := d.extract(ctx, dst, sub, args)
+		if err == nil {
+			if !args.Redirect && len(link.URL) > 0 {
+				if d.DownloadConcurrency > 0 {
+					link.Concurrency = d.DownloadConcurrency
+				}
+				if d.DownloadPartSize > 0 {
+					link.PartSize = d.DownloadPartSize * utils.KB
+				}
+			}
+			return link, nil
+		}
+	}
+	return nil, errs.NotImplement
+}
+
+func (d *Alias) ArchiveDecompress(ctx context.Context, srcObj, dstDir model.Obj, args model.ArchiveDecompressArgs) error {
+	if !d.Writable {
+		return errs.PermissionDenied
+	}
+	srcPath, err := d.getReqPath(ctx, srcObj, false)
+	if errs.IsNotImplement(err) {
+		return errors.New("same-name files cannot be decompressed")
+	}
+	if err != nil {
+		return err
+	}
+	dstPath, err := d.getReqPath(ctx, dstDir, true)
+	if errs.IsNotImplement(err) {
+		return errors.New("same-name dirs cannot be decompressed to")
+	}
+	if err != nil {
+		return err
+	}
+	_, err = fs.ArchiveDecompress(ctx, *srcPath, *dstPath, args)
+	return err
+}
+
 var _ driver.Driver = (*Alias)(nil)

drivers/alias/meta.go

@@ -13,13 +13,14 @@ type Addition struct {
 	ProtectSameName     bool   `json:"protect_same_name" default:"true" required:"false" help:"Protects same-name files from Delete or Rename"`
 	DownloadConcurrency int    `json:"download_concurrency" default:"0" required:"false" type:"number" help:"Need to enable proxy"`
 	DownloadPartSize    int    `json:"download_part_size" default:"0" type:"number" required:"false" help:"Need to enable proxy. Unit: KB"`
+	Writable            bool   `json:"writable" type:"bool" default:"false"`
 }
 
 var config = driver.Config{
 	Name:             "Alias",
 	LocalSort:        true,
 	NoCache:          true,
-	NoUpload:         true,
+	NoUpload:         false,
 	DefaultRoot:      "/",
 	ProxyRangeOption: true,
 }

drivers/alias/util.go

@@ -3,9 +3,11 @@ package alias
 import (
 	"context"
 	"fmt"
+	"net/url"
 	stdpath "path"
 	"strings"
 
+	"github.com/alist-org/alist/v3/internal/driver"
 	"github.com/alist-org/alist/v3/internal/errs"
 	"github.com/alist-org/alist/v3/internal/fs"
 	"github.com/alist-org/alist/v3/internal/model"
@@ -125,9 +127,9 @@ func (d *Alias) link(ctx context.Context, dst, sub string, args model.LinkArgs)
 	return link, err
 }
 
-func (d *Alias) getReqPath(ctx context.Context, obj model.Obj) (*string, error) {
+func (d *Alias) getReqPath(ctx context.Context, obj model.Obj, isParent bool) (*string, error) {
 	root, sub := d.getRootAndPath(obj.GetPath())
-	if sub == "" {
+	if sub == "" && !isParent {
 		return nil, errs.NotSupport
 	}
 	dsts, ok := d.pathMap[root]
@@ -156,3 +158,68 @@ func (d *Alias) getReqPath(ctx context.Context, obj model.Obj) (*string, error)
 	}
 	return reqPath, nil
 }
+
+func (d *Alias) getArchiveMeta(ctx context.Context, dst, sub string, args model.ArchiveArgs) (model.ArchiveMeta, error) {
+	reqPath := stdpath.Join(dst, sub)
+	storage, reqActualPath, err := op.GetStorageAndActualPath(reqPath)
+	if err != nil {
+		return nil, err
+	}
+	if _, ok := storage.(driver.ArchiveReader); ok {
+		return op.GetArchiveMeta(ctx, storage, reqActualPath, model.ArchiveMetaArgs{
+			ArchiveArgs: args,
+			Refresh:     true,
+		})
+	}
+	return nil, errs.NotImplement
+}
+
+func (d *Alias) listArchive(ctx context.Context, dst, sub string, args model.ArchiveInnerArgs) ([]model.Obj, error) {
+	reqPath := stdpath.Join(dst, sub)
+	storage, reqActualPath, err := op.GetStorageAndActualPath(reqPath)
+	if err != nil {
+		return nil, err
+	}
+	if _, ok := storage.(driver.ArchiveReader); ok {
+		return op.ListArchive(ctx, storage, reqActualPath, model.ArchiveListArgs{
+			ArchiveInnerArgs: args,
+			Refresh:          true,
+		})
+	}
+	return nil, errs.NotImplement
+}
+
+func (d *Alias) extract(ctx context.Context, dst, sub string, args model.ArchiveInnerArgs) (*model.Link, error) {
+	reqPath := stdpath.Join(dst, sub)
+	storage, reqActualPath, err := op.GetStorageAndActualPath(reqPath)
+	if err != nil {
+		return nil, err
+	}
+	if _, ok := storage.(driver.ArchiveReader); ok {
+		if _, ok := storage.(*Alias); !ok && !args.Redirect {
+			link, _, err := op.DriverExtract(ctx, storage, reqActualPath, args)
+			return link, err
+		}
+		_, err = fs.Get(ctx, reqPath, &fs.GetArgs{NoLog: true})
+		if err != nil {
+			return nil, err
+		}
+		if common.ShouldProxy(storage, stdpath.Base(sub)) {
+			link := &model.Link{
+				URL: fmt.Sprintf("%s/ap%s?inner=%s&pass=%s&sign=%s",
+					common.GetApiUrl(args.HttpReq),
+					utils.EncodePath(reqPath, true),
+					utils.EncodePath(args.InnerPath, true),
+					url.QueryEscape(args.Password),
+					sign.SignArchive(reqPath)),
+			}
+			if args.HttpReq != nil && d.ProxyRange {
+				link.RangeReadCloser = common.NoProxyRange
+			}
+			return link, nil
+		}
+		link, _, err := op.DriverExtract(ctx, storage, reqActualPath, args)
+		return link, err
+	}
+	return nil, errs.NotImplement
+}

internal/fs/fs.go

@@ -2,12 +2,15 @@ package fs
 
 import (
 	"context"
+	log "github.com/sirupsen/logrus"
+	"io"
+
 	"github.com/alist-org/alist/v3/internal/driver"
+	"github.com/alist-org/alist/v3/internal/errs"
 	"github.com/alist-org/alist/v3/internal/model"
 	"github.com/alist-org/alist/v3/internal/op"
 	"github.com/alist-org/alist/v3/internal/task"
-	log "github.com/sirupsen/logrus"
+	"github.com/pkg/errors"
-	"io"
 )
 
 // the param named path of functions in this package is a mount path
@@ -168,3 +171,19 @@ func Other(ctx context.Context, args model.FsOtherArgs) (interface{}, error) {
 	}
 	return res, err
 }
+
+func PutURL(ctx context.Context, path, dstName, urlStr string) error {
+	storage, dstDirActualPath, err := op.GetStorageAndActualPath(path)
+	if err != nil {
+		return errors.WithMessage(err, "failed get storage")
+	}
+	if storage.Config().NoUpload {
+		return errors.WithStack(errs.UploadNotSupported)
+	}
+	_, ok := storage.(driver.PutURL)
+	_, okResult := storage.(driver.PutURLResult)
+	if !ok && !okResult {
+		return errs.NotImplement
+	}
+	return op.PutURL(ctx, storage, dstDirActualPath, dstName, urlStr)
+}

internal/offline_download/tool/add.go

@@ -2,20 +2,20 @@ package tool
 
 import (
 	"context"
+	"net/url"
+	stdpath "path"
+	"path/filepath"
+
 	_115 "github.com/alist-org/alist/v3/drivers/115"
 	"github.com/alist-org/alist/v3/drivers/pikpak"
 	"github.com/alist-org/alist/v3/drivers/thunder"
-	"github.com/alist-org/alist/v3/internal/driver"
-	"github.com/alist-org/alist/v3/internal/model"
-	"github.com/alist-org/alist/v3/internal/setting"
-	"github.com/alist-org/alist/v3/internal/task"
-	"net/url"
-	"path"
-	"path/filepath"
-
 	"github.com/alist-org/alist/v3/internal/conf"
 	"github.com/alist-org/alist/v3/internal/errs"
+	"github.com/alist-org/alist/v3/internal/fs"
+	"github.com/alist-org/alist/v3/internal/model"
 	"github.com/alist-org/alist/v3/internal/op"
+	"github.com/alist-org/alist/v3/internal/setting"
+	"github.com/alist-org/alist/v3/internal/task"
 	"github.com/google/uuid"
 	"github.com/pkg/errors"
 )
@@ -59,8 +59,11 @@ func AddURL(ctx context.Context, args *AddURLArgs) (task.TaskExtensionInfo, erro
 		}
 	}
 	// try putting url
-	if args.Tool == "SimpleHttp" && tryPutUrl(ctx, storage, dstDirActualPath, args.URL) {
+	if args.Tool == "SimpleHttp" {
-		return nil, nil
+		err = tryPutUrl(ctx, args.DstDirPath, args.URL)
+		if err == nil || !errors.Is(err, errs.NotImplement) {
+			return nil, err
+		}
 	}
 
 	// get tool
@@ -118,17 +121,13 @@ func AddURL(ctx context.Context, args *AddURLArgs) (task.TaskExtensionInfo, erro
 	return t, nil
 }
 
-func tryPutUrl(ctx context.Context, storage driver.Driver, dstDirActualPath, urlStr string) bool {
+func tryPutUrl(ctx context.Context, path, urlStr string) error {
-	_, ok := storage.(driver.PutURL)
+	var dstName string
-	_, okResult := storage.(driver.PutURLResult)
-	if !ok && !okResult {
-		return false
-	}
 	u, err := url.Parse(urlStr)
-	if err != nil {
+	if err == nil {
-		return false
+		dstName = stdpath.Base(u.Path)
+	} else {
+		dstName = "UnnamedURL"
 	}
-	dstName := path.Base(u.Path)
+	return fs.PutURL(ctx, path, dstName, urlStr)
-	err = op.PutURL(ctx, storage, dstDirActualPath, dstName, urlStr)
-	return err == nil
 }

internal/op/archive.go

@@ -84,7 +84,7 @@ func getArchiveMeta(ctx context.Context, storage driver.Driver, path string, arg
 		meta, err := storageAr.GetArchiveMeta(ctx, obj, args.ArchiveArgs)
 		if !errors.Is(err, errs.NotImplement) {
 			archiveMetaProvider := &model.ArchiveMetaProvider{ArchiveMeta: meta, DriverProviding: true}
-			if meta.GetTree() != nil {
+			if meta != nil && meta.GetTree() != nil {
 				archiveMetaProvider.Sort = &storage.GetStorage().Sort
 			}
 			if !storage.Config().NoCache {