From 54a72f83035bdf710368846e55a5b003ccab66cd Mon Sep 17 00:00:00 2001 From: Jason Cox Date: Fri, 23 Feb 2024 11:40:16 -0500 Subject: notmuch: simplify moving a message Delete the existing file from the database after indexing the new one to avoid the need to remember and re-apply tags. Signed-off-by: Jason Cox Tested-by: Maarten Aertsen Acked-by: Robin Jarry --- worker/notmuch/message.go | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/worker/notmuch/message.go b/worker/notmuch/message.go index 2a8b1730..09850d64 100644 --- a/worker/notmuch/message.go +++ b/worker/notmuch/message.go @@ -237,19 +237,10 @@ func (m *Message) Move(srcDir, destDir maildir.Dir) error { return fmt.Errorf("no matching message file found in %s", string(srcDir)) } - tags, err := m.Tags() - if err != nil { - return err - } - // Remove encoded UID information from the key to prevent sync issues name := lib.StripUIDFromMessageFilename(filepath.Base(src)) dest := filepath.Join(string(destDir), "cur", name) - if err := m.db.DeleteMessage(src); err != nil { - return err - } - if err := os.Rename(src, dest); err != nil { return err } @@ -258,7 +249,7 @@ func (m *Message) Move(srcDir, destDir maildir.Dir) error { return err } - if err := m.ModifyTags(tags, nil); err != nil { + if err := m.db.DeleteMessage(src); err != nil { return err } -- cgit v1.2.3-54-g00ecf