t0w0bi/ClubPenguinClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix issue when someone had penumbra folder at the root of their drive

Browse Source
This commit is contained in:
rootdarkarchon
2023-09-20 12:15:38 +02:00
parent afb7800d20
commit d7a4cc1ea1
1 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
MareSynchronos/FileCache/PeriodicFileScanner.cs
View File

@@ -91,7 +91,17 @@ public sealed class PeriodicFileScanner : DisposableMediatorSubscriberBase
await Task.Delay(250, token).ConfigureAwait(false); await Task.Delay(250, token).ConfigureAwait(false);
} }
Thread scanThread = new(() => _performanceCollector.LogPerformance(this, "PeriodicFileScan", () => PeriodicFileScan(isForcedFromExternal, token))) Thread scanThread = new(() =>
{
try
{
_performanceCollector.LogPerformance(this, "PeriodicFileScan", () => PeriodicFileScan(isForcedFromExternal, token));
}
catch (Exception ex)
{
Logger.LogError(ex, "Error during Periodic File Scan");
}
})
{ {
Priority = ThreadPriority.Lowest, Priority = ThreadPriority.Lowest,
IsBackground = true IsBackground = true
@@ -208,12 +218,19 @@ public sealed class PeriodicFileScanner : DisposableMediatorSubscriberBase
Dictionary<string, string[]> penumbraFiles = new(StringComparer.Ordinal); Dictionary<string, string[]> penumbraFiles = new(StringComparer.Ordinal);
foreach (var folder in Directory.EnumerateDirectories(penumbraDir!)) foreach (var folder in Directory.EnumerateDirectories(penumbraDir!))
{ {
penumbraFiles[folder] = Directory.GetFiles(folder, "*.*", SearchOption.AllDirectories) try
.AsParallel() {
.Where(f => ext.Any(e => f.EndsWith(e, StringComparison.OrdinalIgnoreCase)) penumbraFiles[folder] = Directory.GetFiles(folder, "*.*", SearchOption.AllDirectories)
&& !f.Contains(@"\bg\", StringComparison.OrdinalIgnoreCase) .AsParallel()
&& !f.Contains(@"\bgcommon\", StringComparison.OrdinalIgnoreCase) .Where(f => ext.Any(e => f.EndsWith(e, StringComparison.OrdinalIgnoreCase))
&& !f.Contains(@"\ui\", StringComparison.OrdinalIgnoreCase)).ToArray(); && !f.Contains(@"\bg\", StringComparison.OrdinalIgnoreCase)
&& !f.Contains(@"\bgcommon\", StringComparison.OrdinalIgnoreCase)
&& !f.Contains(@"\ui\", StringComparison.OrdinalIgnoreCase)).ToArray();
}
catch (Exception ex)
{
Logger.LogWarning(ex, "Could not enumerate path {path}", folder);
}
Thread.Sleep(50); Thread.Sleep(50);
if (ct.IsCancellationRequested) return; if (ct.IsCancellationRequested) return;
} }