blacklight/aerc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Add Style configuration"

Browse source 
This reverts commit 0f78f06610.
This commit is contained in:
Drew DeVault 2020-05-28 10:32:42 -04:00
parent 76a91813d8
commit caad1b2c06
48 changed files with 326 additions and 1087 deletions

10
commands/compose/attach.go
View file

@ -8,6 +8,7 @@ import (
"git.sr.ht/~sircmpwn/aerc/commands"
"git.sr.ht/~sircmpwn/aerc/widgets"
"github.com/gdamore/tcell"
"github.com/mitchellh/go-homedir"
)
@ -35,23 +36,24 @@ func (Attach) Execute(aerc *widgets.Aerc, args []string) error {
path, err := homedir.Expand(path)
if err != nil {
aerc.PushError(" "+err.Error(), 10*time.Second)
aerc.PushError(" " + err.Error())
return err
}
pathinfo, err := os.Stat(path)
if err != nil {
aerc.PushError(" "+err.Error(), 10*time.Second)
aerc.PushError(" " + err.Error())
return err
} else if pathinfo.IsDir() {
aerc.PushError("Attachment must be a file, not a directory", 10*time.Second)
aerc.PushError("Attachment must be a file, not a directory")
return nil
}
composer, _ := aerc.SelectedTab().(*widgets.Composer)
composer.AddAttachment(path)
aerc.PushSuccess(fmt.Sprintf("Attached %s", pathinfo.Name()), 10*time.Second)
aerc.PushStatus(fmt.Sprintf("Attached %s", pathinfo.Name()), 10*time.Second).
Color(tcell.ColorDefault, tcell.ColorGreen)
return nil
}

4
commands/compose/detach.go
View file

@ -6,6 +6,7 @@ import (
"time"
"git.sr.ht/~sircmpwn/aerc/widgets"
"github.com/gdamore/tcell"
)
type Detach struct{}
@ -43,7 +44,8 @@ func (Detach) Execute(aerc *widgets.Aerc, args []string) error {
return err
}
aerc.PushSuccess(fmt.Sprintf("Detached %s", path), 10*time.Second)
aerc.PushStatus(fmt.Sprintf("Detached %s", path), 10*time.Second).
Color(tcell.ColorDefault, tcell.ColorGreen)
return nil
}

6
commands/compose/postpone.go
View file

@ -63,7 +63,7 @@ func (Postpone) Execute(aerc *widgets.Aerc, args []string) error {
go func() {
errStr := <-errChan
if errStr != "" {
aerc.PushError(" "+errStr, 10*time.Second)
aerc.PushError(" " + errStr)
return
}
@ -71,7 +71,7 @@ func (Postpone) Execute(aerc *widgets.Aerc, args []string) error {
ctr := datacounter.NewWriterCounter(ioutil.Discard)
err = composer.WriteMessage(header, ctr)
if err != nil {
aerc.PushError(errors.Wrap(err, "WriteMessage").Error(), 10*time.Second)
aerc.PushError(errors.Wrap(err, "WriteMessage").Error())
composer.Close()
return
}
@ -90,7 +90,7 @@ func (Postpone) Execute(aerc *widgets.Aerc, args []string) error {
r.Close()
composer.Close()
case *types.Error:
aerc.PushError(" "+msg.Error.Error(), 10*time.Second)
aerc.PushError(" " + msg.Error.Error())
r.Close()
composer.Close()
}

6
commands/compose/send.go
View file

@ -12,6 +12,7 @@ import (
"github.com/emersion/go-sasl"
"github.com/emersion/go-smtp"
"github.com/gdamore/tcell"
"github.com/google/shlex"
"github.com/miolini/datacounter"
"github.com/pkg/errors"
@ -224,7 +225,8 @@ func (Send) Execute(aerc *widgets.Aerc, args []string) error {
aerc.PushStatus("Sending...", 10*time.Second)
nbytes, err := sendAsync()
if err != nil {
aerc.SetError(" " + err.Error())
aerc.SetStatus(" "+err.Error()).
Color(tcell.ColorDefault, tcell.ColorRed)
return
}
if config.CopyTo != "" {
@ -245,7 +247,7 @@ func (Send) Execute(aerc *widgets.Aerc, args []string) error {
composer.SetSent()
composer.Close()
case *types.Error:
aerc.PushError(" "+msg.Error.Error(), 10*time.Second)
aerc.PushError(" " + msg.Error.Error())
r.Close()
composer.Close()
}