mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-07-19 20:54:20 +01:00
support track selection before playback
This commit is contained in:
@@ -14,11 +14,11 @@ namespace MediaBrowser.Controller.Providers
|
||||
private readonly ILogger _logger;
|
||||
private readonly IFileSystem _fileSystem;
|
||||
|
||||
private readonly ConcurrentDictionary<string, FileSystemMetadata[]> _cache =
|
||||
new ConcurrentDictionary<string, FileSystemMetadata[]>(StringComparer.OrdinalIgnoreCase);
|
||||
private readonly Dictionary<string, FileSystemMetadata[]> _cache = new Dictionary<string, FileSystemMetadata[]>(StringComparer.OrdinalIgnoreCase);
|
||||
|
||||
private readonly ConcurrentDictionary<string, FileSystemMetadata> _fileCache =
|
||||
new ConcurrentDictionary<string, FileSystemMetadata>(StringComparer.OrdinalIgnoreCase);
|
||||
private readonly Dictionary<string, FileSystemMetadata> _fileCache = new Dictionary<string, FileSystemMetadata>(StringComparer.OrdinalIgnoreCase);
|
||||
|
||||
private readonly Dictionary<string, List<string>> _filePathCache = new Dictionary<string, List<string>>(StringComparer.OrdinalIgnoreCase);
|
||||
|
||||
public DirectoryService(ILogger logger, IFileSystem fileSystem)
|
||||
{
|
||||
@@ -32,11 +32,6 @@ namespace MediaBrowser.Controller.Providers
|
||||
}
|
||||
|
||||
public FileSystemMetadata[] GetFileSystemEntries(string path)
|
||||
{
|
||||
return GetFileSystemEntries(path, false);
|
||||
}
|
||||
|
||||
private FileSystemMetadata[] GetFileSystemEntries(string path, bool clearCache)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(path))
|
||||
{
|
||||
@@ -45,13 +40,6 @@ namespace MediaBrowser.Controller.Providers
|
||||
|
||||
FileSystemMetadata[] entries;
|
||||
|
||||
if (clearCache)
|
||||
{
|
||||
FileSystemMetadata[] removed;
|
||||
|
||||
_cache.TryRemove(path, out removed);
|
||||
}
|
||||
|
||||
if (!_cache.TryGetValue(path, out entries))
|
||||
{
|
||||
//_logger.Debug("Getting files for " + path);
|
||||
@@ -66,21 +54,17 @@ namespace MediaBrowser.Controller.Providers
|
||||
entries = new FileSystemMetadata[] { };
|
||||
}
|
||||
|
||||
_cache.TryAdd(path, entries);
|
||||
//_cache.TryAdd(path, entries);
|
||||
_cache[path] = entries;
|
||||
}
|
||||
|
||||
return entries;
|
||||
}
|
||||
|
||||
public List<FileSystemMetadata> GetFiles(string path)
|
||||
{
|
||||
return GetFiles(path, false);
|
||||
}
|
||||
|
||||
public List<FileSystemMetadata> GetFiles(string path, bool clearCache)
|
||||
{
|
||||
var list = new List<FileSystemMetadata>();
|
||||
var items = GetFileSystemEntries(path, clearCache);
|
||||
var items = GetFileSystemEntries(path);
|
||||
foreach (var item in items)
|
||||
{
|
||||
if (!item.IsDirectory)
|
||||
@@ -100,7 +84,8 @@ namespace MediaBrowser.Controller.Providers
|
||||
|
||||
if (file != null && file.Exists)
|
||||
{
|
||||
_fileCache.TryAdd(path, file);
|
||||
//_fileCache.TryAdd(path, file);
|
||||
_fileCache[path] = file;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -111,5 +96,24 @@ namespace MediaBrowser.Controller.Providers
|
||||
return file;
|
||||
//return _fileSystem.GetFileInfo(path);
|
||||
}
|
||||
|
||||
public List<string> GetFilePaths(string path)
|
||||
{
|
||||
return GetFilePaths(path, false);
|
||||
}
|
||||
|
||||
public List<string> GetFilePaths(string path, bool clearCache)
|
||||
{
|
||||
List<string> result;
|
||||
if (clearCache || !_filePathCache.TryGetValue(path, out result))
|
||||
{
|
||||
result = _fileSystem.GetFilePaths(path).ToList();
|
||||
|
||||
_filePathCache[path] = result;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user