From 13ecbc361cf695f305704da15131dc8536f7cef2 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Mon, 11 Mar 2024 16:31:09 +0200 Subject: [PATCH] Make FileInfo a pointer (#56) --- http/filestream/filestream.go | 4 ++-- http/filestream/filestream_test.go | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/http/filestream/filestream.go b/http/filestream/filestream.go index dcaf579..bc8d553 100644 --- a/http/filestream/filestream.go +++ b/http/filestream/filestream.go @@ -53,7 +53,7 @@ type FileInfo struct { Path string } -func WriteFilesToStream(multipartWriter *multipart.Writer, filesList []FileInfo) (err error) { +func WriteFilesToStream(multipartWriter *multipart.Writer, filesList []*FileInfo) (err error) { for _, file := range filesList { if err = writeFile(multipartWriter, file); err != nil { return @@ -65,7 +65,7 @@ func WriteFilesToStream(multipartWriter *multipart.Writer, filesList []FileInfo) return multipartWriter.Close() } -func writeFile(multipartWriter *multipart.Writer, file FileInfo) (err error) { +func writeFile(multipartWriter *multipart.Writer, file *FileInfo) (err error) { fileReader, err := os.Open(file.Path) defer ioutils.Close(fileReader, &err) fileWriter, err := multipartWriter.CreateFormFile(FileType, file.Name) diff --git a/http/filestream/filestream_test.go b/http/filestream/filestream_test.go index 3e10a7a..465c139 100644 --- a/http/filestream/filestream_test.go +++ b/http/filestream/filestream_test.go @@ -15,8 +15,8 @@ var targetDir string func TestWriteFilesToStreamAndReadFilesFromStream(t *testing.T) { sourceDir := t.TempDir() // Create 2 file to be transferred via our multipart stream - file1 := FileInfo{Name: "test1.txt", Path: filepath.Join(sourceDir, "test1.txt")} - file2 := FileInfo{Name: "test2.txt", Path: filepath.Join(sourceDir, "test2.txt")} + file1 := &FileInfo{Name: "test1.txt", Path: filepath.Join(sourceDir, "test1.txt")} + file2 := &FileInfo{Name: "test2.txt", Path: filepath.Join(sourceDir, "test2.txt")} file1Content := []byte("test content1") file2Content := []byte("test content2") assert.NoError(t, os.WriteFile(file1.Path, file1Content, 0600)) @@ -25,7 +25,7 @@ func TestWriteFilesToStreamAndReadFilesFromStream(t *testing.T) { // Create the multipart writer that will stream our files body := &bytes.Buffer{} multipartWriter := multipart.NewWriter(body) - assert.NoError(t, WriteFilesToStream(multipartWriter, []FileInfo{file1, file2})) + assert.NoError(t, WriteFilesToStream(multipartWriter, []*FileInfo{file1, file2})) // Create local temp dir that will store our files targetDir = t.TempDir()