From 4fb1310ce523674c0b0e6c46b65c1c774e8f7d4f Mon Sep 17 00:00:00 2001 From: "Mr.Li" Date: Fri, 21 Apr 2023 17:30:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E9=99=A4=E4=B8=B4=E6=97=B6=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E6=96=87=E4=BB=B6=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/cmd/csv.go | 6 +++++- cmd/cmd/merge.go | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/cmd/cmd/csv.go b/cmd/cmd/csv.go index c002486..887defb 100644 --- a/cmd/cmd/csv.go +++ b/cmd/cmd/csv.go @@ -162,5 +162,9 @@ func (e *Csv) mergeCsvToExcel(path string, max int, out string) error { Reader{Path: path, Index: max}, Writer{File: out, Limit: 500000}, ) - return m.Merge() + if err := m.Merge(); err != nil { + return err + } + + return m.Clear() } diff --git a/cmd/cmd/merge.go b/cmd/cmd/merge.go index 36bb17c..835dace 100644 --- a/cmd/cmd/merge.go +++ b/cmd/cmd/merge.go @@ -156,7 +156,11 @@ func (m *Merge) Save() error { return m.file.SaveAs(m.writer.GetFileName(m.fileIndex)) } -//GetFileName 获取文件名 +func (m *Merge) Clear() error { + return os.RemoveAll(m.reader.Path) +} + +// GetFileName 获取文件名 func (w *Writer) GetFileName(fileIndex int) string { ex := regexp.MustCompile("(\\..*)") name := ex.ReplaceAllFunc([]byte(w.File), func(b []byte) []byte {