Fix sloppy error handling when component fails to download

WumboSpasm · WumboSpasm · commit 37bf32459367 · 2023-07-06T20:17:43.000-04:00
diff --git a/FlashpointInstaller/src/Forms/Operate.cs b/FlashpointInstaller/src/Forms/Operate.cs
@@ -61,10 +61,19 @@ private async void Operation_Load(object sender, EventArgs e)
                     {
                         stream = new MemoryStream(await client.DownloadDataTaskAsync(new Uri(component.URL)));
                     }
-                    catch (WebException ex) when (ex.Status == WebExceptionStatus.RequestCanceled)
+                    catch (WebException ex)
                     {
-                        client.Dispose();
+                        if (ex.Status != WebExceptionStatus.RequestCanceled)
+                        {
+                            MessageBox.Show(
+                                $"The {workingComponent.Title} component failed to download.\n\n" +
+                                "If this issue persists, please let us know as soon as possible.",
+                                "Error", MessageBoxButtons.OK, MessageBoxIcon.Error
+                            );
+                        }
+
                         cancelStatus = 2;
+                        CancelButton.PerformClick();
                         return;
                     }
                 }
@@ -253,7 +262,7 @@ await Task.Run(() =>
 
         private async void CancelButton_Click(object sender, EventArgs e)
         {
-            cancelStatus = 1;
+            if (cancelStatus < 1) cancelStatus = 1;
 
             CancelButton.Enabled = false;
             ProgressLabel.Invoke((MethodInvoker)delegate
diff --git a/FlashpointManager/src/Forms/Operate.cs b/FlashpointManager/src/Forms/Operate.cs
@@ -96,10 +96,18 @@ private async void Operation_Load(object sender, EventArgs e)
                     {
                         stream = new MemoryStream(await client.DownloadDataTaskAsync(new Uri(component.URL)));
                     }
-                    catch (WebException ex) when (ex.Status == WebExceptionStatus.RequestCanceled)
+                    catch (WebException ex)
                     {
-                        client.Dispose();
+                        if (ex.Status != WebExceptionStatus.RequestCanceled)
+                        {
+                            FPM.GenericError(
+                                $"The {workingComponent.Title} component failed to download.\n\n" +
+                                "If this issue persists, please let us know as soon as possible."
+                            );
+                        }
+
                         cancelStatus = 2;
+                        CancelButton.PerformClick();
                         return;
                     }
                 }
@@ -325,7 +333,7 @@ void MoveDelete(string source, string dest)
 
         private async void CancelButton_Click(object sender, EventArgs e)
         {
-            cancelStatus = 1;
+            if (cancelStatus < 1) cancelStatus = 1;
 
             CancelButton.Enabled = false;
             ProgressLabel.Invoke((MethodInvoker)delegate

Original file line number	Diff line number	Diff line change
`@@ -61,10 +61,19 @@ private async void Operation_Load(object sender, EventArgs e)`
`61`	`61`	`{`
`62`	`62`	`stream = new MemoryStream(await client.DownloadDataTaskAsync(new Uri(component.URL)));`
`63`	`63`	`}`
`64`		`- catch (WebException ex) when (ex.Status == WebExceptionStatus.RequestCanceled)`
	`64`	`+ catch (WebException ex)`
`65`	`65`	`{`
`66`		`- client.Dispose();`
	`66`	`+ if (ex.Status != WebExceptionStatus.RequestCanceled)`
	`67`	`+ {`
	`68`	`+ MessageBox.Show(`
	`69`	`+ $"The {workingComponent.Title} component failed to download.\n\n" +`
	`70`	`+ "If this issue persists, please let us know as soon as possible.",`
	`71`	`+ "Error", MessageBoxButtons.OK, MessageBoxIcon.Error`
	`72`	`+ );`
	`73`	`+ }`
	`74`	`+`
`67`	`75`	`cancelStatus = 2;`
	`76`	`+ CancelButton.PerformClick();`
`68`	`77`	`return;`
`69`	`78`	`}`
`70`	`79`	`}`
`@@ -253,7 +262,7 @@ await Task.Run(() =>`
`253`	`262`
`254`	`263`	`private async void CancelButton_Click(object sender, EventArgs e)`
`255`	`264`	`{`
`256`		`- cancelStatus = 1;`
	`265`	`+ if (cancelStatus < 1) cancelStatus = 1;`
`257`	`266`
`258`	`267`	`CancelButton.Enabled = false;`
`259`	`268`	`ProgressLabel.Invoke((MethodInvoker)delegate`
Original file line number	Diff line number	Diff line change
`@@ -96,10 +96,18 @@ private async void Operation_Load(object sender, EventArgs e)`
`96`	`96`	`{`
`97`	`97`	`stream = new MemoryStream(await client.DownloadDataTaskAsync(new Uri(component.URL)));`
`98`	`98`	`}`
`99`		`- catch (WebException ex) when (ex.Status == WebExceptionStatus.RequestCanceled)`
	`99`	`+ catch (WebException ex)`
`100`	`100`	`{`
`101`		`- client.Dispose();`
	`101`	`+ if (ex.Status != WebExceptionStatus.RequestCanceled)`
	`102`	`+ {`
	`103`	`+ FPM.GenericError(`
	`104`	`+ $"The {workingComponent.Title} component failed to download.\n\n" +`
	`105`	`+ "If this issue persists, please let us know as soon as possible."`
	`106`	`+ );`
	`107`	`+ }`
	`108`	`+`
`102`	`109`	`cancelStatus = 2;`
	`110`	`+ CancelButton.PerformClick();`
`103`	`111`	`return;`
`104`	`112`	`}`
`105`	`113`	`}`
`@@ -325,7 +333,7 @@ void MoveDelete(string source, string dest)`
`325`	`333`
`326`	`334`	`private async void CancelButton_Click(object sender, EventArgs e)`
`327`	`335`	`{`
`328`		`- cancelStatus = 1;`
	`336`	`+ if (cancelStatus < 1) cancelStatus = 1;`
`329`	`337`
`330`	`338`	`CancelButton.Enabled = false;`
`331`	`339`	`ProgressLabel.Invoke((MethodInvoker)delegate`