From 901c68fdfc1b7b5d3cbd5a16ae7b9eaf83a8fabc Mon Sep 17 00:00:00 2001 From: Derrick Hammer Date: Sun, 18 Feb 2024 03:30:42 -0500 Subject: [PATCH] refactor: have the forward slash always prefixed at the renter abstraction --- protocols/s5/tus.go | 2 +- renter/renter.go | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/protocols/s5/tus.go b/protocols/s5/tus.go index 1838d9c..561541c 100644 --- a/protocols/s5/tus.go +++ b/protocols/s5/tus.go @@ -395,7 +395,7 @@ func (t *TusHandler) uploadTask(hash []byte) error { return tusUpload.GetReader(ctx) }, Bucket: upload.Protocol, - FileName: "/" + t.storageProtocol.EncodeFileName(upload.Hash), + FileName: t.storageProtocol.EncodeFileName(upload.Hash), Size: uint64(info.Size), }, proof) diff --git a/renter/renter.go b/renter/renter.go index f957b07..aef74e4 100644 --- a/renter/renter.go +++ b/renter/renter.go @@ -8,6 +8,7 @@ import ( "math" "net/url" "strconv" + "strings" "git.lumeweb.com/LumeWeb/portal/cron" "github.com/google/uuid" @@ -89,6 +90,7 @@ func (r *RenterDefault) CreateBucketIfNotExists(bucket string) error { } func (r *RenterDefault) UploadObject(ctx context.Context, file io.Reader, bucket string, fileName string) error { + fileName = "/" + strings.TrimLeft(fileName, "/") _, err := r.workerClient.UploadObject(ctx, file, bucket, fileName, api.UploadObjectOptions{}) if err != nil { @@ -140,6 +142,8 @@ func (r *RenterDefault) UploadObjectMultipart(ctx context.Context, params *Multi fileName := params.FileName idHandler := params.UploadIDHandler + fileName = "/" + strings.TrimLeft(fileName, "/") + var redundancy api.RedundancySettings err := r.GetSetting(ctx, "redundancy", &redundancy)