t0w0bi/ClubPenguinClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix issue when multiple transient files point to different gamepaths

Browse Source
This commit is contained in:
Stanley Dimant
2022-09-16 00:25:07 +02:00
parent c9dc0e8468
commit 574cdb0b24
5 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
MareSynchronos/Factories/CharacterDataFactory.cs
View File

@@ -320,10 +320,13 @@ public class CharacterDataFactory
previousData.FileReplacements.Add(objectKind, new());
}
if (!previousData.FileReplacements[objectKind].Any(k => k.ResolvedPath.ToLowerInvariant() == item.ResolvedPath.ToLowerInvariant()))
if (!previousData.FileReplacements[objectKind].Any(k => k.GamePaths.Any(p => item.GamePaths.Select(p => p.ToLowerInvariant()).Contains(p.ToLowerInvariant()))))
{
if (_ipcManager.PenumbraResolvePath(item.GamePaths.First()).ToLowerInvariant() == item.GamePaths.First().ToLowerInvariant())
var penumResolve = _ipcManager.PenumbraResolvePath(item.GamePaths.First()).ToLowerInvariant();
var gamePath = item.GamePaths.First().ToLowerInvariant();
if (penumResolve == gamePath)
{
Logger.Debug("PenumResolve was same as GamePath, not adding " + item);
transientResourceManager.RemoveTransientResource(charaPointer, item);
}
else

8
MareSynchronos/Managers/PlayerManager.cs
View File

@@ -9,6 +9,9 @@ using FFXIVClientStructs.FFXIV.Client.Game.Character;
using System.Collections.Generic;
using System.Linq;
using MareSynchronos.Models;
#if DEBUG
using Newtonsoft.Json;
#endif
namespace MareSynchronos.Managers
{
@@ -236,6 +239,11 @@ namespace MareSynchronos.Managers
CharacterCacheDto? cacheDto = (await CreateFullCharacterCacheDto(token));
if (cacheDto == null || token.IsCancellationRequested) return;
#if DEBUG
var json = JsonConvert.SerializeObject(cacheDto, Formatting.Indented);
Logger.Verbose(json);
#endif
if ((LastCreatedCharacterData?.GetHashCode() ?? 0) == cacheDto.GetHashCode())
{
Logger.Debug("Not sending data, already sent");

27
MareSynchronos/Managers/TransientResourceManager.cs
View File

@@ -143,27 +143,30 @@ namespace MareSynchronos.Managers
var transientResources = resources.ToList();
Logger.Debug("Persisting " + transientResources.Count + " transient resources");
foreach (var item in transientResources)
foreach (var gamePath in transientResources)
{
var existingResource = SemiTransientResources[objectKind].Any(f => f.GamePaths.First().ToLowerInvariant() == item.ToLowerInvariant());
var existingResource = SemiTransientResources[objectKind].Any(f => f.GamePaths.First().ToLowerInvariant() == gamePath.ToLowerInvariant());
if (existingResource)
{
Logger.Debug("Semi Transient resource replaced: " + item);
SemiTransientResources[objectKind].RemoveWhere(f => f.GamePaths.First().ToLowerInvariant() == item.ToLowerInvariant());
Logger.Debug("Semi Transient resource replaced: " + gamePath);
SemiTransientResources[objectKind].RemoveWhere(f => f.GamePaths.First().ToLowerInvariant() == gamePath.ToLowerInvariant());
}
try
{
if (!SemiTransientResources[objectKind].Any(f => f.GamePaths.First().ToLowerInvariant() == item.ToLowerInvariant()))
var fileReplacement = createFileReplacement(gamePath.ToLowerInvariant(), true);
if (!fileReplacement.HasFileReplacement)
fileReplacement = createFileReplacement(gamePath.ToLowerInvariant(), false);
if (fileReplacement.HasFileReplacement)
{
var fileReplacement = createFileReplacement(item.ToLowerInvariant(), true);
if (!fileReplacement.HasFileReplacement)
fileReplacement = createFileReplacement(item.ToLowerInvariant(), false);
if (fileReplacement.HasFileReplacement)
Logger.Debug("Persisting " + gamePath.ToLowerInvariant());
if (SemiTransientResources[objectKind].Add(fileReplacement))
{
Logger.Debug("Persisting " + item.ToLowerInvariant());
SemiTransientResources[objectKind].Add(fileReplacement);
Logger.Debug("Added " + fileReplacement);
}
else
{
Logger.Debug("Not added " + fileReplacement);
}
}
}

2
MareSynchronos/MareSynchronos.csproj
View File

@@ -3,7 +3,7 @@
<PropertyGroup>
<Authors></Authors>
<Company></Company>
<Version>0.4.5</Version>
<Version>0.4.6</Version>
<Description></Description>
<Copyright></Copyright>
<PackageProjectUrl>https://github.com/Penumbra-Sync/client</PackageProjectUrl>

2
MareSynchronos/Models/CharacterData.cs
View File

@@ -48,7 +48,7 @@ namespace MareSynchronos.Models
{
return new FileReplacementDto()
{
GamePaths = g.SelectMany(g => g.GamePaths).Distinct().ToArray(),
GamePaths = g.SelectMany(f => f.GamePaths).Distinct().ToArray(),
Hash = g.First().Hash,
};
}).ToList());