viewer: open rfc822 attachments

Open message/rfc822 attachments from the message viewer when no filter
is defined for this mimetype. When the rfc822 part is selected, call the
eml command to open the attachment in a new message viewer.

Suggested-by: Jens Grassel <jens@wegtam.com>
Signed-off-by: Koni Marti <koni.marti@gmail.com>
Acked-by: Robin Jarry <robin@jarry.cc>

1 files changed, 19 insertions, 9 deletions

diff --git a/commands/eml.go b/commands/eml.go
index a88a13b3..45dd4f25 100644
--- a/commands/eml.go
+++ b/commands/eml.go
@@ -49,15 +49,25 @@ func (Eml) Execute(aerc *widgets.Aerc, args []string) error {
 			})
 	}
 
-	path := strings.Join(args[1:], " ")
-	if _, err := os.Stat(path); err != nil {
-		return err
-	}
-	f, err := os.Open(path)
-	if err != nil {
-		return err
+	if len(args) == 1 {
+		switch tab := aerc.SelectedTabContent().(type) {
+		case *widgets.MessageViewer:
+			part := tab.SelectedMessagePart()
+			tab.MessageView().FetchBodyPart(part.Index, showEml)
+		default:
+			return fmt.Errorf("unsupported operation")
+		}
+	} else {
+		path := strings.Join(args[1:], " ")
+		if _, err := os.Stat(path); err != nil {
+			return err
+		}
+		f, err := os.Open(path)
+		if err != nil {
+			return err
+		}
+		defer f.Close()
+		showEml(f)
 	}
-	defer f.Close()
-	showEml(f)
 	return nil
 }