refactor common pattern of close & remove temporary file into calling the new store.CloseRemoveTempFile

This commit is contained in:
Mechiel Lukkien
2023-11-01 18:57:38 +01:00
parent b6897d1837
commit ef50f4abf0
11 changed files with 15 additions and 81 deletions

View File

@ -311,13 +311,7 @@ func importctl(ctx context.Context, ctl *ctl, mbox bool) {
conf, _ := a.Conf()
process := func(m *store.Message, msgf *os.File, origPath string) {
defer func() {
name := msgf.Name()
err := msgf.Close()
ctl.log.Check(err, "closing temporary message after failing to import")
err = os.Remove(name)
ctl.log.Check(err, "removing temporary message after failing to import", mlog.Field("path", name))
}()
defer store.CloseRemoveTempFile(ctl.log, msgf, "message to import")
for _, kw := range m.Keywords {
mailboxKeywords[kw] = true