Apply IDE-suggested refactoring & style change options.

r3c · Jan 25, 2025 · 7a69e0e · 7a69e0e
1 parent a4b0061
commit 7a69e0e
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 27 deletions.
diff --git a/src/Winp/Package/MariaDbPackage.cs b/src/Winp/Package/MariaDbPackage.cs
@@ -39,7 +39,8 @@ public class MariaDbPackage : IPackage, IService
         if (!File.Exists(Path.Join(packageDirectory.AbsolutePath, mariadb.DataDirectory, "my.ini")))
         {
             var arguments = new[] { Executable.EscapeArgument("--datadir=" + mariadb.DataDirectory) };
-            var process = Executable.Start(CreateProcessStartInfo(application, variant.Identifier, "mysql_install_db.exe", arguments));
+            var process = Executable.Start(CreateProcessStartInfo(application, variant.Identifier,
+                "mysql_install_db.exe", arguments));
 
             if (process == null || await process.Stop(TimeSpan.FromMinutes(5)) != 0)
                 return "could not initialize data directory";
@@ -68,20 +69,19 @@ public ProcessStartInfo CreateProcessStop(ApplicationConfig application, string
 
         // Download and extract archive
         var packageDirectory = GetPackageDirectory(environment.InstallDirectory, variant.Identifier);
-        var downloadMessage = await Archive.DownloadAndExtract(variant.DownloadUrl, variant.PathInArchive, packageDirectory);
+        var downloadMessage = await Archive.DownloadAndExtract(variant.DownloadUrl, variant.PathInArchive,
+            packageDirectory);
 
-        if (downloadMessage != null)
-            return $"download failure ({downloadMessage})";
-
-        return null;
+        return downloadMessage != null ? $"download failure ({downloadMessage})" : null;
     }
 
     public bool IsInstalled(ApplicationConfig application, PackageVariantConfig variant)
     {
-        return File.Exists(CreateProcessStartInfo(application, variant.Identifier, "mysqld.exe", Array.Empty<string>()).FileName);
+        return File.Exists(CreateProcessStartInfo(application, variant.Identifier, "mysqld.exe", []).FileName);
     }
 
-    private static ProcessStartInfo CreateProcessStartInfo(ApplicationConfig application, string variantIdentifier, string executable, string[] arguments)
+    private static ProcessStartInfo CreateProcessStartInfo(ApplicationConfig application, string variantIdentifier,
+        string executable, IReadOnlyList<string> arguments)
     {
         var installDirectory = application.Environment.InstallDirectory;
         var packageDirectory = GetPackageDirectory(installDirectory, variantIdentifier);

diff --git a/src/Winp/Package/NginxPackage.cs b/src/Winp/Package/NginxPackage.cs
@@ -75,12 +75,12 @@ public class NginxPackage : IPackage, IService
 
     public ProcessStartInfo CreateProcessStart(ApplicationConfig application, string variantIdentifier)
     {
-        return CreateProcessStartInfo(application, variantIdentifier, Array.Empty<string>());
+        return CreateProcessStartInfo(application, variantIdentifier, []);
     }
 
     public ProcessStartInfo CreateProcessStop(ApplicationConfig application, string variantIdentifier, int processId)
     {
-        return CreateProcessStartInfo(application, variantIdentifier, new[] { "-s", "quit" });
+        return CreateProcessStartInfo(application, variantIdentifier, ["-s", "quit"]);
     }
 
     public async Task<string?> Install(ApplicationConfig application, PackageVariantConfig variant)
@@ -99,7 +99,7 @@ public ProcessStartInfo CreateProcessStop(ApplicationConfig application, string
 
     public bool IsInstalled(ApplicationConfig application, PackageVariantConfig variant)
     {
-        return File.Exists(CreateProcessStartInfo(application, variant.Identifier, Array.Empty<string>()).FileName);
+        return File.Exists(CreateProcessStartInfo(application, variant.Identifier, []).FileName);
     }
 
     private static ProcessStartInfo CreateProcessStartInfo(ApplicationConfig application, string variantIdentifier, string[] arguments)

diff --git a/src/Winp/Package/PhpMyAdminPackage.cs b/src/Winp/Package/PhpMyAdminPackage.cs
@@ -23,8 +23,7 @@ internal class PhpMyAdminPackage : IPackage
         foreach (var name in new[] { ConfigurationPhpMyAdmin })
         {
             var destinationPath = Path.Combine(packageDirectory.AbsolutePath, name);
-            var success =
-                await Template.WriteToFile<PhpMyAdminPackage>($"PhpMyAdmin.{name}", context, destinationPath);
+            var success = await Template.WriteToFile<PhpMyAdminPackage>($"PhpMyAdmin.{name}", context, destinationPath);
 
             if (!success)
                 return $"configuration failure with '{name}'";
@@ -39,13 +38,10 @@ internal class PhpMyAdminPackage : IPackage
 
         // Download and extract archive
         var packageDirectory = GetPackageDirectory(environment.InstallDirectory, variant.Identifier);
-        var downloadMessage =
-            await Archive.DownloadAndExtract(variant.DownloadUrl, variant.PathInArchive, packageDirectory);
+        var downloadMessage = await Archive.DownloadAndExtract(variant.DownloadUrl, variant.PathInArchive,
+            packageDirectory);
 
-        if (downloadMessage != null)
-            return $"download failure ({downloadMessage})";
-
-        return null;
+        return downloadMessage != null ? $"download failure ({downloadMessage})" : null;
     }
 
     public bool IsInstalled(ApplicationConfig application, PackageVariantConfig variant)

diff --git a/src/Winp/Package/PhpPackage.cs b/src/Winp/Package/PhpPackage.cs
@@ -43,7 +43,7 @@ public ProcessStartInfo CreateProcessStart(ApplicationConfig application, string
         var php = application.Package.Php;
         var binding = $"{php.ServerAddress}:{php.ServerPort}";
 
-        return CreateProcessStartInfo(application, variantIdentifier, new[] { "-b", binding, "-c", "php.ini" });
+        return CreateProcessStartInfo(application, variantIdentifier, ["-b", binding, "-c", "php.ini"]);
     }
 
     public ProcessStartInfo CreateProcessStop(ApplicationConfig application, string variantIdentifier, int processId)
@@ -62,20 +62,19 @@ public ProcessStartInfo CreateProcessStop(ApplicationConfig application, string
 
         // Download and extract archive
         var packageDirectory = GetPackageDirectory(environment.InstallDirectory, variant.Identifier);
-        var downloadMessage = await Archive.DownloadAndExtract(variant.DownloadUrl, variant.PathInArchive, packageDirectory);
+        var downloadMessage = await Archive.DownloadAndExtract(variant.DownloadUrl, variant.PathInArchive,
+            packageDirectory);
 
-        if (downloadMessage != null)
-            return $"download failure ({downloadMessage})";
-
-        return null;
+        return downloadMessage != null ? $"download failure ({downloadMessage})" : null;
     }
 
     public bool IsInstalled(ApplicationConfig application, PackageVariantConfig variant)
     {
-        return File.Exists(CreateProcessStartInfo(application, variant.Identifier, Array.Empty<string>()).FileName);
+        return File.Exists(CreateProcessStartInfo(application, variant.Identifier, []).FileName);
     }
 
-    private static ProcessStartInfo CreateProcessStartInfo(ApplicationConfig application, string variantIdentifier, string[] arguments)
+    private static ProcessStartInfo CreateProcessStartInfo(ApplicationConfig application, string variantIdentifier,
+        IReadOnlyList<string> arguments)
     {
         var installDirectory = application.Environment.InstallDirectory;
         var packageDirectory = GetPackageDirectory(installDirectory, variantIdentifier);