lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4222 from Spacetech/directory_service_concurrent

Browse Source 
Use ConcurrentDictionary's in DirectoryService
This commit is contained in:
dkanada 2020-09-28 23:56:36 +09:00 committed by GitHub
commit 6cafc152b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
MediaBrowser.Controller/Providers/DirectoryService.cs
View File

@ -1,6 +1,7 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
using System; using System;
using System.Collections.Concurrent;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using MediaBrowser.Model.IO; using MediaBrowser.Model.IO;
@ -11,11 +12,11 @@ namespace MediaBrowser.Controller.Providers
{ {
private readonly IFileSystem _fileSystem; private readonly IFileSystem _fileSystem;
private readonly Dictionary<string, FileSystemMetadata[]> _cache = new Dictionary<string, FileSystemMetadata[]>(StringComparer.OrdinalIgnoreCase); private readonly ConcurrentDictionary<string, FileSystemMetadata[]> _cache = new ConcurrentDictionary<string, FileSystemMetadata[]>(StringComparer.OrdinalIgnoreCase);
private readonly Dictionary<string, FileSystemMetadata> _fileCache = new Dictionary<string, FileSystemMetadata>(StringComparer.OrdinalIgnoreCase); private readonly ConcurrentDictionary<string, FileSystemMetadata> _fileCache = new ConcurrentDictionary<string, FileSystemMetadata>(StringComparer.OrdinalIgnoreCase);
private readonly Dictionary<string, List<string>> _filePathCache = new Dictionary<string, List<string>>(StringComparer.OrdinalIgnoreCase); private readonly ConcurrentDictionary<string, List<string>> _filePathCache = new ConcurrentDictionary<string, List<string>>(StringComparer.OrdinalIgnoreCase);
public DirectoryService(IFileSystem fileSystem) public DirectoryService(IFileSystem fileSystem)
{ {
@ -24,14 +25,7 @@ namespace MediaBrowser.Controller.Providers
public FileSystemMetadata[] GetFileSystemEntries(string path) public FileSystemMetadata[] GetFileSystemEntries(string path)
{ {
if (!_cache.TryGetValue(path, out FileSystemMetadata[] entries)) return _cache.GetOrAdd(path, p => _fileSystem.GetFileSystemEntries(p).ToArray());
{
entries = _fileSystem.GetFileSystemEntries(path).ToArray();
_cache[path] = entries;
}
return entries;
} }
public List<FileSystemMetadata> GetFiles(string path) public List<FileSystemMetadata> GetFiles(string path)
@ -51,21 +45,19 @@ namespace MediaBrowser.Controller.Providers
public FileSystemMetadata GetFile(string path) public FileSystemMetadata GetFile(string path)
{ {
if (!_fileCache.TryGetValue(path, out FileSystemMetadata file)) var result = _fileCache.GetOrAdd(path, p =>
{ {
file = _fileSystem.GetFileInfo(path); var file = _fileSystem.GetFileInfo(p);
return file != null && file.Exists ? file : null;
});
if (file != null && file.Exists) if (result == null)
{ {
_fileCache[path] = file; // lets not store null results in the cache
} _fileCache.TryRemove(path, out _);
else
{
return null;
}
} }
return file; return result;
} }
public IReadOnlyList<string> GetFilePaths(string path) public IReadOnlyList<string> GetFilePaths(string path)
@ -73,14 +65,12 @@ namespace MediaBrowser.Controller.Providers
public IReadOnlyList<string> GetFilePaths(string path, bool clearCache) public IReadOnlyList<string> GetFilePaths(string path, bool clearCache)
{ {
if (clearCache || !_filePathCache.TryGetValue(path, out List<string> result)) if (clearCache)
{ {
result = _fileSystem.GetFilePaths(path).ToList(); _filePathCache.TryRemove(path, out _);
_filePathCache[path] = result;
} }
return result; return _filePathCache.GetOrAdd(path, p => _fileSystem.GetFilePaths(p).ToList());
} }
} }
} }