X-Git-Url: https://git.madduck.net/etc/neomutt.git/blobdiff_plain/5f583dd6f81b280645e008beca34c64aa63c6a0f..3cf74171a88da1fa91fa82e472d216a549d93594:/.config/neomutt/buildmimetree.py?ds=inline diff --git a/.config/neomutt/buildmimetree.py b/.config/neomutt/buildmimetree.py index 40bd856..0b62aa4 100755 --- a/.config/neomutt/buildmimetree.py +++ b/.config/neomutt/buildmimetree.py @@ -6,8 +6,10 @@ # # Configuration: # neomuttrc (needs to be a single line): +# set my_mdwn_extensions="extra,admonition,codehilite,sane_lists,smarty" # macro compose B "\ -# source '$my_confdir/buildmimetree.py setup --tempdir $tempdir|'\ +# source '$my_confdir/buildmimetree.py setup \ +# --tempdir $tempdir --extensions $my_mdwn_extensions|'\ # sourc e \$my_mdwn_postprocess_cmd_file\ # " "Convert message into a modern MIME tree with inline images" # @@ -62,9 +64,16 @@ def parse_cli_args(*args, **kwargs): parser_massage = subp.add_parser("massage", help="Massaging phase") parser_setup.add_argument( - "--debug-commands", + "--extensions", + type=str, + default="", + help="Markdown extension to use (comma-separated list)" + ) + + parser_setup.add_argument( + "--only-build", action="store_true", - help="Turn on debug logging of commands generated to stderr", + help="Only build, don't send the message", ) parser_setup.add_argument( @@ -74,32 +83,30 @@ def parse_cli_args(*args, **kwargs): ) parser_setup.add_argument( - "--extension", - "-x", - metavar="EXTENSION", - dest="extensions", - nargs="?", - default=[], - action="append", - help="Markdown extension to add to the list of extensions use", + "--debug-commands", + action="store_true", + help="Turn on debug logging of commands generated to stderr", ) - parser_setup.add_argument( - "--send-message", - action="store_true", - help="Generate command(s) to send the message after processing", + parser_massage.add_argument( + "--write-commands-to", + metavar="PATH", + dest="cmdpath", + help="Temporary file path to write commands to", ) parser_massage.add_argument( - "--debug-commands", - action="store_true", - help="Turn on debug logging of commands generated to stderr", + "--extensions", + metavar="EXTENSIONS", + type=str, + default="", + help="Markdown extension to use (comma-separated list)", ) parser_massage.add_argument( - "--debug-walk", + "--only-build", action="store_true", - help="Turn on debugging to stderr of the MIME tree walk", + help="Only build, don't send the message", ) parser_massage.add_argument( @@ -109,18 +116,15 @@ def parse_cli_args(*args, **kwargs): ) parser_massage.add_argument( - "--extensions", - metavar="EXTENSIONS", - type=str, - default="", - help="Markdown extension to use (comma-separated list)", + "--debug-commands", + action="store_true", + help="Turn on debug logging of commands generated to stderr", ) parser_massage.add_argument( - "--write-commands-to", - metavar="PATH", - dest="cmdpath", - help="Temporary file path to write commands to", + "--debug-walk", + action="store_true", + help="Turn on debugging to stderr of the MIME tree walk", ) parser_massage.add_argument( @@ -246,7 +250,7 @@ def collect_inline_images( filewriter_fn(path, data.read(), "w+b") relparts.append( - Part(*mimetype.split("/"), path, cid=info.cid, desc=info.desc) + Part(*mimetype.split("/"), path, cid=info.cid, desc=f"Image: {info.desc}") ) return relparts @@ -399,11 +403,11 @@ def do_setup( extensions=None, *, out_f=sys.stdout, + only_build=False, temppath=None, tempdir=None, debug_commands=False, ): - extensions = extensions or [] temppath = temppath or pathlib.Path( tempfile.mkstemp(prefix="muttmdwn-", dir=tempdir)[1] ) @@ -411,7 +415,9 @@ def do_setup( editor = f"{sys.argv[0]} massage --write-commands-to {temppath}" if extensions: - editor = f'{editor} --extensions {",".join(extensions)}' + editor = f'{editor} --extensions {extensions}' + if only_build: + editor = f'{editor} --only-build' if tempdir: editor = f"{editor} --tempdir {tempdir}" if debug_commands: @@ -433,6 +439,7 @@ def do_massage( *, extensions=None, converter=convert_markdown_to_html, + only_build=False, tempdir=None, debug_commands=False, debug_walk=False, @@ -466,6 +473,8 @@ def do_massage( depth-first, and responsible for telling NeoMutt how to assemble the tree. """ + KILL_LINE=r'\Ca\Ck' + if isinstance(item, Part): # We've hit a leaf-node, i.e. an alternative or a related part # with actual content. @@ -486,7 +495,7 @@ def do_massage( # information, then we might just as well update the NeoMutt # tree now: if item.cid: - cmds.push(f"\\Ca\\Ck{item.cid}") + cmds.push(f"{KILL_LINE}{item.cid}") elif isinstance(item, Multipart): # This node has children, but we already visited them (see @@ -495,7 +504,7 @@ def do_massage( # appropriate grouping: if item.subtype == "alternative": cmds.push("") - elif item.subtype == "relative": + elif item.subtype in ("relative", "related"): cmds.push("") elif item.subtype == "multilingual": cmds.push("") @@ -506,7 +515,7 @@ def do_massage( # If the item has a description, we might just as well add it if item.desc: - cmds.push(f"\\Ca\\Ck{item.desc}") + cmds.push(f"{KILL_LINE}{item.desc}") # Finally, if we're at non-root level, tag the new container, # as it might itself be part of a container, to be processed @@ -521,6 +530,9 @@ def do_massage( # function mimetree.walk(tree, visitor_fn=visitor_fn) + if not only_build: + cmds.push("") + # Finally, cleanup. Since we're responsible for removing the temporary # file, how's this for a little hack? try: @@ -538,11 +550,9 @@ if __name__ == "__main__": args = parse_cli_args() if args.mode == "setup": - if args.send_message: - raise NotImplementedError() - do_setup( args.extensions, + only_build=args.only_build, tempdir=args.tempdir, debug_commands=args.debug_commands, ) @@ -556,6 +566,7 @@ if __name__ == "__main__": pathlib.Path(args.MAILDRAFT), cmd_f, extensions=args.extensions, + only_build=args.only_build, tempdir=args.tempdir, debug_commands=args.debug_commands, debug_walk=args.debug_walk, @@ -734,6 +745,7 @@ try: assert '="$my_edit_headers"' in lines.pop(0) assert "unset my_editor" == lines.pop(0) assert "unset my_edit_headers" == lines.pop(0) + assert "send-message" in lines.pop(0) assert "update-encoding" in lines.pop(0) assert "source 'rm -f " in lines.pop(0) assert "unset my_mdwn_postprocess_cmd_file" == lines.pop(0) @@ -753,6 +765,7 @@ try: captured = capsys.readouterr() lines = captured.out.splitlines()[4:] + assert "send-message" in lines.pop(0) assert "Related" in lines.pop(0) assert "group-related" in lines.pop(0) assert "tag-entry" in lines.pop(0) @@ -920,23 +933,21 @@ try: assert tree.children[1].path == written[0] assert written[1] == request.urlopen(test_png).read() - def test_inline_image_collection(self, test_png, const1, const2, fake_filewriter): - test_images = { - test_png: InlineImageInfo( - cid=const1, desc=const2 - ) - } + def test_inline_image_collection( + self, test_png, const1, const2, fake_filewriter + ): + test_images = {test_png: InlineImageInfo(cid=const1, desc=const2)} relparts = collect_inline_images( test_images, filewriter_fn=fake_filewriter ) written = fake_filewriter.pop() - assert b'PNG' in written[1] + assert b"PNG" in written[1] assert relparts[0].subtype == "png" assert relparts[0].path == written[0] assert relparts[0].cid == const1 - assert relparts[0].desc == const2 + assert relparts[0].desc.endswith(const2) except ImportError: pass