🐛 refer to https://github.com/ad-m/github-push-action/issues/44#issuecomment-581706892

.github/workflows/build.yml

@@ -10,7 +10,7 @@ jobs:
   build:
     strategy:
       matrix:
-        platform: [macos-latest]
+        platform: [ubuntu-latest]
         go-version: [1.17]
     name: Build
     runs-on: ${{ matrix.platform }}
@@ -25,8 +25,8 @@ jobs:
         with:
           node-version: '16'
 
-      - name: Setup docker
-        uses: docker-practice/actions-setup-docker@master
+#      - name: Setup docker
+#        uses: docker-practice/actions-setup-docker@master
 
       - name: Checkout
         uses: actions/checkout@v2
@@ -45,20 +45,12 @@ jobs:
         run: |
           docker pull techknowlogick/xgo:latest
           go install src.techknowlogick.com/xgo@latest
-          brew install upx
-
-      - name: Build web
-        run: |
-          cd alist-web
-          yarn
-          yarn build
-          cd ..
+          sudo apt install upx
 
       - name: Build
         run: |
-          cd alist
+          mv alist/build.sh .
           bash build.sh
-          cd ..
 
       - name: Upload artifact
         uses: actions/upload-artifact@v2

.github/workflows/release.yml

@@ -9,7 +9,7 @@ jobs:
   release:
     strategy:
       matrix:
-        platform: [macos-latest]
+        platform: [ubuntu-latest]
         go-version: [1.17]
     name: Release
     runs-on: ${{ matrix.platform }}
@@ -19,8 +19,8 @@ jobs:
         with:
           go-version: ${{ matrix.go-version }}
 
-      - name: Setup docker
-        uses: docker-practice/actions-setup-docker@master
+#      - name: Setup docker
+#        uses: docker-practice/actions-setup-docker@master
 
       - name: Setup Node
         uses: actions/setup-node@v2
@@ -32,6 +32,8 @@ jobs:
         with:
           ref: v2
           path: alist
+          persist-credentials: false
+          fetch-depth: 0
 
       - name: Checkout web repo
         uses: actions/checkout@v2
@@ -39,25 +41,27 @@ jobs:
           repository: Xhofe/alist-web
           ref: v2
           path: alist-web
+          persist-credentials: false
+          fetch-depth: 0
 
       - name: Set up xgo
         run: |
           docker pull techknowlogick/xgo:latest
           go install src.techknowlogick.com/xgo@latest
-          brew install upx
-
-      - name: Build web
-        run: |
-          cd alist-web
-          yarn
-          yarn build
-          cd ..
+          sudo apt install upx
 
       - name: Build
         run: |
-          cd alist
+          mv alist/build.sh .
           bash build.sh release
-          cd ..
+
+      - name: Upload asserts files
+        uses: ad-m/github-push-action@master
+        with:
+          github_token: ${{ secrets.MY_TOKEN }}
+          branch: cdn
+          directory: alist-web
+          repository: Xhofe/alist-web
 
       - name: Release
         uses: softprops/action-gh-release@v1

alist.go

@@ -30,7 +30,7 @@ func Init() {
 
 func main() {
 	if conf.Version {
-		fmt.Printf("Built At: %s\nGo Version: %s\nAuthor: %s\nCommit ID: %s\nVersion:%s\n", conf.BuiltAt, conf.GoVersion, conf.GitAuthor, conf.GitCommit, conf.GitTag)
+		fmt.Printf("Built At: %s\nGo Version: %s\nAuthor: %s\nCommit ID: %s\nVersion: %s\n", conf.BuiltAt, conf.GoVersion, conf.GitAuthor, conf.GitCommit, conf.GitTag)
 		return
 	}
 	Init()

build.sh

@@ -1,5 +1,18 @@
 #!/bin/bash
 
+cd alist-web || exit
+webCommit=$(git log --pretty=format:"%h" -1)
+echo "web commit id: $webCommit"
+yarn
+if [ "$1" == "release" ]; then
+  yarn build --base="https://cdn.jsdelivr.net/gh/Xhofe/alist-web@cdn/v2/$webCommit"
+  mv dist/assets ..
+else
+  yarn build
+fi
+cd ..
+
+cd alist
 appName="alist"
 builtAt="$(date +'%F %T %z')"
 goVersion=$(go version | sed 's/go version //')
@@ -9,9 +22,11 @@ gitCommit=$(git log --pretty=format:"%h" -1)
 if [ "$1" == "release" ]; then
   gitTag=$(git describe --abbrev=0 --tags)
 else
-  gitTag=$(git describe --abbrev=0 --tags)-next
+  gitTag=build-next
 fi
 
+echo "build version: $gitTag"
+
 ldflags="\
 -w -s \
 -X 'github.com/Xhofe/alist/conf.BuiltAt=$builtAt' \
@@ -33,7 +48,7 @@ mv alist-* build
 cd build || exit
 upx -9 ./*
 find . -type f -print0 | xargs -0 md5sum > md5.txt
-
+cat md5.txt
 # compress file (release)
 if [ "$1" == "release" ]; then
     mkdir compress
@@ -50,4 +65,17 @@ if [ "$1" == "release" ]; then
     do
       zip compress/$(echo $i | sed 's/\.[^.]*$//').zip "$i"
     done
+fi
+cd ../..
+
+if [ "$1" == "release" ]; then
+  cd alist-web
+  git checkout cdn
+  mkdir "v2/$webCommit"
+  mv ../assets/ v2/$webCommit
+  git add .
+  git config --local user.email "i@nn.ci"
+  git config --local user.name "Xhofe"
+  git commit --allow-empty -m "upload $webCommit assets files" -a
+  cd ..
 fi

drivers/alidrive.go

@@ -221,55 +221,57 @@ func (a AliDrive) Path(path string, account *model.Account) (*model.File, []*mod
 			return a.FormatFile(&file), nil, nil
 		} else {
 			files, _ := cache.([]AliFile)
-			res := make([]*model.File, 0)
-			for _, file = range files {
-				res = append(res, a.FormatFile(&file))
-			}
-			return nil, res, nil
-		}
-	} else {
-		fileId := account.RootFolder
-		if path != "/" {
-			dir, name := filepath.Split(path)
-			dir = utils.ParsePath(dir)
-			_, _, err = a.Path(dir, account)
-			if err != nil {
-				return nil, nil, err
-			}
-			parentFiles_, _ := conf.Cache.Get(conf.Ctx, fmt.Sprintf("%s%s", account.Name, dir))
-			parentFiles, _ := parentFiles_.([]AliFile)
-			found := false
-			for _, file := range parentFiles {
-				if file.Name == name {
-					found = true
-					if file.Type == "file" {
-						url, err := a.Link(path, account)
-						if err != nil {
-							return nil, nil, err
-						}
-						file.Url = url
-						return a.FormatFile(&file), nil, nil
-					} else {
-						fileId = file.FileId
-						break
-					}
+			if len(files) != 0 {
+				res := make([]*model.File, 0)
+				for _, file = range files {
+					res = append(res, a.FormatFile(&file))
 				}
-			}
-			if !found {
-				return nil, nil, fmt.Errorf("path not found")
+				return nil, res, nil
 			}
 		}
-		files, err := a.GetFiles(fileId, account)
+	}
+	// no cache or len(files) == 0
+	fileId := account.RootFolder
+	if path != "/" {
+		dir, name := filepath.Split(path)
+		dir = utils.ParsePath(dir)
+		_, _, err = a.Path(dir, account)
 		if err != nil {
 			return nil, nil, err
 		}
-		_ = conf.Cache.Set(conf.Ctx, fmt.Sprintf("%s%s", account.Name, path), files, nil)
-		res := make([]*model.File, 0)
-		for _, file := range files {
-			res = append(res, a.FormatFile(&file))
+		parentFiles_, _ := conf.Cache.Get(conf.Ctx, fmt.Sprintf("%s%s", account.Name, dir))
+		parentFiles, _ := parentFiles_.([]AliFile)
+		found := false
+		for _, file := range parentFiles {
+			if file.Name == name {
+				found = true
+				if file.Type == "file" {
+					url, err := a.Link(path, account)
+					if err != nil {
+						return nil, nil, err
+					}
+					file.Url = url
+					return a.FormatFile(&file), nil, nil
+				} else {
+					fileId = file.FileId
+					break
+				}
+			}
+		}
+		if !found {
+			return nil, nil, fmt.Errorf("path not found")
 		}
-		return nil, res, nil
 	}
+	files, err := a.GetFiles(fileId, account)
+	if err != nil {
+		return nil, nil, err
+	}
+	_ = conf.Cache.Set(conf.Ctx, fmt.Sprintf("%s%s", account.Name, path), files, nil)
+	res := make([]*model.File, 0)
+	for _, file := range files {
+		res = append(res, a.FormatFile(&file))
+	}
+	return nil, res, nil
 }
 
 func (a AliDrive) Link(path string, account *model.Account) (string, error) {
@@ -316,10 +318,12 @@ func (a AliDrive) RefreshToken(account *model.Account) error {
 		SetError(&e).
 		Post(url)
 	if err != nil {
+		account.Status = err.Error()
 		return err
 	}
 	log.Debugf("%+v,%+v", resp, e)
 	if e.Code != "" {
+		account.Status = e.Message
 		return fmt.Errorf("failed to refresh token: %s", e.Message)
 	}
 	account.RefreshToken, account.AccessToken = resp.RefreshToken, resp.AccessToken
@@ -354,9 +358,6 @@ func (a AliDrive) Save(account *model.Account, old *model.Account) error {
 			return
 		}
 		err = a.RefreshToken(&newAccount)
-		if err != nil {
-			newAccount.Status = err.Error()
-		}
 		_ = model.SaveAccount(newAccount)
 	})
 	if err != nil {

drivers/onedrive.go

@@ -146,9 +146,11 @@ func (o Onedrive) RefreshToken(account *model.Account) error {
 		"refresh_token": account.RefreshToken,
 	}).Post(url)
 	if err != nil {
+		account.Status = err.Error()
 		return err
 	}
 	if e.Error != "" {
+		account.Status = e.ErrorDescription
 		return fmt.Errorf("%s", e.ErrorDescription)
 	}
 	account.RefreshToken, account.AccessToken = resp.RefreshToken, resp.AccessToken
@@ -280,9 +282,6 @@ func (o Onedrive) Save(account *model.Account, old *model.Account) error {
 			return
 		}
 		err = o.RefreshToken(&newAccount)
-		if err != nil {
-			newAccount.Status = err.Error()
-		}
 		_ = model.SaveAccount(newAccount)
 	})
 	if err != nil {

server/meta.go

@@ -32,7 +32,7 @@ func SaveMeta(ctx *fiber.Ctx) error {
 
 func DeleteMeta(ctx *fiber.Ctx) error {
 	path := ctx.Query("path")
-	path = utils.ParsePath(path)
+	//path = utils.ParsePath(path)
 	if err := model.DeleteMeta(path); err != nil {
 		return ErrorResp(ctx, err, 500)
 	}