Rdx 1.0.6; fixes

Author: Decimation

SmartImage.Lib 3/UniImage.cs renamed to SmartImage.Lib 3/Images/BinaryImageFile.cs

@@ -1,11 +1,12 @@
-// Author: Deci | Project: SmartImage.Lib | Name: UniImage.cs
+// Author: Deci | Project: SmartImage.Lib | Name: BinaryImageFile.cs
 // Date: 2024/05/02 @ 10:05:55
 
 using System.Diagnostics;
 using System.Net;
 using Flurl.Http;
 using JetBrains.Annotations;
 using Novus.FileTypes;
+using Novus.FileTypes.Uni;
 using Novus.Streams;
 using Novus.Win32;
 using SixLabors.ImageSharp;
@@ -14,9 +15,12 @@
 using SixLabors.ImageSharp.Processing;
 using SmartImage.Lib.Model;
 
-namespace SmartImage.Lib;
+namespace SmartImage.Lib.Images;
 
-public enum UniImageType
+/// <summary>
+/// <seealso cref="Novus.FileTypes.Uni.UniSourceType"/>
+/// </summary>
+public enum BinaryImageFileSource
 {
 
 	Unknown = 0,
@@ -26,14 +30,17 @@ public enum UniImageType
 
 }
 
-public class UniImage : IItemSize, IDisposable, IAsyncDisposable, IEquatable<UniImage>
+/// <summary>
+/// <seealso cref="Novus.FileTypes.Uni.UniSource"/>
+/// </summary>
+public class BinaryImageFile : IItemSize, IDisposable, IAsyncDisposable, IEquatable<BinaryImageFile>
 {
 
 	public Stream Stream { get; internal init; }
 
 	public object Value { get; internal init; }
 
-	public UniImageType Type { get; internal init; }
+	public BinaryImageFileSource Type { get; internal init; }
 
 	public long Size
 	{
@@ -65,44 +72,48 @@ public long Size
 	[MNNW(true, nameof(Info))]
 	public bool HasInfo => Info != null;
 
-	public bool IsUri => Type == UniImageType.Uri;
+	public bool IsUri => Type == BinaryImageFileSource.Uri;
 
-	public bool IsFile => Type == UniImageType.File;
+	public bool IsFile => Type == BinaryImageFileSource.File;
 
-	public bool IsStream => Type == UniImageType.Stream;
+	public bool IsStream => Type == BinaryImageFileSource.Stream;
 
-	public static readonly UniImage Null = new();
+	public static readonly BinaryImageFile Null = new();
 
-	internal UniImage(object value, Stream stream, UniImageType type)
+	internal BinaryImageFile(object value, Stream stream, BinaryImageFileSource type, IImageFormat format)
 	{
 		Stream = stream;
 		Value  = value;
 		Type   = type;
+		Info   = format;
 	}
 
-	private UniImage() : this(null, Stream.Null, UniImageType.Unknown) { }
+	internal BinaryImageFile(object value, Stream stream, BinaryImageFileSource type)
+		: this(value, stream, type, null) { }
 
-	public static async Task<UniImage> TryCreateAsync(object o, CancellationToken t = default)
+	private BinaryImageFile() : this(null, Stream.Null, BinaryImageFileSource.Unknown) { }
+
+	public static async Task<BinaryImageFile> TryCreateAsync(object o, CancellationToken t = default)
 	{
-		Stream       str;
-		IImageFormat fmt;
-		UniImageType qt;
-		string       s = null;
+		Stream                str;
+		IImageFormat          fmt;
+		BinaryImageFileSource qt;
+		string                s = null;
 
 		if (IsFileType(o, out var fi)) {
 			// var s = ((FileInfo) fi).FullName;
 			s   = (string) o;
 			str = File.OpenRead(s);
-			qt  = UniImageType.File;
+			qt  = BinaryImageFileSource.File;
 		}
 		else if (IsUriType(o, out var url2)) {
 			var res = await HandleUriAsync(url2, t);
 			str = await res.GetStreamAsync();
-			qt  = UniImageType.Uri;
+			qt  = BinaryImageFileSource.Uri;
 		}
 		else if (o is Stream) {
 			str = (Stream) o;
-			qt  = UniImageType.Stream;
+			qt  = BinaryImageFileSource.Stream;
 		}
 		else {
 			return Null;
@@ -114,9 +125,8 @@ public static async Task<UniImage> TryCreateAsync(object o, CancellationToken t
 
 		str.TrySeek();
 
-		var query = new UniImage(o, str, qt)
+		var query = new BinaryImageFile(o, str, qt, fmt)
 		{
-			Info     = fmt,
 			FilePath = s
 		};
 
@@ -131,7 +141,7 @@ public static async Task<IFlurlResponse> HandleUriAsync(Url value, CancellationT
 			          .WithHeaders(new
 			          {
 				          // todo
-				          User_Agent = Resources.UserAgent1,
+				          User_Agent = R1.UserAgent1,
 			          })
 			          .GetAsync(cancellationToken: ct);
 
@@ -256,7 +266,7 @@ public string WriteToFile(string fn = null)
 		string t;
 		fn ??= Path.GetTempFileName();
 
-		if (Type != UniImageType.File) {
+		if (Type != BinaryImageFileSource.File) {
 			t = Path.Combine(Path.GetTempPath(), fn);
 
 			using FileStream fs = File.Create(t);
@@ -303,7 +313,7 @@ public override string ToString()
 
 	#region Equality members
 
-	public bool Equals(UniImage other)
+	public bool Equals(BinaryImageFile other)
 	{
 		if (ReferenceEquals(null, other)) return false;
 		if (ReferenceEquals(this, other)) return true;
@@ -313,7 +323,7 @@ public bool Equals(UniImage other)
 
 	public override bool Equals(object obj)
 	{
-		return ReferenceEquals(this, obj) || (obj is UniImage other && Equals(other));
+		return ReferenceEquals(this, obj) || obj is BinaryImageFile other && Equals(other);
 	}
 
 	public override int GetHashCode()
@@ -324,12 +334,12 @@ public override int GetHashCode()
 		// return Uni.GetHashCode();
 	}
 
-	public static bool operator ==(UniImage left, UniImage right)
+	public static bool operator ==(BinaryImageFile left, BinaryImageFile right)
 	{
 		return Equals(left, right);
 	}
 
-	public static bool operator !=(UniImage left, UniImage right)
+	public static bool operator !=(BinaryImageFile left, BinaryImageFile right)
 	{
 		return !Equals(left, right);
 	}

SmartImage.Lib 3/Images/GenericImageFilter.cs

@@ -0,0 +1,54 @@
+// Author: Deci | Project: SmartImage.Lib | Name: GenericImageFilter.cs
+// Date: 2024/05/02 @ 11:05:10
+
+using System.Diagnostics;
+
+namespace SmartImage.Lib.Images;
+
+public class GenericImageFilter : IImageFilter
+{
+    // TODO
+
+    public string[] Blacklist
+        =>
+        [
+            "thumbnail", "avatar", "error", "logo"
+        ];
+
+    public bool Predicate(BinaryImageFile us)
+    {
+        try
+        {
+            if (us.Stream.Length <= 25_000 || us.Info.DefaultMimeType == null)
+            {
+                return false;
+            }
+
+            return true;
+        }
+        catch (Exception e)
+        {
+            Debug.WriteLine($"{e.Message}", nameof(Predicate));
+            return true;
+        }
+    }
+
+    public bool Refine(string b)
+    {
+        if (!Url.IsValid(b))
+        {
+            return false;
+        }
+
+        var u = Url.Parse(b);
+        var ps = u.PathSegments;
+
+        if (ps.Any())
+        {
+            return !Blacklist.Any(i => ps.Any(p => p.Contains(i, StringComparison.InvariantCultureIgnoreCase)));
+        }
+
+        return true;
+    }
+
+}

SmartImage.Lib 3/Images/IImageFilter.cs

@@ -0,0 +1,16 @@
+// Author: Deci | Project: SmartImage.Lib | Name: IImageFilter.cs
+// Date: 2024/05/02 @ 11:05:28
+
+namespace SmartImage.Lib.Images;
+// todo
+
+public interface IImageFilter
+{
+
+    public string[] Blacklist { get; }
+
+    public bool Refine(string b);
+
+    public bool Predicate(BinaryImageFile us);
+
+}

SmartImage.Lib 3/Utilities/ImageScanner.cs renamed to SmartImage.Lib 3/Images/ImageScanner.cs

@@ -3,25 +3,33 @@
 
 using System.Collections.Concurrent;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using AngleSharp.Html.Parser;
 using Flurl.Http;
 using Kantan.Net.Utilities;
 using Novus.FileTypes;
 using Novus.FileTypes.Uni;
 using Novus.OS;
 using Novus.Utilities;
-using SmartImage.Lib.Model;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.PixelFormats;
+using SmartImage.Lib.Results;
+using SmartImage.Lib.Utilities;
 
-namespace SmartImage.Lib.Utilities;
+namespace SmartImage.Lib.Images;
 
 public static class ImageScanner
 {
 
 	/*public static readonly BaseImageHost[] All =
 		ReflectionHelper.CreateAllInAssembly<BaseImageHost>(InheritanceProperties.Subclass).ToArray();*/
 
-	public static async Task<UniImage[]> ScanAsync(Url u, IImageFilter filter = null,
-	                                               CancellationToken ct = default)
+	/// <summary>
+	/// Scans for images within the webpage located at <paramref name="u"/>; if <paramref name="u"/> itself
+	/// points to binary image data, it is returned.
+	/// </summary>
+	public static async Task<BinaryImageFile[]> ScanImagesAsync(Url u, IImageFilter filter = null,
+	                                                       CancellationToken ct = default)
 	{
 		IFlurlResponse res;
 		Stream         stream;
@@ -49,9 +57,9 @@ public static async Task<UniImage[]> ScanAsync(Url u, IImageFilter filter = null
 			return [];
 		}
 
-		var ul = new ConcurrentBag<UniImage>();
+		var ul = new ConcurrentBag<BinaryImageFile>();
 		stream = await res.GetStreamAsync();
-		var uf = await UniImage.TryCreateAsync(stream, t: ct);
+		var uf = await BinaryImageFile.TryCreateAsync(stream, t: ct);
 
 		if (uf != null) {
 			/*if (!FileType.Image.Contains(uf.FileType)) {
@@ -90,14 +98,14 @@ public static async Task<UniImage[]> ScanAsync(Url u, IImageFilter filter = null
 
 		await Parallel.ForEachAsync(c, po, async (s, token) =>
 		{
-			var ux = await UniImage.TryCreateAsync(s, t: token);
+			var ux = await BinaryImageFile.TryCreateAsync(s, t: token);
 
 			if (ux != null) {
 				/*if (!FileType.Image.Contains(ux.FileType)) {
 					ux?.Dispose();
 					return;
 				}*/
-				// Debug.WriteLine($"Found {ux.Value} for {u}", nameof(ScanAsync));
+				// Debug.WriteLine($"Found {ux.Value} for {u}", nameof(ScanForEmbeddedImagesAsync));
 				if (filter.Predicate(ux)) {
 					ul.Add(ux);
 
@@ -133,7 +141,8 @@ public static bool UniSourcePredicate(UniSource us)
 		}
 	}
 
-	public static async Task<UniImage[]> RunGalleryAsync(Url cri, CancellationToken ct = default)
+	// todo
+	public static async Task<BinaryImageFile[]> RunGalleryAsync(Url cri, CancellationToken ct = default)
 	{
 		using var p = Process.Start(new ProcessStartInfo("gallery-dl", $"-G {cri}")
 		{
@@ -144,11 +153,11 @@ public static async Task<UniImage[]> RunGalleryAsync(Url cri, CancellationToken
 		await p.WaitForExitAsync(ct);
 		var s  = await p.StandardOutput.ReadToEndAsync(ct);
 		var s2 = s.Split(Environment.NewLine);
-		var rg = new ConcurrentBag<UniImage>();
+		var rg = new ConcurrentBag<BinaryImageFile>();
 
 		await Parallel.ForEachAsync(s2, ct, async (s1, token) =>
 		{
-			var uni = await UniImage.TryCreateAsync(s1, t: token);
+			var uni = await BinaryImageFile.TryCreateAsync(s1, t: token);
 
 			if (uni != null) {
 				rg.Add(uni);