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

@@ -582,9 +582,16 @@ public sealed class CacheMonitor : DisposableMediatorSubscriberBase
                         }
                     }
                     catch (Exception ex)
+                    {
+                        if (workload != null)
                         {
                             Logger.LogWarning(ex, "Failed validating {path}", workload.ResolvedFilepath);
                         }
+                        else
+                        {
+                            Logger.LogWarning(ex, "Failed validating unknown workload");
+                        }
+                    }
                     Interlocked.Increment(ref _currentFileProgress);
                 }
 

LightlessSync/FileCache/FileCacheManager.cs

@@ -180,21 +180,32 @@ public sealed class FileCacheManager : IHostedService
 
         try
         {
-            var cleanedPaths = paths.Distinct(StringComparer.OrdinalIgnoreCase).ToDictionary(p => p,
+            var cleanedPaths = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-                p => p.Replace("/", "\\", StringComparison.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),
+                    .Replace("\\\\", "\\", StringComparison.Ordinal);
-                StringComparer.OrdinalIgnoreCase);
+
+                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))
                 {