output format in scripting

strawberryfield · Apr 3, 2022 · 4e8dbde · 4e8dbde
1 parent 9180432
commit 4e8dbde
Show file tree

Hide file tree

Showing 28 changed files with 202 additions and 23 deletions.
diff --git a/Common/Engines/BaseBuilderEngine.cs b/Common/Engines/BaseBuilderEngine.cs
@@ -116,10 +116,6 @@ public override void SetJsonParams(string json)
     /// Does the dirty work
     /// </summary>
     /// <returns>Image to print</returns>
-    public override MagickImage GetResult(bool quiet)
-    {
-        img = new(fmt);
-        return base.GetResult(quiet);
-    }
+    public override MagickImage GetResult(bool quiet) => base.GetResult(quiet);
 
 }
diff --git a/Common/Engines/BaseEngine.cs b/Common/Engines/BaseEngine.cs
@@ -44,6 +44,7 @@ public int Dpi
         {
             _dpi = value;
             fmt = new(_dpi);
+            img = new(fmt);
         }
     }
     /// <summary>
@@ -107,7 +108,7 @@ public string Script
     /// <summary>
     /// Storage for the instantiated Script object
     /// </summary>
-    protected object ScriptInstance { get; set; }   
+    protected object ScriptInstance { get; set; }
 
     #endregion
 
@@ -200,7 +201,14 @@ public void SetBaseJsonParams()
     /// </summary>
     /// <param name="quiet">suppress messages when running</param>
     /// <returns>Image to print</returns>
-    public virtual MagickImage GetResult(bool quiet) => null;
+    public virtual MagickImage GetResult(bool quiet)
+    {
+        if (CustomCode != null)
+        {
+            ScriptInstance = Compiler.New(CustomCode, this);
+        }
+        return null;
+    }
 
     /// <summary>
     /// Writes exif infos on image

diff --git a/Common/Engines/CreditCardEngine.cs b/Common/Engines/CreditCardEngine.cs
@@ -184,9 +184,16 @@ public override void SetJsonParams(string json)
     /// <returns>Image to print</returns>
     public override MagickImage GetResult(bool quiet)
     {
-        img = new(fmt);
-
         MagickImage final = img.FineArt10x15_v();
+        if (ScriptInstance != null)
+        {
+            var f = Compiler.Run(ScriptInstance, "OutputImage", null);
+            if (f != null)
+            {
+                final = (MagickImage)f;
+            }
+        }
+
         MagickImage front = Get(FilesList[0], quiet);
         int bordertop = final.Height / 2 - front.Height;
         int borderleft = (final.Width - front.Width) / 2;

diff --git a/Common/Engines/MontaggioDorsiEngine.cs b/Common/Engines/MontaggioDorsiEngine.cs
@@ -95,14 +95,18 @@ public override void SetJsonParams(string json)
     /// <returns></returns>
     public override MagickImage GetResult(bool quiet)
     {
-        if (CustomCode != null)
+        _ = base.GetResult(quiet);
+
+        MagickImage final = PaperFormat == PaperFormats.Medium ? img.InCartha15x20_o() : img.InCartha20x27_o();
+        if (ScriptInstance != null)
         {
-            ScriptInstance = Compiler.New(CustomCode, this);
+            var f = Compiler.Run(ScriptInstance, "OutputImage", null);
+            if(f != null)
+            {
+                final = (MagickImage)f;
+            }
         }
 
-        img = new(fmt);
-
-        MagickImage final = PaperFormat == PaperFormats.Medium ? img.InCartha15x20_o() : img.InCartha20x27_o();
         MagickImageCollection imagesV = new();
         MagickImageCollection imagesO = new();
 
@@ -185,7 +189,11 @@ private int LoadImages(int n, int counter, MagickImageCollection dest, bool quie
 
             if (ScriptInstance != null)
             {
-                image = (MagickImage)Compiler.Run(ScriptInstance, "ProcessOnLoad", new object[] { image });
+                var im = Compiler.Run(ScriptInstance, "ProcessOnLoad", new object[] { image });
+                if (im != null)
+                {
+                    image = (MagickImage)im;
+                }
             }
 
             MagickImage dorso = Utils.RotateResizeAndFill(image, orientation, FillColor);

diff --git a/Common/Engines/MontaggioFotoEngine.cs b/Common/Engines/MontaggioFotoEngine.cs
@@ -126,15 +126,19 @@ public override void SetJsonParams(string json)
     /// <returns></returns>
     public MagickImage GetResult(bool quiet, int i)
     {
-        if (CustomCode != null)
+        _ = base.GetResult(quiet);
+
+        MagickImage final = img.FineArt10x15_o();
+        if (ScriptInstance != null)
         {
-            ScriptInstance = Compiler.New(CustomCode, this);
+            var f = Compiler.Run(ScriptInstance, "OutputImage", null);
+            if (f != null)
+            {
+                final = (MagickImage)f;
+            }
         }
 
-        img = new(fmt);
-        MagickImage final = img.FineArt10x15_o();
         MagickImage img1 = Get(FilesList[i], quiet);
-
         MagickImage img2;
         i++;
         if (i < FilesList.Count)
@@ -183,7 +187,11 @@ private MagickImage Get(string filename, bool quiet)
 
         if (ScriptInstance != null)
         {
-            image = (MagickImage)Compiler.Run(ScriptInstance, "ProcessOnLoad", new object[] { image });
+            var i = Compiler.Run(ScriptInstance, "ProcessOnLoad", new object[] { image });
+            if(i != null)
+            {
+                image = (MagickImage)i;
+            }
         }
 
         MagickImage img1 = Utils.RotateResizeAndFill(image,

diff --git a/Common/Scripting/BaseScripting.cs b/Common/Scripting/BaseScripting.cs
@@ -33,6 +33,12 @@ internal class BaseScripting : IScripting
 /// Custom class initialization
 /// </summary>
 public void Init() { }
+
+/// <summary>
+/// Image for final output
+/// </summary>
+/// <returns></returns>
+public MagickImage OutputImage() => null;
 ";
 
     public virtual string WrapScript(string script, string engine) => $@"{Compiler.Usings}

diff --git a/Common/Scripting/Compiler.cs b/Common/Scripting/Compiler.cs
@@ -129,11 +129,17 @@ public static object Run(Assembly assembly, string ClassName, string Method, obj
     public static object Run(object obj, string Method, object[] args)
     {
         Type type = obj.GetType();
-        return type.InvokeMember(Method,
+        if (type != null && type.GetMethod(Method) != null)
+        {
+
+            return type.InvokeMember(Method,
             BindingFlags.Default | BindingFlags.InvokeMethod,
             null,
             obj,
             args);
+        }
+        else
+            return null;
     }
 
     /// <summary>

diff --git a/build_tools/publish.cmd b/build_tools/publish.cmd
@@ -33,7 +33,7 @@ set candle="%wix%candle.exe"
 set light="%wix%light.exe"
 set WixUtils="%wix%WixUtilExtension.dll"
 
-set version=22.03.26
+set version=22.04.03
 
 @del /S /Q %build%
 @del /Q %bin%%pkgname%*.*

diff --git a/docs/Cartella.1 b/docs/Cartella.1
@@ -197,6 +197,14 @@ set output dir/filename
 .P
 .PD
 extra info for user scripts
+.PD 0
+.P
+.PD
+Text can be stored in a file instead of a string
+.PD 0
+.P
+.PD
+The file must be referenced as `\[at]filename'
 .PP
 \f[B]\[en]nobanner\f[R] :
 .PD 0
@@ -349,6 +357,10 @@ These are the signatures of the scriptable methods:
 /// Custom class initialization ///
 .PP
 public void Init() { }
+///
+/// Image for final output ///
+.PP
+/// public MagickImage OutputImage() => null;
 .PP
 \[ti]\[ti]\[ti]
 .SH COPYRIGHT

diff --git a/docs/CreditCard.1 b/docs/CreditCard.1
@@ -167,6 +167,14 @@ set output dir/filename
 .P
 .PD
 extra info for user scripts
+.PD 0
+.P
+.PD
+Text can be stored in a file instead of a string
+.PD 0
+.P
+.PD
+The file must be referenced as `\[at]filename'
 .PP
 \f[B]\[en]nobanner\f[R] :
 .PD 0
@@ -315,6 +323,10 @@ These are the signatures of the scriptable methods:
 /// Custom class initialization ///
 .PP
 public void Init() { }
+///
+/// Image for final output ///
+.PP
+/// public MagickImage OutputImage() => null;
 .PP
 \[ti]\[ti]\[ti]
 .SH COPYRIGHT

diff --git a/docs/MontaggioDorsi.1 b/docs/MontaggioDorsi.1
@@ -104,6 +104,14 @@ set output dir/filename
 .P
 .PD
 extra info for user scripts
+.PD 0
+.P
+.PD
+Text can be stored in a file instead of a string
+.PD 0
+.P
+.PD
+The file must be referenced as `\[at]filename'
 .PP
 \f[B]\[en]nobanner\f[R] :
 .PD 0
@@ -243,6 +251,10 @@ These are the signatures of the scriptable methods:
 .PP
 public void Init() { }
 ///
+/// Image for final output ///
+.PP
+/// public MagickImage OutputImage() => null;
+///
 /// Preprocesses the loaded image ///
 .PP
 /// The loaded image /// The Processed image public MagickImage

diff --git a/docs/MontaggioFoto.1 b/docs/MontaggioFoto.1
@@ -114,6 +114,14 @@ set output dir/filename
 .P
 .PD
 extra info for user scripts
+.PD 0
+.P
+.PD
+Text can be stored in a file instead of a string
+.PD 0
+.P
+.PD
+The file must be referenced as `\[at]filename'
 .PP
 \f[B]\[en]nobanner\f[R] :
 .PD 0
@@ -256,6 +264,10 @@ These are the signatures of the scriptable methods:
 .PP
 public void Init() { }
 ///
+/// Image for final output ///
+.PP
+/// public MagickImage OutputImage() => null;
+///
 /// Preprocesses the loaded image ///
 .PP
 /// The loaded image /// The Processed image public MagickImage

diff --git a/docs/Scatola.1 b/docs/Scatola.1
@@ -194,6 +194,14 @@ set output dir/filename
 .P
 .PD
 extra info for user scripts
+.PD 0
+.P
+.PD
+Text can be stored in a file instead of a string
+.PD 0
+.P
+.PD
+The file must be referenced as `\[at]filename'
 .PP
 \f[B]\[en]nobanner\f[R] :
 .PD 0
@@ -346,6 +354,10 @@ These are the signatures of the scriptable methods:
 /// Custom class initialization ///
 .PP
 public void Init() { }
+///
+/// Image for final output ///
+.PP
+/// public MagickImage OutputImage() => null;
 .PP
 \[ti]\[ti]\[ti]
 .SH COPYRIGHT

diff --git a/docs/help_cartella.txt b/docs/help_cartella.txt
@@ -37,6 +37,8 @@ Options:
                                The file must be referenced as '@filename'
   -o, --output=VALUE         set output dir/filename
       --tag=VALUE            extra info for user scripts
+                               Text can be stored in a file instead of a string
+                               The file must be referenced as '@filename'
       --nobanner             suppress the banner
   -h, --help                 show this message and exit
       --helpjson             show json parameters template

diff --git a/docs/help_creditcard.txt b/docs/help_creditcard.txt
@@ -35,6 +35,8 @@ Options:
                                The file must be referenced as '@filename'
   -o, --output=VALUE         set output dir/filename
       --tag=VALUE            extra info for user scripts
+                               Text can be stored in a file instead of a string
+                               The file must be referenced as '@filename'
       --nobanner             suppress the banner
   -h, --help                 show this message and exit
       --helpjson             show json parameters template

diff --git a/docs/help_montaggiodorsi.txt b/docs/help_montaggiodorsi.txt
@@ -22,6 +22,8 @@ Options:
                                The file must be referenced as '@filename'
   -o, --output=VALUE         set output dir/filename
       --tag=VALUE            extra info for user scripts
+                               Text can be stored in a file instead of a string
+                               The file must be referenced as '@filename'
       --nobanner             suppress the banner
   -h, --help                 show this message and exit
       --helpjson             show json parameters template

diff --git a/docs/help_montaggiofoto.txt b/docs/help_montaggiofoto.txt
@@ -23,6 +23,8 @@ Options:
                                The file must be referenced as '@filename'
   -o, --output=VALUE         set output dir/filename
       --tag=VALUE            extra info for user scripts
+                               Text can be stored in a file instead of a string
+                               The file must be referenced as '@filename'
       --nobanner             suppress the banner
   -h, --help                 show this message and exit
       --helpjson             show json parameters template

diff --git a/docs/help_scatola.txt b/docs/help_scatola.txt
@@ -37,6 +37,8 @@ Options:
                                The file must be referenced as '@filename'
   -o, --output=VALUE         set output dir/filename
       --tag=VALUE            extra info for user scripts
+                               Text can be stored in a file instead of a string
+                               The file must be referenced as '@filename'
       --nobanner             suppress the banner
   -h, --help                 show this message and exit
       --helpjson             show json parameters template

diff --git a/docs/helpscript_Cartella.txt b/docs/helpscript_Cartella.txt
@@ -9,4 +9,10 @@ Copyright (c) 2020-2022 Roberto Ceccarelli - Casasoft
 /// </summary>
 public void Init() { }
 
+/// <summary>
+/// Image for final output
+/// </summary>
+/// <returns></returns>
+public MagickImage OutputImage() => null;
+
 -----
diff --git a/docs/helpscript_CreditCard.txt b/docs/helpscript_CreditCard.txt
@@ -9,4 +9,10 @@ Copyright (c) 2020-2022 Roberto Ceccarelli - Casasoft
 /// </summary>
 public void Init() { }
 
+/// <summary>
+/// Image for final output
+/// </summary>
+/// <returns></returns>
+public MagickImage OutputImage() => null;
+
 -----
diff --git a/docs/helpscript_MontaggioDorsi.txt b/docs/helpscript_MontaggioDorsi.txt
@@ -9,6 +9,12 @@ Copyright (c) 2020-2022 Roberto Ceccarelli - Casasoft
 /// </summary>
 public void Init() { }
 
+/// <summary>
+/// Image for final output
+/// </summary>
+/// <returns></returns>
+public MagickImage OutputImage() => null;
+
 /// <summary>
 /// Preprocesses the loaded image
 /// </summary>