]> git.madduck.net Git - etc/neomutt.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

buildmimetree.py: support modifying the original markdown source
authormartin f. krafft <madduck@madduck.net>
Tue, 22 Aug 2023 20:28:58 +0000 (08:28 +1200)
committermartin f. krafft <madduck@madduck.net>
Wed, 23 Aug 2023 04:39:33 +0000 (16:39 +1200)
.config/neomutt/buildmimetree.py

index ad4e988cb7eaef570d8fe29ec668e6cce2a33481..2dac39c4b34bef85072efccd144c0c781daa1c51 100755 (executable)
@@ -142,23 +142,25 @@ class Multipart(
 
 def convert_markdown_to_html(maildraft, *, extensions=None):
     draftpath = pathlib.Path(maildraft)
 
 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)
     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)
     with open(
         htmlpath, "w", encoding="utf-8", errors="xmlcharrefreplace"
     ) as texthtml:
         texthtml.write(html)
+    htmlpart = Part("text", "html", htmlpath, "HTML version")
 
     logopart = Part(
         "image",
 
     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.
 
             # 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("<update-encoding>")
+            else:
+                # … whereas all other parts need to be added, and they're all
+                # considered to be temporary and inline:
                 cmds.push(f"<attach-file>{item.path}<enter>")
                 cmds.push("<toggle-unlink><toggle-disposition>")
                 cmds.push(f"<attach-file>{item.path}<enter>")
                 cmds.push("<toggle-unlink><toggle-disposition>")
-                if item.cid:
-                    cmds.push(f"<edit-content-id>\\Ca\\Ck{item.cid}<enter>")
 
 
-            # 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:
             # tree now:
+            if item.cid:
+                cmds.push(f"<edit-content-id>\\Ca\\Ck{item.cid}<enter>")
             if item.desc:
                 cmds.push(f"<edit-description>\\Ca\\Ck{item.desc}<enter>")
 
             if item.desc:
                 cmds.push(f"<edit-description>\\Ca\\Ck{item.desc}<enter>")