支付相关

internal/data/storage/local.go

@@ -2,8 +2,6 @@ package storage
 
 import (
 	"context"
-	"crypto/md5"
-	"encoding/hex"
 	"fmt"
 	"io"
 	"mime"
@@ -14,6 +12,7 @@ import (
 
 	"kra/internal/biz"
 	"kra/internal/conf"
+	"kra/pkg/osskit"
 )
 
 type fileStorage struct {
@@ -66,40 +65,16 @@ func New(config *conf.AdminBackend) (biz.FileStorage, error) {
 }
 
 func composeFiles(ctx context.Context, storage biz.FileStorage, names []string, destination string) (*biz.StoredFile, string, error) {
-	reader, writer := io.Pipe()
-	hash := md5.New()
-	errCh := make(chan error, 1)
-	go func() {
-		defer writer.Close()
-		for _, name := range names {
-			if ctx.Err() != nil {
-				errCh <- ctx.Err()
-				return
-			}
-			file, err := storage.Open(ctx, name)
-			if err != nil {
-				errCh <- err
-				return
-			}
-			_, err = io.Copy(io.MultiWriter(writer, hash), file)
-			_ = file.Close()
-			if err != nil {
-				errCh <- err
-				return
-			}
-		}
-		errCh <- nil
-	}()
-	stored, err := storage.Put(ctx, destination, reader)
-	composeErr := <-errCh
+	var stored *biz.StoredFile
+	hash, err := osskit.ComposeStreams(ctx, names, storage.Open, func(ctx context.Context, destination string, reader io.Reader) error {
+		var putErr error
+		stored, putErr = storage.Put(ctx, destination, reader)
+		return putErr
+	}, storage.Delete, destination)
 	if err != nil {
 		return nil, "", err
 	}
-	if composeErr != nil {
-		_ = storage.Delete(ctx, destination)
-		return nil, "", composeErr
-	}
-	return stored, hex.EncodeToString(hash.Sum(nil)), nil
+	return stored, hash, nil
 }
 
 func (s *fileStorage) resolve(name string) (string, error) {