Add upload engine backup error handling

Author: Decimation

SmartImage.Lib 3/Engines/Impl/Upload/BaseUploadEngine.cs

@@ -25,7 +25,7 @@ protected BaseUploadEngine(string s)
 
 	// public static BaseUploadEngine Default { get; } = new LitterboxEngine();
 
-	public abstract Task<Url> UploadFileAsync(string file, CancellationToken ct = default);
+	public abstract Task<BaseUploadResponse> UploadFileAsync(string file, CancellationToken ct = default);
 
 	public long Size { get; set; }
 
@@ -37,6 +37,11 @@ private protected bool IsFileSizeValid(string file)
 		return !b;
 	}
 
+	protected bool Paranoid { get; set; }
+
+	protected abstract Task<BaseUploadResponse> VerifyResultAsync(IFlurlResponse response,
+	                                                              CancellationToken ct = default);
+
 	protected void Verify(string file)
 	{
 		if (string.IsNullOrWhiteSpace(file)) {
@@ -56,22 +61,46 @@ protected void Verify(string file)
 
 public abstract class BaseCatboxEngine : BaseUploadEngine
 {
-	public override async Task<Url> UploadFileAsync(string file, CancellationToken ct = default)
+	public override async Task<BaseUploadResponse> UploadFileAsync(string file, CancellationToken ct = default)
 	{
 		Verify(file);
 
-		using var response = await EndpointUrl
-			                     .PostMultipartAsync(mp =>
-				                                         mp.AddFile("fileToUpload", file)
-					                                         .AddString("reqtype", "fileupload")
-					                                         .AddString("time", "1h")
-			                                         , ct);
+		var response = await EndpointUrl
+			               .PostMultipartAsync(mp =>
+				                                   mp.AddFile("fileToUpload", file)
+					                                   .AddString("reqtype", "fileupload")
+					                                   .AddString("time", "1h")
+			                                   , ct);
+
+		return await VerifyResultAsync(response, ct).ConfigureAwait(false);
+	}
 
+	protected override async Task<BaseUploadResponse> VerifyResultAsync(
+		IFlurlResponse response, CancellationToken ct = default)
+	{
 		var responseMessage = response.ResponseMessage;
 
-		var content = await responseMessage.Content.ReadAsStringAsync(ct);
-		
-		return new(content);
+		var url = await responseMessage.Content.ReadAsStringAsync(ct);
+
+		bool ok = true;
+
+		if (Paranoid) {
+			var r2 = await url.GetAsync(ct);
+
+			if (r2.Headers.TryGetFirst("Content-Length", out var cls)) {
+				if (int.Parse(cls) == 0) {
+					ok = false;
+				}
+			}
+
+		}
+
+		return new()
+		{
+			Url      = url,
+			Response = response,
+			IsValid  = ok
+		};
 	}
 
 	protected BaseCatboxEngine(string s) : base(s) { }

SmartImage.Lib 3/Engines/Impl/Upload/BaseUploadResponse.cs

@@ -0,0 +1,20 @@
+// Read S SmartImage.Lib BaseUploadResponse.cs
+// 2023-05-28 @ 7:49 PM
+
+using Flurl.Http;
+
+namespace SmartImage.Lib.Engines.Impl.Upload;
+
+public sealed class BaseUploadResponse : IDisposable
+{
+	public Url Url { get; init; }
+
+	public IFlurlResponse Response { get; init; }
+
+	public bool IsValid { get; init; }
+
+	public void Dispose()
+	{
+		Response.Dispose();
+	}
+}

SmartImage.Lib 3/Engines/Impl/Upload/CatboxEngine.cs

@@ -4,9 +4,14 @@ namespace SmartImage.Lib.Engines.Impl.Upload;
 
 public sealed class CatboxEngine : BaseCatboxEngine
 {
+
 	public override string Name => "Catbox";
 
 	public override int MaxSize => 1 * 1000 * 1000 * 200;
 
-	public CatboxEngine() : base("https://catbox.moe/user/api.php") { }
+	public CatboxEngine() : base("https://catbox.moe/user/api.php")
+	{
+		Paranoid = true;
+	}
+
 }

SmartImage.Lib 3/SearchClient.cs

@@ -229,14 +229,7 @@ public BaseSearchEngine[] LoadEngines()
 	public static ValueTask<IReadOnlyList<SearchResultItem>> Filter(IEnumerable<SearchResultItem> sri)
 	{
 		var sri2 = sri.AsParallel().DistinctBy(e => e.Url).ToList();
-
-		/*Parallel.ForEachAsync(sri2, async (item, token) =>
-		{
-			var r = await item.Url.AllowAnyHttpStatus().GetAsync();
-
-			if (r.ResponseMessage.IsSuccessStatusCode) { }
-		});*/
-
+		
 		return ValueTask.FromResult<IReadOnlyList<SearchResultItem>>(sri2);
 	}
 
@@ -263,6 +256,7 @@ public static IReadOnlyList<SearchResultItem> Optimize(IEnumerable<SearchResultI
 
 	public static async Task<IReadOnlyList<UniSource>> GetDirectImagesAsync(IEnumerable<SearchResultItem> sri)
 	{
+		//
 		var filter = Optimize(sri)
 			.DistinctBy(r => r.Url)
 			// .Where(r => r.Score >= SearchResultItem.SCORE_THRESHOLD) // probably can be removed/reduced

SmartImage.Lib 3/SearchQuery.cs

@@ -33,7 +33,7 @@ internal SearchQuery([MN] UniSource f)
 	{
 		Uni = f;
 	}
-	
+
 	public static readonly SearchQuery Null = new(null);
 
 	static SearchQuery() { }
@@ -59,9 +59,19 @@ public async Task<Url> UploadAsync(BaseUploadEngine engine = null, CancellationT
 		else {
 			engine ??= BaseUploadEngine.Default;
 
+			retry:
 			var u = await engine.UploadFileAsync(Uni.Value.ToString(), ct);
-			Upload = u;
+
+			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;
+			}
+
+			Upload = u.Url;
 			Size   = engine.Size;
+			u.Dispose();
 		}
 
 		return Upload;
@@ -100,7 +110,7 @@ public void Dispose()
 		if (OperatingSystem.IsWindows()) {
 			Image?.Dispose();
 		}
-		
+
 		Uni?.Dispose();
 	}