From 1a09e560c5fdc7d8a33e87f1bca4a20452a85b5e Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 18 Nov 2025 11:49:31 -0500 Subject: [PATCH] fix load IDataStreamFactory(s) (DataStreamFactory.cs) --- .../DynamicLoading/DataStreamFactory.cs | 140 +++++++++++++++++- 1 file changed, 138 insertions(+), 2 deletions(-) diff --git a/src/DataStreamSuite/DataStreamCore/DynamicLoading/DataStreamFactory.cs b/src/DataStreamSuite/DataStreamCore/DynamicLoading/DataStreamFactory.cs index 465485411..2e55a9e10 100644 --- a/src/DataStreamSuite/DataStreamCore/DynamicLoading/DataStreamFactory.cs +++ b/src/DataStreamSuite/DataStreamCore/DynamicLoading/DataStreamFactory.cs @@ -52,11 +52,147 @@ public static class DataStreamFactoryExtensions { streamFactory.Add(sf); } - public static void Add(this DataStreamFactory streamFactory, string name, Func singleStreamfactory, ILogger? logger = null) { - var sf = new SingleDataStreamFactory(new DataStreamMetadata() { Name = name }, singleStreamfactory, logger); + public static void Add(this DataStreamFactory streamFactory, string name, Func singleStreamfactory, ILogger? logger = null) { + var sf = new SingleDataStreamFactory(new DataStreamMetadata() { Name = name }, singleStreamfactory, logger); streamFactory.Add(sf); } + public static void Add(this DataStreamFactory streamFactory, string name, Func factory, IStreamArgumentParser? parser = null) { + var meta = new DataStreamMetadata() { Name = name }; + parser ??= StreamArgumentParser.Default(); + var sf = new SingleDataStreamFactory(meta, FactoryWrapper); + streamFactory.Add(sf); + + ViewStream? FactoryWrapper(IEnumerable args) { + if (!args.TryGetSingle(out var a)) { + return null; + } + if (!parser.CanParse(a, typeof(T))) { + return null; + } + if (!parser.TryParse(a, out var res, out var err)) { + return null; + } + return factory(res); + } + } + + public static void Add( + this DataStreamFactory streamFactory, + string name, + Func factory, + IStreamArgumentParser? parser1 = null, + IStreamArgumentParser? parser2 = null + ) { + var meta = new DataStreamMetadata() { Name = name }; + parser1 ??= StreamArgumentParser.Default(); + parser2 ??= StreamArgumentParser.Default(); + var sf = new SingleDataStreamFactory(meta, FactoryWrapper); + streamFactory.Add(sf); + + ViewStream? FactoryWrapper(IEnumerable args) { + if (!args.TryGetExactCount(out var a1, out var a2)) { + return null; + } + if (!parser1.CanAndTryParse(a2, out var v1, out var err1)) { + return null; + } + if (!parser2.CanAndTryParse(a2, out var v2, out var err2)) { + return null; + } + return factory(v1, v2); + } + } + + public static void Add( + this DataStreamFactory streamFactory, + string name, + Func factory, + IStreamArgumentParser? parser1 = null, + IStreamArgumentParser? parser2 = null, + IStreamArgumentParser? parser3 = null + ) { + var meta = new DataStreamMetadata() { Name = name }; + parser1 ??= StreamArgumentParser.Default(); + parser2 ??= StreamArgumentParser.Default(); + parser3 ??= StreamArgumentParser.Default(); + var sf = new SingleDataStreamFactory(meta, FactoryWrapper); + streamFactory.Add(sf); + + ViewStream? FactoryWrapper(IEnumerable args) { + if (!args.TryGetExactCount(out var a1, out var a2, out var a3)) { + return null; + } + if (!parser1.CanAndTryParse(a2, out var v1, out var err1)) { + return null; + } + if (!parser2.CanAndTryParse(a2, out var v2, out var err2)) { + return null; + } + if (!parser3.CanAndTryParse(a3, out var v3, out var err3)) { + return null; + } + return factory(v1, v2, v3); + } + } + + public static void Add(this DataStreamFactory streamFactory, string name, Func factory, IStreamArgumentParser? parser1 = null, IStreamArgumentParser? parser2 = null, IStreamArgumentParser? parser3 = null, IStreamArgumentParser? parser4 = null) { + var meta = new DataStreamMetadata() { Name = name }; + parser1 ??= StreamArgumentParser.Default(); + parser2 ??= StreamArgumentParser.Default(); + parser3 ??= StreamArgumentParser.Default(); + parser4 ??= StreamArgumentParser.Default(); + var sf = new SingleDataStreamFactory(meta, FactoryWrapper); + streamFactory.Add(sf); + + ViewStream? FactoryWrapper(IEnumerable args) { + if (!args.TryGetExactCount(out var a1, out var a2, out var a3, out var a4)) { + return null; + } + if (!parser1.CanAndTryParse(a2, out var v1, out var err1)) { + return null; + } + if (!parser2.CanAndTryParse(a2, out var v2, out var err2)) { + return null; + } + if (!parser3.CanAndTryParse(a3, out var v3, out var err3)) { + return null; + } + if (!parser4.CanAndTryParse(a4, out var v4, out var err4)) { + return null; + } + return factory(v1, v2, v3, v4); + } + } + + public static void Add(this DataStreamFactory streamFactory, string name, Func factory, IStreamArgumentParser parser1, IStreamArgumentParser parser2, IStreamArgumentParser parser3, IStreamArgumentParser parser4, IStreamArgumentParser parser5) { + var meta = new DataStreamMetadata() { Name = name }; + var sf = new SingleDataStreamFactory(meta, FactoryWrapper); + streamFactory.Add(sf); + + ViewStream? FactoryWrapper(IEnumerable args) { + if (!args.TryGetExactCount(out var a1, out var a2, out var a3, out var a4, out var a5)) { + return null; + } + if (!parser1.CanAndTryParse(a2, out var v1, out var err1)) { + return null; + } + if (!parser2.CanAndTryParse(a2, out var v2, out var err2)) { + return null; + } + if (!parser3.CanAndTryParse(a3, out var v3, out var err3)) { + return null; + } + if (!parser4.CanAndTryParse(a4, out var v4, out var err4)) { + return null; + } + if (!parser5.CanAndTryParse(a5, out var v5, out var err5)) { + return null; + } + return factory(v1, v2, v3, v4, v5); + } + } + public static void Add(this DataStreamFactory streamFactory, string[] names, Func singleStreamfactory, ILogger? logger = null) { if (names.Length == 0) { throw new ArgumentException("StreamFactory must have at least one name", nameof(names));