Merge pull request 'Adding new way for checking cleaned paths. adding more logging.' (#29) from file-cache-attempt into 1.11.9

Reviewed-on: #29

LightlessSync/FileCache/CacheMonitor.cs

@@ -583,7 +583,14 @@ public sealed class CacheMonitor : DisposableMediatorSubscriberBase
                     }
                     catch (Exception ex)
                     {
-                        Logger.LogWarning(ex, "Failed validating {path}", workload.ResolvedFilepath);
+                        if (workload != null)
+                        {
+                            Logger.LogWarning(ex, "Failed validating {path}", workload.ResolvedFilepath);
+                        }
+                        else
+                        {
+                            Logger.LogWarning(ex, "Failed validating unknown workload");
+                        }
                     }
                     Interlocked.Increment(ref _currentFileProgress);
                 }
@@ -647,6 +654,12 @@ public sealed class CacheMonitor : DisposableMediatorSubscriberBase
                     CancellationToken = ct
                 }, (cachePath) =>
                 {
+                    if (_fileDbManager == null || _ipcManager?.Penumbra == null || cachePath == null)
+                    {
+                        Logger.LogTrace("Potential null in db: {isDbNull} penumbra: {isPenumbraNull} cachepath: {isPathNull}", _fileDbManager == null, _ipcManager?.Penumbra == null, cachePath == null);
+                        return;
+                    }
+
                     if (ct.IsCancellationRequested) return;
 
                     if (!_ipcManager.Penumbra.APIAvailable)

LightlessSync/FileCache/FileCacheManager.cs

@@ -180,21 +180,32 @@ public sealed class FileCacheManager : IHostedService
 
         try
         {
-            var cleanedPaths = paths.Distinct(StringComparer.OrdinalIgnoreCase).ToDictionary(p => p,
-                p => p.Replace("/", "\\", StringComparison.OrdinalIgnoreCase)
+            var cleanedPaths = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            foreach (var p in paths)
+            {
+                var cleaned = p.Replace("/", "\\", StringComparison.OrdinalIgnoreCase)
                     .Replace(_ipcManager.Penumbra.ModDirectory!, _ipcManager.Penumbra.ModDirectory!.EndsWith('\\') ? PenumbraPrefix + '\\' : PenumbraPrefix, StringComparison.OrdinalIgnoreCase)
                     .Replace(_configService.Current.CacheFolder, _configService.Current.CacheFolder.EndsWith('\\') ? CachePrefix + '\\' : CachePrefix, StringComparison.OrdinalIgnoreCase)
-                    .Replace("\\\\", "\\", StringComparison.Ordinal),
-                StringComparer.OrdinalIgnoreCase);
+                    .Replace("\\\\", "\\", StringComparison.Ordinal);
+
+                if (!cleanedPaths.ContainsValue(cleaned))
+                {
+                    _logger.LogDebug("Adding to cleanedPaths: {cleaned}", cleaned);
+                    cleanedPaths[p] = cleaned;
+                } else
+                {
+                    _logger.LogWarning("Duplicated found: {cleaned}", cleaned);
+                }
+            }
 
             Dictionary<string, FileCacheEntity?> result = new(StringComparer.OrdinalIgnoreCase);
 
-            var dict = _fileCaches.SelectMany(f => f.Value)
+            var dict = _fileCaches.SelectMany(f => f.Value).Distinct()
                 .ToDictionary(d => d.PrefixedFilePath, d => d, StringComparer.OrdinalIgnoreCase);
 
             foreach (var entry in cleanedPaths)
             {
-                //_logger.LogDebug("Checking {path}", entry.Value);
+                _logger.LogDebug("Checking if in cache: {path}", entry.Value);
 
                 if (dict.TryGetValue(entry.Value, out var entity))
                 {

LightlessSync/LightlessSync.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Authors></Authors>
     <Company></Company>
-    <Version>1.11.6</Version>
+    <Version>1.11.8</Version>
     <Description></Description>
     <Copyright></Copyright>
     <PackageProjectUrl>https://github.com/Light-Public-Syncshells/LightlessClient</PackageProjectUrl>

LightlessSync/Services/ServerConfiguration/ServerConfigurationManager.cs

@@ -299,7 +299,7 @@ public class ServerConfigurationManager
 
     internal void AddPairTag(string tag)
     {
-        if (tag.Length > _maxCharactersFolder)
+        if (tag.Length <= _maxCharactersFolder)
         {
             CurrentPairTagStorage().ServerAvailablePairTags.Add(tag);
             _pairTagConfig.Save();
@@ -313,7 +313,7 @@ public class ServerConfigurationManager
 
     internal void AddSyncshellTag(string tag)
     {
-        if (tag.Length > _maxCharactersFolder)
+        if (tag.Length <= _maxCharactersFolder)
         {
             CurrentSyncshellTagStorage().ServerAvailableSyncshellTags.Add(tag);
             _syncshellTagConfig.Save();

LightlessSync/UI/CompactUI.cs

@@ -416,10 +416,6 @@ public class CompactUi : WindowMediatorSubscriberBase
 
         //Getting information of character and triangles threshold to show overlimit status in UID bar.
         _cachedAnalysis = _characterAnalyzer.LastAnalysis.DeepClone();
-        var groupedfiles = _cachedAnalysis.First().Value.Select(v => v.Value).GroupBy(f => f.FileType, StringComparer.Ordinal)
-        .OrderBy(k => k.Key, StringComparer.Ordinal).ToList();
-        var actualTriCount = _cachedAnalysis.First().Value.Sum(f => f.Value.Triangles);
-        var isOverTriHold = actualTriCount > (_playerPerformanceConfig.Current.TrisWarningThresholdThousands * 1000);
 
         using (_uiSharedService.UidFont.Push())
         {
@@ -428,30 +424,58 @@ public class CompactUi : WindowMediatorSubscriberBase
             ImGui.TextColored(GetUidColor(), uidText);
         }
 
-        if (groupedfiles != null)
+        UiSharedService.AttachToolTip("Click to copy");
+        if (ImGui.IsItemClicked())
         {
-            //Checking of VRAM threshhold
-            var actualVramUsage = groupedfiles.SingleOrDefault(v => string.Equals(v.Key, "tex", StringComparison.Ordinal)).Sum(f => f.OriginalSize);
-            var isOverVRAMUsage = _playerPerformanceConfig.Current.VRAMSizeWarningThresholdMiB * 1024 * 1024 < actualVramUsage;
+            ImGui.SetClipboardText(uidText);
+        }
 
-            if (isOverTriHold || isOverVRAMUsage)
+        if (_cachedAnalysis != null)
+        {
+            var firstEntry = _cachedAnalysis.FirstOrDefault();
+            var valueDict = firstEntry.Value;
+            if (valueDict != null && valueDict.Count > 0)
             {
-                ImGui.SameLine();
-                _uiSharedService.IconText(FontAwesomeIcon.ExclamationTriangle, UIColors.Get("LightlessYellow"));
-                string warningMessage = "";
-                if (isOverTriHold)
-                {
-                    warningMessage += $"You exceed your own triangles threshold by " +
-                        $"{actualTriCount - _playerPerformanceConfig.Current.TrisWarningThresholdThousands * 1000} triangles.";
-                    warningMessage += Environment.NewLine;
+                var groupedfiles = valueDict
+                    .Select(v => v.Value)
+                    .Where(v => v != null)
+                    .GroupBy(f => f.FileType, StringComparer.Ordinal)
+                    .OrderBy(k => k.Key, StringComparer.Ordinal)
+                    .ToList();
 
-                }
-                if (isOverVRAMUsage)
+                var actualTriCount = valueDict
+                    .Select(v => v.Value)
+                    .Where(v => v != null)
+                    .Sum(f => f.Triangles);
+
+                if (groupedfiles != null)
                 {
-                    warningMessage += $"You exceed your own VRAM threshold by " +
-                            $"{UiSharedService.ByteToString(actualVramUsage - (_playerPerformanceConfig.Current.VRAMSizeWarningThresholdMiB * 1024 * 1024))}.";
+                    //Checking of VRAM threshhold
+                    var texGroup = groupedfiles.SingleOrDefault(v => string.Equals(v.Key, "tex", StringComparison.Ordinal));
+                    var actualVramUsage = texGroup != null ? texGroup.Sum(f => f.OriginalSize) : 0L;
+                    var isOverVRAMUsage = _playerPerformanceConfig.Current.VRAMSizeWarningThresholdMiB * 1024 * 1024 < actualVramUsage;
+                    var isOverTriHold = actualTriCount > (_playerPerformanceConfig.Current.TrisWarningThresholdThousands * 1000);
+
+                    if ((isOverTriHold || isOverVRAMUsage) && _playerPerformanceConfig.Current.WarnOnExceedingThresholds)
+                    {
+                        ImGui.SameLine();
+                        _uiSharedService.IconText(FontAwesomeIcon.ExclamationTriangle, UIColors.Get("LightlessYellow"));
+                        string warningMessage = "";
+                        if (isOverTriHold)
+                        {
+                            warningMessage += $"You exceed your own triangles threshold by " +
+                                $"{actualTriCount - _playerPerformanceConfig.Current.TrisWarningThresholdThousands * 1000} triangles.";
+                            warningMessage += Environment.NewLine;
+
+                        }
+                        if (isOverVRAMUsage)
+                        {
+                            warningMessage += $"You exceed your own VRAM threshold by " +
+                                    $"{UiSharedService.ByteToString(actualVramUsage - (_playerPerformanceConfig.Current.VRAMSizeWarningThresholdMiB * 1024 * 1024))}.";
+                        }
+                        UiSharedService.AttachToolTip(warningMessage);
+                    }
                 }
-                UiSharedService.AttachToolTip(warningMessage);
             }
         }
 

LightlessSync/UI/DownloadUi.cs

@@ -169,7 +169,7 @@ public class DownloadUi : WindowMediatorSubscriberBase
                 var dlProgressPercent = transferredBytes / (double)totalBytes;
                 drawList.AddRectFilled(dlBarStart,
                     dlBarEnd with { X = dlBarStart.X + (float)(dlProgressPercent * dlBarWidth) },
-                    UiSharedService.Color(173, 138, 245, transparency), 1);
+                    UiSharedService.Color(UIColors.Get("LightlessPurple")));
 
                 if (_configService.Current.TransferBarsShowText)
                 {