Merge pull request #50 from deadblue/develop

Bump version to 0.7.3.

Author: deadblue

agent.go

@@ -20,6 +20,9 @@ type Agent struct {
 
 	// Common parameters
 	common types.CommonParams
+
+	// Is agent use web credential?
+	isWeb bool
 }
 
 // Default creates an Agent with default settings.

file.go

@@ -212,7 +212,7 @@ func (i *fileIterator) Items() iter.Seq2[int, *File] {
 }
 
 // FileIterate list files under directory, whose id is |dirId|.
-func (a *Agent) FileIterate(dirId string) (it Iterator[*File], err error) {
+func (a *Agent) FileIterate(dirId string) (it Iterator[File], err error) {
 	fi := &fileIterator{
 		llc:   a.llc,
 		dirId: dirId,
@@ -225,7 +225,7 @@ func (a *Agent) FileIterate(dirId string) (it Iterator[*File], err error) {
 }
 
 // FileWithStar lists files with star.
-func (a *Agent) FileWithStar(options ...*option.FileListOptions) (it Iterator[*File], err error) {
+func (a *Agent) FileWithStar(options ...*option.FileListOptions) (it Iterator[File], err error) {
 	fi := &fileIterator{
 		llc:  a.llc,
 		mode: 2,
@@ -245,7 +245,7 @@ func (a *Agent) FileWithStar(options ...*option.FileListOptions) (it Iterator[*F
 // the given keyword.
 func (a *Agent) FileSearch(
 	dirId, keyword string, options ...*option.FileListOptions,
-) (it Iterator[*File], err error) {
+) (it Iterator[File], err error) {
 	fi := &fileIterator{
 		llc:     a.llc,
 		dirId:   dirId,
@@ -266,7 +266,7 @@ func (a *Agent) FileSearch(
 // FileLabeled lists files which has specific label.
 func (a *Agent) FileWithLabel(
 	labelId string, options ...*option.FileListOptions,
-) (it Iterator[*File], err error) {
+) (it Iterator[File], err error) {
 	fi := &fileIterator{
 		llc:     a.llc,
 		mode:    4,

internal/protocol/cookie.go

@@ -1,5 +1,7 @@
 package protocol
 
+import "strings"
+
 const (
 	CookieUrl = "https://115.com"
 
@@ -14,3 +16,8 @@ var (
 		".anxia.com",
 	}
 )
+
+func IsWebCredential(uid string) bool {
+	parts := strings.Split(uid, "_")
+	return len(parts) == 3 && parts[1][0] == 'A'
+}

iterator.go

@@ -16,5 +16,5 @@ type Iterator[T any] interface {
 	Count() int
 
 	// Items return an index-item sequence.
-	Items() iter.Seq2[int, T]
+	Items() iter.Seq2[int, *T]
 }

label.go

@@ -102,7 +102,7 @@ func (i *labelIterator) Items() iter.Seq2[int, *Label] {
 	}
 }
 
-func (a *Agent) LabelIterate() (it Iterator[*Label], err error) {
+func (a *Agent) LabelIterate() (it Iterator[Label], err error) {
 	li := &labelIterator{
 		llc:    a.llc,
 		offset: 0,

login.go

@@ -35,7 +35,7 @@ func (a *Agent) CredentialImport(cr *Credential) (err error) {
 		protocol.CookieNameSEID: cr.SEID,
 	}
 	a.llc.ImportCookies(cookies, protocol.CookieDomains...)
-	return a.afterSignIn()
+	return a.afterSignIn(cr.UID)
 }
 
 // CredentialExport exports current credentials for future-use.
@@ -46,11 +46,12 @@ func (a *Agent) CredentialExport(cr *Credential) {
 	cr.SEID = cookies[protocol.CookieNameSEID]
 }
 
-func (a *Agent) afterSignIn() (err error) {
+func (a *Agent) afterSignIn(uid string) (err error) {
 	// Call UploadInfo API to get userId and userKey
 	spec := (&api.UploadInfoSpec{}).Init()
 	if err = a.llc.CallApi(spec, context.Background()); err == nil {
 		a.common.SetUserInfo(spec.Result.UserId, spec.Result.UserKey)
+		a.isWeb = protocol.IsWebCredential(uid)
 	}
 	return
 }

lowlevel/api/qrcode.go

@@ -9,8 +9,9 @@ import (
 
 const (
 	qrcodeTokenUrl = "https://qrcodeapi.115.com/api/1.0/%s/1.0/token"
-	qrcodeImageUrl = "https://qrcodeapi.115.com/api/1.0/%s/1.0/qrcode?qrfrom=1&client=0&uid=%s"
 	qrcodeLoginUrl = "https://passportapi.115.com/app/1.0/%s/1.0/login/qrcode"
+
+	qrcodeImageUrl = "https://qrcodeapi.115.com/api/1.0/web/1.0/qrcode?qrfrom=1&client=0&uid=%s"
 )
 
 type QrcodeTokenSpec struct {
@@ -46,6 +47,6 @@ func (s *QrcodeLoginSpec) Init(app, uid string) *QrcodeLoginSpec {
 	return s
 }
 
-func QrcodeImageUrl(app, uid string) string {
-	return fmt.Sprintf(qrcodeImageUrl, app, uid)
+func QrcodeImageUrl(uid string) string {
+	return fmt.Sprintf(qrcodeImageUrl, uid)
 }

lowlevel/errors/media.go

@@ -0,0 +1,7 @@
+package errors
+
+import "errors"
+
+var (
+	ErrUnsupportedPlatform = errors.New("unsupported platform")
+)

media.go

@@ -45,6 +45,9 @@ type VideoTicket struct {
 
 // VideoCreateTicket creates a PlayTicket to play the cloud video.
 func (a *Agent) VideoCreateTicket(pickcode string, ticket *VideoTicket) (err error) {
+	if !a.isWeb {
+		return errors.ErrUnsupportedPlatform
+	}
 	spec := (&api.VideoPlayWebSpec{}).Init(pickcode)
 	if err = a.llc.CallApi(spec, context.Background()); err != nil {
 		return
@@ -63,6 +66,9 @@ func (a *Agent) VideoCreateTicket(pickcode string, ticket *VideoTicket) (err err
 			ticket.Url = video.PlayUrl
 		}
 	}
+	ticket.Headers = map[string]string{
+		"User-Agent": a.llc.GetUserAgent(),
+	}
 	return
 }
 

offline.go

@@ -101,7 +101,7 @@ func (i *offlineIterator) Items() iter.Seq2[int, *OfflineTask] {
 }
 
 // OfflineIterate returns an iterator to access all offline tasks.
-func (a *Agent) OfflineIterate() (it Iterator[*OfflineTask], err error) {
+func (a *Agent) OfflineIterate() (it Iterator[OfflineTask], err error) {
 	oi := &offlineIterator{
 		llc:  a.llc,
 		page: 1,