From c701a3558673d10935bf11904250fdbef5c8b03e Mon Sep 17 00:00:00 2001 From: Yusuf Efe <120668197+yuefdev@users.noreply.github.com> Date: Fri, 23 Oct 2026 13:04:11 +0300 Subject: [PATCH] fix(fileutil): preserve CSV fields and truncate replaced files (#378) --- fileutil/file.go | 22 ++-------------------- fileutil/file_test.go | 30 ++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 20 deletions(-) diff --git a/fileutil/file.go b/fileutil/file.go index a329072..854790c 100644 --- a/fileutil/file.go +++ b/fileutil/file.go @@ -761,6 +761,8 @@ func WriteCsvFile(filepath string, records [][]string, append bool, delimiter .. if append { flag = flag | os.O_APPEND + } else { + flag = flag | os.O_TRUNC } f, err := os.OpenFile(filepath, flag, 0644) @@ -778,13 +780,6 @@ func WriteCsvFile(filepath string, records [][]string, append bool, delimiter .. writer.Comma = ',' } - // 遍历所有记录并处理包含分隔符或双引号的单元格 - for i := range records { - for j := range records[i] { - records[i][j] = escapeCSVField(records[i][j], writer.Comma) - } - } - return writer.WriteAll(records) } @@ -843,19 +838,6 @@ func ReadFile(path string) (reader io.ReadCloser, closeFn func(), err error) { } } -// escapeCSVField 处理单元格内容,如果包含分隔符,则用双引号包裹 -func escapeCSVField(field string, delimiter rune) string { - // 替换所有的双引号为两个双引号 - escapedField := strings.ReplaceAll(field, "\"", "\"\"") - - // 如果字段包含分隔符、双引号或换行符,用双引号包裹整个字段 - if strings.ContainsAny(escapedField, string(delimiter)+"\"\n") { - escapedField = fmt.Sprintf("\"%s\"", escapedField) - } - - return escapedField -} - // WriteMapsToCsv write slice of map to csv file. // Play: https://go.dev/play/p/umAIomZFV1c // filepath: Path to the CSV file. diff --git a/fileutil/file_test.go b/fileutil/file_test.go index 9b48d65..ddfa4fd 100644 --- a/fileutil/file_test.go +++ b/fileutil/file_test.go @@ -446,6 +446,36 @@ func TestWriteCsvFile(t *testing.T) { // RemoveFile(csvFilePath) } +func TestWriteCsvFileRoundTrip(t *testing.T) { + for _, delimiter := range []rune{',', ';'} { + t.Run(string(delimiter), func(t *testing.T) { + assert := internal.NewAssert(t, "TestWriteCsvFileRoundTrip") + path := filepath.Join(t.TempDir(), "quoted.csv") + want := [][]string{{"a,b;c", "\"quoted\"", "two\nlines"}} + records := [][]string{append([]string(nil), want[0]...)} + assert.IsNil(WriteCsvFile(path, records, false, delimiter)) + got, err := ReadCsvFile(path, delimiter) + assert.IsNil(err) + assert.Equal(want, got) + assert.Equal(want, records) + }) + } +} + +func TestWriteCsvFileOverwriteAndAppend(t *testing.T) { + assert := internal.NewAssert(t, "TestWriteCsvFileOverwriteAndAppend") + path := filepath.Join(t.TempDir(), "overwrite.csv") + assert.IsNil(os.WriteFile(path, []byte(strings.Repeat("old,value\n", 10)), 0600)) + assert.IsNil(WriteCsvFile(path, [][]string{{"new", "row"}}, false)) + got, err := ReadCsvFile(path) + assert.IsNil(err) + assert.Equal([][]string{{"new", "row"}}, got) + assert.IsNil(WriteCsvFile(path, [][]string{{"appended", "row"}}, true)) + got, err = ReadCsvFile(path) + assert.IsNil(err) + assert.Equal([][]string{{"new", "row"}, {"appended", "row"}}, got) +} + func TestWriteMapsToCsv(t *testing.T) { assert := internal.NewAssert(t, "TestWriteMapsToCSV")