feat(115): add QR code source selection (#5891)

* feat(115): add QR code source selection closed #5386 * feat(115_share): add QR code source selection
AlistGo · Jan 16, 2024 · e3e790f · e3e790f
1 parent f0e8c0e
commit e3e790f
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 90 deletions.
diff --git a/drivers/115/meta.go b/drivers/115/meta.go
@@ -6,10 +6,11 @@ import (
 )
 
 type Addition struct {
-	Cookie      string  `json:"cookie" type:"text" help:"one of QR code token and cookie required"`
-	QRCodeToken string  `json:"qrcode_token" type:"text" help:"one of QR code token and cookie required"`
-	PageSize    int64   `json:"page_size" type:"number" default:"56" help:"list api per page size of 115 driver"`
-	LimitRate   float64 `json:"limit_rate" type:"number" default:"2" help:"limit all api request rate (1r/[limit_rate]s)"`
+	Cookie       string  `json:"cookie" type:"text" help:"one of QR code token and cookie required"`
+	QRCodeToken  string  `json:"qrcode_token" type:"text" help:"one of QR code token and cookie required"`
+	QRCodeSource string  `json:"qrcode_source" type:"select" options:"web,android,ios,linux,mac,windows,tv" default:"linux" help:"select the QR code device, default linux"`
+	PageSize     int64   `json:"page_size" type:"number" default:"56" help:"list api per page size of 115 driver"`
+	LimitRate    float64 `json:"limit_rate" type:"number" default:"2" help:"limit all api request rate (1r/[limit_rate]s)"`
 	driver.RootID
 }
 

diff --git a/drivers/115/util.go b/drivers/115/util.go
@@ -42,7 +42,7 @@ func (d *Pan115) login() error {
 		s := &driver115.QRCodeSession{
 			UID: d.Addition.QRCodeToken,
 		}
-		if cr, err = d.client.QRCodeLogin(s); err != nil {
+		if cr, err = d.client.QRCodeLoginWithApp(s, driver115.LoginApp(d.QRCodeSource)); err != nil {
 			return errors.Wrap(err, "failed to login by qrcode")
 		}
 		d.Addition.Cookie = fmt.Sprintf("UID=%s;CID=%s;SEID=%s", cr.UID, cr.CID, cr.SEID)

diff --git a/drivers/115_share/meta.go b/drivers/115_share/meta.go
@@ -6,12 +6,13 @@ import (
 )
 
 type Addition struct {
-	Cookie      string  `json:"cookie" type:"text" help:"one of QR code token and cookie required"`
-	QRCodeToken string  `json:"qrcode_token" type:"text" help:"one of QR code token and cookie required"`
-	PageSize    int64   `json:"page_size" type:"number" default:"20" help:"list api per page size of 115 driver"`
-	LimitRate   float64 `json:"limit_rate" type:"number" default:"2" help:"limit all api request rate (1r/[limit_rate]s)"`
-	ShareCode   string  `json:"share_code" type:"text" required:"true" help:"share code of 115 share link"`
-	ReceiveCode string  `json:"receive_code" type:"text" required:"true" help:"receive code of 115 share link"`
+	Cookie       string  `json:"cookie" type:"text" help:"one of QR code token and cookie required"`
+	QRCodeToken  string  `json:"qrcode_token" type:"text" help:"one of QR code token and cookie required"`
+	QRCodeSource string  `json:"qrcode_source" type:"select" options:"web,android,ios,linux,mac,windows,tv" default:"linux" help:"select the QR code device, default linux"`
+	PageSize     int64   `json:"page_size" type:"number" default:"20" help:"list api per page size of 115 driver"`
+	LimitRate    float64 `json:"limit_rate" type:"number" default:"2" help:"limit all api request rate (1r/[limit_rate]s)"`
+	ShareCode    string  `json:"share_code" type:"text" required:"true" help:"share code of 115 share link"`
+	ReceiveCode  string  `json:"receive_code" type:"text" required:"true" help:"receive code of 115 share link"`
 	driver.RootID
 }
 

diff --git a/drivers/115_share/utils.go b/drivers/115_share/utils.go
@@ -93,7 +93,7 @@ func (d *Pan115Share) login() error {
 		s := &driver115.QRCodeSession{
 			UID: d.QRCodeToken,
 		}
-		if cr, err = d.client.QRCodeLogin(s); err != nil {
+		if cr, err = d.client.QRCodeLoginWithApp(s, driver115.LoginApp(d.QRCodeSource)); err != nil {
 			return errors.Wrap(err, "failed to login by qrcode")
 		}
 		d.Cookie = fmt.Sprintf("UID=%s;CID=%s;SEID=%s", cr.UID, cr.CID, cr.SEID)

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/alist-org/alist/v3
 go 1.21
 
 require (
-	github.com/SheltonZhu/115driver v1.0.21
+	github.com/SheltonZhu/115driver v1.0.22
 	github.com/Xhofe/go-cache v0.0.0-20220723083548-714439c8af9a
 	github.com/Xhofe/rateg v0.0.0-20230728072201-251a4e1adad4
 	github.com/Xhofe/wopan-sdk-go v0.1.2