chore: rename ListObjetV1Handler to ListObjectHandler, rename BTFS-Ha…

…sh to CID
bittorrent · Aug 30, 2023 · bbed9cd · bbed9cd
1 parent bbfcb97
commit bbed9cd
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 13 deletions.
diff --git a/s3/consts/consts.go b/s3/consts/consts.go
@@ -146,6 +146,7 @@ const (
 	XRequestWith       = "X-Requested-With"
 	Range              = "Range"
 	UserAgent          = "User-Agent"
+	CID                = "CID"
 )
 
 // Standard HTTP cors headers
@@ -157,11 +158,6 @@ const (
 	AccessControlAllowCredentials = "Access-Control-Allow-Credentials"
 )
 
-// Standard BTFS HTTP response constants
-const (
-	BTFSHash = "BTFS-Hash"
-)
-
 // object const
 const (
 	MaxObjectSize = 5 * humanize.TiByte

diff --git a/s3/handlers/handlers_object.go b/s3/handlers/handlers_object.go
@@ -522,7 +522,7 @@ func (h *Handlers) GetObjectACLHandler(w http.ResponseWriter, r *http.Request) {
 	responses.WriteGetBucketAclResponse(w, r, ack, acl)
 }
 
-func (h *Handlers) ListObjectsV1Handler(w http.ResponseWriter, r *http.Request) {
+func (h *Handlers) ListObjectsHandler(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 	ack := cctx.GetAccessKey(r)
 	var err error

diff --git a/s3/handlers/options.go b/s3/handlers/options.go
@@ -16,7 +16,7 @@ var defaultCorsMethods = []string{
 }
 
 var defaultCorsHeaders = []string{
-	consts.BTFSHash,
+	consts.CID,
 	consts.Date,
 	consts.ETag,
 	consts.ServerInfo,

diff --git a/s3/handlers/proto.go b/s3/handlers/proto.go
@@ -25,7 +25,7 @@ type Handlerser interface {
 	DeleteObjectHandler(w http.ResponseWriter, r *http.Request)
 	GetObjectHandler(w http.ResponseWriter, r *http.Request)
 	GetObjectACLHandler(w http.ResponseWriter, r *http.Request)
-	ListObjectsV1Handler(w http.ResponseWriter, r *http.Request)
+	ListObjectsHandler(w http.ResponseWriter, r *http.Request)
 	ListObjectsV2Handler(w http.ResponseWriter, r *http.Request)
 
 	// multipart

diff --git a/s3/responses/types.go b/s3/responses/types.go
@@ -149,7 +149,7 @@ type Object struct {
 	Key          string
 	LastModified string // time string of format "2006-01-02T15:04:05.000Z"
 	ETag         string
-	BTFSHash     string // BTFS Cid
+	CID          string // CID
 	Size         int64
 
 	// Owner of the object.
@@ -261,6 +261,7 @@ func GenerateListObjectsV2Response(bucket, prefix, token, nextToken, startAfter,
 		}
 		content.Size = object.Size
 		content.Owner = owner
+		content.CID = object.Cid
 		contents = append(contents, content)
 	}
 	data.Name = bucket
@@ -307,7 +308,7 @@ func GenerateListObjectsV1Response(bucket, prefix, marker, delimiter, encodingTy
 		if object.ETag != "" {
 			content.ETag = "\"" + object.ETag + "\""
 		}
-		content.BTFSHash = object.Cid
+		content.CID = object.Cid
 		content.Size = object.Size
 		content.StorageClass = ""
 		content.Owner = owner

diff --git a/s3/responses/writers_common.go b/s3/responses/writers_common.go
@@ -203,6 +203,6 @@ func setPutObjHeaders(w http.ResponseWriter, etag, cid string, delete bool) {
 		w.Header()[consts.ETag] = []string{`"` + etag + `"`}
 	}
 	if cid != "" {
-		w.Header()[consts.BTFSHash] = []string{cid}
+		w.Header()[consts.CID] = []string{cid}
 	}
 }
diff --git a/s3/routers/routers.go b/s3/routers/routers.go
@@ -45,8 +45,8 @@ func (routers *Routers) Register() http.Handler {
 	//object...
 	// ListObjectsV2
 	bucket.Methods(http.MethodGet).HandlerFunc(hs.ListObjectsV2Handler).Queries("list-type", "2")
-	// ListObjectsV1
-	bucket.Methods(http.MethodGet).HandlerFunc(hs.ListObjectsV1Handler)
+	// ListObjects
+	bucket.Methods(http.MethodGet).HandlerFunc(hs.ListObjectsHandler)
 	// HeadObject
 	bucket.Methods(http.MethodHead).Path("/{object:.+}").HandlerFunc(hs.HeadObjectHandler)
 	// PutObject