added support for multiple grpinfo files

Author: fgsfds

src/Addons/Providers/GrpInfoProvider.cs

@@ -3,6 +3,7 @@
 using Common.Enums;
 using Common.Enums.Versions;
 using Common.Interfaces;
+using CommunityToolkit.Diagnostics;
 
 namespace Addons.Providers;
 
@@ -11,15 +12,22 @@ public static class GrpInfoProvider
     /// <summary>
     /// Get list of addons from grpinfo file
     /// </summary>
-    /// <param name="foldersGrpInfos">Folders to search for grpinfo and grps</param>
-    public static List<IAddon> GetAddonsFromGrpInfo(List<string> foldersGrpInfos)
+    public static List<IAddon>? GetAddonsFromGrpInfo(string campaignsFolder)
     {
         List<IAddon> newAddons = [];
 
-        foreach (var folder in foldersGrpInfos)
+        var grpInfos = Directory.GetFiles(campaignsFolder, "*.grpinfo", SearchOption.AllDirectories);
+
+        if (grpInfos.Length == 0)
         {
-            var grpInfo = Path.Combine(folder, "addons.grpinfo");
-            var grps = Directory.GetFiles(folder, "*.grp");
+            return null;
+        }
+
+        foreach (var grpInfo in grpInfos)
+        {
+            var grpInfoFolder = Path.GetDirectoryName(grpInfo) ?? ThrowHelper.ThrowInvalidOperationException<string>();
+
+            var grps = Directory.GetFiles(grpInfoFolder, "*.grp", SearchOption.TopDirectoryOnly);
 
             if (grps.Length == 0)
             {
@@ -33,9 +41,9 @@ public static List<IAddon> GetAddonsFromGrpInfo(List<string> foldersGrpInfos)
             {
                 var fileSize = new FileInfo(grp).Length;
 
-                var addon = addons.Find(x => x.Size == fileSize);
+                var addon = addons.FirstOrDefault(x => x.Size == fileSize);
 
-                if (addon.Name is null)
+                if (addon.Equals(default(GrpInfo)) || addon.Name is null)
                 {
                     continue;
                 }

src/Addons/Providers/InstalledAddonsProvider.cs

@@ -160,26 +160,17 @@ await Task.Run(async () =>
                     _campaignsCache.AddRange(tcs);
 
                     //grpinfo
-                    List<string> foldersWithGrpInfos = [];
-                    dirs = Directory.GetDirectories(_game.CampaignsFolderPath, "*", SearchOption.TopDirectoryOnly);
+                    var grpInfoAddons = GrpInfoProvider.GetAddonsFromGrpInfo(_game.CampaignsFolderPath);
 
-                    foreach (var dir in dirs)
+                    if (grpInfoAddons?.Count > 0)
                     {
-                        if (File.Exists(Path.Combine(dir, "addons.grpinfo")))
+                        foreach (var addon in grpInfoAddons)
                         {
-                            foldersWithGrpInfos.Add(dir);
-                        }
-                    }
+                            var result = _campaignsCache.TryAdd(new(addon.AddonId.Id, null), addon);
 
-                    if (foldersWithGrpInfos.Count > 0)
-                    {
-                        var grpInfoAddons = GrpInfoProvider.GetAddonsFromGrpInfo(foldersWithGrpInfos);
-
-                        if (grpInfoAddons.Count > 0)
-                        {
-                            foreach (var addon in grpInfoAddons)
+                            if (!result)
                             {
-                                _campaignsCache.Add(new(addon.AddonId.Id, null), addon);
+                                _logger.LogError($"Failed to add {addon.FileName} to the campaigns list.");
                             }
                         }
                     }