From 1d17c571ec555810bd213859dd71848031ae18cb Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Wed, 23 Aug 2023 20:12:15 +1200 Subject: [PATCH] buildmimetree.py: Provide --only-build switch to prevent sending --- .config/neomutt/buildmimetree.py | 72 +++++++++++++++++++------------- .config/neomutt/neomuttrc | 2 +- 2 files changed, 44 insertions(+), 30 deletions(-) diff --git a/.config/neomutt/buildmimetree.py b/.config/neomutt/buildmimetree.py index 06f62c5..f4ee821 100755 --- a/.config/neomutt/buildmimetree.py +++ b/.config/neomutt/buildmimetree.py @@ -61,18 +61,6 @@ def parse_cli_args(*args, **kwargs): parser_setup = subp.add_parser("setup", help="Setup phase") parser_massage = subp.add_parser("massage", help="Massaging phase") - parser_setup.add_argument( - "--debug-commands", - action="store_true", - help="Turn on debug logging of commands generated to stderr", - ) - - parser_setup.add_argument( - "--tempdir", - default=None, - help="Specify temporary directory to use for attachments", - ) - parser_setup.add_argument( "--extension", "-x", @@ -85,21 +73,42 @@ def parse_cli_args(*args, **kwargs): ) parser_setup.add_argument( - "--send-message", + "--only-build", action="store_true", - help="Generate command(s) to send the message after processing", + help="Only build, don't send the message", ) - parser_massage.add_argument( + parser_setup.add_argument( + "--tempdir", + default=None, + help="Specify temporary directory to use for attachments", + ) + + parser_setup.add_argument( "--debug-commands", action="store_true", help="Turn on debug logging of commands generated to stderr", ) parser_massage.add_argument( - "--debug-walk", + "--write-commands-to", + metavar="PATH", + dest="cmdpath", + help="Temporary file path to write commands to", + ) + + parser_massage.add_argument( + "--extensions", + metavar="EXTENSIONS", + type=str, + default="", + help="Markdown extension to use (comma-separated list)", + ) + + parser_massage.add_argument( + "--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 +118,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( @@ -399,6 +405,7 @@ def do_setup( extensions=None, *, out_f=sys.stdout, + only_build=False, temppath=None, tempdir=None, debug_commands=False, @@ -412,6 +419,8 @@ def do_setup( editor = f"{sys.argv[0]} massage --write-commands-to {temppath}" if extensions: editor = f'{editor} --extensions {",".join(extensions)}' + if only_build: + editor = f'{editor} --only-build' if tempdir: editor = f"{editor} --tempdir {tempdir}" if debug_commands: @@ -433,6 +442,7 @@ def do_massage( *, extensions=None, converter=convert_markdown_to_html, + only_build=False, tempdir=None, debug_commands=False, debug_walk=False, @@ -521,6 +531,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 +551,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 +567,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 +746,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 +766,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) diff --git a/.config/neomutt/neomuttrc b/.config/neomutt/neomuttrc index b328578..6a7f0ad 100644 --- a/.config/neomutt/neomuttrc +++ b/.config/neomutt/neomuttrc @@ -62,4 +62,4 @@ source "test -f $alias_file && cat $alias_file 2>/dev/null || echo unset alias_f # #set pager_format="<%a> %* %J (%P)" -macro compose B " source '$my_confdir/buildmimetree.py setup --debug-commands --tempdir $tmpdir|' source \$my_mdwn_postprocess_cmd_file" "Convert message into a modern MIME tree with inline images" +macro compose B " source '$my_confdir/buildmimetree.py setup --debug-commands --tempdir $tmpdir --only-build|' source \$my_mdwn_postprocess_cmd_file" "Convert message into a modern MIME tree with inline images" -- 2.39.5