mirror of
https://git.sr.ht/~rjarry/aerc
synced 2025-07-01 20:30:21 +02:00
2bbe75fe0b
This fixes a bug introduced in 93bec0de8e:
aerc started using `path.Base(<part>)`, which returns `"."` on an empty
path, but still checked for `""` two lines later.
On macOS, the result is that aerc attempts to open the directory:
```
open /var/folders/vn/hs0zvdsx3vq6svvry8s1bnym0000gn/T/aerc-4229266673: is a directory
```
Signed-off-by: Nicole Patricia Mazzuca <nicole@streganil.no>
Acked-by: Robin Jarry <robin@jarry.cc>
96 lines
1.9 KiB
Go
96 lines
1.9 KiB
Go
package msgview
|
|
|
|
import (
|
|
"errors"
|
|
"io"
|
|
"mime"
|
|
"os"
|
|
"path"
|
|
"path/filepath"
|
|
|
|
"git.sr.ht/~rjarry/aerc/app"
|
|
"git.sr.ht/~rjarry/aerc/commands"
|
|
"git.sr.ht/~rjarry/aerc/lib"
|
|
"git.sr.ht/~rjarry/aerc/lib/log"
|
|
)
|
|
|
|
type Open struct {
|
|
Delete bool `opt:"-d" desc:"Delete temp file after the opener exits."`
|
|
Cmd string `opt:"..." required:"false"`
|
|
}
|
|
|
|
func init() {
|
|
commands.Register(Open{})
|
|
}
|
|
|
|
func (Open) Description() string {
|
|
return "Save the current message part to a temporary file, then open it."
|
|
}
|
|
|
|
func (Open) Context() commands.CommandContext {
|
|
return commands.MESSAGE_VIEWER
|
|
}
|
|
|
|
func (Open) Aliases() []string {
|
|
return []string{"open"}
|
|
}
|
|
|
|
func (o Open) Execute(args []string) error {
|
|
mv := app.SelectedTabContent().(*app.MessageViewer)
|
|
if mv == nil {
|
|
return errors.New("open only supported selected message parts")
|
|
}
|
|
p := mv.SelectedMessagePart()
|
|
|
|
mv.MessageView().FetchBodyPart(p.Index, func(reader io.Reader) {
|
|
mimeType := ""
|
|
|
|
part, err := mv.MessageView().BodyStructure().PartAtIndex(p.Index)
|
|
if err != nil {
|
|
app.PushError(err.Error())
|
|
return
|
|
}
|
|
mimeType = part.FullMIMEType()
|
|
|
|
tmpDir, err := os.MkdirTemp(os.TempDir(), "aerc-*")
|
|
if err != nil {
|
|
app.PushError(err.Error())
|
|
return
|
|
}
|
|
filename := path.Base(part.FileName())
|
|
var tmpFile *os.File
|
|
if filename == "." {
|
|
extension := ""
|
|
if exts, _ := mime.ExtensionsByType(mimeType); len(exts) > 0 {
|
|
extension = exts[0]
|
|
}
|
|
tmpFile, err = os.CreateTemp(tmpDir, "aerc-*"+extension)
|
|
} else {
|
|
tmpFile, err = os.Create(filepath.Join(tmpDir, filename))
|
|
}
|
|
if err != nil {
|
|
app.PushError(err.Error())
|
|
return
|
|
}
|
|
|
|
_, err = io.Copy(tmpFile, reader)
|
|
tmpFile.Close()
|
|
if err != nil {
|
|
app.PushError(err.Error())
|
|
return
|
|
}
|
|
|
|
go func() {
|
|
defer log.PanicHandler()
|
|
if o.Delete {
|
|
defer os.RemoveAll(tmpDir)
|
|
}
|
|
err = lib.XDGOpenMime(tmpFile.Name(), mimeType, o.Cmd)
|
|
if err != nil {
|
|
app.PushError("open: " + err.Error())
|
|
}
|
|
}()
|
|
})
|
|
|
|
return nil
|
|
}
|