From 4d538d791149715aaefe129257f1594ff4774a06 Mon Sep 17 00:00:00 2001
From: Sydonian <794346190@qq.com>
Date: Thu, 24 Aug 2023 17:13:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=AC=E5=85=B1=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/http/package.go     | 14 ++++++++------
 internal/services/package.go | 11 +++++------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/internal/http/package.go b/internal/http/package.go
index bae4170..d05fee5 100644
--- a/internal/http/package.go
+++ b/internal/http/package.go
@@ -9,7 +9,6 @@ import (
 	"gitlink.org.cn/cloudream/common/consts/errorcode"
 	"gitlink.org.cn/cloudream/common/models"
 	"gitlink.org.cn/cloudream/common/pkgs/logger"
-	"gitlink.org.cn/cloudream/common/utils/serder"
 	"gitlink.org.cn/cloudream/storage-common/pkgs/iterator"
 )
 
@@ -49,11 +48,12 @@ func (s *PackageService) Upload(ctx *gin.Context) {
 		return
 	}
 
-	switch req.Info.Redundancy.Type {
-	case models.RedundancyRep:
+	if req.Info.Redundancy.IsRepInfo() {
 		s.uploadRep(ctx, &req)
 		return
-	case models.RedundancyEC:
+	}
+
+	if req.Info.Redundancy.IsECInfo() {
 		s.uploadEC(ctx, &req)
 		return
 	}
@@ -64,8 +64,9 @@ func (s *PackageService) Upload(ctx *gin.Context) {
 func (s *PackageService) uploadRep(ctx *gin.Context, req *PackageUploadReq) {
 	log := logger.WithField("HTTP", "Package.Upload")
 
+	var err error
 	var repInfo models.RepRedundancyInfo
-	if err := serder.AnyToAny(req.Info.Redundancy.Info, &repInfo); err != nil {
+	if repInfo, err = req.Info.Redundancy.ToRepInfo(); err != nil {
 		log.Warnf("parsing rep redundancy config: %s", err.Error())
 		ctx.JSON(http.StatusBadRequest, Failed(errorcode.BadArgument, "invalid rep redundancy config"))
 		return
@@ -107,8 +108,9 @@ func (s *PackageService) uploadRep(ctx *gin.Context, req *PackageUploadReq) {
 func (s *PackageService) uploadEC(ctx *gin.Context, req *PackageUploadReq) {
 	log := logger.WithField("HTTP", "Package.Upload")
 
+	var err error
 	var ecInfo models.ECRedundancyInfo
-	if err := serder.AnyToAny(req.Info.Redundancy.Info, &ecInfo); err != nil {
+	if ecInfo, err = req.Info.Redundancy.ToECInfo(); err != nil {
 		log.Warnf("parsing ec redundancy config: %s", err.Error())
 		ctx.JSON(http.StatusBadRequest, Failed(errorcode.BadArgument, "invalid rep redundancy config"))
 		return
diff --git a/internal/services/package.go b/internal/services/package.go
index b60038a..c85da8c 100644
--- a/internal/services/package.go
+++ b/internal/services/package.go
@@ -5,7 +5,6 @@ import (
 	"time"
 
 	"gitlink.org.cn/cloudream/common/models"
-	"gitlink.org.cn/cloudream/common/utils/serder"
 	mytask "gitlink.org.cn/cloudream/storage-client/internal/task"
 	"gitlink.org.cn/cloudream/storage-common/globals"
 	agtcmd "gitlink.org.cn/cloudream/storage-common/pkgs/cmd"
@@ -60,7 +59,7 @@ func (svc *PackageService) DownloadPackage(userID int64, packageID int64) (itera
 		return nil, fmt.Errorf("getting package objects: %w", err)
 	}
 
-	if getPkgResp.Redundancy.Type == models.RedundancyRep {
+	if getPkgResp.Redundancy.IsRepInfo() {
 		iter, err := svc.downloadRepPackage(packageID, getObjsResp.Objects, coorCli)
 
 		if err != nil {
@@ -107,17 +106,17 @@ func (svc *PackageService) downloadECPackage(pkg model.Package, objects []model.
 		return nil, fmt.Errorf("getting package object ec data: %w", err)
 	}
 
-	var ecRed models.ECRedundancyInfo
-	if err := serder.AnyToAny(pkg.Redundancy.Info, &ecRed); err != nil {
+	var ecInfo models.ECRedundancyInfo
+	if ecInfo, err = pkg.Redundancy.ToECInfo(); err != nil {
 		return nil, fmt.Errorf("get ec redundancy info: %w", err)
 	}
 
-	getECResp, err := coorCli.GetECConfig(coormq.NewGetECConfig(ecRed.ECName))
+	getECResp, err := coorCli.GetECConfig(coormq.NewGetECConfig(ecInfo.ECName))
 	if err != nil {
 		return nil, fmt.Errorf("getting ec: %w", err)
 	}
 
-	iter := iterator.NewECObjectIterator(objects, getObjECDataResp.Data, ecRed, getECResp.Config, &iterator.DownloadContext{
+	iter := iterator.NewECObjectIterator(objects, getObjECDataResp.Data, ecInfo, getECResp.Config, &iterator.DownloadContext{
 		Distlock: svc.DistLock,
 	})