Feat: user storage pack

pkg/serializer/user.go

@@ -87,13 +87,14 @@ func BuildUserResponse(user model.User) Response {
 
 // BuildUserStorageResponse 序列化用户存储概况响应
 func BuildUserStorageResponse(user model.User) Response {
+	total := user.Group.MaxStorage + user.GetAvailablePackSize()
 	storageResp := storage{
 		Used:  user.Storage,
-		Free:  user.Group.MaxStorage - user.Storage,
-		Total: user.Group.MaxStorage,
+		Free:  total - user.Storage,
+		Total: total,
 	}
 
-	if user.Group.MaxStorage < user.Storage {
+	if total < user.Storage {
 		storageResp.Free = 0
 	}
 

pkg/serializer/user_test.go

@@ -2,6 +2,7 @@ package serializer
 
 import (
 	model "github.com/HFO4/cloudreve/models"
+	"github.com/HFO4/cloudreve/pkg/cache"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )
@@ -27,6 +28,7 @@ func TestBuildUserResponse(t *testing.T) {
 
 func TestBuildUserStorageResponse(t *testing.T) {
 	asserts := assert.New(t)
+	cache.Set("pack_size_0", uint64(0), 0)
 
 	{
 		user := model.User{
@@ -58,4 +60,15 @@ func TestBuildUserStorageResponse(t *testing.T) {
 		asserts.Equal(uint64(10), res.Data.(storage).Total)
 		asserts.Equal(uint64(0), res.Data.(storage).Free)
 	}
+	{
+		cache.Set("pack_size_0", uint64(1), 0)
+		user := model.User{
+			Storage: 6,
+			Group:   model.Group{MaxStorage: 10},
+		}
+		res := BuildUserStorageResponse(user)
+		asserts.Equal(uint64(6), res.Data.(storage).Used)
+		asserts.Equal(uint64(11), res.Data.(storage).Total)
+		asserts.Equal(uint64(5), res.Data.(storage).Free)
+	}
 }