From 6784cbf4536b63370dfbf12424f2db0a7c0276f5 Mon Sep 17 00:00:00 2001
From: Derrick Hammer <derrick@derrickhammer.com>
Date: Mon, 15 Jan 2024 15:16:48 -0500
Subject: [PATCH] refactor: optimize

---
 protocols/s5/http.go | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/protocols/s5/http.go b/protocols/s5/http.go
index 32fd9cb..e1f1dd9 100644
--- a/protocols/s5/http.go
+++ b/protocols/s5/http.go
@@ -40,7 +40,8 @@ func NewHttpHandler(portal interfaces.Portal) *HttpHandlerImpl {
 }
 
 func (h *HttpHandlerImpl) SmallFileUpload(jc *jape.Context) {
-	buffer := bytes.NewBuffer(nil)
+	var rs io.ReadSeeker
+	var bufferSize int64
 
 	r := jc.Request
 	contentType := r.Header.Get("Content-Type")
@@ -67,21 +68,18 @@ func (h *HttpHandlerImpl) SmallFileUpload(jc *jape.Context) {
 			}
 		}(file)
 
-		// Copy file contents to buffer
-		_, err = io.Copy(buffer, file)
-		if jc.Check(errReadFile, err) != nil {
-			h.portal.Logger().Error(errReadFile, zap.Error(err))
-			return
-		}
+		rs = file
 	} else {
-		// For other content types, read the body into the buffer
-		_, err := io.Copy(buffer, r.Body)
-
+		data, err := io.ReadAll(r.Body)
 		if jc.Check(errReadFile, err) != nil {
 			h.portal.Logger().Error(errReadFile, zap.Error(err))
 			return
 		}
 
+		buffer := bytes.NewReader(data)
+		bufferSize = int64(buffer.Len())
+		rs = buffer
+
 		defer func(Body io.ReadCloser) {
 			err := Body.Close()
 			if err != nil {
@@ -90,7 +88,7 @@ func (h *HttpHandlerImpl) SmallFileUpload(jc *jape.Context) {
 		}(r.Body)
 	}
 
-	hash, err := h.portal.Storage().PutFile(bytes.NewReader(buffer.Bytes()), "s5", false)
+	hash, err := h.portal.Storage().PutFile(rs, "s5", false)
 
 	if err != nil {
 		_ = jc.Error(errUploadingFileErr, http.StatusInternalServerError)
@@ -98,7 +96,7 @@ func (h *HttpHandlerImpl) SmallFileUpload(jc *jape.Context) {
 		return
 	}
 
-	cid, err := encoding.CIDFromHash(hash, uint64(len(buffer.Bytes())), types.CIDTypeRaw)
+	cid, err := encoding.CIDFromHash(hash, uint64(bufferSize), types.CIDTypeRaw)
 
 	if err != nil {
 		_ = jc.Error(errUploadingFileErr, http.StatusInternalServerError)