fix(115): fix offline download (#7845 close #7794)

* feat(115): use multi url for list files & change download url api * fix(115): fix offline download. (close #7794)
AlistGo · Jan 27, 2025 · 267120a · 267120a
1 parent 5eff8cc
commit 267120a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 62 deletions.
diff --git a/drivers/115/driver.go b/drivers/115/driver.go
@@ -241,7 +241,7 @@ func (d *Pan115) OfflineList(ctx context.Context) ([]*driver115.OfflineTask, err
 }
 
 func (d *Pan115) OfflineDownload(ctx context.Context, uris []string, dstDir model.Obj) ([]string, error) {
-	return d.client.AddOfflineTaskURIs(uris, dstDir.GetID())
+	return d.client.AddOfflineTaskURIs(uris, dstDir.GetID(), driver115.WithAppVer(appVer))
 }
 
 func (d *Pan115) DeleteOfflineTasks(ctx context.Context, hashes []string, deleteFiles bool) error {

diff --git a/drivers/115/util.go b/drivers/115/util.go
@@ -21,9 +21,9 @@ import (
 	"github.com/alist-org/alist/v3/pkg/utils"
 	"github.com/aliyun/aliyun-oss-go-sdk/oss"
 
+	cipher "github.com/SheltonZhu/115driver/pkg/crypto/ec115"
+	crypto "github.com/SheltonZhu/115driver/pkg/crypto/m115"
 	driver115 "github.com/SheltonZhu/115driver/pkg/driver"
-	crypto "github.com/gaoyb7/115drive-webdav/115"
-	"github.com/orzogc/fake115uploader/cipher"
 	"github.com/pkg/errors"
 )
 
@@ -63,7 +63,7 @@ func (d *Pan115) getFiles(fileId string) ([]FileObj, error) {
 	if d.PageSize <= 0 {
 		d.PageSize = driver115.FileListLimit
 	}
-	files, err := d.client.ListWithLimit(fileId, d.PageSize)
+	files, err := d.client.ListWithLimit(fileId, d.PageSize, driver115.WithMultiUrls())
 	if err != nil {
 		return nil, err
 	}
@@ -108,15 +108,15 @@ func (d *Pan115) getUA() string {
 func (d *Pan115) DownloadWithUA(pickCode, ua string) (*driver115.DownloadInfo, error) {
 	key := crypto.GenerateKey()
 	result := driver115.DownloadResp{}
-	params, err := utils.Json.Marshal(map[string]string{"pickcode": pickCode})
+	params, err := utils.Json.Marshal(map[string]string{"pick_code": pickCode})
 	if err != nil {
 		return nil, err
 	}
 
 	data := crypto.Encode(params, key)
 
 	bodyReader := strings.NewReader(url.Values{"data": []string{data}}.Encode())
-	reqUrl := fmt.Sprintf("%s?t=%s", driver115.ApiDownloadGetUrl, driver115.Now().String())
+	reqUrl := fmt.Sprintf("%s?t=%s", driver115.AndroidApiDownloadGetUrl, driver115.Now().String())
 	req, _ := http.NewRequest(http.MethodPost, reqUrl, bodyReader)
 	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
 	req.Header.Set("Cookie", d.Cookie)
@@ -145,19 +145,18 @@ func (d *Pan115) DownloadWithUA(pickCode, ua string) (*driver115.DownloadInfo, e
 		return nil, err
 	}
 
-	downloadInfo := driver115.DownloadData{}
+	downloadInfo := struct {
+		Url string `json:"url"`
+	}{}
 	if err := utils.Json.Unmarshal(bytes, &downloadInfo); err != nil {
 		return nil, err
 	}
 
-	for _, info := range downloadInfo {
-		if info.FileSize < 0 {
-			return nil, driver115.ErrDownloadEmpty
-		}
-		info.Header = resp.Request.Header
-		return info, nil
-	}
-	return nil, driver115.ErrUnexpected
+	info := &driver115.DownloadInfo{}
+	info.PickCode = pickCode
+	info.Header = resp.Request.Header
+	info.Url.Url = downloadInfo.Url
+	return info, nil
 }
 
 func (c *Pan115) GenerateToken(fileID, preID, timeStamp, fileSize, signKey, signVal string) string {

diff --git a/drivers/115_share/meta.go b/drivers/115_share/meta.go
@@ -18,7 +18,7 @@ type Addition struct {
 
 var config = driver.Config{
 	Name:        "115 Share",
-	DefaultRoot: "",
+	DefaultRoot: "0",
 	// OnlyProxy:   true,
 	// OnlyLocal:         true,
 	CheckStatus:       false,

diff --git a/go.mod b/go.mod
@@ -7,7 +7,7 @@ toolchain go1.23.1
 require (
 	github.com/KirCute/ftpserverlib-pasvportmap v1.25.0
 	github.com/KirCute/sftpd-alist v0.0.12
-	github.com/SheltonZhu/115driver v1.0.32
+	github.com/SheltonZhu/115driver v1.0.34
 	github.com/Xhofe/go-cache v0.0.0-20240804043513-b1a71927bc21
 	github.com/Xhofe/rateg v0.0.0-20230728072201-251a4e1adad4
 	github.com/alist-org/gofakes3 v0.0.7
@@ -29,7 +29,6 @@ require (
 	github.com/dustinxie/ecc v0.0.0-20210511000915-959544187564
 	github.com/foxxorcat/mopan-sdk-go v0.1.6
 	github.com/foxxorcat/weiyun-sdk-go v0.1.3
-	github.com/gaoyb7/115drive-webdav v0.1.8
 	github.com/gin-contrib/cors v1.7.2
 	github.com/gin-gonic/gin v1.10.0
 	github.com/go-resty/resty/v2 v2.14.0
@@ -50,7 +49,6 @@ require (
 	github.com/minio/sio v0.4.0
 	github.com/natefinch/lumberjack v2.0.0+incompatible
 	github.com/ncw/swift/v2 v2.0.3
-	github.com/orzogc/fake115uploader v0.6.2
 	github.com/pkg/errors v0.9.1
 	github.com/pkg/sftp v1.13.6
 	github.com/pquerna/otp v1.4.0
@@ -103,6 +101,7 @@ require (
 	github.com/ipfs/boxo v0.12.0 // indirect
 	github.com/jackc/puddle/v2 v2.2.1 // indirect
 	github.com/klauspost/pgzip v1.2.6 // indirect
+	github.com/kr/text v0.2.0 // indirect
 	github.com/nwaples/rardecode/v2 v2.0.0-beta.4.0.20241112120701-034e449c6e78 // indirect
 	github.com/sorairolake/lzip-go v0.3.5 // indirect
 	github.com/taruti/bytepool v0.0.0-20160310082835-5e3a9ea56543 // indirect
@@ -139,7 +138,6 @@ require (
 	github.com/blevesearch/zapx/v13 v13.3.10 // indirect
 	github.com/blevesearch/zapx/v14 v14.3.10 // indirect
 	github.com/blevesearch/zapx/v15 v15.3.13 // indirect
-	github.com/bluele/gcache v0.0.2 // indirect
 	github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect
 	github.com/bytedance/sonic v1.11.6 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect