From 10fce6c0fed11425b7d12a2cbdceb50c36b972ee Mon Sep 17 00:00:00 2001
From: foxxorcat <95907542+foxxorcat@users.noreply.github.com>
Date: Wed, 9 Mar 2022 22:48:15 +0800
Subject: [PATCH] fix(xunlei): some issues about page turning(#716)

---
 drivers/189pc/189.go     |  6 +++---
 drivers/189pc/driver.go  | 22 +++++++++++-----------
 drivers/xunlei/driver.go | 32 +++++++++++++++++++++-----------
 3 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/drivers/189pc/189.go b/drivers/189pc/189.go
index 230b5e36..e14d0081 100644
--- a/drivers/189pc/189.go
+++ b/drivers/189pc/189.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"github.com/Xhofe/alist/utils"
 	"net/http"
 	"net/http/cookiejar"
 	"net/url"
@@ -14,6 +13,7 @@ import (
 	"github.com/Xhofe/alist/conf"
 	"github.com/Xhofe/alist/drivers/base"
 	"github.com/Xhofe/alist/model"
+	"github.com/Xhofe/alist/utils"
 	"github.com/go-resty/resty/v2"
 	"github.com/google/uuid"
 	jsoniter "github.com/json-iterator/go"
@@ -34,7 +34,7 @@ func GetState(account *model.Account) *State {
 	state := &State{client: resty.New().
 		SetHeaders(map[string]string{
 			"Accept":     "application/json;charset=UTF-8",
-			"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:74.0) Gecko/20100101 Firefox/76.0",
+			"User-Agent": base.UserAgent,
 		}),
 	}
 	userStateCache.States[account.Username] = state
@@ -200,10 +200,10 @@ func (s *State) refreshSession(account *model.Account) error {
 		}).
 		SetHeader("X-Request-ID", uuid.NewString()).
 		Get("https://api.cloud.189.cn/getSessionForPC.action")
-	log.Debug(res.String())
 	if err != nil {
 		return err
 	}
+	log.Debug(res.String())
 	if erron.ResCode != "" {
 		return fmt.Errorf(erron.ResMessage)
 	}
diff --git a/drivers/189pc/driver.go b/drivers/189pc/driver.go
index 1c82ddba..bb01775b 100644
--- a/drivers/189pc/driver.go
+++ b/drivers/189pc/driver.go
@@ -268,7 +268,12 @@ func (driver Cloud189) Link(args base.Args, account *model.Account) (*base.Link,
 	if err != nil {
 		return nil, err
 	}
-	return &base.Link{Url: strings.ReplaceAll(downloadUrl.URL, "&amp;", "&")}, nil
+	return &base.Link{
+		Headers: []base.Header{
+			{Name: "User-Agent", Value: base.UserAgent},
+		},
+		Url: strings.ReplaceAll(downloadUrl.URL, "&amp;", "&"),
+	}, nil
 }
 
 func (driver Cloud189) Preview(path string, account *model.Account) (interface{}, error) {
@@ -437,11 +442,6 @@ func (driver Cloud189) Copy(src string, dst string, account *model.Account) erro
 		return err
 	}
 
-	isFolder := 0
-	if srcFile.IsDir() {
-		isFolder = 1
-	}
-
 	_, err = GetState(account).Request("POST", API_URL+"/batch/createBatchTask.action", nil, func(r *resty.Request) {
 		r.SetFormData(clientSuffix()).SetFormData(map[string]string{
 			"type": "COPY",
@@ -450,7 +450,7 @@ func (driver Cloud189) Copy(src string, dst string, account *model.Account) erro
 					{
 						FileId:   srcFile.Id,
 						FileName: srcFile.Name,
-						IsFolder: isFolder,
+						IsFolder: BoolToNumber(srcFile.IsDir()),
 					},
 				}))),
 			"targetFolderId": dstDirFile.Id,
@@ -533,7 +533,7 @@ func (driver Cloud189) uploadFamily(file *model.FileStream, parentFile *model.Fi
 		r.SetQueryParams(map[string]string{
 			"fileMd5":      hex.EncodeToString(fileMd5.Sum(nil)),
 			"fileName":     file.Name,
-			"familyId":     fmt.Sprint(account.SiteId),
+			"familyId":     account.SiteId,
 			"parentId":     parentFile.Id,
 			"resumePolicy": "1",
 			"fileSize":     fmt.Sprint(file.Size),
@@ -554,7 +554,7 @@ func (driver Cloud189) uploadFamily(file *model.FileStream, parentFile *model.Fi
 	_, err = client.Request("GET", createUpload.FileCommitUrl, nil, func(r *resty.Request) {
 		r.SetQueryParams(clientSuffix())
 		r.SetHeaders(map[string]string{
-			"FamilyId":     fmt.Sprint(account.SiteId),
+			"FamilyId":     account.SiteId,
 			"uploadFileId": fmt.Sprint(createUpload.UploadFileId),
 			"ResumePolicy": "1",
 		})
@@ -643,7 +643,7 @@ func (driver Cloud189) uploadFileData(file *model.FileStream, tempFile *os.File,
 				"Expect":                 "100-continue",
 			})
 			if isFamily(account) {
-				r.SetHeader("FamilyId", fmt.Sprint(account.SiteId))
+				r.SetHeader("FamilyId", account.SiteId)
 			}
 			r.SetBody(tempFile)
 		}, account)
@@ -669,7 +669,7 @@ func (driver Cloud189) getUploadFileState(uploadFileId int64, account *model.Acc
 			"resumePolicy": "1",
 		})
 		if isFamily(account) {
-			r.SetQueryParam("familyId", fmt.Sprint(account.SiteId))
+			r.SetQueryParam("familyId", account.SiteId)
 		}
 		r.SetResult(&uploadFileState)
 	}, account)
diff --git a/drivers/xunlei/driver.go b/drivers/xunlei/driver.go
index 203b767f..8ecde652 100644
--- a/drivers/xunlei/driver.go
+++ b/drivers/xunlei/driver.go
@@ -60,7 +60,13 @@ func (driver XunLeiCloud) Save(account *model.Account, old *model.Account) error
 	if account == nil {
 		return nil
 	}
-	return GetState(account).Login(account)
+	state := GetState(account)
+	if state.isTokensExpires() {
+		return state.Login(account)
+	}
+	account.Status = "work"
+	model.SaveAccount(account)
+	return nil
 }
 
 func (driver XunLeiCloud) File(path string, account *model.Account) (*model.File, error) {
@@ -99,16 +105,20 @@ func (driver XunLeiCloud) Files(path string, account *model.Account) ([]model.Fi
 		return nil, err
 	}
 
-	var fileList FileList
-	u := fmt.Sprintf("https://api-pan.xunlei.com/drive/v1/files?parent_id=%s&page_token=%s&with_audit=true&filters=%s", file.Id, "", url.QueryEscape(`{"phase": {"eq": "PHASE_TYPE_COMPLETE"}, "trashed":{"eq":false}}`))
-	if err = GetState(account).Request("GET", u, nil, &fileList, account); err != nil {
-		return nil, err
-	}
-
-	files := make([]model.File, 0, len(fileList.Files))
-	for _, file := range fileList.Files {
-		if file.Kind == FOLDER || (file.Kind == FILE && file.Audit.Status == "STATUS_OK") {
-			files = append(files, *driver.formatFile(&file))
+	files := make([]model.File, 0)
+	for {
+		var fileList FileList
+		u := fmt.Sprintf("https://api-pan.xunlei.com/drive/v1/files?parent_id=%s&page_token=%s&with_audit=true&filters=%s", file.Id, fileList.NextPageToken, url.QueryEscape(`{"phase": {"eq": "PHASE_TYPE_COMPLETE"}, "trashed":{"eq":false}}`))
+		if err = GetState(account).Request("GET", u, nil, &fileList, account); err != nil {
+			return nil, err
+		}
+		for _, file := range fileList.Files {
+			if file.Kind == FOLDER || (file.Kind == FILE && file.Audit.Status == "STATUS_OK") {
+				files = append(files, *driver.formatFile(&file))
+			}
+		}
+		if fileList.NextPageToken == "" {
+			break
 		}
 	}
 	if len(files) > 0 {