Fix for discord game discovery (#1731)

* Fix for discord game discovery

* Removed specific subnautica check for steam

NitroxLauncher/LauncherConfig.cs

@@ -3,6 +3,7 @@
 using System.Runtime.CompilerServices;
 using NitroxLauncher.Properties;
 using NitroxModel.Discovery;
+using NitroxModel.Platforms.Store;
 
 namespace NitroxLauncher
 {
@@ -53,7 +54,7 @@ public string SubnauticaPath
             {
                 // Ensures the path looks alright (no mixed / and \ path separators)
                 subnauticaPath = Path.GetFullPath(value);
-                SubnauticaPlatform = PlatformDetection.GetPlatform(subnauticaPath);
+                subnauticaPlatform = GamePlatforms.GetPlatformByGameDir(subnauticaPath)?.platform ?? Platform.NONE;
                 OnPropertyChanged();
             }
         }

NitroxLauncher/LauncherLogic.cs

@@ -243,7 +243,7 @@ private async Task<ProcessEx> StartSubnauticaAsync()
             using ProcessEx game = platform switch
             {
                 Steam s => await s.StartGameAsync(subnauticaExe, GameInfo.Subnautica.SteamAppId, subnauticaLaunchArguments),
-                Egs e => await e.StartGameAsync(subnauticaExe, subnauticaLaunchArguments),
+                EpicGames e => await e.StartGameAsync(subnauticaExe, subnauticaLaunchArguments),
                 MSStore m => await m.StartGameAsync(subnauticaExe),
                 DiscordStore d => await d.StartGameAsync(subnauticaExe, subnauticaLaunchArguments),
                 _ => throw new Exception($"Directory '{subnauticaPath}' is not a valid {GameInfo.Subnautica.Name} game installation or the game's platform is unsupported by Nitrox.")

NitroxModel/Platforms/Store/Discord.cs

@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
+using NitroxModel.Discovery;
 using NitroxModel.Helper;
 using NitroxModel.Platforms.OS.Shared;
 using NitroxModel.Platforms.Store.Interfaces;
@@ -13,10 +14,11 @@ public sealed class Discord : IGamePlatform
         public static Discord Instance => instance ??= new Discord();
 
         public string Name => nameof(Discord);
+        public Platform platform => Platform.DISCORD;
 
         public bool OwnsGame(string gameDirectory)
         {
-            return File.Exists(Path.Combine(Directory.GetParent(gameDirectory)?.FullName ?? "", "journal.sqlite"));
+            return File.Exists(Path.Combine(Directory.GetParent(gameDirectory)?.FullName ?? "..", "journal.sqlite"));
         }
 
         public async Task<ProcessEx> StartPlatformAsync()

NitroxModel/Platforms/Store/Egs.cs → NitroxModel/Platforms/Store/EpicGames.cs

@@ -1,27 +1,27 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
+using NitroxModel.Discovery;
 using NitroxModel.Helper;
 using NitroxModel.Platforms.OS.Shared;
 using NitroxModel.Platforms.Store.Interfaces;
 
 namespace NitroxModel.Platforms.Store
 {
-    /// <summary>
-    ///     Epic games store.
-    /// </summary>
-    public sealed class Egs : IGamePlatform
+    public sealed class EpicGames : IGamePlatform
     {
-        private static Egs instance;
-        public static Egs Instance => instance ??= new Egs();
+        private static EpicGames instance;
+        public static EpicGames Instance => instance ??= new EpicGames();
+
+        public string Name => "Epic Games Store";
+        public Platform platform => Platform.EPIC;
 
         public bool OwnsGame(string gameDirectory)
         {
-            return Directory.Exists(Path.Combine(gameDirectory, ".egstore"));
+            string path = Path.Combine(gameDirectory, ".egstore");
+            return Directory.Exists(path) && Directory.GetFiles(path).Length > 1;
         }
 
-        public string Name => "Epic Games Store";
-
         public async Task<ProcessEx> StartPlatformAsync()
         {
             await Task.CompletedTask; // Suppresses async-without-await warning - can be removed.

NitroxModel/Platforms/Store/GamePlatforms.cs

@@ -5,7 +5,7 @@ namespace NitroxModel.Platforms.Store
 {
     public static class GamePlatforms
     {
-        public static readonly IGamePlatform[] AllPlatforms = { Steam.Instance, Egs.Instance, MSStore.Instance, Discord.Instance };
+        public static readonly IGamePlatform[] AllPlatforms = { Steam.Instance, EpicGames.Instance, Discord.Instance, MSStore.Instance };
 
         public static IGamePlatform GetPlatformByGameDir(string gameDirectory)
         {
@@ -21,6 +21,7 @@ public static IGamePlatform GetPlatformByGameDir(string gameDirectory)
                     return platform;
                 }
             }
+
             return null;
         }
     }

NitroxModel/Platforms/Store/Interfaces/IGamePlatform.cs

@@ -1,29 +1,34 @@
 using System.Threading.Tasks;
+using NitroxModel.Discovery;
 using NitroxModel.Platforms.OS.Shared;
 
 namespace NitroxModel.Platforms.Store.Interfaces
 {
     public interface IGamePlatform
     {
+        string Name { get; }
+
+        Platform platform { get; }
+
         /// <summary>
         ///     Tries to start the platform and waits for it to be ready to launch games. If it has already been started it will return true.
         /// </summary>
         /// <returns>Returns true if platform is running or has started successfully.</returns>
         public Task<ProcessEx> StartPlatformAsync();
 
         /// <summary>
-        ///     Tries to find the executable of the platform or null if not found.
+        ///     Tries to find the executable of the platform
         /// </summary>
-        /// <returns></returns>
+        /// <returns>Returns path to the executable or null if not found</returns>
         public string GetExeFile();
 
         /// <summary>
         ///     True if game directory originates from the game platform.
         /// </summary>
         /// <param name="gameDirectory">Directory to a game, usually where the exe file is.</param>
-        /// <returns>True if the game platform owns this game.</returns>
+        /// <returns>Returns true if the game platform owns this game.</returns>
         bool OwnsGame(string gameDirectory);
 
-        string Name { get; }
+
     }
 }

NitroxModel/Platforms/Store/MSStore.cs

@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
+using NitroxModel.Discovery;
 using NitroxModel.Platforms.OS.Shared;
 using NitroxModel.Platforms.Store.Interfaces;
 
@@ -12,11 +13,12 @@ public sealed class MSStore : IGamePlatform
         public static MSStore Instance => instance ??= new MSStore();
 
         public string Name => "Microsoft Store";
+        public Platform platform => Platform.MICROSOFT;
 
         public bool OwnsGame(string gameDirectory)
         {
             bool isLocalAppData = Path.GetFullPath(gameDirectory).StartsWith(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Packages"), StringComparison.InvariantCultureIgnoreCase);
-            return isLocalAppData;
+            return isLocalAppData || File.Exists(Path.Combine(gameDirectory, "appxmanifest.xml"));
         }
 
         public async Task<ProcessEx> StartPlatformAsync()

NitroxModel/Platforms/Store/Steam.cs

@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
+using NitroxModel.Discovery;
 using NitroxModel.Helper;
 using NitroxModel.Platforms.OS.Shared;
 using NitroxModel.Platforms.OS.Windows.Internal;
@@ -16,6 +17,7 @@ public sealed class Steam : IGamePlatform
         public static Steam Instance => instance ??= new Steam();
 
         public string Name => nameof(Steam);
+        public Platform platform => Platform.STEAM;
 
         public bool OwnsGame(string gameDirectory)
         {