Refactored inner method "GetBepInExModCount" to parent method code

Measurity · Measurity · commit db1fd4e7b463 · 2025-12-08T16:49:48.000+01:00
diff --git a/Nitrox.Launcher/Models/Utils/GameInspect.cs b/Nitrox.Launcher/Models/Utils/GameInspect.cs
@@ -64,36 +64,33 @@ public static bool WarnIfGameProcessExists(GameInfo game)
 
     public static void WarnIfBepInExMods(string gameDir)
     {
-        if (GetBepInExModCount(gameDir) is var count and > 0)
+        if (string.IsNullOrWhiteSpace(gameDir) || !Directory.Exists(gameDir))
         {
-            Log.Warn($"BepInEx plugins detected: {count}");
-            LauncherNotifier.Warning($"BepInEx mod(s) were detected ({count}). Nitrox multiplayer does not support mods and they may cause instability.");
+            return;
+        }
+        string bepRoot = Path.Combine(gameDir, "BepInEx");
+        if (!Directory.Exists(bepRoot))
+        {
+            return;
         }
 
-        static int GetBepInExModCount(string gameDir)
+        int modDllCount = GetDllPaths(Path.Combine(bepRoot, "plugins")).Count();
+        modDllCount += GetDllPaths(Path.Combine(bepRoot, "patchers")).Count();
+        if (modDllCount > 0)
         {
-            if (string.IsNullOrWhiteSpace(gameDir) || !Directory.Exists(gameDir))
-            {
-                return 0;
-            }
+            Log.Warn($"BepInEx plugins detected: {modDllCount}");
+            LauncherNotifier.Warning($"BepInEx mod(s) were detected ({modDllCount}). Nitrox multiplayer does not support mods and they may cause instability.");
+        }
 
-            string bepRoot = Path.Combine(gameDir, "BepInEx");
-            if (!Directory.Exists(bepRoot))
+        static IEnumerable<string> GetDllPaths(string path)
+        {
+            try
             {
-                return 0;
+                return Directory.EnumerateFiles(path, "*.dll", SearchOption.AllDirectories);
             }
-            return GetDllPaths(Path.Combine(bepRoot, "plugins")).Count() + GetDllPaths(Path.Combine(bepRoot, "patchers")).Count();
-
-            static IEnumerable<string> GetDllPaths(string path)
+            catch (IOException)
             {
-                try
-                {
-                    return Directory.EnumerateFiles(path, "*.dll", SearchOption.AllDirectories);
-                }
-                catch (IOException)
-                {
-                    return [];
-                }
+                return [];
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -64,36 +64,33 @@ public static bool WarnIfGameProcessExists(GameInfo game)`
`64`	`64`
`65`	`65`	`public static void WarnIfBepInExMods(string gameDir)`
`66`	`66`	`{`
`67`		`- if (GetBepInExModCount(gameDir) is var count and > 0)`
	`67`	`+ if (string.IsNullOrWhiteSpace(gameDir) \|\| !Directory.Exists(gameDir))`
`68`	`68`	`{`
`69`		`- Log.Warn($"BepInEx plugins detected: {count}");`
`70`		`- LauncherNotifier.Warning($"BepInEx mod(s) were detected ({count}). Nitrox multiplayer does not support mods and they may cause instability.");`
	`69`	`+ return;`
	`70`	`+ }`
	`71`	`+ string bepRoot = Path.Combine(gameDir, "BepInEx");`
	`72`	`+ if (!Directory.Exists(bepRoot))`
	`73`	`+ {`
	`74`	`+ return;`
`71`	`75`	`}`
`72`	`76`
`73`		`- static int GetBepInExModCount(string gameDir)`
	`77`	`+ int modDllCount = GetDllPaths(Path.Combine(bepRoot, "plugins")).Count();`
	`78`	`+ modDllCount += GetDllPaths(Path.Combine(bepRoot, "patchers")).Count();`
	`79`	`+ if (modDllCount > 0)`
`74`	`80`	`{`
`75`		`- if (string.IsNullOrWhiteSpace(gameDir) \|\| !Directory.Exists(gameDir))`
`76`		`- {`
`77`		`- return 0;`
`78`		`- }`
	`81`	`+ Log.Warn($"BepInEx plugins detected: {modDllCount}");`
	`82`	`+ LauncherNotifier.Warning($"BepInEx mod(s) were detected ({modDllCount}). Nitrox multiplayer does not support mods and they may cause instability.");`
	`83`	`+ }`
`79`	`84`
`80`		`- string bepRoot = Path.Combine(gameDir, "BepInEx");`
`81`		`- if (!Directory.Exists(bepRoot))`
	`85`	`+ static IEnumerable<string> GetDllPaths(string path)`
	`86`	`+ {`
	`87`	`+ try`
`82`	`88`	`{`
`83`		`- return 0;`
	`89`	`+ return Directory.EnumerateFiles(path, "*.dll", SearchOption.AllDirectories);`
`84`	`90`	`}`
`85`		`- return GetDllPaths(Path.Combine(bepRoot, "plugins")).Count() + GetDllPaths(Path.Combine(bepRoot, "patchers")).Count();`
`86`		`-`
`87`		`- static IEnumerable<string> GetDllPaths(string path)`
	`91`	`+ catch (IOException)`
`88`	`92`	`{`
`89`		`- try`
`90`		`- {`
`91`		`- return Directory.EnumerateFiles(path, "*.dll", SearchOption.AllDirectories);`
`92`		`- }`
`93`		`- catch (IOException)`
`94`		`- {`
`95`		`- return [];`
`96`		`- }`
	`93`	`+ return [];`
`97`	`94`	`}`
`98`	`95`	`}`
`99`	`96`	`}`