Merge pull request #124 from PhantomGamers/dev

Dev

Author: PhantomGamers

SFP/Models/Injection/BrowserEndpoint.cs

@@ -40,7 +40,7 @@ internal static async Task<BrowserEndpoint> GetBrowserEndpointAsync()
             }
             else
             {
-                Log.Logger.Error("Could not fetch browser, SFP possibly tried to inject too early");
+                Log.Logger.Error("Could not fetch browser, SFP either tried to inject too early or another service is running on port 8080");
             }
             Log.Logger.Debug(e);
             throw;

SFP/Models/Steam.cs

@@ -198,15 +198,15 @@ public static Task StartSteam(string? args = null)
         const string DebuggingString = @"-cef-enable-debugging";
         if (!args.Contains(DebuggingString))
         {
-            args += $" {DebuggingString}";
             args = args.Trim();
+            args += $" {DebuggingString}";
         }
 
         const string BootstrapString = @"-skipinitialbootstrap";
         if (OperatingSystem.IsMacOS() && !args.Contains(BootstrapString))
         {
-            args += $" {BootstrapString}";
             args = args.Trim();
+            args += $" {BootstrapString}";
         }
 
         if (OperatingSystem.IsWindows() && File.Exists(MillenniumPath))
@@ -381,7 +381,7 @@ private static async Task<bool> CheckForMissingArgumentsAsync()
             return false;
         }
 
-        var argumentMissing = Settings.Default.SteamLaunchArgs.Split(' ')
+        var argumentMissing = Settings.Default.SteamLaunchArgs.Trim().ToLower().Split(' ', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries)
             .Any(arg => !cmdLine.Contains(arg));
 
         if (!argumentMissing)

SFP/Models/Unix/Utils.cs

@@ -17,8 +17,8 @@ public static List<string> GetCommandLine(Process process)
         var processName = process.ProcessName;
         var command = $"pgrep -x {processName} | xargs sh -c 'if [ -n \"$1\" ]; then ps -o command= -p \"$1\"; fi' _";
         var output = RunCommand(command);
-        var lines = output.Split(' ', StringSplitOptions.RemoveEmptyEntries);
-        return lines.Select(line => line.Trim()).Where(arg => !string.IsNullOrWhiteSpace(arg)).ToList();
+        var lines = output.ToLower().Split(' ', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
+        return lines.ToList();
     }
 
     [SuppressMessage("CodeSmell", "ERP022:Unobserved exception in a generic exception handler")]

SFP/Models/Windows/Utils.cs

@@ -46,7 +46,7 @@ public static List<string> GetCommandLine(Process process)
         var query = con.CreateQuery("SELECT CommandLine FROM Win32_Process WHERE ProcessId = " + process.Id);
         var commandLine = query.SingleOrDefault()?["CommandLine"]?.ToString();
         return commandLine != null
-            ? commandLine.Split(' ', StringSplitOptions.RemoveEmptyEntries).ToList()
+            ? commandLine.ToLower().Split(' ', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries).ToList()
             : new List<string>();
     }
 

SFP_UI/Program.cs

@@ -49,7 +49,7 @@ private static void SetupNLog()
         LogManager.Setup().LoadConfiguration(c =>
         {
             c.ForLogger().FilterMinLevel(LogLevel.Info).WriteToConsole().WithAsync();
-            var fileTarget = new FileTarget
+            using var fileTarget = new FileTarget
             {
                 FileName = "SFP.log",
                 ArchiveOldFileOnStartup = true,

SFP_UI/ViewModels/MainPageViewModel.cs

@@ -25,7 +25,7 @@ public class MainPageViewModel : ViewModelBase
 
     [Reactive] public bool ButtonsEnabled { get; set; } = true;
 
-    [Reactive] public bool IsInjected { get; set; }
+    [Reactive] public bool IsInjected { get; set; } = Injector.IsInjected;
 
     [Reactive] public string StartSteamText { get; set; } = Steam.IsSteamRunning ? "Restart Steam" : "Start Steam";
 

SFP_UI/ViewModels/SettingsPageViewModel.cs

@@ -143,7 +143,7 @@ public SettingsPageViewModel()
             .Throttle(TimeSpan.FromSeconds(1))
             .Subscribe(value =>
             {
-                Settings.Default.SteamLaunchArgs = value;
+                Settings.Default.SteamLaunchArgs = value.Trim();
                 Settings.Default.Save();
             });