Image scanning overhaul

Author: Decimation

SmartImage.Lib/SearchClient.cs

@@ -216,7 +216,7 @@ public ImageResult[] FindDirectResults()
 
 			best.AsParallel().ForAll(delegate(ImageResult f)
 			{
-				f.FindDirectImagesAsync();
+				f.FindDirectImages();
 			});
 
 			//foreach (var result in best) {

SmartImage.Lib/Searching/ImageResult.cs

@@ -186,31 +186,33 @@ public void UpdateFrom(ImageResult result)
 			Date        = result.Date;
 
 
-			ReadDirectImageData();
+			UpdateImageData();
 
 		}
 
-		public async void FindDirectImagesAsync()
+		public Image? Image { get; set; }
+
+		public void FindDirectImages()
 		{
 			if (Url is not null && Direct == null) {
 
 				if (ImageHelper.IsDirect(Url.ToString())) {
 					Direct = Url;
-					
+
 				}
 				else {
 					try {
 
-						string[]? directImages = await ImageHelper.FindDirectImagesAsync(Url.ToString());
+						//string[]? directImages = await ImageHelper.FindDirectImagesAsync(Url.ToString());
+						var directImages = ImageHelper.FindDirectImages(Url.ToString(), out var im);
 
-						if (directImages is { }) {
-							string? images = directImages.FirstOrDefault();
+						Image = im.First();
+						string? images = directImages?.FirstOrDefault();
 
-							if (images is { }) {
-								var uri = new Uri(images);
-								Direct = uri;
-								Debug.WriteLine($"{Url} -> {Direct}");
-							}
+						if (images != null) {
+							var uri = new Uri(images);
+							Direct = uri;
+							Debug.WriteLine($"{Url} -> {Direct}");
 						}
 					}
 					catch (Exception e) {
@@ -221,7 +223,7 @@ public async void FindDirectImagesAsync()
 
 
 				try {
-					ReadDirectImageData();
+					UpdateImageData();
 				}
 				catch (Exception) {
 					// ignored
@@ -230,20 +232,16 @@ public async void FindDirectImagesAsync()
 			}
 		}
 
-		private void ReadDirectImageData()
+		private void UpdateImageData()
 		{
-			if (Direct is { }) {
-				var stream = WebUtilities.GetStream(Direct.ToString());
-				var image  = Image.FromStream(stream);
-
-
-				Width  = image.Width;
-				Height = image.Height;
+			if (Image is { }) {
 
-				byte[] rg = stream.ToByteArray();
 
-				OtherMetadata.Add("Size", MathHelper.ConvertToUnit(rg.Length));
-				OtherMetadata.Add("Mime", MediaTypes.ResolveFromData(stream));
+				Width  = Image.Width;
+				Height = Image.Height;
+				//
+				// OtherMetadata.Add("Size", MathHelper.ConvertToUnit(rg.Length));
+				// OtherMetadata.Add("Mime", MediaTypes.ResolveFromData(rg));
 			}
 		}