alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-31 04:48:27 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge pull request #1265 from MediaBrowser/master

Browse Source 
update use of FileAttributes
This commit is contained in:
Luke
2015-11-12 15:54:31 -05:00
parent bccd268081 c6ce834216
commit 1051745fd1
7 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.LocalMetadata/Images/EpisodeLocalImageProvider.cs
View File

@@ -68,7 +68,7 @@ namespace MediaBrowser.LocalMetadata.Images
return parentPathFiles
.Where(i =>
{
if ((i.Attributes & FileAttributes.Directory) == FileAttributes.Directory)
if (i.IsDirectory)
{
return false;
}

5
MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs
View File

@@ -74,8 +74,7 @@ namespace MediaBrowser.LocalMetadata.Images
if (includeDirectories)
{
return directoryService.GetFileSystemEntries(path)
.Where(i => BaseItem.SupportedImageExtensions.Contains(i.Extension, StringComparer.OrdinalIgnoreCase) ||
(i.Attributes & FileAttributes.Directory) == FileAttributes.Directory)
.Where(i => BaseItem.SupportedImageExtensions.Contains(i.Extension, StringComparer.OrdinalIgnoreCase) || i.IsDirectory)
.OrderBy(i => BaseItem.SupportedImageExtensionsList.IndexOf(i.Extension ?? string.Empty));
}
@@ -378,7 +377,7 @@ namespace MediaBrowser.LocalMetadata.Images
private FileSystemMetadata GetImage(IEnumerable<FileSystemMetadata> files, string name)
{
return files.FirstOrDefault(i => ((i.Attributes & FileAttributes.Directory) != FileAttributes.Directory) && string.Equals(name, _fileSystem.GetFileNameWithoutExtension(i), StringComparison.OrdinalIgnoreCase));
return files.FirstOrDefault(i => !i.IsDirectory && string.Equals(name, _fileSystem.GetFileNameWithoutExtension(i), StringComparison.OrdinalIgnoreCase));
}
}
}