chore: apply @lidel review suggestions

ipfs · Aug 22, 2023 · 51fd898 · 51fd898
1 parent baf7ff5
commit 51fd898
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/gateway/gateway.go b/gateway/gateway.go
@@ -299,7 +299,7 @@ func NewGetResponseFromDirectoryListing(dagSize uint64, entries <-chan unixfs.Li
 }
 
 type HeadResponse struct {
-	size          int64
+	bytesSize     int64
 	startingBytes io.ReadCloser
 	isFile        bool
 	isSymLink     bool
@@ -314,15 +314,15 @@ func (r *HeadResponse) Close() error {
 }
 
 func NewHeadResponseForFile(startingBytes io.ReadCloser, size int64) *HeadResponse {
-	return &HeadResponse{startingBytes: startingBytes, isFile: true, size: size}
+	return &HeadResponse{startingBytes: startingBytes, isFile: true, bytesSize: size}
 }
 
 func NewHeadResponseForSymlink(symlinkSize int64) *HeadResponse {
-	return &HeadResponse{isSymLink: true, size: symlinkSize}
+	return &HeadResponse{isSymLink: true, bytesSize: symlinkSize}
 }
 
 func NewHeadResponseForDirectory(dagSize int64) *HeadResponse {
-	return &HeadResponse{isDir: true, size: dagSize}
+	return &HeadResponse{isDir: true, bytesSize: dagSize}
 }
 
 // IPFSBackend is the required set of functionality used to implement the IPFS

diff --git a/gateway/handler_defaults.go b/gateway/handler_defaults.go
@@ -101,7 +101,7 @@ func (i *handler) serveDefaults(ctx context.Context, w http.ResponseWriter, r *h
 		var blockSize int64
 		var dataToRender io.ReadCloser
 		if headResp != nil {
-			blockSize = headResp.size
+			blockSize = headResp.bytesSize
 			dataToRender = nil
 		} else {
 			blockSize = getResp.bytesSize
@@ -117,10 +117,10 @@ func (i *handler) serveDefaults(ctx context.Context, w http.ResponseWriter, r *h
 		if headResp != nil {
 			if headResp.isFile {
 				rq.logger.Debugw("serving unixfs file", "path", rq.contentPath)
-				return i.serveFile(ctx, w, r, resolvedPath, rq.contentPath, headResp.size, headResp.startingBytes, false, true, pathMetadata.ContentType, rq.begin)
+				return i.serveFile(ctx, w, r, resolvedPath, rq.contentPath, headResp.bytesSize, headResp.startingBytes, false, true, pathMetadata.ContentType, rq.begin)
 			} else if headResp.isSymLink {
 				rq.logger.Debugw("serving unixfs file", "path", rq.contentPath)
-				return i.serveFile(ctx, w, r, resolvedPath, rq.contentPath, headResp.size, nil, true, true, pathMetadata.ContentType, rq.begin)
+				return i.serveFile(ctx, w, r, resolvedPath, rq.contentPath, headResp.bytesSize, nil, true, true, pathMetadata.ContentType, rq.begin)
 			} else if headResp.isDir {
 				rq.logger.Debugw("serving unixfs directory", "path", rq.contentPath)
 				return i.serveDirectory(ctx, w, r, resolvedPath, rq.contentPath, true, nil, ranges, rq.begin, rq.logger)

diff --git a/gateway/handler_unixfs_dir.go b/gateway/handler_unixfs_dir.go
@@ -90,7 +90,7 @@ func (i *handler) serveDirectory(ctx context.Context, w http.ResponseWriter, r *
 			}
 			returnRangeStartsAtZero = true
 			idxFileBytes = idxHeadResp.startingBytes
-			idxFileSize = idxHeadResp.size
+			idxFileSize = idxHeadResp.bytesSize
 		}
 	} else {
 		var idxGetResp *GetResponse

diff --git a/gateway/serve_http_content.go b/gateway/serve_http_content.go
@@ -56,7 +56,7 @@ func httpServeContent(w http.ResponseWriter, r *http.Request, modtime time.Time,
 	// handle Content-Range header.
 	sendSize := size
 	if size >= 0 {
-		ranges, err := parsehttpRange(rangeReq, size)
+		ranges, err := parseRange(rangeReq, size)
 		if err != nil {
 			if err == errNoOverlap {
 				w.Header().Set("Content-Range", fmt.Sprintf("bytes */%d", size))
@@ -360,7 +360,7 @@ func (r httpRange) contentRange(size int64) string {
 
 // parseRange parses a Range header string as per RFC 7233.
 // errNoOverlap is returned if none of the ranges overlap.
-func parsehttpRange(s string, size int64) ([]httpRange, error) {
+func parseRange(s string, size int64) ([]httpRange, error) {
 	if s == "" {
 		return nil, nil // header not present
 	}