fix: look up updates in several cats

rfg-modding · Jul 28, 2023 · 1a3d816 · 1a3d816
1 parent 0fd3e2d
commit 1a3d816
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/docs/backlog.md b/docs/backlog.md
@@ -5,6 +5,8 @@ Ideas, notes about features, testing, release process, etc
 ## Release
 
 * ~~implement transfer savegames/settings/profile steam to gog~~
+* mention local folders as installable mods in docs
+* add WC to glossary
 * fix TODOs left from debugging
 * rename FF categories as MM/legacy/something, add new for SF mods
 * remove stuff from news page: links dont work, formatting is bad, a lot of content is bad

diff --git a/src/SyncFaction.Core/Models/FactionFiles/Category.cs b/src/SyncFaction.Core/Models/FactionFiles/Category.cs
@@ -2,11 +2,10 @@ namespace SyncFaction.Core.Models.FactionFiles;
 
 public enum Category
 {
+    // TODO rename FF cats, rename enum
     None = 0,
     Artwork = 37,
     MapsStandalone = 44,
-    MapsPatches = 45,
-    MapPacks = 46,
     ModsClassic = 16,
     ModsRemaster = 30,
     ModsScriptLoader = 29,

diff --git a/src/SyncFaction/Converters/CategoryHumanReadableConverter.cs b/src/SyncFaction/Converters/CategoryHumanReadableConverter.cs
@@ -17,8 +17,6 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
         {
             Category.Artwork => "Artwork",
             Category.MapsStandalone => "Standalone Maps",
-            Category.MapsPatches => "Patched Maps",
-            Category.MapPacks => "Map Packs",
             Category.ModsClassic => "Mods for Classic Edition",
             Category.ModsRemaster => "Mods for Re-Mars-tered",
             Category.ModsScriptLoader => "ScriptLoader Mods",

diff --git a/src/SyncFaction/Services/UiCommands.cs b/src/SyncFaction/Services/UiCommands.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
@@ -353,9 +354,6 @@ private async Task<bool> RefreshOnline(ViewModel viewModel, bool isInit, Cancell
         else
         {
             // add categories to query
-            categories.Add(Category.MapPacks);
-            categories.Add(Category.MapsStandalone);
-            categories.Add(Category.MapsPatches);
             categories.Add(Category.ModsRemaster);
 
             // upd text
@@ -405,7 +403,24 @@ internal async Task<bool> RefreshLocal(ViewModel viewModel, CancellationToken to
     internal async Task<bool> Update(ViewModel viewModel, CancellationToken token)
     {
         var gameStorage = viewModel.Model.GetGameStorage(fileSystem, log);
-        var mods = (await modLoader.GetMods(Category.ModsStandalone, gameStorage, token)).ToList();
+        var mods = new ConcurrentBag<IMod>();
+        // find Terraform in mods or standalone, RSL2 in tools. TODO remove standalone after moving FF cats
+        var cats = new List<Category>
+        {
+            Category.ModsStandalone,
+            Category.Tools,
+            Category.ModsRemaster
+        };
+        await Task.WhenAll(cats.Select(async c =>
+            {
+                var result = await modLoader.GetMods(c, gameStorage, token);
+                foreach (var mod in result)
+                {
+                    mods.Add(mod);
+                }
+            })
+            .ToArray());
+
         var updates = viewModel.LockCollections(() => viewModel.Model.RemoteTerraformUpdates.Concat(viewModel.Model.RemoteRslUpdates).Select(x => mods.Single(y => y.Id == x)).ToList());
 
         var installed = viewModel.LockCollections(() => viewModel.Model.TerraformUpdates.Concat(viewModel.Model.RslUpdates).ToList());