From dfd4fc1ecf7167f76af21fcd369de218b4fa9ce8 Mon Sep 17 00:00:00 2001
From: Alexandre <alexandre@bruyant.xyz>
Date: Sun, 7 Jan 2024 22:19:37 +0100
Subject: [PATCH] Move Close

---
 main.go | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/main.go b/main.go
index 01dbd4c..91a7e96 100644
--- a/main.go
+++ b/main.go
@@ -108,14 +108,15 @@ func main() {
 	q := req.URL.Query()
 	q.Add("wrap-with-directory", "true")
 	q.Add("progress", "false")
+	q.Add("stream-true", "false")
 	req.URL.RawQuery = q.Encode()
 
 	mwriter := NewIpfsMultipartWriter(writer)
 	req.Header.Add("Content-Type", mwriter.FormDataContentType())
 
 	go func() {
-		defer mwriter.Close()
 		defer writer.Close()
+		defer mwriter.Close()
 
 		err = filepath.Walk(path, func(innerPath string, info fs.FileInfo, err error) error {
 			if err != nil {
@@ -123,27 +124,24 @@ func main() {
 			}
 
 			if info.IsDir() {
-				// _, err = mwriter.CreateIpfsDirectoryPart(innerPath)
-				// if err != nil {
-				// 	return err
-				// }
-			} else {
-				relPath, _ := filepath.Rel(path, innerPath)
-				w, err := mwriter.CreateIpfsFilePart(url.QueryEscape(fmt.Sprintf("/%v", relPath)))
-				if err != nil {
-					return err
-				}
+				return nil
+			}
 
-				fileReader, err := os.Open(innerPath)
-				if err != nil {
-					return err
-				}
-				defer fileReader.Close()
+			relPath, _ := filepath.Rel(path, innerPath)
+			w, err := mwriter.CreateIpfsFilePart(url.QueryEscape(fmt.Sprintf("/%v", relPath)))
+			if err != nil {
+				return err
+			}
 
-				written, err := io.Copy(w, fileReader)
-				if err != nil {
-					return fmt.Errorf("error copying %s (%d bytes written): %v", innerPath, written, err)
-				}
+			fileReader, err := os.Open(innerPath)
+			if err != nil {
+				return err
+			}
+			defer fileReader.Close()
+
+			written, err := io.Copy(w, fileReader)
+			if err != nil {
+				return fmt.Errorf("error copying %s (%d bytes written): %v", innerPath, written, err)
 			}
 
 			return nil