- Semantical changes

- Decrease nesting
KoalaBear84 · Oct 31, 2024 · 7361015 · 7361015
1 parent f9f457d
commit 7361015
Show file tree

Hide file tree

Showing 14 changed files with 1,852 additions and 1,581 deletions.
diff --git a/src/OpenDirectoryDownloader.GoogleDrive/OpenDirectoryDownloader.GoogleDrive.csproj b/src/OpenDirectoryDownloader.GoogleDrive/OpenDirectoryDownloader.GoogleDrive.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Apis.Drive.v3" Version="1.68.0.3490" />
+    <PackageReference Include="Google.Apis.Drive.v3" Version="1.68.0.3574" />
     <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
   </ItemGroup>
 

diff --git a/src/OpenDirectoryDownloader.Tests/OpenDirectoryDownloader.Tests.csproj b/src/OpenDirectoryDownloader.Tests/OpenDirectoryDownloader.Tests.csproj
@@ -12,9 +12,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="xunit" Version="2.9.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0-pre.42">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/src/OpenDirectoryDownloader/BrowserContext.cs b/src/OpenDirectoryDownloader/BrowserContext.cs
@@ -142,7 +142,7 @@ public async Task InitializeAsync()
 
 			try
 			{
-				if (!browserFetcher.GetInstalledBrowsers().Any(x => x.BuildId == Chrome.DefaultBuildId))
+				if (browserFetcher.GetInstalledBrowsers().All(x => x.BuildId != Chrome.DefaultBuildId))
 				{
 					Program.Logger.Warning("Downloading browser... First time it can take a while, depending on your internet connection.");
 					InstalledBrowser installedBrowser = await browserFetcher.DownloadAsync(Chrome.DefaultBuildId);
@@ -164,9 +164,9 @@ public async Task InitializeAsync()
 			Browser = await puppeteerExtra.LaunchAsync(new LaunchOptions
 			{
 				Headless = false,
-				Args = new[] { "--no-sandbox", "--disable-setuid-sandbox", $"--user-agent=\"{Constants.UserAgent.Chrome}\"" },
+				Args = ["--no-sandbox", "--disable-setuid-sandbox", $"--user-agent=\"{Constants.UserAgent.Chrome}\""],
 				DefaultViewport = null,
-				IgnoreHTTPSErrors = true
+				AcceptInsecureCerts = true
 			});
 
 			Program.Logger.Information("Started browser with PID {processId}", Browser.Process.Id);
@@ -311,7 +311,7 @@ private void Page_Error(object sender, ErrorEventArgs e)
 		WriteDebugInfo($"Page_Error: {e.Error}");
 	}
 
-	private async void Page_FrameAttached(object sender, FrameEventArgs e)
+	private void Page_FrameAttached(object sender, FrameEventArgs e)
 	{
 		WriteDebugInfo($"Page_FrameAttached: {e.Frame.Url}");
 	}
@@ -379,23 +379,29 @@ private void Page_Response(object sender, ResponseCreatedEventArgs e)
 
 			string theCookie = cookieHeader.Split('\n').FirstOrDefault(cookie => cookie.StartsWith(CloudflareClearanceKey));
 
-			if (theCookie != null)
+			if (theCookie == null)
 			{
-				CookieContainer.SetCookies(new Uri(baseUrl), theCookie);
+				return;
+			}
 
-				if (CloudFlare)
-				{
-					Cookie cloudflareClearance = CookieContainer.GetCookies(new Uri(baseUrl)).FirstOrDefault(c => c.Name == CloudflareClearanceKey);
+			CookieContainer.SetCookies(new Uri(baseUrl), theCookie);
 
-					if (cloudflareClearance != null)
-					{
-						WriteDebugInfo($"Cloudflare clearance cookie found: {cloudflareClearance.Value}");
+			if (!CloudFlare)
+			{
+				return;
+			}
 
-						OK = true;
-						CancellationTokenSource.Cancel();
-					}
-				}
+			Cookie cloudflareClearance = CookieContainer.GetCookies(new Uri(baseUrl)).FirstOrDefault(c => c.Name == CloudflareClearanceKey);
+
+			if (cloudflareClearance == null)
+			{
+				return;
 			}
+
+			WriteDebugInfo($"Cloudflare clearance cookie found: {cloudflareClearance.Value}");
+
+			OK = true;
+			CancellationTokenSource.Cancel();
 		}
 		else
 		{
@@ -425,15 +431,17 @@ private void CheckCloudflareCookie()
 
 						CookieParam cloudflareClearanceCookie = cookieParams.FirstOrDefault(cookie => cookie.Name.StartsWith(CloudflareClearanceKey));
 
-						if (cloudflareClearanceCookie is not null)
+						if (cloudflareClearanceCookie is null)
 						{
-							WriteDebugInfo($"Cloudflare clearance cookie found: {cloudflareClearanceCookie.Value}");
+							return;
+						}
 
-							AddCookiesToContainer(CookieContainer, cookieParams);
+						WriteDebugInfo($"Cloudflare clearance cookie found: {cloudflareClearanceCookie.Value}");
 
-							OK = true;
-							CancellationTokenSource.Cancel();
-						}
+						AddCookiesToContainer(CookieContainer, cookieParams);
+
+						OK = true;
+						CancellationTokenSource.Cancel();
 					}
 					catch
 					{

diff --git a/src/OpenDirectoryDownloader/Command.cs b/src/OpenDirectoryDownloader/Command.cs
@@ -16,11 +16,13 @@ public class Command
 	/// </summary>
 	internal static void SetConsoleProperties()
 	{
-		if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+		if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
 		{
-			Console.WindowWidth = Math.Min(170, Console.LargestWindowWidth);
-			Console.WindowHeight = Math.Min(34, Console.LargestWindowHeight);
+			return;
 		}
+
+		Console.WindowWidth = Math.Min(170, Console.LargestWindowWidth);
+		Console.WindowHeight = Math.Min(34, Console.LargestWindowHeight);
 	}
 
 	internal static void ShowInfoAndCommands()
@@ -253,28 +255,30 @@ private static void SetClipboard(string value)
 		{
 		}
 
-		if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+		if (!RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
 		{
-			try
+			return;
+		}
+
+		try
+		{
+			Process clipboardExecutable = new()
 			{
-				Process clipboardExecutable = new()
+				StartInfo = new ProcessStartInfo
 				{
-					StartInfo = new ProcessStartInfo
-					{
-						RedirectStandardInput = true,
-						FileName = @"wl-copy",
-					}
-				};
+					RedirectStandardInput = true,
+					FileName = @"wl-copy",
+				}
+			};
 
-				clipboardExecutable.Start();
-				clipboardExecutable.StandardInput.Write(value);
-				clipboardExecutable.StandardInput.Close();
+			clipboardExecutable.Start();
+			clipboardExecutable.StandardInput.Write(value);
+			clipboardExecutable.StandardInput.Close();
 
-				return;
-			}
-			catch
-			{
-			}
+			return;
+		}
+		catch
+		{
 		}
 	}
 }