]> 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: simplify CLI
authormartin f. krafft <madduck@madduck.net>
Wed, 23 Aug 2023 09:55:36 +0000 (21:55 +1200)
committermartin f. krafft <madduck@madduck.net>
Wed, 23 Aug 2023 11:56:53 +0000 (23:56 +1200)
.config/neomutt/buildmimetree.py
.config/neomutt/neomuttrc

index 0b62aa4f25b14dda3316db4c4a58c3dcf6794fdb..f805884cf5048b5cc6234995b0b4d80713023677 100755 (executable)
@@ -8,7 +8,7 @@
 #   neomuttrc (needs to be a single line):
 #     set my_mdwn_extensions="extra,admonition,codehilite,sane_lists,smarty"
 #     macro compose B "\
 #   neomuttrc (needs to be a single line):
 #     set my_mdwn_extensions="extra,admonition,codehilite,sane_lists,smarty"
 #     macro compose B "\
-#       <enter-command> source '$my_confdir/buildmimetree.py setup \
+#       <enter-command> source '$my_confdir/buildmimetree.py \
 #       --tempdir $tempdir --extensions $my_mdwn_extensions|'<enter>\
 #       <enter-command> sourc e \$my_mdwn_postprocess_cmd_file<enter>\
 #     " "Convert message into a modern MIME tree with inline images"
 #       --tempdir $tempdir --extensions $my_mdwn_extensions|'<enter>\
 #       <enter-command> sourc e \$my_mdwn_postprocess_cmd_file<enter>\
 #     " "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"
     )
 
         "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)"
     )
 
         "--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",
     )
 
         "--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",
     )
 
         "--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",
     )
 
         "--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",
     )
 
         "--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",
     )
 
         "--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",
         "MAILDRAFT",
         nargs="?",
         help="If provided, the script is invoked as editor on the mail draft",
@@ -400,10 +373,8 @@ class MuttCommands:
 
 
 def do_setup(
 
 
 def do_setup(
-    extensions=None,
     *,
     out_f=sys.stdout,
     *,
     out_f=sys.stdout,
-    only_build=False,
     temppath=None,
     tempdir=None,
     debug_commands=False,
     temppath=None,
     tempdir=None,
     debug_commands=False,
@@ -413,15 +384,7 @@ def do_setup(
     )
     cmds = MuttCommands(out_f, debug=debug_commands)
 
     )
     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"')
 
     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 __name__ == "__main__":
     args = parse_cli_args()
 
-    if args.mode == "setup":
+    if args.mode is None:
         do_setup(
         do_setup(
-            args.extensions,
-            only_build=args.only_build,
             tempdir=args.tempdir,
             debug_commands=args.debug_commands,
         )
             tempdir=args.tempdir,
             debug_commands=args.debug_commands,
         )
@@ -703,27 +664,6 @@ try:
             mimetree.walk(basic_mime_tree)
             assert len(items) == 5
 
             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)
         @pytest.fixture
         def string_io(self, const1, text=None):
             return StringIO(text or const1)
index 8f48387000d61d51ae0d86b8c9e735f122446f9b..49d80fd7de072e4cdfffe43d4f424cfd88a8ba28 100644 (file)
@@ -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"
 #set pager_format="<%a> %*  %J (%P)"
 
 set my_markdown_extensions="extra,admonition,codehilite,sane_lists,smarty"
-macro compose B "<enter-command> source '$my_confdir/buildmimetree.py setup --extensions $my_markdown_extensions --tempdir $tmpdir --only-build|'<enter><enter-command> source \$my_mdwn_postprocess_cmd_file<enter>" "Convert message into a modern MIME tree with inline images"
+macro compose B "<enter-command> source '$my_confdir/buildmimetree.py --extensions $my_markdown_extensions --tempdir $tmpdir --only-build|'<enter><enter-command> source \$my_mdwn_postprocess_cmd_file<enter>" "Convert message into a modern MIME tree with inline images"