Chore: Refactor / Cleanup code

Author: BornToBeRoot

Source/NETworkManager.Models/Network/DiscoveryProtocol.cs

@@ -99,82 +99,81 @@ public void CaptureAsync(int duration, DiscoveryProtocol protocol)
     {
         Task.Run(() =>
         {
-            using (var powerShell = System.Management.Automation.PowerShell.Create())
-            {
-                powerShell.AddScript("Set-ExecutionPolicy -ExecutionPolicy Bypass -Scope Process");
-                powerShell.AddScript("Import-Module NetAdapter");
-                powerShell.AddScript(_psDiscoveryProtocolModule);
-                powerShell.AddScript($"Invoke-DiscoveryProtocolCapture -Duration {duration}" +
-                                     (protocol != DiscoveryProtocol.LldpCdp
-                                         ? $" -Type {protocol.ToString().ToUpper()}"
-                                         : "") + " -Force | Get-DiscoveryProtocolData");
+            using var ps = System.Management.Automation.PowerShell.Create();
+            
+            var typeParam = protocol != DiscoveryProtocol.LldpCdp ? $" -Type {protocol.ToString().ToUpper()}" : "";
 
-                var psOutputs = powerShell.Invoke();
+            ps.AddScript($@"
+Set-ExecutionPolicy -ExecutionPolicy Bypass -Scope Process
+Import-Module NetAdapter -ErrorAction Stop
+{_psDiscoveryProtocolModule}
+Invoke-DiscoveryProtocolCapture -Duration {duration}{typeParam} -Force | Get-DiscoveryProtocolData");
 
-                if (powerShell.Streams.Error.Count > 0)
-                {
-                    StringBuilder stringBuilder = new();
+            var results = ps.Invoke();
 
-                    foreach (var error in powerShell.Streams.Error)
-                    {
-                        if (string.IsNullOrEmpty(stringBuilder.ToString()))
-                            stringBuilder.Append(Environment.NewLine);
+            if (ps.Streams.Error.Count > 0)
+            {
+                StringBuilder stringBuilder = new();
 
-                        stringBuilder.Append(error.Exception.Message);
-                    }
+                foreach (var error in ps.Streams.Error)
+                {
+                    if (string.IsNullOrEmpty(stringBuilder.ToString()))
+                        stringBuilder.Append(Environment.NewLine);
 
-                    OnErrorReceived(new DiscoveryProtocolErrorArgs(stringBuilder.ToString()));
+                    stringBuilder.Append(error.Exception.Message);
                 }
 
-                if (powerShell.Streams.Warning.Count > 0)
-                {
-                    StringBuilder stringBuilder = new();
+                OnErrorReceived(new DiscoveryProtocolErrorArgs(stringBuilder.ToString()));
+            }
 
-                    foreach (var warning in powerShell.Streams.Warning)
-                    {
-                        if (string.IsNullOrEmpty(stringBuilder.ToString()))
-                            stringBuilder.Append(Environment.NewLine);
+            if (ps.Streams.Warning.Count > 0)
+            {
+                StringBuilder stringBuilder = new();
 
-                        stringBuilder.Append(warning.Message);
-                    }
+                foreach (var warning in ps.Streams.Warning)
+                {
+                    if (string.IsNullOrEmpty(stringBuilder.ToString()))
+                        stringBuilder.Append(Environment.NewLine);
 
-                    OnWarningReceived(new DiscoveryProtocolWarningArgs(stringBuilder.ToString()));
+                    stringBuilder.Append(warning.Message);
                 }
 
-                foreach (var outputItem in psOutputs)
+                OnWarningReceived(new DiscoveryProtocolWarningArgs(stringBuilder.ToString()));
+            }
+
+            foreach (var result in results)
+            {
+                if (result == null)
+                    continue;
+
+                List<string> ipAddresses = [];
+
+                if (result.Properties["IPAddress"] != null)
+                    ipAddresses.AddRange(result.Properties["IPAddress"].Value as List<string>);
+
+                List<string> managements = [];
+
+                if (result.Properties["Management"] != null)
+                    managements.AddRange(result.Properties["Management"].Value as List<string>);
+
+                var packageInfo = new DiscoveryProtocolPackageInfo
                 {
-                    if (outputItem == null)
-                        continue;
-
-                    List<string> ipAddresses = new();
-
-                    if (outputItem.Properties["IPAddress"] != null)
-                        ipAddresses.AddRange(outputItem.Properties["IPAddress"].Value as List<string>);
-
-                    List<string> managements = new();
-
-                    if (outputItem.Properties["Management"] != null)
-                        managements.AddRange(outputItem.Properties["Management"].Value as List<string>);
-
-                    var packageInfo = new DiscoveryProtocolPackageInfo
-                    {
-                        Device = outputItem.Properties["Device"]?.Value.ToString(),
-                        DeviceDescription = outputItem.Properties["SystemDescription"]?.Value.ToString(),
-                        Port = outputItem.Properties["Port"]?.Value.ToString(),
-                        PortDescription = outputItem.Properties["PortDescription"]?.Value.ToString(),
-                        Model = outputItem.Properties["Model"]?.Value.ToString(),
-                        IPAddress = string.Join("; ", ipAddresses),
-                        VLAN = outputItem.Properties["VLAN"]?.Value.ToString(),
-                        Protocol = outputItem.Properties["Type"]?.Value.ToString(),
-                        TimeToLive = outputItem.Properties["TimeToLive"]?.Value.ToString(),
-                        Management = string.Join("; ", managements),
-                        ChassisId = outputItem.Properties["ChassisId"]?.Value.ToString(),
-                        LocalConnection = outputItem.Properties["Connection"]?.Value.ToString(),
-                        LocalInterface = outputItem.Properties["Interface"]?.Value.ToString()
-                    };
-
-                    OnPackageReceived(new DiscoveryProtocolPackageArgs(packageInfo));
-                }
+                    Device = result.Properties["Device"]?.Value.ToString(),
+                    DeviceDescription = result.Properties["SystemDescription"]?.Value.ToString(),
+                    Port = result.Properties["Port"]?.Value.ToString(),
+                    PortDescription = result.Properties["PortDescription"]?.Value.ToString(),
+                    Model = result.Properties["Model"]?.Value.ToString(),
+                    IPAddress = string.Join("; ", ipAddresses),
+                    VLAN = result.Properties["VLAN"]?.Value.ToString(),
+                    Protocol = result.Properties["Type"]?.Value.ToString(),
+                    TimeToLive = result.Properties["TimeToLive"]?.Value.ToString(),
+                    Management = string.Join("; ", managements),
+                    ChassisId = result.Properties["ChassisId"]?.Value.ToString(),
+                    LocalConnection = result.Properties["Connection"]?.Value.ToString(),
+                    LocalInterface = result.Properties["Interface"]?.Value.ToString()
+                };
+
+                OnPackageReceived(new DiscoveryProtocolPackageArgs(packageInfo));
             }
 
             OnComplete();