chore(deps): update actions/setup-go action to v4 (#3858)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.github/workflows/auto_lang.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Setup go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.go-version }}
 
@@ -54,7 +54,7 @@ jobs:
           cd alist-web
           git add .
           git config --local user.email "i@nn.ci"
-          git config --local user.name "Noah Hsu"
+          git config --local user.name "Andy Hsu"
           git commit -m "chore: auto update i18n file" -a 2>/dev/null || :
           cd ..
 

.github/workflows/build.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Setup Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.go-version }}
 

.github/workflows/changelog.yml

@@ -0,0 +1,19 @@
+name: auto changelog
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  changelog:
+    name: Create Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - run: npx changelogithub # or changelogithub@0.12 if ensure the stable result
+        env:
+          GITHUB_TOKEN: ${{secrets.MY_TOKEN}}

.github/workflows/release.yml

@@ -1,33 +1,27 @@
 name: release
 
 on:
-  push:
-    tags:
-      - '*'
+  release:
+    types: [ published ]
 
 jobs:
-  changelog:
-    name: Create Release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - run: npx changelogithub # or changelogithub@0.12 if ensure the stable result
-        env:
-          GITHUB_TOKEN: ${{secrets.MY_TOKEN}}
   release:
-    needs: changelog
     strategy:
       matrix:
-        platform: [ubuntu-latest]
-        go-version: [1.19]
+        platform: [ ubuntu-latest ]
+        go-version: [ 1.19 ]
     name: Release
     runs-on: ${{ matrix.platform }}
     steps:
+      - name: prerelease
+        uses: irongut/EditRelease@v1.2.0
+        with:
+          token: ${{ secrets.MY_TOKEN }}
+          id: ${{ github.event.release.id }}
+          prerelease: true
+
       - name: Setup Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.go-version }}
 
@@ -47,7 +41,41 @@ jobs:
         run: |
           bash build.sh release
 
+      - name: prerelease
+        uses: irongut/EditRelease@v1.2.0
+        with:
+          token: ${{ secrets.MY_TOKEN }}
+          id: ${{ github.event.release.id }}
+          prerelease: false
+
       - name: Release
         uses: softprops/action-gh-release@v1
         with:
-          files: build/compress/*
+          files: build/compress/*
+
+  release_desktop:
+    needs: release
+    name: Release desktop
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+        with:
+          repository: alist-org/desktop-release
+          ref: main
+          persist-credentials: false
+          fetch-depth: 0
+
+      - name: Add tag
+        run: |
+          git config --local user.email "i@nn.ci"
+          git config --local user.name "Andy Hsu"
+          version=$(wget -qO- -t1 -T2 "https://api.github.com/repos/alist-org/alist/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g')
+          git tag -a $version -m "release $version"
+
+      - name: Push tags
+        uses: ad-m/github-push-action@master
+        with:
+          github_token: ${{ secrets.MY_TOKEN }}
+          branch: main
+          repository: alist-org/desktop-release

.github/workflows/release_docker.yml

@@ -57,7 +57,7 @@ jobs:
       - name: Add tag
         run: |
           git config --local user.email "i@nn.ci"
-          git config --local user.name "Noah Hsu"
+          git config --local user.name "Andy Hsu"
           git tag -a ${{ github.ref_name }} -m "release ${{ github.ref_name }}"
 
       - name: Push tags

Dockerfile

@@ -15,4 +15,4 @@ RUN apk add --no-cache bash ca-certificates su-exec tzdata; \
     chmod +x /entrypoint.sh
 ENV PUID=0 PGID=0 UMASK=022
 EXPOSE 5244
-ENTRYPOINT [ "/entrypoint.sh" ]
+CMD [ "/entrypoint.sh" ]

cmd/flags/config.go

@@ -6,4 +6,5 @@ var (
 	NoPrefix    bool
 	Dev         bool
 	ForceBinDir bool
+	LogStd      bool
 )

cmd/root.go

@@ -29,4 +29,5 @@ func init() {
 	RootCmd.PersistentFlags().BoolVar(&flags.NoPrefix, "no-prefix", false, "disable env prefix")
 	RootCmd.PersistentFlags().BoolVar(&flags.Dev, "dev", false, "start with dev mode")
 	RootCmd.PersistentFlags().BoolVar(&flags.ForceBinDir, "force-bin-dir", false, "Force to use the directory where the binary file is located as data directory")
+	RootCmd.PersistentFlags().BoolVar(&flags.LogStd, "log-std", false, "Force to log to std")
 }

cmd/storage.go

@@ -0,0 +1,52 @@
+/*
+Copyright © 2023 NAME HERE <EMAIL ADDRESS>
+*/
+package cmd
+
+import (
+	"github.com/alist-org/alist/v3/internal/db"
+	"github.com/alist-org/alist/v3/pkg/utils"
+	"github.com/spf13/cobra"
+)
+
+// storageCmd represents the storage command
+var storageCmd = &cobra.Command{
+	Use:   "storage",
+	Short: "Manage storage",
+}
+
+func init() {
+	var mountPath string
+	var disable = &cobra.Command{
+		Use:   "disable",
+		Short: "Disable a storage",
+		Run: func(cmd *cobra.Command, args []string) {
+			Init()
+			storage, err := db.GetStorageByMountPath(mountPath)
+			if err != nil {
+				utils.Log.Errorf("failed to query storage: %+v", err)
+			} else {
+				storage.Disabled = true
+				err = db.UpdateStorage(storage)
+				if err != nil {
+					utils.Log.Errorf("failed to update storage: %+v", err)
+				} else {
+					utils.Log.Infof("Storage with mount path [%s] have been disabled", mountPath)
+				}
+			}
+		},
+	}
+	disable.Flags().StringVarP(&mountPath, "mount-path", "m", "", "The mountPath of storage")
+	RootCmd.AddCommand(storageCmd)
+	storageCmd.AddCommand(disable)
+
+	// Here you will define your flags and configuration settings.
+
+	// Cobra supports Persistent Flags which will work for this command
+	// and all subcommands, e.g.:
+	// storageCmd.PersistentFlags().String("foo", "", "A help for foo")
+
+	// Cobra supports local flags which will only run when this command
+	// is called directly, e.g.:
+	// storageCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
+}

drivers/115/meta.go

@@ -6,16 +6,18 @@ import (
 )
 
 type Addition struct {
-	Cookie      string `json:"cookie"`
-	QRCodeToken string `json:"qrcode_token"`
+	Cookie      string `json:"cookie" type:"text" help:"one of QR code token and cookie required"`
+	QRCodeToken string `json:"qrcode_token" type:"text" help:"one of QR code token and cookie required"`
+	PageSize    int64  `json:"page_size" type:"number" default:"56" help:"list api per page size of 115 driver"`
 	driver.RootID
 }
 
 var config = driver.Config{
-	Name:        "115 Cloud",
-	DefaultRoot: "0",
-	OnlyProxy:   true,
-	OnlyLocal:   true,
+	Name:              "115 Cloud",
+	DefaultRoot:       "0",
+	OnlyProxy:         true,
+	OnlyLocal:         true,
+	NoOverwriteUpload: true,
 }
 
 func init() {

drivers/115/util.go

@@ -7,7 +7,7 @@ import (
 	"github.com/pkg/errors"
 )
 
-var UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/106.0.0.0 Safari/537.36 115Browser/23.9.3.2 115disk/30.1.0"
+var UserAgent = driver.UA115Desktop
 
 func (d *Pan115) login() error {
 	var err error
@@ -38,7 +38,10 @@ func (d *Pan115) login() error {
 
 func (d *Pan115) getFiles(fileId string) ([]driver.File, error) {
 	res := make([]driver.File, 0)
-	files, err := d.client.List(fileId)
+	if d.PageSize <= 0 {
+		d.PageSize = driver.FileListLimit
+	}
+	files, err := d.client.ListWithLimit(fileId, d.PageSize)
 	if err != nil {
 		return nil, err
 	}

drivers/123/types.go

@@ -7,18 +7,6 @@ import (
 	"github.com/alist-org/alist/v3/internal/model"
 )
 
-//type BaseResp struct {
-//	Code    interface{} `json:"code"`
-//	Message string      `json:"message"`
-//}
-
-type TokenResp struct {
-	//BaseResp
-	Data struct {
-		Token string `json:"token"`
-	} `json:"data"`
-}
-
 type File struct {
 	FileName    string    `json:"FileName"`
 	Size        int64     `json:"Size"`

drivers/123/util.go

@@ -29,9 +29,7 @@ func (d *Pan123) login() error {
 			"password": d.Password,
 		}
 	}
-	var resp TokenResp
 	res, err := base.RestyClient.R().
-		SetResult(&resp).
 		SetBody(body).Post(url)
 	if err != nil {
 		return err
@@ -39,7 +37,7 @@ func (d *Pan123) login() error {
 	if utils.Json.Get(res.Body(), "code").ToInt() != 200 {
 		err = fmt.Errorf(utils.Json.Get(res.Body(), "message").ToString())
 	} else {
-		d.AccessToken = resp.Data.Token
+		d.AccessToken = utils.Json.Get(res.Body(), "data", "token").ToString()
 	}
 	return err
 }

drivers/alias/driver.go

@@ -0,0 +1,114 @@
+package alias
+
+import (
+	"context"
+	"errors"
+	"strings"
+
+	"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"
+)
+
+type Alias struct {
+	model.Storage
+	Addition
+	pathMap     map[string][]string
+	autoFlatten bool
+	oneKey      string
+}
+
+func (d *Alias) Config() driver.Config {
+	return config
+}
+
+func (d *Alias) GetAddition() driver.Additional {
+	return &d.Addition
+}
+
+func (d *Alias) Init(ctx context.Context) error {
+	if d.Paths == "" {
+		return errors.New("paths is required")
+	}
+	d.pathMap = make(map[string][]string)
+	for _, path := range strings.Split(d.Paths, "\n") {
+		path = strings.TrimSpace(path)
+		if path == "" {
+			continue
+		}
+		k, v := getPair(path)
+		d.pathMap[k] = append(d.pathMap[k], v)
+	}
+	if len(d.pathMap) == 1 {
+		for k := range d.pathMap {
+			d.oneKey = k
+		}
+		d.autoFlatten = true
+	}
+	return nil
+}
+
+func (d *Alias) Drop(ctx context.Context) error {
+	d.pathMap = nil
+	return nil
+}
+
+func (d *Alias) Get(ctx context.Context, path string) (model.Obj, error) {
+	if utils.PathEqual(path, "/") {
+		return &model.Object{
+			Name:     "Root",
+			IsFolder: true,
+			Path:     "/",
+		}, nil
+	}
+	root, sub := d.getRootAndPath(path)
+	dsts, ok := d.pathMap[root]
+	if !ok {
+		return nil, errs.ObjectNotFound
+	}
+	for _, dst := range dsts {
+		obj, err := d.get(ctx, path, dst, sub)
+		if err == nil {
+			return obj, nil
+		}
+	}
+	return nil, errs.ObjectNotFound
+}
+
+func (d *Alias) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
+	path := dir.GetPath()
+	if utils.PathEqual(path, "/") && !d.autoFlatten {
+		return d.listRoot(), nil
+	}
+	root, sub := d.getRootAndPath(path)
+	dsts, ok := d.pathMap[root]
+	if !ok {
+		return nil, errs.ObjectNotFound
+	}
+	var objs []model.Obj
+	for _, dst := range dsts {
+		tmp, err := d.list(ctx, dst, sub)
+		if err == nil {
+			objs = append(objs, tmp...)
+		}
+	}
+	return objs, nil
+}
+
+func (d *Alias) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
+	root, sub := d.getRootAndPath(file.GetPath())
+	dsts, ok := d.pathMap[root]
+	if !ok {
+		return nil, errs.ObjectNotFound
+	}
+	for _, dst := range dsts {
+		link, err := d.link(ctx, dst, sub, args)
+		if err == nil {
+			return link, nil
+		}
+	}
+	return nil, errs.ObjectNotFound
+}
+
+var _ driver.Driver = (*Alias)(nil)

drivers/alias/meta.go

@@ -0,0 +1,27 @@
+package alias
+
+import (
+	"github.com/alist-org/alist/v3/internal/driver"
+	"github.com/alist-org/alist/v3/internal/op"
+)
+
+type Addition struct {
+	// Usually one of two
+	// driver.RootPath
+	// define other
+	Paths string `json:"paths" required:"true" type:"text"`
+}
+
+var config = driver.Config{
+	Name:        "Alias",
+	LocalSort:   true,
+	NoCache:     true,
+	NoUpload:    true,
+	DefaultRoot: "/",
+}
+
+func init() {
+	op.RegisterDriver(func() driver.Driver {
+		return &Alias{}
+	})
+}

drivers/alias/types.go

@@ -0,0 +1 @@
+package alias

drivers/alias/util.go

@@ -0,0 +1,103 @@
+package alias
+
+import (
+	"context"
+	"fmt"
+	stdpath "path"
+	"strings"
+
+	"github.com/alist-org/alist/v3/internal/fs"
+	"github.com/alist-org/alist/v3/internal/model"
+	"github.com/alist-org/alist/v3/internal/sign"
+	"github.com/alist-org/alist/v3/pkg/utils"
+	"github.com/alist-org/alist/v3/server/common"
+)
+
+func (d *Alias) listRoot() []model.Obj {
+	var objs []model.Obj
+	for k, _ := range d.pathMap {
+		obj := model.Object{
+			Name:     k,
+			IsFolder: true,
+			Modified: d.Modified,
+		}
+		objs = append(objs, &obj)
+	}
+	return objs
+}
+
+// do others that not defined in Driver interface
+func getPair(path string) (string, string) {
+	//path = strings.TrimSpace(path)
+	if strings.Contains(path, ":") {
+		pair := strings.SplitN(path, ":", 2)
+		if !strings.Contains(pair[0], "/") {
+			return pair[0], pair[1]
+		}
+	}
+	return stdpath.Base(path), path
+}
+
+func (d *Alias) getRootAndPath(path string) (string, string) {
+	if d.autoFlatten {
+		return d.oneKey, path
+	}
+	path = strings.TrimPrefix(path, "/")
+	parts := strings.SplitN(path, "/", 2)
+	if len(parts) == 1 {
+		return parts[0], ""
+	}
+	return parts[0], parts[1]
+}
+
+func (d *Alias) get(ctx context.Context, path string, dst, sub string) (model.Obj, error) {
+	obj, err := fs.Get(ctx, stdpath.Join(dst, sub))
+	if err != nil {
+		return nil, err
+	}
+	return &model.Object{
+		Path:     path,
+		Name:     obj.GetName(),
+		Size:     obj.GetSize(),
+		Modified: obj.ModTime(),
+		IsFolder: obj.IsDir(),
+	}, nil
+}
+
+func (d *Alias) list(ctx context.Context, dst, sub string) ([]model.Obj, error) {
+	objs, err := fs.List(ctx, stdpath.Join(dst, sub))
+	// the obj must implement the model.SetPath interface
+	// return objs, err
+	if err != nil {
+		return nil, err
+	}
+	return utils.SliceConvert(objs, func(obj model.Obj) (model.Obj, error) {
+		return &model.Object{
+			Name:     obj.GetName(),
+			Size:     obj.GetSize(),
+			Modified: obj.ModTime(),
+			IsFolder: obj.IsDir(),
+		}, nil
+	})
+}
+
+func (d *Alias) link(ctx context.Context, dst, sub string, args model.LinkArgs) (*model.Link, error) {
+	reqPath := stdpath.Join(dst, sub)
+	storage, err := fs.GetStorage(reqPath)
+	if err != nil {
+		return nil, err
+	}
+	_, err = fs.Get(ctx, reqPath)
+	if err != nil {
+		return nil, err
+	}
+	if common.ShouldProxy(storage, stdpath.Base(sub)) {
+		return &model.Link{
+			URL: fmt.Sprintf("/p%s?sign=%s",
+				utils.EncodePath(reqPath, true),
+				sign.Sign(reqPath)),
+		}, nil
+	}
+	link, _, err := fs.Link(ctx, reqPath, args)
+	return link, err
+}

drivers/aliyundrive/driver.go

@@ -226,7 +226,7 @@ func (d *AliDrive) Put(ctx context.Context, dstDir model.Obj, stream model.FileS
 		delete(reqBody, "pre_hash")
 		h := sha1.New()
 		if localFile != nil {
-			if _, err = io.Copy(h, localFile); err != nil {
+			if err = utils.CopyWithCtx(ctx, h, localFile, 0, nil); err != nil {
 				return err
 			}
 			if _, err = localFile.Seek(0, io.SeekStart); err != nil {
@@ -241,7 +241,7 @@ func (d *AliDrive) Put(ctx context.Context, dstDir model.Obj, stream model.FileS
 				_ = tempFile.Close()
 				_ = os.Remove(tempFile.Name())
 			}()
-			if _, err = io.Copy(io.MultiWriter(tempFile, h), file); err != nil {
+			if err = utils.CopyWithCtx(ctx, io.MultiWriter(tempFile, h), file, 0, nil); err != nil {
 				return err
 			}
 			localFile = tempFile

drivers/aliyundrive/meta.go

@@ -18,7 +18,9 @@ type Addition struct {
 var config = driver.Config{
 	Name:        "Aliyundrive",
 	DefaultRoot: "root",
-	Alert:       "warning|Deprecated, no longer maintained and will be removed in a future version",
+	Alert: `warning|There may be an infinite loop bug in this driver.
+Deprecated, no longer maintained and will be removed in a future version.
+We recommend using the official driver AliyundriveOpen.`,
 }
 
 func init() {

drivers/aliyundrive_open/driver.go

@@ -5,24 +5,20 @@ import (
 	"io"
 	"math"
 	"net/http"
-	"time"
+	"strings"
 
 	"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/internal/op"
-	"github.com/alist-org/alist/v3/pkg/cron"
 	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/go-resty/resty/v2"
-	log "github.com/sirupsen/logrus"
 )
 
 type AliyundriveOpen struct {
 	model.Storage
 	Addition
 	base string
-	cron *cron.Cron
 
 	AccessToken string
 	DriveId     string
@@ -46,22 +42,10 @@ func (d *AliyundriveOpen) Init(ctx context.Context) error {
 		return err
 	}
 	d.DriveId = utils.Json.Get(res, "default_drive_id").ToString()
-	d.cron = cron.NewCron(time.Hour * 2)
-	d.cron.Do(func() {
-		err := d.refreshToken()
-		d.Status = err.Error()
-		op.MustSaveDriverStorage(d)
-		if err != nil {
-			log.Errorf("%+v", err)
-		}
-	})
 	return nil
 }
 
 func (d *AliyundriveOpen) Drop(ctx context.Context) error {
-	if d.cron != nil {
-		d.cron.Stop()
-	}
 	return nil
 }
 
@@ -78,8 +62,9 @@ func (d *AliyundriveOpen) List(ctx context.Context, dir model.Obj, args model.Li
 func (d *AliyundriveOpen) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
 	res, err := d.request("/adrive/v1.0/openFile/getDownloadUrl", http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
-			"drive_id": d.DriveId,
-			"file_id":  file.GetID(),
+			"drive_id":   d.DriveId,
+			"file_id":    file.GetID(),
+			"expire_sec": 14400,
 		})
 	})
 	if err != nil {
@@ -141,7 +126,11 @@ func (d *AliyundriveOpen) Copy(ctx context.Context, srcObj, dstDir model.Obj) er
 }
 
 func (d *AliyundriveOpen) Remove(ctx context.Context, obj model.Obj) error {
-	_, err := d.request("/adrive/v1.0/openFile/recyclebin/trash", http.MethodPost, func(req *resty.Request) {
+	uri := "/adrive/v1.0/openFile/recyclebin/trash"
+	if d.RemoveWay == "delete" {
+		uri = "/adrive/v1.0/openFile/delete"
+	}
+	_, err := d.request(uri, http.MethodPost, func(req *resty.Request) {
 		req.SetBody(base.Json{
 			"drive_id": d.DriveId,
 			"file_id":  obj.GetID(),
@@ -182,7 +171,12 @@ func (d *AliyundriveOpen) Put(ctx context.Context, dstDir model.Obj, stream mode
 		if utils.IsCanceled(ctx) {
 			return ctx.Err()
 		}
-		req, err := http.NewRequest("PUT", partInfo.UploadUrl, io.LimitReader(stream, DEFAULT))
+		uploadUrl := partInfo.UploadUrl
+		if d.InternalUpload {
+			//Replace a known public Host with an internal Host
+			uploadUrl = strings.ReplaceAll(uploadUrl, "https://cn-beijing-data.aliyundrive.net/", "http://ccp-bj29-bj-1592982087.oss-cn-beijing-internal.aliyuncs.com/")
+		}
+		req, err := http.NewRequest("PUT", uploadUrl, io.LimitReader(stream, DEFAULT))
 		if err != nil {
 			return err
 		}