From 119c2f711bc9f23ee853d287fe12cbbf2f198cb8 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Wed, 23 Aug 2023 21:55:36 +1200 Subject: [PATCH] buildmimetree.py: simplify CLI --- .config/neomutt/buildmimetree.py | 86 +++++--------------------------- .config/neomutt/neomuttrc | 2 +- 2 files changed, 14 insertions(+), 74 deletions(-) diff --git a/.config/neomutt/buildmimetree.py b/.config/neomutt/buildmimetree.py index 0b62aa4..f805884 100755 --- a/.config/neomutt/buildmimetree.py +++ b/.config/neomutt/buildmimetree.py @@ -8,7 +8,7 @@ # 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 \ +# source '$my_confdir/buildmimetree.py \ # --tempdir $tempdir --extensions $my_mdwn_extensions|'\ # sourc e \$my_mdwn_postprocess_cmd_file\ # " "Convert message into a modern MIME tree with inline images" @@ -59,75 +59,48 @@ def parse_cli_args(*args, **kwargs): "Released under the MIT licence" ) - subp = parser.add_subparsers(help="Sub-command parsers", dest="mode") - parser_setup = subp.add_parser("setup", help="Setup phase") - parser_massage = subp.add_parser("massage", help="Massaging phase") - - parser_setup.add_argument( + parser.add_argument( "--extensions", type=str, default="", help="Markdown extension to use (comma-separated list)" ) - parser_setup.add_argument( + parser.add_argument( "--only-build", action="store_true", help="Only build, don't send the message", ) - parser_setup.add_argument( + parser.add_argument( "--tempdir", default=None, help="Specify temporary directory to use for attachments", ) - parser_setup.add_argument( + parser.add_argument( "--debug-commands", action="store_true", help="Turn on debug logging of commands generated to stderr", ) - parser_massage.add_argument( + subp = parser.add_subparsers(help="Sub-command parsers", dest="mode") + massage_p = subp.add_parser("massage", help="Massaging phase (internal use)") + + massage_p.add_argument( "--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="Only build, don't send the message", - ) - - parser_massage.add_argument( - "--tempdir", - default=None, - help="Specify temporary directory to use for attachments", - ) - - parser_massage.add_argument( - "--debug-commands", - action="store_true", - help="Turn on debug logging of commands generated to stderr", - ) - - parser_massage.add_argument( + massage_p.add_argument( "--debug-walk", action="store_true", help="Turn on debugging to stderr of the MIME tree walk", ) - parser_massage.add_argument( + massage_p.add_argument( "MAILDRAFT", nargs="?", help="If provided, the script is invoked as editor on the mail draft", @@ -400,10 +373,8 @@ class MuttCommands: def do_setup( - extensions=None, *, out_f=sys.stdout, - only_build=False, temppath=None, tempdir=None, debug_commands=False, @@ -413,15 +384,7 @@ def do_setup( ) cmds = MuttCommands(out_f, debug=debug_commands) - editor = f"{sys.argv[0]} massage --write-commands-to {temppath}" - if extensions: - editor = f'{editor} --extensions {extensions}' - if only_build: - editor = f'{editor} --only-build' - if tempdir: - editor = f"{editor} --tempdir {tempdir}" - if debug_commands: - editor = f"{editor} --debug-commands" + editor = f"{' '.join(sys.argv)} massage --write-commands-to {temppath}" cmds.cmd('set my_editor="$editor"') cmds.cmd('set my_edit_headers="$edit_headers"') @@ -549,10 +512,8 @@ def do_massage( if __name__ == "__main__": args = parse_cli_args() - if args.mode == "setup": + if args.mode is None: do_setup( - args.extensions, - only_build=args.only_build, tempdir=args.tempdir, debug_commands=args.debug_commands, ) @@ -703,27 +664,6 @@ try: mimetree.walk(basic_mime_tree) assert len(items) == 5 - def test_do_setup_no_extensions(self, const1, capsys): - "Assert basics about the setup command output" - do_setup(temppath=const1, out_f=sys.stdout) - captout = capsys.readouterr() - lines = captout.out.splitlines() - assert lines[2].endswith(f'{const1}"') - assert lines[4].endswith(const1) - assert "first-entry" in lines[-1] - assert "edit-file" in lines[-1] - - def test_do_setup_extensions(self, const1, const2, capsys): - "Assert that extensions are passed to editor" - do_setup( - temppath=const1, extensions=[const2, const1], out_f=sys.stdout - ) - captout = capsys.readouterr() - lines = captout.out.splitlines() - # assert comma-separated list of extensions passed - assert lines[2].endswith(f'{const2},{const1}"') - assert lines[4].endswith(const1) - @pytest.fixture def string_io(self, const1, text=None): return StringIO(text or const1) diff --git a/.config/neomutt/neomuttrc b/.config/neomutt/neomuttrc index 8f48387..49d80fd 100644 --- a/.config/neomutt/neomuttrc +++ b/.config/neomutt/neomuttrc @@ -63,4 +63,4 @@ source "test -f $alias_file && cat $alias_file 2>/dev/null || echo unset alias_f #set pager_format="<%a> %* %J (%P)" set my_markdown_extensions="extra,admonition,codehilite,sane_lists,smarty" -macro compose B " source '$my_confdir/buildmimetree.py setup --extensions $my_markdown_extensions --tempdir $tmpdir --only-build|' source \$my_mdwn_postprocess_cmd_file" "Convert message into a modern MIME tree with inline images" +macro compose B " source '$my_confdir/buildmimetree.py --extensions $my_markdown_extensions --tempdir $tmpdir --only-build|' source \$my_mdwn_postprocess_cmd_file" "Convert message into a modern MIME tree with inline images" -- 2.39.2