From 39d5d9d7c1bf1a0b093d843356997611ba914422 Mon Sep 17 00:00:00 2001 From: cake Date: Mon, 5 Jan 2026 01:54:19 +0100 Subject: [PATCH] Another few fixes. --- LightlessSync/PlayerData/Factories/PlayerDataFactory.cs | 8 -------- LightlessSync/Plugin.cs | 1 - LightlessSync/UI/CompactUI.cs | 2 +- LightlessSync/WebAPI/Files/FileDownloadManager.cs | 4 ++-- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/LightlessSync/PlayerData/Factories/PlayerDataFactory.cs b/LightlessSync/PlayerData/Factories/PlayerDataFactory.cs index 5c5b580..45b7e01 100644 --- a/LightlessSync/PlayerData/Factories/PlayerDataFactory.cs +++ b/LightlessSync/PlayerData/Factories/PlayerDataFactory.cs @@ -169,11 +169,6 @@ public class PlayerDataFactory using var cts = new CancellationTokenSource(_hardBuildTimeout); var fragment = await CreateCharacterDataInternal(obj, cts.Token).ConfigureAwait(false); - fragment.FileReplacements = - new HashSet(resolvedPaths.Select(c => new FileReplacement([.. c.Value], c.Key)), FileReplacementComparer.Instance) - .Where(p => p.HasFileReplacement).ToHashSet(); - var allowedExtensions = CacheMonitor.AllowedFileExtensions; - fragment.FileReplacements.RemoveWhere(c => c.GamePaths.Any(g => !allowedExtensions.Any(e => g.EndsWith(e, StringComparison.OrdinalIgnoreCase)))); _characterBuildCache[key] = new CacheEntry(fragment, DateTime.UtcNow); PruneCharacterCacheIfNeeded(); @@ -220,9 +215,6 @@ public class PlayerDataFactory // get all remaining paths and resolve them var transientPaths = ManageSemiTransientData(objectKind); - var resolvedTransientPaths = transientPaths.Count == 0 - ? new Dictionary(StringComparer.OrdinalIgnoreCase).AsReadOnly() - : await GetFileReplacementsFromPaths(playerRelatedObject, transientPaths, new HashSet(StringComparer.Ordinal)).ConfigureAwait(false); ct.ThrowIfCancellationRequested(); if (await CheckForNullDrawObject(playerRelatedObject.Address).ConfigureAwait(false)) diff --git a/LightlessSync/Plugin.cs b/LightlessSync/Plugin.cs index 88382c6..4e1ed4e 100644 --- a/LightlessSync/Plugin.cs +++ b/LightlessSync/Plugin.cs @@ -123,7 +123,6 @@ public sealed class Plugin : IDalamudPlugin services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); - services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); diff --git a/LightlessSync/UI/CompactUI.cs b/LightlessSync/UI/CompactUI.cs index 2f173ca..a27c568 100644 --- a/LightlessSync/UI/CompactUI.cs +++ b/LightlessSync/UI/CompactUI.cs @@ -167,7 +167,7 @@ public class CompactUi : WindowMediatorSubscriberBase Mediator.Subscribe(this, (_) => IsOpen = false); Mediator.Subscribe(this, (_) => UiSharedService_GposeStart()); Mediator.Subscribe(this, (_) => UiSharedService_GposeEnd()); - Mediator.Subscribe(this, (msg) => _currentDownloads[msg.DownloadId] = msg.DownloadStatus); + Mediator.Subscribe(this, (msg) => _currentDownloads[msg.DownloadId] = (Dictionary)msg.DownloadStatus); Mediator.Subscribe(this, (msg) => _currentDownloads.TryRemove(msg.DownloadId, out _)); Mediator.Subscribe(this, (msg) => _drawFolders = DrawFolders.ToList()); diff --git a/LightlessSync/WebAPI/Files/FileDownloadManager.cs b/LightlessSync/WebAPI/Files/FileDownloadManager.cs index 2013b50..97f8af7 100644 --- a/LightlessSync/WebAPI/Files/FileDownloadManager.cs +++ b/LightlessSync/WebAPI/Files/FileDownloadManager.cs @@ -504,7 +504,7 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase && decompressed.LongLength != expectedRawSize) { await _fileCompactor.WriteAllBytesAsync(filePath, Array.Empty(), ct).ConfigureAwait(false); - PersistFileToStorage(fileHash, filePath, repl.GamePath, skipDownscale); + PersistFileToStorage(fileHash, filePath, repl.GamePath, skipDownscale, skipDecimation); continue; } @@ -526,7 +526,7 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase // write to file without compacting during download await File.WriteAllBytesAsync(filePath, decompressed, ct).ConfigureAwait(false); - PersistFileToStorage(fileHash, filePath, repl.GamePath, skipDownscale); + PersistFileToStorage(fileHash, filePath, repl.GamePath, skipDownscale, skipDecimation); }, ct).ConfigureAwait(false); } finally