rp

commit edd65b61e38e94e3ad59c3ecce7d14745d56581a
parent 45fa7fcb5f59d41541bb6ece99e483f8053fad1c
Author: parazyd <parazyd@dyne.org>
Date:   Wed, 28 Feb 2018 16:57:39 +0100

Refactor rpabook; add rpheaders.

Diffstat:
M
bin/rpabook
 | 
22
+++++++++-------------
A
bin/rpheaders
 | 
20
++++++++++++++++++++
M
mutt/keybindings
 | 
2
+-

3 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/bin/rpabook b/bin/rpabook
@@ -16,23 +16,19 @@ comp() {
 	return $?
 }
 
-insert() {
-	ebegin "adding $1 to addressbook whitelist"
-	abook --datafile "$profile/whitelist.abook" \
-		--add-email-quiet > /dev/null
+add() {
+	ebegin "adding $1 to whitelist"
+	abook --datafile "$profile/whitelist.abook" --add-email-quiet
 	return $?
 }
 
 for i in $@; do
 	case "$i" in
 		-a)
-			shift 1
-			rpabook -c "$1" > /dev/null || rpabook -i "$1"
-			exit $?
-			;;
-		-i)
-			shift 1
-			insert "$1"
+			email="$(cat)"
+			addr="$(echo $email | rpheaders From)"
+			comp "$addr" || exit 0
+			echo "$email" | add
 			exit $?
 			;;
 		-c)
@@ -40,10 +36,10 @@ for i in $@; do
 			comp "$1"
 			exit $?
 			;;
-		-h)
+		*)
 			usage
 			;;
 	esac
 done
 
-abook --datafile "$profile/whitelist.abook" "$@"
+abook --datafile "$profile/whitelist.abook"
diff --git a/bin/rpheaders b/bin/rpheaders
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+profile="${RPPROFILE:-$HOME/.rp/default}"
+. "$HOME"/.rp/rplib/common.sh
+
+usage() {
+	einfo "usage: $(basename $0) [header ...]"
+	exit 1
+}
+
+headers="$(cat | sed '/^$/q')"
+
+get() {
+	grep "^$1:" | cut -d: -f2- | cut -c 2-
+}
+
+
+for i in $@; do
+	printf "$headers\n" | get "$i"
+done
diff --git a/mutt/keybindings b/mutt/keybindings
@@ -26,4 +26,4 @@ bind index,pager r group-reply
 bind editor <tab> complete-query
 
 macro pager Q "<decrypt-save>^<enter>yq"
-
+macro pager A |'rpabook -a'\n