Pipe input support

Author: Decimation

SmartImage.Lib 3/UniImage.cs

@@ -116,6 +116,7 @@ public static async Task<UniImage> TryCreateAsync(object o, CancellationToken t
 			}
 
 		}, str, t);
+
 		str.TrySeek();
 
 		var query = new UniImage(o, str, qt)
@@ -181,7 +182,7 @@ public static bool IsFileType(object o, out FileInfo f)
 		return f != null;
 	}
 
-	public static bool IsValidSourceType(object str)
+	public static bool IsValidSourceType(object str, bool checkExt = true)
 	{
 		// UniSourceType v        = UniHandler.GetUniType(str, out object o2);
 		/*bool isFile   = UniSourceFile.IsType(str, out var f);
@@ -192,7 +193,8 @@ public static bool IsValidSourceType(object str)
 		bool isStream = IsStreamType(str, out var f3);
 		bool ok       = isFile || isUri || isStream;
 
-		if (isFile) {
+		if (isFile && checkExt) {
+			//todo
 			string ext = Path.GetExtension(str.ToString())?[1..];
 			return FileType.Image.Any(x => x.Subtype == ext);
 		}

SmartImage.Rdx/Program.cs

@@ -1,11 +1,14 @@
-using System.Collections.Concurrent;
+using System.Buffers;
+using System.Collections.Concurrent;
 using System.Diagnostics;
 using System.Reflection;
+using System.Runtime.InteropServices;
 using System.Text;
 using Kantan.Text;
 using Novus.Streams;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Formats;
+using SmartImage.Lib;
 using Spectre.Console;
 using Spectre.Console.Cli;
 using SmartImage.Rdx.Shell;
@@ -27,57 +30,63 @@ namespace SmartImage.Rdx;
 public static class Program
 {
 
+	private static readonly byte[] Utf8_Bom_Sig = new[]
+	{
+		(byte) 0xEF, (byte) 0xBB, (byte) 0xBF
+	};
+
+	public static string ReadInputStream(out bool isFile)
+	{
+
+		var path = Path.GetTempFileName();
+
+		using var fs = File.Open(path, FileMode.Truncate, FileAccess.Write);
+
+		using Stream stdin = Console.OpenStandardInput();
+
+		byte[] buffer = new byte[4096]; // Buffer to hold byte input
+		int    bytesRead;
+		int    iter = 0;
+
+		while ((bytesRead = stdin.Read(buffer, 0, buffer.Length)) > 0) {
+			if (iter == 0) {
+
+				if (buffer[0]    == Utf8_Bom_Sig[0]
+				    && buffer[1] == Utf8_Bom_Sig[1]
+				    && buffer[2] == Utf8_Bom_Sig[2]) {
+
+					buffer    =  buffer[3..];
+					bytesRead -= Utf8_Bom_Sig.Length;
+				}
+			}
+
+			fs.Write(buffer, 0, bytesRead);
+
+			iter++;
+		}
+
+		isFile = File.Exists(path);
+		fs.Flush();
+		fs.Dispose();
+
+		return path;
+	}
+
 	public static async Task<int> Main(string[] args)
 	{
 		Debug.WriteLine(AConsole.Profile.Height);
 		Debug.WriteLine(Console.BufferHeight);
 
 		if (Console.IsInputRedirected) {
-			// using var str = Console.OpenStandardInput(500);
-			Stream stdin = Console.OpenStandardInput(1000);
-			/*byte[] inBuffer = new byte[1_000_000];
-
-			int    outLen   = stdin.Read(inBuffer, 0, inBuffer.Length);
-			char[] chars    = Encoding.ASCII.GetChars(inBuffer, 0, outLen);
-			var cmd = new string(chars);
-			if ((cmd[cmd.Length - 2] == '\r') && (cmd[cmd.Length - 1] == '\n'))
-			{
-				cmd = cmd.Substring(0, cmd.Length - 2);
-			}*/
-			var          sr = new StreamReader(stdin);
-			int          n1 = 0, n2 = 0;
-			var sb = new char[8_000_000];
-
-			while (!sr.EndOfStream) {
-				/*if (sb[^2] == '\r' && sb[^1] == '\n') {
-					break;
-				}*/
-				n1 += (n2 = sr.Read(sb, n1, sb.Length - n1));
-
-				if (n2 == 0) {
-					break;
-				}
+			var pipeInput = ReadInputStream(out var isf);
 
-			}
-
-			sb = sb[..n1];
-
-			if (sb[^2] == '\r' && sb[^1] == '\n') {
-				sb = sb[0..^2];
-			}
+			// AConsole.WriteLine($"[{pipeInput}] {isf}");
 
-			IImageFormat fmt;
-			AConsole.WriteLine($"{sb.Length}");
+			var newargs = new string[args.Length + 1];
+			newargs[0] = pipeInput;
+			args.CopyTo(newargs, 1);
 
-			/*try {
-				fmt = await Image.DetectFormatAsync();
-			}
-			catch (Exception e) {
-				AConsole.WriteLine($"{e.Message}");
-			}
-			finally {
-				str.TrySeek();
-			}*/
+			args = newargs;
 		}
 
 		var ff = CliFormat.LoadFigletFontFromResource(nameof(R2.Fg_larry3d), out var ms);

SmartImage.Rdx/SearchCommand.cs

@@ -88,10 +88,6 @@ private async Task SetupSearchAsync(ProgressContext ctx)
 		var p = ctx.AddTask("Creating query");
 		p.IsIndeterminate = true;
 
-		if (m_scs.Raw) {
-			
-		}
-
 		Query = await SearchQuery.TryCreateAsync(m_scs.Query);
 
 		p.Increment(COMPLETE / 2);

SmartImage.Rdx/SearchCommandSettings.cs

@@ -83,20 +83,13 @@ internal sealed class SearchCommandSettings : CommandSettings
 
 	#endregion
 
-	public bool Raw { get; internal set; }
-	public byte[] Raw2 { get; internal set; }
-
 	// public const string PROP_ARG_RESULTS = "$all_results";
 
 	public override ValidationResult Validate()
 	{
 		var result = base.Validate();
 
-		if (String.IsNullOrWhiteSpace(Query)) {
-			
-		}
-
-		else if (!UniImage.IsValidSourceType(Query)) {
+		if (!UniImage.IsValidSourceType(Query, false)) {
 			return ValidationResult.Error("Invalid query");
 		}