From d5d4380823be1308878276e68431442d62c78dea Mon Sep 17 00:00:00 2001
From: Sydonian <794346190@qq.com>
Date: Wed, 2 Jul 2025 16:30:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3OBS=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=87=BA=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/pkgs/storage/s3/base_store.go |  2 +-
 jcsctl/cmd/getp/getp.go              |  6 +++---
 jcsctl/cmd/putp/putp.go              | 10 +++++++---
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/common/pkgs/storage/s3/base_store.go b/common/pkgs/storage/s3/base_store.go
index 9709546..516ddc5 100644
--- a/common/pkgs/storage/s3/base_store.go
+++ b/common/pkgs/storage/s3/base_store.go
@@ -89,7 +89,7 @@ func (s *BaseStore) Write(pat clitypes.JPath, stream io.Reader, opt types.WriteO
 	_, err := s.cli.PutObject(context.TODO(), &s3.PutObjectInput{
 		Bucket:   aws.String(s.Bucket),
 		Key:      aws.String(key.String()),
-		Body:     counter,
+		Body:     hashStr,
 		Metadata: meta,
 	})
 	if err != nil {
diff --git a/jcsctl/cmd/getp/getp.go b/jcsctl/cmd/getp/getp.go
index 2df8a27..ea39246 100644
--- a/jcsctl/cmd/getp/getp.go
+++ b/jcsctl/cmd/getp/getp.go
@@ -143,20 +143,20 @@ func getp(c *cobra.Command, ctx *cmd.CommandContext, opt option, args []string)
 		dir := filepath.Dir(localPath)
 		err = os.MkdirAll(dir, 0755)
 		if err != nil {
-			fmt.Printf("\tx")
+			fmt.Printf("\tx\n")
 			return err
 		}
 
 		fileStartTime := time.Now()
 		file, err := os.OpenFile(localPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0644)
 		if err != nil {
-			fmt.Printf("\tx")
+			fmt.Printf("\tx\n")
 			return err
 		}
 
 		_, err = io.Copy(file, tr)
 		if err != nil {
-			fmt.Printf("\tx")
+			fmt.Printf("\tx\n")
 			return err
 		}
 
diff --git a/jcsctl/cmd/putp/putp.go b/jcsctl/cmd/putp/putp.go
index c7a3ad5..42637fb 100644
--- a/jcsctl/cmd/putp/putp.go
+++ b/jcsctl/cmd/putp/putp.go
@@ -33,13 +33,15 @@ func init() {
 	c.Flags().BoolVar(&opt.UseID, "id", false, "treat the second argument as package id")
 	c.Flags().StringVar(&opt.Prefix, "prefix", "", "add prefix to every uploaded file")
 	c.Flags().BoolVar(&opt.Create, "create", false, "create package if not exists")
+	c.Flags().Int64Var(&opt.Affinity, "affinity", 0, "affinity user space of the package")
 	cmd.RootCmd.AddCommand(c)
 }
 
 type option struct {
-	UseID  bool
-	Prefix string
-	Create bool
+	UseID    bool
+	Prefix   string
+	Create   bool
+	Affinity int64
 }
 
 func putp(c *cobra.Command, ctx *cmd.CommandContext, opt option, args []string) error {
@@ -132,6 +134,7 @@ func putp(c *cobra.Command, ctx *cmd.CommandContext, opt option, args []string)
 		_, err = ctx.Client.Object().Upload(cliapi.ObjectUpload{
 			Info: cliapi.ObjectUploadInfo{
 				PackageID: pkgID,
+				Affinity:  clitypes.UserSpaceID(opt.Affinity),
 			},
 			Files: iterator.Array(&cliapi.UploadingObject{
 				Path: pat,
@@ -156,6 +159,7 @@ func putp(c *cobra.Command, ctx *cmd.CommandContext, opt option, args []string)
 	_, err = ctx.Client.Object().Upload(cliapi.ObjectUpload{
 		Info: cliapi.ObjectUploadInfo{
 			PackageID: pkgID,
+			Affinity:  clitypes.UserSpaceID(opt.Affinity),
 		},
 		Files: iter,
 	})