fix(fs): panic when failed to get storage details (OpenListTeam#1964)

Author: KirCute

drivers/115_open/driver.go

@@ -331,11 +331,11 @@ func (d *Open115) GetDetails(ctx context.Context) (*model.StorageDetails, error)
 	if err != nil {
 		return nil, err
 	}
-	total, err := userInfo.RtSpaceInfo.AllTotal.Size.Int64()
+	total, err := ParseInt64(userInfo.RtSpaceInfo.AllTotal.Size)
 	if err != nil {
 		return nil, err
 	}
-	used, err := userInfo.RtSpaceInfo.AllUse.Size.Int64()
+	used, err := ParseInt64(userInfo.RtSpaceInfo.AllUse.Size)
 	if err != nil {
 		return nil, err
 	}

drivers/115_open/util.go

@@ -1,3 +1,15 @@
 package _115_open
 
-// do others that not defined in Driver interface
+import "encoding/json"
+
+func ParseInt64(v json.Number) (int64, error) {
+	i, err := v.Int64()
+	if err == nil {
+		return i, nil
+	}
+	f, e1 := v.Float64()
+	if e1 == nil {
+		return int64(f), nil
+	}
+	return int64(0), err
+}

drivers/alias/driver.go

@@ -218,8 +218,8 @@ func (d *Alias) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([
 			}
 			if details, ok := model.GetStorageDetails(obj); ok {
 				objRet = &model.ObjStorageDetails{
-					Obj:                    objRet,
-					StorageDetailsWithName: *details,
+					Obj:            objRet,
+					StorageDetails: details,
 				}
 			}
 			objMap[name] = objRet

drivers/alias/util.go

@@ -50,11 +50,8 @@ func (d *Alias) listRoot(ctx context.Context, withDetails, refresh bool) []model
 			continue
 		}
 		objs[idx] = &model.ObjStorageDetails{
-			Obj: objs[idx],
-			StorageDetailsWithName: model.StorageDetailsWithName{
-				StorageDetails: nil,
-				DriverName:     remoteDriver.Config().Name,
-			},
+			Obj:            objs[idx],
+			StorageDetails: nil,
 		}
 		workerCount++
 		go func(dri driver.Driver, i int) {

internal/model/storage.go

@@ -79,29 +79,24 @@ type StorageDetails struct {
 	DiskUsage
 }
 
-type StorageDetailsWithName struct {
-	*StorageDetails
-	DriverName string `json:"driver_name"`
-}
-
 type ObjWithStorageDetails interface {
-	GetStorageDetails() *StorageDetailsWithName
+	GetStorageDetails() *StorageDetails
 }
 
 type ObjStorageDetails struct {
 	Obj
-	StorageDetailsWithName
+	*StorageDetails
 }
 
 func (o *ObjStorageDetails) Unwrap() Obj {
 	return o.Obj
 }
 
-func (o ObjStorageDetails) GetStorageDetails() *StorageDetailsWithName {
-	return &o.StorageDetailsWithName
+func (o *ObjStorageDetails) GetStorageDetails() *StorageDetails {
+	return o.StorageDetails
 }
 
-func GetStorageDetails(obj Obj) (*StorageDetailsWithName, bool) {
+func GetStorageDetails(obj Obj) (*StorageDetails, bool) {
 	if obj, ok := obj.(ObjWithStorageDetails); ok {
 		return obj.GetStorageDetails(), true
 	}

internal/op/storage.go

@@ -353,11 +353,8 @@ func GetStorageVirtualFilesWithDetailsByPath(ctx context.Context, prefix string,
 			return obj
 		}
 		ret := &model.ObjStorageDetails{
-			Obj: obj,
-			StorageDetailsWithName: model.StorageDetailsWithName{
-				StorageDetails: nil,
-				DriverName:     d.Config().Name,
-			},
+			Obj:            obj,
+			StorageDetails: nil,
 		}
 		resultChan := make(chan *model.StorageDetails, 1)
 		go func(dri driver.Driver) {

server/handles/fsread.go

@@ -33,17 +33,17 @@ type DirReq struct {
 }
 
 type ObjResp struct {
-	Name         string                        `json:"name"`
-	Size         int64                         `json:"size"`
-	IsDir        bool                          `json:"is_dir"`
-	Modified     time.Time                     `json:"modified"`
-	Created      time.Time                     `json:"created"`
-	Sign         string                        `json:"sign"`
-	Thumb        string                        `json:"thumb"`
-	Type         int                           `json:"type"`
-	HashInfoStr  string                        `json:"hashinfo"`
-	HashInfo     map[*utils.HashType]string    `json:"hash_info"`
-	MountDetails *model.StorageDetailsWithName `json:"mount_details,omitempty"`
+	Name         string                     `json:"name"`
+	Size         int64                      `json:"size"`
+	IsDir        bool                       `json:"is_dir"`
+	Modified     time.Time                  `json:"modified"`
+	Created      time.Time                  `json:"created"`
+	Sign         string                     `json:"sign"`
+	Thumb        string                     `json:"thumb"`
+	Type         int                        `json:"type"`
+	HashInfoStr  string                     `json:"hashinfo"`
+	HashInfo     map[*utils.HashType]string `json:"hash_info"`
+	MountDetails *model.StorageDetails      `json:"mount_details,omitempty"`
 }
 
 type FsListResp struct {