Merge branch 'AlistGo:main' into main

AlistGo · Jan 30, 2025 · 4e4e7bb · 4e4e7bb
2 parents a257b2e + b9f397d
commit 4e4e7bb
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 23 deletions.
diff --git a/drivers/139/driver.go b/drivers/139/driver.go
@@ -2,11 +2,13 @@ package _139
 
 import (
 	"context"
+	"encoding/base64"
 	"fmt"
 	"io"
 	"net/http"
 	"path"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/alist-org/alist/v3/drivers/base"
@@ -69,29 +71,28 @@ func (d *Yun139) Init(ctx context.Context) error {
 	default:
 		return errs.NotImplement
 	}
-	// if d.ref != nil {
-	// 	return nil
-	// }
-	// decode, err := base64.StdEncoding.DecodeString(d.Authorization)
-	// if err != nil {
-	// 	return err
-	// }
-	// decodeStr := string(decode)
-	// splits := strings.Split(decodeStr, ":")
-	// if len(splits) < 2 {
-	// 	return fmt.Errorf("authorization is invalid, splits < 2")
-	// }
-	// d.Account = splits[1]
-	// _, err = d.post("/orchestration/personalCloud/user/v1.0/qryUserExternInfo", base.Json{
-	// 	"qryUserExternInfoReq": base.Json{
-	// 		"commonAccountInfo": base.Json{
-	// 			"account":     d.getAccount(),
-	// 			"accountType": 1,
-	// 		},
-	// 	},
-	// }, nil)
-	// return err
-	return nil
+	if d.ref != nil {
+		return nil
+	}
+	decode, err := base64.StdEncoding.DecodeString(d.Authorization)
+	if err != nil {
+		return err
+	}
+	decodeStr := string(decode)
+	splits := strings.Split(decodeStr, ":")
+	if len(splits) < 2 {
+		return fmt.Errorf("authorization is invalid, splits < 2")
+	}
+	d.Account = splits[1]
+	_, err = d.post("/orchestration/personalCloud/user/v1.0/qryUserExternInfo", base.Json{
+		"qryUserExternInfoReq": base.Json{
+			"commonAccountInfo": base.Json{
+				"account":     d.getAccount(),
+				"accountType": 1,
+			},
+		},
+	}, nil)
+	return err
 }
 
 func (d *Yun139) InitReference(storage driver.Driver) error {

diff --git a/drivers/febbox/util.go b/drivers/febbox/util.go
@@ -3,6 +3,7 @@ package febbox
 import (
 	"encoding/json"
 	"errors"
+	"fmt"
 	"github.com/alist-org/alist/v3/drivers/base"
 	"github.com/alist-org/alist/v3/internal/op"
 	"github.com/go-resty/resty/v2"
@@ -135,6 +136,9 @@ func (d *FebBox) getDownloadLink(id string, ip string) (string, error) {
 	if err = json.Unmarshal(res, &fileDownloadResp); err != nil {
 		return "", err
 	}
+	if len(fileDownloadResp.Data) == 0 {
+		return "", fmt.Errorf("can not get download link, code:%d, msg:%s", fileDownloadResp.Code, fileDownloadResp.Msg)
+	}
 
 	return fileDownloadResp.Data[0].DownloadURL, nil
 }