From fd4c3dc8a0114f529dc6d6f53f9175c9c646205c Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 2 Apr 2026 05:13:31 +0200
Subject: explicitly load primary message part

Previously the primary part was loaded only for text/plain,
because notmuch show included it automatically.

Now any MIME type can be loaded.
---
 src/Much/TreeView.hs   | 42 +++++++++++++++++++++++++++++++++++++++---
 src/Notmuch/Message.hs |  7 +++++++
 2 files changed, 46 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/Much/TreeView.hs b/src/Much/TreeView.hs
index 02ccde0..b3d36e8 100644
--- a/src/Much/TreeView.hs
+++ b/src/Much/TreeView.hs
@@ -133,11 +133,11 @@ isQuoteLine s0 = do
 -- Loading / Unloading
 --
 
-
 loadSubForest :: TreeView -> IO (Either String (Forest TreeView))
 loadSubForest = \case
     TVMessage m ->
-        Right
+        pure . Right =<<
+            loadPrimaryMessagePart m =<< id
             . unloadPartsWithFilename
             . map unloadReadSubForests
             . concatMap subForest
@@ -172,7 +172,13 @@ loadSubForest = \case
                     $ xconvPart m mp'
 
     TVSearchResult sr ->
-        Right
+        pure . Right =<<
+            mapM
+              (\case
+                Node tv@(TVMessage m) parts -> Node tv <$> loadPrimaryMessagePart m parts
+                node                        -> pure node
+              )
+            =<< id
             . unloadPartsWithFilename
             . map unloadReadSubForests
             . fromMessageForest
@@ -193,6 +199,36 @@ loadSubForest = \case
     termFromSearchResult = unThreadID . searchThread
 
 
+loadPrimaryMessagePart :: Message -> Forest TreeView -> IO (Forest TreeView)
+loadPrimaryMessagePart m parts =
+    mapM (rewriteTreeIO isPrimaryPart loadNode) parts
+  where
+    pid = partID (primaryMessagePart (messageBody m))
+    mid = messageId m
+
+    isPrimaryPart :: TreeView -> Bool
+    isPrimaryPart = \case
+        TVMessagePart m' mp ->
+            messageId m' == mid && partID mp == pid
+        _ -> False
+
+    loadNode :: Tree TreeView -> IO (Tree TreeView)
+    loadNode node@(Node tv _) =
+        loadSubForest tv >>= \case
+            Right subForest' -> pure (Node tv subForest')
+            Left _           -> pure node
+
+
+rewriteTreeIO :: (a -> Bool) -> (Tree a -> IO (Tree a)) -> Tree a -> IO (Tree a)
+rewriteTreeIO shouldRewrite f t@(Node v children)
+  | shouldRewrite v = do
+      Node v' children' <- f t
+      Node v' <$> mapM (rewriteTreeIO shouldRewrite f) children'
+
+  | otherwise = do
+      Node v <$> mapM (rewriteTreeIO shouldRewrite f) children
+
+
 unloadSubForest :: Tree TreeView -> Forest TreeView
 unloadSubForest t = case rootLabel t of
     TVMessage _ ->
diff --git a/src/Notmuch/Message.hs b/src/Notmuch/Message.hs
index 13f3413..93ed07f 100644
--- a/src/Notmuch/Message.hs
+++ b/src/Notmuch/Message.hs
@@ -46,6 +46,13 @@ contentSize (ContentMsgRFC822 xs) = sum $ map (sum . map (contentSize . partCont
 contentSize (ContentRaw _ contentLength) = contentLength
 
 
+primaryMessagePart :: MessagePart -> MessagePart
+primaryMessagePart mp =
+    case partContent mp of
+      ContentMultipart (mp':_) -> primaryMessagePart mp'
+      _ -> mp
+
+
 parseRFC822 :: V.Vector Value -> Parser MessageContent
 parseRFC822 lst = ContentMsgRFC822 . V.toList <$> V.mapM p lst
     where
-- 
cgit v1.2.3