summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaromil <jaromil@dyne.org>2017-03-14 07:27:27 (GMT)
committer Jaromil <jaromil@dyne.org>2017-03-14 07:27:27 (GMT)
commit901117c0295bfc3f971e56af71bfdb7bd2324367 (patch)
tree552e34bdcd08a1c9e68168a5cc879d9a9a119378
parent16a454b77e5b0e23899e7d499cebe2b598c02f31 (diff)
restored notmuch functionality in new x_mutt caller
-rwxr-xr-xsrc/jaro8
-rwxr-xr-xsrc/zlibs/helpers55
-rwxr-xr-xsrc/zlibs/mutt48
3 files changed, 52 insertions, 59 deletions
diff --git a/src/jaro b/src/jaro
index 5875da9..1c4aa16 100755
--- a/src/jaro
+++ b/src/jaro
@@ -938,8 +938,14 @@ EOF
func "no command, autostart"
func "subcommand: $subcommand"
if [[ "$subcommand" = "__default" ]]; then
- open_folder
+ # open folder
+ if [[ "$PARAM" = "" ]]; then
+ x_mutt -Z
+ else
+ x_mutt -f "$PARAM"
+ fi
exitcode=$?
+
# argument passed: determine if an email
elif isemail "$subcommand"; then
notice "Composing message to: ${@}"
diff --git a/src/zlibs/helpers b/src/zlibs/helpers
index b6f7667..b91fc42 100755
--- a/src/zlibs/helpers
+++ b/src/zlibs/helpers
@@ -220,61 +220,6 @@ edit_file() {
return $?
}
-#####################
-## Open a mail folder
-open_folder() {
- notice "Opening folder: $*"
- # parse if mutt-kz
-
- is_mutt_kz && {
- # enable mutt-kz extra functions for notmuch integration
-
- cat <<EOF > "$MAILDIRS/.mutt/notmuch"
-set sidebar_width = 25
-set sidebar_visible = no
-
-color sidebar_new white default
-color progress default magenta
-
-bind index p sidebar-prev
-bind index n sidebar-next
-bind index <space> sidebar-open
-
-bind index / vfolder-from-query
-bind pager / vfolder-from-query
-
-macro pager S "<enter-command>toggle sidebar_visible<enter>"
-macro index S "<enter-command>toggle sidebar_visible<enter>"
-
-set index_format="%2C %Z %?GI?%GI& ? %[%d/%b] %-16.16F (%4c) %?M?(%3M)& ? %s %>"
-# for tags at end of index add %?g?%g?
-set virtual_spoolfile = yes
-virtual-mailboxes \
-" Today" "notmuch://?query= date:1d.. and tag:inbox" \
-" Last week" "notmuch://?query= date:1w.. and tag:inbox" \
-" Last month" "notmuch://?query=date:1M.. and tag:inbox" \
-" Last year" "notmuch://?query=date:1y.. and tag:inbox" \
-" Last 3yrs" "notmuch://?query=date:3y.. and tag:inbox" \
-\
-"ATTACHMENTS" "notmuch://?query=attachment:* and tag:inbox" \
-" Today" "notmuch://?query=attachment:* and date:1d.. and tag:inbox" \
-" Last week" "notmuch://?query=attachment:* and date:1w.. and tag:inbox" \
-" Last month" "notmuch://?query=attachment:* and date:1M.. and tag:inbox" \
-" Last year" "notmuch://?query=attachment:* and date:1y.. and tag:inbox" \
-" Last 3yrs" "notmuch://?query=attachment:* and date:3y.. and tag:inbox"
-
-
-EOF
- }
-
- if [[ "$1" = "" ]]; then
- x_mutt -Z
- else
- x_mutt -f "$1"
- fi
- return $?
-}
-
##############
## Open a File
preview_file() {
diff --git a/src/zlibs/mutt b/src/zlibs/mutt
index e86857c..8e89d3d 100755
--- a/src/zlibs/mutt
+++ b/src/zlibs/mutt
@@ -24,6 +24,10 @@
is_mutt_kz() {
+ fn is_mutt_kz
+ req=(MAILDIRS)
+ ckreq || return 1
+
rm -f "$MAILDIRS/.mutt/notmuch"
touch "$MAILDIRS/.mutt/notmuch"
kz=`mutt -v | awk '/Configure options.*enable-notmuch/ { print $0 }'`
@@ -35,8 +39,18 @@ is_mutt_kz() {
fi
}
+use_notmuch() {
+ fn is_notmuch
+ req=(MAILDIRS subcommand)
+ ckreq || return 1
+ [[ -r "$MAILDIRS"/cache/notmuch/rc ]] &&
+ [[ "$subcommand" != "peek" ]]
+}
x_mutt() {
+ fn x_mutt $*
+ req=(MAILDIRS WORKDIR)
+ ckreq || return 1
[[ -r $MAILDIRS/.mutt/rc ]] || {
error "Jaro Mail is not yet configured."
@@ -46,11 +60,13 @@ x_mutt() {
}
+ rm -f "$MAILDIRS/.mutt/notmuch"
+ touch "$MAILDIRS/.mutt/notmuch"
# when peeking and using mutt-kz use the sidebar
is_mutt_kz && {
- cat <<EOF > "$MAILDIRS/.mutt/notmuch"
+ cat <<EOF >> "$MAILDIRS/.mutt/notmuch"
set sidebar_width = 25
-set sidebar_visible = yes
+set sidebar_visible = no
color sidebar_new white default
color progress default magenta
@@ -63,8 +79,34 @@ macro pager S "<enter-command>toggle sidebar_visible<enter>"
macro index S "<enter-command>toggle sidebar_visible<enter>"
EOF
- }
+ use_notmuch && {
+ # enable mutt-kz extra functions for notmuch integration
+ cat <<EOF >> "$MAILDIRS/.mutt/notmuch"
+
+bind index / vfolder-from-query
+bind pager / vfolder-from-query
+
+set index_format="%2C %Z %?GI?%GI& ? %[%d/%b] %-16.16F (%4c) %?M?(%3M)& ? %s %>"
+# for tags at end of index add %?g?%g?
+set virtual_spoolfile = yes
+virtual-mailboxes \
+" Today" "notmuch://?query= date:1d.. and tag:inbox" \
+" Last week" "notmuch://?query= date:1w.. and tag:inbox" \
+" Last month" "notmuch://?query=date:1M.. and tag:inbox" \
+" Last year" "notmuch://?query=date:1y.. and tag:inbox" \
+" Last 3yrs" "notmuch://?query=date:3y.. and tag:inbox" \
+\
+"ATTACHMENTS" "notmuch://?query=attachment:* and tag:inbox" \
+" Today" "notmuch://?query=attachment:* and date:1d.. and tag:inbox" \
+" Last week" "notmuch://?query=attachment:* and date:1w.. and tag:inbox" \
+" Last month" "notmuch://?query=attachment:* and date:1M.. and tag:inbox" \
+" Last year" "notmuch://?query=attachment:* and date:1y.. and tag:inbox" \
+" Last 3yrs" "notmuch://?query=attachment:* and date:3y.. and tag:inbox"
+
+EOF
+ }
+ }
rm -f $MAILDIRS/.mutt/mboxes
for i; do _fa+=" $i "; done