From 5258c2165632b6dfbfdcdc4d54c4831197ba54a3 Mon Sep 17 00:00:00 2001 From: foxxorcat Date: Sun, 8 May 2022 13:36:36 +0800 Subject: [PATCH 1/4] fix(xunlei):login error --- drivers/xunlei/xunlei.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/xunlei/xunlei.go b/drivers/xunlei/xunlei.go index d98bd4c0..13acd202 100644 --- a/drivers/xunlei/xunlei.go +++ b/drivers/xunlei/xunlei.go @@ -211,7 +211,7 @@ func (c *Client) Request(method string, url string, callback func(*resty.Request "X-Captcha-Token": c.captchaToken, "User-Agent": c.userAgent, "client_id": c.clientID, - }) + }).SetQueryParam("client_id", c.clientID) if callback != nil { callback(req) } From e698b457b9fa8e602e12e8742dae4f3ba6567322 Mon Sep 17 00:00:00 2001 From: foxxorcat Date: Sun, 8 May 2022 13:37:56 +0800 Subject: [PATCH 2/4] fix(baidu.photo):windows path error --- drivers/baiduphoto/driver.go | 21 ++++++++++----------- drivers/baiduphoto/types.go | 5 +++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/baiduphoto/driver.go b/drivers/baiduphoto/driver.go index a502eefe..99010ac1 100644 --- a/drivers/baiduphoto/driver.go +++ b/drivers/baiduphoto/driver.go @@ -9,7 +9,6 @@ import ( "math" "net/http" "os" - "path/filepath" "github.com/Xhofe/alist/conf" "github.com/Xhofe/alist/drivers/base" @@ -81,7 +80,7 @@ func (driver Baidu) File(path string, account *model.Account) (*model.File, erro }, nil } - dir, name := filepath.Split(path) + dir, name := utils.Split(path) files, err := driver.Files(dir, account) if err != nil { return nil, err @@ -123,7 +122,7 @@ func (driver Baidu) Files(path string, account *model.Account) ([]model.File, er Id: joinID(file.Fsid, file.Uk, file.Tid), Name: file.Name(), Size: file.Size, - Type: utils.GetFileType(filepath.Ext(file.Path)), + Type: utils.GetFileType(utils.Ext(file.Path)), Driver: driver.Config().Name, UpdatedAt: getTime(file.Mtime), Thumbnail: thumbnail, @@ -165,7 +164,7 @@ func (driver Baidu) Link(args base.Args, account *model.Account) (*base.Link, er return nil, base.ErrNotSupport } - album, err := driver.File(filepath.Dir(utils.ParsePath(args.Path)), account) + album, err := driver.File(utils.Dir(utils.ParsePath(args.Path)), account) if err != nil { return nil, err } @@ -218,13 +217,13 @@ func (driver Baidu) Rename(src string, dst string, account *model.Account) error } if IsAlbum(srcFile) { - return driver.SetAlbumName(srcFile.Id, filepath.Base(dst), account) + return driver.SetAlbumName(srcFile.Id, utils.Base(dst), account) } return base.ErrNotSupport } func (driver Baidu) MakeDir(path string, account *model.Account) error { - dir, name := filepath.Split(path) + dir, name := utils.Split(path) parentFile, err := driver.File(dir, account) if err != nil { return err @@ -244,7 +243,7 @@ func (driver Baidu) Move(src string, dst string, account *model.Account) error { if IsAlbumFile(srcFile) { // 移动相册文件 - dstAlbum, err := driver.File(filepath.Dir(dst), account) + dstAlbum, err := driver.File(utils.Dir(dst), account) if err != nil { return err } @@ -252,7 +251,7 @@ func (driver Baidu) Move(src string, dst string, account *model.Account) error { return base.ErrNotSupport } - srcAlbum, err := driver.File(filepath.Dir(src), account) + srcAlbum, err := driver.File(utils.Dir(src), account) if err != nil { return err } @@ -282,7 +281,7 @@ func (driver Baidu) Copy(src string, dst string, account *model.Account) error { if IsAlbumFile(srcFile) { // 复制相册文件 - dstAlbum, err := driver.File(filepath.Dir(dst), account) + dstAlbum, err := driver.File(utils.Dir(dst), account) if err != nil { return err } @@ -290,7 +289,7 @@ func (driver Baidu) Copy(src string, dst string, account *model.Account) error { return base.ErrNotSupport } - srcAlbum, err := driver.File(filepath.Dir(src), account) + srcAlbum, err := driver.File(utils.Dir(src), account) if err != nil { return err } @@ -322,7 +321,7 @@ func (driver Baidu) Delete(path string, account *model.Account) error { // 生成相册文件 if IsAlbumFile(file) { // 删除相册文件 - album, err := driver.File(filepath.Dir(path), account) + album, err := driver.File(utils.Dir(path), account) if err != nil { return err } diff --git a/drivers/baiduphoto/types.go b/drivers/baiduphoto/types.go index 9bc954b0..734b5a53 100644 --- a/drivers/baiduphoto/types.go +++ b/drivers/baiduphoto/types.go @@ -2,7 +2,8 @@ package baiduphoto import ( "fmt" - "path/filepath" + + "github.com/Xhofe/alist/utils" ) type TokenErrResp struct { @@ -45,7 +46,7 @@ type ( ) func (f File) Name() string { - return filepath.Base(f.Path) + return utils.Base(f.Path) } /*相册部分*/ From 734b2047091834a8a651088d2da990ceb9511d9e Mon Sep 17 00:00:00 2001 From: Xhofe Date: Sun, 8 May 2022 14:22:07 +0800 Subject: [PATCH 3/4] chore: change ocr api --- bootstrap/setting.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap/setting.go b/bootstrap/setting.go index 6591a774..1843325f 100644 --- a/bootstrap/setting.go +++ b/bootstrap/setting.go @@ -252,7 +252,7 @@ func InitSettings() { }, { Key: "ocr api", - Value: "https://api.xhofe.top/ocr/file/json", + Value: "https://api.nn.ci/ocr/file/json", Description: "Used to identify verification codes", Type: "string", Access: model.PRIVATE, From c54cb61f14c61325c16886bc022d285f8920cac0 Mon Sep 17 00:00:00 2001 From: Xhofe Date: Sun, 8 May 2022 14:25:37 +0800 Subject: [PATCH 4/4] chore: add debug info --- drivers/189/189.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/189/189.go b/drivers/189/189.go index 1d8eeae4..251987f3 100644 --- a/drivers/189/189.go +++ b/drivers/189/189.go @@ -110,8 +110,10 @@ func (driver Cloud189) Login(account *model.Account) error { b := "" lt := "" ltText := regexp.MustCompile(`lt = "(.+?)"`) + var res *resty.Response + var err error for i := 0; i < 3; i++ { - res, err := client.R().Get(url) + res, err = client.R().Get(url) if err != nil { return err } @@ -129,7 +131,7 @@ func (driver Cloud189) Login(account *model.Account) error { } } if lt == "" { - return errors.New("get page: " + b) + return fmt.Errorf("get page: %s \nstatus: %d \nrequest url: %s", b, res.StatusCode(), res.RawResponse.Request.URL.String()) } captchaToken := regexp.MustCompile(`captchaToken' value='(.+?)'`).FindStringSubmatch(b)[1] returnUrl := regexp.MustCompile(`returnUrl = '(.+?)'`).FindStringSubmatch(b)[1]