fix(123): adapt new upload method (close #4141)

* 增加清理空文件夹API

* 修复嵌套文件夹删除Bug

 Author:    varg247 <varg247@gmail.com>

---------

Co-authored-by: varg247 <varg247@qq.com>

.github/stale.yml

@@ -0,0 +1,19 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 44
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 8
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - accepted
+  - security
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: >
+  This issue was closed due to inactive more than 52 days. You can reopen or
+  recreate it if you think it should continue. Thank you for your contributions again.

.github/workflows/auto_lang.yml

@@ -16,12 +16,12 @@ jobs:
     strategy:
       matrix:
         platform: [ ubuntu-latest ]
-        go-version: [ 1.19 ]
+        go-version: [ '1.20' ]
     name: auto generate lang.json
     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

@@ -11,12 +11,12 @@ jobs:
     strategy:
       matrix:
         platform: [ubuntu-latest]
-        go-version: [1.19]
+        go-version: [ '1.20' ]
     name: Build
     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/issue_check_inactive.yml

@@ -1,17 +0,0 @@
-name: Check inactive
-
-on:
-  schedule:
-    - cron: "0 0 1 * *"
-
-jobs:
-  check-inactive:
-    runs-on: ubuntu-latest
-    steps:
-      - name: check-inactive
-        uses: actions-cool/issues-helper@v3
-        with:
-          actions: 'check-inactive'
-          token: ${{ secrets.GITHUB_TOKEN }}
-          inactive-day: 30
-          body: Hello, this issue has been inactive for more than 30 days and will be closed if inactive for another 30 days.

.github/workflows/issue_close_inactive.yml

@@ -1,21 +0,0 @@
-name: Close inactive
-
-on:
-  schedule:
-    - cron: "0 0 */7 * *"
-  workflow_dispatch:
-
-jobs:
-  close-inactive:
-    runs-on: ubuntu-latest
-    steps:
-      - name: close-issues
-        uses: actions-cool/issues-helper@v3
-        with:
-          actions: 'close-issues'
-          token: ${{ secrets.GITHUB_TOKEN }}
-          labels: 'inactive'
-          inactive-day: 30
-          close-reason: 'not_planned'
-          body: |
-            Hello @${{ github.event.issue.user.login }}, this issue was closed due to inactive more than 60 days. You can reopen or recreate it if you think it should continue.

.github/workflows/issue_question.yml

@@ -17,4 +17,4 @@ jobs:
           issue-number: ${{ github.event.issue.number }}
           body: |
             Hello @${{ github.event.issue.user.login }}, please input issue by template and add detail. Issues labeled by `question` will be closed if no activities in 7 days.
-            你好 @${{ github.event.issue.user.login }}，请按照issue模板填写, 并详细说明问题/复现步骤/复现链接/实现思路或提供更多信息等, 7天内未回复issue自动关闭。
+            你好 @${{ github.event.issue.user.login }}，请按照issue模板填写, 并详细说明问题/日志记录/复现步骤/复现链接/实现思路或提供更多信息等, 7天内未回复issue自动关闭。

.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.20' ]
     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: Release
+      - name: Release latest
+        uses: irongut/EditRelease@v1.2.0
+        with:
+          token: ${{ secrets.MY_TOKEN }}
+          id: ${{ github.event.release.id }}
+          prerelease: false
+
+      - name: Upload assets
         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

@@ -1,11 +1,11 @@
-FROM alpine:edge as builder
+FROM alpine:3.17 as builder
 LABEL stage=go-builder
 WORKDIR /app/
 COPY ./ ./
 RUN apk add --no-cache bash curl gcc git go musl-dev; \
     bash build.sh release docker
 
-FROM alpine:edge
+FROM alpine:3.17
 LABEL MAINTAINER="i@nn.ci"
 VOLUME /opt/alist/data/
 WORKDIR /opt/alist/
@@ -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" ]

README_cn.md

@@ -41,7 +41,7 @@
 
 [English](./README.md) | 中文 | [Contributing](./CONTRIBUTING.md) | [CODE_OF_CONDUCT](./CODE_OF_CONDUCT.md)
 
-## Features
+## 功能
 
 - [x] 多种存储
     - [x] 本地存储
@@ -89,7 +89,7 @@
 - [x] 离线下载
 - [x] 跨存储复制文件
 
-## Document
+## 文档
 
 <https://alist.nn.ci/zh/>
 
@@ -97,21 +97,21 @@
 
 <https://al.nn.ci>
 
-## Discussion
+## 讨论
 
 一般问题请到[讨论论坛](https://github.com/Xhofe/alist/discussions) ，**issue仅针对错误报告和功能请求。**
 
-## Sponsor
+## 赞助
 
 AList 是一个开源软件，如果你碰巧喜欢这个项目，并希望我继续下去，请考虑赞助我或提供一个单一的捐款！感谢所有的爱和支持：https://alist.nn.ci/zh/guide/sponsor.html
 
-### Special sponsors
+### 特别赞助
 
 - [找资源 - 阿里云盘资源搜索引擎](https://zhaoziyuan.la/)
 - [KinhDown 百度云盘不限速下载！永久免费！已稳定运行3年！非常可靠！Q群 -> 786799372](https://kinhdown.com)
 - [JetBrains: Essential tools for software developers and teams](https://www.jetbrains.com/)
 
-## Contributors
+## 贡献者
 
 Thanks goes to these wonderful people:
 
@@ -130,4 +130,4 @@ Thanks goes to these wonderful people:
 
 ---
 
-> [@博客](https://nn.ci/) · [@GitHub](https://github.com/Xhofe) · [@Telegram群](https://t.me/alist_chat) · [@Discord](https://discord.gg/F4ymsH4xv2)
+> [@博客](https://nn.ci/) · [@GitHub](https://github.com/Xhofe) · [@Telegram群](https://t.me/alist_chat) · [@Discord](https://discord.gg/F4ymsH4xv2)

build.sh

@@ -43,6 +43,8 @@ FetchWebRelease() {
 
 BuildWinArm64() {
   echo building for windows-arm64
+  chmod +x ./wrapper/zcc-arm64
+  chmod +x ./wrapper/zcxx-arm64
   export GOOS=windows
   export GOARCH=arm64
   export CC=$(pwd)/wrapper/zcc-arm64
@@ -57,7 +59,8 @@ BuildDev() {
   mv alist-* dist
   cd dist
   upx -9 ./alist-linux*
-  upx -9 ./alist-windows-amd64.exe
+  cp ./alist-windows-amd64.exe ./alist-windows-amd64-upx.exe
+  upx -9 ./alist-windows-amd64-upx.exe
   find . -type f -print0 | xargs -0 md5sum >md5.txt
   cat md5.txt
 }
@@ -93,7 +96,8 @@ BuildRelease() {
   xgo -out "$appName" -ldflags="$ldflags" -tags=jsoniter .
   # why? Because some target platforms seem to have issues with upx compression
   upx -9 ./alist-linux-amd64
-  upx -9 ./alist-windows-amd64.exe
+  cp ./alist-windows-amd64.exe ./alist-windows-amd64-upx.exe
+  upx -9 ./alist-windows-amd64-upx.exe
   mv alist-* build
 }
 

cmd/cancel2FA.go

@@ -22,6 +22,8 @@ var Cancel2FACmd = &cobra.Command{
 			err := op.Cancel2FAByUser(admin)
 			if err != nil {
 				utils.Log.Errorf("failed to cancel 2FA: %+v", err)
+			} else {
+				utils.Log.Info("2FA canceled")
 			}
 		}
 	},

cmd/flags/config.go

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

cmd/lang.go

@@ -78,10 +78,19 @@ func writeFile(name string, data interface{}) {
 func generateDriversJson() {
 	drivers := make(Drivers)
 	drivers["drivers"] = make(KV[interface{}])
+	drivers["config"] = make(KV[interface{}])
 	driverInfoMap := op.GetDriverInfoMap()
 	for k, v := range driverInfoMap {
 		drivers["drivers"][k] = convert(k)
 		items := make(KV[interface{}])
+		config := map[string]string{}
+		if v.Config.Alert != "" {
+			alert := strings.SplitN(v.Config.Alert, "|", 2)
+			if len(alert) > 1 {
+				config["alert"] = alert[1]
+			}
+		}
+		drivers["config"][k] = config
 		for i := range v.Additional {
 			item := v.Additional[i]
 			items[item.Name] = convert(item.Name)

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/driver.go

@@ -44,7 +44,11 @@ func (d *Pan115) List(ctx context.Context, dir model.Obj, args model.ListArgs) (
 }
 
 func (d *Pan115) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*model.Link, error) {
-	downloadInfo, err := d.client.Download(file.(driver115.File).PickCode)
+	downloadInfo, err := d.client.
+		SetUserAgent(driver115.UA115Browser).
+		Download(file.(driver115.File).PickCode)
+	// recover for upload
+	d.client.SetUserAgent(driver115.UA115Desktop)
 	if err != nil {
 		return nil, err
 	}

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
 	}