Global usings and file scoped namespaces

src/NadekoBot/_Extensions/ProcessExtensions.cs

@@ -2,109 +2,106 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 // https://github.com/aspnet/Common/blob/dev/shared/Microsoft.Extensions.Process.Sources/ProcessHelper.cs
 
-using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
 
-namespace NadekoBot.Extensions
+namespace NadekoBot.Extensions;
+
+public static class ProcessExtensions
 {
-    public static class ProcessExtensions
+    private static readonly bool _isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
+    private static readonly TimeSpan _defaultTimeout = TimeSpan.FromSeconds(10);
+
+    public static void KillTree(this Process process)
     {
-        private static readonly bool _isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
-        private static readonly TimeSpan _defaultTimeout = TimeSpan.FromSeconds(10);
+        process.KillTree(_defaultTimeout);
+    }
 
-        public static void KillTree(this Process process)
+    public static void KillTree(this Process process, TimeSpan timeout)
+    {
+        if (_isWindows)
         {
-            process.KillTree(_defaultTimeout);
-        }
-
-        public static void KillTree(this Process process, TimeSpan timeout)
-        {
-            if (_isWindows)
-            {
-                RunProcessAndWaitForExit(
-                    "taskkill",
-                    $"/T /F /PID {process.Id}",
-                    timeout,
-                    out var stdout);
-            }
-            else
-            {
-                var children = new HashSet<int>();
-                GetAllChildIdsUnix(process.Id, children, timeout);
-                foreach (var childId in children)
-                {
-                    KillProcessUnix(childId, timeout);
-                }
-                KillProcessUnix(process.Id, timeout);
-            }
-        }
-
-        private static void GetAllChildIdsUnix(int parentId, ISet<int> children, TimeSpan timeout)
-        {
-            var exitCode = RunProcessAndWaitForExit(
-                "pgrep",
-                $"-P {parentId}",
+            RunProcessAndWaitForExit(
+                "taskkill",
+                $"/T /F /PID {process.Id}",
                 timeout,
                 out var stdout);
-
-            if (exitCode == 0 && !string.IsNullOrEmpty(stdout))
+        }
+        else
+        {
+            var children = new HashSet<int>();
+            GetAllChildIdsUnix(process.Id, children, timeout);
+            foreach (var childId in children)
             {
-                using (var reader = new StringReader(stdout))
-                {
-                    while (true)
-                    {
-                        var text = reader.ReadLine();
-                        if (text is null)
-                        {
-                            return;
-                        }
+                KillProcessUnix(childId, timeout);
+            }
+            KillProcessUnix(process.Id, timeout);
+        }
+    }
 
-                        if (int.TryParse(text, out var id))
-                        {
-                            children.Add(id);
-                            // Recursively get the children
-                            GetAllChildIdsUnix(id, children, timeout);
-                        }
+    private static void GetAllChildIdsUnix(int parentId, ISet<int> children, TimeSpan timeout)
+    {
+        var exitCode = RunProcessAndWaitForExit(
+            "pgrep",
+            $"-P {parentId}",
+            timeout,
+            out var stdout);
+
+        if (exitCode == 0 && !string.IsNullOrEmpty(stdout))
+        {
+            using (var reader = new StringReader(stdout))
+            {
+                while (true)
+                {
+                    var text = reader.ReadLine();
+                    if (text is null)
+                    {
+                        return;
+                    }
+
+                    if (int.TryParse(text, out var id))
+                    {
+                        children.Add(id);
+                        // Recursively get the children
+                        GetAllChildIdsUnix(id, children, timeout);
                     }
                 }
             }
         }
-
-        private static void KillProcessUnix(int processId, TimeSpan timeout)
-        {
-            RunProcessAndWaitForExit(
-                "kill",
-                $"-TERM {processId}",
-                timeout,
-                out var stdout);
-        }
-
-        private static int RunProcessAndWaitForExit(string fileName, string arguments, TimeSpan timeout, out string stdout)
-        {
-            var startInfo = new ProcessStartInfo
-            {
-                FileName = fileName,
-                Arguments = arguments,
-                RedirectStandardOutput = true,
-                UseShellExecute = false
-            };
-
-            var process = Process.Start(startInfo);
-
-            stdout = null;
-            if (process.WaitForExit((int)timeout.TotalMilliseconds))
-            {
-                stdout = process.StandardOutput.ReadToEnd();
-            }
-            else
-            {
-                process.Kill();
-            }
-
-            return process.ExitCode;
-        }
     }
-}
+
+    private static void KillProcessUnix(int processId, TimeSpan timeout)
+    {
+        RunProcessAndWaitForExit(
+            "kill",
+            $"-TERM {processId}",
+            timeout,
+            out var stdout);
+    }
+
+    private static int RunProcessAndWaitForExit(string fileName, string arguments, TimeSpan timeout, out string stdout)
+    {
+        var startInfo = new ProcessStartInfo
+        {
+            FileName = fileName,
+            Arguments = arguments,
+            RedirectStandardOutput = true,
+            UseShellExecute = false
+        };
+
+        var process = Process.Start(startInfo);
+
+        stdout = null;
+        if (process.WaitForExit((int)timeout.TotalMilliseconds))
+        {
+            stdout = process.StandardOutput.ReadToEnd();
+        }
+        else
+        {
+            process.Kill();
+        }
+
+        return process.ExitCode;
+    }
+}