RDX v1.0.5; upload error handling

Author: Decimation

SmartImage.Rdx/Program.cs

@@ -83,23 +83,29 @@ public static async Task<int> Main(string[] args)
 			c.PropagateExceptions();
 			var helpProvider = new CustomHelpProvider(c.Settings);
 			c.SetHelpProvider(helpProvider);
+
 			c.AddCommand<IntegrationCommand>("integrate")
 				.WithDescription("Configure system integration such as context menu");
 		});
 
-		try {
-			var x = await app.RunAsync(args);
+		int x = SearchCommand.EC_OK;
 
-			if (x != SearchCommand.EC_OK) {
-				AConsole.Confirm("Press any key to continue");
-			}
+		try {
+			x = await app.RunAsync(args);
 
-			return x;
 		}
 		catch (Exception e) {
 			AConsole.WriteException(e);
-			return SearchCommand.EC_ERROR;
+			x = SearchCommand.EC_ERROR;
 		}
+		finally {
+
+			if (x != SearchCommand.EC_OK) {
+				AConsole.Confirm("Press any key to continue");
+			}
+		}
+
+		return x;
 	}
 
 }

SmartImage.Rdx/SearchCommand.cs

@@ -65,7 +65,7 @@ internal sealed class SearchCommand : AsyncCommand<SearchCommandSettings>, IDisp
 	public const int EC_OK    = 0;
 
 	public static readonly Assembly Assembly = Assembly.GetExecutingAssembly();
-	public static readonly Version Version = Assembly.GetName().Version;
+	public static readonly Version  Version  = Assembly.GetName().Version;
 
 	public SearchCommand()
 	{
@@ -92,16 +92,19 @@ public SearchCommand()
 
 	#region
 
-	private async Task SetupSearchAsync(ProgressContext ctx)
+	private async Task<bool> SetupSearchAsync(ProgressContext ctx)
 	{
 		var p = ctx.AddTask("Creating query");
 		p.IsIndeterminate = true;
+		bool ok = true;
 
 		Query = await SearchQuery.TryCreateAsync(m_scs.Query);
 
 		if (Query == SearchQuery.Null) {
-			throw new SmartImageException($"Could not create query"); //todo
+			// throw new SmartImageException($"Could not create query"); //todo
 
+			ok = false;
+			goto ret;
 		}
 
 		p.Increment(COMPLETE / 2);
@@ -112,10 +115,15 @@ private async Task SetupSearchAsync(ProgressContext ctx)
 		var url = await Query.UploadAsync();
 
 		if (url == null) {
-			throw new SmartImageException("Could not upload query"); //todo
+			// throw new SmartImageException("Could not upload query"); //todo
+			ok = false;
+			goto ret;
 		}
 
 		p.Increment(COMPLETE / 2);
+
+	ret:
+		return ok;
 	}
 
 	private async Task InitConfigAsync([CBN] object c)
@@ -294,11 +302,17 @@ public override async Task<int> ExecuteAsync(CommandContext context, SearchComma
 
 		var task = AConsole.Progress()
 			.AutoRefresh(true)
-			.StartAsync(SetupSearchAsync)
-			.ContinueWith(InitConfigAsync);
+			.StartAsync(SetupSearchAsync);
 
 		try {
-			await task;
+			var ok = await task;
+
+			if (ok) {
+				await InitConfigAsync(ok);
+			}
+			else {
+				throw new SmartImageException("Could not upload query");
+			}
 		}
 		catch (Exception e) {
 			AConsole.WriteException(e);