fix(189): disk-usage unmarshal failed when used capacity overflow (#1577)

Author: KirCute

drivers/189/driver.go

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

drivers/189/types.go

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

drivers/189_tv/driver.go

@@ -284,18 +284,15 @@ func (y *Cloud189TV) GetDetails(ctx context.Context) (*model.StorageDetails, err
 	if err != nil {
 		return nil, err
 	}
-	var total, free uint64
+	var total, used uint64
 	if y.isFamily() {
 		total = capacityInfo.FamilyCapacityInfo.TotalSize
-		free = capacityInfo.FamilyCapacityInfo.FreeSize
+		used = capacityInfo.FamilyCapacityInfo.UsedSize
 	} else {
 		total = capacityInfo.CloudCapacityInfo.TotalSize
-		free = capacityInfo.CloudCapacityInfo.FreeSize
+		used = capacityInfo.CloudCapacityInfo.UsedSize
 	}
 	return &model.StorageDetails{
-		DiskUsage: model.DiskUsage{
-			TotalSpace: total,
-			FreeSpace:  free,
-		},
+		DiskUsage: driver.DiskUsageFromUsedAndTotal(used, total),
 	}, nil
 }

drivers/189_tv/types.go

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

drivers/189pc/driver.go

@@ -416,18 +416,15 @@ func (y *Cloud189PC) GetDetails(ctx context.Context) (*model.StorageDetails, err
 	if err != nil {
 		return nil, err
 	}
-	var total, free uint64
+	var total, used uint64
 	if y.isFamily() {
 		total = capacityInfo.FamilyCapacityInfo.TotalSize
-		free = capacityInfo.FamilyCapacityInfo.FreeSize
+		used = capacityInfo.FamilyCapacityInfo.UsedSize
 	} else {
 		total = capacityInfo.CloudCapacityInfo.TotalSize
-		free = capacityInfo.CloudCapacityInfo.FreeSize
+		used = capacityInfo.CloudCapacityInfo.UsedSize
 	}
 	return &model.StorageDetails{
-		DiskUsage: model.DiskUsage{
-			TotalSpace: total,
-			FreeSpace:  free,
-		},
+		DiskUsage: driver.DiskUsageFromUsedAndTotal(used, total),
 	}, nil
 }

drivers/189pc/types.go

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