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

move "link or copy" functionality to moxio

Browse Source 
and add a bit more logging for unexpected failures when closing files.
and make tests pass with a TMPDIR on a different filesystem than the testdata directory.
This commit is contained in:
Mechiel Lukkien
2023-07-23 12:15:29 +02:00
parent 4a4d337ab4
commit 3e9b4107fd
12 changed files with 165 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
imapserver/server.go
View File

@ -3065,15 +3065,25 @@ func (c *conn) cmdxCopy(isUID bool, tag, cmd string, p *parser) {
}
// Copy message files to new message ID's.
syncDirs := map[string]struct{}{}
for i := range origMsgIDs {
src := c.account.MessagePath(origMsgIDs[i])
dst := c.account.MessagePath(newMsgIDs[i])
os.MkdirAll(filepath.Dir(dst), 0770) // todo optimization: keep track of dirs we already created, don't create them again
err := c.linkOrCopyFile(dst, src)
dstdir := filepath.Dir(dst)
if _, ok := syncDirs[dstdir]; !ok {
os.MkdirAll(dstdir, 0770)
syncDirs[dstdir] = struct{}{}
}
err := moxio.LinkOrCopy(c.log, dst, src, nil, true)
xcheckf(err, "link or copy file %q to %q", src, dst)
createdIDs = append(createdIDs, newMsgIDs[i])
}
for dir := range syncDirs {
err := moxio.SyncDir(dir)
xcheckf(err, "sync directory")
}
err = c.account.RetrainMessages(context.TODO(), c.log, tx, nmsgs, false)
xcheckf(err, "train copied messages")
})
@ -3095,49 +3105,6 @@ func (c *conn) cmdxCopy(isUID bool, tag, cmd string, p *parser) {
c.writeresultf("%s OK [COPYUID %d %s %s] copied", tag, mbDst.UIDValidity, compactUIDSet(origUIDs).String(), compactUIDSet(newUIDs).String())
}
func (c *conn) linkOrCopyFile(dst, src string) error {
// Try hardlink first.
if err := os.Link(src, dst); err == nil {
return nil
}
// File system may not support hardlinks, or link would cross file systems. Do a regular file copy.
sf, err := os.Open(src)
if err != nil {
return err
}
defer func() {
err := sf.Close()
c.xsanity(err, "closing copied src file")
}()
df, err := os.OpenFile(dst, os.O_CREATE|os.O_EXCL|os.O_WRONLY, 0660)
if err != nil {
return err
}
defer func() {
if df != nil {
err = os.Remove(df.Name())
c.xsanity(err, "removing unfinished dst file")
err = df.Close()
c.xsanity(err, "closing unfinished dst file")
}
}()
if _, err := io.Copy(df, sf); err != nil {
return err
}
if err := df.Close(); err != nil {
xerr := os.Remove(df.Name())
c.xsanity(xerr, "removing unfinished dst file")
df = nil
return err
}
// todo: may need to do a file/dir sync to flush to disk. better to do it once after multiple linkOrCopyFile calls.
df = nil
return nil
}
// Move moves messages from the currently selected/active mailbox to a named mailbox.
//
// State: Selected