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: 1355 bytes --]

From 8286c87861d27069107884566d2ef33257dccd66 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/2] 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 f88582d377c51c32c4ffd0913c62ea13787410bf Mon Sep 17 00:00:00 2001
From: Matthieu Rakotojaona <m@rako.space>
Date: Fri, 9 Feb 2024 13:43:36 +0100
Subject: [PATCH 2/2] Fix attachment handling for multiple files

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

diff --git a/mcom b/mcom
index e62b759..20546ae 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