gitea-mirror/CreamInstaller
1
0
Fork 0
mirror of https://github.com/FroggMaster/CreamInstaller.git synced 2026-07-28 14:47:04 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug Fix for Duplicate DLC Entries

Browse Source 
- bug fix to avoid duplicates in a games DLC entries from a cached install
This commit is contained in:
Frog
2026-07-21 00:33:09 -07:00
parent 2502f124ee
commit c6756067f3
3 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CreamInstaller/Forms/InstallForm.cs
+4 -1
View File
@@ -381,7 +381,10 @@ internal sealed partial class InstallForm : CustomForm
UseProxy = selection.UseProxy,
ProxyDllName = selection.UseProxy ? selection.Proxy ?? Selection.DefaultProxy : null,
UseExtraProtection = selection.UseExtraProtection,
Dlc = selection.DLC.Select(dlc => new InstalledDlcRecord
Dlc = selection.DLC
.GroupBy(dlc => dlc.Id)
.Select(g => g.First())
.Select(dlc => new InstalledDlcRecord
{
DlcType = dlc.Type.ToString(),
Id = dlc.Id,
CreamInstaller/Forms/MainForm.cs
+8 -3
View File
@@ -1158,10 +1158,12 @@ internal sealed partial class MainForm : CustomForm
if (selection.TreeNode.TreeView is null)
_ = selectionTreeView.Nodes.Add(selection.TreeNode);
// Restore DLC children from saved record
// Restore DLC children from saved record, deduplicating by ID
if (record.Dlc != null && record.Dlc.Count > 0)
{
foreach (InstalledDlcRecord dlcRecord in record.Dlc)
foreach (InstalledDlcRecord dlcRecord in record.Dlc
.GroupBy(d => d.Id)
.Select(g => g.First()))
{
if (!Enum.TryParse(dlcRecord.DlcType, out DLCType dlcType))
continue;
@@ -1476,7 +1478,10 @@ internal sealed partial class MainForm : CustomForm
UseProxy = existing?.UseProxy ?? false,
ProxyDllName = existing?.UseProxy == true ? existing.ProxyDllName : null,
UseExtraProtection = existing?.UseExtraProtection ?? false,
Dlc = selection.DLC.Select(dlc => new InstalledDlcRecord
Dlc = selection.DLC
.GroupBy(dlc => dlc.Id)
.Select(g => g.First())
.Select(dlc => new InstalledDlcRecord
{
DlcType = dlc.Type.ToString(),
Id = dlc.Id,
CreamInstaller/SelectionDLC.cs
+14 -1
View File
@@ -71,7 +71,20 @@ internal sealed class SelectionDLC : IEquatable<SelectionDLC>
Type == other.Type && GameId == other.GameId && Id == other.Id);
internal static SelectionDLC GetOrCreate(DLCType type, string gameId, string id, string name)
=> FromId(type, gameId, id) ?? new SelectionDLC(type, gameId, id, name);
{
// For Steam DLCs, Steam and SteamHidden represent the same DLC discovered
// through different code paths. Look up by (gameId, id) ignoring the Steam
// subtype to prevent duplicate entries for the same DLC.
if (type is DLCType.Steam or DLCType.SteamHidden)
{
SelectionDLC existing = All.Keys.FirstOrDefault(
dlc => dlc.GameId == gameId && dlc.Id == id
&& dlc.Type is DLCType.Steam or DLCType.SteamHidden);
if (existing is not null)
return existing;
}
return FromId(type, gameId, id) ?? new SelectionDLC(type, gameId, id, name);
}
internal static SelectionDLC FromId(DLCType type, string gameId, string dlcId)
=> All.Keys.FirstOrDefault(dlc => dlc.Type == type && dlc.GameId == gameId && dlc.Id == dlcId);