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

* 增加清理空文件夹API

* 修复嵌套文件夹删除Bug

 Author:    varg247 <varg247@gmail.com>

---------

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

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -43,8 +43,8 @@ body:
     attributes:
       label: Reproduction / 复现链接
       description: |
-        Please provide a link to a repo that can reproduce the problem you ran into.
-        请提供能复现此问题的链接
+        Please provide a link to a repo that can reproduce the problem you ran into. Please be aware that your issue may be closed directly if you don't provide it.
+        请提供能复现此问题的链接，请知悉如果不提供它你的issue可能会被直接关闭。
     validations:
       required: true
   - type: textarea

.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 }}
 
@@ -25,6 +25,7 @@ jobs:
 
       - name: Install dependencies
         run: |
+          sudo snap install zig --classic --beta
           docker pull crazymax/xgo:latest
           go install github.com/crazy-max/xgo@latest
           sudo apt install upx

.github/workflows/build_docker.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   build_docker:
-    name: Docker
+    name: Build docker
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -30,10 +30,36 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           context: .
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64,linux/arm64
+
+  build_docker_with_aria2:
+    needs: build_docker
+    name: Build docker with aria2
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+        with:
+          repository: alist-org/with_aria2
+          ref: main
+          persist-credentials: false
+          fetch-depth: 0
+
+      - name: Commit
+        run: |
+          git config --local user.email "i@nn.ci"
+          git config --local user.name "Noah Hsu"
+          git commit --allow-empty -m "Trigger build for ${{ github.sha }}"
+
+      - name: Push commit
+        uses: ad-m/github-push-action@master
+        with:
+          github_token: ${{ secrets.MY_TOKEN }}
+          branch: main
+          repository: alist-org/with_aria2

.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

@@ -10,11 +10,11 @@ jobs:
     if: github.event.label.name == 'question'
     steps:
       - name: Create comment
-        uses: actions-cool/issues-helper@v3.3.3
+        uses: actions-cool/issues-helper@v3.4.0
         with:
           actions: 'create-comment'
           token: ${{ secrets.GITHUB_TOKEN }}
           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 }}
 
@@ -38,6 +32,7 @@ jobs:
 
       - name: Install dependencies
         run: |
+          sudo snap install zig --classic --beta
           docker pull crazymax/xgo:latest
           go install github.com/crazy-max/xgo@latest
           sudo apt install upx
@@ -46,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

@@ -7,7 +7,7 @@ on:
 
 jobs:
   release_docker:
-    name: Docker
+    name: Release Docker
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -33,10 +33,36 @@ jobs:
 
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           context: .
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x
+
+  release_docker_with_aria2:
+    needs: release_docker
+    name: Release docker with aria2
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+        with:
+          repository: alist-org/with_aria2
+          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"
+          git tag -a ${{ github.ref_name }} -m "release ${{ github.ref_name }}"
+
+      - name: Push tags
+        uses: ad-m/github-push-action@master
+        with:
+          github_token: ${{ secrets.MY_TOKEN }}
+          branch: main
+          repository: alist-org/with_aria2

Dockerfile

@@ -1,18 +1,18 @@
-FROM alpine:edge as builder
+FROM alpine:3.17 as builder
 LABEL stage=go-builder
 WORKDIR /app/
 COPY ./ ./
-RUN apk add --no-cache bash git go gcc musl-dev curl; \
+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/
 COPY --from=builder /app/bin/alist ./
 COPY entrypoint.sh /entrypoint.sh
-RUN apk add ca-certificates bash su-exec; \
+RUN apk add --no-cache bash ca-certificates su-exec tzdata; \
     chmod +x /entrypoint.sh
-ENV PUID=1000 PGID=1000 UMASK=022
+ENV PUID=0 PGID=0 UMASK=022
 EXPOSE 5244
-ENTRYPOINT [ "/entrypoint.sh" ]
+CMD [ "/entrypoint.sh" ]

README.md

@@ -53,6 +53,7 @@ English | [中文](./README_cn.md) | [Contributing](./CONTRIBUTING.md) | [CODE_O
     - [x] FTP / SFTP
     - [x] [PikPak](https://www.mypikpak.com/)
     - [x] [S3](https://aws.amazon.com/s3/)
+    - [x] [Seafile](https://seafile.com/)
     - [x] [UPYUN Storage Service](https://www.upyun.com/products/file-storage)
     - [x] WebDav(Support OneDrive/SharePoint without API)
     - [x] Teambition([China](https://www.teambition.com/ ),[International](https://us.teambition.com/ ))
@@ -60,6 +61,7 @@ English | [中文](./README_cn.md) | [Contributing](./CONTRIBUTING.md) | [CODE_O
     - [x] [139yun](https://yun.139.com/) (Personal, Family)
     - [x] [YandexDisk](https://disk.yandex.com/)
     - [x] [BaiduNetdisk](http://pan.baidu.com/)
+    - [x] [Terabox](https://www.terabox.com/main)
     - [x] [Quark](https://pan.quark.cn)
     - [x] [Thunder](https://pan.xunlei.com)
     - [x] [Lanzou](https://www.lanzou.com/)
@@ -69,6 +71,7 @@ English | [中文](./README_cn.md) | [Contributing](./CONTRIBUTING.md) | [CODE_O
     - [x] [Baidu photo](https://photo.baidu.com/)
     - [x] SMB
     - [x] [115](https://115.com/)
+    - [X] Cloudreve
 - [x] Easy to deploy and out-of-the-box
 - [x] File preview (PDF, markdown, code, plain text, ...)
 - [x] Image preview in gallery mode

README_cn.md

@@ -41,7 +41,7 @@
 
 [English](./README.md) | 中文 | [Contributing](./CONTRIBUTING.md) | [CODE_OF_CONDUCT](./CODE_OF_CONDUCT.md)
 
-## Features
+## 功能
 
 - [x] 多种存储
     - [x] 本地存储
@@ -53,6 +53,7 @@
     - [x] FTP / SFTP
     - [x] [PikPak](https://www.mypikpak.com/)
     - [x] [S3](https://aws.amazon.com/cn/s3/)
+    - [x] [Seafile](https://seafile.com/)
     - [x] [又拍云对象存储](https://www.upyun.com/products/file-storage)
     - [x] WebDav(支持无API的OneDrive/SharePoint)
     - [x] Teambition（[中国](https://www.teambition.com/ )，[国际](https://us.teambition.com/ )）
@@ -69,6 +70,7 @@
     - [x] [一刻相册](https://photo.baidu.com/)
     - [x] SMB
     - [x] [115](https://115.com/)
+    - [X] Cloudreve
 - [x] 部署方便，开箱即用
 - [x] 文件预览（PDF、markdown、代码、纯文本……）
 - [x] 画廊模式下的图像预览
@@ -87,7 +89,7 @@
 - [x] 离线下载
 - [x] 跨存储复制文件
 
-## Document
+## 文档
 
 <https://alist.nn.ci/zh/>
 
@@ -95,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:
 
@@ -128,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

@@ -1,7 +1,7 @@
 appName="alist"
 builtAt="$(date +'%F %T %z')"
 goVersion=$(go version | sed 's/go version //')
-gitAuthor=$(git show -s --format='format:%aN <%ae>' HEAD)
+gitAuthor="Xhofe <i@nn.ci>"
 gitCommit=$(git log --pretty=format:"%h" -1)
 
 if [ "$1" = "dev" ]; then
@@ -41,6 +41,17 @@ FetchWebRelease() {
   rm -rf dist.tar.gz
 }
 
+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
+  export CXX=$(pwd)/wrapper/zcxx-arm64
+  go build -o "$1" -ldflags="$ldflags" -tags=jsoniter .
+}
+
 BuildDev() {
   rm -rf .git/
   xgo -targets=linux/amd64,windows/amd64,darwin/amd64 -out "$appName" -ldflags="$ldflags" -tags=jsoniter .
@@ -48,7 +59,8 @@ BuildDev() {
   mv alist-* dist
   cd dist
   upx -9 ./alist-linux*
-  upx -9 ./alist-windows*
+  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
 }
@@ -80,10 +92,12 @@ BuildRelease() {
     export CGO_ENABLED=1
     go build -o ./build/$appName-$os_arch -ldflags="$muslflags" -tags=jsoniter .
   done
+  BuildWinArm64 ./build/alist-windows-arm64.exe
   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*
+  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/server.go

@@ -29,6 +29,7 @@ the address is defined in config file`,
 	Run: func(cmd *cobra.Command, args []string) {
 		Init()
 		bootstrap.InitAria2()
+		bootstrap.InitQbittorrent()
 		bootstrap.LoadStorages()
 		if !flags.Debug && !flags.Dev {
 			gin.SetMode(gin.ReleaseMode)