~sircmpwn/aerc

98da4c9509d03f8ffe48b9c66b9c3ce8a0f2f942 — Drew DeVault 1 year, 10 months ago 9c10a90
s/aerc2/aerc/g
M aerc.go => aerc.go +8 -8
@@ 10,14 10,14 @@ import (

	"github.com/mattn/go-isatty"

	"git.sr.ht/~sircmpwn/aerc2/commands"
	"git.sr.ht/~sircmpwn/aerc2/commands/account"
	"git.sr.ht/~sircmpwn/aerc2/commands/compose"
	"git.sr.ht/~sircmpwn/aerc2/commands/msgview"
	"git.sr.ht/~sircmpwn/aerc2/commands/terminal"
	"git.sr.ht/~sircmpwn/aerc2/config"
	libui "git.sr.ht/~sircmpwn/aerc2/lib/ui"
	"git.sr.ht/~sircmpwn/aerc2/widgets"
	"git.sr.ht/~sircmpwn/aerc/commands"
	"git.sr.ht/~sircmpwn/aerc/commands/account"
	"git.sr.ht/~sircmpwn/aerc/commands/compose"
	"git.sr.ht/~sircmpwn/aerc/commands/msgview"
	"git.sr.ht/~sircmpwn/aerc/commands/terminal"
	"git.sr.ht/~sircmpwn/aerc/config"
	libui "git.sr.ht/~sircmpwn/aerc/lib/ui"
	"git.sr.ht/~sircmpwn/aerc/widgets"
)

func getCommands(selected libui.Drawable) []*commands.Commands {

M commands/account/account.go => commands/account/account.go +1 -1
@@ 1,7 1,7 @@
package account

import (
	"git.sr.ht/~sircmpwn/aerc2/commands"
	"git.sr.ht/~sircmpwn/aerc/commands"
)

var (

M commands/account/cf.go => commands/account/cf.go +1 -1
@@ 3,7 3,7 @@ package account
import (
	"errors"

	"git.sr.ht/~sircmpwn/aerc2/widgets"
	"git.sr.ht/~sircmpwn/aerc/widgets"
)

var (

M commands/account/compose.go => commands/account/compose.go +1 -1
@@ 3,7 3,7 @@ package account
import (
	"errors"

	"git.sr.ht/~sircmpwn/aerc2/widgets"
	"git.sr.ht/~sircmpwn/aerc/widgets"
)

func init() {

M commands/account/copy.go => commands/account/copy.go +2 -2
@@ 6,8 6,8 @@ import (

	"github.com/gdamore/tcell"

	"git.sr.ht/~sircmpwn/aerc2/widgets"
	"git.sr.ht/~sircmpwn/aerc2/worker/types"
	"git.sr.ht/~sircmpwn/aerc/widgets"
	"git.sr.ht/~sircmpwn/aerc/worker/types"
)

func init() {

M commands/account/delete-message.go => commands/account/delete-message.go +2 -2
@@ 6,8 6,8 @@ import (

	"github.com/gdamore/tcell"

	"git.sr.ht/~sircmpwn/aerc2/widgets"
	"git.sr.ht/~sircmpwn/aerc2/worker/types"
	"git.sr.ht/~sircmpwn/aerc/widgets"
	"git.sr.ht/~sircmpwn/aerc/worker/types"
)

func init() {

M commands/account/move.go => commands/account/move.go +2 -2
@@ 6,8 6,8 @@ import (

	"github.com/gdamore/tcell"

	"git.sr.ht/~sircmpwn/aerc2/widgets"
	"git.sr.ht/~sircmpwn/aerc2/worker/types"
	"git.sr.ht/~sircmpwn/aerc/widgets"
	"git.sr.ht/~sircmpwn/aerc/worker/types"
)

func init() {

M commands/account/next-folder.go => commands/account/next-folder.go +1 -1
@@ 5,7 5,7 @@ import (
	"fmt"
	"strconv"

	"git.sr.ht/~sircmpwn/aerc2/widgets"
	"git.sr.ht/~sircmpwn/aerc/widgets"
)

func init() {

M commands/account/next-message.go => commands/account/next-message.go +1 -1
@@ 6,7 6,7 @@ import (
	"strconv"
	"strings"

	"git.sr.ht/~sircmpwn/aerc2/widgets"
	"git.sr.ht/~sircmpwn/aerc/widgets"
)

func init() {

M commands/account/pipe.go => commands/account/pipe.go +1 -1
@@ 6,7 6,7 @@ import (
	"os/exec"
	"time"

	"git.sr.ht/~sircmpwn/aerc2/widgets"
	"git.sr.ht/~sircmpwn/aerc/widgets"

	"github.com/gdamore/tcell"
	"github.com/mattn/go-runewidth"

M commands/account/reply.go => commands/account/reply.go +1 -1
@@ 14,7 14,7 @@ import (
	"github.com/emersion/go-imap"
	"git.sr.ht/~sircmpwn/getopt"

	"git.sr.ht/~sircmpwn/aerc2/widgets"
	"git.sr.ht/~sircmpwn/aerc/widgets"
)

func init() {

M commands/account/select-message.go => commands/account/select-message.go +1 -1
@@ 4,7 4,7 @@ import (
	"errors"
	"strconv"

	"git.sr.ht/~sircmpwn/aerc2/widgets"
	"git.sr.ht/~sircmpwn/aerc/widgets"
)

func init() {

M commands/account/view-message.go => commands/account/view-message.go +1 -1
@@ 3,7 3,7 @@ package account
import (
	"errors"

	"git.sr.ht/~sircmpwn/aerc2/widgets"
	"git.sr.ht/~sircmpwn/aerc/widgets"
)

func init() {

M commands/cd.go => commands/cd.go +1 -1
@@ 4,7 4,7 @@ import (
	"errors"
	"os"

	"git.sr.ht/~sircmpwn/aerc2/widgets"
	"git.sr.ht/~sircmpwn/aerc/widgets"
	"github.com/mitchellh/go-homedir"
)


M commands/commands.go => commands/commands.go +1 -1
@@ 5,7 5,7 @@ import (

	"github.com/google/shlex"

	"git.sr.ht/~sircmpwn/aerc2/widgets"
	"git.sr.ht/~sircmpwn/aerc/widgets"
)

type AercCommand func(aerc *widgets.Aerc, args []string) error

M commands/compose/abort.go => commands/compose/abort.go +1 -1
@@ 3,7 3,7 @@ package compose
import (
	"errors"

	"git.sr.ht/~sircmpwn/aerc2/widgets"
	"git.sr.ht/~sircmpwn/aerc/widgets"
)

func init() {

M commands/compose/compose.go => commands/compose/compose.go +1 -1
@@ 1,7 1,7 @@
package compose

import (
	"git.sr.ht/~sircmpwn/aerc2/commands"
	"git.sr.ht/~sircmpwn/aerc/commands"
)

var (

M commands/compose/next-field.go => commands/compose/next-field.go +1 -1
@@ 4,7 4,7 @@ import (
	"errors"
	"fmt"

	"git.sr.ht/~sircmpwn/aerc2/widgets"
	"git.sr.ht/~sircmpwn/aerc/widgets"
)

func init() {

M commands/compose/send.go => commands/compose/send.go +2 -2
@@ 15,8 15,8 @@ import (
	"github.com/gdamore/tcell"
	"github.com/miolini/datacounter"

	"git.sr.ht/~sircmpwn/aerc2/widgets"
	"git.sr.ht/~sircmpwn/aerc2/worker/types"
	"git.sr.ht/~sircmpwn/aerc/widgets"
	"git.sr.ht/~sircmpwn/aerc/worker/types"
)

func init() {

M commands/msgview/close.go => commands/msgview/close.go +1 -1
@@ 3,7 3,7 @@ package msgview
import (
	"errors"

	"git.sr.ht/~sircmpwn/aerc2/widgets"
	"git.sr.ht/~sircmpwn/aerc/widgets"
)

func init() {

M commands/msgview/msgview.go => commands/msgview/msgview.go +1 -1
@@ 1,7 1,7 @@
package msgview

import (
	"git.sr.ht/~sircmpwn/aerc2/commands"
	"git.sr.ht/~sircmpwn/aerc/commands"
)

var (

M commands/next-tab.go => commands/next-tab.go +1 -1
@@ 5,7 5,7 @@ import (
	"fmt"
	"strconv"

	"git.sr.ht/~sircmpwn/aerc2/widgets"
	"git.sr.ht/~sircmpwn/aerc/widgets"
)

func init() {

M commands/quit.go => commands/quit.go +1 -1
@@ 3,7 3,7 @@ package commands
import (
	"errors"

	"git.sr.ht/~sircmpwn/aerc2/widgets"
	"git.sr.ht/~sircmpwn/aerc/widgets"
)

func init() {

M commands/term.go => commands/term.go +1 -1
@@ 4,7 4,7 @@ import (
	"os/exec"
	"time"

	"git.sr.ht/~sircmpwn/aerc2/widgets"
	"git.sr.ht/~sircmpwn/aerc/widgets"

	"github.com/gdamore/tcell"
	"github.com/riywo/loginshell"

M commands/terminal/close.go => commands/terminal/close.go +1 -1
@@ 3,7 3,7 @@ package terminal
import (
	"errors"

	"git.sr.ht/~sircmpwn/aerc2/widgets"
	"git.sr.ht/~sircmpwn/aerc/widgets"
)

func init() {

M commands/terminal/terminal.go => commands/terminal/terminal.go +1 -1
@@ 1,7 1,7 @@
package terminal

import (
	"git.sr.ht/~sircmpwn/aerc2/commands"
	"git.sr.ht/~sircmpwn/aerc/commands"
)

var (

M go.mod => go.mod +1 -1
@@ 1,4 1,4 @@
module git.sr.ht/~sircmpwn/aerc2
module git.sr.ht/~sircmpwn/aerc

require (
	git.sr.ht/~sircmpwn/getopt v0.0.0-20190214165041-9a4f886f9fc7

M lib/msgstore.go => lib/msgstore.go +1 -1
@@ 7,7 7,7 @@ import (

	"github.com/emersion/go-imap"

	"git.sr.ht/~sircmpwn/aerc2/worker/types"
	"git.sr.ht/~sircmpwn/aerc/worker/types"
)

// Accesses to fields must be guarded by MessageStore.Lock/Unlock

M lib/ui/ui.go => lib/ui/ui.go +1 -1
@@ 5,7 5,7 @@ import (

	"github.com/gdamore/tcell"

	"git.sr.ht/~sircmpwn/aerc2/config"
	"git.sr.ht/~sircmpwn/aerc/config"
)

type UI struct {

M widgets/account.go => widgets/account.go +5 -5
@@ 6,11 6,11 @@ import (

	"github.com/gdamore/tcell"

	"git.sr.ht/~sircmpwn/aerc2/config"
	"git.sr.ht/~sircmpwn/aerc2/lib"
	"git.sr.ht/~sircmpwn/aerc2/lib/ui"
	"git.sr.ht/~sircmpwn/aerc2/worker"
	"git.sr.ht/~sircmpwn/aerc2/worker/types"
	"git.sr.ht/~sircmpwn/aerc/config"
	"git.sr.ht/~sircmpwn/aerc/lib"
	"git.sr.ht/~sircmpwn/aerc/lib/ui"
	"git.sr.ht/~sircmpwn/aerc/worker"
	"git.sr.ht/~sircmpwn/aerc/worker/types"
)

type AccountView struct {

M widgets/aerc.go => widgets/aerc.go +3 -3
@@ 6,9 6,9 @@ import (

	"github.com/gdamore/tcell"

	"git.sr.ht/~sircmpwn/aerc2/config"
	"git.sr.ht/~sircmpwn/aerc2/lib/ui"
	libui "git.sr.ht/~sircmpwn/aerc2/lib/ui"
	"git.sr.ht/~sircmpwn/aerc/config"
	"git.sr.ht/~sircmpwn/aerc/lib/ui"
	libui "git.sr.ht/~sircmpwn/aerc/lib/ui"
)

type Aerc struct {

M widgets/compose.go => widgets/compose.go +4 -4
@@ 13,10 13,10 @@ import (
	"github.com/gdamore/tcell"
	"github.com/mattn/go-runewidth"

	"git.sr.ht/~sircmpwn/aerc2/config"
	"git.sr.ht/~sircmpwn/aerc2/lib"
	"git.sr.ht/~sircmpwn/aerc2/lib/ui"
	"git.sr.ht/~sircmpwn/aerc2/worker/types"
	"git.sr.ht/~sircmpwn/aerc/config"
	"git.sr.ht/~sircmpwn/aerc/lib"
	"git.sr.ht/~sircmpwn/aerc/lib/ui"
	"git.sr.ht/~sircmpwn/aerc/worker/types"
)

type Composer struct {

M widgets/dirlist.go => widgets/dirlist.go +3 -3
@@ 6,9 6,9 @@ import (

	"github.com/gdamore/tcell"

	"git.sr.ht/~sircmpwn/aerc2/config"
	"git.sr.ht/~sircmpwn/aerc2/lib/ui"
	"git.sr.ht/~sircmpwn/aerc2/worker/types"
	"git.sr.ht/~sircmpwn/aerc/config"
	"git.sr.ht/~sircmpwn/aerc/lib/ui"
	"git.sr.ht/~sircmpwn/aerc/worker/types"
)

type DirectoryList struct {

M widgets/exline.go => widgets/exline.go +1 -1
@@ 3,7 3,7 @@ package widgets
import (
	"github.com/gdamore/tcell"

	"git.sr.ht/~sircmpwn/aerc2/lib/ui"
	"git.sr.ht/~sircmpwn/aerc/lib/ui"
)

type ExLine struct {

M widgets/msglist.go => widgets/msglist.go +4 -4
@@ 6,10 6,10 @@ import (

	"github.com/gdamore/tcell"

	"git.sr.ht/~sircmpwn/aerc2/config"
	"git.sr.ht/~sircmpwn/aerc2/lib"
	"git.sr.ht/~sircmpwn/aerc2/lib/ui"
	"git.sr.ht/~sircmpwn/aerc2/worker/types"
	"git.sr.ht/~sircmpwn/aerc/config"
	"git.sr.ht/~sircmpwn/aerc/lib"
	"git.sr.ht/~sircmpwn/aerc/lib/ui"
	"git.sr.ht/~sircmpwn/aerc/worker/types"
)

type MessageList struct {

M widgets/msgviewer.go => widgets/msgviewer.go +4 -4
@@ 16,10 16,10 @@ import (
	"github.com/google/shlex"
	"github.com/mattn/go-runewidth"

	"git.sr.ht/~sircmpwn/aerc2/config"
	"git.sr.ht/~sircmpwn/aerc2/lib"
	"git.sr.ht/~sircmpwn/aerc2/lib/ui"
	"git.sr.ht/~sircmpwn/aerc2/worker/types"
	"git.sr.ht/~sircmpwn/aerc/config"
	"git.sr.ht/~sircmpwn/aerc/lib"
	"git.sr.ht/~sircmpwn/aerc/lib/ui"
	"git.sr.ht/~sircmpwn/aerc/worker/types"
)

type MessageViewer struct {

M widgets/spinner.go => widgets/spinner.go +1 -1
@@ 6,7 6,7 @@ import (

	"github.com/gdamore/tcell"

	"git.sr.ht/~sircmpwn/aerc2/lib/ui"
	"git.sr.ht/~sircmpwn/aerc/lib/ui"
)

var (

M widgets/status.go => widgets/status.go +1 -1
@@ 5,7 5,7 @@ import (

	"github.com/gdamore/tcell"

	"git.sr.ht/~sircmpwn/aerc2/lib/ui"
	"git.sr.ht/~sircmpwn/aerc/lib/ui"
)

type StatusLine struct {

M widgets/terminal.go => widgets/terminal.go +1 -1
@@ 5,7 5,7 @@ import (
	"os"
	"os/exec"

	"git.sr.ht/~sircmpwn/aerc2/lib/ui"
	"git.sr.ht/~sircmpwn/aerc/lib/ui"

	"git.sr.ht/~sircmpwn/go-libvterm"
	"git.sr.ht/~sircmpwn/pty"

M worker/imap/fetch.go => worker/imap/fetch.go +1 -1
@@ 3,7 3,7 @@ package imap
import (
	"github.com/emersion/go-imap"

	"git.sr.ht/~sircmpwn/aerc2/worker/types"
	"git.sr.ht/~sircmpwn/aerc/worker/types"
)

func (imapw *IMAPWorker) handleFetchMessageHeaders(

M worker/imap/flags.go => worker/imap/flags.go +1 -1
@@ 3,7 3,7 @@ package imap
import (
	"github.com/emersion/go-imap"

	"git.sr.ht/~sircmpwn/aerc2/worker/types"
	"git.sr.ht/~sircmpwn/aerc/worker/types"
)

func (imapw *IMAPWorker) handleDeleteMessages(msg *types.DeleteMessages) {

M worker/imap/list.go => worker/imap/list.go +1 -1
@@ 3,7 3,7 @@ package imap
import (
	"github.com/emersion/go-imap"

	"git.sr.ht/~sircmpwn/aerc2/worker/types"
	"git.sr.ht/~sircmpwn/aerc/worker/types"
)

func (imapw *IMAPWorker) handleListDirectories(msg *types.ListDirectories) {

M worker/imap/movecopy.go => worker/imap/movecopy.go +1 -1
@@ 3,7 3,7 @@ package imap
import (
	"io"

	"git.sr.ht/~sircmpwn/aerc2/worker/types"
	"git.sr.ht/~sircmpwn/aerc/worker/types"
)

func (imapw *IMAPWorker) handleCopyMessages(msg *types.CopyMessages) {

M worker/imap/open.go => worker/imap/open.go +1 -1
@@ 3,7 3,7 @@ package imap
import (
	"github.com/emersion/go-imap"

	"git.sr.ht/~sircmpwn/aerc2/worker/types"
	"git.sr.ht/~sircmpwn/aerc/worker/types"
)

func (imapw *IMAPWorker) handleOpenDirectory(msg *types.OpenDirectory) {

M worker/imap/worker.go => worker/imap/worker.go +1 -1
@@ 11,7 11,7 @@ import (
	"github.com/emersion/go-imap-idle"
	"github.com/emersion/go-imap/client"

	"git.sr.ht/~sircmpwn/aerc2/worker/types"
	"git.sr.ht/~sircmpwn/aerc/worker/types"
)

var errUnsupported = fmt.Errorf("unsupported command")

M worker/types/messages.go => worker/types/messages.go +1 -1
@@ 7,7 7,7 @@ import (

	"github.com/emersion/go-imap"

	"git.sr.ht/~sircmpwn/aerc2/config"
	"git.sr.ht/~sircmpwn/aerc/config"
)

type WorkerMessage interface {

M worker/worker.go => worker/worker.go +2 -2
@@ 1,8 1,8 @@
package worker

import (
	"git.sr.ht/~sircmpwn/aerc2/worker/imap"
	"git.sr.ht/~sircmpwn/aerc2/worker/types"
	"git.sr.ht/~sircmpwn/aerc/worker/imap"
	"git.sr.ht/~sircmpwn/aerc/worker/types"

	"fmt"
	"log"