diff --git a/backend/utils/files/zip.go b/backend/utils/files/zip.go index a29c36f88..39f6f4ec6 100644 --- a/backend/utils/files/zip.go +++ b/backend/utils/files/zip.go @@ -25,10 +25,14 @@ func (z ZipArchiver) Extract(filePath, dstDir string) error { } func (z ZipArchiver) Compress(sourcePaths []string, dstFile string) error { + var err error tmpFile := path.Join(global.CONF.System.TmpDir, fmt.Sprintf("%s%s.zip", common.RandStr(50), time.Now().Format("20060102150405"))) op := NewFileOp() defer func() { _ = op.DeleteFile(tmpFile) + if err != nil { + _ = op.DeleteFile(dstFile) + } }() baseDir := path.Dir(sourcePaths[0]) relativePaths := make([]string, len(sourcePaths)) @@ -36,8 +40,11 @@ func (z ZipArchiver) Compress(sourcePaths []string, dstFile string) error { relativePaths[i] = path.Base(sp) } cmdStr := fmt.Sprintf("zip -qr %s %s", tmpFile, strings.Join(relativePaths, " ")) - if err := cmd.ExecCmdWithDir(cmdStr, baseDir); err != nil { + if err = cmd.ExecCmdWithDir(cmdStr, baseDir); err != nil { return err } - return op.Mv(tmpFile, dstFile) + if err = op.Mv(tmpFile, dstFile); err != nil { + return err + } + return nil }