Testing

Decimation · Decimation · commit a245c10d0e5d · 2023-06-04T13:32:54.000-05:00
diff --git a/SmartImage 3/Mode/Shell/Assets/UI.Styles.cs b/SmartImage 3/Mode/Shell/Assets/UI.Styles.cs
@@ -2,7 +2,7 @@
 // 2023-02-14 @ 12:12 AM
 
 #region
-
+using Color = Terminal.Gui.Color;
 using System.Runtime.Caching;
 using AngleSharp.Dom;
 using Terminal.Gui;
diff --git a/SmartImage 3/Mode/Shell/Assets/UI.cs b/SmartImage 3/Mode/Shell/Assets/UI.cs
@@ -12,7 +12,7 @@
 using SmartImage.Lib.Engines;
 using Terminal.Gui;
 using Attribute = Terminal.Gui.Attribute;
-
+using Color=Terminal.Gui.Color;
 #endregion
 
 // ReSharper disable InconsistentNaming
diff --git a/SmartImage 3/Mode/Shell/ShellMode.Handlers.cs b/SmartImage 3/Mode/Shell/ShellMode.Handlers.cs
@@ -1,6 +1,7 @@
 ﻿// Read S SmartImage ShellMode.Handlers.cs
 // 2023-02-14 @ 12:13 AM
 
+using Color = Terminal.Gui.Color;
 using System.Collections;
 using System.Collections.Concurrent;
 using System.Data;
@@ -31,8 +32,9 @@ namespace SmartImage.Mode.Shell;
 
 public sealed partial class ShellMode
 {
-	private const           int                                   INDEX   = 1;
-	private const           int                                   INV     = -1;
+	private const int INDEX = 1;
+	private const int INV   = -1;
+
 	private static readonly ConcurrentDictionary<object, ustring> Message = new();
 
 	/// <summary>
@@ -117,7 +119,7 @@ private void Restart_Clicked(bool force = false)
 		Tf_Input.EnsureFocus();
 
 		_keyPressHandling = false;
-		_inputVerifying = false;
+		_inputVerifying   = false;
 	}
 
 	/// <summary>
diff --git a/SmartImage 3/Program.cs b/SmartImage 3/Program.cs
@@ -5,6 +5,8 @@
 
 #region
 
+global using IColor = SixLabors.ImageSharp.Color;
+global using IImage = SixLabors.ImageSharp.Image;
 global using static Kantan.Diagnostics.LogCategories;
 using System.CommandLine;
 using System.ComponentModel;
@@ -139,5 +141,7 @@ public static async Task<int> Main(string[] args)
 
 			return ConsoleUtil.CODE_OK;
 		}
+
 	}
+
 }
diff --git a/SmartImage 3/SmartImage.csproj b/SmartImage 3/SmartImage.csproj
@@ -73,6 +73,7 @@
     <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
     <PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.2" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.0.1" />
     <PackageReference Include="Spectre.Console" Version="0.47.0" />
     <PackageReference Include="Spectre.Console.Analyzer" Version="0.47.0">
       <PrivateAssets>all</PrivateAssets>
diff --git a/SmartImage.Lib 3/Engines/BaseSearchEngine.cs b/SmartImage.Lib 3/Engines/BaseSearchEngine.cs
@@ -1,4 +1,5 @@
 ﻿global using Url = Flurl.Url;
+using Image = System.Drawing.Image;
 using System.Diagnostics;
 using System.Drawing;
 using System.Json;
@@ -80,7 +81,8 @@ public virtual async Task<SearchResult> GetResultAsync(SearchQuery query, Cancel
 		var res = new SearchResult(this)
 		{
 			RawUrl = await GetRawUrlAsync(query),
-			Status = !b ? SearchResultStatus.IllegalInput : SearchResultStatus.None
+			Status = !b ? SearchResultStatus.IllegalInput : SearchResultStatus.None,
+			ErrorMessage = $"Engine restriction"
 		};
 
 		Debug.WriteLine($"{query} - {res.Status}", nameof(GetResultAsync));
diff --git a/SmartImage.Lib 3/Engines/Impl/Search/Ascii2DEngine.cs b/SmartImage.Lib 3/Engines/Impl/Search/Ascii2DEngine.cs
@@ -7,7 +7,7 @@
 using Flurl.Http;
 using Kantan.Net.Utilities;
 using SmartImage.Lib.Results;
-
+using Image=System.Drawing.Image;
 // ReSharper disable CognitiveComplexity
 
 // ReSharper disable IdentifierTypo
@@ -27,7 +27,7 @@ public Ascii2DEngine() : base("https://ascii2d.net/search/url/")
 
 	protected override string NodesSelector => Serialization.S_Ascii2D_Images;
 
-	public override SearchEngineOptions EngineOption => SearchEngineOptions.Ascii2D;
+	public override    SearchEngineOptions EngineOption          => SearchEngineOptions.Ascii2D;
 
 	protected override bool VerifyImage(Image i)
 	{
diff --git a/SmartImage.Lib 3/Engines/Impl/Upload/BaseUploadEngine.cs b/SmartImage.Lib 3/Engines/Impl/Upload/BaseUploadEngine.cs
@@ -1,5 +1,6 @@
 ﻿using System.Diagnostics;
 using System.Net.NetworkInformation;
+using System.Reflection.PortableExecutable;
 using Flurl.Http;
 using Novus.OS;
 using Novus.Utilities;
@@ -12,7 +13,7 @@ public abstract class BaseUploadEngine : IEndpoint
 	/// <summary>
 	/// Max file size, in bytes
 	/// </summary>
-	public abstract int MaxSize { get; }
+	public abstract long MaxSize { get; }
 
 	public abstract string Name { get; }
 
@@ -78,6 +79,7 @@ public override async Task<BaseUploadResponse> UploadFileAsync(string file, Canc
 	protected override async Task<BaseUploadResponse> VerifyResultAsync(
 		IFlurlResponse response, CancellationToken ct = default)
 	{
+		
 		var responseMessage = response.ResponseMessage;
 
 		var url = await responseMessage.Content.ReadAsStringAsync(ct);
@@ -87,10 +89,8 @@ protected override async Task<BaseUploadResponse> VerifyResultAsync(
 		if (Paranoid) {
 			var r2 = await url.GetAsync(ct);
 
-			if (r2.Headers.TryGetFirst("Content-Length", out var cls)) {
-				if (int.Parse(cls) == 0) {
-					ok = false;
-				}
+			if (NetHelper.GetContentLength(r2) == 0) {
+				ok = false;
 			}
 
 		}
diff --git a/SmartImage.Lib 3/Engines/Impl/Upload/CatboxEngine.cs b/SmartImage.Lib 3/Engines/Impl/Upload/CatboxEngine.cs
@@ -7,7 +7,7 @@ public sealed class CatboxEngine : BaseCatboxEngine
 
 	public override string Name => "Catbox";
 
-	public override int MaxSize => 1 * 1000 * 1000 * 200;
+	public override long MaxSize => 1 * 1000 * 1000 * 200;
 
 	public CatboxEngine() : base("https://catbox.moe/user/api.php")
 	{
diff --git a/SmartImage.Lib 3/Engines/Impl/Upload/LitterboxEngine.cs b/SmartImage.Lib 3/Engines/Impl/Upload/LitterboxEngine.cs
@@ -10,7 +10,7 @@ public sealed class LitterboxEngine : BaseCatboxEngine
 {
 	public override string Name => "Litterbox";
 
-	public override int MaxSize => 1 * 1000 * 1000 * 1000;
+	public override long MaxSize => 1 * 1000 * 1000 * 1000;
 
 	public LitterboxEngine() : base("https://litterbox.catbox.moe/resources/internals/api.php") { }
 }
diff --git a/SmartImage.Lib 3/SearchClient.cs b/SmartImage.Lib 3/SearchClient.cs
@@ -1,4 +1,6 @@
-﻿global using ICBN = JetBrains.Annotations.ItemCanBeNullAttribute;
+﻿global using IColor = SixLabors.ImageSharp.Color;
+global using IImage = SixLabors.ImageSharp.Image;
+global using ICBN = JetBrains.Annotations.ItemCanBeNullAttribute;
 using System.Collections;
 using System.Collections.Concurrent;
 using System.Diagnostics;
diff --git a/SmartImage.Lib 3/SearchConfig.cs b/SmartImage.Lib 3/SearchConfig.cs
@@ -7,7 +7,7 @@
 using Kantan.Utilities;
 using SmartImage.Lib.Engines;
 using SmartImage.Lib.Engines.Impl.Search;
-
+using Configuration = System.Configuration.Configuration;
 namespace SmartImage.Lib;
 
 public sealed class SearchConfig : IDataTable, INotifyPropertyChanged
diff --git a/SmartImage.Lib 3/SearchQuery.cs b/SmartImage.Lib 3/SearchQuery.cs
@@ -12,6 +12,7 @@
 using SmartImage.Lib.Engines;
 using SmartImage.Lib.Engines.Impl.Upload;
 using SmartImage.Lib.Utilities;
+using Image = System.Drawing.Image;
 
 [assembly: InternalsVisibleTo("SmartImage")]
 
@@ -42,6 +43,18 @@ public static async Task<SearchQuery> TryCreateAsync(string value)
 	{
 		var uf = await UniSource.TryGetAsync(value, whitelist: FileType.Image);
 
+		if (uf != null) {
+			if (uf.IsFile) {
+				var f  = uf.Value.ToString();
+				var f2 = await test(f);
+				Debug.WriteLine($"replacing {f} with {f2}");
+				if (f!=f2) {
+					uf.Dispose();
+					uf = await UniSource.TryGetAsync(f2, whitelist: FileType.Image);
+				}
+			}
+		}
+
 		var sq = new SearchQuery(uf)
 			{ };
 
@@ -51,26 +64,28 @@ public static async Task<SearchQuery> TryCreateAsync(string value)
 	public async Task<Url> UploadAsync(BaseUploadEngine engine = null, CancellationToken ct = default)
 	{
 
+		var fu = Uni.Value.ToString();
+
 		if (Uni.IsUri) {
-			Upload = Uni.Value.ToString();
+			Upload = fu;
 			Size   = BaseSearchEngine.NA_SIZE;
 			Debug.WriteLine($"Skipping upload for {Uni.Value}", nameof(UploadAsync));
 		}
 		else {
+			// fu = await test(fu);
+
 			engine ??= BaseUploadEngine.Default;
 
-			retry:
-			var u = await engine.UploadFileAsync(Uni.Value.ToString(), ct);
+			var u = await engine.UploadFileAsync(fu, ct);
 
-			if (!u.IsValid) {
+			/*if (!u.IsValid) {
 				engine = BaseUploadEngine.All[Array.IndexOf(BaseUploadEngine.All, engine) + 1];
 				Debug.WriteLine($"{u.Response.ResponseMessage} failed, retrying with {engine.Name}");
-				u.Dispose();
-				goto retry;
-			}
+				u = await engine.UploadFileAsync(Uni.Value.ToString(), ct);
+			}*/
 
 			Upload = u.Url;
-			Size   = engine.Size;
+			Size   = NetHelper.GetContentLength(u.Response) ?? 0;
 			u.Dispose();
 		}
 
@@ -198,4 +213,25 @@ public override int GetHashCode()
 
 		return (t, b);
 	}
+
+	public static async Task<string> test(string fi)
+	{
+		using var im = await SixLabors.ImageSharp.Image.LoadAsync(fi);
+		var       m  = im.Metadata;
+
+		string fn = fi;
+
+		if (m.XmpProfile is { } || m.ExifProfile is { }) {
+			Debug.WriteLine($"metadata found");
+			m.XmpProfile  = null;
+			m.ExifProfile = null;
+			fn            = Path.GetFileNameWithoutExtension(fi) + "_1" + Path.GetExtension(fi);
+
+			await im.SaveAsync(fn);
+		}
+		else { }
+
+		return fn;
+	}
+	
 }
diff --git a/SmartImage.Lib 3/SmartImage.Lib.csproj b/SmartImage.Lib 3/SmartImage.Lib.csproj
@@ -50,6 +50,7 @@
     <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.0.1" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
     <PackageReference Include="System.Json" Version="4.7.1" />
     <PackageReference Include="System.Runtime.Caching" Version="7.0.0" />
diff --git a/SmartImage.Lib 3/Utilities/NetHelper.cs b/SmartImage.Lib 3/Utilities/NetHelper.cs
@@ -2,10 +2,11 @@
 // 2023-01-13 @ 11:37 PM
 
 using AngleSharp.Dom;
+using Flurl.Http;
 
 namespace SmartImage.Lib.Utilities;
 
-internal static class NodeHelper
+internal static class NetHelper
 {
 	internal static INode TryFindSingleElementByClassName(this INodeList nodes, string className)
 	{
@@ -17,4 +18,9 @@ internal static INode[] TryFindElementsByClassName(this INodeList nodes, string
 		return nodes.Where(f => f is IElement e && e.ClassName == className).ToArray();
 	}
 
+	public static long? GetContentLength(IFlurlResponse r)
+	{
+		return r.Headers.TryGetFirst("Content-Length", out var cls) ? long.Parse(cls) : null;
+
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`
`6`	`6`	`#region`
`7`	`7`
	`8`	`+global using IColor = SixLabors.ImageSharp.Color;`
	`9`	`+global using IImage = SixLabors.ImageSharp.Image;`
`8`	`10`	`global using static Kantan.Diagnostics.LogCategories;`
`9`	`11`	`using System.CommandLine;`
`10`	`12`	`using System.ComponentModel;`
`@@ -139,5 +141,7 @@ public static async Task<int> Main(string[] args)`
`139`	`141`
`140`	`142`	`return ConsoleUtil.CODE_OK;`
`141`	`143`	`}`
	`144`	`+`
`142`	`145`	`}`
	`146`	`+`
`143`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ public sealed class CatboxEngine : BaseCatboxEngine`
`7`	`7`
`8`	`8`	`public override string Name => "Catbox";`
`9`	`9`
`10`		`- public override int MaxSize => 1 * 1000 * 1000 * 200;`
	`10`	`+ public override long MaxSize => 1 * 1000 * 1000 * 200;`
`11`	`11`
`12`	`12`	`public CatboxEngine() : base("https://catbox.moe/user/api.php")`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public sealed class LitterboxEngine : BaseCatboxEngine`
`10`	`10`	`{`
`11`	`11`	`public override string Name => "Litterbox";`
`12`	`12`
`13`		`- public override int MaxSize => 1 * 1000 * 1000 * 1000;`
	`13`	`+ public override long MaxSize => 1 * 1000 * 1000 * 1000;`
`14`	`14`
`15`	`15`	`public LitterboxEngine() : base("https://litterbox.catbox.moe/resources/internals/api.php") { }`
`16`	`16`	`}`