Lightless-Sync/LightlessClient
8
1
Fork 2
Code Issues 2 Pull Requests 1 Actions Packages Projects Releases 51 Wiki Activity

Fix conflict changes

Browse Source
This commit is contained in:
cake
2026-01-05 20:51:54 +01:00
parent 55d62ff52a
commit 514668724f
2 changed files with 0 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
LightlessSync/PlayerData/Pairs/PairHandlerAdapter.cs
View File

@@ -537,20 +537,6 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
}); });
} }
_ = Task.Run(async () =>
{
try
{
Logger.LogTrace("[{applicationId}] Removing temp collection {CollectionId} for {handler} ({reason})", applicationId, toRelease, GetLogIdentifier(), reason ?? "Cleanup");
await _ipcManager.Penumbra.RemoveTemporaryCollectionAsync(Logger, applicationId, toRelease).ConfigureAwait(false);
}
catch (Exception ex)
{
Logger.LogDebug(ex, "Failed to remove temporary Penumbra collection for {handler}", GetLogIdentifier());
}
});
}
private bool AnyPair(Func<PairConnection, bool> predicate) private bool AnyPair(Func<PairConnection, bool> predicate)
{ {
return GetCurrentPairs().Any(predicate); return GetCurrentPairs().Any(predicate);
@@ -581,26 +567,6 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
return IsPreferredDirectPair(); return IsPreferredDirectPair();
} }
private bool ShouldSkipDownscale()
{
if (!_playerPerformanceConfigService.Current.SkipTextureDownscaleForPreferredPairs)
{
return false;
}
return IsPreferredDirectPair();
}
private bool ShouldSkipDecimation()
{
if (!_playerPerformanceConfigService.Current.SkipModelDecimationForPreferredPairs)
{
return false;
}
return IsPreferredDirectPair();
}
private bool IsPaused() private bool IsPaused()
{ {
var pairs = GetCurrentPairs(); var pairs = GetCurrentPairs();
@@ -699,20 +665,6 @@ internal sealed class PairHandlerAdapter : DisposableMediatorSubscriberBase, IPa
forceApplyCustomization = forced || needsApply; forceApplyCustomization = forced || needsApply;
var suppressForcedModRedraw = !forced && hasMissingCachedFiles && dataApplied; var suppressForcedModRedraw = !forced && hasMissingCachedFiles && dataApplied;
var sanitized = CloneAndSanitizeLastReceived(out var dataHash);
if (sanitized is null)
{
Logger.LogTrace("Sanitized data null for {Ident}", Ident);
return;
}
var dataApplied = !string.IsNullOrEmpty(dataHash)
&& string.Equals(dataHash, _lastSuccessfulDataHash ?? string.Empty, StringComparison.Ordinal);
var needsApply = !dataApplied;
var modFilesChanged = PlayerModFilesChanged(sanitized, _cachedData);
var shouldForceMods = shouldForce || modFilesChanged;
forceApplyCustomization = forced || needsApply;
var suppressForcedModRedraw = !forced && hasMissingCachedFiles && dataApplied;
if (shouldForceMods) if (shouldForceMods)
{ {
_forceApplyMods = true; _forceApplyMods = true;

1
LightlessSync/Plugin.cs
View File

@@ -123,7 +123,6 @@ public sealed class Plugin : IDalamudPlugin
services.AddSingleton<HubFactory>(); services.AddSingleton<HubFactory>();
services.AddSingleton<FileUploadManager>(); services.AddSingleton<FileUploadManager>();
services.AddSingleton<FileTransferOrchestrator>(); services.AddSingleton<FileTransferOrchestrator>();
services.AddSingleton<FileDownloadDeduplicator>();
services.AddSingleton<LightlessPlugin>(); services.AddSingleton<LightlessPlugin>();
services.AddSingleton<LightlessProfileManager>(); services.AddSingleton<LightlessProfileManager>();
services.AddSingleton<TextureCompressionService>(); services.AddSingleton<TextureCompressionService>();