=refactored logging to be instance based instead of a global static to allow comfiuinodes to have a logger per request

=changed function interface to expect a IFunctionContext to allow for expansion in the future

Author: rasberry

Core/Definitions/ExitCode.cs renamed to Cli/ExitCode.cs

@@ -1,4 +1,4 @@
-namespace ImageFunctions.Core;
+namespace ImageFunctions.Cli;
 
 static class ExitCode
 {

Cli/ImageFunctions.Cli.csproj

@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <OutputPath>../artifacts/build</OutputPath>
+    <EnableDynamicLoading>true</EnableDynamicLoading>
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
+    <AnalysisMode>AllEnabledByDefault</AnalysisMode>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Core\ImageFunctions.Core.csproj" />
+    <InternalsVisibleTo Include="ImageFunctions.Test" />
+  </ItemGroup>
+
+</Project>

Core/Options.cs renamed to Cli/Options.cs

@@ -1,7 +1,10 @@
+using ImageFunctions.Core;
 using ImageFunctions.Core.Aides;
+using ImageFunctions.Core.Logging;
 using Rasberry.Cli;
+using System.Text;
 
-namespace ImageFunctions.Core;
+namespace ImageFunctions.Cli;
 
 /*
 sr - show registered
@@ -29,11 +32,12 @@ 1   1   1  0 |  1  1  1  0
  1   1   1  1 |  1  1  1  1
 */
 #pragma warning disable CA1861 //Avoid constant arrays as arguments - There's little to no performance gain for doing this here
-internal class Options : ICoreOptions
+internal sealed class Options : ICoreOptions
 {
-	public Options(IRegister register)
+	public Options(IRegister register, ICoreLog log)
 	{
 		Register = register;
+		Log = log;
 	}
 
 	public void Usage(StringBuilder sb, IRegister _)
@@ -92,22 +96,22 @@ public bool ParseArgs(string[] args, IRegister _)
 				Show |= PickShow.Registered;
 				return r;
 			})
-			.WhenInvalidTellDefault()
+			.WhenInvalidTellDefault(Log)
 			.IsInvalid()
 		) {
 			return false;
 		}
 
 		if(p.Scan<string>(new[] { "--engine", "-e" })
 			.WhenGood(r => { EngineName = r.Value; return r; })
-			.WhenInvalidTellDefault()
+			.WhenInvalidTellDefault(Log)
 			.IsInvalid()
 		) {
 			return false;
 		}
 
 		if(p.Scan<int>(new[] { "--max-threads", "-x" })
-			.WhenInvalidTellDefault()
+			.WhenInvalidTellDefault(Log)
 			.WhenGood(r => {
 				if(r.Value < 1) {
 					Log.Error(Note.MustBeGreaterThan(r.Name, 0));
@@ -122,23 +126,23 @@ public bool ParseArgs(string[] args, IRegister _)
 
 		if(p.Scan<string>(new[] { "--format", "-f" })
 			.WhenGood(r => { _imageFormat = r.Value; return r; })
-			.WhenInvalidTellDefault()
+			.WhenInvalidTellDefault(Log)
 			.IsInvalid()
 		) {
 			return false;
 		}
 
 		if(p.Scan<string>(new[] { "--output", "-o" })
 			.WhenGood(r => { _outputName = r.Value; return r; })
-			.WhenInvalidTellDefault()
+			.WhenInvalidTellDefault(Log)
 			.IsInvalid()
 		) {
 			return false;
 		}
 
 		if(p.Scan<int?, int?>(new[] { "--size", "-#" })
 			.WhenGood(r => { (_defaultWidth, _defaultHeight) = r.Value; return r; })
-			.WhenInvalidTellDefault()
+			.WhenInvalidTellDefault(Log)
 			.IsInvalid()
 		) {
 			return false;
@@ -191,17 +195,11 @@ public bool ProcessOptions()
 		}
 
 		//need to select the engine so we can show formats
-		var er = new EngineRegister(Register);
-		if(!String.IsNullOrWhiteSpace(EngineName)) {
-			if(!er.Try(EngineName, out var engineEntry)) {
-				Log.Error(Note.NotRegistered(engineEntry.NameSpace, engineEntry.Name));
-				return false;
-			}
-			Engine = engineEntry;
+		if (!Register.TrySelectEngine(EngineName, Log, out var _engine)) {
+			return false;
 		}
 		else {
-			EngineName = EngineRegister.SixLaborsString;
-			Engine = er.Get(EngineName);
+			Engine = _engine;
 		}
 
 		//show formats
@@ -216,7 +214,7 @@ public bool ProcessOptions()
 			return false;
 		}
 
-		if(!DetermineImageFormat()) {
+		if (!Engine.Item.Value.TryDetermineImageFormat(_imageFormat, Log, out _)) {
 			return false;
 		}
 
@@ -305,11 +303,18 @@ bool ShowFunctionHelp(string name, StringBuilder sb)
 			list = fn.All().Order();
 		}
 
+		//Usage only relies on register and log and possibly options
+		var context = new FunctionContext {
+			Register = Register,
+			Log = Log,
+			Options = this
+		};
+
 		foreach(string key in list) {
 			var funcItem = fn.Get(key);
 			sb.WT();
 			sb.WT(0, $"Function {key}:");
-			var inst = funcItem.Item.Invoke(Register, null, this);
+			var inst = funcItem.Item.Invoke(context);
 			var opts = inst.Options;
 			if(opts is IUsageProvider uip) {
 				NameSpaceList = GetFlagsFromUsageInfo(uip.GetUsageInfo());
@@ -343,28 +348,6 @@ void ShowFormats(StringBuilder sb)
 		}
 	}
 
-	bool DetermineImageFormat()
-	{
-		var eng = Engine.Item.Value;
-		bool formatGiven = !String.IsNullOrWhiteSpace(_imageFormat);
-		ImageFormat? found = null;
-		foreach(var f in eng.Formats()) {
-			if(formatGiven && f.Name.EqualsIC(_imageFormat)) {
-				found = f;
-			}
-			else if(f.Name.EqualsIC("png")) {
-				found = f;
-			}
-		}
-
-		if(found == null) {
-			Log.Error(Note.NoImageFormatFound(_imageFormat));
-			return false;
-		}
-
-		return true;
-	}
-
 	bool EnumerateInputImages(ParseParams p)
 	{
 		bool found = true;
@@ -393,10 +376,11 @@ bool EnumerateInputImages(ParseParams p)
 	string _functionName;
 	string _imageFormat;
 	string _outputName;
-	readonly IRegister Register;
 	int? _defaultWidth;
 	int? _defaultHeight;
+	readonly IRegister Register;
 	List<string> NameSpaceList;
+	internal ICoreLog Log;
 
 	//Global options
 	public IRegisteredItem<Lazy<IImageEngine>> Engine { get; internal set; }
@@ -420,4 +404,3 @@ enum PickShow
 		All = 8 + 4 + 2 + 1
 	}
 }
-#pragma warning restore CA1861