dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

app, plug-ins: redirect plug-in-script-fu-eval to text console in…

Browse source 
… plug-in code.

In particular, we should not hardcode this in core code anymore. The
behavior is otherwise exactly the same, except that we made the core
code generic as it should be.
This commit is contained in:
Jehan 2022-04-17 14:23:21 +02:00
parent 16784c0081
commit c1d2f35b73
2 changed files with 31 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
app/core/gimp-batch.c
View file

@ -54,10 +54,11 @@ gimp_batch_run (Gimp *gimp,
const gchar *batch_interpreter,
const gchar **batch_commands)
{
GSList *batch_procedures;
GSList *iter;
gulong exit_id;
gint retval = EXIT_SUCCESS;
GimpProcedure *eval_proc;
GSList *batch_procedures;
GSList *iter;
gulong exit_id;
gint retval = EXIT_SUCCESS;
if (! batch_commands || ! batch_commands[0])
return retval;
@ -155,55 +156,33 @@ gimp_batch_run (Gimp *gimp,
G_CALLBACK (gimp_batch_exit_after_callback),
NULL);
/* script-fu text console, hardcoded for backward compatibility */
if (strcmp (batch_interpreter, "plug-in-script-fu-eval") == 0 &&
strcmp (batch_commands[0], "-") == 0)
eval_proc = gimp_pdb_lookup_procedure (gimp->pdb, batch_interpreter);
if (eval_proc)
{
const gchar *proc_name = "plug-in-script-fu-text-console";
GimpProcedure *procedure = gimp_pdb_lookup_procedure (gimp->pdb,
proc_name);
gint i;
retval = 69; /* EX_UNAVAILABLE - service unavailable (sysexits.h) */
if (procedure)
retval = gimp_batch_run_cmd (gimp, proc_name, procedure,
GIMP_RUN_NONINTERACTIVE, NULL);
else
g_message (_("The batch interpreter '%s' is not available. "
"Batch mode disabled."), proc_name);
retval = EXIT_SUCCESS;
for (i = 0; batch_commands[i]; i++)
{
retval = gimp_batch_run_cmd (gimp, batch_interpreter, eval_proc,
GIMP_RUN_NONINTERACTIVE, batch_commands[i]);
/* In case of several commands, stop and return last
* failed command.
*/
if (retval != EXIT_SUCCESS)
{
g_printerr ("Stopping at failing batch command [%d]: %s\n",
i, batch_commands[i]);
break;
}
}
}
else
{
GimpProcedure *eval_proc = gimp_pdb_lookup_procedure (gimp->pdb,
batch_interpreter);
retval = 69; /* EX_UNAVAILABLE - service unavailable (sysexits.h) */
if (eval_proc)
{
gint i;
retval = EXIT_SUCCESS;
for (i = 0; batch_commands[i]; i++)
{
retval = gimp_batch_run_cmd (gimp, batch_interpreter, eval_proc,
GIMP_RUN_NONINTERACTIVE, batch_commands[i]);
/* In case of several commands, stop and return last
* failed command.
*/
if (retval != EXIT_SUCCESS)
{
g_printerr ("Stopping at failing batch command [%d]: %s\n",
i, batch_commands[i]);
break;
}
}
}
else
{
g_message (_("The batch interpreter '%s' is not available. "
"Batch mode disabled."), batch_interpreter);
}
g_message (_("The batch interpreter '%s' is not available. "
"Batch mode disabled."), batch_interpreter);
}
g_signal_handler_disconnect (gimp, exit_id);

6
plug-ins/script-fu/script-fu.c
View file

@ -339,7 +339,11 @@ script_fu_batch_run (GimpProcedure *procedure,
* A non-interactive "console" (for batch mode)
*/
return_vals = script_fu_eval_run (procedure, run_mode, code, args);
if (g_strcmp0 (code, "-") == 0)
/* Redirecting to script-fu text console, for backward compatibility */
return_vals = script_fu_text_console_run (procedure, args);
else
return_vals = script_fu_eval_run (procedure, run_mode, code, args);
}
if (! return_vals)