Skip to content

Commit 5f397f3

Browse files
committed
MCDF fix
1 parent 81c512a commit 5f397f3

5 files changed

Lines changed: 10 additions & 5 deletions

File tree

Snowcloak/Services/CharaData/CharaDataFileHandler.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,11 @@ internal async Task SaveCharaFileAsync(string description, string filePath)
207207
await McdfIo.WriteAsync(
208208
header,
209209
filePath,
210-
hash => _fileCacheManager.GetFileCacheByHash(hash)?.ResolvedFilepath,
210+
hash =>
211+
{
212+
var caches = _fileCacheManager.GetFileCachesByHash(hash);
213+
return (caches.Penumbra ?? caches.Cache ?? caches.Subst)?.ResolvedFilepath;
214+
},
211215
_logger).ConfigureAwait(false);
212216
}
213217
catch (Exception ex)

Snowcloak/Services/CharaData/McdfIo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public static async Task WriteAsync(
9999
var fileStream = new FileStream(tempFilePath, FileMode.Create, FileAccess.ReadWrite, FileShare.None);
100100
await using (fileStream.ConfigureAwait(false))
101101
{
102-
using (var lz4 = new LZ4Stream(fileStream, LZ4StreamMode.Compress, LZ4StreamFlags.HighCompression))
102+
using (var lz4 = new LZ4Stream(fileStream, LZ4StreamMode.Compress, LZ4StreamFlags.HighCompression | LZ4StreamFlags.IsolateInnerStream))
103103
{
104104
using var writer = new BinaryWriter(lz4, Encoding.UTF8, leaveOpen: true);
105105
header.WriteToStream(writer);

Snowcloak/Services/CharaData/Models/MareCharaFileData.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ public MareCharaFileData(FileCacheManager manager, string description, Character
4444
}
4545
else
4646
{
47-
var filePath = manager.GetFileCacheByHash(file.First().Hash)?.ResolvedFilepath;
47+
var caches = manager.GetFileCachesByHash(file.First().Hash);
48+
var filePath = (caches.Penumbra ?? caches.Cache ?? caches.Subst)?.ResolvedFilepath;
4849
if (filePath != null)
4950
{
5051
Files.Add(new FileData(file.SelectMany(f => f.GamePaths), (int)new FileInfo(filePath).Length, file.First().Hash));

Snowcloak/Snowcloak.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project Sdk="Dalamud.NET.Sdk/15.0.0">
33
<PropertyGroup>
44
<AssemblyName>Snowcloak</AssemblyName>
5-
<Version>3.0.1.0</Version>
5+
<Version>3.0.2.0</Version>
66
<PackageProjectUrl>https://github.com/Eauldane/SnowcloakClient/</PackageProjectUrl>
77
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
88
<Configurations>Release;Debug</Configurations>

Snowcloak/UI/PairingAvailabilityWindow.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public sealed class PairingAvailabilityWindow : WindowMediatorSubscriberBase, IS
2323
public PairingAvailabilityWindow(ILogger<PairingAvailabilityWindow> logger, SnowMediator mediator,
2424
PairRequestService pairRequestService, DalamudUtilService dalamudUtilService,
2525
PerformanceCollectorService performanceCollectorService)
26-
: base(logger, mediator, "SnowcloakPairingAvailability", performanceCollectorService)
26+
: base(logger, mediator, "Frostbrand - Open to Pairs###SnowcloakPairingAvailability", performanceCollectorService)
2727
{
2828
ArgumentNullException.ThrowIfNull(pairRequestService);
2929

0 commit comments

Comments
 (0)