infrastructure/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2025-07-12 17:44:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

18
webaccount/import.go
View File

@ -202,11 +202,7 @@ type importStep struct {
func importStart(log *mlog.Log, accName string, f *os.File, skipMailboxPrefix string) (string, error) {
defer func() {
if f != nil {
name := f.Name()
err := f.Close()
log.Check(err, "closing uploaded file")
err = os.Remove(name)
log.Check(err, "removing uploaded file", mlog.Field("name", name))
store.CloseRemoveTempFile(log, f, "upload for import")
}
}()
@ -316,11 +312,7 @@ func importMessages(ctx context.Context, log *mlog.Log, token string, acc *store
}
defer func() {
name := f.Name()
err := f.Close()
log.Check(err, "closing uploaded messages file")
err = os.Remove(name)
log.Check(err, "removing uploaded messages file", mlog.Field("path", name))
store.CloseRemoveTempFile(log, f, "uploaded messages")
for _, id := range deliveredIDs {
p := acc.MessagePath(id)
@ -594,11 +586,7 @@ func importMessages(ctx context.Context, log *mlog.Log, token string, acc *store
ximportcheckf(err, "creating temp message")
defer func() {
if f != nil {
name := f.Name()
err = f.Close()
log.Check(err, "closing temporary file for delivery")
err := os.Remove(name)
log.Check(err, "removing temporary file for delivery", mlog.Field("path", name))
store.CloseRemoveTempFile(log, f, "message to import")
}
}()