Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ModSupport] Fixes issue with logging legacy mods #217

Merged
merged 2 commits into from
Jan 14, 2023
Merged

[ModSupport] Fixes issue with logging legacy mods #217

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8ce385
[ModSupport] Fixes issue with logging legacy mods
wannkunstbeikor Jan 13, 2023
b357e2f
[ModSupport] Cleans up TryAdd functions
wannkunstbeikor Jan 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions FrostyModSupport/FrostyModExecutor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,9 +354,7 @@ private void ProcessModResources(IResourceContainer fmod)
entry.Size = data.Length;

modifiedEbx.TryAdd(entry.Name, entry);
if (!archiveData.ContainsKey(entry.Sha1))
archiveData.GetOrAdd(entry.Sha1, new ArchiveInfo() { Data = data, RefCount = 1 });
else
if (!archiveData.TryAdd(entry.Sha1, new ArchiveInfo() { Data = data, RefCount = 1 }))
archiveData[entry.Sha1].RefCount++;
numArchiveEntries++;
}
Expand Down Expand Up @@ -452,9 +450,7 @@ private void ProcessModResources(IResourceContainer fmod)
entry.Size = data.Length;

modifiedRes.TryAdd(entry.Name, entry);
if (!archiveData.ContainsKey(entry.Sha1))
archiveData.TryAdd(entry.Sha1, new ArchiveInfo() { Data = data, RefCount = 1 });
else
if (!archiveData.TryAdd(entry.Sha1, new ArchiveInfo() { Data = data, RefCount = 1 }))
archiveData[entry.Sha1].RefCount++;
numArchiveEntries++;
}
Expand Down Expand Up @@ -610,9 +606,7 @@ private void ProcessModResources(IResourceContainer fmod)
entry.Size = data.Length;

modifiedChunks.TryAdd(guid, entry);
if (!archiveData.ContainsKey(entry.Sha1))
archiveData.TryAdd(entry.Sha1, new ArchiveInfo() { Data = data, RefCount = 1 });
else
if (!archiveData.TryAdd(entry.Sha1, new ArchiveInfo() { Data = data, RefCount = 1 }))
archiveData[entry.Sha1].RefCount++;
numArchiveEntries++;
}
Expand Down Expand Up @@ -1081,7 +1075,7 @@ public int Run(FileSystem inFs, CancellationToken cancelToken, ILogger inLogger,
int currentMod = 0;
foreach (FrostyMod mod in modList)
{
Logger.Log($"Loading Mods ({mod.ModDetails.Title})");
Logger.Log($"Loading Mods ({mod.ModDetails?.Title ?? mod.Filename.Replace(".fbmod", "")})");
if (mod.NewFormat)
{
ProcessModResources(mod);
Expand Down Expand Up @@ -1455,8 +1449,7 @@ public int Run(FileSystem inFs, CancellationToken cancelToken, ILogger inLogger,
// add bundle data to archive
for (int i = 0; i < action.BundleRefs.Count; i++)
{
if (!archiveData.ContainsKey(action.BundleRefs[i]))
archiveData.TryAdd(action.BundleRefs[i], new ArchiveInfo() { Data = action.BundleBuffers[i] });
archiveData.TryAdd(action.BundleRefs[i], new ArchiveInfo() { Data = action.BundleBuffers[i] });
}

// add refs to be added to cas (and manifest)
Expand Down