Re: [PR PATCH] [Updated] Improve attachments handling

[rakoo <rakoo@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 624 bytes --]

There is an updated pull request by rakoo against master on the mblaze repository

https://github.com/rakoo/mblaze master
https://github.com/leahneukirchen/mblaze/pull/234

Improve attachments handling
I had to manually explore to understand how to add attachments, the man page was a bit evasive. It also didn't help that a `~` at the beginning of the path isn't caught, so I added the same treatment as outbox parsing.

Thanks for this fantastic piece of software, the joys of building one's own MUA in ~150 lines of shell scripts...

A patch file from https://github.com/leahneukirchen/mblaze/pull/234.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-234.patch --]
[-- Type: text/x-diff, Size: 2936 bytes --]

From 216be7d5f2f2ec120adb3f9aa4728b01eb48f0fe Mon Sep 17 00:00:00 2001
From: Matthieu Rakotojaona <m@rako.space>
Date: Sat, 11 Nov 2023 02:01:19 +0100
Subject: [PATCH 1/4] Attach all files when forwarding in raw mode

---
 mcom | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/mcom b/mcom
index 4e834c6..e62b759 100755
--- a/mcom
+++ b/mcom
@@ -306,6 +306,19 @@ fi
 		msgid
 		museragent
 		cat "$MBLAZE/headers" 2>/dev/null
+		if [ -n "$raw" ]; then
+			prev=$(pwd)
+			attachdir=$(mktemp -d)
+			cd $attachdir
+			trap 'rm -r "$attachdir"' EXIT
+
+			mseq -r "$@" \
+				| xargs -I {} mshow -Bx {} \
+				| xargs --null realpath \
+				| sed '/^$/d; s/^/Attach: /'
+			cd $prev
+		fi
+
 		printf '\n\n'
 		if [ -z "$raw" ]; then
 			mseq -r "$@" | sed 's:^:#message/rfc822#inline :; s:$:>:'

From 8effd1244ef13739d986ac06c1806076d8d6a33b Mon Sep 17 00:00:00 2001
From: Matthieu Rakotojaona <m@rako.space>
Date: Fri, 24 Nov 2023 13:54:04 +0100
Subject: [PATCH 2/4] Don't ask for confirmation when deleting draft

---
 mcom | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mcom b/mcom
index e62b759..e52fb9a 100755
--- a/mcom
+++ b/mcom
@@ -544,7 +544,7 @@ while :; do
 		c=send
 		;;
 	d|delete)
-		rm -i "$draft"
+		rm "$draft"
 		if ! [ -f "$draft" ]; then
 			rm -f "$draftmime"
 			printf '%s\n' "mcom: deleted draft $draft"

From a9154b04c7969c36b3479d410b61ec7dfa47999f Mon Sep 17 00:00:00 2001
From: Matthieu Rakotojaona <m@rako.space>
Date: Fri, 9 Feb 2024 13:43:36 +0100
Subject: [PATCH 3/4] Fix attachment handling for multiple files

---
 mcom | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mcom b/mcom
index e52fb9a..4e849aa 100755
--- a/mcom
+++ b/mcom
@@ -314,7 +314,7 @@ fi
 
 			mseq -r "$@" \
 				| xargs -I {} mshow -Bx {} \
-				| xargs --null realpath \
+				| xargs realpath \
 				| sed '/^$/d; s/^/Attach: /'
 			cd $prev
 		fi

From 185bbf96e4a7fd2a1bdde380dad90913c47fa2ec Mon Sep 17 00:00:00 2001
From: Matthieu Rakotojaona <m@rako.space>
Date: Wed, 24 Apr 2024 18:47:46 +0200
Subject: [PATCH 4/4] contrib/mmailto: Fix using longer arguments

We put the args to $TERMINAL inside single quotes for terminals that want a single command,
and we put arguments extracted from the adress between double quotes to protect from spaces
---
 contrib/mmailto | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/contrib/mmailto b/contrib/mmailto
index 7feabb4..2b38def 100755
--- a/contrib/mmailto
+++ b/contrib/mmailto
@@ -19,7 +19,7 @@ fi
 IFS='
 '
 
-exec $TERMINAL -e mcom $(
+args=$(
 awk -v url="$1" '
 
 function decode(s) {
@@ -47,7 +47,7 @@ BEGIN {
     split(fields[i], kv, "=")
     if (kv[1] != "r") {
       args[length(args)+1] = "-" kv[1]
-      args[length(args)+1] =  kv[2]
+      args[length(args)+1] =  "\"" kv[2] "\""
     }
   }
   for (i in args) {
@@ -56,3 +56,5 @@ BEGIN {
 }
 '
 )
+
+exec $TERMINAL -e "mcom $args"