Variables can be used in args

NyaFs/Processor/Scripting/Commands/Echo.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace NyaFs.Processor.Scripting.Commands
+{
+    public class Echo : ScriptStepGenerator
+    {
+        public Echo() : base("echo")
+        {
+            AddConfig(new ScriptArgsConfig(0, null));
+        }
+
+        public override ScriptStep Get(ScriptArgs Args)
+        {
+            return new EchoScriptStep(Args.RawArgs);
+        }
+
+        public class EchoScriptStep : ScriptStep
+        {
+            private string[] Args;
+
+            public EchoScriptStep(string[] Args) : base("echo")
+            {
+                this.Args = Args;
+            }
+
+            public override ScriptStepResult Exec(ImageProcessor Processor)
+            {
+                Log.Write(0, String.Join(" ", Args));
+
+                return new ScriptStepResult(ScriptStepStatus.Ok, null);
+            }
+        }
+    }
+}

NyaFs/Processor/Scripting/Commands/Var.cs

@@ -17,6 +17,8 @@ public Var() : base("var")
                 new Params.StringScriptArgsParam("name") }));
         }
 
+        public override int[] MaskedArgs => new int[] { 0 };
+
         public override ScriptStep Get(ScriptArgs Args)
         {
             if(Args.ArgConfig == 0)

NyaFs/Processor/Scripting/ScriptBase.cs

@@ -30,6 +30,7 @@ public class ScriptBaseAll : ScriptBase
         public ScriptBaseAll()
         {
             Add(new Commands.Include());
+            Add(new Commands.Echo());
 
             Add(new Commands.Load());
             Add(new Commands.Store());

NyaFs/Processor/Scripting/ScriptStep.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 
 namespace NyaFs.Processor.Scripting
@@ -22,22 +23,39 @@ public ScriptStep(string Name)
             this.Name = Name;
         }
 
+
         private string PreprocessArg(Variables.VariableScope Scope, string Arg)
         {
             if (Variables.VariableChecker.IsCorrectName(Arg) && Scope.IsDefined(Arg))
                 return Scope.GetValue(Arg);
             else
+            {
+                var Vars = Variables.VariableChecker.ExtractVariables(Arg);
+                foreach(var V in Vars)
+                {
+                    if (Scope.IsDefined(V))
+                        Arg = Arg.Replace(V, Scope.GetValue(V));
+                }
                 return Arg;
+            }
         }
 
-        private string[] PreprocessArgs(Variables.VariableScope Scope, string[] Args)
+        private string[] PreprocessArgs(Variables.VariableScope Scope, string[] Args, int[] Masked)
         {
-            return Array.ConvertAll(Args, A => PreprocessArg(Scope, A));
+            var Res = new string[Args.Length];
+            for(int i = 0; i < Args.Length; i++)
+            {
+                if (Masked.Contains(i))
+                    Res[i] = Args[i];
+                else
+                    Res[i] = PreprocessArg(Scope, Args[i]);
+            }
+            return Res;
         }
 
         public ScriptStep GetPreprocessed(Variables.VariableScope Scope)
         {
-            var SArgs = Generator.GetArgs(PreprocessArgs(Scope, GeneratorArgs));
+            var SArgs = Generator.GetArgs(PreprocessArgs(Scope, GeneratorArgs, Generator.MaskedArgs));
             if (SArgs != null)
             {
                 var Step = Generator.Get(SArgs);

NyaFs/Processor/Scripting/ScriptStepGenerator.cs

@@ -24,10 +24,15 @@ public virtual ScriptStep Get(ScriptArgs Args)
             throw new NotImplementedException("There is need to implement script step getter");
         }
 
+        public virtual int[] MaskedArgs => new int[] { };
+
         public ScriptArgs GetArgs(string[] Args)
         {
             foreach(var C in Configs)
             {
+                if(C.Params == null)
+                    return new ScriptArgs(C.Id, Args);
+
                 if (CheckConfig(C, Args))
                 {
                     if (!C.CheckArgs(Args))

NyaFs/Processor/Scripting/Variables/VariableChecker.cs

@@ -11,5 +11,21 @@ public static bool IsCorrectName(string Name)
         {
             return (Name != null) && (Name.Length > 2) && (Name.Count(C => (C == '$')) == 1) && (Name[0] == '$');
         }
+
+        public static string[] ExtractVariables(string Text)
+        {
+            var Res = new List<string>();
+            string Temp = null;
+
+            var Parts = Text.Split(new char[] { ' ', '\t', ',', ':', '\\', '/', '>', '<', '?', '!', '*', '*', '%', '#', '@', '~' });
+
+            foreach(var P in Parts)
+            {
+                if (IsCorrectName(P))
+                    Res.Add(P);
+            }
+
+            return Res.ToArray();
+        }
     }
 }

readme.md

@@ -81,6 +81,11 @@ Reset program state, drop all images:
 reset
 ```
 
+Echo any text:
+```
+echo <text>
+```
+
 ## Commands for image loading
 Default load command (type and image format autodetect):
 ```
@@ -367,6 +372,44 @@ List items in other dir:
 ls <path>
 ```
 
+## Variables
+Variables can be defined with command:
+```
+var <name> <value>
+```
+or
+```
+var <name>
+```
+Variable names starts with $: $image, $path etc.
+
+Variables can be used instead parameters:
+```
+var $image zynq.fit
+load $image
+```
+
+Variables can be used in conditions. If variable defined, command line will be executed.
+```
+<var>? <command> <args...>
+```
+Example:
+```
+# Define image1 variable
+var $image1
+
+# Update some config based on condition:
+$image1? file etc/config.cfg files/image1/config.cfg
+$image2? file etc/config.cfg files/image2/config.cfg
+```
+
+As variant, variables can contain part of path:
+```
+var $image image1
+echo Image is $image
+file etc/config.cfg files/$image/config.cfg
+```
+
 ## Plugins
 Plugin is a dll that contain adiitional functionality.
 Available plugins: