fix: keep type of setting item is correct

drivers/123/driver.go

@@ -164,7 +164,7 @@ func (d *Pan123) Remove(ctx context.Context, obj model.Obj) error {
 			"operation":         true,
 			"fileTrashInfoList": []File{f},
 		}
-		_, err := d.request("https://www.123pan.com/a/api/file/trash", http.MethodPost, func(req *resty.Request) {
+		_, err := d.request("https://www.123pan.com/b/api/file/trash", http.MethodPost, func(req *resty.Request) {
 			req.SetBody(data)
 		}, nil)
 		return err

drivers/189/util.go

@@ -215,6 +215,7 @@ func (d *Cloud189) getFiles(fileId string) ([]model.Obj, error) {
 					ID:       strconv.FormatInt(file.Id, 10),
 					Name:     file.Name,
 					Modified: lastOpTime,
+					Size:     file.Size,
 				},
 				Thumbnail: model.Thumbnail{Thumbnail: file.Icon.SmallUrl},
 			})

drivers/aliyundrive/driver.go

@@ -234,7 +234,10 @@ func (d *AliDrive) Put(ctx context.Context, dstDir model.Obj, stream model.FileS
 		buf := make([]byte, 8)
 		r, _ := new(big.Int).SetString(utils.GetMD5Encode(d.AccessToken)[:16], 16)
 		i := new(big.Int).SetInt64(file.GetSize())
-		o := r.Mod(r, i)
+		o := new(big.Int).SetInt64(0)
+		if file.GetSize() > 0 {
+			o = r.Mod(r, i)
+		}
 		n, _ := io.NewSectionReader(tempFile, o.Int64(), 8).Read(buf[:8])
 		reqBody["proof_code"] = base64.StdEncoding.EncodeToString(buf[:n])
 

drivers/aliyundrive/types.go

@@ -40,6 +40,7 @@ func fileToObj(f File) *model.ObjThumb {
 			Modified: f.UpdatedAt,
 			IsFolder: f.Type == "folder",
 		},
+		Thumbnail: model.Thumbnail{Thumbnail: f.Thumbnail},
 	}
 }
 

drivers/aliyundrive_share/driver.go

@@ -0,0 +1,178 @@
+package aliyundrive_share
+
+import (
+	"context"
+	"errors"
+	"net/http"
+	"time"
+
+	"github.com/alist-org/alist/v3/drivers/base"
+	"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/pkg/cron"
+	"github.com/alist-org/alist/v3/pkg/utils"
+	log "github.com/sirupsen/logrus"
+)
+
+type AliyundriveShare struct {
+	model.Storage
+	Addition
+	AccessToken string
+	ShareToken  string
+	DriveId     string
+	cron        *cron.Cron
+}
+
+func (d *AliyundriveShare) Config() driver.Config {
+	return config
+}
+
+func (d *AliyundriveShare) GetAddition() driver.Additional {
+	return d.Addition
+}
+
+func (d *AliyundriveShare) Init(ctx context.Context, storage model.Storage) error {
+	d.Storage = storage
+	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
+	if err != nil {
+		return err
+	}
+	err = d.refreshToken()
+	if err != nil {
+		return err
+	}
+	err = d.getShareToken()
+	if err != nil {
+		return err
+	}
+	d.cron = cron.NewCron(time.Hour * 2)
+	d.cron.Do(func() {
+		err := d.refreshToken()
+		if err != nil {
+			log.Errorf("%+v", err)
+		}
+	})
+	return nil
+}
+
+func (d *AliyundriveShare) Drop(ctx context.Context) error {
+	if d.cron != nil {
+		d.cron.Stop()
+	}
+	return nil
+}
+
+func (d *AliyundriveShare) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
+	files, err := d.getFiles(dir.GetID())
+	if err != nil {
+		return nil, err
+	}
+	return utils.SliceConvert(files, func(src File) (model.Obj, error) {
+		return fileToObj(src), nil
+	})
+}
+
+//func (d *AliyundriveShare) Get(ctx context.Context, path string) (model.Obj, error) {
+//	// this is optional
+//	return nil, errs.NotImplement
+//}
+
+func (d *AliyundriveShare) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
+	data := base.Json{
+		"drive_id":   d.DriveId,
+		"file_id":    file.GetID(),
+		"expire_sec": 14400,
+	}
+	var e ErrorResp
+	res, err := base.RestyClient.R().
+		SetError(&e).SetBody(data).
+		SetHeader("content-type", "application/json").
+		SetHeader("Authorization", "Bearer\t"+d.AccessToken).
+		Post("https://api.aliyundrive.com/v2/file/get_download_url")
+	if err != nil {
+		return nil, err
+	}
+	var u string
+	if e.Code != "" {
+		if e.Code == "AccessTokenInvalid" {
+			err = d.refreshToken()
+			if err != nil {
+				return nil, err
+			}
+			return d.Link(ctx, file, args)
+		} else if e.Code == "ForbiddenNoPermission.File" {
+			data = utils.MergeMap(data, base.Json{
+				// Only ten minutes valid
+				"expire_sec": 600,
+				"share_id":   d.ShareId,
+			})
+			var resp ShareLinkResp
+			var e2 ErrorResp
+			_, err = base.RestyClient.R().
+				SetError(&e2).SetBody(data).SetResult(&resp).
+				SetHeader("content-type", "application/json").
+				SetHeader("Authorization", "Bearer\t"+d.AccessToken).
+				SetHeader("x-share-token", d.ShareToken).
+				Post("https://api.aliyundrive.com/v2/file/get_share_link_download_url")
+			if err != nil {
+				return nil, err
+			}
+			if e2.Code != "" {
+				if e2.Code == "AccessTokenInvalid" || e2.Code == "ShareLinkTokenInvalid" {
+					err = d.getShareToken()
+					if err != nil {
+						return nil, err
+					}
+					return d.Link(ctx, file, args)
+				} else {
+					return nil, errors.New(e2.Code + ":" + e2.Message)
+				}
+			} else {
+				u = resp.DownloadUrl
+			}
+		} else {
+			return nil, errors.New(e.Code + ":" + e.Message)
+		}
+	} else {
+		u = utils.Json.Get(res.Body(), "url").ToString()
+	}
+	return &model.Link{
+		Header: http.Header{
+			"Referer": []string{"https://www.aliyundrive.com/"},
+		},
+		URL: u,
+	}, nil
+}
+
+func (d *AliyundriveShare) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
+	// TODO create folder
+	return errs.NotSupport
+}
+
+func (d *AliyundriveShare) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
+	// TODO move obj
+	return errs.NotSupport
+}
+
+func (d *AliyundriveShare) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
+	// TODO rename obj
+	return errs.NotSupport
+}
+
+func (d *AliyundriveShare) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
+	// TODO copy obj
+	return errs.NotSupport
+}
+
+func (d *AliyundriveShare) Remove(ctx context.Context, obj model.Obj) error {
+	// TODO remove obj
+	return errs.NotSupport
+}
+
+func (d *AliyundriveShare) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
+	// TODO upload file
+	return errs.NotSupport
+}
+
+var _ driver.Driver = (*AliyundriveShare)(nil)

drivers/aliyundrive_share/meta.go

@@ -0,0 +1,29 @@
+package aliyundrive_share
+
+import (
+	"github.com/alist-org/alist/v3/internal/driver"
+	"github.com/alist-org/alist/v3/internal/op"
+)
+
+type Addition struct {
+	RefreshToken string `json:"refresh_token" required:"true"`
+	ShareId      string `json:"share_id" required:"true"`
+	SharePwd     string `json:"share_pwd"`
+	driver.RootID
+	OrderBy        string `json:"order_by" type:"select" options:"name,size,updated_at,created_at"`
+	OrderDirection string `json:"order_direction" type:"select" options:"ASC,DESC"`
+}
+
+var config = driver.Config{
+	Name:        "AliyundriveShare",
+	LocalSort:   false,
+	OnlyProxy:   false,
+	NoUpload:    true,
+	DefaultRoot: "root",
+}
+
+func init() {
+	op.RegisterDriver(config, func() driver.Driver {
+		return &AliyundriveShare{}
+	})
+}

drivers/aliyundrive_share/types.go

@@ -0,0 +1,57 @@
+package aliyundrive_share
+
+import (
+	"time"
+
+	"github.com/alist-org/alist/v3/internal/model"
+)
+
+type ErrorResp struct {
+	Code    string `json:"code"`
+	Message string `json:"message"`
+}
+
+type ShareTokenResp struct {
+	ShareToken string    `json:"share_token"`
+	ExpireTime time.Time `json:"expire_time"`
+	ExpiresIn  int       `json:"expires_in"`
+}
+
+type ListResp struct {
+	Items             []File `json:"items"`
+	NextMarker        string `json:"next_marker"`
+	PunishedFileCount int    `json:"punished_file_count"`
+}
+
+type File struct {
+	DriveId      string    `json:"drive_id"`
+	DomainId     string    `json:"domain_id"`
+	FileId       string    `json:"file_id"`
+	ShareId      string    `json:"share_id"`
+	Name         string    `json:"name"`
+	Type         string    `json:"type"`
+	CreatedAt    time.Time `json:"created_at"`
+	UpdatedAt    time.Time `json:"updated_at"`
+	ParentFileId string    `json:"parent_file_id"`
+	Size         int64     `json:"size"`
+	Thumbnail    string    `json:"thumbnail"`
+}
+
+func fileToObj(f File) *model.ObjThumb {
+	return &model.ObjThumb{
+		Object: model.Object{
+			ID:       f.FileId,
+			Name:     f.Name,
+			Size:     f.Size,
+			Modified: f.UpdatedAt,
+			IsFolder: f.Type == "folder",
+		},
+		Thumbnail: model.Thumbnail{Thumbnail: f.Thumbnail},
+	}
+}
+
+type ShareLinkResp struct {
+	DownloadUrl string `json:"download_url"`
+	Url         string `json:"url"`
+	Thumbnail   string `json:"thumbnail"`
+}

drivers/aliyundrive_share/util.go

@@ -0,0 +1,99 @@
+package aliyundrive_share
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/alist-org/alist/v3/drivers/base"
+	"github.com/alist-org/alist/v3/internal/op"
+	log "github.com/sirupsen/logrus"
+)
+
+func (d *AliyundriveShare) refreshToken() error {
+	url := "https://auth.aliyundrive.com/v2/account/token"
+	var resp base.TokenResp
+	var e ErrorResp
+	_, err := base.RestyClient.R().
+		SetBody(base.Json{"refresh_token": d.RefreshToken, "grant_type": "refresh_token"}).
+		SetResult(&resp).
+		SetError(&e).
+		Post(url)
+	if err != nil {
+		return err
+	}
+	if e.Code != "" {
+		return fmt.Errorf("failed to refresh token: %s", e.Message)
+	}
+	d.RefreshToken, d.AccessToken = resp.RefreshToken, resp.AccessToken
+	op.MustSaveDriverStorage(d)
+	return nil
+}
+
+// do others that not defined in Driver interface
+func (d *AliyundriveShare) getShareToken() error {
+	data := base.Json{
+		"share_id": d.ShareId,
+	}
+	if d.SharePwd != "" {
+		data["share_pwd"] = d.SharePwd
+	}
+	var e ErrorResp
+	var resp ShareTokenResp
+	_, err := base.RestyClient.R().
+		SetResult(&resp).SetError(&e).SetBody(data).
+		Post("https://api.aliyundrive.com/v2/share_link/get_share_token")
+	if err != nil {
+		return err
+	}
+	if e.Code != "" {
+		return errors.New(e.Message)
+	}
+	d.ShareToken = resp.ShareToken
+	return nil
+}
+
+func (d *AliyundriveShare) getFiles(fileId string) ([]File, error) {
+	files := make([]File, 0)
+	data := base.Json{
+		"image_thumbnail_process": "image/resize,w_160/format,jpeg",
+		"image_url_process":       "image/resize,w_1920/format,jpeg",
+		"limit":                   100,
+		"order_by":                d.OrderBy,
+		"order_direction":         d.OrderDirection,
+		"parent_file_id":          fileId,
+		"share_id":                d.ShareId,
+		"video_thumbnail_process": "video/snapshot,t_1000,f_jpg,ar_auto,w_300",
+		"marker":                  "first",
+	}
+	for data["marker"] != "" {
+		if data["marker"] == "first" {
+			data["marker"] = ""
+		}
+		var e ErrorResp
+		var resp ListResp
+		res, err := base.RestyClient.R().
+			SetHeader("x-share-token", d.ShareToken).
+			SetResult(&resp).SetError(&e).SetBody(data).
+			Post("https://api.aliyundrive.com/adrive/v3/file/list")
+		if err != nil {
+			return nil, err
+		}
+		log.Debugf("aliyundrive share get files: %s", res.String())
+		if e.Code != "" {
+			if e.Code == "AccessTokenInvalid" || e.Code == "ShareLinkTokenInvalid" {
+				err = d.getShareToken()
+				if err != nil {
+					return nil, err
+				}
+				return d.getFiles(fileId)
+			}
+			return nil, errors.New(e.Message)
+		}
+		data["marker"] = resp.NextMarker
+		files = append(files, resp.Items...)
+	}
+	if len(files) > 0 && d.DriveId == "" {
+		d.DriveId = files[0].DriveId
+	}
+	return files, nil
+}

drivers/all.go

@@ -6,10 +6,12 @@ import (
 	_ "github.com/alist-org/alist/v3/drivers/189"
 	_ "github.com/alist-org/alist/v3/drivers/189pc"
 	_ "github.com/alist-org/alist/v3/drivers/aliyundrive"
+	_ "github.com/alist-org/alist/v3/drivers/aliyundrive_share"
 	_ "github.com/alist-org/alist/v3/drivers/baidu_netdisk"
 	_ "github.com/alist-org/alist/v3/drivers/baidu_photo"
 	_ "github.com/alist-org/alist/v3/drivers/ftp"
 	_ "github.com/alist-org/alist/v3/drivers/google_drive"
+	_ "github.com/alist-org/alist/v3/drivers/lanzou"
 	_ "github.com/alist-org/alist/v3/drivers/local"
 	_ "github.com/alist-org/alist/v3/drivers/mediatrack"
 	_ "github.com/alist-org/alist/v3/drivers/onedrive"

drivers/baidu_photo/utils.go

@@ -333,6 +333,7 @@ func (d *BaiduPhoto) linkAlbum(ctx context.Context, file model.Obj, args model.L
 		URL: res.Header().Get("location"),
 		Header: http.Header{
 			"User-Agent": []string{headers["User-Agent"]},
+			"Referer":    []string{"https://photo.baidu.com/"},
 		},
 		//Expiration: &exp,
 	}
@@ -369,6 +370,7 @@ func (d *BaiduPhoto) linkFile(ctx context.Context, file model.Obj, args model.Li
 		URL: downloadUrl.Dlink,
 		Header: http.Header{
 			"User-Agent": []string{headers["User-Agent"]},
+			"Referer":    []string{"https://photo.baidu.com/"},
 		},
 		//Expiration: &exp,
 	}

drivers/ftp/util.go

@@ -19,5 +19,6 @@ func (d *FTP) login() error {
 	if err != nil {
 		return err
 	}
+	d.conn = conn
 	return nil
 }

drivers/lanzou/driver.go

@@ -0,0 +1,171 @@
+package lanzou
+
+import (
+	"context"
+	"net/http"
+	"time"
+
+	"github.com/alist-org/alist/v3/drivers/base"
+	"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/pkg/utils"
+	"github.com/go-resty/resty/v2"
+)
+
+var upClient = base.NewRestyClient().SetTimeout(120 * time.Second)
+
+type LanZou struct {
+	Addition
+	model.Storage
+}
+
+func (d *LanZou) Config() driver.Config {
+	return config
+}
+
+func (d *LanZou) GetAddition() driver.Additional {
+	return d.Addition
+}
+
+func (d *LanZou) Init(ctx context.Context, storage model.Storage) error {
+	d.Storage = storage
+	err := utils.Json.UnmarshalFromString(d.Storage.Addition, &d.Addition)
+	if err != nil {
+		return err
+	}
+	if d.IsCookie() {
+		if d.RootFolderID == "" {
+			d.RootFolderID = "-1"
+		}
+	}
+	return nil
+}
+
+func (d *LanZou) Drop(ctx context.Context) error {
+	return nil
+}
+
+// 获取的大小和时间不准确
+func (d *LanZou) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
+	if d.IsCookie() {
+		return d.GetFiles(ctx, dir.GetID())
+	} else {
+		return d.GetFileOrFolderByShareUrl(ctx, dir.GetID(), d.SharePassword)
+	}
+}
+
+func (d *LanZou) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
+	downID := file.GetID()
+	pwd := d.SharePassword
+	if d.IsCookie() {
+		share, err := d.getFileShareUrlByID(ctx, file.GetID())
+		if err != nil {
+			return nil, err
+		}
+		downID = share.FID
+		pwd = share.Pwd
+	}
+	fileInfo, err := d.getFilesByShareUrl(ctx, downID, pwd, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	return &model.Link{
+		URL: fileInfo.Url,
+		Header: http.Header{
+			"User-Agent": []string{base.UserAgent},
+		},
+	}, nil
+}
+
+func (d *LanZou) MakeDir(ctx context.Context, parentDir model.Obj, dirName string) error {
+	if d.IsCookie() {
+		_, err := d.post(d.BaseUrl+"/doupload.php", func(req *resty.Request) {
+			req.SetContext(ctx)
+			req.SetFormData(map[string]string{
+				"task":               "2",
+				"parent_id":          parentDir.GetID(),
+				"folder_name":        dirName,
+				"folder_description": "",
+			})
+		}, nil)
+		return err
+	}
+	return errs.NotImplement
+}
+
+func (d *LanZou) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
+	if d.IsCookie() {
+		if !srcObj.IsDir() {
+			_, err := d.post(d.BaseUrl+"/doupload.php", func(req *resty.Request) {
+				req.SetContext(ctx)
+				req.SetFormData(map[string]string{
+					"task":      "20",
+					"folder_id": dstDir.GetID(),
+					"file_id":   srcObj.GetID(),
+				})
+			}, nil)
+			return err
+		}
+	}
+	return errs.NotImplement
+}
+
+func (d *LanZou) Rename(ctx context.Context, srcObj model.Obj, newName string) error {
+	if d.IsCookie() {
+		if !srcObj.IsDir() {
+			_, err := d.post(d.BaseUrl+"/doupload.php", func(req *resty.Request) {
+				req.SetContext(ctx)
+				req.SetFormData(map[string]string{
+					"task":      "46",
+					"file_id":   srcObj.GetID(),
+					"file_name": newName,
+					"type":      "2",
+				})
+			}, nil)
+			return err
+		}
+	}
+	return errs.NotImplement
+}
+
+func (d *LanZou) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
+	return errs.NotImplement
+}
+
+func (d *LanZou) Remove(ctx context.Context, obj model.Obj) error {
+	if d.IsCookie() {
+		_, err := d.post(d.BaseUrl+"/doupload.php", func(req *resty.Request) {
+			req.SetContext(ctx)
+			if obj.IsDir() {
+				req.SetFormData(map[string]string{
+					"task":      "3",
+					"folder_id": obj.GetID(),
+				})
+			} else {
+				req.SetFormData(map[string]string{
+					"task":    "6",
+					"file_id": obj.GetID(),
+				})
+			}
+		}, nil)
+		return err
+	}
+	return errs.NotImplement
+}
+
+func (d *LanZou) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
+	if d.IsCookie() {
+		_, err := d._post(d.BaseUrl+"/fileup.php", func(req *resty.Request) {
+			req.SetFormData(map[string]string{
+				"task":      "1",
+				"id":        "WU_FILE_0",
+				"name":      stream.GetName(),
+				"folder_id": dstDir.GetID(),
+			}).SetFileReader("upload_file", stream.GetName(), stream)
+		}, nil, true)
+		return err
+	}
+	return errs.NotImplement
+}

drivers/lanzou/help.go

@@ -0,0 +1,165 @@
+package lanzou
+
+import (
+	"bytes"
+	"fmt"
+	"regexp"
+	"strconv"
+	"strings"
+	"time"
+	"unicode"
+)
+
+const DAY time.Duration = 84600000000000
+
+var timeSplitReg = regexp.MustCompile("([0-9.]*)\\s*([\u4e00-\u9fa5]+)")
+
+func MustParseTime(str string) time.Time {
+	lastOpTime, err := time.ParseInLocation("2006-01-02 -07", str+" +08", time.Local)
+	if err != nil {
+		strs := timeSplitReg.FindStringSubmatch(str)
+		lastOpTime = time.Now()
+		if len(strs) == 3 {
+			i, _ := strconv.ParseInt(strs[1], 10, 64)
+			ti := time.Duration(-i)
+			switch strs[2] {
+			case "秒前":
+				lastOpTime = lastOpTime.Add(time.Second * ti)
+			case "分钟前":
+				lastOpTime = lastOpTime.Add(time.Minute * ti)
+			case "小时前":
+				lastOpTime = lastOpTime.Add(time.Hour * ti)
+			case "天前":
+				lastOpTime = lastOpTime.Add(DAY * ti)
+			case "昨天":
+				lastOpTime = lastOpTime.Add(-DAY)
+			case "前天":
+				lastOpTime = lastOpTime.Add(-DAY * 2)
+			}
+		}
+	}
+	return lastOpTime
+}
+
+var sizeSplitReg = regexp.MustCompile(`(?i)([0-9.]+)\s*([bkm]+)`)
+
+func SizeStrToInt64(size string) int64 {
+	strs := sizeSplitReg.FindStringSubmatch(size)
+	if len(strs) < 3 {
+		return 0
+	}
+
+	s, _ := strconv.ParseFloat(strs[1], 64)
+	switch strings.ToUpper(strs[2]) {
+	case "B":
+		return int64(s)
+	case "K":
+		return int64(s * (1 << 10))
+	case "M":
+		return int64(s * (1 << 20))
+	}
+	return 0
+}
+
+// 移除注释
+func RemoveNotes(html []byte) []byte {
+	return regexp.MustCompile(`<!--.*?-->|//.*|/\*.*?\*/`).ReplaceAll(html, []byte{})
+}
+
+var findAcwScV2Reg = regexp.MustCompile(`arg1='([0-9A-Z]+)'`)
+
+// 在页面被过多访问或其他情况下，有时候会先返回一个加密的页面，其执行计算出一个acw_sc__v2后放入页面后再重新访问页面才能获得正常页面
+// 若该页面进行了js加密，则进行解密，计算acw_sc__v2，并加入cookie
+func CalcAcwScV2(html string) (string, error) {
+	acwScV2s := findAcwScV2Reg.FindStringSubmatch(html)
+	if len(acwScV2s) != 2 {
+		return "", fmt.Errorf("无法匹配acw_sc__v2")
+	}
+	return HexXor(Unbox(acwScV2s[1]), "3000176000856006061501533003690027800375"), nil
+}
+
+func Unbox(hex string) string {
+	var box = []int{6, 28, 34, 31, 33, 18, 30, 23, 9, 8, 19, 38, 17, 24, 0, 5, 32, 21, 10, 22, 25, 14, 15, 3, 16, 27, 13, 35, 2, 29, 11, 26, 4, 36, 1, 39, 37, 7, 20, 12}
+	var newBox = make([]byte, len(hex))
+	for i := 0; i < len(box); i++ {
+		j := box[i]
+		if len(newBox) > j {
+			newBox[j] = hex[i]
+		}
+	}
+	return string(newBox)
+}
+
+func HexXor(hex1, hex2 string) string {
+	out := bytes.NewBuffer(make([]byte, len(hex1)))
+	for i := 0; i < len(hex1) && i < len(hex2); i += 2 {
+		v1, _ := strconv.ParseInt(hex1[i:i+2], 16, 64)
+		v2, _ := strconv.ParseInt(hex2[i:i+2], 16, 64)
+		out.WriteString(strconv.FormatInt(v1^v2, 16))
+	}
+	return out.String()
+}
+
+var findDataReg = regexp.MustCompile(`data[:\s]+({[^}]+})`)    // 查找json
+var findKVReg = regexp.MustCompile(`'(.+?)':('?([^' },]*)'?)`) // 拆分kv
+
+// 根据key查询js变量
+func findJSVarFunc(key, data string) string {
+	values := regexp.MustCompile(`var ` + key + ` = '(.+?)';`).FindStringSubmatch(data)
+	if len(values) == 0 {
+		return ""
+	}
+	return values[1]
+}
+
+// 解析html中的JSON
+func htmlJsonToMap(html string) (map[string]string, error) {
+	datas := findDataReg.FindStringSubmatch(html)
+	if len(datas) != 2 {
+		return nil, fmt.Errorf("not find data")
+	}
+	return jsonToMap(datas[1], html), nil
+}
+
+func jsonToMap(data, html string) map[string]string {
+	var param = make(map[string]string)
+	kvs := findKVReg.FindAllStringSubmatch(data, -1)
+	for _, kv := range kvs {
+		k, v := kv[1], kv[3]
+		if v == "" || strings.Contains(kv[2], "'") || IsNumber(kv[2]) {
+			param[k] = v
+		} else {
+			param[k] = findJSVarFunc(v, html)
+		}
+	}
+	return param
+}
+
+func IsNumber(str string) bool {
+	for _, s := range str {
+		if !unicode.IsDigit(s) {
+			return false
+		}
+	}
+	return true
+}
+
+var findFromReg = regexp.MustCompile(`data : '(.+?)'`) // 查找from字符串
+
+// 解析html中的from
+func htmlFormToMap(html string) (map[string]string, error) {
+	froms := findFromReg.FindStringSubmatch(html)
+	if len(froms) != 2 {
+		return nil, fmt.Errorf("not find file sgin")
+	}
+	return fromToMap(froms[1]), nil
+}
+
+func fromToMap(from string) map[string]string {
+	var param = make(map[string]string)
+	for _, kv := range strings.Split(from, "&") {
+		kv := strings.SplitN(kv, "=", 2)[:2]
+		param[kv[0]] = kv[1]
+	}
+	return param
+}

drivers/lanzou/meta.go

@@ -0,0 +1,31 @@
+package lanzou
+
+import (
+	"github.com/alist-org/alist/v3/internal/driver"
+	"github.com/alist-org/alist/v3/internal/op"
+)
+
+type Addition struct {
+	Type   string `json:"type" type:"select" options:"cookie,url" default:"cookie"`
+	Cookie string `json:"cookie" required:"true" help:"about 15 days valid"`
+	driver.RootID
+	SharePassword string `json:"share_password"`
+	BaseUrl       string `json:"baseUrl" required:"true" default:"https://pc.woozooo.com"`
+	ShareUrl      string `json:"shareUrl" required:"true" default:"https://pan.lanzouo.com"`
+}
+
+func (a *Addition) IsCookie() bool {
+	return a.Type == "cookie"
+}
+
+var config = driver.Config{
+	Name:        "Lanzou",
+	LocalSort:   true,
+	DefaultRoot: "-1",
+}
+
+func init() {
+	op.RegisterDriver(config, func() driver.Driver {
+		return &LanZou{}
+	})
+}

drivers/lanzou/types.go

@@ -0,0 +1,131 @@
+package lanzou
+
+import (
+	"fmt"
+	"time"
+
+	"github.com/alist-org/alist/v3/internal/model"
+)
+
+type FilesOrFoldersResp struct {
+	Text []FileOrFolder `json:"text"`
+}
+
+type FileOrFolder struct {
+	Name string `json:"name"`
+	//Onof        string `json:"onof"` // 是否存在提取码
+	//IsLock      string `json:"is_lock"`
+	//IsCopyright int    `json:"is_copyright"`
+
+	// 文件通用
+	ID      string `json:"id"`
+	NameAll string `json:"name_all"`
+	Size    string `json:"size"`
+	Time    string `json:"time"`
+	//Icon          string `json:"icon"`
+	//Downs         string `json:"downs"`
+	//Filelock      string `json:"filelock"`
+	//IsBakdownload int    `json:"is_bakdownload"`
+	//Bakdownload   string `json:"bakdownload"`
+	//IsDes         int    `json:"is_des"` // 是否存在描述
+	//IsIco         int    `json:"is_ico"`
+
+	// 文件夹
+	FolID string `json:"fol_id"`
+	//Folderlock string `json:"folderlock"`
+	//FolderDes  string `json:"folder_des"`
+}
+
+func (f *FileOrFolder) isFloder() bool {
+	return f.FolID != ""
+}
+func (f *FileOrFolder) ToObj() model.Obj {
+	obj := &model.Object{}
+	if f.isFloder() {
+		obj.ID = f.FolID
+		obj.Name = f.Name
+		obj.Modified = time.Now()
+		obj.IsFolder = true
+	} else {
+		obj.ID = f.ID
+		obj.Name = f.NameAll
+		obj.Modified = MustParseTime(f.Time)
+		obj.Size = SizeStrToInt64(f.Size)
+	}
+	return obj
+}
+
+type FileShareResp struct {
+	Info FileShare `json:"info"`
+}
+type FileShare struct {
+	Pwd    string `json:"pwd"`
+	Onof   string `json:"onof"`
+	Taoc   string `json:"taoc"`
+	IsNewd string `json:"is_newd"`
+
+	// 文件
+	FID string `json:"f_id"`
+
+	// 文件夹
+	NewUrl string `json:"new_url"`
+	Name   string `json:"name"`
+	Des    string `json:"des"`
+}
+
+type FileOrFolderByShareUrlResp struct {
+	Text []FileOrFolderByShareUrl `json:"text"`
+}
+type FileOrFolderByShareUrl struct {
+	ID      string `json:"id"`
+	NameAll string `json:"name_all"`
+	Size    string `json:"size"`
+	Time    string `json:"time"`
+	Duan    string `json:"duan"`
+	//Icon          string `json:"icon"`
+	//PIco int `json:"p_ico"`
+	//T int `json:"t"`
+	IsFloder bool
+}
+
+func (f *FileOrFolderByShareUrl) ToObj() model.Obj {
+	return &model.Object{
+		ID:       f.ID,
+		Name:     f.NameAll,
+		Size:     SizeStrToInt64(f.Size),
+		Modified: MustParseTime(f.Time),
+		IsFolder: f.IsFloder,
+	}
+}
+
+type FileShareInfoAndUrlResp[T string | int] struct {
+	Dom string `json:"dom"`
+	URL string `json:"url"`
+	Inf T      `json:"inf"`
+}
+
+func (u *FileShareInfoAndUrlResp[T]) GetBaseUrl() string {
+	return fmt.Sprint(u.Dom, "/file")
+}
+
+func (u *FileShareInfoAndUrlResp[T]) GetDownloadUrl() string {
+	return fmt.Sprint(u.GetBaseUrl(), "/", u.URL)
+}
+
+// 通过分享链接获取文件信息和下载链接
+type FileInfoAndUrlByShareUrl struct {
+	ID   string
+	Name string
+	Size string
+	Time string
+	Url  string
+}
+
+func (f *FileInfoAndUrlByShareUrl) ToObj() model.Obj {
+	return &model.Object{
+		ID:       f.ID,
+		Name:     f.Name,
+		Size:     SizeStrToInt64(f.Size),
+		Modified: MustParseTime(f.Time),
+	}
+}

drivers/quark/meta.go

@@ -8,7 +8,7 @@ import (
 type Addition struct {
 	Cookie string `json:"cookie" required:"true"`
 	driver.RootID
-	OrderBy        string `json:"order_by" type:"select" options:"file_type,file_name,updated_at" default:"file_name"`
+	OrderBy        string `json:"order_by" type:"select" options:"none,file_type,file_name,updated_at" default:"none"`
 	OrderDirection string `json:"order_direction" type:"select" options:"asc,desc" default:"asc"`
 }
 

drivers/quark/util.go

@@ -62,7 +62,9 @@ func (d *Quark) GetFiles(parent string) ([]File, error) {
 		"pdir_fid":     parent,
 		"_size":        strconv.Itoa(size),
 		"_fetch_total": "1",
-		"_sort":        "file_type:asc," + d.OrderBy + ":" + d.OrderDirection,
+	}
+	if d.OrderBy != "none" {
+		query["_sort"] = "file_type:asc," + d.OrderBy + ":" + d.OrderDirection
 	}
 	for {
 		query["_page"] = strconv.Itoa(page)

drivers/s3/driver.go

@@ -130,13 +130,10 @@ func (d *S3) Copy(ctx context.Context, srcObj, dstDir model.Obj) error {
 }
 
 func (d *S3) Remove(ctx context.Context, obj model.Obj) error {
-	key := getKey(obj.GetPath(), obj.IsDir())
-	input := &s3.DeleteObjectInput{
-		Bucket: &d.Bucket,
-		Key:    &key,
+	if obj.IsDir() {
+		return d.removeDir(ctx, obj.GetPath())
 	}
-	_, err := d.client.DeleteObject(input)
-	return err
+	return d.removeFile(obj.GetPath())
 }
 
 func (d *S3) Put(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {

drivers/s3/util.go

@@ -52,12 +52,11 @@ func getKey(path string, dir bool) string {
 	return path
 }
 
-var defaultPlaceholderName = ".placeholder"
-
+// var defaultPlaceholderName = ".placeholder"
 func getPlaceholderName(placeholder string) string {
-	if placeholder == "" {
-		return defaultPlaceholderName
-	}
+	//if placeholder == "" {
+	//	return defaultPlaceholderName
+	//}
 	return placeholder
 }
 
@@ -205,3 +204,33 @@ func (d *S3) copyDir(ctx context.Context, src string, dst string) error {
 	}
 	return nil
 }
+
+func (d *S3) removeDir(ctx context.Context, src string) error {
+	objs, err := op.List(ctx, d, src, model.ListArgs{})
+	if err != nil {
+		return err
+	}
+	for _, obj := range objs {
+		cSrc := path.Join(src, obj.GetName())
+		if obj.IsDir() {
+			err = d.removeDir(ctx, cSrc)
+		} else {
+			err = d.removeFile(cSrc)
+		}
+		if err != nil {
+			return err
+		}
+	}
+	_ = d.removeFile(path.Join(src, getPlaceholderName(d.Placeholder)))
+	return nil
+}
+
+func (d *S3) removeFile(src string) error {
+	key := getKey(src, true)
+	input := &s3.DeleteObjectInput{
+		Bucket: &d.Bucket,
+		Key:    &key,
+	}
+	_, err := d.client.DeleteObject(input)
+	return err
+}