Re: [PR PATCH] [Updated] Attach all files when forwarding in raw mode

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

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

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

https://github.com/rakoo/mblaze mfwd_attachments
https://github.com/leahneukirchen/mblaze/pull/252

Attach all files when forwarding in raw mode
I want to use forwarding with raw messages because it's just easier to work with from the point of view of receivers. The problem is that when "flattening" the message, attachments are lost. This PR extracts them in a temporary folder and adds them to the message to be sent

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

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

From 76e5985c0c0c8c76cd7418b56c86158870265e8a Mon Sep 17 00:00:00 2001
From: Matthieu Rakotojaona <m@rako.space>
Date: Wed, 24 Apr 2024 18:47:46 +0200
Subject: [PATCH 1/3] 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"

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

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

diff --git a/mcom b/mcom
index 4e834c6..20546ae 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 realpath \
+				| sed '/^$/d; s/^/Attach: /'
+			cd $prev
+		fi
+
 		printf '\n\n'
 		if [ -z "$raw" ]; then
 			mseq -r "$@" | sed 's:^:#message/rfc822#inline :; s:$:>:'

From de9e7ab58b83b70ccd19609bf4dd8d4285ce165a Mon Sep 17 00:00:00 2001
From: Matthieu Rakotojaona <m@rako.space>
Date: Thu, 6 Jun 2024 13:17:49 +0200
Subject: [PATCH 3/3] fix

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

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