mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-07-10 10:54:12 +00:00
Merge 'master' updates into 2354-soft-link-sizes
This commit is contained in:
commit
6a39b1a4ca
1009 changed files with 14836 additions and 9090 deletions
|
|
@ -20,7 +20,7 @@ namespace Emby.Server.Implementations.IO
|
|||
/// </summary>
|
||||
public class ManagedFileSystem : IFileSystem
|
||||
{
|
||||
protected ILogger Logger;
|
||||
protected ILogger<ManagedFileSystem> Logger;
|
||||
|
||||
private readonly List<IShortcutHandler> _shortcutHandlers = new List<IShortcutHandler>();
|
||||
private readonly string _tempPath;
|
||||
|
|
@ -237,7 +237,7 @@ namespace Emby.Server.Implementations.IO
|
|||
{
|
||||
result.IsDirectory = info is DirectoryInfo || (info.Attributes & FileAttributes.Directory) == FileAttributes.Directory;
|
||||
|
||||
//if (!result.IsDirectory)
|
||||
// if (!result.IsDirectory)
|
||||
//{
|
||||
// result.IsHidden = (info.Attributes & FileAttributes.Hidden) == FileAttributes.Hidden;
|
||||
//}
|
||||
|
|
@ -638,6 +638,7 @@ namespace Emby.Server.Implementations.IO
|
|||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return extensions.Contains(ext, StringComparer.OrdinalIgnoreCase);
|
||||
});
|
||||
}
|
||||
|
|
@ -692,6 +693,7 @@ namespace Emby.Server.Implementations.IO
|
|||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return extensions.Contains(ext, StringComparer.OrdinalIgnoreCase);
|
||||
});
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue