Add archive command

Adds an archive command that moves the current message into the folder
specified in the account config entry.

Supports three layouts at this point:

- flat: puts all messages next to each other
- year: creates a folder per year
- month: same as above, plus folders per month

This also adds a "-p" argument to "cp" and "mv" that works like
"--parents" on mkdir(1). We use this to auto-create the directories
for the archive layout.
This commit is contained in:
Robert Günzler 2019-06-08 19:41:56 +02:00 committed by Drew DeVault
parent 35f57321f8
commit acfe7d7625
12 changed files with 168 additions and 8 deletions

62
commands/msg/archive.go Normal file
View file

@ -0,0 +1,62 @@
package msg
import (
"errors"
"fmt"
"path"
"time"
"github.com/gdamore/tcell"
"git.sr.ht/~sircmpwn/aerc/widgets"
"git.sr.ht/~sircmpwn/aerc/worker/types"
)
const (
ARCHIVE_FLAT = "flat"
ARCHIVE_YEAR = "year"
ARCHIVE_MONTH = "month"
)
func init() {
register("archive", Archive)
}
func Archive(aerc *widgets.Aerc, args []string) error {
if len(args) != 2 {
return errors.New("Usage: archive <flat|year|month>")
}
acct := aerc.SelectedAccount()
if acct == nil {
return errors.New("No account selected")
}
msg := acct.Messages().Selected()
store := acct.Messages().Store()
archiveDir := acct.AccountConfig().Archive
acct.Messages().Next()
switch args[1] {
case ARCHIVE_MONTH:
archiveDir = path.Join(archiveDir,
fmt.Sprintf("%d", msg.Envelope.Date.Year()),
fmt.Sprintf("%02d", msg.Envelope.Date.Month()))
case ARCHIVE_YEAR:
archiveDir = path.Join(archiveDir, fmt.Sprintf("%v",
msg.Envelope.Date.Year()))
case ARCHIVE_FLAT:
// deliberately left blank
}
store.Move([]uint32{msg.Uid}, archiveDir, true, func(
msg types.WorkerMessage) {
switch msg := msg.(type) {
case *types.Done:
aerc.PushStatus("Messages archived.", 10*time.Second)
case *types.Error:
aerc.PushStatus(" "+msg.Error.Error(), 10*time.Second).
Color(tcell.ColorDefault, tcell.ColorRed)
}
})
return nil
}

View file

@ -4,6 +4,7 @@ import (
"errors"
"time"
"git.sr.ht/~sircmpwn/getopt"
"github.com/gdamore/tcell"
"git.sr.ht/~sircmpwn/aerc/widgets"
@ -16,9 +17,23 @@ func init() {
}
func Copy(aerc *widgets.Aerc, args []string) error {
if len(args) != 2 {
return errors.New("Usage: mv <folder>")
opts, optind, err := getopt.Getopts(args[1:], "p")
if err != nil {
return err
}
if optind != len(args)-2 {
return errors.New("Usage: cp [-p] <folder>")
}
var (
createParents bool
)
for _, opt := range opts {
switch opt.Option {
case 'p':
createParents = true
}
}
widget := aerc.SelectedTab().(widgets.ProvidesMessage)
acct := widget.SelectedAccount()
if acct == nil {
@ -26,7 +41,9 @@ func Copy(aerc *widgets.Aerc, args []string) error {
}
msg := widget.SelectedMessage()
store := widget.Store()
store.Copy([]uint32{msg.Uid}, args[1], func(msg types.WorkerMessage) {
store.Copy([]uint32{msg.Uid}, args[optind+1], createParents, func(
msg types.WorkerMessage) {
switch msg := msg.(type) {
case *types.Done:
aerc.PushStatus("Messages copied.", 10*time.Second)

View file

@ -4,6 +4,7 @@ import (
"errors"
"time"
"git.sr.ht/~sircmpwn/getopt"
"github.com/gdamore/tcell"
"git.sr.ht/~sircmpwn/aerc/widgets"
@ -16,9 +17,23 @@ func init() {
}
func Move(aerc *widgets.Aerc, args []string) error {
if len(args) != 2 {
return errors.New("Usage: mv <folder>")
opts, optind, err := getopt.Getopts(args[1:], "p")
if err != nil {
return err
}
if optind != len(args)-2 {
return errors.New("Usage: mv [-p] <folder>")
}
var (
createParents bool
)
for _, opt := range opts {
switch opt.Option {
case 'p':
createParents = true
}
}
widget := aerc.SelectedTab().(widgets.ProvidesMessage)
acct := widget.SelectedAccount()
if acct == nil {
@ -31,7 +46,9 @@ func Move(aerc *widgets.Aerc, args []string) error {
aerc.RemoveTab(widget)
}
acct.Messages().Next()
store.Move([]uint32{msg.Uid}, args[1], func(msg types.WorkerMessage) {
store.Move([]uint32{msg.Uid}, args[optind+1], createParents, func(
msg types.WorkerMessage) {
switch msg := msg.(type) {
case *types.Done:
aerc.PushStatus("Messages moved.", 10*time.Second)