start fixing up nip4-batch

Author: jcupitt

CHANGELOG.md

@@ -16,6 +16,7 @@
 - fix an infobar race
 - program: add find unresolved syms
 - lots more vips7 compat macros
+- fix nip4-batch as a shebang interpreter
 
 ## 9.0.12 2025/08/21
 

TODO

@@ -1,3 +1,19 @@
+- test other nip4-batch options
+
+	benchmark on banana
+
+- add tab completion ... somewhat like VS intellisense
+
+	should work in workspace entry box, and in program window
+
+- generate little vips8 wrappers automatically on startup
+
+	vips_linear options in a b
+		= vips_call9 "linear" [in, a, b] options;
+
+  could be in a separate namespace? eg.
+
+	vips8.linear
 
 - program: ^W should parse the text and block on error
 

src/dump.c

@@ -32,6 +32,7 @@
 /* A lot of this file is just for debugging. Uncomment to enable all the
  * debugging code.
  */
+
 /*
 #define DEBUG
  */

src/main-batch.c

@@ -29,46 +29,55 @@
 #include "nip4.h"
 
 static char *main_option_output = NULL;
-static gboolean main_option_print_main = FALSE;
 static gboolean main_option_test = FALSE;
 static char *main_option_prefix = NULL;
 static gboolean main_option_version = FALSE;
+static gboolean main_option_workspace = FALSE;
 
-//static iOpenFile *main_stdin = NULL;
-static char *main_option_script = NULL;
+// need testing
 static char *main_option_expression = NULL;
-static gboolean main_option_stdin_ws = FALSE;
-static gboolean main_option_stdin_def = FALSE;
 static char **main_option_set = NULL;
 static gboolean main_option_verbose = FALSE;
 
+// not needed
+static gboolean main_option_print_main = TRUE;
+static char *main_option_script = NULL;
+static gboolean main_option_stdin_ws = FALSE;
+static gboolean main_option_stdin_def = TRUE;
+
+
 static GOptionEntry main_batch_options[] = {
     { "output", 'o', 0, G_OPTION_ARG_FILENAME, &main_option_output,
         N_("write value of 'main' to FILE"), "FILE" },
-	{ "print-main", 'p', 0, G_OPTION_ARG_NONE, &main_option_print_main,
-        N_( "print value of 'main' to stdout" ), NULL },
     { "test", 'T', 0, G_OPTION_ARG_NONE, &main_option_test,
         N_("test for errors and quit"), NULL },
     { "prefix", 'x', 0, G_OPTION_ARG_FILENAME, &main_option_prefix,
         N_("start as if installed to PREFIX"), "PREFIX" },
     { "version", 'v', 0, G_OPTION_ARG_NONE, &main_option_version,
         N_("print version number"), NULL },
+    { "workspace", 'v', 0, G_OPTION_ARG_NONE, &main_option_workspace,
+        N_("load args as workspaces"), NULL },
+
+	// no longer needed
+	{ "print-main", 'p', 0, G_OPTION_ARG_NONE, &main_option_print_main,
+        N_( "print value of 'main' to stdout" ), NULL },
+    { "script", 's', 0, G_OPTION_ARG_FILENAME, &main_option_script,
+        N_("load FILE as a set of definitions"), "FILE" },
+    { "stdin-ws", 'w', 0, G_OPTION_ARG_NONE, &main_option_stdin_ws,
+        N_("load stdin as a workspace"), NULL },
+    { "stdin-def", 'd', 0, G_OPTION_ARG_NONE, &main_option_stdin_def,
+        N_("load stdin as a set of definitions"), NULL },
 
 	// these options need testing and fixing
     { "expression", 'e', 0, G_OPTION_ARG_STRING, &main_option_expression,
         N_("evaluate and print EXPRESSION"), "EXPRESSION" },
-    { "script", 's', 0, G_OPTION_ARG_FILENAME, &main_option_script,
-        N_("load FILE as a set of definitions"), "FILE" },
     { "set", '=', 0, G_OPTION_ARG_STRING_ARRAY, &main_option_set,
         N_("set values"), NULL },
     { "verbose", 'V', 0, G_OPTION_ARG_NONE, &main_option_verbose,
         N_("verbose error output"), NULL },
-    { "stdin-ws", 'w', 0, G_OPTION_ARG_NONE, &main_option_stdin_ws,
-        N_("load stdin as a workspace"), NULL },
-    { "stdin-def", 'd', 0, G_OPTION_ARG_NONE, &main_option_stdin_def,
-        N_("load stdin as a set of definitions"), NULL },
     { "i18n", 'i', 0, G_OPTION_ARG_NONE, &main_option_i18n,
         N_("output strings for internationalisation"), NULL },
+
     { NULL }
 };
 
@@ -313,6 +322,46 @@ main_print_ws(Workspace *ws, gboolean *found)
     return NULL;
 }
 
+/* Make nip's argc/argv[].
+ */
+static void
+main_build_argv(int argc, char **argv)
+{
+	Toolkit *kit = toolkit_new(main_toolkitgroup, "_args");
+
+	char txt[MAX_STRSIZE];
+	VipsBuf buf = VIPS_BUF_STATIC(txt);
+
+	vips_buf_rewind(&buf);
+	vips_buf_appendf(&buf, "argc = %d;", argc);
+	attach_input_string(vips_buf_all(&buf));
+	(void) parse_onedef(kit, -1);
+
+	vips_buf_rewind(&buf);
+	vips_buf_appendf(&buf, "argv = [");
+	for (int i = 0; i < argc; i++) {
+		/* Ignore "--" args. Consider eg.
+		 *
+		 * 	./try201.nip4 -o x.v -- -12 ~/pics/shark.jpg
+		 *
+		 * if we didn't remove --, all scripts would need to.
+		 */
+		if (g_str_equal(argv[i], "--"))
+			continue;
+
+		if(i > 0)
+			vips_buf_appendf(&buf, ", ");
+		vips_buf_appendf(&buf, "\"%s\"", argv[i]);
+	}
+	vips_buf_appendf(&buf, "];");
+
+	attach_input_string(vips_buf_all(&buf));
+	if (!parse_onedef(kit, -1))
+		main_log_add("%s\n", error_get_sub());
+
+	filemodel_set_modified(FILEMODEL(kit), FALSE);
+}
+
 int
 main(int argc, char **argv)
 {
@@ -327,7 +376,7 @@ main(int argc, char **argv)
     g_set_application_name(_(PACKAGE));
 
     GOptionContext *context =
-        g_option_context_new(_("- batch interface to image processing spreadsheet"));
+		g_option_context_new(_("- batch interface to nip4"));
     GOptionGroup *main_group = g_option_group_new(NULL, NULL, NULL, NULL, NULL);
     g_option_group_add_entries(main_group, main_batch_options);
     vips_add_option_entries(main_group);
@@ -385,13 +434,32 @@ main(int argc, char **argv)
 
     main_startup(argc, argv);
 
-	// empty workspace we load images etc into
-	Workspacegroup *wsg =
-		workspacegroup_new_blank(main_workspaceroot, "untitled");
-	Workspace *ws = workspacegroup_get_workspace(wsg);
+	/* In the default script mode (used for #! scripts), we load argv[1] as a
+	 * set of defs and pass the main func any remaining arguments.
+	 *
+	 * In --workspace mode we load all the args as workspaces / images / defs
+	 * etc.
+	 */
+
+	Workspacegroup *wsg;
+	if (!main_option_workspace &&
+		argc > 1) {
+		// load argv[1] as a set of defs
+		if (!toolkit_new_from_file(main_toolkitgroup, argv[1]))
+			main_log_add("%s\n", error_get_sub());
+
+		// the rest of argc/argv become nip4 defs
+		main_build_argv(argc - 1, argv + 1);
+	}
+	else {
+		// load args as workspaces ... the empty wsg is something for images
+		// etc to load into
+		wsg = workspacegroup_new_blank(main_workspaceroot, "untitled");
+		Workspace *ws = workspacegroup_get_workspace(wsg);
 
-	for (int i = 1; i < argc; i++)
-		main_load_file(ws, argv[i]);
+		for (int i = 1; i < argc; i++)
+			main_load_file(ws, argv[i]);
+	}
 
 	if (main_option_set)
         for (int i = 0; main_option_set[i]; i++) {
@@ -410,26 +478,23 @@ main(int argc, char **argv)
             main_error_exit("--test: errors found");
     }
 
-    if (main_option_print_main ||
-        main_option_output) {
-		Symbol *sym;
-		gboolean found;
+	/* Print or save all the mains we can find: one at the top level,
+	 * one in each workspace.
+	 */
+	Symbol *sym;
+	gboolean found;
 
-		symbol_recalculate_all_force(TRUE);
+	symbol_recalculate_all_force(TRUE);
 
-		/* Process all the mains we can find: one at the top level,
-		 * one in each workspace.
-		 */
-		found = FALSE;
-		if ((sym = compile_lookup(symbol_root->expr->compile, "main"))) {
-			main_print_main(sym);
-			found = TRUE;
-		}
-		workspace_map((workspace_map_fn) main_print_ws, &found, NULL);
-
-		if (!found)
-			main_error_exit("%s", _("no \"main\" found"));
+	found = FALSE;
+	if ((sym = compile_lookup(symbol_root->expr->compile, "main"))) {
+		main_print_main(sym);
+		found = TRUE;
 	}
+	workspace_map((workspace_map_fn) main_print_ws, &found, NULL);
+
+	if (!found)
+		main_error_exit("%s", _("no \"main\" found"));
 
     main_shutdown();