From: martin f. krafft Date: Tue, 22 Aug 2023 20:28:58 +0000 (+1200) Subject: buildmimetree.py: support modifying the original markdown source X-Git-Url: https://git.madduck.net/etc/neomutt.git/commitdiff_plain/7767b3c3fd519d71c1f90e26c07084ba6b99702d?hp=5c24c52dc81cd13d5c5087fbf699b9556cec0ac4 buildmimetree.py: support modifying the original markdown source --- diff --git a/.config/neomutt/buildmimetree.py b/.config/neomutt/buildmimetree.py index ad4e988..2dac39c 100755 --- a/.config/neomutt/buildmimetree.py +++ b/.config/neomutt/buildmimetree.py @@ -142,23 +142,25 @@ class Multipart( def convert_markdown_to_html(maildraft, *, extensions=None): draftpath = pathlib.Path(maildraft) - textpart = Part( - "text", "plain", draftpath, "Plain-text version", orig=True - ) - with open(draftpath, "r", encoding="utf-8") as textmarkdown: text = textmarkdown.read() mdwn = markdown.Markdown(extensions=extensions) - html = mdwn.convert(text) - htmlpath = draftpath.with_suffix(".html") - htmlpart = Part("text", "html", htmlpath, "HTML version") + with open(draftpath, "w", encoding="utf-8") as textplain: + textplain.write(text) + textpart = Part( + "text", "plain", draftpath, "Plain-text version", orig=True + ) + + html = mdwn.convert(text) + htmlpath = draftpath.with_suffix(".html") with open( htmlpath, "w", encoding="utf-8", errors="xmlcharrefreplace" ) as texthtml: texthtml.write(html) + htmlpart = Part("text", "html", htmlpath, "HTML version") logopart = Part( "image", @@ -351,17 +353,23 @@ def do_massage( # We've hit a leaf-node, i.e. an alternative or a related part # with actual content. - # If the part is not an original part, i.e. doesn't already - # exist, we must first add it. - if not item.orig: + # Let's add the part + if item.orig: + # The original source already exists in the NeoMutt tree, but + # the underlying file may have been modified, so we need to + # update the encoding, but that's it: + cmds.push("") + else: + # … whereas all other parts need to be added, and they're all + # considered to be temporary and inline: cmds.push(f"{item.path}") cmds.push("") - if item.cid: - cmds.push(f"\\Ca\\Ck{item.cid}") - # If the item (including the original) comes with a - # description, then we might just as well update the NeoMutt + # If the item (including the original) comes with additional + # information, then we might just as well update the NeoMutt # tree now: + if item.cid: + cmds.push(f"\\Ca\\Ck{item.cid}") if item.desc: cmds.push(f"\\Ca\\Ck{item.desc}")