From 69e8f3be8304eb2c533c7e3a93be64a2141b654e Mon Sep 17 00:00:00 2001 From: rootdarkarchon Date: Tue, 21 Feb 2023 00:47:52 +0100 Subject: [PATCH] fixes only manip data being sent and not applied, adjustments to file scanner max size calc --- MareSynchronos/FileCache/PeriodicFileScanner.cs | 4 ++-- MareSynchronos/Managers/CachedPlayer.cs | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/MareSynchronos/FileCache/PeriodicFileScanner.cs b/MareSynchronos/FileCache/PeriodicFileScanner.cs index 58a4b5e..fbf1b6f 100644 --- a/MareSynchronos/FileCache/PeriodicFileScanner.cs +++ b/MareSynchronos/FileCache/PeriodicFileScanner.cs @@ -135,11 +135,11 @@ public class PeriodicFileScanner : MediatorSubscriberBase, IDisposable } }); - if (FileCacheSize < (long)_configService.Current.MaxLocalCacheInGiB * 1024 * 1024 * 1024) return false; + if (FileCacheSize < (long)(_configService.Current.MaxLocalCacheInGiB * 1024 * 1024 * 1024)) return false; var allFiles = Directory.EnumerateFiles(_configService.Current.CacheFolder) .Select(f => new FileInfo(f)).OrderBy(f => f.LastAccessTime).ToList(); - while (FileCacheSize > (long)_configService.Current.MaxLocalCacheInGiB * 1024 * 1024 * 1024) + while (FileCacheSize > (long)(_configService.Current.MaxLocalCacheInGiB * 1024 * 1024 * 1024)) { var oldestFile = allFiles[0]; FileCacheSize -= oldestFile.Length; diff --git a/MareSynchronos/Managers/CachedPlayer.cs b/MareSynchronos/Managers/CachedPlayer.cs index 061b5e9..6602fea 100644 --- a/MareSynchronos/Managers/CachedPlayer.cs +++ b/MareSynchronos/Managers/CachedPlayer.cs @@ -403,12 +403,9 @@ public class CachedPlayer : MediatorSubscriberBase, IDisposable _applicationId = Guid.NewGuid(); _logger.LogDebug("[{applicationId}] Starting application task", _applicationId); - if (updateModdedPaths) + if (updateModdedPaths && (moddedPaths.Any() || !string.IsNullOrEmpty(charaData.ManipulationData))) { - if (moddedPaths.Any()) - { - ApplyBaseData(_applicationId, moddedPaths, charaData.ManipulationData); - } + ApplyBaseData(_applicationId, moddedPaths, charaData.ManipulationData); } foreach (var kind in updatedData)