github
/
alist
mirror of https://github.com/Xhofe/alist
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(115): fix driver package import and variable (#5482) 

names
pull/5503/head
sheltonzhu 2023-11-06 16:53:57 +08:00 committed by GitHub
parent 68f440abdb
commit 3bbdd4fa89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/115/util.go
View File

@ -18,26 +18,25 @@ import (
"sync" "sync"
"time" "time"
"github.com/SheltonZhu/115driver/pkg/driver"
driver115 "github.com/SheltonZhu/115driver/pkg/driver" driver115 "github.com/SheltonZhu/115driver/pkg/driver"
"github.com/alist-org/alist/v3/internal/conf" "github.com/alist-org/alist/v3/internal/conf"
"github.com/pkg/errors" "github.com/pkg/errors"
) )
var UserAgent = driver.UA115Desktop var UserAgent = driver115.UA115Desktop
func (d *Pan115) login() error { func (d *Pan115) login() error {
var err error var err error
opts := []driver.Option{ opts := []driver115.Option{
driver.UA(UserAgent), driver115.UA(UserAgent),
func(c *driver.Pan115Client) { func(c *driver115.Pan115Client) {
c.Client.SetTLSClientConfig(&tls.Config{InsecureSkipVerify: conf.Conf.TlsInsecureSkipVerify}) c.Client.SetTLSClientConfig(&tls.Config{InsecureSkipVerify: conf.Conf.TlsInsecureSkipVerify})
}, },
} }
d.client = driver.New(opts...) d.client = driver115.New(opts...)
cr := &driver.Credential{} cr := &driver115.Credential{}
if d.Addition.QRCodeToken != "" { if d.Addition.QRCodeToken != "" {
s := &driver.QRCodeSession{ s := &driver115.QRCodeSession{
UID: d.Addition.QRCodeToken, UID: d.Addition.QRCodeToken,
} }
if cr, err = d.client.QRCodeLogin(s); err != nil { if cr, err = d.client.QRCodeLogin(s); err != nil {
@ -59,7 +58,7 @@ func (d *Pan115) login() error {
func (d *Pan115) getFiles(fileId string) ([]FileObj, error) { func (d *Pan115) getFiles(fileId string) ([]FileObj, error) {
res := make([]FileObj, 0) res := make([]FileObj, 0)
if d.PageSize <= 0 { if d.PageSize <= 0 {
d.PageSize = driver.FileListLimit d.PageSize = driver115.FileListLimit
} }
files, err := d.client.ListWithLimit(fileId, d.PageSize) files, err := d.client.ListWithLimit(fileId, d.PageSize)
if err != nil { if err != nil {
@ -249,7 +248,7 @@ func (d *Pan115) UploadByMultipart(params *driver115.UploadOSSParams, fileSize i
go func(threadId int) { go func(threadId int) {
defer func() { defer func() {
if r := recover(); r != nil { if r := recover(); r != nil {
errCh <- fmt.Errorf("Recovered in %v", r) errCh <- fmt.Errorf("recovered in %v", r)
} }
}() }()
for chunk := range chunksCh { for chunk := range chunksCh {