alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-27 04:22:08 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge 'master' updates into 2354-soft-link-sizes

Browse Source
This commit is contained in:
Ken Brazier
2020-07-18 11:39:53 -06:00
parent 36312c92f5 09c05ff9fa
commit 6a39b1a4ca
1009 changed files with 14836 additions and 9090 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Emby.Server.Implementations/IO/LibraryMonitor.cs
View File

@@ -18,7 +18,7 @@ namespace Emby.Server.Implementations.IO
{
public class LibraryMonitor : ILibraryMonitor
{
private readonly ILogger _logger;
private readonly ILogger<LibraryMonitor> _logger;
private readonly ILibraryManager _libraryManager;
private readonly IServerConfigurationManager _configurationManager;
private readonly IFileSystem _fileSystem;
@@ -266,7 +266,6 @@ namespace Emby.Server.Implementations.IO
{
DisposeWatcher(newWatcher, false);
}
}
catch (Exception ex)
{
@@ -393,7 +392,6 @@ namespace Emby.Server.Implementations.IO
}
return false;
}))
{
monitorPath = false;

6
Emby.Server.Implementations/IO/ManagedFileSystem.cs
View File

@@ -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);
});
}