about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--commands/account/pipe.go42
-rw-r--r--commands/msg/pipe.go105
-rw-r--r--commands/msgview/open.go2
-rw-r--r--commands/msgview/pipe.go55
-rw-r--r--commands/msgview/save.go2
-rw-r--r--widgets/account.go8
-rw-r--r--widgets/msgviewer.go9
-rw-r--r--widgets/providesmessage.go12
8 files changed, 125 insertions, 110 deletions
diff --git a/commands/account/pipe.go b/commands/account/pipe.go
deleted file mode 100644
index a68ef64..0000000
--- a/commands/account/pipe.go
+++ /dev/null
@@ -1,42 +0,0 @@
-package account
-
-import (
-	"errors"
-	"io"
-
-	"git.sr.ht/~sircmpwn/aerc/commands"
-	"git.sr.ht/~sircmpwn/aerc/widgets"
-)
-
-type Pipe struct{}
-
-func init() {
-	register(Pipe{})
-}
-
-func (_ Pipe) Aliases() []string {
-	return []string{"pipe"}
-}
-
-func (_ Pipe) Complete(aerc *widgets.Aerc, args []string) []string {
-	return nil
-}
-
-func (_ Pipe) Execute(aerc *widgets.Aerc, args []string) error {
-	if len(args) < 2 {
-		return errors.New("Usage: :pipe <cmd> [args...]")
-	}
-	acct := aerc.SelectedAccount()
-	store := acct.Messages().Store()
-	msg := acct.Messages().Selected()
-	store.FetchFull([]uint32{msg.Uid}, func(reader io.Reader) {
-		term, err := commands.QuickTerm(aerc, args[1:], reader)
-		if err != nil {
-			aerc.PushError(" " + err.Error())
-			return
-		}
-		name := args[1] + " <" + msg.Envelope.Subject
-		aerc.NewTab(term, name)
-	})
-	return nil
-}
diff --git a/commands/msg/pipe.go b/commands/msg/pipe.go
new file mode 100644
index 0000000..949bc95
--- /dev/null
+++ b/commands/msg/pipe.go
@@ -0,0 +1,105 @@
+package msg
+
+import (
+	"encoding/base64"
+	"errors"
+	"fmt"
+	"io"
+	"mime/quotedprintable"
+	"strings"
+
+	"git.sr.ht/~sircmpwn/getopt"
+
+	"git.sr.ht/~sircmpwn/aerc/commands"
+	"git.sr.ht/~sircmpwn/aerc/widgets"
+)
+
+type Pipe struct{}
+
+func init() {
+	register(Pipe{})
+}
+
+func (_ Pipe) Aliases() []string {
+	return []string{"pipe"}
+}
+
+func (_ Pipe) Complete(aerc *widgets.Aerc, args []string) []string {
+	return nil
+}
+
+func (_ Pipe) Execute(aerc *widgets.Aerc, args []string) error {
+	var (
+		pipeFull bool
+		pipePart bool
+	)
+	// TODO: let user specify part by index or preferred mimetype
+	opts, optind, err := getopt.Getopts(args, "mp")
+	if err != nil {
+		return err
+	}
+	for _, opt := range opts {
+		switch opt.Option {
+		case 'm':
+			if pipePart {
+				return errors.New("-m and -p are mutually exclusive")
+			}
+			pipeFull = true
+		case 'p':
+			if pipeFull {
+				return errors.New("-m and -p are mutually exclusive")
+			}
+			pipePart = true
+		}
+	}
+	cmd := args[optind:]
+	if len(cmd) == 0 {
+		return errors.New("Usage: pipe [-mp] <cmd> [args...]")
+	}
+
+	provider := aerc.SelectedTab().(widgets.ProvidesMessage)
+	if !pipeFull && !pipePart {
+		if _, ok := provider.(*widgets.MessageViewer); ok {
+			pipePart = true
+		} else if _, ok := provider.(*widgets.AccountView); ok {
+			pipeFull = true
+		} else {
+			return errors.New(
+				"Neither -m nor -p specified and cannot infer default")
+		}
+	}
+
+	if pipeFull {
+		store := provider.Store()
+		msg := provider.SelectedMessage()
+		store.FetchFull([]uint32{msg.Uid}, func(reader io.Reader) {
+			term, err := commands.QuickTerm(aerc, cmd, reader)
+			if err != nil {
+				aerc.PushError(" " + err.Error())
+				return
+			}
+			name := cmd[0] + " <" + msg.Envelope.Subject
+			aerc.NewTab(term, name)
+		})
+	} else if pipePart {
+		p := provider.SelectedMessagePart()
+		p.Store.FetchBodyPart(p.Msg.Uid, p.Index, func(reader io.Reader) {
+			// email parts are encoded as 7bit (plaintext), quoted-printable, or base64
+			if strings.EqualFold(p.Part.Encoding, "base64") {
+				reader = base64.NewDecoder(base64.StdEncoding, reader)
+			} else if strings.EqualFold(p.Part.Encoding, "quoted-printable") {
+				reader = quotedprintable.NewReader(reader)
+			}
+
+			term, err := commands.QuickTerm(aerc, cmd, reader)
+			if err != nil {
+				aerc.PushError(" " + err.Error())
+				return
+			}
+			name := fmt.Sprintf("%s <%s/[%d]", cmd[0], p.Msg.Envelope.Subject, p.Index)
+			aerc.NewTab(term, name)
+		})
+	}
+
+	return nil
+}
diff --git a/commands/msgview/open.go b/commands/msgview/open.go
index d25fa67..f4a0931 100644
--- a/commands/msgview/open.go
+++ b/commands/msgview/open.go
@@ -34,7 +34,7 @@ func (_ Open) Execute(aerc *widgets.Aerc, args []string) error {
 	}
 
 	mv := aerc.SelectedTab().(*widgets.MessageViewer)
-	p := mv.CurrentPart()
+	p := mv.SelectedMessagePart()
 
 	p.Store.FetchBodyPart(p.Msg.Uid, p.Index, func(reader io.Reader) {
 		// email parts are encoded as 7bit (plaintext), quoted-printable, or base64
diff --git a/commands/msgview/pipe.go b/commands/msgview/pipe.go
deleted file mode 100644
index 56c125b..0000000
--- a/commands/msgview/pipe.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package msgview
-
-import (
-	"encoding/base64"
-	"errors"
-	"fmt"
-	"io"
-	"mime/quotedprintable"
-	"strings"
-
-	"git.sr.ht/~sircmpwn/aerc/commands"
-	"git.sr.ht/~sircmpwn/aerc/widgets"
-)
-
-type Pipe struct{}
-
-func init() {
-	register(Pipe{})
-}
-
-func (_ Pipe) Aliases() []string {
-	return []string{"pipe"}
-}
-
-func (_ Pipe) Complete(aerc *widgets.Aerc, args []string) []string {
-	return nil
-}
-
-func (_ Pipe) Execute(aerc *widgets.Aerc, args []string) error {
-	if len(args) < 2 {
-		return errors.New("Usage: :pipe <cmd> [args...]")
-	}
-
-	mv := aerc.SelectedTab().(*widgets.MessageViewer)
-	p := mv.CurrentPart()
-
-	p.Store.FetchBodyPart(p.Msg.Uid, p.Index, func(reader io.Reader) {
-		// email parts are encoded as 7bit (plaintext), quoted-printable, or base64
-		if strings.EqualFold(p.Part.Encoding, "base64") {
-			reader = base64.NewDecoder(base64.StdEncoding, reader)
-		} else if strings.EqualFold(p.Part.Encoding, "quoted-printable") {
-			reader = quotedprintable.NewReader(reader)
-		}
-
-		term, err := commands.QuickTerm(aerc, args[1:], reader)
-		if err != nil {
-			aerc.PushError(" " + err.Error())
-			return
-		}
-		name := fmt.Sprintf("%s <%s/[%d]", args[1], p.Msg.Envelope.Subject, p.Index)
-		aerc.NewTab(term, name)
-	})
-
-	return nil
-}
diff --git a/commands/msgview/save.go b/commands/msgview/save.go
index 93fa83f..75ba56f 100644
--- a/commands/msgview/save.go
+++ b/commands/msgview/save.go
@@ -56,7 +56,7 @@ func (_ Save) Execute(aerc *widgets.Aerc, args []string) error {
 	}
 
 	mv := aerc.SelectedTab().(*widgets.MessageViewer)
-	p := mv.CurrentPart()
+	p := mv.SelectedMessagePart()
 
 	p.Store.FetchBodyPart(p.Msg.Uid, p.Index, func(reader io.Reader) {
 		// email parts are encoded as 7bit (plaintext), quoted-printable, or base64
diff --git a/widgets/account.go b/widgets/account.go
index 824f958..0948c5c 100644
--- a/widgets/account.go
+++ b/widgets/account.go
@@ -165,12 +165,16 @@ func (acct *AccountView) Store() *lib.MessageStore {
 	return acct.msglist.Store()
 }
 
+func (acct *AccountView) SelectedAccount() *AccountView {
+	return acct
+}
+
 func (acct *AccountView) SelectedMessage() *types.MessageInfo {
 	return acct.msglist.Selected()
 }
 
-func (acct *AccountView) SelectedAccount() *AccountView {
-	return acct
+func (acct *AccountView) SelectedMessagePart() *PartInfo {
+	return nil
 }
 
 func (acct *AccountView) onMessage(msg types.WorkerMessage) {
diff --git a/widgets/msgviewer.go b/widgets/msgviewer.go
index 10c2182..b0ae79e 100644
--- a/widgets/msgviewer.go
+++ b/widgets/msgviewer.go
@@ -227,7 +227,7 @@ func (mv *MessageViewer) ToggleHeaders() {
 	switcher.Invalidate()
 }
 
-func (mv *MessageViewer) CurrentPart() *PartInfo {
+func (mv *MessageViewer) SelectedMessagePart() *PartInfo {
 	switcher := mv.switcher
 	part := switcher.parts[switcher.selected]
 
@@ -332,13 +332,6 @@ type PartViewer struct {
 	term        *Terminal
 }
 
-type PartInfo struct {
-	Index []int
-	Msg   *types.MessageInfo
-	Part  *imap.BodyStructure
-	Store *lib.MessageStore
-}
-
 func NewPartViewer(conf *config.AercConfig,
 	store *lib.MessageStore, msg *types.MessageInfo,
 	part *imap.BodyStructure, showHeaders bool,
diff --git a/widgets/providesmessage.go b/widgets/providesmessage.go
index 7be8e7e..4b71637 100644
--- a/widgets/providesmessage.go
+++ b/widgets/providesmessage.go
@@ -1,14 +1,24 @@
 package widgets
 
 import (
+	"github.com/emersion/go-imap"
+
 	"git.sr.ht/~sircmpwn/aerc/lib"
 	"git.sr.ht/~sircmpwn/aerc/lib/ui"
 	"git.sr.ht/~sircmpwn/aerc/worker/types"
 )
 
+type PartInfo struct {
+	Index []int
+	Msg   *types.MessageInfo
+	Part  *imap.BodyStructure
+	Store *lib.MessageStore
+}
+
 type ProvidesMessage interface {
 	ui.Drawable
 	Store() *lib.MessageStore
-	SelectedMessage() *types.MessageInfo
 	SelectedAccount() *AccountView
+	SelectedMessage() *types.MessageInfo
+	SelectedMessagePart() *PartInfo
 }
1:37:58 +0100 Use repeat instead of smartrep' href='/djm/dotfiles/commit/.emacs.d/lisp/init-ui.el?id=65ad19d6e071f74650a74f302c3a390bf34f54cf'>65ad19d ^
674f848 ^

65ad19d ^






d0db566 ^
c79ae69 ^
d32b136 ^
c79ae69 ^
6f3370e ^
c79ae69 ^

3c7bf68 ^
c2aa65c ^
c79ae69 ^

2281d01 ^
c79ae69 ^
6f3370e ^
d7af36c ^
9ad47c7 ^


d7af36c ^




4274f81 ^





9ce6b29 ^

4274f81 ^
660f61d ^






d0db566 ^

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174

                                                                   
                                                                                                            

                  





                                                                               
 
                                                       
 


                                                                           
 
         





                                                                   
                                 
                                   
                                       






                                                 
                               








                                                                        
                    





                                        









                                
                                              
 
                       


                                                           




                                                                                                                                  
                                                
                                                 
 
                    
           
                           
                               
                                              
         
                                                







                                          
          

                              
                               

                                                         


                         
                   
          
         
                            





                                                       
 
                   
          
           
         
                         
                                               
                               
                                  
                                                                                                                                   
                  
 
                    

                                     



                                         




                                                                 
                                                   
 





                                                                                                       
                        
;;; init-ui.el --- UI Configuration File -*- lexical-binding: t -*-
;;; Commentary:
;; Some parts copied from prelude-ui.el and prelude-editor.el
;; Frame customisations, and disabling of {menu,tool,scoll}-bar-mode done in early-init.el, rather than here
;;; Code:

(use-package emacs
  :hook
  (emacs-startup . (lambda ()
                     (cond
                      ((find-font (font-spec :name "iosevka comfy"))
                       (set-face-attribute 'default nil :font "iosevka comfy"))
                      ((find-font (font-spec :name "iosevka"))
                       (set-face-attribute 'default nil :font "iosevka")))

                     (global-display-line-numbers-mode)
                     (global-hl-line-mode +1)

                     (global-set-key (kbd "C-x C-S-k") 'kill-this-buffer)))
  (after-init . (lambda ()
                  (add-to-list 'custom-theme-load-path "~/.emacs.d/themes")
                  (load-theme 'non-modo t)))

  :config
  ;; https://github.com/rougier/elegant-emacs/blob/master/sanity.el
  (setq inhibit-startup-screen t
        inhibit-startup-echo-area-message t
        inhibit-startup-message t
        initial-scratch-message nil)

  (blink-cursor-mode -1)
  (setq-default cursor-type 'bar)

  (setq whitespace-line-column 120)
  (setq show-trailing-whitespace t)
  (setq-default indicate-empty-lines t)
  (setq ring-bell-function 'ignore
        visible-bell t)

  ;; TODO do we want these? (copied from prelude)
  (setq scroll-margin 0
        scroll-conservatively 100000
        scroll-preserve-screen-position 1)

  (fset 'yes-or-no-p 'y-or-n-p)

  (setq frame-title-format
        '("Emacs: " (:eval (if (buffer-file-name)
                               (abbreviate-file-name (buffer-file-name))
                             "%b"))))

  (when (eq system-type 'darwin)
    (setq mac-option-modifier 'meta)
    (setq mac-right-option-modifier 'none)
    (setq mac-command-modifier 'super)))

(use-package hl-todo
  :bind
  (:map hl-todo-mode-map
        ("C-c c t p" . hl-todo-previous)
        ("C-c c t n" . hl-todo-next)
        ("C-c c t o" . hl-todo-occur)
        ("C-c c t r" . hl-todo-rgrep)
        ("C-c c t i" . hl-todo-insert))
  :custom
  (hl-todo-keyword-faces
   '(("TODO"   . "red3")
     ("FIXME"  . "red3")
     ("DEBUG"  . "#A020F0")
     ("GOTCHA" . "#FF4500")
     ("HACK" . "#FF4500")
     ("STUB"   . "#1E90FF")
     ("FAIL"   . "red3")
     ("NOTE"   . "DarkOrange2")
     ("DEPRECATED" . "yellow")))
  :hook (emacs-startup . global-hl-todo-mode))

(use-package whitespace
  :diminish
  :custom
  (whitespace-line-column 120)
  (whitespace-style '(face tabs empty trailing lines-tail))
  :config
  (defun turn-off-whitespace-mode ()
    (whitespace-mode -1))
  (defvar-local whitespace-disabled-modes '(cider-repl-mode ielm-mode vterm-mode eshell-mode shell-mode term-mode ansi-term-mode))
  (dolist (mode whitespace-disabled-modes)
    (add-hook (intern (concat (symbol-name mode) "-hook")) #'turn-off-whitespace-mode))
  :hook
  (text-mode . (lambda () (whitespace-mode +1)))
  (prog-mode . (lambda () (whitespace-mode +1))))

(use-package goggles
  :diminish
  :custom
  (goggles-pulse-delay 0.1)
  (goggles-pulse-iterations 15)
  :hook ((prog-mode text-mode) . goggles-mode)
  :config
  (set-face-background 'goggles-removed "red4"))

(use-package idle-highlight-mode
  :hook (prog-mode . idle-highlight-mode))

(use-package paren
  :config
  (show-paren-mode +1))

(use-package which-key
  :defer 5
  :diminish
  :config (which-key-mode +1))

(use-package rainbow-delimiters
  :hook
  (text-mode . (lambda () (rainbow-delimiters-mode +1)))
  (prog-mode . (lambda () (rainbow-delimiters-mode +1))))

(use-package rainbow-mode
  :diminish)

(use-package repeat
  :defer 5
  :config
  (let ((inhibit-message t))
    (repeat-mode +1))
  (defvar buffer-repeat-map
    (let ((map (make-sparse-keymap)))
      (define-key map (kbd "<left>") #'previous-buffer)
      (define-key map (kbd "<right>") #'next-buffer)
      map))
  (dolist (cmd '(previous-buffer next-buffer))
    (put cmd 'repeat-map 'buffer-repeat-map)))

(use-package beacon
  :defer 5
  :diminish
  :custom
  (beacon-color "yellow")
  (beacon-push-mark 20)
  (beacon-blink-when-point-moves-vertically 10)
  (beacon-blink-when-focused t)
  :bind ("C-c c b" . beacon-blink)
  :config
  (append-to-list* 'beacon-dont-blink-major-modes 'cider-repl-mode 'eshell-mode 'shell-mode 'vterm-mode 'term-mode 'ansi-term-mode)
  (beacon-mode 1))

(use-package helpful
  :bind (("C-h f" . helpful-function)
         ("C-h F" . helpful-callable)
         ("C-h x" . helpful-command)
         ("C-h v" . helpful-variable)
         ("C-h k" . helpful-key)
         ("C-h o" . helpful-symbol)
         ("C-h C-." . helpful-at-point)))

;; From https://github.com/jwiegley/dot-emacs/blob/master/init.el
(use-package eval-expr
  :bind ("M-:" . eval-expr)
  :config
  (defun eval-expr-minibuffer-setup ()
    (local-set-key (kbd "<tab>") #'lisp-complete-symbol)
    (set-syntax-table emacs-lisp-mode-syntax-table)
    (smartparens-strict-mode)))

(use-package highlight-sexp
  :diminish
  :custom (hl-sexp-background-color "grey10") ;; grey25 grey30 DarkBlue navy MidnightBlue DarkSlateBlue
  :hook
  (emacs-lisp-mode . highlight-sexp-mode)
  (clojure-mode . highlight-sexp-mode))

(provide 'init-ui)
;;; init-ui.el ends here