feat(drivers): support getting disk usage of some drivers (OpenListTeam#1905)

* feat(drivers): support getting disk usage of some drivers

* feat(drivers/degoo): implement GetDetails

* fix(fs/storage-details): fill used space rather than free space

* fix mega

* fix bsize type

Author: KirCute

drivers/115/driver.go

@@ -252,8 +252,8 @@ func (d *Pan115) GetDetails(ctx context.Context) (*model.StorageDetails, error)
 	}
 	return &model.StorageDetails{
 		DiskUsage: model.DiskUsage{
-			TotalSpace: uint64(info.SpaceInfo.AllTotal.Size),
-			FreeSpace:  uint64(info.SpaceInfo.AllRemain.Size),
+			TotalSpace: info.SpaceInfo.AllTotal.Size,
+			UsedSpace:  info.SpaceInfo.AllUse.Size,
 		},
 	}, nil
 }

drivers/115_open/driver.go

@@ -335,14 +335,14 @@ func (d *Open115) GetDetails(ctx context.Context) (*model.StorageDetails, error)
 	if err != nil {
 		return nil, err
 	}
-	free, err := userInfo.RtSpaceInfo.AllRemain.Size.Int64()
+	used, err := userInfo.RtSpaceInfo.AllUse.Size.Int64()
 	if err != nil {
 		return nil, err
 	}
 	return &model.StorageDetails{
 		DiskUsage: model.DiskUsage{
-			TotalSpace: uint64(total),
-			FreeSpace:  uint64(free),
+			TotalSpace: total,
+			UsedSpace:  used,
 		},
 	}, nil
 }

drivers/123/driver.go

@@ -260,9 +260,11 @@ func (d *Pan123) GetDetails(ctx context.Context) (*model.StorageDetails, error)
 	if err != nil {
 		return nil, err
 	}
-	total := userInfo.Data.SpacePermanent + userInfo.Data.SpaceTemp
 	return &model.StorageDetails{
-		DiskUsage: driver.DiskUsageFromUsedAndTotal(userInfo.Data.SpaceUsed, total),
+		DiskUsage: model.DiskUsage{
+			TotalSpace: userInfo.Data.SpacePermanent + userInfo.Data.SpaceTemp,
+			UsedSpace:  userInfo.Data.SpaceUsed,
+		},
 	}, nil
 }
 

drivers/123/types.go

@@ -127,9 +127,9 @@ type UserInfoResp struct {
 	Data struct {
 		Uid            int64  `json:"UID"`
 		Nickname       string `json:"Nickname"`
-		SpaceUsed      uint64 `json:"SpaceUsed"`
-		SpacePermanent uint64 `json:"SpacePermanent"`
-		SpaceTemp      uint64 `json:"SpaceTemp"`
+		SpaceUsed      int64  `json:"SpaceUsed"`
+		SpacePermanent int64  `json:"SpacePermanent"`
+		SpaceTemp      int64  `json:"SpaceTemp"`
 		FileCount      int    `json:"FileCount"`
 	} `json:"data"`
 }

drivers/123_open/driver.go

@@ -238,12 +238,10 @@ func (d *Open123) GetDetails(ctx context.Context) (*model.StorageDetails, error)
 	if err != nil {
 		return nil, err
 	}
-	total := userInfo.Data.SpacePermanent + userInfo.Data.SpaceTemp
-	free := total - userInfo.Data.SpaceUsed
 	return &model.StorageDetails{
 		DiskUsage: model.DiskUsage{
-			TotalSpace: total,
-			FreeSpace:  free,
+			TotalSpace: userInfo.Data.SpacePermanent + userInfo.Data.SpaceTemp,
+			UsedSpace:  userInfo.Data.SpaceUsed,
 		},
 	}, nil
 }

drivers/123_open/types.go

@@ -137,9 +137,9 @@ type UserInfoResp struct {
 		// HeadImage      string `json:"headImage"`
 		// Passport       string `json:"passport"`
 		// Mail           string `json:"mail"`
-		SpaceUsed      uint64 `json:"spaceUsed"`
-		SpacePermanent uint64 `json:"spacePermanent"`
-		SpaceTemp      uint64 `json:"spaceTemp"`
+		SpaceUsed      int64 `json:"spaceUsed"`
+		SpacePermanent int64 `json:"spacePermanent"`
+		SpaceTemp      int64 `json:"spaceTemp"`
 		// SpaceTempExpr  int64  `json:"spaceTempExpr"`
 		// Vip            bool   `json:"vip"`
 		// DirectTraffic  int64  `json:"directTraffic"`

drivers/139/driver.go

@@ -944,17 +944,17 @@ func (d *Yun139) GetDetails(ctx context.Context) (*model.StorageDetails, error)
 	if d.UserDomainID == "" {
 		return nil, errs.NotImplement
 	}
-	var total, used uint64
+	var total, used int64
 	if d.isFamily() {
 		diskInfo, err := d.getFamilyDiskInfo(ctx)
 		if err != nil {
 			return nil, err
 		}
-		totalMb, err := strconv.ParseUint(diskInfo.Data.DiskSize, 10, 64)
+		totalMb, err := strconv.ParseInt(diskInfo.Data.DiskSize, 10, 64)
 		if err != nil {
 			return nil, fmt.Errorf("failed convert disk size into integer: %+v", err)
 		}
-		usedMb, err := strconv.ParseUint(diskInfo.Data.UsedSize, 10, 64)
+		usedMb, err := strconv.ParseInt(diskInfo.Data.UsedSize, 10, 64)
 		if err != nil {
 			return nil, fmt.Errorf("failed convert used size into integer: %+v", err)
 		}
@@ -965,19 +965,22 @@ func (d *Yun139) GetDetails(ctx context.Context) (*model.StorageDetails, error)
 		if err != nil {
 			return nil, err
 		}
-		totalMb, err := strconv.ParseUint(diskInfo.Data.DiskSize, 10, 64)
+		totalMb, err := strconv.ParseInt(diskInfo.Data.DiskSize, 10, 64)
 		if err != nil {
 			return nil, fmt.Errorf("failed convert disk size into integer: %+v", err)
 		}
-		freeMb, err := strconv.ParseUint(diskInfo.Data.FreeDiskSize, 10, 64)
+		freeMb, err := strconv.ParseInt(diskInfo.Data.FreeDiskSize, 10, 64)
 		if err != nil {
 			return nil, fmt.Errorf("failed convert free size into integer: %+v", err)
 		}
 		total = totalMb * 1024 * 1024
 		used = total - (freeMb * 1024 * 1024)
 	}
 	return &model.StorageDetails{
-		DiskUsage: driver.DiskUsageFromUsedAndTotal(used, total),
+		DiskUsage: model.DiskUsage{
+			TotalSpace: total,
+			UsedSpace:  used,
+		},
 	}, nil
 }
 

drivers/189/driver.go

@@ -200,7 +200,10 @@ func (d *Cloud189) GetDetails(ctx context.Context) (*model.StorageDetails, error
 		return nil, err
 	}
 	return &model.StorageDetails{
-		DiskUsage: driver.DiskUsageFromUsedAndTotal(capacityInfo.CloudCapacityInfo.UsedSize, capacityInfo.CloudCapacityInfo.TotalSize),
+		DiskUsage: model.DiskUsage{
+			TotalSpace: capacityInfo.CloudCapacityInfo.TotalSize,
+			UsedSpace:  capacityInfo.CloudCapacityInfo.UsedSize,
+		},
 	}, nil
 }
 

drivers/189/types.go

@@ -72,15 +72,15 @@ type CapacityResp struct {
 	ResMessage        string `json:"res_message"`
 	Account           string `json:"account"`
 	CloudCapacityInfo struct {
-		FreeSize     int64  `json:"freeSize"`
-		MailUsedSize uint64 `json:"mail189UsedSize"`
-		TotalSize    uint64 `json:"totalSize"`
-		UsedSize     uint64 `json:"usedSize"`
+		FreeSize     int64 `json:"freeSize"`
+		MailUsedSize int64 `json:"mail189UsedSize"`
+		TotalSize    int64 `json:"totalSize"`
+		UsedSize     int64 `json:"usedSize"`
 	} `json:"cloudCapacityInfo"`
 	FamilyCapacityInfo struct {
-		FreeSize  int64  `json:"freeSize"`
-		TotalSize uint64 `json:"totalSize"`
-		UsedSize  uint64 `json:"usedSize"`
+		FreeSize  int64 `json:"freeSize"`
+		TotalSize int64 `json:"totalSize"`
+		UsedSize  int64 `json:"usedSize"`
 	} `json:"familyCapacityInfo"`
 	TotalSize uint64 `json:"totalSize"`
 }

drivers/189_tv/driver.go

@@ -284,7 +284,7 @@ func (y *Cloud189TV) GetDetails(ctx context.Context) (*model.StorageDetails, err
 	if err != nil {
 		return nil, err
 	}
-	var total, used uint64
+	var total, used int64
 	if y.isFamily() {
 		total = capacityInfo.FamilyCapacityInfo.TotalSize
 		used = capacityInfo.FamilyCapacityInfo.UsedSize
@@ -293,6 +293,9 @@ func (y *Cloud189TV) GetDetails(ctx context.Context) (*model.StorageDetails, err
 		used = capacityInfo.CloudCapacityInfo.UsedSize
 	}
 	return &model.StorageDetails{
-		DiskUsage: driver.DiskUsageFromUsedAndTotal(used, total),
+		DiskUsage: model.DiskUsage{
+			TotalSpace: total,
+			UsedSpace:  used,
+		},
 	}, nil
 }