]> 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: Provide --only-build switch to prevent sending
authormartin f. krafft <madduck@madduck.net>
Wed, 23 Aug 2023 08:12:15 +0000 (20:12 +1200)
committermartin f. krafft <madduck@madduck.net>
Wed, 23 Aug 2023 10:00:58 +0000 (22:00 +1200)
.config/neomutt/buildmimetree.py
.config/neomutt/neomuttrc

index 06f62c549d1020692b1be97f980658d158522eaa..f4ee8216439436c3cc43310e30b31beffadaae73 100755 (executable)
@@ -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 = 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",
     parser_setup.add_argument(
         "--extension",
         "-x",
@@ -85,21 +73,42 @@ def parse_cli_args(*args, **kwargs):
     )
 
     parser_setup.add_argument(
     )
 
     parser_setup.add_argument(
-        "--send-message",
+        "--only-build",
         action="store_true",
         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-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",
         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(
     )
 
     parser_massage.add_argument(
@@ -109,18 +118,15 @@ def parse_cli_args(*args, **kwargs):
     )
 
     parser_massage.add_argument(
     )
 
     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(
     )
 
     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(
     )
 
     parser_massage.add_argument(
@@ -399,6 +405,7 @@ def do_setup(
     extensions=None,
     *,
     out_f=sys.stdout,
     extensions=None,
     *,
     out_f=sys.stdout,
+    only_build=False,
     temppath=None,
     tempdir=None,
     debug_commands=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)}'
     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:
     if tempdir:
         editor = f"{editor} --tempdir {tempdir}"
     if debug_commands:
@@ -433,6 +442,7 @@ def do_massage(
     *,
     extensions=None,
     converter=convert_markdown_to_html,
     *,
     extensions=None,
     converter=convert_markdown_to_html,
+    only_build=False,
     tempdir=None,
     debug_commands=False,
     debug_walk=False,
     tempdir=None,
     debug_commands=False,
     debug_walk=False,
@@ -521,6 +531,9 @@ def do_massage(
     # function
     mimetree.walk(tree, visitor_fn=visitor_fn)
 
     # function
     mimetree.walk(tree, visitor_fn=visitor_fn)
 
+    if not only_build:
+        cmds.push("<send-message>")
+
     # Finally, cleanup. Since we're responsible for removing the temporary
     # file, how's this for a little hack?
     try:
     # 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":
     args = parse_cli_args()
 
     if args.mode == "setup":
-        if args.send_message:
-            raise NotImplementedError()
-
         do_setup(
             args.extensions,
         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,
         )
@@ -556,6 +567,7 @@ if __name__ == "__main__":
                 pathlib.Path(args.MAILDRAFT),
                 cmd_f,
                 extensions=args.extensions,
                 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,
                 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 '="$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)
             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:]
 
             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)
             assert "Related" in lines.pop(0)
             assert "group-related" in lines.pop(0)
             assert "tag-entry" in lines.pop(0)
index b328578f206bbef6e4be06a6f52f9d9c70bb88f9..6a7f0ad82b7c90c1530cc76b118fa5ec57768070 100644 (file)
@@ -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)"
 
 #
 #set pager_format="<%a> %*  %J (%P)"
 
-macro compose B "<enter-command> source '$my_confdir/buildmimetree.py setup --debug-commands --tempdir $tmpdir|'<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 setup --debug-commands --tempdir $tmpdir --only-build|'<enter><enter-command> source \$my_mdwn_postprocess_cmd_file<enter>" "Convert message into a modern MIME tree with inline images"