Code style fixes to {FFmpeg,RAIntegration}DownloaderForm

Author: YoshiRulz

src/BizHawk.Client.EmuHawk/AVOut/FFmpegDownloaderForm.cs

@@ -1,5 +1,7 @@
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Net;
 using System.Threading;
 using System.Windows.Forms;
 
@@ -44,24 +46,16 @@ private void Download()
 				using var fs = File.Create(FFmpegService.FFmpegPath); // check writable before bothering with the download
 				using (var evt = new ManualResetEvent(false))
 				{
-					using (var client = new System.Net.WebClient())
+					using (var client = new WebClient())
 					{
-						System.Net.ServicePointManager.SecurityProtocol = System.Net.SecurityProtocolType.Tls12;
+						ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
 						client.DownloadFileAsync(new Uri(FFmpegService.Url), fn);
-						client.DownloadProgressChanged += (object sender, System.Net.DownloadProgressChangedEventArgs e) =>
-						{
-							pct = e.ProgressPercentage;
-						};
-						client.DownloadFileCompleted += (object sender, System.ComponentModel.AsyncCompletedEventArgs e) =>
-						{
-							//we don't really need a status. we'll just try to unzip it when it's done
-							evt.Set();
-						};
+						client.DownloadProgressChanged += (_, progressArgs) => pct = progressArgs.ProgressPercentage;
+						client.DownloadFileCompleted += (_, _) => evt.Set(); // we don't really need a status, we'll just try to unzip it when it's done
 
-						for (; ; )
+						while (true)
 						{
-							if (evt.WaitOne(10))
-								break;
+							if (evt.WaitOne(10)) break;
 
 							//if the gui thread ordered an exit, cancel the download and wait for it to acknowledge
 							if (exiting)
@@ -73,21 +67,19 @@ private void Download()
 						}
 					}
 				}
-				
-				//throw new Exception("test of download failure");
+
+//				throw new Exception("test of download failure");
 
 				//if we were ordered to exit, bail without wasting any more time
-				if (exiting)
-					return;
+				if (exiting) return;
 
 				//try acquiring file
 				using (var hf = new HawkFile(fn))
 				{
 					using (var exe = OSTailoredCode.IsUnixHost ? hf.BindArchiveMember("ffmpeg") : hf.BindFirstOf(".exe"))
 					{
 						//last chance. exiting, don't dump the new ffmpeg file
-						if (exiting)
-							return;
+						if (exiting) return;
 						exe!.GetStream().CopyTo(fs);
 						fs.Dispose();
 						if (OSTailoredCode.IsUnixHost)
@@ -110,8 +102,14 @@ private void Download()
 			}
 			finally
 			{
-				try { File.Delete(fn); }
-				catch { }
+				try
+				{
+					File.Delete(fn);
+				}
+				catch
+				{
+					// ignore
+				}
 			}
 		}
 
@@ -141,8 +139,7 @@ protected override void OnClosed(EventArgs e)
 		private void timer1_Tick(object sender, EventArgs e)
 		{
 			//if it's done, close the window. the user will be smart enough to reopen it
-			if (succeeded)
-				Close();
+			if (succeeded) Close();
 			if (failed)
 			{
 				failed = false;
@@ -155,8 +152,7 @@ private void timer1_Tick(object sender, EventArgs e)
 
 		private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
 		{
-			System.Diagnostics.Process.Start(FFmpegService.Url);
+			Process.Start(FFmpegService.Url);
 		}
 	}
 }
-

src/BizHawk.Client.EmuHawk/RetroAchievements/RAIntegrationDownloaderForm.cs

@@ -1,4 +1,6 @@
+using System.Diagnostics;
 using System.IO;
+using System.Net;
 using System.Threading;
 using System.Windows.Forms;
 
@@ -30,12 +32,13 @@ public RAIntegrationDownloaderForm(string url)
 		private bool _exiting = false;
 		private bool _succeeded = false;
 		private bool _failed = false;
-		private Thread _thread;
+
+		private Thread/*?*/ _thread = null;
 
 		public bool DownloadSucceeded()
 		{
 			// block until the thread dies
-			while (_thread?.IsAlive ?? false)
+			while (_thread is { IsAlive: true })
 			{
 				Thread.Sleep(1);
 			}
@@ -57,23 +60,15 @@ private void Download()
 			{
 				using (var evt = new ManualResetEvent(false))
 				{
-					using var client = new System.Net.WebClient();
-					System.Net.ServicePointManager.SecurityProtocol = System.Net.SecurityProtocolType.Tls12;
+					using var client = new WebClient();
+					ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
 					client.DownloadFileAsync(new Uri(_url), fn);
-					client.DownloadProgressChanged += (object sender, System.Net.DownloadProgressChangedEventArgs e) =>
-					{
-						_pct = e.ProgressPercentage;
-					};
-					client.DownloadFileCompleted += (object sender, System.ComponentModel.AsyncCompletedEventArgs e) =>
-					{
-							//we don't really need a status. we'll just try to unzip it when it's done
-						evt.Set();
-					};
+					client.DownloadProgressChanged += (_, progressArgs) => _pct = progressArgs.ProgressPercentage;
+					client.DownloadFileCompleted += (_, _) => evt.Set(); // we don't really need a status, we'll just try to unzip it when it's done
 
-					for (; ; )
+					while (true)
 					{
-						if (evt.WaitOne(10))
-							break;
+						if (evt.WaitOne(10)) break;
 
 						//if the gui thread ordered an exit, cancel the download and wait for it to acknowledge
 						if (_exiting)
@@ -85,20 +80,18 @@ private void Download()
 					}
 				}
 
-				//throw new Exception("test of download failure");
+//				throw new Exception("test of download failure");
 
 				//if we were ordered to exit, bail without wasting any more time
-				if (_exiting)
-					return;
+				if (_exiting) return;
 
 				//try acquiring file
 				using (var dll = new HawkFile(fn))
 				{
 					var data = dll!.ReadAllBytes();
 
 					//last chance. exiting, don't dump the new RAIntegration file
-					if (_exiting)
-						return;
+					if (_exiting) return;
 
 					DirectoryInfo parentDir = new(Path.GetDirectoryName(_path)!);
 					if (!parentDir.Exists) parentDir.Create();
@@ -114,8 +107,14 @@ private void Download()
 			}
 			finally
 			{
-				try { File.Delete(fn); }
-				catch { }
+				try
+				{
+					File.Delete(fn);
+				}
+				catch
+				{
+					// ignore
+				}
 			}
 		}
 
@@ -145,8 +144,7 @@ protected override void OnClosed(EventArgs e)
 		private void timer1_Tick(object sender, EventArgs e)
 		{
 			//if it's done, close the window. the user will be smart enough to reopen it
-			if (_succeeded)
-				Close();
+			if (_succeeded) Close();
 			if (_failed)
 			{
 				_failed = false;
@@ -159,8 +157,7 @@ private void timer1_Tick(object sender, EventArgs e)
 
 		private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
 		{
-			System.Diagnostics.Process.Start(_url);
+			Process.Start(_url);
 		}
 	}
 }
-